This commit was manufactured by cvs2svn to create tag 'v200911161615'. Sprout from ptp_2_1 2009-11-16 21:13:35 UTC Vivian Kong <vivkong@ca.ibm.com> 'use latest CDT 5.0.3 build' Delete: core/org.eclipse.ptp.core/.classpath core/org.eclipse.ptp.core/.cvsignore core/org.eclipse.ptp.core/.options core/org.eclipse.ptp.core/.project core/org.eclipse.ptp.core/.settings/org.eclipse.jdt.ui.prefs core/org.eclipse.ptp.core/META-INF/MANIFEST.MF core/org.eclipse.ptp.core/about.html core/org.eclipse.ptp.core/about.ini core/org.eclipse.ptp.core/about.mappings core/org.eclipse.ptp.core/about.properties core/org.eclipse.ptp.core/build.properties core/org.eclipse.ptp.core/eclipse32.png core/org.eclipse.ptp.core/plugin.properties core/org.eclipse.ptp.core/plugin.xml core/org.eclipse.ptp.core/schema/resourceManagers.exsd core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IDGenerator.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelPresentation.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IPTPLaunchConfigurationConstants.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PTPCorePlugin.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PreferenceConstants.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeDefinitionManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IllegalValueException.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttribute.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttributeDefinition.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPElementControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPJobControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPMachineControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPNodeControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPProcessControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPQueueControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPUniverseControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IResourceManagerControl.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPElement.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPJob.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPMachine.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPNode.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPProcess.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPQueue.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPUniverse.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IResourceManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributeManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ErrorAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/JobAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MachineAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MessageAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/NodeAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ProcessAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/QueueAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ResourceManagerAttributes.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IJobChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IMachineChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INodeChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IProcessChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IQueueChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerSubmitJobErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobChildListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineChildListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeChildListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IProcessListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueChildListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerChildListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IChangedResourceManagerEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/INewResourceManagerEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IRemoveResourceManagerEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/listeners/IModelManagerChildListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/resources/FileStorage.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/BitList.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/DebugUtil.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/OutputTextFile.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/Queue.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/ModelManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElement.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElementInfo.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PJob.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PMachine.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PNode.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PProcess.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PQueue.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PUniverse.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/Parent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/JobChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/MachineChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NodeChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ProcessChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/QueueChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerSubmitJobErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/ChangedResourceManagerEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/NewResourceManagerEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/RemoveResourceManagerEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rmsystem/ResourceManagerPersistence.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeAttributeDefinitionEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeConnectedStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeDisconnectedEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeErrorStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeJobChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMachineChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMessageEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNodeChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeProcessChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeQueueChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveAllEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRunningStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeShutdownStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeStartupErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeSubmitJobErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeTerminateJobErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerConfiguration.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerFactory.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractRuntimeResourceManager.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerConfiguration.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerFactory.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerMenuContribution.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractProxyRuntimeSystem.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractRuntimeSystem.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IControlSystem.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IMonitoringSystem.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeEventListener.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeSystem.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/JobRunConfiguration.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeNewEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeRemoveEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeAttributeDefinitionEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeConnectedStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeDisconnectedEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEventFactory.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeJobChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMachineChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMessageEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNodeChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeProcessChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeQueueChangeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveAllEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveJobEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveMachineEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveNodeEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveProcessEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveQueueEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRunningStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeShutdownStateEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeStartupErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeSubmitJobErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeTerminateJobErrorEvent.java core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/RuntimeEventFactory.java core/org.eclipse.ptp.doc.user/.classpath core/org.eclipse.ptp.doc.user/.cvsignore core/org.eclipse.ptp.doc.user/.project core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF core/org.eclipse.ptp.doc.user/about.html core/org.eclipse.ptp.doc.user/build.properties core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html core/org.eclipse.ptp.doc.user/html/00overview.html core/org.eclipse.ptp.doc.user/html/00prereqs.html core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html core/org.eclipse.ptp.doc.user/html/04pLaunchConfigDebug.html core/org.eclipse.ptp.doc.user/html/05monitoring.html core/org.eclipse.ptp.doc.user/html/06parDebugging.html core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html core/org.eclipse.ptp.doc.user/html/help.css core/org.eclipse.ptp.doc.user/html/images/.cvsignore core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png core/org.eclipse.ptp.doc.user/html/images/01proj.png core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png core/org.eclipse.ptp.doc.user/html/images/02ORTEConfiguration.png core/org.eclipse.ptp.doc.user/html/images/02ORTEProxyConn2local.png core/org.eclipse.ptp.doc.user/html/images/02ORTEresMgrLocalStarted.png core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType-OpenMPI.png core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png core/org.eclipse.ptp.doc.user/html/images/02newORTEproxyRemote.png core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png core/org.eclipse.ptp.doc.user/html/images/02orteProxyConfigRemoteAddr1.png core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png core/org.eclipse.ptp.doc.user/html/images/03launch1.png core/org.eclipse.ptp.doc.user/html/images/03launch2.png core/org.eclipse.ptp.doc.user/html/images/03launch5.png core/org.eclipse.ptp.doc.user/html/images/03launch6.png core/org.eclipse.ptp.doc.user/html/images/03launch7.png core/org.eclipse.ptp.doc.user/html/images/03launch8.png core/org.eclipse.ptp.doc.user/html/images/03launch9.png core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png core/org.eclipse.ptp.doc.user/html/images/04combinedConsole1.png core/org.eclipse.ptp.doc.user/html/images/04launch1.png core/org.eclipse.ptp.doc.user/html/images/04launch2.png core/org.eclipse.ptp.doc.user/html/images/04launch5.png core/org.eclipse.ptp.doc.user/html/images/04launchResTab.png core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png core/org.eclipse.ptp.doc.user/html/images/06cipHover.png core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png core/org.eclipse.ptp.doc.user/html/images/06ipMult.png core/org.eclipse.ptp.doc.user/html/images/06ipReg.png core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png core/org.eclipse.ptp.doc.user/html/images/06mip.png core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png core/org.eclipse.ptp.doc.user/html/images/06pSets.png core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png core/org.eclipse.ptp.doc.user/html/images/06reg1.png core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png core/org.eclipse.ptp.doc.user/html/images/06terminate.png core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png core/org.eclipse.ptp.doc.user/html/images/07prefsORTE.png core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png core/org.eclipse.ptp.doc.user/html/thumb.js core/org.eclipse.ptp.doc.user/html/thumb2.js core/org.eclipse.ptp.doc.user/html/toc.html core/org.eclipse.ptp.doc.user/intro/css/graphics/sample.gif core/org.eclipse.ptp.doc.user/intro/css/graphics/sample_hov.gif core/org.eclipse.ptp.doc.user/intro/css/sample.css core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml core/org.eclipse.ptp.doc.user/plugin.properties core/org.eclipse.ptp.doc.user/plugin.xml core/org.eclipse.ptp.doc.user/src/org/eclipse/ptp/help/HelpPlugin.java core/org.eclipse.ptp.doc.user/toc.xml core/org.eclipse.ptp.launch/.classpath core/org.eclipse.ptp.launch/.cvsignore core/org.eclipse.ptp.launch/.project core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF core/org.eclipse.ptp.launch/about.html core/org.eclipse.ptp.launch/build.properties core/org.eclipse.ptp.launch/icons/arguments_tab.gif core/org.eclipse.ptp.launch/icons/debugger_tab.gif core/org.eclipse.ptp.launch/icons/environment_tab.gif core/org.eclipse.ptp.launch/icons/main_tab.gif core/org.eclipse.ptp.launch/icons/parallel_run.gif core/org.eclipse.ptp.launch/icons/parallel_tab.gif core/org.eclipse.ptp.launch/plugin.properties core/org.eclipse.ptp.launch/plugin.xml core/org.eclipse.ptp.launch/schema/rmLaunchConfigurations.exsd core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/PTPLaunchPlugin.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadBackRule.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadRule.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/ISynchronizationRule.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/OverwritePolicies.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/RuleFactory.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/SerializationKeys.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/UploadRule.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/AbstractParallelLaunchConfigurationDelegate.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/LinuxPath.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/PTPLaunchShortcut.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ParallelLaunchConfigurationDelegate.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/RuntimeProcess.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/AbstractDebuggerTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchImages.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchUtils.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/ParallelLaunchConfigurationTabGroup.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/Messages.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/messages.properties core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadBackAction.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadRuleAction.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/ILaunchProcessCallback.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/IRuleAction.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/RuleActionFactory.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/UploadRuleAction.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ApplicationTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ArgumentsTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DebuggerTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DownloadRuleDialog.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnhancedSynchronizeTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnvironmentTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/IRuleDialog.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/LaunchConfigurationTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ResourcesTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/RuleDialogFactory.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/SynchronizationRuleLabelProvider.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/UploadRuleDialog.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/WorkingDirectoryBlock.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationDynamicTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationFactory.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationContentsChangedListener.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationDynamicTab.java core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/RMLaunchValidation.java core/org.eclipse.ptp.proxy.protocol/.classpath core/org.eclipse.ptp.proxy.protocol/.project core/org.eclipse.ptp.proxy.protocol/META-INF/MANIFEST.MF core/org.eclipse.ptp.proxy.protocol/about.html core/org.eclipse.ptp.proxy.protocol/build.properties core/org.eclipse.ptp.proxy.protocol/plugin.properties core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/command/ProxyQuitCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugArgsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointHitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointSetEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataExpValueEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugEventFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugExitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInfoThreadsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugMemoryInfoEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugOKEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugPartialAIFEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSetThreadSelectEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalExitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackInfoDepthEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackframeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStepEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSuspendEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugTypeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugVarsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyConnectedEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyDisconnectedEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyMessageEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyOKEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyShutdownEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyTimeoutEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeInitCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeModelDefCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStartEventsCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStopEventsCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeSubmitJobCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeTerminateJobCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeAttributeDefEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeConnectedStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeErrorStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeJobChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMachineChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMessageEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewJobEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewMachineEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewNodeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewProcessEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewQueueEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNodeChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeProcessChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeQueueChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveAllEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveJobEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveMachineEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveNodeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveProcessEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveQueueEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRunningStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeShutdownStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeStartupErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeSubmitJobErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeTerminateJobErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/AbstractProxyClient.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/IProxyClient.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommandFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandListener.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyExtendedCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyQuitCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/ProxyCommandFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/AbstractProxyDebugClient.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/IProxyDebugClient.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugAIF.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugBreakpoint.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLineLocation.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLocator.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemoryInfo.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugSignal.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugStackFrame.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/AbstractProxyDebugCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/IProxyDebugCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugBreakpointAfterCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugCLICommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugConditionBreakpointCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataReadMemoryCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataWriteMemoryCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDeleteBreakpointCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDisableBreakpointCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEnableBreakpointCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEvaluateExpressionCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetPartialAIFCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetTypeCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGoCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugInterruptCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListArgumentsCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListGlobalVariablesCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListInfoThreadsCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListLocalVariablesCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListSignalsCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListStackframesCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetCurrentStackframeCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetFunctionBreakpointCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetLineBreakpointCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetThreadSelectCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetWatchpointCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSignalInfoCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStackInfoDepthCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStartSessionCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStepCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugTerminateCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugVariableDeleteCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugSuspendEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugArgsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointHitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointSetEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataExpValueEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventListener.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugExitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInfoThreadsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugMemoryInfoEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugOKEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugPartialAIFEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSetThreadSelectEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalExitEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackInfoDepthEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackframeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStepEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSuspendEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugTypeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugVarsEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEventFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyConnectedEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyDisconnectedEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventHandler.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventListener.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyExtendedEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyMessageEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyOKEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyShutdownEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyTimeoutEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/ProxyEventFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/packet/ProxyPacket.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/AbstractProxyRuntimeClient.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeClient.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeEventListener.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/AbstractProxyRuntimeCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommandFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeInitCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeModelDefCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStartEventsCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStopEventsCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeSubmitJobCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeTerminateJobCommand.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/ProxyRuntimeCommandFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/AbstractProxyRuntimeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeAttributeDefEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeConnectedStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeErrorStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEventFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeJobChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMachineChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMessageEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewJobEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewMachineEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewNodeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewProcessEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewQueueEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNodeChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeProcessChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeQueueChangeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveAllEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveJobEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveMachineEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveNodeEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveProcessEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveQueueEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRunningStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeShutdownStateEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeStartupErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeSubmitJobErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeTerminateJobErrorEvent.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/ProxyRuntimeEventFactory.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/AbstractProxyRuntimeServer.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/IProxyRuntimeCommandListener.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/AbstractProxyServer.java core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/IProxyServer.java core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/DebugOptions.java core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/ProtocolUtil.java core/org.eclipse.ptp.proxy/.cdtproject core/org.eclipse.ptp.proxy/.cproject core/org.eclipse.ptp.proxy/.cvsignore core/org.eclipse.ptp.proxy/.project core/org.eclipse.ptp.proxy/.settings/org.eclipse.cdt.core.prefs core/org.eclipse.ptp.proxy/AUTHORS core/org.eclipse.ptp.proxy/COPYING core/org.eclipse.ptp.proxy/ChangeLog core/org.eclipse.ptp.proxy/INSTALL core/org.eclipse.ptp.proxy/META-INF/MANIFEST.MF core/org.eclipse.ptp.proxy/Makefile.am core/org.eclipse.ptp.proxy/Makefile.in core/org.eclipse.ptp.proxy/NEWS core/org.eclipse.ptp.proxy/README core/org.eclipse.ptp.proxy/about.html core/org.eclipse.ptp.proxy/aclocal.m4 core/org.eclipse.ptp.proxy/build.properties core/org.eclipse.ptp.proxy/compile core/org.eclipse.ptp.proxy/config.guess core/org.eclipse.ptp.proxy/config.h.in core/org.eclipse.ptp.proxy/config.sub core/org.eclipse.ptp.proxy/configure core/org.eclipse.ptp.proxy/configure.in core/org.eclipse.ptp.proxy/depcomp core/org.eclipse.ptp.proxy/include/proxy.h core/org.eclipse.ptp.proxy/include/proxy_attr.h core/org.eclipse.ptp.proxy/include/proxy_cmd.h core/org.eclipse.ptp.proxy/include/proxy_event.h core/org.eclipse.ptp.proxy/include/proxy_msg.h core/org.eclipse.ptp.proxy/include/proxy_stdio.h core/org.eclipse.ptp.proxy/include/proxy_tcp.h core/org.eclipse.ptp.proxy/install-sh core/org.eclipse.ptp.proxy/ltmain.sh core/org.eclipse.ptp.proxy/missing core/org.eclipse.ptp.proxy/plugin.properties core/org.eclipse.ptp.proxy/src/proxy.c core/org.eclipse.ptp.proxy/src/proxy_attr.c core/org.eclipse.ptp.proxy/src/proxy_clnt.c core/org.eclipse.ptp.proxy/src/proxy_event.c core/org.eclipse.ptp.proxy/src/proxy_msg.c core/org.eclipse.ptp.proxy/src/proxy_stdio.c core/org.eclipse.ptp.proxy/src/proxy_stdio_svr.c core/org.eclipse.ptp.proxy/src/proxy_svr.c core/org.eclipse.ptp.proxy/src/proxy_tcp.c core/org.eclipse.ptp.proxy/src/proxy_tcp_clnt.c core/org.eclipse.ptp.proxy/src/proxy_tcp_svr.c core/org.eclipse.ptp.remote.remotetools.core/.classpath core/org.eclipse.ptp.remote.remotetools.core/.project core/org.eclipse.ptp.remote.remotetools.core/META-INF/MANIFEST.MF core/org.eclipse.ptp.remote.remotetools.core/about.html core/org.eclipse.ptp.remote.remotetools.core/about.ini core/org.eclipse.ptp.remote.remotetools.core/about.mappings core/org.eclipse.ptp.remote.remotetools.core/about.properties core/org.eclipse.ptp.remote.remotetools.core/build.properties core/org.eclipse.ptp.remote.remotetools.core/eclipse32.png core/org.eclipse.ptp.remote.remotetools.core/plugin.properties core/org.eclipse.ptp.remote.remotetools.core/plugin.xml core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsAdapterCorePlugin.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnection.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnectionManager.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileManager.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileStore.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileSystem.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcess.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcessBuilder.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServices.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServicesFactory.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/ConfigFactory.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/PTPTargetControl.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/TargetConfig.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/AttributeNames.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/DefaultValues.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/attribute_names.properties core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/defaults.properties core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/Messages.java core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/messages.properties core/org.eclipse.ptp.remote.remotetools.ui/.classpath core/org.eclipse.ptp.remote.remotetools.ui/.project core/org.eclipse.ptp.remote.remotetools.ui/.settings/org.eclipse.jdt.core.prefs core/org.eclipse.ptp.remote.remotetools.ui/META-INF/MANIFEST.MF core/org.eclipse.ptp.remote.remotetools.ui/about.html core/org.eclipse.ptp.remote.remotetools.ui/build.properties core/org.eclipse.ptp.remote.remotetools.ui/plugin.properties core/org.eclipse.ptp.remote.remotetools.ui/plugin.xml core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/Activator.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsFileSystemContributor.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIConnectionManager.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIFileManager.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServices.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServicesFactory.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/ConfigurationPage.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Environment.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Messages.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/messages.properties core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/Messages.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferenceInitializer.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferencePage.java core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/messages.properties core/org.eclipse.ptp.ui/.classpath core/org.eclipse.ptp.ui/.cvsignore core/org.eclipse.ptp.ui/.options core/org.eclipse.ptp.ui/.project core/org.eclipse.ptp.ui/META-INF/MANIFEST.MF core/org.eclipse.ptp.ui/about.html core/org.eclipse.ptp.ui/build.properties core/org.eclipse.ptp.ui/icons/abort_disable.gif core/org.eclipse.ptp.ui/icons/abort_hover.gif core/org.eclipse.ptp.ui/icons/abort_normal.gif core/org.eclipse.ptp.ui/icons/c_app.gif core/org.eclipse.ptp.ui/icons/environment_tab.gif core/org.eclipse.ptp.ui/icons/exit_disable.gif core/org.eclipse.ptp.ui/icons/exit_hover.gif core/org.eclipse.ptp.ui/icons/exit_normal.gif core/org.eclipse.ptp.ui/icons/icon_terminate_all.gif core/org.eclipse.ptp.ui/icons/job/debug_job_error.gif core/org.eclipse.ptp.ui/icons/job/debug_job_pending.gif core/org.eclipse.ptp.ui/icons/job/debug_job_running.gif core/org.eclipse.ptp.ui/icons/job/debug_job_started.gif core/org.eclipse.ptp.ui/icons/job/debug_job_suspended.gif core/org.eclipse.ptp.ui/icons/job/debug_job_terminated.gif core/org.eclipse.ptp.ui/icons/job/debug_job_unknown.gif core/org.eclipse.ptp.ui/icons/job/job_error.gif core/org.eclipse.ptp.ui/icons/job/job_pending.gif core/org.eclipse.ptp.ui/icons/job/job_running.gif core/org.eclipse.ptp.ui/icons/job/job_started.gif core/org.eclipse.ptp.ui/icons/job/job_suspended.gif core/org.eclipse.ptp.ui/icons/job/job_terminated.gif core/org.eclipse.ptp.ui/icons/job/job_unknown.gif core/org.eclipse.ptp.ui/icons/legend.gif core/org.eclipse.ptp.ui/icons/machine/machine_alert.gif core/org.eclipse.ptp.ui/icons/machine/machine_down.gif core/org.eclipse.ptp.ui/icons/machine/machine_error.gif core/org.eclipse.ptp.ui/icons/machine/machine_unknown.gif core/org.eclipse.ptp.ui/icons/machine/machine_up.gif core/org.eclipse.ptp.ui/icons/node/node_alloc_other.gif core/org.eclipse.ptp.ui/icons/node/node_alloc_other_sel.gif core/org.eclipse.ptp.ui/icons/node/node_alloc_user.gif core/org.eclipse.ptp.ui/icons/node/node_alloc_user_sel.gif core/org.eclipse.ptp.ui/icons/node/node_down.gif core/org.eclipse.ptp.ui/icons/node/node_down_sel.gif core/org.eclipse.ptp.ui/icons/node/node_error.gif core/org.eclipse.ptp.ui/icons/node/node_error_sel.gif core/org.eclipse.ptp.ui/icons/node/node_exited.gif core/org.eclipse.ptp.ui/icons/node/node_exited_sel.gif core/org.eclipse.ptp.ui/icons/node/node_other_excl.gif core/org.eclipse.ptp.ui/icons/node/node_other_excl_sel.gif core/org.eclipse.ptp.ui/icons/node/node_other_shared.gif core/org.eclipse.ptp.ui/icons/node/node_other_shared_sel.gif core/org.eclipse.ptp.ui/icons/node/node_running.gif core/org.eclipse.ptp.ui/icons/node/node_running_sel.gif core/org.eclipse.ptp.ui/icons/node/node_unknown.gif core/org.eclipse.ptp.ui/icons/node/node_unknown_sel.gif core/org.eclipse.ptp.ui/icons/node/node_up.gif core/org.eclipse.ptp.ui/icons/node/node_up_sel.gif core/org.eclipse.ptp.ui/icons/node/node_user_excl.gif core/org.eclipse.ptp.ui/icons/node/node_user_excl_sel.gif core/org.eclipse.ptp.ui/icons/node/node_user_shared.gif core/org.eclipse.ptp.ui/icons/node/node_user_shared_sel.gif core/org.eclipse.ptp.ui/icons/parallel.gif core/org.eclipse.ptp.ui/icons/parallel_perspective.gif core/org.eclipse.ptp.ui/icons/process/proc_error.gif core/org.eclipse.ptp.ui/icons/process/proc_error_sel.gif core/org.eclipse.ptp.ui/icons/process/proc_exited.gif core/org.eclipse.ptp.ui/icons/process/proc_exited_sel.gif core/org.eclipse.ptp.ui/icons/process/proc_exited_signal.gif core/org.eclipse.ptp.ui/icons/process/proc_exited_signal_sel.gif core/org.eclipse.ptp.ui/icons/process/proc_running.gif core/org.eclipse.ptp.ui/icons/process/proc_running_sel.gif core/org.eclipse.ptp.ui/icons/process/proc_starting.gif core/org.eclipse.ptp.ui/icons/process/proc_starting_sel.gif core/org.eclipse.ptp.ui/icons/process/proc_suspended.gif core/org.eclipse.ptp.ui/icons/process/proc_suspended_sel.gif core/org.eclipse.ptp.ui/icons/process/proc_unknown.gif core/org.eclipse.ptp.ui/icons/process/proc_unknown_sel.gif core/org.eclipse.ptp.ui/icons/rm/rm_error.gif core/org.eclipse.ptp.ui/icons/rm/rm_started.gif core/org.eclipse.ptp.ui/icons/rm/rm_starting.gif core/org.eclipse.ptp.ui/icons/rm/rm_stopped.gif core/org.eclipse.ptp.ui/icons/rm/rm_stopping.gif core/org.eclipse.ptp.ui/icons/rm/rm_suspended.gif core/org.eclipse.ptp.ui/icons/rm/rm_view.gif core/org.eclipse.ptp.ui/icons/rm/start.gif core/org.eclipse.ptp.ui/icons/rm/stop.gif core/org.eclipse.ptp.ui/icons/search.gif core/org.eclipse.ptp.ui/icons/search_dim.gif core/org.eclipse.ptp.ui/icons/tool/changeset_normal.gif core/org.eclipse.ptp.ui/icons/tool/changeset_normal.png core/org.eclipse.ptp.ui/icons/tool/createset_normal.gif core/org.eclipse.ptp.ui/icons/tool/createset_normal.png core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.gif core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.png core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.gif core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.png core/org.eclipse.ptp.ui/icons/tool/job_focus_disable.gif core/org.eclipse.ptp.ui/icons/tool/job_focus_enable.gif core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_disable.gif core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_normal.gif core/org.eclipse.ptp.ui/icons/tool/remove_terminated_disable.gif core/org.eclipse.ptp.ui/icons/tool/remove_terminated_normal.gif core/org.eclipse.ptp.ui/icons/tool/terminate_job_disable.gif core/org.eclipse.ptp.ui/icons/tool/terminate_job_normal.gif core/org.eclipse.ptp.ui/icons/tool/zoomin_normal.gif core/org.eclipse.ptp.ui/icons/tool/zoomout_normal.gif core/org.eclipse.ptp.ui/icons/viewstatus_disable.gif core/org.eclipse.ptp.ui/icons/viewstatus_hover.gif core/org.eclipse.ptp.ui/icons/viewstatus_normal.gif core/org.eclipse.ptp.ui/plugin.properties core/org.eclipse.ptp.ui/plugin.xml core/org.eclipse.ptp.ui/schema/rmConfigurations.exsd core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/PRunPerspectiveFactory.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/ParallelImages.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ChangeSetAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/CreateSetAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DeleteSetAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DisplayRulerAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/JobFocusAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveAllTerminatedAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveElementAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveSelectedJobAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ShowLegendAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobFromListAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomInAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomOutAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PElementPropertySource.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PJobWorkbenchAdapter.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PMachineWorkbenchAdapter.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PNodeWorkbenchAdapter.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PQueueWorkbenchAdapter.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PropertyAdapterFactory.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerPropertySource.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerWorkbenchAdapter.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/UniverseWorkbenchAdapter.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/WorkbenchAdapterAdapterFactory.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/DefaultInformationControl.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHover.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHoverPresenter.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconTextReader.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/LineBreakingReader.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SingleCharReader.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SubstitutionTextReader.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IManager.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IPTPUIConstants.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/LegendDialog.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/OutputConsole.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/PTPUIPlugin.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessage.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessages.properties core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIUtils.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AbstractResourceManagerSelectionActionDelegate.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AddResourceManagerAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/EditResourceManagerAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoDropDownAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/ParallelAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/RemoveResourceManagersAction.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StartResourceManagersObjectActionDelegate.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StopResourceManagersObjectActionDelegate.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/ConsoleManager.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/JobConsole.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconHoverTag.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconInformationControl.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IJobChangedListener.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IPaintListener.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/ISetListener.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/AbstractUIManager.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/JobManager.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/MachineManager.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/Element.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementHandler.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementSet.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElement.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementHandler.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementSet.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/AbstractPreferencePage.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PTPPreferencesPage.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceInitializer.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.properties core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/RMPreferencesPage.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/ViewerPreferencesPage.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/utils/DebugUtil.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelElementView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelSetView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ElementIconCanvas.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IContentProvider.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IIconCanvasActionListener.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IImageProvider.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IToolTipProvider.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IconCanvas.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/JobsListView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/MachinesNodesView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelJobsView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelMachinesView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelProcessView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ProcessEditorInput.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ResourceManagerView.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizard.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPage.java core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPageFactory.java core/org.eclipse.ptp.ui/template/ctemplate.txt core/org.eclipse.ptp.utils.core/.classpath core/org.eclipse.ptp.utils.core/.project core/org.eclipse.ptp.utils.core/.settings/org.eclipse.jdt.core.prefs core/org.eclipse.ptp.utils.core/META-INF/MANIFEST.MF core/org.eclipse.ptp.utils.core/about.html core/org.eclipse.ptp.utils.core/about.ini core/org.eclipse.ptp.utils.core/about.mappings core/org.eclipse.ptp.utils.core/about.properties core/org.eclipse.ptp.utils.core/build.properties core/org.eclipse.ptp.utils.core/eclipse32.png core/org.eclipse.ptp.utils.core/plugin.properties core/org.eclipse.ptp.utils.core/plugin.xml core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Activator.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/ArgumentParser.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Range.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/RangeSet.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ExtensionPointEnumeration.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/IProcessMemberVisitor.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ProcessExtensions.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileEnumeration.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileRecursiveEnumeration.java core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/linux/ArgumentParser.java core/org.eclipse.ptp.utils.ui/.classpath core/org.eclipse.ptp.utils.ui/.project core/org.eclipse.ptp.utils.ui/.settings/org.eclipse.jdt.core.prefs core/org.eclipse.ptp.utils.ui/META-INF/MANIFEST.MF core/org.eclipse.ptp.utils.ui/about.html core/org.eclipse.ptp.utils.ui/build.properties core/org.eclipse.ptp.utils.ui/plugin.properties core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/Activator.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/ImageImageDescriptor.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/PixelConverter.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrame.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMoldMessages.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroup.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroupItem.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ControlsRelationshipHandler.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/DirectoryButtonSelectionListener.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceGroup.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileButtonSelectionListener.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileGroup.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemToTreeMapper.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemTreeNode.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Frame.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FrameMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlGroup.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/LayoutDefinitions.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Messages.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SWTUtil.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerGroup.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextGroup.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextMold.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ToolKit.java core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/auth_frame_messages.properties core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/messages.properties core/org.eclipse.ptp.utils/.cdtproject core/org.eclipse.ptp.utils/.cproject core/org.eclipse.ptp.utils/.cvsignore core/org.eclipse.ptp.utils/.project core/org.eclipse.ptp.utils/.settings/org.eclipse.cdt.core.prefs core/org.eclipse.ptp.utils/AUTHORS core/org.eclipse.ptp.utils/COPYING core/org.eclipse.ptp.utils/ChangeLog core/org.eclipse.ptp.utils/INSTALL core/org.eclipse.ptp.utils/META-INF/MANIFEST.MF core/org.eclipse.ptp.utils/Makefile.am core/org.eclipse.ptp.utils/Makefile.in core/org.eclipse.ptp.utils/NEWS core/org.eclipse.ptp.utils/README core/org.eclipse.ptp.utils/about.html core/org.eclipse.ptp.utils/aclocal.m4 core/org.eclipse.ptp.utils/build.properties core/org.eclipse.ptp.utils/compile core/org.eclipse.ptp.utils/config.guess core/org.eclipse.ptp.utils/config.h.in core/org.eclipse.ptp.utils/config.sub core/org.eclipse.ptp.utils/configure core/org.eclipse.ptp.utils/configure.in core/org.eclipse.ptp.utils/depcomp core/org.eclipse.ptp.utils/include/args.h core/org.eclipse.ptp.utils/include/bitset.h core/org.eclipse.ptp.utils/include/compat.h core/org.eclipse.ptp.utils/include/handler.h core/org.eclipse.ptp.utils/include/hash.h core/org.eclipse.ptp.utils/include/list.h core/org.eclipse.ptp.utils/include/rangeset.h core/org.eclipse.ptp.utils/include/serdes.h core/org.eclipse.ptp.utils/install-sh core/org.eclipse.ptp.utils/ltmain.sh core/org.eclipse.ptp.utils/missing core/org.eclipse.ptp.utils/plugin.properties core/org.eclipse.ptp.utils/src/args.c core/org.eclipse.ptp.utils/src/args_test.c core/org.eclipse.ptp.utils/src/bitset.c core/org.eclipse.ptp.utils/src/bitset_test.c core/org.eclipse.ptp.utils/src/compat.c core/org.eclipse.ptp.utils/src/handler.c core/org.eclipse.ptp.utils/src/hash.c core/org.eclipse.ptp.utils/src/list.c core/org.eclipse.ptp.utils/src/rangeset.c core/org.eclipse.ptp.utils/src/rangeset_test.c core/org.eclipse.ptp.utils/src/serdes.c debug/org.eclipse.ptp.debug.core/.classpath debug/org.eclipse.ptp.debug.core/.cvsignore debug/org.eclipse.ptp.debug.core/.project debug/org.eclipse.ptp.debug.core/.settings/org.eclipse.jdt.ui.prefs debug/org.eclipse.ptp.debug.core/META-INF/MANIFEST.MF debug/org.eclipse.ptp.debug.core/about.html debug/org.eclipse.ptp.debug.core/build.properties debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIAddressLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIBreakpointManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDICondition.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIDebugger.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIExecuteManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFileLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFormat.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFunctionLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILineLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocator.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIMemoryBlockManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISession.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISessionObject.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISet.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISignalManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIStackframeManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIThreadManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDITraceSnapshot.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIVariableManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIException.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIInternalException.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDILocationFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/Session.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/SessionObject.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/AbstractEventFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIBreakpointInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIChangedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIConnectedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDICreatedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDataReadMemoryInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDestroyedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDisconnectedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEndSteppingRangeInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventListener.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIExitInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIFunctionFinishedInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDILocationReachedInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIMemoryBlockInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRegisterInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRestartedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIResumedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISharedLibraryInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISignalInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIStartedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISuspendedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIThreadInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIVariableInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointScopeInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointTriggerInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractEventManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractManagerFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIBreakpointManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventRequestManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIExpressionManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManagerFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIMemoryManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIRegisterManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISignalManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISourceManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITargetManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITaskManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIThreadManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITraceManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIVariableManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/AbstractModelFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIAddressBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgument.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgumentDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExceptionpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExpression.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIFunctionBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariable.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariableDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIInstruction.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILineBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariable.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariableDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocationBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemoryBlock.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMixedInstruction.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIModelFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMultiExpressions.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegister.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterGroup.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRuntimeOptions.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibrary.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibraryManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignal.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignalDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISourceManagement.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrame.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrameDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITarget.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITargetExpression.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThread.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadGroup.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorage.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorageDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITracepoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariable.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariableDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIWatchpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFException.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIF.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFType.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeAddress.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeArray.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeBool.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeChar.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeCharPointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeClass.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeEnum.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFloat.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFunction.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeInt.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLong.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLongLong.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeNamed.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypePointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeRange.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeReference.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeShort.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeString.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeStruct.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeUnion.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeVoid.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValue.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueAddress.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueArray.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueBool.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueChar.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueCharPointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueClass.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueEnum.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFloat.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFunction.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueInt.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueNamed.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValuePointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueReference.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueString.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueStruct.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueUnion.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeAggregate.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeDerived.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeIntegral.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueAggregate.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueDerived.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueIntegral.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueParent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataEvaluateExpressionRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataReadMemoryRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventResultRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetAIFRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetInfoThreadsRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetPartialAIFRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetStackInfoDepthRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListArgumentsRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListLocalVariablesRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListSignalsRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListStackFramesRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractRequestFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetCurrentStackFrameRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetThreadSelectRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDICommandRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConditionBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConnectionRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataEvaluateExpressionRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataReadMemoryRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataWriteMemoryRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteVariableRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDisableBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEnableBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEvaluateExpressionRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEventRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetAIFRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetInfoThreadsRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetPartialAIFRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetStackInfoDepthRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetVariableTypeRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGoRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIHaltRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIInternalEventRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListArgumentsRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListGlobalVariablesRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListLocalVariablesRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListSignalsRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListStackFramesRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRequestFactory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRestartRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetAddressBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetCurrentStackFrameRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetFunctionBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetLineBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetThreadSelectRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetWatchpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStartDebuggerRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepFinishRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoInstructionRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverInstructionRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStopDebuggerRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDITerminateRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/AddressLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FileLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FunctionLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/LineLocation.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Location.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Locator.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIF.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFType.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeAddress.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeArray.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeBool.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeChar.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeCharPointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeClass.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeEnum.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeField.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFloat.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFunction.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeIncomplete.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeInt.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeNamed.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypePointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeReference.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeString.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeStruct.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeUnion.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeVoid.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValue.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueAddress.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueArray.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueBool.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueChar.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueCharPointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueClass.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueEnum.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFloat.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFunction.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueInt.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueNamed.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValuePointer.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueReference.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueString.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueStruct.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnion.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnknown.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueVoid.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeAggregate.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeDerived.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeIntegral.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueAggregate.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueDerived.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueIntegral.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueParent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/AbstractEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/BreakpointInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ChangedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ConnectedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/CreatedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DataReadMemoryInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DestroyedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DisconnectedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/EndSteppingRangeInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ExitInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/LocationReachedInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/MemoryBlockInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/RestartedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ResumedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SignalInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/StartedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SuspendedEvent.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ThreadInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/VariableInfo.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/AbstractPDIManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/BreakpointManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/EventRequestManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ExpressionManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/MemoryManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.properties debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/RegisterManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SignalManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SourceManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TargetManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TaskManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ThreadManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/VariableManager.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/AddressBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Argument.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ArgumentDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Breakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Condition.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Exceptionpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Expression.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/FunctionBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariable.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariableDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LineBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariable.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariableDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocationBreakpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Memory.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MemoryBlock.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MultiExpressions.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Register.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/RegisterDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Signal.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/SignalDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrame.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrameDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Target.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Thread.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorage.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorageDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Variable.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/VariableDescriptor.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Watchpoint.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/BreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/CommandRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DataWriteMemoryRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteVariableRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DisableBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/EnableBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/ResumeRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetAddressBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetFunctionBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetLineBreakpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetWatchpointRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StartDebuggerRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepFinishRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepIntoRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepOverRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StopDebuggerRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SuspendRequest.java debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/TerminateRequest.java debug/org.eclipse.ptp.debug.core/plugin.properties debug/org.eclipse.ptp.debug.core/plugin.xml debug/org.eclipse.ptp.debug.core/schema/parallelDebuggers.exsd debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.properties debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugJobStorage.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ExtFormat.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPBreakpointManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConfiguration.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConstants.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugEventListener.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugger.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPMemoryManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPRegisterManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSession.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSetManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSignalManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugModel.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugUtils.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PTPDebugCorePlugin.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ProcessInputStream.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugBreakpointInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugErrorInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugEvent.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugExitInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugRegisterInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugSuspendInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugValueInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugBreakpointInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugErrorInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugEvent.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugExitInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugRegisterInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugSuspendInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/IPLaunch.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/PLaunch.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IEnableDisableTarget.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IExecFileInfo.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IFormatSupport.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToAddress.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToLine.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAIF.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAddressBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElement.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElementStatus.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugTarget.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDummyStackFrame.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPFunctionBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariable.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariableDescriptor.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPLineBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPModule.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPPersistableRegisterGroup.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegister.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegisterDescriptor.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPSignal.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPStackFrame.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPThread.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPValue.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPVariable.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPWatchpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRestart.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IResumeWithoutSignal.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToAddress.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToLine.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ISteppingModeTarget.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ITargetProperties.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PDebugElementState.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PVariableFormat.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/AbsolutePathSourceContainer.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IDirectorySourceLocation.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocation.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocator.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLookupDirector.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IProjectSourceLocation.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/ISourceLookupChangeListener.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/MappingSourceContainer.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/PSourceLookupDirector.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupFactory.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.properties debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.properties debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PBreakpointManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PDebugConfiguration.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PMemoryManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PRegisterManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSession.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSessionManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSetManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSignalManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PreferenceInitializer.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/AbstractLineBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.properties debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PAddressBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PFunctionBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PLineBreakpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PWatchpoint.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPValue.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPVariable.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.properties debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugElement.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugTarget.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDummyStackFrame.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PExpression.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PFloatingPointValue.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalValue.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalVariable.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PIndexedValue.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PLocalVariable.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PMemoryBlockExtension.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegister.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterDescriptor.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterGroup.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PSignal.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PStackFrame.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PThread.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValue.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValueFactory.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariable.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariableFactory.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.properties debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainer.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MappingSourceContainerType.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainer.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainerType.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceLocation.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PProjectSourceLocation.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLocator.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLookupParticipant.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceManager.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceNotFoundElement.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourcePathComputerDelegate.java debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/SourceUtils.java debug/org.eclipse.ptp.debug.sdm.core/.classpath debug/org.eclipse.ptp.debug.sdm.core/.cvsignore debug/org.eclipse.ptp.debug.sdm.core/.options debug/org.eclipse.ptp.debug.sdm.core/.project debug/org.eclipse.ptp.debug.sdm.core/META-INF/MANIFEST.MF debug/org.eclipse.ptp.debug.sdm.core/about.html debug/org.eclipse.ptp.debug.sdm.core/about.ini debug/org.eclipse.ptp.debug.sdm.core/about.mappings debug/org.eclipse.ptp.debug.sdm.core/about.properties debug/org.eclipse.ptp.debug.sdm.core/build.properties debug/org.eclipse.ptp.debug.sdm.core/eclipse32.png debug/org.eclipse.ptp.debug.sdm.core/plugin.properties debug/org.eclipse.ptp.debug.sdm.core/plugin.xml debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/PreferenceInitializer.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugCorePlugin.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventFactory.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventManager.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMManagerFactory.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMModelFactory.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMPreferenceConstants.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRequestFactory.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRunner.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/ISDMErrorCodes.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/PDIDebugger.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataEvaluateExpressionRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataReadMemoryRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetAIFRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetInfoThreadsRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetPartialAIFRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetStackInfoDepthRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListArgumentsRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListLocalVariablesRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListSignalsRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListStackFramesRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetCurrentStackFrameRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetThreadSelectRequest.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/proxy/ProxyDebugClient.java debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/utils/DebugUtil.java debug/org.eclipse.ptp.debug.sdm.ui/.classpath debug/org.eclipse.ptp.debug.sdm.ui/.cvsignore debug/org.eclipse.ptp.debug.sdm.ui/.project debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF debug/org.eclipse.ptp.debug.sdm.ui/about.html debug/org.eclipse.ptp.debug.sdm.ui/build.properties debug/org.eclipse.ptp.debug.sdm.ui/plugin.properties debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.java debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.properties debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/SDMPage.java debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.java debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.properties debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/SDMPreferencePage.java debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/ui/SDMDebugUIPlugin.java debug/org.eclipse.ptp.debug.sdm/.cdtproject debug/org.eclipse.ptp.debug.sdm/.cproject debug/org.eclipse.ptp.debug.sdm/.cvsignore debug/org.eclipse.ptp.debug.sdm/.project debug/org.eclipse.ptp.debug.sdm/.settings/org.eclipse.cdt.core.prefs debug/org.eclipse.ptp.debug.sdm/AUTHORS debug/org.eclipse.ptp.debug.sdm/COPYING debug/org.eclipse.ptp.debug.sdm/ChangeLog debug/org.eclipse.ptp.debug.sdm/INSTALL debug/org.eclipse.ptp.debug.sdm/META-INF/MANIFEST.MF debug/org.eclipse.ptp.debug.sdm/Makefile.am debug/org.eclipse.ptp.debug.sdm/Makefile.in debug/org.eclipse.ptp.debug.sdm/NEWS debug/org.eclipse.ptp.debug.sdm/README debug/org.eclipse.ptp.debug.sdm/about.html debug/org.eclipse.ptp.debug.sdm/acinclude.m4 debug/org.eclipse.ptp.debug.sdm/aclocal.m4 debug/org.eclipse.ptp.debug.sdm/autogen.sh debug/org.eclipse.ptp.debug.sdm/build.properties debug/org.eclipse.ptp.debug.sdm/compile debug/org.eclipse.ptp.debug.sdm/config.guess debug/org.eclipse.ptp.debug.sdm/config.h.in debug/org.eclipse.ptp.debug.sdm/config.sub debug/org.eclipse.ptp.debug.sdm/configure debug/org.eclipse.ptp.debug.sdm/configure.in debug/org.eclipse.ptp.debug.sdm/depcomp debug/org.eclipse.ptp.debug.sdm/include/backend.h debug/org.eclipse.ptp.debug.sdm/include/breakpoint.h debug/org.eclipse.ptp.debug.sdm/include/dbg.h debug/org.eclipse.ptp.debug.sdm/include/dbg_client.h debug/org.eclipse.ptp.debug.sdm/include/dbg_error.h debug/org.eclipse.ptp.debug.sdm/include/dbg_event.h debug/org.eclipse.ptp.debug.sdm/include/dbg_proxy.h debug/org.eclipse.ptp.debug.sdm/include/helloproto.h debug/org.eclipse.ptp.debug.sdm/include/itimer.h debug/org.eclipse.ptp.debug.sdm/include/location.h debug/org.eclipse.ptp.debug.sdm/include/memoryinfo.h debug/org.eclipse.ptp.debug.sdm/include/routing_table.h debug/org.eclipse.ptp.debug.sdm/include/sdm.h debug/org.eclipse.ptp.debug.sdm/include/session.h debug/org.eclipse.ptp.debug.sdm/include/signalinfo.h debug/org.eclipse.ptp.debug.sdm/include/stackframe.h debug/org.eclipse.ptp.debug.sdm/install-sh debug/org.eclipse.ptp.debug.sdm/jni/.cvsignore debug/org.eclipse.ptp.debug.sdm/jni/dbg_jni.c debug/org.eclipse.ptp.debug.sdm/jni/make_macosx.mak debug/org.eclipse.ptp.debug.sdm/libaif/.cvsignore debug/org.eclipse.ptp.debug.sdm/libaif/AUTHORS debug/org.eclipse.ptp.debug.sdm/libaif/CHANGES debug/org.eclipse.ptp.debug.sdm/libaif/COPYING debug/org.eclipse.ptp.debug.sdm/libaif/ChangeLog debug/org.eclipse.ptp.debug.sdm/libaif/INSTALL debug/org.eclipse.ptp.debug.sdm/libaif/INTERNAL debug/org.eclipse.ptp.debug.sdm/libaif/LICENCE debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.am debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.in debug/org.eclipse.ptp.debug.sdm/libaif/NEWS debug/org.eclipse.ptp.debug.sdm/libaif/README debug/org.eclipse.ptp.debug.sdm/libaif/aclocal.m4 debug/org.eclipse.ptp.debug.sdm/libaif/aif.c debug/org.eclipse.ptp.debug.sdm/libaif/aif.h debug/org.eclipse.ptp.debug.sdm/libaif/aif.x debug/org.eclipse.ptp.debug.sdm/libaif/aiferr.h debug/org.eclipse.ptp.debug.sdm/libaif/aifint.h debug/org.eclipse.ptp.debug.sdm/libaif/array.c debug/org.eclipse.ptp.debug.sdm/libaif/calc.c debug/org.eclipse.ptp.debug.sdm/libaif/cf/misc.m4 debug/org.eclipse.ptp.debug.sdm/libaif/cmp.c debug/org.eclipse.ptp.debug.sdm/libaif/compile debug/org.eclipse.ptp.debug.sdm/libaif/config.h.in debug/org.eclipse.ptp.debug.sdm/libaif/configure debug/org.eclipse.ptp.debug.sdm/libaif/configure.in debug/org.eclipse.ptp.debug.sdm/libaif/conv.c debug/org.eclipse.ptp.debug.sdm/libaif/depcomp debug/org.eclipse.ptp.debug.sdm/libaif/doc/.cvsignore debug/org.eclipse.ptp.debug.sdm/libaif/doc/Makefile.in debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.txt debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.xml debug/org.eclipse.ptp.debug.sdm/libaif/error.c debug/org.eclipse.ptp.debug.sdm/libaif/exclude debug/org.eclipse.ptp.debug.sdm/libaif/fds.c debug/org.eclipse.ptp.debug.sdm/libaif/fds.h debug/org.eclipse.ptp.debug.sdm/libaif/install-sh debug/org.eclipse.ptp.debug.sdm/libaif/io.c debug/org.eclipse.ptp.debug.sdm/libaif/libaif.spec debug/org.eclipse.ptp.debug.sdm/libaif/missing debug/org.eclipse.ptp.debug.sdm/libaif/mkinstalldirs debug/org.eclipse.ptp.debug.sdm/libaif/patches/applypatch debug/org.eclipse.ptp.debug.sdm/libaif/patches/createpatch debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-2002-08-11-cvs.patch debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.0.patch debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.2.patch debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-rh5.2.1-4.patch debug/org.eclipse.ptp.debug.sdm/libaif/print.c debug/org.eclipse.ptp.debug.sdm/libaif/struct.c debug/org.eclipse.ptp.debug.sdm/libaif/testaif.c debug/org.eclipse.ptp.debug.sdm/libaif/testaif.h debug/org.eclipse.ptp.debug.sdm/libaif/util.c debug/org.eclipse.ptp.debug.sdm/libaif/version.h debug/org.eclipse.ptp.debug.sdm/ltmain.sh debug/org.eclipse.ptp.debug.sdm/missing debug/org.eclipse.ptp.debug.sdm/plugin.properties debug/org.eclipse.ptp.debug.sdm/src/client/.cvsignore debug/org.eclipse.ptp.debug.sdm/src/client/client.c debug/org.eclipse.ptp.debug.sdm/src/client/client_cmds.c debug/org.eclipse.ptp.debug.sdm/src/client/client_interface.c debug/org.eclipse.ptp.debug.sdm/src/client/startup.c debug/org.eclipse.ptp.debug.sdm/src/impl/.cvsignore debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_aggregate_hash.c debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_hello_proto.c debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_ompi.c debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_tcpip.c debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_route_tree.c debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_routing_table_file.c debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_set_bitset.c debug/org.eclipse.ptp.debug.sdm/src/mi/.cvsignore debug/org.eclipse.ptp.debug.sdm/src/mi/CLICommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.c debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.h debug/org.eclipse.ptp.debug.sdm/src/mi/MI.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakCommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.h debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIExecCommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIGDBCommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemoryCommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIParser.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.h debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.c debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIStackCommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIThreadCommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.c debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.h debug/org.eclipse.ptp.debug.sdm/src/mi/MIVarCommand.c debug/org.eclipse.ptp.debug.sdm/src/mi/test.input debug/org.eclipse.ptp.debug.sdm/src/mi/test_mi.c debug/org.eclipse.ptp.debug.sdm/src/server/.cvsignore debug/org.eclipse.ptp.debug.sdm/src/server/backend.c debug/org.eclipse.ptp.debug.sdm/src/server/gdbmi_backend.c debug/org.eclipse.ptp.debug.sdm/src/server/server.c debug/org.eclipse.ptp.debug.sdm/src/server/server_cmds.c debug/org.eclipse.ptp.debug.sdm/src/server/test_backend.c debug/org.eclipse.ptp.debug.sdm/src/test/.cvsignore debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy.c debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_clnt.c debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_rev.c debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_svr.c debug/org.eclipse.ptp.debug.sdm/src/utils/.cvsignore debug/org.eclipse.ptp.debug.sdm/src/utils/breakpoint.c debug/org.eclipse.ptp.debug.sdm/src/utils/debug.c debug/org.eclipse.ptp.debug.sdm/src/utils/error.c debug/org.eclipse.ptp.debug.sdm/src/utils/event.c debug/org.eclipse.ptp.debug.sdm/src/utils/itimer.c debug/org.eclipse.ptp.debug.sdm/src/utils/memoryinfo.c debug/org.eclipse.ptp.debug.sdm/src/utils/signalinfo.c debug/org.eclipse.ptp.debug.sdm/src/utils/stackframe.c debug/org.eclipse.ptp.debug.ui/.classpath debug/org.eclipse.ptp.debug.ui/.cvsignore debug/org.eclipse.ptp.debug.ui/.project debug/org.eclipse.ptp.debug.ui/.settings/org.eclipse.jdt.ui.prefs debug/org.eclipse.ptp.debug.ui/META-INF/MANIFEST.MF debug/org.eclipse.ptp.debug.ui/about.html debug/org.eclipse.ptp.debug.ui/build.properties debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr.gif debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr_disabled.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.png debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.png debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.png debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.png debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.png debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.gif debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.png debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr.gif debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr_disabled.gif debug/org.eclipse.ptp.debug.ui/icons/debug/cur_set_ip.gif debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr.gif debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr_disabled.gif debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr.gif debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr_disabled.gif debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr.gif debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr_disabled.gif debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.gif debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.png debug/org.eclipse.ptp.debug.ui/icons/debug/reg_cur_ip.gif debug/org.eclipse.ptp.debug.ui/icons/debug/reg_sec_ip.gif debug/org.eclipse.ptp.debug.ui/icons/debug/set_ip.gif debug/org.eclipse.ptp.debug.ui/icons/process/error.gif debug/org.eclipse.ptp.debug.ui/icons/process/error_sel.gif debug/org.eclipse.ptp.debug.ui/icons/process/running.gif debug/org.eclipse.ptp.debug.ui/icons/process/running_sel.gif debug/org.eclipse.ptp.debug.ui/icons/process/started.gif debug/org.eclipse.ptp.debug.ui/icons/process/started_sel.gif debug/org.eclipse.ptp.debug.ui/icons/process/stopped.gif debug/org.eclipse.ptp.debug.ui/icons/process/stopped_sel.gif debug/org.eclipse.ptp.debug.ui/icons/process/suspended.gif debug/org.eclipse.ptp.debug.ui/icons/process/suspended_sel.gif debug/org.eclipse.ptp.debug.ui/icons/ptparrayview.gif debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.gif debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.png debug/org.eclipse.ptp.debug.ui/icons/ptpvariableview.gif debug/org.eclipse.ptp.debug.ui/icons/signals_view.gif debug/org.eclipse.ptp.debug.ui/icons/tool/add_variable_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.png debug/org.eclipse.ptp.debug.ui/icons/tool/restart_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/restart_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/resume_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/resume_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_disable.gif debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.png debug/org.eclipse.ptp.debug.ui/icons/tool/var_add_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/var_compare_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/var_delete_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/var_edit_normal.gif debug/org.eclipse.ptp.debug.ui/icons/tool/var_refresh_normal.gif debug/org.eclipse.ptp.debug.ui/plugin.properties debug/org.eclipse.ptp.debug.ui/plugin.xml debug/org.eclipse.ptp.debug.ui/schema/debuggerConfigurations.exsd debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/AnnotationGroup.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/BreakpointImageProvider.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageCache.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageDescriptor.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PAnnotationManager.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugImage.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugModelPresentation.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIUtils.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation2.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PJobVariableManager.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PTPDebugPerspectiveFactory.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PValueDetailProvider.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PVariableManager.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PWatchExpressionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PixelConverter.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/SWTUtil.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/UIDebugManager.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractBreakpointRulerAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractDebugActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractListenerActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddPExpressionAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddVariableAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/CompareValueAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DebugAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DeletePExpressionAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DisableVariablesActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EditPExpressionAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableVariablesActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/GotoSet.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/IResumeAtLineTarget.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ManageBreakpointRulerActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RegisterAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RestartActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineAdapter.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetResumeAtLineAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargettableActionAdapterFactory.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RunToLineAdapter.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ShowFullPathsAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalPropertiesActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalZeroWorkbenchActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepIntoAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepOverAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepReturnAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SuspendAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/TerminateAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointAdapter.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointRulerAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UnregisterAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UpdatePExpressionAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ViewFilterAction.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/DialogField.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/IDialogFieldListener.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/SelectionButtonDialogField.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/ArrayVariableDialog.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/RangeDialog.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/VariableDialog.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/editors/PDebugTextHover.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PDebugPreferencePage.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPreferenceStore.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPropertyPage.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/SignalPropertyPage.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/PathMappingDialog.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractCTableCellEditor.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandler.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandlerView.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractPDebugViewEventHandler.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTable.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableCellRenderer.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableComboCellEditor.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableTextCellEditor.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellResizeListener.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellSelectionListener.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableModel.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabFolder.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabItem.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/AbstractArrayTableModel.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayTabItem.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayView.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayViewEventHandler.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/breakpoints/PBreakpointSetOrganizer.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsView.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewContentProvider.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewEventHandler.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewer.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/ICheckProvider.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableCheckboxTableViewer.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableContentProvider.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableDialog.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableLabelProvider.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.properties debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableView.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewEventHandler.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewerSorter.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/IPTPDebugUIConstants.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PTPDebugUIPlugin.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PreferencesAdapter.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/DebugActionEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IDebugActionEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IResumedDebugEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ISuspendedDebugEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ITerminatedDebugEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ResumedDebugEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/SuspendedDebugEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/TerminatedDebugEvent.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IDebugActionUpdateListener.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IRegListener.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/sourcelookup/DefaultSourceLocator.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugView.java debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugViewEventHandler.java rdt/org.eclipse.ptp.rdt.ui.tests/.classpath rdt/org.eclipse.ptp.rdt.ui.tests/.project rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF rdt/org.eclipse.ptp.rdt.ui.tests/build.properties rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java releng/org.eclipse.ptp-feature/.project releng/org.eclipse.ptp-feature/build.properties releng/org.eclipse.ptp-feature/eclipse_update_120.jpg releng/org.eclipse.ptp-feature/epl-v10.html releng/org.eclipse.ptp-feature/feature.properties releng/org.eclipse.ptp-feature/feature.xml releng/org.eclipse.ptp-feature/license.html releng/org.eclipse.ptp.aix.ppc/.project releng/org.eclipse.ptp.aix.ppc/BUILD releng/org.eclipse.ptp.aix.ppc/META-INF/MANIFEST.MF releng/org.eclipse.ptp.aix.ppc/about.html releng/org.eclipse.ptp.aix.ppc/bin/README releng/org.eclipse.ptp.aix.ppc/build.properties releng/org.eclipse.ptp.aix.ppc/fragment.xml releng/org.eclipse.ptp.core-feature/.project releng/org.eclipse.ptp.core-feature/build.properties releng/org.eclipse.ptp.core-feature/epl-v10.html releng/org.eclipse.ptp.core-feature/feature.properties releng/org.eclipse.ptp.core-feature/feature.xml releng/org.eclipse.ptp.core-feature/license.html releng/org.eclipse.ptp.etfw-feature/.project releng/org.eclipse.ptp.etfw-feature/build.properties releng/org.eclipse.ptp.etfw-feature/epl-v10.html releng/org.eclipse.ptp.etfw-feature/feature.properties releng/org.eclipse.ptp.etfw-feature/feature.xml releng/org.eclipse.ptp.etfw-feature/license.html releng/org.eclipse.ptp.etfw.tau-feature/.project releng/org.eclipse.ptp.etfw.tau-feature/build.properties releng/org.eclipse.ptp.etfw.tau-feature/epl-v10.html releng/org.eclipse.ptp.etfw.tau-feature/feature.properties releng/org.eclipse.ptp.etfw.tau-feature/feature.xml releng/org.eclipse.ptp.etfw.tau-feature/license.html releng/org.eclipse.ptp.etfw.tau.fortran-feature/.project releng/org.eclipse.ptp.etfw.tau.fortran-feature/build.properties releng/org.eclipse.ptp.etfw.tau.fortran-feature/epl-v10.html releng/org.eclipse.ptp.etfw.tau.fortran-feature/feature.properties releng/org.eclipse.ptp.etfw.tau.fortran-feature/feature.xml releng/org.eclipse.ptp.etfw.tau.fortran-feature/license.html releng/org.eclipse.ptp.external-feature/.project releng/org.eclipse.ptp.external-feature/build.properties releng/org.eclipse.ptp.external-feature/epl-v10.html releng/org.eclipse.ptp.external-feature/feature.properties releng/org.eclipse.ptp.external-feature/feature.xml releng/org.eclipse.ptp.external-feature/license.html releng/org.eclipse.ptp.linux.ppc/.project releng/org.eclipse.ptp.linux.ppc/BUILD releng/org.eclipse.ptp.linux.ppc/META-INF/MANIFEST.MF releng/org.eclipse.ptp.linux.ppc/about.html releng/org.eclipse.ptp.linux.ppc/bin/.cvsignore releng/org.eclipse.ptp.linux.ppc/bin/README releng/org.eclipse.ptp.linux.ppc/build.properties releng/org.eclipse.ptp.linux.ppc/fragment.xml releng/org.eclipse.ptp.linux.x86/.project releng/org.eclipse.ptp.linux.x86/BUILD releng/org.eclipse.ptp.linux.x86/META-INF/MANIFEST.MF releng/org.eclipse.ptp.linux.x86/about.html releng/org.eclipse.ptp.linux.x86/bin/.cvsignore releng/org.eclipse.ptp.linux.x86/bin/README releng/org.eclipse.ptp.linux.x86/build.properties releng/org.eclipse.ptp.linux.x86/fragment.xml releng/org.eclipse.ptp.linux.x86_64/.project releng/org.eclipse.ptp.linux.x86_64/BUILD releng/org.eclipse.ptp.linux.x86_64/META-INF/MANIFEST.MF releng/org.eclipse.ptp.linux.x86_64/about.html releng/org.eclipse.ptp.linux.x86_64/bin/.cvsignore releng/org.eclipse.ptp.linux.x86_64/bin/README releng/org.eclipse.ptp.linux.x86_64/build.properties releng/org.eclipse.ptp.linux.x86_64/fragment.xml releng/org.eclipse.ptp.macosx.ppc/.project releng/org.eclipse.ptp.macosx.ppc/BUILD releng/org.eclipse.ptp.macosx.ppc/META-INF/MANIFEST.MF releng/org.eclipse.ptp.macosx.ppc/about.html releng/org.eclipse.ptp.macosx.ppc/bin/.cvsignore releng/org.eclipse.ptp.macosx.ppc/bin/README releng/org.eclipse.ptp.macosx.ppc/build.properties releng/org.eclipse.ptp.macosx.ppc/fragment.xml releng/org.eclipse.ptp.macosx.x86/.project releng/org.eclipse.ptp.macosx.x86/BUILD releng/org.eclipse.ptp.macosx.x86/META-INF/MANIFEST.MF releng/org.eclipse.ptp.macosx.x86/about.html releng/org.eclipse.ptp.macosx.x86/bin/.cvsignore releng/org.eclipse.ptp.macosx.x86/bin/README releng/org.eclipse.ptp.macosx.x86/build.properties releng/org.eclipse.ptp.macosx.x86/fragment.xml releng/org.eclipse.ptp.pldt-feature/.project releng/org.eclipse.ptp.pldt-feature/build.properties releng/org.eclipse.ptp.pldt-feature/buildNotes.txt releng/org.eclipse.ptp.pldt-feature/dev.properties releng/org.eclipse.ptp.pldt-feature/epl-v10.html releng/org.eclipse.ptp.pldt-feature/feature.properties releng/org.eclipse.ptp.pldt-feature/feature.xml releng/org.eclipse.ptp.pldt-feature/license.html releng/org.eclipse.ptp.pldt.lapi-feature/.project releng/org.eclipse.ptp.pldt.lapi-feature/build.properties releng/org.eclipse.ptp.pldt.lapi-feature/buildNotes.txt releng/org.eclipse.ptp.pldt.lapi-feature/epl-v10.html releng/org.eclipse.ptp.pldt.lapi-feature/feature.properties releng/org.eclipse.ptp.pldt.lapi-feature/feature.xml releng/org.eclipse.ptp.pldt.lapi-feature/license.html releng/org.eclipse.ptp.releng/.cvsignore releng/org.eclipse.ptp.releng/.project releng/org.eclipse.ptp.releng/build.sh releng/org.eclipse.ptp.releng/build.xml releng/org.eclipse.ptp.releng/buildsite.xml releng/org.eclipse.ptp.releng/maps/ptp.map releng/org.eclipse.ptp.releng/master/build.properties releng/org.eclipse.ptp.releng/master/customTargets.xml releng/org.eclipse.ptp.releng/pack.properties releng/org.eclipse.ptp.releng/ptpbuild releng/org.eclipse.ptp.releng/update_versions releng/org.eclipse.ptp.remote.remotetools-feature/.project releng/org.eclipse.ptp.remote.remotetools-feature/build.properties releng/org.eclipse.ptp.remote.remotetools-feature/eclipse_update_120.jpg releng/org.eclipse.ptp.remote.remotetools-feature/epl-v10.html releng/org.eclipse.ptp.remote.remotetools-feature/feature.properties releng/org.eclipse.ptp.remote.remotetools-feature/feature.xml releng/org.eclipse.ptp.remote.remotetools-feature/license.html releng/org.eclipse.ptp.remotetools-feature/.project releng/org.eclipse.ptp.remotetools-feature/build.properties releng/org.eclipse.ptp.remotetools-feature/epl-v10.html releng/org.eclipse.ptp.remotetools-feature/feature.properties releng/org.eclipse.ptp.remotetools-feature/feature.xml releng/org.eclipse.ptp.remotetools-feature/license.html releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html releng/org.eclipse.ptp.rm.ibm.ll-feature/.project releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html releng/org.eclipse.ptp.rm.ibm.pe-feature/.project releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html releng/org.eclipse.ptp.rm.lsf-feature/.project releng/org.eclipse.ptp.rm.lsf-feature/build.properties releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html releng/org.eclipse.ptp.rm.lsf-feature/feature.properties releng/org.eclipse.ptp.rm.lsf-feature/feature.xml releng/org.eclipse.ptp.rm.lsf-feature/license.html releng/org.eclipse.ptp.rm.mpich2-feature/.project releng/org.eclipse.ptp.rm.mpich2-feature/build.properties releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml releng/org.eclipse.ptp.rm.mpich2-feature/license.html releng/org.eclipse.ptp.rm.openmpi-feature/.project releng/org.eclipse.ptp.rm.openmpi-feature/build.properties releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml releng/org.eclipse.ptp.rm.openmpi-feature/license.html releng/org.eclipse.ptp.rm.orte-feature/.project releng/org.eclipse.ptp.rm.orte-feature/build.properties releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html releng/org.eclipse.ptp.rm.orte-feature/feature.properties releng/org.eclipse.ptp.rm.orte-feature/feature.xml releng/org.eclipse.ptp.rm.orte-feature/license.html releng/org.eclipse.ptp.sdm-feature/.project releng/org.eclipse.ptp.sdm-feature/build.properties releng/org.eclipse.ptp.sdm-feature/epl-v10.html releng/org.eclipse.ptp.sdm-feature/feature.properties releng/org.eclipse.ptp.sdm-feature/feature.xml releng/org.eclipse.ptp.sdm-feature/license.html releng/org.eclipse.ptp.utils-feature/.project releng/org.eclipse.ptp.utils-feature/build.properties releng/org.eclipse.ptp.utils-feature/epl-v10.html releng/org.eclipse.ptp.utils-feature/feature.properties releng/org.eclipse.ptp.utils-feature/feature.xml releng/org.eclipse.ptp.utils-feature/license.html releng/org.eclipse.ptp/.classpath releng/org.eclipse.ptp/.project releng/org.eclipse.ptp/.settings/org.eclipse.jdt.core.prefs releng/org.eclipse.ptp/META-INF/MANIFEST.MF releng/org.eclipse.ptp/about.html releng/org.eclipse.ptp/about.ini releng/org.eclipse.ptp/about.mappings releng/org.eclipse.ptp/about.properties releng/org.eclipse.ptp/build.properties releng/org.eclipse.ptp/eclipse32.png releng/org.eclipse.ptp/plugin.properties releng/org.eclipse.ptp/src/readme.txt rms/org.eclipse.ptp.rm.core/.classpath rms/org.eclipse.ptp.rm.core/.options rms/org.eclipse.ptp.rm.core/.project rms/org.eclipse.ptp.rm.core/.settings/org.eclipse.jdt.core.prefs rms/org.eclipse.ptp.rm.core/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.core/about.html rms/org.eclipse.ptp.rm.core/about.ini rms/org.eclipse.ptp.rm.core/about.mappings rms/org.eclipse.ptp.rm.core/about.properties rms/org.eclipse.ptp.rm.core/build.properties rms/org.eclipse.ptp.rm.core/eclipse32.png rms/org.eclipse.ptp.rm.core/plugin.properties rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsAttributes.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsPreferenceManager.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/ToolsRMPlugin.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/Messages.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/messages.properties rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractEffectiveToolRMConfiguration.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMConfiguration.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMFactory.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolResourceManager.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractRemoteCommandJob.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystem.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystemJob.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/DefaultToolRuntimeSystemJob.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/IToolRuntimeSystemJob.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/DebugUtil.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/IInputStreamListener.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/ITextInputStreamListener.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamListenerToOutputStream.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamObserver.java rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/TextInputStreamObserver.java rms/org.eclipse.ptp.rm.ibm.ll.core/.classpath rms/org.eclipse.ptp.rm.ibm.ll.core/.project rms/org.eclipse.ptp.rm.ibm.ll.core/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.ll.core/about.html rms/org.eclipse.ptp.rm.ibm.ll.core/about.ini rms/org.eclipse.ptp.rm.ibm.ll.core/about.mappings rms/org.eclipse.ptp.rm.ibm.ll.core/about.properties rms/org.eclipse.ptp.rm.ibm.ll.core/build.properties rms/org.eclipse.ptp.rm.ibm.ll.core/eclipse32.png rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.properties rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.xml rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/Activator.java rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/IBMLLAttributes.java rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManager.java rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerConfiguration.java rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerFactory.java rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLProxyRuntimeClient.java rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLRuntimeSystem.java rms/org.eclipse.ptp.rm.ibm.ll.help/.classpath rms/org.eclipse.ptp.rm.ibm.ll.help/.project rms/org.eclipse.ptp.rm.ibm.ll.help/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.ll.help/about.html rms/org.eclipse.ptp.rm.ibm.ll.help/build.properties rms/org.eclipse.ptp.rm.ibm.ll.help/html/IBMLLMainHelp.html rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_preferences.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_1.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_2.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_3.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_2.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_3.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_application_1.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_2.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_3.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_start_resource_manager.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/project_create.jpg rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.properties rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.xml rms/org.eclipse.ptp.rm.ibm.ll.help/src/org/eclipse/ptp/rm/ibm/ll/help/Activator.java rms/org.eclipse.ptp.rm.ibm.ll.help/toc.xml rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cdtproject rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cproject rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cvsignore rms/org.eclipse.ptp.rm.ibm.ll.proxy/.project rms/org.eclipse.ptp.rm.ibm.ll.proxy/AUTHORS rms/org.eclipse.ptp.rm.ibm.ll.proxy/COPYING rms/org.eclipse.ptp.rm.ibm.ll.proxy/ChangeLog rms/org.eclipse.ptp.rm.ibm.ll.proxy/INSTALL rms/org.eclipse.ptp.rm.ibm.ll.proxy/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.am rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.in rms/org.eclipse.ptp.rm.ibm.ll.proxy/NEWS rms/org.eclipse.ptp.rm.ibm.ll.proxy/README rms/org.eclipse.ptp.rm.ibm.ll.proxy/about.html rms/org.eclipse.ptp.rm.ibm.ll.proxy/aclocal.m4 rms/org.eclipse.ptp.rm.ibm.ll.proxy/build.properties rms/org.eclipse.ptp.rm.ibm.ll.proxy/compile rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.guess rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.h.in rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.sub rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure.in rms/org.eclipse.ptp.rm.ibm.ll.proxy/depcomp rms/org.eclipse.ptp.rm.ibm.ll.proxy/install-sh rms/org.eclipse.ptp.rm.ibm.ll.proxy/missing rms/org.eclipse.ptp.rm.ibm.ll.proxy/plugin.properties rms/org.eclipse.ptp.rm.ibm.ll.proxy/src/ptp_ibmll_proxy.c rms/org.eclipse.ptp.rm.ibm.ll.ui/.classpath rms/org.eclipse.ptp.rm.ibm.ll.ui/.project rms/org.eclipse.ptp.rm.ibm.ll.ui/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.ll.ui/about.html rms/org.eclipse.ptp.rm.ibm.ll.ui/build.properties rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.properties rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.xml rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/Activator.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/IBMLLPreferenceManager.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.properties rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferenceConstants.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferencePage.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/BooleanRowWidget.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/CheckboxRowWidget.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ComboRowWidget.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/DualFieldRowWidget.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/FileSelectorRowWidget.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationFactory.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/TextRowWidget.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ValidationState.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/WidgetAttributes.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPage.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPageFactory.java rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerOptionWizardPage.java rms/org.eclipse.ptp.rm.ibm.pe.core/.classpath rms/org.eclipse.ptp.rm.ibm.pe.core/.project rms/org.eclipse.ptp.rm.ibm.pe.core/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.pe.core/about.ini rms/org.eclipse.ptp.rm.ibm.pe.core/about.mappings rms/org.eclipse.ptp.rm.ibm.pe.core/about.properties rms/org.eclipse.ptp.rm.ibm.pe.core/build.properties rms/org.eclipse.ptp.rm.ibm.pe.core/eclipse32.png rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.properties rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.xml rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/Activator.java rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceConstants.java rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceManager.java rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManager.java rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerConfiguration.java rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerFactory.java rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PEProxyRuntimeClient.java rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PERuntimeSystem.java rms/org.eclipse.ptp.rm.ibm.pe.help/.classpath rms/org.eclipse.ptp.rm.ibm.pe.help/.project rms/org.eclipse.ptp.rm.ibm.pe.help/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.pe.help/build.properties rms/org.eclipse.ptp.rm.ibm.pe.help/html/PEMainHelp.html rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_preferences.jpg rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config.jpg rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_1.jpg rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_2.jpg rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_run_config.jpg rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_1.jpg rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_2.jpg rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.properties rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.xml rms/org.eclipse.ptp.rm.ibm.pe.help/src/org/eclipse/ptp/rm/ibm/pe/help/Activator.java rms/org.eclipse.ptp.rm.ibm.pe.help/toc.xml rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cdtproject rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cproject rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cvsignore rms/org.eclipse.ptp.rm.ibm.pe.proxy/.project rms/org.eclipse.ptp.rm.ibm.pe.proxy/.settings/org.eclipse.cdt.core.prefs rms/org.eclipse.ptp.rm.ibm.pe.proxy/AUTHORS rms/org.eclipse.ptp.rm.ibm.pe.proxy/COPYING rms/org.eclipse.ptp.rm.ibm.pe.proxy/ChangeLog rms/org.eclipse.ptp.rm.ibm.pe.proxy/INSTALL rms/org.eclipse.ptp.rm.ibm.pe.proxy/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.am rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.in rms/org.eclipse.ptp.rm.ibm.pe.proxy/NEWS rms/org.eclipse.ptp.rm.ibm.pe.proxy/README rms/org.eclipse.ptp.rm.ibm.pe.proxy/about.html rms/org.eclipse.ptp.rm.ibm.pe.proxy/aclocal.m4 rms/org.eclipse.ptp.rm.ibm.pe.proxy/build.properties rms/org.eclipse.ptp.rm.ibm.pe.proxy/compile rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.guess rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h.in rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.sub rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure.in rms/org.eclipse.ptp.rm.ibm.pe.proxy/depcomp rms/org.eclipse.ptp.rm.ibm.pe.proxy/install-sh rms/org.eclipse.ptp.rm.ibm.pe.proxy/missing rms/org.eclipse.ptp.rm.ibm.pe.proxy/plugin.properties rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_miniproxy.c rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c rms/org.eclipse.ptp.rm.ibm.pe.ui/.classpath rms/org.eclipse.ptp.rm.ibm.pe.ui/.project rms/org.eclipse.ptp.rm.ibm.pe.ui/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ibm.pe.ui/build.properties rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.properties rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.xml rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/Activator.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.properties rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/preferences/PEPreferencePage.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationFactory.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/BooleanRowWidget.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/CheckboxRowWidget.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ComboRowWidget.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/DualFieldRowWidget.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/FileSelectorRowWidget.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/TextRowWidget.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ValidationState.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/WidgetAttributes.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPage.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPageFactory.java rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerOptionDialog.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.html rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/EmptyPage.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/MPICH2PreferencePage.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/.classpath rms/org.eclipse.ptp.rm.mpi.openmpi.core/.project rms/org.eclipse.ptp.rm.mpi.openmpi.core/.settings/org.eclipse.jdt.core.prefs rms/org.eclipse.ptp.rm.mpi.openmpi.core/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.html rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.ini rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.mappings rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.properties rms/org.eclipse.ptp.rm.mpi.openmpi.core/build.properties rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.2.properties rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.3.properties rms/org.eclipse.ptp.rm.mpi.openmpi.core/eclipse32.png rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.properties rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.xml rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12Defaults.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12PreferenceManager.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13Defaults.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13PreferenceManager.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIApplicationAttributes.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIJobAttributes.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPILaunchAttributes.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIMachineAttributes.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPINodeAttributes.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIPlugin.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/Messages.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/messages.properties rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/OmpiInfo.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/Parameters.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/EffectiveOpenMPIResourceManagerConfiguration.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManager.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerConfiguration.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerFactory.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIDiscoverJob.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMap.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMapParser.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMap.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapText12Parser.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapXml13Parser.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystem.java rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystemJob.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.classpath rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.project rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.settings/org.eclipse.jdt.core.prefs rms/org.eclipse.ptp.rm.mpi.openmpi.ui/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.mpi.openmpi.ui/about.html rms/org.eclipse.ptp.rm.mpi.openmpi.ui/build.properties rms/org.eclipse.ptp.rm.mpi.openmpi.ui/data/launch-defaults.properties rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.properties rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.xml rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/OpenMPIUIPlugin.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/AdvancedOpenMpiRMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/BasicOpenMpiRMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/NewOpenMPIRMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfiguration.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfigurationDefaults.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPIRMLaunchConfigurationFactory.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/Messages.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/messages.properties rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/EmptyPage.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI12PreferencePage.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI13PreferencePage.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIConfigurationWizardPage.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPage.java rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPageFactory.java rms/org.eclipse.ptp.rm.ui/.classpath rms/org.eclipse.ptp.rm.ui/.options rms/org.eclipse.ptp.rm.ui/.project rms/org.eclipse.ptp.rm.ui/.settings/org.eclipse.jdt.core.prefs rms/org.eclipse.ptp.rm.ui/META-INF/MANIFEST.MF rms/org.eclipse.ptp.rm.ui/about.html rms/org.eclipse.ptp.rm.ui/build.properties rms/org.eclipse.ptp.rm.ui/plugin.properties rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/ToolsRMUIPlugin.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/AbstractRMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/ExtendableRMLaunchConfigurationDynamicTab.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabDataSource.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabWidgetListener.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/Messages.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/messages.properties rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractPreferencePage.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractToolsPreferencePage.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceDataSource.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceWidgetListener.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DataSource.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DebugUtil.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/WidgetListener.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractConfigurationWizardPage.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractToolRMConfigurationWizardPage.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageDataSource.java rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageWidgetListener.java tools/pldt/org.eclipse.ptp.pldt.common/.classpath tools/pldt/org.eclipse.ptp.pldt.common/.cvsignore tools/pldt/org.eclipse.ptp.pldt.common/.project tools/pldt/org.eclipse.ptp.pldt.common/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.common/about.html tools/pldt/org.eclipse.ptp.pldt.common/about.ini tools/pldt/org.eclipse.ptp.pldt.common/about.mappings tools/pldt/org.eclipse.ptp.pldt.common/about.properties tools/pldt/org.eclipse.ptp.pldt.common/build.properties tools/pldt/org.eclipse.ptp.pldt.common/eclipse32.png tools/pldt/org.eclipse.ptp.pldt.common/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.common/icons/analyze.gif tools/pldt/org.eclipse.ptp.pldt.common/icons/filter_ps.gif tools/pldt/org.eclipse.ptp.pldt.common/plugin.properties tools/pldt/org.eclipse.ptp.pldt.common/plugin.xml tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/Artifact.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactManager.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/CommonPlugin.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IArtifact.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IDs.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ScanReturn.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/AnalysisDropdownHandler.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandler.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandlerBase.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/analysis/PldtAstVisitor.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/AllFunctions.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpBookImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpProviderImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpResourceDescriptorImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionPrototypeSummaryImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionSummaryImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PLDTPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceConstants.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceInitializer.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/AnalysisUtil.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/SourceInfo.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/Utility.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivater.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTableMarkerView.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTreeTableMarkerView.java tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath tools/pldt/org.eclipse.ptp.pldt.doc.user/.cvsignore tools/pldt/org.eclipse.ptp.pldt.doc.user/.project tools/pldt/org.eclipse.ptp.pldt.doc.user/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.doc.user/about.html tools/pldt/org.eclipse.ptp.pldt.doc.user/build.properties tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/help.css tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierMatchingSetView.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierView.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/analyze.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrier.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierActionAnn.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrorView.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrors.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/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.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/contentAssist.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/headerOMP.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSens.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1click.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/hover.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/include.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProjProps.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProject.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowOpenMPartifacts.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowUPCartifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiButtons.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiNewProjectWorkbench.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiPrefsHaveNotBeenSet.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplates.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplatesMod.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiViewAnn.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard2.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard3.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMP.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMPsettings.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ompCompilerOpt.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpArtifactsfound.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpPrefs.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-menu.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-prefs1.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldtIconMisplaced.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPpragmaAnn.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPproblems.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrency.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrencymenu.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcArtifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcPrefs.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcProperties.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorAndArtifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorVsArtifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeC-pldt.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeOverview.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/mpiTemplates.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/openMPextra.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/overview.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/run.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/runOMP.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/runUPC.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/helloMPI_c_style.cpp tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/pi.cpp tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPI.c tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIbarrier.c tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIcpp.cpp tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setup.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupMakefileProject.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupOMP.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/thumb.js tools/pldt/org.eclipse.ptp.pldt.doc.user/html/toc.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/tracing.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/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.properties 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.lapi/.classpath tools/pldt/org.eclipse.ptp.pldt.lapi/.cvsignore tools/pldt/org.eclipse.ptp.pldt.lapi/.project tools/pldt/org.eclipse.ptp.pldt.lapi/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.lapi/about.ini tools/pldt/org.eclipse.ptp.pldt.lapi/about.mappings tools/pldt/org.eclipse.ptp.pldt.lapi/about.properties tools/pldt/org.eclipse.ptp.pldt.lapi/build.properties tools/pldt/org.eclipse.ptp.pldt.lapi/eclipse32.png tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_get.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_set.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init64.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsend.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsendv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Fence.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Get.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getcntr.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Gfence.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Init.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msg_string.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msgpoll.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Nopoll_wait.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Probe.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Purge_totask.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Put.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Putv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Qenv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Resume_totask.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw64.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Senv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr_wstatus.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Term.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Util.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Waitcntr.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Xfer.html tools/pldt/org.eclipse.ptp.pldt.lapi/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.lapi/icons/lapi.gif tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.properties tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.xml tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LAPIArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiIDs.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiPlugin.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/actions/RunAnalyseLAPIcommandHandler.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/analysis/LapiCASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpBook.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpInfoProvider.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/prefs/LAPIPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/views/LapiArtifactView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.classpath tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.project tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/build.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/plugin.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/Activator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/GraphCreator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IBlock.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraphNode.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IControlFlowGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/Block.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraphNode.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ControlFlowGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ResourceCollector.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.classpath tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.project tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/build.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/barrier.gif tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/collapseall.gif tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/expandall.gif tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.xml tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/Activator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/IDs.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/MPIAnalysisManager.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/RunAnalyseMPIAnalysiscommandHandler.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFG.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFGBlock.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierExpression.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierTable.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/GotoEliminator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierAnalysisResults.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExpr.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExprModified.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierMatching.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBlock.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICFGBuilder.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraphNode.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIControlFlowGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIDUChain.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIMVAnalysis.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIResourceCollector.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISSA.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISingleAssignAnalysis.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/UseDefBuilder.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/Util.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/popup/actions/ShowMatchSet.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ArtifactWithParent.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/BarrierArtifacts.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierMatchingSetView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIErrorView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MatchingSet.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ShowErrors.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTableBarrierView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTreeTableErrorView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTreeTableMarkerView.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/.classpath tools/pldt/org.eclipse.ptp.pldt.mpi.core/.cvsignore tools/pldt/org.eclipse.ptp.pldt.mpi.core/.project tools/pldt/org.eclipse.ptp.pldt.mpi.core/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.mpi.core/about.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/build.properties tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Abort.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Accumulate.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_class.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_code.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_string.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Address.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgather.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgatherv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alloc_mem.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allreduce.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallw.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_delete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_put.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Barrier.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bcast.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_attach.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_detach.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cancel.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_coords.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_map.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_rank.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_shift.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_sub.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cartdim_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_call_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_compare.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_delete_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_dup.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_group.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_rank.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_group.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_split.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_test_inter.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Dims_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_set.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_class.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_string.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Exscan.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_call_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_create_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_get_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_set_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalize.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalized.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Free_mem.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gather.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gatherv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_address.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_count.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_elements.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_processor_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_version.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_map.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors_count.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graphdims_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_complete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_start.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_compare.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_difference.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_excl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_incl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_intersection.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_excl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_incl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_rank.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_union.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ibsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_delete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_dup.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nkeys.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nthkey.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_valuelen.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_set.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init_thread.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Initialized.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_merge.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Iprobe.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irecv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Is_thread_main.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Isend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Issend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pcontrol.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Probe.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Put.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Query_thread.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce_scatter.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_get_status.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scan.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatter.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatterv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv_replace.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Start.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Startall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_cancelled.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_elements.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test_cancelled.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testany.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testsome.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Topo_test.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_commit.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_contiguous.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_darray.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_complex.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_integer.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_real.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hindexed.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hvector.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_indexed_block.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_resized.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_struct.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_subarray.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_delete_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_dup.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_extent.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_contents.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_envelope.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_extent.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_true_extent.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hindexed.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hvector.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_indexed.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_lb.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_match_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_struct.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_ub.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_vector.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack_external.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wait.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitany.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitsome.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/testMPI.c tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.classpath tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/about.html tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/build.properties tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/.classpath tools/pldt/org.eclipse.ptp.pldt.openmp.core/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project tools/pldt/org.eclipse.ptp.pldt.openmp.core/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.properties tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.xml tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages.properties tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.classpath tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/about.html tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/build.properties tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java tools/pldt/org.eclipse.ptp.pldt.upc/.classpath tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore tools/pldt/org.eclipse.ptp.pldt.upc/.project tools/pldt/org.eclipse.ptp.pldt.upc/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/pldt/org.eclipse.ptp.pldt.wizards/.classpath tools/pldt/org.eclipse.ptp.pldt.wizards/.cvsignore tools/pldt/org.eclipse.ptp.pldt.wizards/.project tools/pldt/org.eclipse.ptp.pldt.wizards/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.wizards/about.html tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.properties tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml tools/pldt/org.eclipse.ptp.pldt.wizards/samples/testMPI.c tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml tools/remotetools/org.eclipse.ptp.remotetools.core/.classpath tools/remotetools/org.eclipse.ptp.remotetools.core/.project tools/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.core/about.html tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini tools/remotetools/org.eclipse.ptp.remotetools.core/about.mappings tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDirectory.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFile.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteDirectory.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFile.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.core/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/.classpath tools/remotetools/org.eclipse.ptp.remotetools.preferences/.project tools/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.preferences/about.html tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.utils/.classpath tools/remotetools/org.eclipse.ptp.remotetools.utils/.project tools/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.utils/about.html tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties tools/remotetools/org.eclipse.ptp.remotetools.utils/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java

commit: cfee18cd4b74973f8e793f21e10e201190f538bb [log] [tgz]
author: cvs2svn <ptp-dev@eclipse.org> Mon Nov 16 21:13:36 2009 +0000
committer: cvs2svn <ptp-dev@eclipse.org> Mon Nov 16 21:13:36 2009 +0000
tree: 532c2b038e5e27880eb1c9eb1237a7a81a4f65d2
parent: 33c8979e37887c32d3b0e4005fc5bc189132bf18 [diff]
diff --git a/core/org.eclipse.ptp.core/.classpath b/core/org.eclipse.ptp.core/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/core/org.eclipse.ptp.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/core/org.eclipse.ptp.core/.cvsignore b/core/org.eclipse.ptp.core/.cvsignore
deleted file mode 100644
index f0a691e..0000000
--- a/core/org.eclipse.ptp.core/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/.options b/core/org.eclipse.ptp.core/.options
deleted file mode 100644
index 7b55edb..0000000
--- a/core/org.eclipse.ptp.core/.options
+++ /dev/null

@@ -1,15 +0,0 @@
-org.eclipse.ptp.core/debug=true
-
-# Proxy protocol tracing
-org.eclipse.ptp.core/debug/proxy/protocol/tracing=true
-
-# Proxy client debugging messages
-org.eclipse.ptp.core/debug/proxy/client/tracing=true
-
-# Proxy server debugging messages
-# Level 0 is off
-# Level >0 is on. Higher levels mean more debugging
-org.eclipse.ptp.core/debug/proxy/server/debug_level=1
-
-# Resource manager debugging messages
-org.eclipse.ptp.core/debug/rm/tracing=true

diff --git a/core/org.eclipse.ptp.core/.project b/core/org.eclipse.ptp.core/.project
deleted file mode 100644
index a11b6d4..0000000
--- a/core/org.eclipse.ptp.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.core/.settings/org.eclipse.jdt.ui.prefs b/core/org.eclipse.ptp.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index cca115f..0000000
--- a/core/org.eclipse.ptp.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Thu Apr 12 09:22:30 MDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=default

diff --git a/core/org.eclipse.ptp.core/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.core/META-INF/MANIFEST.MF
deleted file mode 100644
index bf104e8..0000000
--- a/core/org.eclipse.ptp.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.core.PTPCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.core,
- org.eclipse.ptp.core.attributes,
- org.eclipse.ptp.core.elementcontrols,
- org.eclipse.ptp.core.elements,
- org.eclipse.ptp.core.elements.attributes,
- org.eclipse.ptp.core.elements.events,
- org.eclipse.ptp.core.elements.listeners,
- org.eclipse.ptp.core.events,
- org.eclipse.ptp.core.listeners,
- org.eclipse.ptp.core.resources,
- org.eclipse.ptp.core.util,
- org.eclipse.ptp.rmsystem,
- org.eclipse.ptp.rtsystem,
- org.eclipse.ptp.rtsystem.events
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.ptp.proxy.protocol,
- org.eclipse.ptp.utils.core
-Eclipse-LazyStart: true

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

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

diff --git a/core/org.eclipse.ptp.core/about.ini b/core/org.eclipse.ptp.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/core/org.eclipse.ptp.core/about.ini
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.core/about.mappings b/core/org.eclipse.ptp.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/core/org.eclipse.ptp.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/about.properties b/core/org.eclipse.ptp.core/about.properties
deleted file mode 100644
index 78f081d..0000000
--- a/core/org.eclipse.ptp.core/about.properties
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.core/build.properties b/core/org.eclipse.ptp.core/build.properties
deleted file mode 100644
index f4c3b25..0000000
--- a/core/org.eclipse.ptp.core/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = plugin.xml,\

-               .,\

-               META-INF/,\

-               about.html,\

-               plugin.properties,\

-               about.ini,\

-               about.mappings,\

-               about.properties,\

-               eclipse32.png


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

diff --git a/core/org.eclipse.ptp.core/plugin.properties b/core/org.eclipse.ptp.core/plugin.properties
deleted file mode 100644
index 9c5feee..0000000
--- a/core/org.eclipse.ptp.core/plugin.properties
+++ /dev/null

@@ -1,31 +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
-#
-# Contributors:
-#     Clement Chu
-#################################################################################
-
-pluginName=Parallel Tools Platform Core
-pluginProvider=Eclipse.org
-
-fragmentName.aix.ppc=PTP AIX PPC Fragment
-fragmentName.linux.ppc=PTP Linux PPC Fragment
-fragmentName.linux.x86=PTP Linux x86 Fragment
-fragmentName.linux.x86_64=PTP Linux x86_64 Fragment
-fragmentName.macosx.ppc=PTP MacOS X PPC Fragment
-fragmentName.macosx.x86=PTP MacOS X x86 Fragment
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/plugin.xml b/core/org.eclipse.ptp.core/plugin.xml
deleted file mode 100644
index 6c78175..0000000
--- a/core/org.eclipse.ptp.core/plugin.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="resourceManagers" name="Resource Managers" schema="schema/resourceManagers.exsd"/>
-
-		
-</plugin>

diff --git a/core/org.eclipse.ptp.core/schema/resourceManagers.exsd b/core/org.eclipse.ptp.core/schema/resourceManagers.exsd
deleted file mode 100644
index 4c157c6..0000000
--- a/core/org.eclipse.ptp.core/schema/resourceManagers.exsd
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.core" id="resourceManagers" name="PTP Resource Managers"/>
-      </appInfo>
-      <documentation>
-         This extension point allows plug-ins to contribute a resource manager factory for creating new instances of a resource manager.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="resourceManager" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="resourceManager">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IDGenerator.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IDGenerator.java
deleted file mode 100644
index a8c84f4..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IDGenerator.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core;
-
-public class IDGenerator {
-	private static int current_ID = 1;
-	
-	public static int getNewID() {
-		return current_ID++;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelManager.java
deleted file mode 100644
index 03b09a7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelManager.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-
-public interface IModelManager extends IModelPresentation {
-	/**
-	 * Add a listener for model manager children events.
-	 * 
-	 * @param listener
-	 */
-	public void addListener(IModelManagerChildListener listener);
-	
-	/**
-	 * Add a resource manager to the model.
-	 * 
-	 * @param addedManager
-	 */
-	public void addResourceManager(IResourceManagerControl addedManager);
-
-	/**
-	 * Add resource managers to the model.
-	 * 
-	 * @param addedManagers
-	 */
-	public void addResourceManagers(IResourceManagerControl[] addedManagers);
-	
-	/**
-	 * Get the resource manager factories that have been registered via
-	 * extensions.
-	 * 
-	 * @return array of resource manager factories
-	 */
-	public IResourceManagerFactory[] getResourceManagerFactories();
-	
-	/**
-	 * Find the resource manager factory corresponding to the supplied ID.
-	 * 
-	 * @param id
-	 * @return the requested resource manager factory
-	 */
-	public IResourceManagerFactory getResourceManagerFactory(String id);
-
-	/**
-	 * Find the resource manager with the supplied unique name
-	 * 
-	 * @param rmUniqueName
-	 * @return resource manager
-	 */
-	public IResourceManager getResourceManagerFromUniqueName(String rmUniqueName);
-
-	/**
-	 * Find resource managers that have been started
-	 * 
-	 * @param universe
-	 * @return array of resource managers
-	 */
-	public IResourceManager[] getStartedResourceManagers(IPUniverse universe);
-
-	/**
-	 * Loads saved resource managers.
-	 * 
-	 * @throws CoreException
-	 */
-	public void loadResourceManagers() throws CoreException;
-	
-	/**
-	 * Remove listener for model manager child events.
-	 * 
-	 * @param listener
-	 */
-	public void removeListener(IModelManagerChildListener listener);
-	
-	/**
-	 * Remove a resource manager from the model.
-	 * 
-	 * @param removedManager
-	 */
-	public void removeResourceManager(IResourceManagerControl removedManager);
-	
-	/**
-	 * Remove resource managers from the model.
-	 * 
-	 * @param removedRMs
-	 */
-	public void removeResourceManagers(IResourceManagerControl[] removedRMs);
-	
-	/**
-	 * Save the resource manager configurations
-	 */
-	public void saveResourceManagers();
-
-	/**
-	 * Shuts down the model manager. Should only be called at plugin shutdown.
-	 * @throws CoreException
-	 */
-	public void shutdown() throws CoreException;
-
-	/**
-	 * Start the model manager. Should only be called once at plugin startup.
-	 * 
-	 * @throws CoreException
-	 */
-	public void start() throws CoreException;
-
-	/**
-	 * stops all of the resource managers.
-	 * 
-	 * @throws CoreException
-	 */
-	public void stopResourceManagers() throws CoreException;
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelPresentation.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelPresentation.java
deleted file mode 100644
index d32b288..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IModelPresentation.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core;
-
-import org.eclipse.ptp.core.elements.IPUniverse;
-
-/**
- * @author rsqrd
- */
-/**
- * @author rsqrd
- *
- */
-public interface IModelPresentation {
-	
-	/**
-	 * @return
-	 */
-	public IPUniverse getUniverse();
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IPTPLaunchConfigurationConstants.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IPTPLaunchConfigurationConstants.java
deleted file mode 100644
index a80f44b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/IPTPLaunchConfigurationConstants.java
+++ /dev/null

@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core;
-
-/**
- *
- */
-public interface IPTPLaunchConfigurationConstants {
-	/**
-	 * Plugin ID
-	 */
-	public static final String PTP_LAUNCHCONFIGURETYPE_ID = "org.eclipse.ptp.launch.parallelLaunch";
-
-	/**
-	 * Unique string for launch attributes
-	 */
-	public static final String PTP_LAUNCH_ID = "org.eclipse.ptp.launch";
-	
-	/**
-	 * Launch configuration attribute value. The key is
-	 * ATTR_DEBUGGER_STOP_AT_MAIN.
-	 */
-	public static final boolean DEBUGGER_STOP_AT_MAIN_DEFAULT = true;
-
-	/**
-	 * Launch configuration attribute value. The key is
-	 * ATTR_DEBUGGER_START_MODE. Startup debugger running the program.
-	 */
-	public static final String DEBUGGER_MODE_RUN = "run";
-
-	/**
-	 * Launch configuration attribute value. The key is
-	 * ATTR_DEBUGGER_START_MODE. Startup debugger and attach to running process.
-	 */
-	public static final String DEBUGGER_MODE_ATTACH = "attach";
-
-	/**
-	 * Launch configuration attribute key. The values is the selected
-	 * resource manager.
-	 */
-	public static final String ATTR_RESOURCE_MANAGER_UNIQUENAME = PTP_LAUNCH_ID + ".RESOURCE_MANAGER_NAME";
-
-	/**
-	 * Launch configuration attribute key. The value is the selected queue name
-	 */
-	public static final String ATTR_QUEUE_NAME = PTP_LAUNCH_ID + ".QUEUE_NAME";
-	
-	/**
-	 * Launch configuration attribute key. The value is the project name.
-	 */
-	public static final String ATTR_PROJECT_NAME = PTP_LAUNCH_ID + ".PROJECT_ATTR";
-
-	/**
-	 * Launch configuration attribute key. The value is the application (executable) name
-	 */
-	public static final String ATTR_APPLICATION_NAME = PTP_LAUNCH_ID + ".APPLICATION_NAME";
-
-	/**
-	 * Launch configuration attribute key. The value is the platform string of
-	 * the launch configuration
-	 */
-	public static final String ATTR_PLATFORM = PTP_LAUNCH_ID + ".PLATFFORM";
-
-	/**
-	 * Launch configuration attribute key. The value is true if the debugger
-	 * should stop in main().
-	 */
-	public static final String ATTR_STOP_IN_MAIN = PTP_LAUNCH_ID + ".STOP_IN_MAIN";
-
-	/**
-	 * Launch configuration attribute key. The value is the ID of the debugger used in launch
-	 */
-	public static final String ATTR_DEBUGGER_ID = PTP_LAUNCH_ID + ".DEBUGGER_ID";
-
-	/**
-	 * Launch configuration attribute key. The value is the program arguments that
-	 * have been supplied.
-	 */
-	public static final String ATTR_ARGUMENTS = PTP_LAUNCH_ID + ".ARGUMENT_ATTR";
-
-	/**
-	 * Launch configuration attribute key. The value is the working directory.
-	 */
-	public static final String ATTR_WORK_DIRECTORY = PTP_LAUNCH_ID + ".WORK_DIRECTORY_ATTR";
-
-	/**
-	 * Launch configuration attribute key. The value is the platform string of
-	 * the launch configuration
-	 */
-	public static final String ATTR_DEBUGGER_SPECIFIC_ATTRS_MAP = PTP_LAUNCH_ID + ".DEBUGGER_SPECIFIC_ATTRS_MAP";
-	
-	/**
-	 * Launch configuration attribute key. The value is a global variables'
-	 * memento.
-	 */
-	public static final String ATTR_DEBUGGER_GLOBAL_VARIABLES = PTP_LAUNCH_ID + ".GLOBAL_VARIABLES";
-
-	/**
-	 * Launch configuration attribute key. The value is the startup mode for the
-	 * debugger.
-	 */
-	public static final String ATTR_DEBUGGER_START_MODE = PTP_LAUNCH_ID + ".DEBUGGER_START_MODE";
-
-	/**
-	 * Launch configuration attribute key. The value is the location of the executable
-	 * being debugged.
-	 */
-	public static final String ATTR_DEBUGGER_EXECUTABLE_PATH = PTP_LAUNCH_ID + ".DEBUGGER_EXECUTABLE_PATH";
-
-	/**
-	 * Launch configuration attribute key. The value is the working directory from
-	 * which to run the debugger.
-	 */
-	public static final String ATTR_DEBUGGER_WORKING_DIR = PTP_LAUNCH_ID + ".DEBUGGER_WORKING_DIR";
-
-	/**
-	 * TODO: Please document what this is
-	 */
-	public static final String ATTR_DEBUGGER_MEMORY_BLOCKS = PTP_LAUNCH_ID + ".MEMORY_BLOCKS";
-	
-	/**
-	 * TODO: Please document what this is
-	 */
-	public static final String ATTR_DEBUGGER_REGISTER_GROUPS = PTP_LAUNCH_ID + ".DEBUGGER_REGISTER_GROUPS";
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean that states if the executable will be copied 
-	 * from the local machine to the remote machine.
-	 */
-	public static final String ATTR_COPY_EXECUTABLE = PTP_LAUNCH_ID + ".ATTR_COPY_EXECUTABLE_FROM_LOCAL";
-	
-	/**
-	 * Launch configuration attribute key. The value is the absolute path to the executable that will be copied
-	 * to the remote machine.
-	 */
-	public static final String ATTR_LOCAL_EXECUTABLE_PATH = PTP_LAUNCH_ID + ".ATTR_LOCAL_EXECUTABLE_PATH";
-	
-	/**
-	 *  Launch configuration attribute key. The value is the absolute path to the executable that
-	 *  is to be launched. If the executable is located on a remote machine, it is the path to the
-	 *  executable on this machine.
-	 */
-	public static final String ATTR_EXECUTABLE_PATH = PTP_LAUNCH_ID + ".ATTR_REMOTE_EXECUTABLE_PATH";
-
-	/**
-	 *  Launch configuration attribute key. The value is the address of the host that will be contacted
-	 *  by the debug server when it starts.
-	 */
-	public static final String ATTR_DEBUGGER_HOST = PTP_LAUNCH_ID + ".ATTR_DEBUGGER_HOST";
-
-	/**
-	 *  Launch configuration attribute key. The value is a boolean flag indicating
-	 *  if output from all processes should be combined into a single console.
-	 */
-	public static final String ATTR_CONSOLE = PTP_LAUNCH_ID + ".ATTR_CONSOLE";
-
-	/**
-	 * Error codes
-	 */
-	public static final int ERR_PROGRAM_NOT_EXIST = 104;
-	public static final int ERR_PROGRAM_NOT_BINARY = 107;
-
-	/**
-	 * Launch configuration attribute key. The value is a boolean flag indicating
-	 * if file synchronization will occur after the execution.
-	 */
-	public static final String ATTR_SYNC_AFTER = PTP_LAUNCH_ID + ".ATTR_SYNC_AFTER";
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean flag indicating
-	 * if file synchronization will occur before the execution.
-	 */
-	public static final String ATTR_SYNC_BEFORE = PTP_LAUNCH_ID + ".ATTR_SYNC_BEFORE";
-	
-	/**
-	 * Launch configuration attribute key. The value is a list of rules of 
-	 * synchronization.
-	 */
-	public static final String ATTR_SYNC_RULES = PTP_LAUNCH_ID + ".ATTR_SYNC_RULES";
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PTPCorePlugin.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PTPCorePlugin.java
deleted file mode 100644
index cd56248..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PTPCorePlugin.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core;
-
-import java.io.File;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.util.DebugUtil;
-import org.eclipse.ptp.internal.core.ModelManager;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-public class PTPCorePlugin extends Plugin {
-	public static final String PLUGIN_ID = "org.eclipse.ptp.core";
-
-	// The shared instance.
-	private static PTPCorePlugin plugin;
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PTPCorePlugin 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 = PTPCorePlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 * 
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 * 
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		if (DebugUtil.RM_TRACING) {
-			System.err.println(msg);
-		}
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 * 
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, "Internal Error", e));
-	}
-
-	/*
-	 * Resource bundle
-	 */
-	private ResourceBundle resourceBundle;
-	/*
-	 * ModelManager for this Eclipse session
-	 */
-	private ModelManager modelManager;
-	
-	/**
-	 * The constructor.
-	 */
-	public PTPCorePlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle(PLUGIN_ID
-					+ ".ParallelPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-	
-	/**
-	 * Get the model manager
-	 * 
-	 * @return the model manager
-	 */
-	public IModelManager getModelManager() {
-		return modelManager;
-	}
-	
-	/**
-	 * Get the presentation manager. This is now the model manager.
-	 * 
-	 * @return the presentation manager
-	 */
-	public IModelPresentation getModelPresentation() {
-		return getModelManager();
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	/**
-	 * Convenience function to return the universe
-	 * @return the universe
-	 */
-	public IPUniverse getUniverse() {
-		return getModelPresentation().getUniverse();
-	}
-
-	/**
-	 * Locate the fragment for our architecture. This should really be phased out, since
-	 * there is now no guarantee that there will be local executables for the proxy
-	 * server or debugger.
-	 * 
-	 * @param fragment
-	 * @param file
-	 * @return path to "bin" directory in fragment
-	 */
-	public String locateFragmentFile(String fragment, String file) {		
-		Bundle[] frags = Platform.getFragments(Platform.getBundle(PTPCorePlugin.PLUGIN_ID));
-		
-		if (frags != null) {
-			String os = Platform.getOS();
-			String arch = Platform.getOSArch();
-			String frag_os_arch = fragment+"."+os+"."+arch;
-			
-			for (int i=0; i<frags.length; i++) {
-				Bundle frag = frags[i];
-				URL path = frag.getEntry("/");
-				try {
-					URL local_path = FileLocator.toFileURL(path);
-					String str_path = local_path.getPath();
-					
-					/* 
-					 * Check each fragment that matches our os and arch for a bin directory.
-					 */
-	
-					int idx = str_path.indexOf(frag_os_arch);
-					if (idx > 0) {
-						/* found it!  This is the right fragment for our OS & arch */
-						String file_path = str_path + "bin/"+file;
-						File f = new File(file_path);
-						if (f.exists()) {
-							return file_path;
-						}
-					}
-	
-				} catch(Exception e) { 
-				}
-			}
-		}
-		
-		/* guess we never found it.... */
-		return null;
-	}
-	
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		DebugUtil.configurePluginDebugOptions();
-		modelManager = new ModelManager();
-		modelManager.start();
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		modelManager.shutdown();
-	}
-
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PreferenceConstants.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PreferenceConstants.java
deleted file mode 100644
index 2062d52..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/PreferenceConstants.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core;
-
-public interface PreferenceConstants {
-	public static final String SET_ROOT_ID = "Root";
-	
-	public static final String OUTPUT_DIR = "OUTPUT_DIR";
-	public static final String STORE_LINE = "STORE_LINE";
-	public int DEF_STORE_LINE = 100;
-	public String DEF_OUTPUT_DIR_NAME = "output";
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttribute.java
deleted file mode 100644
index 9ea60c5..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttribute.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public abstract class AbstractAttribute<T,
-                                        A extends AbstractAttribute<T,A,D>,
-                                        D extends IAttributeDefinition<T,A,D>>
-implements IAttribute<T,A,D> {
-
-	private final D definition;
-	private boolean enabled;
-
-	public AbstractAttribute(D definition) {
-		this.definition = definition;
-		this.enabled = true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-	 */
-	public int compareTo(A other) {
-        int results = getDefinition().compareTo(other.getDefinition());
-        if (results != 0) {
-            return results;
-        }
-        if (getClass() != other.getClass()) {
-            final int hashCode1 = getClass().hashCode();
-            final int hashCode2 = other.getClass().hashCode();
-            return hashCode1 < hashCode2 ? -1 : (hashCode1 > hashCode2 ? 1 : 0);
-        }
-        final int doCompareTo = doCompareTo(other);
-        return doCompareTo;
-    }
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        final A other = (A) obj;
-        if (definition == null) {
-            if (other.definition != null)
-                return false;
-        } else if (!definition.equals(other.definition))
-            return false;
-        final boolean doEquals = doEquals(other);
-        if (!doEquals)
-            return false;
-        return true;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#getDefinition()
-	 */
-	public D getDefinition() {
-		return definition;
-	}
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result
-                + ((definition == null) ? 0 : definition.hashCode());
-        result = prime * result + doHashCode();
-        return result;
-    }
-    
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-    /**
-	 * @param enabled the enabled to set
-	 */
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	/**
-     * @param other
-     * @return
-     */
-    protected abstract int doCompareTo(A other);
-
-    /**
-     * @param other
-     * @return
-     */
-    protected abstract boolean doEquals(A other);
-    
-    /**
-     * @return
-     */
-    protected abstract int doHashCode();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttributeDefinition.java
deleted file mode 100644
index de074ed..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AbstractAttributeDefinition.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public abstract class AbstractAttributeDefinition<T,
-												  A extends IAttribute<T,A,D>,
-												  D extends AbstractAttributeDefinition<T,A,D>>
-implements IAttributeDefinition<T,A,D> {
-	private final String name;
-	private final String description;
-	private final String uniqueId;
-	private final boolean display;
-	
-	public AbstractAttributeDefinition(final String uniqueId, final String name,
-			final String description, final boolean display) {
-		this.uniqueId = uniqueId;
-		this.name = name;
-		this.description = description;
-		this.display = display;
-	}
-
-	public int compareTo(IAttributeDefinition<?, ?, ?> arg0) {
-		return this.name.compareTo(arg0.getName());
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	final public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		final D other = (D) obj;
-		if (uniqueId == null) {
-			if (other.uniqueId != null)
-				return false;
-		} else if (!uniqueId.equals(other.uniqueId))
-			return false;
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttributeDefinition#getDescription()
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttributeDefinition#getDisplay()
-	 */
-	public boolean getDisplay() {
-		return display;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttributeDefinition#getId()
-	 */
-	public String getId() {
-		return uniqueId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttributeDefinition#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	final public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result +
-				((uniqueId == null) ? 0 : uniqueId.hashCode());
-		return result;
-	}
-
-	public String toString() {
-		return name;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttribute.java
deleted file mode 100644
index 2d5d6e8..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttribute.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.core.attributes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-public final class ArrayAttribute<T extends Comparable<? super T>> extends
-		AbstractAttribute<List<? extends T>, ArrayAttribute<T>, ArrayAttributeDefinition<T>> {
-
-	private List<T> value;
-
-	public <U extends T> ArrayAttribute(ArrayAttributeDefinition<T> definition, List<U> initialValue) {
-		super(definition);
-		setValue(initialValue);
-	}
-
-	public ArrayAttribute(ArrayAttributeDefinition<T> definition, String initialValue) throws IllegalValueException {
-		super(definition);
-		setValueAsString(initialValue);
-	}
-
-	public <U extends T> ArrayAttribute(ArrayAttributeDefinition<T> definition, U[] initialValue) {
-		super(definition);
-		setValue(initialValue);
-	}
-
-	/**
-	 * @param <U>
-	 * @param value
-	 */
-	public synchronized <U extends T> void addAll(U[] value) {
-		if (value != null) {
-			this.value.addAll(Arrays.asList(value));
-		}
-	}
-
-	/**
-	 * @param <U>
-	 * @param value
-	 */
-	public synchronized <U extends T> void addAll(List<U> value) {
-		if (value != null) {
-			this.value.addAll(value);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#getValue()
-	 */
-	public synchronized List<T> getValue() {
-		return value;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#getValueAsString()
-	 */
-	public synchronized String getValueAsString() {
-		return Arrays.toString(value.toArray());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#isValid(java.lang.String)
-	 */
-	public boolean isValid(String string) {
-		try {
-			@SuppressWarnings("unused")
-			T obj = (T) string;
-		} catch (ClassCastException e) {
-			return false;
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#setValue(java.lang.Object)
-	 */
-	public synchronized void setValue(List<? extends T> value) {
-		if (value != null) {
-			this.value = new ArrayList<T>(value);
-		} else {
-			this.value = new ArrayList<T>();
-		}
-	}
-
-	/**
-	 * @param <U>
-	 * @param value
-	 */
-	public synchronized <U extends T> void setValue(U[] value) {
-		if (value != null) {
-			this.value = Arrays.asList((T[]) value.clone());
-		} else {
-			this.value = new ArrayList<T>();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#setValueAsString(java.lang.String)
-	 */
-	public void setValueAsString(String string) throws IllegalValueException {
-		String[] values = string.split("");
-		try {
-			setValue((T[]) values);
-		} catch (ClassCastException e) {
-			throw new IllegalValueException(e);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.attributes.AbstractAttribute#doCompareTo(org.eclipse.ptp.core.attributes.AbstractAttribute)
-	 */
-	@Override
-	protected synchronized int doCompareTo(ArrayAttribute<T> other) {
-		// This is a lexicographic compare.
-
-		int results = 0;
-		Iterator<T> it1 = value.iterator();
-		Iterator<T> it2 = other.value.iterator();
-		while (it1.hasNext() && it2.hasNext()) {
-			T o1 = it1.next();
-			T o2 = it2.next();
-			results = o1.compareTo(o2);
-			if (results != 0) {
-				return results;
-			}
-		}
-		// If they compared the same up to here
-		// then the lexicographic compare is based
-		// on their sizes, the shortest
-		// one is less than the longer one.
-		return value.size() - other.value.size();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.AbstractAttribute#doEquals(org.eclipse.ptp.core.attributes.AbstractAttribute)
-	 */
-	@Override
-	protected synchronized boolean doEquals(ArrayAttribute<T> other) {
-		return value.equals(other.value);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.AbstractAttribute#doHashCode()
-	 */
-	@Override
-	protected synchronized int doHashCode() {
-		return value.hashCode();
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttributeDefinition.java
deleted file mode 100644
index 9af66ab..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/ArrayAttributeDefinition.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.core.attributes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-
-public final class ArrayAttributeDefinition<T extends Comparable<? super T>>
-extends AbstractAttributeDefinition<List<? extends T>,ArrayAttribute<T>,ArrayAttributeDefinition<T>> {
-
-	private final List<T> defaultValue;
-
-	public <U extends T> ArrayAttributeDefinition(final String uniqueId, final String name,
-			final String description, final boolean display, final U[] defaultValue) {
-		super(uniqueId, name, description, display);
-		if (defaultValue != null) {
-			this.defaultValue = Arrays.asList((T[])defaultValue.clone());
-		}
-		else {
-			this.defaultValue = new ArrayList<T>();
-		}
-	}
-
-	public ArrayAttribute<T> create() {
-		return new ArrayAttribute<T>(this, defaultValue);
-	}
-
-	public ArrayAttribute<T> create(String value) throws IllegalValueException {
-		return new ArrayAttribute<T>(this, value);
-	}
-
-	public <U extends T> ArrayAttribute<T> create(U[] value) {
-		return new ArrayAttribute<T>(this, value);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeDefinitionManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeDefinitionManager.java
deleted file mode 100644
index a7666e2..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeDefinitionManager.java
+++ /dev/null

@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.math.BigInteger;
-import java.text.DateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-public class AttributeDefinitionManager {
-	private final Map<String, IAttributeDefinition<?,?,?>> attributeDefs =
-		Collections.synchronizedMap(new HashMap<String, IAttributeDefinition<?,?,?>>());
-
-	public AttributeDefinitionManager() {
-	}
-	
-	/**
-	 * Create an attribute definition
-	 * 
-	 * @param attr
-	 */
-	public void setAttributeDefinition(IAttributeDefinition<?,?,?> attrDef) {
-		synchronized (attributeDefs) {
-			if (!attributeDefs.containsKey(attrDef.getId())) {
-				attributeDefs.put(attrDef.getId(), attrDef);
-			}
-		}
-	}
-	
-	/**
-	 * @param attrDefs
-	 */
-	public void setAttributeDefinitions(IAttributeDefinition<?,?,?>[] attrDefs) {
-		for (IAttributeDefinition<?,?,?> attrDef : attrDefs) {
-			setAttributeDefinition(attrDef);
-		}
-	}
-	
-	/**
-	 * Lookup an attribute definition
-	 * 
-	 * @param attrId
-	 * @return attribute definition
-	 */
-	public IAttributeDefinition<?,?,?> getAttributeDefinition(String attrId) {
-		return attributeDefs.get(attrId);
-	}
-	
-	/**
-	 * Clear attribute definitions
-	 */
-	public void clear() {
-		attributeDefs.clear();
-	}
-	
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @return
-	 * @throws IllegalValueException 
-	 */
-	public BigIntegerAttributeDefinition createBigIntegerAttributeDefinition(final String uniqueId,
-			final String name, final String description, final boolean display, final BigInteger defaultValue) 
-			throws IllegalValueException {
-		BigIntegerAttributeDefinition def = new BigIntegerAttributeDefinition(uniqueId, name,
-				description, display, defaultValue);
-		setAttributeDefinition(def);
-		return def;
-	}
-	
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @param min
-	 * @param max
-	 * @return
-	 * @throws IllegalValueException
-	 */
-	public BigIntegerAttributeDefinition createBigIntegerAttributeDefinition(final String uniqueId,
-			final String name, final String description, final boolean display, final BigInteger defaultValue,
-			final BigInteger min, final BigInteger max) throws IllegalValueException {
-		BigIntegerAttributeDefinition def = new BigIntegerAttributeDefinition(uniqueId, name,
-				description, display, defaultValue, min, max);
-		setAttributeDefinition(def);
-		return def;
-	}
-
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @return
-	 */
-	public BooleanAttributeDefinition createBooleanAttributeDefinition(final String uniqueId,
-			final String name, final String description, final boolean display, final Boolean defaultValue) {
-		BooleanAttributeDefinition def = new BooleanAttributeDefinition(uniqueId, name,
-				description, display, defaultValue);
-		setAttributeDefinition(def);
-		return def;
-	}
-	
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @param outputDateFormat
-	 * @return
-	 */
-	public DateAttributeDefinition createDateAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final Date defaultValue, final DateFormat outputDateFormat) {
-		DateAttributeDefinition def = new DateAttributeDefinition(uniqueId, name, 
-				description, display, defaultValue, outputDateFormat);
-		setAttributeDefinition(def);
-		return def;
-	}
-	
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @param outputDateFormat
-	 * @param min
-	 * @param max
-	 * @return
-	 * @throws IllegalValueException
-	 */
-	public DateAttributeDefinition createDateAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final Date defaultValue, final DateFormat outputDateFormat, final Date min, final Date max) throws IllegalValueException {
-		DateAttributeDefinition def = new DateAttributeDefinition(uniqueId, name, 
-				description, display, defaultValue, outputDateFormat, min, max);
-		setAttributeDefinition(def);
-		return def;
-	}
-
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @return
-	 * @throws IllegalValueException 
-	 */
-	public DoubleAttributeDefinition createDoubleAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final Double defaultValue) throws IllegalValueException {
-		DoubleAttributeDefinition def = new DoubleAttributeDefinition(uniqueId, name, 
-				description, display, defaultValue);
-		setAttributeDefinition(def);
-		return def;
-	}
-	
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @param min
-	 * @param max
-	 * @return
-	 * @throws IllegalValueException
-	 */
-	public DoubleAttributeDefinition createDoubleAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final Double defaultValue, final Double min, final Double max) throws IllegalValueException {
-		DoubleAttributeDefinition def = new DoubleAttributeDefinition(uniqueId, name, 
-				description, display, defaultValue, min, max);
-		setAttributeDefinition(def);
-		return def;
-	}
-
-	/**
-	 * @param <E>
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @return
-	 */
-	public <E extends Enum<E>> EnumeratedAttributeDefinition<E> createEnumeratedAttributeDefinition(
-			final String uniqueId, final String name, final String description,
-			final boolean display, final E defaultValue) {
-		EnumeratedAttributeDefinition<E> def = 
-			new EnumeratedAttributeDefinition<E>(uniqueId, name, description, display, defaultValue);
-		setAttributeDefinition(def);
-		return def;
-	}
-	
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @return
-	 * @throws IllegalValueException 
-	 */
-	public IntegerAttributeDefinition createIntegerAttributeDefinition(final String uniqueId,
-			final String name, final String description, final boolean display, final Integer defaultValue) throws IllegalValueException {
-		IntegerAttributeDefinition def = new IntegerAttributeDefinition(uniqueId, name,
-				description, display, defaultValue);
-		setAttributeDefinition(def);
-		return def;
-	}
-
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @param min
-	 * @param max
-	 * @return
-	 * @throws IllegalValueException
-	 */
-	public IntegerAttributeDefinition createIntegerAttributeDefinition(final String uniqueId,
-			final String name, final String description, final boolean display, 
-			final Integer defaultValue, final Integer min, final Integer max) throws IllegalValueException {
-		IntegerAttributeDefinition def = new IntegerAttributeDefinition(uniqueId, name,
-				description, display, defaultValue, min, max);
-		setAttributeDefinition(def);
-		return def;
-	}
-
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @return
-	 */
-	public StringAttributeDefinition createStringAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final String defaultValue) {
-		StringAttributeDefinition def = new StringAttributeDefinition(uniqueId, name, 
-				description, display, defaultValue);
-		setAttributeDefinition(def);
-		return def;
-	}
-	
-	/**
-	 * @param <T>
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @return
-	 */
-	public <T extends Comparable<T>> ArrayAttributeDefinition<T> createArrayAttributeDefinition(
-			final String uniqueId, final String name, final String description,
-			final boolean display, final T[] defaultValue) {
-		ArrayAttributeDefinition<T> def = new ArrayAttributeDefinition<T>(uniqueId, name,
-				description, display, defaultValue);
-		setAttributeDefinition(def);
-		return def;
-	}
-
-	/**
-	 * @param uniqueId
-	 * @param name
-	 * @param description
-	 * @param defaultValue
-	 * @param values
-	 * @return
-	 * @throws IllegalValueException
-	 */
-	public StringSetAttributeDefinition createStringSetAttributeDefinition(
-			String uniqueId, String name, String description,
-			final boolean display, String defaultValue, String[] values) throws IllegalValueException {
-		return new StringSetAttributeDefinition(uniqueId, name, description, display, defaultValue,
-				values);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeManager.java
deleted file mode 100644
index dcc5b46..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/AttributeManager.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * An attribute manager is responsible for managing a set of attribute definition ID's and
- * attributes. It is used where groups of attributes are needed.
- * 
- * @author greg
- *
- */
-public class AttributeManager {
-	private final Map<IAttributeDefinition<?,?,?>, IAttribute<?,?,?>> map = 
-		Collections.synchronizedMap(new HashMap<IAttributeDefinition<?,?,?>, IAttribute<?,?,?>>());
-	
-	public AttributeManager() {
-	}
-	
-	public AttributeManager(IAttribute<?,?,?>[] attrs) {
-		for (IAttribute<?,?,?> attr : attrs) {
-			addAttribute(attr);
-		}
-	}
-
-	/**
-	 * @param attr
-	 */
-	public void addAttribute(IAttribute<?,?,?> attr) {
-		map.put(attr.getDefinition(), attr);
-	}
-
-	/**
-	 * Add new attributes to the attributes being managed. Handle array
-	 * attributes specially: the new array is appended to an existing array, 
-	 * if any.
-	 * 
-	 * @param attrs
-	 */
-	public void addAttributes(IAttribute<?,?,?>[] attrs) {
-		synchronized (map) {
-			for (IAttribute<?,?,?> attr : attrs) {
-				IAttributeDefinition<?,?,?> def = attr.getDefinition();
-				if (map.containsKey(def) && attr instanceof ArrayAttribute) {
-					ArrayAttribute<?> arrAttr = (ArrayAttribute<?>) attr;
-					addAttributeToArrayAttribute(arrAttr);
-				} else {
-					addAttribute(attr);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param attr
-	 * @param def
-	 */
-	private <T extends Comparable<? super T>> void addAttributeToArrayAttribute(ArrayAttribute<T> attr) {
-		ArrayAttributeDefinition<T> def = attr.getDefinition();
-		ArrayAttribute<T> exAttr = (ArrayAttribute<T>)map.get(def);
-		final List<T> value = attr.getValue();
-		exAttr.addAll(value);
-	}
-
-	/**
-	 * @param id
-	 * @return
-	 */
-	public IAttribute<?,?,?> getAttribute(String id) {
-		synchronized (map) {
-			for (Map.Entry<IAttributeDefinition<?,?,?>, IAttribute<?,?,?>> entry : map.entrySet()) {
-				if (entry.getKey().getId().equals(id)) {
-					return entry.getValue();
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * @param <T>
-	 * @param <A>
-	 * @param <D>
-	 * @param def
-	 * @return
-	 */
-	public <T, A extends IAttribute<T, A, D>, D extends IAttributeDefinition<T, A, D>> A getAttribute(D def) {
-		return (A) this.getAttribute(def.getId());
-	}
-
-	/**
-	 * @return
-	 */
-	public IAttribute<?,?,?>[] getAttributes() {
-		return map.values().toArray(new IAttribute[map.size()]);
-	}
-	
-	/**
-	 * @return
-	 */
-	public IAttribute<?,?,?>[] getDisplayAttributes() {
-		List<IAttribute<?,?,?>> attrs = new ArrayList<IAttribute<?,?,?>>();
-		
-		synchronized (map) {
-			for (IAttribute<?,?,?> attr : map.values()) {
-				if (attr.getDefinition().getDisplay()) {
-					attrs.add(attr);
-				}
-			}
-		}
-		
-		return attrs.toArray(new IAttribute[attrs.size()]);
-	}
-		
-	/**
-	 * @return
-	 */
-	public IAttributeDefinition<?,?,?>[] getKeys() {
-		return map.keySet().toArray(new IAttributeDefinition[0]);
-	}
-	
-	/**
-	 * @param attr
-	 */
-	public void removeAttribute(IAttribute<?,?,?> attr) {
-		map.remove(attr.getDefinition());
-	}
-	
-	/**
-	 * @return
-	 */
-	public String[] toStringArray() {
-		ArrayList<String> res = new ArrayList<String>();
-		
-		synchronized (map) {
-			for (Map.Entry<IAttributeDefinition<?,?,?>, IAttribute<?,?,?>> entry : map.entrySet()) {
-				IAttribute<?,?,?> attr = entry.getValue();
-				if (attr instanceof ArrayAttribute) {
-					List<?> arrObj = ((ArrayAttribute<?>)attr).getValue();
-					for (Object obj : arrObj) {
-						res.add(entry.getKey().getId() + "=" + obj.toString());					
-					}
-				} else {
-					res.add(entry.getKey().getId() + "=" + attr.getValueAsString());
-				}
-			}
-		}
-		
-		return res.toArray(new String[res.size()]);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttribute.java
deleted file mode 100644
index ef2bc27..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttribute.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.math.BigInteger;
-
-public final class BigIntegerAttribute
-extends AbstractAttribute<BigInteger,BigIntegerAttribute,BigIntegerAttributeDefinition> {
-
-	private BigInteger value;
-
-	public BigIntegerAttribute(BigIntegerAttributeDefinition definition,
-			BigInteger initialValue) throws IllegalValueException {
-		super(definition);
-		setValue(initialValue);
-	}
-
-	public BigIntegerAttribute(BigIntegerAttributeDefinition definition,
-			String initialValue) throws IllegalValueException {
-		super(definition);
-		setValueAsString(initialValue);
-	}
-
-	public BigIntegerAttribute(BigIntegerAttributeDefinition definition,
-			Integer value) throws IllegalValueException {
-		this(definition, BigInteger.valueOf(value));
-	}
-
-	public synchronized BigInteger getValue() {
-		return value;
-	}
-	
-	public synchronized String getValueAsString() {
-		return value.toString();
-	}
-
-	public boolean isValid(String string) {
-		try {
-			BigInteger val = new BigInteger(string);
-			if (val.compareTo(getMinValue()) < 0 || val.compareTo(getMaxValue()) > 0) {
-				return false;
-			}
-			return true;
-		}
-		catch (NumberFormatException e) {
-			return false;
-		}
-	}
-
-	public synchronized void setValue(BigInteger value) throws IllegalValueException {
-		if (value.compareTo(getMinValue()) < 0 || value.compareTo(getMaxValue()) > 0) {
-			throw new IllegalValueException("The set valid range does not include the new value");
-		}
-		this.value = value;
-	}
-
-	public synchronized void setValue(Integer ivalue) throws IllegalValueException {
-		BigInteger value = BigInteger.valueOf(ivalue);
-		if (value.compareTo(getMinValue()) < 0 || value.compareTo(getMaxValue()) > 0) {
-			throw new IllegalValueException("The set valid range does not include the new value");
-		}
-		this.value = value;
-	}
-
-	public synchronized void setValueAsString(String string) throws IllegalValueException {
-		try {
-			BigInteger value = new BigInteger(string);
-			if (value.compareTo(getMinValue()) < 0 || value.compareTo(getMaxValue()) > 0) {
-				throw new IllegalValueException("The set valid range does not include the new value");
-			}
-			this.value = value;
-		}
-		catch (NumberFormatException e) {
-			throw new IllegalValueException(e);
-		}
-	}
-	
-	private BigInteger getMinValue() {
-		return getDefinition().getMinValue();
-	}
-	
-	private BigInteger getMaxValue() {
-		return getDefinition().getMaxValue();
-	}
-
-    @Override
-    protected synchronized int doCompareTo(BigIntegerAttribute other) {
-        return value.compareTo(other.value);
-    }
-
-    @Override
-    protected synchronized boolean doEquals(BigIntegerAttribute other) {
-        return value.equals(other.value);
-    }
-
-    @Override
-    protected synchronized int doHashCode() {
-        return value.hashCode();
-    }
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttributeDefinition.java
deleted file mode 100644
index de01726..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BigIntegerAttributeDefinition.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.math.BigInteger;
-
-
-public final class BigIntegerAttributeDefinition
-extends AbstractAttributeDefinition<BigInteger,BigIntegerAttribute,BigIntegerAttributeDefinition> {
-
-	private final BigInteger minValue;
-	private final BigInteger maxValue;
-	private final BigInteger defaultValue;
-
-	public BigIntegerAttributeDefinition(final String uniqueId, final String name,
-			final String description, final boolean display, final BigInteger defaultValue) {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-		this.minValue = BigInteger.ZERO;
-		this.maxValue = BigInteger.valueOf(Long.MAX_VALUE);
-	}
-
-	public BigIntegerAttributeDefinition(final String uniqueId, final String name,
-			final String description, final boolean display, final BigInteger defaultValue,
-			final BigInteger minValue, final BigInteger maxValue) throws IllegalValueException {
-		super(uniqueId, name, description, display);
-		if (minValue.compareTo(maxValue) > 0) {
-			throw new IllegalArgumentException("minValue must be less than or equal to maxValue");
-		}
-		if (defaultValue.compareTo(minValue) < 0 || defaultValue.compareTo(maxValue) > 0) {
-			throw new IllegalValueException("The set valid range does not include the default value");
-		}
-		this.defaultValue = defaultValue;
-		this.minValue = minValue;
-		this.maxValue = maxValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#create(java.lang.String)
-	 */
-	public BigIntegerAttribute create() throws IllegalValueException {
-		return new BigIntegerAttribute(this, defaultValue);
-	}
-
-	public BigIntegerAttribute create(String value) throws IllegalValueException {
-		return new BigIntegerAttribute(this, value);
-	}
-
-	public BigIntegerAttribute create(BigInteger value) throws IllegalValueException {
-		return new BigIntegerAttribute(this, value);
-	}
-
-	public BigIntegerAttribute create(Integer value) throws IllegalValueException {
-		return new BigIntegerAttribute(this, value);
-	}
-
-	public BigInteger getMaxValue() {
-		return maxValue;
-	}
-
-	public BigInteger getMinValue() {
-		return minValue;
-	}
-	
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttribute.java
deleted file mode 100644
index a14649b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttribute.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public class BooleanAttribute 
-extends AbstractAttribute<Boolean,BooleanAttribute,BooleanAttributeDefinition> {
-
-	private Boolean value;
-
-	public BooleanAttribute(BooleanAttributeDefinition definition, Boolean initialValue) {
-		super(definition);
-		this.value = initialValue;
-	}
-	
-	public BooleanAttribute(BooleanAttributeDefinition definition, String initialValue) {
-		super(definition);
-		this.value = Boolean.valueOf(initialValue);
-	}
-	
-	public synchronized Boolean getValue() {
-		return value.booleanValue();
-	}
-	
-	public synchronized String getValueAsString() {
-		return value.toString();
-	}
-
-	public boolean isValid(String string) {
-		if ("true".equalsIgnoreCase(string) || "false".equalsIgnoreCase(string)) {
-			return true;
-		}
-		return false;
-	}
-
-	public synchronized void setValue(Boolean value) {
-		this.value = value;
-	}
-
-	public synchronized void setValueAsString(String string) throws IllegalValueException {
-		if (!isValid(string)) {
-			throw new IllegalValueException(string + " is not a legal Boolean");
-		}
-		value = Boolean.valueOf(string);
-	}
-
-    @Override
-    protected synchronized int doCompareTo(BooleanAttribute other) {
-        return value.compareTo(other.value);
-    }
-
-    @Override
-    protected synchronized boolean doEquals(BooleanAttribute other) {
-        return value.equals(other.value);
-    }
-
-    @Override
-    protected synchronized int doHashCode() {
-        return value.hashCode();
-    }
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttributeDefinition.java
deleted file mode 100644
index 162237f..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/BooleanAttributeDefinition.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-
-public final class BooleanAttributeDefinition
-extends AbstractAttributeDefinition<Boolean,BooleanAttribute,BooleanAttributeDefinition> {
-
-	private final Boolean defaultValue;
-	
-	public BooleanAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final Boolean defaultValue) {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#create(java.lang.String)
-	 */
-	public BooleanAttribute create() {
-		return new BooleanAttribute(this, defaultValue);
-	}
-
-	public BooleanAttribute create(Boolean value) {
-		return new BooleanAttribute(this, value);
-	}
-	
-	public BooleanAttribute create(String value) {
-		return new BooleanAttribute(this, value);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttribute.java
deleted file mode 100644
index a87bbfe..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttribute.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.text.DateFormat;
-import java.text.ParsePosition;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-public class DateAttribute
-extends AbstractAttribute<Calendar, DateAttribute, DateAttributeDefinition> {
-
-	private static DateFormat[] dateFormats = null;
-
-	public static void main(String[] args) throws IllegalValueException {
-		Calendar cal = Calendar.getInstance();
-		DateAttributeDefinition def = new DateAttributeDefinition("uniqId", "name", "desc", true, cal.getTime(), DateFormat.getDateTimeInstance());
-		DateAttribute mda = (DateAttribute)def.create();
-		mda.setValue(cal);
-		System.out.println(mda.toString());
-		String str = mda.toString();
-		cal.add(Calendar.MONTH, 2);
-		System.out.println(mda.toString());
-		mda.setValueAsString(str);
-		System.out.println(mda.toString());
-	}
-
-	private static DateFormat[] getDateFormats() {
-		if (dateFormats != null) {
-			return dateFormats;
-		}
-		Locale[] locals = DateFormat.getAvailableLocales();
-		final int styles[] = { DateFormat.SHORT, DateFormat.MEDIUM,
-				DateFormat.LONG, DateFormat.FULL };
-		ArrayList<DateFormat> dfs = new ArrayList<DateFormat>(styles.length * styles.length
-				* locals.length);
-		for (int i = 0; i < locals.length; ++i) {
-			for (int ds = 0; ds < styles.length; ++ds) {
-				final int dateStyle = styles[ds];
-				for (int ts = 0; ts < styles.length; ++ts) {
-					final int timeStyle = styles[ts];
-					dfs.add(DateFormat.getDateTimeInstance(dateStyle,
-							timeStyle, locals[i]));
-				}
-			}
-		}
-		System.out.println("There are " + dfs.size() + " date formats");
-		dateFormats = (DateFormat[]) dfs.toArray(new DateFormat[dfs.size()]);
-		return dateFormats;
-	}
-
-	protected final Calendar value = Calendar.getInstance();
-	
-	public DateAttribute(DateAttributeDefinition definition, Date initialValue) throws IllegalValueException {
-		super(definition);
-		setValue(initialValue);
-	}
-
-	public DateAttribute(DateAttributeDefinition definition, String initialValue) throws IllegalValueException {
-		super(definition);
-		setValueAsString(initialValue);
-	}
-
-	public DateFormat getDateFormat() {
-		return getDefinition().getDateFormat();
-	}
-	
-	public Date getDateValue() {
-		return value.getTime();
-	}
-
-
-	public Calendar getValue() {
-		return (Calendar) value.clone();
-	}
-	
-	public String getValueAsString() {
-		return getDateFormat().format(value);
-	}
-	
-	public boolean isValid(String string) {
-		final Date date = parseString(string);
-		if (date == null) {
-			return false;
-		}
-		if (date.compareTo(getMinDate()) < 0) {
-			return false;
-		}
-		if (date.compareTo(getMaxDate()) > 0) {
-			return false;
-		}
-		return true;
-	}
-
-	public void setValue(Calendar calendar) throws IllegalValueException {
-		setValue(calendar.getTime());
-	}
-
-	public void setValue(Date date) throws IllegalValueException {
-		value.setTime(date);
-		if (date.compareTo(getMinDate()) < 0) {
-			throw new IllegalValueException("date specified is before min date");
-		}
-		if (date.compareTo(getMaxDate()) > 0) {
-			throw new IllegalValueException("date specified is after max date");
-		}
-	}
-
-	public void setValueAsString(String string) throws IllegalValueException {
-		final Date date = parseString(string);
-		if (date == null) {
-			throw new IllegalValueException("Unable to parse \"" + string
-					+ "\" into a date");
-		}
-		if (date.compareTo(getMinDate()) < 0) {
-			throw new IllegalValueException("Date, " + string + ", is before " + toString(getMinDate()));
-		}
-		if (date.compareTo(getMaxDate()) > 0) {
-			throw new IllegalValueException("Date, " + string + ", is after " + toString(getMaxDate()));
-		}
-		value.setTime(date);
-	}
-	
-	public String toString() {
-		return getValueAsString();
-		
-	}
-
-	private Date getMaxDate() {
-		return getDefinition().getMaxDate();
-	}
-
-	private Date getMinDate() {
-		return getDefinition().getMinDate();
-	}
-
-	private Date parseString(String string) {
-		Date date = null;
-		final ParsePosition parsePosition = new ParsePosition(0);
-		date = getDateFormat().parse(string, parsePosition);
-		if (date != null) {
-			return date;
-		}
-		for (int i = 0; i < getDateFormats().length; ++i) {
-			parsePosition.setIndex(0);
-			date = getDateFormats()[i].parse(string, parsePosition);
-			if (date != null) {
-				return date;
-			}
-		}
-		return date;
-	}
-	
-	private String toString(Date date) {
-		return getDateFormat().format(date);
-	}
-
-    @Override
-    protected int doCompareTo(DateAttribute other) {
-        return value.compareTo(other.value);
-    }
-
-    @Override
-    protected boolean doEquals(DateAttribute other) {
-        return value.equals(other.value);
-    }
-
-    @Override
-    protected int doHashCode() {
-        return value.hashCode();
-    }
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttributeDefinition.java
deleted file mode 100644
index dd898e0..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DateAttributeDefinition.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-public final class DateAttributeDefinition
-extends AbstractAttributeDefinition<Calendar, DateAttribute, DateAttributeDefinition> {
-
-	private Date minDate = new Date(Long.MIN_VALUE);
-	private Date maxDate = new Date(Long.MAX_VALUE);
-	
-	private final DateFormat outputDateFormat;
-	private final Date defaultValue;
-
-	public DateAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, 
-			final Date defaultValue, final DateFormat outputDateFormat) {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-		this.outputDateFormat = outputDateFormat;
-	}
-
-	public DateAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, 
-			final Date defaultValue, final DateFormat outputDateFormat, final Date min, final Date max) throws IllegalValueException {
-		super(uniqueId, name, description, display);
-		if (defaultValue.compareTo(getMinDate()) < 0) {
-			throw new IllegalValueException("default date specified is before min date");
-		}
-		if (defaultValue.compareTo(getMaxDate()) > 0) {
-			throw new IllegalValueException("default date specified is after max date");
-		}
-		this.defaultValue = defaultValue;
-		this.outputDateFormat = outputDateFormat;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#create(java.lang.String)
-	 */
-	public DateAttribute create() throws IllegalValueException {
-		return new DateAttribute(this, defaultValue);
-	}
-	
-	public DateAttribute create(String value) throws IllegalValueException {
-		return new DateAttribute(this, value);
-	}
-
-	public synchronized Date getMaxDate() {
-		return maxDate;
-	}
-
-	public synchronized Date getMinDate() {
-		return minDate;
-	}
-	
-	public DateFormat getDateFormat() {
-		return outputDateFormat;
-	}
-
-	public synchronized void setValidRange(Date minDate, Date maxDate) throws IllegalValueException {
-		if (minDate == null) {
-			this.minDate = new Date(Long.MIN_VALUE);
-		}
-		else {
-			this.minDate = minDate;
-		}
-		if (maxDate == null) {
-			this.maxDate = new Date(Long.MAX_VALUE);
-		}
-		else {
-			this.maxDate = maxDate;
-		}
-		if (this.minDate.compareTo(this.maxDate) > 0) {
-				throw new IllegalArgumentException("minDate must be less than or equal to maxDate");
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttribute.java
deleted file mode 100644
index 2030ff7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttribute.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public final class DoubleAttribute
-extends AbstractAttribute<Double,DoubleAttribute,DoubleAttributeDefinition> {
-
-	private Double value;
-
-	public DoubleAttribute(DoubleAttributeDefinition description, Double initialValue) throws IllegalValueException {
-		super(description);
-		setValue(initialValue);
-	}
-
-	public DoubleAttribute(DoubleAttributeDefinition description, String initialValue) throws IllegalValueException {
-		super(description);
-		setValueAsString(initialValue);
-	}
-
-	public synchronized Double getValue() {
-		return value;
-	}
-	
-	public synchronized String getValueAsString() {
-		return value.toString();
-	}
-	
-	public boolean isValid(String string) {
-		try {
-			Double.parseDouble(string);
-			return true;
-		}
-		catch (NumberFormatException e) {
-			return false;
-		}
-	}
-
-	public synchronized void setValue(Double value) throws IllegalValueException {
-		if (value.doubleValue() < getMinValue() || value.doubleValue() > getMaxValue()) {
-			throw new IllegalValueException("The set valid range does not include the new value");
-		}
-		this.value = value;
-	}
-
-	public synchronized void setValueAsString(String string) throws IllegalValueException {
-		try {
-			Double value = Double.valueOf(string);
-			if (value.doubleValue() < getMinValue() || value.doubleValue() > getMaxValue()) {
-				throw new IllegalValueException("The set valid range does not include the new value");
-			}
-			this.value = value;
-		}
-		catch (NumberFormatException e) {
-			throw new IllegalValueException(e);
-		}
-	}
-	
-	private double getMinValue() {
-		return getDefinition().getMinValue();
-	}
-	
-	private double getMaxValue() {
-		return getDefinition().getMaxValue();
-	}
-
-    @Override
-    protected synchronized int doCompareTo(DoubleAttribute other) {
-        return value.compareTo(other.value);
-    }
-
-    @Override
-    protected synchronized boolean doEquals(DoubleAttribute other) {
-        return value.equals(other.value);
-    }
-
-    @Override
-    protected synchronized int doHashCode() {
-        return value.hashCode();
-    }
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttributeDefinition.java
deleted file mode 100644
index 2a5475e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/DoubleAttributeDefinition.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-
-public final class DoubleAttributeDefinition
-extends AbstractAttributeDefinition<Double,DoubleAttribute,DoubleAttributeDefinition> {
-
-	private final Double minValue;
-	private final Double maxValue;
-	private final Double defaultValue;
-
-	public DoubleAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final Double defaultValue) {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-		this.minValue = Double.NEGATIVE_INFINITY;
-		this.maxValue = Double.POSITIVE_INFINITY;
-	}
-
-	public DoubleAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, 
-			final Double defaultValue, final double minValue, final double maxValue) throws IllegalValueException {
-		super(uniqueId, name, description, display);
-		if (minValue > maxValue) {
-			throw new IllegalArgumentException("minValue must be less than or equal to maxValue");
-		}
-		if (defaultValue < minValue || defaultValue > maxValue) {
-			throw new IllegalValueException("The set valid range does not include the default value");
-		}
-		this.defaultValue = defaultValue;
-		this.minValue = minValue;
-		this.maxValue = maxValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#create(java.lang.String)
-	 */
-	public DoubleAttribute create() throws IllegalValueException {
-		return new DoubleAttribute(this, defaultValue);
-	}
-
-	public DoubleAttribute create(String value) throws IllegalValueException {
-		return new DoubleAttribute(this, value);
-	}
-
-	public Double getMaxValue() {
-		return maxValue;
-	}
-
-	public Double getMinValue() {
-		return minValue;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttribute.java
deleted file mode 100644
index 36beeec..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttribute.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.core.attributes;
-
-import java.util.List;
-
-/**
- * @author rsqrd
- *
- */
-public final class EnumeratedAttribute<E extends Enum<E>> extends
-		AbstractAttribute<E, EnumeratedAttribute<E>, EnumeratedAttributeDefinition<E>> {
-
-	private E value;
-
-	/**
-	 * @param definition
-	 * @param valueIndex
-	 * @throws IllegalValueException
-	 */
-	public EnumeratedAttribute(EnumeratedAttributeDefinition<E> definition,
-			int valueIndex) throws IllegalValueException {
-		super(definition);
-		setValue(valueIndex);
-	}
-
-	/**
-	 * @param definition
-	 * @param valueString
-	 * @throws IllegalValueException
-	 */
-	public EnumeratedAttribute(EnumeratedAttributeDefinition<E> definition,
-			String valueString) throws IllegalValueException {
-		super(definition);
-		setValueAsString(valueString);
-	}
-
-	/**
-	 * @param description
-	 * @param enumerations
-	 * @param value
-	 */
-	public EnumeratedAttribute(EnumeratedAttributeDefinition<E> definition, E value) {
-		super(definition);
-		setValue(value);
-	}
-
-	/**
-     * @return
-     */
-    public List<? extends E> getEnumerations() {
-		return getDefinition().getEnumerations();
-	}
-
-    /**
-     * @return
-     */
-    public List<String> getEnumerationStrings() {
-		return getDefinition().getEnumerationStrings();
-	}
-    
-	/**
-     * @return
-     */
-    public synchronized E getValue() {
-        return value;
-    }
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#getValueAsString()
-	 */
-	public synchronized String getValueAsString() {
-		return value.toString();
-	}
-	
-	/**
-	 * @return the valueIndex
-	 */
-	public synchronized int getValueIndex() {
-		return value.ordinal();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#isValid(java.lang.String)
-	 */
-	public boolean isValid(String string) {
-		int vi = getEnumerations().indexOf(string);
-		if (vi == -1) {
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * @param value
-	 */
-	public synchronized void setValue(E value) {
-		this.value = value;
-	}
-
-	/**
-	 * @param valueIndex
-	 * @throws IllegalValueException
-	 */
-	public synchronized void setValue(int valueIndex) throws IllegalValueException {
-		final List<? extends E> enumerations = getEnumerations();
-		if (valueIndex < 0 || valueIndex >= enumerations.size()) {
-			throw new IllegalValueException("valueIndex is out of range");
-		}
-		this.value = enumerations.get(valueIndex);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#setValue(java.lang.String)
-	 */
-	public synchronized void setValueAsString(String string) throws IllegalValueException {
-		Class<E> enumClass = getDefinition().getEnumClass();
-        E eval;
-        try {
-        	eval = E.valueOf(enumClass, string);
-        } catch (IllegalArgumentException e) {
-        	throw new IllegalValueException(e);
-        }
-		this.value = eval;
-	}
-
-    @Override
-    protected synchronized int doCompareTo(EnumeratedAttribute<E> other) {
-        return value.compareTo(other.value);
-    }
-
-    @Override
-    protected synchronized boolean doEquals(EnumeratedAttribute<E> other) {
-        return value == other.value;
-    }
-
-    @Override
-    protected synchronized int doHashCode() {
-        return value.hashCode();
-    }
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttributeDefinition.java
deleted file mode 100644
index 09d52b2..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/EnumeratedAttributeDefinition.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-
-public final class EnumeratedAttributeDefinition<E extends Enum<E>>
-extends AbstractAttributeDefinition<E,EnumeratedAttribute<E>,EnumeratedAttributeDefinition<E>> {
-
-	private final E defaultValue;
-	private final Class<E> enumClass;
-
-    public EnumeratedAttributeDefinition(final String uniqueId,
-			final String name, final String description, final boolean display, 
-			final E defaultValueIn) {
-		super(uniqueId, name, description, display);
-		final Class<E> eClass = (Class<E>) defaultValueIn.getClass();
-        this.enumClass = eClass;
-		this.defaultValue = defaultValueIn;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#create(java.lang.String)
-	 */
-	public EnumeratedAttribute<E> create() {
-		return new EnumeratedAttribute<E>(this, defaultValue);
-	}
-
-	public EnumeratedAttribute<E> create(E value) {
-		return new EnumeratedAttribute<E>(this, value);
-	}
-
-	public EnumeratedAttribute<E> create(int value) throws IllegalValueException {
-		return new EnumeratedAttribute<E>(this, value);
-	}
-
-	public EnumeratedAttribute<E> create(String value) throws IllegalValueException {
-		return new EnumeratedAttribute<E>(this, value);
-	}
-
-	public Class<E> getEnumClass() {
-		return enumClass;
-	}
-
-	public List<E> getEnumerations() {
-		return Arrays.asList(enumClass.getEnumConstants());
-	}
-
-	public List<String> getEnumerationStrings() {
-		final List<E> values = getEnumerations();
-		ArrayList<String> strings = new ArrayList<String>(values.size());
-		for (E value : values) {
-			strings.add(value.toString());
-		}
-		return strings;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttribute.java
deleted file mode 100644
index cc3cb28..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttribute.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public interface IAttribute<T, A extends IAttribute<T,A,D>, D extends IAttributeDefinition<T,A,D>>
-	extends Comparable<A> {
-	
-	/**
-	 * @return the attribute definition object associated with this attribute
-	 */
-	public D getDefinition();
-	
-	/**
-	 * @return
-	 */
-	public T getValue();
-	
-	/**
-	 * @return string
-	 */
-	public String getValueAsString();
-	
-	/**
-	 * @return whether this attribute is enabled.
-	 */
-	public boolean isEnabled();
-
-	/**
-	 * Is the string parsable to a valid
-	 * attribute of this type?
-	 * 
-	 * @param string
-	 * @return
-	 */
-	public boolean isValid(String string);
-		
-	/**
-	 * @param value
-	 * @throws IllegalValueException
-	 */
-	public void setValue(T value) throws IllegalValueException;
-	
-	/**
-	 * @param string
-	 * @throws IAttribute.IllegalValue
-	 */
-	public void setValueAsString(String string) throws IllegalValueException;
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttributeDefinition.java
deleted file mode 100644
index cbc85a1..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IAttributeDefinition.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public interface IAttributeDefinition<T,
-									  A extends IAttribute<T,A,D>,
-                                      D extends IAttributeDefinition<T,A,D>>
-extends Comparable<IAttributeDefinition<?,?,?>> {
-
-	/**
-	 * @return
-	 */
-	public String getDescription();
-
-	/**
-	 * @return
-	 */
-	public boolean getDisplay();
-	
-	/**
-	 * @return
-	 */
-	public String getName();
-	
-	/**
-	 * @return
-	 */
-	public String getId();
-	
-	/**
-	 * @return
-	 */
-	public A create() throws IllegalValueException;
-	
-	/**
-	 * @return
-	 */
-	public A create(String value) throws IllegalValueException;
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IllegalValueException.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IllegalValueException.java
deleted file mode 100644
index 5e4676d..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IllegalValueException.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public class IllegalValueException extends Exception {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 2366875582524976226L;
-
-	public IllegalValueException(String message) {
-		super(message);
-	}
-
-	public IllegalValueException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public IllegalValueException(Throwable cause) {
-		super(cause);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttribute.java
deleted file mode 100644
index 53ef674..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttribute.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-public final class IntegerAttribute
-extends AbstractAttribute<Integer,IntegerAttribute,IntegerAttributeDefinition> {
-
-	private Integer value;
-
-	public IntegerAttribute(IntegerAttributeDefinition definition, Integer initialValue) throws IllegalValueException {
-		super(definition);
-		setValue(initialValue);
-	}
-
-	public IntegerAttribute(IntegerAttributeDefinition definition, String initialValue) throws IllegalValueException {
-		super(definition);
-		setValueAsString(initialValue);
-	}
-
-	public synchronized Integer getValue() {
-		return value.intValue();
-	}
-	
-	public synchronized String getValueAsString() {
-		return value.toString();
-	}
-
-	public boolean isValid(String string) {
-		try {
-			int val = Integer.parseInt(string);
-			if (val < getMinValue() || val > getMaxValue()) {
-				return false;
-			}
-			return true;
-		}
-		catch (NumberFormatException e) {
-			return false;
-		}
-	}
-
-	public synchronized void setValue(Integer value) throws IllegalValueException {
-		if (value.intValue() < getMinValue() || value.intValue() > getMaxValue()) {
-			throw new IllegalValueException("The set valid range does not include the new value");
-		}
-		this.value = value;
-	}
-
-	public synchronized void setValueAsString(String string) throws IllegalValueException {
-		try {
-			Integer value = Integer.valueOf(string);
-			if (value.intValue() < getMinValue() || value.intValue() > getMaxValue()) {
-				throw new IllegalValueException("The set valid range does not include the new value");
-			}
-			this.value = value;
-		}
-		catch (NumberFormatException e) {
-			throw new IllegalValueException(e);
-		}
-	}
-	
-	private int getMinValue() {
-		return getDefinition().getMinValue();
-	}
-	
-	private int getMaxValue() {
-		return getDefinition().getMaxValue();
-	}
-
-    @Override
-    protected synchronized int doCompareTo(IntegerAttribute other) {
-        return value.compareTo(other.value);
-    }
-
-    @Override
-    protected synchronized boolean doEquals(IntegerAttribute other) {
-        return value.equals(other.value);
-    }
-
-    @Override
-    protected synchronized int doHashCode() {
-        return value.hashCode();
-    }
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttributeDefinition.java
deleted file mode 100644
index 9d3288d..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/IntegerAttributeDefinition.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-
-public final class IntegerAttributeDefinition
-extends AbstractAttributeDefinition<Integer,IntegerAttribute,IntegerAttributeDefinition> {
-
-	private final Integer minValue;
-	private final Integer maxValue;
-	private final Integer defaultValue;
-
-	public IntegerAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final Integer defaultValue) {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-		this.minValue = 0;
-		this.maxValue = Integer.MAX_VALUE;
-	}
-
-	public IntegerAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, 
-			final Integer defaultValue, final Integer minValue, final Integer maxValue) throws IllegalValueException {
-		super(uniqueId, name, description, display);
-		if (minValue > maxValue) {
-			throw new IllegalArgumentException("minValue must be less than or equal to maxValue");
-		}
-		if (defaultValue < minValue || defaultValue > maxValue) {
-			throw new IllegalValueException("The set valid range does not include the default value");
-		}
-		this.defaultValue = defaultValue;
-		this.minValue = minValue;
-		this.maxValue = maxValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#create(java.lang.String)
-	 */
-	public IntegerAttribute create() throws IllegalValueException {
-		return new IntegerAttribute(this, defaultValue);
-	}
-
-	public IntegerAttribute create(String value) throws IllegalValueException {
-		return new IntegerAttribute(this, value);
-	}
-
-	public IntegerAttribute create(Integer value) throws IllegalValueException {
-		return new IntegerAttribute(this, value);
-	}
-
-	public Integer getMaxValue() {
-		return maxValue;
-	}
-
-	public Integer getMinValue() {
-		return minValue;
-	}
-	
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttribute.java
deleted file mode 100644
index b259dac..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttribute.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-
-public final class StringAttribute
-extends AbstractAttribute<String,StringAttribute,StringAttributeDefinition> {
-
-	private final StringBuffer value = new StringBuffer();
-
-	public StringAttribute(StringAttributeDefinition description, String initialValue) {
-		super(description);
-		setValueAsString(initialValue);
-	}
-
-	public synchronized String getValue() {
-		return value.toString();
-	}
-	
-	public String getValueAsString() {
-		return getValue();
-	}
-	
-	public boolean isValid(String string) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#setValue(java.lang.Object)
-	 */
-	public void setValue(String value) throws IllegalValueException {
-		setValueAsString(value);
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ptp.core.attributes.IAttribute#setValueAsString(java.lang.String)
-     */
-    public synchronized void setValueAsString(String string) {
-    	if (string == null) {
-    		string = "";
-    	}
-		this.value.replace(0, this.value.length(), string);
-	}
-
-    @Override
-    protected synchronized int doCompareTo(StringAttribute other) {
-        return value.toString().compareTo(other.value.toString());
-    }
-
-    @Override
-    protected synchronized boolean doEquals(StringAttribute other) {
-        return value.equals(other.value);
-    }
-
-	@Override
-    protected synchronized int doHashCode() {
-        return value.hashCode();
-    }
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttributeDefinition.java
deleted file mode 100644
index eb8120c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringAttributeDefinition.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-
-public final class StringAttributeDefinition
-extends AbstractAttributeDefinition<String,StringAttribute,StringAttributeDefinition> {
-
-	private final String defaultValue;
-	
-	public StringAttributeDefinition(final String uniqueId, final String name, 
-			final String description, final boolean display, final String defaultValue) {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#create(java.lang.String)
-	 */
-	public StringAttribute create() {
-		return new StringAttribute(this, defaultValue);
-	}
-
-	public StringAttribute create(String value) {
-		return new StringAttribute(this, value);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttribute.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttribute.java
deleted file mode 100644
index e619a1a..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttribute.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.util.List;
-
-public final class StringSetAttribute
-extends AbstractAttribute<String,StringSetAttribute,StringSetAttributeDefinition> {
-
-	private String value;
-
-	/**
-	 * @param definition
-	 * @throws IllegalValueException
-	 */
-	public StringSetAttribute(StringSetAttributeDefinition definition) throws IllegalValueException {
-		super(definition);
-		setValueAsString(definition.getDefaultValue());
-	}
-
-	/**
-	 * @param definition
-	 * @param valueIn
-	 * @throws IllegalValueException
-	 */
-	public StringSetAttribute(StringSetAttributeDefinition definition, String valueIn) throws IllegalValueException {
-		super(definition);
-		setValueAsString(valueIn);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#getValue()
-	 */
-	public String getValue() {
-		return getValueAsString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#getValueAsString()
-	 */
-	public synchronized String getValueAsString() {
-		return value;
-	}
-
-	public synchronized int getValueIndex() {
-        return getDefinition().getValues().indexOf(value);
-    }
-
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#isValid(java.lang.String)
-	 */
-	public boolean isValid(String valueIn) {
-		final List<String> values = getDefinition().getValues();
-		final boolean isValid = values.contains(valueIn);
-		return isValid;
-	}
-
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#setValue(java.lang.Object)
-	 */
-	public void setValue(String value) throws IllegalValueException {
-		setValueAsString(value);
-	}
-
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttribute#setValue(java.lang.String)
-	 */
-	public synchronized void setValueAsString(String valueIn) throws IllegalValueException {
-		if (!isValid(valueIn)) {
-			throw new IllegalValueException("value: " + valueIn +
-					" is not in StringSetAttribute: " +	getDefinition().getName());
-		}
-		this.value = valueIn;
-	}
-
-    @Override
-    protected int doCompareTo(StringSetAttribute other) {
-        return getValueIndex() - other.getValueIndex();
-    }
-
-	@Override
-    protected synchronized boolean doEquals(StringSetAttribute other) {
-        return value.equals(other.value);
-    }
-
-	@Override
-    protected synchronized int doHashCode() {
-        return value.hashCode();
-    }
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttributeDefinition.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttributeDefinition.java
deleted file mode 100644
index 2b050a8..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/attributes/StringSetAttributeDefinition.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.attributes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public final class StringSetAttributeDefinition
-extends AbstractAttributeDefinition<String,StringSetAttribute,StringSetAttributeDefinition> {
-
-	private final String defaultValue;
-	private final List<String> values;
-
-	public StringSetAttributeDefinition(final String uniqueId, final String name,
-			final String description, final boolean display, 
-			final String defaultValue, final String[] values) throws IllegalValueException {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-		this.values = Arrays.asList(values);
-	}
-
-	public StringSetAttributeDefinition(final String uniqueId, final String name,
-			final String description, final boolean display, 
-			final String defaultValue, final List<String> values)
-	throws IllegalValueException {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-		this.values = new ArrayList<String>(values);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttributeDefinition#create()
-	 */
-	public StringSetAttribute create() throws IllegalValueException {
-		return new StringSetAttribute(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.attributes.IAttributeDefinition#create(java.lang.String)
-	 */
-	public StringSetAttribute create(String value) throws IllegalValueException {
-		return new StringSetAttribute(this, value);
-	}
-
-	/**
-	 * @return the defaultValue
-	 */
-	public String getDefaultValue() {
-		return defaultValue;
-	}
-
-	/**
-	 * @return the values
-	 */
-	public List<String> getValues() {
-		return values;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPElementControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPElementControl.java
deleted file mode 100644
index 5ab69b7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPElementControl.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import org.eclipse.ptp.core.elements.IPElement;
-
-/**
- * This is the generic parallel element class which all the specific classes
- * extend, like Machine, Node, Job, etc. This base class maintains a name for
- * each entity that extends it and handles parent/child operations. A key is
- * also maintained for each parallel element which is used in storing these
- * elements in hash tables and such.
- * 
- * @author Nathan DeBardeleben
- */
-public interface IPElementControl extends IPElement {
-	// public String NAME_TAG = "";
-
-	/**
-	 * Element tag for an error / undefined type
-	 */
-	public static final int P_TYPE_ERROR = -1;
-	
-	/**
-	 * Element tag for Universe Elements
-	 */
-	public static final int P_UNIVERSE = 10;
-
-	/**
-	 * Element tag for Machine Elements
-	 */
-	public static final int P_MACHINE = 11;
-
-	/**
-	 * Element tag for Node Elements
-	 */
-	public static final int P_NODE = 12;
-
-	/**
-	 * Element tag for Job Elements
-	 */
-	public static final int P_JOB = 13;
-
-	/**
-	 * Element tag for Process Elements
-	 */
-	public static final int P_PROCESS = 14;
-	
-	/**
-	 * Element tag for Resource Manager Elements
-	 */
-	public static final int P_RESOURCE_MANAGER = 15;
-	
-	/**
-	 * Element tag for Queue Elements
-	 */
-	public static final int P_QUEUE = 16;
-
-	/**
-	 * Returns the element type (such as P_UNIVERSE, P_MACHINE, etc.) for this
-	 * Element. This type is usually set through the constructor of the
-	 * implementing class of this interface.
-	 * 
-	 * @return The element type of this Element which can be compared with the
-	 *         public statics of this interface.
-	 * @see P_UNIVERSE
-	 * @see P_MACHINE
-	 * @see P_NODE
-	 * @see P_JOB
-	 * @see P_PROCESS
-	 */
-	public int getElementType();
-
-	/**
-	 * If this Element has a parent then this method returns it, else it returns
-	 * null.
-	 * 
-	 * @return The parent Element of this Element, null if there is none
-	 */
-	public IPElementControl getParent();
-
-	/*
-	 * public IPUniverse getPUniverse(); public IPMachine getPMachine(); public
-	 * IPJob getPRoot();
-	 */
-
-	/**
-	 * Returns true if this Element has children Elements, else returns false.
-	 * 
-	 * @return True if this Element has children Elements, else false
-	 */
-	public boolean hasChildren();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPJobControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPJobControl.java
deleted file mode 100644
index 9e3073c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPJobControl.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import java.util.Collection;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-
-public interface IPJobControl extends IPElementControl, IPJob {
-
-	/**
-	 * Add attributes to a collection of processes.
-	 * 
-	 * @param processes collection of IPProcessControl
-	 * @param attrs array of attributes to add to each process
-	 */
-	public void addProcessAttributes(Collection<IPProcessControl> processes, IAttribute<?,?,?>[] attrs);
-
-	/**
-	 * Add the collection of processes to the job.
-	 * 
-	 * @param processes collection of IPProcessControls
-	 */
-	public void addProcesses(Collection<IPProcessControl> processes);
-	
-	/**
-	 * Get all the processes known by this job
-	 * 
-	 * @return collection of processes
-	 */
-	public Collection<IPProcessControl> getProcessControls();
-
-	/**
-	 * Get the parent of this job
-	 * 
-	 * @return parent queue
-	 */
-	public IPQueueControl getQueueControl();
-	
-	/**
-	 * Remove processes from the job
-	 * 
-	 * @param processes to remove
-	 */
-	public void removeProcesses(Collection<IPProcessControl> processes);
-	
-	/**
-	 * Set the launch configuration that was used to launch this job.
-	 * 
-	 * @param configuration
-	 */
-	public void setLaunchConfiguration(ILaunchConfiguration configuration);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPMachineControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPMachineControl.java
deleted file mode 100644
index 6e23120..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPMachineControl.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPMachine;
-
-public interface IPMachineControl extends IPElementControl, IPMachine {
-
-	/**
-	 * Add attributes to a collection of nodes.
-	 * 
-	 * @param nodes collection of IPNodeControls
-	 * @param attrs array of attributes to add to each node
-	 */
-	public void addNodeAttributes(Collection<IPNodeControl> nodes, IAttribute<?,?,?>[] attrs);
-	
-	/**
-	 * Add a collection of nodes to the machine.
-	 * 
-	 * @param node collection of IPNodeControls
-	 */
-	public void addNodes(Collection<IPNodeControl> nodes);
-	
-	/**
-	 * Get the nodes known by this machine
-	 * 
-	 * @return array of nodes
-	 */
-	public Collection<IPNodeControl> getNodeControls();
-
-	/**
-	 * Remove a collection of nodes from this machine
-	 * 
-	 * @param nodes to remove
-	 */
-	public void removeNodes(Collection<IPNodeControl> nodes);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPNodeControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPNodeControl.java
deleted file mode 100644
index 05282db..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPNodeControl.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPNode;
-
-public interface IPNodeControl extends IPElementControl, IPNode {
-	/**
-	 * Add a collection of processes to the node
-	 * 
-	 * @param processes to add
-	 */
-	public void addProcesses(Collection<IPProcessControl> processes);
-
-	/**
-	 * Get the parent machine for this node
-	 * 
-	 * @return parent machine
-	 */
-	public IPMachineControl getMachineControl();
-
-	/**
-	 * Get the processes associated with this node
-	 * 
-	 * @return collection of processes
-	 */
-	public Collection<IPProcessControl> getProcessControls();
-	
-	/**
-	 * Remove processes from this node
-	 * 
-	 * @param processe to remove
-	 */
-	public void removeProcesses(Collection<IPProcessControl> processes);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPProcessControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPProcessControl.java
deleted file mode 100644
index 0427006..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPProcessControl.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPProcess;
-
-public interface IPProcessControl extends IPElementControl, IPProcess {
-
-	/**
-	 * Add a mapping from this process to a node
-	 */
-	public void addNode(IPNode node);
-	
-	/**
-	 * Get the parent job for this process
-	 * 
-	 * @return parent job
-	 */
-	public IPJobControl getJobControl();
-
-	/**
-	 * Remove the mapping from this process to a node
-	 */
-	public void removeNode();
-	
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPQueueControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPQueueControl.java
deleted file mode 100644
index 835e9d2..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPQueueControl.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-
-public interface IPQueueControl extends IPElementControl, IPQueue {
-	/**
-	 * Add attributes to a collection of jobs.
-	 * 
-	 * @param jobs collection of IJobControls
-	 * @param attrs array of attributes to add to each job
-	 */
-	public void addJobAttributes(Collection<IPJobControl> jobs, IAttribute<?,?,?>[] attrs);
-
-	/**
-	 * Add the collection of jobs to the queue.
-	 * 
-	 * @param jobs collection of IJobControls
-	 */
-	public void addJobs(Collection<IPJobControl> jobs);
-
-	/**
-	 * Lookup a job from a job ID
-	 * 
-	 * @param job_id
-	 * @return job associated with the job ID
-	 */
-	public IPJobControl getJobControl(String job_id);
-	
-	/**
-	 * Get all the jobs in this queue.
-	 * 
-	 * @return array of jobs
-	 */
-	public Collection<IPJobControl> getJobControls();
-	
-	/**
-	 * Remove job from the queue
-	 * 
-	 * @param jobs to remove
-	 */
-	public void removeJobs(Collection<IPJobControl> jobs);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPUniverseControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPUniverseControl.java
deleted file mode 100644
index df69ef5..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IPUniverseControl.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * Adds the internal functionality of an IPElement to an IPUniverse
- * 
- * @author rsqrd
- *
- */
-public interface IPUniverseControl extends IPUniverse, IPElementControl {
-
-	public void removeResourceManager(IResourceManager removedManager);
-
-	public void removeResourceManagers(IResourceManager[] removedRMs);
-
-	public void addResourceManager(IResourceManagerControl addedManager);
-
-	public void addResourceManagers(IResourceManagerControl[] addedManagers);
-
-	public IResourceManagerControl[] getResourceManagerControls();
-
-	public int getNextResourceManagerId();
-	
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IResourceManagerControl.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IResourceManagerControl.java
deleted file mode 100644
index 943f588..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elementcontrols/IResourceManagerControl.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elementcontrols;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-
-public interface IResourceManagerControl extends IResourceManager, IPElementControl {
-	/**
-	 * Add attributes to a collection of machines.
-	 * 
-	 * @param machines collection of IPMachineControl
-	 * @param attrs array of attributes to add to each machine
-	 */
-	public void addMachineAttributes(Collection<IPMachineControl> machines, IAttribute<?,?,?>[] attrs);
-	
-	/**
-	 * Add attributes to a collection of queues.
-	 * 
-	 * @param queues collection of IPQueueControl
-	 * @param attrs array of attributes to add to each queue
-	 */
-	public void addQueueAttributes(Collection<IPQueueControl> queues, IAttribute<?,?,?>[] attrs);
-
-	/**
-	 * Disable event processing. The RM state will be set to SUSPENDED.
-	 * 
-	 * @throws CoreException
-	 */
-	public void disableEvents() throws CoreException;
-
-	/**
-	 * Safely dispose of this Resource Manager.
-	 */
-	public void dispose();
-
-	/**
-	 * Enable event processing. The RM state will be set to STARTED.
-	 * 
-	 * @throws CoreException
-	 */
-	public void enableEvents() throws CoreException;
-	
-	/**
-	 * Get the configuration associated with this resource manager.
-	 * 
-	 * @return resource manager configuration
-	 */
-	public IResourceManagerConfiguration getConfiguration();
-	
-	/**
-	 * Get the IPMachineControl interfaces for machines that this resource manager knows about.
-	 * 
-	 * @return IPMachineControl interfaces
-	 */
-	public Collection<IPMachineControl> getMachineControls();
-	
-	/**
-	 * Get the IPQueueControl interfaces for queues that this resource manager knows about.
-	 * 
-	 * @return IPQueueControl interfaces
-	 */
-	public Collection<IPQueueControl> getQueueControls();
-	
-	/**
-	 * Set the configuration for this resource manager. This will replace the existing
-	 * configuration with a new configuration. The method is responsible for dealing with
-	 * any saved state that needs to be cleaned up.
-	 * 
-	 * @param config the new configuration
-	 */
-	public void setConfiguration(IResourceManagerConfiguration config);
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPElement.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPElement.java
deleted file mode 100644
index 905ecf1..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPElement.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-
-public interface IPElement extends IAdaptable {
-	
-	/**
-	 * Sets the attribute value.
-	 * 
-	 * @param attrValue
-	 */
-	public void addAttribute(IAttribute<?,?,?> attrValue);
-
-	/**
-	 * Sets the attribute values.
-	 * 
-	 * @param attrValues
-	 */
-	public void addAttributes(IAttribute<?,?,?>[] attrValues);
-
-	/**
-	 * Returns the attribute corresponding to the attribute definition.
-	 * 
-	 * @param attrDef
-	 * @return The attribute for this attribute definition
-	 */
-	public <T, A extends IAttribute<T,A,D>, D extends IAttributeDefinition<T,A,D>>
-	A getAttribute(D attrDef);
-
-	/**
-	 * Returns the attribute corresponding to the attribute definition ID.
-	 * 
-	 * @param attrDefId
-	 * @return The attribute for this attribute definition
-	 */
-	public IAttribute<?,?,?> getAttribute(String attrDefId);
-	
-	/**
-	 * Get all the attribute definitions that this element knows about.
-	 * 
-	 * @return array of IAttributeDefinition keys
-	 */
-	public IAttributeDefinition<?,?,?>[] getAttributeKeys();
-	
-	/**
-	 * Returns an array containing all attributes.
-	 * 
-	 * @return An array of attributes for this element
-	 */
-	public IAttribute<?,?,?>[] getAttributes();
-
-	/**
-	 * Returns an array containing all attributes that should be displayed in a UI.
-	 * 
-	 * @return An array of attributes for this element
-	 */
-	public IAttribute<?,?,?>[] getDisplayAttributes();
-
-	/**
-	 * Returns the unique ID for this Element
-	 * 
-	 * @return The ID for this Element as a String
-	 */
-	public String getID();
-
-	/**
-	 * Returns a name for this Element. An Element name does not need to
-	 * be unique. It is primarily used for UI display purposes.
-	 * 
-	 * @return This Element's name
-	 */
-	public String getName();
-
-	/**
-	 * Removes the attribute value.
-	 * 
-	 * @param attrValue
-	 */
-	public void removeAttribute(IAttribute<?,?,?> attrValue);
-
-
-	/**
-	 * Returns the number of children of this Element.
-	 * 
-	 * @return The number of children of this Element
-	 */
-	public int size();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPJob.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPJob.java
deleted file mode 100644
index fabe70d..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPJob.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.IJobListener;
-
-
-/**
- * A Job can be a parallel or sequential job, consisting of one or more
- * processes which are residing on Nodes. Jobs may span Machines, though this
- * may not be very common in reality, but the model allows for this. Finally, a
- * Job may or may not belong to the current user, it just means that if it is
- * visible then this user can see the Job in his or her Universe. This may have
- * ramifications on what the user can do to the Job if it is not owned by them.
- * 
- * @author Nathan DeBardeleben
- */
-public interface IPJob extends IPElement {
-	
-	/**
-	 * Add a listener for child events.
-	 * 
-	 * @param listener
-	 */
-	public void addChildListener(IJobChildListener listener);
-
-	/**
-	 * Add a listner for element events.
-	 * 
-	 * @param listener
-	 */
-	public void addElementListener(IJobListener listener);
-
-	/**
-	 * Get the launch configuration that was used to launch this job
-	 * 
-	 * @return launch configuration
-	 */
-	public ILaunchConfiguration getLaunchConfiguration();
-
-	/**
-	 * Find a Process in this Job by its ID. Returns the Process
-	 * object if found, else returns <code>null</code>.
-	 * 
-	 * @param processNumber
-	 *            The Process number to search for
-	 * @return The Process object if found, else <code>null</code>
-	 * @see IPProcess
-	 */
-	public IPProcess getProcessById(String id);
-	
-	/**
-	 * Finds a Process in by its integer index. A process index is a
-	 * zero-based index of all processes in the job. Returns the Process
-	 * object if found, else returns <code>null</code>.
-	 * 
-	 * @param number
-	 *            The Process number to search for
-	 * @return The Process object if found, else <code>null</code>
-	 */
-	public IPProcess getProcessByIndex(int number);
-
-	/**
-	 * Finds a Process in by its String index. A process index is a
-	 * zero-based index of all processes in the job. Returns the Process
-	 * object if found, else returns <code>null</code>.
-	 * 
-	 * @param number
-	 *            The Process index to search for
-	 * @return The Process object if found, else <code>null</code>
-	 */
-	public IPProcess getProcessByIndex(String number);
-	
-	/**
-	 * Returns an array of the Processes comprised by this Job. Might return
-	 * <code>null</code> if no Processes have yet been assigned.
-	 * 
-	 * @return The Processes in this Job.
-	 */
-	public IPProcess[] getProcesses();
-	
-	/**
-	 * Returns parent queue for this job.
-	 * 
-	 * @return IPQueue
-	 */
-	public IPQueue getQueue();
-
-	/**
-	 * Returns the state of the job
-	 * 
-	 * @return job state
-	 */
-	public JobAttributes.State getState();
-
-	/**
-	 * Returns true/false regarding whether this Job is a debug job 
-	 * 
-	 * @return True if this job is a debug job
-	 */
-	public boolean isDebug();
-
-	/**
-	 * Returns true if all processes in the job have terminated
-	 * 
-	 * @return 
-	 */
-	public boolean isTerminated();
-	
-	/**
-	 * Remove a listener for child events.
-	 * 
-	 * @param listener
-	 */
-	public void removeChildListener(IJobChildListener listener);
-	
-	/**
-	 * Remove a listener for element events.
-	 * 
-	 * @param listener
-	 */
-	public void removeElementListener(IJobListener listener);
-	
-	/**
-	 * Sets this job to be a debug job
-	 */
-	public void setDebug();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPMachine.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPMachine.java
deleted file mode 100644
index b5faf13..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPMachine.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements;
-
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.listeners.IMachineListener;
-import org.eclipse.ptp.core.elements.listeners.IMachineChildListener;
-
-
-/**
- * Interface class for a model of a machine. Machines are comprised of nodes
- * which may have processes running on them. The Machine model is intented to be
- * a hardware representation of the machine with methods to get information like
- * the architecture and related interested bits. The model allows for the
- * Machine to have any number of nodes (even a single one to represent a
- * uniprocessor machine).
- * 
- * @author Nathan DeBardeleben
- */
-public interface IPMachine extends IPElement {
-	
-	/**
-	 * @param listener
-	 */
-	public void addChildListener(IMachineChildListener listener);
-
-	/**
-	 * @param listener
-	 */
-	public void addElementListener(IMachineListener listener);
-
-	/**
-	 * Returns the architecture of this Machine.
-	 * 
-	 * @return The architecture of this Machine
-	 */
-	public String getArch();
-	
-	/**
-	 * Given a node id, attempts to find it as a Node object
-	 * contained in this Machine. If found, the Node object is returned.
-	 * Otherwise, <code>null</code> is returned.
-	 * 
-	 * @param id
-	 *            The ID to find in this Machine
-	 * @return The Node object if found, else <code>null</code>
-	 */
-	public IPNode getNodeById(String id);
-
-	/**
-	 * Returns an array of all the Nodes that this Machine is comprised of. May
-	 * return null if there are none.
-	 * 
-	 * @return The Nodes in this Machine - <code>null</code> if there are
-	 *         none.
-	 */
-	public IPNode[] getNodes();
-	
-	/**
-	 * @return the machine's parent resource manager
-	 */
-	public IResourceManager getResourceManager();
-	
-	/**
-	 * Get the state of the machine
-	 * 
-	 * @return machine state
-	 */
-	public MachineAttributes.State getState();
-
-	/**
-	 * @param listener
-	 */
-	public void removeChildListener(IMachineChildListener listener);
-
-	/**
-	 * @param listener
-	 */
-	public void removeElementListener(IMachineListener listener);
-
-	/**
-	 * Sets the architecture of this machine. At this time there are no
-	 * standards for how this String should be formatted and the String is
-	 * really only used for printing out information about this Machine.
-	 * 
-	 * @param arch
-	 *            The architecture of this machine
-	 */
-	public void setArch(String arch);
-	
-	/**
-	 * Counts all the Nodes associated with this Machine and returns that as an
-	 * <code>int</code>.
-	 * 
-	 * @return The number of Nodes in this Machine
-	 */
-	public int totalNodes();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPNode.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPNode.java
deleted file mode 100644
index 05b6be1..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPNode.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements;
-
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes;
-import org.eclipse.ptp.core.elements.listeners.INodeListener;
-import org.eclipse.ptp.core.elements.listeners.INodeChildListener;
-
-
-public interface IPNode extends IPElement {
-
-	/**
-	 * @param listener
-	 */
-	public void addChildListener(INodeChildListener listener);
-
-	/**
-	 * @param listener
-	 */
-	public void addElementListener(INodeListener listener);
-
-	/**
-	 * Returns the parent Machine that this Node is contained within.
-	 * 
-	 * @return The Machine this Node is part of
-	 */
-	public IPMachine getMachine();
-	
-	/**
-	 * Returns the node number of this Node as a String. 
-	 * Node numbers are optionally supplied by the resource manager, so may return <code>null</code>.
-	 * Providing a node number will enable the node numbering ruler in the UI.
-	 * 
-	 * @return The node number of this Node as a String
-	 */
-	public String getNodeNumber();
-
-	/**
-	 * Return any processes that are linked to this node
-	 * 
-	 * @return array of processes
-	 */
-	public IPProcess[] getProcesses();
-	
-	/**
-	 * Returns the state of the node
-	 * 
-	 * @return node state
-	 */
-	public NodeAttributes.State getState();
-
-	/**
-	 * @param listener
-	 */
-	public void removeChildListener(INodeChildListener listener);
-	
-	/**
-	 * @param listener
-	 */
-	public void removeElementListener(INodeListener listener);
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPProcess.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPProcess.java
deleted file mode 100644
index 6cbc6bb..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPProcess.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements;
-
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.listeners.IProcessListener;
-
-public interface IPProcess extends IPElement {
-	
-	/**
-	 * Add listener for element events.
-	 * 
-	 * @param listener
-	 */
-	public void addElementListener(IProcessListener listener);
-
-	/**
-	 * Clear the local cache of process output
-	 */
-	public void clearOutput();
-
-	/**
-	 * Get the value of the exit code attribute. This is the exit code
-	 * that the process returned on termination.
-	 * 
-	 * @return value of the exit code attribute
-	 */
-	public int getExitCode();
-	
-	/**
-	 * Find the parent job that this process is encompassed by 
-	 * 
-	 * @return parent job
-	 */
-	public IPJob getJob();
-	
-	/**
-	 * Find the node that this process is running on
-	 * 
-	 * @return node that the process is running on
-	 */
-	public IPNode getNode();
-	
-	/**
-	 * Get the value of the PID attribute
-	 * 
-	 * @return value of the PID attribute
-	 */
-	public int getPid();
-	
-	/**
-	 * Returns a zero-based index of the process in a job.
-	 * 
-	 * @return process index
-	 */
-	public String getProcessIndex();
-	
-	/**
-	 * @param attrDef
-	 * @return
-	 */
-	public String getSavedOutput(StringAttributeDefinition attrDef);
-	
-	/**
-	 * Get the value of the signal name attribute. If the process was
-	 * terminated by a signal, this is the name of the signal that caused
-	 * the termination.
-	 * 
-	 * @return value of the signal name attribute
-	 */
-	public String getSignalName();
-	
-	/**
-	 * Get the state of the process
-	 * 
-	 * @return process state
-	 */
-	public ProcessAttributes.State getState();
-	
-	/**
-	 * Check if process is terminated
-	 * 
-	 * @return true if process terminated
-	 */
-	public boolean isTerminated();
-	
-	/**
-	 * Remove listener for element events.
-	 * 
-	 * @param listener
-	 */
-	public void removeElementListener(IProcessListener listener);
-	
-	/**
-	 * Set the state attribute on the process
-	 * 
-	 * @param state of the process
-	 */
-	public void setState(ProcessAttributes.State state);
-	
-	/**
-	 * Set the value of the terminated attribute on the process
-	 * 
-	 * @param boolean representing termination status of the process
-	 */
-	public void setTerminated(boolean isTerminate);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPQueue.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPQueue.java
deleted file mode 100644
index 6e088ff..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPQueue.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements;
-
-import org.eclipse.ptp.core.elements.attributes.QueueAttributes;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IQueueListener;
-
-public interface IPQueue extends IPElement {
-
-	/**
-	 * @param listener
-	 */
-	public void addChildListener(IQueueChildListener listener);
-
-	/**
-	 * @param listener
-	 */
-	public void addElementListener(IQueueListener listener);
-
-	/**
-	 * @param job_id
-	 * @return IPJob
-	 */
-	public IPJob getJobById(String job_id);
-
-	/**
-	 * @return IPJob[]
-	 */
-	public IPJob[] getJobs();
-
-	/**
-	 * @return IResourceManager
-	 */
-	public IResourceManager getResourceManager();
-	
-	/**
-	 * Get the state of the queue
-	 * 
-	 * @return queue state
-	 */
-	public QueueAttributes.State getState();
-	
-	/**
-	 * @param listener
-	 */
-	public void removeChildListener(IQueueChildListener listener);
-	
-	/**
-	 * @param listener
-	 */
-	public void removeElementListener(IQueueListener listener);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPUniverse.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPUniverse.java
deleted file mode 100644
index f5becf6..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IPUniverse.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.core.elements;
-
-
-
-/**
- * A Universe represents a user's view of the world. It is comprised of a set of
- * Resource Managers.
- * 
- * @author Nathan DeBardeleben
- * @see IResourceManager
- */
-public interface IPUniverse extends IPElement {
-	/**
-	 * @param id
-	 * @return IResourceManager
-	 */
-	public IResourceManager getResourceManager(String id);
-	
-	/**
-	 * @return IResourceManager[]
-	 */
-	public IResourceManager[] getResourceManagers();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IResourceManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IResourceManager.java
deleted file mode 100644
index 4515986..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/IResourceManager.java
+++ /dev/null

@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerListener;
-import org.eclipse.ptp.rmsystem.IResourceManagerMenuContribution;
-
-public interface IResourceManager extends IPElement,
-	IAdaptable, IResourceManagerMenuContribution {
-
-	/**
-	 * Add a listener for child events.
-	 * 
-	 * @param listener listener to add to the list of listeners
-	 */
-	public void addChildListener(IResourceManagerChildListener listener);
-	
-	/**
-	 * Add a listener for events related to this resource manager.
-	 * 
-	 * @param listener listener to add to the list of listeners
-	 */
-	public void addElementListener(IResourceManagerListener listener);
-
-	/**
-	 * Get the attribute definition corresponding to the attrId. This will
-	 * only check for attribute definitions that the RM knows about.
-	 * 
-	 * @param attrId ID of the attribute definition
-	 * @return the attribute definition corresponding to the attribute definition ID
-	 */
-	public IAttributeDefinition<?,?,?> getAttributeDefinition(String attrId);
-
-	/**
-	 * Get a string description of this RM
-	 * 
-	 * @return string describing the RM
-	 */
-	public String getDescription();
-	
-	/**
-	 * Find a machine object using its ID
-	 * 
-	 * @param id ID of the machine object
-	 * @return machine object corresponding to the ID
-	 */
-	public IPMachine getMachineById(String id);
-	
-	/**
-	 * Get an array containing all the machines known by this RM
-	 * 
-	 * @return array of machines known by this RM
-	 */
-	public IPMachine[] getMachines();
-
-	/**
-	 * Get the name of this RM
-	 * 
-	 * @return string name of the RM
-	 */
-	public String getName();
-
-	/**
-	 * Find a queue object using its ID
-	 * 
-	 * @param id ID of the queue object
-	 * @return queue object corresponding to the ID
-	 */
-	public IPQueue getQueueById(String id);
-
-	/**
-	 * Fina a queue object using its name attribute
-	 * 
-	 * @param name name attribute of the queue object
-	 * @return queue object corresponding to the name
-	 */
-	public IPQueue getQueueByName(String name);
-
-	/**
-	 * Get an array containing all the queues known by this RM
-	 * 
-	 * @return array of queues known by this RM
-	 */
-	public IPQueue[] getQueues();
-
-    /**
-     * Returns the id of the resource manager
-     *
-     * @return the id of the resource manager
-     */
-    public String getResourceManagerId();
-
-    /**
-     * Get the state of this RM
-     * 
-	 * @return state value representing the state of the RM
-	 */
-	public ResourceManagerAttributes.State getState();
-	
-	/**
-	 * Remove listener for child events
-	 * 
-	 * @param listener listener to remove
-	 */
-	public void removeChildListener(IResourceManagerChildListener listener);
-
-	/**
-	 * Remove listener for events relating to this resource manager
-	 * 
-	 * @param listener listener to remove
-	 */
-	public void removeElementListener(IResourceManagerListener listener);
-
-	/**
-	 * Remove all terminated jobs from the given queue. A terminated job is determined
-	 * by its state attribute.
-	 * 
-	 * @param queue queue from which all terminated jobs will be removed
-	 */
-	public void removeTerminatedJobs(IPQueue queue);
-	
-	/**
-	 * Shutdown the resource manager
-	 */
-	public void shutdown() throws CoreException;
-
-	/**
-	 * Start up the resource manager. This could potentially take a long time (or forever),
-	 * particularly if the RM is located on a remote system.
-	 * 
-	 * @param monitor progress monitor to indicate startup progress
-	 */
-	public void startUp(IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Submit a job. The attribute manager must contain the appropriate attributes for
-	 * a successful job launch (e.g. the queue, etc.).
-	 * 
-	 * The method will return after an INewJobEvent has been received confirming that
-	 * the job has been submitted. 
-	 * 
-	 * @param configuration launch configuration used to submit the job. Can be null.
-	 * @param attrMgr attribute manager containing the job launch attributes
-	 * @param monitor progress monitor
-	 * @return a job object representing the submitted job or null if the submission failed
-	 * @throws CoreException
-	 */
-	public IPJob submitJob(ILaunchConfiguration configuration, AttributeManager attrMgr, 
-			IProgressMonitor monitor) 
-		throws CoreException;
-
-	/**
-	 * Submit a job with the supplied submission ID. This ID can be used to identify the
-	 * job when an INewJobEvent is received.
-	 * 
-	 * The method will return immediately. It is up to the calling thread to check for
-	 * successful submission by registering a listener for INewJobEvent.
-	 * 
-	 * @param subId job submission ID
-	 * @param configuration launch configuration used to submit the job. Can be null.
-	 * @param attrMgr attribute manager containing the job launch attributes
-	 * @param monitor progress monitor
-	 * @throws CoreException
-	 */
-	public void submitJob(String subId, ILaunchConfiguration configuration, AttributeManager attrMgr,
-			IProgressMonitor monitor) 
-		throws CoreException;
-
-	/**
-	 * Terminate the job. The action this takes depends on the RM implementation and
-	 * the state of the job. For queued but not running jobs, this would be equivalent
-	 * to canceling the job. For running jobs, this would mean halting its execution.
-	 * 
-	 * @param job job object representing the job to be canceled.
-	 */
-	public void terminateJob(IPJob job) throws CoreException;
-
-	/**
-	 * Get a unique name that can be used to identify this resource
-	 * manager persistently between PTP invocations. Used by the 
-	 * ResourceManagerPersistence.
-	 * 
-	 * @return string representing a unique name for the resource manager
-	 */
-	public String getUniqueName();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributeManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributeManager.java
deleted file mode 100644
index 501efa1..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributeManager.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-/**
- * An ElementAttributeManager maintains a mapping between ranges of element ID's and
- * a set of attributes managed by an AttributeManager.
- * 
- * @author greg
- *
- */
-public class ElementAttributeManager {
-	private Map<RangeSet, AttributeManager>	map;
-	
-	public ElementAttributeManager() {
-		this.map = new HashMap<RangeSet, AttributeManager>();
-	}
-
-	public void setAttributeManager(RangeSet ids, AttributeManager attr) {
-		map.put(ids, attr);
-	}
-	
-	public AttributeManager getAttributeManager(Integer id) {
-		return map.get(id);
-	}
-	
-	public RangeSet[] getElementIds() {
-		return map.keySet().toArray(new RangeSet[map.size()]);
-	}
-	
-	public Set<Map.Entry<RangeSet, AttributeManager>> getEntrySet() {
-		return map.entrySet();
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributes.java
deleted file mode 100644
index c25a1a6..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ElementAttributes.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-
-/**
- * Job attributes
- */
-public class ElementAttributes {
-	/*
-	 * Predefine attributes. These are attributes that
-	 * the UI knows about.
-	 */
-	private final static String ATTR_ID = "id";
-	private final static String ATTR_NAME = "name";
-	
-	private final static StringAttributeDefinition idAttributeDefinition = 
-		new StringAttributeDefinition(ATTR_ID, "ID", "Unique ID of element", false, "");
-
-	private final static StringAttributeDefinition nameAttributeDefinition = 
-		new StringAttributeDefinition(ATTR_NAME, "Name", "Name of element", true, "");
-
-	public static StringAttributeDefinition getIdAttributeDefinition() {
-		return idAttributeDefinition;
-	}
-	
-	public static StringAttributeDefinition getNameAttributeDefinition() {
-		return nameAttributeDefinition;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				idAttributeDefinition, 
-				nameAttributeDefinition
-			};
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ErrorAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ErrorAttributes.java
deleted file mode 100644
index cbcb6df..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ErrorAttributes.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-
-/**
- * Error attributes
- */
-public class ErrorAttributes {
-	private static final String CODE_ATTR_ID = "errorCode";
-	private static final String MESSAGE_ATTR_ID = "errorMsg";
-
-	private final static IntegerAttributeDefinition codeAttrDef = 
-		new IntegerAttributeDefinition(CODE_ATTR_ID, "Error Code", 
-				"Code assigned to this error", true, 0);
-
-	private final static StringAttributeDefinition msgAttrDef = 
-		new StringAttributeDefinition(MESSAGE_ATTR_ID, "Error Message",
-				"Text of error message", true, "");
-
-	public static IntegerAttributeDefinition getCodeAttributeDefinition() {
-		return codeAttrDef;
-	}
-
-	public static StringAttributeDefinition getMsgAttributeDefinition() {
-		return msgAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				codeAttrDef, 
-				msgAttrDef
-			};
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/JobAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/JobAttributes.java
deleted file mode 100644
index e4cb092..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/JobAttributes.java
+++ /dev/null

@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-
-/**
- * Job attributes
- */
-public class JobAttributes {
-	public enum State {
-		PENDING,
-		STARTED,
-		RUNNING,
-		TERMINATED,
-		SUSPENDED,
-		ERROR,
-		UNKNOWN
-	};
-	
-	public static final int IO_FORWARDING_NONE = 0x0;
-	public static final int IO_FORWARDING_STDIN = 0x01;
-	public static final int IO_FORWARDING_STDOUT = 0x02;
-	public static final int IO_FORWARDING_STDERR = 0x04;
-	
-	private static final String DEBUG_ARGS_ATTR_ID = "debugArgs";
-	private static final String DEBUG_EXEC_NAME_ATTR_ID = "debugExecName";
-	private static final String DEBUG_EXEC_PATH_ATTR_ID = "debugExecPath";
-	private static final String DEBUG_FLAG_ATTR_ID = "debug";
-	private static final String DEBUG_STOP_IN_MAIN_ATTR_ID = "debugStopInMain";
-	private static final String ENV_ATTR_ID = "env";
-	private static final String EXEC_NAME_ATTR_ID = "execName";
-	private static final String EXEC_PATH_ATTR_ID = "execPath";
-	private static final String IO_FORWARDING_ATTR_ID = "ioForwarding";
-	private static final String LAUNCHED_BY_PTP_FLAG_ATTR_ID = "launchedByPTP";
-	private static final String JOB_ID_ATTR_ID = "jobId";
-	private static final String NUM_PROCS_ATTR_ID = "jobNumProcs";
-	private static final String PROG_ARGS_ATTR_ID = "progArgs";
-	private static final String QUEUEID_ATTR_ID = "queueId";
-	private static final String STATE_ATTR_ID = "jobState";
-	private static final String SUBID_ATTR_ID = "jobSubId";
-	private static final String USERID_ATTR_ID = "userId";
-	private static final String WORKING_DIR_ATTR_ID = "workingDir";
-
-	private final static ArrayAttributeDefinition<String> debugArgsAttrDef = 
-		new ArrayAttributeDefinition<String>(DEBUG_ARGS_ATTR_ID, DEBUG_ARGS_ATTR_ID,
-				"Debugger Arguments", true, null);
-
-	private final static StringAttributeDefinition debugExecNameAttrDef = 
-		new StringAttributeDefinition(DEBUG_EXEC_NAME_ATTR_ID, "Debugger Executable Name",
-				"Name of debugger executable", true, "");
-
-	private final static StringAttributeDefinition debugExecPathAttrDef = 
-		new StringAttributeDefinition(DEBUG_EXEC_PATH_ATTR_ID, "Debugger Executable Path",
-				"Path to debugger executable", true, "");
-
-	private final static BooleanAttributeDefinition debugFlagAttrDef = 
-		new BooleanAttributeDefinition(DEBUG_FLAG_ATTR_ID, DEBUG_FLAG_ATTR_ID, 
-				"Debug Flag", true, false);
-
-	private final static BooleanAttributeDefinition debugStopInMainAttrDef = 
-		new BooleanAttributeDefinition(DEBUG_STOP_IN_MAIN_ATTR_ID, "Stop In Main", 
-				"Debugger should stop application in main", true, true);
-
-	private final static ArrayAttributeDefinition<String> envAttrDef = 
-		new ArrayAttributeDefinition<String>(ENV_ATTR_ID, "Environment",
-				"Environment to be supplied to executable on launch", true, null);
-
-	private final static StringAttributeDefinition execNameAttrDef = 
-		new StringAttributeDefinition(EXEC_NAME_ATTR_ID, "Executable Name",
-				"Name of executable to be launched", true, "");
-
-	private final static StringAttributeDefinition execPathAttrDef = 
-		new StringAttributeDefinition(EXEC_PATH_ATTR_ID, "Executable Path",
-				"Path of executable to be launched", true, "");
-
-	private final static IntegerAttributeDefinition ioForwardingAttrDef = 
-		new IntegerAttributeDefinition(IO_FORWARDING_ATTR_ID, "I/O Forwarding", 
-				"Specify which I/O channels to foward", false, IO_FORWARDING_STDOUT);
-
-	private final static BooleanAttributeDefinition launchedByPTPFlagAttrDef = 
-		new BooleanAttributeDefinition(LAUNCHED_BY_PTP_FLAG_ATTR_ID, "Launched By PTP", 
-				"Application was launched by PTP", true, false);
-
-	private final static StringAttributeDefinition jobIdAttrDef = 
-		new StringAttributeDefinition(JOB_ID_ATTR_ID, "Job ID",
-				"Job ID that command applies to", true, "");
-
-	private final static IntegerAttributeDefinition numProcsAttrDef = 
-		new IntegerAttributeDefinition(NUM_PROCS_ATTR_ID, "Procs", 
-				"Number of processes to launch", true, 1);
-
-	private final static ArrayAttributeDefinition<String> progArgsAttrDef = 
-		new ArrayAttributeDefinition<String>(PROG_ARGS_ATTR_ID, "Program Arguments",
-				"Command-line arguments supplied to executable", true, null);
-
-	private final static StringAttributeDefinition queueIdAttrDef = 
-		new StringAttributeDefinition(QUEUEID_ATTR_ID, QUEUEID_ATTR_ID, 
-				"Job submission queue ID", true, "");
-	
-	private final static EnumeratedAttributeDefinition<State> stateAttrDef = 
-		new EnumeratedAttributeDefinition<State>(STATE_ATTR_ID, "State", "State of a job", 
-				true, State.STARTED);
-
-	private final static StringAttributeDefinition subIdAttrDef = 
-		new StringAttributeDefinition(SUBID_ATTR_ID, "Job Submission ID",
-				"Temporary ID used for job submission", false, "");
-
-	private final static StringAttributeDefinition userIdAttrDef = 
-		new StringAttributeDefinition(USERID_ATTR_ID, "User",
-				"User ID", true, "");
-
-	private final static StringAttributeDefinition workingDirAttrDef = 
-		new StringAttributeDefinition(WORKING_DIR_ATTR_ID, "Working Directory",
-				"Working directory where executable will run", true, "");
-
-
-	public static BooleanAttributeDefinition getDebugFlagAttributeDefinition() {
-		return debugFlagAttrDef;
-	}
-
-	public static ArrayAttributeDefinition<String> getDebuggerArgumentsAttributeDefinition() {
-		return debugArgsAttrDef;
-	}
-	
-	public static StringAttributeDefinition getDebuggerExecutableNameAttributeDefinition() {
-		return debugExecNameAttrDef;
-	}
-
-	public static StringAttributeDefinition getDebuggerExecutablePathAttributeDefinition() {
-		return debugExecPathAttrDef;
-	}
-	
-	public static BooleanAttributeDefinition getDebuggerStopInMainFlagAttributeDefinition() {
-		return debugStopInMainAttrDef;
-	}
-	
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				debugArgsAttrDef,
-				debugExecNameAttrDef,
-				debugExecPathAttrDef,
-				debugFlagAttrDef,
-				debugStopInMainAttrDef,
-				envAttrDef,
-				execNameAttrDef, 
-				execPathAttrDef,
-				ioForwardingAttrDef,
-				jobIdAttrDef,
-				launchedByPTPFlagAttrDef,
-				numProcsAttrDef,
-				progArgsAttrDef,
-				queueIdAttrDef,
-				stateAttrDef, 
-				subIdAttrDef, 
-				userIdAttrDef,
-				workingDirAttrDef,
-			};
-	}
-
-	public static ArrayAttributeDefinition<String> getEnvironmentAttributeDefinition() {
-		return envAttrDef;
-	}
-
-	public static StringAttributeDefinition getExecutableNameAttributeDefinition() {
-		return execNameAttrDef;
-	}
-
-	public static StringAttributeDefinition getExecutablePathAttributeDefinition() {
-		return execPathAttrDef;
-	}
-
-	public static BooleanAttributeDefinition getLaunchedByPTPFlagAttributeDefinition() {
-		return launchedByPTPFlagAttrDef;
-	}
-
-	public static IntegerAttributeDefinition getIOForwardingAttributeDefinition() {
-		return ioForwardingAttrDef;
-	}
-
-	public static StringAttributeDefinition getJobIdAttributeDefinition() {
-		return jobIdAttrDef;
-	}
-	
-	public static IntegerAttributeDefinition getNumberOfProcessesAttributeDefinition() {
-		return numProcsAttrDef;
-	}
-
-	public static ArrayAttributeDefinition<String> getProgramArgumentsAttributeDefinition() {
-		return progArgsAttrDef;
-	}
-
-	public static StringAttributeDefinition getQueueIdAttributeDefinition() {
-		return queueIdAttrDef;
-	}
-
-	public static EnumeratedAttributeDefinition<State> getStateAttributeDefinition() {
-		return stateAttrDef;
-	}
-
-	public static StringAttributeDefinition getSubIdAttributeDefinition() {
-		return subIdAttrDef;
-	}
-	
-	public static StringAttributeDefinition getUserIdAttributeDefinition() {
-		return userIdAttrDef;
-	}
-
-	public static StringAttributeDefinition getWorkingDirectoryAttributeDefinition() {
-		return workingDirAttrDef;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MachineAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MachineAttributes.java
deleted file mode 100644
index f4dc532..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MachineAttributes.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-
-
-/**
- * Machine attributes
- */
-public class MachineAttributes {
-	public enum State {
-		UP,
-		DOWN,
-		ALERT,
-		ERROR,
-		UNKNOWN,
-	};
-
-    private static final String STATE_ATTR_ID = "machineState";
-    private static final String NUMNODES_ATTR_ID = "numNodes";
-
-    private final static EnumeratedAttributeDefinition<State> stateAttrDef = 
-        new EnumeratedAttributeDefinition<State>(STATE_ATTR_ID, "state", "Machine State",
-                true, State.UNKNOWN);
-    
-    private final static IntegerAttributeDefinition numNodesAttrDef = 
-        new IntegerAttributeDefinition(NUMNODES_ATTR_ID, "nodes", "Number of Nodes",
-                true, 0);
-    
-    public static EnumeratedAttributeDefinition<State> getStateAttributeDefinition() {
-        return stateAttrDef;
-    }
-    
-    public static IntegerAttributeDefinition getNumNodesAttributeDefinition() {
-        return numNodesAttrDef;
-    }
-    
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{stateAttrDef, numNodesAttrDef};
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MessageAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MessageAttributes.java
deleted file mode 100644
index 299fd7c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/MessageAttributes.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-
-/**
- * Error attributes
- */
-public class MessageAttributes {
-	public enum Level {
-		FATAL,
-		ERROR,
-		WARNING,
-		INFO,
-		DEBUG,
-		UNDEFINED
-	};
-	
-	private static final String LEVEL_ATTR_ID = "messageLevel";
-	private static final String CODE_ATTR_ID = "messageCode";
-	private static final String TEXT_ATTR_ID = "messageText";
-
-	private final static EnumeratedAttributeDefinition<Level> levelAttrDef = 
-		new EnumeratedAttributeDefinition<Level>(LEVEL_ATTR_ID, "Message Level", 
-				"Level of the message", true, Level.UNDEFINED);
-
-	private final static IntegerAttributeDefinition codeAttrDef = 
-		new IntegerAttributeDefinition(CODE_ATTR_ID, "Message Code", 
-				"Code assigned to this message", true, 0);
-
-	private final static StringAttributeDefinition textAttrDef = 
-		new StringAttributeDefinition(TEXT_ATTR_ID, "Message Text",
-				"Text of message", true, "");
-
-	public static EnumeratedAttributeDefinition<Level> getLevelAttributeDefinition() {
-		return levelAttrDef;
-	}
-	
-	public static IntegerAttributeDefinition getCodeAttributeDefinition() {
-		return codeAttrDef;
-	}
-
-	public static StringAttributeDefinition getTextAttributeDefinition() {
-		return textAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				levelAttrDef, 
-				codeAttrDef, 
-				textAttrDef
-			};
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/NodeAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/NodeAttributes.java
deleted file mode 100644
index f059913..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/NodeAttributes.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-
-
-/**
- * Node attributes
- */
-public class NodeAttributes {
-	public enum State {
-		UP,
-		DOWN,
-		ERROR,
-		UNKNOWN,
-	};
-	
-	public enum ExtraState {
-		USER_ALLOC_EXCL,
-		USER_ALLOC_SHARED,
-		OTHER_ALLOC_EXCL,
-		OTHER_ALLOC_SHARED,
-		RUNNING_PROCESS,
-		EXITED_PROCESS,
-		NONE,
-	};
-
-	private static final String STATE_ATTR_ID = "nodeState";
-	private static final String EXTRA_STATE_ATTR_ID = "nodeExtraState";
-	private static final String NUMBER_ATTR_ID = "nodeNumber";
-
-	private final static EnumeratedAttributeDefinition<State> stateAttrDef = 
-		new EnumeratedAttributeDefinition<State>(STATE_ATTR_ID, "Node State", "State of the node",
-				true, State.UNKNOWN);
-	
-	private final static EnumeratedAttributeDefinition<ExtraState> extraStateAttrDef = 
-		new EnumeratedAttributeDefinition<ExtraState>(EXTRA_STATE_ATTR_ID, "Extra Node State",
-				"Extra state information for the node (e.g. job scheduler state)", true, ExtraState.NONE);
-	
-	private final static IntegerAttributeDefinition numAttrDef = 
-		new IntegerAttributeDefinition(NUMBER_ATTR_ID, "Node Number", 
-				"Zero-based index of node", true, 0);
-	
-	public static EnumeratedAttributeDefinition<State> getStateAttributeDefinition() {
-		return stateAttrDef;
-	}
-	
-	public static EnumeratedAttributeDefinition<ExtraState> getExtraStateAttributeDefinition() {
-		return extraStateAttrDef;
-	}
-
-	public static IntegerAttributeDefinition getNumberAttributeDefinition() {
-		return numAttrDef;
-	}
-	
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{stateAttrDef, extraStateAttrDef, numAttrDef};
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ProcessAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ProcessAttributes.java
deleted file mode 100644
index a629f91..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ProcessAttributes.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-
-/**
- * Process attributes
- */
-public class ProcessAttributes {
-	public enum State {
-		STARTING,
-		RUNNING,
-		EXITED,
-		EXITED_SIGNALLED,
-		SUSPENDED,
-		ERROR,
-		UNKNOWN
-	};
-
-	private static final String STATE_ATTR_ID = "processState";
-	private static final String PID_ATTR_ID = "processPID";
-	private static final String EXIT_CODE_ATTR_ID = "processExitCode";
-	private static final String SIGNAL_NAME_ATTR_ID = "processSignalName";
-	private static final String INDEX_ATTR_ID = "processIndex";
-	private static final String STDOUT_ATTR_ID = "processStdout";
-	private static final String STDERR_ATTR_ID = "processStderr";
-	private static final String NODEID_ATTR_ID = "processNodeId";
-
-	private final static EnumeratedAttributeDefinition<State> stateAttrDef = 
-		new EnumeratedAttributeDefinition<State>(STATE_ATTR_ID, "State",
-				"Execution state of a process", true, State.STARTING);
-	
-	private final static IntegerAttributeDefinition pidAttrDef = 
-		new IntegerAttributeDefinition(PID_ATTR_ID, "PID", 
-				"Operating system process ID", true, 0);
-	
-	private final static IntegerAttributeDefinition exitCodeAttrDef = 
-		new IntegerAttributeDefinition(EXIT_CODE_ATTR_ID, "Exit Code", 
-				"Operating system exit code", true, 0);
-	
-	private final static IntegerAttributeDefinition indexAttrDef = 
-		new IntegerAttributeDefinition(INDEX_ATTR_ID, "Index", 
-				"Zero-based index of process (e.g. MPI rank)", true, 0);
-	
-	private final static StringAttributeDefinition signalNameAttrDef = 
-		new StringAttributeDefinition(SIGNAL_NAME_ATTR_ID, "Exit Signal", 
-				"Name of signal that caused process termination", true, "");
-	
-	private final static StringAttributeDefinition stdoutAttrDef = 
-		new StringAttributeDefinition(STDOUT_ATTR_ID, "Process Stdout", 
-				"Standard output from process", false, "");
-	
-	private final static StringAttributeDefinition stderrAttrDef = 
-		new StringAttributeDefinition(STDERR_ATTR_ID, "Process Stderr", 
-				"Standard error from process", false, "");
-	
-	private final static StringAttributeDefinition nodeIdAttrDef = 
-		new StringAttributeDefinition(NODEID_ATTR_ID, "Process Node ID", 
-				"Node that this process is running on", true, "");
-	
-	public static EnumeratedAttributeDefinition<State> getStateAttributeDefinition() {
-		return stateAttrDef;
-	}
-	
-	public static IntegerAttributeDefinition getPIDAttributeDefinition() {
-		return pidAttrDef;
-	}
-	
-	public static IntegerAttributeDefinition getExitCodeAttributeDefinition() {
-		return exitCodeAttrDef;
-	}
-	
-	public static IntegerAttributeDefinition getIndexAttributeDefinition() {
-		return indexAttrDef;
-	}
-	
-	public static StringAttributeDefinition getSignalNameAttributeDefinition() {
-		return signalNameAttrDef;
-	}
-	
-	public static StringAttributeDefinition getStdoutAttributeDefinition() {
-		return stdoutAttrDef;
-	}
-	
-	public static StringAttributeDefinition getStderrAttributeDefinition() {
-		return stderrAttrDef;
-	}
-	
-	public static StringAttributeDefinition getNodeIdAttributeDefinition() {
-		return nodeIdAttrDef;
-	}
-	
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				stateAttrDef, 
-				pidAttrDef, 
-				exitCodeAttrDef, 
-				indexAttrDef, 
-				signalNameAttrDef, 
-				stdoutAttrDef,
-				stderrAttrDef,
-				nodeIdAttrDef
-			};
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/QueueAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/QueueAttributes.java
deleted file mode 100644
index ca342c3..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/QueueAttributes.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-
-
-/**
- * Queue attributes
- */
-public class QueueAttributes {
-	public enum State {
-		NORMAL,
-		COLLECTING,
-		DRAINING,
-		STOPPED
-	};
-
-	private static final String STATE_ATTR_ID = "queueState";
-
-	private final static EnumeratedAttributeDefinition<State> stateAttrDef = 
-		new EnumeratedAttributeDefinition<State>(STATE_ATTR_ID, "state", "Queue State",
-				true, State.NORMAL);
-	
-	public static EnumeratedAttributeDefinition<State> getStateAttributeDefinition() {
-		return stateAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{stateAttrDef};
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ResourceManagerAttributes.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ResourceManagerAttributes.java
deleted file mode 100644
index 0b9fe2c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/attributes/ResourceManagerAttributes.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.attributes;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-
-/**
- * Resource manager attributes
- */
-public class ResourceManagerAttributes {
-	public enum State {
-		STARTING,
-		STARTED,
-		STOPPING,
-		STOPPED,
-	    SUSPENDED,
-		ERROR
-	}
-	
-	private final static String STATE_ATTR_ID = "rmState";
-	private final static String DESC_ATTR_ID = "rmDescription";
-	private final static String RMID_ATTR_ID = "rmID";
-	private final static String TYPE_ATTR_ID = "rmType";
-
-	private final static EnumeratedAttributeDefinition<State> stateAttrDef = 
-		new EnumeratedAttributeDefinition<State>(STATE_ATTR_ID, "state", 
-				"RM State", true, State.STOPPED);
-	private final static StringAttributeDefinition descAttrDef = 
-		new StringAttributeDefinition(DESC_ATTR_ID, "description", 
-				"RM description", true, "");
-	private final static StringAttributeDefinition rmIDAttrDef = 
-		new StringAttributeDefinition(RMID_ATTR_ID, "RM ID", 
-				"RM unique identifier", false, "");
-	private final static StringAttributeDefinition typeAttrDef = 
-		new StringAttributeDefinition(TYPE_ATTR_ID, "type", 
-				"RM type", false, "unspecified");
-	
-	public static EnumeratedAttributeDefinition<State> getStateAttributeDefinition() {
-		return stateAttrDef;
-	}
-	
-	public static StringAttributeDefinition getDescriptionAttributeDefinition() {
-		return descAttrDef;
-	}
-	
-	public static StringAttributeDefinition getRmIDAttributeDefinition() {
-		return rmIDAttrDef;
-	}
-	
-	public static StringAttributeDefinition getTypeAttributeDefinition() {
-		return typeAttrDef;
-	}
-	
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{stateAttrDef, descAttrDef, typeAttrDef, rmIDAttrDef};
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedJobEvent.java
deleted file mode 100644
index 86adc5e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedJobEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-
-/**
- * This event is generated when the attributes on one or more jobs have changed. It is
- * a bulk event that is sent to child listeners on the source queue.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener
- */
-public interface IChangedJobEvent {
-	
-	/**
-	 * Get the jobs that have changed
-	 * 
-	 * @return the changed jobs
-	 */
-	public Collection<IPJob> getJobs();
-
-	/**
-	 * Get the source event
-	 * 
-	 * @return the source of the event
-	 */
-	public IPQueue getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedMachineEvent.java
deleted file mode 100644
index e906262..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedMachineEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is generated when the attributes on one or more machines have changed. It is
- * a bulk event that is sent to child listeners on the source resource manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener
- */
-public interface IChangedMachineEvent {
-	
-	/**
-	 * Get the changed machines
-	 * 
-	 * @return the changed machines
-	 */
-	public Collection<IPMachine> getMachines();
-
-	/**
-	 * Get the event source
-	 * 
-	 * @return the source of the event
-	 */
-	public IResourceManager getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedNodeEvent.java
deleted file mode 100644
index 936144c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedNodeEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-
-/**
- * This event is generated when the attributes on one or more nodes have changed. It is
- * a bulk event that is sent to child listeners on the source machine.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IMachineChildListener
- */
-public interface IChangedNodeEvent {
-	
-	/**
-	 * Get the nodes that have changed
-	 * 
-	 * @return nodes that have changed
-	 */
-	public Collection<IPNode> getNodes();
-	
-	/**
-	 * Get the source of the event
-	 * 
-	 * @return the source of the event
-	 */
-	public IPMachine getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedProcessEvent.java
deleted file mode 100644
index a132a65..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedProcessEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPProcess;
-
-/**
- * This event is generated when the attributes on one or more processes have changed. It is
- * a bulk event that is sent to child listeners on the source job.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener
- */
-public interface IChangedProcessEvent {
-	/**
-	 * Get the processes that have changed
-	 * 
-	 * @return processes that have changed
-	 */
-	public Collection<IPProcess> getProcesses();
-	
-	/**
-	 * Get the source of the event. This event can come from either a job
-	 * or a node.
-	 * 
-	 * @return the source of the event
-	 */
-	public IPElement getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedQueueEvent.java
deleted file mode 100644
index 7cf1135..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IChangedQueueEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is generated when the attributes on one or more queues have changed. It is
- * a bulk event that is sent to child listeners on the source resource manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener
- */
-public interface IChangedQueueEvent {
-	
-	/**
-	 * Get the changed queues
-	 * 
-	 * @return the changed queues
-	 */
-	public Collection<IPQueue> getQueues();
-
-	/**
-	 * Get the event source
-	 * 
-	 * @return the source of the event
-	 */
-	public IResourceManager getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IJobChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IJobChangeEvent.java
deleted file mode 100644
index ac215e8..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IJobChangeEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPJob;
-
-/**
- * This event is sent when the attributes on a job change. It is sent to
- * element listeners on the job.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IJobListener
- */
-public interface IJobChangeEvent {
-	
-	/**
-	 * Get the attributes that have changed
-	 * 
-	 * @return changed attributes
-	 */
-	public AttributeManager getAttributes();
-	
-	/**
-	 * Get the source of the event
-	 * 
-	 * @return the source of the event
-	 */
-	public IPJob getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IMachineChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IMachineChangeEvent.java
deleted file mode 100644
index 641c226..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IMachineChangeEvent.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPMachine;
-
-/**
- * This event is sent when the attributes on a machine change. It is sent to
- * element listeners on the machine.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IMachineListener
- */
-public interface IMachineChangeEvent {
-	
-	/**
-	 * @return the source of the event
-	 */
-	public IPMachine getSource();
-	
-	/**
-	 * @return
-	 */
-	public AttributeManager getAttributes();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewJobEvent.java
deleted file mode 100644
index 6cc7bfe..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewJobEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-
-/**
- * This event is generated when one or more new jobs are created. It is
- * a bulk event that is sent to child listeners on the source queue.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener
- */
-public interface INewJobEvent {
-	
-	/**
-	 * Get the jobs that have been newly created.
-	 * 
-	 * @return the new jobs
-	 */
-	public Collection<IPJob> getJobs();
-
-	/**
-	 * Get the source of this event.
-	 * 
-	 * @return the source of the event
-	 */
-	public IPQueue getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewMachineEvent.java
deleted file mode 100644
index 10d2f0c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewMachineEvent.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is generated when one or more new machines are created. It is
- * a bulk event that is sent to child listeners on the source resource manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener
- */
-public interface INewMachineEvent {
-	
-	/**
-	 * Get the machines that have been newly created.
-	 * 
-	 * @return the new machines
-	 */
-	public Collection<IPMachine> getMachines();
-	
-	/**
-	 * Get the source of this event.
-	 * 
-	 * @return the source of the event
-	 */
-	public IResourceManager getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewNodeEvent.java
deleted file mode 100644
index 25f160e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewNodeEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-
-/**
- * This event is generated when one or more new nodes are created. It is
- * a bulk event that is sent to child listeners on the source machine.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IMachineChildListener
- */
-public interface INewNodeEvent {
-		
-	/**
-	 * Get the nodes that have been newly created.
-	 * 
-	 * @return the changed node
-	 */
-	public Collection<IPNode> getNodes();
-
-	/**
-	 * Get the source of this event.
-	 * 
-	 * @return the source of the event
-	 */
-	public IPMachine getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewProcessEvent.java
deleted file mode 100644
index 30a6c9c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewProcessEvent.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPProcess;
-
-/**
- * This event is generated when one or more new processes are created. It is
- * a bulk event that is sent to child listeners on the source element. Since
- * processes belong to a job, but can also be associated with a node, the
- * source element can be either a job or node.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener
- * @see org.eclipse.ptp.core.elements.listeners.INodeChildListener
- */
-public interface INewProcessEvent {
-	
-	/**
-	 * Get the new processes
-	 * 
-	 * @return the new processes
-	 */
-	public Collection<IPProcess> getProcesses();
-
-	/**
-	 * Get the source of this event. Since a process normally has two parents,
-	 * a job and a node, his will return the source that generated the
-	 * event.
-	 * 
-	 * @return the source of the event
-	 */
-	public IPElement getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewQueueEvent.java
deleted file mode 100644
index 4050160..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INewQueueEvent.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is generated when one or more new queues are created. It is
- * a bulk event that is sent to child listeners on the source resource manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener
- */
-public interface INewQueueEvent {
-	
-	/**
-	 * Get the queues that have been created
-	 * 
-	 * @return the new queue
-	 */
-	public Collection<IPQueue> getQueues();
-	
-	/**
-	 * Get the source of this event
-	 * 
-	 * @return the source of the event
-	 */
-	public IResourceManager getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INodeChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INodeChangeEvent.java
deleted file mode 100644
index f95c8a9..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/INodeChangeEvent.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPNode;
-
-/**
- * This event is sent when the attributes on a node change. It is sent to
- * element listeners on the node.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.INodeListener
- */
-public interface INodeChangeEvent {
-	
-	/**
-	 * Get the attributes that have changed
-	 * 
-	 * @return changed attributes
-	 */
-	public AttributeManager getAttributes();
-	
-	/**
-	 * Get the source of the event
-	 * 
-	 * @return the source of the event
-	 */
-	public IPNode getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IProcessChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IProcessChangeEvent.java
deleted file mode 100644
index fbf151b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IProcessChangeEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPProcess;
-
-/**
- * This event is sent when the attributes on a process change. It is sent to
- * element listeners on the process.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IProcessListener
- */
-public interface IProcessChangeEvent {
-	
-	/**
-	 * Get the attributes that have changed
-	 * 
-	 * @return changed attributes
-	 */
-	public AttributeManager getAttributes();
-	
-	/**
-	 * Get the source of the event
-	 * 
-	 * @return the source of the event
-	 */
-	public IPProcess getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IQueueChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IQueueChangeEvent.java
deleted file mode 100644
index 012ea1c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IQueueChangeEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPQueue;
-
-/**
- * This event is sent when the attributes on a queue change. It is sent to
- * element listeners on the queue.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IQueueListener
- */
-
-public interface IQueueChangeEvent {
-	
-	/**
-	 * Get the attributes that have changed.
-	 * 
-	 * @return attributes that have changed
-	 */
-	public AttributeManager getAttributes();
-	
-	/**
-	 * Get the source of the event
-	 * 
-	 * @return the source of the event
-	 */
-	public IPQueue getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveJobEvent.java
deleted file mode 100644
index 83e67c8..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveJobEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-
-/**
- * This event is generated when one or more jobs are removed. It is
- * a bulk event that is sent to child listeners on the source queue.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener
- */
-public interface IRemoveJobEvent {
-	
-	/**
-	 * Get the removed jobs
-	 * 
-	 * @return the removed jobs
-	 */
-	public Collection<IPJob> getJobs();
-
-	/**
-	 * Get the event source
-	 * 
-	 * @return the source of the event
-	 */
-	public IPQueue getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveMachineEvent.java
deleted file mode 100644
index 7de3807..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveMachineEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is generated when one or more machines are removed. It is
- * a bulk event that is sent to child listeners on the source resource manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener
- */
-public interface IRemoveMachineEvent {
-	
-	/**
-	 * Get the machines that were removed
-	 * 
-	 * @return the removed machines
-	 */
-	public Collection<IPMachine> getMachines();
-	
-	/**
-	 * Get the event source
-	 * 
-	 * @return the source of the event
-	 */
-	public IResourceManager getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveNodeEvent.java
deleted file mode 100644
index c922e1a..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveNodeEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-
-/**
- * This event is generated when one or more nodes are removed. It is
- * a bulk event that is sent to child listeners on the source machine.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IMachineChildListener
- */
-public interface IRemoveNodeEvent {
-	
-	/**
-	 * Get the nodes that have been removed
-	 * 
-	 * @return the changed node
-	 */
-	public Collection<IPNode> getNodes();
-
-	/**
-	 * Get the source of the event
-	 * 
-	 * @return the source of the event
-	 */
-	public IPMachine getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveProcessEvent.java
deleted file mode 100644
index 7a9d642..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveProcessEvent.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPProcess;
-
-/**
- * This event is generated when one or more processes are removed. It is
- * a bulk event that is sent to child listeners on the source element. Since
- * processes belong to a job, but can also be associated with a node, the
- * source element can be either a job or node.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener
- * @see org.eclipse.ptp.core.elements.listeners.INodeChildListener
- */
-public interface IRemoveProcessEvent {
-	
-	/**
-	 * Get the removed processes
-	 * 
-	 * @return the removed process
-	 */
-	public Collection<IPProcess> getProcesses();
-
-	/**
-	 * Get the event source
-	 * 
-	 * @return the source of the event
-	 */
-	public IPElement getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveQueueEvent.java
deleted file mode 100644
index 4954cce..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IRemoveQueueEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is generated when one or more queues are removed. It is
- * a bulk event that is sent to child listeners on the source resource manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener
- */
-public interface IRemoveQueueEvent {
-	
-	/**
-	 * Get the removed queues
-	 * 
-	 * @return the removed queue
-	 */
-	public Collection<IPQueue> getQueues();
-	
-	/**
-	 * Get the event source
-	 * 
-	 * @return the source of the event
-	 */
-	public IResourceManager getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerChangeEvent.java
deleted file mode 100644
index d3c1d34..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerChangeEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is sent when the attributes on a resource manager change. It is sent to
- * element listeners on the resource manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener
- */
-public interface IResourceManagerChangeEvent {
-	
-	/**
-	 * Get the changed attributes
-	 * 
-	 * @return changed attributes
-	 */
-	public AttributeManager getAttributes();
-	
-	/**
-	 * Get the event source.
-	 * 
-	 * @return the source of the event
-	 */
-	IResourceManager getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerErrorEvent.java
deleted file mode 100644
index 21fff9e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerErrorEvent.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.core.elements.events;
-
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-public interface IResourceManagerErrorEvent {
-	/**
-	 * @return
-	 */
-	String getMessage();
-	
-	/**
-	 * @return
-	 */
-	IResourceManager getSource();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerSubmitJobErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerSubmitJobErrorEvent.java
deleted file mode 100644
index 749ac13..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/events/IResourceManagerSubmitJobErrorEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.core.elements.events;
-
-
-
-/**
- * This event is sent when a job submission fails.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener
- */
-public interface IResourceManagerSubmitJobErrorEvent extends IResourceManagerErrorEvent {
-	
-	/**
-	 * Get the job submission id that was used in the original submission
-	 * 
-	 * @return id job submission id of failed submission
-	 */
-	public String getJobSubmissionId();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobChildListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobChildListener.java
deleted file mode 100644
index f52cb93..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobChildListener.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-
-
-/**
- * @author rsqrd
- * 
- */
-public interface IJobChildListener {
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IChangedProcessEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(INewProcessEvent e);
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRemoveProcessEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobListener.java
deleted file mode 100644
index 6941a03..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IJobListener.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IJobChangeEvent;
-
-public interface IJobListener {
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IJobChangeEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineChildListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineChildListener.java
deleted file mode 100644
index 9195b33..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineChildListener.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IChangedNodeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveNodeEvent;
-import org.eclipse.ptp.core.elements.events.INewNodeEvent;
-
-
-/**
- * @author rsqrd
- * 
- */
-public interface IMachineChildListener {
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IChangedNodeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(INewNodeEvent e);
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRemoveNodeEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineListener.java
deleted file mode 100644
index d96d847..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IMachineListener.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IMachineChangeEvent;
-
-public interface IMachineListener {
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IMachineChangeEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeChildListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeChildListener.java
deleted file mode 100644
index 86be024..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeChildListener.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-
-
-/**
- * @author rsqrd
- * 
- */
-public interface INodeChildListener {
-	
-	/**
-	 * Handle IChangedProcessEvent
-	 * 
-	 * @param e
-	 */
-	public void handleEvent(IChangedProcessEvent e);
-	
-	/**
-	 * Handle INewProcessEvent
-	 * 
-	 * @param e
-	 */
-	public void handleEvent(INewProcessEvent e);
-
-	/**
-	 * Handle 
-	 * 
-	 * @param e
-	 */
-	public void handleEvent(IRemoveProcessEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeListener.java
deleted file mode 100644
index fc92125..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/INodeListener.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.INodeChangeEvent;
-
-
-public interface INodeListener {
-	/**
-	 * @param e
-	 */
-	public void handleEvent(INodeChangeEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IProcessListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IProcessListener.java
deleted file mode 100644
index 1f6bb83..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IProcessListener.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-
-public interface IProcessListener {
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProcessChangeEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueChildListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueChildListener.java
deleted file mode 100644
index 5504a7d..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueChildListener.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-
-
-/**
- * @author rsqrd
- * 
- */
-public interface IQueueChildListener {
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IChangedJobEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(INewJobEvent e);
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRemoveJobEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueListener.java
deleted file mode 100644
index 6e872ff..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IQueueListener.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IQueueChangeEvent;
-
-public interface IQueueListener {
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IQueueChangeEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerChildListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerChildListener.java
deleted file mode 100644
index 68506dc..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerChildListener.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-
-
-/**
- * @author rsqrd
- * 
- */
-public interface IResourceManagerChildListener {
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(INewMachineEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(INewQueueEvent e);
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IChangedMachineEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IChangedQueueEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRemoveMachineEvent e);
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRemoveQueueEvent e);
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerListener.java
deleted file mode 100644
index b484153..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/elements/listeners/IResourceManagerListener.java
+++ /dev/null

@@ -1,29 +0,0 @@
-package org.eclipse.ptp.core.elements.listeners;
-
-import org.eclipse.ptp.core.elements.events.IResourceManagerChangeEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent;
-
-public interface IResourceManagerListener {
-	/**
-	 * Handle a resource manager attribute change event
-	 * 
-	 * @param e event
-	 */
-	public void handleEvent(IResourceManagerChangeEvent e);
-	
-	/**
-	 * Handle general resource manager error
-	 * 
-	 * @param e event
-	 */
-	public void handleEvent(IResourceManagerErrorEvent e);
-	
-	/**
-	 * Handle job submission error
-	 * 
-	 * @param e event
-	 */
-	public void handleEvent(IResourceManagerSubmitJobErrorEvent e);
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IChangedResourceManagerEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IChangedResourceManagerEvent.java
deleted file mode 100644
index d2ccf34..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IChangedResourceManagerEvent.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.core.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-/**
- * This event is generated when the attributes on one or more resource managers have changed. It is
- * a bulk event that is sent to child listeners on the model manager.
- * 
- * @see org.eclipse.ptp.core.elements.listeners.IModelManagerChildListener
- */
-public interface IChangedResourceManagerEvent {
-	/**
-	 * Get the resource managers that have changed
-	 * 
-	 * @return resource managers that have changed
-	 */
-	public Collection<IResourceManager> getResourceManagers();
-	
-	/**
-	 * Get the source of the event
-	 * 
-	 * @return source of the event
-	 */
-	public IModelManager getSource();
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/INewResourceManagerEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/INewResourceManagerEvent.java
deleted file mode 100644
index 745525f..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/INewResourceManagerEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.core.events;
-
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-public interface INewResourceManagerEvent {
-	/**
-	 * @return
-	 */
-	public IModelManager getSource();
-	
-	/**
-	 * @return
-	 */
-	public IResourceManager getResourceManager();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IRemoveResourceManagerEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IRemoveResourceManagerEvent.java
deleted file mode 100644
index 67c6872..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/events/IRemoveResourceManagerEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.core.events;
-
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-
-public interface IRemoveResourceManagerEvent {
-	/**
-	 * @return
-	 */
-	public IModelManager getSource();
-	
-	/**
-	 * @return
-	 */
-	public IResourceManager getResourceManager();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/listeners/IModelManagerChildListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/listeners/IModelManagerChildListener.java
deleted file mode 100644
index 307da46..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/listeners/IModelManagerChildListener.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.listeners;
-
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-
-
-public interface IModelManagerChildListener {
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IChangedResourceManagerEvent e);
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(INewResourceManagerEvent e);
-
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRemoveResourceManagerEvent e);
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/resources/FileStorage.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/resources/FileStorage.java
deleted file mode 100644
index fc56e13..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/resources/FileStorage.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.resources;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.PTPCorePlugin;
-
-/**
- * @author Clement chu
- * 
- */
-public class FileStorage extends PlatformObject implements IStorage {
-	IPath path;
-	InputStream in = null;
-
-	public FileStorage(IPath path){
-		this.path = path;
-	}
-	public FileStorage(InputStream in, IPath path){
-		this.path = path;
-		this.in = in;
-	}        
-	public InputStream getContents() throws CoreException {
-		if (in == null) {	
-			try {
-				return new FileInputStream(path.toFile());
-			} catch (FileNotFoundException e) {
-				throw new CoreException(new Status(IStatus.ERROR, PTPCorePlugin.PLUGIN_ID, IStatus.ERROR, e.toString(), e));
-			}
-		}
-		return in;
-	}
-
-	/**
-	 * @see IStorage#getFullPath
-	 */
-	public IPath getFullPath() {
-		return this.path;
-	}
-
-	/**
-	 * @see IStorage#getName
-	 */
-	public String getName() {
-		return this.path.lastSegment();
-	}
-
-	/**
-	 * @see IStorage#isReadOnly()
-	 */
-	public boolean isReadOnly() {
-		return true;
-	}
-	/**
-	 * @see IStorage#isReadOnly()
-	 */
-	public String toString() {
-		return path.toOSString();
-	}
-
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj instanceof IStorage) {
-			IPath p= getFullPath();
-			IPath objPath= ((IStorage)obj).getFullPath();
-			if (p != null && objPath != null)
-				return p.equals(objPath);
-		}
-		return super.equals(obj);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/BitList.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/BitList.java
deleted file mode 100644
index 07d7d86..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/BitList.java
+++ /dev/null

@@ -1,384 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.core.util;
-
-public class BitList {
-	private byte[]	bits;
-	private int		nBits;
-	private int		nBytes;
-	/** Cache the hash code for the BitList */
-	private int hash = 0;
-
-	private void init(int nbits) throws NegativeArraySizeException {
-		if (nbits < 0) 
-			throw new NegativeArraySizeException();
-		
-		if (nbits == 0) {
-			this.nBits = 0;
-			this.nBytes = 0;
-		} else {
-			this.nBits = nbits;
-			this.nBytes = ((nbits-1) >> 3) + 1;
-			this.bits = new byte[this.nBytes];
-		}
-	}
-	
-	public BitList(int nbits, String str) {
-		this.init(nbits);
-		this.fromString(str);
-	}
-	
-	public BitList(int nbits) {
-		this.init(nbits);
-	}
-	
-	private BitList(int nbits, byte[] bits) {
-		this.init(nbits);
-		for (int i = 0; i < this.nBytes; i++)
-			this.bits[i] = bits[i];
-	}
-	
-	public int size() {
-		return this.nBits;
-	}
-	
-	private int countBits(byte b) {
-		int n = 0;
-		
-		while (b != 0) {
-			n++;
-			b &= (b-1);
-		}
-		
-		return n;
-	}
-	
-	public int cardinality() {
-		int n = 0;
-		
-		for (int i = 0; i < this.nBytes; i++) {
-			n += countBits(this.bits[i]);
-		}
-		
-		return n;
-	}
-	
-	public void clear(int index) throws IndexOutOfBoundsException {
-		if (index >= this.nBits || index < 0)
-			throw new IndexOutOfBoundsException();
-		
-		int b = bytePos(index);
-		this.bits[b] &= ~(byte)(1 << bitInByte(index));
-	}
-
-	public void clear(int[] indexs) {
-		for (int i = 0; i < indexs.length; i++)
-			this.clear(indexs[i]);
-	}
-	
-	public void set(int index) throws IndexOutOfBoundsException {
-		if (index >= this.nBits || index < 0)
-			throw new IndexOutOfBoundsException();
-
-		int b = bytePos(index);
-		this.bits[b] |= (byte)(1 << bitInByte(index));
-	}
-
-	public void set(int[] indexs) {
-		for (int i = 0; i < indexs.length; i++)
-			this.set(indexs[i]);
-	}
-	
-	public void set(int from, int to) {
-		if (from >= this.nBits || from < 0 || to > this.nBits || from >= to)
-			throw new IndexOutOfBoundsException();
-		
-		int last = to - 1; 
-		
-		/*
-		 * Deal with single bit case
-		 */
-		if (from == last) {
-			this.set(from);
-			return;
-		}
-		
-		int p1 = bytePos(from);
-		int p2 = bytePos(last);
-		int b1 = bitInByte(from);
-		int b2 = bitInByte(last);
-		
-		/*
-		 * Need to do something special if 'from' and 'to' refer
-		 * to a single byte
-		 */
-		if (p1 == p2) {
-			byte mask = (byte) (0xff >> (7 - b2));
-			this.bits[p1] = (byte) (mask & (0xff << b1));
-			return;
-		}
-		
-		byte hiMask =  (byte) (0xff >> (7 - b2));
-		byte lowMask = (byte) (0xff << b1);
-		
-		for (int p = p1+1; p < p2; p++)
-			this.bits[p] = (byte) 0xff;
-		
-		this.bits[p1] |= lowMask;
-		this.bits[p2] |= hiMask;
-	}
-	
-	public boolean get(int index) throws IndexOutOfBoundsException {
-		if (index >= this.nBits || index < 0)
-			throw new IndexOutOfBoundsException();
-
-		int b = bytePos(index);
-		byte mask = (byte)(1 << bitInByte(index));
-		return (this.bits[b] & mask) == mask;
-	}
-	
-	public int nextSetBit(int index) {
-		if (index < 0)
-			throw new IndexOutOfBoundsException();
-
-		if (index >= this.nBits)
-			return -1;
-		
-		int i = index;
-		int start = bitInByte(index);
-		
-		for (int p = bytePos(index); p < this.nBytes; p++) {
-			byte val = this.bits[p];
-			if (val != 0) {
-				for (int b = start; b < 8; b++, i++) {
-					byte mask = (byte) (1 << b);
-					if ((val & mask) == mask)
-						return i;
-				}
-			} else
-				i += 8;
-			
-			start = 0;
-		}
-		
-		return -1;
-	}
-	
-	public int[] toArray() {
-		int[] retValue = new int[this.cardinality()];
-		for(int i = this.nextSetBit(0), j = 0; i >= 0; i = this.nextSetBit(i+1), j++) {
-			retValue[j] = i;
-		}
-		return retValue;
-	}
-
-	public BitList copy() {
-		return new BitList(this.nBits, this.bits);
-	}
-	
-	public Object clone() {
-		return (Object)this.copy();
-	}
-	
-	/*
-	 * If sets are different lengths, we assume missing bits are zero
-	 */
-	public void and(BitList s) {
-		for (int i = 0; i < this.nBytes; i++) {
-			if (i >= s.nBytes)
-				this.bits[i] = 0;
-			else
-				this.bits[i] &= s.bits[i];
-		}
-	}
-	
-	public void andNot(BitList s) {
-		for (int i = 0; i < this.nBytes; i++) {
-			if (i < s.nBytes)
-				this.bits[i] &= ~s.bits[i];
-		}
-	}
-	
-	public boolean intersects(BitList s) {
-		for (int i = 0; i < this.nBytes; i++) {
-			if (i >= s.nBytes)
-				break;
-
-			if ((this.bits[i] & s.bits[i]) != 0)
-				return true;
-		}
-		
-		return false;
-	}
-	
-	public boolean isEmpty() {
-		boolean res = true;
-		
-		for (int i = 0; i < this.nBytes; i++) {
-			if (this.bits[i] != 0)
-				res = false;
-		}
-		
-		return res;
-	}
-	
-	public void or(BitList s) {
-		for (int i = 0; i < this.nBytes; i++) {
-			if (i >= s.nBytes)
-				break;
-
-			this.bits[i] |= s.bits[i];
-		}
-	}
-	
-	private void fromString(String str) {
-		if (this.nBytes == 0)
-			return;
-		
-		byte[] strBits = str.getBytes();
-		
-		int last = strBits.length - this.nBytes * 2;
-		if (last < 0)
-			last = 0;
-		
-		byte mask = (byte) (0xff >> (7 - bitInByte(this.nBits - 1)));
-		
-		for (int i = strBits.length-1, b = 0; i >= last; i -= 2, b++) {
-			byte c = fromHex(strBits[i]);
-			if (i-1 >= 0)
-				c |= fromHex(strBits[i-1]) << 4;
-			this.bits[b] = c;
-		}
-		
-		/*
-		 * Mask out high bits of last byte
-		 */
-		this.bits[this.nBytes-1] &= mask;
-	}
-	
-	public String toString() {
-		String res = "";
-		boolean nonzero = false;
-		
-		if (this.nBits == 0) {
-			res = "0";
-		} else {
-			for (int i = this.nBytes-1 ; i >= 0; i--) {
-				nonzero |= this.bits[i] != 0;
-				if (nonzero) {
-					res += Integer.toHexString((this.bits[i] >> 4) & 0xf);
-					res += Integer.toHexString(this.bits[i] & 0xf);
-				}
-			}
-			if (!nonzero)
-				res = "0";
-		}
-		
-		return res;
-	}
-	
-	private byte fromHex(byte b) {
-		if (b >= 48 && b <= 57)
-			return (byte) (b - 48);
-		if (b >= 65 && b <= 70)
-			return (byte) (b - 65 + 10);
-		if (b >= 97 && b <= 102)
-			return (byte) (b - 97 + 10);
-		
-		return (byte)0;
-	}
-
-	private int bytePos(int idx) {
-		return idx >> 3;
-	}
-	
-	private int bitInByte(int idx) {
-		return idx - (bytePos(idx) << 3);
-	}
-	
-    /**
-     * Returns a hash code for this BitList. 
-     * (The hash value of the empty BitList is zero.)
-     * @return  a hash code value for this object.
-     */
-	public int hashCode() {
-		int h = hash;
-		if (h == 0) {
-			for (int i = 0; i < nBytes; i++) {
-				h = 31*h + bits[i];
-	        }
-	        hash = h;
-		}
-		return h;
-	}
-    /**
-     * Compares this BitList to the specified object.
-     * @param  obj The object to compare this {@code BitList} against
-     * @return  {@code true} if the given object represents a {@code BitList} equivalent to this BitList, {@code false} otherwise
-     */
-	public boolean equals(Object obj) {
-		if (this == obj) {
-		    return true;
-		}
-		if (obj instanceof BitList) {
-			BitList anotherBitList = (BitList)obj;
-			if (nBits != anotherBitList.nBits || nBytes != anotherBitList.nBytes)
-				return false;
-			
-			for (int i = 0; i < nBytes; i++) {
-				if (bits[i] != anotherBitList.bits[i])
-					return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	public static String showBitList(BitList tasks) {
-		if (tasks == null) {
-			return "{null}";
-		}
-		int[] array = tasks.toArray();
-		if (array.length == 0)
-			return "{}";
-		
-		String msg = "{";
-		int preTask = array[0];
-		msg += preTask;
-		boolean isContinue = false;
-		for (int i = 1; i < array.length; i++) {
-			if (preTask == (array[i] - 1)) {
-				preTask = array[i];
-				isContinue = true;
-				if (i == (array.length - 1)) {
-					msg += "-" + array[i];
-					break;
-				}
-				continue;
-			}
-			if (isContinue)
-				msg += "-" + preTask;
-			msg += "," + array[i];
-			isContinue = false;
-			preTask = array[i];
-		}
-		return msg + "}";
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/DebugUtil.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/DebugUtil.java
deleted file mode 100644
index fce8e54..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/DebugUtil.java
+++ /dev/null

@@ -1,52 +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.core.util;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.core.PTPCorePlugin;
-
-public class DebugUtil {
-	private static final String PROTOCOL_TRACING_OPTION = "org.eclipse.ptp.core/debug/proxy/protocol/tracing";
-	private static final String PROXY_CLIENT_TRACING_OPTION = "org.eclipse.ptp.core/debug/proxy/client/tracing";
-	private static final String PROXY_SERVER_DEBUG_LEVEL_OPTION = "org.eclipse.ptp.core/debug/proxy/server/debug_level";
-	private static final String RM_TRACING_OPTION = "org.eclipse.ptp.core/debug/rm/tracing";
-
-	public static boolean PROTOCOL_TRACING = false;
-	public static boolean PROXY_CLIENT_TRACING = false;
-	public static int PROXY_SERVER_DEBUG_LEVEL = 0;
-	public static boolean RM_TRACING = false;;
-
-	public static void configurePluginDebugOptions() {
-		if (PTPCorePlugin.getDefault().isDebugging()) {
-			String option = Platform.getDebugOption(PROTOCOL_TRACING_OPTION);
-			if (option != null) {
-				PROTOCOL_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(PROXY_CLIENT_TRACING_OPTION);
-			if (option != null) {
-				PROXY_CLIENT_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(PROXY_SERVER_DEBUG_LEVEL_OPTION);
-			if (option != null) {
-				try {
-					PROXY_SERVER_DEBUG_LEVEL = Integer.parseInt(option);
-				} catch (NumberFormatException e) {
-					PROXY_SERVER_DEBUG_LEVEL = 0;
-				}
-			}
-			option = Platform.getDebugOption(RM_TRACING_OPTION);
-			if (option != null) {
-				RM_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/OutputTextFile.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/OutputTextFile.java
deleted file mode 100644
index f207ea1..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/OutputTextFile.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.core.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.core.PreferenceConstants;
-
-/**
- *
- */
-public class OutputTextFile implements PreferenceConstants {
-	private String filename = "";
-
-	private File file = null;
-
-	private String outputPath = null;
-
-	private int storeLine = 0;
-
-	private int lineCounter = 0;
-
-	public OutputTextFile(String name, String type, String outputPath, int storeLine) {
-		this.filename = name + "." + type;
-		this.outputPath = outputPath;
-		this.storeLine = storeLine;
-		init();
-	}
-
-	private void init() {
-		file = getFilePath();
-	}
-
-	private File getFilePath() {
-		IPath filePath = new Path(outputPath).append(filename);
-		File tmpFile = filePath.toFile();
-		try {
-			tmpFile.createNewFile();
-		} catch (IOException e) {
-			System.out.println("OutputTextFile - getFilePath err: "
-					+ e.getMessage());
-		}
-		return tmpFile;
-	}
-
-	public void write(String text) {
-		if (lineCounter == storeLine) {
-			lineCounter = 0;
-			write(text, false);
-		} else
-			write(text, true);
-	}
-
-	public void write(String text, boolean isAppend) {
-		FileOutputStream fos = null;
-		try {
-			fos = new FileOutputStream(file, isAppend);
-			fos.write(text.getBytes());
-			lineCounter++;
-		} catch (FileNotFoundException e) {
-			System.out.println("OutputTextFile - append file err: "
-					+ e.getMessage());
-		} catch (IOException ioe) {
-			System.out.println("OutputTextFile - append io err: "
-					+ ioe.getMessage());
-		} finally {
-			if (fos != null) {
-				try {
-					fos.close();
-				} catch (IOException ioe) {
-					System.out.println("OutputTextFile - append close err: "
-							+ ioe.getMessage());
-				}
-			}
-			fos = null;
-		}
-	}
-
-	public void delete() {
-		if (file.exists())
-			file.delete();
-
-		file = null;
-	}
-
-	public String getContents() {
-		if (file == null)
-			return null;
-
-		InputStream is = null;
-		try {
-			is = new BufferedInputStream(new FileInputStream(file));
-			return readString(is, ResourcesPlugin.getEncoding());
-		} catch (FileNotFoundException e) {
-			System.out.println("OutputTextFile - read file err: "
-					+ e.getMessage());
-		} finally {
-			is = null;
-		}
-		return null;
-	}
-
-	private String readString(InputStream is, String encoding) {
-		if (is == null)
-			return null;
-
-		BufferedReader reader = null;
-		try {
-			StringBuffer buffer = new StringBuffer();
-			char[] part = new char[2048];
-			int read = 0;
-			reader = new BufferedReader(new InputStreamReader(is, encoding));
-			while ((read = reader.read(part)) != -1)
-				buffer.append(part, 0, read);
-
-			return buffer.toString();
-		} catch (IOException ex) {
-		} finally {
-			if (reader != null) {
-				try {
-					reader.close();
-				} catch (IOException ex) {
-				}
-			}
-		}
-		return null;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/Queue.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/Queue.java
deleted file mode 100644
index 0cd6952..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/core/util/Queue.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.core.util;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-public class Queue<T> {
-	protected List<T> list;
-
-	public Queue() {
-		list = Collections.synchronizedList(new LinkedList<T>());
-	}
-
-	public T removeItem() throws InterruptedException {
-		synchronized (list) {
-			while (list.isEmpty()) {
-				list.wait();
-			}
-			return list.remove(0);
-		}
-	}
-
-	public void addItem(T item) {
-		synchronized (list) {
-			list.add(item);
-			list.notifyAll();
-		}
-	}
-	
-    public T[] clearItems() {
-		T[] array;
-		synchronized (list) {
-			array = (T[]) list.toArray();
-			list.clear();
-		}
-		return array;
-	}
-
-	public boolean isEmpty() {
-		boolean empty;
-		synchronized (list) {
-			empty = list.isEmpty();
-		}
-		return empty;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/ModelManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/ModelManager.java
deleted file mode 100644
index 7c127d4..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/ModelManager.java
+++ /dev/null

@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.internal.core.elements.PUniverse;
-import org.eclipse.ptp.internal.core.events.NewResourceManagerEvent;
-import org.eclipse.ptp.internal.core.events.RemoveResourceManagerEvent;
-import org.eclipse.ptp.internal.rmsystem.ResourceManagerPersistence;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-
-public class ModelManager implements IModelManager {
-	public final static String EXTENSION_POINT_ID = "resourceManagers"; //$NON-NLS-1$
-	
-	private class RMStartupJob extends Job {
-		private IResourceManagerControl resourceManager;
-		
-		public RMStartupJob(IResourceManagerControl rm) {
-			super("Starting Resource Manager: " + rm.getName());
-			resourceManager = rm;
-		}
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor) {
-			try {
-	            try {
-	            	monitor.beginTask("Starting resource manager", 100);
-	            	resourceManager.startUp(new SubProgressMonitor(monitor, 100));
-	            } catch (CoreException e) {
-	                return e.getStatus();
-	            }
-	            if (monitor.isCanceled()) {
-	                return Status.CANCEL_STATUS;
-	            }
-	            return Status.OK_STATUS;
-			} finally {
-				monitor.done();
-			}
-        }
-		
-	}
-	
-	private IResourceManagerFactory[] resourceManagerFactories;
-	
-	private final ListenerList resourceManagerListeners = new ListenerList();
-
-	// protected IPMachine machine = null;
-	protected IPJob processRoot = null;
-
-	protected IPUniverseControl universe = new PUniverse();
-	protected ILaunchConfiguration config = null;
-	
-	public ModelManager() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#addListener(org.eclipse.ptp.core.listeners.IModelManagerChildListener)
-	 */
-	public void addListener(IModelManagerChildListener listener) {
-		resourceManagerListeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#addResourceManager(org.eclipse.ptp.core.elementcontrols.IResourceManagerControl)
-	 */
-	public synchronized void addResourceManager(IResourceManagerControl rm) {
-		universe.addResourceManager(rm);
-		fireNewResourceManager(rm);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#addResourceManagers(org.eclipse.ptp.core.elementcontrols.IResourceManagerControl[])
-	 */
-	public synchronized void addResourceManagers(IResourceManagerControl[] rms) {
-		for (IResourceManagerControl rm : rms) {
-			addResourceManager(rm);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#getResourceManagerFactories()
-	 */
-	public IResourceManagerFactory[] getResourceManagerFactories()
-	{
-		if (resourceManagerFactories != null) {
-			return resourceManagerFactories;
-		}
-		
-		final ArrayList<AbstractResourceManagerFactory> factoryList = new ArrayList<AbstractResourceManagerFactory>();
-	
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry.getExtensionPoint(PTPCorePlugin.getUniqueIdentifier(), EXTENSION_POINT_ID);
-		final IExtension[] extensions = extensionPoint.getExtensions();
-		
-		for (int iext = 0; iext < extensions.length; ++iext) {
-			final IExtension ext = extensions[iext];
-			
-			final IConfigurationElement[] elements = ext.getConfigurationElements();
-		
-			for (int i=0; i< elements.length; i++)
-			{
-				IConfigurationElement ce = elements[i];
-				try {
-					AbstractResourceManagerFactory factory = (AbstractResourceManagerFactory) ce.createExecutableExtension("class");
-					factory.setId(ce.getAttribute("id"));
-					factoryList.add(factory);
-				} catch (CoreException e) {
-					PTPCorePlugin.log(e);
-				}
-			}
-		}
-		resourceManagerFactories =
-			(IResourceManagerFactory[]) factoryList.toArray(
-					new IResourceManagerFactory[factoryList.size()]);
-	
-		return resourceManagerFactories;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#getResourceManagerFactory(java.lang.String)
-	 */
-	public IResourceManagerFactory getResourceManagerFactory(String id)
-	{
-		IResourceManagerFactory[] factories = getResourceManagerFactories();
-		for (int i=0; i<factories.length; i++)
-		{
-			if (factories[i].getId().equals(id)) return factories[i];
-		}
-		
-		throw new RuntimeException("Unable to find resource manager factory");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#getResourceManagerFromUniqueName(java.lang.String)
-	 */
-	public IResourceManager getResourceManagerFromUniqueName(String rmUniqueName) {
-		IPUniverse universe = getUniverse();
-		if (universe != null) {
-			IResourceManager[] rms = getStartedResourceManagers(universe);
-			
-			for (IResourceManager rm : rms) {
-				if (rm.getUniqueName().equals(rmUniqueName)) {
-					return rm;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#getStartedResourceManagers(org.eclipse.ptp.core.elements.IPUniverse)
-	 */
-	public IResourceManager[] getStartedResourceManagers(IPUniverse universe) {
-		IResourceManager[] rms = universe.getResourceManagers();
-		ArrayList<IResourceManager> startedRMs = 
-			new ArrayList<IResourceManager>(rms.length);
-		for (IResourceManager rm : rms) {
-			if (rm.getState() == ResourceManagerAttributes.State.STARTED) {
-				startedRMs.add(rm);
-			}
-		}
-		return startedRMs.toArray(new IResourceManager[startedRMs.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelPresentation#getUniverse()
-	 */
-	public IPUniverse getUniverse() {
-		return universe;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent)
-	 */
-	public void handleEvent(IResourceManagerErrorEvent e) {
-		// Ignore - handled by listener on RM		
-	}
-
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#loadResourceManagers()
-	 */
-	public void loadResourceManagers() throws CoreException {
-        ResourceManagerPersistence rmp = new ResourceManagerPersistence();
-        rmp.loadResourceManagers(getResourceManagersFile(), getResourceManagerFactories());
-        IResourceManagerControl[] resourceManagers = rmp.getResourceManagerControls();
-        IResourceManagerControl[] rmsNeedStarting = rmp.getResourceManagerControlsNeedStarting();
-        addResourceManagers(resourceManagers);
-        startResourceManagers(rmsNeedStarting);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#removeListener(org.eclipse.ptp.core.listeners.IModelManagerChildListener)
-	 */
-	public void removeListener(IModelManagerChildListener listener) {
-		resourceManagerListeners.remove(listener);
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.ptp.core.IModelManager#removeResourceManager(org.eclipse.ptp.core.elementcontrols.IResourceManagerControl)
-     */
-    public synchronized void removeResourceManager(IResourceManagerControl rm) {
-		universe.removeResourceManager(rm);
-		fireRemoveResourceManager(rm);
-	}
-
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#removeResourceManagers(org.eclipse.ptp.core.elementcontrols.IResourceManagerControl[])
-	 */
-	public synchronized void removeResourceManagers(IResourceManagerControl[] rms) {
-		for (IResourceManagerControl rm : rms) {
-			removeResourceManager(rm);
-		}
-	}
-
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#saveResourceManagers()
-	 */
-	public void saveResourceManagers() {
-		ResourceManagerPersistence.saveResourceManagers(getResourceManagersFile(),
-				universe.getResourceManagerControls());
-	}
-
-	/* (non-Javadoc)
-     * @see org.eclipse.ptp.core.IModelManager#shutdown()
-     */
-    public void shutdown() throws CoreException {
-		saveResourceManagers();
-		stopResourceManagers();
-		shutdownResourceManagers();
-		resourceManagerListeners.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#start()
-	 */
-	public void start() throws CoreException {
-		loadResourceManagers();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IModelManager#stopResourceManagers()
-	 */
-	public void stopResourceManagers() throws CoreException {
-		IResourceManager[] resourceManagers = universe.getResourceManagers();
-		for (int i = 0; i<resourceManagers.length; ++i) {
-			resourceManagers[i].shutdown();
-		}
-	}
-
-	/**
-	 * Fire a new resource manager event.
-	 * 
-	 * @param rm
-	 */
-	private void fireNewResourceManager(final IResourceManager rm) {
-		INewResourceManagerEvent event = 
-			new NewResourceManagerEvent(this, rm);
-		for (Object listener : resourceManagerListeners.getListeners()) {
-			((IModelManagerChildListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * Fire a remove resource manager event.
-	 * 
-	 * @param rm
-	 */
-	private void fireRemoveResourceManager(final IResourceManager rm) {
-		IRemoveResourceManagerEvent event = 
-			new RemoveResourceManagerEvent(this, rm);
-		for (Object listener : resourceManagerListeners.getListeners()) {
-			((IModelManagerChildListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Locate the resource managers configuration file.
-	 * 
-	 * @return
-	 */
-	private File getResourceManagersFile() {
-		final PTPCorePlugin plugin = PTPCorePlugin.getDefault();
-		return plugin.getStateLocation().append("resourceManagers.xml").toFile(); //$NON-NLS-1$
-	}
-
-	/**
-	 * shuts down all of the resource managers.
-	 */
-	private synchronized void shutdownResourceManagers() {
-		IResourceManagerControl[] resourceManagers = universe.getResourceManagerControls();
-		for (int i = 0; i<resourceManagers.length; ++i) {
-			resourceManagers[i].dispose();
-		}
-	}
-
-	/**
-	 * Start all resource managers.
-	 * 
-	 * @param rmsNeedStarting
-	 * @throws CoreException
-	 */
-	private void startResourceManagers(IResourceManagerControl[] rmsNeedStarting) throws CoreException {
-        for (final IResourceManagerControl rm : rmsNeedStarting) {
-            Job job = new RMStartupJob(rm);
-            job.schedule();
-        }
-    }
-
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElement.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElement.java
deleted file mode 100644
index 6da6e37..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElement.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-
-public abstract class PElement extends PlatformObject implements IPElementControl, Comparable<IPElementControl> {
-
-	private final PElementInfo elementInfo = new PElementInfo(this);
-	protected final AttributeManager attributeValues = new AttributeManager();
-	protected final String elementId;
-	protected final IPElementControl elementParent;
-	protected final int elementType;
-
-	protected PElement(String id, IPElementControl parent, int type, IAttribute<?,?,?>[] attrs) {
-		elementId = id;
-		elementType = type;
-		elementParent = parent;
-		ArrayList<IAttribute<?, ?, ?>> attrList = new ArrayList<IAttribute<?,?,?>>(Arrays.asList(attrs));
-		attrList.add(ElementAttributes.getIdAttributeDefinition().create(id));
-		attributeValues.addAttributes(attrList.toArray(new IAttribute<?, ?, ?>[0]));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#addAttribute(org.eclipse.ptp.core.attributes.IAttribute)
-	 */
-	public void addAttribute(IAttribute<?,?,?> attrib) {
-		addAttributes(new IAttribute<?,?,?>[]{attrib});
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#addAttributes(org.eclipse.ptp.core.attributes.IAttribute[])
-	 */
-	public void addAttributes(IAttribute<?,?,?>[] attribs) {
-		attributeValues.addAttributes(attribs);
-		doAddAttributeHook(new AttributeManager(attribs));
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-	 */
-	public int compareTo(IPElementControl obj) {
-		return getName().compareTo(obj.getName());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IPElement#getAttribute(org.eclipse.ptp.core.attributes.IAttributeDefinition)
-	 */
-	public <T, A extends IAttribute<T, A, D>, D extends IAttributeDefinition<T, A, D>> A getAttribute(D attrDef) {
-		return attributeValues.getAttribute(attrDef);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#getAttribute(java.lang.String)
-	 */
-	public IAttribute<?,?,?> getAttribute(String attrId) {
-		return attributeValues.getAttribute(attrId);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#getAttributeKeys()
-	 */
-	public IAttributeDefinition<?,?,?>[] getAttributeKeys() {
-		return attributeValues.getKeys();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#getAttributes()
-	 */
-	public IAttribute<?,?,?>[] getAttributes() {
-		return attributeValues.getAttributes();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#getDisplayAttributes()
-	 */
-	public IAttribute<?,?,?>[] getDisplayAttributes() {
-		return attributeValues.getDisplayAttributes();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPElementControl#getElementType()
-	 */
-	public int getElementType() {
-		return elementType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#getID()
-	 */
-	public String getID() {
-		return elementId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#getName()
-	 */
-	public String getName() {
-		StringAttribute attr = attributeValues.getAttribute(ElementAttributes.getNameAttributeDefinition());
-		if (attr != null) {
-			return attr.getValue();
-		}
-		return getID();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPElementControl#getParent()
-	 */
-	public IPElementControl getParent() {
-		return elementParent;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPElement#removeAttribute(org.eclipse.ptp.core.attributes.IAttribute)
-	 */
-	public void removeAttribute(IAttribute<?,?,?> attrib) {
-		attributeValues.removeAttribute(attrib);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPElementControl#size()
-	 */
-	public int size() {
-		return getElementInfo().size();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getName();
-	}
-
-	protected abstract void doAddAttributeHook(AttributeManager attrs);
-	
-	/**
-	 * Find the element info for this element
-	 * 
-	 * @return PElementInfo
-	 */
-	protected PElementInfo getElementInfo() {
-		return elementInfo;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElementInfo.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElementInfo.java
deleted file mode 100644
index 6e59d52..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PElementInfo.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elements.IPElement;
-
-/**
- *
- */
-public class PElementInfo {
-	private final Map<String, IPElementControl> fChildren = 
-		Collections.synchronizedMap(new HashMap<String, IPElementControl>());
-	protected final IPElementControl element;
-
-	public PElementInfo(IPElementControl element) {
-		this.element = element;
-	}
-
-	/**
-	 * Add a child to this element
-	 * 
-	 * @param member
-	 */
-	public void addChild(IPElementControl member) {
-		fChildren.put(member.getID(), member);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() {
-		try {
-			return super.clone();
-		} catch (CloneNotSupportedException e) {
-			throw new Error();
-		}
-	}
-
-	/**
-	 * Find child with corresponding key
-	 * 
-	 * @param key
-	 * @return child
-	 */
-	public IPElementControl findChild(String key) {
-		synchronized (fChildren) {
-			if (fChildren.containsKey(key)) {
-				return (IPElementControl) fChildren.get(key);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Get all children of this element
-	 * 
-	 * @return children
-	 */
-	public IPElementControl[] getChildren() {
-		 return (IPElementControl[]) fChildren.values().toArray(new IPElementControl[size()]);
-	}
-
-	/**
-	 * Get the element
-	 * 
-	 * @return element
-	 */
-	public IPElementControl getElement() {
-		return element;
-	}
-
-	/**
-	 * Check if this element has any children
-	 * 
-	 * @return true if we have children
-	 */
-	public boolean hasChildren() {
-		return size() > 0;
-	}
-
-	/**
-	 * Check if child is one of ours
-	 * 
-	 * @param child
-	 * @return true if child is one of ours
-	 */
-	public boolean includesChild(IPElementControl child) {
-		if (fChildren.containsKey(child.getID())) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove child
-	 * 
-	 * @param member
-	 */
-	public void removeChild(IPElement member) {
-		fChildren.remove(member.getID());
-	}
-
-	/**
-	 * Remove all children
-	 */
-	public void removeChildren() {
-		fChildren.clear();
-	}
-
-	/**
-	 * Add children
-	 * 
-	 * @param children
-	 */
-	public void setChildren(IPElementControl[] children) {
-		for (IPElementControl element : children) {
-			fChildren.put(element.getID(), element);
-		}
-	}
-
-	/**
-	 * Return number of children
-	 * 
-	 * @return number of children
-	 */
-	public int size() {
-		return fChildren.size();
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PJob.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PJob.java
deleted file mode 100644
index a77c5bc..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PJob.java
+++ /dev/null

@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.BooleanAttribute;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.IJobChangeEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.IJobListener;
-import org.eclipse.ptp.internal.core.elements.events.ChangedProcessEvent;
-import org.eclipse.ptp.internal.core.elements.events.JobChangeEvent;
-import org.eclipse.ptp.internal.core.elements.events.NewProcessEvent;
-import org.eclipse.ptp.internal.core.elements.events.RemoveProcessEvent;
-
-public class PJob extends Parent implements IPJobControl {
-	private final ListenerList elementListeners = new ListenerList();
-	private final ListenerList childListeners = new ListenerList();
-	private final Map<String, IPProcessControl> indexMap = 
-		Collections.synchronizedMap(new HashMap<String, IPProcessControl>());
-	private ILaunchConfiguration configuration;
-
-	public PJob(String id, IPQueueControl queue, IAttribute<?,?,?>[] attrs) {
-		super(id, queue, P_JOB, attrs);
-		/*
-		 * Create required attributes.
-		 */
-		EnumeratedAttribute<State> jobState = getAttribute(JobAttributes.getStateAttributeDefinition());
-		if (jobState == null) {
-			jobState = JobAttributes.getStateAttributeDefinition().create();
-			addAttribute(jobState);
-		}
-		BooleanAttribute debugFlag = getAttribute(JobAttributes.getDebugFlagAttributeDefinition());
-		if (debugFlag == null) {
-			debugFlag = JobAttributes.getDebugFlagAttributeDefinition().create();
-			addAttribute(debugFlag);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#addChildListener(org.eclipse.ptp.core.elements.listeners.IJobProcessListener)
-	 */
-	public void addChildListener(IJobChildListener listener) {
-		childListeners.add(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#addElementListener(org.eclipse.ptp.core.elements.listeners.IJobListener)
-	 */
-	public void addElementListener(IJobListener listener) {
-		elementListeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPJobControl#addProcessAttributes(java.util.Collection, org.eclipse.ptp.core.attributes.IAttribute<?,?,?>[])
-	 */
-	public void addProcessAttributes(Collection<IPProcessControl> processControls,
-			IAttribute<?, ?, ?>[] attrs) {
-		List<IPProcess> processes = new ArrayList<IPProcess>(processControls.size());
-		
-		for (IPProcessControl process : processControls) {
-			process.addAttributes(attrs);
-			processes.add(process);
-		}
-		
-		fireChangedProcesses(processes);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPJobControl#addProcesses(java.util.Collection)
-	 */
-	public void addProcesses(Collection<IPProcessControl> processControls) {
-		List<IPProcess> processes = new ArrayList<IPProcess>(processControls.size());
-
-		for (IPProcessControl process : processControls) {
-			addChild(process);
-			String idx = process.getProcessIndex();
-			if (idx != null) {
-				indexMap.put(idx, process);
-			}
-			processes.add(process);
-		}
-		
-		fireNewProcesses(processes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#getLaunchConfiguration()
-	 */
-	public synchronized ILaunchConfiguration getLaunchConfiguration() {
-		return configuration;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#getProcessById(java.lang.String)
-	 */
-	public IPProcess getProcessById(String id) {
-		IPElementControl element = findChild(id);
-		if (element != null) {
-			return (IPProcessControl) element;
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#getProcessByIndex(int)
-	 */
-	public IPProcess getProcessByIndex(int index) {
-		return indexMap.get(String.valueOf(index));
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#getProcessByIndex(java.lang.String)
-	 */
-	public IPProcess getProcessByIndex(String index) {
-		return indexMap.get(index);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPJobControl#getProcessControls()
-	 */
-	public Collection<IPProcessControl> getProcessControls() {
-		IPElementControl[] children = getChildren();
-		List<IPProcessControl> processes =
-			new ArrayList<IPProcessControl>(children.length);
-		for (IPElementControl element : children) {
-			processes.add((IPProcessControl)element);
-		}
-		return processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#getProcesses()
-	 */
-	public IPProcess[] getProcesses() {
-		return getProcessControls().toArray(new IPProcess[getProcessControls().size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#getQueue()
-	 */
-	public IPQueue getQueue() {
-		return getQueueControl();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPJobControl#getQueueControl()
-	 */
-	public IPQueueControl getQueueControl() {
-		return (IPQueueControl) getParent();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#getState()
-	 */
-	public State getState() {
-		return getAttribute(JobAttributes.getStateAttributeDefinition()).getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#isDebug()
-	 */
-	public boolean isDebug() {
-		return getAttribute(JobAttributes.getDebugFlagAttributeDefinition()).getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#isTerminated()
-	 */
-	public boolean isTerminated() {
-		State state = getState();
-		if (state == State.TERMINATED || state == State.ERROR) {
-			return true;
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#removeChildListener(org.eclipse.ptp.core.elements.listeners.IJobProcessListener)
-	 */
-	public void removeChildListener(IJobChildListener listener) {
-		childListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#removeElementListener(org.eclipse.ptp.core.elements.listeners.IJobListener)
-	 */
-	public void removeElementListener(IJobListener listener) {
-		elementListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPJobControl#removeProcesses(java.util.Collection)
-	 */
-	public void removeProcesses(Collection<IPProcessControl> processControls) {
-		List<IPProcess> processes = new ArrayList<IPProcess>(processControls.size());
-		
-		for (IPProcessControl process : processControls) {
-			removeChild(process);
-			process.clearOutput();
-			String idx = process.getProcessIndex();
-			if (idx != null) {
-				indexMap.remove(idx);
-			}
-			processes.add(process);
-		}
-		
-		fireRemoveProcesses(processes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPJob#setDebug()
-	 */
-	public void setDebug() {
-		BooleanAttribute debug = getAttribute(JobAttributes.getDebugFlagAttributeDefinition());
-		debug.setValue(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPJobControl#setLaunchConfiguration(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public synchronized void setLaunchConfiguration(ILaunchConfiguration configuration) {
-		this.configuration = configuration;
-	}
-
-	/**
-	 * Notify listeners when a job attribute has changed.
-	 * 
-	 * @param attrs
-	 */
-	private void fireChangedJob(AttributeManager attrs) {
-		IJobChangeEvent e = new JobChangeEvent(this, attrs);
-		
-		for (Object listener : elementListeners.getListeners()) {
-			((IJobListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Send IChangedProcessEvent to registered listeners
-	 * 
-	 * @param nodes
-	 */
-	private void fireChangedProcesses(Collection<IPProcess> processes) {
-		IChangedProcessEvent e = 
-			new ChangedProcessEvent(this, processes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IJobChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Notify listeners when a new process is created.
-	 * 
-	 * @param process
-	 */
-	private void fireNewProcesses(Collection<IPProcess> processes) {
-		INewProcessEvent e = 
-			new NewProcessEvent(this, processes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IJobChildListener)listener).handleEvent(e);
-		}
-	}
-	
-	/**
-	 * Notify listeners when the collection of processes are removed.
-	 * 
-	 * @param processes to remove
-	 */
-	private void fireRemoveProcesses(Collection<IPProcess> processes) {
-		IRemoveProcessEvent e = 
-			new RemoveProcessEvent(this, processes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IJobChildListener)listener).handleEvent(e);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.core.elements.PElement#doAddAttributeHook(java.util.Map)
-	 */
-	@Override
-	protected void doAddAttributeHook(AttributeManager attribs) {
-		fireChangedJob(attribs);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PMachine.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PMachine.java
deleted file mode 100644
index ed47c9b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PMachine.java
+++ /dev/null

@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedNodeEvent;
-import org.eclipse.ptp.core.elements.events.IMachineChangeEvent;
-import org.eclipse.ptp.core.elements.events.INewNodeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveNodeEvent;
-import org.eclipse.ptp.core.elements.listeners.IMachineChildListener;
-import org.eclipse.ptp.core.elements.listeners.IMachineListener;
-import org.eclipse.ptp.internal.core.elements.events.ChangedNodeEvent;
-import org.eclipse.ptp.internal.core.elements.events.MachineChangeEvent;
-import org.eclipse.ptp.internal.core.elements.events.NewNodeEvent;
-import org.eclipse.ptp.internal.core.elements.events.RemoveNodeEvent;
-
-public class PMachine extends Parent implements IPMachineControl {
-	private final ListenerList elementListeners = new ListenerList();
-	private final ListenerList childListeners = new ListenerList();
-	private String arch = "undefined";
-    
-    public PMachine(String id, IResourceManagerControl rm, IAttribute<?,?,?>[] attrs) {
-		super(id, rm, P_MACHINE, attrs);
-		/*
-		 * Create required attributes.
-		 */
-		EnumeratedAttribute<State> machineState = getAttribute(MachineAttributes.getStateAttributeDefinition());
-		if (machineState == null) {
-			machineState = MachineAttributes.getStateAttributeDefinition().create();
-			addAttribute(machineState);
-		}
-		IntegerAttribute numNodes = getAttribute(MachineAttributes.getNumNodesAttributeDefinition());
-        if (numNodes == null) {
-            try {
-                numNodes = MachineAttributes.getNumNodesAttributeDefinition().create(0);
-            } catch (IllegalValueException e) {
-                //FIXME
-                throw new RuntimeException(e);
-            }
-            addAttribute(numNodes);
-        }
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#addChildListener(org.eclipse.ptp.core.elements.listeners.IMachineNodeListener)
-	 */
-	public void addChildListener(IMachineChildListener listener) {
-		childListeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#addElementListener(org.eclipse.ptp.core.elements.listeners.IMachineListener)
-	 */
-	public void addElementListener(IMachineListener listener) {
-		elementListeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPMachineControl#addNodeAttributes(java.util.Collection, org.eclipse.ptp.core.attributes.IAttribute<?,?,?>[])
-	 */
-	public void addNodeAttributes(Collection<IPNodeControl> nodeControls,
-			IAttribute<?, ?, ?>[] attrs) {
-		List<IPNode> nodes = new ArrayList<IPNode>(nodeControls.size());
-		for (IPNodeControl node : nodeControls) {
-			node.addAttributes(attrs);
-		}
-		fireChangedNodes(nodes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPMachineControl#addNodes(java.util.Collection)
-	 */
-	public void addNodes(Collection<IPNodeControl> nodeControls) {
-		assert(getAttribute(MachineAttributes.getNumNodesAttributeDefinition()).getValue().equals(getNodes().length));
-		List<IPNode> nodes = new ArrayList<IPNode>(nodeControls.size());
-		
-		for (IPNodeControl node : nodeControls) {
-			addChild(node);
-			nodes.add(node);
-		}
-		
-		try {
-			getAttribute(MachineAttributes.getNumNodesAttributeDefinition()).setValue(getNodes().length);
-        } catch (IllegalValueException e) {
-            // FIXME
-            throw new RuntimeException(e);
-        }
-        
-		fireNewNodes(nodes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#getArch()
-	 */
-	public synchronized String getArch() {
-		return arch;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#getNodeById(java.lang.String)
-	 */
-	public IPNode getNodeById(String id) {
-		IPElementControl element = findChild(id);
-		if (element != null) {
-			return (IPNodeControl) element;
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPMachineControl#getNodeControls()
-	 */
-	public Collection<IPNodeControl> getNodeControls() {
-		IPElementControl[] children = getChildren();
-		List<IPNodeControl> nodes =
-			new ArrayList<IPNodeControl>(children.length);
-		for (IPElementControl element : children) {
-			nodes.add((IPNodeControl)element);
-		}
-		return nodes;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#getNodes()
-	 */
-	public IPNode[] getNodes() {
-		Collection<IPNodeControl> nodes = getNodeControls();
-		return nodes.toArray(new IPNode[nodes.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IPMachine#getResourceManager()
-	 */
-	public IResourceManager getResourceManager() {
-		return (IResourceManager) getParent();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#getState()
-	 */
-	public State getState() {
-		return getAttribute(MachineAttributes.getStateAttributeDefinition()).getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#removeChildListener(org.eclipse.ptp.core.elements.listeners.IMachineNodeListener)
-	 */
-	public void removeChildListener(IMachineChildListener listener) {
-		childListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#removeElementListener(org.eclipse.ptp.core.elements.listeners.IMachineListener)
-	 */
-	public void removeElementListener(IMachineListener listener) {
-		elementListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPMachineControl#removeNode(org.eclipse.ptp.core.elementcontrols.IPNodeControl)
-	 */
-	public void removeNodes(Collection<IPNodeControl> nodeControls) {
-		List<IPNode> nodes = new ArrayList<IPNode>(nodeControls.size());
-		
-		for (IPNodeControl node : nodeControls) {
-			removeChild(node);
-			nodes.add(node);
-		}
-		
-		fireRemoveNodes(nodes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#setArch(java.lang.String)
-	 */
-	public synchronized void setArch(String arch) {
-		this.arch = arch;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPMachine#totalNodes()
-	 */
-	public int totalNodes() {
-		return size();
-	}
-	
-	/**
-	 * @param attrs
-	 */
-	private void fireChangedMachine(AttributeManager attrs) {
-		IMachineChangeEvent e = 
-			new MachineChangeEvent(this, attrs);
-		
-		for (Object listener : elementListeners.getListeners()) {
-			((IMachineListener)listener).handleEvent(e);
-		}
-	}
-	
-	/**
-	 * Send IChangedNodeEvent to registered listeners
-	 * 
-	 * @param nodes
-	 */
-	private void fireChangedNodes(Collection<IPNode> nodes) {
-		IChangedNodeEvent e = 
-			new ChangedNodeEvent(this, nodes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IMachineChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Send INewNodeEvent to registered listeners
-	 * 
-	 * @param nodes
-	 */
-	private void fireNewNodes(Collection<IPNode> nodes) {
-		INewNodeEvent e = 
-			new NewNodeEvent(this, nodes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IMachineChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * @param node
-	 */
-	private void fireRemoveNodes(Collection<IPNode> nodes) {
-		IRemoveNodeEvent e = 
-			new RemoveNodeEvent(this, nodes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IMachineChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.core.elements.PElement#doAddAttributeHook(java.util.Map)
-	 */
-	@Override
-	protected void doAddAttributeHook(AttributeManager attrs) {
-		fireChangedMachine(attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PNode.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PNode.java
deleted file mode 100644
index b6510e0..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PNode.java
+++ /dev/null

@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes;
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.INodeChangeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.INodeChildListener;
-import org.eclipse.ptp.core.elements.listeners.INodeListener;
-import org.eclipse.ptp.internal.core.elements.events.ChangedProcessEvent;
-import org.eclipse.ptp.internal.core.elements.events.NewProcessEvent;
-import org.eclipse.ptp.internal.core.elements.events.NodeChangeEvent;
-import org.eclipse.ptp.internal.core.elements.events.RemoveProcessEvent;
-
-public class PNode extends Parent implements IPNodeControl, IJobChildListener {
-	
-	private final ListenerList elementListeners = new ListenerList();
-	private final ListenerList childListeners = new ListenerList();
-
-	public PNode(String id, IPMachineControl mac, IAttribute<?,?,?>[] attrs) {
-		super(id, mac, P_NODE, attrs);
-		/*
-		 * Create required attributes.
-		 */
-		EnumeratedAttribute<State> nodeState = getAttribute(NodeAttributes.getStateAttributeDefinition());
-		if (nodeState == null) {
-			nodeState = NodeAttributes.getStateAttributeDefinition().create();
-			addAttribute(nodeState);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPNode#addChildListener(org.eclipse.ptp.core.elements.listeners.INodeProcessListener)
-	 */
-	public void addChildListener(INodeChildListener listener) {
-		childListeners.add(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPNode#addElementListener(org.eclipse.ptp.core.elements.listeners.INodeListener)
-	 */
-	public void addElementListener(INodeListener listener) {
-		elementListeners.add(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPNodeControl#addProcess(org.eclipse.ptp.core.elementcontrols.IPProcessControl)
-	 */
-	public void addProcesses(Collection<IPProcessControl> processControls) {
-		List<IPProcess> procs = new ArrayList<IPProcess>(processControls.size());
-		Set<IPJob> jobs = new HashSet<IPJob>();
-		
-		for (IPProcessControl process : processControls) {
-			/*
-			 * Add the process as a child of the node
-			 */
-			addChild(process);
-			
-			/*
-			 * Add this node to the process
-			 */
-			process.addNode(this);
-			
-			/*
-			 * Find the set of jobs that started these processes
-			 */
-			jobs.add(process.getJob());
-			
-			/*
-			 * Add the process to the event list
-			 */
-			procs.add(process);
-		}
-		
-		/*
-		 * Add this node to the listeners for job child events. This is so
-		 * we can forward IChangedProcess events to the INodeChildListers.
-		 */
-		for (IPJob job : jobs) {
-			job.addChildListener(this);
-		}
-		
-		/*
-		 * Fire the INewProcess event for these processes
-		 */
-		fireNewProcesses(procs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPNodeControl#getMachineControl()
-	 */
-	public IPMachine getMachine() {
-		return getMachineControl();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPNodeControl#getMachineControl()
-	 */
-	public IPMachineControl getMachineControl() {
-		IPElementControl current = this;
-		do {
-			if (current instanceof IPMachineControl) {
-				return (IPMachineControl) current;
-			}
-		} while ((current = current.getParent()) != null);
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPNode#getNodeNumber()
-	 */
-	public String getNodeNumber() {
-		IntegerAttribute num = getAttribute(NodeAttributes.getNumberAttributeDefinition());
-		if (num != null) {
-			return num.getValueAsString();
-		}
-		return "";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPNodeControl#getProcessControls()
-	 */
-	public Collection<IPProcessControl> getProcessControls() {
-		IPElementControl[] children = getChildren();
-		List<IPProcessControl> processes =
-			new ArrayList<IPProcessControl>(children.length);
-		for (IPElementControl element : children) {
-			processes.add((IPProcessControl)element);
-		}
-		return processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPNode#getProcesses()
-	 */
-	public IPProcess[] getProcesses() {
-		return getProcessControls().toArray(new IPProcess[getProcessControls().size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPNode#getState()
-	 */
-	public State getState() {
-		return getAttribute(NodeAttributes.getStateAttributeDefinition()).getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedProcessEvent)
-	 */
-	public void handleEvent(IChangedProcessEvent e) {
-		fireChangedProcesses(e.getProcesses());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveProcessEvent)
-	 */
-	public void handleEvent(IRemoveProcessEvent e) {
-		for (IPProcess process : e.getProcesses()) {
-			removeChild((IPProcessControl)process);
-		}
-		
-		fireRemoveProcesses(e.getProcesses());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewProcessEvent)
-	 */
-	public void handleEvent(INewProcessEvent e) {
-		// Do nothing
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPNode#removeChildListener(org.eclipse.ptp.core.elements.listeners.INodeProcessListener)
-	 */
-	public void removeChildListener(INodeChildListener listener) {
-		childListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPNode#removeElementListener(org.eclipse.ptp.core.elements.listeners.INodeListener)
-	 */
-	public void removeElementListener(INodeListener listener) {
-		elementListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPNodeControl#removeProcess(org.eclipse.ptp.core.elementcontrols.IPProcessControl)
-	 */
-	public void removeProcesses(Collection<IPProcessControl> processControls) {
-		List<IPProcess> processes = new ArrayList<IPProcess>(processControls.size());
-		
-		for (IPProcessControl process : processControls) {
-			removeChild(process);
-			process.removeNode();
-			processes.add(process);
-		}
-		
-		fireRemoveProcesses(processes);
-	}
-
-	/**
-	 * Notify listeners when a node attribute has changed.
-	 * 
-	 * @param attrs
-	 */
-	private void fireChangedNode(AttributeManager attrs) {
-		INodeChangeEvent e = new NodeChangeEvent(this, attrs);
-		
-		for (Object listener : elementListeners.getListeners()) {
-			((INodeListener)listener).handleEvent(e);
-		}
-	}
-	
-	/**
-	 * Send INewProcessEvent to registered listeners
-	 * 
-	 * @param process
-	 */
-	private void fireNewProcesses(Collection<IPProcess> processes) {
-		INewProcessEvent e = 
-			new NewProcessEvent(this, processes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((INodeChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * @param process
-	 */
-	private void fireRemoveProcesses(Collection<IPProcess> processes) {
-		IRemoveProcessEvent e = 
-			new RemoveProcessEvent(this, processes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((INodeChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Send IChangedProcessEvent to registered listeners
-	 * 
-	 * @param nodes
-	 */
-	private void fireChangedProcesses(Collection<IPProcess> processes) {
-		IChangedProcessEvent e = 
-			new ChangedProcessEvent(this, processes);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((INodeChildListener)listener).handleEvent(e);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.core.elements.PElement#doAddAttributeHook(java.util.Map)
-	 */
-	@Override
-	protected void doAddAttributeHook(AttributeManager attrs) {
-		fireChangedNode(attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PProcess.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PProcess.java
deleted file mode 100644
index 75bf5cf..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PProcess.java
+++ /dev/null

@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.io.File;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.PreferenceConstants;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State;
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-import org.eclipse.ptp.core.elements.listeners.IProcessListener;
-import org.eclipse.ptp.core.util.OutputTextFile;
-import org.eclipse.ptp.internal.core.elements.events.ProcessChangeEvent;
-
-public class PProcess extends Parent implements IPProcessControl {
-
-	private final ListenerList elementListeners = new ListenerList();
-	private final OutputTextFile outputFile;
-	private String outputDirPath = null;
-	private int storeLines = 0;
-
-	/*
-	 * the node that this process is running on, or was scheduled on / will be, etc
-	 */
-	private IPNodeControl node;
-
-	public PProcess(String id, IPJobControl job, IAttribute<?,?,?>[] attrs) {
-		super(id, job, P_PROCESS, attrs);
-		setOutputStore();
-		
-		/*
-		 * Derive a unique name for the output file
-		 */
-		String name = job.getQueue().getResourceManager().getName()
-						+ "_" + job.getQueue().getName()
-						+ "_" + job.getName()
-						+ "_" + getName();
-	
-		outputFile = new OutputTextFile(name, 
-							ProcessAttributes.getStdoutAttributeDefinition().getId(), 
-							outputDirPath, storeLines);
-		
-		/*
-		 * Create required attributes.
-		 */
-		EnumeratedAttribute<State> procState = getAttribute(ProcessAttributes.getStateAttributeDefinition());
-		if (procState == null) {
-			procState = ProcessAttributes.getStateAttributeDefinition().create();
-			addAttribute(procState);
-		}
-		IntegerAttribute exitCode = getAttribute(ProcessAttributes.getExitCodeAttributeDefinition());
-		if (exitCode == null) {
-			try {
-				exitCode = ProcessAttributes.getExitCodeAttributeDefinition().create();
-				addAttribute(exitCode);
-			} catch (IllegalValueException e) {
-			}
-		}
-		IntegerAttribute pid = getAttribute(ProcessAttributes.getPIDAttributeDefinition());
-		if (pid == null) {
-			try {
-				pid = ProcessAttributes.getPIDAttributeDefinition().create();
-				addAttribute(pid);
-			} catch (IllegalValueException e) {
-			}
-		}
-		IntegerAttribute index = getAttribute(ProcessAttributes.getIndexAttributeDefinition());
-		if (index == null) {
-			try {
-				index = ProcessAttributes.getIndexAttributeDefinition().create();
-				addAttribute(index);
-			} catch (IllegalValueException e) {
-			}
-		}	
-		StringAttribute signalName = getAttribute(ProcessAttributes.getSignalNameAttributeDefinition());
-		if (signalName == null) {
-			signalName = ProcessAttributes.getSignalNameAttributeDefinition().create();
-			addAttribute(signalName);
-		}	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#addElementListener(org.eclipse.ptp.core.elements.listeners.IProcessListener)
-	 */
-	public void addElementListener(IProcessListener listener) {
-		elementListeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#addNode(org.eclipse.ptp.core.elements.IPNode)
-	 */
-	public synchronized void addNode(IPNode node) {
-		this.node = (IPNodeControl) node;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#clearOutput()
-	 */
-	public void clearOutput() {
-		outputFile.delete();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getExitCode()
-	 */
-	public int getExitCode() {
-		return getAttribute(ProcessAttributes.getExitCodeAttributeDefinition()).getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getJob()
-	 */
-	public IPJob getJob() {
-		return getJobControl();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPProcessControl#getJobControl()
-	 */
-	public IPJobControl getJobControl() {
-		IPElementControl current = this;
-		do {
-			if (current instanceof IPJobControl)
-				return (IPJobControl) current;
-		} while ((current = current.getParent()) != null);
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getNode()
-	 */
-	public synchronized IPNode getNode() {
-		return this.node;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getPid()
-	 */
-	public int getPid() {
-		return getAttribute(ProcessAttributes.getPIDAttributeDefinition()).getValue();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getProcessIndex()
-	 */
-	public String getProcessIndex() {
-		return getAttribute(ProcessAttributes.getIndexAttributeDefinition()).getValueAsString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getSavedOutput(org.eclipse.ptp.core.attributes.StringAttributeDefinition)
-	 */
-	public String getSavedOutput(StringAttributeDefinition attrDef) {
-		if (attrDef.equals(ProcessAttributes.getStdoutAttributeDefinition())) {
-			return outputFile.getContents();
-		} else {
-			return "";
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getSignalName()
-	 */
-	public String getSignalName() {
-		return getAttribute(ProcessAttributes.getSignalNameAttributeDefinition()).getValue();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#getState()
-	 */
-	public State getState() {
-		return getAttribute(ProcessAttributes.getStateAttributeDefinition()).getValue();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#isTerminated()
-	 */
-	public boolean isTerminated() {
-		State state = getState();
-		if (state == State.ERROR || state == State.EXITED || state == State.EXITED_SIGNALLED) {
-			return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#removeElementListener(org.eclipse.ptp.core.elements.listeners.IProcessListener)
-	 */
-	public void removeElementListener(IProcessListener listener) {
-		elementListeners.remove(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#removeNode()
-	 */
-	public synchronized void removeNode() {
-		node = null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#setState(org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State)
-	 */
-	public void setState(State state) {
-		EnumeratedAttribute<State> procState = getAttribute(ProcessAttributes.getStateAttributeDefinition());
-		procState.setValue(state);
-		AttributeManager attrs = new AttributeManager();
-		attrs.addAttribute(procState);
-		fireChangedProcess(attrs);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPProcess#setTerminated(boolean)
-	 */
-	public void setTerminated(boolean isTerminated) {
-		setState(State.EXITED);
-	}
-
-	/**
-	 * Cache output from process to local file.
-	 * 
-	 * @param output
-	 */
-	private void addOutput(String output) {
-		outputFile.write(output + "\n");
-	}
-
-	/**
-	 * Notify listeners of changed attributes.
-	 * 
-	 * @param attrs
-	 */
-	private void fireChangedProcess(AttributeManager attrs) {
-		IProcessChangeEvent e = new ProcessChangeEvent(this, attrs);
-		
-		for (Object listener : elementListeners.getListeners()) {
-			((IProcessListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Create a local cache for process output.
-	 */
-	private void setOutputStore() {
-		Preferences preferences = PTPCorePlugin.getDefault().getPluginPreferences();
-		outputDirPath = preferences.getString(PreferenceConstants.OUTPUT_DIR);
-		storeLines = preferences.getInt(PreferenceConstants.STORE_LINE);
-		if (outputDirPath == null || outputDirPath.length() == 0) {
-			outputDirPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(PreferenceConstants.DEF_OUTPUT_DIR_NAME).toOSString();
-		}
-		if (storeLines == 0) {
-			storeLines = PreferenceConstants.DEF_STORE_LINE;
-		}
-		File outputDirectory = new File(outputDirPath);
-		if (!outputDirectory.exists()) {
-			outputDirectory.mkdir();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.core.elements.PElement#doAddAttributeHook(java.util.List)
-	 */
-	@Override
-	protected void doAddAttributeHook(AttributeManager attrs) {
-		StringAttribute attr = attrs.getAttribute(ProcessAttributes.getStdoutAttributeDefinition());
-		if (attr != null) {
-			addOutput(attr.getValue());
-		}
-		fireChangedProcess(attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PQueue.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PQueue.java
deleted file mode 100644
index 25aca01..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PQueue.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.QueueAttributes;
-import org.eclipse.ptp.core.elements.attributes.QueueAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.IQueueChangeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IQueueListener;
-import org.eclipse.ptp.internal.core.elements.events.ChangedJobEvent;
-import org.eclipse.ptp.internal.core.elements.events.NewJobEvent;
-import org.eclipse.ptp.internal.core.elements.events.QueueChangeEvent;
-import org.eclipse.ptp.internal.core.elements.events.RemoveJobEvent;
-
-public class PQueue extends Parent implements IPQueueControl {
-	private final ListenerList elementListeners = new ListenerList();
-	private final ListenerList childListeners = new ListenerList();
-	
-	public PQueue(String id, IResourceManagerControl rm, IAttribute<?,?,?>[] attrs) {
-		super(id, rm, P_QUEUE, attrs);
-		/*
-		 * Create required attributes.
-		 */
-		EnumeratedAttribute<State> queueState = getAttribute(QueueAttributes.getStateAttributeDefinition());
-		if (queueState == null) {
-			queueState = QueueAttributes.getStateAttributeDefinition().create();
-			addAttribute(queueState);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPQueue#addChildListener(org.eclipse.ptp.core.elements.listeners.IQueueJobListener)
-	 */
-	public void addChildListener(IQueueChildListener listener) {
-		childListeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPQueue#addElementListener(org.eclipse.ptp.core.elements.listeners.IQueueListener)
-	 */
-	public void addElementListener(IQueueListener listener) {
-		elementListeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPQueueControl#addJobAttributes(java.util.Collection, org.eclipse.ptp.core.attributes.IAttribute<?,?,?>[])
-	 */
-	public void addJobAttributes(Collection<IPJobControl> jobControls,
-			IAttribute<?, ?, ?>[] attrs) {
-		List<IPJob> jobs = new ArrayList<IPJob>(jobControls.size());
-		
-		for (IPJobControl job : jobControls) {
-			job.addAttributes(attrs);
-			jobs.add(job);
-		}
-		
-		fireChangedJobs(jobs);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPQueueControl#addJobs(java.util.Collection)
-	 */
-	public void addJobs(Collection<IPJobControl> jobControls) {
-		List<IPJob> jobs = new ArrayList<IPJob>(jobControls.size());
-		
-		for (IPJobControl job : jobControls) {
-			addChild(job);
-			jobs.add(job);
-		}
-
-		fireNewJobs(jobs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPQueue#getJobById(java.lang.String)
-	 */
-	public IPJob getJobById(String job_id) {
-		return getJobControl(job_id);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPQueueControl#getJobControl(java.lang.String)
-	 */
-	public IPJobControl getJobControl(String job_id) {
-		IPElementControl element = findChild(job_id);
-		if (element != null) {
-			return (IPJobControl) element;
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPQueueControl#getJobControls()
-	 */
-	public Collection<IPJobControl> getJobControls() {
-		IPElementControl[] children = getChildren();
-		List<IPJobControl> jobs =
-			new ArrayList<IPJobControl>(children.length);
-		for (IPElementControl element : children) {
-			jobs.add((IPJobControl)element);
-		}
-		return jobs;	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPQueue#getJobs()
-	 */
-	public IPJob[] getJobs() {
-		Collection<IPJobControl> jobs = getJobControls();
-		return jobs.toArray(new IPJobControl[jobs.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IPMachine#getResourceManager()
-	 */
-	public IResourceManager getResourceManager() {
-		return (IResourceManager) getParent();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPQueue#getState()
-	 */
-	public State getState() {
-		return getAttribute(QueueAttributes.getStateAttributeDefinition()).getValue();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPQueue#removeChildListener(org.eclipse.ptp.core.elements.listeners.IQueueJobListener)
-	 */
-	public void removeChildListener(IQueueChildListener listener) {
-		childListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPQueue#removeElementListener(org.eclipse.ptp.core.elements.listeners.IQueueListener)
-	 */
-	public void removeElementListener(IQueueListener listener) {
-		elementListeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPQueueControl#removeJobs(java.util.Collection)
-	 */
-	public void removeJobs(Collection<IPJobControl> jobControls) {
-		List<IPJob> jobs = new ArrayList<IPJob>(jobControls.size());
-		
-		for (IPJobControl job : jobControls) {
-			job.removeProcesses(job.getProcessControls());
-			removeChild(job);
-			jobs.add(job);
-		}
-		
-		fireRemoveJobs(jobs);
-	}
-
-	/**
-	 * Send IChangedJobEvent to registered listeners
-	 * 
-	 * @param jobs jobs that have changed
-	 */
-	private void fireChangedJobs(Collection<IPJob> jobs) {
-		IChangedJobEvent e = 
-			new ChangedJobEvent(this, jobs);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IQueueChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Send IQueueChangeEvent to registered listeners
-	 * 
-	 * @param attrs attributes that have changed
-	 */
-	private void fireChangedQueue(AttributeManager attrs) {
-		IQueueChangeEvent e = new QueueChangeEvent(this, attrs);
-		
-		for (Object listener : elementListeners.getListeners()) {
-			((IQueueListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Send INewJobEvent to registered listeners
-	 * 
-	 * @param jobs new jobs
-	 */
-	private void fireNewJobs(Collection<IPJob> jobs) {
-		INewJobEvent e = 
-			new NewJobEvent(this, jobs);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IQueueChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Send IRemoveJobEvent to registered listeners
-	 * 
-	 * @param job removed jobs
-	 */
-	private void fireRemoveJobs(Collection<IPJob> jobs) {
-		IRemoveJobEvent e = 
-			new RemoveJobEvent(this, jobs);
-		
-		for (Object listener : childListeners.getListeners()) {
-			((IQueueChildListener)listener).handleEvent(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.core.elements.PElement#doAddAttributeHook(java.util.Map)
-	 */
-	@Override
-	protected void doAddAttributeHook(AttributeManager attrs) {
-		fireChangedQueue(attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PUniverse.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PUniverse.java
deleted file mode 100644
index a4bb789..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/PUniverse.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-
-public class PUniverse extends PElement implements IPUniverseControl {
-	private static final int RMID_SHIFT = 24;
-	private static IAttribute<?,?,?>[] getDefaultAttributes(String name) {
-		StringAttribute nameAttr = ElementAttributes.getNameAttributeDefinition().create(name);
-		return new IAttribute[]{nameAttr};
-	}
-	private int nextResourceManagerId = 1;
-	private final List<IResourceManagerControl> resourceManagers =
-		Collections.synchronizedList(new LinkedList<IResourceManagerControl>());
-	protected String NAME_TAG = "universe ";
-	
-	public PUniverse() {
-		/* '1' because this is the only universe */
-		super("1", null, P_UNIVERSE, getDefaultAttributes("TheUniverse"));
-		// setOutputStore();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPUniverseControl#addResourceManager(org.eclipse.ptp.core.elementcontrols.IResourceManagerControl)
-	 */
-	public void addResourceManager(IResourceManagerControl addedManager) {
-		resourceManagers.add(addedManager);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPUniverseControl#addResourceManagers(org.eclipse.ptp.core.elementcontrols.IResourceManagerControl[])
-	 */
-	public void addResourceManagers(IResourceManagerControl[] addedManagers) {
-		for (IResourceManagerControl rm : addedManagers) {
-			addResourceManager(rm);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPUniverseControl#getNextResourceManagerId()
-	 */
-	public synchronized int getNextResourceManagerId() {
-		return (nextResourceManagerId++ << RMID_SHIFT);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.IPUniverse#findResourceManagerById(java.lang.String)
-	 */
-	public IResourceManager getResourceManager(String id) {
-		synchronized (resourceManagers) {
-			for (IResourceManager resourceManager : resourceManagers) {
-				if (resourceManager.getID().equals(id)) {
-					return resourceManager;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPUniverseControl#getResourceManagerControls()
-	 */
-	public IResourceManagerControl[] getResourceManagerControls() {
-		return resourceManagers.toArray(new IResourceManagerControl[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IPUniverse#getResourceManagers()
-	 */
-	public IResourceManager[] getResourceManagers() {
-		return (IResourceManager[]) getResourceManagerControls();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPElementControl#hasChildren()
-	 */
-	public boolean hasChildren() {
-		return !resourceManagers.isEmpty();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPUniverseControl#removeResourceManager(org.eclipse.ptp.core.elements.IResourceManager)
-	 */
-	public void removeResourceManager(IResourceManager removedManager) {
-		resourceManagers.remove(removedManager);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPUniverseControl#removeResourceManagers(org.eclipse.ptp.core.elements.IResourceManager[])
-	 */
-	public void removeResourceManagers(IResourceManager[] removedRMs) {
-		for (IResourceManager rm : removedRMs) {
-			removeResourceManager(rm);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.core.elements.PElement#doAddAttributeHook(java.util.Map)
-	 */
-	@Override
-	protected void doAddAttributeHook(AttributeManager attrs) {
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/Parent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/Parent.java
deleted file mode 100644
index c068eee..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/Parent.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements;
-
-import java.util.Arrays;
-
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPElementControl;
-import org.eclipse.ptp.core.elements.IPElement;
-
-/**
- *  
- */
-public abstract class Parent extends PElement {
-	/**
-	 * @param elements
-	 */
-	public static void sort(IPElementControl elements[]) {
-		Arrays.sort(elements);
-	}
-
-	public Parent(String id, IPElementControl parent, int type, IAttribute<?,?,?>[] attrs) {
-		super(id, parent, type, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elementcontrols.IPElementControl#hasChildren()
-	 */
-	public boolean hasChildren() {
-		return getElementInfo().hasChildren();
-	}
-
-	/**
-	 * @param member
-	 */
-	protected void addChild(IPElementControl member) {
-		getElementInfo().addChild(member);
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	protected IPElementControl findChild(String key) {
-		return getElementInfo().findChild(key);
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPElementControl[] getChildren() {
-		return getElementInfo().getChildren();
-	}
-
-	/**
-	 * @param member
-	 */
-	protected void removeChild(IPElement member) {
-		getElementInfo().removeChild(member);
-	}
-
-	/**
-	 * 
-	 */
-	protected void removeChildren() {
-		getElementInfo().removeChildren();
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedJobEvent.java
deleted file mode 100644
index c9de806..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedJobEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-
-/**
- * @author grw
- *
- */
-public class ChangedJobEvent implements IChangedJobEvent {
-
-	private final IPQueue queue;
-	private final Collection<IPJob> jobs;
-	
-	public ChangedJobEvent(IPQueue queue, Collection<IPJob> jobs) {
-		this.queue = queue;
-		this.jobs = jobs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IChangedJobEvent#getJobs()
-	 */
-	public Collection<IPJob> getJobs() {
-		return jobs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IChangedJobEvent#getSource()
-	 */
-	public IPQueue getSource() {
-		return queue;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedMachineEvent.java
deleted file mode 100644
index 0d7b468..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedMachineEvent.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class ChangedMachineEvent implements
-		IChangedMachineEvent {
-
-	private final IResourceManager rm;
-	private final Collection<IPMachine> machines;
-	
-	public ChangedMachineEvent(IResourceManager manager, Collection<IPMachine> machines) {
-		this.rm = manager;
-		this.machines = machines;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IChangedMachineEvent#getMachines()
-	 */
-	public Collection<IPMachine> getMachines() {
-		return machines;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IChangedMachineEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedNodeEvent.java
deleted file mode 100644
index 69deece..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedNodeEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.events.IChangedNodeEvent;
-
-/**
- * @author grw
- *
- */
-public class ChangedNodeEvent implements IChangedNodeEvent {
-
-	private final IPMachine machine;
-	private final Collection<IPNode> nodes;
-
-	public ChangedNodeEvent(IPMachine machine, 
-			Collection<IPNode> nodes) {
-		this.machine = machine;
-		this.nodes = nodes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.INodeChangedEvent#getAttributes()
-	 */
-	public Collection<IPNode> getNodes() {
-		return nodes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IChangedNodeEvent#getSource()
-	 */
-	public IPMachine getSource() {
-		return machine;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedProcessEvent.java
deleted file mode 100644
index 5691365..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedProcessEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-
-/**
- * @author grw
- *
- */
-public class ChangedProcessEvent implements IChangedProcessEvent {
-
-	private final IPElement source;
-	private final Collection<IPProcess> processes;
-	
-	public ChangedProcessEvent(IPElement source, Collection<IPProcess> processes) {
-		this.source = source;
-		this.processes = processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IChangedProcessEvent#getProcesses()
-	 */
-	public Collection<IPProcess> getProcesses() {
-		return processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IJobChangedProcessEvent#getSource()
-	 */
-	public IPElement getSource() {
-		return source;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedQueueEvent.java
deleted file mode 100644
index 398e675..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ChangedQueueEvent.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class ChangedQueueEvent implements
-		IChangedQueueEvent {
-
-	private final IResourceManager rm;
-	private final Collection<IPQueue> queues;
-
-
-	public ChangedQueueEvent(IResourceManager manager, Collection<IPQueue> queues) {
-		this.rm = manager;
-		this.queues = queues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IChangedQueueEvent#getQueues()
-	 */
-	public Collection<IPQueue> getQueues() {
-		return queues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IChangedQueueEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/JobChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/JobChangeEvent.java
deleted file mode 100644
index f2abc34..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/JobChangeEvent.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.events.IJobChangeEvent;
-
-/**
- * @author grw
- *
- */
-public class JobChangeEvent implements IJobChangeEvent {
-
-	private final IPJob job;
-	private final AttributeManager attributes;
-
-	public JobChangeEvent(IPJob job, AttributeManager attrs) {
-		this.job = job;
-		this.attributes = attrs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IJobChangedEvent#getAttributes()
-	 */
-	public AttributeManager getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IJobChangedEvent#getSource()
-	 */
-	public IPJob getSource() {
-		return job;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/MachineChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/MachineChangeEvent.java
deleted file mode 100644
index 4bff215..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/MachineChangeEvent.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.events.IMachineChangeEvent;
-
-/**
- * @author grw
- *
- */
-public class MachineChangeEvent implements IMachineChangeEvent {
-
-	private final IPMachine machine;
-	private final AttributeManager attributes;
-
-	public MachineChangeEvent(IPMachine machine, AttributeManager attrs) {
-		this.machine = machine;
-		this.attributes = attrs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IMachineChangedEvent#getAttributes()
-	 */
-	public AttributeManager getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IMachineChangedEvent#getSource()
-	 */
-	public IPMachine getSource() {
-		return machine;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewJobEvent.java
deleted file mode 100644
index 5753642..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewJobEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-
-/**
- * @author grw
- *
- */
-public class NewJobEvent implements INewJobEvent {
-
-	private final IPQueue queue;
-	private final Collection<IPJob> jobs;
-
-	public NewJobEvent(IPQueue queue, Collection<IPJob> jobs) {
-		this.queue = queue;
-		this.jobs = jobs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IQueueNewJobEvent#getProcess()
-	 */
-	public Collection<IPJob> getJobs() {
-		return jobs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IQueueNewJobEvent#getSource()
-	 */
-	public IPQueue getSource() {
-		return queue;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewMachineEvent.java
deleted file mode 100644
index 322a34e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewMachineEvent.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class NewMachineEvent implements
-		INewMachineEvent {
-
-	private final IResourceManager rm;
-	private final Collection<IPMachine> machines;
-
-	public NewMachineEvent(IResourceManager manager, Collection<IPMachine> machines) {
-		this.rm = manager;
-		this.machines = machines;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getMachine()
-	 */
-	public Collection<IPMachine> getMachines() {
-		return machines;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewNodeEvent.java
deleted file mode 100644
index 0e85899..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewNodeEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.events.INewNodeEvent;
-
-/**
- * @author grw
- *
- */
-public class NewNodeEvent implements INewNodeEvent {
-
-	private final IPMachine machine;
-	private final Collection<IPNode> nodes;
-
-	public NewNodeEvent(IPMachine machine, Collection<IPNode> nodes) {
-		this.machine = machine;
-		this.nodes = nodes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IMachineNewNodeEvent#getProcess()
-	 */
-	public Collection<IPNode> getNodes() {
-		return nodes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IMachineNewNodeEvent#getSource()
-	 */
-	public IPMachine getSource() {
-		return machine;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewProcessEvent.java
deleted file mode 100644
index 394cb62..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewProcessEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-
-/**
- * @author grw
- *
- */
-public class NewProcessEvent implements INewProcessEvent {
-
-	private final IPElement source;
-	private final Collection<IPProcess> processes;
-
-	public NewProcessEvent(IPElement source, Collection<IPProcess> processes) {
-		this.source = source;
-		this.processes = processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.INewProcessEvent#getProcesses()
-	 */
-	public Collection<IPProcess> getProcesses() {
-		return processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IJobNewProcessEvent#getSource()
-	 */
-	public IPElement getSource() {
-		return source;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewQueueEvent.java
deleted file mode 100644
index f021e23..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NewQueueEvent.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class NewQueueEvent implements
-		INewQueueEvent {
-
-	private final IResourceManager rm;
-	private final Collection<IPQueue>  queues;
-
-	public NewQueueEvent(IResourceManager manager, Collection<IPQueue> queues) {
-		this.rm = manager;
-		this.queues = queues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.INewQueueEvent#getQueue()
-	 */
-	public Collection<IPQueue>  getQueues() {
-		return queues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewQueueEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NodeChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NodeChangeEvent.java
deleted file mode 100644
index ee1315e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/NodeChangeEvent.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.events.INodeChangeEvent;
-
-/**
- * @author grw
- *
- */
-public class NodeChangeEvent implements INodeChangeEvent {
-
-	private final IPNode node;
-	private final AttributeManager attributes;
-	
-	public NodeChangeEvent(IPNode node,	AttributeManager attrs) {
-		this.node = node;
-		this.attributes = attrs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.INodeChangeEvent#getAttributes()
-	 */
-	public AttributeManager getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.INodeChangeEvent#getSource()
-	 */
-	public IPNode getSource() {
-		return node;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ProcessChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ProcessChangeEvent.java
deleted file mode 100644
index 730df4c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ProcessChangeEvent.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-
-/**
- * @author grw
- *
- */
-public class ProcessChangeEvent implements IProcessChangeEvent {
-
-	private final IPProcess process;
-	private final AttributeManager attributes;
-
-	public ProcessChangeEvent(IPProcess process, AttributeManager attrs) {
-		this.process = process;
-		this.attributes = attrs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IProcessChangedEvent#getAttributes()
-	 */
-	public AttributeManager getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IProcessChangedEvent#getSource()
-	 */
-	public IPProcess getSource() {
-		return process;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/QueueChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/QueueChangeEvent.java
deleted file mode 100644
index 265682c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/QueueChangeEvent.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.events.IQueueChangeEvent;
-
-/**
- * @author grw
- *
- */
-public class QueueChangeEvent implements IQueueChangeEvent {
-
-	private final IPQueue queue;
-	private final AttributeManager attributes;
-
-	public QueueChangeEvent(IPQueue queue, AttributeManager attrs) {
-		this.queue = queue;
-		this.attributes = attrs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IQueueChangedEvent#getAttributes()
-	 */
-	public AttributeManager getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IQueueChangedEvent#getSource()
-	 */
-	public IPQueue getSource() {
-		return queue;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveJobEvent.java
deleted file mode 100644
index 2ade6f8..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveJobEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-
-/**
- * @author grw
- *
- */
-public class RemoveJobEvent implements IRemoveJobEvent {
-
-	private final IPQueue queue;
-	private final Collection<IPJob> jobs;
-
-	public RemoveJobEvent(IPQueue queue, Collection<IPJob> jobs) {
-		this.queue = queue;
-		this.jobs = jobs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IQueueRemoveJobEvent#getProcess()
-	 */
-	public Collection<IPJob> getJobs() {
-		return jobs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IQueueRemoveJobEvent#getSource()
-	 */
-	public IPQueue getSource() {
-		return queue;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveMachineEvent.java
deleted file mode 100644
index 83ee580..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveMachineEvent.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-
-/**
- * @author Greg Watson
- *
- */
-public class RemoveMachineEvent implements
-	IRemoveMachineEvent {
-
-	private final IResourceManager rm;
-	private final Collection<IPMachine> machines;
-
-	public RemoveMachineEvent(IResourceManager manager, Collection<IPMachine> machines) {
-		this.rm = manager;
-		this.machines = machines;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getMachines()
-	 */
-	public Collection<IPMachine> getMachines() {
-		return machines;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveNodeEvent.java
deleted file mode 100644
index 3fd6bae..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveNodeEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.events.IRemoveNodeEvent;
-
-/**
- * @author grw
- *
- */
-public class RemoveNodeEvent implements IRemoveNodeEvent {
-
-	private final IPMachine machine;
-	private final Collection<IPNode> nodes;
-
-	public RemoveNodeEvent(IPMachine machine, Collection<IPNode> nodes) {
-		this.machine = machine;
-		this.nodes = nodes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IMachineRemoveNodeEvent#getNodes()
-	 */
-	public Collection<IPNode> getNodes() {
-		return nodes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IMachineRemoveNodeEvent#getSource()
-	 */
-	public IPMachine getSource() {
-		return machine;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveProcessEvent.java
deleted file mode 100644
index ecd2dcf..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveProcessEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-
-/**
- * @author grw
- *
- */
-public class RemoveProcessEvent implements IRemoveProcessEvent {
-
-	private final IPElement source;
-	private final Collection<IPProcess> processes;
-
-	public RemoveProcessEvent(IPElement source, Collection<IPProcess> processes) {
-		this.source = source;
-		this.processes = processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.INodeRemoveProcessEvent#getProcesses()
-	 */
-	public Collection<IPProcess> getProcesses() {
-		return processes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.INodeRemoveProcessEvent#getSource()
-	 */
-	public IPElement getSource() {
-		return source;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveQueueEvent.java
deleted file mode 100644
index da98a1e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/RemoveQueueEvent.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class RemoveQueueEvent implements
-	IRemoveQueueEvent {
-
-	private final IResourceManager rm;
-	private final Collection<IPQueue> queues;
-
-	public RemoveQueueEvent(IResourceManager manager, Collection<IPQueue> queues) {
-		this.rm = manager;
-		this.queues = queues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewQueueEvent#getQueues()
-	 */
-	public Collection<IPQueue> getQueues() {
-		return queues;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewQueueEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerChangeEvent.java
deleted file mode 100644
index 6c171fb..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerChangeEvent.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.elements.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IResourceManagerChangeEvent;
-
-/**
- * @author grw
- *
- */
-public class ResourceManagerChangeEvent implements IResourceManagerChangeEvent {
-
-	private final IResourceManager rm;
-	private final AttributeManager attributes;
-
-	public ResourceManagerChangeEvent(IResourceManager rm,
-			AttributeManager attrs) {
-		this.rm = rm;
-		this.attributes = attrs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IResourceManagerChangedEvent#getAttributes()
-	 */
-	public AttributeManager getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IResourceManagerChangedEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerErrorEvent.java
deleted file mode 100644
index 74a920d..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerErrorEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.internal.core.elements.events;
-
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent;
-
-public class ResourceManagerErrorEvent implements IResourceManagerErrorEvent {
-
-	private final IResourceManager rm;
-	private final String message;
-
-	public ResourceManagerErrorEvent(final IResourceManager rm, final String message) {
-		this.rm = rm;
-		this.message = message;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerErrorEvent#getMessage()
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerErrorEvent#getSource()
-	 */
-	public IResourceManager getSource() {
-		return rm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerSubmitJobErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerSubmitJobErrorEvent.java
deleted file mode 100644
index dec8def..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/elements/events/ResourceManagerSubmitJobErrorEvent.java
+++ /dev/null

@@ -1,37 +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.internal.core.elements.events;
-
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent;
-
-/**
- * @author grw
- *
- */
-public class ResourceManagerSubmitJobErrorEvent extends ResourceManagerErrorEvent 
-	implements IResourceManagerSubmitJobErrorEvent {
-
-	private final String id;
-
-	public ResourceManagerSubmitJobErrorEvent(IResourceManager rm, String id, String message) {
-		super(rm, message);
-		this.id = id;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent#getJobSubmissionId()
-	 */
-	public String getJobSubmissionId() {
-		return id;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/ChangedResourceManagerEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/ChangedResourceManagerEvent.java
deleted file mode 100644
index cae68e2..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/ChangedResourceManagerEvent.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.events;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class ChangedResourceManagerEvent implements IChangedResourceManagerEvent {
-
-	private final IModelManager mm;
-	private final Collection<IResourceManager> rms;
-	
-	public ChangedResourceManagerEvent(IModelManager mm, Collection<IResourceManager> rms) {
-		this.mm = mm;
-		this.rms = rms;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getMachine()
-	 */
-	public Collection<IResourceManager> getResourceManagers() {
-		return rms;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getSource()
-	 */
-	public IModelManager getSource() {
-		return mm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/NewResourceManagerEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/NewResourceManagerEvent.java
deleted file mode 100644
index 6a04718..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/NewResourceManagerEvent.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.events;
-
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class NewResourceManagerEvent implements INewResourceManagerEvent {
-
-	private final IModelManager mm;
-	private final IResourceManager rm;
-
-	public NewResourceManagerEvent(IModelManager mm, IResourceManager rm) {
-		this.mm = mm;
-		this.rm = rm;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getMachine()
-	 */
-	public IResourceManager getResourceManager() {
-		return rm;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getSource()
-	 */
-	public IModelManager getSource() {
-		return mm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/RemoveResourceManagerEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/RemoveResourceManagerEvent.java
deleted file mode 100644
index 08d7276..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/core/events/RemoveResourceManagerEvent.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.core.events;
-
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-
-/**
- * @author rsqrd
- *
- */
-public class RemoveResourceManagerEvent implements IRemoveResourceManagerEvent {
-
-	private final IModelManager mm;
-	private final IResourceManager rm;
-
-	public RemoveResourceManagerEvent(IModelManager mm, IResourceManager rm) {
-		this.mm = mm;
-		this.rm = rm;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getMachine()
-	 */
-	public IResourceManager getResourceManager() {
-		return rm;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.events.IResourceManagerNewMachineEvent#getSource()
-	 */
-	public IModelManager getSource() {
-		return mm;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rmsystem/ResourceManagerPersistence.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rmsystem/ResourceManagerPersistence.java
deleted file mode 100644
index ae78788..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rmsystem/ResourceManagerPersistence.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.rmsystem;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.util.DebugUtil;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.XMLMemento;
-
-public class ResourceManagerPersistence {
-
-	private static final String TAG_RESOURCEMANAGER_INDEX = "ResourceManagerIndex";
-
-	private static final String TAG_RESOURCEMANAGERS = "ResourceManagers";
-
-	private static final String TAG_RESOURCEMANGER = "ResourceManager";
-
-	private static final String TAG_RESOURCEMANGER_CONFIGURATION = "Configuration";
-
-	private static final String TAG_RESOURCEMANGER_ID = "ResourceManagerId";
-
-	private static final String TAG_RESOURCEMANGER_RUNNING = "IsRunning";
-
-	public static void saveResourceManagers(File file,
-			IResourceManagerControl[] resourceManagers) {
-		if (DebugUtil.RM_TRACING) {
-			System.out.println("In saveResourceManagers to file, " + file.getAbsolutePath());
-		}
-		XMLMemento memento = XMLMemento.createWriteRoot(TAG_RESOURCEMANAGERS);
-		saveResourceManagers(memento, resourceManagers);
-		FileWriter writer = null;
-		try {
-			writer = new FileWriter(file);
-			memento.save(writer);
-		} catch (IOException e) {
-			PTPCorePlugin.log(e);
-		} finally {
-			try {
-				if (writer != null) {
-					writer.close();
-				}
-			} catch (IOException e) {
-				PTPCorePlugin.log(e);
-			}
-		}
-		if (DebugUtil.RM_TRACING) {
-			System.out.println("Leaving saveResourceManagers");
-		}
-	}
-
-	private static void saveResourceManagers(XMLMemento memento,
-			IResourceManagerControl[] resourceManagers) {
-		for (int i = 0; i < resourceManagers.length; ++i) {
-			IMemento child = memento.createChild(TAG_RESOURCEMANGER);
-			child.putString(
-					TAG_RESOURCEMANGER_ID,
-					resourceManagers[i].getConfiguration().getResourceManagerId());
-			child.putInteger(TAG_RESOURCEMANAGER_INDEX, i);
-			boolean isRunning = resourceManagers[i].getState().equals(ResourceManagerAttributes.State.STARTED);
-			child.putString(TAG_RESOURCEMANGER_RUNNING, isRunning ? "true" : "false");
-			IMemento grandchild = child.createChild(TAG_RESOURCEMANGER_CONFIGURATION);
-			resourceManagers[i].getConfiguration().save(grandchild);
-		}
-	}
-
-	private final List<IResourceManagerControl> resourceManagers =
-	    new ArrayList<IResourceManagerControl>();
-
-	private IResourceManagerControl savedCurrentResourceManager;
-
-    private final List<IResourceManagerControl> rmsNeedStarting =
-        new ArrayList<IResourceManagerControl>();
-
-	public IResourceManagerControl[] getResourceManagerControls() {
-		return resourceManagers.toArray(new IResourceManagerControl[0]);
-	}
-
-	public IResourceManagerControl[] getResourceManagerControlsNeedStarting() {
-        return rmsNeedStarting.toArray(new IResourceManagerControl[0]);
-    }
-
-	public IResourceManager getSavedCurrentResourceManager() {
-		return savedCurrentResourceManager;
-	}
-
-	/**
-	 * Loads saved resource managers.
-	 * @param file
-	 * @param factories
-	 * @param monitor
-	 * @throws CoreException 
-	 */
-	public void loadResourceManagers(File file,
-			IResourceManagerFactory[] factories) throws CoreException {
-        rmsNeedStarting.clear();
-        resourceManagers.clear();
-
-        FileReader reader = null;
-        try {
-            reader = new FileReader(file);
-            loadResourceManagers(XMLMemento.createReadRoot(reader), factories);
-        } catch (FileNotFoundException e) {
-            // ignored... no ResourceManager items exist yet.
-        } finally {
-            try {
-                if (reader != null) {
-                    reader.close();
-                }
-            } catch (IOException e) {
-                PTPCorePlugin.log(e);
-            }
-        }
-	}
-
-	private IResourceManagerFactory getResourceManagerFactory(
-			IResourceManagerFactory[] factories, String id) {
-		for (int i = 0; i < factories.length; i++) {
-			if (factories[i].getId().equals(id))
-				return factories[i];
-		}
-
-		return null;
-	}
-
-    /**
-	 * Loads saved resource managers.
-	 * @param memento
-	 * @param factories
-	 * @param monitor
-	 * @throws CoreException 
-	 */
-	private void loadResourceManagers(XMLMemento memento,
-			IResourceManagerFactory[] factories) throws CoreException {
-		IMemento[] children = memento.getChildren(TAG_RESOURCEMANGER);
-		ArrayList<IStatus> statuses = new ArrayList<IStatus>();
-		final IResourceManagerControl[] tmpRMs = new IResourceManagerControl[children.length];
-		ArrayList<IResourceManagerControl> rms = new ArrayList<IResourceManagerControl>(tmpRMs.length);
-
-		for (int i = 0; i < children.length; ++i) {
-			String resourceManagerId = children[i].getString(TAG_RESOURCEMANGER_ID);
-			final int index = children[i].getInteger(TAG_RESOURCEMANAGER_INDEX).intValue();
-			String isRunningRep = children[i].getString(TAG_RESOURCEMANGER_RUNNING);
-			boolean isRunning = "true".equalsIgnoreCase(isRunningRep);
-			IResourceManagerFactory factory = getResourceManagerFactory(
-					factories, resourceManagerId);
-			if (factory != null) {
-				final IMemento grandchild = children[i].getChild(TAG_RESOURCEMANGER_CONFIGURATION);
-				IResourceManagerConfiguration configuration = factory.loadConfiguration(grandchild);
-				if (configuration != null) {
-					tmpRMs[index] = factory.create(configuration);
-					if (tmpRMs[index] != null) {
-						// start the resource manager if it was running when saved.
-						if (isRunning) {
-						    rmsNeedStarting .add(tmpRMs[index]);
-						}
-						rms.add(tmpRMs[index]);
-					}
-				}
-			}
-		}
-
-		resourceManagers.addAll(rms);
-		if (statuses.size() > 0) {
-			throw new CoreException(new MultiStatus(PTPCorePlugin.PLUGIN_ID,
-					MultiStatus.ERROR, statuses.toArray(new IStatus[0]),
-					"loading resource managers", null));
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeAttributeDefinitionEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeAttributeDefinitionEvent.java
deleted file mode 100644
index fde345f..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeAttributeDefinitionEvent.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.rtsystem.events.IRuntimeAttributeDefinitionEvent;
-
-public class RuntimeAttributeDefinitionEvent implements IRuntimeAttributeDefinitionEvent {
-
-	private IAttributeDefinition<?,?,?>[] attributeDefs;
-	
-	public RuntimeAttributeDefinitionEvent(IAttributeDefinition<?,?,?>[] defs) {
-		attributeDefs = defs;
-	}
-
-	public IAttributeDefinition<?,?,?>[] getDefinitions() {
-		return attributeDefs;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeConnectedStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeConnectedStateEvent.java
deleted file mode 100644
index 3077e13..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeConnectedStateEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.IRuntimeConnectedStateEvent;
-
-
-public class RuntimeConnectedStateEvent implements IRuntimeConnectedStateEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeDisconnectedEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeDisconnectedEvent.java
deleted file mode 100644
index 8cc1a07..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeDisconnectedEvent.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.IRuntimeDisconnectedEvent;
-
-
-public class RuntimeDisconnectedEvent implements IRuntimeDisconnectedEvent {
-
-	private String message;
-	
-	public RuntimeDisconnectedEvent(String msg) {
-		message = msg;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeErrorStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeErrorStateEvent.java
deleted file mode 100644
index 5af8cd7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeErrorStateEvent.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.IRuntimeErrorStateEvent;
-
-
-public class RuntimeErrorStateEvent implements IRuntimeErrorStateEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeJobChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeJobChangeEvent.java
deleted file mode 100644
index 09c9f76..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeJobChangeEvent.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeJobChangeEvent;
-
-public class RuntimeJobChangeEvent extends AbstractRuntimeChangeEvent implements IRuntimeJobChangeEvent {
-
-	public RuntimeJobChangeEvent(ElementAttributeManager attrs) {
-		super(attrs);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMachineChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMachineChangeEvent.java
deleted file mode 100644
index 251a595..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMachineChangeEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMachineChangeEvent;
-
-public class RuntimeMachineChangeEvent extends AbstractRuntimeChangeEvent implements IRuntimeMachineChangeEvent {
-
-	public RuntimeMachineChangeEvent(ElementAttributeManager attrs) {
-		super(attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMessageEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMessageEvent.java
deleted file mode 100644
index 400968a..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeMessageEvent.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes.Level;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMessageEvent;
-
-
-public class RuntimeMessageEvent implements IRuntimeMessageEvent {
-
-	AttributeManager attributes;
-	
-	public RuntimeMessageEvent(AttributeManager attrs) {
-		if (attrs.getAttribute(MessageAttributes.getLevelAttributeDefinition()) == null) {
-			attrs.addAttribute(MessageAttributes.getLevelAttributeDefinition().create());
-		}
-		if (attrs.getAttribute(MessageAttributes.getCodeAttributeDefinition()) == null) {
-			try {
-				attrs.addAttribute(MessageAttributes.getCodeAttributeDefinition().create());
-			} catch (IllegalValueException e) {
-			}
-		}
-		if (attrs.getAttribute(MessageAttributes.getTextAttributeDefinition()) == null) {
-			attrs.addAttribute(MessageAttributes.getTextAttributeDefinition().create());
-		}
-		this.attributes = attrs;
-	}
-
-	public RuntimeMessageEvent(Level level, String text) {
-		AttributeManager attrs = new AttributeManager();
-		attrs.addAttribute(MessageAttributes.getLevelAttributeDefinition().create(level));
-		attrs.addAttribute(MessageAttributes.getTextAttributeDefinition().create(text));
-		try {
-			attrs.addAttribute(MessageAttributes.getCodeAttributeDefinition().create());
-		} catch (IllegalValueException e) {
-		}
-		this.attributes = attrs;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeErrorEvent#getLevel()
-	 */
-	public MessageAttributes.Level getLevel() {
-		EnumeratedAttribute<Level> level = 
-			attributes.getAttribute(MessageAttributes.getLevelAttributeDefinition());
-		return level.getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeErrorEvent#getCode()
-	 */
-	public int getCode() {
-		IntegerAttribute code = 
-			attributes.getAttribute(MessageAttributes.getCodeAttributeDefinition());
-		return code.getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeErrorEvent#getText()
-	 */
-	public String getText() {
-		StringAttribute text = 
-			attributes.getAttribute(MessageAttributes.getTextAttributeDefinition());
-		return text.getValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeMessageEvent#getAttributes()
-	 */
-	public AttributeManager getAttributes() {
-		return attributes;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewJobEvent.java
deleted file mode 100644
index caefb4b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewJobEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeNewEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewJobEvent;
-
-public class RuntimeNewJobEvent extends AbstractRuntimeNewEvent implements IRuntimeNewJobEvent {
-
-	public RuntimeNewJobEvent(String parent, ElementAttributeManager attrs) {
-		super(parent, attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewMachineEvent.java
deleted file mode 100644
index 6fe3c17..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewMachineEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeNewEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewMachineEvent;
-
-public class RuntimeNewMachineEvent extends AbstractRuntimeNewEvent implements IRuntimeNewMachineEvent {
-
-	public RuntimeNewMachineEvent(String parent, ElementAttributeManager attrs) {
-		super(parent, attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewNodeEvent.java
deleted file mode 100644
index fb5d6a2..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewNodeEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeNewEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewNodeEvent;
-
-public class RuntimeNewNodeEvent extends AbstractRuntimeNewEvent implements IRuntimeNewNodeEvent {
-
-	public RuntimeNewNodeEvent(String parent, ElementAttributeManager attrs) {
-		super(parent, attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewProcessEvent.java
deleted file mode 100644
index b26f911..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewProcessEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeNewEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewProcessEvent;
-
-public class RuntimeNewProcessEvent extends AbstractRuntimeNewEvent implements IRuntimeNewProcessEvent {
-
-	public RuntimeNewProcessEvent(String parent, ElementAttributeManager attrs) {
-		super(parent, attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewQueueEvent.java
deleted file mode 100644
index dcedec8..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNewQueueEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeNewEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewQueueEvent;
-
-public class RuntimeNewQueueEvent extends AbstractRuntimeNewEvent implements IRuntimeNewQueueEvent {
-
-	public RuntimeNewQueueEvent(String parent, ElementAttributeManager attrs) {
-		super(parent, attrs);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNodeChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNodeChangeEvent.java
deleted file mode 100644
index d265fd8..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeNodeChangeEvent.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNodeChangeEvent;
-
-public class RuntimeNodeChangeEvent extends AbstractRuntimeChangeEvent implements IRuntimeNodeChangeEvent {
-
-	public RuntimeNodeChangeEvent(ElementAttributeManager attrs) {
-		super(attrs);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeProcessChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeProcessChangeEvent.java
deleted file mode 100644
index f6c1224..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeProcessChangeEvent.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeProcessChangeEvent;
-
-public class RuntimeProcessChangeEvent extends AbstractRuntimeChangeEvent implements IRuntimeProcessChangeEvent {
-
-	public RuntimeProcessChangeEvent(ElementAttributeManager attrs) {
-		super(attrs);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeQueueChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeQueueChangeEvent.java
deleted file mode 100644
index 44473cb..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeQueueChangeEvent.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeQueueChangeEvent;
-
-public class RuntimeQueueChangeEvent extends AbstractRuntimeChangeEvent implements IRuntimeQueueChangeEvent {
-
-	public RuntimeQueueChangeEvent(ElementAttributeManager attrs) {
-		super(attrs);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveAllEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveAllEvent.java
deleted file mode 100644
index 6f9a459..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveAllEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeRemoveEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveAllEvent;
-
-
-public class RuntimeRemoveAllEvent 
-	extends AbstractRuntimeRemoveEvent 
-		implements IRuntimeRemoveAllEvent {
-
-	public RuntimeRemoveAllEvent() {
-		super();
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveJobEvent.java
deleted file mode 100644
index 493f057..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveJobEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeRemoveEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveJobEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public class RuntimeRemoveJobEvent 
-	extends AbstractRuntimeRemoveEvent 
-		implements IRuntimeRemoveJobEvent {
-
-	public RuntimeRemoveJobEvent(RangeSet ids) {
-		super(ids);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveMachineEvent.java
deleted file mode 100644
index 10aa0bc..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveMachineEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeRemoveEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public class RuntimeRemoveMachineEvent 
-	extends AbstractRuntimeRemoveEvent 
-		implements IRuntimeRemoveMachineEvent {
-
-	public RuntimeRemoveMachineEvent(RangeSet ids) {
-		super(ids);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveNodeEvent.java
deleted file mode 100644
index 114c6c7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveNodeEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeRemoveEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public class RuntimeRemoveNodeEvent 
-	extends AbstractRuntimeRemoveEvent 
-		implements IRuntimeRemoveNodeEvent {
-
-	public RuntimeRemoveNodeEvent(RangeSet ids) {
-		super(ids);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveProcessEvent.java
deleted file mode 100644
index e5d0142..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveProcessEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeRemoveEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public class RuntimeRemoveProcessEvent 
-	extends AbstractRuntimeRemoveEvent 
-		implements IRuntimeRemoveProcessEvent {
-
-	public RuntimeRemoveProcessEvent(RangeSet ids) {
-		super(ids);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveQueueEvent.java
deleted file mode 100644
index f3cc140..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRemoveQueueEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeRemoveEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public class RuntimeRemoveQueueEvent 
-	extends AbstractRuntimeRemoveEvent 
-		implements IRuntimeRemoveQueueEvent {
-
-	public RuntimeRemoveQueueEvent(RangeSet ids) {
-		super(ids);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRunningStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRunningStateEvent.java
deleted file mode 100644
index 045ecfc..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeRunningStateEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.IRuntimeRunningStateEvent;
-
-
-public class RuntimeRunningStateEvent implements IRuntimeRunningStateEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeShutdownStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeShutdownStateEvent.java
deleted file mode 100644
index 61a2cf9..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeShutdownStateEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.IRuntimeShutdownStateEvent;
-
-
-public class RuntimeShutdownStateEvent implements IRuntimeShutdownStateEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeStartupErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeStartupErrorEvent.java
deleted file mode 100644
index 68d75c4..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeStartupErrorEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeStartupErrorEvent;
-
-
-public class RuntimeStartupErrorEvent 
-	extends AbstractRuntimeErrorEvent
-		implements IRuntimeStartupErrorEvent {
-
-	public RuntimeStartupErrorEvent(String message) {
-		super(0, message);
-	}
-
-	public RuntimeStartupErrorEvent(int code, String message) {
-		super(code, message);
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeSubmitJobErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeSubmitJobErrorEvent.java
deleted file mode 100644
index 4638d2d..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeSubmitJobErrorEvent.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeSubmitJobErrorEvent;
-
-
-public class RuntimeSubmitJobErrorEvent 
-	extends AbstractRuntimeErrorEvent
-		implements IRuntimeSubmitJobErrorEvent {
-
-	private String jobSubID;
-	
-	public RuntimeSubmitJobErrorEvent(int code, String message, String jobSubID) {
-		super(code, message);
-		this.jobSubID = jobSubID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeSubmitJobErrorEvent#getJobSubID()
-	 */
-	public String getJobSubID() {
-		return jobSubID;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeTerminateJobErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeTerminateJobErrorEvent.java
deleted file mode 100644
index cc1bd40..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/internal/rtsystem/events/RuntimeTerminateJobErrorEvent.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.rtsystem.events;
-
-import org.eclipse.ptp.rtsystem.events.AbstractRuntimeErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeTerminateJobErrorEvent;
-
-
-public class RuntimeTerminateJobErrorEvent 
-	extends AbstractRuntimeErrorEvent
-		implements IRuntimeTerminateJobErrorEvent {
-
-	private String jobID;
-	
-	public RuntimeTerminateJobErrorEvent(int code, String message, String jobID) {
-		super(code, message);
-		this.jobID = jobID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeTerminateJobErrorEvent#getJobID()
-	 */
-	public String getJobID() {
-		return jobID;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManager.java
deleted file mode 100644
index 3dd84ec..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManager.java
+++ /dev/null

@@ -1,1264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.rmsystem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.ErrorAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes;
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.QueueAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedNodeEvent;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewNodeEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveNodeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerChangeEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.IMachineChildListener;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerListener;
-import org.eclipse.ptp.internal.core.elements.PElement;
-import org.eclipse.ptp.internal.core.elements.PJob;
-import org.eclipse.ptp.internal.core.elements.PMachine;
-import org.eclipse.ptp.internal.core.elements.PNode;
-import org.eclipse.ptp.internal.core.elements.PProcess;
-import org.eclipse.ptp.internal.core.elements.PQueue;
-import org.eclipse.ptp.internal.core.elements.events.ChangedMachineEvent;
-import org.eclipse.ptp.internal.core.elements.events.ChangedQueueEvent;
-import org.eclipse.ptp.internal.core.elements.events.NewMachineEvent;
-import org.eclipse.ptp.internal.core.elements.events.NewQueueEvent;
-import org.eclipse.ptp.internal.core.elements.events.RemoveMachineEvent;
-import org.eclipse.ptp.internal.core.elements.events.RemoveQueueEvent;
-import org.eclipse.ptp.internal.core.elements.events.ResourceManagerChangeEvent;
-import org.eclipse.ptp.internal.core.elements.events.ResourceManagerErrorEvent;
-import org.eclipse.ptp.internal.core.elements.events.ResourceManagerSubmitJobErrorEvent;
-
-/**
- * @author rsqrd
- * 
- */
-public abstract class AbstractResourceManager extends PElement implements IResourceManager, IResourceManagerControl {
-
-	private static IAttribute<?, ?, ?>[] getDefaultAttributes(IResourceManagerConfiguration config) {
-		ArrayList<IAttribute<?, ?, ?>> attrs = new ArrayList<IAttribute<?, ?, ?>>();
-		attrs.add(ElementAttributes.getNameAttributeDefinition().create(config.getName()));
-		attrs.add(ElementAttributes.getIdAttributeDefinition().create(config.getUniqueName()));
-		attrs.add(ResourceManagerAttributes.getDescriptionAttributeDefinition().create(config.getDescription()));
-		attrs.add(ResourceManagerAttributes.getTypeAttributeDefinition().create(config.getType()));
-		attrs.add(ResourceManagerAttributes.getStateAttributeDefinition().create(ResourceManagerAttributes.State.STOPPED));
-		attrs.add(ResourceManagerAttributes.getRmIDAttributeDefinition().create(config.getUniqueName()));
-		return attrs.toArray(new IAttribute<?, ?, ?>[0]);
-	}
-
-	private final ListenerList listeners = new ListenerList();
-	private final ListenerList childListeners = new ListenerList();
-
-	private final IQueueChildListener queueJobListener;
-	private final IJobChildListener jobProcessListener;
-	private final IMachineChildListener machineNodeListener;
-
-	private IResourceManagerConfiguration config;
-	private AttributeDefinitionManager attrDefManager = new AttributeDefinitionManager();
-
-	private final Map<String, IPJobControl> jobsById = Collections.synchronizedMap(new HashMap<String, IPJobControl>());
-	private final Map<String, IPMachineControl> machinesById = Collections.synchronizedMap(new HashMap<String, IPMachineControl>());
-	private final Map<String, IPNodeControl> nodesById = Collections.synchronizedMap(new HashMap<String, IPNodeControl>());
-	private final Map<String, IPProcessControl> processesById = Collections
-			.synchronizedMap(new HashMap<String, IPProcessControl>());
-	private final Map<String, IPQueueControl> queuesById = Collections.synchronizedMap(new HashMap<String, IPQueueControl>());
-	private final Map<String, IPQueueControl> queuesByName = Collections.synchronizedMap(new HashMap<String, IPQueueControl>());
-
-	public AbstractResourceManager(String id, IPUniverseControl universe, IResourceManagerConfiguration config) {
-		super(id, universe, P_RESOURCE_MANAGER, getDefaultAttributes(config));
-		this.config = config;
-
-		queueJobListener = new IQueueChildListener() {
-			public void handleEvent(IChangedJobEvent e) {
-				// OK to ignore
-			}
-
-			public void handleEvent(INewJobEvent e) {
-				// OK to ignore
-			}
-
-			public void handleEvent(IRemoveJobEvent e) {
-				for (IPJob job : e.getJobs()) {
-					job.removeChildListener(jobProcessListener);
-					jobsById.remove(job.getID());
-				}
-			}
-		};
-		jobProcessListener = new IJobChildListener() {
-			public void handleEvent(IChangedProcessEvent e) {
-				// OK to ignore
-			}
-
-			public void handleEvent(INewProcessEvent e) {
-				// OK to ignore
-			}
-
-			public void handleEvent(IRemoveProcessEvent e) {
-				for (IPProcess process : e.getProcesses()) {
-					processesById.remove(process.getID());
-				}
-			}
-		};
-		machineNodeListener = new IMachineChildListener() {
-			public void handleEvent(IChangedNodeEvent e) {
-				// OK to ignore
-			}
-
-			public void handleEvent(INewNodeEvent e) {
-				// OK to ignore
-			}
-
-			public void handleEvent(IRemoveNodeEvent e) {
-				for (IPNode node : e.getNodes()) {
-					nodesById.remove(node.getID());
-				}
-			}
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#addChildListener(org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener)
-	 */
-	public void addChildListener(IResourceManagerChildListener listener) {
-		childListeners.add(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.IResourceManager#addResourceManagerListener(org.eclipse.ptp.rm.IResourceManagerListener)
-	 */
-	public void addElementListener(IResourceManagerListener listener) {
-		listeners.add(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elementcontrols.IResourceManagerControl#addMachineAttributes(java.util.Collection,
-	 *      org.eclipse.ptp.core.attributes.IAttribute<?,?,?>[])
-	 */
-	public void addMachineAttributes(Collection<IPMachineControl> machineControls, IAttribute<?, ?, ?>[] attrs) {
-		List<IPMachine> machines = new ArrayList<IPMachine>(machineControls.size());
-
-		for (IPMachineControl machine : machineControls) {
-			machine.addAttributes(attrs);
-			machines.add(machine);
-		}
-
-		fireChangedMachines(machines);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elementcontrols.IResourceManagerControl#addQueueAttributes(java.util.Collection,
-	 *      org.eclipse.ptp.core.attributes.IAttribute<?,?,?>[])
-	 */
-	public void addQueueAttributes(Collection<IPQueueControl> queueControls, IAttribute<?, ?, ?>[] attrs) {
-		List<IPQueue> queues = new ArrayList<IPQueue>(queueControls.size());
-
-		for (IPQueueControl queue : queueControls) {
-			queue.addAttributes(attrs);
-			queues.add(queue);
-		}
-
-		fireChangedQueues(queues);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.IResourceManager#disableEvents()
-	 */
-	public void disableEvents() throws CoreException {
-		if (getState().equals(ResourceManagerAttributes.State.STARTED)) {
-			doDisableEvents();
-			setState(ResourceManagerAttributes.State.SUSPENDED);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.IResourceManager#dispose()
-	 */
-	public void dispose() {
-		listeners.clear();
-		try {
-			shutdown();
-		} catch (CoreException e) {
-		}
-		doDispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.IResourceManager#enableEvents()
-	 */
-	public void enableEvents() throws CoreException {
-		if (getState().equals(ResourceManagerAttributes.State.SUSPENDED)) {
-			doEnableEvents();
-			setState(ResourceManagerAttributes.State.STARTED);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
-	 */
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Class adapter) {
-		if (adapter.isInstance(this)) {
-			return this;
-		} else {
-			return super.getAdapter(adapter);
-		}
-	}
-
-	/**
-	 * Lookup an attribute definition
-	 * 
-	 * @param attrId
-	 * @return attribute definition
-	 */
-	public IAttributeDefinition<?, ?, ?> getAttributeDefinition(String attrId) {
-		return attrDefManager.getAttributeDefinition(attrId);
-	}
-
-	/**
-	 * Returns the resource managers attribute definition manager
-	 * 
-	 * @return attribute definiton manager for this resource manager
-	 */
-	public AttributeDefinitionManager getAttributeDefinitionManager() {
-		return attrDefManager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elementcontrols.IResourceManagerControl#getConfiguration()
-	 */
-	public IResourceManagerConfiguration getConfiguration() {
-		synchronized (this) {
-			return config;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.IResourceManager#getDescription()
-	 */
-	public String getDescription() {
-		StringAttributeDefinition descAttrDef = ResourceManagerAttributes.getDescriptionAttributeDefinition();
-		StringAttribute descAttr = getAttribute(descAttrDef);
-		if (descAttr != null) {
-			return descAttr.getValue();
-		}
-		return getName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.internal.core.PElement#getID()
-	 */
-	@Override
-	public String getID() {
-		// needed this to get around draconian plug-in
-		// library restrictions
-		return super.getID();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#getMachineById(java.lang.String)
-	 */
-	public IPMachine getMachineById(String id) {
-		return machinesById.get(id);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elementcontrols.IResourceManagerControl#getMachineControls()
-	 */
-	public Collection<IPMachineControl> getMachineControls() {
-		synchronized (machinesById) {
-			List<IPMachineControl> machines = new ArrayList<IPMachineControl>(machinesById.values().size());
-			for (IPMachineControl machine : machinesById.values()) {
-				machines.add(machine);
-			}		
-			return machines;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#getMachines()
-	 */
-	public IPMachine[] getMachines() {
-		return getMachineControls().toArray(new IPMachineControl[0]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#getQueueById(java.lang.String)
-	 */
-	public IPQueue getQueueById(String id) {
-		return queuesById.get(id);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#getQueueByName(java.lang.String)
-	 */
-	public IPQueue getQueueByName(String name) {
-		return queuesByName.get(name);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elementcontrols.IResourceManagerControl#getQueueControls()
-	 */
-	public Collection<IPQueueControl> getQueueControls() {
-		synchronized (queuesById) {
-			List<IPQueueControl> queues = new ArrayList<IPQueueControl>(queuesById.values().size());
-			for (IPQueueControl queue : queuesById.values()) {
-				queues.add(queue);
-			}		
-			return queues;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#getQueues()
-	 */
-	public IPQueue[] getQueues() {
-		return getQueueControls().toArray(new IPQueueControl[0]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#getResourceManagerId()
-	 */
-	public String getResourceManagerId() {
-		return getConfiguration().getResourceManagerId();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.IResourceManager#getStatus()
-	 */
-	public ResourceManagerAttributes.State getState() {
-		EnumeratedAttribute<State> stateAttr = getStateAttribute();
-		return stateAttr.getValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#getUniqueName()
-	 */
-	public String getUniqueName() {
-		return getConfiguration().getUniqueName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elementcontrols.IPElementControl#hasChildren()
-	 */
-	public boolean hasChildren() {
-		return getMachines().length > 0 || getQueues().length > 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#removeChildListener(org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener)
-	 */
-	public void removeChildListener(IResourceManagerChildListener listener) {
-		childListeners.remove(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.IResourceManager#removeResourceManagerListener(org.eclipse.ptp.rm.IResourceManagerListener)
-	 */
-	public void removeElementListener(IResourceManagerListener listener) {
-		listeners.remove(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#removeTerminatedJobs(org.eclipse.ptp.core.elements.IPQueue)
-	 */
-	public void removeTerminatedJobs(IPQueue queue) {
-		doRemoveTerminatedJobs((IPQueueControl) queue);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elementcontrols.IResourceManagerControl#setConfiguration(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public void setConfiguration(IResourceManagerConfiguration config) {
-		synchronized (this) {
-			this.config = config;
-		}
-
-		/*
-		 * Update attributes from the new configuration
-		 */
-		AttributeManager attrs = new AttributeManager();
-
-		StringAttributeDefinition nameAttrDef = ElementAttributes.getNameAttributeDefinition();
-		StringAttribute nameAttr = getAttribute(nameAttrDef);
-		if (nameAttr != null) {
-			try {
-				nameAttr.setValue(config.getName());
-				attrs.addAttribute(nameAttr);
-			} catch (IllegalValueException e) {
-			}
-		}
-		StringAttributeDefinition descAttrDef = ResourceManagerAttributes.getDescriptionAttributeDefinition();
-		StringAttribute descAttr = getAttribute(descAttrDef);
-		if (descAttr != null) {
-			try {
-				descAttr.setValue(config.getDescription());
-				attrs.addAttribute(descAttr);
-			} catch (IllegalValueException e) {
-			}
-		}
-
-		fireResourceManagerChanged(attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.IResourceManager#stop()
-	 */
-	public void shutdown() throws CoreException {
-		IProgressMonitor monitor = null;
-		switch (getState()) {
-		case ERROR:
-			setState(ResourceManagerAttributes.State.STOPPED);
-			cleanUp();
-			break;
-		case STARTED:
-			setState(ResourceManagerAttributes.State.STOPPING);
-			if (monitor == null) {
-				monitor = new NullProgressMonitor();
-			}
-			monitor.beginTask("Stopping Resource Manager " + getName(), 10);
-			SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, 10);
-			try {
-				doShutdown(subMonitor);
-			} finally {
-				monitor.done();
-				setState(ResourceManagerAttributes.State.STOPPED);
-				cleanUp();
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.IResourceManager#start()
-	 */
-	public void startUp(IProgressMonitor monitor) throws CoreException {
-		if (getState() == ResourceManagerAttributes.State.STOPPED) {
-			setState(ResourceManagerAttributes.State.STARTING);
-			if (monitor == null) {
-				monitor = new NullProgressMonitor();
-			}
-			monitor.beginTask("Resource manager starting: " + getName(), 10);
-			try {
-				initialize();
-				boolean started = doStartup(new SubProgressMonitor(monitor, 10));
-				if (started) {
-					setState(ResourceManagerAttributes.State.STARTED);
-				} else {
-					setState(ResourceManagerAttributes.State.STOPPED);
-				}
-			} catch (CoreException e) {
-				setState(ResourceManagerAttributes.State.ERROR);
-				throw e;
-			} finally {
-				monitor.done();
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#submitJob(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      org.eclipse.ptp.core.attributes.AttributeManager,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IPJob submitJob(ILaunchConfiguration configuration, AttributeManager attrMgr, IProgressMonitor monitor)
-			throws CoreException {
-		return doSubmitJob(null, configuration, attrMgr, monitor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#submitJob(java.lang.String, 
-	 * 		org.eclipse.debug.core.ILaunchConfiguration, 
-	 * 		org.eclipse.ptp.core.attributes.AttributeManager, 
-	 * 		org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void submitJob(String subId, ILaunchConfiguration configuration, AttributeManager attrMgr, IProgressMonitor monitor)
-			throws CoreException {
-		doSubmitJob(subId, configuration, attrMgr, monitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.core.elements.IResourceManager#terminateJob(org.eclipse.ptp.core.elements.IPJob)
-	 */
-	public void terminateJob(IPJob job) throws CoreException {
-		doTerminateJob(job);
-	}
-
-	/**
-	 * Fire an event to notify that some attributes have changed
-	 * 
-	 * @param attrs
-	 *            attributes that have changed
-	 */
-	private void fireResourceManagerChanged(AttributeManager attrs) {
-		IResourceManagerChangeEvent e = new ResourceManagerChangeEvent(this, attrs);
-
-		for (Object listener : listeners.getListeners()) {
-			((IResourceManagerListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Helper method to get the state attribute for this RM
-	 * 
-	 * @return state attribute
-	 */
-	private EnumeratedAttribute<State> getStateAttribute() {
-		EnumeratedAttributeDefinition<State> stateAttrDef = ResourceManagerAttributes.getStateAttributeDefinition();
-		EnumeratedAttribute<State> stateAttr = getAttribute(stateAttrDef);
-		return stateAttr;
-	}
-
-	/**
-	 * Initialize the resource manager. This is called each time the resource
-	 * manager is started.
-	 */
-	private void initialize() {
-		attrDefManager.clear();
-		attrDefManager.setAttributeDefinitions(ElementAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(ErrorAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(JobAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(MachineAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(MessageAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(NodeAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(ProcessAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(QueueAttributes.getDefaultAttributeDefinitions());
-		attrDefManager.setAttributeDefinitions(ResourceManagerAttributes.getDefaultAttributeDefinitions());
-	}
-
-	/**
-	 * Add a collection of jobs to the model. This will result in a INewJobEvent
-	 * being propagated to listeners on the queue.
-	 * 
-	 * @param queue
-	 * @param jobs
-	 */
-	protected void addJobs(IPQueueControl queue, Collection<IPJobControl> jobs) {
-
-		for (IPJobControl job : jobs) {
-			job.addChildListener(jobProcessListener);
-			jobsById.put(job.getID(), job);
-		}
-
-		queue.addJobs(jobs);
-	}
-
-	/**
-	 * Add a collection of machines to the model. This will result in a
-	 * INewMachineEvent being propagated to listeners on the RM.
-	 * 
-	 * @param machineControls
-	 *            Collection of IMachineControls
-	 */
-	protected void addMachines(Collection<IPMachineControl> machineControls) {
-		List<IPMachine> machines = new ArrayList<IPMachine>(machineControls.size());
-
-		synchronized (machinesById) {
-			for (IPMachineControl machine : machineControls) {
-				machinesById.put(machine.getID(), machine);
-				machine.addChildListener(machineNodeListener);
-				machines.add(machine);
-			}
-		}
-
-		fireNewMachines(machines);
-	}
-
-	/**
-	 * Add a collection of machines to the model. This will result in a
-	 * INewNodeEvent being propagated to listeners on the machine.
-	 * 
-	 * @param machine
-	 *            parent of the nodes
-	 * @param nodes
-	 *            collection of IPNodeControls
-	 */
-	protected void addNodes(IPMachineControl machine, Collection<IPNodeControl> nodes) {
-
-		for (IPNodeControl node : nodes) {
-			nodesById.put(node.getID(), node);
-		}
-
-		machine.addNodes(nodes);
-	}
-
-	/**
-	 * Add a collection of processes to the model. This involves adding the
-	 * processes to a job *and* to a node. The node information is an attribute
-	 * on the process. This will result in a INewProcessEvent being propagated
-	 * to listeners on the job and nodes.
-	 * 
-	 * @param job
-	 *            parent of the processes
-	 * @param processes
-	 *            collection of IPProcesControls
-	 */
-	protected void addProcesses(IPJobControl job, Collection<IPProcessControl> processes) {
-		/*
-		 * Map containing a list of processes that are linked to nodes
-		 */
-		Map<IPNodeControl, List<IPProcessControl>> nodeProcMap = new HashMap<IPNodeControl, List<IPProcessControl>>();
-
-		for (IPProcessControl process : processes) {
-			/*
-			 * Find the node ID attribute and add the process to the list for
-			 * each node. Remove the attribute from the attribute manager.
-			 */
-			StringAttribute attr = (StringAttribute) process.getAttribute(ProcessAttributes.getNodeIdAttributeDefinition());
-			if (attr != null) {
-				IPNodeControl node = getNodeControl(attr.getValue());
-				if (node != null) {
-					List<IPProcessControl> procs = nodeProcMap.get(node);
-					if (procs == null) {
-						procs = new ArrayList<IPProcessControl>();
-						nodeProcMap.put(node, procs);
-					}
-					procs.add(process);
-				}
-				process.removeAttribute(attr);
-			}
-
-			processesById.put(process.getID(), process);
-		}
-
-		job.addProcesses(processes);
-
-		/*
-		 * Bulk add the processes to the nodes
-		 */
-		for (Map.Entry<IPNodeControl, List<IPProcessControl>> entry : nodeProcMap.entrySet()) {
-			entry.getKey().addProcesses(entry.getValue());
-		}
-
-	}
-
-	/**
-	 * Add a collection of processes to the model. This will result in a
-	 * INewProcessEvent being propagated to listeners on the job.
-	 * 
-	 * @param queues
-	 *            collection of IPQueueControls
-	 */
-	protected void addQueues(Collection<IPQueueControl> queueControls) {
-		List<IPQueue> queues = new ArrayList<IPQueue>(queueControls.size());
-
-		for (IPQueueControl queue : queueControls) {
-			queuesById.put(queue.getID(), queue);
-			/*
-			 * Keep a map of queue names, if the queue has a name (and it
-			 * should).
-			 */
-			StringAttribute attr = queue.getAttribute(ElementAttributes.getNameAttributeDefinition());
-			if (attr != null) {
-				queuesByName.put(attr.getValue(), queue);
-			}
-			queue.addChildListener(queueJobListener);
-			queues.add(queue);
-		}
-
-		fireNewQueues(queues);
-	}
-
-	/**
-	 * Remove all the model elements below the RM. This is called when the RM
-	 * shuts down and ensures that everything is cleaned up properly.
-	 */
-	protected void cleanUp() {
-		doCleanUp();
-
-		removeQueues(this, getQueueControls());
-		removeMachines(this, getMachineControls());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.internal.core.elements.PElement#doAddAttributeHook(java.util.Map)
-	 */
-	@Override
-	protected void doAddAttributeHook(AttributeManager attrs) {
-		fireResourceManagerChanged(attrs);
-	}
-
-	/**
-	 * Perform any cleanup activities
-	 */
-	protected abstract void doCleanUp();
-
-	/**
-	 * Perform any activities prior to disabling events
-	 */
-	protected abstract void doDisableEvents();
-
-	/**
-	 * Perform any activities prior to disposing of the resource manager.
-	 */
-	protected abstract void doDispose();
-
-	/**
-	 * Perform any activities prior to enabling events
-	 */
-	protected abstract void doEnableEvents();
-
-	/**
-	 * Remove terminated jobs
-	 * 
-	 * @param queue
-	 * @return list of removed jobs
-	 */
-	protected abstract List<IPJobControl> doRemoveTerminatedJobs(IPQueueControl queue);
-
-	/**
-	 * Stop the resource manager subsystem.
-	 * 
-	 * @throws CoreException
-	 */
-	protected abstract void doShutdown(IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Start the resource manager subsystem. Returns true if the system was
-	 * started successfully or false if startup was canceled by the user.
-	 * 
-	 * @param monitor
-	 * @return true if successful
-	 * @throws CoreException
-	 */
-	protected abstract boolean doStartup(IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Submit a job with the supplied submission ID.Returns a job that represents the submitted job, or null if
-	 * the progress monitor was canceled.
-	 * 
-	 * @param subId
-	 * @param attrMgr
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	protected abstract IPJob doSubmitJob(String subId, ILaunchConfiguration configuration, AttributeManager attrMgr, IProgressMonitor monitor)
-			throws CoreException;
-
-	/**
-	 * Terminate a job.
-	 * 
-	 * @param job
-	 *            job to terminate
-	 * @throws CoreException
-	 */
-	protected abstract void doTerminateJob(IPJob job) throws CoreException;
-
-	/**
-	 * Propagate IChangedMachineEvent to listener
-	 * 
-	 * @param machine
-	 * @param collection
-	 */
-	protected void fireChangedMachines(Collection<IPMachine> machines) {
-		IChangedMachineEvent e = new ChangedMachineEvent(this, machines);
-
-		for (Object listener : childListeners.getListeners()) {
-			((IResourceManagerChildListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Propagate IChangedQueueEvent to listener
-	 * 
-	 * @param queue
-	 * @param collection
-	 */
-	protected void fireChangedQueues(Collection<IPQueue> queues) {
-		IChangedQueueEvent e = new ChangedQueueEvent(this, queues);
-
-		for (Object listener : childListeners.getListeners()) {
-			((IResourceManagerChildListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Propagate IResourceManagerErrorEvent to listener
-	 * 
-	 * @param message
-	 */
-	protected void fireError(String message) {
-		IResourceManagerErrorEvent e = new ResourceManagerErrorEvent(this, message);
-
-		for (Object listener : listeners.getListeners()) {
-			((IResourceManagerListener) listener).handleEvent(e);
-		}
-	}
-	
-	/**
-	 * Propagate IResourceManagerSubmitJobErrorEvent to listeners
-	 * 
-	 * @param id job submission id
-	 */
-	protected void fireSubmitJobError(String id, String message) {
-		IResourceManagerSubmitJobErrorEvent e = new ResourceManagerSubmitJobErrorEvent(this, id, message);
-
-		for (Object listener : listeners.getListeners()) {
-			((IResourceManagerListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * Propagate a IResourceManagerNewMachinesEvent to listeners.
-	 * 
-	 * @param machines
-	 *            collection containing the new machines
-	 */
-	protected void fireNewMachines(Collection<IPMachine> machines) {
-		INewMachineEvent e = new NewMachineEvent(this, machines);
-
-		for (Object listener : childListeners.getListeners()) {
-			((IResourceManagerChildListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * @param queue
-	 */
-	protected void fireNewQueues(Collection<IPQueue> queues) {
-		INewQueueEvent e = new NewQueueEvent(this, queues);
-
-		for (Object listener : childListeners.getListeners()) {
-			((IResourceManagerChildListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * @param machine
-	 */
-	protected void fireRemoveMachines(Collection<IPMachine> machines) {
-		IRemoveMachineEvent e = new RemoveMachineEvent(this, machines);
-
-		for (Object listener : childListeners.getListeners()) {
-			((IResourceManagerChildListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * @param queue
-	 */
-	protected void fireRemoveQueues(Collection<IPQueue> queues) {
-		IRemoveQueueEvent e = new RemoveQueueEvent(this, queues);
-
-		for (Object listener : childListeners.getListeners()) {
-			((IResourceManagerChildListener) listener).handleEvent(e);
-		}
-	}
-
-	/**
-	 * @param jobId
-	 * @return
-	 */
-	protected IPJobControl getJobControl(String jobId) {
-		return jobsById.get(jobId);
-	}
-
-	/**
-	 * @param machineId
-	 * @return
-	 */
-	protected IPMachineControl getMachineControl(String machineId) {
-		return machinesById.get(machineId);
-	}
-
-	/**
-	 * @param nodeId
-	 * @return
-	 */
-	protected IPNodeControl getNodeControl(String nodeId) {
-		return nodesById.get(nodeId);
-	}
-
-	/**
-	 * @param processId
-	 * @return
-	 */
-	protected IPProcessControl getProcessControl(String processId) {
-		return processesById.get(processId);
-	}
-
-	/**
-	 * @param machineId
-	 * @return
-	 */
-	protected IPQueueControl getQueueControl(String machineId) {
-		return queuesById.get(machineId);
-	}
-
-	/**
-	 * @param string
-	 * @return
-	 */
-	protected CoreException makeCoreException(String string) {
-		IStatus status = new Status(Status.ERROR, PTPCorePlugin.getUniqueIdentifier(), Status.ERROR, string, null);
-		return new CoreException(status);
-	}
-
-	/**
-	 * Helper method to create a new job.
-	 * 
-	 * @param queue
-	 *            queue that this job belongs to
-	 * @param jobId
-	 *            job ID for the job
-	 * @param attrs
-	 *            initial attributes for the job
-	 * @return newly created job model element
-	 */
-	protected IPJobControl newJob(IPQueueControl queue, String jobId, AttributeManager attrs) {
-		return new PJob(jobId, queue, attrs.getAttributes());
-	}
-
-	/**
-	 * Helper method to create a new machine.
-	 * 
-	 * @param machineId
-	 *            ID for the machine
-	 * @param attrs
-	 *            initial attributes for the machine
-	 * @return newly created machine model element
-	 */
-	protected IPMachineControl newMachine(String machineId, AttributeManager attrs) {
-		return new PMachine(machineId, this, attrs.getAttributes());
-	}
-
-	/**
-	 * Helper method to create a new node
-	 * 
-	 * @param machine
-	 *            machine that this node belongs to
-	 * @param nodeId
-	 *            ID for the node
-	 * @param attrs
-	 *            initial attributes for the node
-	 * @return newly created node model element
-	 */
-	protected IPNodeControl newNode(IPMachineControl machine, String nodeId, AttributeManager attrs) {
-		return new PNode(nodeId, machine, attrs.getAttributes());
-	}
-
-	/**
-	 * Helper method to create a new process
-	 * 
-	 * @param job
-	 *            job that this process belongs to
-	 * @param processId
-	 *            ID for the process
-	 * @param attrs
-	 *            initial attributes for the process
-	 * @return newly created process model element
-	 */
-	protected IPProcessControl newProcess(IPJobControl job, String processId, AttributeManager attrs) {
-		return new PProcess(processId, job, attrs.getAttributes());
-	}
-
-	/**
-	 * Helper method to create a new queue
-	 * 
-	 * @param queueId
-	 *            ID for the queue
-	 * @param attrs
-	 *            initial attributes for the queue
-	 * @return newly created queue model element
-	 */
-	protected IPQueueControl newQueue(String queueId, AttributeManager attrs) {
-		return new PQueue(queueId, this, attrs.getAttributes());
-	}
-
-	/**
-	 * @param job
-	 */
-	protected void removeJobs(IPQueueControl queue, Collection<IPJobControl> jobs) {
-		queue.removeJobs(jobs);
-	}
-
-	/**
-	 * @param machine
-	 */
-	protected void removeMachines(IResourceManager rm, Collection<IPMachineControl> machineControls) {
-		List<IPMachine> machines = new ArrayList<IPMachine>(machineControls.size());
-
-		for (IPMachineControl machine : machineControls) {
-			machine.removeNodes(machine.getNodeControls());
-			machine.removeChildListener(machineNodeListener);
-			machinesById.remove(machine.getID());
-			machines.add(machine);
-		}
-
-		fireRemoveMachines(machines);
-	}
-
-	/**
-	 * Remove nodes from the machine.
-	 * 
-	 * @param machine
-	 *            machine containing the nodes to remove
-	 * @param nodes
-	 *            nodes to remove from the model
-	 */
-	protected void removeNodes(IPMachineControl machine, Collection<IPNodeControl> nodes) {
-		machine.removeNodes(nodes);
-	}
-
-	/**
-	 * Remove processes from the job. This will also result in the processes
-	 * being removed from the associated nodes, as the nodes were registered as
-	 * child listeners on the job.
-	 * 
-	 * @param job
-	 *            job containing the processes to remove
-	 * @param processes
-	 *            processes to remove from the model
-	 */
-	protected void removeProcesses(IPJobControl job, Collection<IPProcessControl> processes) {
-		job.removeProcesses(processes);
-	}
-
-	/**
-	 * @param queue
-	 */
-	protected void removeQueues(IResourceManager rm, Collection<IPQueueControl> queueControls) {
-		List<IPQueue> queues = new ArrayList<IPQueue>(queueControls.size());
-
-		for (IPQueueControl queue : queueControls) {
-			queue.removeJobs(queue.getJobControls());
-			queue.removeChildListener(queueJobListener);
-			queuesById.remove(queue.getID());
-			StringAttribute attr = queue.getAttribute(ElementAttributes.getNameAttributeDefinition());
-			if (attr != null) {
-				queuesByName.remove(attr.getValue());
-			}
-			queues.add(queue);
-		}
-
-		fireRemoveQueues(queues);
-	}
-
-	/**
-	 * @param state
-	 */
-	protected void setState(ResourceManagerAttributes.State state) {
-		EnumeratedAttribute<State> stateAttr = getStateAttribute();
-		if (stateAttr.getValue() != state) {
-			stateAttr.setValue(state);
-			AttributeManager attrs = new AttributeManager();
-			attrs.addAttribute(stateAttr);
-			fireResourceManagerChanged(attrs);
-		}
-	}
-
-	/**
-	 * Update attributes on a collection of jobs.
-	 * 
-	 * @param queue
-	 *            parent of jobs
-	 * @param jobs
-	 *            jobs to update
-	 * @param attrs
-	 *            attributes to update
-	 * @return true if updated
-	 */
-	protected boolean updateJobs(IPQueueControl queue, Collection<IPJobControl> jobs, AttributeManager attrs) {
-		queue.addJobAttributes(jobs, attrs.getAttributes());
-		return true;
-	}
-
-	/**
-	 * Update attributes on a collection of machines.
-	 * 
-	 * @param machines
-	 *            machines to update
-	 * @param attrs
-	 *            attributes to update
-	 * @return true if updated
-	 */
-	protected boolean updateMachines(Collection<IPMachineControl> machines, AttributeManager attrs) {
-		addMachineAttributes(machines, attrs.getAttributes());
-		return true;
-	}
-
-	/**
-	 * Update attributes on a collection of nodes.
-	 * 
-	 * @param machine
-	 *            parent of nodes
-	 * @param nodes
-	 *            collection of nodes
-	 * @param attrs
-	 *            attributes to update
-	 * @return true if updated
-	 */
-	protected boolean updateNodes(IPMachineControl machine, Collection<IPNodeControl> nodes, AttributeManager attrs) {
-		machine.addNodeAttributes(nodes, attrs.getAttributes());
-		return true;
-	}
-
-	/**
-	 * Update attributes on a collection of processes.
-	 * 
-	 * @param job
-	 *            parent of processes
-	 * @param processes
-	 *            collection of processes
-	 * @param attrs
-	 *            attributes to update
-	 * @return true if updated
-	 */
-	protected boolean updateProcesses(IPJobControl job, Collection<IPProcessControl> processes, AttributeManager attrs) {
-		job.addProcessAttributes(processes, attrs.getAttributes());
-		return true;
-	}
-	
-	/**
-	 * Update attributes on a collection of queues.
-	 * 
-	 * @param queues
-	 *            queues to update
-	 * @param attrs
-	 *            attributes to update
-	 * @return true if updated
-	 */
-	protected boolean updateQueues(Collection<IPQueueControl> queues, AttributeManager attrs) {
-		addQueueAttributes(queues, attrs.getAttributes());
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerConfiguration.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerConfiguration.java
deleted file mode 100644
index f53896f..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerConfiguration.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.rmsystem;
-
-import org.eclipse.ui.IMemento;
-
-
-public abstract class AbstractResourceManagerConfiguration implements IResourceManagerConfiguration {
-
-	static public class CommonConfig {
-		private final String name;
-		private final String description;
-		private final String uniqueName;
-
-		public CommonConfig() {
-			this("", "", generateUniqueName());
-		}
-
-		public CommonConfig(String name, String desc, String uniqueName) {
-			this.name = name;
-			this.description = desc;
-			this.uniqueName = uniqueName;
-		}
-		
-		public String getDescription() {
-			return description;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public String getUniqueName() {
-			return uniqueName;
-		}		
-	}
-
-	private static final String TAG_DESCRIPTION = "description"; //$NON-NLS-1$
-	private static final String TAG_NAME = "name"; //$NON-NLS-1$
-	private static final String TAG_UNIQUE_NAME = "uniqName"; //$NON-NLS-1$
-	private static final String TAG_FACTORY_ID = "factoryId"; //$NON-NLS-1$
-
-	/**
-	 * @param factory
-	 * @param memento
-	 * @return
-	 */
-	public static CommonConfig loadCommon(IResourceManagerFactory factory,
-			IMemento memento) {
-		String factoryId = memento.getString(TAG_FACTORY_ID);
-		if (!factoryId.equals(factory.getId())) {
-			throw new IllegalStateException("Incompatable factory with factoryId"
-					+ " stored id" + factoryId 
-					+ ", factory id:" + factory.getId());
-		}
-		String name = memento.getString(TAG_NAME);
-		String desc = memento.getString(TAG_DESCRIPTION);
-		String uniqueName = memento.getString(TAG_UNIQUE_NAME);
-		return new CommonConfig(name, desc, uniqueName);
-	}
-	
-	protected static String generateUniqueName() {
-		long time = System.currentTimeMillis();
-		return "RMID:" + Long.toString(time);
-	}
-
-	private String description;
-	private String name;
-	private final String resourceManagerId;
-	private final String resourceManagerType;
-	private final String uniqueName;
-	private final IResourceManagerFactory factory;
-	
-	/**
-	 * @param name
-	 * @param description
-	 * @param factory
-	 */
-	public AbstractResourceManagerConfiguration(CommonConfig commonConfig,
-			IResourceManagerFactory factory) {
-		this.name = commonConfig.getName();
-		this.description = commonConfig.getDescription();
-		this.resourceManagerId = factory.getId();
-		this.resourceManagerType = factory.getName();
-		this.uniqueName = commonConfig.getUniqueName();
-		this.factory = factory;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#clone()
-	 */
-	@Override
-	public Object clone() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#getDescription()
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * Get the factory for this configuration
-	 * 
-	 * @return factory
-	 */
-	public IResourceManagerFactory getFactory() {
-		return factory;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#getResourceManagerId()
-	 */
-	public String getResourceManagerId() {
-		return resourceManagerId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#getType()
-	 */
-	public String getType() {
-		return resourceManagerType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#getUniqueName()
-	 */
-	public String getUniqueName() {
-		return uniqueName;
-	}
-
-	/**
-	 * Save the common parts of this config then save the rest
-	 * @param memento
-	 */
-	public void save(IMemento memento) {
-		memento.putString(TAG_FACTORY_ID, getResourceManagerId());
-		memento.putString(TAG_NAME, getName());
-		memento.putString(TAG_DESCRIPTION, getDescription());
-		memento.putString(TAG_UNIQUE_NAME, getUniqueName());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setDescription(java.lang.String)
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setName(java.lang.String)
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerFactory.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerFactory.java
deleted file mode 100644
index 8b8d0b7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractResourceManagerFactory.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.rmsystem;
-
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-
-
-
-/**
- * @author rsqrd
- * 
- */
-/**
- * @author rsqrd
- *
- */
-public abstract class AbstractResourceManagerFactory implements
-		IResourceManagerFactory {
-
-	private String name;
-	private String id;
-
-	/**
-	 * @param name
-	 */
-	public AbstractResourceManagerFactory(final String name) {
-		this.name = name;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.IResourceManagerFactory#create(org.eclipse.ptp.rm.IRMConfiguration)
-	 */
-	public abstract IResourceManagerControl create(IResourceManagerConfiguration configuration);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.internal.rm.IResourceManagerFactory#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#getId()
-	 */
-	public String getId() {
-		return this.id;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractRuntimeResourceManager.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractRuntimeResourceManager.java
deleted file mode 100644
index 0e09f12..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/AbstractRuntimeResourceManager.java
+++ /dev/null

@@ -1,1141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.rmsystem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.rtsystem.IRuntimeEventListener;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-import org.eclipse.ptp.rtsystem.events.IRuntimeAttributeDefinitionEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeConnectedStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeErrorStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeJobChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMachineChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMessageEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewJobEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewMachineEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewNodeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewProcessEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewQueueEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNodeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeProcessChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeQueueChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveAllEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveJobEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRunningStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeShutdownStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeStartupErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeTerminateJobErrorEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-/**
- * @author greg
- *
- */
-/**
- * @author greg
- *
- */
-public abstract class AbstractRuntimeResourceManager extends
-		AbstractResourceManager implements IRuntimeEventListener {
-
-	public enum JobSubState {SUBMITTED, COMPLETED, ERROR}
-	
-	private class JobSubmission {
-		private IPJob					job = null;
-		private JobSubState				state = JobSubState.SUBMITTED;
-		private String					reason;
-		private String					id;
-		private ILaunchConfiguration	configuration;
-		private final ReentrantLock 	subLock = new ReentrantLock();;
-		private final Condition 		subCondition = subLock.newCondition();
-		
-		public JobSubmission(int count) {
-			this.id = "JOB_" + Long.toString(System.currentTimeMillis()) + Integer.toString(count);
-		}
-
-		public JobSubmission(String id) {
-			this.id = id;
-		}
-		
-		/**
-		 * @return the reason for the error
-		 */
-		public String getErrorReason() {
-			return reason;
-		}
-		
-		/**
-		 * Get the job submission ID
-		 * 
-		 * @return job submission ID
-		 */
-		public String getId() {
-			return id;
-		}
-		
-		/**
-		 * @return the job
-		 */
-		public IPJob getJob() {
-			return job;
-		}
-		
-		/**
-		 * @return the configuration
-		 */
-		public ILaunchConfiguration getLaunchConfiguration() {
-			return configuration;
-		}
-		
-		/**
-		 * Wait for the job state to change
-		 * 
-		 * @return the state
-		 */
-		public JobSubState waitFor(IProgressMonitor monitor) {
-			subLock.lock();
-			try {
-				while (!monitor.isCanceled() && state != JobSubState.SUBMITTED) {
-					try {
-						subCondition.await(100, TimeUnit.MILLISECONDS);
-					} catch (InterruptedException e) {
-						// Expect to be interrupted if monitor is canceled
-					}
-				}
-				
-				return state;
-			} finally {
-				subLock.unlock();
-			}
-		}
-		
-		/**
-		 * @param reason the reason for the error
-		 */
-		public void setError(String reason) {
-			this.reason = reason;
-			setState(JobSubState.ERROR);
-		}
-
-		/**
-		 * @param job the job to set
-		 */
-		public void setJob(IPJob job) {
-			this.job = job;
-		}
-
-		/**
-		 * @param configuaration the configuration to set
-		 */
-		public void setLaunchConfiguration(ILaunchConfiguration configuration) {
-			this.configuration = configuration;
-		}
-		
-		/**
-		 * @param error the error to set
-		 */
-		public void setState(JobSubState state) {
-			subLock.lock();
-			try {
-				this.state = state;
-				subCondition.signalAll();
-			} finally {
-				subLock.unlock();
-			}
-		}
-	}
-	
-	private enum RMState {STARTING, STARTED, STOPPING, STOPPED, ERROR}
-	
-	private IRuntimeSystem runtimeSystem;
-	private volatile RMState state;
-	private String errorMessage = null;
-	
-	private final ReentrantLock stateLock = new ReentrantLock();;
-	private final Condition stateCondition = stateLock.newCondition();
-
-	private Map<String, JobSubmission> jobSubmissions = Collections.synchronizedMap(new HashMap<String, JobSubmission>());
-	
-	public AbstractRuntimeResourceManager(String id, IPUniverseControl universe,
-			IResourceManagerConfiguration config) {
-		super(id, universe, config);
-		state = RMState.STOPPED;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeAttributeDefinitionEvent)
-	 *
-	 * Note: this allows redefinition of attribute definitions. This is ok as long as they
-	 * are only allowed during the initialization phase.
-	 */
-	public void handleEvent(IRuntimeAttributeDefinitionEvent e) {
-		for (IAttributeDefinition<?,?,?> attr : e.getDefinitions()) {
-			getAttributeDefinitionManager().setAttributeDefinition(attr);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeConnectedStateEvent)
-	 */
-	public void handleEvent(IRuntimeConnectedStateEvent e) {
-		// Ignore
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeErrorStateEvent)
-	 */
-	public void handleEvent(IRuntimeErrorStateEvent e) {
-		/*
-		 * Fatal error in the runtime system. Cancel any pending job submissions
-		 * and inform upper levels of the problem.
-		 */
-		for (JobSubmission sub : jobSubmissions.values()) {
-			sub.setError("Fatal error ocurred in runtime system"); //$NON-NLS-1$
-		}
-		jobSubmissions.clear();
-		
-		stateLock.lock();
-		try {
-			RMState oldState = state;
-			state = RMState.ERROR;
-			errorMessage = null;
-			if (oldState == RMState.STOPPING) {
-				stateCondition.signalAll();
-			}
-			setState(ResourceManagerAttributes.State.ERROR);
-			cleanUp();
-		} finally {
-			stateLock.unlock();
-		}	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeJobChangeEvent)
-	 */
-	public void handleEvent(IRuntimeJobChangeEvent e) {
-		ElementAttributeManager eMgr = e.getElementAttributeManager();
-		Map<IPQueueControl, List<IPJobControl>> map = 
-			new HashMap<IPQueueControl, List<IPJobControl>>();
-		
-		for (Map.Entry<RangeSet, AttributeManager> mgrEntry : eMgr.getEntrySet()) {
-			AttributeManager attrs = mgrEntry.getValue();
-			RangeSet jobIds = mgrEntry.getKey();
-			List<IPJobControl> changedJobs;
-			
-			for (String elementId : jobIds) {
-				IPJobControl job = getJobControl(elementId);
-				if (job != null) {
-					IPQueueControl queue = job.getQueueControl();
-					changedJobs = map.get(queue);
-					if (changedJobs == null) {
-						changedJobs = new ArrayList<IPJobControl>();
-						map.put(queue, changedJobs);
-					}
-					changedJobs.add(job);
-				} else {
-					PTPCorePlugin.log("JobChange: unknown node " + elementId); //$NON-NLS-1$
-				}
-			}
-
-			for (Map.Entry<IPQueueControl, List<IPJobControl>> entry : map.entrySet()) {
-				doUpdateJobs(entry.getKey(), entry.getValue(), attrs);
-			}
-			
-			map.clear();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeMachineChangeEvent)
-	 */
-	public void handleEvent(IRuntimeMachineChangeEvent e) {
-		ElementAttributeManager eMgr = e.getElementAttributeManager();
-		List<IPMachineControl> machines = new ArrayList<IPMachineControl>();
-
-		for (Map.Entry<RangeSet, AttributeManager> entry : eMgr.getEntrySet()) {
-			AttributeManager attrs = entry.getValue();
-			RangeSet machineIds = entry.getKey();
-			
-			for (String elementId : machineIds) {
-				IPMachineControl machine = getMachineControl(elementId);
-				if (machine != null) {
-					machines.add(machine);
-				} else {
-					System.out.println("MachineChange: unknown machine " + elementId); //$NON-NLS-1$
-				}
-			}
-			
-			doUpdateMachines(machines, attrs);
-			machines.clear();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeErrorEvent)
-	 */
-	public void handleEvent(IRuntimeMessageEvent e) {
-		//MessageAttributes.Level level = e.getLevel();
-		// FIXME: implement logging
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeNewJobEvent)
-	 */
-	public void handleEvent(IRuntimeNewJobEvent e) {
-		IPQueueControl queue = getQueueControl(e.getParentId());
-		
-		if (queue != null) {
-			ElementAttributeManager mgr = e.getElementAttributeManager();
-	
-			for (Map.Entry<RangeSet, AttributeManager> entry : mgr.getEntrySet()) {
-				AttributeManager jobAttrs = entry.getValue();
-				
-				RangeSet jobIds = entry.getKey();
-				List<IPJobControl> newJobs = new ArrayList<IPJobControl>(jobIds.size());
-	
-				for (String elementId : jobIds) {
-					IPJobControl job = getJobControl(elementId);
-					if (job == null) {
-						job = doCreateJob(queue, elementId, jobAttrs);
-						newJobs.add(job);
-						
-						StringAttribute jobSubAttr = 
-							(StringAttribute) jobAttrs.getAttribute(JobAttributes.getSubIdAttributeDefinition());
-						if (jobSubAttr != null) {
-							/*
-							 * Notify any submitJob() calls that the job has been created
-							 */
-							JobSubmission sub = jobSubmissions.remove(jobSubAttr.getValue());
-							if (sub != null) {
-								sub.setJob(job);
-								job.setLaunchConfiguration(sub.getLaunchConfiguration());
-								sub.setState(JobSubState.COMPLETED);
-							}
-						}
-				 	}
-				}
-				
-				addJobs(queue, newJobs);
-			}
-		} else {
-			PTPCorePlugin.log("IRuntimeEventListener#handleEvent: unknown queue ID " + e.getParentId());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeNewMachineEvent)
-	 */
-	public void handleEvent(IRuntimeNewMachineEvent e) {
-		ElementAttributeManager mgr = e.getElementAttributeManager();
-
-		for (Map.Entry<RangeSet, AttributeManager> entry : mgr.getEntrySet()) {
-			AttributeManager attrs = entry.getValue();
-			RangeSet machineIds = entry.getKey();
-			List<IPMachineControl> newMachines = new ArrayList<IPMachineControl>(machineIds.size());
-
-			for (String elementId : machineIds) {
-				IPMachineControl machine = getMachineControl(elementId);
-				if (machine == null) {
-					machine = doCreateMachine(elementId, attrs);
-					newMachines.add(machine);
-				}
-			}
-			
-			addMachines(newMachines);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeNewNodeEvent)
-	 */
-	public void handleEvent(IRuntimeNewNodeEvent e) {
-		IPMachineControl machine = getMachineControl(e.getParentId());
-		
-		if (machine != null) {
-			ElementAttributeManager mgr = e.getElementAttributeManager();
-	
-			for (Map.Entry<RangeSet, AttributeManager> entry : mgr.getEntrySet()) {
-				AttributeManager attrs = entry.getValue();
-				RangeSet nodeIds = entry.getKey();
-				List<IPNodeControl> newNodes = new ArrayList<IPNodeControl>(nodeIds.size());
-	
-				for (String elementId : nodeIds) {
-					IPNodeControl node = getNodeControl(elementId);
-					if (node == null) {
-						node = doCreateNode(machine, elementId, attrs);
-						newNodes.add(node);
-					}
-				}
-				
-				addNodes(machine, newNodes);
-			}
-		} else {
-			PTPCorePlugin.log("IRuntimeEventListener#handleEvent: unknown machine ID " + e.getParentId());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeNewProcessEvent)
-	 */
-	public void handleEvent(IRuntimeNewProcessEvent e) {
-		IPJobControl job = getJobControl(e.getParentId());
-		
-		if (job != null) {
-			ElementAttributeManager mgr = e.getElementAttributeManager();
-	
-			for (Map.Entry<RangeSet, AttributeManager> entry : mgr.getEntrySet()) {
-				AttributeManager attrs = entry.getValue();
-				RangeSet processIds = entry.getKey();
-				List<IPProcessControl> newProcesses = new ArrayList<IPProcessControl>(processIds.size());
-	
-				for (String elementId : processIds) {
-					IPProcessControl process = getProcessControl(elementId);
-					if (process == null) {
-						process = doCreateProcess(job, elementId, attrs);
-						newProcesses.add(process);
-					}
-				}
-				
-				addProcesses(job, newProcesses);
-			}
-		} else {
-			PTPCorePlugin.log("IRuntimeEventListener#handleEvent: unknown job ID " + e.getParentId());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeNewQueueEvent)
-	 */
-	public void handleEvent(IRuntimeNewQueueEvent e) {
-		ElementAttributeManager mgr = e.getElementAttributeManager();
-		
-		for (Map.Entry<RangeSet, AttributeManager> entry : mgr.getEntrySet()) {
-			AttributeManager attrs = entry.getValue();
-			RangeSet queueIds = entry.getKey();
-			List<IPQueueControl> newQueues = new ArrayList<IPQueueControl>(queueIds.size());
-
-			for (String elementId : queueIds) {
-				IPQueueControl queue = getQueueControl(elementId);
-				if (queue == null) {
-					queue = doCreateQueue(elementId, attrs);
-					newQueues.add(queue);
-				}
-			}
-
-			addQueues(newQueues);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeNodeChangeEvent)
-	 */
-	public void handleEvent(IRuntimeNodeChangeEvent e) {
-		ElementAttributeManager eMgr = e.getElementAttributeManager();
-		Map<IPMachineControl, List<IPNodeControl>> map = 
-			new HashMap<IPMachineControl, List<IPNodeControl>>();
-		
-		for (Map.Entry<RangeSet, AttributeManager> mgrEntry : eMgr.getEntrySet()) {
-			AttributeManager attrs = mgrEntry.getValue();
-			RangeSet nodeIds = mgrEntry.getKey();
-			List<IPNodeControl> changedNodes;
-			
-			for (String elementId : nodeIds) {
-				IPNodeControl node = getNodeControl(elementId);
-				if (node != null) {
-					IPMachineControl machine = node.getMachineControl();
-					changedNodes = map.get(machine);
-					if (changedNodes == null) {
-						changedNodes = new ArrayList<IPNodeControl>();
-						map.put(machine, changedNodes);
-					}
-					changedNodes.add(node);
-				} else {
-					PTPCorePlugin.log("NodeChange: unknown node " + elementId); //$NON-NLS-1$
-				}
-			}
-
-			for (Map.Entry<IPMachineControl, List<IPNodeControl>> entry : map.entrySet()) {
-				doUpdateNodes(entry.getKey(), entry.getValue(), attrs);
-			}
-			
-			map.clear();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeProcessChangeEvent)
-	 */
-	public void handleEvent(IRuntimeProcessChangeEvent e) {
-		ElementAttributeManager eMgr = e.getElementAttributeManager();
-		Map<IPJobControl, List<IPProcessControl>> map = 
-			new HashMap<IPJobControl, List<IPProcessControl>>();
-
-		for (Map.Entry<RangeSet, AttributeManager> mgrEntry : eMgr.getEntrySet()) {
-			AttributeManager attrs = mgrEntry.getValue();
-			RangeSet processIds = mgrEntry.getKey();
-			List<IPProcessControl> changedProcesses;
-			
-			for (String elementId : processIds) {
-				IPProcessControl process = getProcessControl(elementId);
-				if (process != null) {
-					IPJobControl job = process.getJobControl();
-					changedProcesses = map.get(job);
-					if (changedProcesses == null) {
-						changedProcesses = new ArrayList<IPProcessControl>();
-						map.put(job, changedProcesses);
-					}
-					changedProcesses.add(process);
-				} else {
-					PTPCorePlugin.log("ProcessChange: unknown process " + elementId); //$NON-NLS-1$
-				}
-			}
-			
-			for (Map.Entry<IPJobControl, List<IPProcessControl>> entry : map.entrySet()) {
-				doUpdateProcesses(entry.getKey(), entry.getValue(), attrs);
-			}
-			
-			map.clear();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeQueueChangeEvent)
-	 */
-	public void handleEvent(IRuntimeQueueChangeEvent e) {
-		ElementAttributeManager eMgr = e.getElementAttributeManager();
-		List<IPQueueControl> queues = new ArrayList<IPQueueControl>();
-		
-		for (Map.Entry<RangeSet, AttributeManager> entry : eMgr.getEntrySet()) {
-			AttributeManager attrs = entry.getValue();
-			RangeSet queueIds = entry.getKey();
-			
-			for (String elementId : queueIds) {
-				IPQueueControl queue = getQueueControl(elementId);
-				if (queue != null) {
-					queues.add(queue);
-				} else {
-					PTPCorePlugin.log("QueueChange: unknown queue " + elementId);
-				}
-			}
-			
-			doUpdateQueues(queues, attrs);
-			queues.clear();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeRemoveAllEvent)
-	 */
-	public void handleEvent(IRuntimeRemoveAllEvent e) {
-		cleanUp();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeRemoveJobEvent)
-	 */
-	public void handleEvent(IRuntimeRemoveJobEvent e) {
-		Map<IPQueueControl, List<IPJobControl>> map = 
-			new HashMap<IPQueueControl, List<IPJobControl>>();
-
-		for (String elementId : e.getElementIds()) {
-			IPJobControl job = getJobControl(elementId);
-			if (job != null) {
-				IPQueueControl queue = job.getQueueControl();
-				List<IPJobControl> jobs = map.get(queue);
-				if (jobs == null) {
-					jobs = new ArrayList<IPJobControl>();
-					map.put(queue, jobs);
-				}
-				jobs.add(job);
-			}
-		}
-		
-		for (Map.Entry<IPQueueControl, List<IPJobControl>> entry : map.entrySet()) {
-			removeJobs(entry.getKey(), entry.getValue());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeRemoveMachineEvent)
-	 */
-	public void handleEvent(IRuntimeRemoveMachineEvent e) {
-		Map<IResourceManager, List<IPMachineControl>> map = 
-			new HashMap<IResourceManager, List<IPMachineControl>>();
-
-		for (String elementId : e.getElementIds()) {
-			IPMachineControl machine = getMachineControl(elementId);
-			if (machine != null) {
-				IResourceManager rm = machine.getResourceManager();
-				List<IPMachineControl> machines = map.get(rm);
-				if (machines == null) {
-					machines = new ArrayList<IPMachineControl>();
-					map.put(rm, machines);
-				}
-				machines.add(machine);
-			}
-		}
-		
-		for (Map.Entry<IResourceManager, List<IPMachineControl>> entry : map.entrySet()) {
-			removeMachines(entry.getKey(), entry.getValue());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeRemoveNodeEvent)
-	 */
-	public void handleEvent(IRuntimeRemoveNodeEvent e) {
-		Map<IPMachineControl, List<IPNodeControl>> map = 
-			new HashMap<IPMachineControl, List<IPNodeControl>>();
-		
-		for (String elementId : e.getElementIds()) {
-			IPNodeControl node = getNodeControl(elementId);
-			if (node != null) {
-				IPMachineControl machine = node.getMachineControl();
-				List<IPNodeControl> nodes = map.get(machine);
-				if (nodes == null) {
-					nodes = new ArrayList<IPNodeControl>();
-					map.put(machine, nodes);
-				}
-				nodes.add(node);
-			}
-		}
-		
-		for (Map.Entry<IPMachineControl, List<IPNodeControl>> entry : map.entrySet()) {
-			removeNodes(entry.getKey(), entry.getValue());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeRemoveProcessEvent)
-	 */
-	public void handleEvent(IRuntimeRemoveProcessEvent e) {
-		Map<IPJobControl, List<IPProcessControl>> map = 
-			new HashMap<IPJobControl, List<IPProcessControl>>();
-
-		for (String elementId : e.getElementIds()) {
-			IPProcessControl process = getProcessControl(elementId);
-			if (process != null) {
-				IPJobControl job = process.getJobControl();
-				List<IPProcessControl> processes = map.get(job);
-				if (processes == null) {
-					processes = new ArrayList<IPProcessControl>();
-					map.put(job, processes);
-				}
-				processes.add(process);
-			}
-		}
-
-		for (Map.Entry<IPJobControl, List<IPProcessControl>> entry : map.entrySet()) {
-			removeProcesses(entry.getKey(), entry.getValue());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeRemoveQueueEvent)
-	 */
-	public void handleEvent(IRuntimeRemoveQueueEvent e) {
-		Map<IResourceManager, List<IPQueueControl>> map = 
-			new HashMap<IResourceManager, List<IPQueueControl>>();
-
-		for (String elementId : e.getElementIds()) {
-			IPQueueControl queue = getQueueControl(elementId);
-			if (queue != null) {
-				IResourceManager rm = queue.getResourceManager();
-				List<IPQueueControl> queues = map.get(rm);
-				if (queues == null) {
-					queues = new ArrayList<IPQueueControl>();
-					map.put(rm, queues);
-				}
-				queues.add(queue);
-			}
-		}
-		
-		for (Map.Entry<IResourceManager, List<IPQueueControl>> entry : map.entrySet()) {
-			removeQueues(entry.getKey(), entry.getValue());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeRunningStateEvent)
-	 */
-	public void handleEvent(IRuntimeRunningStateEvent e) {
-		stateLock.lock();
-		try {
-            if (state == RMState.STARTING) {
-             	state = RMState.STARTED;
-				stateCondition.signalAll();
-            }
-        } finally {
-        	stateLock.unlock();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeShutdownStateEvent)
-	 */
-	public void handleEvent(IRuntimeShutdownStateEvent e) {
-		stateLock.lock();
-		try {
-			RMState oldState = state;
-			state = RMState.STOPPED;
-			if (oldState == RMState.STOPPING) {
-				stateCondition.signalAll();
-			} else {
-				/*
-				 * This event has been generated by the runtime system. Let upper levels know
-				 * that the RM has shut down.
-				 */
-				setState(ResourceManagerAttributes.State.STOPPED);
-				cleanUp();
-			}
-		} finally {
-			stateLock.unlock();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeStartupErrorEvent)
-	 */
-	public void handleEvent(IRuntimeStartupErrorEvent e) {
-		/*
-		 * Check for errors while starting.
-		 */
-		stateLock.lock();
-		try {
-			if (state == RMState.STARTING) {
-				state = RMState.ERROR;
-				errorMessage = e.getErrorMessage();
-				stateCondition.signalAll();
-				return;
-			}
-		} finally {
-			stateLock.unlock();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeSubmitJobErrorEvent)
-	 */
-	public void handleEvent(IRuntimeSubmitJobErrorEvent e) {
-		if (e.getJobSubID() != null) {
-			JobSubmission sub = jobSubmissions.remove(e.getJobSubID());
-			if (sub != null) {
-				sub.setError(e.getErrorMessage());
-			}
-		}
-		fireSubmitJobError(e.getJobSubID(), e.getErrorMessage());	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeEventListener#handleEvent(org.eclipse.ptp.rtsystem.events.IRuntimeTerminateJobErrorEvent)
-	 */
-	public void handleEvent(IRuntimeTerminateJobErrorEvent e) {
-		IPJob job = this.getJobControl(e.getJobID());
-		String name = e.getJobID();
-		if (job != null) {
-			name = job.getName();
-		}
-		fireError("Error while terminating job \"" + name + "\": " + e.getErrorMessage());
-	}
-
-	/**
-	 * Close the RTS connection.
-	 */
-	private void closeConnection(IProgressMonitor monitor) {
-		try {
-			runtimeSystem.shutdown(monitor);
-		} catch (CoreException e) {
-			// TODO: Should probably throw something
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected abstract void doAfterCloseConnection();
-
-	/**
-	 * 
-	 */
-	protected abstract void doAfterOpenConnection();
-
-	/**
-	 * 
-	 */
-	protected abstract void doBeforeCloseConnection();
-
-	/**
-	 * 
-	 */
-	protected abstract void doBeforeOpenConnection();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doCleanUp()
-	 */
-	@Override
-	protected void doCleanUp() {
-		state = RMState.STOPPED;
-	}
-	
-	/**
-	 * Template pattern method to actually create the job.
-	 *
-	 * @param queue
-	 * @param jobId
-	 * @return
-	 */
-	abstract protected IPJobControl doCreateJob(IPQueueControl queue, String jobId, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to actually create the machine.
-	 *
-	 * @param machineId
-	 * @return
-	 */
-	abstract protected IPMachineControl doCreateMachine(String machineId, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to actually create the node.
-	 *
-	 * @param machine
-	 * @param nodeId
-	 * @return
-	 */
-	abstract protected IPNodeControl doCreateNode(IPMachineControl machine, String nodeId, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to actually create the process.
-	 *
-	 * @param job
-	 * @param processId
-	 * @return
-	 */
-	abstract protected IPProcessControl doCreateProcess(IPJobControl job, String processId, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to actually create the queue.
-	 *
-	 * @param queueId
-	 * @return
-	 */
-	abstract protected IPQueueControl doCreateQueue(String queueId, AttributeManager attrs);
-
-	/**
-	 * create a new runtime system
-	 * @return the new runtime system
-	 * @throws CoreException TODO
-	 */
-	protected abstract IRuntimeSystem doCreateRuntimeSystem()
-	throws CoreException;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doDisableEvents()
-	 */
-	protected void doDisableEvents() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doDispose()
-	 */
-	@Override
-	protected void doDispose() {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doEnableEvents()
-	 */
-	protected void doEnableEvents() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	protected List<IPJobControl> doRemoveTerminatedJobs(IPQueueControl queue) {
-		List<IPJobControl> terminatedJobs = new ArrayList<IPJobControl>();
-		
-		if (queue != null) {
-			for (IPJobControl job : queue.getJobControls()) {
-				if (job.isTerminated()) {
-					terminatedJobs.add(job);
-				}
-			}
-			queue.removeJobs(terminatedJobs);
-		}
-		
-		return terminatedJobs;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doShutdown()
-	 */
-	protected void doShutdown(IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-
-		state = RMState.STOPPING;
-
-		doBeforeCloseConnection();
-		closeConnection(monitor);
-
-		stateLock.lock();
-		try {
-			while (state != RMState.STOPPED && state != RMState.ERROR) {
-				try {
-					stateCondition.await(500, TimeUnit.MILLISECONDS);
-				} catch (InterruptedException e) {
-				}
-			}
-		} finally {
-			stateLock.unlock();
-		}
-		
-		doAfterCloseConnection();
-		runtimeSystem.removeRuntimeEventListener(this);
-		monitor.done();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doStartup(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected boolean doStartup(IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		if (state != RMState.STOPPED) {
-			return false;
-		}
-		
-		monitor.beginTask("Runtime resource manager startup", 10); //$NON-NLS-1$
-		doBeforeOpenConnection();
-		monitor.subTask("Creating runtime system"); //$NON-NLS-1$
-		runtimeSystem = doCreateRuntimeSystem();
-		monitor.worked(1);
-		runtimeSystem.addRuntimeEventListener(this);
-		monitor.worked(2);
-		monitor.subTask("Starting runtime system"); //$NON-NLS-1$
-		
-		state = RMState.STARTING;
-				
-		try {
-			runtimeSystem.startup(monitor);
-		} catch (CoreException e) {
-			state = RMState.ERROR;
-			throw e;
-		}
-		
-		monitor.worked(7);
-		
-		/*
-		 * Wait until state changes or the monitor is canceled
-		 */
-		stateLock.lock();
-		try {
-			while (!monitor.isCanceled() && state != RMState.STARTED && state != RMState.ERROR) {
-				try {
-					stateCondition.await(500, TimeUnit.MILLISECONDS);
-				} catch (InterruptedException e) {
-					// Expect to be interrupted if monitor is canceled
-				}
-			}
-		} finally {
-			stateLock.unlock();
-		}		
-		
-		if (state == RMState.ERROR) {
-			if (errorMessage == null) {
-				errorMessage= "Fatal error occurred in the runtime system"; //$NON-NLS-1$
-			}
-			throw new CoreException(new Status(IStatus.ERROR, 
-					PTPCorePlugin.getUniqueIdentifier(), errorMessage));
-		}
-		
-		if (monitor.isCanceled()) {
-			state = RMState.STOPPED;
-			return false;
-		}
-		
-       	try {
-			runtimeSystem.startEvents();
-		} catch (CoreException e) {
-	        fireError(e.getMessage());
-		}
-
-		doAfterOpenConnection();
-		
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doSubmitJob(java.lang.String, org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.ptp.core.attributes.AttributeManager, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IPJob doSubmitJob(String subId, ILaunchConfiguration configuration, 
-			AttributeManager attrMgr, IProgressMonitor monitor) 
-			throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		IPJob job = null;
-	
-		try {
-			JobSubmission sub = new JobSubmission(subId);
-			sub.setLaunchConfiguration(configuration);
-			jobSubmissions.put(subId, sub);
-			
-			runtimeSystem.submitJob(subId, attrMgr);
-			
-			/*
-			 * If subId is null then don't wait for the submission to complete.
-			 */
-			if (subId != null) {
-				return job;
-			}
-		
-			JobSubState state = sub.waitFor(monitor);
-			
-			switch (state) {
-			case SUBMITTED:
-				/*
-				 * The job submission process itself can't be canceled, so
-				 * this will just cause the submitJob command to return a null.
-				 * The job will still eventually get created.
-				 */
-				break;
-				
-			case COMPLETED:
-				job = sub.getJob();
-				break;
-				
-			case ERROR:
-				throw new CoreException(new Status(IStatus.ERROR, 
-						PTPCorePlugin.getUniqueIdentifier(), IStatus.ERROR, 
-						sub.getErrorReason(), null));
-			}
-		} finally {
-			monitor.done();
-		}
-		
-		return job;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#doTerminateJob(org.eclipse.ptp.core.elements.IPJob)
-	 */
-	protected void doTerminateJob(IPJob job) throws CoreException {
-		runtimeSystem.terminateJob(job);
-	}
-
-	/**
-	 * Template pattern method to actually update the jobs.
-	 * 
-	 * @param job
-	 * @param attrs
-	 * @return changes were made
-	 */
-	abstract protected boolean doUpdateJobs(IPQueueControl queue,
-			Collection<IPJobControl> jobs, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to actually update the machines.
-	 * 
-	 * @param machine
-	 * @param attrs
-	 * @return changes were made
-	 */
-	abstract protected boolean doUpdateMachines(Collection<IPMachineControl> machines, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to update a collection of nodes.
-	 * 
-	 * @param machine parent machine
-	 * @param nodes collection of nodes to update
-	 * @param attrs new/changed attibutes for each node in the collection
-	 * @return changes were made
-	 */
-	protected abstract boolean doUpdateNodes(IPMachineControl machine, 
-			Collection<IPNodeControl> nodes, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to actually update the processes.
-	 * 
-	 * @param job parent job
-	 * @param processes collection of processes to update
-	 * @param attrs new/changed attibutes for each node in the collection
-	 * @return changes were made
-	 */
-	protected abstract boolean doUpdateProcesses(IPJobControl job,
-			Collection<IPProcessControl> processes, AttributeManager attrs);
-
-	/**
-	 * Template pattern method to actually update the queues.
-	 * 
-	 * @param queue
-	 * @param attrs
-	 * @return changes were made
-	 */
-	protected abstract boolean doUpdateQueues(Collection<IPQueueControl> queues, AttributeManager attrs);
-
-	/**
-	 * @return the runtimeSystem
-	 */
-	protected IRuntimeSystem getRuntimeSystem() {
-		return runtimeSystem;
-	}
-
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerConfiguration.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerConfiguration.java
deleted file mode 100644
index 8628e15..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerConfiguration.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.rmsystem;
-
-import org.eclipse.ui.IMemento;
-
-public interface IResourceManagerConfiguration extends Cloneable {
-	
-	/**
-	 * Create a copy of this configuration.
-	 * 
-	 * @return a copy of this configuration
-	 */
-	public Object clone();
-
-	/**
-	 * Returns the description of the resource manager.
-	 *
-	 * @return the description of the resource manager
-	 */
-	public String getDescription();
-
-	/**
-	 * Returns the name of the resource manager.
-	 *
-	 * @return the name of the resource manager
-	 */
-	public String getName();
-	
-	/**
-	 * Returns the id of the resource manager
-	 *
-	 * @return the id of the resource manager
-	 */
-	public String getResourceManagerId();
-
-	/**
-	 * Returns the type of the resource manager. This is the name of the resource manager factory.
-	 *
-	 * @return the type of the resource manager
-	 */
-	public String getType();
-
-	/**
-	 * Get a unique name for this resource manager
-	 * 
-	 * @return unique name
-	 */
-	public String getUniqueName();
-
-	/**
-	 * Save the state of the configuration.
-	 * 
-	 * @param memento
-	 */
-	public void save(IMemento memento);
-
-	/**
-	 * The the name and description to default values
-	 */
-	public void setDefaultNameAndDesc();
-
-	/**
-	 * Set the description of the resource manager
-	 * 
-	 * @param description
-	 */
-	public void setDescription(String description);
-
-	/**
-	 * Set the name of the resource manager
-	 * 
-	 * @param name
-	 */
-	public void setName(String name);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerFactory.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerFactory.java
deleted file mode 100644
index ccd465b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerFactory.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.rmsystem;
-
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ui.IMemento;
-
-
-/**
- * @author rsqrd
- * 
- */
-public interface IResourceManagerFactory {
-	/**
-	 * Copy a configuration. This can be used to provide a temporary working copy of a configuration
-	 *
-	 * @param configuration configuration to copy
-	 * @return copy of the configuration
-	 */
-	public IResourceManagerConfiguration copyConfiguration(IResourceManagerConfiguration configuration);
-
-	/**
-	 * Create a default configuration
-	 * 
-	 * @return default configuration
-	 */
-	public IResourceManagerConfiguration createConfiguration();
-
-	/**
-	 * Get the ID of this factory
-	 * 
-	 * @return factory ID
-	 */
-	public String getId();
-
-	/**
-	 * Get the name of this factory
-	 * 
-	 * @return factory name
-	 */
-	public String getName();
-	
-	/**
-	 * Load a resource manager configuration from saved state
-	 * 
-	 * @param memento saved state of configuration
-	 * @return resource manager configuration
-	 */
-	public IResourceManagerConfiguration loadConfiguration(IMemento memento);
-	
-	/**
-	 * Create a resource manager using the supplied configuration
-	 * 
-	 * @param configuration configuration to use when creating resource manager
-	 * @return resource manager control
-	 */
-	IResourceManagerControl create(IResourceManagerConfiguration configuration);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerMenuContribution.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerMenuContribution.java
deleted file mode 100644
index 170ab7d..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rmsystem/IResourceManagerMenuContribution.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.rmsystem;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Tagging interface for resource menu contributions
- * @author rsqrd
- *
- */
-public interface IResourceManagerMenuContribution extends IAdaptable {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractProxyRuntimeSystem.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractProxyRuntimeSystem.java
deleted file mode 100644
index 2d1ec66..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractProxyRuntimeSystem.java
+++ /dev/null

@@ -1,958 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.rtsystem;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.core.elements.attributes.ErrorAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes.Level;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeAttributeDefinitionEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeConnectedStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeErrorStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeJobChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeMachineChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeMessageEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewJobEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewMachineEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewNodeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewProcessEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewQueueEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNodeChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeProcessChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeQueueChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveAllEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveJobEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveMachineEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveNodeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveProcessEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveQueueEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRunningStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeShutdownStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeStartupErrorEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeTerminateJobErrorEvent;
-import org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient;
-import org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeEventListener;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeAttributeDefEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeConnectedStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeErrorStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeJobChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMachineChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMessageEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewJobEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewMachineEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewNodeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewProcessEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewQueueEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNodeChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeProcessChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeQueueChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveAllEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveJobEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRunningStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeShutdownStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeStartupErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeTerminateJobErrorEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-/*
- * ProxyAttributeDefEvents are formatted as follows:
- * 
- *	EVENT_HEADER NUM_DEFS ATTR_DEF ... ATTR_DEF
- * 
- *	where:
- * 
- *	EVENT_HEADER is the event message header
- *	NUM_DEFS is the number of attribute definitions to follow
- *	ATTR_DEF is an attribute definition of the form:
- * 
- *	NUM_ARGS ID TYPE NAME DESCRIPTION DISPLAY DEFAULT [ADDITIONAL_PARAMS]
- * 
- *	where:
- * 
- *	NUM_ARGS is the number of arguments in the attribute definition
- *	ID is a unique definition ID
- *	TYPE is the type of the attribute. Legal types are:
- *		'BOOLEAN', 'DATE', 'DOUBLE', 'ENUMERATED', 'INTEGER', 'STRING', 'ARRAY'
- *	NAME is the short name of the attribute
- *	DESCRIPTION is the long name of the attribute
- *  DISPLAY is true if the attribute should be displayed in a UI
- *	DEFAULT is the default value of the attribute
- *	ADDITIONAL_PARAMS are optional parameters depending on the attribute type:
- *		BOOLEAN - none
- *		DATE - DATE_STYLE TIME_STYLE LOCALE [MIN MAX]
- *		DOUBLE - [MIN MAX]
- *		ENUMERATED - VAL ... VAL
- *		INTEGER - [MIN MAX]
- *		STRING - none
- *		ARRAY - none
- *	MIN is the minimum allowable value for the attribute
- *	MAX is the maximum allowable value for the attribute
- *	DATE_STYLE is the date format: SHORT, MEDIUM, LONG, or FULL
- *	TIME_STYLE is the time format: SHORT, MEDIUM, LONG, or FULL
- *	LOCALE is the country (see java.lang.Local)
- *	NUM_VALS is the number of enumerated values
- *	VAL is the enumerated value
- * 
- * ProxyNew*Events are formatted as follows:
- * 
- *	EVENT_HEADER PARENT_ID NUM_RANGES ID_RANGE NUM_ATTRS KEY=VALUE ... KEY=VALUE ...
- * 
- *	where:
- * 
- *	EVENT_HEADER is the event message header
- *	PARENT_ID is the model element ID of the parent element
- *	NUM_RANGES is the number of ID_RANGEs to follow
- *	ID_RANGE is a range of model element ID's in RangeSet notation
- *	NUM_ATTRS is the number of attributes to follow
- *	KEY=VALUE are key/value pairs, where KEY is the attribute ID and VALUE is the attribute value
- * 
- * Proxy*ChangeEvents are formatted as follows:
- * 
- *	EVENT_HEADER NUM_RANGES ID_RANGE NUM_ATTRS KEY=VALUE ... KEY=VALUE
- * 
- *	where:
- * 
- *	EVENT_HEADER is the event message header
- *	NUM_RANGES is the number of ID_RANGEs to follow
- *	ID_RANGE is a range of model element ID's in RangeSet notation
- *	NUM_ATTRS is the number of attributes to follow
- *	KEY=VALUE are key/value pairs, where KEY is the attribute ID and VALUE is the new attribute value
- *
- * ProxyRemove*Events (apart from ProxyRemoveAllEvent) are formatted as follows:
- * 
- *	EVENT_HEADER ID_RANGE
- * 
- *	where:
- * 
- *	EVENT_HEADER is the event message header
- *	ID_RANGE is a range of model element ID's in RangeSet notation.
- *
- * The ProxyRemoveAllEvent is formatted as follows:
- * 
- *  EVENT_HEADER
- *  
- *  where:
- * 
- *	EVENT_HEADER is the event message header
- */
-
-public abstract class AbstractProxyRuntimeSystem extends AbstractRuntimeSystem implements IProxyRuntimeEventListener {
-
-	private final static int ATTR_MIN_LEN = 5;
-	protected IProxyRuntimeClient proxy = null;
-	private AttributeDefinitionManager attrDefManager;
-	private Map<String, AttributeManager> jobSubs = Collections.synchronizedMap(new HashMap<String, AttributeManager>());
-
-	public AbstractProxyRuntimeSystem(IProxyRuntimeClient proxy, AttributeDefinitionManager manager) {
-		this.proxy = proxy;
-		this.attrDefManager = manager;
-		proxy.addProxyRuntimeEventListener(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeAttributeDefEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeAttributeDefEvent)
-	 */
-	public void handleEvent(IProxyRuntimeAttributeDefEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length >= ATTR_MIN_LEN + 2) {
-			try {
-				int numDefs = Integer.parseInt(attrs[0]);
-				
-				ArrayList<IAttributeDefinition<?,?,?>> attrDefs = 
-					new ArrayList<IAttributeDefinition<?,?,?>>(numDefs);
-
-				int pos = 1;
-				
-				for (int i = 0; i < numDefs; i++) {
-					int numArgs = Integer.parseInt(attrs[pos]);
-					
-					if (numArgs >= ATTR_MIN_LEN && pos + numArgs < attrs.length) {
-						IAttributeDefinition<?,?,?> attrDef = 
-							parseAttributeDefinition(attrs, pos + 1, pos + numArgs);	
-						if (attrDef != null) {
-							attrDefs.add(attrDef);
-						}
-						pos += numArgs + 1;
-					} else {
-						fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "Bad proxy event: bad arg count"));
-						return;
-					}
-				}
-				
-				fireRuntimeAttributeDefinitionEvent(new RuntimeAttributeDefinitionEvent(attrDefs.toArray(new IAttributeDefinition[attrDefs.size()])));
-			} catch (NumberFormatException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "Bad proxy event: could not convert arg to integer"));
-			}
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "Bad proxy event: not enough arguments"));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.IProxyRuntimeEventListener#handleProxyRuntimeErrorStateEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeErrorStateEvent)
-	 */
-	public void handleEvent(IProxyRuntimeErrorStateEvent e) {
-		fireRuntimeErrorStateEvent(new RuntimeErrorStateEvent());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeErrorEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeErrorEvent)
-	 */
-	public void handleEvent(IProxyRuntimeMessageEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length > 0) {
-			AttributeManager mgr = getAttributeManager(attrs, 0, attrs.length - 1);
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(mgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeJobChangeEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeJobChangeEvent)
-	 */
-	public void handleEvent(IProxyRuntimeJobChangeEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 0);
-		if (eMgr != null) {			
-			fireRuntimeJobChangeEvent(new RuntimeJobChangeEvent(eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeMachineChangeEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeMachineChangeEvent)
-	 */
-	public void handleEvent(IProxyRuntimeMachineChangeEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 0);
-		if (eMgr != null) {			
-			fireRuntimeMachineChangeEvent(new RuntimeMachineChangeEvent(eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeNewJobEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeNewJobEvent)
-	 */
-	public void handleEvent(IProxyRuntimeNewJobEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 2) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 1);
-		
-		if (eMgr != null) {			
-			/*
-			 * Find any job submission attributes and add to the jobs
-			 */
-			for (Map.Entry<RangeSet, AttributeManager> entry : eMgr.getEntrySet()) {
-				StringAttribute subIdAttr = entry.getValue().getAttribute(JobAttributes.getSubIdAttributeDefinition());
-				if (subIdAttr != null) {
-					String subId = subIdAttr.getValueAsString();
-					AttributeManager mgr = jobSubs.get(subId);
-					if (mgr != null) {
-						entry.getValue().addAttributes(mgr.getAttributes());
-					}
-					jobSubs.remove(subId);
-				}
-			}
-			
-			fireRuntimeNewJobEvent(new RuntimeNewJobEvent(attrs[0], eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeNewMachineEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeNewMachineEvent)
-	 */
-	public void handleEvent(IProxyRuntimeNewMachineEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 2) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 1);
-		if (eMgr != null) {			
-			fireRuntimeNewMachineEvent(new RuntimeNewMachineEvent(attrs[0], eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeNewNodeEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeNewNodeEvent)
-	 */
-	public void handleEvent(IProxyRuntimeNewNodeEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 2) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 1);
-		if (eMgr != null) {			
-			fireRuntimeNewNodeEvent(new RuntimeNewNodeEvent(attrs[0], eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeNewProcessEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeNewProcessEvent)
-	 */
-	public void handleEvent(IProxyRuntimeNewProcessEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 2) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 1);
-		if (eMgr != null) {			
-			fireRuntimeNewProcessEvent(new RuntimeNewProcessEvent(attrs[0], eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeNewQueueEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeNewQueueEvent)
-	 */
-	public void handleEvent(IProxyRuntimeNewQueueEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 2) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 1);
-		if (eMgr != null) {			
-			fireRuntimeNewQueueEvent(new RuntimeNewQueueEvent(attrs[0], eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeNodeChangeEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeNodeChangeEvent)
-	 */
-	public void handleEvent(IProxyRuntimeNodeChangeEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 0);
-		if (eMgr != null) {			
-			fireRuntimeNodeChangeEvent(new RuntimeNodeChangeEvent(eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeProcessChangeEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeProcessChangeEvent)
-	 */
-	public void handleEvent(IProxyRuntimeProcessChangeEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 0);
-		if (eMgr != null) {			
-			fireRuntimeProcessChangeEvent(new RuntimeProcessChangeEvent(eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeQueueChangeEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeQueueChangeEvent)
-	 */
-	public void handleEvent(IProxyRuntimeQueueChangeEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		ElementAttributeManager eMgr = getElementAttributeManager(attrs, 0);
-		if (eMgr != null) {			
-			fireRuntimeQueueChangeEvent(new RuntimeQueueChangeEvent(eMgr));
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeConnectedStateEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeConnectedStateEvent)
-	 */
-	public void handleEvent(IProxyRuntimeConnectedStateEvent e) {
-		fireRuntimeConnectedStateEvent(new RuntimeConnectedStateEvent());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.IProxyRuntimeEventListener#handleProxyRuntimeRemoveAllEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeRemoveAllEvent)
-	 */
-	public void handleEvent(IProxyRuntimeRemoveAllEvent e) {
-		fireRuntimeRemoveAllEvent(new RuntimeRemoveAllEvent());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeRemoveJobEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeRemoveJobEvent)
-	 */
-	public void handleEvent(IProxyRuntimeRemoveJobEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		fireRuntimeRemoveJobEvent(new RuntimeRemoveJobEvent(new RangeSet(attrs[0])));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeRemoveMachineEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeRemoveMachineEvent)
-	 */
-	public void handleEvent(IProxyRuntimeRemoveMachineEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		fireRuntimeRemoveMachineEvent(new RuntimeRemoveMachineEvent(new RangeSet(attrs[0])));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeRemoveNodeEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeRemoveNodeEvent)
-	 */
-	public void handleEvent(IProxyRuntimeRemoveNodeEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length < 1) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-			return;
-		}
-		
-		fireRuntimeRemoveNodeEvent(new RuntimeRemoveNodeEvent(new RangeSet(attrs[0])));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeRemoveProcessEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeRemoveProcessEvent)
-	 */
-	public void handleEvent(IProxyRuntimeRemoveProcessEvent e) {
-			String[] attrs = e.getAttributes();
-			
-			if (attrs.length < 1) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-				return;
-			}
-			
-			fireRuntimeRemoveProcessEvent(new RuntimeRemoveProcessEvent(new RangeSet(attrs[0])));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeRemoveQueueEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeRemoveQueueEvent)
-	 */
-	public void handleEvent(IProxyRuntimeRemoveQueueEvent e) {
-			String[] attrs = e.getAttributes();
-			
-			if (attrs.length < 1) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "AbstractProxyRuntimeSystem: not enough arguments"));
-				return;
-			}
-			
-			fireRuntimeRemoveQueueEvent(new RuntimeRemoveQueueEvent(new RangeSet(attrs[0])));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeRunningStateEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeRunningStateEvent)
-	 */
-	public void handleEvent(IProxyRuntimeRunningStateEvent e) {
-		fireRuntimeRunningStateEvent(new RuntimeRunningStateEvent());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeShutdownStateEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeShutdownStateEvent)
-	 */
-	public void handleEvent(IProxyRuntimeShutdownStateEvent e) {
-		fireRuntimeShutdownStateEvent(new RuntimeShutdownStateEvent());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeStartupErrorEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeStartupErrorEvent)
-	 */
-	public void handleEvent(
-			IProxyRuntimeStartupErrorEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length > 0) {
-			AttributeManager mgr = getAttributeManager(attrs, 0, attrs.length - 1);
-			IntegerAttribute codeAttr = mgr.getAttribute(ErrorAttributes.getCodeAttributeDefinition());
-			StringAttribute msgAttr = mgr.getAttribute(ErrorAttributes.getMsgAttributeDefinition());
-			if (codeAttr == null || msgAttr == null) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "StartupErrorEvent: missing attibutes"));				
-			} else {
-				fireRuntimeStartupErrorEvent(new RuntimeStartupErrorEvent(codeAttr.getValue(), msgAttr.getValue()));
-			}
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "StartupErrorEvent: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeSubmitJobErrorEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeSubmitJobErrorEvent)
-	 */
-	public void handleEvent(
-			IProxyRuntimeSubmitJobErrorEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length > 0) {
-			AttributeManager mgr = getAttributeManager(attrs, 0, attrs.length - 1);
-			IntegerAttribute codeAttr = (IntegerAttribute) mgr.getAttribute(ErrorAttributes.getCodeAttributeDefinition());
-			StringAttribute msgAttr = (StringAttribute) mgr.getAttribute(ErrorAttributes.getMsgAttributeDefinition());
-			StringAttribute jobSubIdAttr = (StringAttribute) mgr.getAttribute(JobAttributes.getSubIdAttributeDefinition());
-			if (codeAttr == null || msgAttr == null || jobSubIdAttr == null) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "SubmitJobErrorEvent: missing attibutes"));				
-			} else {
-				fireRuntimeSubmitJobErrorEvent(new RuntimeSubmitJobErrorEvent(codeAttr.getValue(), msgAttr.getValue(), jobSubIdAttr.getValue()));
-			}
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "SubmitJobErrorEvent: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEventListener#handleProxyRuntimeTerminateJobErrorEvent(org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeTerminateJobErrorEvent)
-	 */
-	public void handleEvent(
-			IProxyRuntimeTerminateJobErrorEvent e) {
-		String[] attrs = e.getAttributes();
-		
-		if (attrs.length > 0) {
-			AttributeManager mgr = getAttributeManager(attrs, 0, attrs.length - 1);
-			IntegerAttribute codeAttr = (IntegerAttribute) mgr.getAttribute(ErrorAttributes.getCodeAttributeDefinition());
-			StringAttribute msgAttr = (StringAttribute) mgr.getAttribute(ErrorAttributes.getMsgAttributeDefinition());
-			StringAttribute jobIdAttr = (StringAttribute) mgr.getAttribute(JobAttributes.getJobIdAttributeDefinition());
-			if (codeAttr == null || msgAttr == null || jobIdAttr == null) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "TerminateJobErrorEvent: missing attibutes"));				
-			} else {
-				fireRuntimeTerminateJobErrorEvent(new RuntimeTerminateJobErrorEvent(codeAttr.getValue(), msgAttr.getValue(), jobIdAttr.getValue()));
-			}
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, "TerminateJobErrorEvent: could not parse message"));				
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeSystem#shutdown(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public abstract void shutdown(IProgressMonitor monitor) throws CoreException;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeSystem#startup(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public abstract void startup(IProgressMonitor monitor) throws CoreException;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IControlSystem#submitJob(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	public void submitJob(String subId, AttributeManager attrMgr) throws CoreException {
-		try {
-			StringAttribute jobSubAttr = JobAttributes.getSubIdAttributeDefinition().create(subId);
-			attrMgr.addAttribute(jobSubAttr);
-			jobSubs.put(subId, attrMgr);
-			proxy.submitJob(attrMgr.toStringArray());
-		} catch(IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPCorePlugin.getUniqueIdentifier(), IStatus.ERROR, 
-				"Control system is shut down, proxy exception.  The proxy may have crashed or been killed.", null));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IControlSystem#terminateJob(org.eclipse.ptp.core.elements.IPJob)
-	 */
-	public void terminateJob(IPJob job) throws CoreException {
-		if(job == null) {
-			PTPCorePlugin.log("Tried to terminate a null job.");
-			return;
-		}
-		
-		try {
-			proxy.terminateJob(job.getID());
-		} catch(IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPCorePlugin.getUniqueIdentifier(), IStatus.ERROR, 
-				"Control system is shut down, proxy exception.  The proxy may have crashed or been killed.", null));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IMonitoringSystem#startEvents()
-	 */
-	public void startEvents() throws CoreException {
-		try {
-			proxy.startEvents();
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPCorePlugin.getUniqueIdentifier(), IStatus.ERROR, 
-					e.getMessage(), e));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IMonitoringSystem#stopEvents()
-	 */
-	public void stopEvents() throws CoreException {
-		try {
-			proxy.stopEvents();
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPCorePlugin.getUniqueIdentifier(), IStatus.ERROR, 
-					e.getMessage(), e));
-		}	
-	}
-
-	/**
-	 * Create an attribute manager given an array of key/value strings. Each key/value string
-	 * must be in the form "key=value", where "key" is a string containing at least one character,
-	 * and "value" is a string containing zero or more characters. The "key" string cannot contain 
-	 * an '=' character. There is no white space allowed between the end of the "key" string, the '=', 
-	 * and the start of the "value" string, unless that white space is part of those strings.
-	 * 
-	 * @param kvs
-	 * @param start
-	 * @param end
-	 * @return
-	 */
-	private AttributeManager getAttributeManager(String[] kvs, int start, int end) {
-		AttributeManager mgr = new AttributeManager();
-		
-		for (int i = start; i <= end; i++) {
-			String kv = kvs[i];
-			int sep = kv.indexOf('=');
-			if (sep > 0) {
-				try {
-					IAttributeDefinition<?,?,?> attrDef = attrDefManager.getAttributeDefinition(kv.substring(0, sep));
-					if(attrDef != null) {
-						String value = "";
-						if (sep < kv.length() - 1) {
-							value = kv.substring(sep+1);
-						}
-						IAttribute<?,?,?> attr = attrDef.create(value);
-						mgr.addAttribute(attr);
-					} else {
-						PTPCorePlugin.log("AbstractProxyRuntimSystem: unknown attribute definition");
-					}
-				} catch (IllegalValueException e1) {
-					PTPCorePlugin.log("AbstractProxyRuntimSystem: invalid attribute for definition");
-				}
-			}
-		}
-		
-		return mgr;
-	}
-
-	/**
-	 * @param attrs
-	 * @param pos
-	 * @return
-	 */
-	private ElementAttributeManager getElementAttributeManager(String[] attrs, int pos) {
-		ElementAttributeManager eMgr = new ElementAttributeManager();
-		
-		try {
-			int numRanges = Integer.parseInt(attrs[pos++]);
-			
-			for (int i = 0; i < numRanges; i++) {
-				if (pos >= attrs.length) {
-					return null;					
-				}
-				
-				RangeSet ids = new RangeSet(attrs[pos++]);
-				int numAttrs = Integer.parseInt(attrs[pos++]);
-				
-				int start = pos;
-				int end = pos + numAttrs - 1;
-				
-				if (end >= attrs.length) {
-					return null;					
-				}
-				
-				eMgr.setAttributeManager(ids, getAttributeManager(attrs, start, end));
-				
-				pos = end + 1;
-			}
-		} catch (NumberFormatException e1) {
-			return null;
-		}
-		
-		return eMgr;
-	}
-	
-	/**
-	 * Parse and extract an attribute definition.
-	 * 
-	 * On entry, we know that end < attrs.length and end - start >= ATTR_MIN_LEN
-	 * 
-	 */
-	private IAttributeDefinition<?,?,?> parseAttributeDefinition(String[] attrs, int start, int end) {
-		int pos = start;
-		IAttributeDefinition<?,?,?> attrDef = null;
-		
-		String attrId = attrs[pos++];
-		String attrType = attrs[pos++];
-		String attrName = attrs[pos++];
-		String attrDesc = attrs[pos++];
-		boolean attrDisplay;
-			
-		try {
-			attrDisplay = Boolean.parseBoolean(attrs[pos++]);
-		} catch (NumberFormatException ex) {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-					"Bad proxy event: could not convert attr to boolean"));
-			return null;
-		}
-		
-		String attrDefault = attrs[pos++];
-		
-		if (attrType.equals("BOOLEAN")) {
-			try {
-				Boolean defVal = Boolean.parseBoolean(attrDefault);
-				attrDef = attrDefManager.createBooleanAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, defVal);
-			} catch (NumberFormatException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: could not convert attrs to boolean"));
-			}
-		} else if (attrType.equals("DATE")) {
-			if (end - pos > 2) {
-				try {
-					int dateStyle = toDateStyle(attrs[pos++]);
-					int timeStyle = toDateStyle(attrs[pos++]);
-					Locale locale = toLocale(attrs[pos++]);
-					
-					DateFormat fmt = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
-					Date defVal = fmt.parse(attrDefault);
-					
-					if (end - pos > 1) {
-						Date min = fmt.parse(attrs[pos++]);
-						Date max = fmt.parse(attrs[pos++]);
-						attrDef = attrDefManager.createDateAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, defVal, fmt, min, max);
-					} else {
-						attrDef = attrDefManager.createDateAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, defVal, fmt);
-					}
-				} catch (ParseException ex) {
-					fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-							"Bad proxy event: could not parse date"));
-				} catch (IllegalValueException ex) {
-					fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-							"Bad proxy event: could not create attribute definition, "
-							+ ex.getMessage()));					
-				}
-			} else {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: missing date format"));				
-			}
-		} else if (attrType.equals("DOUBLE")) {
-			try {
-				Double defVal = Double.parseDouble(attrDefault);
-				if (end - pos > 0) {
-						Double min = Double.parseDouble(attrs[pos++]);
-						Double max = Double.parseDouble(attrs[pos++]);
-						attrDef = attrDefManager.createDoubleAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, defVal, min, max);
-				} else {
-					attrDef = attrDefManager.createDoubleAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, defVal);
-				}
-			} catch (NumberFormatException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: could not convert args to double"));
-			} catch (IllegalValueException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: could not create attribute definition, " 
-						+ ex.getMessage()));					
-			}
-		} else if (attrType.equals("ENUMERATED")) {
-			ArrayList<String> values = new ArrayList<String>();
-			while (pos <= end) {
-				values.add(attrs[pos++]);
-			}
-			try {
-				attrDef = attrDefManager.createStringSetAttributeDefinition(attrId, attrName,
-						attrDesc, attrDisplay, attrDefault, values.toArray(new String[values.size()]));
-			} catch (IllegalValueException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: could not create attribute definition, " 
-						+ ex.getMessage()));					
-			}
-		} else if (attrType.equals("INTEGER")) {
-			try {
-				Integer defVal = Integer.parseInt(attrDefault);
-				if (end - pos > 0) {
-						Integer min = Integer.parseInt(attrs[pos++]);
-						Integer max = Integer.parseInt(attrs[pos++]);
-						attrDef = attrDefManager.createIntegerAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, defVal, min, max);
-				} else {
-					attrDef = attrDefManager.createIntegerAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, defVal);
-				}
-			} catch (NumberFormatException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR, 
-						"Bad proxy event: could not convert args to integer"));
-			} catch (IllegalValueException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: could not create attribute definition, " 
-						+ ex.getMessage()));					
-			}
-		} else if (attrType.equals("BIGINTEGER")) {
-			try {
-				BigInteger defVal = new BigInteger(attrDefault);
-				if (end - pos > 0) {
-						BigInteger min = new BigInteger(attrs[pos++]);
-						BigInteger max = new BigInteger(attrs[pos++]);
-						attrDef = attrDefManager.createBigIntegerAttributeDefinition(attrId,
-								attrName, attrDesc, attrDisplay, defVal, min, max);
-				} else {
-					attrDef = attrDefManager.createBigIntegerAttributeDefinition(attrId, attrName,
-							attrDesc, attrDisplay, defVal);
-				}
-			} catch (NumberFormatException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: could not convert args to BigInteger"));
-			} catch (IllegalValueException ex) {
-				fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-						"Bad proxy event: could not create attribute definition, "
-						+ ex.getMessage()));					
-			}
-		} else if (attrType.equals("STRING")) {
-			attrDef = attrDefManager.createStringAttributeDefinition(attrId, attrName, attrDesc, attrDisplay, attrDefault);
-		} else {
-			fireRuntimeMessageEvent(new RuntimeMessageEvent(Level.ERROR,
-					"Bad proxy event: unknown attribute type"));
-		}
-		
-		return attrDef;
-	}
-
-	/**
-	 * @param val
-	 * @return
-	 */
-	private int toDateStyle(String val) {
-		if (val.equals("SHORT")) {
-			return DateFormat.SHORT;
-		} else if (val.equals("MEDIUM")) {
-			return DateFormat.MEDIUM;
-		} else if (val.equals("LONG")) {
-			return DateFormat.LONG;
-		} else if (val.equals("FULL")) {
-			return DateFormat.FULL;
-		} else {
-			return DateFormat.DEFAULT;
-		}
-	}
-
-	/**
-	 * @param val
-	 * @return
-	 */
-	private Locale toLocale(String val) {
-		if (val.equals("CANADA")) {
-			return Locale.CANADA;
-		} else if (val.equals("CHINA")) {
-			return Locale.CHINA;
-		} else if (val.equals("FRANCE")) {
-			return Locale.FRANCE;
-		} else if (val.equals("GERMANY")) {
-			return Locale.GERMANY;
-		} else if (val.equals("ITALY")) {
-			return Locale.ITALY;
-		} else if (val.equals("JAPAN")) {
-			return Locale.JAPAN;
-		} else if (val.equals("TAIWAN")) {
-			return Locale.TAIWAN;
-		} else if (val.equals("UK")) {
-			return Locale.UK;
-		} else if (val.equals("US")) {
-			return Locale.US;
-		} else {
-			return Locale.US;
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractRuntimeSystem.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractRuntimeSystem.java
deleted file mode 100644
index 51d2341..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/AbstractRuntimeSystem.java
+++ /dev/null

@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.rtsystem;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.rtsystem.events.IRuntimeAttributeDefinitionEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeConnectedStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeErrorStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeJobChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMachineChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMessageEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewJobEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewMachineEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewNodeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewProcessEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewQueueEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNodeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeProcessChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeQueueChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveAllEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveJobEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRunningStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeShutdownStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeStartupErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeTerminateJobErrorEvent;
-
-public abstract class AbstractRuntimeSystem implements IRuntimeSystem {
-	final private ListenerList	listeners = new ListenerList();
-
-	public void addRuntimeEventListener(IRuntimeEventListener listener) {
-		listeners.add(listener);
-	}
-
-	public void removeRuntimeEventListener(IRuntimeEventListener listener) {
-		listeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManager#getLaunchAttributes(java.lang.String,
-	 *  java.lang.String, org.eclipse.ptp.core.attributes.IAttribute[])
-	 */
-	public IAttribute<?,?,?>[] getLaunchAttributes(String machineName, String queueName,
-			IAttribute<?,?,?>[] currentAttrs) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void removeJob(IPJob job) {
-		// TODO Auto-generated method stub
-
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeMessageEvent(IRuntimeMessageEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeAttributeDefinitionEvent(IRuntimeAttributeDefinitionEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeConnectedStateEvent(IRuntimeConnectedStateEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeErrorStateEvent(IRuntimeErrorStateEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeJobChangeEvent(IRuntimeJobChangeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeMachineChangeEvent(IRuntimeMachineChangeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeNodeChangeEvent(IRuntimeNodeChangeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeProcessChangeEvent(IRuntimeProcessChangeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeQueueChangeEvent(IRuntimeQueueChangeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeNewJobEvent(IRuntimeNewJobEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeNewMachineEvent(IRuntimeNewMachineEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeNewNodeEvent(IRuntimeNewNodeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeNewProcessEvent(IRuntimeNewProcessEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeNewQueueEvent(IRuntimeNewQueueEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeRemoveAllEvent(IRuntimeRemoveAllEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeRemoveJobEvent(IRuntimeRemoveJobEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeRemoveMachineEvent(IRuntimeRemoveMachineEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeRemoveNodeEvent(IRuntimeRemoveNodeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeRemoveProcessEvent(IRuntimeRemoveProcessEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeRemoveQueueEvent(IRuntimeRemoveQueueEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeRunningStateEvent(IRuntimeRunningStateEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeShutdownStateEvent(IRuntimeShutdownStateEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeStartupErrorEvent(IRuntimeStartupErrorEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeSubmitJobErrorEvent(IRuntimeSubmitJobErrorEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireRuntimeTerminateJobErrorEvent(IRuntimeTerminateJobErrorEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRuntimeEventListener)listener).handleEvent(event);
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IControlSystem.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IControlSystem.java
deleted file mode 100644
index fc808bc..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IControlSystem.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPJob;
-
-/**
- * A Control System is a portion of a runtime system that handles controlling jobs.  This includes
- * starting new jobs, terminating jobs, getting information about running jobs and processes, etc.
- * 
- * @author Nathan DeBardeleben
- */
-
-public interface IControlSystem {	
-	
-	/**
-	 * Submits a job run using the submission ID and the attributes provided by the AttributeManager.  
-	 * The AttributeManager contains resource manager specific information about 
-	 * how the user wants to run the job, such as the program name, number of processes, etc.
-	 * 
-	 * The job submission ID can be used to identify the new job that 
-	 * is created. The ID will be returned as an attribute on the new job.
-	 * 
-	 * This will call will result in either a new job event when the job is created
-	 * by the resource manager or an error event if the job submission fails.
-	 * 
-	 * @param subId
-	 * @param attrMgr 
-	 * @throws CoreException 
-	 */
-	public void submitJob(String subId, AttributeManager attrMgr) throws CoreException;
-
-	/**
-	 * Terminates a running job.  The {@link IPJob} contains the job identifier used to 
-	 * locate the job by the control system.
-	 * 
-	 * @param job the job to terminate
-	 * @throws CoreException 
-	 */
-	public void terminateJob(IPJob job) throws CoreException;
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IMonitoringSystem.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IMonitoringSystem.java
deleted file mode 100644
index ff45f4b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IMonitoringSystem.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * A Monitoring System is a portion of a runtime system that handles status and information about
- * the system (generally things outside the control of the runtime system).  This includes
- * what machines are available, the nodes for those machines, the status of those nodes, etc.
- * 
- * @author Nathan DeBardeleben
- *
- */
-public interface IMonitoringSystem {
-
-	/**
-	 * @throws CoreException
-	 */
-	public void startEvents() throws CoreException;
-	
-	/**
-	 * @throws CoreException
-	 */
-	public void stopEvents() throws CoreException;
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeEventListener.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeEventListener.java
deleted file mode 100644
index b15104f..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeEventListener.java
+++ /dev/null

@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.rtsystem;
-
-import org.eclipse.ptp.rtsystem.events.IRuntimeAttributeDefinitionEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeConnectedStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeErrorStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeJobChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMachineChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMessageEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewJobEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewMachineEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewNodeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewProcessEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewQueueEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNodeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeProcessChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeQueueChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveAllEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveJobEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRunningStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeShutdownStateEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeStartupErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeTerminateJobErrorEvent;
-
-public interface IRuntimeEventListener {
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeAttributeDefinitionEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeConnectedStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeErrorStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeJobChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeMachineChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeMessageEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeNewJobEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeNewMachineEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeNewNodeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeNewProcessEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeNewQueueEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeNodeChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeProcessChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeQueueChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeRemoveAllEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeRemoveJobEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeRemoveMachineEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeRemoveNodeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeRemoveProcessEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeRemoveQueueEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeRunningStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeShutdownStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeStartupErrorEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeSubmitJobErrorEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IRuntimeTerminateJobErrorEvent e);
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeSystem.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeSystem.java
deleted file mode 100644
index 2a44e17..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/IRuntimeSystem.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public interface IRuntimeSystem extends IControlSystem, IMonitoringSystem {	
-
-	/**
-	 * Adds a listener to the runtime system.  The runtime system may fire events
-	 * and will use this list of listeners to determine who to send these events to.
-	 * 
-	 * @param listener someone that wants to listener to runtime events
-	 */
-	public void addRuntimeEventListener(IRuntimeEventListener listener);
-	
-	/**
-	 * Removes a listener from the list of things listening to runtime events on
-	 * this runtime system.
-	 * 
-	 * @param listener the listener to remove
-	 */
-	public void removeRuntimeEventListener(IRuntimeEventListener listener);
-	
-	/**
-	 * Called when the control system is being shutdown.
-	 * @throws CoreException 
-	 */
-	public void shutdown(IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Called to start the runtime system.
-	 * @throws CoreException
-	 */
-	public void startup(IProgressMonitor monitor) throws CoreException;
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/JobRunConfiguration.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/JobRunConfiguration.java
deleted file mode 100644
index 57cee43..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/JobRunConfiguration.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem;
-
-import org.eclipse.ptp.core.attributes.IAttribute;
-
-/**
- * This is a complete description needed to run or debug a parallel job
- * 
- * execName					The name of the executable (can be a relative path).
- * pathToExec				When appended to execName, gives the absolute path to the executable. 
- * 							Can be null.
- * machineName				The name of the machine (from model) on which to run the job.
- * numberOfProcesses			Number of processes to start.
- * numberOfProcessesPerNode	Number of processes to start on each node.
- * firsNodeNumber			Node number (from model) of first node to use in the allocation.
- * workingDir				The working directory for the job. If pathToExec is null, this will be used
- * 							locate the executable.
- * arguments					The arguments passed to the program. Can be null.
- * environment				The environment passed to the program. Can be null.
- * debuggerPath				Name (or path) to the debugger executable.
- * debuggerArgs				Arguments to be passed to the debugger.
- * isDebugJob				True if this is a debug job.
- */
-public class JobRunConfiguration {
-	protected String execName;
-	protected String pathToExec;
-	protected String resourceManagerName;
-	protected String workingDir;
-	protected String[] arguments;
-	protected String[] environment;
-	protected String debuggerPath;
-	protected String[] debuggerArgs;
-	protected boolean isDebugJob;
-	protected IAttribute<?,?,?>[] launchAttributes;
-	protected String queueName;
-	
-	public JobRunConfiguration(String exe, String exePath, String resourceManager,
-			String queue, IAttribute<?,?,?>[] launchAttributes,
-			String[] args, String[] env,
-			String dir)
-	{
-		execName = exe;
-		pathToExec = exePath;
-		resourceManagerName = resourceManager;
-		queueName = queue;
-		this.launchAttributes = launchAttributes;
-		workingDir = dir;
-		arguments = args;
-		environment = env;
-		isDebugJob = false;
-		debuggerPath = null;
-		debuggerArgs = null;
-	}
-	
-	public String getExecName()
-	{
-		return execName;
-	}
-	
-	public String getPathToExec()
-	{
-		return pathToExec;
-	}
-	
-	public String getResourceManagerName()
-	{
-		return resourceManagerName;
-	}
-	
-	public String getQueueName()
-	{
-		return queueName;
-	}
-	
-	public String getWorkingDir()
-	{
-		return workingDir;
-	}
-
-	public String[] getArguments()
-	{
-		return arguments;
-	}
-
-	public String[] getEnvironment()
-	{
-		return environment;
-	}
-
-	public String getDebuggerPath()
-	{
-		return debuggerPath;
-	}
-	
-	public String[] getDebuggerArgs()
-	{
-		return debuggerArgs;
-	}
-	
-	public boolean isDebug()
-	{
-		return isDebugJob;
-	}
-	
-	public void setDebug()
-	{
-		isDebugJob = true;
-	}
-	
-	public void setDebuggerPath(String path)
-	{
-		debuggerPath = path;
-	}
-	
-	public void setDebuggerArgs(String args)
-	{
-		debuggerArgs = args.split(" ");
-	}
-	
-	public String toString()
-	{
-		return "name:\t\t"+execName+"\n"+
-				"path:\t\t"+pathToExec+"\n"+
-				"cwd:\t\t"+workingDir+"\n"+
-				"resourceManagerName:\t"+resourceManagerName+"\n"+
-				"queueName:\t"+queueName+"\n"+
-				"isDebug?\t\t"+isDebugJob;
-	}
-
-	public IAttribute<?,?,?>[] getLaunchAttributes() {
-		return launchAttributes;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeChangeEvent.java
deleted file mode 100644
index eb4d9ac..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeChangeEvent.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-
-public abstract class AbstractRuntimeChangeEvent implements IRuntimeChangeEvent {
-	private ElementAttributeManager attrMgr;
-	
-	public AbstractRuntimeChangeEvent(ElementAttributeManager attrs) {
-		this.attrMgr = attrs;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeChangeEvent#getElementAttributeManager()
-	 */
-	public ElementAttributeManager getElementAttributeManager() {
-		return attrMgr;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeErrorEvent.java
deleted file mode 100644
index 27518cf..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeErrorEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-
-public abstract class AbstractRuntimeErrorEvent implements IRuntimeErrorEvent {
-	private int errorCode;
-	private String errorMessage;
-	
-	public AbstractRuntimeErrorEvent(int code, String message) {
-		this.errorCode = code;
-		this.errorMessage = message;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeErrorEvent#getErrorCode()
-	 */
-	public int getErrorCode() {
-		return errorCode;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeErrorEvent#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeNewEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeNewEvent.java
deleted file mode 100644
index 0324b29..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeNewEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-
-public abstract class AbstractRuntimeNewEvent implements IRuntimeNewEvent {
-	private String parentId;
-	private ElementAttributeManager attrMgr;
-	
-	public AbstractRuntimeNewEvent(String parentId, ElementAttributeManager attrMgr) {
-		this.parentId = parentId;
-		this.attrMgr = attrMgr;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeNewEvent#getParentId()
-	 */
-	public String getParentId() {
-		return parentId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeNewEvent#getElementAttributeManager()
-	 */
-	public ElementAttributeManager getElementAttributeManager() {
-		return attrMgr;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeRemoveEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeRemoveEvent.java
deleted file mode 100644
index a1b8916..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/AbstractRuntimeRemoveEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public abstract class AbstractRuntimeRemoveEvent implements IRuntimeRemoveEvent {
-	private RangeSet elementIds;
-	
-	public AbstractRuntimeRemoveEvent() {
-		this.elementIds = null;
-	}
-
-	public AbstractRuntimeRemoveEvent(RangeSet elementIds) {
-		this.elementIds = elementIds;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeRemoveEvent#getElementIds()
-	 */
-	public RangeSet getElementIds() {
-		return elementIds;
-	}
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeAttributeDefinitionEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeAttributeDefinitionEvent.java
deleted file mode 100644
index 65f7f0c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeAttributeDefinitionEvent.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-
-public interface IRuntimeAttributeDefinitionEvent extends IRuntimeEvent {
-	public IAttributeDefinition<?,?,?>[] getDefinitions();
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeChangeEvent.java
deleted file mode 100644
index 909bd1f..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeChangeEvent.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-
-public interface IRuntimeChangeEvent extends IRuntimeEvent {	
-	public ElementAttributeManager getElementAttributeManager();
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeConnectedStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeConnectedStateEvent.java
deleted file mode 100644
index 8784a14..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeConnectedStateEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeConnectedStateEvent extends IRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeDisconnectedEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeDisconnectedEvent.java
deleted file mode 100644
index 54e5495..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeDisconnectedEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeDisconnectedEvent extends IRuntimeEvent {
-	public String getMessage();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorEvent.java
deleted file mode 100644
index 9bdf95f..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorEvent.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-
-public interface IRuntimeErrorEvent extends IRuntimeEvent {
-	/**
-	 * @return the error code
-	 */
-	public int getErrorCode();
-	
-	/**
-	 * @return the error message
-	 */
-	public String getErrorMessage();
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorStateEvent.java
deleted file mode 100644
index f910b7c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeErrorStateEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeErrorStateEvent extends IRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEvent.java
deleted file mode 100644
index b3e4491..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeEvent {	
-
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEventFactory.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEventFactory.java
deleted file mode 100644
index a29290c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeEventFactory.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes.Level;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public interface IRuntimeEventFactory {
-
-	/**
-	 * @param defs
-	 * @return
-	 */
-	public IRuntimeAttributeDefinitionEvent newRuntimeAttributeDefinitionEvent(IAttributeDefinition<?, ?, ?>[] defs);
-
-	/**
-	 * @return
-	 */
-	public IRuntimeConnectedStateEvent newRuntimeConnectedStateEvent();
-
-	/**
-	 * @param message
-	 * @return
-	 */
-	public IRuntimeDisconnectedEvent newRuntimeDisconnectedEvent(String message);
-
-	/**
-	 * @return
-	 */
-	public IRuntimeErrorStateEvent newRuntimeErrorStateEvent();
-
-	/**
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeJobChangeEvent newRuntimeJobChangeEvent(ElementAttributeManager attrs);
-
-	/**
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeMachineChangeEvent newRuntimeMachineChangeEvent(ElementAttributeManager attrs);
-
-	/**
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeMessageEvent newRuntimeMessageEvent(AttributeManager attrs);
-
-	/**
-	 * @param level
-	 * @param message
-	 * @return
-	 */
-	public IRuntimeMessageEvent newRuntimeMessageEvent(Level level, String message);
-
-	/**
-	 * @param parent
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeNewJobEvent newRuntimeNewJobEvent(String parent, ElementAttributeManager attrs);
-
-	/**
-	 * @param parent
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeNewMachineEvent newRuntimeNewMachineEvent(String parent, ElementAttributeManager attrs);
-
-	/**
-	 * @param parent
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeNewNodeEvent newRuntimeNewNodeEvent(String parent, ElementAttributeManager attrs);
-
-	/**
-	 * @param parent
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeNewProcessEvent newRuntimeNewProcessEvent(String parent, ElementAttributeManager attrs);
-
-	/**
-	 * @param parent
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeNewQueueEvent newRuntimeNewQueueEvent(String parent, ElementAttributeManager attrs);
-
-	/**
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeNodeChangeEvent newRuntimeNodeChangeEvent(ElementAttributeManager attrs);
-
-	/**
-	 * @param attrs
-	 * @return
-	 */
-	public IRuntimeProcessChangeEvent newRuntimeProcessChangeEvent(ElementAttributeManager attrs);
-
-	/**
-	 * @return
-	 */
-	public IRuntimeRemoveAllEvent newRuntimeRemoveAllEventt();
-
-	/**
-	 * @param ids
-	 * @return
-	 */
-	public IRuntimeRemoveJobEvent newRuntimeRemoveJobEvent(RangeSet ids);
-
-	/**
-	 * @param ids
-	 * @return
-	 */
-	public IRuntimeRemoveMachineEvent newRuntimeRemoveMachineEvent(RangeSet ids);
-
-	/**
-	 * @param ids
-	 * @return
-	 */
-	public IRuntimeRemoveNodeEvent newRuntimeRemoveNodeEvent(RangeSet ids);
-
-	/**
-	 * @param ids
-	 * @return
-	 */
-	public IRuntimeRemoveProcessEvent newRuntimeRemoveProcessEvent(RangeSet ids);
-
-	/**
-	 * @param ids
-	 * @return
-	 */
-	public IRuntimeRemoveQueueEvent newRuntimeRemoveQueueEvent(RangeSet ids);
-
-	/**
-	 * @return
-	 */
-	public IRuntimeRunningStateEvent newRuntimeRunningStateEvent();
-
-	/**
-	 * @return
-	 */
-	public IRuntimeShutdownStateEvent newRuntimeShutdownStateEvent();
-
-	/**
-	 * @param message
-	 * @return
-	 */
-	public IRuntimeStartupErrorEvent newRuntimeStartupErrorEvent(String message);
-
-	/**
-	 * @param code
-	 * @param message
-	 * @return
-	 */
-	public IRuntimeStartupErrorEvent newRuntimeStartupErrorEvent(int code, String message);
-
-	/**
-	 * @param code
-	 * @param message
-	 * @param jobSubID
-	 * @return
-	 */
-	public IRuntimeSubmitJobErrorEvent newRuntimeSubmitJobErrorEvent(int code, String message, String jobSubID);
-
-	/**
-	 * @param code
-	 * @param message
-	 * @param jobID
-	 * @return
-	 */
-	public IRuntimeTerminateJobErrorEvent newRuntimeTerminateJobErrorEvent(int code, String message, String jobID);
-
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeJobChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeJobChangeEvent.java
deleted file mode 100644
index 96fbbb5..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeJobChangeEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeJobChangeEvent extends IRuntimeChangeEvent {
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMachineChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMachineChangeEvent.java
deleted file mode 100644
index 06eaf86..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMachineChangeEvent.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeMachineChangeEvent extends IRuntimeChangeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMessageEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMessageEvent.java
deleted file mode 100644
index 90299d7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeMessageEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes;
-
-public interface IRuntimeMessageEvent extends IRuntimeEvent {
-	/**
-	 * @return message level
-	 */
-	public MessageAttributes.Level getLevel();
-
-	/**
-	 * @return message code
-	 */
-	public int getCode();
-
-	/**
-	 * @return message text
-	 */
-	public String getText();
-	
-	/**
-	 * @return message attributes
-	 */
-	public AttributeManager getAttributes();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewEvent.java
deleted file mode 100644
index 8c3da9a..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-
-public interface IRuntimeNewEvent extends IRuntimeEvent {
-	public String getParentId();
-	public ElementAttributeManager getElementAttributeManager();
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewJobEvent.java
deleted file mode 100644
index bc0c5c4..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewJobEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeNewJobEvent extends IRuntimeNewEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewMachineEvent.java
deleted file mode 100644
index 6b792c6..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewMachineEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeNewMachineEvent extends IRuntimeNewEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewNodeEvent.java
deleted file mode 100644
index de83b00..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewNodeEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeNewNodeEvent extends IRuntimeNewEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewProcessEvent.java
deleted file mode 100644
index 0516441..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewProcessEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeNewProcessEvent extends IRuntimeNewEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewQueueEvent.java
deleted file mode 100644
index bea9d71..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNewQueueEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeNewQueueEvent extends IRuntimeNewEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNodeChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNodeChangeEvent.java
deleted file mode 100644
index 9d1462b..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeNodeChangeEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeNodeChangeEvent extends IRuntimeChangeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeProcessChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeProcessChangeEvent.java
deleted file mode 100644
index 4b42e95..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeProcessChangeEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeProcessChangeEvent extends IRuntimeChangeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeQueueChangeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeQueueChangeEvent.java
deleted file mode 100644
index b5f4ba2..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeQueueChangeEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeQueueChangeEvent extends IRuntimeChangeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveAllEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveAllEvent.java
deleted file mode 100644
index dd34f25..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveAllEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeRemoveAllEvent extends IRuntimeRemoveEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveEvent.java
deleted file mode 100644
index b5ba60e..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveEvent.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public interface IRuntimeRemoveEvent extends IRuntimeEvent {
-	public RangeSet getElementIds();
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveJobEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveJobEvent.java
deleted file mode 100644
index 4908b39..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveJobEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeRemoveJobEvent extends IRuntimeRemoveEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveMachineEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveMachineEvent.java
deleted file mode 100644
index b2633d0..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveMachineEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeRemoveMachineEvent extends IRuntimeRemoveEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveNodeEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveNodeEvent.java
deleted file mode 100644
index 1aafe03..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveNodeEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeRemoveNodeEvent extends IRuntimeRemoveEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveProcessEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveProcessEvent.java
deleted file mode 100644
index 031cfb7..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveProcessEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeRemoveProcessEvent extends IRuntimeRemoveEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveQueueEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveQueueEvent.java
deleted file mode 100644
index 71373f2..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRemoveQueueEvent.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeRemoveQueueEvent extends IRuntimeRemoveEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRunningStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRunningStateEvent.java
deleted file mode 100644
index 9ffd78c..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeRunningStateEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeRunningStateEvent extends IRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeShutdownStateEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeShutdownStateEvent.java
deleted file mode 100644
index 7785b58..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeShutdownStateEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeShutdownStateEvent extends IRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeStartupErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeStartupErrorEvent.java
deleted file mode 100644
index 2562bda..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeStartupErrorEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeStartupErrorEvent extends IRuntimeErrorEvent {
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeSubmitJobErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeSubmitJobErrorEvent.java
deleted file mode 100644
index 8107ce9..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeSubmitJobErrorEvent.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeSubmitJobErrorEvent extends IRuntimeErrorEvent {
-	/**
-	 * @return job submission ID
-	 */
-	public String getJobSubID();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeTerminateJobErrorEvent.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeTerminateJobErrorEvent.java
deleted file mode 100644
index be2aaf5..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/IRuntimeTerminateJobErrorEvent.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-public interface IRuntimeTerminateJobErrorEvent extends IRuntimeErrorEvent {
-	/**
-	 * @return job ID
-	 */
-	public String getJobID();
-}

diff --git a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/RuntimeEventFactory.java b/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/RuntimeEventFactory.java
deleted file mode 100644
index 928e1eb..0000000
--- a/core/org.eclipse.ptp.core/src/org/eclipse/ptp/rtsystem/events/RuntimeEventFactory.java
+++ /dev/null

@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rtsystem.events;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes.Level;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeAttributeDefinitionEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeConnectedStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeDisconnectedEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeErrorStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeJobChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeMachineChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeMessageEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewJobEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewMachineEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewNodeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewProcessEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNewQueueEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeNodeChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeProcessChangeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveAllEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveJobEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveMachineEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveNodeEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveProcessEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRemoveQueueEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeRunningStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeShutdownStateEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeStartupErrorEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.internal.rtsystem.events.RuntimeTerminateJobErrorEvent;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-public class RuntimeEventFactory implements IRuntimeEventFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeAttributeDefinitionEvent(org.eclipse.ptp.core.attributes.IAttributeDefinition)
-	 */
-	public IRuntimeAttributeDefinitionEvent newRuntimeAttributeDefinitionEvent(IAttributeDefinition<?,?,?>[] defs) {
-		return new RuntimeAttributeDefinitionEvent(defs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeConnectedStateEvent()
-	 */
-	public IRuntimeConnectedStateEvent newRuntimeConnectedStateEvent() {
-		return new RuntimeConnectedStateEvent();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeDisconnectedEvent(java.lang.String)
-	 */
-	public IRuntimeDisconnectedEvent newRuntimeDisconnectedEvent(String message) {
-		return new RuntimeDisconnectedEvent(message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeErrorStateEvent()
-	 */
-	public IRuntimeErrorStateEvent newRuntimeErrorStateEvent() {
-		return new RuntimeErrorStateEvent();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeJobChangeEvent(org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeJobChangeEvent newRuntimeJobChangeEvent(ElementAttributeManager attrs) {
-		return new RuntimeJobChangeEvent(attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeMachineChangeEvent(org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeMachineChangeEvent newRuntimeMachineChangeEvent(ElementAttributeManager attrs) {
-		return new RuntimeMachineChangeEvent(attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeMessageEvent(org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	public IRuntimeMessageEvent newRuntimeMessageEvent(AttributeManager attrs) {
-		return new RuntimeMessageEvent(attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeMessageEvent(org.eclipse.ptp.core.elements.attributes.MessageAttributes.Level, java.lang.String)
-	 */
-	public IRuntimeMessageEvent newRuntimeMessageEvent(Level level,
-			String message) {
-		return new RuntimeMessageEvent(level, message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeNewJobEvent(java.lang.String, org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeNewJobEvent newRuntimeNewJobEvent(String parent, ElementAttributeManager attrs) {
-		return new RuntimeNewJobEvent(parent, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeNewMachineEvent(java.lang.String, org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeNewMachineEvent newRuntimeNewMachineEvent(String parent, ElementAttributeManager attrs) {
-		return new RuntimeNewMachineEvent(parent, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeNewNodeEvent(java.lang.String, org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeNewNodeEvent newRuntimeNewNodeEvent(String parent, ElementAttributeManager attrs) {
-		return new RuntimeNewNodeEvent(parent, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeNewProcessEvent(java.lang.String, org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeNewProcessEvent newRuntimeNewProcessEvent(String parent, ElementAttributeManager attrs) {
-		return new RuntimeNewProcessEvent(parent, attrs);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeNewQueueEvent(java.lang.String, org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeNewQueueEvent newRuntimeNewQueueEvent(String parent, ElementAttributeManager attrs) {
-		return new RuntimeNewQueueEvent(parent, attrs);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeNodeChangeEvent(org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeNodeChangeEvent newRuntimeNodeChangeEvent(ElementAttributeManager attrs) {
-		return new RuntimeNodeChangeEvent(attrs);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeProcessChangeEvent(org.eclipse.ptp.core.elements.attributes.ElementAttributeManager)
-	 */
-	public IRuntimeProcessChangeEvent newRuntimeProcessChangeEvent(ElementAttributeManager attrs) {
-		return new RuntimeProcessChangeEvent(attrs);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeRemoveAllEventt()
-	 */
-	public IRuntimeRemoveAllEvent newRuntimeRemoveAllEventt() {
-		return new RuntimeRemoveAllEvent();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeRemoveJobEvent(org.eclipse.ptp.core.util.RangeSet)
-	 */
-	public IRuntimeRemoveJobEvent newRuntimeRemoveJobEvent(RangeSet ids) {
-		return new RuntimeRemoveJobEvent(ids);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeRemoveMachineEvent(org.eclipse.ptp.core.util.RangeSet)
-	 */
-	public IRuntimeRemoveMachineEvent newRuntimeRemoveMachineEvent(RangeSet ids) {
-		return new RuntimeRemoveMachineEvent(ids);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeRemoveNodeEvent(org.eclipse.ptp.core.util.RangeSet)
-	 */
-	public IRuntimeRemoveNodeEvent newRuntimeRemoveNodeEvent(RangeSet ids) {
-		return new RuntimeRemoveNodeEvent(ids);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeRemoveProcessEvent(org.eclipse.ptp.core.util.RangeSet)
-	 */
-	public IRuntimeRemoveProcessEvent newRuntimeRemoveProcessEvent(RangeSet ids) {
-		return new RuntimeRemoveProcessEvent(ids);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeRemoveQueueEvent(org.eclipse.ptp.core.util.RangeSet)
-	 */
-	public IRuntimeRemoveQueueEvent newRuntimeRemoveQueueEvent(RangeSet ids) {
-		return new RuntimeRemoveQueueEvent(ids);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeRunningStateEvent()
-	 */
-	public IRuntimeRunningStateEvent newRuntimeRunningStateEvent() {
-		return new RuntimeRunningStateEvent();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeShutdownStateEvent()
-	 */
-	public IRuntimeShutdownStateEvent newRuntimeShutdownStateEvent() {
-		return new RuntimeShutdownStateEvent();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeStartupErrorEvent(java.lang.String)
-	 */
-	public IRuntimeStartupErrorEvent newRuntimeStartupErrorEvent(String message) {
-		return new RuntimeStartupErrorEvent(message);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeStartupErrorEvent(int, java.lang.String)
-	 */
-	public IRuntimeStartupErrorEvent newRuntimeStartupErrorEvent(int code, String message) {
-		return new RuntimeStartupErrorEvent(code, message);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeSubmitJobErrorEvent(int, java.lang.String, java.lang.String)
-	 */
-	public IRuntimeSubmitJobErrorEvent newRuntimeSubmitJobErrorEvent(int code, String message, String jobSubID) {
-		return new RuntimeSubmitJobErrorEvent(code, message, jobSubID);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory#newRuntimeTerminateJobErrorEvent(int, java.lang.String, java.lang.String)
-	 */
-	public IRuntimeTerminateJobErrorEvent newRuntimeTerminateJobErrorEvent(int code, String message, String jobID) {
-		return new RuntimeTerminateJobErrorEvent(code, message, jobID);
-	}
-}

diff --git a/core/org.eclipse.ptp.doc.user/.classpath b/core/org.eclipse.ptp.doc.user/.classpath
deleted file mode 100755
index 4848249..0000000
--- a/core/org.eclipse.ptp.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/core/org.eclipse.ptp.doc.user/.cvsignore b/core/org.eclipse.ptp.doc.user/.cvsignore
deleted file mode 100755
index 092357e..0000000
--- a/core/org.eclipse.ptp.doc.user/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-bin


diff --git a/core/org.eclipse.ptp.doc.user/.project b/core/org.eclipse.ptp.doc.user/.project
deleted file mode 100755
index 9cdce28..0000000
--- a/core/org.eclipse.ptp.doc.user/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.ptp.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/core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 85ff3b9..0000000
--- a/core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.help; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-ClassPath: ptpHelp.jar
-Bundle-Activator: org.eclipse.ptp.help.HelpPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.help,
- org.eclipse.ui.intro,
- org.eclipse.ui.intro.universal
-Bundle-ActivationPolicy: lazy

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

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

diff --git a/core/org.eclipse.ptp.doc.user/build.properties b/core/org.eclipse.ptp.doc.user/build.properties
deleted file mode 100755
index c6faefa..0000000
--- a/core/org.eclipse.ptp.doc.user/build.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-source.ptphelp.jar = src/

-output.ptphelp.jar = bin/

-bin.includes = plugin.xml,\

-               ptphelp.jar,\

-               toc.xml,\

-               intro/,\

-               about.html,\

-               html/,\

-               META-INF/,\

-               plugin.properties

-src.includes = html/,\

-               plugin.xml,\

-               toc.xml


diff --git a/core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html b/core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html
deleted file mode 100644
index fcb1be0..0000000
--- a/core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<html>
-<head>
-<title>New and Noteworthy - Parallel Tools Platform (PTP) Release 2.1 </title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1>Parallel Tools Platform (PTP) Release 2.1 - New and Noteworthy</h1>
-
-<p>This version has had many enhancements and bug fixes since the 2.0  
-release. Detailed PTP 2.1 release notes, including installation instructions, are available
-    	at <a href="http://wiki.eclipse.org/PTP/release_notes/2.1">
-    	http://wiki.eclipse.org/PTP/release_notes/2.1</a></p>
-<dl>
-<dt>Resource Managers</dt>
-<dd>
-New more flexible resource manager for Open MPI. This resource manager does not require a proxy agent to be running on the target system, and can be use as a 
-template to target other MPI implementations. It also works with Open MPI 1.2 and 1.3.
-Improvements have also been made to the Parallel Environment resource manager, as well as adding
-support for the new debugger.
-</dd>
-<br>
-<dl>
-<dt>Parallel Debugger</dt>
-<dd>
-The debugger dependency on MPI has now been removed. This allows the debugger to work with virtually any MPI implementation. 
-The debugger also provides a flexible architecture allows different routing and communication layers as well as 
-full asynchronous command support
-</dd>
-<br>
-<dl>
-<dt>Parallel Language Development Tools (PLDT)</dt>
-<dd>
-Support for Unified Parallel C (UPC) has been added, along with new MPI code templates.
-</dd>
-<br>
-<dl>
-<dt>External Tools Framework (formerly the Performance Tools Framework)</dt>
-<dd>
-Support for PAPI Component counter selection has been added, along with parametric analysis capabilities 
-(supported primarily for TAU at this time). Significant modifications have been made to increase work-flow flexibility
-</dd>
-<br>
-<dl>
-<dt>Remote Development Tools (RDT)</dt>
-<dd>
-A new Remote Development Tools environment that enables C and C++ projects to be located on a remote machine. 
-RDT provides remote indexing and parsing services, a new remote C/C++ project wizard, automatic source code 
-delta handling (the index is automatically updated when files in your project are added/removed/changed), 
-remote "scanner info" support to allow the user to define include paths and defined preprocessor macros as a 
-context for the parser to operate, and remote Search, Call Hierarchy, Navigation (e.g. Go To Declaration), 
-Content Assist, and Type Hierarchy support. RDT also provides remote Standard Make functionality 
-for building remote makefile-based projects.
-</dd>
-<br>
-<dl>
-<dt>Services Model</dt>
-<dd>
-The PTP service model allows the user to configure how services on their system are mapped to service providers
-and locations (e.g. to a remote machine). This allows ISVs and tool implementers to define new services, and 
-contribute providers to any defined services.
-</dd>
-<br>
-<dl>
-<dt>Cell/B.E. IDE</dt>
-<dd>
-The Cell/B.E. IDE provides a fully-featured IDE for developing applications for the Cell Broadband Engine. It includes
-features such as custom source code templates for Cell development, full configurable build properties for PPU and 
-SPU using GNU and XL compilers, managed build for PPU and SPU using GNU and XL compilers, remote launch and debug of 
-Cell applications, and support for PPU & SPU combined remote debugger. The Cell/B.E. IDE also provides support for
-Cell performance tools, the ALF programming model, IBM PDT (Performance Debug Tools) instrumentation plugins, and
-Mambo Simulator plugins.
-</dd>
-</dl>
-
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>

diff --git a/core/org.eclipse.ptp.doc.user/html/00overview.html b/core/org.eclipse.ptp.doc.user/html/00overview.html
deleted file mode 100755
index 7e25f36..0000000
--- a/core/org.eclipse.ptp.doc.user/html/00overview.html
+++ /dev/null

@@ -1,44 +0,0 @@
-<html>
-<head>
-<title>PTP - Overview and Features</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1 id="top">PTP - Overview and Features</h1>
-<p><p>The Parallel Tools Platform (PTP) is a framework for integrating tools to aid the development of parallel applications into Eclipse. The PTP framework provides a range of services to support tools in four main areas:
-<ul>
-<li>Runtime tools that allow developers to monitor and control the execution of parallel applications
-<li>Debugging tools for locating runtime errors in parallel applications
-<li>Analysis tools that provide advanced editing, error checking, and programmer assistance for developing parallel applications
-<li>Performance tools for analyzing and optimizing the performance of parallel applications
-</ul>
-
-<h2>Runtime Tools</h2>
-
-These tools aid the developer in launching and monitoring parallel applications on a range of local and remote systems. PTP provides a parallel model that represents the state of a (possibly remote) parallel system, and the applications running on that system. This model includes the notion of a <i>resource manager</i> which is used to control interaction with the target system. Developers can use the normal Eclipse launch configuration mechanism to specify the system-specifc attributes necessary to launch a parallel job, and monitor the status of the system and job using a number of different views.
-
-<h2>Debugging Tools</h2>
-
-PTP provides an integrated parallel debugger that provides a range of basic debugging functions for locating errors in parallel applications. This includes the ability to set breakpoints and control program execution (single step, resume, etc.) across an arbitrary set of application processes. The developer can also drill down into individual process to obtain more detailed information about the process state, variable information, etc.
-
-<h2>Analysis Tools</h2>
-
-These tools are built on the C/C++ Development Tools (CDT) abstract syntax tree infrastructure and use static 
-analysis techniques to provide a range of advanced editing and error checking features. Examples include content 
-assist for MPI, OpenMP, LAPI, and UPC APIs and directives, barrier analysis for MPI programs, and concurrency analysis for OpenMP 
-programs.  Future versions of PTP will combine this with the External Tools Framework  to provide dynamic 
-analysis functions, such as parallelization assistance.
-
-<h2>External Tools Framework and Performance Tools</h2>
-
-The External Tools Framework (formerly the Performance Tools Framework) provides a simple mechanism 
-for integrating external performance tools, and other arbitrary external tools, with PTP. 
-By providing an XML description file, the tool is able to be integrated with the editor, build, and 
-launch systems. Currently, support is provided for the Tuning and Analysis Utilities (TAU) performance analysis 
-system.
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-
-</html>

diff --git a/core/org.eclipse.ptp.doc.user/html/00prereqs.html b/core/org.eclipse.ptp.doc.user/html/00prereqs.html
deleted file mode 100755
index 895f3a9..0000000
--- a/core/org.eclipse.ptp.doc.user/html/00prereqs.html
+++ /dev/null

@@ -1,68 +0,0 @@
-<html>
-<head>
-<title>PTP - Prerequisites</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1 id="top">PTP - Prerequisites</h1>
-
-<p>The following prerequisites are required for PTP 2.1 installation. For more 
-detailed information, including installation instructions, see
-<a href="http://wiki.eclipse.org/PTP/release_notes/2.1">
-http://wiki.eclipse.org/PTP/release_notes/2.1</a></p>
-<ul>
-<li>Java 1.5 or later</li>
-<li><a href="http://eclipse.org/downloads">Eclipse SDK</a> version 3.4 or later</li>
-<li><a href="http://eclipse.org/cdt/">Eclipse C/C++ Development Tools (CDT)</a> version 5.0.1 or later</li>
-<li>Note: the Remote Development Tools require CDT 5.0.2 or later</li>
-</ul>
-
-<table border="1">
-  <tr>
-    <th colspan="4" scope="col">PTP Support Matrix <br></th>
-  </tr>
-  <tr>
-    <th scope="col">Operating System</th>
-    <th scope="col">Architecture</th>
-    <th scope="col">Components</th>
-    <th scope="col">Debugging</th>
-  </tr>
-  <tr>
-    <td>Linux</td>
-    <td>x86, x86_64, ppc</td>
-    <td>Eclipse+Agents</td>
-    <td>gdb 6.3 - 6.8</td>
-  </tr>
-  <tr>
-    <td>MacOS X</td>
-    <td>x86</td>
-    <td>Eclipse+Agents</td>
-    <td>gdb 6.3</td>
-  </tr>
-  <tr>
-    <td>Windows</td>
-    <td>x86</td>
-    <td>Eclipse only</td>
-    <td>N/A</td>
-  </tr>
-  <tr>
-    <td>AIX</td>
-    <td>ppc</td>
-    <td>Eclipse+Agents</td>
-    <td>N/A</td>
-  </tr>
-</table>
-
-<p>PTP supports a number of parallel runtime systems and job schedulers. These need to be installed on the target system prior to using PTP:</p>
-<ul>
-<li><a href="http://open-mpi.org">Open MPI</a> version 1.2.x and 1.3.x</li>
-<li>MPICH2 version 1.0.6p1 (later versions may work but are untested)</li>
-<li>IBM Parallel Environment (PE)</li>
-<li>IBM LoadLeveler (LL)</li>
-</ul>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-
-</html>

diff --git a/core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html b/core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html
deleted file mode 100755
index 90bf77d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html
+++ /dev/null

@@ -1,76 +0,0 @@
-<html>
-<head>
-<title>Creating an MPI Project</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head> 
-<body>
-<h1>Creating an MPI Project</h1>
-<p>This section provides a brief introduction to creating, building and launching an MPI program. It will cover the following steps:
-<ul>
-<li><a href="#create">Create the project</a></li>
-<li><a href="#configure">Configure to use MPI</a></li>
-<li><a href="#build">Build the executable</a></li>
-<li><a href="#launch">Launch the program</a></li>
-</ul>
-
-<h2 id="create">Step 1: Create the project</h2>
-<p>Note: this tutorial uses the
-<a href="PLUGINS_ROOT/org.eclipse.ptp.pldt.help/html/toc.html">Parallel Language Development Tools (PLDT)</a> wizards for creating MPI projects. 
-Please make sure this feature is installed before continuing.
-
-<ol>
-<li><p>Switch to the C/C++ Perspective using <b>Window &gt; Open Perspective &gt; Other...</b>  and then choose <b>C/C++</b></p><p><br></p></li>
-<li><p>Create a new MPI project using the managed build facility. Select <b>File &gt; New &gt; C Project ...</b> and the <b>New Project</b> dialog should open.</p><p><br></p></li>
-<li><p>Enter a name for the project e.g. MyMPIProject.</p><p><br></p></li>
-<li><p>From the <b>Project types</b> list, expand <b>Executable</b> and select <b>MPI Hello World C Project</b></p><p><br></p>
-<p><script> thumb("images/01newMPIproject.png")</script></p><p><br></p>
-</li>
-<li><p>In the <b>Basic Settings</b> dialog, fill in the author name and change any other values you like.</p><p><br></p>
-<p><script> thumb("images/01projBasicSettings.png")</script></p><p><br></p>
-<p>Click <b>Next</b>.</p><p><br></p></li>
-</ol>
-
-<h2 id="configure">Step 2: Configure the project to use MPI</h2>
-<p></p>
-<ol>
-<li><p>In the <b>MPI Project Settings</b> dialog, make sure <b>Add MPI Project settings to this project</b> is checked.
-You can uncheck <b>Use default information</b> if you need to change any values for include paths, libraries or search path,
-or MPI build commands.</p><p><br></p>
-<p><script> thumb("images/01mpiProjSettings.png")</script></p><p><br></p>
-<p>Click <b>Finish</b>.</p><p><br></p></li>
-<li><p>The new project is created and appears in the <b>C/C++ Projects</b> view. Expand the <b>src</b> folder to see the new source file.</p><p><br></p>
-<p><script> full("images/01proj.png") </script></p>
-</li>
-</ol>
-
-<h2 id="build">Step 3: Build the executable</h2>
-<p></p>
-<ol>
-<li><p>Assuming that you have MPI installed and that the project was configured correctly, the application should now autmatically build. When the automatic 
-build setting is selected, Eclipse will build the application whenever you save changes in an editor. 
-Automatic/manual build can be toggled by selecting <b>Project &gt; Build Automatically...</b>. When 
-manual build is selected, a build can be initiated using <b>Project &gt; Build All</b>.</p><p><br></p></li>
-<li><p>Once the build is complete, any errors will be dislayed in the <b>Problems view</b>, the 
-corresponding source files will be flagged, and markers will be insterted into the editor window.</p><p><br></p></li>
-<li><p>Double-click on the source file name to open the C/C++ editor in order to correct any errors.</p><p><br></p>
-<p><script> thumb("images/01wbSrcEditor.png") </script></p><p><br></p>
-</li>
-<li><p>Details of the commands that were executed to complete the build can be seen in the <b>Console 
-view</b> (click on the <b>Console</b> tab near the bottom right hand corner of the Eclispe 
-workbench.)</p></li>
-</ol>
-
-<h2 id="launch">Step 4: Launch the program</h2>
-<p></p>
-<ol>
-<li><p>Before launching the program, you will need to <i>create</i> and <i>start</i> a 
-<a href="02resMgrSetup.html">Resource Manager</a></p><p><br></p></li>
-<li><p>Once you have verified that the resource manager is operating correctly, you can then 
-<a href="03pLaunchConfig.html">create a configuration and launch the parallel program.</a></p></li>
-</ol>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-</body>
-
-</html>

diff --git a/core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html b/core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html
deleted file mode 100644
index ec59aae..0000000
--- a/core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html
+++ /dev/null

@@ -1,263 +0,0 @@
-<html>
-<head>
-<title>Resource Managers</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1 id="top">Configuring Resource Managers</h1>
-
-<p>Topics  include:
-<ul>
-<li><a href="#defn">Resource managers</a></li>
-<li>Steps for defining a resource manager</li>
-<ol>
-<li><a href="#creat">Creating a resource manager</a></li>
-<li>Configuring a resource manager</li>
-<ol type="a">
-<li><a href="#local">Local resource manager</a></li>
-<li><a href="#remote">Remote resource manager</a></li>
-</ol>
-<li><a href="#spec">Resource manager-specific configuration</a></li>
-<li><a href="#finish">Finishing resource manager configuration</a></li>
-<li><a href="#start">Starting the resource manager</a></li>
-</ol>
-<li><a href="#edit">Editing a Resource Manager</a></li>
-<li><a href="#rm">Removing a Resource Manager</a></li>
-</ul>
-<h2 id="defn">Resource Managers</h2>
-<p>PTP uses the term <i>resource manager</i> to refer to any subsystem that controls the resources required for launching a parallel job. If the target parallel system employs a job scheduler for controlling access to compute resources, then the job scheduler would be considered the resource manager for the system. For a cluster with Open MPI installed, the Open MPI runtime system would be considered the resource manager.</p>
-
-<p>In order for PTP to launch, monitor, and control applications on a target system, it must know what type of resource manager is being employed. PTP allows you to configure and manage resource managers that correspond to target systems. Each resource manager controls one target system, although a particular target system may have more than one type of resource manager.</p>
-
-<p>Resource managers can be <i>local</i> or <i>remote</i>. A local resource manager controls resources on the local machine running Eclipse. A remote resource manager controls resources on a physically remote system. The process of configuring a local or remote resource manager is the same.</p>
-
-<h2 id="creat">Step 1: Creating a resource manager</h2>
-<p></p>
-<ol>
-<li><p>Open the <b>PTP Runtime Perspective</b> using 
-<b>Window &gt; Open Perspective &gt; Other...</b> and then choose <b>PTP Runtime</b> from the 
-list of perspectives.</p><p><br></p>
-<p><script> thumb("images/02RuntimePerspEmpty.png")</script></p><p><br></p>
-</li>
-<li><p>Right-click in <b>Resource Managers</b> view and select 
-<b>Add Resource Manager...</b></p><p><br></p>
-<p><script> full("images/02addResMgr.png") </script></p><p><br></p>
-</li>
-<li><p>Choose the resource manager that corresponds to the target system. In this example we 
-will use the <b>Open MPI</b> resource manager, which is used to control the Open MPI Open Runtime 
-Environment.</p><p><br></p>
-<p><script> thumb("images/02chooseResMgrType-OpenMPI.png",200) </script></p><p><br></p></li>
-<li><p>Select <b>Next &gt;</b></p></li>
-</ol>
-
-<h2 id="local">Step 2a: Configuring a local resource manager</h2>
-<p>
-In this example, we will show how to configure PTP to use a local resource manager, for example, where Eclipse is installed on the head node of a cluster. 
-This was the scenario that PTP 1.x handled.
-</p>
-<p>
-The <b>Open MPI connection configuration</b> dialog is used to configure how Eclipse will communicate with the Open MPI environment.
-</p>
-
-<ol>
-	<li>
-		<p>To configure the simple case of a local resource manager, select <b>Local</b> as the <b>Remote service provider</b>.
-		</p>
-		<p><script> thumb("images/02-RM-OpenMPI-Connection-Local.png",240)</script></p>
-		<p><br></p>
-	</li>
-	
-	<li>
-		<p>For the local case, the <b>Proxy server location</b> will be automatically set to <b>Local</b>.
-		</p>
-		<p><br></p>
-	</li>
-
-	<li>
-		<p>
-		The <b>Multiplexing Options</b> allow communication to be tunneled over a single connection if necessary. 
-		For the local case, it is not required, and <b>None</b> should be selected.
-		</p>
-		<p><br></p>
-	</li>
-
-	<li>
-		<p>The <b>Local address for proxy connection</b> should be set to the address of your local machine (its host name, IP address, or <code>localhost</code>).
-		</p>
-		<p><br></p>
-	</li>
-
-<li><p>Select <b>Next &gt;</b></p>
-</ol>
-
-<h2 id="remote">Step 2b: Configuring a remote resource manager</h2>
-<p>This example will demonstrate configuring a remote resource manager, where
-Eclipse and PTP are on your local laptop or workstation, and PTP
-controls a remote target system.
-
-<p>A remote resource manager allows PTP to control a remote target machine. To accomplish this, PTP uses the services of
-a <i>remote service provider</i>. Currently supported remote service providers include the <b>Remote Tools</b> package (a part
-of PTP) and the <b>Eclipse Remote Systems Explorer (RSE)</b> which is an optional package that can be installed at any time.</p> The
-only reason to use RSE rather than Remote Tools is if your remote system does not use the <code>ssh</code> protocol for remote connections,
-or you wish to use the additional functionality that RSE provides. See the RSE documentation
-for more information. We will only consider Remote Tools here, but the steps for configuring RSE are similar.
-
-<p></p>
-
-<ol>
-	<li>
-		<p>In the <b>Open MPI connection configuration</b> dialog,  select <b>Remote Tools</b> as the <b>Remote service provider</b>.
-		</p>
-		<p><br></p>
-		<p><script> thumb("images/02-RM-OpenMPI-Connection-Remote0.png") </script></p><p><br></p>
-	</li>
-	
-	<li>
-		<p>
-		At this point, you need to configure a <b>Proxy server location</b>.
-		This will differ depending on the remote service provider that you selected in the previous step. 
-		The following steps describe configuring a <b>Remote Tools</b> location.
-		</p>
-		<p><br></p>
-	</li>
-	
-	<ol type="a">
-		<li>
-			<p>Select <b>New...</b></p>
-			<p><br></p>
-		</li>		
-		<li>
-			<p>In the <b>Remote Host</b> dialog, enter a name for the connection in the <b>Target Name</b> field (can be anything).</p>
-			<p><br></p>
-			<p><script> thumb("images/02newRemoteHost.png") </script></p>
-			<p><br></p>
-		</li>
-		<li><p>Select the <b>Remote Host</b> radio button.</p><p><br></p></li>
-		<li><p>Enter the address of the remote host in the <b>Host</b> field.</p><p><br></p></li>
-		<li><p>The <b>Port</b> field should be left at <code>22</code> unless your installation uses a different port for <code>ssh</code> connections.</p><p><br></p></li>
-		<li><p>Enter your user name on the remote machine in the <b>User</b> field.</p><p><br></p></li>
-		<li><p>If you use password authentication, select the <b>Password based authentication</b> radio button and enter the password in the <b>Password</b> field.</p><p><br></p></li>
-		<li><p>If you use key based authentication, select the <b>Public key based authentication</b> radio button, select the file containing your public key, and enter the passphrase for your key (or leave blank if you don't use a passphrase).</p><p><br></p></li>
-		<li><p>Click <b>Finish</b></p><p><br></p></li>
-	</ol>
-
-	<li>
-		<p>The <b>Multiplexing Options</b> allow communication to be tunneled over a single connection if supported by the remote service provider. 
-		To enable tunneling, select the <b>Use port forwarding</b> radio button.</p>
-		<p><br></p>
-	</li>
-
-	<li>
-		<p>
-		If you don't wish to use port forwarding, select the <b>None</b> radio button and enter the address of your local machine (its host name, or IP address) in the <b>Local address for proxy connection</b> field. 
-		Note that if your site does not allow outbound connections from the remote machine to your local machine, then you <i>must</i> use port forwarding.</p>
-		<p><br></p>
-	</li>
-
-	<li><p>Select <b>Next &gt;</b></p></li>
-</ol>
-
-<h2 id="spec">Step 3: Resource manager-specific configuration</h2>
-<p>The next page will show configuration information specific to a particular resource manager. 
-In this case, the <b>Open MPI tool configuration</b> dialog is shown. 
-You will not normally need to change this information. Just select the <b>Open MPI version</b> installed on the target machine, and default values will automatically loaded into the fields.</p>
-<p><script> thumb("images/02-RM-OpenMPI-Configuration.png") </script></p>
-<ol>
-<li><p>If you wish to specify the commands for the Open MPI environment, or add extra arguments, 
-uncheck the <b>Use default settings</b> checkbox.</p>
-<p><br></p></li>
-<ol>
-<li><p><b>Launch command</b>: A command line executed to launch the parallel application with Open MPI.</p><p><br></p></li>
-<li><p><b>Debug command</b>: A command line executed to use Open MPI to launch a debug session for the parallel application.</p><p><br></p></li>
-<li><p><b>Discover command</b>: A command line executed when the Resource Manager is started, to collect information about the Open MPI environment..</p><p><br></p></li>
-<li><p><b>Path to installation</b>: If not empty, then all commands are prefixed with this path.</p><p><br></p></li>
-</ol>
-<p>Only a single command is allowed on each command field.
-Several place holders (macros) are allowed, the most relevant are:</p>
-<ul>
-<li><b>Open_MPI_args</b>: Command line arguments to be passed to the mpirun command, specifying options selected in the launch configuration dialog.</li>
-<li><b>Open_MPI_env</b>: Command line arguments to be passed to the mpirun command, specifying name of environment variables.</li>
-<li><b>execPath</b> and <b>execName</b>: Path and name of the executable of the parallel application to be launched by mpirun.
-<li><b>progArgs</b>: arguments to be passed to the parallel application.</li>
-</ul>
-<li><p>Select <b>Next &gt;</b></p></li>
-</ol>
-
-<h2 id="finish">Step 4: Finishing resource manager configuration</h2>
-<p>The final dialog is <b>Choose Resource Manager Name and Description</b> which provides an opportunity
-to change how the resource manager is displayed.</p>
-<p><script> thumb("images/02ChooseResMgrNameAndDesc.png") </script></p>
-<ol>
-<li><p>If you wish to change the name or description, uncheck the <b>Use default name and 
-description</b> checkbox.</p><p><br></p></li>
-<ol>
-<li><p>Enter a new name in the <b>Name</b> field. Anything can be entered.</p><p><br></p></li>
-<li>
-  <p>Enter a new description in the <b>Description</b> field. Anything can be entered.</p><p><br></p>
-</li>
-</ol>
-<li><p>Select <b>Finish</b></p></li>
-</ol>
-<p>The new Resource Manager should appear in the list of Resource
-Managers.</p>
-<p><script> thumb("images/02-RM-OpenMPI-View-List.png") </script></p>
-
-<h2 id="start">Step 5: Starting the resource manager</h2>
-<p></p>
-<ol>
-<li><p>To start the resource manager, right mouse click on the resource manager in the <b>Resource 
-Managers view</b>, then select <b>Start Resource Manager</b> from the context menu.</p><p><br></p>
-<p><script> thumb("images/02-RM-OpenMPI-View-Start.png") </script></p><p><br></p>
-</li>
-<li><p>The resource manager icon should change color to green to indicate has been successfully 
-started.</p><p><br></p>
-  <p><script> full("images/02-RM-OpenMPI-View-Running.png") </script></p><p><br></p>
-</li>
-<li>
-  <p>In the <b>Machines view</b> you should see an icon representing your target system and icons 
-  showing status of the node(s).</p><p><br></p>
-  <p><script> thumb("images/02-RM-OpenMPI-View-Machines.png") </script></p><p><br></p>
-</li>
-<li><p>If the resource manager fails to start (the icon is red), right click on the resource 
-manager and select <b>Stop Resource Manager</b>. Check the log files for the reason that the 
-resource manager failed to start, correct the error and restart again.</p></li>
-</ol>
-
-<h2 id="edit">Editing a resource manager</h2>
-<p>It is sometimes necessary to change the configuration of an existing resource manager, for example, to change the remote machine that the resource manager controls. Note that the resource manager cannot be edited when it is running.</p>
-<ol>
-<li><p>If the resource manager is running, stop it first. Right-click on the resource manager and 
-select <b>Stop Resource Manager</b></p><p><br></p></li>
-<li><p>Right-click on the resource manager and select <b>Edit Resource Manager</b><p><br></p></p>
-<p><script> thumb("images/02-RM-OpenMPI-View-Edit.png") </script></p><p><br></p>
-</li>
-<li><p>Modify the required configuration settings and click <b>Finish</b>.</p><p><br></p></li>
-<li><p>Restart the resource manager.</p></li>
-</ol>
-
-<h2 id="rm">Removing a Resource Manager</h2>
-<p>If the resource manager is no longer required, it can be removed from the <b>Resource Managers view</b></p>
-<ol>
-<li><p>If the resource manager is running, stop it first. Right-click on the resource manager and 
-select <b>Stop Resource Manager</b></p><p><br></p></li>
-<li><p>Right-click on the resource manager and select <b>Remove Resource Manager</b></p><p><br></p>
-<p><script> thumb("images/02-RM-OpenMPI-View-Remove.png") </script></p><p><br></p>
-</li>
-<li>
-  <p>You will be prompted to confirm removal. Click <b>OK</b></p>
-</li>
-</ol>
-
-
-<p>Proceed to <a href="03pLaunchConfig.html">Launching a parallel application</a>.
-<p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-

diff --git a/core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html b/core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html
deleted file mode 100755
index 18fa8b9..0000000
--- a/core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html
+++ /dev/null

@@ -1,188 +0,0 @@
-<html>
-<head>
-<title>Launching Parallel Programs </title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1 id="top">Launching Parallel Programs</h1>
-<p>This section describes how to launch a parallel program. Launching requires the services of a resource manager, which should have been set up as described in <a href="02resMgrSetup.html">Resource Managers</a>. PTP is able to launch applications that have been compiled to use an MPI runtime system, those compiled to use the OpenMP system, and a combination of MPI and OpenMP. It is also possible to launch multiple copies of a sequential program so that they execute simultaneously.
-
-<p>Topics  include:
-<ol>
-<li><a href="#create">Creating a parallel launch configuration</a></li>
-<li><a href="#resources">Completing the <b>Resources tab</b></a></li>
-<li><a href="#application">Completing the <b>Application tab</b></a></li>
-<li><a href="#synchronize">Completing the <b>Synchronize tab</b></a></li>
-<li><a href="#debugger">Completing the <b>Debugger tab</b></a></li>
-<li><a href="#arguments">Completing the <b>Arguments tab</b></a></li>
-<li><a href="#launch">Launching the application</b></a></li>
-</ol>
-
-<h2 id="create">Step 1: Create a parallel launch configuration</h2>
-<p>Note: At least one resource manager must have been configured and started before it is possible to create
-a parallel launch configuration.
-<ol>
-<li><p>Open the run configuration dialog using <b>Run &gt; Open Run Dialog...</b>
-or click the run icon menu on the tool bar and select <b>Open Run Dialog...</b></p><p><br></p></li>
-<li><p>Create a new parallel launch configuration by clicking <b>Parallel Application</b> and
-then clicking on the <b>New</b> button icon.</p><p><br></p>
-<p><script> thumb("images/03launch1.png") </script></p><p><br></p>
-</li>
-<li><p>Enter a name for the configuration in the <b>Name:</b> field. Here we use the same name as the project.</p></li>
-</ol>
-
-<h2 id="resources">Step 2: Complete the Resources tab</h2>
-<p>The <b>Resources tab</b> is used to specify the resources required for the job execution. The contents of this tab will vary for different resource managers. This description only applys to the Open MPI and MPICH2 resource managers.</p>
-<ol>
-<li><p>Select a resource manager from the drop-down (Note: a resource manager
-must be running for it to appear in the list. If there is only one resource manager running, then it will be
-automatically selected.)</p><p><br></p></li>
-<li><p>Some resource managers require a job queue to be selected using a <b>Queue:</b> drop-down. If there is
-no drop-down, then this resource manager does not support multiple queues.</p><p><br></p></li>
-<li><p>Enter a value in the <b>Number of Processes</b> field. This field must be greater than 0 in 
-order to launch a job, and specifies the number of processes to use for the application launch.</p><p><br></p>
-<p><script> thumb("images/03launchResTab.png") </script></p>
-</li>
-</ol>
-
-<h2 id="application">Step 3: Complete the <b>Application</b> tab</h2>
-<p>The <b>Application tab</b> is used to specify the application (executable) to be launched.</p>
-<ol>
-<li><p>Ensure that the correct the <b>Parallel Project</b> is selected. This is the project containing the source
-and binaries for the application.</p><p><br></p></li>
-
-<li><p>Select the <b>Application Program</b> (executable) you wish to launch. 
-If the Resource Manager is connected to a remote target, then this means the path of the executable on the remote target. 
-Otherwise, for a Resource Manager on the local machine, it should be the path to the executable within the project directory. </p><p><br></p></li>
-
-<li><p>If you are running the application on a remote machine and the project was <i>built</i> locally, then you will have to copy 
-the executable to the remote machine first. For this purpose, you may enable <b>Copy executable from local filesystem</b> and fill
-<b>Path to the local file</b> with the path to the executable within the project directory. This configures the launcher to copy the 
-executable automatically to the remote target before starting the run/debug session. If not enabled, then you will need to
-copy the executable manually to the remote target.</p>
-<p><br></p>
-</li>
-<p><script> thumb("images/03launch6.png") </script></p><p><br></p>
-
-<li><p>If you wish to have the output from all processes in a single output console,
-check the <b>Display combined output in a console view</b> option.</p><p><br></p>
-</li>
-</ol>
-
-<h2 id="synchronize">Step 4: Complete the <b>Synchronize</b> tab</h2>
-<p>
-The <b>Synchronize tab</b> is used in scenarios where the Resource Manager is connected to a remote target.
-The tab specifies rules that describe files or directories that need to be copied (<i>uploaded</i>) to the remote target before starting the parallel application execution. 
-Typically, this feature is used to upload dependencies (like dynamic libraries) or input data for test cases.
-</p>
-<p>
-This tab also allows to specify rules describing files on the remote host to be retrieved back (<i>downloaded</i>) to the local host after the parallel application finishes execution, as output data produced by the parallel application execution.
-</p>
-
-<ol>
-<li><p>If you wish to enable file transfer to the remote target, enable the <b>Upload rules enabled</b> or
-<b>Download rules enabled</b> according which direction of file transfer is required.</p>
-<p><script> thumb("images/03launch7.png") </script></p><p><br></p>
-</li>
-
-<li>
-<p>
-In order to specify files to be copied to the remote target (<i>uploaded</i>), click on <b>New upload rule</b>.
-</p>
-<p>
-An upload rule lists a collection of files or directories that shall be copied into a single directory.
-</p>
-<p>
-If <b>Use directory from launch configuration</b> is enabled, then the listed files or directories are copied to the working directory specified on the launch configuration. 
-At the moment, this is equivalent to same directory that contains the executable for the parallel application. 
-If not enabled, they you must specify on <b>Remote directory</b> a path where the files or directories will be placed. 
-The path may be absolute or relative (to the working directory).
-</p>
-<p>
-In the list underneath, <b>Selected file(s)</b>, add the files or directories that shall be copied.
-Click on <b>File(s)</b> to  select one or more individual files from anywhere in the local file system. 
-The <b>Directory</b> button works similarly to select a directory from the local file system. 
-Directories are copied recursively. 
-The <b>Workspace</b> button allows easily choosing files from the current workspace.
-</p>
-<p>
-On the bottom of the dialog, you may wish to set attributes to be applied to the copied files on the remote target. 
-The options <b>Readonly</b> or <b>Executable</b> sets all copied files to read-only or executable on the remote host.
-If <b>Preserve time attributes</b> is enabled, then the remote copy will assume the same time stamp then the local file, otherwise, the time stamp will be the time the file was copied.
-Also, if the file already exists on the remote target, you may choose how to react in <b>If file already exists</b>.
-<p><script> thumb("images/03launch8.png") </script></p><p><br></p>
-<p><br></p>
-</li>
-<li>
-In order to specify files to be copied from the remote target (<i>downloaded</i>) after the parallel application finishes, click on <b>New download rule</b>.
-</p>
-<p>
-An download rule  lists a collection of files or directories that shall be copied into a single local directory. 
-Its optins are very similar to the upload rule.
-</p>
-<p><script> thumb("images/03launch9.png") </script></p><p><br></p>
-<p><br></p>
-</li>
-</ol>
-
-<h2 id="debugger">Step 5: Complete the Debugger tab</h2>
-<p>The <b>Debugger tab</b> is only required if you are planning to debug the application. However 
-it is a good idea to complete it now, even if you are only planning to launch a non-debug job.</p>
-<ol>
-<li><p>If no debugger is visible in the <b>Debugger</b> drop-down, select one. This is the debugger that will control 
-the parallel debug session. Currently only <b>SDM</b> is supported (SDM stands for Scalable Debug 
-Manager), so select this.</p><p><br></p></li>
-<li><p>If you wish the debugger to automatically suspend the application on launch, make sure 
-<b>Stop in main() on startup</b> is checked</p><p><br></p></li>
-<li><p>Under Debugger options, make sure that the path to debugger executable is correct.</p><p><br></p>
-<p>If you are debugging on the local machine, this path should point to the <code>sdm</code> executable 
-in your Ecilpse installation's <code>plugins/org.eclipse.ptp.<i>os.arch_version</i>/bin</code> directory,
-where <code><i>os.arch_version</i></code> is your operating system (<code>linux</code>, <code>macosx</code>, or <code>aix</code>), 
-architecture (<code>x86</code>, <code>x86_64</code>, or <code>ppc</code>), and version number of the plugin (e.g. <code>2.1.0.200810311901</code>).</p><p><br></p>
-<p>If you are debugging remotely, then this path will be the path to where the <code>sdm</code> executable was installed on the remote machine.</p><p><br></p></li>
-<li><p>Set the <b>Debugger session address</b>. This is the address that the debugger will connect 
-to when it starts, and will depend on where you are launching the application:</p><p><br></p>
-<ul>
-<li><p>If you are launching onto the local machine, use <code>localhost</code> (some systems will 
-accept <code>localhost.localdomain</code>).</p><p><br></p></li>
-<li><p>If you are launching onto a remote machine without using port forwarding (as specified in the 
-resource manager configuration), then this should be the address of the local machine (the one 
-running Eclipse) <i>as viewed from one of the nodes of the parallel machine</i>. Note that if the 
-parallel machine configuration precludes nodes accessing your local machine, you will need to 
-reconfigure the resource manager to use port forwarding.</p><p><br></p></li>
-<li><p>If you are launching onto a remote machine using port forwarding, this is the address of the 
-remote machine <i>as viewed from one of its nodes</i>. Note that you will need to have the <code>GatewayPorts</code> option set to <code>yes</code>
-in the <code>sshd</code> configuration file on the remote system (see the manual page for <code>sshd_config</code>) for this to work.</p><p><br></p>
-<p><script> thumb("images/03launch5.png") </script></p>
-</p></li>
-</ul>
-
-</li>
-</ol>
-
-<h2 id="arguments">Step 6: Complete the Arguments tab</h2>
-<p></p>
-<ol>
-<li><p>Enter any <i>program</i> arguments.</p><p><br></p></li>
-<li><p>Select a different working directory if desired. Note that for a remote launch, this will be 
-the location of the execution on the remote machine.</p></li>
-</ol>
-
-<h2 id="launch">Step 6: Launching the application</h2>
-<p>The launch configuration is now complete. Click on the <b>Run</b> button to launch the program.
-At this point the application should begin execution. 
-The <a href="05monitoring.html">Monitoring Parallel Machines and Jobs</a> section will show you how to
-monitor the program's execution.</p>
-
-
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-

diff --git a/core/org.eclipse.ptp.doc.user/html/04pLaunchConfigDebug.html b/core/org.eclipse.ptp.doc.user/html/04pLaunchConfigDebug.html
deleted file mode 100755
index f40214e..0000000
--- a/core/org.eclipse.ptp.doc.user/html/04pLaunchConfigDebug.html
+++ /dev/null

@@ -1,126 +0,0 @@
-<html>
-<head>
-<title>Launching Parallel Programs for Debugging</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1 id="top">Launching Parallel Programs for Debugging</h1>
-<p>This section describes how to launch a parallel program that you wish to debug. A <a href="06parDebugging.html">description of how to actually debug the application</a> is provided in another section. 
-
-<p>If you have already created <a href="03pLaunchConfig.html">normal parallel launch configuration</a> and configured the <b>Debug tab</b> you are ready to launch a debug session. Simply select <b>Run &gt; Debug</b>, the debug icon, or choose a configuration from the debug icon menu on the toolbar.</p>
-
-<p>Topics  include:</p>
-<ol>
-<li><a href="#create">Creating a parallel debug launch configuration</a></li>
-<li><a href="#resources">Completing the <b>Resources tab</b></a></li>
-<li><a href="#application">Completing the <b>Application tab</b></a></li>
-<li><a href="#debugger">Completing the <b>Debugger tab</b></a></li>
-<li><a href="#arguments">Completing the <b>Arguments tab</b></a></li>
-<li><a href="#launch">Launching the application</b></a></li>
-</ol>
-
-<h2 id="create">Step 1: Create a parallel debug launch configuration</h2>
-<p>Note: At least one resource manager must have been configured and started before it is possible to create
-a parallel launch configuration.
-<ol>
-<li><p>Open the run configuration dialog using <b>Run &gt; Open Debug Dialog...</b>
-or click the debug icon menu on the tool bar and select <b>Open Debug Dialog...</b></p><p><br></p></li>
-<li><p>Create a new parallel launch configuration by clicking <b>Parallel Application</b> and
-then clicking on the <b>New</b> button icon.</p><p><br></p>
-<p><script> thumb("images/04launch1.png") </script></p><p><br></p>
-</li>
-<li><p>Enter a name for the configuration in the <b>Name:</b> field. Here we use the same name as the project.</p></li>
-</ol>
-
-<h2 id="resources">Step 2: Complete the Resources tab</h2>
-<p>The <b>Resources tab</b> is used to specify the resources required for the job execution. The contents of this tab will vary for different resource managers. This description only applys to the Open MPI and MPICH2 resource managers.</p>
-<ol>
-<li><p>Select a resource manager from the drop-down (Note: a resource manager
-must be running for it to appear in the list. If there is only one resource manager running, then it will be
-automatically selected.)</p><p><br></p></li>
-<li><p>Some resource managers require a job queue to be selected using a <b>Queue:</b> drop-down. If there is
-no drop-down, then this resource manager does not support multiple queues.</p><p><br></p></li>
-<li><p>Enter a value in the <b>Number of Processes</b> field. This field must be greater than 0 in 
-order to launch a job, and specifies the number of processes to use for the application launch.</p><p><br></p>
-<p><script> thumb("images/03launchResTab.png") </script></p>
-</li>
-</ol>
-
-<h2 id="application">Step 3: Complete the <b>Application</b> tab</h2>
-<p>The <b>Application tab</b> is used to specify the application (executable) to be launched.</p>
-<ol>
-<li><p>Ensure that the correct the <b>Parallel Project</b> is selected. This is the project containing the source
-and binaries for the application.</p><p><br></p></li>
-<li><p>Select the <b>Application Program</b> (executable) that you wish to launch by clicking on 
-the <b>Browse</b> button. If you are running the application on the local machine, you will need 
-to navigate to the workspace and project directory. In this case, and if you are using a debug 
-configuration, the executable will be located in the Debug folder of your project.</p><p><br></p>
-<p>If you are running the application on a remote machine you will need to navigate to the location 
-of the executable on that machine. If the project was <i>built</i> locally, then you will have to 
-manually copy the executable to the remote machine first.</p><p><br></p>
-<p><script> thumb("images/03launch2.png") </script></p><p><br></p>
-</li>
-<li><p>If you wish to have the output from all processes in a single output console,
-check the <b>Display combined output in a console view</b> option.</p><p><br></p>
-</li>
-</ol>
-
-
-<h2 id="debugger">Step 4: Complete the Debugger tab</h2>
-<p></p>
-<ol>
-<li><p>Select a debugger from the <b>Debugger</b> drop-down. This is the debugger that will control 
-the parallel debug session. Currently only <b>SDM</b> is supported (SDM stands for Scalable Debug 
-Manager), so select this.</p><p><br></p></li>
-<li><p>If you wish the debugger to automatically suspend the application on launch, make sure 
-<b>Stop in main() on startup</b> is checked</p><p><br></p></li>
-<li><p>Under Debugger options, make sure that the path to debugger executable is correct.</p><p><br></p>
-<p>If you are debugging on the local machine, this path should point to the <code>sdm</code> executable in your Ecilpse installation's <code>plugins/org.eclipse.ptp.<i>os.arch_version</i>/bin</code> directory,
-where <code><i>os.arch_version</i></code> is your operating system (<code>linux</code>, <code>macosx</code>, or <code>aix</code>), 
-architecture (<code>x86</code>, <code>x86_64</code>, or <code>ppc</code>), and version number of the plugin (e.g. <code>2.1.0.200810311901</code>).</p><p><br></p>
-<p>If you are debugging remotely, then this path will be the path to where the <code>sdm</code> executable 
-was installed on the remote machine.</p><p><br></p></li>
-<li><p>Set the <b>Debugger session address</b>. This is the address that the debugger will connect 
-to when it starts, and will depend on where you are launching the application:</p><p><br></p>
-<ul>
-<li><p>If you are launching onto the local machine, use <code>localhost</code> (some systems will 
-accept <code>localhost.localdomain</code>).</p><p><br></p></li>
-<li><p>If you are launching onto a remote machine without using port forwarding (as specified in the 
-resource manager configuration), then this should be the address of the local machine (the one 
-running Eclipse) <i>as viewed from one of the nodes of the parallel machine</i>. Note that if the 
-parallel machine configuration precludes nodes accessing your local machine, you will need to 
-reconfigure the resource manager to use port forwarding.</p><p><br></p></li>
-<li><p>If you are launching onto a remote machine using port forwarding, this is the address of the 
-remote machine <i>as viewed from one of its nodes</i>. Note that you will need to have the <code>GatewayPorts</code> option set to <code>yes</code>
-in the <code>sshd</code> configuration file on the remote system (see the manual page for <code>sshd_config</code>) for this to work.</p><p><br></p>
-<p><script> thumb("images/04launch5.png") </script></p>
-</li>
-</ul>
-
-</li>
-</ol>
-
-<h2 id="arguments">Step 5: Complete the Arguments tab</h2>
-<p></p>
-<ol>
-<li><p>Enter any <i>program</i> arguments.</p><p><br></p></li>
-<li><p>Select a different working directory if desired. Note that for a remote launch, this will be the location of the exeuction on the remote machine.</p></li>
-</ol>
-
-<h2 id="launch">Step 6: Launching the application</h2>
-<p>The launch configuration is now complete. Click on the <b>Debug</b> button to start debugging the program. Eclipse will, by default, switch to the <b>PTP Debug perspective</b>, and you can begin debugging the application.
-The <a href="06parDebugging.html">Parallel Debugging</a> section will show you how to
-use the debugger.</p>
-
-
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-

diff --git a/core/org.eclipse.ptp.doc.user/html/05monitoring.html b/core/org.eclipse.ptp.doc.user/html/05monitoring.html
deleted file mode 100755
index e6e6744..0000000
--- a/core/org.eclipse.ptp.doc.user/html/05monitoring.html
+++ /dev/null

@@ -1,102 +0,0 @@
-<html>
-<head>
-<title>Monitoring Parallel Machines and Jobs</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-<head>
-<body>
-<h1 id="top">Monitoring Parallel Machines and Jobs</h1>
-<p>This section describes the features of PTP the enable the developer to monitor activity on target parallel machines, to monitor job status, and to terminate jobs. It will cover the following topics:</p>
-<ul>
-
-<li><a href="#persp">PTP Runtime perspective</a></li>
-<li><a href="#resMgr">Resource Managers view</a></li>
-<li><a href="#machines">Machines view</a></li>
-<li><a href="#jobs">Jobs view</a></li>
-<li><a href="#output">Process Output</a></li>
-<li><a href="#legend">Icon Legend</a></li>
-</ul>
-
-
-<h2 id="persp">PTP Runtime Perspective</h2>
-<p>The <b>PTP Runtime perspective</b> is used to monitor the status of target parallel systems and the parallel jobs that are running on these systems. At least one resource manager must be active to see anything in the views. See <a href="02resMgrSetup.html">configuring resource managers</a> for information on setting up resource managers and <a href="03pLaunchConfig.html">launching parallel programs</a> for how to launch a parallel program.</p>
-
-<p>The perspective provides four main views for monitoring systems and jobs: <b>Resource Managers view</b>; <b>Machines view</b>; <b>Jobs view</b>; and <b>Process Details view</b>. Each of these views will be discussed in more detail below.</p>
-
-<p>To open the <b>PTP Runtime perspective</b>,
-select <b>Window &gt; Open Perspective &gt; Other ...</b> and choose <b>PTP Runtime</b> from the list.</p>
-<p><script> thumb("images/05runtimePerspAnn.png") </script></p>
-
-<h2 id="resMgr">Resource Managers View</h2>
-<p>The <b>Resource Managers view</b> shows all resource managers that have been configured, and is used to manage and control these resource managers. Each resource manager has an icon and a name. The icon color indicates the current state of the resource manager. The following image shows two resource managers, one that is <i>stopped</i> and one that is <i>running</i>. A stopped resource manager is know to the system, but is not providing any information to PTP. A running resource manager is the normal state, and indicates that PTP is receiving information and can launch jobs using the resource manager.</p>
-
-<table><tr>
-<td><img src="images/05runtimeResMgrView.png"></td>
-<td><img src="images/05ptpLegendResMgr.png"></td>
-</tr></table>
-
-<p>The view can also be used to create new resource managers, edit or remove resource managers, and control resource manager opertaion. Right-click in the view to access these functions.</p>
-<p>Note that if a resource manager is removed and re-added, the launch configurations using the original resource
-manager must be changed to use the new one, even if it has the same name.</p>  
-
-<h2 id="machines"><img src="images/05parallel_perspective.png">Machines View</h2>
-<p>The <b>Machines view</b> shows the status of all machines being controlled by running resource managers. The upper left-hand panel of this view shows a collective list of all machines known by all the resource managers. A machine is represented by an icon and an address. The icon represents the state of the machine, and the address is typically the hostname of the machine.</p>
-
-<p>Selecting one of the machines in the upper left-handle panel will show the nodes of that machine in the upper right-hand panel of this view. Nodes are represented by an icon only. The icon shows the state of the node. The following image shows a typical view:</p>
-<p><img src="images/05runtimeMachinesView.png"></p>
-
-<p>The left edge of the node panel displays the node number of the first node in the row. This is useful for quickly locating a particular node. Also, if there are too many nodes to fit in the display the zoom buttons in the view toolbar can be used to zoom the display.</p>
-
-<p>The machine and node icons indicate the state of each machine and node, as shown in the following image. There are icons representing most typical states. There are also node states that indicate access to the nodes that could be controlled by a job scheduler (user excusive, user shared, etc.) These states are only used by certain types of resource managers.</p>
-<p><img src="images/05ptpLegendMachines.png"></p>
-
-<h3>Node details</h3>
-<p>Placing the mouse over a node in the will show information about that node, including the node number, in a tooltip popup.</p>
-<p>Double-click on a node icon to display the more detailed information about the node in the lower two panes of the view. The lower left-hand pane will show the detailed attributes of the node, and the lower right-hand pane will show the processes that are running, or have recently run, on the node. (See the full picture of the runtime perspective at the top of this page.)</p>
-
-<h2 id="jobs"><img src="images/05parallel_perspective.png">Jobs View</h2>
-<p>This view shows the current status of jobs in the system. Pending, running, and completed jobs are shown. The actual jobs displayed in this view are resource manager dependent, but will typically be the user's jobs that have been launched by PTP. Some resource managers may show jobs that have been launched using other means, or jobs for all users on the system.</p>
-
-<p>Jobs are represented by an icon and a name, and are shown in the left-hand pane. The icon is used to show the state of the job. To see the  individual processes associated with a job, double-click on the job. The processes will be shown in the right-hand pane.</p>
-<p><img src="images/05ptpRuntimeJobsViewHover.png"></p>
-
-<p>There are icons representing most job and process states. The following image shows the states that can be represented:</p>
-<p><img src="images/05ptpLegendJobProcess.png"></p>
-
-<h3>Process Details</h3>
-<p>More details about the processes can be obtained from the <b>Jobs view</b> by placing the mouse of the process that is of interest. A tooltip popup with be displayed showing the MPI task ID and process ID of the process, as can be seen below.</p>
-
-<p>Like the <b>Machines view</b>, the there are zoom buttons that can be used to scale the display so that more processes can be seen in the current view.</p>
-
-<h3>Job Termination</h3>
-<p>Usually a job will terminate when it finishes executing. However the user can also terminate a job using the <b>terminate button</b> on the toolbar. This button will become enabled when a running job is selected. Clickin on the button will instruct the resource manager to terminate the job. If the job is pending in a queue, then it will normally be removed from the queue.</p>
-
-<h2 id="output">Process Output View</h2>
-<p>Depending on the functionality of the resource manager, PTP can also display standard output from individual processes, collectively from all processes, or both. Standard output from individual processes is viewed by double-clicking on a process icon in the <b>Machines view</b> or <b>Jobs view</b>. This will open another view showing the process output. An example is shown below.</p>
-<p><img src="images/05ptpRuntimeProcessDetails.png"></p>
-
-<p>If the <b>Display combined output in a console view</b> was selected in the job launch configuration (see <a href="03pLaunchConfig.html">Launching Parallel Programs</a>), then output from all processes will be combined into a single console. This output can be seen by opening the <b>Console view</b> in the Eclipse workbench.</p>
-
-<h2 id="legend">Icon Legend</h2>
-
-<p>There are many different icons representing the state of the various components of the parallel system. If you need to identify a particular icon, click on the legend icon <img src="images/05legendIcon.png"> in the toolbar.  This will open a dialog that shows all the icons and their meanings. An example is shown below.</p>
-
-<p><script> thumb("images/05ptpLegend.png") </script></p>
-
-
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-
-
-
-
-
-
-
-

diff --git a/core/org.eclipse.ptp.doc.user/html/06parDebugging.html b/core/org.eclipse.ptp.doc.user/html/06parDebugging.html
deleted file mode 100755
index 4ef6e7f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/06parDebugging.html
+++ /dev/null

@@ -1,199 +0,0 @@
-<html>
-<head>
-<title>Parallel Debugging</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-<!-- test -->
-<h1>Parallel Debugging</h1>
-<p>This section describes the features of PTP that enable a developer to debug a parallel application. The topics that will be covered, include:</p>
-<ul>
-<li><a href="#feat">The PTP Debug Perspective </a></li>
-<li><a href="#pSets">Process Sets</a></li>
-<li><a href="#pSetsOper">Operations on Process Sets</a></li>
-<li><a href="#pSetsCreate">Managing Process Sets</a></li>
-<li><a href="#bkpt">Breakpoints</a></li>
-<li><a href="#cip">Current Instruction Pointer</a></li>
-<li><a href="#reg">Process Registration </a> and the Debug view (including stack traces)</li>
-<li><a href="#finish">Terminating Execution</a></li>
-
-</ul>
-
-<h2 id="feat">The PTP Debug perspective</h2>
-<p>The <b>PTP Debug perspective</b> is used when debugging a parallel application. The default behavior is to switch to the perspective when a <a href="04pLaunchConfigDebug.html">debug session is launched</a>. Experienced Eclipse users will notice that many of the views are similar to those available in the CDT <b>Debug perspectives</b>. Please refer to the <b>C/C++ Development User Guide</b> for a description of these views.</p>
-
-<p><script> thumb("images/06ptpDebugPersp.png",240) </script></p>
-<p>This image shows a typical debug session. In the upper left of the perspecitve is the <b>Parallel Debug view</b> which shows the processes associated with the job, and allows bulk control of the processes. Underneath this is the <b>Debug view</b> which is the standard view showing process threads and stack frames. The source window shows a current line marker, which represents the current location of all 64 processes. In the upper right, the <b>Variables view</b> is showing the variables from the processes currently selected in the <b>Debug view</b>. There are also a number of other views available for setting breakpoints, manipulating signals, etc. Below this is the standard <b>Outline view</b>. At the very bottom are the standard <b>Problems</b>, <b>Console</b>, and <b>Memory</b> views.</p>
-
-<h2 id="pSets">Process Sets</h2>
-<p>A key concept for debugging parallel programs with PTP is the notion of a <i>process set</i>. Traditional debuggers apply operations to a single
-process.  Parallel debugging operations apply to arbitrary collections of processes (including a single process). The PTP debugger calls these arbitrary collections process sets, and uses them as a means of simultaneously referring to one or more processes.</p>
-
-<p>When a parallel debug session is first started, all processes are contained
-in a set, called the <b>Root</b> set.  Sets are always associated with a single Job.
-A job can have any number of process sets, and a set can contain from 1 to the
-number of processes in a job. Process sets from the same job can contain overlapping sets of processes. This is
-shown in the following diagram.</p>
-
-<p><script> thumb("images/06pSets.png",100)</script></p>
-
-<p>Debug commands on the <b>Parallel Debug view</b> toolbar always apply to the <i>current process set</i>, which is the set of processes that is visible in the view.</p>
-
-<p><script> thumb("images/06parallelDebugViewCmds.png",100)</script></p>
-
-<h2 id="pSetsOper">Operations on Process sets</h2>
-
-<p>PTP provides buttons on the toolbar of the <b>Parallel Debug view</b>
-to create, modify, and delete process sets, and to change
-the current process set.</p>
-
-<p><script> thumb("images/06parallelDebugViewSets.png",100)</script></p>
-
-
-<h2 id="pSetsCreate">Managing Process Sets</h2>
-
-<p>Select the processes to be placed in the set
-by selecting a rectangular region with the mouse,
-or click the mouse and shift-click or ctrl-click to 
-select a contiguous region, or separate processes, respectively.</p>
-
-<p>For example, to select a rectangular set of processes:</p>
-
-<p><script> thumb("images/06pSetSelect.png")</script></p>
-
-<p>Once the processes have been selected, create a process set clicking on the <b>Create Set button</b> <img src="images/06createProcessSetIcon.png">.</p>
-
-<p><script> thumb("images/06selectProcessSetCreate.png")</script></p>
-
-<p>To add processes to an existing process set, select the processes you wish to add and click on
-the down-arrow <img src="images/06downArrowSelect.png"> to the right of the icon:</p>
-
-<p><script> thumb("images/06selectProcessSetCreateAdd.png", 80)</script></p>
-
-
-<p>To change the current process set, select the <b>Change Set button</b>
-<img src="images/06pSetChooseIcon.png">
-and choose from the list via the down-arrow <img src="images/06downArrowSelect.png">, or 
-click on the button itself to cycle through the sets.</p>
-
-<p><script> thumb("images/06pSetChange.png")</script></p>
-
-<p>To remove processes from the <i>current set</i>, select the processes 
-as described above, and click the
-<b>Remove Elements button</b>.</p>
-
-<p><script> thumb("images/06pSetRemove.png", 100)</script></p>
-
-<p>Select the <b>Delete Set button</b> to delete the current process set:</p>
-
-<p><script> thumb("images/06pSetDelete.png", 100)</script></p>
-
-<h2 id="bkpt">Breakpoints</h2>
-<p>PTP has a special type of breakpoint known as a <i>parallel breakpoint</i>. These breakpoints differ from normal breakpoints because they apply to a set of processes instead of a single process (or thread). There are two types of parallel breakpoints:</p>
-
-<ul>
-<li><p><i>Global breakpoints</i> apply to <i>all</i> processes in <i>any</i> job. A global breakpoint remains in effect between job launches. Typically, a global breakpoint is used for gaining control of an application at a predetermined point. Global breakpoints are identified by a parallel breakpoint icon with a small <code>G</code> in the upper left corner:</p>
-
-<p><script> thumb("images/06globalBreakpoint.png",60)</script></p> 
-</li>
-
-<li><p><i>Set Breakpoints </i> apply only to a <i>specific set</i> of processes
-(which can include the root set) for a <i>single</i> job. When the job completes,
-these breakpoints are removed.</p>
-
-<p><script> thumb("images/06setBreakpoint.png",60)</script></p> 
-</li>
-<p>Set breakpoints can be one of three colors:<p>
-<ul>
-<li><p>Green indicates the breakpoint applies to the current set.</p></li>
-<li><p>Blue indicates the breakpoint applies to some other set than the current set, but there are overlapping processes in the sets.</p></li>
-<li><p>Yellow indicates the breakpoint applies to some other set than the current set, and there are no overlapping processes in the sets.</p></li>
-</ul>
-</ul>
-
-<h3>Setting a breakpoint</h3><p>
-To create a breakpoint, double-click on the left edge of 
-an editor window, at the line on which you want to set the breakpoint.
-You can also right-click and use the <b>Parallel Breakpoint &gt; Toggle breakpoint</b> context menu.</p>
-
-<p><script> thumb("images/06bkptSetContext.png")</script></p> 
-
-<p>A global breakpoint is created if no jobs are selected in the <b>Parallel Debug view</b>.
-If a job is selected, the breakpoint will apply to the current set.</p>
-
-<h3>Breakpoint information</h3>
-
-<p>There are a number of ways to find out more information about a breakpoint, such as the source file, line and process set it applies to. Placing the mouse over a breakpoint will display a tooltip popup:</p>
-
-<p><script> thumb("images/06bkptHover.png", 80)</script></p> 
-
-<p>The <b>Breakpoints view</b> can be used to see all breakpoints that have been created: </p>
-
-<p><script> thumb("images/06bkptsView.png")</script></p> 
-
-<p>Use <b>Show &gt; Parallel Breakpoint Set</b> in the menu on the <b>Breakpoints view</b> toolbar to group breakpoints
-by the process set they apply to:</p>
-
-<p><script> thumb("images/06bkptsViewMenu.png")</script></p> 
-
-<p>For example the above selection will list the breakpoints
-by process set:</p>
-
-<p><script> thumb("images/06bkptsViewByProcessSet.png")</script></p> 
-
-<h2 id="cip">Current Instruction Pointer</h2>
-<p>The current instruction pointer is used to show the current
-location of <i>suspended</i> processes.
-In traditional programs, there is only a single instruction pointer displayed at any one time.
-In parallel programs, there is an instruction pointer for every process.</p>
-
-<p>The PTP debugger shows one instruction pointer for
-<i>every group of processes at the same location</i>. In the following example, there are processes suspended
-at three different locations in the program.</p>
-
-<p><script> thumb("images/06mip.png")</script></p> 
-
-<p><i>The group of processes represented by an instruction pointer
-is not necessarily the same as a process set.</i></p>
-
-<p>Different markers are used to indicate the types of processes stopped at that location (the different types will be discussed below):</p>
-<ul>
-<li><p><img src="images/06ipReg.png">Registered processes marker</p></li>
-<li><p><img src="images/06ipUnreg.png">Un-registered processes marker</p></li>
-<li><p><img src="images/06ipMult.png">Marker indicating a combination of registered and un-registered processes</p></li>
-</ul>
-
-<p>Placing the mouse over an instruction pointer provides additional information about the processes suspended at that location:</p>
-<p><script> thumb("images/06cipHover.png", 80)</script></p> 
-
-<h2 id="reg">Process Registration and the Debug View</h2> 
-
-<p>Once processes of a parallel job have been suspended, it is often desirable to obtain more detailed information about an individual process. In order to do this, a particular process must first be <i>registered</i>. Once a process is registered it's threads and stack frames appear in the <b>Debug view</b>. By selecting the stack frame in this view, detailed information about the local variables can be obtained in the <b>Variables view</b>.</p>
-
-<p>Any number of processes can be registered, and processes can be registered or un-registered at any time. To register a process, double-click its process icon in the <b>Parallel Debug view</b>. A black box will be shown around the process icon to indicate that it has been registered. At the sime time, the process will appear in the <b>Debug view</b>.</p>
-
-<p><script> thumb("images/06reg1.png",240) </script></p>
-
-<p>To un-register a process, double-click on the same process icon. The box disappears, and the process is removed from the debug view.</p>
-
-<p>The <b>Debug view</b> also provides a set of debug commands (resume, pause, step over, etc.) that apply to the <i>currently selected process</i> in the view. This provides a convenient means of controlling individual processes.</p>
-
-<h2 id="finish">Terminating Execution</h2>
-<p>At the end of a debug session, it is necessary to terminate the execution of the job. To do this, click on the terminate icon <img src="images/06terminateAll.png"> in the <b>Parallel Debug view</b>.  Note that the terminate icon in the <b>Debug view</b> <img src="images/06terminate.png"> will only terminate the currently selected process in that view.</p>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-
-
-
-
-
-
-
-

diff --git a/core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html b/core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html
deleted file mode 100755
index e3d9f99..0000000
--- a/core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html
+++ /dev/null

@@ -1,125 +0,0 @@
-<html>
-<head>
-<title>PTP Preferences</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1>PTP Preferences</h1>
-<p>To open the <b>Preferences dialog</b>, select:</p>
-<ul>
-<li><p><b>Window &gt; Preferences...</b> for Windows and Linux</p></li>
-<li><p><b>Eclipse &gt; Preferences...</b> for MacOS X</p></li>
-</ul>
-
-<p>Next, expand <b>PTP</b> in the list of preferences pages on the left side and choose the component who's preferences you wish to change. The following image shows all available components:</p>
-
-<p><script> thumb("images/07prefsAll.png") </script></p>
-
-<h2 id="main"><a name="run"></a>PTP Preference Page </h2>
-<p>This is the main preferences page for PTP. Available preferences are:</p>
-<dl>
-<dt><b>Output directory</b></dt><dd>Temporary directory to use to save process output</dd>
-<dt><b>Store line number</b></dt><dd>Number of lines of output from each process to save (0 means infinite)</dd>
-</dl>
-
-<h2 id="debug">Debug Preferences Page (PTP &gt; Debug)</h2>
-<p>This is the main parallel debugger preferences page. These are  preferences that apply to any parallel debugger.
-<p><script> thumb("images/07prefsDebug.png") </script></p>
-
-<h3>Default setting</h3>
-<p>These preferences control some debugger default behavior</p>
-<dl>
-<dt><b>Show full paths on breakpoint</b> (default disabled)</dt><dd>Use the full path to the source file when displayed in the debugger <b>Breakpoint view</b></dd>
-<dt><b>Register process 0 by default</b> (default enabled)</dt><dd>Will register process 0 with the <b>Debug view</b> when the parallel debugger starts. This is required to enable Eclipse to switch automatically to the <b>PTP Debug perspective</b> when a debugger breakpoint is hit.</dd>
-</dl>
-
-<h3>Communication</h3>
-<p>These are preferences relating to the communication between Eclipse and the external parallel debugger. They do not normally need to be changed.</p>
-<dl>
-<dt><b>Command timeout (ms)</b> (default 60000)</dt><dd>This specifices the period Eclipse waits after sending a command to the external debugger. If no response is received the debug session will be terminated.</dd>
-</dl>
-
-<h3>Variable</h3>
-<p>These variables control the action of the debugger to update variable information.</p>
-<dl>
-<dt><b>The debugger is suspended</b> (default enabled)</dt><dd>The debugger allows variable values to be displayed in tooltip popups when the mouse hovers over a process in the <b>Parallel Debug view</b>. Enabling this option will update all the values each time the process is suspended. When this option is disabled, the value will be updated when the tooltip popup is displayed.</dd>
-<dt><b>Job or Set is changed</b> (default disabled)</dt><dd>Variable values will be updated when the current job or set is changed.</dd>
-</dl>
-
-<h2>  SDM (Scalable Debug Manager) Preferences (PTP &gt; Debug > SDM)</h2>
-<p>These are
-  preferences for controlling the behavior of the scalable debug manager, which is server component of the parallel debugger. They
-  do not normally need to be changed.</p>
-  
-<p><script> thumb("images/07prefsDebugSDM.png") </script></p>
-
-<h3>Debugger launch preferences</h3>
-<p>These preference control how the debugger behaves when it is launched.  
-    They do not normally need to be altered.</p>
-    
-<dl>
-<dt><b>SDM client host</b> (default localhost)</dt><dd>This specifies the host on which Eclipse is running. It is used to establish communication between the SDM and Eclipse. In situations where a parallel job is being debugged remotely, this should be the host name of the &quot;front end&quot; on which Eclipse is running.</dd>
-<dt><b>Backend debugger</b> (default gdb-mi)</dt><dd>The name of the backend debugger to use when debugging the application. This is an internal name known by the SDM, not the name of the debugger itself. Currently only gdb using the MI mode is supported.</dd>
-<dt><b>Extra SDM arguments</b> (default empty)</dt><dd>Any extra arguments that need to be supplied to the sdm (e.g. for debugging purposes)</dd>
-</dl>
-
-<h2 id="pldt">Parallel Language Development Tool (PLDT) Preferences</h2>
-<p>See the help for <a href="PLUGINS_ROOT/org.eclipse.ptp.pldt.help/html/toc.html">PLDT</a></p>
-
-<h2 id="rm"></a>Resource Manager Preferences (PTP > Resource Managers )</h2>
-<p>See the help for <a href="PLUGINS_ROOT/org.eclipse.ptp.ibmll.help/html/IBMLLMainHelp.html">Loadleveler</a> 
-and <a href="PLUGINS_ROOT/org.eclipse.ptp.ibmpe.help/html/PEMainHelp.html">Parallel Environment</a>
-for details on their preference pages.</p>
-
-
-<h2 id="orte"></a>Open MPI Preferences (PTP &gt; Resource Managers &gt; Open MPI)</h2>
-
-<p> These are preferences specific to Open MPI.</p>
-
-<h3>Open MPI 1.2</h3>
-<p>Specifies the defaults for Open MPI version 1.2.<p>
-<dl>
-<dt><b>Launch command</b></dt><dd>The default command used to launch applications.</dd>
-<dt><b>Debug command</b></dt><dd>The default command used to launch the debugger.</dd>
-<dt><b>Discover command</b></dt><dd>The default command used to discover the system configuration.</dd>
-<dt><b>Path to installation</b></dt><dd>The default path to the Open MPI installation.</dd>
-</dl>
-
-<h3>Open MPI 1.3</h3>
-<p>Specifies the defaults for Open MPI version 1.3.<p>
-<dl>
-<dt><b>Launch command</b></dt><dd>The default command used to launch applications.</dd>
-<dt><b>Debug command</b></dt><dd>The default command used to launch the debugger.</dd>
-<dt><b>Discover command</b></dt><dd>The default command used to discover the system configuration.</dd>
-<dt><b>Path to installation</b></dt><dd>The default path to the Open MPI installation.</dd>
-</dl>
-
-<h2 id="viewer">Viewer (PTP &gt; Viewer)</h2>
-<p>These preferences are used to change the behavior of some of the PTP views. They do not normally need to be altered.</p>
-<p><script> thumb("images/07prefsViewer.png")</script></p>
-
-<h3>Tooltip</h3>
-<p>Controls the way tooltips for PTP variables are displayed.</p>
-<dl>
-<dt><b>Show all the time</b></dt><dd>Always show tooltips</dd>
-<dt><b>Timeout (ms)</b> (default 5000)</dt><dd>Changes the time the tooltip remains displayed when the mouse hovers over a node or process icon.</dd>
-<dt><b>Wrap text</b> (default enabled)</dt><dd>Wrap the text to fit into the tooltip</dd>
-</dl>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-
-
-
-
-
-
-
-

diff --git a/core/org.eclipse.ptp.doc.user/html/help.css b/core/org.eclipse.ptp.doc.user/html/help.css
deleted file mode 100644
index 8f09f90..0000000
--- a/core/org.eclipse.ptp.doc.user/html/help.css
+++ /dev/null

@@ -1,51 +0,0 @@
-/* following font face declarations need to be removed for DBCS */

-

-

-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000}

-pre				{ font-family: Courier, monospace}

-

-/* end font face declarations */

-

-/* following font size declarations should be OK for DBCS */

-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }

-pre				{ font-size: 10pt}

-

-/* end font size declarations */

-

-body	     { background: #FFFFFF}

-h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	

-h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }

-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }

-h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }

-p 	     { font-size: 10pt; }

-pre	     { margin-left: 6; font-size: 9pt }

-

-a:link { color: #006699 }

-a:visited { color: #996699 }

-a:hover  { color: #006699 }

-

-ul	     { margin-top: 0; margin-bottom: 10 }

-li	     { margin-top: 0; margin-bottom: 0 } 

-li p	     { margin-top: 0; margin-bottom: 0 } 

-ol	     { margin-top: 0; margin-bottom: 10 }

-dl	     { margin-top: 0; margin-bottom: 10 }

-dt	     { margin-top: 0; margin-bottom: 0; font-weight: bold }

-dd	     { margin-top: 0; margin-bottom: 0 }

-strong	     { font-weight: bold}

-em	     { font-style: italic}

-var	     { font-style: italic}

-div.revision { border-left-style: solid; border-left-width: thin; 

-				   border-left-color: #7B68EE; padding-left:5 }

-th	     { font-weight: bold }

-

-/* Mike Behm's addition to the style sheet */

-.userinput { font-family: monospace; }

-.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, 

-.notetitle  {

-     color: #000000;

-     font-family: helvetica, arial, sans-serif;

-     font-weight: bold;

-     }

-div.linux  {display:none;}

-.firsterm {font-style:italic;}

-


diff --git a/core/org.eclipse.ptp.doc.user/html/images/.cvsignore b/core/org.eclipse.ptp.doc.user/html/images/.cvsignore
deleted file mode 100755
index 980b5d2..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/.cvsignore
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png b/core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png
deleted file mode 100644
index 756ab8f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png b/core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png
deleted file mode 100644
index 89ccf7c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/01proj.png b/core/org.eclipse.ptp.doc.user/html/images/01proj.png
deleted file mode 100644
index 33db54d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01proj.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png b/core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png
deleted file mode 100644
index d994e6c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png b/core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png
deleted file mode 100644
index 32a9369..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png
deleted file mode 100644
index ff4c8ef..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png
deleted file mode 100644
index e8ed7d1..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png
deleted file mode 100644
index 985a0e8..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png
deleted file mode 100644
index f0e00dd..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png
deleted file mode 100644
index 9ce03b5..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png
deleted file mode 100644
index 1b77d37..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png
deleted file mode 100644
index daccbc3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png
deleted file mode 100644
index 5b6faf3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png
deleted file mode 100644
index 2a77896..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png
deleted file mode 100644
index a53b10c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png b/core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png
deleted file mode 100644
index 0d4ce0a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02ORTEConfiguration.png b/core/org.eclipse.ptp.doc.user/html/images/02ORTEConfiguration.png
deleted file mode 100644
index 785d59c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02ORTEConfiguration.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02ORTEProxyConn2local.png b/core/org.eclipse.ptp.doc.user/html/images/02ORTEProxyConn2local.png
deleted file mode 100644
index 66c9009..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02ORTEProxyConn2local.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02ORTEresMgrLocalStarted.png b/core/org.eclipse.ptp.doc.user/html/images/02ORTEresMgrLocalStarted.png
deleted file mode 100644
index e0266d9..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02ORTEresMgrLocalStarted.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png b/core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png
deleted file mode 100644
index a1ec8ce..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png b/core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png
deleted file mode 100644
index 3a54403..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType-OpenMPI.png b/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType-OpenMPI.png
deleted file mode 100644
index 3e72bf6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType-OpenMPI.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png b/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png
deleted file mode 100644
index fe22302..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02newORTEproxyRemote.png b/core/org.eclipse.ptp.doc.user/html/images/02newORTEproxyRemote.png
deleted file mode 100644
index 72b5ea6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02newORTEproxyRemote.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png b/core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png
deleted file mode 100644
index b9a54e1..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02orteProxyConfigRemoteAddr1.png b/core/org.eclipse.ptp.doc.user/html/images/02orteProxyConfigRemoteAddr1.png
deleted file mode 100644
index 52d2aec..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02orteProxyConfigRemoteAddr1.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png b/core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png
deleted file mode 100644
index 7f0cce3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png
deleted file mode 100644
index 0ba69c3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png
deleted file mode 100644
index 247ba17..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png
deleted file mode 100644
index cd5a38e..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png
deleted file mode 100644
index 5463a85..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png
deleted file mode 100644
index 591ed4a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png b/core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png
deleted file mode 100644
index a630514..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch1.png b/core/org.eclipse.ptp.doc.user/html/images/03launch1.png
deleted file mode 100644
index dc6dc85..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch1.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch2.png b/core/org.eclipse.ptp.doc.user/html/images/03launch2.png
deleted file mode 100644
index b804e79..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch2.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch5.png b/core/org.eclipse.ptp.doc.user/html/images/03launch5.png
deleted file mode 100644
index 5d62080..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch5.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch6.png b/core/org.eclipse.ptp.doc.user/html/images/03launch6.png
deleted file mode 100644
index d27d047..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch6.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch7.png b/core/org.eclipse.ptp.doc.user/html/images/03launch7.png
deleted file mode 100644
index 12bceaf..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch7.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch8.png b/core/org.eclipse.ptp.doc.user/html/images/03launch8.png
deleted file mode 100644
index 0be70ff..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch8.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch9.png b/core/org.eclipse.ptp.doc.user/html/images/03launch9.png
deleted file mode 100644
index 5ca1276..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch9.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png b/core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png
deleted file mode 100644
index c13f87d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/04combinedConsole1.png b/core/org.eclipse.ptp.doc.user/html/images/04combinedConsole1.png
deleted file mode 100644
index a630514..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/04combinedConsole1.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/04launch1.png b/core/org.eclipse.ptp.doc.user/html/images/04launch1.png
deleted file mode 100644
index dc6dc85..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/04launch1.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/04launch2.png b/core/org.eclipse.ptp.doc.user/html/images/04launch2.png
deleted file mode 100644
index b804e79..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/04launch2.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/04launch5.png b/core/org.eclipse.ptp.doc.user/html/images/04launch5.png
deleted file mode 100644
index 5d62080..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/04launch5.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/04launchResTab.png b/core/org.eclipse.ptp.doc.user/html/images/04launchResTab.png
deleted file mode 100644
index c13f87d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/04launchResTab.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png b/core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png
deleted file mode 100644
index 7ae660e..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png b/core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png
deleted file mode 100644
index c292250..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png
deleted file mode 100644
index 31c3dbd..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png
deleted file mode 100644
index 623bb05..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png
deleted file mode 100644
index 52ee77c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png
deleted file mode 100644
index a0ddb1a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png
deleted file mode 100644
index a6e9b75..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png
deleted file mode 100644
index 7d6e79c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png b/core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png
deleted file mode 100644
index bee9852..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png b/core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png
deleted file mode 100644
index 104bd3c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png b/core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png
deleted file mode 100644
index 201a266..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png
deleted file mode 100644
index d8869f1..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png
deleted file mode 100644
index cf79560..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png
deleted file mode 100644
index 8995d4a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png
deleted file mode 100644
index f798772..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png
deleted file mode 100644
index 4f54600..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06cipHover.png b/core/org.eclipse.ptp.doc.user/html/images/06cipHover.png
deleted file mode 100644
index 4eb6521..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06cipHover.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png b/core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png
deleted file mode 100644
index 79c8afc..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png b/core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png
deleted file mode 100644
index e788b0d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png b/core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png
deleted file mode 100644
index 6a7e594..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ipMult.png b/core/org.eclipse.ptp.doc.user/html/images/06ipMult.png
deleted file mode 100644
index 4b23dd2..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ipMult.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ipReg.png b/core/org.eclipse.ptp.doc.user/html/images/06ipReg.png
deleted file mode 100644
index fbde720..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ipReg.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png b/core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png
deleted file mode 100644
index f959eca..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06mip.png b/core/org.eclipse.ptp.doc.user/html/images/06mip.png
deleted file mode 100644
index f5a5d32..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06mip.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png
deleted file mode 100644
index 1198c6a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png
deleted file mode 100644
index 856a532..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png
deleted file mode 100644
index 65f7bf2..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png
deleted file mode 100644
index a08c58b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png
deleted file mode 100644
index 681df01..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSets.png b/core/org.eclipse.ptp.doc.user/html/images/06pSets.png
deleted file mode 100644
index a4d0b2c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSets.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png b/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png
deleted file mode 100644
index 3b70dcb..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png b/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png
deleted file mode 100644
index 5d846c5..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png b/core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png
deleted file mode 100644
index d7d603b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06reg1.png b/core/org.eclipse.ptp.doc.user/html/images/06reg1.png
deleted file mode 100644
index e6e472b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06reg1.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png b/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png
deleted file mode 100644
index acfde81..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png b/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png
deleted file mode 100644
index 1bebf2a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png b/core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png
deleted file mode 100644
index 1526500..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06terminate.png b/core/org.eclipse.ptp.doc.user/html/images/06terminate.png
deleted file mode 100644
index cefcfc8..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06terminate.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png b/core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png
deleted file mode 100644
index 7328b02..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png
deleted file mode 100644
index 683107d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png
deleted file mode 100644
index 891fcf0..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png
deleted file mode 100644
index 1e3b4ed..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsORTE.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsORTE.png
deleted file mode 100644
index 157ac7a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsORTE.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png
deleted file mode 100644
index 2eea9b0..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png b/core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png
deleted file mode 100644
index 10c62a6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.doc.user/html/thumb.js b/core/org.eclipse.ptp.doc.user/html/thumb.js
deleted file mode 100644
index 09c27ec..0000000
--- a/core/org.eclipse.ptp.doc.user/html/thumb.js
+++ /dev/null

@@ -1,16 +0,0 @@
-
-// Javascript to provide a convenient way to show a thumbnail of an image, with a link to the full-size image
-// Default height is 120 if the second arg is omitted
-//Note that IE uses the alt tag for hover but Firefox more correctly uses the title tag for hover text.
-//Usage: <script> thumb("images/foo.gif")</script>
-function thumb(url,height){
-   if (!height) {height=120;}
-   document.write ("<a href='"+url+"'><img src='"+url+"' height="+height+" title='Click for a full-size image' alt='Click for a full-size image'></a>");
-}
-// simple imbedding of image, in default full size, with break preceeding
-// (easy to replace the above with this one)
-//Usage: <script> full("images/foo.gif")</script>
-function full(url){
-   document.write ("<img src='"+url+"'>");
-}
-

diff --git a/core/org.eclipse.ptp.doc.user/html/thumb2.js b/core/org.eclipse.ptp.doc.user/html/thumb2.js
deleted file mode 100644
index 4c1dc90..0000000
--- a/core/org.eclipse.ptp.doc.user/html/thumb2.js
+++ /dev/null

@@ -1,33 +0,0 @@
-
-function newWin(url) {
-	window.open(url, 'install_ptp', 'menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
-}
-// Javascript to provide a convenient way to show a thumbnail of an image, with a link to the full-size image
-// Default height is 120 if the second arg is omitted
-//Note that IE uses the alt tag for hover but Firefox more correctly uses the title tag for hover text.
-function thumb(url,height){
-   if (!height) {height=120;}
-   document.write ("<br><a href='"+url+"'><img src='"+url+"' height="+height+" title='Click for a full-size image' alt='Click for a full-size image'></a>");
-}
-// simple imbedding of image, in default full size, with break preceeding
-// (easy to replace the above with this one)
-function full(url){
-   document.write ("<br><img src='"+url+"'>");
-}
-//trying to abbreviate this: <a href="javascript:void(0)" onClick="newWin('images/foo.gif')">Click here</a>
-// with usage like this:  <script> thumbNewWin("foo.gif") </script>
-// this doesn't work.   Hmmmmm....
-// I think it has to do with the quotes. i need 3 nesting levels so just " and ' doesn't cut it.
-// I tried escaping but that doesn't seem to work either.  \"
-function thumbNewWin(url,height){
-   if (!height) {height=120;}
-   msg="Click here to see a full-size image in a new window";
-   //document.write ("<br><a href='javascript:void(0)' onClick='newWin(\""+url+"\")><img src='"+url+"' height="+height+" title='Click' alt='Click'></a>");
-   anchor="<a href='javascript:void(0)' onClick='newWin(\""+url+"\")>";
-   img="<img src='"+url+"' height="+height+" title='"+msg+"' alt='"+msg+"'>";
-   //alert("anchor="anchor);
-   //alert("img="+img);
-   document.write ("<br>"+anchor+img+"</a>");
-   
- }  
-

diff --git a/core/org.eclipse.ptp.doc.user/html/toc.html b/core/org.eclipse.ptp.doc.user/html/toc.html
deleted file mode 100755
index bfc7983..0000000
--- a/core/org.eclipse.ptp.doc.user/html/toc.html
+++ /dev/null

@@ -1,59 +0,0 @@
- <html>
-<head>
-<title>Parallel Tools Platform User Guide</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1> <img src="images/toc_parallel_perspective_lg.png"> Parallel Tools Platform</h1>
-<p>Release 2.1
-<p>
-The Parallel Tools Platform is designed to allow the Eclipse  
-framework to be used for developing applications for parallel  
-computer systems. PTP provides the following functionality:
-<ul><li>
-tools for developing applications based on the Message Passing  
-Interface (MPI) standard (other environments and APIs will follow.)
-<li> the ability to launch,  control and monitor the execution of  
-parallel programs
-<li> the ability to monitor parallel system status information
-<li> an integrated parallel debugger
-<li> a framework for integrating exernal dynamic tools
-</ul>
-In addition, PTP provides a platform for parallel tool developers to  
-integrate their tools within the Eclipse framework. New tools can  
-take advantage of the user interface components and parallel  
-services  that are provided by PTP, without the need to develop and  
-support this infrastructure across multiple platforms.
-<p>More information and downloads are available at
-<a href="http://eclipse.org/ptp">http://eclipse.org/ptp</a>.
-<h2>Overview, Background, and Setup information</h2>
-<p>
-<ol>
-<li> <a href="00overview.html">PTP Overview</a>  and architecture
-<li> <a href="00prereqs.html">PTP Prerequisites</a>  
-<li><a href="00newNoteworthy.html">New and Noteworthy</a> 
-</ol>
-<h2>Help Topics</h2>
-<ol>
-
-<li> <a href="01buildMPIprog.html">Creating MPI Projects</a>
-<li> <a href="02resMgrSetup.html">Configuring Resource Managers</a>
-<li> <a href="03pLaunchConfig.html">Launching Parallel Programs</a> 
-<li> <a href="04pLaunchConfigDebug.html">Launching Parallel Programs for Debugging</a> 
-<li> <a href="05monitoring.html">Monitoring Parallel Machines and Jobs</a>
-<li> <a href="06parDebugging.html">Parallel Debugging</a>
-<li> <a href="07ptpPrefs.html">PTP Preferences</a> 
-
-</ol>
-<p>Other related Help topics
-<ul>
-<li><a href="PLUGINS_ROOT/org.eclipse.ptp.pldt.help/html/toc.html">Parallel Language Development Tools (PLDT)</a>
-<li><a href="PLUGINS_ROOT/org.eclipse.ptp.ibmll.help/html/IBMLLMainHelp.html">IBM Loadleveler</a> PTP resource manager
-<li><a href="PLUGINS_ROOT/org.eclipse.ptp.ibmpe.help/html/PEMainHelp.html">IBM Parallel Environment</a> (PE) PTP resource manager
-<li><a href="http://wiki.eclipse.org/PTP/PTFw/PTFw-Overview">External Tools Framework (ETFw) - formerly the Performance Tools Framework
-</ul>
-<p>&nbsp;
-<p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-</body>
-</html>
\ No newline at end of file

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

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

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

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

diff --git a/core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml b/core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml
deleted file mode 100644
index 4966a98..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptphelp-introExtension" style="css/sample.css" 
-  	name="PTP overview intro Extension" path="overview/@">
-		<group style-id="content-group" id="orgeclipseptphelp-introLink-group">
-       		<link label="Parallel Tools Platform"  id="orgeclipseptphelp-introLink" style-id="content-link"
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.help/html/toc.html">
-          		<text>Learn more about PTP, the Parallel Tools Platform.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml b/core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml
deleted file mode 100644
index 82355b7..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml
+++ /dev/null

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptphelp-introExtension" style="css/sample.css" name="PTP tutorial intro Extension" path="tutorials/@">
-		<group style-id="content-group" id="orgeclipseptphelp-introLink-group">
-       		<link label="Parallel Tools Platform"  
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.help/html/01buildMPIprog.html"
-       		id="orgeclipseptphelp-introLink" style-id="content-link">
-          		<text>Learn how to create, run, and debug a Parallel Project with MPI.
-          		</text>
-		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml b/core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml
deleted file mode 100644
index 1d626a2..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptphelp-introExtension" style="css/sample.css" name="PTP whatsnew intro Extension" path="whatsnew/@">
-		<group style-id="content-group" id="orgeclipseptphelp-introLink-group">
-       		<link label="Parallel Tools Platform" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.help/html/newNoteworthy.html" id="orgeclipseptphelp-introLink" style-id="content-link">
-          		<text>Find out the new features in PTP 2.1.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.doc.user/plugin.properties b/core/org.eclipse.ptp.doc.user/plugin.properties
deleted file mode 100644
index 79c6e42..0000000
--- a/core/org.eclipse.ptp.doc.user/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP User Guide
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.doc.user/plugin.xml b/core/org.eclipse.ptp.doc.user/plugin.xml
deleted file mode 100755
index 99896ef..0000000
--- a/core/org.eclipse.ptp.doc.user/plugin.xml
+++ /dev/null

@@ -1,32 +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.help.index1"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.intro.configExtension">
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/ptpOverview.xml">
-      </configExtension>
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/ptpWhatsnew.xml">
-      </configExtension>
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/ptpTutorial.xml">
-      </configExtension>
-
-   </extension>
-
-</plugin>

diff --git a/core/org.eclipse.ptp.doc.user/src/org/eclipse/ptp/help/HelpPlugin.java b/core/org.eclipse.ptp.doc.user/src/org/eclipse/ptp/help/HelpPlugin.java
deleted file mode 100755
index 207a398..0000000
--- a/core/org.eclipse.ptp.doc.user/src/org/eclipse/ptp/help/HelpPlugin.java
+++ /dev/null

@@ -1,101 +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:

- *     Beth Tibbitts (IBM Corp.) - initial API and implementation

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

-

-package org.eclipse.ptp.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 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.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("org.eclipse.ptp.help", path);

-    }

-}


diff --git a/core/org.eclipse.ptp.doc.user/toc.xml b/core/org.eclipse.ptp.doc.user/toc.xml
deleted file mode 100755
index 4f9154a..0000000
--- a/core/org.eclipse.ptp.doc.user/toc.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

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

-

-<toc label="Parallel Tools Platform User Guide" topic="html/toc.html">

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

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

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

-      <topic label="Configuring Resource Managers"  href="html/02resMgrSetup.html"/> 
-      <topic label="Launching Parallel Programs"  href="html/03pLaunchConfig.html"/> 
-      <topic label="Launching Parallel Programs for Debugging"  href="html/04pLaunchConfigDebug.html"/> 

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

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

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

-   

-</toc>


diff --git a/core/org.eclipse.ptp.launch/.classpath b/core/org.eclipse.ptp.launch/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/core/org.eclipse.ptp.launch/.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/core/org.eclipse.ptp.launch/.cvsignore b/core/org.eclipse.ptp.launch/.cvsignore
deleted file mode 100644
index f0a691e..0000000
--- a/core/org.eclipse.ptp.launch/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.launch/.project b/core/org.eclipse.ptp.launch/.project
deleted file mode 100644
index 1495647..0000000
--- a/core/org.eclipse.ptp.launch/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.launch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF
deleted file mode 100644
index ae89ba6..0000000
--- a/core/org.eclipse.ptp.launch/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.launch; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.launch.PTPLaunchPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.core.runtime,
- org.eclipse.core.filesystem,
- org.eclipse.debug.ui,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.core,
- org.eclipse.ptp.debug.core,
- org.eclipse.ptp.debug.ui,
- org.eclipse.cdt.core,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.utils.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.launch,
- org.eclipse.ptp.launch.internal;x-internal:=true,
- org.eclipse.ptp.launch.internal.ui;x-internal:=true,
- org.eclipse.ptp.launch.messages,
- org.eclipse.ptp.launch.ui,
- org.eclipse.ptp.launch.ui.extensions

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

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

diff --git a/core/org.eclipse.ptp.launch/build.properties b/core/org.eclipse.ptp.launch/build.properties
deleted file mode 100644
index 656fccf..0000000
--- a/core/org.eclipse.ptp.launch/build.properties
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.launch/icons/arguments_tab.gif b/core/org.eclipse.ptp.launch/icons/arguments_tab.gif
deleted file mode 100644
index 8670a38..0000000
--- a/core/org.eclipse.ptp.launch/icons/arguments_tab.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.launch/icons/debugger_tab.gif b/core/org.eclipse.ptp.launch/icons/debugger_tab.gif
deleted file mode 100644
index d90a29f..0000000
--- a/core/org.eclipse.ptp.launch/icons/debugger_tab.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.launch/icons/environment_tab.gif b/core/org.eclipse.ptp.launch/icons/environment_tab.gif
deleted file mode 100644
index c379dd2..0000000
--- a/core/org.eclipse.ptp.launch/icons/environment_tab.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.launch/icons/main_tab.gif b/core/org.eclipse.ptp.launch/icons/main_tab.gif
deleted file mode 100644
index 6b86d07..0000000
--- a/core/org.eclipse.ptp.launch/icons/main_tab.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.launch/icons/parallel_run.gif b/core/org.eclipse.ptp.launch/icons/parallel_run.gif
deleted file mode 100644
index 6facfb9..0000000
--- a/core/org.eclipse.ptp.launch/icons/parallel_run.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.launch/icons/parallel_tab.gif b/core/org.eclipse.ptp.launch/icons/parallel_tab.gif
deleted file mode 100644
index 6facfb9..0000000
--- a/core/org.eclipse.ptp.launch/icons/parallel_tab.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.launch/plugin.properties b/core/org.eclipse.ptp.launch/plugin.properties
deleted file mode 100644
index 6f35e14..0000000
--- a/core/org.eclipse.ptp.launch/plugin.properties
+++ /dev/null

@@ -1,29 +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
-#
-# Contributors:
-#     Clement Chu
-#################################################################################
-
-pluginName=PTP Launching Support
-pluginProvider=Eclipse.org
-
-ParallelLaunch.name=Parallel Application
-PTPShortcut.label=PTP Run
-ParallelLaunch.debug=Create a configuration to launch a parallel application in Parallel Debug Perspective
-ParallelLaunch.run=Create a configuration to launch a parallel application in Parallel Perspective

diff --git a/core/org.eclipse.ptp.launch/plugin.xml b/core/org.eclipse.ptp.launch/plugin.xml
deleted file mode 100644
index 10ef98f..0000000
--- a/core/org.eclipse.ptp.launch/plugin.xml
+++ /dev/null

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="rmLaunchConfigurations" name="Resource Manager Launch Configurations" schema="schema/rmLaunchConfigurations.exsd"/>
-	<extension
-		point="org.eclipse.debug.core.launchConfigurationTypes">
-		<launchConfigurationType
-			name="%ParallelLaunch.name"
-			delegate="org.eclipse.ptp.launch.internal.ParallelLaunchConfigurationDelegate"
-			sourceLocatorId="org.eclipse.ptp.debug.core.sourceLocator"
-			sourcePathComputerId="org.eclipse.ptp.debug.core.sourcePathComputer"
-			modes="run,debug"
-			public="true"
-			id="org.eclipse.ptp.launch.parallelLaunch">
-		</launchConfigurationType>
-	</extension>
-
-	<extension
-		point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-		<launchConfigurationTypeImage
-			icon="icons/parallel_run.gif"
-			configTypeID="org.eclipse.ptp.launch.parallelLaunch"
-			id="org.eclipse.ptp.launch.parallelLaunchImage">
-		</launchConfigurationTypeImage>
-	</extension>   
-   
-	<extension
-		point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-		<launchConfigurationTabGroup
-			type="org.eclipse.ptp.launch.parallelLaunch"
-			class="org.eclipse.ptp.launch.internal.ui.ParallelLaunchConfigurationTabGroup"
-			id="org.eclipse.ptp.launch.parallelLaunchConfigurationTabGroup">
-			<launchMode
-               perspective="org.eclipse.ptp.debug.ui.PTPDebugPerspective"
-               description="%ParallelLaunch.debug"
-               mode="debug">
-	        </launchMode>
-    	    <launchMode
-               perspective="org.eclipse.ptp.ui.PTPRunPerspective"
-               description="%ParallelLaunch.run"
-               mode="run">
-         	</launchMode>
-		</launchConfigurationTabGroup>
-	</extension>
-
-<!-- PDT Shortcut //-->	
-   <extension
-		point="org.eclipse.debug.ui.launchShortcuts">
-		<shortcut
-            label="%PTPShortcut.label"
-			icon="icons/parallel_run.gif"
-            class="org.eclipse.ptp.launch.internal.PTPLaunchShortcut"
-            modes="run, debug"
-            id="org.eclipse.ptp.ptpShortcut">
-			<perspective id="org.eclipse.ptp.ui.PTPRunPerspective"/>
-			<perspective id="org.eclipse.ptp.debug.ui.PTPDebugPerspective"/>
-		</shortcut>
-   </extension>	
-</plugin>

diff --git a/core/org.eclipse.ptp.launch/schema/rmLaunchConfigurations.exsd b/core/org.eclipse.ptp.launch/schema/rmLaunchConfigurations.exsd
deleted file mode 100644
index fe1ed79..0000000
--- a/core/org.eclipse.ptp.launch/schema/rmLaunchConfigurations.exsd
+++ /dev/null

@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.launch">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.launch" id="rmLaunchConfigurations" name="Resource Manager Launch Configuration"/>
-      </appInfo>
-      <documentation>
-         This extension point allows plug-ins to contribute resource manager specific launch configuration information to the Resources launch tab.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="launchConfiguration"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="launchConfiguration">
-      <complexType>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/PTPLaunchPlugin.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/PTPLaunchPlugin.java
deleted file mode 100644
index 8ae61fa..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/PTPLaunchPlugin.java
+++ /dev/null

@@ -1,359 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.launch;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PTPLaunchPlugin extends AbstractUIPlugin {
-    public static final String PLUGIN_ID = "org.eclipse.ptp.launch"; //$NON-NLS-1$
-    public static final String EXTENSION_POINT_ID = "rmLaunchConfigurations"; //$NON-NLS-1$
-
-	//The shared instance.
-	private static PTPLaunchPlugin plugin;
-	
-	/**
-	 * Convenience method to create an error dialog given an IStatus.
-	 * 
-	 * @param message
-	 * @param status
-	 */
-	public static void errorDialog(String message, IStatus status) {
-		log(status);
-		Shell shell = getActiveWorkbenchShell();
-		if (shell != null) {
-			ErrorDialog.openError(shell, Messages.Launch_common_Error, message, status);
-		}
-	}
-
-	/**
-	 * Convenience method to create an error dialog given a message and Throwable.
-	 * 
-	 * @param message
-	 * @param t
-	 */
-	public static void errorDialog(String message, Throwable t) {
-		log(t);
-		Shell shell = getActiveWorkbenchShell();
-		if (shell != null) {
-			IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), 1, t.getMessage(), null); //$NON-NLS-1$	
-			ErrorDialog.openError(shell, Messages.Launch_common_Error, message, status);
-		}
-	}
-	
-	/**
-	 * Convenience method to get the currently active page
-	 * 
-	 * @return currently active page
-	 */
-	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow w = getActiveWorkbenchWindow();
-		if (w != null) {
-			return w.getActivePage();
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the active workbench shell or <code>null</code> if none
-	 * 
-	 * @return the active workbench shell or <code>null</code> if none
-	 */
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window != null) {
-			return window.getShell();
-		}
-		return null;
-	}
-
-	/**
-	 * Convenience method to get the currently active workbench window
-	 * 
-	 * @return currently active workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PTPLaunchPlugin 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.launch", path); //$NON-NLS-1$
-	}    
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = PTPLaunchPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Get a unique identifier for this plugin
-	 * 
-	 * @return unique identifier
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * Logs the specified status with this plug-in's log.
-	 * 
-	 * @param status
-	 *            status to log
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-	
-	/**
-	 * Logs an internal error with the specified throwable
-	 * 
-	 * @param e
-	 *            the exception to be logged
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), e)); //$NON-NLS-1$
-	}	
-	
-	/**
-	 * Logs an internal error with the specified message.
-	 * 
-	 * @param message
-	 *            the error message to log
-	 */
-	public static void logErrorMessage(String message) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
-	}	
-	
-	// Resource bundle.
-	private ResourceBundle resourceBundle;
-	// Map of resource managers to launch configuration factories
-	private final Map<Class<? extends IResourceManager>, AbstractRMLaunchConfigurationFactory> rmLaunchConfigurationFactories =
-		new HashMap<Class<? extends IResourceManager>, AbstractRMLaunchConfigurationFactory>();
-
-	/**
-	 * The constructor.
-	 */
-	public PTPLaunchPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.ptp.launch.LaunchPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * Find the launch configuration factory for a resource manager
-	 * 
-	 * @param rm resource manager
-	 * @return launch configuration factory
-	 */
-	public AbstractRMLaunchConfigurationFactory getRMLaunchConfigurationFactory(IResourceManager rm) {
-		if (rm == null) {
-			return null;
-		}
-		return rmLaunchConfigurationFactories.get(rm.getClass());
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		retrieveRMLaunchConfigurationFactories();
-	}
-	
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		rmLaunchConfigurationFactories.clear();
-		plugin = null;
-		resourceBundle = null;
-	}
-	
-	/**
-	 * Find the resource manager that corresponds to the unique name specified in the configuration
-	 * 
-	 * @param configuration launch configuration
-	 * @return resource manager
-	 * @throws CoreException
-	 */
-	public IResourceManager getResourceManager(ILaunchConfiguration configuration) throws CoreException {
-		IPUniverse universe = PTPCorePlugin.getDefault().getUniverse();
-		IResourceManager[] rms = universe.getResourceManagers();
-		String rmUniqueName = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, (String)null);
-		for (IResourceManager rm : rms) {
-			if (rm.getState() == ResourceManagerAttributes.State.STARTED &&
-					rm.getUniqueName().equals(rmUniqueName)) {
-				return rm;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Verify that the resource "path" actually exists. This just checks
-	 * that the path references something real.
-	 * 
-	 * @param path
-	 * @param configuration
-	 * @return IPath
-	 * @throws CoreException
-	 */
-	public IPath verifyResource(String path, ILaunchConfiguration configuration) throws CoreException {
-		IResourceManagerControl rm = (IResourceManagerControl)getResourceManager(configuration);
-		if (rm != null) {
-			IResourceManagerConfiguration conf = rm.getConfiguration();
-			if (conf instanceof AbstractRemoteResourceManagerConfiguration) {
-				AbstractRemoteResourceManagerConfiguration remConf = (AbstractRemoteResourceManagerConfiguration)conf;
-				IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(remConf.getRemoteServicesId());
-				if (remoteServices != null) {
-					IRemoteConnectionManager connMgr = remoteServices.getConnectionManager();
-					IRemoteConnection conn = connMgr.getConnection(remConf.getConnectionName());
-					IRemoteFileManager fileManager = remoteServices.getFileManager(conn);
-					try {
-						IPath resPath = new Path(path);
-						IFileStore res = fileManager.getResource(resPath, new NullProgressMonitor());
-						if (res.fetchInfo().exists()) {
-							return resPath;
-						}
-					} catch (IOException e) {
-					}
-				}
-			} else {
-				IPath resPath = new Path(path);
-				if (resPath.toFile().exists()) {
-					return resPath;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Find all launch configuration factory extensions that have been registered
-	 */
-	private void retrieveRMLaunchConfigurationFactories() {
-    	rmLaunchConfigurationFactories.clear();
-    	
-    	IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-		final IExtension[] extensions = extensionPoint.getExtensions();
-		
-		for (int iext = 0; iext < extensions.length; ++iext) {
-			final IExtension ext = extensions[iext];
-			
-			final IConfigurationElement[] elements = ext.getConfigurationElements();
-		
-			for (int i=0; i< elements.length; i++)
-			{
-				IConfigurationElement ce = elements[i];
-				try {
-					AbstractRMLaunchConfigurationFactory factory = (AbstractRMLaunchConfigurationFactory) ce.createExecutableExtension("class");
-					Class<? extends IResourceManager> resourceManagerClass = factory.getResourceManagerClass();
-					rmLaunchConfigurationFactories.put(resourceManagerClass, factory);
-				} catch (CoreException e) {
-					log(e);
-				}
-			}
-		}
-    }
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadBackRule.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadBackRule.java
deleted file mode 100755
index d6706c0..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadBackRule.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-
-
-public class DownloadBackRule implements ISynchronizationRule {
-	List<IPath> remoteFiles = new ArrayList<IPath>();
-	List<File> localFiles = new ArrayList<File>();
-	
-	public DownloadBackRule() {
-	}
-	
-	public void add(File local, IPath remote) {
-		remoteFiles.add(remote);
-		localFiles.add(local);
-	}
-	
-	public File getLocalFile(int index) {
-		return (File) localFiles.get(index);
-	}
-		
-	public IPath getRemoteFile(int index) {
-		return (IPath) remoteFiles.get(index);
-	}
-	
-	public int count() {
-		return remoteFiles.size();
-	}
-
-	public boolean isActive() {
-		return remoteFiles.size() > 0;
-	}
-
-	public boolean isDownloadRule() {
-		return true; // by definition
-	}
-
-	public boolean isUploadRule() {
-		return false; // by definition
-	}
-
-	public String toLabel() {
-		return "Internal download back rule"; //$NON-NLS-1$
-	}
-
-	public void validate() throws CoreException {
-		// nothing to validate
-	}
-
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadRule.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadRule.java
deleted file mode 100755
index 0acc938..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/DownloadRule.java
+++ /dev/null

@@ -1,398 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/*
- * Represents an upload rule.
- * It describes how to copy a list of local files or local directories into a single remote directory.
- * A local file is copied into the remote directory.
- * A local directory has its content copied recursively into the remote directory.
- */
-public class DownloadRule implements ISynchronizationRule {
-	private int overwritePolicy = OverwritePolicies.UNKNOWN;
-
-	private boolean asReadOnly = false;
-	private boolean asExecutable = false;
-	private boolean preserveTimeStamp = false;
-	
-	/** Local destiny directory where the files are downloaded into. */
-	private String localDirectory = null;
-	
-	/**
-	 * List of remote source paths, represented as strings.
-	 * They may be files or directories.
-	 */
-	private List<String> remoteFileList = new ArrayList<String>();
-
-	/*
-	 * Default constructor.
-	 */
-	public DownloadRule() {
-
-	}
-
-	/*
-	 * Creates de rule from a serialized string.
-	 */
-	public DownloadRule(String data) {
-		/*
-		 * Split the string into lines.
-		 */
-		String list[] = data.split("\n"); //$NON-NLS-1$
-		/*
-		 * Check if the first token is the proper identifier. If not, the string does not represent a rule that
-		 * can be parsed by this class.
-		 */
-		{
-			if (list.length < 1) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-			String s = list[0];
-			if (! s.equalsIgnoreCase(SerializationKeys.TYPE_DOWNLOAD)) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-		}
-		for (int i = 1; i < list.length; i++) {
-			String s = list[i];
-			/*
-			 * Split key from data.
-			 */
-			int p = s.indexOf(' ');
-			if (p == -1) {
-				logError("Invalid rule entry: "+s); //$NON-NLS-1$
-				continue;
-			}
-			String key = s.substring(0, p);
-			String value = s.substring(p + 1);
-			parseEntry(key, value);
-		}
-	}
-	
-	public DownloadRule(DownloadRule rule) {
-		this.overwritePolicy = rule.overwritePolicy;
-		this.asReadOnly = rule.asReadOnly;
-		this.asExecutable = rule.asExecutable;
-		this.preserveTimeStamp = rule.preserveTimeStamp;
-		if (rule.localDirectory != null) {
-			this.localDirectory = new String(rule.localDirectory);
-		} else {
-			this.localDirectory = null;
-		}
-		this.remoteFileList = new ArrayList<String>(rule.remoteFileList);
-	}
-
-	private void throwError(String string) {
-		throw new RuntimeException(string);		
-	}
-
-	private void parseEntry(String key, String value) {
-		if (key.equalsIgnoreCase(SerializationKeys.KEY_LOCAL_PATH)) {
-			localDirectory = value;
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY)) {
-			if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS)) {
-				overwritePolicy = OverwritePolicies.ALWAYS;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ASK)) {
-				overwritePolicy = OverwritePolicies.ASK;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_NEWER)) {
-				overwritePolicy = OverwritePolicies.NEWER;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_SKIP)) {
-				overwritePolicy = OverwritePolicies.SKIP;
-			} else {
-				logError("Unknown overwrite policy: "+value); //$NON-NLS-1$
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_FLAGS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_TIMESTAMP)) {
-					preserveTimeStamp = true;
-				} else {
-					logError("Unknown flag: "+flag); //$NON-NLS-1$
-				}
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_REMOTE_PATH)) {
-			remoteFileList.add(value);
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_EXECUTABLE)) {
-					asExecutable = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_READONLY)) {
-					asReadOnly = true;
-				} else {
-					logError("Unknown permission: "+flag); //$NON-NLS-1$
-				}
-			}			
-		} else {
-			logError("Unknown key: "+key); //$NON-NLS-1$
-		}
-	}
-
-	private void logError(String string) {
-		// TODO Auto-generated method stub
-	}
-
-	/*
-	 * The rule as a serialized string.
-	 */
-	public String toString() {
-		List<String> l = new ArrayList<String>();
-		if (localDirectory != null) {
-			l.add(SerializationKeys.KEY_LOCAL_PATH+" "+localDirectory.trim()); //$NON-NLS-1$
-		}
-		if (overwritePolicy == OverwritePolicies.ALWAYS) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.ASK) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ASK);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.NEWER) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_NEWER);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.SKIP) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_SKIP);			 //$NON-NLS-1$
-		}
-		if (asExecutable || asReadOnly) {
-			String s = SerializationKeys.KEY_PERMISSIONS;
-			if (asExecutable) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_EXECUTABLE; //$NON-NLS-1$
-			}
-			if (asReadOnly) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_READONLY; //$NON-NLS-1$
-			}
-			l.add(s);
-		}
-		if (preserveTimeStamp) {
-			String s = SerializationKeys.KEY_FLAGS;
-			if (preserveTimeStamp) {
-				s += " " + SerializationKeys.KEY_FLAGS_TIMESTAMP; //$NON-NLS-1$
-			}
-			l.add(s);			
-		}
-		for (Iterator<String> iter = remoteFileList.iterator(); iter.hasNext();) {
-			String remotePath = (String) iter.next();
-			if (remotePath == null) continue;
-			if (remotePath.trim().length() == 0) continue;
-			
-			l.add(SerializationKeys.KEY_REMOTE_PATH+" "+remotePath.trim());  //$NON-NLS-1$
-		}
-		String result = new String(SerializationKeys.TYPE_DOWNLOAD);
-		for (Iterator<String> iter = l.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			result += "\n" + element; //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public boolean isAsExecutable() {
-		return asExecutable;
-	}
-
-	public void setAsExecutable(boolean asExecutable) {
-		this.asExecutable = asExecutable;
-	}
-
-	public boolean isAsReadOnly() {
-		return asReadOnly;
-	}
-
-	public void setAsReadOnly(boolean asReadOnly) {
-		this.asReadOnly = asReadOnly;
-	}
-
-	public int getOverwritePolicy() {
-		return overwritePolicy;
-	}
-
-	public void setOverwritePolicy(int overwritePolicy) {
-		this.overwritePolicy = overwritePolicy;
-	}
-
-	public boolean isPreserveTimeStamp() {
-		return preserveTimeStamp;
-	}
-
-	public void setPreserveTimeStamp(boolean preserveTimeStamp) {
-		this.preserveTimeStamp = preserveTimeStamp;
-	}
-
-	public String getLocalDirectory() {
-		if (localDirectory != null) {
-			return localDirectory.trim();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setLocalDirectory(String localDirectory) {
-		if (localDirectory != null) {
-			this.localDirectory = localDirectory.trim();
-		} else {
-			this.localDirectory = null;
-		}
-	}
-	
-	public int getRemoteFileCount() {
-		return remoteFileList.size();
-	}
-	
-	public String [] getRemoteFilesAsStringArray() {
-		String result [] = new String [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = (String) remoteFileList.get(i);
-		}
-		return result;
-	}
-
-	public IPath [] getRemoteFilesAsPathArray() {
-		IPath result [] = new IPath [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new Path((String) remoteFileList.get(i));
-		}
-		return result;
-	}
-
-	public File [] getRemoteFilesAsFileArray() {
-		File result [] = new File [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new File((String) remoteFileList.get(i));
-		}
-		return result;
-	}
-	
-	public class RemoteFileIteratorAsString implements Iterator<Object> {
-		Iterator<String> iteratorref = remoteFileList.iterator();
-		
-		public boolean hasNext() {
-			return iteratorref.hasNext();
-		}
-
-		public Object next() {
-			return iteratorref.next();
-		}
-
-		public void remove() {
-			iteratorref.remove();
-		}		
-	}
-
-	public class RemoteFileIteratorAsPath extends RemoteFileIteratorAsString {
-		public Object next() {
-			return new Path((String)iteratorref.next());
-		}
-	}
-
-	public Iterator<?> remoteIteratorAsString() {
-		return new RemoteFileIteratorAsString();
-	}
-
-	public Iterator<?> remoteIteratorAsPath() {
-		return new RemoteFileIteratorAsPath();
-	}
-
-	public void addRemoteFile(String string) {
-		if (string != null) {
-			remoteFileList.add(string);
-		}
-	}
-
-	public void addRemoteFile(IPath path) {
-		if (path != null) {
-			remoteFileList.add(path.toOSString());
-		}
-	}
-
-	public static void main(String[] args) {
-		DownloadRule r = new DownloadRule();
-		System.out.println(r);
-		r.setAsExecutable(true);
-		System.out.println(r);
-		r.setAsReadOnly(true);
-		System.out.println(r);
-		r.setLocalDirectory("/tmp/a"); //$NON-NLS-1$
-		System.out.println(r);
-		r.setOverwritePolicy(OverwritePolicies.ASK);
-		System.out.println(r);		
-	}
-
-	public void removeRemoteFile(String entry) {
-		for (Iterator<String> iter = remoteFileList.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			if (element.equals(entry)) {
-				iter.remove();
-			}
-		}
-	}
-	
-	public void removeRemoteFile(IPath entry) {
-		removeRemoteFile(entry.toOSString());
-	}
-	
-	public void setRemoteFiles(String[] items) {
-		clearRemoteFiles();
-		for (int i = 0; i < items.length; i++) {
-			String string = items[i];
-			if (string != null) {
-				addRemoteFile(string.trim());
-			}
-		}
-	}
-	
-	public void setRemoteFiles(IPath[] items) {
-		clearRemoteFiles();
-		for (int i = 0; i < items.length; i++) {
-			IPath path = items[i];
-			if (path != null) {
-				addRemoteFile(path);
-			}
-		}
-	}
-	
-	public void clearRemoteFiles() {
-		remoteFileList.clear();
-	}
-
-	public boolean isActive() {
-		return true;
-	}
-
-	public boolean isDownloadRule() {
-		return true;
-	}
-
-	public boolean isUploadRule() {
-		return false;
-	}
-
-	// FIXME: Throw core exception
-	public void validate() throws CoreException {
-		if (overwritePolicy == OverwritePolicies.UNKNOWN) {
-			//RemoteLauncherPlugin.throwCoreException(Messages.DownloadRule_Validation_MissingOverwritePolicy, IRemoteLaunchErrors.INVALID_RULE);
-		}
-		if (localDirectory == null) {
-			//RemoteLauncherPlugin.throwCoreException(Messages.DownloadRule_Validation_MissingRemoteDirectory, IRemoteLaunchErrors.INVALID_RULE);
-		}
-	}
-	
-	public String toLabel() {
-		String result = "DOWNLOAD "+Integer.toString(remoteFileList.size())+" item(s) back to "+localDirectory; //$NON-NLS-1$ //$NON-NLS-2$
-		return result;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/ISynchronizationRule.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/ISynchronizationRule.java
deleted file mode 100755
index 0bcb353..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/ISynchronizationRule.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.data;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Identifies a synchronizatuion rule for the launch job.
- * @author Daniel Ferber
- *
- */
-
-public interface ISynchronizationRule {
-	/**
-	 * A label to show the rule for debug.
-	 * @return The label
-	 * @deprecated
-	 */
-	public String toLabel();
-	
-	/**
-	 * Query if the rule is active and has all required information to be applied.
-	 * @return
-	 */
-	public boolean isActive();
-	
-	/**
-	 * Validate the rule and raise a {@link CoreException} if some attribute is missing
-	 * or not valid. The validation does not include check for existing files.
-	 */
-	public void validate() throws CoreException;
-	
-	/**
-	 * Queries if the tule can be used by launch job after the application finishes execution on the remote host.
-	 * @author Daniel Ferber
-	 *
-	 */
-	public boolean isDownloadRule();
-
-	/**
-	 * Queries if the rule can be used by launch job before the application starts execution on the remote host.
-	 * @author Daniel Ferber
-	 *
-	 */
-	public boolean isUploadRule();
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/OverwritePolicies.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/OverwritePolicies.java
deleted file mode 100755
index cdb9aa1..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/OverwritePolicies.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.data;
-
-public interface OverwritePolicies {
-	
-	public static final int UNKNOWN = 0;
-	public static final int SKIP = 1;
-	public static final int ALWAYS = 2;
-	public static final int NEWER = 3;
-	public static final int ASK = 4;
-	
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/RuleFactory.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/RuleFactory.java
deleted file mode 100755
index ea0b6e7..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/RuleFactory.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.data;
-
-
-public class RuleFactory {
-	
-	/**
-	 * Returns a new synchronization rule object for the serialized string.
-	 * @param string The serialized string
-	 * @return The rule or null if no rule is known for the string.
-	 */
-	public static ISynchronizationRule createRuleFromString(String string) {
-		String list[] = string.split("\n"); //$NON-NLS-1$
-		String first = list[0];
-		if (first.equalsIgnoreCase(SerializationKeys.TYPE_UPLOAD)) {
-			return new UploadRule(string);
-		} else if (first.equalsIgnoreCase(SerializationKeys.TYPE_DOWNLOAD)) {
-			return new DownloadRule(string);
-		} else {
-			return null;
-		}
-	}
-	
-	public static ISynchronizationRule duplicateRule(ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			return new DownloadRule(downloadRule);
-		} if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			return new UploadRule(uploadRule);
-		} else {
-			return null;
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/SerializationKeys.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/SerializationKeys.java
deleted file mode 100755
index cd5adbe..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/SerializationKeys.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.data;
-
-
-interface SerializationKeys {
-	public static String TYPE_UPLOAD = "upload"; //$NON-NLS-1$
-	public static String TYPE_DOWNLOAD = "download"; //$NON-NLS-1$
-	
-	public static String KEY_REMOTE_PATH = "remote-path"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY = "overwrite-policy"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_SKIP = "skip"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_ALWAYS = "always"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_NEWER = "newer"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_ASK = "ask"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS = "permissions"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS_READONLY = "readonly"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS_EXECUTABLE = "executable"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS = "flags"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_TIMESTAMP = "timestamp"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_DOWNLOAD_BACK = "download-back"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY = "default-remote-directory"; //$NON-NLS-1$
-
-	public static String KEY_LOCAL_PATH = "local-path"; //$NON-NLS-1$
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/UploadRule.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/UploadRule.java
deleted file mode 100755
index 5108661..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/data/UploadRule.java
+++ /dev/null

@@ -1,471 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/*
- * Represents an upload rule.
- * It describes how to copy a list of local files or local directories into a single remote directory.
- * A local file is copied into the remote directory.
- * A local directory has its content copied recursively into the remote directory.
- */
-public class UploadRule implements ISynchronizationRule {
-	private int overwritePolicy = OverwritePolicies.UNKNOWN;
-
-	private boolean asReadOnly = false;
-
-	private boolean asExecutable = false;
-
-	private boolean preserveTimeStamp = false;
-	
-	private boolean downloadBack = false;
-
-	private boolean defaultRemoteDirectory = false;
-
-	private String remoteDirectory = null;
-
-	/*
-	 * List of local paths, represented as strings.
-	 * They may be files or directories.
-	 */
-	private List<String> localFileList = new ArrayList<String>();
-
-	/*
-	 * Default constructor.
-	 */
-	public UploadRule() {
-
-	}
-
-	/*
-	 * Creates de rule from a serialized string.
-	 */
-	public UploadRule(String data) {
-		/*
-		 * Split the string into lines.
-		 */
-		String list[] = data.split("\n"); //$NON-NLS-1$
-		/*
-		 * Check if the first token is the proper identifier. If not, the string does not represent a rule that
-		 * can be parsed by this class.
-		 */
-		{
-			if (list.length < 1) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-			String s = list[0];
-			if (! s.equalsIgnoreCase(SerializationKeys.TYPE_UPLOAD)) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-		}
-		for (int i = 1; i < list.length; i++) {
-			String s = list[i];
-			/*
-			 * Split key from data.
-			 */
-			int p = s.indexOf(' ');
-			if (p == -1) {
-				logError("Invalid rule entry: "+s); //$NON-NLS-1$
-				continue;
-			}
-			String key = s.substring(0, p);
-			String value = s.substring(p + 1);
-			parseEntry(key, value);
-		}
-	}
-	
-	public UploadRule(UploadRule rule) {
-		this.overwritePolicy = rule.overwritePolicy;
-		this.asReadOnly = rule.asReadOnly;
-		this.asExecutable = rule.asExecutable;
-		this.preserveTimeStamp = rule.preserveTimeStamp;
-		this.downloadBack = rule.downloadBack;
-		this.defaultRemoteDirectory = rule.defaultRemoteDirectory;
-		if (rule.remoteDirectory != null) {
-			this.remoteDirectory = new String(rule.remoteDirectory);
-		} else {
-			this.remoteDirectory = null;
-		}
-		this.localFileList = new ArrayList<String>(rule.localFileList);
-	}
-
-	private void throwError(String string) {
-		throw new RuntimeException(string);		
-	}
-
-	private void parseEntry(String key, String value) {
-		if (key.equalsIgnoreCase(SerializationKeys.KEY_REMOTE_PATH)) {
-			remoteDirectory = value;
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY)) {
-			if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS)) {
-				overwritePolicy = OverwritePolicies.ALWAYS;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ASK)) {
-				overwritePolicy = OverwritePolicies.ASK;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_NEWER)) {
-				overwritePolicy = OverwritePolicies.NEWER;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_SKIP)) {
-				overwritePolicy = OverwritePolicies.SKIP;
-			} else {
-				logError("Unknown overwrite policy: "+value); //$NON-NLS-1$
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_FLAGS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY)) {
-					defaultRemoteDirectory = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_TIMESTAMP)) {
-					preserveTimeStamp = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_DOWNLOAD_BACK)) {
-					downloadBack = true;
-				} else {
-					logError("Unknown flag: "+flag); //$NON-NLS-1$
-				}
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_LOCAL_PATH)) {
-			localFileList.add(value);
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_EXECUTABLE)) {
-					asExecutable = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_READONLY)) {
-					asReadOnly = true;
-				} else {
-					logError("Unknown permission: "+flag); //$NON-NLS-1$
-				}
-			}			
-		} else {
-			logError("Unknown key: "+key); //$NON-NLS-1$
-		}
-	}
-
-	private void logError(String string) {
-		// TODO Auto-generated method stub
-	}
-
-	/*
-	 * The rule as a serialized string.
-	 */
-	public String toString() {
-		List<String> l = new ArrayList<String>();
-		if (remoteDirectory != null) {
-			l.add(SerializationKeys.KEY_REMOTE_PATH+" "+remoteDirectory.trim()); //$NON-NLS-1$
-		}
-		if (overwritePolicy == OverwritePolicies.ALWAYS) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.ASK) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ASK);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.NEWER) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_NEWER);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.SKIP) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_SKIP);			 //$NON-NLS-1$
-		}
-		if (asExecutable || asReadOnly) {
-			String s = SerializationKeys.KEY_PERMISSIONS;
-			if (asExecutable) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_EXECUTABLE; //$NON-NLS-1$
-			}
-			if (asReadOnly) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_READONLY; //$NON-NLS-1$
-			}
-			l.add(s);
-		}
-		if (preserveTimeStamp || defaultRemoteDirectory || downloadBack) {
-			String s = SerializationKeys.KEY_FLAGS;
-			if (defaultRemoteDirectory) {
-				s += " " + SerializationKeys.KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY; //$NON-NLS-1$
-			}
-			if (preserveTimeStamp) {
-				s += " " + SerializationKeys.KEY_FLAGS_TIMESTAMP; //$NON-NLS-1$
-			}
-			if (downloadBack) {
-				s += " " + SerializationKeys.KEY_FLAGS_DOWNLOAD_BACK;				 //$NON-NLS-1$
-			}
-			l.add(s);			
-		}
-		for (Iterator<String> iter = localFileList.iterator(); iter.hasNext();) {
-			String localpath = (String) iter.next();
-			if (localpath == null) continue;
-			if (localpath.trim().length() == 0) continue;
-			
-			l.add(SerializationKeys.KEY_LOCAL_PATH+" "+localpath.trim());  //$NON-NLS-1$
-		}
-		String result = new String(SerializationKeys.TYPE_UPLOAD);
-		for (Iterator<String> iter = l.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			result += "\n" + element; //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public boolean isAsExecutable() {
-		return asExecutable;
-	}
-
-	public void setAsExecutable(boolean asExecutable) {
-		this.asExecutable = asExecutable;
-	}
-
-	public boolean isAsReadOnly() {
-		return asReadOnly;
-	}
-
-	public void setAsReadOnly(boolean asReadOnly) {
-		this.asReadOnly = asReadOnly;
-	}
-
-	public boolean isDefaultRemoteDirectory() {
-		return defaultRemoteDirectory;
-	}
-
-	public void setDefaultRemoteDirectory(boolean defaultRemoteDirectory) {
-		this.defaultRemoteDirectory = defaultRemoteDirectory;
-	}
-
-	public int getOverwritePolicy() {
-		return overwritePolicy;
-	}
-
-	public void setOverwritePolicy(int overwritePolicy) {
-		this.overwritePolicy = overwritePolicy;
-	}
-
-	public boolean isPreserveTimeStamp() {
-		return preserveTimeStamp;
-	}
-
-	public void setPreserveTimeStamp(boolean preserveTimeStamp) {
-		this.preserveTimeStamp = preserveTimeStamp;
-	}
-
-	public String getRemoteDirectory() {
-		if (remoteDirectory != null) {
-				return remoteDirectory.trim();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setRemoteDirectory(String remoteDirectory) {
-		if (remoteDirectory != null) {
-			this.remoteDirectory = remoteDirectory.trim();
-		} else {
-			this.remoteDirectory = null;
-		}
-	}
-	
-	public void setDownloadBack(boolean downloadBack) {
-		this.downloadBack = downloadBack;
-	}
-	
-	public boolean isDownloadBack() {
-		return downloadBack;
-	}
-	
-	public int getRemoteFileCount() {
-		return localFileList.size();
-	}
-	
-	public String [] getLocalFilesAsStringArray() {
-		String result [] = new String [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = (String) localFileList.get(i);
-		}
-		return result;
-	}
-
-	public IPath [] getLocalFilesAsPathArray() {
-		IPath result [] = new IPath [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new Path((String) localFileList.get(i));
-		}
-		return result;
-	}
-
-	public File [] getLocalFilesAsFileArray() {
-		File result [] = new File [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new File((String) localFileList.get(i));
-		}
-		return result;
-	}
-	
-	public class LocalFileIteratorAsString implements Iterator<Object> {
-		Iterator<String> iteratorref = localFileList.iterator();
-		
-		public boolean hasNext() {
-			return iteratorref.hasNext();
-		}
-
-		public Object next() {
-			return iteratorref.next();
-		}
-
-		public void remove() {
-			iteratorref.remove();
-		}		
-	}
-
-	public class LocalFileIteratorAsPath extends LocalFileIteratorAsString {
-		public Object next() {
-			return new Path((String)iteratorref.next());
-		}
-	}
-
-	public class LocalFileIteratorAsFile extends LocalFileIteratorAsString {
-		public Object next() {
-			return new File((String)iteratorref.next());
-		}
-	}
-
-	public Iterator<?> localIteratorAsString() {
-		return new LocalFileIteratorAsString();
-	}
-
-	public Iterator<?> localIteratorAsPath() {
-		return new LocalFileIteratorAsPath();
-	}
-
-	public Iterator<?> localIteratorAsFile() {
-		return new LocalFileIteratorAsFile();
-	}
-
-	public void addLocalFile(String string) {
-		if (string != null) {
-			localFileList.add(string);
-		}
-	}
-
-	public void addLocalFile(IPath path) {
-		if (path != null) {
-			localFileList.add(path.toOSString());
-		}
-	}
-
-	public void addLocalFile(File file) {
-		if (file != null) {
-			localFileList.add(file.getPath());
-		}
-	}
-
-	public static void main(String[] args) {
-		UploadRule r = new UploadRule();
-		System.out.println(r);
-		r.setAsExecutable(true);
-		System.out.println(r);
-		r.setAsReadOnly(true);
-		System.out.println(r);
-		r.setRemoteDirectory("/tmp/a"); //$NON-NLS-1$
-		System.out.println(r);
-		r.setOverwritePolicy(OverwritePolicies.ASK);
-		System.out.println(r);
-		
-		String s = "upload\nremote-directory /tmp/a\npermissions executable readonly\nflags default-remote-directory"; //$NON-NLS-1$
-		r = new UploadRule(s);
-		System.out.println(r);
-		
-	}
-
-	public void removeLocalFile(String entry) {
-		for (Iterator<String> iter = localFileList.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			if (element.equals(entry)) {
-				iter.remove();
-			}
-		}
-	}
-	
-	public void removeLocalFile(IPath entry) {
-		removeLocalFile(entry.toOSString());
-	}
-	
-	public void removeLocalFile(File entry) {
-		removeLocalFile(entry.getPath());
-	}
-
-	public void setLocalFiles(String[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			String string = items[i];
-			if (string != null) {
-				addLocalFile(string);
-			}
-		}
-	}
-	
-	public void setLocalFiles(IPath[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			IPath path = items[i];
-			if (path != null) {
-				addLocalFile(path);
-			}
-		}
-	}
-	
-	public void setLocalFiles(File[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			File file = items[i];
-			if (file != null) {
-				addLocalFile(file);
-			}
-		}
-	}
-
-	public void clearLocalFiles() {
-		localFileList.clear();
-	}
-
-	public boolean isActive() {
-		return true;
-	}
-
-	public boolean isDownloadRule() {
-		return false;
-	}
-
-	public boolean isUploadRule() {
-		return true;
-	}
-
-	public String toLabel() {
-		String result = "UPLOAD "+Integer.toString(localFileList.size())+" item(s) \nto "+remoteDirectory; //$NON-NLS-1$ //$NON-NLS-2$
-		return result;
-	}
-	
-	// FIXME: Exceptions not thrown
-	public void validate() throws CoreException {
-		if (overwritePolicy == OverwritePolicies.UNKNOWN) {
-			//RemoteLauncherPlugin.throwCoreException(Messages.UploadRule_Validate_MissingOverwritePolicy, IRemoteLaunchErrors.INVALID_RULE);
-		}
-		if (defaultRemoteDirectory == false) {
-			if (remoteDirectory == null) {
-				//RemoteLauncherPlugin.throwCoreException(Messages.UploadRule_Validate_MissingRemotedirectory, IRemoteLaunchErrors.INVALID_RULE);
-			}
-//			IPath remotePath = LinuxPath.fromString(remoteDirectory);
-//			if (! remotePath.isAbsolute()) {
-//				RemoteLauncherPlugin.throwCoreException("Remote directory must be an absolute path.", IRemoteLaunchErrors.INVALID_RULE);				
-//			}
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/AbstractParallelLaunchConfigurationDelegate.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/AbstractParallelLaunchConfigurationDelegate.java
deleted file mode 100644
index 11b71cc..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/AbstractParallelLaunchConfigurationDelegate.java
+++ /dev/null

@@ -1,1359 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California.
- * This material was produced under U.S. Government contract W-7405-ENG-36
- * for Los Alamos National Laboratory, which is operated by the University
- * of California for the U.S. Department of Energy. The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
- * to produce derivative works, such modified software should be clearly marked,
- * so as not to confuse it with the version available from LANL.
- *
- * Additionally, this program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.internal;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.IBinaryParser;
-import org.eclipse.cdt.core.ICExtensionReference;
-import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IPersistableSourceLocator;
-import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.BooleanAttribute;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerChangeEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerListener;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.debug.core.IPDebugConfiguration;
-import org.eclipse.ptp.debug.core.IPDebugger;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.debug.core.launch.PLaunch;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-import org.eclipse.ptp.launch.data.RuleFactory;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.launch.rulesengine.ILaunchProcessCallback;
-import org.eclipse.ptp.launch.rulesengine.IRuleAction;
-import org.eclipse.ptp.launch.rulesengine.RuleActionFactory;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.utils.core.linux.ArgumentParser;
-
-/**
- *
- */
-public abstract class AbstractParallelLaunchConfigurationDelegate extends
-		LaunchConfigurationDelegate implements ILaunchProcessCallback {
-	private List<ISynchronizationRule> extraSynchronizationRules;
-	public enum JobStatus {SUBMITTED, COMPLETED, ERROR}
-
-	/**
-	 * The JobSubmission class encapsulates all the information used in
-	 * a job submission. Once the job is created *and starts running*,
-	 * this information is used to complete the launch.
-	 */
-	private class JobSubmission {
-		private ILaunchConfiguration configuration;
-		private String mode;
-		private String id;
-		private String error = null;
-		private IPLaunch launch;
-		private AttributeManager attrMgr;
-		private IPDebugger debugger;
-		private JobStatus status = JobStatus.SUBMITTED;
-		private final ReentrantLock subLock = new ReentrantLock();;
-		private final Condition subCondition = subLock.newCondition();
-
-		public JobSubmission(int count, ILaunchConfiguration configuration, String mode, IPLaunch launch,
-				AttributeManager attrMgr, IPDebugger debugger) {
-			this.configuration = configuration;
-			this.mode = mode;
-			this.launch = launch;
-			this.attrMgr = attrMgr;
-			this.debugger = debugger;
-			this.id = "JOB_" + Long.toString(System.currentTimeMillis()) + Integer.toString(count); //$NON-NLS-1$
-		}
-
-		/**
-		 * Wait for the job state to change
-		 *
-		 * @return the state
-		 */
-		public JobStatus waitFor(IProgressMonitor monitor) {
-			subLock.lock();
-			try {
-				while (!monitor.isCanceled() && status != JobStatus.SUBMITTED) {
-					try {
-						subCondition.await(100, TimeUnit.MILLISECONDS);
-					} catch (InterruptedException e) {
-						// Expect to be interrupted if monitor is canceled
-					}
-				}
-
-				return status;
-			} finally {
-				subLock.unlock();
-			}
-		}
-
-		/**
-		 * @return the attrMgr
-		 */
-		public AttributeManager getAttrMgr() {
-			return attrMgr;
-		}
-
-		/**
-		 * @return the configuration
-		 */
-		public ILaunchConfiguration getConfiguration() {
-			return configuration;
-		}
-
-		/**
-		 * @return the debugger
-		 */
-		public IPDebugger getDebugger() {
-			return debugger;
-		}
-
-		/**
-		 * @return the error
-		 */
-		public String getError() {
-			return error;
-		}
-
-		/**
-		 * @return the job submission id
-		 */
-		public String getId() {
-			return id;
-		}
-
-		/**
-		 * @return the launch
-		 */
-		public IPLaunch getLaunch() {
-			return launch;
-		}
-
-		/**
-		 * @return the mode
-		 */
-		public String getMode() {
-			return mode;
-		}
-
-		/**
-		 * set the error
-		 */
-		public void setError(String error) {
-			this.error = error;
-			setStatus(JobStatus.ERROR);
-		}
-
-		/**
-		 * set the current status
-		 */
-		public void setStatus(JobStatus status) {
-			subLock.lock();
-			try {
-				this.status = status;
-				subCondition.signalAll();
-			} finally {
-				subLock.unlock();
-			}
-		}
-	}
-
-	private final class MMChildListener implements IModelManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IChangedResourceManagerEvent)
-		 */
-		public void handleEvent(IChangedResourceManagerEvent e) {
-			// Don't need to do anything
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.INewResourceManagerEvent)
-		 */
-		public void handleEvent(INewResourceManagerEvent e) {
-			/*
-			 * Add resource manager child listener so we get notified when new
-			 * machines are added to the model.
-			 */
-			final IResourceManager rm = e.getResourceManager();
-	        rm.addChildListener(resourceManagerChildListener);
-	        rm.addElementListener(resourceManagerListener);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IRemoveResourceManagerEvent)
-		 */
-		public void handleEvent(IRemoveResourceManagerEvent e) {
-			/*
-			 * Removed resource manager child listener when resource manager is removed.
-			 */
-			final IResourceManager rm = e.getResourceManager();
-	        rm.removeChildListener(resourceManagerChildListener);
-	        rm.removeElementListener(resourceManagerListener);
-		}
-	}
-
-	private final class QueueChildListener implements IQueueChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedJobEvent)
-		 */
-		public void handleEvent(IChangedJobEvent e) {
-			for (IPJob job : e.getJobs()) {
-				/*
-				 * If the job state has changed to running, find the JobSubmission that
-				 * corresponds to this job and perform remainder of job launch actions
-				 */
-				StringAttribute subIdAttr = job.getAttribute(JobAttributes.getSubIdAttributeDefinition());
-				if (subIdAttr != null) {
-					IAttribute<?,?,?> stateAttr = job.getAttribute(JobAttributes.getStateAttributeDefinition());
-					if (stateAttr != null) {
-						JobAttributes.State state = (JobAttributes.State)((EnumeratedAttribute<?>)stateAttr).getValue();
-						if (state == JobAttributes.State.RUNNING) {
-							JobSubmission jobSub = jobSubmissions.remove(subIdAttr.getValue());
-							if (jobSub != null) {
-								jobSub.setStatus(JobStatus.COMPLETED);
-								doCompleteJobLaunch(jobSub.getConfiguration(), jobSub.getMode(), jobSub.getLaunch(), jobSub.getAttrMgr(), jobSub.getDebugger(), job);
-							}
-						} else if(state == JobAttributes.State.TERMINATED || state == JobAttributes.State.ERROR) {
-							JobSubmission jobSub = jobInfos.remove(subIdAttr.getValue());
-							if(jobSub != null) {
-								if (state == JobAttributes.State.TERMINATED) {
-									ILaunchConfiguration lconf = jobSub.getConfiguration();
-									// If needed, copy data back.
-									try {
-										// Get the list of paths to be copied back.
-										doPosLaunchSynchronization(lconf);
-									} catch (CoreException e1) {
-										PTPLaunchPlugin.log(e1);
-									}
-								}
-								doCleanuoLaunch(jobSub.getConfiguration(), jobSub.getMode(), jobSub.getLaunch(), jobSub.getAttrMgr(), jobSub.getDebugger(), job);
-							}
-						}
-					}
-				}
-			}
-		}
-
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewJobEvent)
-		 */
-		public void handleEvent(INewJobEvent e) {
-			for (IPJob job : e.getJobs()) {
-				/*
-				 * If the new job is one that we launched, check to see if it's in our list
-				 * of job submissions. If not, assume that we have reconnected to a session
-				 * so we need to re-create the launch configuration that was used launch it.
-				 * If it's a debug job, and it has not yet started running, then
-				 * start a debug session. It's possible the job will never run, so we
-				 * need to clean up any debug sessions before exiting Eclipse.
-				 */
-				StringAttribute subAttr = job.getAttribute(JobAttributes.getSubIdAttributeDefinition());
-				if (subAttr != null) {
-					IAttribute<?,?,?> launchAttr = job.getAttribute(JobAttributes.getLaunchedByPTPFlagAttributeDefinition());
-					if (launchAttr != null && ((BooleanAttribute)launchAttr).getValue()) {
-						JobSubmission jobSub = jobSubmissions.get(subAttr.getValue());
-						if (jobSub == null) {
-							// recreate launch configuration
-							// jobSub = ....;
-							// jobSubmissions.put(job, jobSub);
-						}
-						IAttribute<?,?,?> debugAttr = job.getAttribute(JobAttributes.getDebugFlagAttributeDefinition());
-						if (debugAttr != null && ((BooleanAttribute)debugAttr).getValue()) {
-						}
-					}
-				}
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveJobEvent)
-		 */
-		public void handleEvent(IRemoveJobEvent e) {
-		}
-	}
-
-	private final class RMChildListener implements IResourceManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedMachineEvent)
-		 */
-		public void handleEvent(IChangedMachineEvent e) {
-			// Don't need to do anything
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedQueueEvent)
-		 */
-		public void handleEvent(IChangedQueueEvent e) {
-			// Can safely ignore
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerNewMachineEvent)
-		 */
-		public void handleEvent(INewMachineEvent e) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewQueueEvent)
-		 */
-		public void handleEvent(INewQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.addChildListener(queueChildListener);
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveMachineEvent)
-		 */
-		public void handleEvent(IRemoveMachineEvent e) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveQueueEvent)
-		 */
-		public void handleEvent(IRemoveQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.removeChildListener(queueChildListener);
-			}
-		}
-	}
-
-	private final class RMListener implements IResourceManagerListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangeEvent)
-		 */
-		public void handleEvent(IResourceManagerChangeEvent e) {
-			// Ignore
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent)
-		 */
-		public void handleEvent(IResourceManagerErrorEvent e) {
-			// TODO Auto-generated method stub
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent)
-		 */
-		public void handleEvent(IResourceManagerSubmitJobErrorEvent e) {
-			JobSubmission jobSub = jobSubmissions.remove(e.getJobSubmissionId());
-			jobSub.setError(e.getMessage());
-		}
-	}
-
-    /**
-	 * Get the program arguments specified in the Arguments tab
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getArguments(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_ARGUMENTS, (String)null);
-	}
-
-	/**
-	 * Get the debugger executable path
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getDebuggerExePath(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_EXECUTABLE_PATH, (String)null);
-	}
-
-	/**
-	 * Get the ID of the debugger for this launch
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getDebuggerID(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_ID, (String)null);
-	}
-
-	/**
-     * Get the debugger "stop in main" flag
-     *
-	 * @param configuration
-	 * @return "stop in main" flag
-	 * @throws CoreException
-	 */
-	protected static boolean getDebuggerStopInMainFlag(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, false);
-	}
-
-	/**
-	 * Get the working directory for this debug session
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getDebuggerWorkDirectory(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_WORKING_DIR, (String)null);
-	}
-
-	/**
-     * Get the absolute path of the executable to launch. If the executable is on a remote machine,
-     * this is the path to the executable on that machine.
-     *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getExecutablePath(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, (String)null);
-	}
-
-    /**
-	 * Get the name of the application to launch
-	 *
-	 * @deprecated
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	@Deprecated
-	protected static String getProgramName(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_APPLICATION_NAME, (String)null);
-	}
-
-	/**
-	 * Get the name of the project
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getProjectName(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null);
-	}
-
-	/**
-	 * Get the name of the queue for the launch
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getQueueName(ILaunchConfiguration configuration) throws CoreException {
-		return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_QUEUE_NAME, (String)null);
-	}
-
-	/**
-	 * Get the resource manager to use for the launch
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getResourceManagerUniqueName(ILaunchConfiguration configuration) throws CoreException {
-		return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, (String)null);
-	}
-
-	/**
-     * Get the working directory for the application launch
-     *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected static String getWorkDirectory(ILaunchConfiguration configuration) throws CoreException {
-	    return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_WORK_DIRECTORY, (String)null);
-	}
-
-	/**
-	 * Get if the executable shall be copied to remote target before launch.
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	public boolean getCopyExecutable(ILaunchConfiguration configuration)
-			throws CoreException {
-		return configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_COPY_EXECUTABLE, false);
-	}
-
-	private int jobCount = 0;
-
-	/*
-	 * Model listeners
-	 */
-	private final IModelManagerChildListener modelManagerChildListener = new MMChildListener();
-	private final IResourceManagerChildListener resourceManagerChildListener = new RMChildListener();
-	private final IResourceManagerListener resourceManagerListener = new RMListener();
-	private final IQueueChildListener queueChildListener = new QueueChildListener();
-	/*
-	 * HashMap used to keep track of job submissions
-	 */
-	protected Map<String, JobSubmission> jobSubmissions = Collections.synchronizedMap(new HashMap<String, JobSubmission>());
-	/*
-	 * Temporary workaround. Leave a copy of jobSubmissions to get job information even after the submission.
-	 */
-	protected Map<String, JobSubmission> jobInfos = Collections.synchronizedMap(new HashMap<String, JobSubmission>());
-
-	public AbstractParallelLaunchConfigurationDelegate() {
-		IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-		synchronized (mm) {
-		    for (IResourceManager rm : mm.getUniverse().getResourceManagers()) {
-		    	for (IPQueue queue : rm.getQueues()) {
-		    		queue.addChildListener(queueChildListener);
-		    	}
-		        rm.addChildListener(resourceManagerChildListener);
-		        rm.addElementListener(resourceManagerListener);
-		    }
-		    mm.addListener(modelManagerChildListener);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
-	 */
-	@Override
-	public ILaunch getLaunch(ILaunchConfiguration configuration, String mode) throws CoreException {
-		return new PLaunch(configuration, mode, null);
-	}
-
-	/**
-	 * Get the attributes from the resource manager specific launch page.
-	 *
-	 * @param configuration
-	 * @param mode
-	 * @return IAttribute[]
-	 * @throws CoreException
-	 */
-	private IAttribute<?,?,?>[] getResourceAttributes(ILaunchConfiguration configuration, String mode)
-		throws CoreException {
-
-		IResourceManager rm = getResourceManager(configuration);
-
-		final AbstractRMLaunchConfigurationFactory rmFactory =
-			PTPLaunchPlugin.getDefault().getRMLaunchConfigurationFactory(rm);
-		if (rmFactory == null) {
-			return new IAttribute[0];
-		}
-		IRMLaunchConfigurationDynamicTab rmDynamicTab = rmFactory.create(rm);
-		return rmDynamicTab.getAttributes(rm, null, configuration, mode);
-	}
-
-	/**
-	 * Abort the job launch if anything goes wrong.
-	 *
-	 * @param message
-	 * @param exception
-	 * @param code
-	 * @throws CoreException
-	 */
-	protected void abort(String message, Throwable exception, int code) throws CoreException {
-	    throw new CoreException(new Status(IStatus.ERROR, PTPLaunchPlugin.getUniqueIdentifier(), code, message, exception));
-	}
-
-	/**
-	 * This method is called when the job state changes to RUNNING. This allows the launcher to
-	 * complete the job launch.
-	 *
-	 * @param configuration
-	 * @param mode
-	 * @param launch
-	 * @param mgr
-	 * @param debugger
-	 * @param job
-	 */
-	protected abstract void doCompleteJobLaunch(ILaunchConfiguration configuration, String mode, IPLaunch launch,
-			AttributeManager mgr, IPDebugger debugger, IPJob job);
-
-	protected abstract void doCleanuoLaunch(ILaunchConfiguration configuration,
-			String mode, IPLaunch launch, AttributeManager attrMgr,
-			IPDebugger debugger, IPJob job);
-
-//	protected void doCleanupJobLaunch(ILaunchConfiguration configuration, String mode,
-//			IPLaunch launch, AttributeManager attrMgr, IPDebugger debugger,
-//			IPJob job) {
-//		if (debugger != null) {
-//			debugger.cleanup(configuration, attrMgr, launch);
-//		}
-//	}
-
-	/**
-	 * Get all the attributes specified in the launch configuration.
-	 *
-	 * @param configuration
-	 * @param mode
-	 * @return AttributeManager
-	 * @throws CoreException
-	 */
-	protected AttributeManager getAttributeManager(ILaunchConfiguration configuration, String mode) throws CoreException {
-		IResourceManager rm = getResourceManager(configuration);
-		if (rm == null) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_No_ResourceManager, null, 0);
-		}
-
-		AttributeManager attrMgr = new AttributeManager();
-
-		/*
-		 * Collect attributes from Resources tab
-		 */
-		attrMgr.addAttributes(getResourceAttributes(configuration, mode));
-
-		/*
-		 * Make sure there is a queue, even if the resources tab doesn't require
-		 * one to be specified.
-		 */
-		if (attrMgr.getAttribute(JobAttributes.getQueueIdAttributeDefinition()) == null) {
-			IPQueue queue = getQueueDefault(rm);
-			attrMgr.addAttribute(JobAttributes.getQueueIdAttributeDefinition().create(queue.getID()));
-		}
-
-		/*
-		 * Collect attributes from Application tab
-		 */
-		IPath programPath = verifyExecutablePath(configuration);
-		attrMgr.addAttribute(JobAttributes.getExecutableNameAttributeDefinition().create(programPath.lastSegment()));
-
-		String path = programPath.removeLastSegments(1).toString();
-		if (path != null) {
-			attrMgr.addAttribute(JobAttributes.getExecutablePathAttributeDefinition().create(path));
-		}
-
-		/*
-		 * Collect attributes from Debugger tab
-		 */
-		verifyDebuggerPath(configuration);
-		Boolean stopInMainFlag = getDebuggerStopInMainFlag(configuration);
-		attrMgr.addAttribute(JobAttributes.getDebuggerStopInMainFlagAttributeDefinition().create(stopInMainFlag));
-
-		/*
-		 * Collect attributes from Arguments tab
-		 */
-		String wd = verifyWorkDirectory(configuration);
-		if (wd != null) {
-			attrMgr.addAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition().create(wd));
-		}
-
-		String[] argArr = getProgramArguments(configuration);
-		if (argArr != null) {
-			attrMgr.addAttribute(JobAttributes.getProgramArgumentsAttributeDefinition().create(argArr));
-		}
-
-		/*
-		 * Collect attributes from Environment tab
-		 */
-		String[] envArr = getEnvironmentToAppend(configuration);
-		if (envArr != null) {
-			attrMgr.addAttribute(JobAttributes.getEnvironmentAttributeDefinition().create(envArr));
-		}
-
-		/*
-		 * PTP launched this job
-		 */
-		attrMgr.addAttribute(JobAttributes.getLaunchedByPTPFlagAttributeDefinition().create(true));
-
-		return attrMgr;
-	}
-
-	/**
-	 * Get the debugger configuration
-	 *
-	 * @param configuration launch configuration
-	 * @return debugger configuration
-	 * @throws CoreException
-	 */
-	protected IPDebugConfiguration getDebugConfig(ILaunchConfiguration config) throws CoreException {
-		IPDebugConfiguration dbgCfg = null;
-		try {
-			dbgCfg = PTPDebugCorePlugin.getDefault().getDebugConfiguration(getDebuggerID(config));
-		} catch (CoreException e) {
-			System.out.println("ParallelLaunchConfigurationDelegate.getDebugConfig() Error"); //$NON-NLS-1$
-			throw e;
-		}
-		return dbgCfg;
-	}
-
-	/**
-	 * Convert application arguments to an array of strings.
-	 *
-	 * @param configuration launch configuration
-	 * @return array of strings containing the program arguments
-	 * @throws CoreException
-	 */
-	protected String[] getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
-		String temp = getArguments(configuration);
-		if (temp != null && temp.length() > 0) {
-			// Replaced PTPs ArgumentParser with better ArgumentParser contributed with RemoteTools.
-//			ArgumentParser ap = new ArgumentParser(temp);
-//			List<String> args = ap.getArguments();
-			ArgumentParser ap = new ArgumentParser(temp);
-			List<String> args = ap.getTokenList();
-			if (args != null) {
-				return args.toArray(new String[args.size()]);
-			}
-		}
-		return new String[0];
-	}
-
-	/**
-	 * Get the path of the program to launch. No longer used since the program may not be
-	 * on the local machine.
-	 *
-	 * @deprecated
-	 *
-	 * @param configuration launch configuration
-	 * @return IPath corresponding to program executable
-	 * @throws CoreException
-	 */
-	@Deprecated
-	protected IPath getProgramFile(ILaunchConfiguration configuration) throws CoreException {
-		IProject project = verifyProject(configuration);
-		String fileName = getProgramName(configuration);
-		if (fileName == null)
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Application_file_not_specified, null, IStatus.INFO);
-
-		IPath programPath = new Path(fileName);
-		if (!programPath.isAbsolute()) {
-			programPath = project.getFile(programPath).getLocation();
-		}
-		if (!programPath.toFile().exists()) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Application_file_does_not_exist,
-					new FileNotFoundException(
-							NLS.bind(Messages.AbstractParallelLaunchConfigurationDelegate_Path_not_found, new Object[] {programPath.toString()})),
-							IPTPLaunchConfigurationConstants.ERR_PROGRAM_NOT_EXIST);
-		}
-		/* --old
-		IFile programPath = project.getFile(fileName);
-		if (programPath == null || !programPath.exists() || !programPath.getLocation().toFile().exists())
-			abort(LaunchMessages.getResourceString("AbstractParallelLaunchConfigurationDelegate.Application_file_does_not_exist"), new FileNotFoundException(LaunchMessages.getFormattedResourceString("AbstractParallelLaunchConfigurationDelegate.Application_path_not_found", programPath.getLocation().toString())), IStatus.INFO);
-		 */
-		return programPath;
-	}
-
-	/**
-	 * Get the IProject object from the project name.
-	 *
-     * @param project name of the project
-     * @return IProject resource
-     */
-    protected IProject getProject(String project) {
-        return getWorkspaceRoot().getProject(project);
-    }
-
-	/**
-	 * Get the default queue for the given resource manager
-	 *
-	 * @param rm resource manager
-	 * @return default queue
-	 */
-	protected IPQueue getQueueDefault(IResourceManager rm) {
-		final IPQueue[] queues = rm.getQueues();
-		if (queues.length == 0) {
-			return null;
-		}
-		return queues[0];
-	}
-
-	/**
-	 * Find the resource manager that corresponds to the unique name specified in the configuration
-	 *
-	 * @param configuration launch configuration
-	 * @return resource manager
-	 * @throws CoreException
-	 */
-	protected IResourceManager getResourceManager(ILaunchConfiguration configuration) throws CoreException {
-		IPUniverse universe = PTPCorePlugin.getDefault().getUniverse();
-		IResourceManager[] rms = universe.getResourceManagers();
-		String rmUniqueName = getResourceManagerUniqueName(configuration);
-		for (IResourceManager rm : rms) {
-			if (rm.getState() == ResourceManagerAttributes.State.STARTED &&
-					rm.getUniqueName().equals(rmUniqueName)) {
-				return rm;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Get the workspace root.
-	 *
-     * @return workspace root
-     */
-    protected IWorkspaceRoot getWorkspaceRoot() {
-    	return ResourcesPlugin.getWorkspace().getRoot();
-    }
-
-	/**
-	 * Create a source locator from the ID specified in the configuration, or create
-	 * a default one if it hasn't been specified.
-	 *
-	 * @param launch
-	 * @param configuration
-	 * @throws CoreException
-	 */
-	protected void setDefaultSourceLocator(ILaunch launch, ILaunchConfiguration configuration) throws CoreException {
-		//  set default source locator if none specified
-		if (launch.getSourceLocator() == null) {
-			IPersistableSourceLocator sourceLocator;
-			String id = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, (String)null);
-			if (id == null) {
-				sourceLocator = PTPDebugUIPlugin.createDefaultSourceLocator();
-				sourceLocator.initializeDefaults(configuration);
-			} else {
-				sourceLocator = DebugPlugin.getDefault().getLaunchManager().newSourceLocator(id);
-				String memento = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, (String)null);
-				if (memento == null) {
-					sourceLocator.initializeDefaults(configuration);
-				} else {
-					sourceLocator.initializeFromMemento(memento);
-				}
-			}
-			launch.setSourceLocator(sourceLocator);
-		}
-	}
-
-	/**
-	 * Set the source locator for this application
-	 *
-	 * @param launch
-	 * @param config
-	 * @throws CoreException
-	 */
-	protected void setSourceLocator(ILaunch launch, ILaunchConfiguration config) throws CoreException {
-		setDefaultSourceLocator(launch, config);
-	}
-
-	/**
-	 * Submit a job to the resource manager. Keeps track of the submission so we know when the
-	 * job actually starts running. When this happens, the abstract method doCompleteJobLaunch()
-	 * is invoked.
-	 *
-	 * @param configuration
-	 * @param mode
-	 * @param launch
-	 * @param attrMgr
-	 * @param debugger
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	protected void submitJob(ILaunchConfiguration configuration, String mode, IPLaunch launch,
-		AttributeManager attrMgr, IPDebugger debugger, IProgressMonitor monitor) throws CoreException {
-
-		final IResourceManager rm = getResourceManager(configuration);
-		if (rm == null) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_No_ResourceManager, null, 0);
-		}
-
-		JobSubmission jobSub = new JobSubmission(jobCount++, configuration, mode, launch, attrMgr, debugger);
-		jobSubmissions.put(jobSub.getId(), jobSub);
-		jobInfos.put(jobSub.getId(), jobSub);
-
-		rm.submitJob(jobSub.getId(), configuration, attrMgr, monitor);
-
-		JobStatus status = jobSub.waitFor(monitor);
-
-		if (status == JobStatus.ERROR) {
-			abort(jobSub.getError(), null, IStatus.ERROR);
-		}
-	}
-
-	/**
-	 * @param project
-	 * @param exePath
-	 * @return
-	 * @throws CoreException
-	 * @deprecated
-	 */
-	@Deprecated
-	protected IBinaryObject verifyBinary(IProject project, IPath exePath) throws CoreException {
-		ICExtensionReference[] parserRef = CCorePlugin.getDefault().getBinaryParserExtensions(project);
-		for (int i = 0; i < parserRef.length; i++) {
-			try {
-				IBinaryParser parser = (IBinaryParser) parserRef[i].createExtension();
-				IBinaryObject exe = (IBinaryObject) parser.getBinary(exePath);
-				if (exe != null) {
-					return exe;
-				}
-			} catch (ClassCastException e) {
-			} catch (IOException e) {
-			}
-		}
-		IBinaryParser parser = CCorePlugin.getDefault().getDefaultBinaryParser();
-		try {
-			return (IBinaryObject) parser.getBinary(exePath);
-		} catch (ClassCastException e) {
-		} catch (IOException e) {
-		}
-		Throwable exception = new FileNotFoundException(Messages.AbstractParallelLaunchConfigurationDelegate_Program_is_not_a_recongnized_executable);
-		int code = IPTPLaunchConfigurationConstants.ERR_PROGRAM_NOT_BINARY;
-		MultiStatus status = new MultiStatus(PTPCorePlugin.getUniqueIdentifier(), code, Messages.AbstractParallelLaunchConfigurationDelegate_Program_is_not_a_recongnized_executable, exception);
-		status.add(new Status(IStatus.ERROR, PTPCorePlugin.getUniqueIdentifier(), code, exception == null ? "" : exception.getLocalizedMessage(), exception)); //$NON-NLS-1$
-		throw new CoreException(status);
-	}
-
-	/**
-	 * @param path
-	 * @throws CoreException
-	 */
-	protected void verifyDebuggerPath(ILaunchConfiguration configuration) throws CoreException {
-		String dbgPath = getDebuggerExePath(configuration);
-		try {
-			verifyResource(dbgPath, configuration);
-		} catch (CoreException e) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Debugger_path_not_found,
-					new FileNotFoundException(e.getLocalizedMessage()), IStatus.INFO);
-		}
-	}
-
-	/**
-	 * Verify the validity of executable path.
-	 * If the executable is to be copied, then no additional verification is required.
-	 * Otherwise, the path must point to an existing file.
-	 * @param configuration
-	 * @return
-	 */
-	protected IPath verifyExecutablePath(ILaunchConfiguration configuration)  throws CoreException {
-		if (getCopyExecutable(configuration)) {
-			return new Path(getExecutablePath(configuration));
-		} else {
-			String exePath = getExecutablePath(configuration);
-			try {
-				return verifyResource(exePath, configuration);
-			} catch (CoreException e) {
-				abort(Messages.AbstractParallelLaunchConfigurationDelegate_Application_file_does_not_exist,
-						new FileNotFoundException(e.getLocalizedMessage()),	IStatus.INFO);
-				return null;
-			}
-		}
-	}
-
-	/**
-	 * @param path
-	 * @return
-	 * @deprecated
-	 */
-	@Deprecated
-	protected boolean verifyPath(String path) {
-		IPath programPath = new Path(path);
-		if (programPath == null || programPath.isEmpty() || !programPath.toFile().exists()) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Verify that the project exists prior to the launch.
-	 *
-     * @param configuration
-     * @return
-     * @throws CoreException
-     */
-    protected IProject verifyProject(ILaunchConfiguration configuration) throws CoreException {
-        String proName = getProjectName(configuration);
-        if (proName == null) {
-   			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Project_not_specified, null, IStatus.INFO);
-        }
-
-        IProject project = getProject(proName);
-        if (project == null || !project.exists() || !project.isOpen()) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Project_does_not_exist_or_is_not_a_project, null, IStatus.INFO);
-        }
-
-        return project;
-    }
-
-	/**
-	 * @param path
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected IPath verifyResource(String path, ILaunchConfiguration configuration) throws CoreException {
-		IResourceManagerControl rm = (IResourceManagerControl)getResourceManager(configuration);
-		if (rm == null) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_No_ResourceManager, null, IStatus.ERROR);
-		}
-		
-		IResourceManagerConfiguration conf = rm.getConfiguration();
-		if (!(conf instanceof AbstractRemoteResourceManagerConfiguration)) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Unsupported_resource_manager_type, null, IStatus.ERROR);
-		}
-		
-		AbstractRemoteResourceManagerConfiguration remConf = (AbstractRemoteResourceManagerConfiguration)conf;
-		IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(remConf.getRemoteServicesId());
-		if (remoteServices == null) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Unknown_remote_services, null, IStatus.ERROR);
-		}
-		IRemoteConnectionManager connMgr = remoteServices.getConnectionManager();
-		IRemoteConnection conn = connMgr.getConnection(remConf.getConnectionName());
-		IRemoteFileManager fileManager = remoteServices.getFileManager(conn);
-		IPath resPath = new Path(path);
-		try {
-			IFileStore res = fileManager.getResource(resPath, new NullProgressMonitor());
-			if (!res.fetchInfo().exists()) {
-				abort(NLS.bind(Messages.AbstractParallelLaunchConfigurationDelegate_Path_not_found, new Object[] {path}), null, IStatus.INFO);
-			}
-		} catch (IOException e) {
-			abort(Messages.AbstractParallelLaunchConfigurationDelegate_Error_fetching_resource, e.getCause(), IStatus.ERROR);
-		}
-		return resPath;
-	}
-
-	/**
-	 * Check if the copy local file is enabled. If it is, copy the executable file from
-	 * the local host to the remote host.
-	 *
-	 * @param configuration
-	 * @throws CoreException
-	 */
-	protected void copyExecutable(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-		boolean copyExecutable =
-			getCopyExecutable(configuration);
-
-		if(copyExecutable) {
-			// Get remote and local paths
-			String remotePath = getExecutablePath(configuration);
-			String localPath = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_LOCAL_EXECUTABLE_PATH,
-					(String)null);
-
-			// Check if local path is valid
-			if(localPath == null) {
-				// Throws exception
-			}
-
-			// Copy data
-			copyFileToRemoteHost(localPath, remotePath, configuration, monitor);
-		}
-	}
-
-	/**
-	 * Copy a data from a path (can be a file or directory) from the remote host to
-	 * the local host.
-	 *
-	 * @param remotePath
-	 * @param localPath
-	 * @param configuration
-	 * @throws CoreException
-	 */
-	protected void copyFileFromRemoteHost(String remotePath, String localPath, ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-
-		/*IResourceManagerControl rm = (IResourceManagerControl)getResourceManager(configuration);
-		if (rm != null) {
-			IResourceManagerConfiguration conf = rm.getConfiguration();
-			if (conf instanceof AbstractRemoteResourceManagerConfiguration) {
-				AbstractRemoteResourceManagerConfiguration remConf = (AbstractRemoteResourceManagerConfiguration)conf;
-
-				IRemoteServices localServices = PTPRemoteCorePlugin.getDefault().getRemoteServices("org.eclipse.ptp.remote.core.LocalServices");
-				IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(remConf.getRemoteServicesId());
-				if (remoteServices != null && localServices != null) {
-					IRemoteConnectionManager lconnMgr = localServices.getConnectionManager();
-					IRemoteConnection lconn = lconnMgr.getConnection(null); // Since it's a local service, doesn't matter which parameter is passed*/
-					IRemoteFileManager localFileManager = getLocalFileManager(configuration);//localServices.getFileManager(lconn);
-
-					/*IRemoteConnectionManager rconnMgr = remoteServices.getConnectionManager();
-					IRemoteConnection rconn = rconnMgr.getConnection(remConf.getConnectionName());*/
-					IRemoteFileManager remoteFileManager = getRemoteFileManager(configuration);//remoteServices.getFileManager(rconn);
-
-					try {
-						IFileStore rres = remoteFileManager.getResource(new Path(remotePath), monitor);
-
-						if(!rres.fetchInfo().exists()) {
-							// Local file not found!
-							throw new CoreException(new Status(IStatus.ERROR, PTPLaunchPlugin.PLUGIN_ID, 
-									Messages.AbstractParallelLaunchConfigurationDelegate_Remote_resource_does_not_exist));
-						}
-						IFileStore lres = localFileManager.getResource(new Path(localPath), new NullProgressMonitor());
-
-						// Copy file
-						rres.copy(lres, EFS.OVERWRITE, monitor);
-					} catch (IOException e) {
-						throw new CoreException(new Status(IStatus.ERROR, PTPLaunchPlugin.PLUGIN_ID, 
-								Messages.AbstractParallelLaunchConfigurationDelegate_Could_not_retrieve_remote_resource_info));
-					}
-	/*			}
-			} else {
-				// FIXME: work out what to do for RM's that don't extend AbstractRemoteResourceManagerConfiguration
-			}
-		}*/
-	}
-
-	/**
-	 * Copy a data from a path (can be a file or directory) from the local host to
-	 * the remote host.
-	 *
-	 * @param localPath
-	 * @param remotePath
-	 * @param configuration
-	 * @throws CoreException
-	 */
-	protected void copyFileToRemoteHost(String localPath, String remotePath, ILaunchConfiguration configuration,
-			IProgressMonitor monitor) throws CoreException {
-					IRemoteFileManager localFileManager = getLocalFileManager(configuration);
-
-					IRemoteFileManager remoteFileManager = getRemoteFileManager(configuration);
-
-					try {
-						IFileStore lres = localFileManager.getResource(new Path(localPath), new NullProgressMonitor());
-						if(!lres.fetchInfo().exists()) {
-							// Local file not found!
-							throw new CoreException(new Status(IStatus.ERROR, PTPLaunchPlugin.PLUGIN_ID, 
-									Messages.AbstractParallelLaunchConfigurationDelegate_Local_resource_does_not_exist));
-						}
-						IFileStore rres = remoteFileManager.getResource(new Path(remotePath), monitor);
-
-						// Copy file
-						lres.copy(rres, EFS.OVERWRITE, monitor);
-
-					} catch (IOException e) {
-						throw new CoreException(new Status(IStatus.ERROR, PTPLaunchPlugin.PLUGIN_ID, 
-								Messages.AbstractParallelLaunchConfigurationDelegate_Could_not_retrieve_local_resource_info));
-					}
-	}
-
-	/**
-	 * Verify the working directory. If no working directory is specified, the default is
-	 * the location of the executable.
-	 *
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	protected String verifyWorkDirectory(ILaunchConfiguration configuration) throws CoreException {
-		IPath path;
-        String workPath = getWorkDirectory(configuration);
-        if (workPath == null) {
-        	path = verifyExecutablePath(configuration).removeLastSegments(1);
-		} else {
-			path = verifyResource(workPath, configuration);
-		}
-		return path.toString();
-    }
-
-	/**
-	 * This method does the synchronization step before the job submission
-	 *
-	 * @param configuration
-	 * @param monitor
-	 */
-	protected void doPreLaunchSynchronization(ILaunchConfiguration configuration,
-			IProgressMonitor monitor) throws CoreException {
-		boolean syncBefore = configuration.getAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_SYNC_BEFORE, false);
-		if(!syncBefore)
-			return;
-
-		// This faction generate action objects which execute according to rules
-		RuleActionFactory ruleActFactory = new RuleActionFactory(configuration, this, monitor);
-
-		List<?> rulesList = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_RULES, new ArrayList<String>());
-
-		// Iterate over rules executing them
-		for (Object ruleObj : rulesList) {
-			ISynchronizationRule syncRule =
-				RuleFactory.createRuleFromString((String)ruleObj);
-			if(syncRule.isUploadRule()) {
-				// Execute the action
-				IRuleAction action = ruleActFactory.getAction(syncRule);
-				action.run();
-			}
-
-		}
-	}
-
-	protected void doPosLaunchSynchronization(ILaunchConfiguration configuration)  throws CoreException {
-		boolean syncAfter;
-		syncAfter = configuration.getAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_SYNC_AFTER, false);
-		if(!syncAfter)
-			return;
-		List<?> rulesList = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_RULES, new ArrayList<String>());
-
-		// This faction generate action objects which execute according to rules
-		RuleActionFactory ruleActFactory = new RuleActionFactory(configuration, this, new NullProgressMonitor());
-
-		for (Object ruleObj : rulesList) {
-			ISynchronizationRule syncRule =
-				RuleFactory.createRuleFromString((String)ruleObj);
-			if(syncRule.isDownloadRule()) {
-				// Execute the action
-				IRuleAction action = ruleActFactory.getAction(syncRule);
-				action.run();
-			}
-		}
-	}
-
-	/**
-	 * Returns the (possible empty) list of synchronization rule objects according to the rules described in the configuration.
-	 */
-	protected ISynchronizationRule[] getSynchronizeRules(ILaunchConfiguration configuration) throws CoreException {
-		List<?> ruleStrings = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_RULES, new ArrayList<String>());
-		List<ISynchronizationRule> result = new ArrayList<ISynchronizationRule>();
-
-		for (Object ruleObj : ruleStrings) {
-			String element = (String) ruleObj;
-			try {
-				ISynchronizationRule rule = RuleFactory.createRuleFromString(element);
-				result.add(rule);
-			} catch (RuntimeException e) {
-				throw new CoreException(new Status(Status.ERROR,
-						PTPLaunchPlugin.PLUGIN_ID,
-						Messages.AbstractParallelLaunchConfigurationDelegate_Error_converting_rules));
-			}
-		}
-
-		return (ISynchronizationRule[]) result.toArray(new ISynchronizationRule[result.size()]);
-	}
-
-	// Methods below implement the ILaunchProcessCallback interface
-
-	public void addSynchronizationRule(ISynchronizationRule rule) {
-		extraSynchronizationRules.add(rule);
-	}
-
-	public IRemoteFileManager getLocalFileManager(ILaunchConfiguration configuration) throws CoreException {
-		IResourceManagerControl rm = (IResourceManagerControl)getResourceManager(configuration);
-		if (rm != null) {
-			IResourceManagerConfiguration conf = rm.getConfiguration();
-			if (conf instanceof AbstractRemoteResourceManagerConfiguration) {
-				IRemoteServices localServices = PTPRemoteCorePlugin.getDefault().getRemoteServices("org.eclipse.ptp.remote.LocalServices"); //$NON-NLS-1$
-				if (localServices != null) {
-					IRemoteConnectionManager lconnMgr = localServices.getConnectionManager();
-					IRemoteConnection lconn = lconnMgr.getConnection(null); // Since it's a local service, doesn't matter which parameter is passed
-					IRemoteFileManager localFileManager = localServices.getFileManager(lconn);
-
-					return localFileManager;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public IRemoteFileManager getRemoteFileManager(ILaunchConfiguration configuration) throws CoreException {
-		IResourceManagerControl rm = (IResourceManagerControl)getResourceManager(configuration);
-		if (rm != null) {
-			IResourceManagerConfiguration conf = rm.getConfiguration();
-			if (conf instanceof AbstractRemoteResourceManagerConfiguration) {
-				AbstractRemoteResourceManagerConfiguration remConf = (AbstractRemoteResourceManagerConfiguration)conf;
-
-				IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(remConf.getRemoteServicesId());
-				if (remoteServices != null) {
-
-					IRemoteConnectionManager rconnMgr = remoteServices.getConnectionManager();
-					IRemoteConnection rconn = rconnMgr.getConnection(remConf.getConnectionName());
-					IRemoteFileManager remoteFileManager = remoteServices.getFileManager(rconn);
-
-					return remoteFileManager;
-				}
-			}
-		}
-		return null;
-	}
-
-	protected static String [] getEnvironmentToAppend(ILaunchConfiguration configuration) throws CoreException {
-		Map<?,?> defaultEnv = null;
-		Map<?,?> configEnv = configuration.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, defaultEnv);
-		if (configEnv == null) {
-			return null;
-		}
-		if (! configuration.getAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true)) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPLaunchPlugin.getUniqueIdentifier(), 
-					Messages.AbstractParallelLaunchConfigurationDelegate_Parallel_launcher_does_not_support));
-		}
-
-		List<String> strings = new ArrayList<String>(configEnv.size());
-		Iterator<?> iter= configEnv.entrySet().iterator();
-		while (iter.hasNext()) {
-			Entry<?,?> entry = (Entry<?, ?>) iter.next();
-			String key = (String) entry.getKey();
-            String value = (String) entry.getValue();
-            strings.add(key+"="+value); //$NON-NLS-1$
-
-		}
-		return strings.toArray(new String[strings.size()]);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/LinuxPath.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/LinuxPath.java
deleted file mode 100644
index ce3a920..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/LinuxPath.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.internal;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-public class LinuxPath {
-	public static String toString(IPath path) {
-		return path.toString();
-	}
-
-	public static IPath fromString(String location) {
-		return new Path(location);
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/PTPLaunchShortcut.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/PTPLaunchShortcut.java
deleted file mode 100644
index 3663feb..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/PTPLaunchShortcut.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.ILaunchGroup;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-/**
- *
- */
-public class PTPLaunchShortcut implements ILaunchShortcut {
-    public static final String LauncherGroupID = "org.eclipse.debug.ui.launchGroup.run";
-    
-	/**
-	 * @see ILaunchShortcut#launch(IEditorPart, String)
-	 */
-	public void launch(IEditorPart editor, String mode) {
-		IEditorInput input = editor.getEditorInput();
-		IProject element = (IProject) input.getAdapter(IProject.class);
-		launch(element, mode);
-	}
-	
-	/**
-	 * @see ILaunchShortcut#launch(ISelection, String)
-	 */
-	public void launch(ISelection selection, String mode) {
-		if (selection instanceof IStructuredSelection) {
-		    launch(((IStructuredSelection)selection).getFirstElement(), mode);
-		} 		
-	}
-	
-	public void launch(Object element, String mode) {
-	    if (!(element instanceof IFile)) {
-	        MessageDialog.openInformation(PTPLaunchPlugin.getActiveWorkbenchShell(), "Incorrect file", "Please select parallel program file");
-	        return;
-	    }
-	        
-	    IFile file = (IFile)element;
-	        
-	    ILaunchConfiguration config = getILaunchConfigure(file);
-	    IStructuredSelection selection = null;
-	    if (config == null)
-	        selection  = new StructuredSelection();
-	    else 
-	        selection = new StructuredSelection(config);
-	        
-	    ILaunchGroup group = DebugUITools.getLaunchGroup(config, mode);
-		DebugUITools.openLaunchConfigurationDialogOnGroup(PTPDebugUIPlugin.getShell(), selection, group.getIdentifier());
-	}
-	
-	public ILaunchConfiguration getILaunchConfigure(IFile file) {
-	    String projectName = file.getProject().getName();
-	    ILaunchManager lm = getLaunchManager();
-	    ILaunchConfigurationType configType = lm.getLaunchConfigurationType(IPTPLaunchConfigurationConstants.PTP_LAUNCHCONFIGURETYPE_ID);
-		try {
-		    ILaunchConfiguration[] configs = lm.getLaunchConfigurations(configType);
-		    for (int i=0; i<configs.length; i++) {
-		        if (configs[i].getAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(projectName))
-		            return configs[i];
-		    }
-		    ILaunchConfigurationWorkingCopy wc = configType.newInstance(file.getProject(), projectName);		    
-		    wc.setAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, projectName);
-		    wc.setAttribute(IPTPLaunchConfigurationConstants.ATTR_APPLICATION_NAME, file.getName());
-	        //wc.setAttribute(IPTPLaunchConfigurationConstants.NETWORK_TYPE, IPTPLaunchConfigurationConstants.DEF_NETWORK_TYPE);
-
-		    return wc.doSave();
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-	
-	
-	private ILaunchManager getLaunchManager() {
-	    return DebugPlugin.getDefault().getLaunchManager();
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ParallelLaunchConfigurationDelegate.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ParallelLaunchConfigurationDelegate.java
deleted file mode 100644
index b189d29..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ParallelLaunchConfigurationDelegate.java
+++ /dev/null

@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California.
- * This material was produced under U.S. Government contract W-7405-ENG-36
- * for Los Alamos National Laboratory, which is operated by the University
- * of California for the U.S. Department of Energy. The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
- * to produce derivative works, such modified software should be clearly marked,
- * so as not to confuse it with the version available from LANL.
- *
- * Additionally, this program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.debug.core.IPDebugConfiguration;
-import org.eclipse.ptp.debug.core.IPDebugger;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.WorkbenchException;
-/**
- *
- */
-public class ParallelLaunchConfigurationDelegate
-extends AbstractParallelLaunchConfigurationDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.internal.AbstractParallelLaunchConfigurationDelegate#doCompleteJobLaunch(org.eclipse.ptp.core.elements.IPJob)
-	 */
-	@Override
-	protected void doCompleteJobLaunch(ILaunchConfiguration configuration, String mode, final IPLaunch launch,
-			AttributeManager mgr, final IPDebugger debugger, final IPJob job) {
-		launch.setAttribute(ElementAttributes.getIdAttributeDefinition().getId(), job.getID());
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			launch.setPJob(job);
-			try {
-				setDefaultSourceLocator(launch, configuration);
-				final IProject project = verifyProject(configuration);
-				final IPath execPath = verifyExecutablePath(configuration);
-
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						IRunnableWithProgress runnable = new IRunnableWithProgress() {
-							public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-								if (monitor.isCanceled())
-									throw new InterruptedException("The job is cancelled."); //$NON-NLS-1$
-								monitor.beginTask("Debugger has started, waiting for connection...", 1); //$NON-NLS-1$
-								try {
-									IPSession session = PTPDebugCorePlugin.getDebugModel().createDebugSession(debugger, launch, project, execPath);
-
-									String app = job.getAttribute(JobAttributes.getExecutableNameAttributeDefinition()).getValueAsString();
-									String path = job.getAttribute(JobAttributes.getExecutablePathAttributeDefinition()).getValueAsString();
-									String cwd = job.getAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition()).getValueAsString();
-									List<String> args = job.getAttribute(JobAttributes.getProgramArgumentsAttributeDefinition()).getValue();
-
-									session.connectToDebugger(monitor, app, path, cwd, args.toArray(new String[args.size()]));
-								} catch (CoreException e) {
-									throw new InvocationTargetException(e);
-								} finally {
-									monitor.done();
-								}
-							}
-						};
-						try {
-							new ProgressMonitorDialog(PTPLaunchPlugin.getActiveWorkbenchShell()).run(true, true, runnable);
-						} catch (InterruptedException e) {
-							System.out.println("Debug job launch interrupted: " + e.getMessage()); //$NON-NLS-1$
-							terminateJob(job);
-						} catch (InvocationTargetException e) {
-							String msg = e.getMessage();
-							Throwable t = e.getCause();
-							if (t != null) {
-								msg = t.getMessage();
-							}
-							System.out.println("Error completing debug job launch: " + msg); //$NON-NLS-1$
-							PTPLaunchPlugin.errorDialog("Error completing debug job launch", t);
-							PTPLaunchPlugin.log(t);
-							terminateJob(job);
-						}
-					}
-				});
-			} catch (final CoreException e) {
-				/*
-				 * Completion of launch fails, then terminate the job and display error message.
-				 */
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						PTPLaunchPlugin.errorDialog("Error completing launch", e.getStatus());
-					}
-				});
-				PTPLaunchPlugin.log(e);
-				terminateJob(job);
-			}
-		} else {
-			new RuntimeProcess(launch, job, null);
-		}
-	}
-
-	@Override
-	protected void doCleanuoLaunch(ILaunchConfiguration configuration,
-			String mode, IPLaunch launch, AttributeManager attrMgr,
-			IPDebugger debugger, IPJob job) {
-		if (debugger != null) {
-			debugger.cleanup(configuration, attrMgr, launch);
-		}
-	}
-
-	private void terminateJob(final IPJob job) {
-		try {
-			IResourceManager rm = job.getQueue().getResourceManager();
-			rm.terminateJob(job);
-		} catch (CoreException e1) {
-			// Ignore, but log
-			PTPLaunchPlugin.log(e1);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		if (!(launch instanceof IPLaunch)) {
-			abort(Messages.ParallelLaunchConfigurationDelegate_Invalid_launch_object, null, 0);
-		}
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("", 250);
-		monitor.setTaskName(MessageFormat.format("{0} . . .", new Object[] { "Launching " + configuration.getName() })); //$NON-NLS-1$ $NON-NLS-2$
-		if (monitor.isCanceled())
-			return;
-		IPDebugger debugger = null;
-		IPJob job = null;
-
-		monitor.worked(10);
-		monitor.subTask("Copying data . . .");
-
-		AttributeManager attrManager = getAttributeManager(configuration, mode);
-
-		// All copy pre-"job submission" occurs here
-		copyExecutable(configuration, monitor);
-		doPreLaunchSynchronization(configuration, monitor);
-
-		//switch perspective
-		switchPerspective(DebugUITools.getLaunchPerspective(configuration.getType(), mode));
-		try {
-			if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-				// show ptp debug view
-				showPTPDebugView(IPTPDebugUIConstants.ID_VIEW_PARALLELDEBUG);
-				monitor.subTask("Configuring debug setting . . ."); //$NON-NLS-1$
-
-				/*
-				 * Create the debugger extension, then the connection point for the debug server.
-				 * The debug server is launched via the submitJob() command.
-				 */
-
-				IPDebugConfiguration debugConfig = getDebugConfig(configuration);
-				debugger = debugConfig.getDebugger();
-				debugger.initialize(configuration, attrManager, monitor);
-				if (monitor.isCanceled())
-					return;
-				debugger.getLaunchAttributes(configuration, attrManager);
-			}
-
-			monitor.worked(10);
-			monitor.subTask("Submitting the job . . ."); //$NON-NLS-1$
-
-			submitJob(configuration, mode, (IPLaunch)launch, attrManager, debugger, monitor);
-
-			monitor.worked(10);
-		} catch (CoreException e) {
-			if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-				PTPDebugCorePlugin.getDebugModel().shutdownSession(job);
-			}
-			if (e.getStatus().getCode() != IStatus.CANCEL)
-				throw e;
-		} finally {
-			monitor.done();
-		}
-	}
-
-	/**
-	 * Show the PTP Debug view
-	 *
-	 * @param viewID
-	 */
-	protected void showPTPDebugView(final String viewID) {
-		Display display = Display.getCurrent();
-		if (display == null) {
-			display = Display.getDefault();
-		}
-		if (display != null && !display.isDisposed()) {
-			display.syncExec(new Runnable() {
-				public void run() {
-					IWorkbenchWindow window = PTPLaunchPlugin.getActiveWorkbenchWindow();
-					if (window != null) {
-						IWorkbenchPage page = window.getActivePage();
-						if (page != null) {
-							try {
-								page.showView(viewID, null, IWorkbenchPage.VIEW_CREATE);
-							} catch (PartInitException e) {}
-						}
-					}
-				}
-			});
-		}
-	}
-
-
-	/**
-	 * Used to force switching to the PTP Debug perspective
-	 *
-	 * @param perspectiveID
-	 */
-	protected void switchPerspective(final String perspectiveID) {
-		Display display = Display.getCurrent();
-		if (display == null) {
-			display = Display.getDefault();
-		}
-		if (display != null && !display.isDisposed()) {
-			display.syncExec(new Runnable() {
-				public void run() {
-					IWorkbenchWindow window = PTPLaunchPlugin.getActiveWorkbenchWindow();
-					if (window != null) {
-						IWorkbenchPage page = window.getActivePage();
-						if (page != null) {
-							if (page.getPerspective().getId().equals(perspectiveID))
-								return;
-
-							try {
-								window.getWorkbench().showPerspective(perspectiveID, window);
-							} catch (WorkbenchException e) { }
-						}
-					}
-				}
-			});
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/RuntimeProcess.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/RuntimeProcess.java
deleted file mode 100644
index 042a4f1..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/RuntimeProcess.java
+++ /dev/null

@@ -1,170 +0,0 @@
-package org.eclipse.ptp.launch.internal;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes.State;
-import org.eclipse.ptp.core.elements.events.IJobChangeEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobListener;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-
-public class RuntimeProcess implements IProcess, IJobListener {
-	private IPLaunch launch = null;
-	private IPJob job = null;
-	private Map<String, String> fAttributes;
-	private int fExitValue = -1;
-	private boolean fTerminated = false;
-	
-	public RuntimeProcess(IPLaunch launch, IPJob job, Map<String, String> attributes) {
-		this.launch = launch;
-		this.job = job;	
-		job.addElementListener(this);
-		initializeAttributes(attributes);
-		fTerminated = job.isTerminated();
-		launch.addProcess(this);
-		fireCreationEvent();
-	}
-	
-	private void initializeAttributes(Map<String, String> attributes) {
-		if (attributes != null) {
-			Iterator<String> keys = attributes.keySet().iterator();
-			while (keys.hasNext()) {
-				String key = (String)keys.next();
-				setAttribute(key, (String)attributes.get(key));
-			}	
-		}
-	}	
-	
-	/***************************************************************************************************************************************************************************************************
-	 * IProcess interface
-	 **************************************************************************************************************************************************************************************************/
-	public String getLabel() {
-		return job.getName();
-	}
-	
-	public ILaunch getLaunch() {
-		return launch;
-	}
-	
-	public IStreamsProxy getStreamsProxy() {
-		return null;
-	}
-	
-	public void setAttribute(String key, String value) {
-		if (fAttributes == null) {
-			fAttributes = new HashMap<String, String>(5);
-		}
-		Object origVal = fAttributes.get(key);
-		if (origVal != null && origVal.equals(value)) {
-			return;
-		}
-		fAttributes.put(key, value);
-	}
-	
-	public String getAttribute(String key) {
-		if (fAttributes == null) {
-			return null;
-		}
-		return (String) fAttributes.get(key);
-	}
-	
-	public int getExitValue() throws DebugException {
-		if (isTerminated()) {
-			return fExitValue;
-		}
-		throw new DebugException(new Status(IStatus.ERROR, PTPLaunchPlugin.getUniqueIdentifier(), IStatus.ERROR, "Exit value not available", null));
-	}
-	
-	protected void terminated() {
-		synchronized (this) {
-			fTerminated = true;
-		}
-		fExitValue = 0;
-		job.removeElementListener(this);
-		fireTerminateEvent();
-	}	
-	
-	/***************************************************************************************************************************************************************************************************
-	 * ITerminate interface
-	 **************************************************************************************************************************************************************************************************/
-	public synchronized boolean canTerminate() {
-		return !fTerminated;
-	}
-	
-	public synchronized boolean isTerminated() {
-		return fTerminated;
-	}
-	
-	public void terminate() throws DebugException {
-		if (!isTerminated()) {
-			try {
-				IResourceManager rm = job.getQueue().getResourceManager();
-				rm.terminateJob(job);
-			} catch (CoreException e) {
-				throw new DebugException(e.getStatus());
-			}
-		}
-	}
-	
-	/***************************************************************************************************************************************************************************************************
-	 * Adapter interface
-	 **************************************************************************************************************************************************************************************************/
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IProcess.class)) {
-			return this;
-		}
-		if (adapter.equals(ILaunch.class)) {
-			return getLaunch();
-		}
-		return null;
-	}
-	
-	/***************************************************************************************************************************************************************************************************
-	 * IJobListener interface
-	 **************************************************************************************************************************************************************************************************/
-
-	@SuppressWarnings("unchecked")
-	public void handleEvent(IJobChangeEvent e) {
-		EnumeratedAttribute<JobAttributes.State> attr = e.getAttributes().getAttribute(JobAttributes.getStateAttributeDefinition());
-		if (attr != null) {
-			JobAttributes.State state = attr.getValue();
-			if (state == State.TERMINATED || state == State.ERROR) {
-				terminated();
-			}
-		} 
-	}
-	
-	/***************************************************************************************************************************************************************************************************
-	 * Debug Event
-	 **************************************************************************************************************************************************************************************************/
-	protected void fireCreationEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.CREATE));
-	}
-	
-	protected void fireEvent(DebugEvent event) {
-		DebugPlugin manager= DebugPlugin.getDefault();
-		if (manager != null) {
-			manager.fireDebugEventSet(new DebugEvent[]{event});
-		}
-	}
-	
-	protected void fireTerminateEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.TERMINATE));
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/AbstractDebuggerTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/AbstractDebuggerTab.java
deleted file mode 100644
index 86da61d..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/AbstractDebuggerTab.java
+++ /dev/null

@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 QNX Software Systems 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:
- *     QNX Software Systems - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.launch.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.debug.core.IPDebugConfiguration;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.launch.ui.LaunchConfigurationTab;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-
-public abstract class AbstractDebuggerTab extends LaunchConfigurationTab {
-	protected ILaunchConfigurationWorkingCopy fWorkingCopy;
-	protected IPDebugConfiguration fCurrentDebugConfig;
-
-	// Dynamic Debugger UI widgets
-	protected ILaunchConfigurationTab fDynamicTab;
-	protected Composite fDynamicTabHolder;
-	private boolean fInitDefaults;
-	private Combo fDCombo;
-	private boolean fIsInitializing = false;
-	private boolean fPageUpdated;
-
-	protected void setDebugConfig(IPDebugConfiguration config) {
-		fCurrentDebugConfig = config;
-	}
-
-	protected IPDebugConfiguration getDebugConfig() {
-		return fCurrentDebugConfig;
-	}
-
-	protected ILaunchConfigurationTab getDynamicTab() {
-		return fDynamicTab;
-	}
-
-	protected void setDynamicTab(ILaunchConfigurationTab tab) {
-		fDynamicTab = tab;
-	}
-
-	protected Composite getDynamicTabHolder() {
-		return fDynamicTabHolder;
-	}
-
-	protected void setDynamicTabHolder(Composite tabHolder) {
-		fDynamicTabHolder = tabHolder;
-	}
-
-	protected ILaunchConfigurationWorkingCopy getLaunchConfigurationWorkingCopy() {
-		return fWorkingCopy;
-	}
-
-	public void setLaunchConfiguration(ILaunchConfiguration launchConfiguration) {
-		super.setLaunchConfiguration(launchConfiguration);
-		setLaunchConfigurationWorkingCopy(null);
-	}
-
-	protected void setLaunchConfigurationWorkingCopy(ILaunchConfigurationWorkingCopy workingCopy) {
-		fWorkingCopy = workingCopy;
-	}
-
-	/**
-	 * Overridden here so that any error message in the dynamic UI gets
-	 * returned.
-	 * 
-	 * @see ILaunchConfigurationTab#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		ILaunchConfigurationTab tab = getDynamicTab();
-		if ( (super.getErrorMessage() != null) || (tab == null)) {
-			return super.getErrorMessage();
-		}
-		return tab.getErrorMessage();
-	}
-
-	/**
-	 * Notification that the user changed the selection of the Debugger.
-	 */
-	protected void handleDebuggerChanged() {
-		loadDynamicDebugArea();
-
-		// always set the newly created area with defaults
-		ILaunchConfigurationWorkingCopy wc = getLaunchConfigurationWorkingCopy();
-		if (getDynamicTab() == null) {
-			// remove any debug specfic args from the config
-			if (wc == null) {
-				if (getLaunchConfiguration().isWorkingCopy()) {
-					wc = (ILaunchConfigurationWorkingCopy)getLaunchConfiguration();
-				}
-			}
-			if (wc != null) {
-				wc.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_SPECIFIC_ATTRS_MAP, (Map)null);
-			}
-		} else {
-			if (wc == null) {
-				try {
-					if (getLaunchConfiguration().isWorkingCopy()) {
-						setLaunchConfigurationWorkingCopy((ILaunchConfigurationWorkingCopy)getLaunchConfiguration());
-					} else {
-						setLaunchConfigurationWorkingCopy(getLaunchConfiguration().getWorkingCopy());
-					}
-					wc = getLaunchConfigurationWorkingCopy();
-				} catch (CoreException e) {
-					return;
-				}
-			}
-			if (initDefaults()) {
-				getDynamicTab().setDefaults(wc);
-			}
-			setInitializeDefault(false);
-			getDynamicTab().initializeFrom(wc);
-		}
-	}
-
-	/**
-	 * Show the contributed piece of UI that was registered for the debugger id
-	 * of the currently selected debugger.
-	 */
-	protected void loadDynamicDebugArea() {
-		// Dispose of any current child widgets in the tab holder area
-		Control[] children = getDynamicTabHolder().getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].dispose();
-		}
-
-		// Retrieve the dynamic UI for the current Debugger
-		IPDebugConfiguration debugConfig = getConfigForCurrentDebugger();
-		if (debugConfig == null) {
-			setDynamicTab(null);
-		} else {
-			ILaunchConfigurationTab tab = null;
-			try {
-				tab = PTPDebugUIPlugin.getDefault().getDebuggerPage(debugConfig.getID());
-			} catch (CoreException e) {
-				PTPLaunchPlugin.errorDialog(Messages.AbstractDebuggerTab_ErrorLoadingDebuggerPage, e.getStatus());
-			}
-			setDynamicTab(tab);
-		}
-		setDebugConfig(debugConfig);
-		if (getDynamicTab() == null) {
-			return;
-		}
-		// Ask the dynamic UI to create its Control
-		getDynamicTab().setLaunchConfigurationDialog(getLaunchConfigurationDialog());
-		getDynamicTab().createControl(getDynamicTabHolder());
-		getDynamicTab().getControl().setVisible(true);
-		getDynamicTabHolder().layout(true);
-	}
-
-	abstract public void createControl(Composite parent);
-
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			dynamicTab.activated(workingCopy);
-		}
-	}
-
-	public void initializeFrom(ILaunchConfiguration config) {
-		setLaunchConfiguration(config);
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			dynamicTab.initializeFrom(config);
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		if (getDebugConfig() != null) {
-			config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_ID, getDebugConfig().getID());
-			ILaunchConfigurationTab dynamicTab = getDynamicTab();
-			if (dynamicTab == null) {
-				config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_SPECIFIC_ATTRS_MAP, (Map)null);
-			} else {
-				dynamicTab.performApply(config);
-			}
-		}
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		setLaunchConfigurationWorkingCopy(config);
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			dynamicTab.setDefaults(config);
-			setInitializeDefault(false);
-		}
-	}
-
-	public boolean isValid(ILaunchConfiguration config) {
-		setErrorMessage(null);
-		setMessage(null);
-		if (getDebugConfig() == null) {
-			setErrorMessage(Messages.AbstractDebuggerTab_No_debugger_available);
-			return false;
-		}
-
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			return dynamicTab.isValid(config);
-		}
-		return true;
-	}
-
-	public boolean canSave() {
-		setErrorMessage(null);
-		setMessage(null);
-		if (getDebugConfig() == null) {
-			setErrorMessage(Messages.AbstractDebuggerTab_No_debugger_available);
-			return false;
-		}
-
-		ILaunchConfigurationTab dynamicTab = getDynamicTab();
-		if (dynamicTab != null) {
-			return dynamicTab.canSave();
-		}
-		return true;
-	}
-	
-	protected void setInitializeDefault(boolean init) {
-		fInitDefaults = init;
-	}
-
-	protected boolean initDefaults() {
-		return fInitDefaults;
-	}
-
-	public Image getImage() {
-		return LaunchImages.getImage(LaunchImages.IMG_DEBUGGER_TAB);
-	}
-
-	public String getName() {
-		return Messages.AbstractDebuggerTab_Debugger;
-	}
-
-	protected void createDebuggerCombo(Composite parent, int colspan) {
-		Composite comboComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		comboComp.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = colspan;
-		comboComp.setLayoutData(gd);
-		Label dlabel = new Label(comboComp, SWT.NONE);
-		dlabel.setText(Messages.Launch_common_DebuggerColon);
-		fDCombo = new Combo(comboComp, SWT.READ_ONLY | SWT.DROP_DOWN);
-		fDCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fDCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (!isInitializing()) {
-					setInitializeDefault(true);
-					updateComboFromSelection();
-				}
-			}
-		});
-	}
-
-	protected void loadDebuggerCombo(IPDebugConfiguration[] debugConfigs, String current) {
-		fDCombo.removeAll();
-		int select = -1;
-		for (int i = 0; i < debugConfigs.length; i++) {
-			fDCombo.add(debugConfigs[i].getName());
-			fDCombo.setData(Integer.toString(i), debugConfigs[i]);
-			if (debugConfigs[i].getID().equalsIgnoreCase(current)) {
-				select = i;
-			}
-		}
-
-		fPageUpdated = false;
-		if (select != -1) {
-			fDCombo.select(select);
-		}
-		//The behaviour is undefined for if the callbacks should be triggered for this, so force page update if needed.
-		if (!fPageUpdated) {
-			updateComboFromSelection();
-		}
-		fPageUpdated = false;
-		getControl().getParent().layout(true);
-	}
-
-	protected void createDebuggerGroup(Composite parent, int colspan) {
-		Group debuggerGroup = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		debuggerGroup.setText(Messages.DebuggerTab_Debugger_Options);
-		setDynamicTabHolder(debuggerGroup);
-		GridLayout tabHolderLayout = new GridLayout();
-		tabHolderLayout.marginHeight = 0;
-		tabHolderLayout.marginWidth = 0;
-		tabHolderLayout.numColumns = 1;
-		getDynamicTabHolder().setLayout(tabHolderLayout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = colspan;
-		getDynamicTabHolder().setLayoutData(gd);
-	}
-
-	protected void updateComboFromSelection() {
-		fPageUpdated = true;
-		handleDebuggerChanged();
-		updateLaunchConfigurationDialog();
-	}
-
-	protected boolean isInitializing() {
-		return fIsInitializing;
-	}
-
-	protected void setInitializing(boolean isInitializing) {
-		fIsInitializing = isInitializing;
-	}
-
-	/**
-	 * Return the class that implements <code>ILaunchConfigurationTab</code>
-	 * that is registered against the debugger id of the currently selected
-	 * debugger.
-	 */
-	protected IPDebugConfiguration getConfigForCurrentDebugger() {
-		int selectedIndex = fDCombo.getSelectionIndex();
-		return (IPDebugConfiguration)fDCombo.getData(Integer.toString(selectedIndex));
-	}
-
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchImages.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchImages.java
deleted file mode 100644
index d61ae9a..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchImages.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.internal.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class LaunchImages {
-	private static final String NAME_PREFIX = "org.eclipse.ptp.launch."; //$NON-NLS-1$
-	private static final int NAME_PREFIX_LENGTH = NAME_PREFIX.length();
-    
-	private static URL iconBaseURL = null;
-	
-	static {
-		String pathSuffix = "icons/";
-		iconBaseURL = PTPLaunchPlugin.getDefault().getBundle().getEntry(pathSuffix);
-	}
-	
-	// The plugin registry
-	private static ImageRegistry imageRegistry = null;
-	private static HashMap<String,ImageDescriptor> avoidSWTErrorMap = null;
-
-	public static final String IMG_PARALLEL_TAB = NAME_PREFIX + "parallel_tab.gif"; //$NON-NLS-1$
-	public static final String IMG_ARGUMENTS_TAB = NAME_PREFIX + "arguments_tab.gif"; //$NON-NLS-1$
-	public static final String IMG_MAIN_TAB = NAME_PREFIX + "main_tab.gif"; //$NON-NLS-1
-	public static final String IMG_DEBUGGER_TAB = NAME_PREFIX + "debugger_tab.gif"; //$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_PARALLEL_TAB = createManaged(IMG_PARALLEL_TAB);
-	public static final ImageDescriptor DESC_ARGUMENTS_TAB = createManaged(IMG_ARGUMENTS_TAB);
-	public static final ImageDescriptor DESC_MAIN_TAB = createManaged(IMG_MAIN_TAB);	
-	public static final ImageDescriptor DESC_DEBUGGER_TAB = createManaged(IMG_DEBUGGER_TAB);	
-	/**
-	 * Returns the image managed under the given key in this registry.
-	 * 
-	 * @param key the image's key
-	 * @return the image managed under the given key
-	 */ 
-	public static Image getImage(String key) {
-		return getImageRegistry().get(key);
-	}
-	public static ImageDescriptor getDescriptor(String key) {
-		return getImageRegistry().getDescriptor(key);
-	}
-	
-	private static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-			for (String key : avoidSWTErrorMap.keySet()) {
-				imageRegistry.put(key, (ImageDescriptor) avoidSWTErrorMap.get(key));
-			}
-			avoidSWTErrorMap = null;
-		}
-		return imageRegistry;
-	}
-	
-	private static ImageDescriptor createManaged(String name) {
-		try {
-			ImageDescriptor result = ImageDescriptor.createFromURL(makeIconFileURL(name.substring(NAME_PREFIX_LENGTH)));
-			if (avoidSWTErrorMap == null) {
-				avoidSWTErrorMap = new HashMap<String,ImageDescriptor>(); 
-			}
-			avoidSWTErrorMap.put(name, result);
-			if (imageRegistry != null) {
-			    System.out.println("Internal Error: Image registry already defined"); //$NON-NLS-1$
-			}
-			return result;
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	private static URL makeIconFileURL(String name) throws MalformedURLException {
-		if (iconBaseURL == null)
-			throw new MalformedURLException();
-			
-		return new URL(iconBaseURL, name);
-	}	
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchUtils.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchUtils.java
deleted file mode 100644
index 9a83566..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/LaunchUtils.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.internal.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.WorkbenchException;
-
-/**
- *
- */
-public class LaunchUtils {
-    public static final String ParallelProcessesView_ID = "org.eclipse.ptp.ui.views.parallelProcessesView";
-	public static final String PPerspectiveFactory_ID = "org.eclipse.ptp.ui.PRunPerspective";
-    public static final String ParallelProcessViewer_ID = "org.eclipse.ptp.ui.views.parallelProcessViewer";
-    public static final String ParallelNodeStatusView_ID = "org.eclipse.ptp.ui.views.parallelNodeStatusView";
-    public static final String ParallelJobsView_ID = "org.eclipse.ptp.ui.views.parallelJobsView";
-    public static final String ParallelProcessStatusView_ID = "org.ecliipse.ptd.ui.views.parallelProcessStatusView";
-    public static final String PTP_ACTION_SET = "org.eclipse.ptp.actionSets";
-    public static final String PTP_SEARCHPAGE_ID = "org.eclipse.ptp.ui.PSearchPage";        
-    
-    public static final int NORMAL = 0;
-    public static final int ASYNC = 1;
-
-    protected static void showDialog(final Shell shell, final String title, final String message, final int style) {
-        MessageBox dialog = new MessageBox(shell, style);
-        dialog.setMessage(message);
-        dialog.setText(title);
-        dialog.open();
-    }
-
-    protected static void showDialogAsync(final Shell shell, final String title, final String message, final int style) {
-        shell.getDisplay().asyncExec(new Runnable() {
-            public void run() {
-                showDialog(shell, title, message, style);
-            }
-        });
-    }
-
-    public static void showWarningDialog(final Shell shell, final String title, final String message, int flag) {
-        if (flag == NORMAL)
-            showDialog(shell, title, message, SWT.ICON_WARNING | SWT.OK);
-        else
-            showDialogAsync(shell, title, message, SWT.ICON_WARNING | SWT.OK);
-    }
-
-    public static void showInformationDialog(final Shell shell, final String title, final String message, int flag) {
-        if (flag == NORMAL)
-            showDialog(shell, title, message, SWT.ICON_INFORMATION | SWT.OK);
-        else
-            showDialogAsync(shell, title, message, SWT.ICON_INFORMATION | SWT.OK);
-    }
-
-    public static void showErrorDialog(final Shell shell, final String title, final String message, int flag) {
-        if (flag == NORMAL)
-            showDialog(shell, title, message, SWT.ICON_ERROR | SWT.OK);
-        else
-            showDialogAsync(shell, title, message, SWT.ICON_ERROR | SWT.OK);
-    }
-
-    // IStatus can be retrieved from CoreException e.getStatus()
-    public static void showDetailErrorDialog(final Shell shell, final String title, final String message, final IStatus status) {
-        shell.getDisplay().asyncExec(new Runnable() {
-            public void run() {
-                ErrorDialog.openError(shell, title, message, status);
-            }
-        });
-    }
-
-    public static void showErrorDialog(final String title, final String message, final IStatus status) {
-        Display.getDefault().asyncExec(new Runnable() {
-            public void run() {
-                final Shell shell = Display.getDefault().getActiveShell();
-                if (status == null)
-                    MessageDialog.openError(shell, title, message);
-                else
-                    ErrorDialog.openError(shell, title, message, status);
-            }
-        });
-    }
-
-    public static boolean showQuestionDialog(final String title, final String message) {
-        final Shell shell = Display.getDefault().getActiveShell();
-        return MessageDialog.openQuestion(shell, title, message);
-    }
-
-    public static void showView(final String viewID) {
-        BusyIndicator.showWhile(null, new Runnable() {
-            public void run() {
-                Display.getDefault().syncExec(new Runnable() {
-                    public void run() {
-                        try {
-                            displayView(viewID);
-                        } catch (NullPointerException e) {
-                            System.out.println("Show View err: " + e.getMessage());
-                        }
-                    }
-                });
-            }
-        });
-    }
-
-    public static void switchPerspectiveTo(final String perspectiveID) {
-        Display.getDefault().syncExec(new Runnable() {
-            public void run() {
-                IWorkbenchPage page = getActivePage();
-                if (page.getPerspective().getId().equals(perspectiveID))
-                    return;
-                IWorkbench bench = PTPLaunchPlugin.getDefault().getWorkbench();
-                try {
-                    bench.showPerspective(perspectiveID, PTPLaunchPlugin.getActiveWorkbenchWindow());
-                } catch (WorkbenchException e) {
-                    showErrorDialog("Display Error", "Cannot switch Perspective to: " + perspectiveID, e.getStatus());
-                }
-            }
-        });
-    }
-
-    public static IWorkbenchPage getActivePage() {
-        return PTPLaunchPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
-    }
-
-    public static void displayView(String viewID) throws NullPointerException {
-        IWorkbenchPage page = getActivePage();
-        try {
-            page.showView(viewID);
-        } catch (PartInitException e) {
-            showErrorDialog("Display Error", "Cannot show View ID: " + viewID, e.getStatus());
-        }
-    }
-
-    public static IViewPart findView(String viewID) {
-        IWorkbenchPage page = getActivePage();
-        return page.findView(viewID);
-    }
-
-    public static void closeView(String viewID) {
-        IViewPart viewPart = findView(viewID);
-        if (viewPart == null)
-            return;
-        viewPart.dispose();
-    }
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/ParallelLaunchConfigurationTabGroup.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/ParallelLaunchConfigurationTabGroup.java
deleted file mode 100644
index 6cfe9ab..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/internal/ui/ParallelLaunchConfigurationTabGroup.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.internal.ui;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.ptp.launch.ui.ApplicationTab;
-import org.eclipse.ptp.launch.ui.ArgumentsTab;
-import org.eclipse.ptp.launch.ui.DebuggerTab;
-import org.eclipse.ptp.launch.ui.EnhancedSynchronizeTab;
-import org.eclipse.ptp.launch.ui.EnvironmentTab;
-import org.eclipse.ptp.launch.ui.ResourcesTab;
-
-/**
- * 
- */
-public class ParallelLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-    		ILaunchConfigurationTab tabs[] = {
-        		new ResourcesTab(),
-        		new ApplicationTab(), 
-        		new EnhancedSynchronizeTab(),
-        		new DebuggerTab(false),
-        		new ArgumentsTab(),
-        		new SourceLookupTab(),
-        		new EnvironmentTab(), 
-        		new CommonTab() };
-    		setTabs(tabs);
-	}    
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/Messages.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/Messages.java
deleted file mode 100644
index 677fa8d..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/Messages.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.launch.messages.messages"; //$NON-NLS-1$
-
-	public static String CommonTab_common_Exception_occurred_reading_configuration_EXCEPTION;
-	public static String Tab_common_Browse_1;
-	public static String Tab_common_Browse_2;
-	public static String Launch_common_DebuggerColon;
-	public static String Launch_common_Error;
-
-	public static String ApplicationTab_Main;
-	public static String ApplicationTab_RM_Selection_Label;
-	public static String ApplicationTab_Project_Label;
-	public static String ApplicationTab_Application_Label;
-	public static String ApplicationTab_No_Resource_Manager_Available;
-	public static String ApplicationTab_Project_Selection_Title;
-	public static String ApplicationTab_Project_Selection_Message;
-	public static String ApplicationTab_Project_required;
-	public static String ApplicationTab_Enter_project_before_browsing_for_program;
-	public static String ApplicationTab_Program_selection;
-	public static String ApplicationTab_Choose_program_to_run_from_NAME;
-	public static String ApplicationTab_Selection_must_be_file;
-	public static String ApplicationTab_Illegal_project;
-	public static String ApplicationTab_Project_not_exist;
-	public static String ApplicationTab_Project_is_closed;
-	public static String ApplicationTab_Application_program_not_specified;
-	public static String ApplicationTab_Console;
-
-	public static String ResourcesTab_Resources;
-	public static String ResourcesTab_Launch_Attributes;
-	public static String ResourcesTab_No_Resource_Manager;
-	public static String ResourcesTab_No_Launch_Configuration;
-
-	public static String ArgumentsTab_Arguments;
-	public static String ArgumentsTab_Parallel_Program_Arguments;
-
-	public static String AbstractDebuggerTab_No_debugger_available;
-	public static String AbstractDebuggerTab_Debugger;
-	public static String AbstractDebuggerTab_ErrorLoadingDebuggerPage;
-
-	public static String DebuggerTab_Stop_at_main_on_startup;
-	public static String DebuggerTab_Debugger_Options;
-	public static String DebuggerTab_Mode_not_supported;
-	public static String DebuggerTab_No_debugger_available;
-
-	public static String WorkingDirectoryBlock_Working_directory;
-	public static String WorkingDirectoryBlock_Working_directory_colon;
-	public static String WorkingDirectoryBlock_Use_default_working_directory;
-	public static String WorkingDirectoryBlock_Local_directory;
-	public static String WorkingDirectoryBlock_Workspace;
-	public static String WorkingDirectoryBlock_Select_workspace_relative_working_directory;
-	public static String WorkingDirectoryBlock_Select_working_directory_for_launch_configuration;
-	public static String WorkingDirectoryBlock_Working_directory_does_not_exist;
-	public static String WorkingDirectoryBlock_Working_directory_is_not_a_directory;
-	public static String WorkingDirectoryBlock_Project_or_folder_does_not_exist;
-
-	public static String ParallelLaunchConfigurationDelegate_Invalid_launch_object;
-
-	public static String AbstractParallelLaunchConfigurationDelegate_Project_not_specified;
-	public static String AbstractParallelLaunchConfigurationDelegate_Project_does_not_exist_or_is_not_a_project;
-	public static String AbstractParallelLaunchConfigurationDelegate_Application_file_not_specified;
-	public static String AbstractParallelLaunchConfigurationDelegate_Application_file_does_not_exist;
-	public static String AbstractParallelLaunchConfigurationDelegate_Working_directory_does_not_exist;
-	public static String AbstractParallelLaunchConfigurationDelegate_Path_not_found;
-	public static String AbstractParallelLaunchConfigurationDelegate_No_ResourceManager;
-	public static String AbstractParallelLaunchConfigurationDelegate_Debugger_path_not_found;
-	public static String AbstractParallelLaunchConfigurationDelegate_Program_is_not_a_recongnized_executable;
-	public static String AbstractParallelLaunchConfigurationDelegate_Local_resource_does_not_exist;
-	public static String AbstractParallelLaunchConfigurationDelegate_Could_not_retrieve_local_resource_info;
-	public static String AbstractParallelLaunchConfigurationDelegate_Remote_resource_does_not_exist;
-	public static String AbstractParallelLaunchConfigurationDelegate_Could_not_retrieve_remote_resource_info;
-	public static String AbstractParallelLaunchConfigurationDelegate_Error_converting_rules;
-	public static String AbstractParallelLaunchConfigurationDelegate_Parallel_launcher_does_not_support;
-	public static String AbstractParallelLaunchConfigurationDelegate_Unsupported_resource_manager_type;
-	public static String AbstractParallelLaunchConfigurationDelegate_Unknown_remote_services;
-	public static String AbstractParallelLaunchConfigurationDelegate_Error_fetching_resource;
-	
-	public static String LauncherExecutionTab_ArgumentsFrame_CommandLineLabel;
-	public static String LauncherExecutionTab_ArgumentsFrame_Title;
-	public static String LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel;
-	public static String LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel;
-	public static String LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption;
-	public static String LauncherExecutionTab_ObserverFrame_ParserLabel;
-	public static String LauncherExecutionTab_ObserverFrame_Title;
-	public static String LauncherExecutionTab_Tab_Title;
-	public static String LauncherExecutionTab_Validation_ObserverAndNoConsole;
-
-	public static String DownloadRuleDialog_AddFileDialog_Message;
-	public static String DownloadRuleDialog_AddFileDialog_Title;
-	public static String DownloadRuleDialog_DestinationFrame_FileSystemButton;
-	public static String DownloadRuleDialog_DestinationFrame_Title;
-	public static String DownloadRuleDialog_DestinationFrame_WorkspaceButton;
-	public static String DownloadRuleDialog_DirectoryDialog_Message;
-	public static String DownloadRuleDialog_DirectoryDialog_Title;
-	public static String DownloadRuleDialog_EditFileDialog_Message;
-	public static String DownloadRuleDialog_EditFileDialog_Title;
-	public static String DownloadRuleDialog_FileListFrame_AddButton;
-	public static String DownloadRuleDialog_FileListFrame_EditButton;
-	public static String DownloadRuleDialog_FileListFrame_RemoveButton;
-	public static String DownloadRuleDialog_FileListFrame_Title;
-	public static String DownloadRuleDialog_Message;
-	public static String DownloadRuleDialog_OptionsFrame_ExecutableCheck;
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption;
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption;
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption;
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteLabel;
-	public static String DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck;
-	public static String DownloadRuleDialog_OptionsFrame_ReadonlyCheck;
-	public static String DownloadRuleDialog_OptionsFrame_Title;
-	public static String DownloadRuleDialog_Title;
-	public static String DownloadRuleDialog_WorkspaceDialog_Title;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_DestinationLabel;
-	public static String EnhancedSynchronizeTab_DownloadLabel_DestinationMissing;
-	public static String EnhancedSynchronizeTab_DownloadLabel_FileListSeparator;
-	public static String EnhancedSynchronizeTab_DownloadLabel_FromLabel;
-	public static String EnhancedSynchronizeTab_DownloadLabel_MultipleFiles;
-	public static String EnhancedSynchronizeTab_DownloadLabel_NoFiles;
-	public static String EnhancedSynchronizeTab_DownloadLabel_OneFile;
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_Executable;
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp;
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_Readonly;
-	public static String EnhancedSynchronizeTab_DownloadLabel_OptionsLabel;
-	public static String EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator;
-	public static String EnhancedSynchronizeTab_DownloadLabel_Type;
-	public static String EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType;
-	public static String EnhancedSynchronizeTab_ErrorMessage_NewRule_Title;
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule;
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule;
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule;
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules;
-	public static String EnhancedSynchronizeTab_RulesFrame_Description;
-	public static String EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled;
-	public static String EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled;
-	public static String EnhancedSynchronizeTab_RulesFrame_Title;
-	public static String EnhancedSynchronizeTab_Tab_Message;
-	public static String EnhancedSynchronizeTab_Tab_Title;
-	public static String EnhancedSynchronizeTab_UploadLabel_DestinationLabel;
-	public static String EnhancedSynchronizeTab_UploadLabel_DestinationSeparator;
-	public static String EnhancedSynchronizeTab_UploadLabel_FileListSeparator;
-	public static String EnhancedSynchronizeTab_UploadLabel_FromLabel;
-	public static String EnhancedSynchronizeTab_UploadLabel_MultipleFiles;
-	public static String EnhancedSynchronizeTab_UploadLabel_NoFiles;
-	public static String EnhancedSynchronizeTab_UploadLabel_OneFile;
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack;
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_Executable;
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp;
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_Readonly;
-	public static String EnhancedSynchronizeTab_UploadLabel_OptionsLabel;
-	public static String EnhancedSynchronizeTab_UploadLabel_Type;
-
-	public static String UploadRuleDialog_FileButtonsFrame_AddDirectoryButton;
-	public static String UploadRuleDialog_FileButtonsFrame_AddFilesButton;
-	public static String UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton;
-	public static String UploadRuleDialog_FileButtonsFrame_Description;
-	public static String UploadRuleDialog_FileButtonsFrame_RemoveButton;
-	public static String UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel;
-	public static String UploadRuleDialog_FileButtonsFrame_Title;
-	public static String UploadRuleDialog_Message;
-	public static String UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title;
-	public static String UploadRuleDialog_OptionsFrame_AddFileDialog_Description;
-	public static String UploadRuleDialog_OptionsFrame_AddFileDialog_Title;
-	public static String UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description;
-	public static String UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title;
-	public static String UploadRuleDialog_OptionsFrame_DownloadBackCheck;
-	public static String UploadRuleDialog_OptionsFrame_ExecutableCheck;
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption;
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption;
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption;
-	public static String UploadRuleDialog_OptionsFrame_OverwriteLabel;
-	public static String UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck;
-	public static String UploadRuleDialog_OptionsFrame_ReadonlyCheck;
-	public static String UploadRuleDialog_OptionsFrame_Title;
-	public static String UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton;
-	public static String UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory;
-	public static String UploadRuleDialog_RemoteDirectoryFrame_Title;
-	public static String UploadRuleDialog_Title;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/messages.properties b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/messages.properties
deleted file mode 100644
index 7a30e0b..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/messages/messages.properties
+++ /dev/null

@@ -1,242 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-CommonTab_common_Exception_occurred_reading_configuration_EXCEPTION=Cannot read configuration
-Tab_common_Browse_1=&Browse
-Tab_common_Browse_2=B&rowse
-Launch_common_DebuggerColon=Debugger:
-Launch_common_Error=Launch Error
-
-#ApplicationTab
-ApplicationTab_Main=Application
-ApplicationTab_RM_Selection_Label=Resource Manager:
-ApplicationTab_Project_Label=Parallel &Project:
-ApplicationTab_Application_Label=&Application program:
-ApplicationTab_No_Resource_Manager_Available=No resource managers available
-ApplicationTab_Project_Selection_Title=Project Selection
-ApplicationTab_Project_Selection_Message=Choose the project containing the program you wish to launch
-ApplicationTab_Project_required=Please select the project first
-ApplicationTab_Enter_project_before_browsing_for_program=Enter project before browsing for program
-ApplicationTab_Program_selection=Program Selection
-ApplicationTab_Choose_program_to_run_from_NAME=Choose program to run
-ApplicationTab_Selection_must_be_file=Selection must be file
-ApplicationTab_Illegal_project=Illegal project name: {0}
-ApplicationTab_Project_not_exist=Project {0} does not exist
-ApplicationTab_Project_is_closed=Project {0} is closed
-ApplicationTab_Application_program_not_specified=Application program is not specified
-ApplicationTab_Console=Display combined output in a console view
-
-#ResourcesTab
-ResourcesTab_Resources=Resources
-ResourcesTab_Launch_Attributes=Launch Attributes
-ResourcesTab_No_Resource_Manager=No Resource Manager has been selected
-ResourcesTab_No_Launch_Configuration=No Launch Configuration Available for Resource Manager: {0}
-
-#ArgumentsTab
-ArgumentsTab_Arguments=Arguments
-ArgumentsTab_Parallel_Program_Arguments=Parallel program &arguments:
-
-#PDebuggerTab
-AbstractDebuggerTab_No_debugger_available=No debugger available
-AbstractDebuggerTab_Debugger=Debugger
-AbstractDebuggerTab_ErrorLoadingDebuggerPage=Error Loading Debugger UI Component
-
-DebuggerTab_Stop_at_main_on_startup=Stop at main() on startup
-DebuggerTab_Debugger_Options=Debugger Options
-DebuggerTab_Mode_not_supported=Mode ''{0}'' is not supported by selected debugger
-DebuggerTab_No_debugger_available=No debugger available
-
-#WorkingDirectoryBlock
-WorkingDirectoryBlock_Working_directory=Working Directory
-WorkingDirectoryBlock_Working_directory_colon=Working directory:
-WorkingDirectoryBlock_Use_default_working_directory=Use de&fault working directory
-WorkingDirectoryBlock_Local_directory=&Local directory
-WorkingDirectoryBlock_Workspace=Works&pace
-WorkingDirectoryBlock_Select_workspace_relative_working_directory=Select &workspace relative working directory
-WorkingDirectoryBlock_Select_working_directory_for_launch_configuration=Select &working directory for launch configuration
-WorkingDirectoryBlock_Working_directory_does_not_exist=Working directory does not exist
-WorkingDirectoryBlock_Working_directory_is_not_a_directory=Working directory is not a directory
-WorkingDirectoryBlock_Project_or_folder_does_not_exist=Project or folder does not exist
-
-
-#ParallelLaunchConfigurationDelegate
-ParallelLaunchConfigurationDelegate_Invalid_launch_object=Internal error: Invalid launch object
-
-#AbstractParallelLaunchConfigurationDelegate
-AbstractParallelLaunchConfigurationDelegate_Project_not_specified=Project is not specified
-AbstractParallelLaunchConfigurationDelegate_Project_does_not_exist_or_is_not_a_project=Project does not exist or is not a project type
-AbstractParallelLaunchConfigurationDelegate_Application_file_not_specified=Application file is not specified
-AbstractParallelLaunchConfigurationDelegate_Application_file_does_not_exist=Application file does not exist
-AbstractParallelLaunchConfigurationDelegate_Working_directory_does_not_exist=Working directory does not exist
-AbstractParallelLaunchConfigurationDelegate_Path_not_found=Path ''{0}'' not found
-AbstractParallelLaunchConfigurationDelegate_No_ResourceManager=Specified resource manager not found or is not available
-AbstractParallelLaunchConfigurationDelegate_Debugger_path_not_found=Debugger path not found
-AbstractParallelLaunchConfigurationDelegate_Program_is_not_a_recongnized_executable=Program is not a recognized executable
-AbstractParallelLaunchConfigurationDelegate_Local_resource_does_not_exist=Local resource doesn't exist!
-AbstractParallelLaunchConfigurationDelegate_Could_not_retrieve_local_resource_info=Could not retrieve local resource info!
-AbstractParallelLaunchConfigurationDelegate_Remote_resource_does_not_exist=Remote resource doesn't exist!
-AbstractParallelLaunchConfigurationDelegate_Could_not_retrieve_remote_resource_info=Could not retrieve remote resource info!
-AbstractParallelLaunchConfigurationDelegate_Error_converting_rules=Error converting rules
-AbstractParallelLaunchConfigurationDelegate_Parallel_launcher_does_not_support=Parallel launcher does not support replacing all environment variables on remote environment.
-AbstractParallelLaunchConfigurationDelegate_Unsupported_resource_manager_type=Unsupported resource manager type
-AbstractParallelLaunchConfigurationDelegate_Unknown_remote_services=Unknown remote services
-AbstractParallelLaunchConfigurationDelegate_Error_fetching_resource=Error fetching resource
-
-EnhancedSynchronizeTab_Tab_Message=Add synchronization rules to upload files before the launch or to download files after the application terminates.
-EnhancedSynchronizeTab_RulesFrame_Title=Synchronize rules:
-EnhancedSynchronizeTab_RulesFrame_Description=Upload rules are executed before application starts. Download rules are executed after application finishes.
-EnhancedSynchronizeTab_DownloadLabel_Type=DOWNLOAD 
-EnhancedSynchronizeTab_DownloadLabel_NoFiles=(no files/directories)
-EnhancedSynchronizeTab_DownloadLabel_OneFile=1 item 
-EnhancedSynchronizeTab_DownloadLabel_MultipleFiles={0} items 
-EnhancedSynchronizeTab_DownloadLabel_FromLabel=From: 
-EnhancedSynchronizeTab_DownloadLabel_FileListSeparator=; 
-EnhancedSynchronizeTab_DownloadLabel_DestinationMissing=To: <missing local destination>
-EnhancedSynchronizeTab_DownloadLabel_DestinationLabel=To: 
-EnhancedSynchronizeTab_DownloadLabel_OptionsLabel=Options: 
-EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator=; 
-EnhancedSynchronizeTab_DownloadLabel_Options_Executable=executable
-EnhancedSynchronizeTab_DownloadLabel_Options_Readonly=readonly
-EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp=preserve time/date
-EnhancedSynchronizeTab_UploadLabel_Type=UPLOAD 
-EnhancedSynchronizeTab_UploadLabel_NoFiles=(no files/directories)
-EnhancedSynchronizeTab_UploadLabel_OneFile=1 item 
-EnhancedSynchronizeTab_UploadLabel_MultipleFiles={0} items 
-EnhancedSynchronizeTab_UploadLabel_FromLabel=From: 
-EnhancedSynchronizeTab_UploadLabel_FileListSeparator=; 
-EnhancedSynchronizeTab_UploadLabel_DestinationLabel=To: 
-EnhancedSynchronizeTab_UploadLabel_OptionsLabel=Options: 
-EnhancedSynchronizeTab_UploadLabel_DestinationSeparator=; 
-EnhancedSynchronizeTab_UploadLabel_Options_Executable=executable
-EnhancedSynchronizeTab_UploadLabel_Options_Readonly=readonly
-EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp=preserve time/date
-EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack=download back changes
-EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled=Upload rules enabled
-EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled=Download rules enabled
-EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule=New upload rule
-EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule=New download rule
-EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule=Edit selected
-EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules=Remove selected
-EnhancedSynchronizeTab_Tab_Title=Synchronize
-EnhancedSynchronizeTab_ErrorMessage_NewRule_Title=New rule
-EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType=Launcher does not know how to edit this type of rule.
-
-UploadRuleDialog_Title=Upload Rule
-UploadRuleDialog_Message=Please specify the remote directory and a list of files that shall be uploaded.
-UploadRuleDialog_OptionsFrame_Title=Options for all selected file(s):
-UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton=Use directory from launch configuration
-UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption=Skip
-UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption=Overwrite
-UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption=Overwrite if newer
-UploadRuleDialog_OptionsFrame_AddFileDialog_Description=Select directory to add
-UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description=Select the ressources from workspace to add
-UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory=Remote directory:
-UploadRuleDialog_RemoteDirectoryFrame_Title=Remote directory:
-UploadRuleDialog_FileButtonsFrame_Title=Selected file(s):
-UploadRuleDialog_FileButtonsFrame_Description=Add files:
-UploadRuleDialog_FileButtonsFrame_AddFilesButton=File(s)
-UploadRuleDialog_FileButtonsFrame_AddDirectoryButton=Directory
-UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton=Workspace
-UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel=Remove files:
-UploadRuleDialog_FileButtonsFrame_RemoveButton=Remove selected
-UploadRuleDialog_OptionsFrame_ReadonlyCheck=Readonly
-UploadRuleDialog_OptionsFrame_ExecutableCheck=Executable
-UploadRuleDialog_OptionsFrame_DownloadBackCheck=Download back if changed
-UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck=Preserve time attributes
-UploadRuleDialog_OptionsFrame_OverwriteLabel=If file already exists:
-UploadRuleDialog_OptionsFrame_AddFileDialog_Title=Select file(s) to add
-UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title=Select directory to add
-UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title=Workspace resources
-LauncherExecutionTab_ArgumentsFrame_Title=Arguments:
-LauncherExecutionTab_ArgumentsFrame_CommandLineLabel=Command line arguments
-LauncherExecutionTab_ObserverFrame_Title=Customize application launch:
-LauncherExecutionTab_ObserverFrame_ParserLabel=Output parser:
-LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel=Bash commands, executed before application
-LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel=Bash commands, executed after application
-LauncherExecutionTab_Validation_ObserverAndNoConsole=Cannot set observer if no console is allocated (see Common Tab)
-LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption=none
-LauncherExecutionTab_Tab_Title=Launch
-
-DownloadRuleDialog_Title=Download Rule
-DownloadRuleDialog_Message=Please specify the remote files that shall be downloaded and a local directory.
-DownloadRuleDialog_DestinationFrame_Title=Local destination directory:
-DownloadRuleDialog_DestinationFrame_FileSystemButton=File system
-DownloadRuleDialog_DestinationFrame_WorkspaceButton=Workspace
-DownloadRuleDialog_OptionsFrame_Title=Options for all selected file(s):
-DownloadRuleDialog_OptionsFrame_ReadonlyCheck=Readonly
-DownloadRuleDialog_OptionsFrame_ExecutableCheck=Executable
-DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck=Preserve time attributes
-DownloadRuleDialog_OptionsFrame_OverwriteLabel=If file already exists:
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption=Skip
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption=Overwrite
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption=Overwrite if newer
-DownloadRuleDialog_FileListFrame_Title=Selected file(s):
-DownloadRuleDialog_FileListFrame_AddButton=Add new
-DownloadRuleDialog_FileListFrame_EditButton=Change selected
-DownloadRuleDialog_FileListFrame_RemoveButton=Remove selected
-DownloadRuleDialog_DirectoryDialog_Title=Select local destination
-DownloadRuleDialog_DirectoryDialog_Message=Select local destination directory
-DownloadRuleDialog_WorkspaceDialog_Title=Select folder:
-DownloadRuleDialog_AddFileDialog_Title=Add remote file/directoty
-DownloadRuleDialog_AddFileDialog_Message=Remote file or directory to be added:
-DownloadRuleDialog_EditFileDialog_Title=Add remote file/directoty
-DownloadRuleDialog_EditFileDialog_Message=Remote file or directory to be added:
-
-RemoteLaunchProcess_RequestToCancelLaunch=Requested to cancel this launch.
-RemoteLaunchProcess_PrepareWorkingDir_NotRequired=* Launch configuration does not require creating remote directory.
-RemoteLaunchProcess_UploadWorkingDirectory_Title=* Synchronize before launch:
-RemoteLaunchProcess_UploadApplication_Title=* Upload application executable file.
-RemoteLaunchProcess_PrepareWorkingDir_Title=* Creating remote working directory: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedCreate=\ \ \ Failed to create remote working directory: {0}
-RemoteLaunchProcess_UploadWorkingDirectory_NoRules=\ \ \ No rules were specified for this launch.
-RemoteLaunchProcess_UploadApplication_TitleNoUpload=* Launch configuration does not require uploading the executable file.
-RemoteLaunchProcess_UploadApplication_UploadMessage=\ \ \ Upload executable {0}\n   to {1} (remote)
-RemoteLaunchProcess_UploadApplication_FailedUpload=\ \ \ Upload failed: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedCreateHint=\ \ \ Check if the directory already exists or is owned by another user.
-RemoteLaunchProcess_UploadWorkingDirectory_FailedRule=\ \ \ Rule {0} failed: {1}
-RemoteLaunchProcess_UploadApplication_CompletedUpload=\ \ \ Upload completed.
-RemoteLaunchProcess_PrepareWorkingDir_Failed=Could not prepare working directory.
-RemoteLaunchProcess_All_FailedConnection=Connection to host failed.
-RemoteLaunchProcess_Failed=Could not upload executable file.
-RemoteLaunchProcess_FailedPermissions=\ \ \ Failed to set permissions on executable file: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedPermissions=\ \ \ Failed to set permissions on remote working directory: {0}
-RemoteLaunchProcess_UploadWorkingDirectory_TitleUploadDisabled=* Launch configuration does not require synchronize before launch.
-RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive=\ \ \ Ignoring inactive rule {0}
-RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInvalid=\ \ \ Ignoring rule {0}: {1}
-RemoteLaunchProcess_DownloadWorkingDirectory_TitleDownloadDisabled=* Launch configuration does not require synchronize after launch.
-RemoteLaunchProcess_DownloadWorkingDirectory_Title=* Synchronize after launch:
-RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInactive=\ \ \ Ignoring inactive rule {0}
-RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInvalid=\ \ \ Ignoring rule {0}: {1}
-RemoteLaunchProcess_DownloadWorkingDirectory_FailedRule=\ \ \ Rule {0} failed: {1}
-
-DownloadBackAction_FailedFetchRemoteProperties=\ \ \ Could not fetch properties for remote file: {0}
-DownloadRuleAction_FailedCalculateClockDifference=\ \ \ Could not calculate clock difference with remote host: {0}
-DownloadRuleAction_FailedCalculateClockDifference2=\ \ \ Assuming same a remote clock synchronized with local clock.
-DownloadRuleAction_FailedCreateLocalDirectory=\ \ \ Cannot create local directory {0}
-DownloadRuleAction_FailedLocalDiretoryIsNotDirectory=\ \ \ Path {0} exists, but is not a directory
-DownloadRuleAction_FailedRemotePathDoesNotExit=\ \ \ Ignoring {0}: Path does not exist remotely
-DownloadRuleAction_FailedFetchRemoteAttributes=\ \ \ Could not fetch attributes of remote file/directory: {0}
-DownloadRuleAction_NotiftNewerFileExistsLocally=\ \ \ A newer file alredy exists locally, ignoring it: {0}
-DownloadRuleAction_FailedSetLocalFileAttributes=\ \ \ Failed to set attributes of local file: {0}
-DownloadRuleAction_FailedSetLocalDirectoryAttributes=\ \ \ Failed to set attributes of local directory: {0}
-DownloadBackAction_FailedFiledDoesNotExist=\ \ \ Remote file does not exist anymore: {0}
-DownloadRuleAction_NotifyDirectoryDownload1=\ \ \ Copying contents of directory {0} (remote)
-DownloadRuleAction_NotifyDirectoryDownload2=\ \ \ into directory {0} (local)
-DownloadRuleAction_NotiftFileExistsLocally=\ \ \ File alredy exists locally, ignoring it: {0}
-DownloadBackAction_NotifyFileNotChanged=\ \ \ File {0} was not changed on remote target.
-DownloadRuleAction_WarningClockBackward=\ \ \ Warning\! Clock at remote target is older than local clock. File synchronization may not be correct.
-DownloadRuleAction_FailedFetchAttributes=\ \ \ Ignoring {0}: Cannot fetch attributes
-DownloadRuleAction_FailedSetDownloadFile=\ \ \ Could not download file: {0}
-DownloadBackAction_NotifyDonwloadBack=\ \ \ Download back file {0}.
-DownloadBackAction_FailedDownloadBack=\ \ \ Could not download file: {0}
-DownloadRuleAction_WarningClockForward=\ \ \ Warning\! Clock at remote target is more recent than local clock. File synchronization may not be correct.
-DownloadRuleAction_FailedRemotePathNoDirectoryNorFile=\ \ \ Ignoring {0}: Path is not a remote file nor directory
-DownloadRuleAction_NotifyFileDownload1=\ \ \ Copying file {0} (remote)
-DownloadRuleAction_NotifyFileDownload2=\ \ \ to file {0} (local)

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadBackAction.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadBackAction.java
deleted file mode 100755
index 771d65a..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadBackAction.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.rulesengine;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.data.DownloadBackRule;
-import org.eclipse.ptp.launch.internal.LinuxPath;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-
-public class DownloadBackAction implements IRuleAction {
-	
-	private ILaunchProcessCallback process;
-	private DownloadBackRule rule;
-	private ILaunchConfiguration configuration;
-	private IProgressMonitor monitor;
-
-	public DownloadBackAction(ILaunchProcessCallback process, ILaunchConfiguration configuration, 
-			DownloadBackRule downloadBackRule, IProgressMonitor monitor) {
-		super();
-		this.process = process;
-		this.rule = downloadBackRule;
-		this.configuration = configuration;
-		this.monitor = monitor;
-		
-	}
-
-	public void run() throws CoreException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		
-		// Get managers
-		IRemoteFileManager remoteFileManager = process.getRemoteFileManager(configuration);
-		IRemoteFileManager localFileManager = process.getLocalFileManager(configuration);
-		
-		/*
-		 * Process files in list.
-		 */
-		for (int i = 0; i < rule.count(); i++) {
-			IFileStore remoteFileStore = null;
-			IFileStore localFileStore = null;
-			
-			try {
-			remoteFileStore = remoteFileManager.getResource(rule.getRemoteFile(i), 
-					monitor);
-			IPath localPath = new Path(rule.getLocalFile(i).getAbsolutePath());
-			localFileStore = localFileManager.getResource(localPath, monitor);
-			} catch (IOException e) {
-				throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, 
-						"Error retrieving resource", e));
-			}
-			
-			doDownload(remoteFileStore, localFileStore);
-			//downloadFile(localFile, remotePath);
-		}
-	}
-
-	private void doDownload(IFileStore remoteFileStore,
-			IFileStore localFileStore) throws CoreException {
-		
-		// Get remote and local file infos
-		IFileInfo remoteFileInfo = remoteFileStore.fetchInfo(EFS.NONE, monitor);
-		//IFileInfo localFileInfo = localFileStore.fetchInfo();
-		
-		if(!remoteFileInfo.exists()) {
-			// Warn user that file doesn`t exist
-			return;
-		}
-		
-		remoteFileStore.copy(localFileStore, EFS.OVERWRITE, monitor);
-	}
-
-	/*private void downloadFile(File localFile, IPath remotePath) throws CoreException, CancelException, RemoteConnectionException {
-		String remotePathAsString = LinuxPath.toString(remotePath);
-		
-				
-		IRemoteFile remoteFile = null;
-		try {
-			remoteFile = fileTools.getFile(remotePathAsString);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedFetchRemoteProperties, e.getMessage()));
-			return;
-		}
-		
-		if (! remoteFile.exists()) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedFiledDoesNotExist, remotePathAsString));
-			return;			
-		}
-		
-		
-		 * Test if file has been changed.
-		 
-		long difference = remoteFile.getModificationTime() - localFile.lastModified();
-		if (difference < 1000 && remoteFile.getSize() == localFile.length()) {
-			outputWriter.println(NLS.bind(Messages.DownloadBackAction_NotifyFileNotChanged, remotePath));
-			return;					
-		}
-		
-		
-		 * Download file
-		 
-		try {
-			outputWriter.println(NLS.bind(Messages.DownloadBackAction_NotifyDonwloadBack, remotePathAsString));
-			copyTools.downloadFileToFile(remotePathAsString, localFile);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedDownloadBack, e.getMessage()));
-			return;
-		}
-	}*/
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadRuleAction.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadRuleAction.java
deleted file mode 100755
index 4db3dbd..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/DownloadRuleAction.java
+++ /dev/null

@@ -1,454 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.rulesengine;
-
-import java.io.IOException;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.data.DownloadBackRule;
-import org.eclipse.ptp.launch.data.DownloadRule;
-import org.eclipse.ptp.launch.data.OverwritePolicies;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-
-
-public class DownloadRuleAction implements IRuleAction {
-
-	private final ILaunchProcessCallback process;
-	private final DownloadRule rule;
-	private final ILaunchConfiguration configuration;
-	private DownloadBackRule downloadBackRule;
-	private final IProgressMonitor monitor;
-
-	public DownloadRuleAction(ILaunchProcessCallback process, ILaunchConfiguration configuration, 
-			DownloadRule rule, IProgressMonitor monitor) {
-		super();
-		this.process = process;
-		this.rule = rule;
-		this.configuration = configuration;
-		this.monitor = monitor;
-	}
-
-	public void run() throws CoreException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		
-		/*
-		 * If overwrite policy depends on time, then get remote clock skew.
-		 */
-		/*long clockSkew = 0;
-		if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-			IRemoteStatusTools statusTools = manager.getRemoteStatusTools();
-			long localTime;
-			long remoteTime;
-			try {
-				localTime = System.currentTimeMillis();
-				remoteTime = statusTools.getTime();
-				clockSkew = localTime -remoteTime;
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCalculateClockDifference, e.getMessage()));			
-				errorWriter.println(Messages.DownloadRuleAction_FailedCalculateClockDifference2);
-				clockSkew = 0;
-			}
-			if (clockSkew < -15000) {
-				errorWriter.println(Messages.DownloadRuleAction_WarningClockForward);
-			} else if (clockSkew > 15000) {
-				errorWriter.println(Messages.DownloadRuleAction_WarningClockBackward);				
-			}
-		}*/
-		
-		/*
-		 * Determine local path. Make it absolute. 
-		 */
-		IPath localParentPath = new Path(rule.getLocalDirectory());
-		if (! localParentPath.isAbsolute()) {
-			IPath defaultPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			localParentPath = defaultPath.append(localParentPath);
-			/*IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			localPath = workspace.append(localPath);*/
-		}
-		localParentPath.removeTrailingSeparator();
-		Assert.isTrue(localParentPath.isAbsolute(), "localPath.isAbsolute()"); //$NON-NLS-1$
-		
-		// Get the file store of the parent dir.
-		IRemoteFileManager localFileManager = process.getLocalFileManager(configuration);
-		IFileStore localFileParentResource = null;
-		try {
-			localFileParentResource = localFileManager.getResource(localParentPath, monitor);
-		} catch (IOException e) {
-			throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, "Error retrieving local resource", e));
-		}
-		IFileInfo localFileParentInfo = localFileParentResource.fetchInfo();
-		
-		// Create the localpath if necessary
-		if(!localFileParentInfo.exists()) {
-			localFileParentResource.mkdir(EFS.NONE, monitor);
-		}
-		
-		// Download all remote paths
-		IPath remotePaths [] = rule.getRemoteFilesAsPathArray();
-		IPath remoteWorkingPath = new Path(configuration.getAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, "")).removeLastSegments(1);
-		for(int i = 0; i < remotePaths.length; i++) {
-			IPath remotePath = remotePaths[i];
-			
-			// Make paths absolute
-			if(!remotePath.isAbsolute()) {
-				remotePath = remoteWorkingPath.append(remotePath);
-			}
-			
-			IFileStore remoteFileStore = null;
-			try {
-				IRemoteFileManager remoteFileManager = process.getRemoteFileManager(configuration);
-				remoteFileStore = remoteFileManager.getResource(remotePath, monitor);
-			} catch (IOException e) {
-				throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, "Error retrieving remote resource", e));
-			}
-			
-			// Check if the remote resource exists
-			IFileInfo remoteFileInfo = remoteFileStore.fetchInfo(EFS.NONE, monitor);
-			
-			if(!remoteFileInfo.exists()) {
-				// Warn the user and continue processing the next file
-				// FIXME Warn the user that the resource doesn't exist
-				continue;
-			}
-			
-			// Generate the entire path from the combination of the localPathParent
-			// and the name of the file or directory which will be copied.
-			IPath localPath = localParentPath.append(remotePath.lastSegment());
-			
-			// Generate the file store for the local path
-			IFileStore localFileStore = null;
-			try {
-				localFileStore = localFileManager.getResource(localPath, monitor);
-			} catch (IOException e) {
-				throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, "Error retrieving local resource", e));
-			}
-
-			doDownload(remoteFileStore, remotePath, localFileStore, localPath);
-		}
-		/*File localDir = localPathParent.toFile();
-		if (! localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCreateLocalDirectory, localPathParent.toString()));
-				return;								
-			}
-		} else if (! localDir.isDirectory()) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedLocalDiretoryIsNotDirectory, localPathParent.toString()));
-			return;											
-		}*/
-		
-		/*
-		 * Determine list of remote paths. Make them absolute.
-		 */
-		/*IPath remotePaths [] = rule.getRemoteFilesAsPathArray();
-		IPath remoteWorkingPath = configuration.getRemoteDirectoryPath();
-		for (int i = 0; i < remotePaths.length; i++) {
-			IPath remotePath = remotePaths[i];
-			if (! remotePath.isAbsolute()) {
-				remotePath = remoteWorkingPath.append(remotePath);
-			}
-			remotePath = remotePath.removeTrailingSeparator();
-			Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()"); //$NON-NLS-1$
-			remotePaths[i] = remotePath;
-		}
-
-		
-		 * Process paths.
-		 
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		for (int i = 0; i < remotePaths.length; i++) {
-			IPath remotePath = remotePaths[i];
-			String remotePathAsString = LinuxPath.toString(remotePath);
-			IRemoteItem item = null;
-			try {
-				item = fileTools.getItem(remotePathAsString);
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchAttributes, remotePathAsString));
-				continue;
-			}
-			
-			if (! item.exists()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedRemotePathDoesNotExit, remotePathAsString));
-				continue;
-			} else if (item instanceof IRemoteDirectory) {
-				IRemoteDirectory remoteDirectory = (IRemoteDirectory) item;
-				downloadDirectory(remoteDirectory, localDir);
-			} else if (item instanceof IRemoteFile) {
-				IRemoteFile remoteFile = (IRemoteFile) item;
-				downloadFile(remoteFile, localDir);
-			} else {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedRemotePathNoDirectoryNorFile, remotePathAsString));
-				continue;				
-			}
-		}*/
-
-	}
-
-	private void doDownload(IFileStore remoteFileStore, IPath remotePath,
-			IFileStore localFileStore, IPath localPath) throws CoreException {
-		// Fetch file infos
-		IFileInfo localFileInfo = localFileStore.fetchInfo();
-		IFileInfo remoteFileInfo = remoteFileStore.fetchInfo(EFS.NONE, monitor);
-		
-		// Find if file already exists on the local machine
-		if(localFileInfo.exists()) {
-			// Follows the selected policy
-			switch(rule.getOverwritePolicy()) {
-			case OverwritePolicies.ALWAYS:
-				// Always copy anyway...
-				break;
-			case OverwritePolicies.NEWER:
-				long dupFileModTime, localFileModTime;
-				dupFileModTime = localFileInfo.getLastModified();
-				localFileModTime = remoteFileInfo.getLastModified();
-				
-				if(dupFileModTime >= localFileModTime) {
-					// Remote file is newer. Skip
-					return;
-				}
-				break;
-			default:
-				return;	
-			}
-		}
-		
-		// Download resource
-		remoteFileStore.copy(localFileStore, EFS.OVERWRITE, monitor);
-		
-		/* Set local file permissions from the remote resource */
-		boolean changedAttr = false;
-		if (rule.isAsReadOnly()) {
-			localFileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, true);
-			changedAttr = true;
-		}
-		if (rule.isAsExecutable()) {
-			localFileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, true);
-			changedAttr = true;
-		}
-		if(changedAttr) {
-			localFileStore.putInfo(localFileInfo, EFS.SET_ATTRIBUTES, monitor);
-		}
-		
-		 // Set date/time, if required
-		if (rule.isPreserveTimeStamp()) {
-			localFileInfo.setLastModified(remoteFileInfo.getLastModified());
-			localFileStore.putInfo(localFileInfo, EFS.SET_LAST_MODIFIED, monitor);
-		}
-		
-	}
-
-	/*private void downloadFile(IRemoteFile remoteFile, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()"); //$NON-NLS-1$
-		
-		IPath remoteFilePath = LinuxPath.fromString(remoteFile.getPath());
-		File localFile = new File(localDir, remoteFilePath.lastSegment());
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyFileDownload1, remoteFile.getPath()));
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyFileDownload2, localFile.getAbsolutePath()));
-
-		doFileDownload(remoteFile, localFile);	
-	}
-
-	private void downloadDirectory(IRemoteDirectory remoteDirectory, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()"); //$NON-NLS-1$
-
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyDirectoryDownload1, remoteDirectory.getPath()));
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyDirectoryDownload2, localDir.getAbsolutePath()));
-
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		
-		IRemoteFileEnumeration enumeration = null;
-		try {
-			enumeration = fileTools.createRecursiveFileEnumeration(remoteDirectory.getPath());
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, e.getMessage()));	
-			return;
-		}
-		
-		IPath remoteRootPath = LinuxPath.fromString(remoteDirectory.getPath());
-		IPath localRootPath = new Path(localDir.getAbsolutePath());
-		int remoteRootPathLength = remoteRootPath.segmentCount();
-		
-		while (enumeration.hasMoreElements()) {
-			while (enumeration.hasMoreExceptions()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, enumeration.nextException()));
-			}
-			
-			 * Calculate path relative to the remote root.
-			 * Generate path relative to the local root.
-			  
-			IRemoteItem remoteItem = enumeration.nextElementAsItem();
-			IPath remotePath = LinuxPath.fromString(remoteItem.getPath());
-			IPath relativePath = remotePath.removeFirstSegments(remoteRootPathLength);
-			IPath localFilePath = localRootPath.append(relativePath);
-			File localFile = localFilePath.toFile();
-			if (remoteItem instanceof IRemoteDirectory) {
-				IRemoteDirectory directoryItem = (IRemoteDirectory) remoteItem;
-				doDirectoryDownload(directoryItem, localFile);
-			} else if (remoteItem instanceof IRemoteFile) {
-				IRemoteFile fileItem = (IRemoteFile) remoteItem;
-				doFileDownload(fileItem, localFile);
-			}
-		}
-		while (enumeration.hasMoreExceptions()) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, enumeration.nextException()));	
-		}
-	}
-	
-	private void doFileDownload(IRemoteFile remoteFile, File localFile) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		
-		String remoteFileAsString = remoteFile.getPath();
-
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-				
-		
-		 * Check if file exists and if file is newer, depending on overwrite policy.
-		 
-		if (rule.getOverwritePolicy() == OverwritePolicies.ALWAYS) {
-			
-			 * File is always copied, no policy.
-			 
-		} else {
-			
-			 * Policy needs to check remote file.
-			 
-			if (rule.getOverwritePolicy() == OverwritePolicies.SKIP) {
-				if (localFile.exists()) {
-					outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotiftFileExistsLocally, localFile.getAbsolutePath()));
-					return;
-				}
-			} else if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-				long difference = remoteFile.getModificationTime() - localFile.lastModified();
-				if (difference < 1000) {
-					outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotiftNewerFileExistsLocally, localFile.getAbsolutePath()));
-					return;					
-				}
-			}
-		}  
-		
-		
-		 * Upload the file.
-		 
-		try {
-			copyTools.downloadFileToFile(remoteFileAsString, localFile);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetDownloadFile, e.getMessage()));
-			return;
-		}
-	
-		
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 
-//		boolean read = remoteFile.isReadable();
-		boolean write = remoteFile.isWritable();
-		boolean execute = remoteFile.isExecutable();
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		if (rule.isAsExecutable()) {
-			execute = true;
-		}
-		
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localFile.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, execute);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, ! write);
-		
-		
-		 * Set date/time, if required
-		 
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = remoteFile.getModificationTime();
-			fileInfo.setLastModified(timestamp);
-		}
-		
-		
-		 * Commit changes
-		 
-		try {
-			fileStore.putInfo(fileInfo, EFS.SET_LAST_MODIFIED | EFS.SET_ATTRIBUTES, null);
-		} catch (CoreException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetLocalFileAttributes, localFile.getAbsolutePath()));
-			return;
-		}
-	}
-
-	private void doDirectoryDownload(IRemoteDirectory remoteDir, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		
-		
-		 * Create local directory, if not already exists.
-		 
-		if (! localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCreateLocalDirectory, localDir.getAbsolutePath()));
-				return;
-			}
-		}
-	
-		
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 
-//		boolean read = remoteDir.isReadable();
-		boolean write = remoteDir.isWritable();
-		boolean execute = true;
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localDir.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, execute);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, ! write);
-		
-		
-		 * Set date/time, if required
-		 
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = remoteDir.getModificationTime();
-			fileInfo.setLastModified(timestamp);
-		}
-		
-		
-		 * Commit changes
-		 
-		try {
-			fileStore.putInfo(fileInfo, EFS.SET_LAST_MODIFIED | EFS.SET_ATTRIBUTES, null);
-		} catch (CoreException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetLocalDirectoryAttributes, localDir.getAbsolutePath()));
-			return;
-		}
-	}*/
-
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/ILaunchProcessCallback.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/ILaunchProcessCallback.java
deleted file mode 100755
index cfea8e9..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/ILaunchProcessCallback.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.rulesengine;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-
-
-
-public interface ILaunchProcessCallback {
-	//public PrintWriter getOutputWriter();
-	//public PrintWriter getErrorWriter();
-	//public ExecutionConfiguration getConfiguration();
-	public IRemoteFileManager getLocalFileManager(ILaunchConfiguration configuration) throws CoreException;
-	public IRemoteFileManager getRemoteFileManager(ILaunchConfiguration configuration) throws CoreException;
-	//public IRemoteExecutionManager getExecutionManager();
-	public void addSynchronizationRule(ISynchronizationRule downloadBackRule);
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/IRuleAction.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/IRuleAction.java
deleted file mode 100755
index 21c9ff4..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/IRuleAction.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.rulesengine;
-
-import org.eclipse.core.runtime.CoreException;
-
-
-public interface IRuleAction {
-	public void run() throws CoreException;
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/RuleActionFactory.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/RuleActionFactory.java
deleted file mode 100755
index 80ce77d..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/RuleActionFactory.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.rulesengine;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.launch.data.DownloadBackRule;
-import org.eclipse.ptp.launch.data.DownloadRule;
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-import org.eclipse.ptp.launch.data.UploadRule;
-
-
-public class RuleActionFactory {
-	
-	private ILaunchProcessCallback process;
-	private ILaunchConfiguration configuration;
-	private IProgressMonitor monitor;
-
-	public RuleActionFactory(ILaunchConfiguration configuration, ILaunchProcessCallback process, IProgressMonitor monitor) {
-		super();
-		this.process = process;
-		this.configuration = configuration;
-		this.monitor = monitor;
-	}
-
-	public IRuleAction getAction(ISynchronizationRule rule) throws CoreException {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			DownloadRuleAction action = new DownloadRuleAction(process, configuration, downloadRule, monitor);
-			return action;
-		} else if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			UploadRuleAction action = new UploadRuleAction(process, configuration, uploadRule, monitor);
-			return action;
-		} else if (rule instanceof DownloadBackRule) {
-			DownloadBackRule uploadRule = (DownloadBackRule) rule;
-			DownloadBackAction action = new DownloadBackAction(process, configuration, uploadRule, monitor);
-			return action;
-		} else {
-			Assert.isLegal(false);
-			return null;
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/UploadRuleAction.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/UploadRuleAction.java
deleted file mode 100755
index c08af53..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/rulesengine/UploadRuleAction.java
+++ /dev/null

@@ -1,510 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.rulesengine;
-
-import java.io.IOException;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.data.DownloadBackRule;
-import org.eclipse.ptp.launch.data.OverwritePolicies;
-import org.eclipse.ptp.launch.data.UploadRule;
-import org.eclipse.ptp.launch.internal.LinuxPath;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-
-
-public class UploadRuleAction implements IRuleAction {
-
-	private final ILaunchProcessCallback process;
-	private final UploadRule rule;
-	//private ExecutionConfiguration configuration;
-	//private PrintWriter outputWriter;
-	//private PrintWriter errorWriter;
-	//private IRemoteExecutionManager manager;
-	private final ILaunchConfiguration configuration;
-	//private IRemoteFileManager remoteFileManager;
-	//private IRemoteFileManager localFileManager;
-	private DownloadBackRule downloadBackRule;
-	private final IProgressMonitor monitor;
-
-	public UploadRuleAction(ILaunchProcessCallback process, ILaunchConfiguration configuration,
-			UploadRule uploadRule, IProgressMonitor monitor) {
-		super();
-		this.process = process;
-		this.rule = uploadRule;
-		/*configuration = process.getConfiguration();
-		outputWriter = process.getOutputWriter();
-		errorWriter = process.getErrorWriter();*/
-		//manager = process.getExecutionManager();
-		this.configuration = configuration;
-
-		//remoteFileManager = process.getRemoteFileManager(configuration);
-		//localFileManager = process.getLocalFileManager(configuration);
-		this.monitor = monitor;
-	}
-
-	public void run() throws CoreException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-
-		// The actual interface doesn't provide a way to check the remote time,
-		// se we assume the clocks are synchronized.
-		/*
-		 * If overwrite policy depends on time, then get remote clock skew.
-		 */
-		/*if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-			IRemoteStatusTools statusTools = manager.getRemoteStatusTools();
-			long localTime;
-			long remoteTime;
-			try {
-				localTime = System.currentTimeMillis();
-				remoteTime = statusTools.getTime();
-				clockSkew = localTime -remoteTime;
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind("   Could not calculate clock difference with remote host: {0}", e.getMessage()));
-				errorWriter.println("   Assuming same a remote clock synchronized with local clock.");
-				clockSkew = 0;
-			}
-			if (clockSkew < -15000) {
-				errorWriter.println("   Warning! Clock at remote target is more recent than local clock. File synchronization may not be correct.");
-			} else if (clockSkew > 15000) {
-				errorWriter.println("   Warning! Clock at remote target is older than local clock. File synchronization may not be correct.");
-			}
-		}*/
-
-		/*
-		 * Determine the first part of the remote path. Make it absolute.
-		 */
-		String execPath = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, (String)null);
-
-
-		IPath defaultRemotePath = LinuxPath.fromString(execPath).removeLastSegments(1);//configuration.getRemoteDirectoryPath();
-		IPath remotePathParent = null;
-		if (rule.isDefaultRemoteDirectory()) {
-			remotePathParent = defaultRemotePath;
-		} else {
-			remotePathParent = LinuxPath.fromString(rule.getRemoteDirectory());
-			if (! remotePathParent.isAbsolute()) {
-				remotePathParent = defaultRemotePath.append(remotePathParent);
-			}
-		}
-		remotePathParent = remotePathParent.removeTrailingSeparator();
-		Assert.isTrue(remotePathParent.isAbsolute(), "remotePathWoLastSegment.isAbsolute()");
-
-		/*// Generate the FileStore for the remote path
-		IFileStore remoteFileStore = null;
-		try {
-			remoteFileStore = remoteFileManager.getResource(remotePath, monitor);
-		} catch (IOException e1) {
-			throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, "Error retrieving remote resource", e1));
-		}*/
-
-		// Retrieve the local working dir (workspace path)
-		IPath workingDir = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		//IPath workingDir = new Path(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_WORK_DIRECTORY, ""));
-
-		/*
-		 * Determine list of local paths. Make them absolute.
-		 */
-		IPath localPaths [] = rule.getLocalFilesAsPathArray();
-		//IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-
-		for (int i = 0; i < localPaths.length; i++) {
-			IPath localPath = localPaths[i];
-			if (!localPath.isAbsolute()) {
-				localPath = workingDir.append(localPath);
-			}
-			localPath = localPath.removeTrailingSeparator();
-			Assert.isTrue(localPath.isAbsolute(), "localPath.isAbsolute()");
-			localPaths[i] = localPath;
-		}
-
-		/*
-		 * Process paths.
-		 */
-		for (int i = 0; i < localPaths.length; i++) {
-			IPath localPath = localPaths[i];
-
-			IFileStore localFileStore = null;
-
-			try {
-				IRemoteFileManager localFileManager = process.getLocalFileManager(configuration);
-				localFileStore = localFileManager.getResource(localPath, monitor);
-			} catch (IOException e) {
-				throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, "Error retrieving local resource", e));
-			}
-			IFileInfo localFileInfo = localFileStore.fetchInfo();
-
-			if(!localFileInfo.exists()) {
-				// Warn user and go to the next file
-				// TODO Warn users that file doesn't exist
-				continue;
-			}
-
-			// Generate the entire path from the combination of the remotePathParent
-			// and the name of the file or directory which will be copied.
-			IPath remotePath = remotePathParent.append(localPath.lastSegment());
-
-			// Generate the FileStore for the remote path
-			IFileStore remoteFileStore = null;
-			IRemoteFileManager remoteFileManager = process.getRemoteFileManager(configuration);
-			try {
-				remoteFileStore = remoteFileManager.getResource(remotePath, monitor);
-			} catch (IOException e1) {
-				throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, "Error retrieving remote resource", e1));
-			}
-
-			/*
-			 * Assure the remote path exists.
-			 */
-			try {
-				IFileStore parentFileStore = remoteFileManager.getResource(remotePathParent, monitor);
-				parentFileStore.mkdir(EFS.NONE, monitor);
-			} catch (IOException e1) {
-				throw new CoreException(new Status(Status.ERROR, PTPLaunchPlugin.PLUGIN_ID, "Error retrieving remote resource", e1));
-			}
-
-
-			doUpload(localFileStore, localPath, remoteFileStore, remotePath);
-
-			//if(localFileStore.fetchInfo().isDirectory())
-
-			//File localFile = localPath.toFile();
-			/*if (! localFile.exists()) {
-				// TODO Warn that file doesn't exists
-				//errorWriter.println(NLS.bind("   Ignoring {0}: Path does not exist locally", localFile.toString()));
-				continue;
-			} else if (localFile.isDirectory()) {
-				uploadDirectory(localFile, remotePath);
-			} else if (localFile.isFile()) {
-				uploadFile(localFile, remotePath);
-			} else {
-				//errorWriter.println(NLS.bind("   Ignoring {0}: Path is not a file nor directory", localFile.toString()));
-				continue;
-			}*/
-		}
-
-		/*
-		 * If a download back rule was created during the upload,
-		 * the add this rule the the list of synchronize rules.
-		 */
-		if (downloadBackRule != null) {
-			process.addSynchronizationRule(downloadBackRule);
-		}
-	}
-
-	private void doUpload(IFileStore localFileStore, IPath localPath,
-			IFileStore remoteFileStore, IPath remotePath) throws CoreException {
-		// Fetch remoteFileStore info
-		IFileInfo remoteFileInfo = remoteFileStore.fetchInfo(EFS.NONE, monitor);
-
-		// Fetch localFileStore info
-		IFileInfo localFileInfo = localFileStore.fetchInfo();
-
-		// Find if file already exists on the remote machine
-		if(remoteFileInfo.exists()) {
-			switch(rule.getOverwritePolicy()) {
-			case OverwritePolicies.ALWAYS:
-				// Always copy anyway...
-				break;
-			case OverwritePolicies.NEWER:
-				long dupFileModTime, localFileModTime;
-				dupFileModTime = remoteFileInfo.getLastModified();
-				localFileModTime = localFileInfo.getLastModified();
-
-				if(dupFileModTime >= localFileModTime) {
-					// Remote file is newer. Skip
-					return;
-				}
-				break;
-			default:
-				// SKIP
-				return;
-			}
-		}
-
-		// Upload file or directory
-		localFileStore.copy(remoteFileStore, EFS.OVERWRITE, monitor);
-
-		// Add remote path to list of files to download back,
-		// if this feature was enabled.
-		if (rule.isDownloadBack()) {
-			if (downloadBackRule == null) {
-				downloadBackRule = new DownloadBackRule();
-			}
-			downloadBackRule.add(localPath.toFile(), remotePath);
-		}
-
-		/* Set remote file permissions from the local */
-		boolean changedAttr = false;
-		if (rule.isAsReadOnly()) {
-			remoteFileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, true);
-			changedAttr = true;
-		}
-		if (rule.isAsExecutable()) {
-			remoteFileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, true);
-			changedAttr = true;
-		}
-		if(changedAttr) {
-			remoteFileStore.putInfo(remoteFileInfo, EFS.SET_ATTRIBUTES, monitor);
-		}
-
-		 // Set date/time, if required
-		if (rule.isPreserveTimeStamp()) {
-			remoteFileInfo.setLastModified(localFileInfo.getLastModified());
-			remoteFileStore.putInfo(remoteFileInfo, EFS.SET_LAST_MODIFIED, monitor);
-		}
-
-	}
-	/*private void uploadFile(File localFile, IPath remoteDirectoryPath) throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()");
-		Assert.isTrue(remoteDirectoryPath.isAbsolute(), "remoteDirectoryPath.isAbsolute()");
-
-		IPath remoteFile = remoteDirectoryPath.append(localFile.getName());
-		outputWriter.println(NLS.bind("   Copying file {0} (local)", localFile.toString()));
-		outputWriter.println(NLS.bind("   to file {0} (remote)", LinuxPath.toString(remoteFile)));
-
-		doFileUpload(localFile, remoteFile);
-	}
-
-	private void doFileUpload(File localFile, IPath remotePath) throws CoreException {
-		if (! localFile.exists()) {
-			errorWriter.println(NLS.bind("   Ignoring {0}: File does not exist locally", localFile.toString()));
-			return;
-		}
-
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()");
-		Assert.isTrue(localFile.isFile(), "localFile.isFile()");
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()");
-
-		String remotePathAsString = LinuxPath.toString(remotePath);
-
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-
-
-		 * Check if file exists and if file is newer, depending on overwrite policy.
-
-		if (rule.getOverwritePolicy() == OverwritePolicies.ALWAYS) {
-
-			 * File is always copied, no policy.
-
-		} else {
-
-			 * Policy needs to check remote file.
-
-			IRemoteFile remoteFile = null;
-			try {
-				remoteFile = fileTools.getFile(remotePathAsString);
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind("   Could not fetch properties for remote file, ignoring it: {0}", e.getMessage()));
-				return;
-			}
-			if (rule.getOverwritePolicy() == OverwritePolicies.SKIP) {
-				if (remoteFile.exists()) {
-					outputWriter.println(NLS.bind("   File alredy exists on remote target, ignoring it: {0}", remotePath));
-					return;
-				}
-			} else if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-				long difference = localFile.lastModified() - remoteFile.getModificationTime();
-				if (difference < 1000) {
-					outputWriter.println(NLS.bind("   A newer file alredy exists on remote target, ignoring it: {0}", remotePath));
-					return;
-				}
-			}
-		}
-
-
-		 * Upload the file.
-
-		try {
-			copyTools.uploadFileToFile(localFile, remotePathAsString);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not upload file: {0}", e.getMessage()));
-			return;
-		}
-
-
-		 * Add file to list of files to download back, if this feature was enabled.
-
-		if (rule.isDownloadBack()) {
-			if (downloadBackRule == null) {
-				downloadBackRule = new DownloadBackRule();
-			}
-			downloadBackRule.add(localFile, remotePath);
-		}
-
-
-		 * Fetch properties of file that was just uploaded.
-
-		IRemoteFile remoteFile = null;
-		try {
-			remoteFile = fileTools.getFile(remotePathAsString);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not fetch properties for uploaded file: {0}", e.getMessage()));
-			return;
-		}
-
-
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localFile.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		boolean read = localFile.canRead();
-		boolean write = localFile.canWrite();
-		boolean execute = fileInfo.getAttribute(EFS.ATTRIBUTE_EXECUTABLE);
-
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		if (rule.isAsExecutable()) {
-			execute = true;
-		}
-
-		remoteFile.setExecutable(execute);
-		remoteFile.setWriteable(write);
-		remoteFile.setReadable(read);
-
-
-		 * Set date/time, if required
-
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = localFile.lastModified();
-			remoteFile.setModificationTime(timestamp);
-		}
-
-
-		 * Commit changes
-
-		try {
-			remoteFile.commitAttributes();
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not write properties for uploaded file: {0}", e.getMessage()));
-			return;
-		}
-	}
-
-	private void doDirectoryUpload(File localDir, IPath remotePath) throws RemoteConnectionException, CancelException {
-		if (! localDir.exists()) {
-			errorWriter.println(NLS.bind("   Ignoring {0}: Directory does not exist locally", localDir.toString()));
-			return;
-		}
-
-		Assert.isTrue(localDir.isDirectory(), "localFile.isDirectory()");
-		Assert.isTrue(localDir.isAbsolute(), "localFile.isAbsolute()");
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()");
-
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-
-
-		 * Create remote directory if not already exists.
-
-		try {
-			fileTools.assureDirectory(LinuxPath.toString(remotePath));
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not create remote directory: {0}", e.getMessage()));
-			return;
-		}
-
-
-		 * Fetch properties of directory that was just uploaded.
-
-		IRemoteDirectory remoteDirectory = null;
-		try {
-			remoteDirectory = fileTools.getDirectory(LinuxPath.toString(remotePath));
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not fetch properties for created remote directory: {0}", e.getMessage()));
-			return;
-		}
-
-
-		 * Set file permissions.
-
-		boolean read = localDir.canRead();
-		boolean write = localDir.canWrite();
-		boolean execute = true;
-
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-
-		remoteDirectory.setAccessible(execute);
-		remoteDirectory.setWriteable(write);
-		remoteDirectory.setReadable(read);
-
-
-		 * Set date/time, if required
-
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = localDir.lastModified();
-			remoteDirectory.setModificationTime(timestamp);
-		}
-
-
-		 * Commit changes
-
-		try {
-			remoteDirectory.commitAttributes();
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not write properties for uploaded directory: {0}", e.getMessage()));
-			return;
-		}
-	}
-
-
-	private void uploadDirectory(File localDir, IPath remotePath) throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()");
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()");
-
-		outputWriter.println(NLS.bind("   Copying contents of directory {0} (local)", localDir.toString()));
-		outputWriter.println(NLS.bind("   into directory {0} (remote)", LinuxPath.toString(remotePath)));
-
-		FileRecursiveEnumeration enumeration = null;
-		enumeration = new FileRecursiveEnumeration(localDir);
-
-		IPath rootPath = new Path(localDir.getAbsolutePath());
-		int rootPathLength = rootPath.segmentCount();
-		while (enumeration.hasMoreElements()) {
-			while (enumeration.hasMoreExceptions()) {
-				errorWriter.println(NLS.bind("   Could not read file/directory: {0}", enumeration.nextException()));
-			}
-			File file = (File) enumeration.nextElement();
-			IPath filePath = new Path(file.getAbsolutePath());
-			IPath relativePath = filePath.removeFirstSegments(rootPathLength);
-			IPath remoteFilePath = remotePath.append(relativePath);
-			if (file.isDirectory()) {
-				outputWriter.println(NLS.bind("   Create remote directory {0}", LinuxPath.toString(remoteFilePath)));
-				doDirectoryUpload(file, remoteFilePath);
-			} else {
-				outputWriter.println(NLS.bind("   Upload {0}", LinuxPath.toString(relativePath)));
-				doFileUpload(file, remoteFilePath);
-			}
-		}
-		while (enumeration.hasMoreExceptions()) {
-			errorWriter.println(NLS.bind("   Could not read file/directory: {0}", enumeration.nextException()));
-		}
-	}*/
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ApplicationTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ApplicationTab.java
deleted file mode 100644
index e3e5fb0..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ApplicationTab.java
+++ /dev/null

@@ -1,552 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California.
- * This material was produced under U.S. Government contract W-7405-ENG-36
- * for Los Alamos National Laboratory, which is operated by the University
- * of California for the U.S. Department of Energy. The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
- * to produce derivative works, such modified software should be clearly marked,
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.internal.ui.LaunchImages;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.BaseWorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * The Main tab is used to specify the resource manager for the launch,
- * select the project and executable to launch, and specify the location
- * of the executable if it is a remote launch.
- */
-public class ApplicationTab extends LaunchConfigurationTab {
-	protected class WidgetListener extends SelectionAdapter implements ModifyListener {
-		public void modifyText(ModifyEvent e) {
-			updateLaunchConfigurationDialog();
-		}
-		@Override
-		public void widgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == projButton) {
-				handleProjectButtonSelected();
-			} else if (source == appButton) {
-				handleApplicationButtonSelected();
-			} else if (source == consoleButton) {
-				updateLaunchConfigurationDialog();
-			} else if (source == localAppButton) {
-				handleLocalApplicationButtonSelected();
-				updateLaunchConfigurationDialog();
-			} else if (source == browseAppButton) {
-				handleBrowseLocalApplicationButtonSelected();
-			}
-		}
-	}
-
-	protected Text projText = null;
-	protected Text appText = null;
-	protected Text localAppText = null;
-	protected Button projButton = null;
-	protected Button appButton = null;
-	protected Button browseAppButton = null;
-	protected Button localAppButton = null;
-	protected Button consoleButton = null;
-	protected WidgetListener listener = new WidgetListener();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-
-		comp.setLayout(new GridLayout());
-
-		Composite mainComp = new Composite(comp, SWT.NONE);
-		mainComp.setLayout(createGridLayout(2, false, 0, 0));
-		mainComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label projLabel = new Label(mainComp, SWT.NONE);
-		projLabel.setText(Messages.ApplicationTab_Project_Label);
-		projLabel.setLayoutData(spanGridData(-1, 2));
-
-		projText = new Text(mainComp, SWT.SINGLE | SWT.BORDER);
-		projText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		projText.addModifyListener(listener);
-
-		projButton = createPushButton(mainComp, Messages.Tab_common_Browse_1, null);
-		projButton.addSelectionListener(listener);
-
-		createVerticalSpacer(comp, 1);
-
-		Label appLabel = new Label(mainComp, SWT.NONE);
-		appLabel.setText(Messages.ApplicationTab_Application_Label);
-		appLabel.setLayoutData(spanGridData(-1, 2));
-
-		appText = new Text(mainComp, SWT.SINGLE | SWT.BORDER);
-		appText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		appText.addModifyListener(listener);
-
-		appButton = createPushButton(mainComp, Messages.Tab_common_Browse_2, null);
-		appButton.addSelectionListener(listener);
-
-		createVerticalSpacer(mainComp, 2);
-
-		localAppButton = createCheckButton(mainComp, "Copy executable from local filesystem");
-		localAppButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		localAppButton.addSelectionListener(listener);
-
-		Label localAppLabel = new Label(mainComp, SWT.NONE);
-		localAppLabel.setText("Path to the local file:");
-		localAppLabel.setLayoutData(spanGridData(-1, 2));
-
-		localAppText = new Text(mainComp, SWT.SINGLE | SWT.BORDER);
-		localAppText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		localAppText.addModifyListener(listener);
-
-		browseAppButton = createPushButton(mainComp, "Browse", null);
-		browseAppButton.addSelectionListener(listener);
-
-		createVerticalSpacer(mainComp, 2);
-
-		consoleButton = createCheckButton(mainComp, Messages.ApplicationTab_Console);
-		consoleButton.setSelection(false);
-		consoleButton.addSelectionListener(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()
-	 */
-	@Override
-	public Image getImage() {
-		return LaunchImages.getImage(LaunchImages.IMG_MAIN_TAB);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.ApplicationTab_Main; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	@Override
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		super.initializeFrom(configuration);
-
-		try {
-			projText.setText(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING));
-			appText.setText(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, EMPTY_STRING));
-			localAppText.setText(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_LOCAL_EXECUTABLE_PATH, EMPTY_STRING));
-			localAppButton.setSelection(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_COPY_EXECUTABLE, false));
-			consoleButton.setSelection(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_CONSOLE, false));
-		} catch (CoreException e) {
-			setErrorMessage(Messages.CommonTab_common_Exception_occurred_reading_configuration_EXCEPTION); //$NON-NLS-1$
-		}
-		handleLocalApplicationButtonSelected(); // Refreshes the local path textbox enable state.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	@Override
-	public boolean isValid(ILaunchConfiguration config) {
-		setErrorMessage(null);
-		setMessage(null);
-
-		String name = getFieldContent(projText.getText());
-		if (name != null) {
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			IStatus status = workspace.validateName(name, IResource.PROJECT);
-			if (status.isOK()) {
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-				if (!project.exists()) {
-					setErrorMessage(NLS.bind(Messages.ApplicationTab_Project_not_exist, new Object[] {name}));
-					return false;
-				}
-				if (!project.isOpen()) {
-					setErrorMessage(NLS.bind(Messages.ApplicationTab_Project_is_closed, new Object[] {name}));
-					return false;
-				}
-			} else {
-				setErrorMessage(NLS.bind(Messages.ApplicationTab_Illegal_project, new Object[]{status.getMessage()}));
-				return false;
-			}
-		}
-
-		name = getFieldContent(appText.getText());
-		if (name == null) {
-			setErrorMessage(Messages.ApplicationTab_Application_program_not_specified);
-			return false;
-		}
-
-		if(localAppButton.getSelection()) {
-			name = getFieldContent(localAppText.getText());
-			if(name == null) {
-				setErrorMessage("Local file not specified");
-			}
-			File file = new File(name);
-			if(!file.isAbsolute()) {
-				setErrorMessage("Local file path must be absolute");
-			}
-			if(!file.exists() || !file.isFile()) {
-				setErrorMessage("Local file must exist and be valid");
-			}
-		}
-
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME,
-				getFieldContent(projText.getText()));
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH,
-				getFieldContent(appText.getText()));
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_COPY_EXECUTABLE,
-				localAppButton.getSelection());
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_LOCAL_EXECUTABLE_PATH,
-				getFieldContent(localAppText.getText()));
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_CONSOLE,
-				consoleButton.getSelection());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		IProject project = getDefaultProject(configuration);
-		String projectName = null;
-		if (project != null) {
-			projectName = project.getName();
-			String name = getLaunchConfigurationDialog().generateName(projectName);
-			configuration.rename(name);
-		}
-
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME,
-				projectName);
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH,
-				(String) null);
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_COPY_EXECUTABLE,
-				(String) null);
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_LOCAL_EXECUTABLE_PATH,
-				false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#setLaunchConfigurationDialog(org.eclipse.debug.ui.ILaunchConfigurationDialog)
-	 */
-	@Override
-	public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) {
-		super.setLaunchConfigurationDialog(dialog);
-	}
-
-	/**
-	 * Create a dialog that allows the user to select a file in the current project.
-	 * 
-	 * @return selected file
-	 */
-	protected IResource chooseFile() {
-		final IProject project = getProject();
-		if (project == null) {
-			MessageDialog.openInformation(getShell(), Messages.ApplicationTab_Project_required,
-					Messages.ApplicationTab_Enter_project_before_browsing_for_program);
-			return null;
-		}
-
-		WorkbenchLabelProvider labelProvider = new WorkbenchLabelProvider();
-		BaseWorkbenchContentProvider contentProvider = new BaseWorkbenchContentProvider();
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), labelProvider, contentProvider);
-		dialog.setTitle(Messages.ApplicationTab_Program_selection);
-		dialog.setMessage(Messages.ApplicationTab_Choose_program_to_run_from_NAME);
-		dialog.setBlockOnOpen(true);
-		dialog.setAllowMultiple(false);
-		dialog.setInput(project);
-		dialog.setValidator(new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection.length == 0 || ! (selection[0] instanceof IFile)) {
-					return new Status(IStatus.ERROR, PTPCorePlugin.getUniqueIdentifier(), IStatus.INFO,
-							Messages.ApplicationTab_Selection_must_be_file, null);
-				}
-				try {
-					IResource resource = project.findMember( ((IFile)selection[0]).getProjectRelativePath());
-					if (resource == null || resource.getType() != IResource.FILE) {
-						return new Status(IStatus.ERROR, PTPCorePlugin.getUniqueIdentifier(), IStatus.INFO,
-								Messages.ApplicationTab_Selection_must_be_file, null);
-					}
-
-					return new Status(IStatus.OK, PTPCorePlugin.getUniqueIdentifier(), IStatus.OK, resource.getName(), null);
-				} catch (Exception ex) {
-					return new Status(IStatus.ERROR, PTPCorePlugin.PLUGIN_ID, IStatus.INFO,
-							Messages.ApplicationTab_Selection_must_be_file, null);
-				}
-			}
-		});
-		if (dialog.open() == Window.OK) {
-			return (IResource) dialog.getFirstResult();
-		}
-		return null;
-	}
-
-	/**
-	 * Create a dialog that allows the user to choose a project.
-	 * 
-	 * @return selected project
-	 */
-	protected IProject chooseProject() {
-		IProject[] projects = getWorkspaceRoot().getProjects();
-
-		WorkbenchLabelProvider labelProvider = new WorkbenchLabelProvider();
-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setTitle(Messages.ApplicationTab_Project_Selection_Title);
-		dialog.setMessage(Messages.ApplicationTab_Project_Selection_Message);
-		dialog.setElements(projects);
-
-		IProject project = getProject();
-		if (project != null) {
-			dialog.setInitialSelections(new Object[] { project });
-		}
-		if (dialog.open() == Window.OK) {
-			return (IProject) dialog.getFirstResult();
-		}
-		return null;
-	}
-
-	/**
-	 * Get a default project. This is either the project name that
-	 * has been previously selected, or the project that is currently
-	 * selected in the workspace.
-	 * 
-	 * @param configuration
-	 * @return default project
-	 */
-	protected IProject getDefaultProject(ILaunchConfiguration configuration) {
-		String projectName = null;
-		try {
-			projectName = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
-		} catch (CoreException e) {
-			return null;
-		}
-		IWorkbenchPage page = PTPLaunchPlugin.getActivePage();
-		if (projectName != null && !projectName.equals("")) { //$NON-NLS-1$
-			IProject project = getWorkspaceRoot().getProject(projectName);
-			if (project != null && project.exists())
-				return project;
-		} else {
-			if (page != null) {
-				ISelection selection = page.getSelection();
-				if (selection instanceof IStructuredSelection) {
-					IStructuredSelection ss = (IStructuredSelection)selection;
-					if (!ss.isEmpty()) {
-						Object obj = ss.getFirstElement();
-						if (obj instanceof IAdaptable) {
-							Object o = ((IAdaptable)obj).getAdapter(IResource.class);
-							if (o instanceof IResource)
-								return ((IResource)o).getProject();
-						}
-					}
-				}
-			}
-		}
-
-		IEditorPart part = page.getActiveEditor();
-		if (part != null) {
-			IEditorInput input = part.getEditorInput();
-			IFile file = (IFile) input.getAdapter(IFile.class);
-			if (file != null)
-				return file.getProject();
-		}
-		return null;
-	}
-
-	/**
-	 * Get the IProject the corresponds to the project name that is
-	 * displayed in the projText control
-	 * 
-	 * @return project
-	 */
-	protected IProject getProject() {
-		String projectName = projText.getText().trim();
-		if (projectName.length() < 1) {
-			return null;
-		}
-		return getWorkspaceRoot().getProject(projectName);
-	}
-
-	/**
-	 * Allow the user to choose the application to execute
-	 * 
-	 * Initial path does not work on MacOS X: see bug #153365
-	 */
-	protected void handleApplicationButtonSelected() {
-		String initPath = appText.getText();
-		if (initPath.equals(EMPTY_STRING)) {
-			final IProject project = getProject();
-			if (project == null) {
-				MessageDialog.openInformation(getShell(), Messages.ApplicationTab_Project_required,
-						Messages.ApplicationTab_Enter_project_before_browsing_for_program);
-				return;
-			}
-			initPath = getProject().getLocationURI().getPath();
-		}
-		IResourceManager rm = getResourceManager(getLaunchConfiguration());
-		AbstractRemoteResourceManagerConfiguration rmConf = (AbstractRemoteResourceManagerConfiguration) ((IResourceManagerControl)rm).getConfiguration();
-		IRemoteServices remServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(rmConf.getRemoteServicesId());
-		IRemoteUIServices remUIServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(remServices);
-		if (remServices != null && remUIServices != null) {
-			IRemoteConnection remCon = remServices.getConnectionManager().getConnection(rmConf.getConnectionName());
-			if (remCon != null) {
-				IRemoteUIFileManager fileMgr = remUIServices.getUIFileManager();
-				if (fileMgr != null) {
-					fileMgr.setConnection(remCon);
-					fileMgr.showConnections(false);
-					IPath path = fileMgr.browseFile(getShell(), "Select application to execute", initPath);
-					if (path != null) {
-						appText.setText(path.toString());
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Allow the user to choose a project
-	 */
-	protected void handleProjectButtonSelected() {
-		IProject project = chooseProject();
-		if (project == null)
-			return;
-
-		String projectName = project.getName();
-		projText.setText(projectName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog()
-	 */
-	@Override
-	protected void updateLaunchConfigurationDialog() {
-		super.updateLaunchConfigurationDialog();
-	}
-
-	/**
-	 * Disables copy of executable from local machine.
-	 */
-	protected void handleLocalApplicationButtonSelected() {
-		localAppText.setEnabled(localAppButton.getSelection());
-		browseAppButton.setEnabled(localAppButton.getSelection());
-	}
-
-	protected void handleBrowseLocalApplicationButtonSelected() {
-		String initPath = localAppText.getText();
-		if (initPath.equals(EMPTY_STRING)) {
-			final IProject project = getProject();
-			if (project == null) {
-				MessageDialog.openInformation(getShell(), Messages.ApplicationTab_Project_required,
-						Messages.ApplicationTab_Enter_project_before_browsing_for_program);
-				return;
-			}
-			initPath = getProject().getLocationURI().getPath();
-		}
-		IRemoteServices localServices = PTPRemoteCorePlugin.getDefault().getRemoteServices("org.eclipse.ptp.remote.LocalServices");
-		IRemoteUIServices localUIServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(localServices);
-		if(localServices != null && localUIServices != null) {
-			IRemoteConnectionManager lconnMgr = localServices.getConnectionManager();
-			IRemoteConnection lconn = lconnMgr.getConnection(null); // Since it's a local service, doesn't matter which parameter is passed
-			IRemoteUIFileManager localUIFileMgr = localUIServices.getUIFileManager();
-			localUIFileMgr.setConnection(lconn);
-			IPath path = localUIFileMgr.browseFile(getShell(), "Select the executable file to be copied", initPath);
-			if (path != null) {
-				localAppText.setText(path.toString());
-			}
-		}
-
-		/*IResourceManager rm = getResourceManager(getLaunchConfiguration());
-    	AbstractRemoteResourceManagerConfiguration rmConf = (AbstractRemoteResourceManagerConfiguration) ((IResourceManagerControl)rm).getConfiguration();
-    	IRemoteServices remServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(rmConf.getRemoteServicesId());
-    	if (remServices != null) {
-    		IRemoteConnection remCon = remServices.getConnectionManager().getConnection(rmConf.getConnectionName());
-    		if (remCon != null) {
-    			IRemoteFileManager fileMgr = remServices.getFileManager(remCon);
-    			if (fileMgr != null) {
-    				IPath path = fileMgr.browseFile(getShell(), "Select application to execute", initPath);
-    				if (path != null) {
-    					appText.setText(path.toString());
-    				}
-    			}
-    		}
-    	};*/
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ArgumentsTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ArgumentsTab.java
deleted file mode 100644
index d2e32cb..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ArgumentsTab.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.launch.internal.ui.LaunchImages;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- *
- */
-public class ArgumentsTab extends LaunchConfigurationTab {
-    protected Text argumentText = null;
-    
-    protected WorkingDirectoryBlock workingDirectoryBlock = new WorkingDirectoryBlock(); 
-    
-    protected class WidgetListener implements ModifyListener {
-		public void modifyText(ModifyEvent evt) {
-			updateLaunchConfigurationDialog();
-		}        
-    }
-    
-    protected WidgetListener listener = new WidgetListener();
-
-    /**
-     * @see ILaunchConfigurationTab#createControl(Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite comp = new Composite(parent, SWT.NONE);
-        setControl(comp);
-        //WorkbenchHelp.setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ARGUMNETS_TAB);
-        
-		GridLayout topLayout = new GridLayout();
-		comp.setLayout(topLayout);
-
-		Composite parallelComp = new Composite(comp, SWT.NONE);		
-		parallelComp.setLayout(createGridLayout(2, false, 0, 0));
-		parallelComp.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL, 5));        
-                
-		Label programArgumentLabel = new Label(parallelComp, SWT.NONE);
-		programArgumentLabel.setLayoutData(spanGridData(-1, 2));
-		programArgumentLabel.setText(Messages.ArgumentsTab_Parallel_Program_Arguments);
-		argumentText = new Text(parallelComp, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL);
-		GridData gd = spanGridData(GridData.FILL_HORIZONTAL, 2);
-		gd.heightHint = 40;
-		argumentText.setLayoutData(gd);
-		argumentText.addModifyListener(listener);
-		
-        createVerticalSpacer(parallelComp, 2);
-		
-        workingDirectoryBlock.createControl(parallelComp);
-    }
-    
-    /**
-     * Defaults are empty.
-     * 
-     * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-     */
-    public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-        configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_ARGUMENTS, (String) null);
-        workingDirectoryBlock.setDefaults(configuration);
-    }
-
-    /**
-     * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-     */
-    public void initializeFrom(ILaunchConfiguration configuration) {
-        try {
-            argumentText.setText(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_ARGUMENTS, EMPTY_STRING));            
-            workingDirectoryBlock.initializeFrom(configuration);
-        } catch (CoreException e) {
-            setErrorMessage(Messages.CommonTab_common_Exception_occurred_reading_configuration_EXCEPTION);
-        }
-    }
-
-    /**
-     * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-     */
-    public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-        configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_ARGUMENTS, argumentText.getText());
-        workingDirectoryBlock.performApply(configuration);
-    }    
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration configuration) {
-		setErrorMessage(null);
-		setMessage(null);
-		
-		return workingDirectoryBlock.isValid(configuration);
-	}
-	
-    /**
-     * @see ILaunchConfigurationTab#getName()
-     */
-    public String getName() {
-        return Messages.ArgumentsTab_Arguments;
-    }
-
-    /**
-     * @see ILaunchConfigurationTab#setLaunchConfigurationDialog(ILaunchConfigurationDialog)
-     */
-    public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) {
-        super.setLaunchConfigurationDialog(dialog);
-		workingDirectoryBlock.setLaunchConfigurationDialog(dialog);
-    }
-    
-    /**
-     * @see ILaunchConfigurationTab#getImage()
-     */
-    public Image getImage() {
-        return LaunchImages.getImage(LaunchImages.IMG_ARGUMENTS_TAB);
-    }    
-    
-    /**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		String msg = super.getErrorMessage();
-		if (msg == null)
-			return workingDirectoryBlock.getErrorMessage();
-
-		return msg;
-	}	
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getMessage()
-	 */
-	public String getMessage() {
-		String msg = super.getMessage();
-		if (msg == null)
-			return workingDirectoryBlock.getMessage();
-
-		return msg;
-	}		
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DebuggerTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DebuggerTab.java
deleted file mode 100644
index b1c24a9..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DebuggerTab.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 QNX Software Systems 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:
- * QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.debug.core.IPDebugConfiguration;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.launch.internal.ui.AbstractDebuggerTab;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-public class DebuggerTab extends AbstractDebuggerTab {
-	final protected boolean fAttachMode;
-
-	protected Button fStopInMain;
-	protected Button fAttachButton;
-
-	public DebuggerTab(boolean attachMode) {
-		fAttachMode = attachMode;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.internal.ui.AbstractDebuggerTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		GridLayout layout = new GridLayout(2, true);
-		comp.setLayout(layout);
-		GridData gd = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
-		comp.setLayoutData(gd);
-
-		createDebuggerCombo(comp, (fAttachMode) ? 1 : 2);
-		createOptionsComposite(comp);
-		createDebuggerGroup(comp, 2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.internal.ui.AbstractDebuggerTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		setInitializing(true);
-		super.initializeFrom(config);
-		try {
-			/*
-			 * Only set default debugger if there is a resource manager selected.
-			 */
-			String id = config.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_ID, EMPTY_STRING);
-			loadDebuggerComboBox(config, id, getResourceManager(config) == null);
-			initializeCommonControls(config);
-		} catch (CoreException e) {
-		}
-		setInitializing(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.internal.ui.AbstractDebuggerTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		if (!validateDebuggerConfig(config)) {
-			return false;
-		}
-		IPDebugConfiguration debugConfig = getDebugConfig();
-		String mode = fAttachMode ? IPTPLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH : IPTPLaunchConfigurationConstants.DEBUGGER_MODE_RUN;
-		if (!debugConfig.supportsMode(mode)) {
-			setErrorMessage(NLS.bind(Messages.DebuggerTab_Mode_not_supported, new Object[]{mode}));
-			return false;
-		}
-		if (super.isValid(config) == false) {
-			return false;
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.internal.ui.AbstractDebuggerTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		super.performApply(config);
-		if (fAttachMode) {
-			config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, IPTPLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH);
-		} else {
-			config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, fStopInMain.getSelection());
-			config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, IPTPLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.internal.ui.AbstractDebuggerTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		super.setDefaults(config);
-		if (fAttachMode) {
-			config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, IPTPLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH);
-		} else {
-			config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, IPTPLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
-			config.setAttribute(IPTPLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, IPTPLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT);
-		}
-	}
-
-	/**
-	 * Create a composite to display debugger options.
-	 * 
-	 * @param parent
-	 */
-	protected void createOptionsComposite(Composite parent) {
-		Composite optionsComp = new Composite(parent, SWT.NONE);
-
-		if (fAttachMode == true) {
-			GridLayout layout = new GridLayout(1, false);
-			optionsComp.setLayout(layout);
-			optionsComp.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false, 1, 1));
-		} else {
-			GridLayout layout = new GridLayout(2, false);
-			optionsComp.setLayout(layout);
-			optionsComp.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false, 2, 1));
-			fStopInMain = createCheckButton(optionsComp, Messages.DebuggerTab_Stop_at_main_on_startup);
-			GridData data = new GridData();
-			data.horizontalAlignment = GridData.BEGINNING;
-			fStopInMain.setLayoutData(data);
-			fStopInMain.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (!isInitializing()) {
-						updateLaunchConfigurationDialog();
-					}
-				}
-			});
-		}
-	}
-
-	/**
-	 * Initialize the controls.
-	 * 
-	 * @param config
-	 */
-	protected void initializeCommonControls(ILaunchConfiguration config) {
-		try {
-			if (!fAttachMode) {
-				fStopInMain.setSelection(config.getAttribute(IPTPLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, IPTPLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_DEFAULT));
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	/**
-	 * Load the debugger combo with installed debuggers.
-	 * 
-	 * @param config
-	 * @param selection
-	 */
-	protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection, boolean noDefault) {
-		IPDebugConfiguration[] debugConfigs;
-		debugConfigs = PTPDebugCorePlugin.getDefault().getDebugConfigurations();
-		Arrays.sort(debugConfigs, new Comparator<IPDebugConfiguration>() {
-			public int compare(IPDebugConfiguration ic1, IPDebugConfiguration ic2) {
-				return ic1.getName().compareTo(ic2.getName());
-			}
-		});
-		List<IPDebugConfiguration> list = new ArrayList<IPDebugConfiguration>();
-		String mode;
-		if (fAttachMode) {
-			mode = IPTPLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH;
-		} else {
-			mode = IPTPLaunchConfigurationConstants.DEBUGGER_MODE_RUN;
-		}
-		String defaultSelection = selection;
-		for (int i = 0; i < debugConfigs.length; i++) {
-			if (debugConfigs[i].supportsMode(mode)) {
-				list.add(debugConfigs[i]);
-				// select first exact matching debugger for requested selection
-				if (!noDefault && defaultSelection.equals("")) {
-					defaultSelection = debugConfigs[i].getID();
-				}
-			}
-		}
-		// if no selection meaning nothing in config the force initdefault on tab
-		setInitializeDefault(selection.equals("") ? true : false);
-		loadDebuggerCombo((IPDebugConfiguration[])list.toArray(new IPDebugConfiguration[list.size()]), defaultSelection);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.internal.ui.AbstractDebuggerTab#updateComboFromSelection()
-	 */
-	protected void updateComboFromSelection() {
-		super.updateComboFromSelection();
-		initializeCommonControls(getLaunchConfiguration());
-	}
-
-	/**
-	 * Validate the debugger configuration.
-	 * 
-	 * @param config
-	 * @return
-	 */
-	protected boolean validateDebuggerConfig(ILaunchConfiguration config) {
-		IPDebugConfiguration debugConfig = getDebugConfig();
-		if (debugConfig == null) {
-			setErrorMessage(Messages.DebuggerTab_No_debugger_available);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Check that the selected debugger can be used for this launch
-	 * 
-	 * FIXME: This needs to check the debugger supports the platform being managed by the
-	 * resource manager. The RM will need to provide an interface to get this information.
-	 * 
-	 * @param config
-	 * @param debugConfig
-	 * @return
-	 */
-	protected boolean validatePlatform(ILaunchConfiguration config, IPDebugConfiguration debugConfig) {
-		return true;
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DownloadRuleDialog.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DownloadRuleDialog.java
deleted file mode 100644
index 8ed151a..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/DownloadRuleDialog.java
+++ /dev/null

@@ -1,491 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.launch.data.DownloadRule;
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-import org.eclipse.ptp.launch.data.OverwritePolicies;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboMold;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-
-
-public class DownloadRuleDialog extends TitleAreaDialog implements IRuleDialog {
-
-	Composite content;
-
-	Text localDirectoryText;
-	Button localDirectoryButton;
-	Button localWorkspaceButton;
-
-	List fileList;
-	Button addFilesButton;
-	Button editFileButton;
-	Button removeFilesButton;
-	
-	Button asReadOnlyButton, asExecutableButton;
-	Button preserveTimeStampButton;
-	ComboGroup overwritePolicyCombo;
-	
-	DownloadRule downloadRule;
-	IPath lastSelectedDirectory = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-	
-	private int listenersEnabled = 0;
-	
-	public DownloadRuleDialog(Shell parentShell, DownloadRule rule) {
-		super(parentShell);
-		
-		downloadRule = rule;
-	}
-	
-	public DownloadRuleDialog(Shell shell) {
-		super(shell);
-		downloadRule = new DownloadRule();
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		content = new Composite(parent, SWT.BORDER);
-		GridLayout layout = new GridLayout();
-		content.setLayout(layout);
-//		Layout l = content.getParent().getLayout();
-		content.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		setTitle(Messages.DownloadRuleDialog_Title);
-		setMessage(Messages.DownloadRuleDialog_Message);
-		
-		createRemoteFilesComposite(content);
-		createLocalDirectoryComposite(content);
-		createOptionsComposite(content);
-		
-		putFieldContents();
-		
-		return content;
-	}
-
-	private void enableListeners() {
-		listenersEnabled ++;		
-	}
-	
-	private void disableListeners() {
-		listenersEnabled--;
-	}
-	
-	private void putFieldContents() {
-		disableListeners();
-		
-		if (downloadRule.getLocalDirectory() != null) {
-			localDirectoryText.setText(downloadRule.getLocalDirectory());
-		} else {
-			localDirectoryText.setText("");			 //$NON-NLS-1$
-		}
-		overwritePolicyCombo.selectIndexUsingID(Integer.toString(downloadRule.getOverwritePolicy()));
-		asExecutableButton.setSelection(downloadRule.isAsExecutable());
-		asReadOnlyButton.setSelection(downloadRule.isAsReadOnly());
-		preserveTimeStampButton.setSelection(downloadRule.isPreserveTimeStamp());
-		String items[] = downloadRule.getRemoteFilesAsStringArray();
-		Arrays.sort(items);
-		fileList.setItems(items);
-		
-		enableListeners();
-	}
-	
-	private void fetchFieldContents() {
-		disableListeners();
-		
-		String path = localDirectoryText.getText().trim();
-		if (path.length() > 0) {
-			downloadRule.setLocalDirectory(path);
-		} else {
-			downloadRule.setLocalDirectory(null);
-		}
-		downloadRule.setOverwritePolicy(Integer.parseInt(overwritePolicyCombo.getSelectionId()));
-		downloadRule.setAsExecutable(asExecutableButton.getSelection());
-		downloadRule.setAsReadOnly(asReadOnlyButton.getSelection());
-		downloadRule.setPreserveTimeStamp(preserveTimeStampButton.getSelection());
-		downloadRule.setRemoteFiles(fileList.getItems());
-		
-		enableListeners();
-	}
-
-	protected void okPressed() {
-		fetchFieldContents();
-		super.okPressed();
-	}
-
-	private Composite createLocalDirectoryComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(3);
-		frameMold.setTitle(Messages.DownloadRuleDialog_DestinationFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		Composite contents = frame.getComposite();
-		
-		GridData localDirectoryGridData = new GridData();
-		localDirectoryGridData.grabExcessHorizontalSpace = true;
-		localDirectoryGridData.horizontalSpan = 3;
-		localDirectoryGridData.horizontalAlignment = SWT.FILL;
-		localDirectoryText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-		localDirectoryText.setLayoutData(localDirectoryGridData);
-		
-		GridData skipperGridData = new GridData();
-		skipperGridData.grabExcessHorizontalSpace = true;
-		skipperGridData.horizontalSpan = 1;
-		skipperGridData.horizontalAlignment = SWT.FILL;
-		Label skipper = new Label(contents, SWT.NONE); // Just to skip one column
-		skipper.setLayoutData(skipperGridData);
-		
-		localDirectoryButton = new Button(contents, SWT.PUSH);
-		localDirectoryButton.setText(Messages.DownloadRuleDialog_DestinationFrame_FileSystemButton);
-		localDirectoryButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleLocalDirectoryButtonEvent();
-			}			
-		});
-		localWorkspaceButton = new Button(contents, SWT.PUSH);
-		localWorkspaceButton.setText(Messages.DownloadRuleDialog_DestinationFrame_WorkspaceButton);
-		localWorkspaceButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleLocalWorkspaceButtonEvent();
-			}			
-		});
-		
-		return frame;
-	}
-	
-	private Composite createOptionsComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(3);
-		frameMold.addOption(FrameMold.COLUMNS_EQUAL_WIDTH);
-		frameMold.setTitle(Messages.DownloadRuleDialog_OptionsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Composite contents = frame.getComposite();
-		asReadOnlyButton = new Button(contents, SWT.CHECK);
-		asReadOnlyButton.setText(Messages.DownloadRuleDialog_OptionsFrame_ReadonlyCheck);
-		asExecutableButton = new Button(contents, SWT.CHECK);
-		asExecutableButton.setText(Messages.DownloadRuleDialog_OptionsFrame_ExecutableCheck);
-		preserveTimeStampButton = new Button(contents, SWT.CHECK);
-		preserveTimeStampButton.setText(Messages.DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck);
-		
-		ComboMold mold = new ComboMold(ComboMold.GRID_DATA_SPAN);
-		mold.setLabel(Messages.DownloadRuleDialog_OptionsFrame_OverwriteLabel);
-		mold.setTextFieldWidth(40);
-		mold.addItem(Integer.toString(OverwritePolicies.SKIP), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption);
-		mold.addItem(Integer.toString(OverwritePolicies.ALWAYS), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption);
-		mold.addItem(Integer.toString(OverwritePolicies.NEWER), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption);
-		overwritePolicyCombo = new ComboGroup(contents, mold);
-		overwritePolicyCombo.getCombo().addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				disableListeners();
-				if (overwritePolicyCombo.getSelectionId().equals(Integer.toString(OverwritePolicies.NEWER))) {
-					preserveTimeStampButton.setEnabled(false);
-					preserveTimeStampButton.setSelection(true);
-				} else {
-					preserveTimeStampButton.setEnabled(true);					
-				}
-				enableListeners();
-			}
-			
-		});
-		return frame;
-	}
-	
-	private Composite createRemoteFilesComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.setTitle(Messages.DownloadRuleDialog_FileListFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Frame filesFrame = new Frame(frame.getComposite());
-		fileList = new List(filesFrame, SWT.MULTI | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=200;
-		fileList.setLayoutData(gridData);
-		fileList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				removeFilesButton.setEnabled(fileList.getSelectionCount() != 0);
-				editFileButton.setEnabled(fileList.getSelectionCount() == 1);
-			}
-		});
-		fileList.deselectAll();
-		
-		Frame buttonFrame = new Frame(frame.getComposite());
-		addFilesButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesButton.setText(Messages.DownloadRuleDialog_FileListFrame_AddButton);
-		addFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleaddFilesButtonEvent();
-			}			
-		});
-		editFileButton = new Button(buttonFrame, SWT.PUSH);
-		editFileButton.setText(Messages.DownloadRuleDialog_FileListFrame_EditButton);
-		editFileButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		editFileButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleEditFileButtonEvent();
-			}			
-		});
-		removeFilesButton = new Button(buttonFrame, SWT.PUSH);
-		removeFilesButton.setText(Messages.DownloadRuleDialog_FileListFrame_RemoveButton);
-		removeFilesButton.setEnabled(false);
-		removeFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleRemoveFilesButtonEvent();
-			}
-			
-		});
-		GridData gridData2 = new GridData();
-		gridData2.grabExcessVerticalSpace = true;
-		gridData2.verticalAlignment = SWT.TOP;
-		buttonFrame.setLayoutData(gridData2);
-		
-		return frame;
-	}
-
-	
-	private void handleLocalDirectoryButtonEvent() {
-		if (listenersEnabled < 0) return;
-
-		IPath selectedPath = null;
-		/*
-		 * First, try the current path.
-		 */
-		IPath workspacePath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		IPath currentPath = new Path(localDirectoryText.getText());
-		if (! currentPath.isAbsolute()) {
-			currentPath = workspacePath.append(currentPath).removeTrailingSeparator();
-		}
-		File file = new File(currentPath.toOSString());
-		if (file.isDirectory() && file.isDirectory()) {
-			selectedPath =  currentPath;
-		}
-		
-		/*
-		 * If not, try last directory.
-		 */
-		if (selectedPath == null) {
-			File file2 = new File(lastSelectedDirectory.toOSString());
-			if (file2.isDirectory() && file2.isDirectory()) {
-				selectedPath =  lastSelectedDirectory;
-			}
-		}
-		
-		/*
-		 * Otherwise, use workspace root.
-		 */
-		if (selectedPath == null) {
-			selectedPath = workspacePath;
-		}
-		
-		DirectoryDialog directoryDialog = new DirectoryDialog(getShell(), SWT.OPEN);
-		directoryDialog.setFilterPath(selectedPath.toOSString());
-		directoryDialog.setText(Messages.DownloadRuleDialog_DirectoryDialog_Title);
-		directoryDialog.setMessage(Messages.DownloadRuleDialog_DirectoryDialog_Message);
-
-		String newPath = directoryDialog.open();
-
-		if (newPath != null) {			
-			/*
-			 * If path is inside the workspace, then make it relative.
-			 */
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath path = new Path(newPath);
-			if (workspace.isPrefixOf(path)) {
-				path = path.removeFirstSegments(workspace.segmentCount());
-				path = path.makeRelative();
-			}
-			localDirectoryText.setText(path.toOSString());
-			
-			/*
-			 * Save lastSelectedDirectory. There is a bug in DirectoryDialog.
-			 * The method getFilterPath does not return the expected path.
-			 * The bug will be fixed in Eclipse 3.4.
-			 * The workarount takes the parent of the selected directory as lastSelectedDirectory.
-			 */
-			lastSelectedDirectory = new Path(newPath);
-			lastSelectedDirectory = lastSelectedDirectory.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-	
-	private void handleLocalWorkspaceButtonEvent() {
-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-		IContainer selectedContainer = null;
-	
-		/*
-		 * First, try the current content as initial selection.
-		 */
-		IPath currentPath = new Path(localDirectoryText.getText());
-		if (currentPath.isAbsolute()) {
-			// Absolute path if file system
-			IContainer currentContainer[] = workspace.findContainersForLocation(currentPath);
-			if (currentContainer != null) {
-				if (currentContainer.length == 1) {
-					selectedContainer = currentContainer[0];
-				}
-			}
-		} else {
-			// Path relative to workspace
-			IResource selectedResource = workspace.findMember(lastSelectedDirectory);
-			if (selectedResource != null) {
-				if (selectedResource instanceof IContainer) {
-					selectedContainer = (IContainer) selectedResource;
-				}
-			}
-		}
-		
-		/*
-		 * Otherwise, try the last selected path as initial selection.
-		 */
-		if (selectedContainer == null) {
-			IContainer lastContainer[] = workspace.findContainersForLocation(lastSelectedDirectory);
-			if (lastContainer != null) {
-				if (lastContainer.length == 1) {
-					selectedContainer = lastContainer[0];
-				}
-			}
-		}
-				
-		/*
-		 * If nothing matches, use the workspace root.
-		 */
-		if (selectedContainer == null) {
-			selectedContainer = workspace;
-		}
-		
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), workspace, true, Messages.DownloadRuleDialog_WorkspaceDialog_Title);
-		dialog.setBlockOnOpen(true);
-		dialog.setInitialSelections(new Object[] { selectedContainer });
-		
-		if (dialog.open() == Dialog.OK) {
-			/*
-			 * Although not documented, getResult returns an array with exactly
-			 * one element, that has type of IPath.
-			 * The path is relative to workspace.
-			 */
-			Object r[] = dialog.getResult();
-			IPath selectedPath = (IPath)r[0];
-			// The path is returned as absolute! Make it relative!
-			localDirectoryText.setText(selectedPath.makeRelative().toOSString());
-			
-			lastSelectedDirectory = selectedPath.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-
-	private void handleaddFilesButtonEvent() {
-		InputDialog inputDialog = new InputDialog(getShell(), Messages.DownloadRuleDialog_AddFileDialog_Title, Messages.DownloadRuleDialog_AddFileDialog_Message, "", null); //$NON-NLS-3$ //$NON-NLS-1$
-		inputDialog.setBlockOnOpen(true);
-		if (inputDialog.open() == Dialog.OK) {
-			ArrayList list = new ArrayList(Arrays.asList(fileList.getItems()));
-			list.add(inputDialog.getValue());
-			String s[] = new String[list.size()];
-			s = (String[]) list.toArray(s);
-			Arrays.sort(s);
-			fileList.setItems(s);
-		}
-	}
-	
-	private void handleEditFileButtonEvent() {
-		if (fileList.getSelectionCount() != 1) {
-			return;
-		}
-		int index = fileList.getSelectionIndex();
-		String selectedItem = fileList.getItem(index);
-		
-		InputDialog inputDialog = new InputDialog(getShell(), Messages.DownloadRuleDialog_EditFileDialog_Title, Messages.DownloadRuleDialog_EditFileDialog_Message, selectedItem, null);
-		inputDialog.setBlockOnOpen(true);
-		if (inputDialog.open() == Dialog.OK) {
-			String s[] = fileList.getItems();
-			s[index] = inputDialog.getValue();
-			Arrays.sort(s);
-			fileList.setItems(s);
-		}
-	}
-	
-	private void handleRemoveFilesButtonEvent() {
-		String selection [] = fileList.getSelection();
-		if (selection.length == 0) {
-			return;
-		}
-		
-		HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-		for (int i = 0; i < selection.length; i++) {
-			String string = selection[i];
-			fileSet.remove(string);
-		}
-		
-		String items[] = new String[fileSet.size()];
-		items = (String[]) fileSet.toArray(items);
-		Arrays.sort(items);
-		fileList.setItems(items);
-	}
-
-	public ISynchronizationRule getRuleWorkingCopy() {
-		return downloadRule;
-	}
-}
-

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnhancedSynchronizeTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnhancedSynchronizeTab.java
deleted file mode 100644
index 5753eb5..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnhancedSynchronizeTab.java
+++ /dev/null

@@ -1,454 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.launch.ui;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.data.DownloadRule;
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-import org.eclipse.ptp.launch.data.OverwritePolicies;
-import org.eclipse.ptp.launch.data.RuleFactory;
-import org.eclipse.ptp.launch.data.UploadRule;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- * @since 1.1
- */
-public class EnhancedSynchronizeTab extends AbstractLaunchConfigurationTab {
-
-	protected Button addUploadRuleButton;
-	protected Button addDownloadRuleButton;
-	protected Button editRuleButton;
-	protected Button removeRuleButton;
-	protected List ruleList;
-	protected ListViewer ruleViewer;
-	
-	protected Button syncBeforeButton;
-	protected Button syncAfterButton;
-	
-	protected ArrayList rules = new ArrayList();
-	protected SynchronizationRuleLabelProvider ruleLabelProvider;
-
-	boolean dataChanged = false;
-	int eventHandlerEnabled = 0;
-	
-	Image tabImage;
-	
-	public EnhancedSynchronizeTab() {
-		super();
-		dataChanged = false;
-		URL url = PTPLaunchPlugin.getDefault().getBundle().getEntry("/icons/sync.png"); //$NON-NLS-1$
-		if (url != null) {
-		    ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
-		    tabImage = imageDescriptor.createImage();
-		}
-	}
-
-	protected void enableEventHandlers() {
-		eventHandlerEnabled++;
-	}
-	
-	protected void disableEventHandlers() {
-		eventHandlerEnabled--;
-	}
-	
-	protected boolean isEventHandlerEnabled() {
-		return eventHandlerEnabled > 0;
-	}
-
-	protected class TabModifyListener implements ModifyListener, SelectionListener {
-		public void modifyText(ModifyEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-	}
-
-	protected TabModifyListener modifyListener;
-
-	public void createControl(Composite parent) {
-
-		this.setErrorMessage(null);
-		this.setMessage(Messages.EnhancedSynchronizeTab_Tab_Message);
-
-		Composite topControl = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topControl.setLayout(topLayout);
-
-		setControl(topControl);
-		
-		Frame frame = new Frame(topControl, Messages.EnhancedSynchronizeTab_RulesFrame_Title);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL | GridData.GRAB_VERTICAL));
-		Composite frameComposite = frame.getComposite();
-
-		modifyListener = new TabModifyListener();
-
-		createRuleListControl(frameComposite);
-		createOptionsControl(frameComposite);
-		createButtonControl(frameComposite);
-		
-		enableEventHandlers();
-		
-	}
-
-	protected Composite createRuleListControl(Composite parent) {
-		Frame frame = new Frame(parent, 1);
-		frame.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		Composite frameComposite = frame.getComposite();
-		
-		Label label = new Label(frameComposite, SWT.WRAP);
-		label.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Description);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		ruleList = new List(frameComposite, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=100;
-		ruleList.setLayoutData(gridData);
-		ruleList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				removeRuleButton.setEnabled(ruleList.getSelectionCount() != 0);
-				editRuleButton.setEnabled(ruleList.getSelectionCount() == 1);
-			}
-		});
-		ruleList.deselectAll();
-		ruleViewer = new ListViewer(ruleList);
-		ruleViewer.setContentProvider(new IStructuredContentProvider() {
-			public Object[] getElements(Object inputElement) {
-				return rules.toArray();
-			}
-
-			public void dispose() {
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-//				System.out.println(oldInput.toString());
-			}
-		});
-		
-		ruleLabelProvider = new SynchronizationRuleLabelProvider();
-		ruleViewer.setLabelProvider(ruleLabelProvider);
-		ruleViewer.setInput(rules);
-		return frame;		
-	}
-
-	protected Composite createOptionsControl(Composite parent) {
-		Frame frame = new Frame(parent, FrameMold.COLUMNS_EQUAL_WIDTH, 2);
-		Composite frameComposite = frame.getComposite();
-		
-		syncBeforeButton = createCheckButton(frameComposite, Messages.EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled);
-		syncBeforeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		syncBeforeButton.addSelectionListener(modifyListener);
-		syncAfterButton = createCheckButton(frameComposite, Messages.EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled);
-		syncAfterButton.addSelectionListener(modifyListener);
-		syncAfterButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		return frame;
-	}
-	
-	protected Composite createButtonControl(Composite parent) {
-		Frame frame = new Frame(parent, FrameMold.COLUMNS_EQUAL_WIDTH, 4);
-		Composite frameComposite = frame.getComposite();
-		
-		addUploadRuleButton = new Button(frameComposite, SWT.PUSH);
-		addUploadRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule);
-		addUploadRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addUploadRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleAddUploadRuleButtonPressed();
-			}
-		});
-		
-		addDownloadRuleButton = new Button(frameComposite, SWT.PUSH);
-		addDownloadRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule);
-		addDownloadRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addDownloadRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleAddDownloadRuleButtonPressed();
-			}
-		});
-
-		editRuleButton = new Button(frameComposite, SWT.PUSH);
-		editRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule);
-		editRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		editRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleEditRuleButtonPressed();
-			}
-		});
-		editRuleButton.setEnabled(false);
-		
-		removeRuleButton = new Button(frameComposite, SWT.PUSH);
-		removeRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules);
-		removeRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleRemoveRuleButtonPressed();
-			}
-		});
-		removeRuleButton.setEnabled(false);
-
-		return frame;
-	}
-	
-
-	public boolean isValid(ILaunchConfiguration config) {
-		return super.isValid(config);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#canSave()
-	 */
-	public boolean canSave() {
-		return super.canSave() || dataChanged;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_AFTER,
-				false);
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_BEFORE,
-				false);
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_RULES, 
-				new ArrayList());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	// FIXME Set data initialization
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		dataChanged = false;
-		try {
-			syncAfterButton.setSelection(configuration.getAttribute(
-					IPTPLaunchConfigurationConstants.ATTR_SYNC_AFTER,
-					false));
-			syncBeforeButton.setSelection(configuration.getAttribute(
-					IPTPLaunchConfigurationConstants.ATTR_SYNC_BEFORE,
-					false));
-			java.util.List list = configuration.getAttribute(
-					IPTPLaunchConfigurationConstants.ATTR_SYNC_RULES,
-					new ArrayList());
-			rules.clear();
-			for (Iterator iter = list.iterator(); iter.hasNext();) {
-				String string = (String) iter.next();
-				ISynchronizationRule rule = RuleFactory.createRuleFromString(string);
-				rules.add(rule);
-			}
-
-//			RemoteLaunchDelegate delegate = new RemoteLaunchDelegate();
-//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getValidatedRemoteDirectory(configuration)));
-//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getRemoteDirectory(configuration)));
-			
-			// For now the working directory will be the directory where the executable
-			// is
-			// TODO: Add another field to the interface to represent the working dir?
-			String execFile = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, (String)null);
-			if(execFile == null) {
-				String plugid = PTPLaunchPlugin.getDefault().getUniqueIdentifier();
-				String message = "No working directory available";
-				throw new CoreException(new Status(Status.ERROR, plugid, message));
-			}
-			/*String defaultRemoteWorkingDirectory = "";LaunchPreferences.getPreferenceStore().getString(
-					LaunchPreferences.ATTR_WORKING_DIRECTORY);*/
-
-			Path filePath = new Path(execFile);
-			ruleLabelProvider.setRemoteWorkingDir(filePath.removeLastSegments(1).toOSString());
-			
-			/*if( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, IRemoteLaunchAttributes.DEFAULT_AUTOMATIC_WORKING_DIRECTORY)){
-				ruleLabelProvider.setRemoteWorkingDir( defaultRemoteWorkingDirectory );
-			} else {
-				ruleLabelProvider.setRemoteWorkingDir( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, defaultRemoteWorkingDirectory) );
-			}*/
-			
-			refreshRuleList();
-			// FIXME: Set error messages
-		} catch (CoreException e) {
-			/*setErrorMessage(LaunchMessages
-					.getFormattedString(
-							"Launch.common.Exception_occurred_reading_configuration_EXCEPTION", e.getStatus().getMessage())); //$NON-NLS-1$
-			LaunchUIPlugin.log(e);*/
-		}
-	}
-
-	private void refreshRuleList() {
-//		ruleList.removeAll();
-//		for (Iterator iter = rules.iterator(); iter.hasNext();) {
-//			ISynchronizationRule rule = (ISynchronizationRule) iter.next();
-//			ruleList.add(rule.toLabel());
-//		}
-//		IStructuredSelection selection = (IStructuredSelection) ruleViewer.getSelection();
-//		Object firstElement = selection.getFirstElement();
-		ruleViewer.refresh();
-//		if (firstElement != null) {
-//			selection = new StructuredSelection(new Object[] {firstElement});
-//			ruleViewer.setSelection(selection, true);
-//		}
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_AFTER, syncAfterButton.getSelection());
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_BEFORE, syncBeforeButton.getSelection());
-		ArrayList list = new ArrayList();
-		for (Iterator iter = rules.iterator(); iter.hasNext();) {
-			ISynchronizationRule rule = (ISynchronizationRule) iter.next();
-			list.add(rule.toString());
-		}
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_SYNC_RULES, list);
-		dataChanged = false;
-	}
-
-	public String getName() {
-		return Messages.EnhancedSynchronizeTab_Tab_Title;
-	}
-
-	public Image getImage() {
-		return tabImage;
-	}
-
-	protected void handleAddUploadRuleButtonPressed() {
-		UploadRule uploadRule = new UploadRule();
-		uploadRule.setDefaultRemoteDirectory(true);
-		uploadRule.setRemoteDirectory(null);
-		uploadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-		newRuleDialog(uploadRule);
-	}
-	
-	protected void handleAddDownloadRuleButtonPressed() {
-		DownloadRule downloadRule = new DownloadRule();
-		downloadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-		newRuleDialog(downloadRule);
-	}
-	
-	protected void newRuleDialog(ISynchronizationRule rule) {
-		Dialog dialog = RuleDialogFactory.createDialogForRule(getShell(), rule);
-		if (dialog != null) {
-			if (dialog.open() == Dialog.OK) {
-				IRuleDialog ruleDialog = (IRuleDialog) dialog;
-				ISynchronizationRule newRule = RuleFactory.duplicateRule(ruleDialog.getRuleWorkingCopy());
-				rules.add(newRule);
-			}
-		} else {
-			MessageDialog.openError(getShell(), Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_Title,	Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType);
-		}
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-
-	protected void handleEditRuleButtonPressed() {
-		if (ruleList.getSelectionCount() != 1) return;
-		
-		int index = ruleList.getSelectionIndex();
-		ISynchronizationRule rule = (ISynchronizationRule) rules.get(index);
-		Dialog dialog = RuleDialogFactory.createDialogForRule(getShell(), rule);
-		if (dialog != null) {
-			if (dialog.open() == Dialog.OK) {
-				IRuleDialog ruleDialog = (IRuleDialog) dialog;
-				ISynchronizationRule newRule = RuleFactory.duplicateRule(ruleDialog.getRuleWorkingCopy());
-				rules.set(index, newRule);
-			}
-		} else {
-			MessageDialog.openError(getShell(), Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_Title,	Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType);
-		}
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-	
-	protected void handleRemoveRuleButtonPressed() {		
-		if (ruleList.getSelectionCount() == 0) return;
-
-		int indexes[] = ruleList.getSelectionIndices();
-		HashSet set = new HashSet();
-		for (int i = 0; i < indexes.length; i++) {
-			int index = indexes[i];
-			set.add(rules.get(index));
-		}
-		rules.removeAll(set);
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-	
-	public void dispose() {
-		super.dispose();
-
-		if (tabImage != null) tabImage.dispose();
-		tabImage = null;
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnvironmentTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnvironmentTab.java
deleted file mode 100644
index 38d472d..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/EnvironmentTab.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-
-/**
- * A modified version of {@link org.eclipse.debug.ui.EnvironmentTab}, where the
- * "append" and "replace" options are always disabled, and set to "append". 
- * @author Daniel Felix Ferber
- */
-public class EnvironmentTab extends org.eclipse.debug.ui.EnvironmentTab {
-	@Override
-	protected void updateAppendReplace() {
-		appendEnvironment.setEnabled(false);
-		replaceEnvironment.setEnabled(false);	
-	}
-	
-	@Override
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		/*
-		 * Ensure that the "append"/"replace" attribute is always set to "append", 
-		 * ignoring whatever was set as default by the original implementation.
-		 */
-		super.setDefaults(configuration);
-		configuration.setAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true);
-	}
-	
-	@Override
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		super.initializeFrom(configuration);
-		/*
-		 * Ensure that the "append"/"replace" controls are always shown as "append", 
-		 * ignoring whatever was shown by the original implementation.
-		 */
-		appendEnvironment.setSelection(true);
-        replaceEnvironment.setSelection(false);
-	}
-	
-	@Override
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		/*
-		 * Ensure that the "append"/"replace" attribute is always set to "append", 
-		 * ignoring whatever was set by the original implementation.
-		 */
-		super.performApply(configuration);
-		configuration.setAttribute(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true);
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/IRuleDialog.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/IRuleDialog.java
deleted file mode 100644
index a8968c9..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/IRuleDialog.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-
-public interface IRuleDialog {
-	public ISynchronizationRule getRuleWorkingCopy();
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/LaunchConfigurationTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/LaunchConfigurationTab.java
deleted file mode 100644
index 70a9f17..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/LaunchConfigurationTab.java
+++ /dev/null

@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-
-/**
- *
- */
-public abstract class LaunchConfigurationTab extends AbstractLaunchConfigurationTab {
-    public static final String DEFAULT_VALUE = "0";
-    public static final String EMPTY_STRING = "";
-
-	private ILaunchConfiguration launchConfiguration = null;
-
-    /**
-     * Utility routine to create a grid layout
-     * 
-     * @param columns
-     * @param isEqual
-     * @param mh
-     * @param mw
-     * @return
-     */
-    protected GridLayout createGridLayout(int columns, boolean isEqual, int mh, int mw) {
-        GridLayout gridLayout = new GridLayout();
-        gridLayout.numColumns = columns;
-        gridLayout.makeColumnsEqualWidth = isEqual;
-        gridLayout.marginHeight = mh;
-        gridLayout.marginWidth = mw;
-        return gridLayout;
-    }
-    
-	/**
-	 * Returns the selected workspace container,or <code>null</code>
-	 *
-	 * @param workspaceDir
-	 * @return workspace container
-	 */
-	protected IContainer getContainer(String workspaceDir) {
-		IResource res = getResource(workspaceDir);
-		if (res instanceof IContainer) {
-			return (IContainer)res;
-		}
-		return null;
-	}
-	
-	/**
-     * Utility routine to get the contents of a text field
-     * 
-     * @param text
-     * @return string
-     */
-    protected String getFieldContent(String text) {
-        if (text.trim().length() == 0 || text.equals(EMPTY_STRING)) {
-            return null;
-        }
-        
-        return text;
-    }    
-    
-    /**
-     * Get the platform from the launch configuration
-     * 
-     * @param config
-     * @return platform
-     */
-    protected String getPlatform(ILaunchConfiguration config) {
-		String platform = Platform.getOS();
-		try {
-			return config.getAttribute(IPTPLaunchConfigurationConstants.ATTR_PLATFORM, platform);
-		} catch (CoreException e) {
-			return platform;
-		}
-	}
-    
-    /**
-     * Gets the project from the configuration
-     * 
-     * @param configuration
-     * @return project
-     */
-    protected IProject getProject(ILaunchConfiguration configuration) {
-        String proName = null;
-        try {
-            proName = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null);
-        } catch (CoreException e) {
-            return null;
-        }        
-        if (proName == null) {
-            return null;
-        }
-        
-        return getWorkspaceRoot().getProject(proName);        
-    }
-    
-    /**
-	 * Returns the selected workspace resource, or <code>null</code>
-	 *
-	 * @param workspaceDir
-	 * @return workspace resource
-	 */
-	protected IResource getResource(String workspaceDir) {
-		return getWorkspaceRoot().findMember(new Path(workspaceDir));
-	}
-
-    protected IWorkspaceRoot getWorkspaceRoot() {
-    	return ResourcesPlugin.getWorkspace().getRoot();
-    }    
-	
-    /**
-	 * Given a launch configuration, find the resource manager that was been selected.
-	 * 
-	 * @param configuration
-	 * @return resource manager
-	 * @throws CoreException
-	 */
-	protected IResourceManager getResourceManager(ILaunchConfiguration configuration) {
-		final String rmUniqueName;
-		try {
-			rmUniqueName = configuration
-					.getAttribute(
-							IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME,
-							EMPTY_STRING);
-		} catch (CoreException e) {
-			return null;
-		}
-		return PTPCorePlugin.getDefault().getModelManager()
-				.getResourceManagerFromUniqueName(rmUniqueName);
-	}
-	
-    /**
-     * Utility routing to create a GridData
-     * 
-     * @param style
-     * @param space
-     * @return
-     */
-    protected GridData spanGridData(int style, int space) {
-        GridData gd = null;
-        if (style == -1)
-            gd = new GridData();
-        else
-            gd = new GridData(style);
-        gd.horizontalSpan = space;
-        return gd;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		// cache the launch configuration for updates
-		setLaunchConfiguration(configuration);
-	}
-	
-
-	/**
-	 * Cache the launch configuration
-	 * 
-	 * @param configuration
-	 */
-	public void setLaunchConfiguration(ILaunchConfiguration configuration) {
-		launchConfiguration = configuration;
-	}
-	
-
-	/**
-	 * @return the launchConfiguration
-	 */
-	public ILaunchConfiguration getLaunchConfiguration() {
-		return launchConfiguration;
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ResourcesTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ResourcesTab.java
deleted file mode 100644
index f786fad..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/ResourcesTab.java
+++ /dev/null

@@ -1,442 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.launch.internal.ui.LaunchImages;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationContentsChangedListener;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * The Resources tab is used to specify the resources required for
- * a successful job launch. It is populated by the selected
- * resource manager (specified in the Main tab)
- */
-public class ResourcesTab extends LaunchConfigurationTab {
-	private final class ContentsChangedListener implements IRMLaunchConfigurationContentsChangedListener {
-
-		public void handleContentsChanged(IRMLaunchConfigurationDynamicTab rmDynamicTab) {
-			// The buttons and messages have to be updated based on anything
-			// that has changed in the dynamic portion of the launch tab.
-			updateLaunchConfigurationDialog();
-		}
-	}
-
-	private Combo resourceManagerCombo = null;
-	private IResourceManager resourceManager = null;
-    private final Map<Integer, IResourceManager> resourceManagers = new HashMap<Integer, IResourceManager>();
-    private final HashMap<IResourceManager, Integer> resourceManagerIndices = new HashMap<IResourceManager, Integer>();
-
-	// The composite that holds the RM's attributes for the launch configuration 
-	private ScrolledComposite launchAttrsScrollComposite;
-
-	private final Map<IResourceManager, IRMLaunchConfigurationDynamicTab> rmDynamicTabs = 
-		new HashMap<IResourceManager, IRMLaunchConfigurationDynamicTab>();
-
-	private final ContentsChangedListener launchContentsChangedListener = 
-		new ContentsChangedListener(); 
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#canSave()
-	 */
-	@Override
-	public boolean canSave() {
-		setErrorMessage(null);
-		if (resourceManager == null) {
-			setErrorMessage(Messages.ResourcesTab_No_Resource_Manager);
-			return false;
-		}
-		IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(resourceManager);
-		final Composite launchComp = getLaunchAttrsScrollComposite();
-		if (rmDynamicTab == null || launchComp == null) {
-			setErrorMessage(NLS.bind(Messages.ResourcesTab_No_Launch_Configuration, new Object[] {resourceManager.getName()}));
-			return false;
-		}
-		RMLaunchValidation validation = rmDynamicTab.canSave(launchComp, resourceManager, null);
-		if (!validation.isSuccess()) {
-			setErrorMessage(validation.getMessage());
-			return false;
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		final int numColumns = 2;
-		final Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-	
-		GridLayout layout = new GridLayout(2, false);
-		comp.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		comp.setLayoutData(gd);
-	 
-		IModelManager modelManager = PTPCorePlugin.getDefault().getModelManager();
-		IPUniverse universe = modelManager.getUniverse();
-		IResourceManager[] rms = modelManager.getStartedResourceManagers(universe);
-		new Label(comp, SWT.NONE).setText(Messages.ApplicationTab_RM_Selection_Label);
-			
-		resourceManagerCombo = new Combo(comp, SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		resourceManagerCombo.setLayoutData(gd);
-		for (int i = 0; i < rms.length; i++) {
-			resourceManagerCombo.add(rms[i].getName());
-			resourceManagers.put(i, rms[i]);
-			resourceManagerIndices.put(rms[i], i);
-		}
-		resourceManagerCombo.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (e.getSource() == resourceManagerCombo) {
-					rmSelectionChanged();
-			        updateLaunchAttributeControls(resourceManager, null, getLaunchConfiguration());
-		            updateLaunchConfigurationDialog();
-				}
-			}
-		});
-		resourceManagerCombo.deselectAll();
-		
-		createVerticalSpacer(comp, 2);
-
-		// The composite that holds the RM's attributes for the launch configuration
-		Group attrGroup = new Group(comp, SWT.NONE);
-		attrGroup.setText(Messages.ResourcesTab_Launch_Attributes);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = numColumns;
-		attrGroup.setLayoutData(gd);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 1;
-		attrGroup.setLayout(gridLayout);
-
-		final ScrolledComposite scrollComp = createLaunchAttributeControlComposite(attrGroup,
-				numColumns);
-		setLaunchAttrsScrollComposite(scrollComp);
- 	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return LaunchImages.getImage(LaunchImages.IMG_PARALLEL_TAB);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.ResourcesTab_Resources;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		super.initializeFrom(configuration);
-		
-        resourceManager = getResourceManager(configuration);
-		if (resourceManager == null) {
-			setErrorMessage(Messages.ApplicationTab_No_Resource_Manager_Available);
-			return;
-		}
-
-		setResourceManagerComboSelection(resourceManager);
-
-		IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(resourceManager);
-		final Composite launchComp = getLaunchAttrsScrollComposite();
-		if (rmDynamicTab == null || launchComp == null) {
-			setErrorMessage(NLS.bind(Messages.ResourcesTab_No_Launch_Configuration, new Object[] {resourceManager.getName()}));
-			return;
-		}
-		
-		// Update the dynamic portions of the launch configuration
-		// tab.
-		updateLaunchAttributeControls(resourceManager, null, getLaunchConfiguration());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration configuration) {
-		setErrorMessage(null);
-		setMessage(null);
-		if (resourceManager == null) {
-			setErrorMessage(Messages.ResourcesTab_No_Resource_Manager);
-			return false;
-		}
-
-		IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(resourceManager);
-		if (rmDynamicTab == null) {
-			setErrorMessage(NLS.bind(Messages.ResourcesTab_No_Launch_Configuration, new Object[] {resourceManager.getName()}));
-			return false;
-		}
-		RMLaunchValidation validation = rmDynamicTab.isValid(configuration, resourceManager, null);
-		if (!validation.isSuccess()) {
-			setErrorMessage(validation.getMessage());
-			return false;
-		}
-		
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-    	if (resourceManager != null) {
- 			configuration.setAttribute(
-						IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME,
-						resourceManager.getUniqueName());
-			IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(resourceManager);
-			if (rmDynamicTab == null) {
-				setErrorMessage(NLS.bind(Messages.ResourcesTab_No_Launch_Configuration, new Object[] {resourceManager.getName()}));
-				return;
-			}
-			RMLaunchValidation validation = rmDynamicTab.performApply(configuration, resourceManager, null);
-			if (!validation.isSuccess()) {
-				setErrorMessage(validation.getMessage());
-				return;
-			}
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-        IResourceManager rm = getResourceManagerDefault();
-		if (rm == null) {
-			setErrorMessage(Messages.ResourcesTab_No_Resource_Manager);
-			return;
-		}
-        String rmName = rm.getUniqueName();
-		configuration.setAttribute(
-				IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME,
-				rmName);
-
-		IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(rm);
-		if (rmDynamicTab == null) {
-			setErrorMessage(NLS.bind(Messages.ResourcesTab_No_Launch_Configuration, new Object[] {resourceManager.getName()}));
-		} else {
-			rmDynamicTab.setDefaults(configuration, rm, null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#setLaunchConfigurationDialog(org.eclipse.debug.ui.ILaunchConfigurationDialog)
-	 */
-	public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) {
-		super.setLaunchConfigurationDialog(dialog);
-	}
-
-	/**
-	 * @param parent
-	 * @param colspan
-	 * @return
-	 */
-	private ScrolledComposite createLaunchAttributeControlComposite(Composite parent, int colspan) {
-		ScrolledComposite attrComp = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalSpan = colspan;
-		attrComp.setLayoutData(gridData);
-		attrComp.setExpandHorizontal(true);
-		attrComp.setExpandVertical(true);
-		return attrComp;
-	}
-
-	/**
-	 * Create a new dynamic tab, given the resource manager.
-	 * 
-	 * @param rm
-	 * @return
-	 * @throws CoreException
-	 */
-	private IRMLaunchConfigurationDynamicTab createRMLaunchConfigurationDynamicTab(
-			final IResourceManager rm) throws CoreException {
-		
-		final AbstractRMLaunchConfigurationFactory rmFactory = 
-			PTPLaunchPlugin.getDefault().getRMLaunchConfigurationFactory(rm);
-		if (rmFactory == null) {
-			return null;
-		}
-		IRMLaunchConfigurationDynamicTab rmDynamicTab =	rmFactory.create(rm);
-		if (rmDynamicTab == null) {
-			return null;
-		}
-		rmDynamicTab.addContentsChangedListener(launchContentsChangedListener);
-		return rmDynamicTab;
-	}
-
-	/**
-	 * @return
-	 */
-	private ScrolledComposite getLaunchAttrsScrollComposite() {
-		return launchAttrsScrollComposite;
-	}
-
-	/**
-	 * Find a default resource manager. If there is only one, then it is
-	 * the default. If there are more or less than one, there is no default.
-	 * 
-	 * @return resource manager
-	 */
-	private IResourceManager getResourceManagerDefault() {
-		IModelManager modelManager = PTPCorePlugin.getDefault().getModelManager();
-		IPUniverse universe = modelManager.getUniverse();
-		if (universe != null) {
-			IResourceManager[] rms = modelManager.getStartedResourceManagers(universe);
-			if (rms.length != 1) {
-				return null;
-			}
-			return rms[0];
-		}
-		return null;
-	}
-
-	/**
-	 * @return
-	 */
-	private IResourceManager getResourceManagerFromCombo() {
-		if (resourceManagerCombo != null) {
-			int i = resourceManagerCombo.getSelectionIndex();
-			return resourceManagers.get(i);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a cached launch configuration dynamic tab.  If it isn't in the cache
-	 * then it creates a new one, and puts it in the cache.
-	 * 
-	 * @param rm
-	 * @return
-	 */
-	private IRMLaunchConfigurationDynamicTab getRMLaunchConfigurationDynamicTab(
-			final IResourceManager rm) {
-		if (!rmDynamicTabs.containsKey(rm)) { 
-			try {
-				IRMLaunchConfigurationDynamicTab rmDynamicTab =
-					createRMLaunchConfigurationDynamicTab(rm);
-				rmDynamicTabs.put(rm, rmDynamicTab);
-				return rmDynamicTab;
-			} catch (CoreException e) {
-				setErrorMessage(e.getMessage());
-				PTPLaunchPlugin.errorDialog(e.getMessage(), e);
-				return null;
-			}
-		}
-		return rmDynamicTabs.get(rm);
-	}
-
-	/**
-     * Handle selection of a resource manager
-     */
-    private void rmSelectionChanged() {
-    	resourceManager = getResourceManagerFromCombo();
-    }
-
-    /**
-	 * @param comp
-	 */
-	private void setLaunchAttrsScrollComposite(ScrolledComposite comp) {
-		this.launchAttrsScrollComposite = comp;
-	}
-    
-	/**
-	 * Given a resource manager, select it in the combo
-	 * 
-	 * @param resource manager
-	 */
-	private void setResourceManagerComboSelection(IResourceManager rm) {
-		final Integer results = resourceManagerIndices.get(rm);
-		int i = 0;
-		if (results != null) {
-			i = results.intValue();
-		}
-		resourceManagerCombo.select(i);
-		rmSelectionChanged();
-	}
-    
-    /**
-	 * This routine is called when either the resource manager or the
-	 * queue has been changed via the combo boxes.  It's job is to
-	 * regenerate the dynamic ui components, dependent on the resource
-	 * manager and queue choice.
-	 * 
-	 * @param rm
-	 * @param queue
-	 * @param launchConfiguration
-	 */
-	private void updateLaunchAttributeControls(IResourceManager rm, IPQueue queue,
-			ILaunchConfiguration launchConfiguration) {
-		final ScrolledComposite launchAttrsScrollComp = getLaunchAttrsScrollComposite();
-		launchAttrsScrollComp.setContent(null);
-		for (Control child : launchAttrsScrollComp.getChildren()) {
-			child.dispose();
-		}
-		IRMLaunchConfigurationDynamicTab rmDynamicTab = getRMLaunchConfigurationDynamicTab(rm);
-		if (rmDynamicTab != null) {
-			try {
-				rmDynamicTab.createControl(launchAttrsScrollComp, rm, queue);
-				final Control dynControl = rmDynamicTab.getControl();
-				launchAttrsScrollComp.setContent(dynControl);
-				Point size = dynControl.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-				launchAttrsScrollComp.setMinSize(size);
-				rmDynamicTab.initializeFrom(launchAttrsScrollComp, rm, queue, launchConfiguration);
-			} catch (CoreException e) {
-				setErrorMessage(e.getMessage());
-				PTPLaunchPlugin.errorDialog(e.getMessage(), e);
-			}
-		}		
-		launchAttrsScrollComp.layout(true);
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/RuleDialogFactory.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/RuleDialogFactory.java
deleted file mode 100644
index 6c69f8e..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/RuleDialogFactory.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.ptp.launch.data.DownloadRule;
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-import org.eclipse.ptp.launch.data.UploadRule;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class RuleDialogFactory {
-	
-	/**
-	 * Returns a new dialog that is able to edit a rule.
-	 * @param shell The SWT shell for the dialog
-	 * @param rule The rule to edit
-	 * @return The dialog or null if no dialog is known for the rule.
-	 */
-	public static Dialog createDialogForRule(Shell shell, ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			return new DownloadRuleDialog(shell, downloadRule);
-		} else if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			return new UploadRuleDialog(shell, uploadRule);
-		} else {
-			return null;
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/SynchronizationRuleLabelProvider.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/SynchronizationRuleLabelProvider.java
deleted file mode 100644
index ac36151..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/SynchronizationRuleLabelProvider.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.launch.internal.LinuxPath;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.launch.data.DownloadRule;
-import org.eclipse.ptp.launch.data.UploadRule;
-import org.eclipse.swt.graphics.Image;
-
-
-class SynchronizationRuleLabelProvider implements ILabelProvider {
-	Image uploadRuleImage = null;
-	Image downloadRuleImage = null;
-	
-	String remoteWorkingDir;
-
-	public SynchronizationRuleLabelProvider() {
-		super();
-	}
-
-	public String getRemoteWorkingDir() {
-		return remoteWorkingDir;
-	}
-
-	public void setRemoteWorkingDir(String remoteWorkingDir) {
-		this.remoteWorkingDir = remoteWorkingDir;
-	}
-
-	public Image getImage(Object element) {
-		if (element instanceof DownloadRule) {
-			return downloadRuleImage;
-		} else if (element instanceof DownloadRule) {
-			return uploadRuleImage;
-		} else {
-			return null;
-		}
-	}
-
-	public String getText(Object element) {
-		if (element instanceof DownloadRule) {
-			DownloadRule rule = (DownloadRule) element;
-			String result = Messages.EnhancedSynchronizeTab_DownloadLabel_Type;
-			if (rule.getRemoteFileCount() == 0) {
-				result += Messages.EnhancedSynchronizeTab_DownloadLabel_NoFiles;
-			} else if (rule.getRemoteFileCount() == 1) {
-				result += Messages.EnhancedSynchronizeTab_DownloadLabel_OneFile;
-			} else {
-				result += NLS.bind(Messages.EnhancedSynchronizeTab_DownloadLabel_MultipleFiles, new Integer(rule.getRemoteFileCount()));
-			}
-			if (rule.getRemoteFileCount() >= 1) {
-				result += '\n' + Messages.EnhancedSynchronizeTab_DownloadLabel_FromLabel;
-				String files[] = rule.getRemoteFilesAsStringArray();
-				for (int i = 0; i < files.length; i++) {
-					String file = files[i];
-					if (i != 0) file += Messages.EnhancedSynchronizeTab_DownloadLabel_FileListSeparator;
-					result += file;
-				}
-				result += '\n';
-				if (rule.getLocalDirectory() == null) {
-					result += Messages.EnhancedSynchronizeTab_DownloadLabel_DestinationMissing;
-				} else {
-					result += Messages.EnhancedSynchronizeTab_DownloadLabel_DestinationLabel + rule.getLocalDirectory();							
-				}
-				if (rule.isAsExecutable() || rule.isAsReadOnly() || rule.isPreserveTimeStamp()) {							result += '\n' + Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsLabel;			
-					boolean comma = false;
-					if (rule.isAsExecutable()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_Executable;
-					}
-					if (rule.isAsReadOnly()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_Readonly;								
-					}
-					if (rule.isPreserveTimeStamp()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp;
-					}
-				}
-			}
-			return result;
-		} else if (element instanceof UploadRule) {
-			UploadRule rule = (UploadRule) element;
-			String result = Messages.EnhancedSynchronizeTab_UploadLabel_Type;
-			if (rule.getRemoteFileCount() == 0) {
-				result += Messages.EnhancedSynchronizeTab_UploadLabel_NoFiles;
-			} else if (rule.getRemoteFileCount() == 1) {
-				result += Messages.EnhancedSynchronizeTab_UploadLabel_OneFile;
-			} else {
-				result += NLS.bind(Messages.EnhancedSynchronizeTab_UploadLabel_MultipleFiles, new Integer(rule.getRemoteFileCount()) );
-			}
-			if (rule.getRemoteFileCount() >= 1) {
-				result += '\n' + Messages.EnhancedSynchronizeTab_UploadLabel_FromLabel;
-				String files[] = rule.getLocalFilesAsStringArray();
-				for (int i = 0; i < files.length; i++) {
-					String file = files[i];
-					if (i != 0) file += Messages.EnhancedSynchronizeTab_UploadLabel_FileListSeparator;
-					result += file;
-				}
-				result += '\n';
-				if ((rule.getRemoteDirectory() == null) || rule.isDefaultRemoteDirectory()) {
-					result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationLabel+remoteWorkingDir;
-				} else {
-					IPath remoteWorkingPath = new Path(remoteWorkingDir);
-					IPath remotePath = new Path(rule.getRemoteDirectory());
-					if (! remotePath.isAbsolute()) {
-						remotePath = remoteWorkingPath.append(remotePath);
-					}
-					result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationLabel+LinuxPath.toString(remotePath);
-				}
-				if (rule.isAsExecutable() || rule.isAsReadOnly() || rule.isPreserveTimeStamp() || rule.isDownloadBack()) {
-					result += '\n' + Messages.EnhancedSynchronizeTab_UploadLabel_OptionsLabel;			
-					boolean comma = false;
-					if (rule.isAsExecutable()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_Executable;
-					}
-					if (rule.isAsReadOnly()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_Readonly;								
-					}
-					if (rule.isPreserveTimeStamp()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp;
-					}
-					if (rule.isDownloadBack()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack;
-					}
-				}
-			}
-			return result;					
-		} else {
-			return null;
-		}
-	}
-
-
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	public void dispose() {
-		if (uploadRuleImage != null) uploadRuleImage.dispose();
-		if (downloadRuleImage != null) downloadRuleImage.dispose();
-		uploadRuleImage = null;
-		downloadRuleImage = null;
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/UploadRuleDialog.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/UploadRuleDialog.java
deleted file mode 100644
index 4a99280..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/UploadRuleDialog.java
+++ /dev/null

@@ -1,519 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.launch.data.ISynchronizationRule;
-import org.eclipse.ptp.launch.data.OverwritePolicies;
-import org.eclipse.ptp.launch.data.UploadRule;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboMold;
-import org.eclipse.ptp.utils.ui.swt.ControlsRelationshipHandler;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.ptp.utils.ui.swt.TextGroup;
-import org.eclipse.ptp.utils.ui.swt.TextMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-
-
-public class UploadRuleDialog extends TitleAreaDialog implements IRuleDialog {
-
-	Composite content;
-	Button defaultRemoteDirectoryButton;
-	ControlsRelationshipHandler remoteDirectoryRelationshipHandler;
-	TextGroup remoteDirectoryText;
-	Button asReadOnlyButton, asExecutableButton;
-	Button downloadBackButton, preserveTimeStampButton;
-	ComboGroup overwritePolicyCombo;
-	Button removeFilesButton;
-	Button addFilesFromFilesystemButton;
-	Button addDirectoriesFromFilesystemButton;
-	Button addFilesFromWorkspaceButton;
-	List fileList;
-	
-	UploadRule uploadRule;
-	
-	IPath lastSelectedDirectory = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-	private int listenersEnabled = 0;
-	
-	public UploadRuleDialog(Shell parentShell, UploadRule rule) {
-		super(parentShell);
-		
-		uploadRule = rule;
-	}
-	
-//	public UploadRuleDialog(Shell shell) {
-//		super(shell);
-//		uploadRule = new UploadRule();
-//		// set defaults
-//		uploadRule.setDefaultRemoteDirectory(true);
-//		uploadRule.setRemoteDirectory(null);
-//		uploadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-//	}
-
-	protected Control createDialogArea(Composite parent) {
-		content = new Composite(parent, SWT.BORDER);
-		GridLayout layout = new GridLayout();
-		content.setLayout(layout);
-//		Layout l = content.getParent().getLayout();
-		content.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		setTitle(Messages.UploadRuleDialog_Title);
-		setMessage(Messages.UploadRuleDialog_Message);
-		
-		createRemoteDirectoryComposite(content);
-		createFilesComposite(content);
-		createOptionsComposite(content);
-		
-		putFieldContents();
-		
-		return content;
-	}
-
-	private void putFieldContents() {
-		disableListeners();
-		defaultRemoteDirectoryButton.setSelection(uploadRule.isDefaultRemoteDirectory());
-		remoteDirectoryRelationshipHandler.manageDependentControls(defaultRemoteDirectoryButton);
-		if (uploadRule.getRemoteDirectory() != null) {
-			remoteDirectoryText.setString(uploadRule.getRemoteDirectory());
-		} else {
-			remoteDirectoryText.setString(""); //$NON-NLS-1$
-		}
-		asReadOnlyButton.setSelection(uploadRule.isAsReadOnly()); 
-		asExecutableButton.setSelection(uploadRule.isAsExecutable());
-		downloadBackButton.setSelection(uploadRule.isDownloadBack()); 
-		preserveTimeStampButton.setSelection(uploadRule.isPreserveTimeStamp());
-		overwritePolicyCombo.selectIndexUsingID(Integer.toString(uploadRule.getOverwritePolicy()));
-		String items[] = uploadRule.getLocalFilesAsStringArray();
-		Arrays.sort(items);
-		fileList.setItems(items);
-		enableListeners();
-	}
-	
-	private void enableListeners() {
-		listenersEnabled ++;		
-	}
-
-	private void disableListeners() {
-		listenersEnabled--;
-	}
-
-	private void fetchFieldContents() {
-		disableListeners();
-		uploadRule.setDefaultRemoteDirectory(defaultRemoteDirectoryButton.getSelection());
-		uploadRule.setRemoteDirectory(remoteDirectoryText.getString());
-		uploadRule.setAsExecutable(asExecutableButton.getSelection());
-		uploadRule.setAsReadOnly(asReadOnlyButton.getSelection());
-		uploadRule.setDownloadBack(downloadBackButton.getSelection());
-		uploadRule.setPreserveTimeStamp(preserveTimeStampButton.getSelection());
-		uploadRule.setOverwritePolicy(Integer.parseInt(overwritePolicyCombo.getSelectionId()));
-		uploadRule.setLocalFiles(fileList.getItems());
-		String path =remoteDirectoryText.getString().trim();
-		if (path.length() > 0) {
-			uploadRule.setRemoteDirectory(path);
-		} else {
-			uploadRule.setRemoteDirectory(null);
-		}
-		enableListeners();
-	}
-	
-	protected void okPressed() {
-		fetchFieldContents();
-		super.okPressed();
-	}
-
-	private Composite createRemoteDirectoryComposite(Composite parent) {
-		Frame frame = new Frame(parent, Messages.UploadRuleDialog_RemoteDirectoryFrame_Title);
-		Composite contents = frame.getComposite();
-
-		defaultRemoteDirectoryButton = new Button(contents, SWT.CHECK);
-		defaultRemoteDirectoryButton.setText(Messages.UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton);
-		defaultRemoteDirectoryButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		TextMold mold = new TextMold(TextMold.GRID_DATA_GRAB_EXCESS_SPACE | TextMold.GRID_DATA_ALIGNMENT_FILL, Messages.UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory);
-		remoteDirectoryText = new TextGroup(contents, mold);
-
-		remoteDirectoryRelationshipHandler = new ControlsRelationshipHandler(defaultRemoteDirectoryButton, new Control[] {remoteDirectoryText}, false);
-		return remoteDirectoryText;
-	}
-
-	private Composite createFilesComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.setTitle(Messages.UploadRuleDialog_FileButtonsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Frame filesFrame = new Frame(frame.getComposite());
-		fileList = new List(filesFrame, SWT.MULTI | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=200;
-		fileList.setLayoutData(gridData);
-		fileList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				removeFilesButton.setEnabled(fileList.getSelectionCount() != 0);
-			}
-		});
-		fileList.deselectAll();
-		
-		Frame buttonFrame = new Frame(frame.getComposite());
-		Label label = new Label(buttonFrame, SWT.NONE);
-		label.setText(Messages.UploadRuleDialog_FileButtonsFrame_Description);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromFilesystemButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesFromFilesystemButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddFilesButton);
-		addFilesFromFilesystemButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromFilesystemButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleFilesFromFilesystemButtonEvent();
-			}			
-		});
-		addDirectoriesFromFilesystemButton = new Button(buttonFrame, SWT.PUSH);
-		addDirectoriesFromFilesystemButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddDirectoryButton);
-		addDirectoriesFromFilesystemButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addDirectoriesFromFilesystemButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleDirectoryFromFilesystemButtonEvent();
-			}			
-		});
-		addFilesFromWorkspaceButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesFromWorkspaceButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton);
-		addFilesFromWorkspaceButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromWorkspaceButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleFilesFromWorkspaceButtonEvent();
-			}
-		});
-		label = new Label(buttonFrame, SWT.NONE);
-		label.setText(Messages.UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton = new Button(buttonFrame, SWT.PUSH);
-		removeFilesButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_RemoveButton);
-		removeFilesButton.setEnabled(false);
-		removeFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				handleRemoveFilesButtonEvent();
-			}
-			
-		});
-		GridData gridData2 = new GridData();
-		gridData2.grabExcessVerticalSpace = true;
-		gridData2.verticalAlignment = SWT.TOP;
-		buttonFrame.setLayoutData(gridData2);
-		
-		return frame;
-	}
-
-	private Composite createOptionsComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.addOption(FrameMold.COLUMNS_EQUAL_WIDTH);
-		frameMold.setTitle(Messages.UploadRuleDialog_OptionsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Composite contents = frame.getComposite();
-		asReadOnlyButton = new Button(contents, SWT.CHECK);
-		asReadOnlyButton.setText(Messages.UploadRuleDialog_OptionsFrame_ReadonlyCheck);
-		asExecutableButton = new Button(contents, SWT.CHECK);
-		asExecutableButton.setText(Messages.UploadRuleDialog_OptionsFrame_ExecutableCheck);
-		downloadBackButton = new Button(contents, SWT.CHECK);
-		downloadBackButton.setText(Messages.UploadRuleDialog_OptionsFrame_DownloadBackCheck);
-		preserveTimeStampButton = new Button(contents, SWT.CHECK);
-		preserveTimeStampButton.setText(Messages.UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck);
-		
-		ComboMold mold = new ComboMold(ComboMold.GRID_DATA_SPAN);
-		mold.setLabel(Messages.UploadRuleDialog_OptionsFrame_OverwriteLabel);
-		mold.setTextFieldWidth(40);
-		mold.addItem(Integer.toString(OverwritePolicies.SKIP), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption);
-		mold.addItem(Integer.toString(OverwritePolicies.ALWAYS), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption);
-		mold.addItem(Integer.toString(OverwritePolicies.NEWER), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption);
-		overwritePolicyCombo = new ComboGroup(contents, mold);
-		overwritePolicyCombo.getCombo().addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				disableListeners();
-				if (overwritePolicyCombo.getSelectionId().equals(Integer.toString(OverwritePolicies.NEWER))) {
-					preserveTimeStampButton.setEnabled(false);
-					preserveTimeStampButton.setSelection(true);
-				} else {
-					preserveTimeStampButton.setEnabled(true);					
-				}
-				enableListeners();
-			}
-			
-		});
-		return frame;
-	}
-	
-	class PathIterator implements Iterator {
-		Iterator internalIterator;
-		
-		public PathIterator(Iterator internalIterator) {
-			this.internalIterator = internalIterator;
-		}
-		
-		public PathIterator(String [] array) {
-			this.internalIterator = Arrays.asList(array).iterator();
-		}
-
-		public PathIterator(java.util.List list) {
-			this.internalIterator = list.iterator();
-		}
-
-		public boolean hasNext() {
-			return internalIterator.hasNext();
-		}
-		
-		public Object next() {
-			return new Path((String)internalIterator.next());
-		}
-		
-		public void remove() {
-			internalIterator.remove();
-		}
-	}
-	
-	private void handleFilesFromFilesystemButtonEvent() {
-		FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN | SWT.MULTI);
-
-		/*
-		 * Filter path must be set to the directory that contains the file.
-		 */
-		fileDialog.setFilterPath(lastSelectedDirectory.toOSString());
-		fileDialog.setText(Messages.UploadRuleDialog_OptionsFrame_AddFileDialog_Title);
-				
-		String result = fileDialog.open();
-
-		if (result != null) {
-			lastSelectedDirectory = new Path(fileDialog.getFilterPath());
-			/*
-			 * Only add files that are not already in the list.
-			 * If file is inside the workspace, add relative path.
-			 */
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath fileRoot = new Path(fileDialog.getFilterPath());
-			HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-			for (Iterator iter = new PathIterator(fileDialog.getFileNames()); iter.hasNext();) {
-				/*
-				 * If not absolute, the make it absolute according to path in dialog.
-				 * This is due behaviour how FileDialog returns selected files.
-				 */
-				IPath path = (IPath) iter.next();
-				if (! path.isAbsolute()) {
-					path = fileRoot.append(path);
-				}
-				
-				/*
-				 * If path is inside the workspace, then make it relative.
-				 */
-				if (workspace.isPrefixOf(path)) {
-					path = path.removeFirstSegments(workspace.segmentCount());
-					path = path.makeRelative();
-				}
-				
-				/*
-				 * If already in the list, the ignore.
-				 */
-				String fullPath = path.toOSString();
-				if (! fileSet.contains(fullPath)) {
-					fileSet.add(fullPath);
-				}
-			}
-			
-			String items[] = new String[fileSet.size()];
-			items = (String[]) fileSet.toArray(items);
-			Arrays.sort(items);
-			fileList.setItems(items);
-		}
-	}
-
-	private void handleDirectoryFromFilesystemButtonEvent() {
-		DirectoryDialog directoryDialog = new DirectoryDialog(getShell(), SWT.OPEN);
-		
-		directoryDialog.setFilterPath(lastSelectedDirectory.toOSString());
-		directoryDialog.setText(Messages.UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title);
-		directoryDialog.setMessage(Messages.UploadRuleDialog_OptionsFrame_AddFileDialog_Description);
-
-		String newPath = directoryDialog.open();
-
-		if (newPath != null) {
-			HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath path = new Path(newPath);
-			
-			/*
-			 * If path is inside the workspace, then make it relative.
-			 */
-			if (workspace.isPrefixOf(path)) {
-				path = path.removeFirstSegments(workspace.segmentCount());
-				path = path.makeRelative();
-			}
-			
-			/*
-			 * If already in the list, the ignore.
-			 */
-			String fullPath = path.toOSString();
-			if (! fileSet.contains(fullPath)) {
-				fileSet.add(fullPath);
-				
-				String items[] = new String[fileSet.size()];
-				items = (String[]) fileSet.toArray(items);
-				Arrays.sort(items);
-				fileList.setItems(items);
-			}
-			
-			/*
-			 * Save lastSelectedDirectory. There is a bug in DirectoryDialog.
-			 * The method getFilterPath does not return the expected path.
-			 * The bug will be fixed in Eclipse 3.4.
-			 * The workarount takes the parent of the selected directory as lastSelectedDirectory.
-			 */
-			lastSelectedDirectory = new Path(newPath);
-			lastSelectedDirectory = lastSelectedDirectory.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-
-
-	ResourceSelectionDialog resourceDialog = null;
-	private void handleFilesFromWorkspaceButtonEvent() {
-		/*
-		 * Create a list a resource for all relative paths. The must be valid resources in the workspace.
-		 * Otherwise, they are ignored and removed.
-		 */
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		ArrayList resourceList = new ArrayList();
-		for (Iterator iter = new PathIterator(fileList.getItems()); iter.hasNext();) {
-			IPath path = (IPath) iter.next();
-			if (path.isAbsolute()) {
-				continue;
-			}
-			IResource resource = root.findMember(path);
-			if (resource != null) {
-				resourceList.add(resource);
-			}
-		}
-		Object initialSelection[] = resourceList.toArray();
-		
-		/*
-		 * Show the dialog.
-		 */
-		if (resourceDialog == null) {
-			resourceDialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), null);
-		}
-		resourceDialog.setInitialSelections( initialSelection );
-		resourceDialog.setBlockOnOpen(true);
-		resourceDialog.setMessage(Messages.UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description);
-		resourceDialog.setTitle(Messages.UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title);
-		resourceDialog.open();
-
-		/*
-		 * Get results and updated local files.
-		 */
-		Object[] results = resourceDialog.getResult();
-
-		if (results != null) {
-			/*
-			 * Filter only absolute path. Relative paths are removed.
-			 */
-			HashSet newFileList = new HashSet();
-			for (Iterator iter = new PathIterator(fileList.getItems()); iter.hasNext();) {
-				IPath path = (IPath) iter.next();
-				if (! path.isAbsolute()) {
-					continue;
-				}
-				newFileList.add(path.toOSString());
-			}
-
-			/*
-			 * Add items that a selected in the dialog but not in the file list.
-			 */
-			for (int i = 0; i < results.length; i++) {
-				IResource resource = (IResource) results[i];
-				String entry = resource.getFullPath().makeRelative().toOSString();
-				newFileList.add(entry);
-			}
-			
-			String items[] = new String[newFileList.size()];
-			items = (String[]) newFileList.toArray(items);
-			Arrays.sort(items);
-			fileList.setItems(items);
-		}
-	}
-	
-	private void handleRemoveFilesButtonEvent() {		
-		String selection [] = fileList.getSelection();
-		if (selection.length == 0) {
-			return;
-		}
-		
-		HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-		for (int i = 0; i < selection.length; i++) {
-			String string = selection[i];
-			fileSet.remove(string);
-		}
-		
-		String items[] = new String[fileSet.size()];
-		items = (String[]) fileSet.toArray(items);
-		Arrays.sort(items);
-		fileList.setItems(items);
-	}
-
-	public ISynchronizationRule getRuleWorkingCopy() {
-		return uploadRule;
-	}
-}
-

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/WorkingDirectoryBlock.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/WorkingDirectoryBlock.java
deleted file mode 100644
index 0fbcf9a..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/WorkingDirectoryBlock.java
+++ /dev/null

@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.launch.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-
-/**
- *
- */
-public class WorkingDirectoryBlock extends LaunchConfigurationTab {
-    protected Button useDefaultWorkingDirButton = null;
-    protected Button localDirButton = null;
-    protected Text workingDirText = null;
-    protected Button workingDirBrowseButton = null;
-    protected Button workspaceDirButton = null;
-    protected Text workspaceDirText = null;
-    protected Button workspaceDirBrowseButton = null;
-	protected ILaunchConfiguration launchConfiguration;
-
-    protected class WidgetListener extends SelectionAdapter implements ModifyListener {
-	    public void widgetSelected(SelectionEvent e) {
-	        Object source = e.getSource();
-	        if (source == useDefaultWorkingDirButton)
-	            handleUseDefaultWorkingDirButtonSelected();
-	        else if (source == localDirButton || source == workspaceDirButton) {
-	            handleLocationButtonSelected();
-	    		updateLaunchConfigurationDialog();
-	        } else if (source == workingDirBrowseButton)
-	            handleWorkingDirBrowseButtonSelected();
-	        else if (source == workspaceDirBrowseButton)
-	            handleWorkspaceDirBrowseButtonSelected();
-	        else
-	            updateLaunchConfigurationDialog();
-	    }
-		public void modifyText(ModifyEvent evt) {
-			updateLaunchConfigurationDialog();
-		}        
-    }
-    
-    protected WidgetListener listener = new WidgetListener();
-
-    /**
-     * @see ILaunchConfigurationTab#createControl(Composite)
-     */
-    public void createControl(Composite parent) {
-		Composite workingDirComp = new Composite(parent, SWT.NONE);
-		workingDirComp.setLayout(createGridLayout(3, false, 0, 0));
-		workingDirComp.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL, 5));
-		setControl(workingDirComp);
-		
-		Label workingDirLabel = new Label(workingDirComp, SWT.NONE);
-		workingDirLabel.setText(Messages.WorkingDirectoryBlock_Working_directory_colon);
-		workingDirLabel.setLayoutData(spanGridData(-1, 3));
-
-		useDefaultWorkingDirButton = new Button(workingDirComp, SWT.CHECK);
-		useDefaultWorkingDirButton.setText(Messages.WorkingDirectoryBlock_Use_default_working_directory);
-		useDefaultWorkingDirButton.setLayoutData(spanGridData(-1, 3));
-		useDefaultWorkingDirButton.addSelectionListener(listener);
-		
-		localDirButton = createRadioButton(workingDirComp, Messages.WorkingDirectoryBlock_Local_directory);
-		localDirButton.addSelectionListener(listener);
-				
-		workingDirText = new Text(workingDirComp, SWT.SINGLE | SWT.BORDER);
-		workingDirText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		workingDirText.addModifyListener(listener);
-		
-		workingDirBrowseButton = createPushButton(workingDirComp, Messages.Tab_common_Browse_1, null);
-		workingDirBrowseButton.addSelectionListener(listener);
-		
-		workspaceDirButton = createRadioButton(workingDirComp, Messages.WorkingDirectoryBlock_Workspace);
-		workspaceDirButton.addSelectionListener(listener);
-		
-		workspaceDirText = new Text(workingDirComp, SWT.SINGLE | SWT.BORDER);
-		workspaceDirText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		workspaceDirText.addModifyListener(listener);
-		
-		workspaceDirBrowseButton = createPushButton(workingDirComp, Messages.Tab_common_Browse_2, null);
-		workspaceDirBrowseButton.addSelectionListener(listener);        
-    }
-
-    /**
-     * Defaults are empty.
-     * 
-     * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-     */
-    public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-        configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_WORK_DIRECTORY, (String) null);
-    }
-    
-    /**
-     * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-     */
-    public void initializeFrom(ILaunchConfiguration configuration) {
-        setLaunchConfiguration(configuration);
-        try {            
-			String wd = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_WORK_DIRECTORY, (String) null);
-			workspaceDirText.setText(EMPTY_STRING);
-			workingDirText.setText(EMPTY_STRING);
-			if (wd == null) {
-				useDefaultWorkingDirButton.setSelection(true);
-			} else {
-				IPath path = new Path(wd);
-				if (path.isAbsolute()) {
-					workingDirText.setText(wd);
-					localDirButton.setSelection(true);
-					workspaceDirButton.setSelection(false);
-				} else {
-					workspaceDirText.setText(wd);
-					workspaceDirButton.setSelection(true);
-					localDirButton.setSelection(false);
-				}
-				useDefaultWorkingDirButton.setSelection(false);
-			}
-			handleUseDefaultWorkingDirButtonSelected();            
-        } catch (CoreException e) {
-            setErrorMessage(Messages.CommonTab_common_Exception_occurred_reading_configuration_EXCEPTION);
-        }
-    }
-    
-    /**
-     * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-     */
-    public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		String wd = null;
-		if (!isDefaultWorkingDirectory()) {
-			if (isLocalWorkingDirectory()) {
-				wd = getFieldContent(workingDirText.getText());
-			} else {
-				IPath path = new Path(workspaceDirText.getText());
-				wd = path.makeRelative().toOSString();
-			}
-		} 
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_WORK_DIRECTORY, wd);
-    }    
-
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration configuration) {
-		setErrorMessage(null);
-		setMessage(null);
-        
-		if (isLocalWorkingDirectory()) {		    
-			String workingDirPath = getFieldContent(workingDirText.getText());
-			if (workingDirPath != null) {
-				File dir = new File(workingDirPath);
-				if (!dir.exists()) {
-					setErrorMessage(Messages.WorkingDirectoryBlock_Working_directory_does_not_exist);
-					return false;
-				}
-				if (!dir.isDirectory()) {
-					setErrorMessage(Messages.WorkingDirectoryBlock_Working_directory_is_not_a_directory);
-					return false;
-				}
-			}
-		} else {
-			if (getContainer(workingDirText.getText()) == null) {
-				setErrorMessage(Messages.WorkingDirectoryBlock_Project_or_folder_does_not_exist);
-				return false;
-			}
-		}		
-		return true;
-	}    
-    
-    /**
-     * @see ILaunchConfigurationTab#getName()
-     */
-    public String getName() {
-        return Messages.WorkingDirectoryBlock_Working_directory;
-    }
-
-    /**
-     * @see ILaunchConfigurationTab#setLaunchConfigurationDialog(ILaunchConfigurationDialog)
-     */
-    public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog) {
-        super.setLaunchConfigurationDialog(dialog);
-    }
-
-    /**
-     * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog()
-     */
-    protected void updateLaunchConfigurationDialog() {
-        super.updateLaunchConfigurationDialog();
-    }
-    
-	/**
-	 * Returns whether the default working directory is to be used
-	 */
-	protected boolean isDefaultWorkingDirectory() {
-		return useDefaultWorkingDirButton.getSelection();
-	}
-
-	/**
-	 * Returns whether the working directory is local
-	 */
-	protected boolean isLocalWorkingDirectory() {
-		return localDirButton.getSelection();
-	}
-	
-	/**
-	 * Sets the default working directory
-	 */
-	protected void setDefaultWorkingDir(ILaunchConfiguration configuration) {
-		if (configuration == null) {
-			workingDirText.setText(System.getProperty("user.dir"));
-			localDirButton.setSelection(true);
-			workspaceDirButton.setSelection(false);
-			return;
-		}
-
-		IProject project = getProject(configuration);
-		if (project == null)
-		    return;
-		
-		workspaceDirText.setText(project.getFullPath().makeRelative().toString());
-		localDirButton.setSelection(false);
-		workspaceDirButton.setSelection(true);
-	}
-	
-	/**
-	 * The "local directory" or "workspace directory" button has been selected.
-	 */
-	protected void handleLocationButtonSelected() {
-		if (!isDefaultWorkingDirectory()) {
-			boolean local = isLocalWorkingDirectory();
-			workingDirText.setEnabled(local);
-			workingDirBrowseButton.setEnabled(local);
-			workspaceDirText.setEnabled(!local);
-			workspaceDirBrowseButton.setEnabled(!local);
-		}
-		updateLaunchConfigurationDialog();
-	}
-
-	/**
-	 * The default working dir check box has been toggled.
-	 */
-	protected void handleUseDefaultWorkingDirButtonSelected() {
-		if (isDefaultWorkingDirectory()) {
-			setDefaultWorkingDir(getLaunchConfiguration());
-			localDirButton.setEnabled(false);
-			workingDirText.setEnabled(false);
-			workingDirBrowseButton.setEnabled(false);
-			workspaceDirButton.setEnabled(false);
-			workspaceDirText.setEnabled(false);
-			workspaceDirBrowseButton.setEnabled(false);
-		} else {
-			localDirButton.setEnabled(true);
-			workspaceDirButton.setEnabled(true);
-			handleLocationButtonSelected();
-		}
-	}
-	
-	/**
-	 * Show a dialog that lets the user select a working directory
-	 */
-	protected void handleWorkingDirBrowseButtonSelected() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		dialog.setMessage(Messages.WorkingDirectoryBlock_Select_working_directory_for_launch_configuration);
-		String currentWorkingDir = workingDirText.getText();
-		if (currentWorkingDir != null && !currentWorkingDir.trim().equals(EMPTY_STRING)) {
-			File path = new File(currentWorkingDir);
-			if (path.exists())
-				dialog.setFilterPath(currentWorkingDir);
-		}
-		
-		String selectedDirectory = dialog.open();
-		if (selectedDirectory != null)
-			workingDirText.setText(selectedDirectory);
-	}
-	
-	/**
-	 * Show a dialog that lets the user select a working directory from 
-	 * the workspace
-	 */
-	protected void handleWorkspaceDirBrowseButtonSelected() {
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), getWorkspaceRoot(), false, 
-				Messages.WorkingDirectoryBlock_Select_workspace_relative_working_directory);		
-		IContainer currentContainer = getContainer(workspaceDirText.getText());
-		if (currentContainer != null) {
-			IPath path = currentContainer.getFullPath();
-			dialog.setInitialSelections(new Object[] {path});
-		}
-		
-		dialog.showClosedProjects(false);
-		dialog.open();
-		Object[] results = dialog.getResult();		
-		if ((results != null) && (results.length > 0) && (results[0] instanceof IPath)) {
-			IPath path = (IPath)results[0];
-			String containerName = path.makeRelative().toString();
-			workspaceDirText.setText(containerName);
-		}			
-	}
-    
-    /**
-     * @return Returns the launchConfiguration.
-     */
-    public ILaunchConfiguration getLaunchConfiguration() {
-        return launchConfiguration;
-    }
-    /**
-     * @param launchConfiguration The launchConfiguration to set.
-     */
-    public void setLaunchConfiguration(ILaunchConfiguration launchConfiguration) {
-        this.launchConfiguration = launchConfiguration;
-    }	
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationDynamicTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 164acc4..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui.extensions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-
-
-/**
- * Abstract class that is the extension point for contributing
- * ConfigurationWizardPages to this plug-in.
- *
- * @author rsqrd
- *
- */
-public abstract class AbstractRMLaunchConfigurationDynamicTab implements IRMLaunchConfigurationDynamicTab {
-	public static final String EMPTY_STRING = "";
-
-	private final Map<Integer, IPQueue> queues = new HashMap<Integer, IPQueue>();
-	private final Map<IPQueue, Integer> queueIndices = new HashMap<IPQueue, Integer>();
-
-	/**
-	 * @param string
-	 * @return
-	 */
-	protected static CoreException makeCoreException(String string) {
-		IStatus status = new Status(Status.ERROR, PTPLaunchPlugin.getUniqueIdentifier(),
-				Status.ERROR, string, null);
-		return new CoreException(status);
-	}
-
-	private final ListenerList listenerList = new ListenerList();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#addContentsChangedListener(org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationContentsChangedListener)
-	 */
-	public void addContentsChangedListener(IRMLaunchConfigurationContentsChangedListener listener) {
-		listenerList.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#removeContentsChangedListener(org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationContentsChangedListener)
-	 */
-	public void removeContentsChangedListener(IRMLaunchConfigurationContentsChangedListener listener) {
-		listenerList.remove(listener);
-	}
-
-	/**
-	 * This should be called when GUI elements are modified by the user,
-	 * e.g. a Text widget should have its ModifyListener's
-	 * modifyText method set up to notify all of the contents
-	 * changed listeners.
-	 */
-	protected void fireContentsChanged() {
-		Object[] listeners = listenerList.getListeners();
-		for (Object listener : listeners) {
-			((IRMLaunchConfigurationContentsChangedListener) listener).handleContentsChanged(this);
-		}
-	}
-
-	/**
-	 * Get the queue with the corresponding name
-	 *
-	 * @param rm resource manager
-	 * @param queueName queue name
-	 * @return queue
-	 */
-	public IPQueue getQueueFromName(IResourceManager rm, String queueName) {
-		if (rm == null) {
-			return null;
-		}
-
-		IPQueue[] queues = rm.getQueues();
-
-		for (IPQueue queue : queues) {
-			if (queue.getName().equals(queueName))
-				return queue;
-		}
-		return null;
-	}
-
-	/**
-	 *
-	 */
-	public void clearQueues() {
-		queues.clear();
-	}
-
-	/**
-	 * @param queue
-	 * @param index
-	 */
-	public void addQueue(IPQueue queue, int index) {
-		queues.put(index, queue);
-		queueIndices.put(queue, index);
-	}
-
-	/**
-	 * @param index
-	 * @return
-	 */
-	public IPQueue getQueue(int index) {
-		return queues.get(index);
-	}
-
-	/**
-	 * @param queue
-	 * @return
-	 */
-	public Integer getQueueIndex(IPQueue queue) {
-		return queueIndices.get(queue);
-	}
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationFactory.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationFactory.java
deleted file mode 100644
index 14339d1..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/AbstractRMLaunchConfigurationFactory.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui.extensions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-
-
-/**
- * Abstract class that is the extension point for contributing
- * Dynamic configuration tabs to this plug-in.
- * 
- * @author rsqrd
- *
- */
-public abstract class AbstractRMLaunchConfigurationFactory {
-
-	protected static CoreException makeCoreException(String string) {
-		IStatus status = new Status(Status.ERROR, PTPLaunchPlugin.getUniqueIdentifier(),
-				Status.ERROR, string, null);
-		return new CoreException(status);
-	}
-	
-	/**
-	 * @param rm
-	 * @return
-	 * @throws CoreException
-	 */
-	public IRMLaunchConfigurationDynamicTab create(IResourceManager rm) throws CoreException {
-		if (!getResourceManagerClass().isInstance(rm)) {
-			throw makeCoreException("Resource manager: " + rm.getName() + 
-			" is not of expected type");
-		}
-		return doCreate(rm);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#getResourceManagerClass()
-	 */
-	public abstract Class<? extends IResourceManager> getResourceManagerClass();
-
-	/**
-	 * @param rm
-	 * @return
-	 * @throws CoreException
-	 */
-	protected abstract IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm)
-	throws CoreException;
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationContentsChangedListener.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationContentsChangedListener.java
deleted file mode 100644
index 750dc16..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationContentsChangedListener.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui.extensions;
-
-/**
- * @author rsqrd
- *
- */
-public interface IRMLaunchConfigurationContentsChangedListener {
-	/**
-	 * This method should be called when
-	 * when GUI elements are modified by the user, e.g.
-	 * a Text widget should have its ModifyListener's
-	 * modifyText method set up to notify all of the contents
-	 * changed listeners.
-	 * 
-	 * @param factory
-	 */
-	public abstract void handleContentsChanged(IRMLaunchConfigurationDynamicTab factory);
-}

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationDynamicTab.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 25e06be..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/IRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui.extensions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-public interface IRMLaunchConfigurationDynamicTab {
-
-	/**
-	 * The events for this listener should be fired
-	 * when GUI elements are modified by the user, e.g.
-	 * a Text widget should have its ModifyListener's
-	 * modifyText method set up to notify all of the contents
-	 * changed listeners.
-	 *
-	 * @param launchContentsChangedListener
-	 */
-	public abstract void addContentsChangedListener(
-			IRMLaunchConfigurationContentsChangedListener launchContentsChangedListener);
-
-	/**
-	 * Returns whether this tab is in a state that allows the launch configuration whose values
-	 * this tab is showing to be saved.  This differs from <code>isValid()</code> in that <code>canSave()</code>
-	 * determines if this tab prevents the current launch configuration from being saved, whereas
-	 * <code>isValid()</code> determines if this tab prevents the current launch configuration from
-	 * being launched.
-	 *
-	 * <p>
-	 * This information is typically used by the launch configuration
-	 * dialog to decide when it is okay to save a launch configuration.
-	 * </p>
-	 *
-	 * @param control
-	 * @param rm
-	 * @param queue
-	 * @return whether this tab is in a state that allows the current launch configuration to be saved
-	 */
-	public abstract RMLaunchValidation canSave(Control control,
-			IResourceManager rm, IPQueue queue);
-
-	/**
-	 * Creates the top level control for the dynamic part of the parallel
-	 * launch configuration
-	 * tab under the given parent composite.  This method is called every time
-	 * a new resource manager or queue is selected by the user.
-	 * <p>
-	 * Implementors are responsible for ensuring that
-	 * the created control can be accessed via <code>getControl</code>
-	 * </p>
-	 *
-	 * @param parent the parent composite
-	 * @param rm
-	 * @param queue
-	 * @throws CoreException
-	 */
-	public abstract void createControl(Composite parent,
-			IResourceManager rm, IPQueue queue) throws CoreException;
-
-	/**
-	 * Get the set of resource manager attributes to be used as launch
-	 * attributes
-	 *
-	 * @param rm
-	 *            The resource manager associated with the current launch
-	 *            configuration
-	 * @param queue
-	 *            The current queue
-	 * @param configuration
-	 *            The current launch configuration
-	 * @param mode
-	 *            The current launch mode
-	 * @return array of attributes
-	 * @throws CoreException
-	 */
-	public abstract IAttribute<?,?,?>[] getAttributes(IResourceManager rm, IPQueue queue,
-			ILaunchConfiguration configuration, String mode) throws CoreException;
-
-	/**
-	 * Returns the top level control for the dynamic portion of the parallel tab.
-	 * <p>
-	 * May return <code>null</code> if the control
-	 * has not been created yet.
-	 * </p>
-	 *
-	 * @return the top level control or <code>null</code>
-	 */
-	public Control getControl();
-
-	/**
-	 * Initializes this dynamic tab's controls with values from the given
-	 * launch configuration. This method is called when
-	 * a configuration is selected to view or edit, after this
-	 * tab's control has been created.
-	 * It is also called every time the user selects a new resource manager
-	 * or queue.  In this case the configuration that is passed in has
-	 * been cached by the parallel tab.
-	 *
-	 * @param queue
-	 * @param rm
-	 * @param control
-	 * @param configuration launch configuration
-	 * @return
-	 */
-	public abstract RMLaunchValidation initializeFrom(Control control,
-			IResourceManager rm, IPQueue queue,
-			ILaunchConfiguration configuration);
-
-	/**
-	 * Returns whether this tab is in a valid state in the context of the specified
-	 * launch configuration.
-	 * <p>
-	 * This information is typically used by the launch configuration
-	 * dialog to decide when it is okay to launch.
-	 * </p>
-	 *
-	 *
-	 * @param launchConfig launch configuration which provides context for validating this tab.
-	 *         This value must not be <code>null</code>.
-	 * @param rm
-	 * @param queue
-	 * @return whether this tab is in a valid state
-	 */
-	public abstract RMLaunchValidation isValid(ILaunchConfiguration launchConfig,
-			IResourceManager rm,
-			IPQueue queue);
-
-	/**
-	 * Copies values from this tab into the given
-	 * launch configuration.
-	 *
-	 * @param configuration launch configuration
-	 * @param rm
-	 * @param queue
-	 * @return
-	 */
-	public abstract RMLaunchValidation performApply(
-			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-			IPQueue queue);
-
-	/**
-	 * @param launchContentsChangedListener
-	 */
-	public abstract void removeContentsChangedListener(
-			IRMLaunchConfigurationContentsChangedListener launchContentsChangedListener);
-
-	/**
-	 * Initializes the given launch configuration with
-	 * default values for this tab. This method
-	 * is called when a new launch configuration is created
-	 * such that the configuration can be initialized with
-	 * meaningful values. This method may be called before this
-	 * tab's control is created.
-	 *
-	 * @param configuration launch configuration
-	 * @param rm
-	 * @param queue
-	 * @return
-	 */
-	public abstract RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration,
-			IResourceManager rm, IPQueue queue);
-
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/RMLaunchValidation.java b/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/RMLaunchValidation.java
deleted file mode 100644
index edbbf5e..0000000
--- a/core/org.eclipse.ptp.launch/src/org/eclipse/ptp/launch/ui/extensions/RMLaunchValidation.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-package org.eclipse.ptp.launch.ui.extensions;
-
-public class RMLaunchValidation {
-	final boolean success;
-	final String message;
-	public RMLaunchValidation(final boolean success, final String message) {
-		this.success = success;
-		this.message = message;
-	}
-	/**
-	 * @return the message
-	 */
-	public String getMessage() {
-		return message;
-	}
-	/**
-	 * @return the success
-	 */
-	public boolean isSuccess() {
-		return success;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/.classpath b/core/org.eclipse.ptp.proxy.protocol/.classpath
deleted file mode 100644
index 7521194..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="util"/>
-	<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/core/org.eclipse.ptp.proxy.protocol/.project b/core/org.eclipse.ptp.proxy.protocol/.project
deleted file mode 100644
index 7d03b34..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.proxy.protocol</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.proxy.protocol/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.proxy.protocol/META-INF/MANIFEST.MF
deleted file mode 100644
index 0ac4157..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.proxy.protocol
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.proxy.client;uses:="org.eclipse.ptp.proxy.event,org.eclipse.ptp.proxy.util",
- org.eclipse.ptp.proxy.command,
- org.eclipse.ptp.proxy.debug.client,
- org.eclipse.ptp.proxy.debug.command,
- org.eclipse.ptp.proxy.debug.event,
- org.eclipse.ptp.proxy.event;uses:="org.eclipse.ptp.proxy.util,org.eclipse.ptp.proxy.command",
- org.eclipse.ptp.proxy.packet,
- org.eclipse.ptp.proxy.runtime.client;uses:="org.eclipse.ptp.proxy.event,org.eclipse.ptp.proxy.client,org.eclipse.ptp.proxy.runtime.event",
- org.eclipse.ptp.proxy.runtime.command,
- org.eclipse.ptp.proxy.runtime.event;uses:="org.eclipse.ptp.proxy.event,org.eclipse.ptp.proxy.util",
- org.eclipse.ptp.proxy.runtime.server,
- org.eclipse.ptp.proxy.server,
- org.eclipse.ptp.proxy.util
-Eclipse-LazyStart: true
-Bundle-Vendor: %pluginProvider

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

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

diff --git a/core/org.eclipse.ptp.proxy.protocol/build.properties b/core/org.eclipse.ptp.proxy.protocol/build.properties
deleted file mode 100644
index bc5295c..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/,\
-           util/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties
-jars.compile.order = .

diff --git a/core/org.eclipse.ptp.proxy.protocol/plugin.properties b/core/org.eclipse.ptp.proxy.protocol/plugin.properties
deleted file mode 100644
index ffa28c8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Proxy Protocol
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/command/ProxyQuitCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/command/ProxyQuitCommand.java
deleted file mode 100644
index 309bdfa..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/command/ProxyQuitCommand.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-import org.eclipse.ptp.proxy.command.IProxyQuitCommand;
-
-public class ProxyQuitCommand extends AbstractProxyCommand implements IProxyQuitCommand {
-	public ProxyQuitCommand() {
-		super(QUIT);
-	}
-	
-	public ProxyQuitCommand(int transID, String[] args) {
-		super(QUIT, transID, args);
-	}
-	
-	public String toString() {
-		return "ProxyQuitCommand tid=" + getTransactionID();
-	}
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugArgsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugArgsEvent.java
deleted file mode 100644
index 8dff1bd..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugArgsEvent.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugArgsEvent;
-
-
-
-public class ProxyDebugArgsEvent extends AbstractProxyDebugEvent implements IProxyDebugArgsEvent {
-	private String[] args;
-	
-	public ProxyDebugArgsEvent(int transID, String bits, String[] args) {
-		super(EVENT_DBG_ARGS, transID, bits);
-		this.args = args;
-	}
-	
-	public String[] getVariables() {
-		return this.args;
-	}
-	
-	public String toString() {
-		String res = "EVENT_DBG_ARGS transid=" + getTransactionID() + " " + this.getBitSet().toString() + " {";
-
-		for (int i = 0; i < args.length; i++) {
-			if (i > 0)
-				res += ", ";
-			res += args[i];
-		}
-		
-		res += "}";
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointHitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointHitEvent.java
deleted file mode 100644
index 579bfb9..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointHitEvent.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugSuspendEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugBreakpointHitEvent;
-
-public class ProxyDebugBreakpointHitEvent extends AbstractProxyDebugSuspendEvent implements IProxyDebugBreakpointHitEvent {
-	private int	bpId;
-
-	public ProxyDebugBreakpointHitEvent(int transID, String set, int id, int thread_id, int depth, String[] vars) {
-		super(transID, set, null, thread_id, depth, vars);
-		this.bpId = id;
-	}
-	
-	public int getBreakpointId() {
-		return this.bpId;
-	}
-	public String toString() {
-		return "EVENT_DBG_BPHIT transid=" + getTransactionID() + " " + this.getBitSet().toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointSetEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointSetEvent.java
deleted file mode 100644
index 3f66a1d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugBreakpointSetEvent.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugBreakpoint;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugBreakpointSetEvent;
-
-public class ProxyDebugBreakpointSetEvent extends AbstractProxyDebugEvent implements IProxyDebugBreakpointSetEvent {
-	private int						bpId;
-	private ProxyDebugBreakpoint	bpt;
-	
-	public ProxyDebugBreakpointSetEvent(int transID, String bits, int id, ProxyDebugBreakpoint bpt) {
-		super(transID, EVENT_DBG_BPSET, bits);
-		this.bpId = id;
-		this.bpt = bpt;
-	}
-	
-	public int getBreakpointId() {
-		return this.bpId;
-	}
-	
-	public ProxyDebugBreakpoint getBreakpoint() {
-		return this.bpt;
-	}
-
-	public String toString() {
-		return "EVENT_DBG_BPSET transid=" + getTransactionID() + " " + this.getBitSet().toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataEvent.java
deleted file mode 100644
index 5e718ee..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataEvent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataEvent;
-
-public class ProxyDebugDataEvent extends AbstractProxyDebugEvent implements IProxyDebugDataEvent {
-	private ProxyDebugAIF data;
-	
-	public ProxyDebugDataEvent(int transID, String bits, ProxyDebugAIF data) {
-		super(transID, EVENT_DBG_DATA, bits);
-		this.data = data;
-	}
-	
-	public ProxyDebugAIF getData() {
-		return this.data;
-	}
-	
-	public String toString() {
-		String res = "EVENT_DBG_DATA transid=" + getTransactionID() + " " + this.getBitSet().toString();
-		if (this.data != null)
-			res += " " + this.data.toString();
-		else
-			res += " AIFNULL";
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataExpValueEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataExpValueEvent.java
deleted file mode 100644
index 908c0c3..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugDataExpValueEvent.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataExpValueEvent;
-
-/**
- * @deprecated
- */
-public class ProxyDebugDataExpValueEvent extends AbstractProxyDebugEvent implements IProxyDebugDataExpValueEvent {
-	private String value;
-	
-	public ProxyDebugDataExpValueEvent(int transID, String bits, String value) {
-		super(transID, EVENT_DBG_DATA_EVA_EX, bits);
-		this.value = value;
-	}
-	public String getValue() {
-		return value;
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_DATA_EVA_EX transid=" + getTransactionID() + " " + this.getBitSet().toString() + " - value: " + this.value;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugErrorEvent.java
deleted file mode 100644
index 10c821f..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugErrorEvent.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugErrorEvent;
-
-
-
-public class ProxyDebugErrorEvent extends AbstractProxyDebugEvent implements IProxyDebugErrorEvent {
-	private int		errorCode;
-	private String	errorMsg;
-	
-	public ProxyDebugErrorEvent(int transID, String bits, int code, String msg) {
-		super(transID, EVENT_DBG_ERROR, bits);
-		this.errorCode = code;
-		this.errorMsg = msg;
-	}
-	
-	public int getErrorCode() {
-		return this.errorCode;
-	}
-	
-	public String getErrorMessage() {
-		return this.errorMsg;
-	}
-
-	public String toString() {
-		return "EVENT_DBG_ERROR transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.errorCode + " " + this.errorMsg;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugEventFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugEventFactory.java
deleted file mode 100644
index f58d7a4..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugEventFactory.java
+++ /dev/null

@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugBreakpoint;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugLineLocation;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugLocator;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugMemory;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugMemoryInfo;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugSignal;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugEventFactory;
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-import org.eclipse.ptp.proxy.event.ProxyEventFactory;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public class ProxyDebugEventFactory extends ProxyEventFactory implements IProxyDebugEventFactory {
-	
-	public IProxyEvent toEvent(ProxyPacket packet) {
-		IProxyDebugEvent	evt = null;
-		int numVars;
-		String vars[];
-
-		IProxyEvent e = super.toEvent(packet);
-		if (e != null) {
-			return e;
-		}
-
-		String[] args = packet.getArgs();
-		
-		/*
-		 * [0]: bit list
-		 */
-		String bits = args[0];
-		
-		switch (packet.getID()) {
-		case IProxyDebugEvent.EVENT_DBG_OK:
-			evt = new ProxyDebugOKEvent(packet.getTransID(), bits);
-			break;
-			
-		/**
-		 * [1]: error code
-		 * [2]: error message
-		 */
-		case IProxyDebugEvent.EVENT_DBG_ERROR:
-			int errCode = Integer.parseInt(args[1]);
-			evt = new ProxyDebugErrorEvent(packet.getTransID(), bits, errCode, args[2]);
-			break;
-
-		/**
-		 * [1]: number of servers
-		 */			
-		case IProxyDebugEvent.EVENT_DBG_INIT:
-			int num_servers = Integer.parseInt(args[1]);
-			evt = new ProxyDebugInitEvent(packet.getTransID(), bits, num_servers);
-			break;
-			
-		/**
-		 * [1]: event reason
-		 */
-		case IProxyDebugEvent.EVENT_DBG_SUSPEND:
-			switch (Integer.parseInt(args[1])) {
-			/**
-			 * [2]: bpt id
-			 * [3]: thread id
-			 * [4]: depth
-			 * [5]: var changed list -> length
-			 * [6]: var changed list -> name
-			 * 
-			 */
-			case IProxyDebugEvent.EVENT_DBG_SUSPEND_BPHIT:
-				int hitId = Integer.parseInt(args[2]);
-				int bpTid = Integer.parseInt(args[3]);
-				int bpDep = Integer.parseInt(args[4]);
-				numVars = Integer.parseInt(args[5]);
-				vars = new String[numVars];
-				for (int i = 0; i<numVars; i++) {
-					vars[i] = args[i+6];
-				}
-				evt = new ProxyDebugBreakpointHitEvent(packet.getTransID(), bits, hitId, bpTid, bpDep, vars);
-				break;
-				
-				
-			/**
-			 * [2]: signal info -> name
-			 * [3]: signal info -> sig_stop
-			 * [4]: signal info -> sig_print
-			 * [5]: signal info -> sig_pass
-			 * [6]: signal info -> description
-			 * [7]: frame -> level
-			 * [8]: frame -> location -> file
-			 * [9]: frame -> location -> function
-			 * [10]: frame -> location -> address
-			 * [11]: frame -> location -> line number
-			 * [12]: thread id
-			 * [13]: depth
-			 * [14]: var changed list -> length
-			 * [15]: var changed list -> name
-			 */
-			case IProxyDebugEvent.EVENT_DBG_SUSPEND_SIGNAL:
-				int sigTid = Integer.parseInt(args[12]);
-				int sigDep = Integer.parseInt(args[13]);
-				ProxyDebugStackFrame sigFrame = null;
-				
-				if (!(args[7].compareTo("*") == 0)) {
-					sigFrame = toFrame(args[7], args[8], args[9], args[11], args[10]);
-				}
-	
-				numVars = Integer.parseInt(args[14]);
-				vars = new String[numVars];
-				for (int i = 0; i<numVars; i++) {
-					vars[i] = args[i+15];
-				}
-
-				evt = new ProxyDebugSignalEvent(packet.getTransID(), bits, args[2], args[6], sigFrame, sigTid, sigDep, vars);
-				break;
-				
-			/**
-			 * [2]: frame -> level
-			 * [3]: frame -> location -> file
-			 * [4]: frame -> location -> function
-			 * [5]: frame -> location -> address
-			 * [6]: frame -> location -> line number
-			 * [7]: thread id
-			 * [8]: depth
-			 * [9]: var changed list -> length
-			 * [10]: var changed list -> name
-			 */
-			case IProxyDebugEvent.EVENT_DBG_SUSPEND_STEP:
-				ProxyDebugStackFrame frame = toFrame(args[2], args[3], args[4], args[6], args[5]);
-				int stTid = Integer.parseInt(args[7]);
-				int stDep = Integer.parseInt(args[8]);
-				numVars = Integer.parseInt(args[9]);
-				vars = new String[numVars];
-				for (int i = 0; i<numVars; i++) {
-					vars[i] = args[i+10];
-				}
-				evt = new ProxyDebugStepEvent(packet.getTransID(), bits, frame, stTid, stDep, vars);
-				break;
-				
-			/**
-			 * [2]: frame -> level
-			 * [3]: frame -> location -> file
-			 * [4]: frame -> location -> function
-			 * [5]: frame -> location -> address
-			 * [6]: frame -> location -> line number
-			 * [7]: thread id
-			 * [8]: depth
-			 * [9]: var changed list -> length
-			 * [10]: var changed list -> name
-			 */
-			case IProxyDebugEvent.EVENT_DBG_SUSPEND_INT:
-				ProxyDebugStackFrame suspendFrame = toFrame(args[2], args[3], args[4], args[6], args[5]);
-				int susTid = Integer.parseInt(args[7]);
-				int susDep = Integer.parseInt(args[8]);
-				numVars = Integer.parseInt(args[9]);
-				vars = new String[numVars];
-				for (int i = 0; i<numVars; i++) {
-					vars[i] = args[i+10];
-				}
-				evt = new ProxyDebugSuspendEvent(packet.getTransID(), bits, suspendFrame, susTid, susDep, vars);
-				break;
-			}
-			break;
-			
-		/**
-		 * [1]: bpt id
-		 * [2]: breakpoint -> bpt id
-		 * [3]: breakpoint -> ignore
-		 * [4]: breakpoint -> special
-		 * [5]: breakpoint -> deleted
-		 * [6]: breakpoint -> type
-		 * [7]: breakpoint -> location -> file
-		 * [8]: breakpoint -> location -> function
-		 * [9]: breakpoint -> location -> address
-		 * [10]: breakpoint -> location -> line number
-		 * [11]: breakpoint -> hit count
-		 */
-		case IProxyDebugEvent.EVENT_DBG_BPSET:
-			int bpId = Integer.parseInt(args[1]);
-			ProxyDebugLineLocation loc = toLineLocation(args[7], args[10]);
-			ProxyDebugBreakpoint bpt = toBreakpoint(args[3], args[4], args[5], args[6], loc);
-			evt = new ProxyDebugBreakpointSetEvent(packet.getTransID(), bits, bpId, bpt);
-			break;
-
-		/**
-		 * [1]: signal info list -> length
-		 * [2]: signal info list -> name
-		 * [3]: signal info list -> sig_stop
-		 * [4]: signal info list -> sig_print
-		 * [5]: signal info list -> sig_pass
-		 * [6]: signal info list -> description
-		 */
-		case IProxyDebugEvent.EVENT_DBG_SIGNALS:
-			int numSignals = Integer.parseInt(args[1]);
-			ProxyDebugSignal[] signals = new ProxyDebugSignal[numSignals];
-			for (int i = 0; i<numSignals; i++) {
-				signals[i] = new ProxyDebugSignal(args[5*i+2], toBoolean(Integer.parseInt(args[5*i+3])), toBoolean(Integer.parseInt(args[5*i+4])), toBoolean(Integer.parseInt(args[5*i+5])), args[5*i+6]);
-			}
-			evt = new ProxyDebugSignalsEvent(packet.getTransID(), bits, signals);
-			break;
-			
-		/**
-		 * [1]: event reason
-		 */
-		case IProxyDebugEvent.EVENT_DBG_EXIT:
-			switch (Integer.parseInt(args[1])) {
-			/**
-			 * [2]: exit status
-			 */
-			case IProxyDebugEvent.EVENT_DBG_EXIT_NORMAL:
-				int status = Integer.parseInt(args[2]);
-				evt = new ProxyDebugExitEvent(packet.getTransID(), bits, status);
-				break;
-			/**
-			 * [2]: signal info -> name
-			 * [3]: signal info -> sig_stop
-			 * [4]: signal info -> sig_print
-			 * [5]: signal info -> sig_pass
-			 * [6]: signal info -> description
-			 */
-			case IProxyDebugEvent.EVENT_DBG_EXIT_SIGNAL:
-				evt = new ProxyDebugSignalExitEvent(packet.getTransID(), bits, args[2], args[6]);
-				break;
-			}
-			break;
-			
-		/**
-		 * [1]: frame list -> length
-		 * [2]: frame list -> level
-		 * [3]: frame list -> location -> file
-		 * [4]: frame list -> location -> function
-		 * [5]: frame list -> location -> address
-		 * [6]: frame list -> location -> line number
-		 */
-		case IProxyDebugEvent.EVENT_DBG_FRAMES:
-			int numFrames = Integer.parseInt(args[1]);
-			ProxyDebugStackFrame[] frames = new ProxyDebugStackFrame[numFrames];
-			for (int i = 0; i < numFrames; i++) {
-				frames[i] = toFrame(args[5*i+2], args[5*i+3], args[5*i+4], args[5*i+6], args[5*i+5]);
-			}
-			evt = new ProxyDebugStackframeEvent(packet.getTransID(), bits, frames);
-			break;
-
-		/**
-		 * [1]: thread id
-		 * [2]: frame -> level
-		 * [3]: frame -> location -> file
-		 * [4]: frame -> location -> function
-		 * [5]: frame -> location -> address
-		 * [6]: frame -> location -> line number
-		 */
-		case IProxyDebugEvent.EVENT_DBG_THREAD_SELECT:
-			int current_thread_id = Integer.parseInt(args[1]);
-			ProxyDebugStackFrame th_frame = toFrame(args[2], args[3], args[4], args[6], args[5]);
-			evt = new ProxyDebugSetThreadSelectEvent(packet.getTransID(), bits, current_thread_id, th_frame);
-			break;
-		
-		/**
-		 * [1]: current thread id
-		 * [2]: thread ids list -> length
-		 * [3]: thread ids list -> thread id
-		 */
-		case IProxyDebugEvent.EVENT_DBG_THREADS:
-			int numThreads = Integer.parseInt(args[2]);
-			String[] thread_ids = new String[numThreads + 1];
-			thread_ids[0] = args[1];
-			for (int i=1; i<thread_ids.length; i++) {
-				thread_ids[i] = args[i+2];
-			}
-			evt = new ProxyDebugInfoThreadsEvent(packet.getTransID(), bits, thread_ids);
-			break;
-
-		/**
-		 * [1]: stack depth
-		 */
-		case IProxyDebugEvent.EVENT_DBG_STACK_INFO_DEPTH:
-			int depth = Integer.parseInt(args[1]);
-			evt = new ProxyDebugStackInfoDepthEvent(packet.getTransID(), bits, depth);
-			break;
-
-		/**
-		 * [1]: address
-		 * [2]: next row
-		 * [3]: prev row
-		 * [4]: next page
-		 * [5]: prev page
-		 * [6]: number of bytes
-		 * [7]: total bytes
-		 * [8]: memory list -> length
-		 * [9]: memory list -> address
-		 * [10]: memory list -> ascii
-		 * [11]: memory list -> data list -> length
-		 * [12]: memory list -> data list -> value
-		 */
-		case IProxyDebugEvent.EVENT_DBG_DATA_READ_MEMORY:
-			int numMemories = Integer.parseInt(args[8]);
-			ProxyDebugMemory[] memories = new ProxyDebugMemory[numMemories];
-			int data_len = 0;
-			for (int i=0; i<numMemories; i++) {
-				int new_data_len = Integer.parseInt(args[data_len*i+11]);
-				String addr = args[data_len*i+9];
-				String ascii = args[data_len*i+10];
-				String[] data_str = new String[new_data_len];
-				for (int j=0; j<new_data_len; j++) {
-					data_str[j] = args[data_len*i+12+j];
-				}
-				data_len = new_data_len;
-				memories[i] = new ProxyDebugMemory(addr, ascii, data_str);
-			}
-			evt = new ProxyDebugMemoryInfoEvent(packet.getTransID(), bits, toMemoryInfo(args[1], args[2], args[3], args[4], args[5], args[6], args[7], memories));
-			break;
-			
-		/**
-		 * [1]: var list -> length
-		 * [2]: var list -> name
-		 */
-		case IProxyDebugEvent.EVENT_DBG_VARS:
-			numVars = Integer.parseInt(args[1]);
-			vars = new String[numVars];
-			for (int i = 0; i < numVars; i++) {
-				vars[i] = args[i+2];
-			}
-			evt = new ProxyDebugVarsEvent(packet.getTransID(), bits, vars);
-			break;
-
-		/**
-		 * [1]: arg list -> length
-		 * [2]: arg list -> name
-		 */
-		case IProxyDebugEvent.EVENT_DBG_ARGS:
-			int numArgs = Integer.parseInt(args[1]);
-			String[] arg_strs = new String[numArgs];
-			for (int i = 0; i < numArgs; i++) {
-				arg_strs[i] = args[i+2];
-			}
-			evt = new ProxyDebugArgsEvent(packet.getTransID(), bits, arg_strs);
-			break;
-			
-		/**
-		 * [1]: type name
-		 */
-		case IProxyDebugEvent.EVENT_DBG_TYPE:
-			evt = new ProxyDebugTypeEvent(packet.getTransID(), bits, args[1]);
-			break;
-			
-		/**
-		 * [1]: aif format
-		 * [2]: aif data
-		 * [3]: type description
-		 */
-		case IProxyDebugEvent.EVENT_DBG_DATA:
-			ProxyDebugAIF data = new ProxyDebugAIF(args[1], args[2], args[3]);
-			evt = new ProxyDebugDataEvent(packet.getTransID(), bits, data);
-			break;
-
-		/**
-		 * [1]: data value 
-		 */
-		case IProxyDebugEvent.EVENT_DBG_DATA_EVA_EX:
-			evt = new ProxyDebugDataExpValueEvent(packet.getTransID(), bits, args[1]);
-			break;
-
-		/**
-		 * [1]: aif format
-		 * [2]: aif data
-		 * [3]: type description
-		 */
-		case IProxyDebugEvent.EVENT_DBG_PARTIAL_AIF:
-			ProxyDebugAIF partial_data = new ProxyDebugAIF(args[1], args[2], args[3]);
-			evt = new ProxyDebugPartialAIFEvent(packet.getTransID(), bits, partial_data, args[4]);
-			break;
-		}
-		return evt;
-	}
-	
-	public static BigInteger decodeAddr(String str) {
-		String[] parts = str.split(":");
-		int len = Integer.parseInt(parts[0], 16) - 1; // Skip trailing NULL
-		byte[] strBytes = new byte[len];
-		
-		for (int i = 0, p = 0; i < len; i++, p += 2) {
-			byte c = (byte) ((Character.digit(parts[1].charAt(p), 16) & 0xf) << 4);
-			c |= (byte) ((Character.digit(parts[1].charAt(p+1), 16) & 0xf));
-			strBytes[i] = c;
-		}
-		
-		BigInteger a = new BigInteger(strBytes);
-		return a;
-	}
-	
-	public static ProxyDebugBreakpoint toBreakpoint(String ignore, String spec, String del, String type, ProxyDebugLineLocation loc) {
-		return new ProxyDebugBreakpoint(ignore, spec, del, type, loc);
-	}
-	
-	public static ProxyDebugLineLocation toLineLocation(String file, String line) {
-		return new ProxyDebugLineLocation(file, line);
-	}
-	
-	public static ProxyDebugLocator toLocator(String file, String func, String addr, String line) {
-		return new ProxyDebugLocator(file, func, line, addr);
-	}
-
-	public static ProxyDebugStackFrame toFrame(String level, String file, String func, String line, String addr)  {
-		int stepLevel = Integer.parseInt(level);
-		return new ProxyDebugStackFrame(stepLevel, toLocator(file, func, addr, line));
-	}
-	
-	public static ProxyDebugMemoryInfo toMemoryInfo(String addr, String nextRow, String prevRow, String nextPage, String prevPage, 
-			String numBytes, String totalBytes, ProxyDebugMemory[] memories) {
-		return new ProxyDebugMemoryInfo(addr, nextRow, prevRow, nextPage, prevPage, numBytes, totalBytes, memories);
-	}
-	
-	public static boolean toBoolean(int value) {
-		return (value!=0);
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugExitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugExitEvent.java
deleted file mode 100644
index 9888cca..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugExitEvent.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugExitEvent;
-
-public class ProxyDebugExitEvent extends AbstractProxyDebugEvent implements IProxyDebugExitEvent {
-	private int		exitStatus;
-	
-	public ProxyDebugExitEvent(int transID, String bits, int code) {
-		super(transID, EVENT_DBG_EXIT, bits);
-		this.exitStatus = code;
-	}
-	
-	public int getExitStatus() {
-		return this.exitStatus;
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_EXIT transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.exitStatus;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInfoThreadsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInfoThreadsEvent.java
deleted file mode 100644
index 2f39adf..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInfoThreadsEvent.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugInfoThreadsEvent;
-
-public class ProxyDebugInfoThreadsEvent extends AbstractProxyDebugEvent implements IProxyDebugInfoThreadsEvent {
-	private String[] thread_ids;
-	
-	public ProxyDebugInfoThreadsEvent(int transID, String bits, String[] thread_ids) {
-		super(transID, EVENT_DBG_THREADS, bits);
-		this.thread_ids = thread_ids;
-	}
-	
-	public String[] getThreadIds() {
-		return this.thread_ids;
-	}
-
-	public String toString() {
-		String res = "EVENT_DBG_THREADS: transid=" + getTransactionID() + " " + this.getBitSet().toString() + " {";
-
-		for (int i = 0; i < thread_ids.length; i++) {
-			if (i > 0)
-				res += ", ";
-			res += thread_ids[i];
-		}
-		
-		res += "}";
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInitEvent.java
deleted file mode 100644
index 3a1adf9..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugInitEvent.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugInitEvent;
-
-/**
- * @deprecated
- *
- */
-public class ProxyDebugInitEvent extends AbstractProxyDebugEvent implements IProxyDebugInitEvent {
-	private int		num_servers;
-	
-	public ProxyDebugInitEvent(int transID, String bits, int num) {
-		super(transID, EVENT_DBG_INIT, bits);
-		this.num_servers = num;
-	}
-	
-	public int getNumServers() {
-		return this.num_servers;
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_INIT transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.num_servers;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugMemoryInfoEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugMemoryInfoEvent.java
deleted file mode 100644
index 743574c..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugMemoryInfoEvent.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugMemoryInfo;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugMemoryInfoEvent;
-
-/**
- * @author clement chu
- *
- */
-public class ProxyDebugMemoryInfoEvent extends AbstractProxyDebugEvent implements IProxyDebugMemoryInfoEvent {
-	private ProxyDebugMemoryInfo memoryInfo;
-	
-	public ProxyDebugMemoryInfoEvent(int transID, String bits, ProxyDebugMemoryInfo memoryInfo) {
-		super(transID, EVENT_DBG_DATA_READ_MEMORY, bits);
-		this.memoryInfo = memoryInfo;
-	}
-	
-	public ProxyDebugMemoryInfo getMemoryInfo() {
-		return this.memoryInfo;
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_DATA_READ_MEMORY transid=" + getTransactionID() + " " + this.getBitSet().toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugOKEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugOKEvent.java
deleted file mode 100644
index ca829e4..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugOKEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugOKEvent;
-
-public class ProxyDebugOKEvent extends AbstractProxyDebugEvent implements IProxyDebugOKEvent {
-	public ProxyDebugOKEvent(int transID, String bits) {
-		super(transID, EVENT_DBG_OK, bits);
-	}
-
-	public String toString() {
-		return "EVENT_DBG_OK transid=" + getTransactionID() + " " + this.getBitSet().toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugPartialAIFEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugPartialAIFEvent.java
deleted file mode 100644
index e4c33ad..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugPartialAIFEvent.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugPartialAIFEvent;
-
-public class ProxyDebugPartialAIFEvent extends AbstractProxyDebugEvent implements IProxyDebugPartialAIFEvent {
-	private ProxyDebugAIF data;
-	private String name;
-	
-	public ProxyDebugPartialAIFEvent(int transID, String bits, ProxyDebugAIF data, String name) {
-		super(transID, EVENT_DBG_PARTIAL_AIF, bits);
-		this.data = data;
-		this.name = name;
-	}
-	public ProxyDebugAIF getData() {
-		return this.data;
-	}
-	public String getName() {
-		return name;
-	}
-	
-	public String toString() {
-		String res = "EVENT_DBG_PARTIAL_AIF transid=" + getTransactionID() + " " + this.getBitSet().toString();
-		if (this.data != null)
-			res += " " + this.data.toString();
-		else
-			res += " AIFNULL";
-		
-		res += ", name: " + name;
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSetThreadSelectEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSetThreadSelectEvent.java
deleted file mode 100644
index 749d1ba..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSetThreadSelectEvent.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSetThreadSelectEvent;
-
-public class ProxyDebugSetThreadSelectEvent extends AbstractProxyDebugEvent implements IProxyDebugSetThreadSelectEvent {
-	private int thread_id = -1;
-	private ProxyDebugStackFrame frame;
-	
-	public ProxyDebugSetThreadSelectEvent(int transID, String bits, int thread_id, ProxyDebugStackFrame frame) {
-		super(transID, EVENT_DBG_THREAD_SELECT, bits);
-		this.thread_id = thread_id;
-		this.frame = frame;
-	}
-	
-	public ProxyDebugStackFrame getFrame() {
-		return this.frame;
-	}
-	public int getThreadId() {
-		return this.thread_id;
-	}
-	
-	public String toString() {
-		String res = "EVENT_DBG_THREAD_SELECT transid=" + getTransactionID() + " " + this.getBitSet().toString();
-		res += "\n id: " + frame.toString();
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalEvent.java
deleted file mode 100644
index e514908..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalEvent.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugSuspendEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalEvent;
-
-public class ProxyDebugSignalEvent extends AbstractProxyDebugSuspendEvent implements IProxyDebugSignalEvent {
-	private String		signalName;
-	private String		signalMeaning;
-	
-	public ProxyDebugSignalEvent(int transID, String set, String name, String meaning, ProxyDebugStackFrame frame, int tid, int depth, String[] vars) {
-		super(transID, set, frame, tid, depth, vars);
-		this.signalName = name;
-		this.signalMeaning = meaning;
-	}
-	
-	public String getSignalName() {
-		return this.signalName;
-	}
-	
-	public String getSignalMeaning() {
-		return this.signalMeaning;
-	}
-	
-	public String toString() {
-		String res = "EVENT_DBG_SIGNAL transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.signalName;
-		if (this.getFrame() != null)
-			res += " " + getFrame().toString();
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalExitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalExitEvent.java
deleted file mode 100644
index 825d603..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalExitEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalExitEvent;
-
-public class ProxyDebugSignalExitEvent extends AbstractProxyDebugEvent implements IProxyDebugSignalExitEvent {
-	private String signalName;
-	private String signalMeaning;
-
-	public ProxyDebugSignalExitEvent(int transID, String bits, String signalName, String signalMeaning) {
-		super(transID, EVENT_DBG_EXIT_SIGNAL, bits);
-		this.signalName = signalName;
-		this.signalMeaning = signalMeaning;
-	}
-
-	public String getSignalName() {
-		return this.signalName;
-	}
-	public String getSignalMeaning() {
-		return this.signalMeaning;
-	}
-
-	public String toString() {
-		return "EVENT_DBG_EXIT_SIGNAL transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.signalName + " " + this.signalMeaning;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalsEvent.java
deleted file mode 100644
index 3044a16..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSignalsEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugSignal;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalsEvent;
-
-public class ProxyDebugSignalsEvent extends AbstractProxyDebugEvent implements IProxyDebugSignalsEvent {
-	private ProxyDebugSignal[] signals;
-	
-	public ProxyDebugSignalsEvent(int transID, String bits, ProxyDebugSignal[] signals) {
-		super(transID, EVENT_DBG_SIGNALS, bits);
-		this.signals = signals;
-	}
-	public ProxyDebugSignal[] getSignals() {
-		return signals;
-	}
-	public String toString() {
-		String res = "EVENT_DBG_SIGNALS transid=" + getTransactionID() + " " + this.getBitSet().toString();
-		/*
-		for (int i = 0; i<signals.length; i++) {
-			res += "\n " + signals[i].toString();
-		}
-		*/
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackInfoDepthEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackInfoDepthEvent.java
deleted file mode 100644
index a5972f8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackInfoDepthEvent.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackInfoDepthEvent;
-
-public class ProxyDebugStackInfoDepthEvent extends AbstractProxyDebugEvent implements IProxyDebugStackInfoDepthEvent {
-	private int	depth;
-	
-	public ProxyDebugStackInfoDepthEvent(int transID, String bits, int depth) {
-		super(transID, EVENT_DBG_STACK_INFO_DEPTH, bits);
-		this.depth = depth;
-	}
-	
-	public int getDepth() {
-		return this.depth;
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_STACK_INFO_DEPTH transid=" + getTransactionID() + " " + this.getBitSet().toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackframeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackframeEvent.java
deleted file mode 100644
index db398f4..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStackframeEvent.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackframeEvent;
-
-public class ProxyDebugStackframeEvent extends AbstractProxyDebugEvent implements IProxyDebugStackframeEvent {
-	private ProxyDebugStackFrame[] frames;
-	
-	public ProxyDebugStackframeEvent(int transID, String bits, ProxyDebugStackFrame[] frames) {
-		super(transID, EVENT_DBG_FRAMES, bits);
-		this.frames = frames;
-	}
-	
-	public ProxyDebugStackFrame[] getFrames() {
-		return this.frames;
-	}
-	
-	public String toString() {
-		String res = "EVENT_DBG_FRAMES transid=" + getTransactionID() + " " + this.getBitSet().toString();
-		for (int i = 0; i < frames.length; i++) {
-			res += "\n " + frames[i].toString();	
-		}
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStepEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStepEvent.java
deleted file mode 100644
index 046ca90..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugStepEvent.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugSuspendEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStepEvent;
-
-public class ProxyDebugStepEvent extends AbstractProxyDebugSuspendEvent implements IProxyDebugStepEvent {
-	public ProxyDebugStepEvent(int transID, String set, ProxyDebugStackFrame frame, int thread_id, int depth, String[] vars) {
-		super(transID, set, frame, thread_id, depth, vars);
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_STEP transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.getFrame().toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSuspendEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSuspendEvent.java
deleted file mode 100644
index deb6abe..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugSuspendEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugSuspendEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSuspendEvent;
-
-public class ProxyDebugSuspendEvent extends AbstractProxyDebugSuspendEvent implements IProxyDebugSuspendEvent {
-	public ProxyDebugSuspendEvent(int transID, String set, ProxyDebugStackFrame frame, int thread_id, int depth, String[] vars) {
-		super(transID, set, frame, thread_id, depth, vars);
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_SUSPEND transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.getFrame().toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugTypeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugTypeEvent.java
deleted file mode 100644
index 0adde9b..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugTypeEvent.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugTypeEvent;
-
-public class ProxyDebugTypeEvent extends AbstractProxyDebugEvent implements IProxyDebugTypeEvent {
-	private String type;
-	
-	public ProxyDebugTypeEvent(int transID, String bits, String type) {
-		super(transID, EVENT_DBG_TYPE, bits);
-		this.type = type;
-	}
-	
-	public String getType() {
-		return this.type;
-	}
-	
-	public String toString() {
-		return "EVENT_DBG_TYPE transid=" + getTransactionID() + " " + this.getBitSet().toString() + " " + this.type;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugVarsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugVarsEvent.java
deleted file mode 100644
index 21d1d73..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/debug/event/ProxyDebugVarsEvent.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.event.AbstractProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugVarsEvent;
-
-public class ProxyDebugVarsEvent extends AbstractProxyDebugEvent implements IProxyDebugVarsEvent {
-	private String[] vars;
-	
-	public ProxyDebugVarsEvent(int transID, String set, String[] vars) {
-		super(transID, EVENT_DBG_VARS, set);
-		this.vars = vars;
-	}
-	
-	public String[] getVariables() {
-		return this.vars;
-	}
-	
-	public String toString() {
-		String res = "EVENT_DBG_VARS transid=" + getTransactionID() + " " + this.getBitSet().toString() + " {";
-
-		for (int i = 0; i < vars.length; i++) {
-			if (i > 0)
-				res += ", ";
-			res += vars[i];
-		}
-		
-		res += "}";
-		return res;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyConnectedEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyConnectedEvent.java
deleted file mode 100644
index 3003289..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyConnectedEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyConnectedEvent;
-
-public class ProxyConnectedEvent extends AbstractProxyEvent implements IProxyConnectedEvent {
-	
-	public ProxyConnectedEvent() {
-		super(CONNECTED, 0, null);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyDisconnectedEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyDisconnectedEvent.java
deleted file mode 100644
index 8f515b1..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyDisconnectedEvent.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyDisconnectedEvent;
-
-public class ProxyDisconnectedEvent extends AbstractProxyEvent implements IProxyDisconnectedEvent {
-	
-	private boolean error = false;
-	
-	public ProxyDisconnectedEvent(boolean error) {
-		super(DISCONNECTED, 0, null);
-		this.error = error;
-	}
-	
-	public boolean wasError() { return error; }
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyErrorEvent.java
deleted file mode 100644
index 2ccc554..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyErrorEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyErrorEvent;
-
-public class ProxyErrorEvent extends AbstractProxyEvent implements IProxyErrorEvent {
-	public ProxyErrorEvent(int transactionID, String[] args) {
-		super(ERROR, transactionID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyMessageEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyMessageEvent.java
deleted file mode 100644
index 5fa3afd..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyMessageEvent.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent.Level;
-
-
-public class ProxyMessageEvent extends AbstractProxyEvent implements IProxyMessageEvent {
-	public static final int EVENT_ERR_EVENT = 11;
-	
-	public ProxyMessageEvent(int transactionID, String[] args) {
-		super(MESSAGE, transactionID, args);
-	}
-
-	public ProxyMessageEvent(Level level, String message) {
-		super(MESSAGE, 0, new String[] {
-			LEVEL_ATTR + "=" + level.name(),
-			TEXT_ATTR + "=" + message
-		});
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyOKEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyOKEvent.java
deleted file mode 100644
index 43a16b8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyOKEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyOKEvent;
-
-public class ProxyOKEvent extends AbstractProxyEvent implements IProxyOKEvent {
-	public ProxyOKEvent(int transactionID) {
-		super(OK, transactionID, null);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyShutdownEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyShutdownEvent.java
deleted file mode 100644
index 22c9f38..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyShutdownEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyShutdownEvent;
-
-public class ProxyShutdownEvent extends AbstractProxyEvent implements IProxyShutdownEvent {
-	public ProxyShutdownEvent(int transactionID) {
-		super(SHUTDOWN, transactionID, null);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyTimeoutEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyTimeoutEvent.java
deleted file mode 100644
index 8c9d896..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/event/ProxyTimeoutEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyTimeoutEvent;
-
-public class ProxyTimeoutEvent extends AbstractProxyEvent implements IProxyTimeoutEvent {
-	
-	public ProxyTimeoutEvent() {
-		super(TIMEOUT, 0, null);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeInitCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeInitCommand.java
deleted file mode 100644
index 9361db1..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeInitCommand.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.client.IProxyClient;
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeInitCommand;
-
-public class ProxyRuntimeInitCommand 
-	extends AbstractProxyCommand implements IProxyRuntimeInitCommand {
-	
-	public final static String PROTOCOL_VERSION_ATTR = "version";
-	public final static String BASE_ID_ATTR = "baseId";
-
-	public ProxyRuntimeInitCommand(int baseId) {
-		super(INIT);
-		addArgument(PROTOCOL_VERSION_ATTR + "=" + IProxyClient.WIRE_PROTOCOL_VERSION);
-		addArgument(BASE_ID_ATTR + "=" + baseId);
-	}
-	
-	public ProxyRuntimeInitCommand(int transID, String[] args) {
-		super(INIT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeModelDefCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeModelDefCommand.java
deleted file mode 100644
index 232e635..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeModelDefCommand.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeModelDefCommand;
-
-public class ProxyRuntimeModelDefCommand 
-	extends AbstractProxyCommand implements IProxyRuntimeModelDefCommand {
-	
-	public ProxyRuntimeModelDefCommand() {
-		super(MODEL_DEF);
-	}
-	
-	public ProxyRuntimeModelDefCommand(int transID, String[] args) {
-		super(MODEL_DEF, transID, args);
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStartEventsCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStartEventsCommand.java
deleted file mode 100644
index 17bf063..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStartEventsCommand.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStartEventsCommand;
-
-public class ProxyRuntimeStartEventsCommand 
-	extends AbstractProxyCommand implements IProxyRuntimeStartEventsCommand {
-
-	public ProxyRuntimeStartEventsCommand() {
-		super(START_EVENTS);
-	}
-	
-	public ProxyRuntimeStartEventsCommand(int transID, String[] args) {
-		super(START_EVENTS, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStopEventsCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStopEventsCommand.java
deleted file mode 100644
index 7c53383..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeStopEventsCommand.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStopEventsCommand;
-
-public class ProxyRuntimeStopEventsCommand extends AbstractProxyCommand
-		implements IProxyRuntimeStopEventsCommand {
-
-	public ProxyRuntimeStopEventsCommand() {
-		super(STOP_EVENTS);
-	}
-
-	public ProxyRuntimeStopEventsCommand(int transID, String[] args) {
-		super(STOP_EVENTS, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeSubmitJobCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeSubmitJobCommand.java
deleted file mode 100644
index 75ef8ab..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeSubmitJobCommand.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeSubmitJobCommand;
-
-public class ProxyRuntimeSubmitJobCommand extends AbstractProxyCommand
-		implements IProxyRuntimeSubmitJobCommand {
-
-	public ProxyRuntimeSubmitJobCommand(String[] args) {
-		super(SUBMIT_JOB);
-		addArguments(args);
-	}
-
-	public ProxyRuntimeSubmitJobCommand(int transID, String[] args) {
-		super(SUBMIT_JOB, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeTerminateJobCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeTerminateJobCommand.java
deleted file mode 100644
index 43f8627..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/command/ProxyRuntimeTerminateJobCommand.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.internal.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeTerminateJobCommand;
-
-public class ProxyRuntimeTerminateJobCommand extends AbstractProxyCommand
-		implements IProxyRuntimeTerminateJobCommand {
-
-	public final static String JOB_ID_ATTR = "jobId";
-
-	public ProxyRuntimeTerminateJobCommand(String jobId) {
-		super(TERMINATE_JOB);
-		addArgument(JOB_ID_ATTR + "=" + jobId);
-	}
-
-	public ProxyRuntimeTerminateJobCommand(int transID, String[] args) {
-		super(TERMINATE_JOB, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeAttributeDefEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeAttributeDefEvent.java
deleted file mode 100644
index 7b3a940..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeAttributeDefEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeAttributeDefEvent;
-
-
-public class ProxyRuntimeAttributeDefEvent extends AbstractProxyEvent 
-	implements IProxyRuntimeAttributeDefEvent {
-
-	public ProxyRuntimeAttributeDefEvent(int transID, String[] args) {
-		super(ATTR_DEF, transID, args);
-	}
-}
-

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeConnectedStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeConnectedStateEvent.java
deleted file mode 100644
index 0005ec8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeConnectedStateEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeConnectedStateEvent;
-
-public class ProxyRuntimeConnectedStateEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeConnectedStateEvent {
-
-	public ProxyRuntimeConnectedStateEvent() {
-		super(CONNECTED_STATE, 0);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeErrorStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeErrorStateEvent.java
deleted file mode 100644
index 7337479..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeErrorStateEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeErrorStateEvent;
-
-public class ProxyRuntimeErrorStateEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeErrorStateEvent {
-
-	public ProxyRuntimeErrorStateEvent() {
-		super(ERROR_STATE, 0);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeJobChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeJobChangeEvent.java
deleted file mode 100644
index 4ba6c92..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeJobChangeEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeJobChangeEvent;
-
-public class ProxyRuntimeJobChangeEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeJobChangeEvent {
-	public ProxyRuntimeJobChangeEvent(int transID, String[] args) {
-		super(JOB_CHANGE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMachineChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMachineChangeEvent.java
deleted file mode 100644
index 01a1ced..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMachineChangeEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMachineChangeEvent;
-
-public class ProxyRuntimeMachineChangeEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeMachineChangeEvent {
-
-	public ProxyRuntimeMachineChangeEvent(int transID, String[] args) {
-		super(NODE_CHANGE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMessageEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMessageEvent.java
deleted file mode 100644
index 16d1e2b..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeMessageEvent.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMessageEvent;
-
-public class ProxyRuntimeMessageEvent extends AbstractProxyEvent 
-		implements IProxyRuntimeMessageEvent {
-
-	public ProxyRuntimeMessageEvent(int transID, String[] args) {
-		super(MESSAGE, transID, args);
-	}
-	
-	public ProxyRuntimeMessageEvent(Level level, String message) {
-		this(level, 0, message);
-	}
-
-	public ProxyRuntimeMessageEvent(Level level, int code, String message) {
-		super(MESSAGE, 0, new String[] {
-			IProxyMessageEvent.LEVEL_ATTR + "=" + level.name(),
-			IProxyMessageEvent.CODE_ATTR + "=" + code,
-			IProxyMessageEvent.TEXT_ATTR + "=" + message
-		});
-	}
-	
-	public ProxyRuntimeMessageEvent(IProxyMessageEvent event) {
-		this(event.getTransactionID(), event.getAttributes());
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewJobEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewJobEvent.java
deleted file mode 100644
index ee04514..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewJobEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewJobEvent;
-
-public class ProxyRuntimeNewJobEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeNewJobEvent {
-
-	public ProxyRuntimeNewJobEvent(int transid, String[] args) {
-		super(NEW_JOB, transid, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewMachineEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewMachineEvent.java
deleted file mode 100644
index 06c2a03..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewMachineEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewMachineEvent;
-
-public class ProxyRuntimeNewMachineEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeNewMachineEvent {
-
-	public ProxyRuntimeNewMachineEvent(int transID, String[] args) {
-		super(NEW_MACHINE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewNodeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewNodeEvent.java
deleted file mode 100644
index a11a447..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewNodeEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewNodeEvent;
-
-public class ProxyRuntimeNewNodeEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeNewNodeEvent {
-
-	public ProxyRuntimeNewNodeEvent(int transID, String[] args) {
-		super(NEW_NODE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewProcessEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewProcessEvent.java
deleted file mode 100644
index 7dcd547..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewProcessEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewProcessEvent;
-
-public class ProxyRuntimeNewProcessEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeNewProcessEvent {
-
-	public ProxyRuntimeNewProcessEvent(int transID, String[] args) {
-		super(NEW_PROCESS, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewQueueEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewQueueEvent.java
deleted file mode 100644
index f52f3dd..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNewQueueEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewQueueEvent;
-
-public class ProxyRuntimeNewQueueEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeNewQueueEvent {
-
-	public ProxyRuntimeNewQueueEvent(int transID, String[] args) {
-		super(NEW_QUEUE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNodeChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNodeChangeEvent.java
deleted file mode 100644
index abc5f4c..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeNodeChangeEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNodeChangeEvent;
-
-public class ProxyRuntimeNodeChangeEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeNodeChangeEvent {
-	
-	public ProxyRuntimeNodeChangeEvent(int transID, String[] args) {
-		super(NODE_CHANGE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeProcessChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeProcessChangeEvent.java
deleted file mode 100644
index 1161ee7..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeProcessChangeEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeProcessChangeEvent;
-
-public class ProxyRuntimeProcessChangeEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeProcessChangeEvent {
-	
-	public ProxyRuntimeProcessChangeEvent(int transID, String[] args) {
-		super(PROCESS_CHANGE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeQueueChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeQueueChangeEvent.java
deleted file mode 100644
index 047c263..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeQueueChangeEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeQueueChangeEvent;
-
-public class ProxyRuntimeQueueChangeEvent extends AbstractProxyRuntimeEvent implements IProxyRuntimeQueueChangeEvent {
-
-	public ProxyRuntimeQueueChangeEvent(int transID, String[] args) {
-		super(QUEUE_CHANGE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveAllEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveAllEvent.java
deleted file mode 100644
index 4052521..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveAllEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveAllEvent;
-
-public class ProxyRuntimeRemoveAllEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeRemoveAllEvent {
-
-	public ProxyRuntimeRemoveAllEvent(int transID, String[] args) {
-		super(REMOVE_ALL, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveJobEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveJobEvent.java
deleted file mode 100644
index 5cb49c2..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveJobEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveJobEvent;
-
-public class ProxyRuntimeRemoveJobEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeRemoveJobEvent {
-
-	public ProxyRuntimeRemoveJobEvent(int transID, String[] args) {
-		super(REMOVE_JOB, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveMachineEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveMachineEvent.java
deleted file mode 100644
index d5e7b30..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveMachineEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveMachineEvent;
-
-public class ProxyRuntimeRemoveMachineEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeRemoveMachineEvent {
-
-	public ProxyRuntimeRemoveMachineEvent(int transID, String[] args) {
-		super(REMOVE_MACHINE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveNodeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveNodeEvent.java
deleted file mode 100644
index 7a5768e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveNodeEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveNodeEvent;
-
-public class ProxyRuntimeRemoveNodeEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeRemoveNodeEvent {
-
-	public ProxyRuntimeRemoveNodeEvent(int transID, String[] args) {
-		super(REMOVE_NODE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveProcessEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveProcessEvent.java
deleted file mode 100644
index 5f6dac8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveProcessEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveProcessEvent;
-
-public class ProxyRuntimeRemoveProcessEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeRemoveProcessEvent {
-
-	public ProxyRuntimeRemoveProcessEvent(int transID, String[] args) {
-		super(REMOVE_PROCESS, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveQueueEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveQueueEvent.java
deleted file mode 100644
index ce9e065..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRemoveQueueEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveQueueEvent;
-
-public class ProxyRuntimeRemoveQueueEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeRemoveQueueEvent {
-
-	public ProxyRuntimeRemoveQueueEvent(int transID, String[] args) {
-		super(REMOVE_QUEUE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRunningStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRunningStateEvent.java
deleted file mode 100644
index 361a438..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeRunningStateEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRunningStateEvent;
-
-public class ProxyRuntimeRunningStateEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeRunningStateEvent {
-
-	public ProxyRuntimeRunningStateEvent() {
-		super(RUNNING_STATE, 0);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeShutdownStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeShutdownStateEvent.java
deleted file mode 100644
index 91a89bc..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeShutdownStateEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeShutdownStateEvent;
-
-public class ProxyRuntimeShutdownStateEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeShutdownStateEvent {
-
-	public ProxyRuntimeShutdownStateEvent() {
-		super(SHUTDOWN_STATE, 0);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeStartupErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeStartupErrorEvent.java
deleted file mode 100644
index 93b9407..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeStartupErrorEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.event.IProxyErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeStartupErrorEvent;
-
-public class ProxyRuntimeStartupErrorEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeStartupErrorEvent {
-
-	public ProxyRuntimeStartupErrorEvent(String message) {
-		super(STARTUP_ERROR, 0, new String[] {
-				IProxyErrorEvent.ERROR_CODE_ATTR + "=" + 0,
-				IProxyErrorEvent.ERROR_MESSAGE_ATTR + "=" + message
-		});
-	}
-
-	public ProxyRuntimeStartupErrorEvent(String[] attrs) {
-		super(STARTUP_ERROR, 0, attrs);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeSubmitJobErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeSubmitJobErrorEvent.java
deleted file mode 100644
index 4d8894e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeSubmitJobErrorEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeSubmitJobErrorEvent;
-
-public class ProxyRuntimeSubmitJobErrorEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeSubmitJobErrorEvent {
-
-	public ProxyRuntimeSubmitJobErrorEvent(int transID, String[] args) {
-		super(SUBMITJOB_ERROR, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeTerminateJobErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeTerminateJobErrorEvent.java
deleted file mode 100644
index 88edf01..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/internal/proxy/runtime/event/ProxyRuntimeTerminateJobErrorEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.runtime.event.AbstractProxyRuntimeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeTerminateJobErrorEvent;
-
-public class ProxyRuntimeTerminateJobErrorEvent 
-	extends AbstractProxyRuntimeEvent 
-		implements IProxyRuntimeTerminateJobErrorEvent {
-
-	public ProxyRuntimeTerminateJobErrorEvent(int transID, String[] args) {
-		super(TERMINATEJOB_ERROR, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/AbstractProxyClient.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/AbstractProxyClient.java
deleted file mode 100644
index 4d3856b..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/AbstractProxyClient.java
+++ /dev/null

@@ -1,502 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.client;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.SocketTimeoutException;
-import java.nio.channels.Channels;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.WritableByteChannel;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.ptp.internal.proxy.command.ProxyQuitCommand;
-import org.eclipse.ptp.internal.proxy.event.ProxyConnectedEvent;
-import org.eclipse.ptp.internal.proxy.event.ProxyDisconnectedEvent;
-import org.eclipse.ptp.internal.proxy.event.ProxyMessageEvent;
-import org.eclipse.ptp.internal.proxy.event.ProxyTimeoutEvent;
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.event.IProxyConnectedEvent;
-import org.eclipse.ptp.proxy.event.IProxyDisconnectedEvent;
-import org.eclipse.ptp.proxy.event.IProxyErrorEvent;
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyEventFactory;
-import org.eclipse.ptp.proxy.event.IProxyEventListener;
-import org.eclipse.ptp.proxy.event.IProxyExtendedEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-import org.eclipse.ptp.proxy.event.IProxyOKEvent;
-import org.eclipse.ptp.proxy.event.IProxyShutdownEvent;
-import org.eclipse.ptp.proxy.event.IProxyTimeoutEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent.Level;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-import org.eclipse.ptp.proxy.util.DebugOptions;
-
-public abstract class AbstractProxyClient implements IProxyClient {
-
-	private enum SessionState {WAITING, CONNECTED, RUNNING, SHUTTING_DOWN, SHUTDOWN}
-	
-	private int					transactionID = 1;
-	private int					sessPort = 0;
-	private ServerSocketChannel	sessSvrSock = null;
-	private SocketChannel		sessSock = null;
-	private IProxyEventFactory	proxyEventFactory;
-
-	private ReadableByteChannel	sessInput;
-	private WritableByteChannel	sessOutput;
-
-	private Thread				eventThread;
-	private Thread				acceptThread;
-	
-	private DebugOptions		debugOptions;
-	private SessionState 		state;
-
-	private List<IProxyEventListener>	listeners = Collections.synchronizedList(new ArrayList<IProxyEventListener>());
-
-	public AbstractProxyClient() {
-		this.debugOptions = new DebugOptions();
-		this.state = SessionState.SHUTDOWN;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#addProxyEventListener(org.eclipse.ptp.proxy.client.event.IProxyEventListener)
-	 */
-	public void addProxyEventListener(IProxyEventListener listener) {
-		listeners.add(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#getSessionPort()
-	 */
-	public int getSessionPort() {
-		return sessPort;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#isReady()
-	 */
-	public boolean isReady() {
-		synchronized (state) {
-			return state == SessionState.RUNNING;
-		}
-	}
-
-	/**
-	 * Test if proxy has shut down
-	 * 
-	 * @return shut down state
-	 */
-	public boolean isShutdown() {
-		synchronized (state) {
-			return state == SessionState.SHUTDOWN;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#newTransactionID()
-	 */
-	public synchronized int newTransactionID() {
-		return ++transactionID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#removeProxyEventListener(org.eclipse.ptp.proxy.client.event.IProxyEventListener)
-	 */
-	public void removeProxyEventListener(IProxyEventListener listener) {
-		listeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#sendCommand(java.lang.String)
-	 */
-	public void sendCommand(IProxyCommand cmd) throws IOException {
-		if (!isReady()) {
-			throw new IOException("channel is not ready to send");
-		}
-		ProxyPacket packet = new ProxyPacket(cmd);
-		packet.send(sessOutput);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#sessionConnect()
-	 */
-	public int sessionConnect() {
-		return 0; // Not implemented
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#sessionCreate()
-	 */
-	public void sessionCreate() throws IOException {
-		sessionCreate(0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#sessionCreate(int)
-	 */
-	public void sessionCreate(int timeout) throws IOException {
-		sessionCreate(0, timeout);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#sessionCreate(int, int)
-	 */
-	public void sessionCreate(int port, int timeout) throws IOException {
-		if (DebugOptions.CLIENT_TRACING) {
-			System.out.println("sessionCreate("+port+","+timeout+")");
-		}
-		sessSvrSock = ServerSocketChannel.open();
-		InetSocketAddress isa = new InetSocketAddress(port);
-		if (DebugOptions.CLIENT_TRACING) {
-			System.out.println("bind("+isa.toString()+")");
-		}
-		sessSvrSock.socket().bind(isa);
-		if (timeout > 0)
-			sessSvrSock.socket().setSoTimeout(timeout);
-		sessPort = sessSvrSock.socket().getLocalPort();
-		
-		synchronized (state) {
-			state = SessionState.WAITING;
-		}
-		
-		if (DebugOptions.CLIENT_TRACING) {
-			System.out.println("port=" + sessPort);
-		}
-		
-		acceptThread = new Thread("Proxy Client Accept Thread") {
-			public void run() {
-				boolean error = false;
-				try {
-					if (DebugOptions.CLIENT_TRACING) {
-						System.out.println("accept thread starting...");
-					}
-					sessSock = sessSvrSock.accept();
-					sessInput = sessSock;
-					sessOutput = sessSock;
-				} catch (SocketTimeoutException e) {
-					error = true;
-					fireProxyTimeoutEvent(new ProxyTimeoutEvent());
-				} catch (ClosedByInterruptException e) {
-					error = true;
-					fireProxyMessageEvent(new ProxyMessageEvent(Level.WARNING, "Accept cancelled by user"));
-				} catch (IOException e) {
-					error = true;
-					fireProxyMessageEvent(new ProxyMessageEvent(Level.FATAL, "IOException in accept"));
-				} finally {		
-					try {
-						sessSvrSock.close();
-					} catch (IOException e) {
-						if (DebugOptions.CLIENT_TRACING) {
-							System.out.println("IO Exception trying to close server socket (non fatal)");
-						}
-					}
-					synchronized (state) {
-						if (isInterrupted()) {
-							error = true;
-							fireProxyMessageEvent(new ProxyMessageEvent(Level.WARNING, "Connection cancelled by user"));
-						}
-						if (!error && state == SessionState.WAITING) {
-							state = SessionState.CONNECTED;
-							fireProxyConnectedEvent(new ProxyConnectedEvent());
-						} else {
-							state = SessionState.SHUTDOWN;
-						}
-					}
-					if (DebugOptions.CLIENT_TRACING) {
-						System.out.println("accept thread exiting...");
-					}
-				}
-			}
-		};
-		acceptThread.start();
-	}
-	
-	/**
-	 * Create a proxy session that will read from InputStream and write to OutputStream
-	 * 
-	 * Generates a ProxyConnectedEvent
-	 * 
-	 * @param	output		stream to write to
-	 * @param	input		stream to read from
-	 */
-	public void sessionCreate(OutputStream output, InputStream input) {
-		if (DebugOptions.CLIENT_TRACING) {
-			System.out.println("sessionCreate(stdin, stdout)");
-		}
-		sessInput = Channels.newChannel(input);
-		sessOutput = Channels.newChannel(output);
-		synchronized (state) {
-			state = SessionState.CONNECTED;
-		}
-		fireProxyConnectedEvent(new ProxyConnectedEvent());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.client.IProxyClient#sessionFinish()
-	 */
-	public void sessionFinish() throws IOException {
-		synchronized (state) {
-			switch (state) {
-			case WAITING:
-				if (acceptThread.isAlive()) {
-					/*
-					 * Force interrupt of accept. Note that this will cause
-					 * a ProxyErrorEvent to be generated
-					 */
-					acceptThread.interrupt();
-				}
-				state = SessionState.SHUTTING_DOWN;
-				break;
-			case CONNECTED:
-				try {
-					sessSock.close();
-					state = SessionState.SHUTTING_DOWN;
-				} catch (IOException e) {
-					state = SessionState.SHUTDOWN;
-				} 
-				break;
-			case RUNNING:
-				/*
-				 * Send quit command. Proxy will shut down when OK is
-				 * received or after shutdownTimeout.
-				 */
-				IProxyCommand cmd = new ProxyQuitCommand();
-				// TODO: start shutdown timeout
-				try {
-					sendCommand(cmd);
-					state = SessionState.SHUTTING_DOWN;
-				} catch (IOException e) {
-					// Tell event thread to exit
-					state = SessionState.SHUTDOWN;
-					// TODO: stop shutdown timeout
-				}
-				break;
-			}
-		}
-	}
-	
-	/**
-	 * Start a thread to process events from the proxy by repeatedly calling sessionProgress(). 
-	 * The thread is guaranteed to produce a ProxyDisconnectedEvent when it exits.
-	 * 
-	 * @throws IOException	if the session is not connected or the event thread fails to start
-	 */
-	public void sessionHandleEvents() throws IOException {
-		eventThread = new Thread("Proxy Client Event Thread") {
-			public void run() {
-				boolean error = false;
-				int errorCount = 0;			
-				
-				if (DebugOptions.CLIENT_TRACING) {
-					System.out.println("event thread starting...");
-				}
-				try {
-					while (errorCount < MAX_ERRORS && !isInterrupted()) {
-						synchronized (state) {
-							if (state == SessionState.SHUTDOWN) {
-								break;
-							}
-						}
-						if (!sessionProgress()) {
-							errorCount++;
-						}
-					}
-				} catch (IOException e) {
-					synchronized (state) {
-						if (!isInterrupted() && state != SessionState.SHUTTING_DOWN) {
-							error = true;
-							if (DebugOptions.CLIENT_TRACING) {
-								System.out.println("event thread IOException . . . " + e.getMessage());
-							}
-						}
-					}
-				} 
-				
-				if (errorCount >= MAX_ERRORS) {
-					error = true;
-				}
-				
-				try {
-					sessSock.close();
-				} catch (IOException e) {
-				} 
-				
-				synchronized (state) {
-					state = SessionState.SHUTDOWN;
-				}
-
-				fireProxyDisconnectedEvent(new ProxyDisconnectedEvent(error));
-				
-				if (DebugOptions.CLIENT_TRACING) {
-					System.out.println("event thread exited");
-				}
-			}
-		};
-
-		synchronized (state) {
-			if (state != SessionState.CONNECTED) {
-				throw new IOException("Not ready to receive events");
-			}
-			state = SessionState.RUNNING;
-		}
-		eventThread.start();
-	}
-	
-	/**
-	 * Set the factory used to decode events
-	 * 
-	 * @param factory
-	 */
-	public void setEventFactory(IProxyEventFactory factory) {
-		this.proxyEventFactory = factory;
-	}
-
-	/**
-	 * Process incoming events
-	 * 
-	 * @return
-	 * @throws IOException
-	 */
-	private boolean sessionProgress() throws IOException {
-		ProxyPacket packet = new ProxyPacket();
-		if (DebugOptions.PROTOCOL_TRACING) {
-			packet.setDebug(true);
-		}
-		if (!packet.read(sessInput)) {
-			return false;
-		}
-		
-		/*
-		 * Now convert the event into an IProxyEvent
-		 */
-		IProxyEvent e = proxyEventFactory.toEvent(packet);
-				
-		if (e != null) {
-			if (e instanceof IProxyMessageEvent) {
-				fireProxyMessageEvent((IProxyMessageEvent) e);
-			} else if (e instanceof IProxyOKEvent) {
-				fireProxyOKEvent((IProxyOKEvent) e);
-			} else if (e instanceof IProxyErrorEvent) {
-				fireProxyErrorEvent((IProxyErrorEvent) e);
-			} else if (e instanceof IProxyShutdownEvent) {
-				if (state == SessionState.SHUTTING_DOWN) { 
-					state = SessionState.SHUTDOWN;
-					// TODO: stop shutdown timeout
-				}
-			} else if (e instanceof IProxyExtendedEvent) {
-				fireProxyExtendedEvent((IProxyExtendedEvent) e);
-			}
-			
-			return true;
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Send event to event handlers
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyConnectedEvent(IProxyConnectedEvent event) {
-		IProxyEventListener[] la = listeners.toArray(new IProxyEventListener[0]);
-		for (IProxyEventListener listener : la) {
-			listener.handleEvent(event);
-		}
-	}
-	
-	/**
-	 * Send event to event handlers
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyDisconnectedEvent(IProxyDisconnectedEvent event) {
-		IProxyEventListener[] la = listeners.toArray(new IProxyEventListener[0]);
-		for (IProxyEventListener listener : la) {
-			listener.handleEvent(event);
-		}
-	}
-	
-	/**
-	 * Send event to event handlers
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyErrorEvent(IProxyErrorEvent event) {
-		IProxyEventListener[] la = listeners.toArray(new IProxyEventListener[0]);
-		for (IProxyEventListener listener : la) {
-			listener.handleEvent(event);
-		}
-	}
-	
-	/**
-	 * Send event to event handlers
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyExtendedEvent(IProxyExtendedEvent event) {
-		IProxyEventListener[] la = listeners.toArray(new IProxyEventListener[0]);
-		for (IProxyEventListener listener : la) {
-			listener.handleEvent(event);
-		}
-	}
-	
-	/**
-	 * Send event to event handlers
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyMessageEvent(IProxyMessageEvent event) {
-		IProxyEventListener[] la = listeners.toArray(new IProxyEventListener[0]);
-		for (IProxyEventListener listener : la) {
-			listener.handleEvent(event);
-		}
-	}
-	
-	/**
-	 * Send event to event handlers
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyOKEvent(IProxyOKEvent event) {
-		IProxyEventListener[] la = listeners.toArray(new IProxyEventListener[0]);
-		for (IProxyEventListener listener : la) {
-			listener.handleEvent(event);
-		}
-	}
-
-	/**
-	 * Send event to event handlers
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyTimeoutEvent(IProxyTimeoutEvent event) {
-		IProxyEventListener[] la = listeners.toArray(new IProxyEventListener[0]);
-		for (IProxyEventListener listener : la) {
-			listener.handleEvent(event);
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/IProxyClient.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/IProxyClient.java
deleted file mode 100644
index 97fe41b..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/client/IProxyClient.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.client;
-
-import java.io.IOException;
-
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.event.IProxyEventListener;
-
-public interface IProxyClient {
-	/* wire protocol version */
-	public static final String WIRE_PROTOCOL_VERSION = "2.0";
-	public static final int MAX_ERRORS = 5;
-	
-	/**
-	 * Add listener to receive proxy events.
-	 * 
-	 * @param listener listener to receive events
-	 */
-	public void addProxyEventListener(IProxyEventListener listener);
-	
-	/**
-	 * Get the port that has been allocated for incoming connections.
-	 * 
-	 * @return port number
-	 */
-	public int getSessionPort();
-	
-	/**
-	 * Check if the client is ready to send commands
-	 * 
-	 * @return true if client is ready to send commands
-	 */
-	public boolean isReady();
-
-	/**
-	 * Generate a new transaction ID.
-	 * 
-	 * @return new transaction ID
-	 */
-	public int newTransactionID();	
-	
-	/**
-	 * Remove listener from receiving proxy events
-	 * 
-	 * @param listener listener to remove
-	 */
-	public void removeProxyEventListener(IProxyEventListener listener);
-	
-	/**
-	 * Send a command to the proxy server. 
-	 * 
-	 * @param command command to send
-	 * @throws IOException
-	 */
-	public void sendCommand(IProxyCommand command) throws IOException;
-	
-	/**
-	 * Connect to a remote proxy server. This is not currently implemented.
-	 * 
-	 * @return
-	 */
-	public int sessionConnect();
-	
-	/**
-	 * Convenience method. Same as sessionCreate(0, 0)
-	 * 
-	 * @throws IOException
-	 */
-	public void sessionCreate() throws IOException;	
-	
-	/**
-	 * Convenience method. Same as sessionCreate(0, timeout)
-	 * 
-	 * @param timeout
-	 * @throws IOException
-	 */
-	public void sessionCreate(int timeout) throws IOException;
-	
-	/**
-	 * Create a proxy session. This starts a thread that waits for an incoming proxy connection.
-	 * If the connection is successful, then an event thread is started.
-	 * 
-	 * On a successful return one of three events are guaranteed to be generated:
-	 * 
-	 * ProxyConnectedEvent	if the incoming connection succeeded
-	 * ProxyTimeoutEvent	if no connection is established before the timeout expires
-	 * ProxyErrorEvent		if the accept fails or is canceled
-	 * 
-	 * @param	port		port number to use for incoming connection (0 = autogenerate)
-	 * @param	timeout		delay (in ms) to wait for incoming connection (0 = wait forever)
-	 * @throws	IOException	if accept thread fails to start 
-	 */
-	public void sessionCreate(int port, int timeout) throws IOException;
-	
-	/**
-	 * Attempt to shut down the proxy session regardless of state.
-	 * 
-	 * Events that can be generated as a result of sessionFinish() are:
-	 * 
-	 * ProxyErrorEvent			if sessionCreate() was waiting for an incoming connection
-	 * ProxyDisconnectedEvent	if the proxy shut down successfully
-	 * 
-	 * @throws	IOException	if the session is already shut down
-	 */
-	public void sessionFinish() throws IOException;
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommand.java
deleted file mode 100644
index 089b559..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommand.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class AbstractProxyCommand implements IProxyCommand {
-	
-	private static List<IProxyCommand> pendingCommands = new ArrayList<IProxyCommand>();
-
-	private int					commandID;
-	private int					transactionID;
-	private ArrayList<String>	args;
-	
-	protected AbstractProxyCommand(int commandID) {
-		this.commandID = commandID;
-		this.transactionID = newTransactionID(this);
-		this.args = new ArrayList<String>();
-	}
-
-	protected AbstractProxyCommand(int commandID, int transID, String[] args) {
-		this.commandID = commandID;
-		this.transactionID = transID;
-		for (String arg : args) {
-			this.args.add(arg);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.command.IProxyCommand#addArgument(java.lang.String)
-	 */
-	public void addArgument(String arg) {
-		if (arg == null) {
-			args.add("");
-		} else {
-			args.add(arg);
-		}
-	}
-	
-	/**
-	 * Mark the command that it has been completed so the transaction
-	 * ID can be used by future commands.
-	 */
-	public void completed() {
-		pendingCommands.add(transactionID, null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.command.IProxyCommand#getArguments()
-	 */
-	public String[] getArguments() {
-		return args.toArray(new String[args.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.command.IProxyCommand#getCommandID()
-	 */
-	public int getCommandID() {
-		return commandID;
-	}
-
-	/**
-	 * Return the transaction id used by this command
-	 */
-	public int getTransactionID() {
-		return transactionID;
-	}
-
-	public String toString() {
-		String str = this.getClass().getSimpleName() + " tid=" + getTransactionID();
-		
-		for (String arg : args) {
-			if (arg == null) {
-				str += " <null>";
-			} else if (arg.equals("")) {
-				str += " \"\"";
-			} else {
-				str += " " + arg;
-			}
-		}
-		return str;
-	}
-
-	/*
-	 * Find first available slot. Use slot ID as transaction ID.
-	 * 
-	 * @return new transaction ID
-	 */
-	private int newTransactionID(IProxyCommand cmd) {
-		int transID = 0;
-		
-		for (; transID < pendingCommands.size(); transID++) {
-			if (pendingCommands.get(transID) == null) {
-				break;
-			}
-		}
-		
-		pendingCommands.add(transID, cmd);
-		
-		return transID;
-	}
-
-	/**
-	 * @param arg
-	 */
-	protected void addArgument(boolean arg) {
-		addArgument(arg?"1":"0");
-	}
-
-	/**
-	 * @param arg
-	 */
-	protected void addArgument(Character arg) {
-		args.add(arg==null ? "" : arg.toString());
-	}
-
-	/**
-	 * @param arg
-	 */
-	protected void addArgument(int arg) {
-		args.add(Integer.toString(arg));
-	}
-
-	/**
-	 * @param arg
-	 */
-	protected void addArgument(long arg) {
-		args.add(Long.toString(arg));
-	}
-
-	/**
-	 * @param args
-	 */
-	protected void addArguments(String[] args) {
-		for (String arg : args) {
-			addArgument(arg);
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommandFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommandFactory.java
deleted file mode 100644
index 844adac..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/AbstractProxyCommandFactory.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-
-public abstract class AbstractProxyCommandFactory implements IProxyCommandFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.command.IProxyCommandFactory#toCommand(org.eclipse.ptp.proxy.packet.ProxyPacket)
-	 */
-	public abstract IProxyCommand toCommand(ProxyPacket packet);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommand.java
deleted file mode 100644
index 4710da5..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommand.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-
-public interface IProxyCommand {
-	/*
-	 * Base command ids
-	 */
-	public static final int QUIT = 0;
-
-	/**
-	 * Mark command as completed
-	 */
-	public void completed();
-		
-	/**
-	 * @return the transaction id used by this command
-	 */
-	public int getCommandID();
-	
-	/**
-	 * @return the encoded message buffer to be sent to the proxy
-	 */
-	public String[] getArguments();
-	
-	/**
-	 * @return the transaction id used by this command
-	 */
-	public int getTransactionID();
-	
-	/**
-	 * Add an argument to the command
-	 * 
-	 * @param arg argument to add to the command
-	 */
-	public void addArgument(String arg);
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandFactory.java
deleted file mode 100644
index 81569b6..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandFactory.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public interface IProxyCommandFactory {
-	public IProxyCommand toCommand(ProxyPacket packet);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandListener.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandListener.java
deleted file mode 100644
index fc1493d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyCommandListener.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-public interface IProxyCommandListener {
-
-	/**
-	 * Handler for quit commands
-	 * 
-	 * @param c command to handle
-	 */
-	public void handleCommand(IProxyQuitCommand c);
-
-	/**
-	 * Handler for extended commands
-	 * 
-	 * @param c command to handle
-	 */
-	public void handleCommand(IProxyExtendedCommand c);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyExtendedCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyExtendedCommand.java
deleted file mode 100644
index d006010..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyExtendedCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-
-public interface IProxyExtendedCommand extends IProxyCommand {
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyQuitCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyQuitCommand.java
deleted file mode 100644
index 11d9336..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/IProxyQuitCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-
-public interface IProxyQuitCommand extends IProxyCommand {
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/ProxyCommandFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/ProxyCommandFactory.java
deleted file mode 100644
index b5bfb59..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/command/ProxyCommandFactory.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.command;
-
-import org.eclipse.ptp.internal.proxy.command.ProxyQuitCommand;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public class ProxyCommandFactory extends AbstractProxyCommandFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.command.AbstractProxyCommandFactory#toCommand(org.eclipse.ptp.proxy.packet.ProxyPacket)
-	 */
-	public IProxyCommand toCommand(ProxyPacket packet) {
-		IProxyCommand evt = null;
-
-		switch (packet.getID()) {
-		case IProxyCommand.QUIT:
-			evt = new ProxyQuitCommand(packet.getTransID(), packet.getArgs());
-			break;
-		}
-		return evt;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/AbstractProxyDebugClient.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/AbstractProxyDebugClient.java
deleted file mode 100644
index 8006ecc..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/AbstractProxyDebugClient.java
+++ /dev/null

@@ -1,436 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.ptp.internal.proxy.debug.event.ProxyDebugEventFactory;
-import org.eclipse.ptp.proxy.client.AbstractProxyClient;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugArgsEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugBreakpointHitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugBreakpointSetEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataExpValueEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugErrorEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugEventFactory;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugEventListener;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugExitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugInfoThreadsEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugInitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugMemoryInfoEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugOKEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugPartialAIFEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSetThreadSelectEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalExitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalsEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackInfoDepthEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackframeEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStepEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSuspendEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugTypeEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugVarsEvent;
-import org.eclipse.ptp.proxy.event.IProxyConnectedEvent;
-import org.eclipse.ptp.proxy.event.IProxyDisconnectedEvent;
-import org.eclipse.ptp.proxy.event.IProxyErrorEvent;
-import org.eclipse.ptp.proxy.event.IProxyEventListener;
-import org.eclipse.ptp.proxy.event.IProxyExtendedEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-import org.eclipse.ptp.proxy.event.IProxyOKEvent;
-import org.eclipse.ptp.proxy.event.IProxyTimeoutEvent;
-
-public abstract class AbstractProxyDebugClient extends AbstractProxyClient implements IProxyDebugClient,IProxyEventListener {
-	
-	private List<IProxyDebugEventListener>	listeners = 
-		Collections.synchronizedList(new ArrayList<IProxyDebugEventListener>());
-
-	protected boolean					waiting = false;
-	protected boolean					timeout = false;
-	protected final ReentrantLock		waitLock = new ReentrantLock();
-	protected final Condition			waitCondition = waitLock.newCondition();
-	protected volatile DebugProxyState	state;
-	protected IProxyDebugEventFactory	factory;
-	
-	protected enum DebugProxyState {
-		DISCONNECTED,
-		DISCONNECTING,
-		CONNECTED,
-		CONNECTING
-	}
-	
-	public AbstractProxyDebugClient() {
-		super();
-		this.factory = new ProxyDebugEventFactory();
-		super.setEventFactory(factory);
-		super.addProxyEventListener(this);
-		state = DebugProxyState.DISCONNECTED;
-	}
-	
-	public void finalize() {
-		super.removeProxyEventListener(this);
-	}
-	
-	/**
-	 * Initialize the debugger connection.
-	 * 
-	 * @throws IOException
-	 */
-	public void doInitialize(int port) throws IOException {
-		sessionCreate(port, 0);
-		state = DebugProxyState.CONNECTING;
-	}
-	
-
-	/**
-	 * Shutdown the debugger connection. This can be called if we are either in the CONNECTED
-	 * state, in which case we will receive a disconnected event, or in the CONNECTING state, 
-	 * in which case we will receive an error event.
-	 * 
-	 * @throws IOException
-	 */
-	public void doShutdown() throws IOException {
-		waitLock.lock();
-		try {
-			if (state == DebugProxyState.CONNECTING || state == DebugProxyState.CONNECTED) {
-				state = DebugProxyState.DISCONNECTING;
-				System.out.println("calling session finish");
-				sessionFinish();
-				while (state == DebugProxyState.DISCONNECTING) {
-					waiting = true;
-					try {
-						waitCondition.await(30000, TimeUnit.MILLISECONDS);
-					} catch (InterruptedException e) {
-					}
-				}
-			}
-		} finally {
-			waitLock.unlock();
-			state = DebugProxyState.DISCONNECTED;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.debug.client.IProxyDebugClient#addProxyDebugEventListener(org.eclipse.ptp.proxy.debug.client.event.IProxyDebugEventListener)
-	 */
-	public void addProxyDebugEventListener(IProxyDebugEventListener listener) {
-		listeners.add(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.debug.client.IProxyDebugClient#removeProxyDebugEventListener(org.eclipse.ptp.proxy.debug.client.event.IProxyDebugEventListener)
-	 */
-	public void removeProxyDebugEventListener(IProxyDebugEventListener listener) {
-		listeners.remove(listener);
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.core.proxy.event.IProxyConnectedEvent)
-	 */
-	public void handleEvent(IProxyConnectedEvent e) {
-		System.out.println("debug: received connected event");
-		waitLock.lock();
-		try {
-			state = DebugProxyState.CONNECTED;
-			if (waiting) {
-				waitCondition.signal();
-				waiting = false;
-			}
-		} finally {
-			waitLock.unlock();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.core.proxy.event.IProxyDisconnectedEvent)
-	 */
-	public void handleEvent(IProxyDisconnectedEvent e) {
-		System.out.println("debug: received disconnected event");
-		waitLock.lock();
-		try {
-			if (state == DebugProxyState.DISCONNECTING) {
-				state = DebugProxyState.DISCONNECTED;
-				if (waiting) {
-					waitCondition.signal();
-					waiting = false;
-				}
-			}
-		} finally {
-			waitLock.unlock();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.core.proxy.event.IProxyErrorEvent)
-	 */
-	public void handleEvent(IProxyErrorEvent e) {
-		System.out.println("debug: received error event");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.core.proxy.event.IProxyMessageEvent)
-	 */
-	public void handleEvent(IProxyMessageEvent e) {
-		System.out.println("debug: received message event");
-		waitLock.lock();
-		try {
-			if (state == DebugProxyState.DISCONNECTING) {
-				state = DebugProxyState.DISCONNECTED;
-				if (waiting) {
-					waitCondition.signal();
-					waiting = false;
-				}
-			}
-		} finally {
-			waitLock.unlock();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.core.proxy.event.IProxyOKEvent)
-	 */
-	public void handleEvent(IProxyOKEvent e) {
-		System.out.println("debug: received ok event");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.core.proxy.event.IProxyTimeoutEvent)
-	 */
-	public void handleEvent(IProxyTimeoutEvent e) {
-		System.out.println("debug: received timeout event");
-		waitLock.lock();
-		try {
-			timeout = true;
-			if (waiting) {
-				waitCondition.signal();
-				waiting = false;
-			}
-		} finally {
-			waitLock.unlock();
-		}
-	}
-	
-	public void handleEvent(IProxyExtendedEvent e) {
-		if (e instanceof IProxyDebugArgsEvent) {
-			fireProxyDebugArgsEvent((IProxyDebugArgsEvent) e);
-		} else if (e instanceof IProxyDebugBreakpointHitEvent) {
-			fireProxyDebugBreakpointHitEvent((IProxyDebugBreakpointHitEvent) e);
-		} else if (e instanceof IProxyDebugBreakpointSetEvent) {
-			fireProxyDebugBreakpointSetEvent((IProxyDebugBreakpointSetEvent) e);
-		} else if (e instanceof IProxyDebugDataEvent) {
-			fireProxyDebugDataEvent((IProxyDebugDataEvent) e);
-		} else if (e instanceof IProxyDebugDataExpValueEvent) {
-			fireProxyDebugDataExpValueEvent((IProxyDebugDataExpValueEvent) e);
-		} else if (e instanceof IProxyDebugExitEvent) {
-			fireProxyDebugExitEvent((IProxyDebugExitEvent) e);
-		} else if (e instanceof IProxyDebugErrorEvent) {
-			fireProxyDebugErrorEvent((IProxyDebugErrorEvent) e);
-		} else if (e instanceof IProxyDebugInfoThreadsEvent) {
-			fireProxyDebugInfoThreadsEvent((IProxyDebugInfoThreadsEvent) e);
-		} else if (e instanceof IProxyDebugInitEvent) {
-			fireProxyDebugInitEvent((IProxyDebugInitEvent) e);
-		} else if (e instanceof IProxyDebugMemoryInfoEvent) {
-			fireProxyDebugMemoryInfoEvent((IProxyDebugMemoryInfoEvent) e);
-		} else if (e instanceof IProxyDebugOKEvent) {
-			fireProxyDebugOKEvent((IProxyDebugOKEvent) e);
-		} else if (e instanceof IProxyDebugPartialAIFEvent) {
-			fireProxyDebugPartialAIFEvent((IProxyDebugPartialAIFEvent) e);
-		} else if (e instanceof IProxyDebugSetThreadSelectEvent) {
-			fireProxyDebugSetThreadSelectEvent((IProxyDebugSetThreadSelectEvent) e);
-		} else if (e instanceof IProxyDebugSignalEvent) {
-			fireProxyDebugSignalEvent((IProxyDebugSignalEvent) e);
-		} else if (e instanceof IProxyDebugSignalExitEvent) {
-			fireProxyDebugSignalExitEvent((IProxyDebugSignalExitEvent) e);
-		} else if (e instanceof IProxyDebugSignalsEvent) {
-			fireProxyDebugSignalsEvent((IProxyDebugSignalsEvent) e);
-		} else if (e instanceof IProxyDebugStackframeEvent) {
-			fireProxyDebugStackframeEvent((IProxyDebugStackframeEvent) e);
-		} else if (e instanceof IProxyDebugStackInfoDepthEvent) {
-			fireProxyDebugStackInfoDepthEvent((IProxyDebugStackInfoDepthEvent) e);
-		} else if (e instanceof IProxyDebugStepEvent) {
-			fireProxyDebugStepEvent((IProxyDebugStepEvent) e);
-		} else if (e instanceof IProxyDebugSuspendEvent) {
-			fireProxyDebugSuspendEvent((IProxyDebugSuspendEvent) e);
-		} else if (e instanceof IProxyDebugTypeEvent) {
-			fireProxyDebugTypeEvent((IProxyDebugTypeEvent) e);
-		} else if (e instanceof IProxyDebugVarsEvent) {
-			fireProxyDebugVarsEvent((IProxyDebugVarsEvent) e);
-		}
-	}
-
-	protected void fireProxyDebugArgsEvent(IProxyDebugArgsEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugArgsEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugBreakpointHitEvent(IProxyDebugBreakpointHitEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugBreakpointHitEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugBreakpointSetEvent(IProxyDebugBreakpointSetEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugBreakpointSetEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugDataEvent(IProxyDebugDataEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugDataEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugDataExpValueEvent(IProxyDebugDataExpValueEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugDataExpValueEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugExitEvent(IProxyDebugExitEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugExitEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugErrorEvent(IProxyDebugErrorEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugErrorEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugInfoThreadsEvent(IProxyDebugInfoThreadsEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugInfoThreadsEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugInitEvent(IProxyDebugInitEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugInitEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugMemoryInfoEvent(IProxyDebugMemoryInfoEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugMemoryInfoEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugOKEvent(IProxyDebugOKEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugOKEvent(e);
-		}
-	}
-	protected void fireProxyDebugPartialAIFEvent(IProxyDebugPartialAIFEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugPartialAIFEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugSetThreadSelectEvent(IProxyDebugSetThreadSelectEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugSetThreadSelectEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugSignalEvent(IProxyDebugSignalEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugSignalEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugSignalExitEvent(IProxyDebugSignalExitEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugSignalExitEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugSignalsEvent(IProxyDebugSignalsEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugSignalsEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugStackframeEvent(IProxyDebugStackframeEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugStackframeEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugStackInfoDepthEvent(IProxyDebugStackInfoDepthEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugStackInfoDepthEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugStepEvent(IProxyDebugStepEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugStepEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugSuspendEvent(IProxyDebugSuspendEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugSuspendEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugTypeEvent(IProxyDebugTypeEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugTypeEvent(e);
-		}
-	}
-
-	protected void fireProxyDebugVarsEvent(IProxyDebugVarsEvent e) {
-		IProxyDebugEventListener[] la = listeners.toArray(new IProxyDebugEventListener[0]);
-		for (IProxyDebugEventListener listener : la) {
-			listener.handleProxyDebugVarsEvent(e);
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/IProxyDebugClient.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/IProxyDebugClient.java
deleted file mode 100644
index ad83caa..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/IProxyDebugClient.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugEventListener;
-
-public interface IProxyDebugClient {
-	public void addProxyDebugEventListener(IProxyDebugEventListener listener);
-	public void removeProxyDebugEventListener(IProxyDebugEventListener listener);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugAIF.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugAIF.java
deleted file mode 100644
index 8a37aca..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugAIF.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-import org.eclipse.ptp.proxy.util.ProtocolUtil;
-
-
-public class ProxyDebugAIF {
-	private String	fds;
-	private String	description;
-	private byte[]	data;
-	
-	public ProxyDebugAIF(String fds, String data, String desc) {
-		this.fds = fds;
-		this.data = ProtocolUtil.decodeBytes(data);
-		this.description = desc;
-	}
-	
-	public String getFDS() {
-		return fds;
-	}
-	
-	public byte[] getData() {
-		return data;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugBreakpoint.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugBreakpoint.java
deleted file mode 100644
index 7e89d3f..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugBreakpoint.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.proxy.debug.client;
-
-public class ProxyDebugBreakpoint {
-	private String ignore; 
-	private String spec;
-	private String del;
-	private String type;
-	private ProxyDebugLineLocation loc;
-	
-	public ProxyDebugBreakpoint(String ignore, String spec, String del, 
-			String type, ProxyDebugLineLocation loc) {
-		this.ignore = ignore;
-		this.spec = spec;
-		this.del = del;
-		this.type = type;
-		this.loc = loc;
-	}
-
-	public String getIgnore() {
-		return ignore;
-	}
-	
-	public String getSpec() {
-		return spec;
-	}
-	
-	public String getDel() {
-		return del;
-	}
-	
-	public String getType() {
-		return type;
-	}
-	
-	public ProxyDebugLineLocation getLocation(){
-		return loc;
-	}
-	
-	public String toString() {
-		return getIgnore() + " " + getSpec() + " " + 
-			getDel() + " " + getType() + " " + getLocation().toString();	
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLineLocation.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLineLocation.java
deleted file mode 100644
index e0f6096..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLineLocation.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-public class ProxyDebugLineLocation {
-	private String	file;
-	private int		line;
-	
-	public ProxyDebugLineLocation(String file, String line) {
-		this.file = file;
-		this.line = Integer.parseInt(line);
-	}
-	
-	public String getFile() {
-		return file;
-	}
-	
-	public int getLineNumber() {
-		return line;
-	}
-
-	public String toString() {
-		return file + ":" + ":" + line;	 
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLocator.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLocator.java
deleted file mode 100644
index 89cc43d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugLocator.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.proxy.util.ProtocolUtil;
-
-public class ProxyDebugLocator {
-	private String		file;
-	private String		function;
-	private int			line;
-	private BigInteger	address;
-	
-	public ProxyDebugLocator(String file, String function, String line, String address) {
-		this.file = file;
-		this.function = function;
-		this.line = Integer.parseInt(line);
-		this.address = ProtocolUtil.decodeAddress(address);
-	}
-	
-	public String getFile() {
-		return file;
-	}
-	
-	public String getFunction() {
-		return function;
-	}
-
-	public int getLineNumber() {
-		return line;
-	}
-
-	public BigInteger getAddress() {
-		return address;
-	}
-	
-	public String toString() {
-		return file + ":" + function + ":" + line + ":" + address.toString();	 
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemory.java
deleted file mode 100644
index d06a23f..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemory.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-
-public class ProxyDebugMemory {
-	private String addr;
-	private String ascii;
-	private String[] data;
-	
-	public ProxyDebugMemory(String addr, String ascii, String[] data) {
-		this.addr = addr;
-		this.ascii = ascii;
-		this.data = data;
-	}
-	
-	public String getAddress() {
-		return addr;
-	}
-	
-	public String getAscii() {
-		return ascii;
-	}
-	
-	public String[] getData() {
-		return data;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemoryInfo.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemoryInfo.java
deleted file mode 100644
index c8fb588..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugMemoryInfo.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-public class ProxyDebugMemoryInfo {
-	private String addr;
-	private long nextRow;
-	private long prevRow;
-	private long nextPage;
-	private long prevPage;
-	private long numBytes;
-	private long totalBytes;
-	private ProxyDebugMemory[] memories;
-	
-	public ProxyDebugMemoryInfo(String addr, String nextRow, String prevRow, 
-			String nextPage, String prevPage, String numBytes, String totalBytes, 
-			ProxyDebugMemory[] memories) {
-		this.addr = addr;
-		this.nextRow = Long.parseLong(nextRow);
-		this.prevRow = Long.parseLong(prevRow);
-		this.nextPage = Long.parseLong(nextPage);
-		this.prevPage = Long.parseLong(prevPage);
-		this.numBytes = Long.parseLong(numBytes);
-		this.totalBytes = Long.parseLong(totalBytes);
-		this.memories = memories;
-	}
-	
-	public String getAddress() {
-		return addr;
-	}
-	
-	public long getNextRow() {
-		return nextRow;
-	}
-	
-	public long getPrevRow() {
-		return prevRow;
-	}
-	
-	public long getNextPage() {
-		return nextPage;
-	}
-	
-	public long getPrevPage() {
-		return prevPage;
-	}
-	
-	public long getNumBytes() {
-		return numBytes;
-	}
-	
-	public long getTotalBytes() {
-		return totalBytes;
-	}
-	
-	public ProxyDebugMemory[] getMemories() {
-		return memories;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugSignal.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugSignal.java
deleted file mode 100644
index 099d710..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugSignal.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.proxy.debug.client;
-
-/**
- * @author Clement chu
- */
-public class ProxyDebugSignal {
-	private String name;
-	private boolean stop;
-	private boolean pass;
-	private boolean print;
-	private String desc;
-	
-	public ProxyDebugSignal(String name, boolean stop, boolean print, 
-			boolean pass, String desc) {
-		this.name = name;
-		this.stop = stop;
-		this.print = print;
-		this.pass = pass;
-		this.desc = desc;
-	}
-
-	public String getName() {
-		return name;
-	}
-	public boolean isStop() {
-		return stop;
-	}
-	public boolean isPrint() {
-		return print;
-	}
-	public boolean isPass() {
-		return pass;
-	}
-	public String getDescription(){
-		return desc;
-	}
-	public String toString() {
-		return getName() + " " + isStop() + " " + 
-			isPrint() + " " + isPass() + " " + getDescription();	
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugStackFrame.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugStackFrame.java
deleted file mode 100644
index 21fa9d1..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/client/ProxyDebugStackFrame.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.client;
-
-
-public class ProxyDebugStackFrame {
-	private int					level;
-	private ProxyDebugLocator	loc;
-	
-	public ProxyDebugStackFrame(int level, ProxyDebugLocator loc) {
-		this.level = level;
-		this.loc = loc;
-	}
-	
-	public int getLevel() {
-		return this.level;
-	}
-	
-	public ProxyDebugLocator getLocator() {
-		return loc;
-	}
-	
-	public String toString() {
-		return getLevel() + " " + loc.toString();	 
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/AbstractProxyDebugCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/AbstractProxyDebugCommand.java
deleted file mode 100644
index 283e5d7..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/AbstractProxyDebugCommand.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-
-public abstract class AbstractProxyDebugCommand extends AbstractProxyCommand {
-	
-	public AbstractProxyDebugCommand(int eventID) {
-		super(eventID);
-	}
-
-	public AbstractProxyDebugCommand(int eventID, String bits) {
-		super(eventID);
-		addArgument(bits);
-	}
-
-	public AbstractProxyDebugCommand(int eventID, int transactionID, String[] args) {
-		super(eventID, transactionID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/IProxyDebugCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/IProxyDebugCommand.java
deleted file mode 100644
index 09a8c6a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/IProxyDebugCommand.java
+++ /dev/null

@@ -1,48 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-
-
-public interface IProxyDebugCommand extends IProxyCommand {
-
-	/*
-	 * Command IDs
-	 */
-	public static final int STARTSESSION = 1;
-	public static final int SETLINEBREAKPOINT = 2;
-	public static final int SETFUNCBREAKPOINT = 3;
-	public static final int DELETEBREAKPOINT = 4;
-	public static final int ENABLEBREAKPOINT = 5;
-	public static final int DISABLEBREAKPOINT = 6;
-	public static final int CONDITIONBREAKPOINT = 7;
-	public static final int BREAKPOINTAFTER = 8;
-	public static final int SETWATCHPOINT = 9;
-	public static final int GO = 10;
-	public static final int STEP = 11;
-	public static final int TERMINATE = 12;
-	public static final int INTERRUPT = 13;
-	public static final int LISTSTACKFRAMES = 14;
-	public static final int SETCURRENTSTACKFRAME = 15;
-	public static final int EVALUATEEXPRESSION = 16;
-	public static final int GETTYPE = 17;
-	public static final int LISTLOCALVARIABLES = 18;
-	public static final int LISTARGUMENTS = 19;
-	public static final int LISTGLOBALVARIABLES = 20;
-	public static final int LISTINFOTHREADS = 21;
-	public static final int SETTHREADSELECT = 22;
-	public static final int STACKINFODEPTH = 23;
-	public static final int DATAREADMEMORY = 24;
-	public static final int DATAWRITEMEMORY = 25;
-	public static final int LISTSIGNALS = 26;
-	/**
-	 * @deprecated
-	 */
-	public static final int SIGNALINFO = 27;
-	public static final int CLIHANDLE = 28;
-	/**
-	 * @deprecated
-	 */
-	public static final int DATAEVALUATEEXPRESSION = 29;
-	public static final int GETPARTIALAIF = 30;
-	public static final int VARIABLEDELETE = 31;
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugBreakpointAfterCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugBreakpointAfterCommand.java
deleted file mode 100644
index 3c0d490..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugBreakpointAfterCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugBreakpointAfterCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugBreakpointAfterCommand(String bits, 
-			int bpid, int icount) {
-		super(BREAKPOINTAFTER, bits);
-		addArgument(bpid);
-		addArgument(icount);
-	}
-	
-	public ProxyDebugBreakpointAfterCommand(int transID, String[] args) {
-		super(BREAKPOINTAFTER, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugCLICommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugCLICommand.java
deleted file mode 100644
index a3580c5..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugCLICommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugCLICommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugCLICommand(String bits, String arg) {
-		super(CLIHANDLE, bits);
-		addArgument(arg);
-	}
-	
-	public ProxyDebugCLICommand(int transID, String[] args) {
-		super(CLIHANDLE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugConditionBreakpointCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugConditionBreakpointCommand.java
deleted file mode 100644
index 4cbcfb5..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugConditionBreakpointCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugConditionBreakpointCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugConditionBreakpointCommand(String bits, 
-			int bpid, String expr) {
-		super(CONDITIONBREAKPOINT, bits);
-		addArgument(bpid);
-		addArgument(expr);
-	}
-	
-	public ProxyDebugConditionBreakpointCommand(int transID, String[] args) {
-		super(CONDITIONBREAKPOINT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataReadMemoryCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataReadMemoryCommand.java
deleted file mode 100644
index f2438d2..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataReadMemoryCommand.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugDataReadMemoryCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugDataReadMemoryCommand(String bits, long offset, String address, 
-			String format, int wordSize, int rows, int cols, Character asChar) {
-		super(DATAREADMEMORY, bits);
-		addArgument(offset);
-		addArgument(address);
-		addArgument(format);
-		addArgument(wordSize);
-		addArgument(rows);
-		addArgument(cols);
-		addArgument(asChar);
-	}
-	
-	public ProxyDebugDataReadMemoryCommand(int transID, String[] args) {
-		super(DATAREADMEMORY, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataWriteMemoryCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataWriteMemoryCommand.java
deleted file mode 100644
index f352c4b..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDataWriteMemoryCommand.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugDataWriteMemoryCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugDataWriteMemoryCommand(String bits, 
-			long offset, String address, String format, int wordSize, String value) {
-		super(DATAWRITEMEMORY, bits);
-		addArgument(offset);
-		addArgument(address);
-		addArgument(format);
-		addArgument(wordSize);
-		addArgument(value);
-	}
-	
-	public ProxyDebugDataWriteMemoryCommand(int transID, String[] args) {
-		super(DATAWRITEMEMORY, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDeleteBreakpointCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDeleteBreakpointCommand.java
deleted file mode 100644
index f9d87ad..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDeleteBreakpointCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugDeleteBreakpointCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugDeleteBreakpointCommand(String bits, int bpid) {
-		super(DELETEBREAKPOINT, bits);
-		addArgument(bpid);
-	}
-	
-	public ProxyDebugDeleteBreakpointCommand(int transID, String[] args) {
-		super(DELETEBREAKPOINT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDisableBreakpointCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDisableBreakpointCommand.java
deleted file mode 100644
index 426c796..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugDisableBreakpointCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugDisableBreakpointCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugDisableBreakpointCommand(String bits, int bpid) {
-		super(DISABLEBREAKPOINT, bits);
-		addArgument(bpid);
-	}
-	
-	public ProxyDebugDisableBreakpointCommand(int transID, String[] args) {
-		super(DISABLEBREAKPOINT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEnableBreakpointCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEnableBreakpointCommand.java
deleted file mode 100644
index e9e7199..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEnableBreakpointCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugEnableBreakpointCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugEnableBreakpointCommand(String bits, int bpid) {
-		super(ENABLEBREAKPOINT, bits);
-		addArgument(bpid);
-	}
-	
-	public ProxyDebugEnableBreakpointCommand(int transID, String[] args) {
-		super(ENABLEBREAKPOINT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEvaluateExpressionCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEvaluateExpressionCommand.java
deleted file mode 100644
index 8211d93..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugEvaluateExpressionCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugEvaluateExpressionCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugEvaluateExpressionCommand(String bits, String expr) {
-		super(EVALUATEEXPRESSION, bits);
-		addArgument(expr);
-	}
-	
-	public ProxyDebugEvaluateExpressionCommand(int transID, String[] args) {
-		super(EVALUATEEXPRESSION, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetPartialAIFCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetPartialAIFCommand.java
deleted file mode 100644
index ffddace..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetPartialAIFCommand.java
+++ /dev/null

@@ -1,17 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugGetPartialAIFCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugGetPartialAIFCommand(String bits, String name, String key, boolean listChildren, boolean express) {
-		super(GETPARTIALAIF, bits);
-		addArgument(name);
-		addArgument(key);
-		addArgument(listChildren);
-		addArgument(express);
-	}
-	
-	public ProxyDebugGetPartialAIFCommand(int transID, String[] args) {
-		super(GETPARTIALAIF, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetTypeCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetTypeCommand.java
deleted file mode 100644
index 3825279..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGetTypeCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugGetTypeCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugGetTypeCommand(String bits, String expr) {
-		super(GETTYPE, bits);
-		addArgument(expr);
-	}
-	
-	public ProxyDebugGetTypeCommand(int transID, String[] args) {
-		super(GETTYPE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGoCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGoCommand.java
deleted file mode 100644
index 4aec732..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugGoCommand.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugGoCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugGoCommand(String bits) {
-		super(GO, bits);
-	}
-	
-	public ProxyDebugGoCommand(int transID, String[] args) {
-		super(GO, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugInterruptCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugInterruptCommand.java
deleted file mode 100644
index 4d67e64..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugInterruptCommand.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugInterruptCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugInterruptCommand(String bits) {
-		super(INTERRUPT, bits);
-	}
-	
-	public ProxyDebugInterruptCommand(int transID, String[] args) {
-		super(INTERRUPT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListArgumentsCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListArgumentsCommand.java
deleted file mode 100644
index ea40ca8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListArgumentsCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugListArgumentsCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugListArgumentsCommand(String bits, 
-			int low, int high) {
-		super(LISTARGUMENTS, bits);
-		addArgument(low);
-		addArgument(high);
-	}
-	
-	public ProxyDebugListArgumentsCommand(int transID, String[] args) {
-		super(LISTARGUMENTS, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListGlobalVariablesCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListGlobalVariablesCommand.java
deleted file mode 100644
index 5842912..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListGlobalVariablesCommand.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugListGlobalVariablesCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugListGlobalVariablesCommand(String bits) {
-		super(LISTGLOBALVARIABLES, bits);
-	}
-	
-	public ProxyDebugListGlobalVariablesCommand(int transID, String[] args) {
-		super(LISTGLOBALVARIABLES, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListInfoThreadsCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListInfoThreadsCommand.java
deleted file mode 100644
index 71823aa..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListInfoThreadsCommand.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugListInfoThreadsCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugListInfoThreadsCommand(String bits) {
-		super(LISTINFOTHREADS, bits);
-	}
-	
-	public ProxyDebugListInfoThreadsCommand(int transID, String[] args) {
-		super(LISTINFOTHREADS, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListLocalVariablesCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListLocalVariablesCommand.java
deleted file mode 100644
index 30d81ae..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListLocalVariablesCommand.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugListLocalVariablesCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugListLocalVariablesCommand(String bits) {
-		super(LISTLOCALVARIABLES, bits);
-	}
-	
-	public ProxyDebugListLocalVariablesCommand(int transID, String[] args) {
-		super(LISTLOCALVARIABLES, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListSignalsCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListSignalsCommand.java
deleted file mode 100644
index 2bff7b7..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListSignalsCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugListSignalsCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugListSignalsCommand(String bits, String name) {
-		super(LISTSIGNALS, bits);
-		addArgument(name);
-	}
-	
-	public ProxyDebugListSignalsCommand(int transID, String[] args) {
-		super(LISTSIGNALS, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListStackframesCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListStackframesCommand.java
deleted file mode 100644
index 08071fd..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugListStackframesCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugListStackframesCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugListStackframesCommand(String bits, 
-			int low, int high) {
-		super(LISTSTACKFRAMES, bits);
-		addArgument(low);
-		addArgument(high);
-	}
-	
-	public ProxyDebugListStackframesCommand(int transID, String[] args) {
-		super(LISTSTACKFRAMES, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetCurrentStackframeCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetCurrentStackframeCommand.java
deleted file mode 100644
index d3aa9ae..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetCurrentStackframeCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugSetCurrentStackframeCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugSetCurrentStackframeCommand(String bits, int level) {
-		super(SETCURRENTSTACKFRAME, bits);
-		addArgument(level);
-	}
-	
-	public ProxyDebugSetCurrentStackframeCommand(int transID, String[] args) {
-		super(SETCURRENTSTACKFRAME, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetFunctionBreakpointCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetFunctionBreakpointCommand.java
deleted file mode 100644
index 4ffe05d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetFunctionBreakpointCommand.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugSetFunctionBreakpointCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugSetFunctionBreakpointCommand(String bits, 
-			int bpid, boolean isTemporary, boolean isHardware, String file, String func, 
-			String expression, int ignoreCount, int tid) {
-		super(SETFUNCBREAKPOINT, bits);
-		addArgument(bpid);
-		addArgument(isTemporary);
-		addArgument(isHardware);
-		addArgument(file);
-		addArgument(func);
-		addArgument(expression);
-		addArgument(ignoreCount);
-		addArgument(tid);
-	}
-	
-	public ProxyDebugSetFunctionBreakpointCommand(int transID, String[] args) {
-		super(SETFUNCBREAKPOINT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetLineBreakpointCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetLineBreakpointCommand.java
deleted file mode 100644
index 7a110b0..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetLineBreakpointCommand.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugSetLineBreakpointCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugSetLineBreakpointCommand(String bits, 
-			int bpid, boolean isTemporary, boolean isHardware, String file, int line, 
-			String expression, int ignoreCount, int tid) {
-		super(SETLINEBREAKPOINT, bits);
-		addArgument(bpid);
-		addArgument(isTemporary);
-		addArgument(isHardware);
-		addArgument(file);
-		addArgument(line);
-		addArgument(expression);
-		addArgument(ignoreCount);
-		addArgument(tid);
-	}
-	
-	public ProxyDebugSetLineBreakpointCommand(int transID, String[] args) {
-		super(SETLINEBREAKPOINT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetThreadSelectCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetThreadSelectCommand.java
deleted file mode 100644
index e85092c..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetThreadSelectCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugSetThreadSelectCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugSetThreadSelectCommand(String bits, int thread) {
-		super(SETTHREADSELECT, bits);
-		addArgument(thread);
-	}
-	
-	public ProxyDebugSetThreadSelectCommand(int transID, String[] args) {
-		super(SETTHREADSELECT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetWatchpointCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetWatchpointCommand.java
deleted file mode 100644
index 10802f2..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSetWatchpointCommand.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugSetWatchpointCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugSetWatchpointCommand(String bits, 
-			int bpid, String expression, boolean isAccess, boolean isRead, String condition, 
-			int ignoreCount) {
-		super(SETWATCHPOINT, bits);
-		addArgument(bpid);
-		addArgument(expression);
-		addArgument(isAccess);
-		addArgument(isRead);
-		addArgument(condition);
-		addArgument(ignoreCount);
-	}
-	
-	public ProxyDebugSetWatchpointCommand(int transID, String[] args) {
-		super(SETWATCHPOINT, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSignalInfoCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSignalInfoCommand.java
deleted file mode 100644
index 724eb2e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugSignalInfoCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-/**
- * @deprecated
- */
-public class ProxyDebugSignalInfoCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugSignalInfoCommand(String bits, String arg) {
-		super(SIGNALINFO, bits);
-		addArgument(arg);
-	}
-	
-	public ProxyDebugSignalInfoCommand(int transID, String[] args) {
-		super(SIGNALINFO, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStackInfoDepthCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStackInfoDepthCommand.java
deleted file mode 100644
index e7f99d8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStackInfoDepthCommand.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugStackInfoDepthCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugStackInfoDepthCommand(String bits) {
-		super(STACKINFODEPTH, bits);
-	}
-	
-	public ProxyDebugStackInfoDepthCommand(int transID, String[] args) {
-		super(STACKINFODEPTH, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStartSessionCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStartSessionCommand.java
deleted file mode 100644
index 5338271..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStartSessionCommand.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugStartSessionCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugStartSessionCommand(String prog, String path, 
-			String dir, String[] args) {
-		super(STARTSESSION);
-		addArgument(prog);
-		addArgument(path);
-		addArgument(dir);
-		addArguments(args);
-	}
-	
-	public ProxyDebugStartSessionCommand(int transID, String[] args) {
-		super(STARTSESSION, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStepCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStepCommand.java
deleted file mode 100644
index b542dc5..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugStepCommand.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugStepCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugStepCommand(String bits, 
-			int count, int type) {
-		super(STEP, bits);
-		addArgument(count);
-		addArgument(type);
-	}
-	
-	public ProxyDebugStepCommand(int transID, String[] args) {
-		super(STEP, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugTerminateCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugTerminateCommand.java
deleted file mode 100644
index fcb7c25..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugTerminateCommand.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugTerminateCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugTerminateCommand(String bits) {
-		super(TERMINATE, bits);
-	}
-	
-	public ProxyDebugTerminateCommand(int transID, String[] args) {
-		super(TERMINATE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugVariableDeleteCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugVariableDeleteCommand.java
deleted file mode 100644
index 506713e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/command/ProxyDebugVariableDeleteCommand.java
+++ /dev/null

@@ -1,14 +0,0 @@
-package org.eclipse.ptp.proxy.debug.command;
-
-
-public class ProxyDebugVariableDeleteCommand extends AbstractProxyDebugCommand implements IProxyDebugCommand {
-	
-	public ProxyDebugVariableDeleteCommand(String bits, String name) {
-		super(VARIABLEDELETE, bits);
-		addArgument(name);
-	}
-	
-	public ProxyDebugVariableDeleteCommand(int transID, String[] args) {
-		super(VARIABLEDELETE, transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugEvent.java
deleted file mode 100644
index 8944ddd..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugEvent.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-
-public abstract class AbstractProxyDebugEvent extends AbstractProxyEvent implements IProxyDebugEvent {
-	private String	bits;
-	
-	public AbstractProxyDebugEvent(int transID, int id, String bits) {
-		super(id, transID);
-		this.bits = bits;
-	}
-	
-	public String getBitSet() {
-		return bits;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugSuspendEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugSuspendEvent.java
deleted file mode 100644
index f8eb17e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/AbstractProxyDebugSuspendEvent.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-
-public abstract class AbstractProxyDebugSuspendEvent extends AbstractProxyDebugEvent implements IProxyDebugEvent {
-	private int	thread_id = 0;
-	private ProxyDebugStackFrame frame;
-	private String[] changed_vars;
-	private int depth = 0;
-
-	public AbstractProxyDebugSuspendEvent(int transID, String set, ProxyDebugStackFrame frame, int tid, int depth, String[] vars) {
-		super(EVENT_DBG_SUSPEND, transID, set);
-		this.frame = frame;
-		this.thread_id = tid;
-		this.depth = depth;
-		this.changed_vars = vars;
-	}
-	
-	public int getThreadId() {
-		return this.thread_id;
-	}
-	
-	public ProxyDebugStackFrame getFrame() {
-		return this.frame;
-	}
-	
-	public String[] getChangedVars() {
-		return this.changed_vars;
-	}
-
-	public int getDepth() {
-		return this.depth;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugArgsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugArgsEvent.java
deleted file mode 100644
index 5c9e099..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugArgsEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugArgsEvent extends IProxyDebugEvent {
-	public String[] getVariables();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointHitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointHitEvent.java
deleted file mode 100644
index 649b306..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointHitEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugBreakpointHitEvent extends IProxyDebugSuspendEvent {
-	public int getBreakpointId();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointSetEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointSetEvent.java
deleted file mode 100644
index 4360f8e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugBreakpointSetEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugBreakpoint;
-
-public interface IProxyDebugBreakpointSetEvent extends IProxyDebugEvent {
-	public int getBreakpointId();
-	public ProxyDebugBreakpoint getBreakpoint();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataEvent.java
deleted file mode 100644
index cae0979..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataEvent.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-
-public interface IProxyDebugDataEvent extends IProxyDebugEvent {
-	public ProxyDebugAIF getData();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataExpValueEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataExpValueEvent.java
deleted file mode 100644
index f3375f7..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugDataExpValueEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugDataExpValueEvent extends IProxyDebugEvent {
-	public String getValue();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugErrorEvent.java
deleted file mode 100644
index 8215e6a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugErrorEvent.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugErrorEvent extends IProxyDebugEvent {
-	public int getErrorCode();
-	public String getErrorMessage();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEvent.java
deleted file mode 100644
index 6a8b2df..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEvent.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.event.IProxyExtendedEvent;
-
-public interface IProxyDebugEvent extends IProxyExtendedEvent {
-	public static final int DBG_EVENT_OFFSET = 100;
-	public static final int EVENT_DBG_EXIT = DBG_EVENT_OFFSET + 2;
-	public static final int 	EVENT_DBG_EXIT_NORMAL = 0;
-	public static final int 	EVENT_DBG_EXIT_SIGNAL = 1;
-	public static final int EVENT_DBG_BPSET = DBG_EVENT_OFFSET + 4;
-	public static final int EVENT_DBG_FRAMES = DBG_EVENT_OFFSET + 5;
-	public static final int EVENT_DBG_DATA = DBG_EVENT_OFFSET + 6;
-	public static final int EVENT_DBG_TYPE = DBG_EVENT_OFFSET + 7;
-	public static final int EVENT_DBG_VARS = DBG_EVENT_OFFSET + 8;
-	public static final int EVENT_DBG_ARGS = DBG_EVENT_OFFSET + 9;
-	/**
-	 * @deprecated
-	 */
-	public static final int EVENT_DBG_INIT = DBG_EVENT_OFFSET + 10;
-	public static final int EVENT_DBG_OK = DBG_EVENT_OFFSET + 11;
-	public static final int EVENT_DBG_ERROR = DBG_EVENT_OFFSET + 12;
-	public static final int EVENT_DBG_SUSPEND = DBG_EVENT_OFFSET + 13;
-	public static final int 	EVENT_DBG_SUSPEND_BPHIT = 0;
-	public static final int 	EVENT_DBG_SUSPEND_SIGNAL = 1;
-	public static final int 	EVENT_DBG_SUSPEND_STEP = 2;
-	public static final int 	EVENT_DBG_SUSPEND_INT = 3;
-	public static final int EVENT_DBG_THREADS	= DBG_EVENT_OFFSET + 14;
-	public static final int EVENT_DBG_THREAD_SELECT = DBG_EVENT_OFFSET + 15;
-	public static final int EVENT_DBG_STACK_INFO_DEPTH = DBG_EVENT_OFFSET + 16;
-	public static final int EVENT_DBG_DATA_READ_MEMORY = DBG_EVENT_OFFSET + 17;
-	public static final int EVENT_DBG_DATA_WRITE_MEMORY = DBG_EVENT_OFFSET + 18;
-	public static final int EVENT_DBG_SIGNALS = DBG_EVENT_OFFSET + 19;
-	/**
-	 * @deprecated
-	 */
-	public static final int EVENT_DBG_DATA_EVA_EX = DBG_EVENT_OFFSET + 20;
-	public static final int EVENT_DBG_PARTIAL_AIF = DBG_EVENT_OFFSET + 21;
-
-	public String getBitSet();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventFactory.java
deleted file mode 100644
index a738665..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventFactory.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.event.IProxyEventFactory;
-
-public interface IProxyDebugEventFactory extends IProxyEventFactory {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventListener.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventListener.java
deleted file mode 100644
index e884e6c..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugEventListener.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugEventListener {
-	public void handleProxyDebugArgsEvent(IProxyDebugArgsEvent e);
-	public void handleProxyDebugBreakpointHitEvent(IProxyDebugBreakpointHitEvent e);
-	public void handleProxyDebugBreakpointSetEvent(IProxyDebugBreakpointSetEvent e);
-	public void handleProxyDebugDataEvent(IProxyDebugDataEvent e);
-	public void handleProxyDebugDataExpValueEvent(IProxyDebugDataExpValueEvent e);
-	public void handleProxyDebugExitEvent(IProxyDebugExitEvent e);
-	public void handleProxyDebugErrorEvent(IProxyDebugErrorEvent e);
-	public void handleProxyDebugInfoThreadsEvent(IProxyDebugInfoThreadsEvent e);
-	public void handleProxyDebugInitEvent(IProxyDebugInitEvent e);
-	public void handleProxyDebugMemoryInfoEvent(IProxyDebugMemoryInfoEvent e);
-	public void handleProxyDebugOKEvent(IProxyDebugOKEvent e);
-	public void handleProxyDebugPartialAIFEvent(IProxyDebugPartialAIFEvent e);
-	public void handleProxyDebugSetThreadSelectEvent(IProxyDebugSetThreadSelectEvent e);
-	public void handleProxyDebugSignalEvent(IProxyDebugSignalEvent e);
-	public void handleProxyDebugSignalExitEvent(IProxyDebugSignalExitEvent e);
-	public void handleProxyDebugSignalsEvent(IProxyDebugSignalsEvent e);
-	public void handleProxyDebugStackframeEvent(IProxyDebugStackframeEvent e);
-	public void handleProxyDebugStackInfoDepthEvent(IProxyDebugStackInfoDepthEvent e);
-	public void handleProxyDebugStepEvent(IProxyDebugStepEvent e);
-	public void handleProxyDebugSuspendEvent(IProxyDebugSuspendEvent e);
-	public void handleProxyDebugTypeEvent(IProxyDebugTypeEvent e);
-	public void handleProxyDebugVarsEvent(IProxyDebugVarsEvent e);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugExitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugExitEvent.java
deleted file mode 100644
index b70e842..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugExitEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugExitEvent extends IProxyDebugEvent {
-	public int getExitStatus();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInfoThreadsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInfoThreadsEvent.java
deleted file mode 100644
index 43df862..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInfoThreadsEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugInfoThreadsEvent extends IProxyDebugEvent {
-	public String[] getThreadIds();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInitEvent.java
deleted file mode 100644
index 4ec3a62..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugInitEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugInitEvent extends IProxyDebugEvent {
-	public int getNumServers();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugMemoryInfoEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugMemoryInfoEvent.java
deleted file mode 100644
index 0acd9c9..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugMemoryInfoEvent.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugMemoryInfo;
-
-
-/**
- * @author clement chu
- *
- */
-public interface IProxyDebugMemoryInfoEvent extends IProxyDebugEvent {
-	public ProxyDebugMemoryInfo getMemoryInfo();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugOKEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugOKEvent.java
deleted file mode 100644
index d1f00d2..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugOKEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugOKEvent extends IProxyDebugEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugPartialAIFEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugPartialAIFEvent.java
deleted file mode 100644
index 77db60a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugPartialAIFEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-
-public interface IProxyDebugPartialAIFEvent extends IProxyDebugEvent {
-	public ProxyDebugAIF getData();
-	public String getName();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSetThreadSelectEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSetThreadSelectEvent.java
deleted file mode 100644
index 1c54f68..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSetThreadSelectEvent.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-
-public interface IProxyDebugSetThreadSelectEvent extends IProxyDebugEvent {
-	public ProxyDebugStackFrame getFrame();
-	public int getThreadId();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalEvent.java
deleted file mode 100644
index 0ef4449..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalEvent.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugSignalEvent extends IProxyDebugSuspendEvent {
-	public String getSignalName();
-	public String getSignalMeaning();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalExitEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalExitEvent.java
deleted file mode 100644
index 2e8efed..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalExitEvent.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugSignalExitEvent extends IProxyDebugEvent {
-	public String getSignalName();
-	public String getSignalMeaning();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalsEvent.java
deleted file mode 100644
index f022100..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSignalsEvent.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugSignal;
-
-public interface IProxyDebugSignalsEvent extends IProxyDebugEvent {
-	public ProxyDebugSignal[] getSignals();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackInfoDepthEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackInfoDepthEvent.java
deleted file mode 100644
index 034a0b0..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackInfoDepthEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugStackInfoDepthEvent extends IProxyDebugEvent {
-	public int getDepth();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackframeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackframeEvent.java
deleted file mode 100644
index a22429a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStackframeEvent.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-
-public interface IProxyDebugStackframeEvent extends IProxyDebugEvent {
-	public ProxyDebugStackFrame[] getFrames();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStepEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStepEvent.java
deleted file mode 100644
index 40df616..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugStepEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-
-public interface IProxyDebugStepEvent extends IProxyDebugSuspendEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSuspendEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSuspendEvent.java
deleted file mode 100644
index e1c45f6..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugSuspendEvent.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.proxy.debug.event;
-
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-
-public interface IProxyDebugSuspendEvent extends IProxyDebugEvent {
-	public int getThreadId();
-	public String[] getChangedVars();
-	int getDepth();
-	ProxyDebugStackFrame getFrame();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugTypeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugTypeEvent.java
deleted file mode 100644
index 40e8484..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugTypeEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugTypeEvent extends IProxyDebugEvent {
-	public String getType();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugVarsEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugVarsEvent.java
deleted file mode 100644
index 62767bd..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/debug/event/IProxyDebugVarsEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.debug.event;
-
-public interface IProxyDebugVarsEvent extends IProxyDebugEvent {
-	public String[] getVariables();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEvent.java
deleted file mode 100644
index 4744c2a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEvent.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public abstract class AbstractProxyEvent implements IProxyEvent {
-	private int			eventID;
-	private int			transactionID;
-	private String[]	attributes;
-	
-	public AbstractProxyEvent(int eventID, int transactionID, String[] attrs) {
-		this.eventID		= eventID;
-		this.transactionID	= transactionID;
-		this.attributes		= attrs;
-	}
-	
-	public AbstractProxyEvent(int eventID, int transactionID) {
-		this(eventID, transactionID, null);
-	}
-	
-	public int getEventID() {
-		return eventID;
-	}
-
-	public int getTransactionID() {
-		return transactionID;
-	}
-	
-	public String[] getAttributes() {
-		return attributes;
-	}
-
-	public String toString() {
-		String str = eventID + " transid=" + getTransactionID();
-		if (attributes != null) {
-			str += " (";
-			for (int i = 0 ; i < attributes.length; i++) {
-				if (i > 0)
-					str += ",";
-				str += attributes[i];
-			}
-			str += ")";
-		}
-		return str;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEventFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEventFactory.java
deleted file mode 100644
index b436299..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/AbstractProxyEventFactory.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-
-public abstract class AbstractProxyEventFactory implements IProxyEventFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventFactory#toEvent(org.eclipse.ptp.proxy.packet.ProxyPacket)
-	 */
-	public abstract IProxyEvent toEvent(ProxyPacket packet);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyConnectedEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyConnectedEvent.java
deleted file mode 100644
index e7f46bd..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyConnectedEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyConnectedEvent extends IProxyEvent {
-// EMPTY
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyDisconnectedEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyDisconnectedEvent.java
deleted file mode 100644
index 4e913e2..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyDisconnectedEvent.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyDisconnectedEvent extends IProxyEvent {
-
-	boolean wasError();
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyErrorEvent.java
deleted file mode 100644
index 8e1f69c..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyErrorEvent.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyErrorEvent extends IProxyEvent {
-	public static final String ERROR_CODE_ATTR = "errorCode";
-	public static final String ERROR_MESSAGE_ATTR = "errorMsg";
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEvent.java
deleted file mode 100644
index cb67038..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEvent.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyEvent {
-	public static final int OK = 0;
-	public static final int MESSAGE = 1;
-	public static final int CONNECTED = 2;
-	public static final int DISCONNECTED = 3;
-	public static final int TIMEOUT = 4;
-	public static final int ERROR = 5;
-	public static final int SHUTDOWN = 6;
-		
-	/**
-	 * Get the event ID (type)
-	 * 
-	 * @return event ID
-	 */
-	public int getEventID();
-	
-	/**
-	 * Get the transaction ID
-	 * 
-	 * @return transaction ID
-	 */
-	public int getTransactionID();
-	
-	/**
-	 * Get the event attributes
-	 * @return event attributes
-	 */
-	public String[] getAttributes();
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventFactory.java
deleted file mode 100644
index d48bd4a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventFactory.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public interface IProxyEventFactory {
-	public IProxyEvent toEvent(ProxyPacket packet);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventHandler.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventHandler.java
deleted file mode 100644
index 8c55d9a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventHandler.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package org.eclipse.ptp.proxy.event;
-
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-
-/**
- * @deprecated
- */
-public interface IProxyEventHandler {
-
-	/**
-	 * Handle (process) the given event.
-	 * 
-	 * @param event - the event to process
-	 */
-	public abstract void handleEvent(IProxyCommand command, IProxyEvent event);
-
-}
-

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventListener.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventListener.java
deleted file mode 100644
index 7b304d0..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyEventListener.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyEventListener {
-
-	/**
-	 * Handler for connected events.
-	 * 
-	 * @param e event to handle
-	 */
-	public void handleEvent(IProxyConnectedEvent e);
-	
-	/**
-	 * Handler for disconnected events.
-	 * 
-	 * @param e event to handle
-	 */
-	public void handleEvent(IProxyDisconnectedEvent e);
-	
-	/**
-	 * Handler for error events.
-	 * 
-	 * @param e event to handle
-	 */
-	public void handleEvent(IProxyErrorEvent e);
-	
-	/**
-	 * Handler for extended events.
-	 * 
-	 * @param e event to handle
-	 */
-	public void handleEvent(IProxyExtendedEvent e);
-
-	/**
-	 * Handler for message events.
-	 * 
-	 * @param e event to handle
-	 */
-	public void handleEvent(IProxyMessageEvent e);
-	
-	/**
-	 * Handler for OK events.
-	 * 
-	 * @param e event to handle
-	 */
-	public void handleEvent(IProxyOKEvent e);
-	
-	/**
-	 * Handler for timeout events.
-	 * 
-	 * @param e event to handle
-	 */
-	public void handleEvent(IProxyTimeoutEvent e);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyExtendedEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyExtendedEvent.java
deleted file mode 100644
index b9cfe54..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyExtendedEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyExtendedEvent extends IProxyEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyMessageEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyMessageEvent.java
deleted file mode 100644
index a6d7013..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyMessageEvent.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyMessageEvent extends IProxyEvent {
-	public enum Level {
-		FATAL,
-		ERROR,
-		WARNING,
-		INFO,
-		DEBUG,
-		UNDEFINED
-	};
-	
-	public static final String LEVEL_ATTR = "messageLevel";
-	public static final String CODE_ATTR = "messageCode";
-	public static final String TEXT_ATTR = "messageText";
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyOKEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyOKEvent.java
deleted file mode 100644
index e4d0a9f..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyOKEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyOKEvent extends IProxyEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyShutdownEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyShutdownEvent.java
deleted file mode 100644
index 6c23a9d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyShutdownEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyShutdownEvent extends IProxyEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyTimeoutEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyTimeoutEvent.java
deleted file mode 100644
index 6125291..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/IProxyTimeoutEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-public interface IProxyTimeoutEvent extends IProxyEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/ProxyEventFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/ProxyEventFactory.java
deleted file mode 100644
index 5d4dc1d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/event/ProxyEventFactory.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.event;
-
-import org.eclipse.ptp.internal.proxy.event.ProxyErrorEvent;
-import org.eclipse.ptp.internal.proxy.event.ProxyMessageEvent;
-import org.eclipse.ptp.internal.proxy.event.ProxyOKEvent;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public class ProxyEventFactory extends AbstractProxyEventFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.event.AbstractProxyEventFactory#toEvent(org.eclipse.ptp.proxy.packet.ProxyPacket)
-	 */
-	public IProxyEvent toEvent(ProxyPacket packet) {
-		IProxyEvent evt = null;
-
-		switch (packet.getID()) {
-		case IProxyEvent.OK:
-			evt = new ProxyOKEvent(packet.getTransID());
-			break;
-			
-		case IProxyEvent.MESSAGE:
-			evt = new ProxyMessageEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyEvent.ERROR:
-			evt = new ProxyErrorEvent(packet.getTransID(), packet.getArgs());
-			break;
-		}
-
-		return evt;
-	}
-	
-	public static IProxyOKEvent newOKEvent(int transID) {
-		return new ProxyOKEvent(transID);
-	}
-	
-	public static IProxyErrorEvent newErrorEvent(int transID, int code, String message) {
-		String[] args = new String[] {
-				IProxyErrorEvent.ERROR_CODE_ATTR + "=" + code, 
-				IProxyErrorEvent.ERROR_MESSAGE_ATTR + "=" + message
-		};
-		
-		return new ProxyErrorEvent(transID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/packet/ProxyPacket.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/packet/ProxyPacket.java
deleted file mode 100644
index b16e1a4..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/packet/ProxyPacket.java
+++ /dev/null

@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.packet;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-import org.eclipse.ptp.proxy.util.ProtocolUtil;
-
-public class ProxyPacket {
-	public static final int PACKET_LENGTH_SIZE = 8;
-	public static final int PACKET_CHANNEL_SIZE = 2;
-	public static final int PACKET_ID_SIZE = 4;
-	public static final int PACKET_TRANS_ID_SIZE = 8;
-	public static final int PACKET_NARGS_SIZE = 8;
-	public static final int PACKET_ARG_LEN_SIZE = 8;
-
-	private boolean debug = false;
-	
-	private int packetID;
-	private int packetTransID;
-	private String[] packetArgs;
-
-	private Charset			charset = Charset.forName("US-ASCII");
-	private CharsetEncoder	encoder = charset.newEncoder();
-	private CharsetDecoder	decoder = charset.newDecoder();
-
-	public ProxyPacket() {
-	}
-	
-	public ProxyPacket(IProxyCommand cmd) {
-		this.packetID = cmd.getCommandID();
-		this.packetTransID = cmd.getTransactionID();
-		this.packetArgs = cmd.getArguments();
-	}
-
-	public ProxyPacket(IProxyEvent event) {
-		this.packetID = event.getEventID();
-		this.packetTransID = event.getTransactionID();
-		this.packetArgs = event.getAttributes();
-	}
-
-	/**
-	 * Character set decoder
-	 * 
-	 * @return decoder
-	 */
-	public CharsetDecoder decoder() {
-		return decoder;
-	}
-	
-	/**
-	 * Character set encoder
-	 * 
-	 * @return encoder
-	 */
-	public CharsetEncoder encoder() {
-		return encoder;
-	}
-	
-	/**
-	 * Get the arguments
-	 * 
-	 * @return arguments
-	 */
-	public String[] getArgs() {
-		return packetArgs;
-	}
-
-	/**
-	 * Get the packet type
-	 * 
-	 * @return packet type
-	 */
-	public int getID() {
-		return packetID;
-	}
-	
-	/**
-	 * Get the transaction ID for this packet
-	 * 
-	 * @return transaction ID
-	 */
-	public int getTransID() {
-		return packetTransID;
-	}
-	
-	/**
-	 * Process packets from the wire. Each packet comprises a length, header and a body 
-	 * formatted as follows:
-	 * 
-	 * LENGTH HEADER BODY
-	 * 
-	 * where:
-	 * 
-	 * LENGTH	is an PACKET_LENGTH_SIZE hexadecimal number representing
-	 * 			the total length of the HEADER and BODY sections.
-	 * 
-	 * HEADER consists of the following fields:
-	 * 
-	 * ' ' CMD_ID ':' TRANS_ID ':' NUM_ARGS
-	 * 
-	 * where:
-	 * 
-	 * CMD_ID	is an PACKET_ID_SIZE hexadecimal number representing
-	 * 			the type of this command.
-	 * TRANS_ID	is an PACKET_TRANS_ID_SIZE hexadecimal number representing
-	 * 			the transaction ID of the command.
-	 * NUM_ARGS	is an PACKET_ARGS_LEN_SIZE hexadecimal number representing
-	 * 			the number of arguments. 
-	 * 
-	 * The command body is formatted as a list of NUM_ARGS string arguments, each 
-	 * preceded by a space (0x20) characters as follows:
-	 * 	
-	 * ' ' LENGTH ':' BYTES ... ' ' LENGTH ':' BYTES
-	 * 
-	 * where:
-	 * 
-	 * LENGTH	is an PACKET_ARGS_LEN_SIZE hexadecimal number representing
-	 * 			the length of the string.
-	 * BYTES	are LENGTH bytes of the string. Any characters are permitted, 
-	 * 			including spaces
-	 * 	
-	 * @return	false if a protocol error occurs
-	 * @throws	IOException if the connection is terminated (read returns < 0)
-	 * 		
-	 */
-	public boolean read(ReadableByteChannel channel) throws IOException {
-		/*
-		 * First EVENT_LENGTH_SIZE bytes are the length of the event
-		 */
-		ByteBuffer lengthBytes = ByteBuffer.allocate(PACKET_LENGTH_SIZE);
-		fullRead(channel, lengthBytes);
-		CharBuffer len_str = decoder.decode(lengthBytes);
-		
-		if (debug) {
-			System.out.print("RECEIVE:[" + len_str);
-		}
-	
-		int len;
-		try {
-			len = Integer.parseInt(len_str.subSequence(0, PACKET_LENGTH_SIZE).toString(), 16);
-		} catch (NumberFormatException e) {
-			if (debug) {
-				System.out.println("] BAD PACKET LENGTH");
-			} else {
-				System.out.println("BAD PACKET LENGTH: \"" + len_str + "\"");
-			}
-			throw new IOException("Bad packet length format");
-		}
-		
-		/*
-		 * Read len bytes of rest of packet
-		 */
-		ByteBuffer packetBytes = ByteBuffer.allocate(len);
-		fullRead(channel, packetBytes);
-		CharBuffer packetBuf = decoder.decode(packetBytes);
-		
-		if (debug) {
-			System.out.println(packetBuf + "]");
-		}
-
-		/*
-		 * Extract transaction ID and event type
-		 */
-		
-		int idStart = 1; // Skip ' '
-		int idEnd = idStart + PACKET_ID_SIZE;
-		int transStart = idEnd + 1; // Skip ':'
-		int transEnd = transStart + PACKET_TRANS_ID_SIZE;
-		int numArgsStart = transEnd + 1; // Skip ':'
-		int numArgsEnd = numArgsStart + PACKET_NARGS_SIZE;
-		
-		try {
-			packetID = Integer.parseInt(packetBuf.subSequence(idStart, idEnd).toString(), 16);
-			packetTransID = Integer.parseInt(packetBuf.subSequence(transStart, transEnd).toString(), 16);
-			int packetNumArgs = Integer.parseInt(packetBuf.subSequence(numArgsStart, numArgsEnd).toString(), 16);
-			
-			/*
-			 * Extract rest of the arguments. Each argument is an 8 byte hex length, ':' and
-			 * then the characters of the argument.
-			 */
-			
-			packetArgs = new String[packetNumArgs];
-			int argPos = numArgsEnd + 1;
-			
-			for (int i = 0; i < packetNumArgs; i++) {
-				packetArgs[i] = ProtocolUtil.decodeString(packetBuf, argPos);
-				argPos += packetArgs[i].length() + PACKET_ARG_LEN_SIZE + 2;
-			}
-		} catch (NumberFormatException e) {
-			System.out.println("BAD PACKET FORMAT: \"" + packetBuf + "\"");
-			throw new IOException("Bad packet format");
-		} catch (IndexOutOfBoundsException e1) {
-			return false;
-		}
-		
-		return true;
-	}
-	
-	public void send(WritableByteChannel channel) throws IOException {
-		String body = ProtocolUtil.encodeIntVal(packetID, PACKET_ID_SIZE) 
-			+ ":" + ProtocolUtil.encodeIntVal(packetTransID, PACKET_TRANS_ID_SIZE)
-			+ ":" + ProtocolUtil.encodeIntVal(packetArgs.length, PACKET_ARG_LEN_SIZE);
-
-		for (String arg : packetArgs) {
-			body += " " + ProtocolUtil.encodeString(arg);
-		}
-
-		/*
-		 * Note: command length includes the first space!
-		 */
-		String packet = ProtocolUtil.encodeIntVal(body.length() + 1, 
-				PACKET_LENGTH_SIZE) + " " + body;
-		
-		if (debug) {
-			System.out.println("SEND:[" + packet + "]");
-		}
-		
-		fullWrite(channel, encoder.encode(CharBuffer.wrap(packet)));
-	}
-	
-	/**
-	 * Enable/disable protocol debugging
-	 * 
-	 * @param logging
-	 */
-	public void setDebug(boolean debug) {
-		this.debug = debug;
-	}
-	
-	/**
-	 * Read a full buffer from the socket. Guaranteed to read buf.remaining() bytes
-	 * from the channel.
-	 * 
-	 * FIXME: Can this block if there is nothing available on the channel? If so, then
-	 * there should be some kind of timeout to prevent the UI from hanging.
-	 * 
-	 * @throws	IOException if EOF
-	 */
-	private void fullRead(ReadableByteChannel channel, ByteBuffer buf) throws IOException {
-		buf.clear();
-		while (buf.hasRemaining()) {
-			int n = channel.read(buf);
-			if (n < 0) {
-				throw new IOException("EOF from proxy");
-			}
-		}
-		buf.flip();
-	}
-	
-	/**
-	 * Write a full buffer to the socket. Guaranteed to write buf.remaingin() bytes to
-	 * the channel.
-	 * 
-	 * FIXME: Can this block? If so, then there should be some kind of timeout to prevent the UI from hanging.
-	 * 
-	 * @param buf
-	 * @throws IOException
-	 */
-	private void fullWrite(WritableByteChannel channel, ByteBuffer buf) throws IOException {
-		while (buf.hasRemaining()) {
-			int n = channel.write(buf);
-			if (n < 0) {
-				throw new IOException("EOF from proxy");
-			}
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/AbstractProxyRuntimeClient.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/AbstractProxyRuntimeClient.java
deleted file mode 100644
index bbd706f..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/AbstractProxyRuntimeClient.java
+++ /dev/null

@@ -1,1016 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.client;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.eclipse.ptp.proxy.client.AbstractProxyClient;
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.event.IProxyConnectedEvent;
-import org.eclipse.ptp.proxy.event.IProxyDisconnectedEvent;
-import org.eclipse.ptp.proxy.event.IProxyErrorEvent;
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyEventListener;
-import org.eclipse.ptp.proxy.event.IProxyExtendedEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-import org.eclipse.ptp.proxy.event.IProxyOKEvent;
-import org.eclipse.ptp.proxy.event.IProxyTimeoutEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent.Level;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStartEventsCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStopEventsCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeSubmitJobCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeTerminateJobCommand;
-import org.eclipse.ptp.proxy.runtime.command.ProxyRuntimeCommandFactory;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeAttributeDefEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeConnectedStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeErrorStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeJobChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMachineChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMessageEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewJobEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewMachineEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewNodeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewProcessEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewQueueEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNodeChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeProcessChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeQueueChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveAllEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveJobEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRunningStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeShutdownStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeStartupErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeTerminateJobErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.ProxyRuntimeEventFactory;
-import org.eclipse.ptp.proxy.util.DebugOptions;
-
-public abstract class AbstractProxyRuntimeClient extends AbstractProxyClient
-		implements IProxyRuntimeClient, IProxyEventListener {
-
-	private class StateMachineThread implements Runnable {
-		private static final String name = "State Machine Thread";
-
-		public void run() {
-			try {
-				runStateMachine();
-			} catch (IllegalStateException e) {
-				System.out.println("Illegal state detected: " + e.getMessage());
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			if (logEvents) {
-				System.out.println("state machine thread exited");
-			}
-		}
-	}
-
-	/*
-	 * Proxy state
-	 */
-	enum ProxyState {
-		IDLE, STARTUP, INIT, MODEL_DEF, RUNNING, SHUTDOWN, END, ERROR
-	}
-
-	/*
-	 * Flag to enable/disable logging messages
-	 */
-	private boolean logEvents = false;
-	/*
-	 * Actual name of the proxy - used for debugging messages
-	 */
-	private String proxyName = "";
-	/*
-	 * Main state machine variable
-	 */
-	private volatile ProxyState state;
-	/*
-	 * Master list of commands that have been sent to the server
-	 */
-	private List<IProxyCommand> commands = new ArrayList<IProxyCommand>();
-	/*
-	 * Event queue for incoming events.
-	 */
-	private LinkedBlockingQueue<IProxyEvent> events = new LinkedBlockingQueue<IProxyEvent>();
-	/*
-	 * Listener list for events generated by us
-	 */
-	private Collection<IProxyRuntimeEventListener> listeners = Collections
-			.synchronizedList(new ArrayList<IProxyRuntimeEventListener>());
-	/*
-	 * Based ID for model ID's generated by the proxy. This is used to ensure
-	 * model ID's are unique.
-	 */
-	protected final int baseModelId;
-	/*
-	 * Factory for creating new events
-	 */
-	protected final IProxyRuntimeEventFactory eventFactory;
-	/*
-	 * Factory for creating new commands
-	 */
-	protected final IProxyRuntimeCommandFactory cmdFactory;
-
-	public AbstractProxyRuntimeClient(String name, int baseModelId,
-			IProxyRuntimeCommandFactory cmdFactory,
-			IProxyRuntimeEventFactory eventFactory) {
-		this.cmdFactory = cmdFactory;
-		this.eventFactory = eventFactory;
-		this.proxyName = name;
-		this.baseModelId = baseModelId;
-		this.state = ProxyState.IDLE;
-		super.setEventFactory(eventFactory);
-		super.addProxyEventListener(this);
-
-		if (DebugOptions.CLIENT_TRACING) {
-			this.logEvents = true;
-		}
-	}
-
-	public AbstractProxyRuntimeClient(String name, int baseModelId) {
-		this(name, baseModelId, new ProxyRuntimeCommandFactory(), new ProxyRuntimeEventFactory());
-	}
-
-	/**
-	 * Add a command to the list of commands that have been sent to the proxy
-	 * 
-	 * @param command
-	 */
-	private void addCommand(IProxyCommand command) {
-		synchronized (commands) {
-			commands.add(command);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#addProxyRuntimeEventListener(org.eclipse.ptp.proxy.runtime.client.event.IProxyRuntimeEventListener)
-	 */
-	public void addProxyRuntimeEventListener(IProxyRuntimeEventListener listener) {
-		listeners.add(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.proxy.event.IProxyConnectedEvent)
-	 */
-	public void handleEvent(IProxyConnectedEvent event) {
-		try {
-			// this will wake up the state machine to process the event
-			events.add(event);
-		} catch (IllegalStateException except) {
-			// events list should never be full
-			except.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.proxy.event.IProxyDisconnectedEvent)
-	 */
-	public void handleEvent(IProxyDisconnectedEvent event) {
-		try {
-			// this will wake up the state machine to process the event
-			events.add(event);
-		} catch (IllegalStateException except) {
-			// events list should never be full
-			except.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.proxy.event.IProxyErrorEvent)
-	 */
-	public void handleEvent(IProxyErrorEvent event) {
-		try {
-			// this will wake up the state machine to process the event
-			events.add(event);
-		} catch (IllegalStateException except) {
-			// events list should never be full
-			except.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.proxy.event.IProxyExtendedEvent)
-	 */
-	public void handleEvent(IProxyExtendedEvent event) {
-		try {
-			// this will wake up the state machine to process the event
-			events.add(event);
-		} catch (IllegalStateException except) {
-			// events list should never be full
-			except.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.proxy.event.IProxyMessageEvent)
-	 */
-	public void handleEvent(IProxyMessageEvent event) {
-		try {
-			// this will wake up the state machine to process the event
-			events.add(event);
-		} catch (IllegalStateException except) {
-			// events list should never be full
-			except.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.proxy.event.IProxyOKEvent)
-	 */
-	public void handleEvent(IProxyOKEvent event) {
-		try {
-			// this will wake up the state machine to process the event
-			events.add(event);
-		} catch (IllegalStateException except) {
-			// events list should never be full
-			except.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.event.IProxyEventListener#handleEvent(org.eclipse.ptp.proxy.event.IProxyTimeoutEvent)
-	 */
-	public void handleEvent(IProxyTimeoutEvent event) {
-		try {
-			// this will wake up the state machine to process the event
-			events.add(event);
-		} catch (IllegalStateException except) {
-			// events list should never be full
-			except.printStackTrace();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#removeProxyRuntimeEventListener(org.eclipse.ptp.proxy.runtime.client.event.IProxyRuntimeEventListener)
-	 */
-	public void removeProxyRuntimeEventListener(
-			IProxyRuntimeEventListener listener) {
-		listeners.remove(listener);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#shutdown()
-	 */
-	public void shutdown() throws IOException {
-		if (state != ProxyState.SHUTDOWN) {
-			if (logEvents) {
-				System.out.println(toString() + ": shutting down server...");
-			}
-			state = ProxyState.SHUTDOWN;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#startEvents()
-	 */
-	public void startEvents() throws IOException {
-		if (state != ProxyState.RUNNING) {
-			throw new IOException("Not accepting commands");
-		}
-		IProxyCommand command = cmdFactory.newProxyRuntimeStartEventsCommand();
-		addCommand(command);
-		sendCommand(command);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#startup()
-	 */
-	public void startup() throws IOException {
-		if (state == ProxyState.IDLE) {
-			state = ProxyState.STARTUP;
-
-			Thread smt = new Thread(new StateMachineThread(), proxyName
-					+ StateMachineThread.name);
-			smt.start();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#stopEvents()
-	 */
-	public void stopEvents() throws IOException {
-		if (state != ProxyState.RUNNING) {
-			throw new IOException("Not accepting commands");
-		}
-		IProxyCommand command = cmdFactory.newProxyRuntimeStopEventsCommand();
-		addCommand(command);
-		sendCommand(command);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#submitJob(java.lang.String[])
-	 */
-	public void submitJob(String[] args) throws IOException {
-		if (state != ProxyState.RUNNING) {
-			throw new IOException("Not accepting commands");
-		}
-		IProxyCommand command = cmdFactory
-				.newProxyRuntimeSubmitJobCommand(args);
-		addCommand(command);
-		sendCommand(command);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.client.IProxyRuntimeClient#terminateJob(java.lang.String)
-	 */
-	public void terminateJob(String jobId) throws IOException {
-		if (state != ProxyState.RUNNING) {
-			throw new IOException("Not accepting commands");
-		}
-		IProxyCommand command = cmdFactory
-				.newProxyRuntimeTerminateJobCommand(jobId);
-		addCommand(command);
-		sendCommand(command);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return proxyName + "ProxyRuntimeClient";
-	}
-
-	/**
-	 * Locate the command associated with a particular event. Uses the
-	 * transaction ID o match commands/events.
-	 * 
-	 * @param event
-	 * @return
-	 */
-	private IProxyCommand getCommandForEvent(IProxyEvent event) {
-		IProxyCommand[] ca;
-		IProxyCommand command = null;
-		synchronized (commands) {
-			ca = commands.toArray(new IProxyCommand[0]);
-		}
-		for (IProxyCommand cmd : ca) {
-			if (cmd.getTransactionID() == event.getTransactionID()) {
-				command = cmd;
-				break;
-			}
-		}
-		return command;
-	}
-
-	/**
-	 * Process events while in the RUNNING state.
-	 */
-	private void processRunningEvent(IProxyCommand command, IProxyEvent event) {
-		if (logEvents) {
-			System.out.println(toString() + " received event " + event);
-		}
-		if (event instanceof IProxyMessageEvent) {
-			fireProxyRuntimeMessageEvent(eventFactory
-					.newProxyRuntimeMessageEvent((IProxyMessageEvent) event));
-		} else if (command instanceof IProxyRuntimeStartEventsCommand) {
-			if (event instanceof IProxyRuntimeNewJobEvent) {
-				fireProxyRuntimeNewJobEvent((IProxyRuntimeNewJobEvent) event);
-			} else if (event instanceof IProxyRuntimeNewMachineEvent) {
-				fireProxyRuntimeNewMachineEvent((IProxyRuntimeNewMachineEvent) event);
-			} else if (event instanceof IProxyRuntimeNewNodeEvent) {
-				fireProxyRuntimeNewNodeEvent((IProxyRuntimeNewNodeEvent) event);
-			} else if (event instanceof IProxyRuntimeNewProcessEvent) {
-				fireProxyRuntimeNewProcessEvent((IProxyRuntimeNewProcessEvent) event);
-			} else if (event instanceof IProxyRuntimeNewQueueEvent) {
-				fireProxyRuntimeNewQueueEvent((IProxyRuntimeNewQueueEvent) event);
-			} else if (event instanceof IProxyRuntimeJobChangeEvent) {
-				fireProxyRuntimeJobChangeEvent((IProxyRuntimeJobChangeEvent) event);
-			} else if (event instanceof IProxyRuntimeMachineChangeEvent) {
-				fireProxyRuntimeMachineChangeEvent((IProxyRuntimeMachineChangeEvent) event);
-			} else if (event instanceof IProxyRuntimeNodeChangeEvent) {
-				fireProxyRuntimeNodeChangeEvent((IProxyRuntimeNodeChangeEvent) event);
-			} else if (event instanceof IProxyRuntimeProcessChangeEvent) {
-				fireProxyRuntimeProcessChangeEvent((IProxyRuntimeProcessChangeEvent) event);
-			} else if (event instanceof IProxyRuntimeQueueChangeEvent) {
-				fireProxyRuntimeQueueChangeEvent((IProxyRuntimeQueueChangeEvent) event);
-			} else if (event instanceof IProxyRuntimeRemoveAllEvent) {
-				fireProxyRuntimeRemoveAllEvent((IProxyRuntimeRemoveAllEvent) event);
-			} else if (event instanceof IProxyRuntimeRemoveJobEvent) {
-				fireProxyRuntimeRemoveJobEvent((IProxyRuntimeRemoveJobEvent) event);
-			} else if (event instanceof IProxyRuntimeRemoveMachineEvent) {
-				fireProxyRuntimeRemoveMachineEvent((IProxyRuntimeRemoveMachineEvent) event);
-			} else if (event instanceof IProxyRuntimeRemoveNodeEvent) {
-				fireProxyRuntimeRemoveNodeEvent((IProxyRuntimeRemoveNodeEvent) event);
-			} else if (event instanceof IProxyRuntimeRemoveProcessEvent) {
-				fireProxyRuntimeRemoveProcessEvent((IProxyRuntimeRemoveProcessEvent) event);
-			} else if (event instanceof IProxyRuntimeRemoveQueueEvent) {
-				fireProxyRuntimeRemoveQueueEvent((IProxyRuntimeRemoveQueueEvent) event);
-			} else if (event instanceof IProxyErrorEvent) {
-				fireProxyRuntimeErrorStateEvent(eventFactory
-						.newProxyRuntimeErrorStateEvent());
-			} else if (event instanceof IProxyOKEvent) {
-				removeCommand(command);
-			}
-		} else if (command instanceof IProxyRuntimeStopEventsCommand) {
-			if (event instanceof IProxyOKEvent) {
-				removeCommand(command);
-			}
-		} else if (command instanceof IProxyRuntimeSubmitJobCommand) {
-			if (event instanceof IProxyRuntimeSubmitJobErrorEvent) {
-				fireProxyRuntimeSubmitJobErrorEvent(eventFactory
-						.newProxyRuntimeSubmitJobErrorEvent(event
-								.getTransactionID(), event.getAttributes()));
-			} else if (event instanceof IProxyErrorEvent) {
-				fireProxyRuntimeErrorStateEvent(eventFactory
-						.newProxyRuntimeErrorStateEvent());
-			}
-			removeCommand(command);
-		} else if (command instanceof IProxyRuntimeTerminateJobCommand) {
-			if (event instanceof IProxyRuntimeTerminateJobErrorEvent) {
-				fireProxyRuntimeTerminateJobErrorEvent(eventFactory
-						.newProxyRuntimeTerminateJobErrorEvent(event
-								.getTransactionID(), event.getAttributes()));
-			} else if (event instanceof IProxyErrorEvent) {
-				fireProxyRuntimeErrorStateEvent(eventFactory
-						.newProxyRuntimeErrorStateEvent());
-			}
-			removeCommand(command);
-		}
-
-	}
-
-	/**
-	 * Remove command from list of sent commands.
-	 * 
-	 * @param command
-	 */
-	private void removeCommand(IProxyCommand command) {
-		synchronized (commands) {
-			command.completed();
-			commands.remove(command);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeAttributeDefEvent(
-			IProxyRuntimeAttributeDefEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeConnectedStateEvent(
-			IProxyRuntimeConnectedStateEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeErrorStateEvent(
-			IProxyRuntimeErrorStateEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeJobChangeEvent(
-			IProxyRuntimeJobChangeEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeMachineChangeEvent(
-			IProxyRuntimeMachineChangeEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeMessageEvent(IProxyRuntimeMessageEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeNewJobEvent(IProxyRuntimeNewJobEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeNewMachineEvent(
-			IProxyRuntimeNewMachineEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeNewNodeEvent(IProxyRuntimeNewNodeEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeNewProcessEvent(
-			IProxyRuntimeNewProcessEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeNewQueueEvent(
-			IProxyRuntimeNewQueueEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeNodeChangeEvent(
-			IProxyRuntimeNodeChangeEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeProcessChangeEvent(
-			IProxyRuntimeProcessChangeEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeQueueChangeEvent(
-			IProxyRuntimeQueueChangeEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeRemoveAllEvent(
-			IProxyRuntimeRemoveAllEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeRemoveJobEvent(
-			IProxyRuntimeRemoveJobEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeRemoveMachineEvent(
-			IProxyRuntimeRemoveMachineEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeRemoveNodeEvent(
-			IProxyRuntimeRemoveNodeEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeRemoveProcessEvent(
-			IProxyRuntimeRemoveProcessEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeRemoveQueueEvent(
-			IProxyRuntimeRemoveQueueEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeRunningStateEvent(
-			IProxyRuntimeRunningStateEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeShutdownStateEvent(
-			IProxyRuntimeShutdownStateEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeStartupErrorEvent(
-			IProxyRuntimeStartupErrorEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeSubmitJobErrorEvent(
-			IProxyRuntimeSubmitJobErrorEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Forward event to listeners
-	 * 
-	 * @param event
-	 */
-	protected void fireProxyRuntimeTerminateJobErrorEvent(
-			IProxyRuntimeTerminateJobErrorEvent event) {
-		for (Object listener : listeners) {
-			((IProxyRuntimeEventListener) listener).handleEvent(event);
-		}
-	}
-
-	/**
-	 * Main proxy state machine. Use to manage communication with a proxy
-	 * client.
-	 * 
-	 * This should only be called from the state machine thread (so synchronized
-	 * not needed)
-	 * 
-	 * @throws IOException
-	 * @throws InterruptedException
-	 * @throws IllegalStateException
-	 */
-	protected void runStateMachine() throws IOException, InterruptedException,
-			IllegalStateException {
-		while (state != ProxyState.IDLE && state != ProxyState.ERROR) {
-			IProxyCommand command;
-			IProxyEvent event;
-
-			switch (state) {
-			case STARTUP:
-				/*
-				 * This state is used to wait for a connected event from the
-				 * proxy after it was started. A connected event indicates that
-				 * the proxy has been launched successfully. Send an INIT
-				 * command to the proxy and enter the INIT state.
-				 */
-				event = events.take();
-
-				if (event instanceof IProxyConnectedEvent) {
-					try {
-						sessionHandleEvents();
-						command = cmdFactory
-								.newProxyRuntimeInitCommand(baseModelId);
-						addCommand(command);
-						sendCommand(command);
-						state = ProxyState.INIT;
-						fireProxyRuntimeConnectedStateEvent(eventFactory
-								.newProxyRuntimeConnectedStateEvent());
-					} catch (IOException e) {
-						state = ProxyState.IDLE;
-						fireProxyRuntimeStartupErrorEvent(eventFactory
-								.newProxyRuntimeStartupErrorEvent(e
-										.getMessage()));
-					}
-				} else if (event instanceof IProxyTimeoutEvent) {
-					state = ProxyState.IDLE;
-					fireProxyRuntimeStartupErrorEvent(eventFactory
-							.newProxyRuntimeStartupErrorEvent("Proxy connection timeout out"));
-				} else if (event instanceof IProxyDisconnectedEvent) {
-					state = ProxyState.IDLE;
-					fireProxyRuntimeStartupErrorEvent(eventFactory
-							.newProxyRuntimeStartupErrorEvent("Proxy disconnected"));
-				} else {
-					state = ProxyState.ERROR;
-					fireProxyRuntimeErrorStateEvent(eventFactory
-							.newProxyRuntimeErrorStateEvent());
-					throw new IllegalStateException("Received "
-							+ event.toString() + " in STARTUP");
-				}
-				break;
-
-			case INIT:
-				/*
-				 * This state is set to wait from a response from the INIT
-				 * command. If we receive an OK event, we next send a MODEL_DEF
-				 * command and enter the MODEL_DEF state.
-				 */
-				event = events.take();
-
-				if (event instanceof IProxyDisconnectedEvent) {
-					state = ProxyState.IDLE;
-					fireProxyRuntimeStartupErrorEvent(eventFactory
-							.newProxyRuntimeStartupErrorEvent("Proxy disconnected"));
-				} else if (event instanceof IProxyMessageEvent) {
-					fireProxyRuntimeMessageEvent(eventFactory
-							.newProxyRuntimeMessageEvent((IProxyMessageEvent) event));
-				} else {
-					command = getCommandForEvent(event);
-					if (command != null) {
-						removeCommand(command);
-						if (event instanceof IProxyOKEvent) {
-							command = cmdFactory
-									.newProxyRuntimeModelDefCommand();
-							addCommand(command);
-							sendCommand(command);
-							state = ProxyState.MODEL_DEF;
-						} else if (event instanceof IProxyErrorEvent) {
-							state = ProxyState.IDLE;
-							fireProxyRuntimeStartupErrorEvent(eventFactory
-									.newProxyRuntimeStartupErrorEvent(event
-											.getAttributes()));
-						} else {
-							state = ProxyState.ERROR;
-							fireProxyRuntimeErrorStateEvent(eventFactory
-									.newProxyRuntimeErrorStateEvent());
-							throw new IllegalStateException(
-									"Could not find command for event [" 
-										+ event.toString() + "] in INIT");
-						}
-					} else {
-						state = ProxyState.ERROR;
-						fireProxyRuntimeErrorStateEvent(eventFactory
-								.newProxyRuntimeErrorStateEvent());
-						throw new IllegalStateException("Received "
-								+ event.toString() + " in INIT");
-					}
-				}
-				break;
-
-			case MODEL_DEF:
-				/*
-				 * This state is used to process attribute definition events
-				 * that are used by the proxy to define any attributes that it
-				 * will use. This state is terminated when an OK event is
-				 * received. At this point enter the RUNNING state.
-				 * 
-				 */
-				event = events.take();
-
-				if (event instanceof IProxyDisconnectedEvent) {
-					state = ProxyState.IDLE;
-					fireProxyRuntimeStartupErrorEvent(eventFactory
-							.newProxyRuntimeStartupErrorEvent("Proxy disconnected"));
-				} else if (event instanceof IProxyMessageEvent) {
-					fireProxyRuntimeMessageEvent(eventFactory
-							.newProxyRuntimeMessageEvent((IProxyMessageEvent) event));
-				} else {
-					command = getCommandForEvent(event);
-					if (command != null) {
-						if (event instanceof IProxyOKEvent) {
-							removeCommand(command);
-							state = ProxyState.RUNNING;
-							fireProxyRuntimeRunningStateEvent(eventFactory
-									.newProxyRuntimeRunningStateEvent());
-						} else if (event instanceof IProxyRuntimeAttributeDefEvent) {
-							fireProxyRuntimeAttributeDefEvent((IProxyRuntimeAttributeDefEvent) event);
-						} else if (event instanceof IProxyErrorEvent) {
-							removeCommand(command);
-							state = ProxyState.IDLE;
-							fireProxyRuntimeStartupErrorEvent(eventFactory
-									.newProxyRuntimeStartupErrorEvent(event
-											.getAttributes()));
-						} else {
-							removeCommand(command);
-							state = ProxyState.ERROR;
-							fireProxyRuntimeErrorStateEvent(eventFactory
-									.newProxyRuntimeErrorStateEvent());
-							throw new IllegalStateException(
-									"Could not find command for event [" 
-										+ event.toString() + "] in MODEL_DEF");
-						}
-					} else {
-						state = ProxyState.ERROR;
-						fireProxyRuntimeErrorStateEvent(eventFactory
-								.newProxyRuntimeErrorStateEvent());
-						throw new IllegalStateException("Received "
-								+ event.toString() + " in MODEL_DEF");
-					}
-				}
-				break;
-
-			case RUNNING:
-				/*
-				 * This is the main event processing state. Any events we
-				 * receive in this state are forwarded to event listeners. This
-				 * state continues until the shutdown() method is called, at
-				 * which time we enter the shutdown state.
-				 */
-				event = events.take();
-
-				if (event instanceof IProxyDisconnectedEvent) {
-					state = ProxyState.SHUTDOWN;
-					fireProxyRuntimeMessageEvent(eventFactory
-							.newProxyRuntimeMessageEvent(Level.FATAL,
-									"Proxy disconnected"));
-				} else {
-					command = getCommandForEvent(event);
-					if (command != null) {
-						processRunningEvent(command, event);
-					} else {
-						state = ProxyState.ERROR;
-						throw new IllegalStateException(
-								"Could not find command for event [" 
-									+ event.toString() + "] in RUNNING");
-					}
-				}
-				break;
-
-			case SHUTDOWN:
-				/*
-				 * This state is entered when the proxy has been shut down. We
-				 * stay in this state until the session is shut down. This
-				 * happens when an OK event is received in response to a QUIT
-				 * command, or if the shutdown timeout has expired.
-				 */
-				if (isShutdown()) {
-					fireProxyRuntimeShutdownStateEvent(eventFactory
-							.newProxyRuntimeShutdownStateEvent());
-					state = ProxyState.IDLE;
-					commands.clear();
-					events.clear();
-				} else {
-					/*
-					 * Wait for any event. We will eventually get an
-					 * IProxyDisconnectedEvent.
-					 */
-					events.take();
-				}
-				break;
-
-			default:
-				throw new IllegalStateException("Unknown state: "
-						+ state.toString());
-			}
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeClient.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeClient.java
deleted file mode 100644
index d5f0031..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeClient.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.client;
-
-import java.io.IOException;
-
-
-public interface IProxyRuntimeClient {
-	/**
-	 * Register for events
-	 * 
-	 * @param listener
-	 */
-	public void addProxyRuntimeEventListener(IProxyRuntimeEventListener listener);
-	
-	/**
-	 * Unregister for events
-	 * 
-	 * @param listener
-	 */
-	public void removeProxyRuntimeEventListener(IProxyRuntimeEventListener listener);
-	
-	/**
-	 * Shut down the proxy
-	 * 
-	 * @throws IOException if proxy fails to stop
-	 */
-	public void shutdown() throws IOException;
-	
-	/**
-	 * Tell proxy to start sending events
-	 * 
-	 * @throws IOException 
-	 */
-	public void startEvents() throws IOException;
-	
-	/**
-	 * Start up the proxy
-	 * 
-	 * @throws IOException if proxy fails to start
-	 */
-	public void startup() throws IOException;
-	
-	/**
-	 * Tell proxy to stop sending events
-	 * 
-	 * @throws IOException
-	 */
-	public void stopEvents() throws IOException;
-	
-	/**
-	 * Submit a job for execution
-	 * 
-	 * @param args
-	 * @throws IOException
-	 */
-	public void submitJob(String[] args) throws IOException;
-	
-	/**
-	 * Terminate a job
-	 * 
-	 * @param jobId
-	 * @throws IOException
-	 */
-	public void terminateJob(String jobId) throws IOException;
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeEventListener.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeEventListener.java
deleted file mode 100644
index 3ad4705..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/client/IProxyRuntimeEventListener.java
+++ /dev/null

@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.client;
-
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeAttributeDefEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeConnectedStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeErrorStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeJobChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMachineChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeMessageEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewJobEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewMachineEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewNodeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewProcessEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNewQueueEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeNodeChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeProcessChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeQueueChangeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveAllEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveJobEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeRunningStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeShutdownStateEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeStartupErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeTerminateJobErrorEvent;
-
-public interface IProxyRuntimeEventListener {
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeAttributeDefEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeConnectedStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeErrorStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeJobChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeMachineChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeMessageEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeNewJobEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeNewMachineEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeNewNodeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeNewProcessEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeNewQueueEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeNodeChangeEvent e);	
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeProcessChangeEvent e);	
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeQueueChangeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeRemoveAllEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeRemoveJobEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeRemoveMachineEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeRemoveNodeEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeRemoveProcessEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeRemoveQueueEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeRunningStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeShutdownStateEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeStartupErrorEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeSubmitJobErrorEvent e);
-	
-	/**
-	 * @param e
-	 */
-	public void handleEvent(IProxyRuntimeTerminateJobErrorEvent e);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/AbstractProxyRuntimeCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/AbstractProxyRuntimeCommand.java
deleted file mode 100644
index cc8b040..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/AbstractProxyRuntimeCommand.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.AbstractProxyCommand;
-
-public abstract class AbstractProxyRuntimeCommand extends AbstractProxyCommand
-	implements IProxyRuntimeCommand {
-	public AbstractProxyRuntimeCommand(int eventID) {
-		super(eventID);
-	}
-
-	public AbstractProxyRuntimeCommand(int eventID, int transactionID, String[] args) {
-		super(eventID, transactionID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommand.java
deleted file mode 100644
index bd5a4c6..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommand.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-
-
-public interface IProxyRuntimeCommand extends IProxyCommand {
-	/*
-	 * Command IDs
-	 */
-	public static final int INIT = 1;
-	public static final int MODEL_DEF = 2;
-	public static final int START_EVENTS = 3;
-	public static final int STOP_EVENTS = 4;
-	public static final int SUBMIT_JOB = 5;
-	public static final int TERMINATE_JOB = 6;
-		
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommandFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommandFactory.java
deleted file mode 100644
index cfe3bf8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeCommandFactory.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-import org.eclipse.ptp.proxy.command.IProxyCommandFactory;
-
-public interface IProxyRuntimeCommandFactory extends IProxyCommandFactory {
-	/**
-	 * @param baseID
-	 * @return
-	 */
-	public IProxyRuntimeInitCommand newProxyRuntimeInitCommand(int baseId);
-	
-	/**
-	 * @return
-	 */
-	public IProxyRuntimeModelDefCommand newProxyRuntimeModelDefCommand();
-	
-	/**
-	 * @return
-	 */
-	public IProxyRuntimeStartEventsCommand newProxyRuntimeStartEventsCommand();
-	
-	/**
-	 * @return
-	 */
-	public IProxyRuntimeStopEventsCommand newProxyRuntimeStopEventsCommand();
-	
-	/**
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeSubmitJobCommand newProxyRuntimeSubmitJobCommand(String[] args);
-	
-	/**
-	 * @param jobID
-	 * @return
-	 */
-	public IProxyRuntimeTerminateJobCommand newProxyRuntimeTerminateJobCommand(String jobId);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeInitCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeInitCommand.java
deleted file mode 100644
index 9b9b8ee..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeInitCommand.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-public interface IProxyRuntimeInitCommand extends IProxyRuntimeCommand {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeModelDefCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeModelDefCommand.java
deleted file mode 100644
index 56d0cea..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeModelDefCommand.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-public interface IProxyRuntimeModelDefCommand extends IProxyRuntimeCommand {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStartEventsCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStartEventsCommand.java
deleted file mode 100644
index 1c9e088..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStartEventsCommand.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-public interface IProxyRuntimeStartEventsCommand extends IProxyRuntimeCommand {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStopEventsCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStopEventsCommand.java
deleted file mode 100644
index ec45326..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeStopEventsCommand.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-public interface IProxyRuntimeStopEventsCommand extends IProxyRuntimeCommand {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeSubmitJobCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeSubmitJobCommand.java
deleted file mode 100644
index ec0b61b..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeSubmitJobCommand.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-public interface IProxyRuntimeSubmitJobCommand extends IProxyRuntimeCommand {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeTerminateJobCommand.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeTerminateJobCommand.java
deleted file mode 100644
index ab0cf42..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/IProxyRuntimeTerminateJobCommand.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-public interface IProxyRuntimeTerminateJobCommand extends IProxyRuntimeCommand {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/ProxyRuntimeCommandFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/ProxyRuntimeCommandFactory.java
deleted file mode 100644
index be86a28..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/command/ProxyRuntimeCommandFactory.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.command;
-
-import org.eclipse.ptp.internal.proxy.runtime.command.ProxyRuntimeInitCommand;
-import org.eclipse.ptp.internal.proxy.runtime.command.ProxyRuntimeModelDefCommand;
-import org.eclipse.ptp.internal.proxy.runtime.command.ProxyRuntimeStartEventsCommand;
-import org.eclipse.ptp.internal.proxy.runtime.command.ProxyRuntimeStopEventsCommand;
-import org.eclipse.ptp.internal.proxy.runtime.command.ProxyRuntimeSubmitJobCommand;
-import org.eclipse.ptp.internal.proxy.runtime.command.ProxyRuntimeTerminateJobCommand;
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.command.ProxyCommandFactory;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public class ProxyRuntimeCommandFactory extends ProxyCommandFactory implements IProxyRuntimeCommandFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeInitCommand(int)
-	 */
-	public IProxyRuntimeInitCommand newProxyRuntimeInitCommand(int baseId) {
-		return new ProxyRuntimeInitCommand(baseId);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeModelDefCommand()
-	 */
-	public IProxyRuntimeModelDefCommand newProxyRuntimeModelDefCommand() {
-		return new ProxyRuntimeModelDefCommand();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeStartEventsCommand()
-	 */
-	public IProxyRuntimeStartEventsCommand newProxyRuntimeStartEventsCommand() {
-		return new ProxyRuntimeStartEventsCommand();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeStopEventsCommand()
-	 */
-	public IProxyRuntimeStopEventsCommand newProxyRuntimeStopEventsCommand() {
-		return new ProxyRuntimeStopEventsCommand();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeSubmitJobCommand(java.lang.String[])
-	 */
-	public IProxyRuntimeSubmitJobCommand newProxyRuntimeSubmitJobCommand(
-			String[] args) {
-		return new ProxyRuntimeSubmitJobCommand(args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeTerminateJobCommand(java.lang.String)
-	 */
-	public IProxyRuntimeTerminateJobCommand newProxyRuntimeTerminateJobCommand(
-			String jobId) {
-		return new ProxyRuntimeTerminateJobCommand(jobId);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.command.ProxyCommandFactory#toCommand(org.eclipse.ptp.proxy.packet.ProxyPacket)
-	 */
-	public IProxyCommand toCommand(ProxyPacket packet) {
-		IProxyRuntimeCommand	cmd = null;
-
-		IProxyCommand c = super.toCommand(packet);
-		if (c != null) {
-			return c;
-		}
-		
-		switch (packet.getID()) {
-		case IProxyRuntimeCommand.INIT:
-			cmd = new ProxyRuntimeInitCommand(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeCommand.MODEL_DEF:
-			cmd = new ProxyRuntimeModelDefCommand(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeCommand.START_EVENTS:
-			cmd = new ProxyRuntimeStartEventsCommand(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeCommand.STOP_EVENTS:
-			cmd = new ProxyRuntimeStopEventsCommand(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeCommand.SUBMIT_JOB:
-			cmd = new ProxyRuntimeSubmitJobCommand(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeCommand.TERMINATE_JOB:
-			cmd = new ProxyRuntimeTerminateJobCommand(packet.getTransID(), packet.getArgs());
-			break;
-		}
-
-		return cmd;
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/AbstractProxyRuntimeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/AbstractProxyRuntimeEvent.java
deleted file mode 100644
index 6c157c8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/AbstractProxyRuntimeEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.event.AbstractProxyEvent;
-
-public abstract class AbstractProxyRuntimeEvent extends AbstractProxyEvent implements IProxyRuntimeEvent {
-	public AbstractProxyRuntimeEvent(int eventID, int transactionID) {
-		super(eventID, transactionID);
-	}
-
-	public AbstractProxyRuntimeEvent(int eventID, int transactionID, String[] args) {
-		super(eventID, transactionID, args);
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeAttributeDefEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeAttributeDefEvent.java
deleted file mode 100644
index b13624f..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeAttributeDefEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeAttributeDefEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeConnectedStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeConnectedStateEvent.java
deleted file mode 100644
index 9ad5322..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeConnectedStateEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeConnectedStateEvent extends IProxyRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeErrorStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeErrorStateEvent.java
deleted file mode 100644
index d383ca1..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeErrorStateEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeErrorStateEvent extends IProxyRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEvent.java
deleted file mode 100644
index 32b5956..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEvent.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.event.IProxyExtendedEvent;
-
-public interface IProxyRuntimeEvent extends IProxyExtendedEvent {
-	public static final int EVENT_OFFSET = 200;
-	
-	/*
-	 * Internal state events
-	 */
-	public static final int STARTUP_STATE = EVENT_OFFSET + 1;
-	public static final int CONNECTED_STATE = EVENT_OFFSET + 2;
-	public static final int RUNNING_STATE = EVENT_OFFSET + 3;
-	public static final int SHUTDOWN_STATE = EVENT_OFFSET + 4;
-	public static final int ERROR_STATE = EVENT_OFFSET + 5;
-	
-	/*
-	 * Internal error event
-	 */
-	public static final int STARTUP_ERROR = EVENT_OFFSET + 10;
-	
-	/*
-	 * Command error events
-	 */
-	public static final int SUBMITJOB_ERROR = EVENT_OFFSET + 11;
-	public static final int TERMINATEJOB_ERROR = EVENT_OFFSET + 12;
-
-	/*
-	 * New model element events
-	 */
-	public static final int NEW_JOB = EVENT_OFFSET + 20;
-	public static final int NEW_MACHINE = EVENT_OFFSET + 21;
-	public static final int NEW_NODE = EVENT_OFFSET + 22;
-	public static final int NEW_PROCESS = EVENT_OFFSET + 23;
-	public static final int NEW_QUEUE = EVENT_OFFSET + 24;
-
-	/*
-	 * Change model element events
-	 */
-	public static final int JOB_CHANGE = EVENT_OFFSET + 30;
-	public static final int MACHINE_CHANGE = EVENT_OFFSET + 31;
-	public static final int NODE_CHANGE = EVENT_OFFSET + 32;
-	public static final int PROCESS_CHANGE = EVENT_OFFSET + 33;
-	public static final int QUEUE_CHANGE = EVENT_OFFSET + 34;
-
-	/*
-	 * Remove model element events
-	 */
-	public static final int REMOVE_ALL = EVENT_OFFSET + 40;
-	public static final int REMOVE_JOB = EVENT_OFFSET + 41;
-	public static final int REMOVE_MACHINE = EVENT_OFFSET + 42;
-	public static final int REMOVE_NODE = EVENT_OFFSET + 43;
-	public static final int REMOVE_PROCESS = EVENT_OFFSET + 44;
-	public static final int REMOVE_QUEUE = EVENT_OFFSET + 45;
-
-	/*
-	 * Miscellaneous events
-	 */
-	public static final int MESSAGE = EVENT_OFFSET + 50;
-	public static final int ATTR_DEF = EVENT_OFFSET + 51;
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEventFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEventFactory.java
deleted file mode 100644
index 0098fa3..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeEventFactory.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.event.IProxyEventFactory;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent.Level;
-
-public interface IProxyRuntimeEventFactory extends IProxyEventFactory {
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeAttributeDefEvent newProxyRuntimeAttributeDefEvent(int transID, String[] args);
-	
-	/**
-	 * @return
-	 */
-	public IProxyRuntimeConnectedStateEvent newProxyRuntimeConnectedStateEvent();
-	
-	/**
-	 * @return
-	 */
-	public IProxyRuntimeErrorStateEvent newProxyRuntimeErrorStateEvent();
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeJobChangeEvent newProxyRuntimeJobChangeEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeMachineChangeEvent newProxyRuntimeMachineChangeEvent(int transID, String[] args);
-	
-	/**
-	 * @param event
-	 * @return
-	 */
-	public IProxyRuntimeMessageEvent newProxyRuntimeMessageEvent(IProxyMessageEvent event);
-	
-	/**
-	 * @param level
-	 * @param message
-	 * @return
-	 */
-	public IProxyRuntimeMessageEvent newProxyRuntimeMessageEvent(Level level, String message);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeNewJobEvent newProxyRuntimeNewJobEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeNewMachineEvent newProxyRuntimeNewMachineEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeNewNodeEvent newProxyRuntimeNewNodeEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeNewProcessEvent newProxyRuntimeNewProcessEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeNewQueueEvent newProxyRuntimeNewQueueEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeNodeChangeEvent newProxyRuntimeNodeChangeEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeProcessChangeEvent newProxyRuntimeProcessChangeEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeRemoveAllEvent newProxyRuntimeRemoveAllEventt(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeRemoveJobEvent newProxyRuntimeRemoveJobEvent(int transID, String[] args);
-
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeRemoveMachineEvent newProxyRuntimeRemoveMachineEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeRemoveNodeEvent newProxyRuntimeRemoveNodeEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeRemoveProcessEvent newProxyRuntimeRemoveProcessEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeRemoveQueueEvent newProxyRuntimeRemoveQueueEvent(int transID, String[] args);
-
-	/**
-	 * @return
-	 */
-	public IProxyRuntimeRunningStateEvent newProxyRuntimeRunningStateEvent();
-	
-	/**
-	 * @return
-	 */
-	public IProxyRuntimeShutdownStateEvent newProxyRuntimeShutdownStateEvent();
-
-	/**
-	 * @param message
-	 * @return
-	 */
-	public IProxyRuntimeStartupErrorEvent newProxyRuntimeStartupErrorEvent(String message);
-	
-	/**
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeStartupErrorEvent newProxyRuntimeStartupErrorEvent(String args[]);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeSubmitJobErrorEvent newProxyRuntimeSubmitJobErrorEvent(int transID, String[] args);
-	
-	/**
-	 * @param transID
-	 * @param args
-	 * @return
-	 */
-	public IProxyRuntimeTerminateJobErrorEvent newProxyRuntimeTerminateJobErrorEvent(int transID, String[] args);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeJobChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeJobChangeEvent.java
deleted file mode 100644
index 7ea5fc7..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeJobChangeEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeJobChangeEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMachineChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMachineChangeEvent.java
deleted file mode 100644
index 179434d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMachineChangeEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeMachineChangeEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMessageEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMessageEvent.java
deleted file mode 100644
index 21e80e6..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeMessageEvent.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-
-public interface IProxyRuntimeMessageEvent extends IProxyMessageEvent {
-	public enum ErrorType {
-		CONNECT_TIMEOUT,
-		COMMAND_TIMEOUT,
-		DISCONNECTED,
-		PROXY,
-		INTERNAL
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewJobEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewJobEvent.java
deleted file mode 100644
index 04ef725..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewJobEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeNewJobEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewMachineEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewMachineEvent.java
deleted file mode 100644
index ddb286d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewMachineEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeNewMachineEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewNodeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewNodeEvent.java
deleted file mode 100644
index 8f399a8..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewNodeEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeNewNodeEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewProcessEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewProcessEvent.java
deleted file mode 100644
index a8159f3..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewProcessEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeNewProcessEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewQueueEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewQueueEvent.java
deleted file mode 100644
index 935ded6..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNewQueueEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeNewQueueEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNodeChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNodeChangeEvent.java
deleted file mode 100644
index b4f2353..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeNodeChangeEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeNodeChangeEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeProcessChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeProcessChangeEvent.java
deleted file mode 100644
index 9c7079a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeProcessChangeEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeProcessChangeEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeQueueChangeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeQueueChangeEvent.java
deleted file mode 100644
index f09ea37..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeQueueChangeEvent.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeQueueChangeEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveAllEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveAllEvent.java
deleted file mode 100644
index 6815421..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveAllEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeRemoveAllEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveJobEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveJobEvent.java
deleted file mode 100644
index 32a0933..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveJobEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeRemoveJobEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveMachineEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveMachineEvent.java
deleted file mode 100644
index 7bef53f..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveMachineEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeRemoveMachineEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveNodeEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveNodeEvent.java
deleted file mode 100644
index 99d12e3..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveNodeEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeRemoveNodeEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveProcessEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveProcessEvent.java
deleted file mode 100644
index 0a058ce..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveProcessEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeRemoveProcessEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveQueueEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveQueueEvent.java
deleted file mode 100644
index 9fbcc9d..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRemoveQueueEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeRemoveQueueEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRunningStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRunningStateEvent.java
deleted file mode 100644
index 9d02d3a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeRunningStateEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeRunningStateEvent extends IProxyRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeShutdownStateEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeShutdownStateEvent.java
deleted file mode 100644
index 374fbba..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeShutdownStateEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeShutdownStateEvent extends IProxyRuntimeEvent {
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeStartupErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeStartupErrorEvent.java
deleted file mode 100644
index 17c288e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeStartupErrorEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeStartupErrorEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeSubmitJobErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeSubmitJobErrorEvent.java
deleted file mode 100644
index 785322e..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeSubmitJobErrorEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeSubmitJobErrorEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeTerminateJobErrorEvent.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeTerminateJobErrorEvent.java
deleted file mode 100644
index 4bd59b1..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/IProxyRuntimeTerminateJobErrorEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-public interface IProxyRuntimeTerminateJobErrorEvent extends IProxyRuntimeEvent {
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/ProxyRuntimeEventFactory.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/ProxyRuntimeEventFactory.java
deleted file mode 100644
index 965a911..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/event/ProxyRuntimeEventFactory.java
+++ /dev/null

@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.event;
-
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeAttributeDefEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeConnectedStateEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeErrorStateEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeJobChangeEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeMachineChangeEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeMessageEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeNewJobEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeNewMachineEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeNewNodeEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeNewProcessEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeNewQueueEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeNodeChangeEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeProcessChangeEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeQueueChangeEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeRemoveAllEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeRemoveJobEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeRemoveMachineEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeRemoveNodeEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeRemoveProcessEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeRemoveQueueEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeRunningStateEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeShutdownStateEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeStartupErrorEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeSubmitJobErrorEvent;
-import org.eclipse.ptp.internal.proxy.runtime.event.ProxyRuntimeTerminateJobErrorEvent;
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent;
-import org.eclipse.ptp.proxy.event.ProxyEventFactory;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent.Level;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public class ProxyRuntimeEventFactory extends ProxyEventFactory implements IProxyRuntimeEventFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeAttributeDefEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeAttributeDefEvent newProxyRuntimeAttributeDefEvent(int transID, String[] args) {
-		return new ProxyRuntimeAttributeDefEvent(transID, args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeConnectedStateEvent()
-	 */
-	public IProxyRuntimeConnectedStateEvent newProxyRuntimeConnectedStateEvent() {
-		return new ProxyRuntimeConnectedStateEvent();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeErrorStateEvent()
-	 */
-	public IProxyRuntimeErrorStateEvent newProxyRuntimeErrorStateEvent() {
-		return new ProxyRuntimeErrorStateEvent();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeJobChangeEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeJobChangeEvent newProxyRuntimeJobChangeEvent(int transID, String[] args) {
-		return new ProxyRuntimeJobChangeEvent(transID, args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeMachineChangeEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeMachineChangeEvent newProxyRuntimeMachineChangeEvent(int transID, String[] args) {
-		return new ProxyRuntimeMachineChangeEvent(transID, args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeMessageEvent(org.eclipse.ptp.proxy.event.IProxyMessageEvent)
-	 */
-	public IProxyRuntimeMessageEvent newProxyRuntimeMessageEvent(
-			IProxyMessageEvent event) {
-		return new ProxyRuntimeMessageEvent(event);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeMessageEvent(org.eclipse.ptp.proxy.event.IProxyMessageEvent.Level, java.lang.String)
-	 */
-	public IProxyRuntimeMessageEvent newProxyRuntimeMessageEvent(Level level,
-			String message) {
-		return new ProxyRuntimeMessageEvent(level, message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeNewJobEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeNewJobEvent newProxyRuntimeNewJobEvent(int transID, String[] args) {
-		return new ProxyRuntimeNewJobEvent(transID, args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeNewMachineEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeNewMachineEvent newProxyRuntimeNewMachineEvent(int transID, String[] args) {
-		return new ProxyRuntimeNewMachineEvent(transID, args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeNewNodeEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeNewNodeEvent newProxyRuntimeNewNodeEvent(int transID, String[] args) {
-		return new ProxyRuntimeNewNodeEvent(transID, args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeNewProcessEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeNewProcessEvent newProxyRuntimeNewProcessEvent(int transID, String[] args) {
-		return new ProxyRuntimeNewProcessEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeNewQueueEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeNewQueueEvent newProxyRuntimeNewQueueEvent(int transID, String[] args) {
-		return new ProxyRuntimeNewQueueEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeNodeChangeEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeNodeChangeEvent newProxyRuntimeNodeChangeEvent(int transID, String[] args) {
-		return new ProxyRuntimeNodeChangeEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeProcessChangeEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeProcessChangeEvent newProxyRuntimeProcessChangeEvent(int transID, String[] args) {
-		return new ProxyRuntimeProcessChangeEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeRemoveAllEventt(int, java.lang.String[])
-	 */
-	public IProxyRuntimeRemoveAllEvent newProxyRuntimeRemoveAllEventt(int transID, String[] args) {
-		return new ProxyRuntimeRemoveAllEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeRemoveJobEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeRemoveJobEvent newProxyRuntimeRemoveJobEvent(int transID, String[] args) {
-		return new ProxyRuntimeRemoveJobEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeRemoveMachineEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeRemoveMachineEvent newProxyRuntimeRemoveMachineEvent(int transID, String[] args) {
-		return new ProxyRuntimeRemoveMachineEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeRemoveNodeEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeRemoveNodeEvent newProxyRuntimeRemoveNodeEvent(int transID, String[] args) {
-		return new ProxyRuntimeRemoveNodeEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeRemoveProcessEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeRemoveProcessEvent newProxyRuntimeRemoveProcessEvent(int transID, String[] args) {
-		return new ProxyRuntimeRemoveProcessEvent(transID, args);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeRemoveQueueEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeRemoveQueueEvent newProxyRuntimeRemoveQueueEvent(int transID, String[] args) {
-		return new ProxyRuntimeRemoveQueueEvent(transID, args);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeRunningStateEvent()
-	 */
-	public IProxyRuntimeRunningStateEvent newProxyRuntimeRunningStateEvent() {
-		return new ProxyRuntimeRunningStateEvent();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeShutdownStateEvent()
-	 */
-	public IProxyRuntimeShutdownStateEvent newProxyRuntimeShutdownStateEvent() {
-		return new ProxyRuntimeShutdownStateEvent();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeStartupErrorEvent(java.lang.String)
-	 */
-	public IProxyRuntimeStartupErrorEvent newProxyRuntimeStartupErrorEvent(
-			String message) {
-		return new ProxyRuntimeStartupErrorEvent(message);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeStartupErrorEvent(java.lang.String[])
-	 */
-	public IProxyRuntimeStartupErrorEvent newProxyRuntimeStartupErrorEvent(
-			String[] args) {
-		return new ProxyRuntimeStartupErrorEvent(args);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeSubmitJobErrorEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeSubmitJobErrorEvent newProxyRuntimeSubmitJobErrorEvent(
-			int transID, String[] args) {
-		return new ProxyRuntimeSubmitJobErrorEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.runtime.event.IProxyRuntimeEventFactory#newProxyRuntimeTerminateJobErrorEvent(int, java.lang.String[])
-	 */
-	public IProxyRuntimeTerminateJobErrorEvent newProxyRuntimeTerminateJobErrorEvent(
-			int transID, String[] args) {
-		return new ProxyRuntimeTerminateJobErrorEvent(transID, args);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.event.ProxyEventFactory#toEvent(org.eclipse.ptp.proxy.packet.ProxyPacket)
-	 */
-	public IProxyEvent toEvent(ProxyPacket packet) {
-		IProxyRuntimeEvent	evt = null;
-
-		IProxyEvent e = super.toEvent(packet);
-		if (e != null) {
-			return e;
-		}
-		
-		switch (packet.getID()) {
-		case IProxyRuntimeEvent.ATTR_DEF:
-			evt = new ProxyRuntimeAttributeDefEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.NEW_JOB:
-			evt = new ProxyRuntimeNewJobEvent(packet.getTransID(), packet.getArgs());
-			break;
-		
-		case IProxyRuntimeEvent.NEW_MACHINE:
-			evt = new ProxyRuntimeNewMachineEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.NEW_NODE:
-			evt = new ProxyRuntimeNewNodeEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.NEW_PROCESS:
-			evt = new ProxyRuntimeNewProcessEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.NEW_QUEUE:
-			evt = new ProxyRuntimeNewQueueEvent(packet.getTransID(), packet.getArgs());
-			break;
-			
-		case IProxyRuntimeEvent.JOB_CHANGE:
-			evt = new ProxyRuntimeJobChangeEvent(packet.getTransID(), packet.getArgs());
-			break;
-		
-		case IProxyRuntimeEvent.MACHINE_CHANGE:
-			evt = new ProxyRuntimeMachineChangeEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.NODE_CHANGE:
-			evt = new ProxyRuntimeNodeChangeEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.PROCESS_CHANGE:
-			evt = new ProxyRuntimeProcessChangeEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.QUEUE_CHANGE:
-			evt = new ProxyRuntimeQueueChangeEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.REMOVE_ALL:
-			evt = new ProxyRuntimeRemoveAllEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.REMOVE_JOB:
-			evt = new ProxyRuntimeRemoveJobEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.REMOVE_MACHINE:
-			evt = new ProxyRuntimeRemoveMachineEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.REMOVE_NODE:
-			evt = new ProxyRuntimeRemoveNodeEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.REMOVE_PROCESS:
-			evt = new ProxyRuntimeRemoveProcessEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.REMOVE_QUEUE:
-			evt = new ProxyRuntimeRemoveQueueEvent(packet.getTransID(), packet.getArgs());
-			break;
-
-		case IProxyRuntimeEvent.SUBMITJOB_ERROR:
-			evt = new ProxyRuntimeSubmitJobErrorEvent(packet.getTransID(), packet.getArgs());
-			break;
-			
-		case IProxyRuntimeEvent.TERMINATEJOB_ERROR:
-			evt = new ProxyRuntimeTerminateJobErrorEvent(packet.getTransID(), packet.getArgs());
-			break;
-		}
-			
-		return evt;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/AbstractProxyRuntimeServer.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/AbstractProxyRuntimeServer.java
deleted file mode 100644
index 84336a7..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/AbstractProxyRuntimeServer.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.server;
-
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-import org.eclipse.ptp.proxy.runtime.command.ProxyRuntimeCommandFactory;
-import org.eclipse.ptp.proxy.server.AbstractProxyServer;
-
-public abstract class AbstractProxyRuntimeServer extends AbstractProxyServer {
-
-	/*
-	 * Event queue for incoming events.
-	 */
-	private LinkedBlockingQueue<IProxyEvent>	events = 
-		new LinkedBlockingQueue<IProxyEvent>();
-
-	public AbstractProxyRuntimeServer(String host, int port) {
-		super(host, port, new ProxyRuntimeCommandFactory());
-	}
-	
-	public void sendEvent(IProxyEvent event) {
-		synchronized (events) {
-			events.add(event);
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/IProxyRuntimeCommandListener.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/IProxyRuntimeCommandListener.java
deleted file mode 100644
index 877a8ff..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/runtime/server/IProxyRuntimeCommandListener.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.runtime.server;
-
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeInitCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeModelDefCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStartEventsCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStopEventsCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeSubmitJobCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeTerminateJobCommand;
-
-public interface IProxyRuntimeCommandListener {
-	/**
-	 * @param c
-	 */
-	public void handleCommand(IProxyRuntimeInitCommand c);
-	
-	/**
-	 * @param c
-	 */
-	public void handleCommand(IProxyRuntimeModelDefCommand c);
-	
-	/**
-	 * @param c
-	 */
-	public void handleCommand(IProxyRuntimeStartEventsCommand c);
-	
-	/**
-	 * @param c
-	 */
-	public void handleCommand(IProxyRuntimeStopEventsCommand c);
-	
-	/**
-	 * @param c
-	 */
-	public void handleCommand(IProxyRuntimeSubmitJobCommand c);
-	
-	/**
-	 * @param c
-	 */
-	public void handleCommand(IProxyRuntimeTerminateJobCommand c);
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/AbstractProxyServer.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/AbstractProxyServer.java
deleted file mode 100644
index bc10845..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/AbstractProxyServer.java
+++ /dev/null

@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.server;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.nio.channels.ReadableByteChannel;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.command.IProxyCommandFactory;
-import org.eclipse.ptp.proxy.command.IProxyCommandListener;
-import org.eclipse.ptp.proxy.command.IProxyExtendedCommand;
-import org.eclipse.ptp.proxy.command.IProxyQuitCommand;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public abstract class AbstractProxyServer implements IProxyServer {
-	private enum ServerState {WAITING, CONNECTED, RUNNING, SHUTTING_DOWN, SHUTDOWN}
-
-	public static final int MAX_ERRORS = 5;
-	
-	private ServerState 				state = ServerState.SHUTDOWN;
-
-	private String						sessHost;
-	private int							sessPort;
-	private Socket 						sessSocket;
-	private ReadableByteChannel 		sessInput;
-	private IProxyCommandFactory		proxyCommandFactory;
-	private Thread						commandThread;
-	private List<IProxyCommandListener>	listeners = 
-		Collections.synchronizedList(new ArrayList<IProxyCommandListener>());
-
-	public AbstractProxyServer(String host, int port, IProxyCommandFactory factory) {
-		this.sessHost = host;
-		this.sessPort = port;
-		this.proxyCommandFactory = factory;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.server.IProxyServer#addListener(org.eclipse.ptp.proxy.command.IProxyCommandListener)
-	 */
-	public void addListener(IProxyCommandListener listener) {
-		listeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.server.IProxyServer#addListener(org.eclipse.ptp.proxy.command.IProxyCommandListener)
-	 */
-	public void removeListener(IProxyCommandListener listener) {
-		listeners.remove(listener);
-	}
-
-	public void connect() throws IOException {
-		sessSocket = new Socket(sessHost, sessPort);
-		sessInput = sessSocket.getChannel();
-	}
-	
-	/**
-	 * Start a thread to process commands from the proxy by repeatedly 
-	 * calling sessionProgress(). 
-	 */
-	public void start() {
-		commandThread = new Thread("Proxy Server Command Thread") {
-			public void run() {
-				boolean error = false;
-				int errorCount = 0;			
-				
-				System.out.println("server command thread starting...");
-				try {
-					while (errorCount < MAX_ERRORS && !isInterrupted()) {
-						synchronized(state) {
-							if (state == ServerState.SHUTDOWN) {
-								break;
-							}
-						}
-						if (!sessionProgress()) {
-							errorCount++;
-						}
-					}
-				} catch (IOException e) {
-					synchronized(state) {
-						if (!isInterrupted() && state != ServerState.SHUTTING_DOWN) {
-							error = true;
-							System.out.println("event thread IOException . . . " + e.getMessage());
-						}
-					}
-				} 
-				
-				if (errorCount >= MAX_ERRORS) {
-					error = true;
-				}
-				
-				try {
-					sessSocket.close();
-				} catch (IOException e) {
-				} 
-				
-				synchronized(state) {
-					state = ServerState.SHUTDOWN;
-				}
-
-				System.out.println("server thread exited");
-				if (error) {
-					System.out.println(" due to errors");
-				} else {
-					System.out.println(" normally");
-				}
-			}
-		};
-
-		try {
-			commandThread.join();
-		} catch (InterruptedException e) {
-		}
-	}
-
-	/**
-	 * Process commands from the wire
-	 * 
-	 * @return 
-	 * @throws IOException
-	 */
-	private boolean sessionProgress() throws IOException {
-		ProxyPacket packet = new ProxyPacket();
-		if (!packet.read(sessInput)) {
-			return false;
-		}
-		
-		/*
-		 * Now convert the event into an IProxyEvent
-		 */
-		IProxyCommand cmd = proxyCommandFactory.toCommand(packet);
-				
-		if (cmd != null) {
-			if (cmd instanceof IProxyQuitCommand) {
-				fireProxyQuitCommand((IProxyQuitCommand)cmd);
-			} else if (cmd instanceof IProxyExtendedCommand) {
-				fireProxyExtendedCommand((IProxyExtendedCommand)cmd);
-			}
-			
-			return true;
-		}
-		
-		return false;
-	}
-	
-	/**
-	 * Send command to command handlers
-	 * 
-	 * @param cmd
-	 */
-	protected void fireProxyExtendedCommand(IProxyExtendedCommand cmd) {
-		IProxyCommandListener[] la = listeners.toArray(new IProxyCommandListener[0]);
-		for (IProxyCommandListener listener : la) {
-			listener.handleCommand(cmd);
-		}
-	}
-	
-	/**
-	 * Send command to command handlers
-	 * 
-	 * @param cmd
-	 */
-	protected void fireProxyQuitCommand(IProxyQuitCommand cmd) {
-		IProxyCommandListener[] la = listeners.toArray(new IProxyCommandListener[0]);
-		for (IProxyCommandListener listener : la) {
-			listener.handleCommand(cmd);
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/IProxyServer.java b/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/IProxyServer.java
deleted file mode 100644
index e497e4a..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/src/org/eclipse/ptp/proxy/server/IProxyServer.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.proxy.server;
-
-import org.eclipse.ptp.proxy.command.IProxyCommandListener;
-
-public interface IProxyServer {
-	/**
-	 * Add listener to receive proxy commands
-	 * 
-	 * @param listener listener to receive commands
-	 */
-	public void addListener(IProxyCommandListener listener);
-	
-	/**
-	 * Remove listener from receiving proxy commands
-	 * 
-	 * @param listener listener to remove
-	 */
-	public void removeListener(IProxyCommandListener listener);
-	
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/DebugOptions.java b/core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/DebugOptions.java
deleted file mode 100644
index 599ecd0..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/DebugOptions.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.proxy.util;
-
-public class DebugOptions {
-	public static boolean CLIENT_TRACING = false;
-	public static int SERVER_DEBUG_LEVEL = 0;
-	public static boolean PROTOCOL_TRACING = false;
-}

diff --git a/core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/ProtocolUtil.java b/core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/ProtocolUtil.java
deleted file mode 100644
index f949389..0000000
--- a/core/org.eclipse.ptp.proxy.protocol/util/org/eclipse/ptp/proxy/util/ProtocolUtil.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.proxy.util;
-
-import java.math.BigInteger;
-import java.nio.CharBuffer;
-
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-
-public class ProtocolUtil {
-	public final static int HEXADECIMAL = 0;
-	public final static int OCTAL = 1;
-	public final static int BINARY = 2;
-	public final static int DECIMAL = 3;
-	public final static int RAW = 4;
-	public final static int NATURAL = 5;
-
-	public final static int FLOAT = 10;
-	public final static int ADDRESS = 11;
-	public final static int INSTRUCTION = 12;
-	public final static int CHAR = 13;
-	public final static int STRING = 14;
-	public final static int UNSIGNED = 15;
-
-	/**
-	 * Decode a string into a BigInteger
-	 * 
-	 * @param address
-	 * @return BigInteger
-	 */
-	public static BigInteger decodeAddress(String address) {
-		int index = 0;
-		int radix = 10;
-		boolean negative = false;
-
-		// Handle zero length
-		address = address.trim();
-		if (address.length() == 0) {
-			return BigInteger.ZERO;
-		}
-
-		// Handle minus sign, if present
-		if (address.startsWith("-")) {
-			negative = true;
-			index++;
-		}
-		if (address.startsWith("0x", index) || address.startsWith("0X", index)) {
-			index += 2;
-			radix = 16;
-		} else if (address.startsWith("#", index)) {
-			index ++;
-			radix = 16;
-		} else if (address.startsWith("0", index) && address.length() > 1 + index) {
-			index ++;
-			radix = 8;
-		}
-
-		if (index > 0) {
-			address = address.substring(index);
-		}
-		if (negative) {
-			address = "-" + address;
-		}
-		try {
-			return new BigInteger(address, radix);
-		} catch (NumberFormatException e) {
-			// ...
-			// What can we do ???
-		}
-		return BigInteger.ZERO;
-	}
-	
-	/**
-	 * Convert as sequence of hexadecimal values to a Java byte array.
-	 * 
-	 * @param str
-	 * @return byte array
-	 */
-	public static byte[] decodeBytes(String str) {
-		int len = str.length()/2;
-		byte[] strBytes = new byte[len];
-		
-		for (int i = 0, p = 0; i < len; i++, p += 2) {
-			byte c = (byte) ((Character.digit(str.charAt(p), 16) & 0xf) << 4);
-			c |= (byte) ((Character.digit(str.charAt(p+1), 16) & 0xf));
-			strBytes[i] = c;
-		}
-		
-		return strBytes;
-	}
-
-	/**
-	 * Convert a proxy representation of a string into a Java String
-	 * 
-	 * @param buf
-	 * @param start
-	 * @return proxy string converted to Java String
-	 */
-	public static String decodeString(CharBuffer buf, int start) {
-		int end = start + ProxyPacket.PACKET_ARG_LEN_SIZE;
-		int len = Integer.parseInt(buf.subSequence(start, end).toString(), 16);
-		start = end + 1; // Skip ':'
-		end = start + len;
-		return buf.subSequence(start, end).toString();
-	}
-	
-	/**
-	 * Convert an integer to it's proxy representation
-	 * 
-	 * @param val
-	 * @param len
-	 * @return proxy representation
-	 */
-	public static String encodeIntVal(int val, int len) {
-		char[] res = new char[len];
-		String str = Integer.toHexString(val);
-		int rem = len - str.length();
-		
-		for (int i = 0 ; i < len ; i++) {
-			if (i < rem)
-				res[i] = '0';
-			else
-				res[i] = str.charAt(i - rem);
-		}
-		return String.valueOf(res);
-	}
-
-	/**
-	 * Encode a string into it's proxy representation
-	 * 
-	 * @param str
-	 * @return proxy representation
-	 */
-	public static String encodeString(String str) {
-		int len;
-		
-		if (str == null) {
-			len = 0;
-			str = "";
-		} else {
-			len = str.length();
-		}
-		
-		return encodeIntVal(len, ProxyPacket.PACKET_ARG_LEN_SIZE) + ":" + str;		
-	}	
-
-}

diff --git a/core/org.eclipse.ptp.proxy/.cdtproject b/core/org.eclipse.ptp.proxy/.cdtproject
deleted file mode 100644
index 62bd06c..0000000
--- a/core/org.eclipse.ptp.proxy/.cdtproject
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<data>
-<item id="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</item>
-<item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</item>
-
-
-</data>
-</cdtproject>

diff --git a/core/org.eclipse.ptp.proxy/.cproject b/core/org.eclipse.ptp.proxy/.cproject
deleted file mode 100644
index c4cfd8f..0000000
--- a/core/org.eclipse.ptp.proxy/.cproject
+++ /dev/null

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="converted.config.887763833">
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</storageModule>
-<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.887763833" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-</extensions>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="all" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>all</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>true</runAllBuilders>
-</target>
-<target name="clean" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>clean</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>true</runAllBuilders>
-</target>
-</buildTargets>
-</storageModule>
-</cconfiguration>
-</storageModule>
-</cproject>

diff --git a/core/org.eclipse.ptp.proxy/.cvsignore b/core/org.eclipse.ptp.proxy/.cvsignore
deleted file mode 100644
index 4560987..0000000
--- a/core/org.eclipse.ptp.proxy/.cvsignore
+++ /dev/null

@@ -1,9 +0,0 @@
-.deps
-stamp-h1
-libtool
-config.status
-Makefile
-config.h
-autom4te.cache
-*.a
-a.out.dSYM

diff --git a/core/org.eclipse.ptp.proxy/.project b/core/org.eclipse.ptp.proxy/.project
deleted file mode 100644
index b917f8d..0000000
--- a/core/org.eclipse.ptp.proxy/.project
+++ /dev/null

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.proxy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.makeBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.core.errorOutputParser</key>
-					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.environment</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.inc</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.location</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.command</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.clean</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.full</key>
-					<value>clean all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.auto</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>false</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</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.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.make.core.makeNature</nature>
-		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.proxy/.settings/org.eclipse.cdt.core.prefs b/core/org.eclipse.ptp.proxy/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index 67e7e91..0000000
--- a/core/org.eclipse.ptp.proxy/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue May 01 12:59:12 MDT 2007
-eclipse.preferences.version=1
-indexer/indexerId=org.eclipse.cdt.core.domsourceindexer
-indexerId=org.eclipse.cdt.core.domsourceindexer

diff --git a/core/org.eclipse.ptp.proxy/AUTHORS b/core/org.eclipse.ptp.proxy/AUTHORS
deleted file mode 100644
index e5cbfbc..0000000
--- a/core/org.eclipse.ptp.proxy/AUTHORS
+++ /dev/null

@@ -1 +0,0 @@
-Greg Watson <g.watson@computer.org>
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy/COPYING b/core/org.eclipse.ptp.proxy/COPYING
deleted file mode 100644
index 8b7e105..0000000
--- a/core/org.eclipse.ptp.proxy/COPYING
+++ /dev/null

@@ -1,16 +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
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy/ChangeLog b/core/org.eclipse.ptp.proxy/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/core/org.eclipse.ptp.proxy/ChangeLog
+++ /dev/null


diff --git a/core/org.eclipse.ptp.proxy/INSTALL b/core/org.eclipse.ptp.proxy/INSTALL
deleted file mode 100644
index 2ca06b0..0000000
--- a/core/org.eclipse.ptp.proxy/INSTALL
+++ /dev/null

@@ -1,19 +0,0 @@
-PTP Scalable Debug Manager
-
-Basic Installation
-==================
-
-The simplest way to compile this package is:
-
-  1. Make sure you have the latest versions of 'automake' and 
-     'libtool' (at this time it is 1.9.6 and 1.5.20 respectively). 
-     They can be obtained from ftp.gnu.org if necessary.
-     
-  2. Run 'autoreconf' which will build the various configure scripts.
-
-  3. At the top level, run './configure' to create the Makefiles.
-
-  4. Type `make' to build the package.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.

diff --git a/core/org.eclipse.ptp.proxy/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index abea860..0000000
--- a/core/org.eclipse.ptp.proxy/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.proxy
-Bundle-Version: 2.1.4.qualifier
-Bundle-Vendor: %pluginProvider

diff --git a/core/org.eclipse.ptp.proxy/Makefile.am b/core/org.eclipse.ptp.proxy/Makefile.am
deleted file mode 100644
index 00f34d4..0000000
--- a/core/org.eclipse.ptp.proxy/Makefile.am
+++ /dev/null

@@ -1,20 +0,0 @@
-noinst_LIBRARIES =			libproxyclnt.a libproxysvr.a
-
-libproxyclnt_a_SOURCES =	src/proxy.c \
-							src/proxy_attr.c \
-							src/proxy_clnt.c \
-							src/proxy_tcp.c \
-							src/proxy_tcp_clnt.c \
-							src/proxy_msg.c
-libproxyclnt_a_CFLAGS =		-I./include $(AM_CFLAGS) -g
-
-libproxysvr_a_SOURCES =		src/proxy.c \
-							src/proxy_attr.c \
-							src/proxy_svr.c \
-							src/proxy_stdio.c \
-							src/proxy_stdio_svr.c \
-							src/proxy_tcp.c \
-							src/proxy_tcp_svr.c \
-							src/proxy_msg.c \
-							src/proxy_event.c
-libproxysvr_a_CFLAGS =		-I./include $(AM_CFLAGS) -g

diff --git a/core/org.eclipse.ptp.proxy/Makefile.in b/core/org.eclipse.ptp.proxy/Makefile.in
deleted file mode 100644
index f4bd942..0000000
--- a/core/org.eclipse.ptp.proxy/Makefile.in
+++ /dev/null

@@ -1,794 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libproxyclnt_a_AR = $(AR) $(ARFLAGS)
-libproxyclnt_a_LIBADD =
-am_libproxyclnt_a_OBJECTS = libproxyclnt_a-proxy.$(OBJEXT) \
-	libproxyclnt_a-proxy_attr.$(OBJEXT) \
-	libproxyclnt_a-proxy_clnt.$(OBJEXT) \
-	libproxyclnt_a-proxy_tcp.$(OBJEXT) \
-	libproxyclnt_a-proxy_tcp_clnt.$(OBJEXT) \
-	libproxyclnt_a-proxy_msg.$(OBJEXT)
-libproxyclnt_a_OBJECTS = $(am_libproxyclnt_a_OBJECTS)
-libproxysvr_a_AR = $(AR) $(ARFLAGS)
-libproxysvr_a_LIBADD =
-am_libproxysvr_a_OBJECTS = libproxysvr_a-proxy.$(OBJEXT) \
-	libproxysvr_a-proxy_attr.$(OBJEXT) \
-	libproxysvr_a-proxy_svr.$(OBJEXT) \
-	libproxysvr_a-proxy_stdio.$(OBJEXT) \
-	libproxysvr_a-proxy_stdio_svr.$(OBJEXT) \
-	libproxysvr_a-proxy_tcp.$(OBJEXT) \
-	libproxysvr_a-proxy_tcp_svr.$(OBJEXT) \
-	libproxysvr_a-proxy_msg.$(OBJEXT) \
-	libproxysvr_a-proxy_event.$(OBJEXT)
-libproxysvr_a_OBJECTS = $(am_libproxysvr_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libproxyclnt_a_SOURCES) $(libproxysvr_a_SOURCES)
-DIST_SOURCES = $(libproxyclnt_a_SOURCES) $(libproxysvr_a_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LIBRARIES = libproxyclnt.a libproxysvr.a
-libproxyclnt_a_SOURCES = src/proxy.c \
-							src/proxy_attr.c \
-							src/proxy_clnt.c \
-							src/proxy_tcp.c \
-							src/proxy_tcp_clnt.c \
-							src/proxy_msg.c
-
-libproxyclnt_a_CFLAGS = -I./include $(AM_CFLAGS) -g
-libproxysvr_a_SOURCES = src/proxy.c \
-							src/proxy_attr.c \
-							src/proxy_svr.c \
-							src/proxy_stdio.c \
-							src/proxy_stdio_svr.c \
-							src/proxy_tcp.c \
-							src/proxy_tcp_svr.c \
-							src/proxy_msg.c \
-							src/proxy_event.c
-
-libproxysvr_a_CFLAGS = -I./include $(AM_CFLAGS) -g
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libproxyclnt.a: $(libproxyclnt_a_OBJECTS) $(libproxyclnt_a_DEPENDENCIES) 
-	-rm -f libproxyclnt.a
-	$(libproxyclnt_a_AR) libproxyclnt.a $(libproxyclnt_a_OBJECTS) $(libproxyclnt_a_LIBADD)
-	$(RANLIB) libproxyclnt.a
-libproxysvr.a: $(libproxysvr_a_OBJECTS) $(libproxysvr_a_DEPENDENCIES) 
-	-rm -f libproxysvr.a
-	$(libproxysvr_a_AR) libproxysvr.a $(libproxysvr_a_OBJECTS) $(libproxysvr_a_LIBADD)
-	$(RANLIB) libproxysvr.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxyclnt_a-proxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxyclnt_a-proxy_attr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxyclnt_a-proxy_clnt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxyclnt_a-proxy_msg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxyclnt_a-proxy_tcp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxyclnt_a-proxy_tcp_clnt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_attr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_event.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_msg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_stdio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_stdio_svr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_svr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_tcp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxysvr_a-proxy_tcp_svr.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-libproxyclnt_a-proxy.o: src/proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy.o -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy.Tpo -c -o libproxyclnt_a-proxy.o `test -f 'src/proxy.c' || echo '$(srcdir)/'`src/proxy.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy.Tpo $(DEPDIR)/libproxyclnt_a-proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy.c' object='libproxyclnt_a-proxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy.o `test -f 'src/proxy.c' || echo '$(srcdir)/'`src/proxy.c
-
-libproxyclnt_a-proxy.obj: src/proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy.obj -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy.Tpo -c -o libproxyclnt_a-proxy.obj `if test -f 'src/proxy.c'; then $(CYGPATH_W) 'src/proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy.Tpo $(DEPDIR)/libproxyclnt_a-proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy.c' object='libproxyclnt_a-proxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy.obj `if test -f 'src/proxy.c'; then $(CYGPATH_W) 'src/proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy.c'; fi`
-
-libproxyclnt_a-proxy_attr.o: src/proxy_attr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_attr.o -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_attr.Tpo -c -o libproxyclnt_a-proxy_attr.o `test -f 'src/proxy_attr.c' || echo '$(srcdir)/'`src/proxy_attr.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_attr.Tpo $(DEPDIR)/libproxyclnt_a-proxy_attr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_attr.c' object='libproxyclnt_a-proxy_attr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_attr.o `test -f 'src/proxy_attr.c' || echo '$(srcdir)/'`src/proxy_attr.c
-
-libproxyclnt_a-proxy_attr.obj: src/proxy_attr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_attr.obj -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_attr.Tpo -c -o libproxyclnt_a-proxy_attr.obj `if test -f 'src/proxy_attr.c'; then $(CYGPATH_W) 'src/proxy_attr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_attr.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_attr.Tpo $(DEPDIR)/libproxyclnt_a-proxy_attr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_attr.c' object='libproxyclnt_a-proxy_attr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_attr.obj `if test -f 'src/proxy_attr.c'; then $(CYGPATH_W) 'src/proxy_attr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_attr.c'; fi`
-
-libproxyclnt_a-proxy_clnt.o: src/proxy_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_clnt.o -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_clnt.Tpo -c -o libproxyclnt_a-proxy_clnt.o `test -f 'src/proxy_clnt.c' || echo '$(srcdir)/'`src/proxy_clnt.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_clnt.Tpo $(DEPDIR)/libproxyclnt_a-proxy_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_clnt.c' object='libproxyclnt_a-proxy_clnt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_clnt.o `test -f 'src/proxy_clnt.c' || echo '$(srcdir)/'`src/proxy_clnt.c
-
-libproxyclnt_a-proxy_clnt.obj: src/proxy_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_clnt.obj -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_clnt.Tpo -c -o libproxyclnt_a-proxy_clnt.obj `if test -f 'src/proxy_clnt.c'; then $(CYGPATH_W) 'src/proxy_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_clnt.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_clnt.Tpo $(DEPDIR)/libproxyclnt_a-proxy_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_clnt.c' object='libproxyclnt_a-proxy_clnt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_clnt.obj `if test -f 'src/proxy_clnt.c'; then $(CYGPATH_W) 'src/proxy_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_clnt.c'; fi`
-
-libproxyclnt_a-proxy_tcp.o: src/proxy_tcp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_tcp.o -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_tcp.Tpo -c -o libproxyclnt_a-proxy_tcp.o `test -f 'src/proxy_tcp.c' || echo '$(srcdir)/'`src/proxy_tcp.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_tcp.Tpo $(DEPDIR)/libproxyclnt_a-proxy_tcp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp.c' object='libproxyclnt_a-proxy_tcp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_tcp.o `test -f 'src/proxy_tcp.c' || echo '$(srcdir)/'`src/proxy_tcp.c
-
-libproxyclnt_a-proxy_tcp.obj: src/proxy_tcp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_tcp.obj -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_tcp.Tpo -c -o libproxyclnt_a-proxy_tcp.obj `if test -f 'src/proxy_tcp.c'; then $(CYGPATH_W) 'src/proxy_tcp.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_tcp.Tpo $(DEPDIR)/libproxyclnt_a-proxy_tcp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp.c' object='libproxyclnt_a-proxy_tcp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_tcp.obj `if test -f 'src/proxy_tcp.c'; then $(CYGPATH_W) 'src/proxy_tcp.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp.c'; fi`
-
-libproxyclnt_a-proxy_tcp_clnt.o: src/proxy_tcp_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_tcp_clnt.o -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_tcp_clnt.Tpo -c -o libproxyclnt_a-proxy_tcp_clnt.o `test -f 'src/proxy_tcp_clnt.c' || echo '$(srcdir)/'`src/proxy_tcp_clnt.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_tcp_clnt.Tpo $(DEPDIR)/libproxyclnt_a-proxy_tcp_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp_clnt.c' object='libproxyclnt_a-proxy_tcp_clnt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_tcp_clnt.o `test -f 'src/proxy_tcp_clnt.c' || echo '$(srcdir)/'`src/proxy_tcp_clnt.c
-
-libproxyclnt_a-proxy_tcp_clnt.obj: src/proxy_tcp_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_tcp_clnt.obj -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_tcp_clnt.Tpo -c -o libproxyclnt_a-proxy_tcp_clnt.obj `if test -f 'src/proxy_tcp_clnt.c'; then $(CYGPATH_W) 'src/proxy_tcp_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp_clnt.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_tcp_clnt.Tpo $(DEPDIR)/libproxyclnt_a-proxy_tcp_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp_clnt.c' object='libproxyclnt_a-proxy_tcp_clnt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_tcp_clnt.obj `if test -f 'src/proxy_tcp_clnt.c'; then $(CYGPATH_W) 'src/proxy_tcp_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp_clnt.c'; fi`
-
-libproxyclnt_a-proxy_msg.o: src/proxy_msg.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_msg.o -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_msg.Tpo -c -o libproxyclnt_a-proxy_msg.o `test -f 'src/proxy_msg.c' || echo '$(srcdir)/'`src/proxy_msg.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_msg.Tpo $(DEPDIR)/libproxyclnt_a-proxy_msg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_msg.c' object='libproxyclnt_a-proxy_msg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_msg.o `test -f 'src/proxy_msg.c' || echo '$(srcdir)/'`src/proxy_msg.c
-
-libproxyclnt_a-proxy_msg.obj: src/proxy_msg.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -MT libproxyclnt_a-proxy_msg.obj -MD -MP -MF $(DEPDIR)/libproxyclnt_a-proxy_msg.Tpo -c -o libproxyclnt_a-proxy_msg.obj `if test -f 'src/proxy_msg.c'; then $(CYGPATH_W) 'src/proxy_msg.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_msg.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxyclnt_a-proxy_msg.Tpo $(DEPDIR)/libproxyclnt_a-proxy_msg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_msg.c' object='libproxyclnt_a-proxy_msg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxyclnt_a_CFLAGS) $(CFLAGS) -c -o libproxyclnt_a-proxy_msg.obj `if test -f 'src/proxy_msg.c'; then $(CYGPATH_W) 'src/proxy_msg.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_msg.c'; fi`
-
-libproxysvr_a-proxy.o: src/proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy.Tpo -c -o libproxysvr_a-proxy.o `test -f 'src/proxy.c' || echo '$(srcdir)/'`src/proxy.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy.Tpo $(DEPDIR)/libproxysvr_a-proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy.c' object='libproxysvr_a-proxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy.o `test -f 'src/proxy.c' || echo '$(srcdir)/'`src/proxy.c
-
-libproxysvr_a-proxy.obj: src/proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy.Tpo -c -o libproxysvr_a-proxy.obj `if test -f 'src/proxy.c'; then $(CYGPATH_W) 'src/proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy.Tpo $(DEPDIR)/libproxysvr_a-proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy.c' object='libproxysvr_a-proxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy.obj `if test -f 'src/proxy.c'; then $(CYGPATH_W) 'src/proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy.c'; fi`
-
-libproxysvr_a-proxy_attr.o: src/proxy_attr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_attr.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_attr.Tpo -c -o libproxysvr_a-proxy_attr.o `test -f 'src/proxy_attr.c' || echo '$(srcdir)/'`src/proxy_attr.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_attr.Tpo $(DEPDIR)/libproxysvr_a-proxy_attr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_attr.c' object='libproxysvr_a-proxy_attr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_attr.o `test -f 'src/proxy_attr.c' || echo '$(srcdir)/'`src/proxy_attr.c
-
-libproxysvr_a-proxy_attr.obj: src/proxy_attr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_attr.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_attr.Tpo -c -o libproxysvr_a-proxy_attr.obj `if test -f 'src/proxy_attr.c'; then $(CYGPATH_W) 'src/proxy_attr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_attr.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_attr.Tpo $(DEPDIR)/libproxysvr_a-proxy_attr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_attr.c' object='libproxysvr_a-proxy_attr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_attr.obj `if test -f 'src/proxy_attr.c'; then $(CYGPATH_W) 'src/proxy_attr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_attr.c'; fi`
-
-libproxysvr_a-proxy_svr.o: src/proxy_svr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_svr.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_svr.Tpo -c -o libproxysvr_a-proxy_svr.o `test -f 'src/proxy_svr.c' || echo '$(srcdir)/'`src/proxy_svr.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_svr.Tpo $(DEPDIR)/libproxysvr_a-proxy_svr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_svr.c' object='libproxysvr_a-proxy_svr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_svr.o `test -f 'src/proxy_svr.c' || echo '$(srcdir)/'`src/proxy_svr.c
-
-libproxysvr_a-proxy_svr.obj: src/proxy_svr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_svr.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_svr.Tpo -c -o libproxysvr_a-proxy_svr.obj `if test -f 'src/proxy_svr.c'; then $(CYGPATH_W) 'src/proxy_svr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_svr.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_svr.Tpo $(DEPDIR)/libproxysvr_a-proxy_svr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_svr.c' object='libproxysvr_a-proxy_svr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_svr.obj `if test -f 'src/proxy_svr.c'; then $(CYGPATH_W) 'src/proxy_svr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_svr.c'; fi`
-
-libproxysvr_a-proxy_stdio.o: src/proxy_stdio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_stdio.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_stdio.Tpo -c -o libproxysvr_a-proxy_stdio.o `test -f 'src/proxy_stdio.c' || echo '$(srcdir)/'`src/proxy_stdio.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_stdio.Tpo $(DEPDIR)/libproxysvr_a-proxy_stdio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_stdio.c' object='libproxysvr_a-proxy_stdio.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_stdio.o `test -f 'src/proxy_stdio.c' || echo '$(srcdir)/'`src/proxy_stdio.c
-
-libproxysvr_a-proxy_stdio.obj: src/proxy_stdio.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_stdio.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_stdio.Tpo -c -o libproxysvr_a-proxy_stdio.obj `if test -f 'src/proxy_stdio.c'; then $(CYGPATH_W) 'src/proxy_stdio.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_stdio.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_stdio.Tpo $(DEPDIR)/libproxysvr_a-proxy_stdio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_stdio.c' object='libproxysvr_a-proxy_stdio.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_stdio.obj `if test -f 'src/proxy_stdio.c'; then $(CYGPATH_W) 'src/proxy_stdio.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_stdio.c'; fi`
-
-libproxysvr_a-proxy_stdio_svr.o: src/proxy_stdio_svr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_stdio_svr.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_stdio_svr.Tpo -c -o libproxysvr_a-proxy_stdio_svr.o `test -f 'src/proxy_stdio_svr.c' || echo '$(srcdir)/'`src/proxy_stdio_svr.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_stdio_svr.Tpo $(DEPDIR)/libproxysvr_a-proxy_stdio_svr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_stdio_svr.c' object='libproxysvr_a-proxy_stdio_svr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_stdio_svr.o `test -f 'src/proxy_stdio_svr.c' || echo '$(srcdir)/'`src/proxy_stdio_svr.c
-
-libproxysvr_a-proxy_stdio_svr.obj: src/proxy_stdio_svr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_stdio_svr.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_stdio_svr.Tpo -c -o libproxysvr_a-proxy_stdio_svr.obj `if test -f 'src/proxy_stdio_svr.c'; then $(CYGPATH_W) 'src/proxy_stdio_svr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_stdio_svr.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_stdio_svr.Tpo $(DEPDIR)/libproxysvr_a-proxy_stdio_svr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_stdio_svr.c' object='libproxysvr_a-proxy_stdio_svr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_stdio_svr.obj `if test -f 'src/proxy_stdio_svr.c'; then $(CYGPATH_W) 'src/proxy_stdio_svr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_stdio_svr.c'; fi`
-
-libproxysvr_a-proxy_tcp.o: src/proxy_tcp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_tcp.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_tcp.Tpo -c -o libproxysvr_a-proxy_tcp.o `test -f 'src/proxy_tcp.c' || echo '$(srcdir)/'`src/proxy_tcp.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_tcp.Tpo $(DEPDIR)/libproxysvr_a-proxy_tcp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp.c' object='libproxysvr_a-proxy_tcp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_tcp.o `test -f 'src/proxy_tcp.c' || echo '$(srcdir)/'`src/proxy_tcp.c
-
-libproxysvr_a-proxy_tcp.obj: src/proxy_tcp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_tcp.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_tcp.Tpo -c -o libproxysvr_a-proxy_tcp.obj `if test -f 'src/proxy_tcp.c'; then $(CYGPATH_W) 'src/proxy_tcp.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_tcp.Tpo $(DEPDIR)/libproxysvr_a-proxy_tcp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp.c' object='libproxysvr_a-proxy_tcp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_tcp.obj `if test -f 'src/proxy_tcp.c'; then $(CYGPATH_W) 'src/proxy_tcp.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp.c'; fi`
-
-libproxysvr_a-proxy_tcp_svr.o: src/proxy_tcp_svr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_tcp_svr.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_tcp_svr.Tpo -c -o libproxysvr_a-proxy_tcp_svr.o `test -f 'src/proxy_tcp_svr.c' || echo '$(srcdir)/'`src/proxy_tcp_svr.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_tcp_svr.Tpo $(DEPDIR)/libproxysvr_a-proxy_tcp_svr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp_svr.c' object='libproxysvr_a-proxy_tcp_svr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_tcp_svr.o `test -f 'src/proxy_tcp_svr.c' || echo '$(srcdir)/'`src/proxy_tcp_svr.c
-
-libproxysvr_a-proxy_tcp_svr.obj: src/proxy_tcp_svr.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_tcp_svr.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_tcp_svr.Tpo -c -o libproxysvr_a-proxy_tcp_svr.obj `if test -f 'src/proxy_tcp_svr.c'; then $(CYGPATH_W) 'src/proxy_tcp_svr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp_svr.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_tcp_svr.Tpo $(DEPDIR)/libproxysvr_a-proxy_tcp_svr.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_tcp_svr.c' object='libproxysvr_a-proxy_tcp_svr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_tcp_svr.obj `if test -f 'src/proxy_tcp_svr.c'; then $(CYGPATH_W) 'src/proxy_tcp_svr.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_tcp_svr.c'; fi`
-
-libproxysvr_a-proxy_msg.o: src/proxy_msg.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_msg.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_msg.Tpo -c -o libproxysvr_a-proxy_msg.o `test -f 'src/proxy_msg.c' || echo '$(srcdir)/'`src/proxy_msg.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_msg.Tpo $(DEPDIR)/libproxysvr_a-proxy_msg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_msg.c' object='libproxysvr_a-proxy_msg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_msg.o `test -f 'src/proxy_msg.c' || echo '$(srcdir)/'`src/proxy_msg.c
-
-libproxysvr_a-proxy_msg.obj: src/proxy_msg.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_msg.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_msg.Tpo -c -o libproxysvr_a-proxy_msg.obj `if test -f 'src/proxy_msg.c'; then $(CYGPATH_W) 'src/proxy_msg.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_msg.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_msg.Tpo $(DEPDIR)/libproxysvr_a-proxy_msg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_msg.c' object='libproxysvr_a-proxy_msg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_msg.obj `if test -f 'src/proxy_msg.c'; then $(CYGPATH_W) 'src/proxy_msg.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_msg.c'; fi`
-
-libproxysvr_a-proxy_event.o: src/proxy_event.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_event.o -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_event.Tpo -c -o libproxysvr_a-proxy_event.o `test -f 'src/proxy_event.c' || echo '$(srcdir)/'`src/proxy_event.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_event.Tpo $(DEPDIR)/libproxysvr_a-proxy_event.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_event.c' object='libproxysvr_a-proxy_event.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_event.o `test -f 'src/proxy_event.c' || echo '$(srcdir)/'`src/proxy_event.c
-
-libproxysvr_a-proxy_event.obj: src/proxy_event.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -MT libproxysvr_a-proxy_event.obj -MD -MP -MF $(DEPDIR)/libproxysvr_a-proxy_event.Tpo -c -o libproxysvr_a-proxy_event.obj `if test -f 'src/proxy_event.c'; then $(CYGPATH_W) 'src/proxy_event.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_event.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libproxysvr_a-proxy_event.Tpo $(DEPDIR)/libproxysvr_a-proxy_event.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/proxy_event.c' object='libproxysvr_a-proxy_event.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libproxysvr_a_CFLAGS) $(CFLAGS) -c -o libproxysvr_a-proxy_event.obj `if test -f 'src/proxy_event.c'; then $(CYGPATH_W) 'src/proxy_event.c'; else $(CYGPATH_W) '$(srcdir)/src/proxy_event.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES) config.h
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-noinstLIBRARIES ctags dist dist-all \
-	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

diff --git a/core/org.eclipse.ptp.proxy/NEWS b/core/org.eclipse.ptp.proxy/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/core/org.eclipse.ptp.proxy/NEWS
+++ /dev/null


diff --git a/core/org.eclipse.ptp.proxy/README b/core/org.eclipse.ptp.proxy/README
deleted file mode 100644
index e005997..0000000
--- a/core/org.eclipse.ptp.proxy/README
+++ /dev/null

@@ -1,13 +0,0 @@
-This is the initial release of the PTP Scalable Debug Manager (SDM). The SDM is a framework for debugging parallel programs.
-It comprises the following components:
-
-1. An MPI-based client/server framework for controlling multiple distributed processes. The primary purpose of this
-   framework is to attach backend debuggers to the processes being debugged, and to provide a library interface
-   to control the debugging of these processes.
-   
-2. A proxy library that allows the client/server framework to be controlled from a remote location.  This is particularly
-   important, since it is not always possible to know the location of the SDM client (it may be placed on a random
-   node in the parallel machine).
-
-3. A JNI library for interfacing Java applications to the proxy client. This allows applications like Eclipse to control
-   the debug framework, respond to events, etc.
\ No newline at end of file

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

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

diff --git a/core/org.eclipse.ptp.proxy/aclocal.m4 b/core/org.eclipse.ptp.proxy/aclocal.m4
deleted file mode 100644
index b6d1f15..0000000
--- a/core/org.eclipse.ptp.proxy/aclocal.m4
+++ /dev/null

@@ -1,896 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
-
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

diff --git a/core/org.eclipse.ptp.proxy/build.properties b/core/org.eclipse.ptp.proxy/build.properties
deleted file mode 100644
index 21a22c7..0000000
--- a/core/org.eclipse.ptp.proxy/build.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-bin.includes = AUTHORS,\
-               COPYING,\
-               ChangeLog,\
-               INSTALL,\
-               Makefile.am,\
-               Makefile.in,\
-               NEWS,\
-               README,\
-               about.html,\
-               aclocal.m4,\
-               compile,\
-               config.guess,\
-               config.h.in,\
-               config.status,\
-               config.sub,\
-               configure,\
-               configure.in,\
-               depcomp,\
-               include/,\
-               install-sh,\
-               libtool,\
-               ltmain.sh,\
-               missing,\
-               src/,\
-               META-INF/

diff --git a/core/org.eclipse.ptp.proxy/compile b/core/org.eclipse.ptp.proxy/compile
deleted file mode 100755
index a81e000..0000000
--- a/core/org.eclipse.ptp.proxy/compile
+++ /dev/null

@@ -1,136 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-	*.o | *.obj)
-	  ;;
-	*)
-	  args="$args -o $ofile"
-	  ofile=
-	  ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/core/org.eclipse.ptp.proxy/config.guess b/core/org.eclipse.ptp.proxy/config.guess
deleted file mode 100755
index f4f7772..0000000
--- a/core/org.eclipse.ptp.proxy/config.guess
+++ /dev/null

@@ -1,1321 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-04'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
-		fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-	CPU=mipsel 
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif 
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-		echo i386-${UNAME_MACHINE}-nto-qnx
-	else
-		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	fi
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/core/org.eclipse.ptp.proxy/config.h.in b/core/org.eclipse.ptp.proxy/config.h.in
deleted file mode 100644
index dc3fef0..0000000
--- a/core/org.eclipse.ptp.proxy/config.h.in
+++ /dev/null

@@ -1,34 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-#ifdef DEBUG
-#define DEBUG_PRINT(format, ...)	printf(format, __VA_ARGS__); fflush(stdout)
-#else /* DEBUG */
-#define DEBUG_PRINT(format, ...)
-#endif /* DEBUG */
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#undef HAVE_LIBUTILS
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Version number of package */
-#undef VERSION

diff --git a/core/org.eclipse.ptp.proxy/config.sub b/core/org.eclipse.ptp.proxy/config.sub
deleted file mode 100755
index f365797..0000000
--- a/core/org.eclipse.ptp.proxy/config.sub
+++ /dev/null

@@ -1,1443 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-07'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 | mipsisa64 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-        sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/core/org.eclipse.ptp.proxy/configure b/core/org.eclipse.ptp.proxy/configure
deleted file mode 100755
index 4c64ab5..0000000
--- a/core/org.eclipse.ptp.proxy/configure
+++ /dev/null

@@ -1,5070 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for org.eclipse.ptp.proxy 2.1.4.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='org.eclipse.ptp.proxy'
-PACKAGE_TARNAME='org-eclipse-ptp-proxy'
-PACKAGE_VERSION='2.1.4'
-PACKAGE_STRING='org.eclipse.ptp.proxy 2.1.4'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="src/proxy.c"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures org.eclipse.ptp.proxy 2.1.4 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/org-eclipse-ptp-proxy]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of org.eclipse.ptp.proxy 2.1.4:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-org.eclipse.ptp.proxy configure 2.1.4
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by org.eclipse.ptp.proxy $as_me 2.1.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='org-eclipse-ptp-proxy'
- VERSION='2.1.4'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		{ { echo "$as_me:$LINENO: error: utils directory not found" >&5
-echo "$as_me: error: utils directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-	CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt -I$UTILS/include"
-else
-	CFLAGS="$CFLAGS -Wall -I$UTILS/include"
-fi
-LIBS="$LIBS -L$UTILS"
-
-
-
-
-{ echo "$as_me:$LINENO: checking for bitset_new in -lutils" >&5
-echo $ECHO_N "checking for bitset_new in -lutils... $ECHO_C" >&6; }
-if test "${ac_cv_lib_utils_bitset_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutils  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bitset_new ();
-int
-main ()
-{
-return bitset_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_utils_bitset_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_utils_bitset_new=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_utils_bitset_new" >&5
-echo "${ECHO_T}$ac_cv_lib_utils_bitset_new" >&6; }
-if test $ac_cv_lib_utils_bitset_new = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTILS 1
-_ACEOF
-
-  LIBS="-lutils $LIBS"
-
-fi
-
-
-
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by org.eclipse.ptp.proxy $as_me 2.1.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-org.eclipse.ptp.proxy config.status 2.1.4
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-

diff --git a/core/org.eclipse.ptp.proxy/configure.in b/core/org.eclipse.ptp.proxy/configure.in
deleted file mode 100644
index 91172ed..0000000
--- a/core/org.eclipse.ptp.proxy/configure.in
+++ /dev/null

@@ -1,58 +0,0 @@
-dnl
-dnl
-
-AC_PREREQ(2.50)
-
-AC_INIT(org.eclipse.ptp.proxy, 2.1.4)
-AC_CONFIG_SRCDIR(src/proxy.c)
-AC_CONFIG_HEADERS(config.h)
-
-AM_INIT_AUTOMAKE
-
-AC_CANONICAL_BUILD
-
-dnl
-dnl Eclipse adds version number to end of package when deploying via update site
-dnl
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		AC_MSG_ERROR([utils directory not found])
-	fi
-fi
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-	CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt -I$UTILS/include"
-else
-	CFLAGS="$CFLAGS -Wall -I$UTILS/include"
-fi
-LIBS="$LIBS -L$UTILS"
-
-dnl
-dnl Check for libraries.
-dnl
-
-AC_CHECK_LIB(utils, bitset_new)
-
-AH_VERBATIM([DEBUG],
-[#ifdef DEBUG
-#define DEBUG_PRINT(format, ...)	printf(format, __VA_ARGS__); fflush(stdout)
-#else /* DEBUG */
-#define DEBUG_PRINT(format, ...)
-#endif /* DEBUG */])
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

diff --git a/core/org.eclipse.ptp.proxy/depcomp b/core/org.eclipse.ptp.proxy/depcomp
deleted file mode 100755
index 11e2d3b..0000000
--- a/core/org.eclipse.ptp.proxy/depcomp
+++ /dev/null

@@ -1,522 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2004-05-31.23
-
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit 0
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/core/org.eclipse.ptp.proxy/include/proxy.h b/core/org.eclipse.ptp.proxy/include/proxy.h
deleted file mode 100644
index 63d522b..0000000
--- a/core/org.eclipse.ptp.proxy/include/proxy.h
+++ /dev/null

@@ -1,142 +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
- ******************************************************************************/
- 
-#ifndef _PROXY_H_
-#define _PROXY_H_
-
-#include <stdarg.h>
-#include <list.h>
-
-#include "proxy_msg.h"
-#include "proxy_cmd.h"
-#include "proxy_event.h"
-#include "proxy_attr.h"
-
-#define PROXY_RES_OK		0
-#define PROXY_RES_ERR		-1
-
-#define PROXY_ERR_CLIENT	0
-#define PROXY_ERR_SERVER	1
-#define PROXY_ERR_PROTO		2
-#define PROXY_ERR_SYSTEM	3
-
-#define PROXY_EVENT_HANDLER		1
-#define PROXY_CMD_HANDLER		2
-
-struct proxy;
-struct proxy_clnt;
-struct proxy_svr;
-
-struct proxy_clnt_helper_funcs {
-	void (*eventhandler)(void *, void *);
-	void *eventdata;
-};
-typedef struct proxy_clnt_helper_funcs	proxy_clnt_helper_funcs;
-
-struct proxy_clnt_funcs {
-	/*
-	 * Service functions
-	 */
-	int (*init)(struct proxy_clnt *, void **, char *, va_list);
-	int (*connect)(struct proxy_clnt *);
-	int (*create)(struct proxy_clnt *);
-	int (*progress)(struct proxy_clnt *);
-};
-typedef struct proxy_clnt_funcs	proxy_clnt_funcs;
-
-struct proxy_svr_helper_funcs {
-	/*
-	 * Service functions
-	 */
-	int (*newconn)(void);
-	int (*numservers)(void);
-};
-typedef struct proxy_svr_helper_funcs	proxy_svr_helper_funcs;
-
-/*
- * Functions for managing proxy server.
- */
-struct proxy_svr_funcs {
-	int (*init)(struct proxy_svr *, void **);
-	int (*create)(struct proxy_svr *, int);
-	int (*connect)(struct proxy_svr *, char *, int);
-	int (*progress)(struct proxy_svr *);
-	void (*finish)(struct proxy_svr *);
-};
-typedef struct proxy_svr_funcs	proxy_svr_funcs;
-
-/*
- * A proxy client send commands to and receives events from a server.
- */
-struct proxy_clnt {
-	struct proxy *						proxy;
-	struct proxy_clnt_helper_funcs *	clnt_helper_funcs;
-	void *								clnt_data;
-	struct timeval *					clnt_timeout;
-	List *								clnt_events;
-};
-typedef struct proxy_clnt	proxy_clnt;
-
-/*
- * A proxy server receives commands from and sends events to a client.
- */
-struct proxy_svr {
-	struct proxy *					proxy;
-	struct proxy_svr_helper_funcs *	svr_helper_funcs;
-	struct proxy_commands *			svr_commands;
-	void *							svr_data;
-	struct timeval *				svr_timeout;
-	List *							svr_events;
-};
-typedef struct proxy_svr	proxy_svr;
-
-/*
- * The proxy structure encapsulates both the client and server sides
- * of the communication protocol.
- */
-struct proxy {
-	char *							name;
-	struct proxy_handler_funcs *	handler_funcs;
-	struct proxy_clnt_funcs *		clnt_funcs;
-	struct proxy_svr_funcs *		svr_funcs;
-};
-typedef struct proxy	proxy;
-
-extern proxy 	proxies[];
-
-extern int		find_proxy(char *, proxy **);
-extern void		proxy_set_error(int, char *);
-extern int		proxy_get_error(void);
-extern char *	proxy_get_error_str(void);
-extern void		proxy_event_callback(proxy *, char *);
-
-extern int		proxy_svr_init(char *, struct timeval *, proxy_svr_helper_funcs *, proxy_commands *cmds, proxy_svr **);
-extern int		proxy_svr_create(proxy_svr *, int);
-extern int		proxy_svr_connect(proxy_svr *, char *, int);
-extern int		proxy_svr_progress(proxy_svr *);
-extern void		proxy_svr_finish(proxy_svr *);
-extern void		proxy_svr_queue_msg(proxy_svr *, proxy_msg *);
-
-extern int		proxy_clnt_init(char *, struct timeval *, proxy_clnt_helper_funcs *, proxy_clnt **, char *, va_list);
-extern int 		proxy_clnt_connect(proxy_clnt *);
-extern int 		proxy_clnt_create(proxy_clnt *);
-extern int 		proxy_clnt_progress(proxy_clnt *);
-extern void		proxy_clnt_queue_msg(proxy_clnt *, proxy_msg *);
-
-#endif /* _PROXY_H_*/

diff --git a/core/org.eclipse.ptp.proxy/include/proxy_attr.h b/core/org.eclipse.ptp.proxy/include/proxy_attr.h
deleted file mode 100644
index 90f6e28..0000000
--- a/core/org.eclipse.ptp.proxy/include/proxy_attr.h
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-#ifndef PROXY_ATTR_H_
-#define PROXY_ATTR_H_
-
-/*
- * Predefined attribute ID's and values. These must EXACTLY match org.eclipse.ptp.core.elements.attributes
- */
-
-/*
- * Element attributes
- */
-#define ELEMENT_ID_ATTR				"id"
-#define ELEMENT_NAME_ATTR			"name"
-
-/*
- * Machine attributes
- */
-#define MACHINE_STATE_ATTR			"machineState"
-#define 	MACHINE_STATE_UNKNOWN		"UNKNOWN"
-#define 	MACHINE_STATE_UP			"UP"
-#define 	MACHINE_STATE_DOWN			"DOWN"
-#define 	MACHINE_STATE_ALERT			"ALERT"
-
-/*
- * Job attributes
- */
-#define JOB_STATE_ATTR				"jobState"
-#define 	JOB_STATE_INIT				"STARTED"
-#define 	JOB_STATE_RUNNING			"RUNNING"
-#define 	JOB_STATE_TERMINATED		"TERMINATED"
-#define 	JOB_STATE_ERROR				"ERROR"
-#define JOB_SUB_ID_ATTR				"jobSubId"
-#define JOB_ID_ATTR					"jobId"
-#define JOB_NUM_PROCS_ATTR			"jobNumProcs"
-#define JOB_EXEC_NAME_ATTR			"execName"
-#define JOB_EXEC_PATH_ATTR			"execPath"
-#define JOB_WORKING_DIR_ATTR		"workingDir"
-#define JOB_PROG_ARGS_ATTR			"progArgs"
-#define JOB_ENV_ATTR				"env"
-#define JOB_DEBUG_EXEC_NAME_ATTR	"debugExecName"
-#define JOB_DEBUG_EXEC_PATH_ATTR	"debugExecPath"
-#define JOB_DEBUG_ARGS_ATTR			"debugArgs"
-#define JOB_DEBUG_FLAG_ATTR			"debug"
-
-/*
- * Node attributes
- */
-#define NODE_STATE_ATTR				"nodeState"
-#define 	NODE_STATE_UP				"UP"
-#define 	NODE_STATE_DOWN				"DOWN"
-#define 	NODE_STATE_ERROR			"ERROR"
-#define 	NODE_STATE_UNKNOWN			"UNKNOWN"
-#define NODE_NUMBER_ATTR			"nodeNumber"
-#ifdef HAVE_SYS_BPROC_H
-#define NODE_GROUP_ATTR				"nodeGroup"
-#define NODE_USER_ATTR				"nodeUser"
-#define NODE_MODE_ATTR				"nodeMode"
-#define 	DEFAULT_NODE_MODE		0111
-#endif /* HAVE_SYS_BPROC_H */
-
-/*
- * Queue attributes
- */
-#define QUEUE_STATE_ATTR			"queueState"
-#define		QUEUE_STATE_NORMAL			"NORMAL"
-#define		QUEUE_STATE_COLLECTING		"COLLECTING"
-#define		QUEUE_STATE_DRAINING		"DRAINING"
-#define		QUEUE_STATE_STOPPED			"STOPPED"
-#define QUEUE_ID_ATTR				"queueId"
-
-/*
- * Process attributes
- */
-#define PROC_STATE_ATTR				"processState"
-#define		PROC_STATE_STARTING			"STARTING"
-#define 	PROC_STATE_RUNNING			"RUNNING"
-#define		PROC_STATE_EXITED			"EXITED"
-#define		PROC_STATE_EXITED_SIGNALLED	"EXITED_SIGNALLED"
-#define		PROC_STATE_STOPPED			"STOPPED"
-#define		PROC_STATE_ERROR			"ERROR"
-#define PROC_NODEID_ATTR			"processNodeId"
-#define PROC_PID_ATTR				"processPID"
-#define PROC_INDEX_ATTR				"processIndex"
-#define PROC_STDOUT_ATTR			"processStdout"
-#define PROC_EXITCODE_ATTR			"processExitCode"
-#define PROC_SIGNALNAME_ATTR		"processSignalName"
-
-/*
- * Message attributes
- */
-#define MSG_LEVEL_ATTR				"messageLevel"
-#define		MSG_LEVEL_FATAL				"FATAL"
-#define		MSG_LEVEL_ERROR				"ERROR"
-#define		MSG_LEVEL_WARNING			"WARNING"
-#define		MSG_LEVEL_INFO				"INFO"
-#define MSG_CODE_ATTR				"messageCode"
-#define MSG_TEXT_ATTR				"messageText"
-
-/*
- * ERROR attributes
- */
-#define ERROR_CODE_ATTR				"errorCode"
-#define ERROR_MSG_ATTR				"errorMsg"
-
-/*
- * Miscellaneous attributes
- */
-#define PROTOCOL_VERSION_ATTR		"version"
-#define BASE_ID_ATTR				"baseId"
-
-extern int		proxy_test_attribute(char *key, char *attr_str);
-extern char *	proxy_get_attribute_value_str(char *attr_str);
-extern int		proxy_get_attribute_value_int(char *attr_str);
-extern int		proxy_get_attribute_value_bool(char *attr_str);
-#endif /*PROXY_ATTR_H_*/

diff --git a/core/org.eclipse.ptp.proxy/include/proxy_cmd.h b/core/org.eclipse.ptp.proxy/include/proxy_cmd.h
deleted file mode 100644
index 61b9b31..0000000
--- a/core/org.eclipse.ptp.proxy/include/proxy_cmd.h
+++ /dev/null

@@ -1,38 +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
- ******************************************************************************/
- 
-#ifndef PROXY_CMD_H_
-#define PROXY_CMD_H_
-
-#define CMD_QUIT			0
-
-/*
- * Command dispatch structure
- */
-
-typedef int (*proxy_cmd)(int trans_id, int nargs, char **args);
-
-struct proxy_commands {
-	int			cmd_base;
-	int			cmd_size;
-	proxy_cmd *	cmd_funcs;
-};
-typedef struct proxy_commands	proxy_commands;
-
-#endif /*PROXY_CMD_H_*/

diff --git a/core/org.eclipse.ptp.proxy/include/proxy_event.h b/core/org.eclipse.ptp.proxy/include/proxy_event.h
deleted file mode 100644
index a00840a..0000000
--- a/core/org.eclipse.ptp.proxy/include/proxy_event.h
+++ /dev/null

@@ -1,123 +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
- ******************************************************************************/
-
-#ifndef _PROXY_EVENT_H_
-#define _PROXY_EVENT_H_
-
-/*
- * Event code definitions.
- *
- * These are the events used by the proxy runtime system.
- *
- * Event codes that are marked 'LOCAL EVENT' are *not* sent across the wire. They
- * are used for internal communication only (mainly on the Java side, but can
- * be used by a C client if desired). All other events are sent across
- * the wire.
- */
-
-#define PROXY_EV_OK				0
-#define PROXY_EV_MESSAGE		1
-#define PROXY_EV_CONNECTED		2	/* LOCAL EVENT */
-#define PROXY_EV_DISCONNECTED	3	/* LOCAL EVENT */
-#define PROXY_EV_TIMEOUT		4	/* LOCAL EVENT */
-#define PROXY_EV_ERROR			5
-#define PROXY_EV_SHUTDOWN		6
-
-/*
- * Codes must EXACTLY match org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEvent
- */
-#define PROXY_EV_RT_OFFSET				200
-/*
- * Internal state events
- */
-#define PROXY_EV_RT_STARTUP_STATE		PROXY_EV_RT_OFFSET + 1	/*LOCAL EVENT */
-#define PROXY_EV_RT_CONNECTED_STATE		PROXY_EV_RT_OFFSET + 2	/*LOCAL EVENT */
-#define PROXY_EV_RT_RUNNING_STATE		PROXY_EV_RT_OFFSET + 3	/*LOCAL EVENT */
-#define PROXY_EV_RT_SHUTDOWN_STATE		PROXY_EV_RT_OFFSET + 4	/*LOCAL EVENT */
-#define PROXY_EV_RT_ERROR_STATE			PROXY_EV_RT_OFFSET + 5	/*LOCAL EVENT */
-/*
- * Internal error events
- */
-#define PROXY_EV_RT_STARTUP_ERROR		PROXY_EV_RT_OFFSET + 10	/*LOCAL EVENT */
-
-/*
- * Command error events
- */
-#define PROXY_EV_RT_SUBMITJOB_ERROR		PROXY_EV_RT_OFFSET + 11
-#define PROXY_EV_RT_TERMINATEJOB_ERROR	PROXY_EV_RT_OFFSET + 12
-/*
- * New model element events
- */
-#define PROXY_EV_RT_NEW_JOB				PROXY_EV_RT_OFFSET + 20
-#define PROXY_EV_RT_NEW_MACHINE			PROXY_EV_RT_OFFSET + 21
-#define PROXY_EV_RT_NEW_NODE			PROXY_EV_RT_OFFSET + 22
-#define PROXY_EV_RT_NEW_PROCESS			PROXY_EV_RT_OFFSET + 23
-#define PROXY_EV_RT_NEW_QUEUE			PROXY_EV_RT_OFFSET + 24
-/*
- * Change model element events
- */
-#define PROXY_EV_RT_JOB_CHANGE			PROXY_EV_RT_OFFSET + 30
-#define PROXY_EV_RT_MACHINE_CHANGE		PROXY_EV_RT_OFFSET + 31
-#define PROXY_EV_RT_NODE_CHANGE			PROXY_EV_RT_OFFSET + 32
-#define PROXY_EV_RT_PROCESS_CHANGE		PROXY_EV_RT_OFFSET + 33
-#define PROXY_EV_RT_QUEUE_CHANGE		PROXY_EV_RT_OFFSET + 34
-/*
- * Remove model element events
- */
-#define PROXY_EV_RT_REMOVE_ALL			PROXY_EV_RT_OFFSET + 40
-#define PROXY_EV_RT_REMOVE_JOB			PROXY_EV_RT_OFFSET + 41
-#define PROXY_EV_RT_REMOVE_MACHINE		PROXY_EV_RT_OFFSET + 42
-#define PROXY_EV_RT_REMOVE_NODE			PROXY_EV_RT_OFFSET + 43
-#define PROXY_EV_RT_REMOVE_PROCESS		PROXY_EV_RT_OFFSET + 44
-#define PROXY_EV_RT_REMOVE_QUEUE		PROXY_EV_RT_OFFSET + 45
-/*
- * Miscellaneous events
- */
-#define PROXY_EV_RT_MESSAGE				PROXY_EV_RT_OFFSET + 50	/* LOCAL EVENT */
-#define PROXY_EV_RT_ATTR_DEF			PROXY_EV_RT_OFFSET + 51
-
-void		proxy_add_string_attribute(proxy_msg *m, char *attr, char *value);
-void		proxy_add_int_attribute(proxy_msg *m, char *attr, int value);
-proxy_msg *	proxy_ok_event(int trans_id);
-proxy_msg *	proxy_shutdown_event(int trans_id);
-proxy_msg *	proxy_message_event(int trans_id, char *level, int code, char *fmt, ...);
-proxy_msg *	proxy_error_event(int trans_id, int code, char *fmt, ...);
-proxy_msg *	proxy_submitjob_error_event(int trans_id, char *jobSubId, int code, char *msg);
-proxy_msg *	proxy_terminatejob_error_event(int trans_id, char *job_id, int code, char *msg);
-proxy_msg *	proxy_attr_def_int_event(int trans_id, char *id, char *name, char *desc, int disp, int def);
-proxy_msg *	proxy_attr_def_string_event(int trans_id, char *id, char *name, char *desc, int disp, char *def);
-proxy_msg *	proxy_new_machine_event(int trans_id, char *rm_id, char *machine_id_range, char *name, char *state);
-proxy_msg *	proxy_new_job_event(int trans_id, char *queue_id, char *job_id_range, char *name, char *state, char *jobSubId);
-proxy_msg *	proxy_new_node_event(int trans_id, char *mach_id, int num_nodes);
-void		proxy_add_node(proxy_msg *m, char *node_id, char *name, char *state, int extra_attrs);
-proxy_msg *	proxy_new_process_event(int trans_id, char *job_id, int num_procs);
-void		proxy_add_process(proxy_msg *m, char *proc_id, char *name, char *state, int extra_attrs);
-proxy_msg *	proxy_new_queue_event(int trans_id, char *rm_id, char *queue_id, char *name, char *state);
-proxy_msg *	proxy_job_change_event(int trans_id, char *id_range, int num_attrs);
-proxy_msg *	proxy_machine_change_event(int trans_id, char *id_range, int num_attrs);
-proxy_msg *	proxy_node_change_event(int trans_id, char *id_range, int num_attrs);
-proxy_msg *	proxy_process_change_event(int trans_id, char *id_range, int num_attrs);
-proxy_msg *	proxy_queue_change_event(int trans_id, char *id_range, int num_attrs);
-proxy_msg *	proxy_remove_all_event(int trans_id);
-proxy_msg *	proxy_remove_job_event(int trans_id, char *id_range);
-proxy_msg *	proxy_remove_machine_event(int trans_id, char *id_range);
-proxy_msg *	proxy_remove_node_event(int trans_id, char *id_range);
-proxy_msg *	proxy_remove_process_event(int trans_id, char *id_range);
-proxy_msg *	proxy_remove_queue_event(int trans_id, char *id_range);
-#endif /* !_PROXY_EVENT_H_ */

diff --git a/core/org.eclipse.ptp.proxy/include/proxy_msg.h b/core/org.eclipse.ptp.proxy/include/proxy_msg.h
deleted file mode 100644
index ec616b3..0000000
--- a/core/org.eclipse.ptp.proxy/include/proxy_msg.h
+++ /dev/null

@@ -1,72 +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
- ******************************************************************************/
-
-#ifndef _PROXY_MSG_H_
-#define _PROXY_MSG_H_
-
-#include "list.h"
-#include "bitset.h"
-
-#define MSG_ID_SIZE			4
-#define MSG_ID_MASK			0xffff
-#define MSG_TRANS_ID_SIZE	8
-#define MSG_TRANS_ID_MASK	0xffffffff
-#define MSG_NARGS_SIZE		8
-#define MSG_NARGS_MASK		0xffffffff
-#define MSG_ARG_LEN_SIZE	8
-#define MSG_ARG_LEN_MASK	0xffffffff
-
-/*
- * Proxy errors
- */
-#define ERROR_MALFORMED_COMMAND	0
-
-struct proxy_msg {
-	int		msg_id;
-	int		trans_id;
-	int		num_args;
-	int 	arg_size;
-	int *	free_args;
-	char **	args;
-};
-typedef struct proxy_msg proxy_msg;
-
-extern int 			proxy_list_to_str(List *, int (*)(void *, char **), char **);
-extern void			proxy_get_data(char *, char **, int *);
-extern void			proxy_get_int(char *, int *);
-extern void			proxy_get_bitset(char *, bitset **);
-extern int 			proxy_deserialize_msg(char *, int len, proxy_msg **);
-extern int 			proxy_serialize_msg(proxy_msg *, char **, int *);
-extern int			proxy_msg_decode_string(char *, int, char **, char **);
-extern void			proxy_msg_add_int(proxy_msg *, int);
-extern void			proxy_msg_add_string(proxy_msg *, char *);
-extern void			proxy_msg_add_string_nocopy(proxy_msg *, char *);
-extern void			proxy_msg_add_data(proxy_msg *, char *, int);
-extern void			proxy_msg_add_args(proxy_msg *, int, char **);
-extern void			proxy_msg_add_args_nocopy(proxy_msg *, int, char **);
-extern void			proxy_msg_add_keyval_int(proxy_msg *, char *, int);
-extern void			proxy_msg_add_keyval_string(proxy_msg *, char *, char *);
-extern void			proxy_msg_add_bitset(proxy_msg *, bitset *);
-extern void			proxy_msg_insert_bitset(proxy_msg *, bitset *, int);
-extern void			proxy_msg_add_list(proxy_msg *, List *, void (*)(proxy_msg *, void *));
-extern proxy_msg *	new_proxy_msg(int, int);
-extern void			free_proxy_msg(proxy_msg *);
-extern void			proxy_queue_msg(List *, proxy_msg *);
-extern void 		proxy_process_msgs(List *, void (*)(proxy_msg*, void *), void *);
-#endif /* !_PROXY_MSG_H_ */

diff --git a/core/org.eclipse.ptp.proxy/include/proxy_stdio.h b/core/org.eclipse.ptp.proxy/include/proxy_stdio.h
deleted file mode 100644
index bf03eb2..0000000
--- a/core/org.eclipse.ptp.proxy/include/proxy_stdio.h
+++ /dev/null

@@ -1,58 +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
- ******************************************************************************/
- 
-#ifndef _PROXY_STDIO_H_
-#define _PROXY_STDIO_H_
-
-#include "compat.h"
-
-#define MSG_LEN_SIZE		8
-#define MSG_LENGTH_MASK		0xffffffff
-
-struct proxy_stdio_conn {
-	proxy_clnt *	clnt;
-	proxy_svr *		svr;
-	int				connected;
-	int				sess_in; // File descriptor to read from
-	int				sess_out; // File descriptor to write to
-	char *			buf;
-	char			msg_len_buf[11];
-	int				buf_size;
-	int				buf_pos;
-	int				total_read;
-	char *			msg;
-	int				msg_len;
-	void			(*event_handler)(void *, void *);
-	void *			event_data;
-};
-typedef struct proxy_stdio_conn	proxy_stdio_conn;
-
-extern proxy_clnt_funcs proxy_stdio_clnt_funcs;
-extern proxy_svr_funcs proxy_stdio_svr_funcs;
-
-extern void		proxy_stdio_create_conn(proxy_stdio_conn **);
-extern void		proxy_stdio_destroy_conn(proxy_stdio_conn *);
-extern int		proxy_stdio_recv_msgs(proxy_stdio_conn *);
-extern int		proxy_stdio_get_msg(proxy_stdio_conn *, char **, int *len);
-extern int		proxy_stdio_send_msg(proxy_stdio_conn *, char *, int);
-extern int		proxy_stdio_decode_string(char *, char **, char **);
-extern void		skipspace(char *);
-extern char *	getword(char **);
-
-#endif /* _PROXY_STDIO_H_*/

diff --git a/core/org.eclipse.ptp.proxy/include/proxy_tcp.h b/core/org.eclipse.ptp.proxy/include/proxy_tcp.h
deleted file mode 100644
index d34b1af..0000000
--- a/core/org.eclipse.ptp.proxy/include/proxy_tcp.h
+++ /dev/null

@@ -1,62 +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
- ******************************************************************************/
- 
-#ifndef _PROXY_TCP_H_
-#define _PROXY_TCP_H_
-
-#include "compat.h"
-
-#define PROXY_TCP_PORT		12345
-#define MSG_LEN_SIZE		8
-#define MSG_LENGTH_MASK		0xffffffff
-
-struct proxy_tcp_conn {
-	proxy_clnt *	clnt;
-	proxy_svr *		svr;
-	char *			host;
-	int				port;
-	int				connected;
-	SOCKET			sess_sock;
-	SOCKET			svr_sock;
-	char *			buf;
-	char			msg_len_buf[11];
-	int				buf_size;
-	int				buf_pos;
-	int				total_read;
-	char *			msg;
-	int				msg_len;
-	void			(*event_handler)(void *, void *);
-	void *			event_data;
-};
-typedef struct proxy_tcp_conn	proxy_tcp_conn;
-
-extern struct timeval TCPTIMEOUT;
-extern proxy_clnt_funcs proxy_tcp_clnt_funcs;
-extern proxy_svr_funcs proxy_tcp_svr_funcs;
-
-extern void		proxy_tcp_create_conn(proxy_tcp_conn **);
-extern void		proxy_tcp_destroy_conn(proxy_tcp_conn *);
-extern int		proxy_tcp_recv_msgs(proxy_tcp_conn *);
-extern int		proxy_tcp_get_msg(proxy_tcp_conn *, char **, int *len);
-extern int		proxy_tcp_send_msg(proxy_tcp_conn *, char *, int);
-extern int		proxy_tcp_decode_string(char *, char **, char **);
-extern void		skipspace(char *);
-extern char *	getword(char **);
-
-#endif /* _PROXY_TCP_H_*/

diff --git a/core/org.eclipse.ptp.proxy/install-sh b/core/org.eclipse.ptp.proxy/install-sh
deleted file mode 100755
index ebc6691..0000000
--- a/core/org.eclipse.ptp.proxy/install-sh
+++ /dev/null

@@ -1,250 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

diff --git a/core/org.eclipse.ptp.proxy/ltmain.sh b/core/org.eclipse.ptp.proxy/ltmain.sh
deleted file mode 100644
index 9e71d27..0000000
--- a/core/org.eclipse.ptp.proxy/ltmain.sh
+++ /dev/null

@@ -1,6530 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.20
-TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
-  setopt NO_GLOB_SUBST
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-        darwin_framework)
-	  compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch)
-        prev=darwin_framework
-        compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-        continue
-        ;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char *
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:

diff --git a/core/org.eclipse.ptp.proxy/missing b/core/org.eclipse.ptp.proxy/missing
deleted file mode 100755
index e7ef83a..0000000
--- a/core/org.eclipse.ptp.proxy/missing
+++ /dev/null

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/core/org.eclipse.ptp.proxy/plugin.properties b/core/org.eclipse.ptp.proxy/plugin.properties
deleted file mode 100644
index 861e08e..0000000
--- a/core/org.eclipse.ptp.proxy/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Proxy Protocol Library
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.proxy/src/proxy.c b/core/org.eclipse.ptp.proxy/src/proxy.c
deleted file mode 100644
index dda1b2c..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy.c
+++ /dev/null

@@ -1,99 +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
- ******************************************************************************/
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-/*
- * Miscellaneous proxy functions.
- */
- 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "proxy.h"
-
-static int 			proxy_errno = PROXY_RES_OK;
-static char *		proxy_errstr = NULL;
-
-static char * proxy_error_tab[] = {
-	"Proxy client error: %s",
-	"Proxy server error: %s",
-	"Error with proxy protocol: %s",
-	"System error: %s",
-	"%s"
-};
-
-int
-find_proxy(char *name, proxy **pp)
-{
-	proxy *p;
-	
-	for (p = proxies; p->name != NULL; p++) {
-		if (strcmp(p->name, name) == 0) {
-			*pp = p;
-			return 0;
-		}
-	}
-	return -1;
-}
-
-
-/*
- * Error handling
- */
-void
-proxy_set_error(int errnum, char *msg)
-{
-	proxy_errno = errnum;
-	
-	if (proxy_errstr != NULL) {
-		free(proxy_errstr);
-		proxy_errstr = NULL;
-	}
-	
-	if (proxy_errno >= sizeof(proxy_error_tab)/sizeof(char *)) {
-		if (msg != NULL) {
-			proxy_errstr = strdup(msg);
-		} else {
-			asprintf(&proxy_errstr, "Error %d occurred.", proxy_errno);
-		}
-	} else {
-		if (msg == NULL)
-			msg = "<null>";
-			
-		asprintf(&proxy_errstr, proxy_error_tab[proxy_errno], msg);
-	}
-}
-
-int
-proxy_get_error(void)
-{
-	return proxy_errno;
-}
-
-char *
-proxy_get_error_str(void)
-{
-	if (proxy_errstr == NULL)
-		return "";
-		
-	return proxy_errstr;
-}

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_attr.c b/core/org.eclipse.ptp.proxy/src/proxy_attr.c
deleted file mode 100644
index da7adea..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_attr.c
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "compat.h"
-#include "proxy_attr.h"
-
-/*
- * Test if this attribute string has matching key. Also tests
- * to see if the attribute string is formatted correctly.
- */
-int
-proxy_test_attribute(char *key, char *attr_str)
-{
-	int len = strlen(key);
-	
-	/*
-	 * Attribute string must be at least the length of key + 1 characters long.
-	 */
-	if (strlen(attr_str) <= len) 
-		return 0;
-	
-	/*
-	 * Attribute string must have '=' separating key and value.
-	 */
-	if (attr_str[len] != '=') 
-		return 0;
-	
-	/*
-	 * Key must match.
-	 */
-	return strncmp(attr_str, key, len) == 0;
-}
-
-/*
- * Return attribute value as a string. If we have tested for the attribute key
- * before calling this, then it is guaranteed to return a non-NULL string.
- */
-char *
-proxy_get_attribute_value_str(char *attr_str)
-{
-	char *	s = strchr(attr_str, '=');
-	
-	if (s != NULL) {
-		return s + 1;
-	}
-	
-	return NULL;
-}
-
-/*
- * Return attribute value as an int. May return a misleading value if attribute
- * value is not an integer.
- */
-int
-proxy_get_attribute_value_int(char *attr_str)
-{
-	char *	s = strchr(attr_str, '=');
-	
-	if (s != NULL) {
-		return strtol(s + 1, NULL, 10);
-	}
-	
-	return 0;
-}
-
-/*
- * Return attribute value as a boolean. Returns false if the
- * attribute value is not the (case insensitive) string "true".
- */
-int
-proxy_get_attribute_value_bool(char *attr_str)
-{
-	char *	s = strchr(attr_str, '=');
-	
-	if (s != NULL) {
-		return strcasecmp(s + 1, "true") == 0;
-	}
-	
-	return 0;
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_clnt.c b/core/org.eclipse.ptp.proxy/src/proxy_clnt.c
deleted file mode 100644
index 8e3590d..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_clnt.c
+++ /dev/null

@@ -1,101 +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
- ******************************************************************************/
-
-/*
- * Miscellaneous proxy functions.
- */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "proxy.h"
-#include "proxy_tcp.h"
- 
-proxy proxies[] = {
-	{"tcp", NULL, &proxy_tcp_clnt_funcs, NULL},
-	{NULL, NULL, NULL, NULL}
-};
-
-int 
-proxy_clnt_init(char *name, struct timeval *timeout, proxy_clnt_helper_funcs *cf, proxy_clnt **clnt, char *attr, va_list ap)
-{
-	proxy *		p;
-	proxy_clnt *	pc;
-	void *		data;
-	
-	if (find_proxy(name, &p) < 0)
-		return PROXY_RES_ERR;
-		
-	pc = (proxy_clnt *)malloc(sizeof(proxy_clnt));
-	pc->proxy = p;
-	pc->clnt_helper_funcs = cf;
-	pc->clnt_timeout = NULL;
-
-	if (timeout != NULL) {
-		pc->clnt_timeout = (struct timeval *)malloc(sizeof(struct timeval));
-		memcpy(pc->clnt_timeout, timeout, sizeof(struct timeval));
-	}
-	
-	if (p->clnt_funcs->init(pc, &data, attr, ap) < 0) {
-		free(pc);
-		return PROXY_RES_ERR;
-	}
-
-	pc->clnt_data = data;
-	pc->clnt_events = NewList();
-	
-	*clnt = pc;
-	
-	return PROXY_RES_OK;	
-}
-
-int 
-proxy_clnt_connect(proxy_clnt *pc)
-{
-	if (pc != NULL)
-		return pc->proxy->clnt_funcs->connect(pc);
-		
-	return PROXY_RES_ERR;
-}
-
-int 
-proxy_clnt_create(proxy_clnt *pc)
-{
-	if (pc != NULL)
-		return pc->proxy->clnt_funcs->create(pc);
-		
-	return PROXY_RES_ERR;
-}
-
-int
-proxy_clnt_progress(proxy_clnt *pc)
-{
-	if (pc != NULL)
-		return pc->proxy->clnt_funcs->progress(pc);
-		
-	return PROXY_RES_ERR;
-}
-
-void
-proxy_clnt_queue_msg(proxy_clnt *pc, proxy_msg *m)
-{
-	proxy_queue_msg(pc->clnt_events, m);
-}
-

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_event.c b/core/org.eclipse.ptp.proxy/src/proxy_event.c
deleted file mode 100644
index 30e1142..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_event.c
+++ /dev/null

@@ -1,460 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-/*
- * Utility routines for constructing and sending proxy runtime events.
- *
- * These routines define the format of runtime events for communication with
- * runtime proxy clients.
- *
- * See org.eclipse.ptp.rtsystem.AbstractProxyRuntimeSystem for a description
- * of the protocol format.
- */
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "proxy.h"
-#include "proxy_msg.h"
-#include "args.h"
-#include "list.h"
-#include "compat.h"
-
-/*
- * Add a string attribute to an existing event.
- */
-void
-proxy_add_string_attribute(proxy_msg *m, char *attr, char *value)
-{
-	proxy_msg_add_keyval_string(m, attr, value);
-}
-
-/*
- * Add an integer attribute to an existing event.
- */
-void
-proxy_add_int_attribute(proxy_msg *m, char *attr, int value)
-{
-	proxy_msg_add_keyval_int(m, attr, value);
-}
-
-/*
- * OK EVENT. Sent in response to a sucessfully
- * completed command.
- */
-proxy_msg *
-proxy_ok_event(int trans_id)
-{
- 	return new_proxy_msg(PROXY_EV_OK, trans_id);
-}
-
-/*
- * SHUTDOWN EVENT. Sent in response to a quit command.
- */
-proxy_msg *
-proxy_shutdown_event(int trans_id)
-{
- 	return new_proxy_msg(PROXY_EV_SHUTDOWN, trans_id);
-}
-
-/*
- * MESSAGE EVENT. Used for sending messages that
- * should be logged by the client.
- */
-proxy_msg *
-proxy_message_event(int trans_id, char *level, int code, char *fmt, ...)
-{
-	va_list		ap;
-	char *		msg;
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_MESSAGE, trans_id);
-
-	va_start(ap, fmt);
-	vasprintf(&msg, fmt, ap);
-	va_end(ap);
-
-	proxy_msg_add_int(m, 3); /* 3 attributes */
-	proxy_msg_add_keyval_string(m, MSG_LEVEL_ATTR, level);
-	proxy_msg_add_keyval_int(m, MSG_CODE_ATTR, code);
-	proxy_msg_add_keyval_string(m, MSG_TEXT_ATTR, msg);
-
-	return m;
-}
-
-/*
- * ERROR EVENT. General error event that should be sent to
- * indicate an error condition. NOTE: command errors should
- * use the specific error events below.
- */
-proxy_msg *
-proxy_error_event(int trans_id, int code, char *fmt, ...)
-{
-	va_list		ap;
-	char *		msg;
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_ERROR, trans_id);
-
-	va_start(ap, fmt);
-	vasprintf(&msg, fmt, ap);
-	va_end(ap);
-
-	proxy_msg_add_int(m, 2); /* 2 attributes */
-	proxy_msg_add_keyval_int(m, ERROR_CODE_ATTR, code);
-	proxy_msg_add_keyval_string(m, ERROR_MSG_ATTR, msg);
-
-	return m;
-}
-
-/*
- * SUBMITJOB ERROR EVENT. Used to indicate an error when attempting
- * to submit a job. The jobSubId argument is the job submission ID
- * that was specified to the submitJob command. This event should
- * be used to indicate submission errors as soon as the job submission
- * id has been obtained.
- */
-proxy_msg *
-proxy_submitjob_error_event(int trans_id, char *jobSubId, int code, char *msg)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_SUBMITJOB_ERROR, trans_id);
-
-	proxy_msg_add_int(m, 3); /* 3 attributes */
-	proxy_msg_add_keyval_string(m, JOB_SUB_ID_ATTR, jobSubId);
-	proxy_msg_add_keyval_int(m, ERROR_CODE_ATTR, code);
-	proxy_msg_add_keyval_string(m, ERROR_MSG_ATTR, msg);
-
-	return m;
-}
-
-/*
- * TERMINATEJOB ERROR EVENT. Used to indicate an error when attempting
- * to terminate a job. The jobId argument is the job ID
- * that was specified to the terminateJob command.
- */
-proxy_msg *
-proxy_terminatejob_error_event(int trans_id, char *jobId, int code, char *msg)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_TERMINATEJOB_ERROR, trans_id);
-
-	proxy_msg_add_int(m, 3); /* 3 attributes */
-	proxy_msg_add_keyval_string(m, JOB_ID_ATTR, jobId);
-	proxy_msg_add_keyval_int(m, ERROR_CODE_ATTR, code);
-	proxy_msg_add_keyval_string(m, ERROR_MSG_ATTR, msg);
-
-	return m;
-}
-
-/*
- * ATTR DEF INT EVENT. Uused to define a new INTEGER attribute that can be used
- * in subsequent events.
- */
-proxy_msg *
-proxy_attr_def_int_event(int trans_id, char *id, char *name, char *desc, int disp, int def)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, trans_id);
-
-	proxy_msg_add_int(m, 1); /* 1 attribute def */
-	proxy_msg_add_int(m, 5); /* 5 attributes */
-	proxy_msg_add_string(m, id);
-	proxy_msg_add_string(m, "INTEGER");
-	proxy_msg_add_string(m, name);
-	proxy_msg_add_string(m, desc);
-	proxy_msg_add_string(m, disp ? "true" : "false");
-	proxy_msg_add_int(m, def);
-
-	return m;
-}
-
-/*
- * ATTR DEF STRING EVENT. Used to define a new STRING attribute that can be used
- * in subsequent events.
- */
-proxy_msg *
-proxy_attr_def_string_event(int trans_id, char *id, char *name, char *desc, int disp, char *def)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, trans_id);
-
-	proxy_msg_add_int(m, 1); /* 1 attribute def */
-	proxy_msg_add_int(m, 5); /* 5 attributes */
-	proxy_msg_add_string(m, id);
-	proxy_msg_add_string(m, "STRING");
-	proxy_msg_add_string(m, name);
-	proxy_msg_add_string(m, desc);
-	proxy_msg_add_string(m, disp ? "true" : "false");
-	proxy_msg_add_string(m, def);
-
-	return m;
-}
-
-/*
- * NEW MACHINE. Used to define new machine model elements.
- */
-proxy_msg *
-proxy_new_machine_event(int trans_id, char *rm_id, char *machine_id_range, char *name, char *state)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_NEW_MACHINE, trans_id);
-
-	proxy_msg_add_string(m, rm_id);
-	proxy_msg_add_int(m, 1); /* 1 new machine range */
-	proxy_msg_add_string(m, machine_id_range);
-	proxy_msg_add_int(m, 2); /* 2 attributes */
-	proxy_msg_add_keyval_string(m, ELEMENT_NAME_ATTR, name);
-	proxy_msg_add_keyval_string(m, MACHINE_STATE_ATTR, state);
-
-	return m;
-}
-
-/*
- * NEW JOB EVENT. Used to create a job model element. Jobs can either be created in
- * response to a submitJob command, or to represent existing jobs in a queue (for example).
- *
- * New jobs created in response to a submitJob event *MUST* provide the job submission ID.
- */
-proxy_msg *
-proxy_new_job_event(int trans_id, char *queue_id, char *job_id_range, char *name, char *state, char *jobSubId)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_NEW_JOB, trans_id);
-
-	proxy_msg_add_string(m, queue_id);
-	proxy_msg_add_int(m, 1); /* 1 new job range */
-	proxy_msg_add_string(m, job_id_range);
-
-	if (jobSubId != NULL) {
-		proxy_msg_add_int(m, 3); /* 3 attributes */
-		proxy_msg_add_keyval_string(m, JOB_SUB_ID_ATTR, jobSubId);
-	} else {
-		proxy_msg_add_int(m, 2); /* 2 attributes */
-	}
-
-	proxy_msg_add_keyval_string(m, ELEMENT_NAME_ATTR, name);
-	proxy_msg_add_keyval_string(m, JOB_STATE_ATTR, state);
-
-	return m;
-}
-
-/*
- * NEW NODE EVENT. Used to create new node model elements.
- */
-proxy_msg *
-proxy_new_node_event(int trans_id, char *mach_id, int num_nodes)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_NEW_NODE, trans_id);
-
-	proxy_msg_add_string(m, mach_id);
-	proxy_msg_add_int(m, num_nodes);
-
-	return m;
-}
-
-/*
- * Add a node to a new node event.
- */
-void
-proxy_add_node(proxy_msg *m, char *node_id, char *name, char *state, int extra_attrs)
-{
-	proxy_msg_add_string(m, node_id);
-	proxy_msg_add_int(m, 2 + extra_attrs);
-	proxy_msg_add_keyval_string(m, ELEMENT_NAME_ATTR, name);
-	proxy_msg_add_keyval_string(m, NODE_STATE_ATTR, state);
-}
-
-/*
- * NEW PROCESS EVENT. Used to create a new process model element.
- */
-proxy_msg *
-proxy_new_process_event(int trans_id, char *job_id, int num_procs)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_NEW_PROCESS, trans_id);
-
-	proxy_msg_add_string(m, job_id);
-	proxy_msg_add_int(m, num_procs);
-
-	return m;
-}
-
-void
-proxy_add_process(proxy_msg *m, char *proc_id, char *name, char *state, int extra_attrs)
-{
-	proxy_msg_add_string(m, proc_id);
-	proxy_msg_add_int(m, 2 + extra_attrs);
-	proxy_msg_add_keyval_string(m, ELEMENT_NAME_ATTR, name);
-	proxy_msg_add_keyval_string(m, PROC_STATE_ATTR, state);
-}
-
-/*
- * NEW QUEUE EVENT. Used to create a new queue model element.
- */
-proxy_msg *
-proxy_new_queue_event(int trans_id, char *rm_id, char *queue_id, char *name, char *state)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_NEW_QUEUE, trans_id);
-
-	proxy_msg_add_string(m, rm_id);
-	proxy_msg_add_int(m, 1); /* 1 new queue */
-	proxy_msg_add_string(m, queue_id);
-	proxy_msg_add_int(m, 2); /* 2 attributes */
-	proxy_msg_add_keyval_string(m, ELEMENT_NAME_ATTR, name);
-	proxy_msg_add_keyval_string(m, QUEUE_STATE_ATTR, state);
-
-	return m;
-}
-
-/*
- * JOB CHANGE EVENT. Used to change attributes on a job.
- */
-proxy_msg *
-proxy_job_change_event(int trans_id, char *id_range, int num_attrs)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_JOB_CHANGE, trans_id);
-
-	proxy_msg_add_int(m, 1); /* 1 id range */
-	proxy_msg_add_string(m, id_range);
-	proxy_msg_add_int(m, num_attrs);
-
-	return m;
-}
-
-/*
- * MACHINE CHANGE EVENT. Used to change attributes on a machine.
- */
-proxy_msg *
-proxy_machine_change_event(int trans_id, char *id_range, int num_attrs)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_MACHINE_CHANGE, trans_id);
-
-	proxy_msg_add_int(m, 1); /* 1 id range */
-	proxy_msg_add_string(m, id_range);
-	proxy_msg_add_int(m, num_attrs);
-
-	return m;
-}
-
-/*
- * NODE CHANGE EVENT. Used to change attributes on a node.
- */
-proxy_msg *
-proxy_node_change_event(int trans_id, char *id_range, int num_attrs)
-{
-	proxy_msg *	m = new_proxy_msg(PROXY_EV_RT_NODE_CHANGE, trans_id);
-
-	proxy_msg_add_int(m, 1); /* 1 id range */
-	proxy_msg_add_string(m, id_range);
-	proxy_msg_add_int(m, num_attrs);
-
-	return m;
-}
-
-/*
- * PROCESS CHANGE EVENT. Used to change attributes on a process.
- */
-proxy_msg *
-proxy_process_change_event(int trans_id, char *id_range, int num_attrs)
-{
-	proxy_msg *m = new_proxy_msg(PROXY_EV_RT_PROCESS_CHANGE, trans_id);
-
-	proxy_msg_add_int(m, 1); /* 1 id range */
-	proxy_msg_add_string(m, id_range);
-	proxy_msg_add_int(m, num_attrs);
-
-	return m;
-}
-
-/*
- * QUEUE CHANGE EVENT. Used to change attributes on a queue.
- */
-proxy_msg *
-proxy_queue_change_event(int trans_id, char *id_range, int num_attrs)
-{
-	proxy_msg *m = new_proxy_msg(PROXY_EV_RT_QUEUE_CHANGE, trans_id);
-
-	proxy_msg_add_int(m, 1); /* 1 id range */
-	proxy_msg_add_string(m, id_range);
-	proxy_msg_add_int(m, num_attrs);
-
-	return m;
-}
-
-/*
- * REMOVE ALL EVENT. Used to remove all model elements.
- */
-proxy_msg *
-proxy_remove_all_event(int trans_id)
-{
-	return new_proxy_msg(PROXY_EV_RT_REMOVE_ALL, trans_id);
-}
-
-/*
- * REMOVE JOB EVENT. Used to remove job model elements.
- */
-proxy_msg *
-proxy_remove_job_event(int trans_id, char *id_range)
-{
-	proxy_msg *m = new_proxy_msg(PROXY_EV_RT_REMOVE_JOB, trans_id);
-
-	proxy_msg_add_string(m, id_range);
-
-	return m;
-}
-
-/*
- * REMOVE MACHINE EVENT. Used to remove machine model elements.
- */
-proxy_msg *
-proxy_remove_machine_event(int trans_id, char *id_range)
-{
-	proxy_msg *m = new_proxy_msg(PROXY_EV_RT_REMOVE_MACHINE, trans_id);
-
-	proxy_msg_add_string(m, id_range);
-
-	return m;
-}
-
-/*
- * REMOVE NODE EVENT. Used to remove node model elements.
- */
-proxy_msg *
-proxy_remove_node_event(int trans_id, char *id_range)
-{
-	proxy_msg *m = new_proxy_msg(PROXY_EV_RT_REMOVE_NODE, trans_id);
-
-	proxy_msg_add_string(m, id_range);
-
-	return m;
-}
-
-/*
- * REMOVE PROCESS EVENT. Used to remove process model elements.
- */
-proxy_msg *
-proxy_remove_process_event(int trans_id, char *id_range)
-{
-	proxy_msg *m = new_proxy_msg(PROXY_EV_RT_REMOVE_PROCESS, trans_id);
-
-	proxy_msg_add_string(m, id_range);
-
-	return m;
-}
-
-/*
- * REMOVE QUEUE EVENT. Used to remove queue model elements.
- */
-proxy_msg *
-proxy_remove_queue_event(int trans_id, char *id_range)
-{
-	proxy_msg *m = new_proxy_msg(PROXY_EV_RT_REMOVE_QUEUE, trans_id);
-
-	proxy_msg_add_string(m, id_range);
-
-	return m;
-}

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_msg.c b/core/org.eclipse.ptp.proxy/src/proxy_msg.c
deleted file mode 100644
index a891aab..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_msg.c
+++ /dev/null

@@ -1,458 +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
- ******************************************************************************/
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "proxy.h"
-#include "proxy_msg.h"
-#include "args.h"
-#include "list.h"
-#include "serdes.h"
-#include "compat.h"
-
-#ifdef __linux__
-extern int digittoint(int c);
-#endif /* __linux__ */
-
-#define ARG_SIZE	100
-
-static char tohex[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
-/*
- * Convert a message to a packet ready to send over the wire.
- *
- * Note: packet length is added when the packet is transmitted.
- */
-int
-proxy_serialize_msg(proxy_msg *m, char **result, int *result_len)
-{
-	int		i;
-	int		hdr_len;
-	int		arg_len;
-	int		len = 0;
-	char *	packet;
-	char *	p;
-
-	if (m == NULL) {
-		return -1;
-	}
-
-	/*
-	 * Compute packet length.
-	 *
-	 * Header length includes leading space and separators.
-	 * Body length include encoded strings and separators.
-	 */
-	hdr_len = MSG_ID_SIZE + MSG_TRANS_ID_SIZE + MSG_NARGS_SIZE + 3;
-
-	for (i = 0; i < m->num_args; i++) {
-		len += strlen(m->args[i]) + MSG_ARG_LEN_SIZE + 2;
-	}
-
-	/*
-	 * Allocate packet
-	 */
-	packet = p = (char *)malloc(hdr_len + len);
-
-	*p++ = ' ';
-	int_to_hex_str(m->msg_id, p, MSG_ID_SIZE, &p);
-	*p++ = ':';
-	int_to_hex_str(m->trans_id, p, MSG_TRANS_ID_SIZE, &p);
-	*p++ = ':';
-	int_to_hex_str(m->num_args, p, MSG_NARGS_SIZE, &p);
-
-	for (i = 0; i < m->num_args; i++) {
-		arg_len = strlen(m->args[i]);
-		*p++ = ' ';
-		int_to_hex_str(arg_len, p, MSG_ARG_LEN_SIZE, &p);
-		*p++ = ':';
-		memcpy(p, m->args[i], arg_len);
-		p += arg_len;
-	}
-
-	*result = packet;
-	*result_len = hdr_len + len;
-
-	return 0;
-}
-
-void
-proxy_get_data(char *str, char **data, int *len)
-{
-	int		data_len;
-	char	ch;
-	char *	p;
-
-	data_len = strlen(str) / 2;
-
-	*len = data_len;
-	*data = p = (char *)malloc(sizeof(char) * data_len);
-
-	for (; data_len > 0; data_len--) {
-		ch = digittoint(*str++);
-		ch <<= 4;
-		ch |= digittoint(*str++);
-
-		*p++ = ch;
-	}
-}
-
-void
-proxy_get_int(char *str, int *val)
-{
-	*val = (int)strtol(str, NULL, 10);
-}
-
-void
-proxy_get_bitset(char *str, bitset **b)
-{
-	*b = str_to_bitset(str, NULL);
-}
-
-/*
- * Convert wire protocol to message.
- *
- * Packet length has already been removed.
- */
-int
-proxy_deserialize_msg(char *packet, int packet_len, proxy_msg **msg)
-{
-	int			i;
-	int			msg_id;
-	int			trans_id;
-	int			num_args;
-	proxy_msg *	m = NULL;
-	char *		arg;
-	char *		end;
-
-	if (packet == NULL ||
-			*packet != ' ' ||
-			packet_len < MSG_ID_SIZE + MSG_TRANS_ID_SIZE + MSG_NARGS_SIZE + 3) {
-		return -1;
-	}
-
-	/*
-	 * message ID
-	 */
-	packet++; /* Skip space */
-	msg_id = hex_str_to_int(packet, MSG_ID_SIZE, &end);
-	end++; /* Skip separator */
-
-	/*
-	 * transaction ID
-	 */
-	packet = end;
-	trans_id = hex_str_to_int(packet, MSG_TRANS_ID_SIZE, &end);
-	end++;
-
-	/*
-	 * number of args
-	 */
-	packet = end;
-	num_args = hex_str_to_int(packet, MSG_NARGS_SIZE, &end);
-	end++;
-
-	m = new_proxy_msg(msg_id, trans_id);
-
-	packet = end;
-	packet_len -= (MSG_ID_SIZE + MSG_TRANS_ID_SIZE + MSG_NARGS_SIZE + 3);
-
-	for (i = 0; i < num_args; i++) {
-		if (proxy_msg_decode_string(packet, packet_len, &arg, &end) < 0) {
-			free_proxy_msg(m);
-			return -1;
-		}
-		proxy_msg_add_string_nocopy(m, arg);
-		end++; /* skip space */
-		packet_len -= (end - packet);
-		packet = end;
-	}
-
-	*msg = m;
-
-	return 0;
-}
-
-/*
- * Decode string argument. Returns pointer to the character after
- * the end of the string in 'end'
- */
-int
-proxy_msg_decode_string(char *str, int len, char **arg, char **end)
-{
-	int		arg_len;
-	char *	ep;
-	char *	p;
-
-	if (len < MSG_ARG_LEN_SIZE + 1) {
-		return -1;
-	}
-
-	arg_len = hex_str_to_int(str, MSG_ARG_LEN_SIZE, &ep);
-	ep++;
-
-	if (len < MSG_ARG_LEN_SIZE + arg_len + 1) {
-		return -1;
-	}
-
-	p = (char *)malloc(arg_len + 1);
-	memcpy(p, ep, arg_len);
-	p[arg_len] = '\0';
-
-	*arg = p;
-	*end = ep + arg_len;
-
-	return 0;
-}
-
-static void
-add_arg(proxy_msg *m, char *arg, int free_arg)
-{
-	int 	size = m->arg_size;
-
-	if (m->arg_size < m->num_args + 2) {
-		m->arg_size += ARG_SIZE;
-	}
-
-	if (size == 0) {
-		m->arg_size++; // extra space to null terminate arguments
-		m->args = (char **)malloc(sizeof(char *) * m->arg_size);
-		m->free_args = (int *)malloc(sizeof(int *) * m->arg_size);
-	} else if (size < m->arg_size) {
-		m->args = (char **)realloc(m->args, sizeof(char *) * m->arg_size);
-		m->free_args = (int *)realloc(m->free_args, sizeof(int *) * m->arg_size);
-	}
-
-	m->args[m->num_args] = arg;
-	m->free_args[m->num_args] = free_arg;
-	m->num_args++;
-
-	/*
-	 * Make sure that args are always null terminated
-	 */
-	m->args[m->num_args] = NULL;
-}
-
-void
-proxy_msg_add_data(proxy_msg *m, char *data, int len)
-{
-	int		i;
-	char	ch;
-	char *	arg;
-	char *	p;
-
-	if (data == NULL) {
-		proxy_msg_add_string(m, "00");
-		return;
-	}
-
-	p = arg = (char *)malloc((len * 2) + 8 + 2);
-
-	/*
-	 * Encode data
-	 */
-	for (i = 0; i < len; i++) {
-		ch = *data++;
-		*p++ = tohex[(ch >> 4) & 0xf];
-		*p++ = tohex[ch & 0xf];
-	}
-
-	*p = '\0';
-
-	proxy_msg_add_string(m, arg);
-}
-
-void
-proxy_msg_add_int(proxy_msg *m, int val)
-{
-	char *	str_val;
-
-	asprintf(&str_val, "%d", val);
-	add_arg(m, str_val, 1);
-}
-
-void
-proxy_msg_add_string(proxy_msg *m, char *val)
-{
-	if (val == NULL) {
-		val = "";
-	}
-	add_arg(m, strdup(val), 1);
-}
-
-void
-proxy_msg_add_string_nocopy(proxy_msg *m, char *val)
-{
-	if (val == NULL) {
-		val = "";
-	}
-	add_arg(m, val, 0);
-}
-
-void
-proxy_msg_add_args(proxy_msg *m, int nargs, char **args)
-{
-	int i;
-
-	if (nargs == 0)
-		return;
-
-	for (i = 0; i < nargs; i++) {
-		add_arg(m, strdup(args[i]), 1);
-	}
-}
-
-void
-proxy_msg_add_args_nocopy(proxy_msg *m, int nargs, char **args)
-{
-	int i;
-
-	if (nargs == 0)
-		return;
-
-	for (i = 0; i < nargs; i++) {
-		add_arg(m, args[i], 0);
-	}
-}
-
-void
-proxy_msg_add_keyval_int(proxy_msg *m, char *key, int val)
-{
-	char *	kv;
-
-	asprintf(&kv, "%s=%d", key, val);
-	add_arg(m, kv, 1);
-}
-
-void
-proxy_msg_add_keyval_string(proxy_msg *m, char *key, char *val)
-{
-	char *	kv;
-
-	asprintf(&kv, "%s=%s", key, val);
-	add_arg(m, kv, 1);
-}
-
-void
-proxy_msg_add_bitset(proxy_msg *m, bitset *b)
-{
-	add_arg(m, bitset_to_str(b), 1);
-}
-
-void
-proxy_msg_insert_bitset(proxy_msg *m, bitset *b, int idx)
-{
-	int 	i;
-	int		tmp_free;
-	char *	tmp_arg;
-
-	if (idx < 0)
-		idx = 0;
-
-	/*
-	 * First add bitset to end
-	 */
-	proxy_msg_add_bitset(m, b);
-
-	/*
-	 * Just return if the insert location is at or past end
-	 */
-	if (idx >= m->num_args) {
-		return;
-	}
-
-	/*
-	 * Otherwise rotate last argument into required position
-	 */
-
-	tmp_arg = m->args[m->num_args-1];
-	tmp_free = m->free_args[m->num_args-1];
-
-	for (i = m->num_args-1; i > idx; i--) {
-		m->args[i] = m->args[i-1];
-		m->free_args[i] = m->free_args[i-1];
-	}
-
-	m->args[idx] = tmp_arg;
-	m->free_args[idx] = tmp_free;
-}
-
-proxy_msg *
-new_proxy_msg(int msg_id, int trans_id)
-{
-	proxy_msg *	m = (proxy_msg *)malloc(sizeof(proxy_msg));
-
-	m->msg_id = msg_id;
-	m->trans_id = trans_id;
-	m->arg_size = 0;
-	m->num_args = 0;
-	m->args = NULL;
-	m->free_args = NULL;
-
-	return m;
-}
-
-void
-free_proxy_msg(proxy_msg *m)
-{
-	int i;
-
-	for (i = 0; i < m->num_args; i++) {
-		if (m->free_args[i]) {
-			free(m->args[i]);
-		}
-	}
-
-	free(m->args);
-	free(m->free_args);
-	free(m);
-}
-
-/*
- * Add message to list of messages waiting to be sent.
- */
-void
-proxy_queue_msg(List *ev_list, proxy_msg *m)
-{
-	AddToList(ev_list, (void *)m);
-}
-
-/*
- * Process any queued messages.
- */
-void
-proxy_process_msgs(List *msg_list, void (*callback)(proxy_msg *, void *), void *data)
-{
-	proxy_msg *	m;
-
-	if (msg_list == NULL)
-		return;
-
-	while ((m = (proxy_msg *)RemoveFirst(msg_list)) != NULL) {
-		callback(m, data);
-		free_proxy_msg(m);
-	}
-}
-

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_stdio.c b/core/org.eclipse.ptp.proxy/src/proxy_stdio.c
deleted file mode 100644
index 2153789..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_stdio.c
+++ /dev/null

@@ -1,276 +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
- ******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "compat.h"
-#include "proxy.h"
-#include "proxy_stdio.h"
-#include "proxy_cmd.h"
-
-/**
- * Create a conn structure.
- */
-void
-proxy_stdio_create_conn(proxy_stdio_conn **conn)
-{
-	proxy_stdio_conn *c;
-
-	c = (proxy_stdio_conn *) malloc(sizeof(proxy_stdio_conn));
-
-	c->sess_in = -1;
-	c->sess_out = -1;
-	c->connected = 0;
-	c->buf_size = BUFSIZ;
-	c->buf = (char *)malloc(c->buf_size);
-	c->buf_pos = 0;
-	c->total_read = 0;
-	c->msg_len = 0;
-
-	signal(SIGPIPE, SIG_IGN);
-
-	*conn = c;
-}
-
-void
-proxy_stdio_destroy_conn(proxy_stdio_conn *conn)
-{
-	free(conn->buf);
-	free(conn);
-}
-
-static int
-stdio_read(proxy_stdio_conn *conn)
-{
-	int	n;
-
-	if (conn->total_read == conn->buf_size) {
-		conn->buf_size += BUFSIZ;
-		conn->buf = (char *)realloc(conn->buf, conn->buf_size);
-	}
-
-	n = read(conn->sess_in, &conn->buf[conn->buf_pos], conn->buf_size - conn->total_read);
-fprintf(stderr, " read %d \"%s\"\n", n, &conn->buf[conn->buf_pos]);
-	if (n <= 0) {
-		if (n < 0)
-			proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		else
-			proxy_set_error(PROXY_ERR_PROTO, "connection terminated");
-
-		conn->connected = 0;
-		return -1;
-	}
-
-	conn->buf_pos += n;
-	conn->total_read += n;
-
-	return n;
-}
-
-static int
-stdio_write(proxy_stdio_conn *conn, char *buf, int len)
-{
-	int		n;
-
-	while ( len > 0 ) {
-		n = write(conn->sess_out, buf, len);
-		if (n <= 0) {
-			if (n < 0)
-				perror("send");
-			conn->connected = 0;
-			return -1;
-		}
-
-		len -= n;
-		buf += n;
-	}
-
-	return 0;
-}
-
-/*
- * Send a message to a remote peer. proxy_stdio_send() will always send a complete message.
- * If the send fails for any reason, an error is returned.
- *
- * Silently truncates length to a maximum of 32 bits.
- */
-int
-proxy_stdio_send_msg(proxy_stdio_conn *conn, char *message, int len)
-{
-	char 	buf[MSG_LEN_SIZE+1];
-
-	/*
-	 * Send message length first
-	 */
-	sprintf(buf, "%0*x", MSG_LEN_SIZE, len & MSG_LENGTH_MASK);
-
-	if (stdio_write(conn, buf, strlen(buf)) < 0) {
-		return -1;
-	}
-
-	/*
-	 * Now send message
-	 */
-
-	return stdio_write(conn, message, len);
-}
-
-static int
-proxy_stdio_get_msg_len(proxy_stdio_conn *conn)
-{
-	char *	end;
-
-	/*
-	 * If we haven't read enough then return for more...
-	 */
-	if (conn->total_read < MSG_LEN_SIZE)
-		return 0;
-
-	conn->msg_len = strtol(conn->buf, &end, 16);
-
-	/*
-	 * check if we've received the length
-	 */
-	if (conn->msg_len == 0 || (conn->msg_len > 0 && *end != ' ')) {
-		proxy_set_error(PROXY_ERR_PROTO, "could not understand message");
-		return -1;
-	}
-
-	return conn->msg_len;
-}
-
-static int
-proxy_stdio_copy_msg(proxy_stdio_conn *conn, char **result)
-{
-	int	n = conn->msg_len;
-
-	*result = (char *)malloc(conn->msg_len + 1);
-	memcpy(*result, &conn->buf[MSG_LEN_SIZE], conn->msg_len);
-	(*result)[conn->msg_len] = '\0';
-
-	/*
-	 * Move rest of buffer down if necessary
-	 */
-	if (conn->total_read > conn->msg_len + MSG_LEN_SIZE) {
-		conn->total_read -= conn->msg_len + MSG_LEN_SIZE;
-		memmove(conn->buf, &conn->buf[conn->msg_len + MSG_LEN_SIZE], conn->total_read);
-	} else {
-		conn->buf_pos = 0;
-		conn->total_read = 0;
-	}
-
-	conn->msg_len = 0;
-
-	return n;
-}
-
-static int
-proxy_stdio_get_msg_body(proxy_stdio_conn *conn, char **result)
-{
-	/*
-	 * If we haven't read enough then return for more...
-	 */
-	if (conn->total_read - MSG_LEN_SIZE < conn->msg_len)
-		return 0;
-
-	return proxy_stdio_copy_msg(conn, result);
-}
-
-/*
- * Receive a buffer from a remote peer. It is possible that this buffer may contain a partial
- * message or a number of completed messages.
- *
- */
-int
-proxy_stdio_recv_msgs(proxy_stdio_conn *conn)
-{
-	/*
-	 * Get whatever is available
-	 */
-	if (stdio_read(conn) < 0)
-		return -1;
-
-	return 0;
-}
-
-/*
- * Get the first available message from the buffer. Repeated calls will get subsequent
- * messages from the buffer.
- *
- * @return	0	no messages available
- * 			>0	message available, length returned
- * 			-1	error
- */
-int
-proxy_stdio_get_msg(proxy_stdio_conn *conn, char **result, int *len)
-{
-	int	n;
-
-	if (conn->msg_len == 0 && (n = proxy_stdio_get_msg_len(conn)) <= 0)
-		return n;
-
-	*len = conn->msg_len;
-	return proxy_stdio_get_msg_body(conn, result);
-}
-
-/*
- * Decode string argument
- */
-int
-proxy_stdio_decode_string(char *str, char **arg, char **end)
-{
-	int		arg_len;
-	int 	str_len = strlen(str);
-	char *	ep;
-	char *	p;
-
-	if (str_len < MSG_ARG_LEN_SIZE + 1) {
-		return -1;
-	}
-
-	ep = str + MSG_ARG_LEN_SIZE;
-	*ep++ = '\0';
-	arg_len = strtol(str, NULL, 16);
-
-	if (str_len < MSG_ARG_LEN_SIZE + arg_len + 1) {
-		return -1;
-	}
-
-	p = (char *)malloc(arg_len + 1);
-	memcpy(p, ep, arg_len);
-	p[arg_len] = '\0';
-
-	*arg = p;
-	*end = str + MSG_ARG_LEN_SIZE + arg_len + 1;
-
-	return 0;
-}

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_stdio_svr.c b/core/org.eclipse.ptp.proxy/src/proxy_stdio_svr.c
deleted file mode 100644
index 574298b..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_stdio_svr.c
+++ /dev/null

@@ -1,298 +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
- ******************************************************************************/
-
-/*
- * The proxy handles communication between the client debug library API and the
- * client debugger, since they may be running on different hosts, and will
- * certainly be running in different processes.
- */
-
-#include <config.h>
-
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "compat.h"
-#include "args.h"
-#include "proxy.h"
-#include "proxy_event.h"
-#include "proxy_cmd.h"
-#include "proxy_stdio.h"
-#include "handler.h"
-
-static int	proxy_stdio_svr_init(proxy_svr *, void **);
-static int	proxy_stdio_svr_create(proxy_svr *, int);
-static int	proxy_stdio_svr_connect(proxy_svr *, char *, int);
-static int  proxy_stdio_svr_progress(proxy_svr *);
-static void	proxy_stdio_svr_process_cmds(void);
-static void	proxy_stdio_svr_finish(proxy_svr *);
-
-static int	proxy_stdio_svr_recv_msgs(int, void *);
-static int	proxy_stdio_svr_dispatch(proxy_svr *, char *, int);
-
-proxy_svr_funcs proxy_stdio_svr_funcs =
-{
-	proxy_stdio_svr_init,
-	proxy_stdio_svr_create,
-	proxy_stdio_svr_connect,
-	proxy_stdio_svr_progress,
-	proxy_stdio_svr_finish,
-};
-
-/*
- * Called for each event that is placed on the event queue.
- * Sends the event to the proxy peer.
- */
-static void
-proxy_stdio_svr_event_callback(void *ev_data, void *data)
-{
-	int					len;
-	proxy_svr *			svr = (proxy_svr *)ev_data;
-	proxy_stdio_conn *	conn = (proxy_stdio_conn *)svr->svr_data;
-	proxy_msg *			msg = (proxy_msg *)data;
-	char *				str;
-
-	if (proxy_serialize_msg(msg, &str, &len) < 0) {
-		/*
-		 * TODO should send an error back to proxy peer
-		 */
-		fprintf(stderr, "proxy_stdio_svr_event_callback: event conversion failed\n");
-		return;
-	}
-
-	(void)proxy_stdio_send_msg(conn, str, len);
-	free(str);
-}
-
-/*
- * Called to process any commands in the read buffer.
- */
-static void
-proxy_stdio_svr_cmd_callback(void *cmd_data, void *data)
-{
-	int						len;
-	char *					msg = NULL;
-	proxy_svr *				svr = (proxy_svr *)cmd_data;
-	proxy_stdio_conn *		conn = (proxy_stdio_conn *)svr->svr_data;
-
-	if (proxy_stdio_get_msg(conn, &msg, &len) > 0) {
-		proxy_stdio_svr_dispatch(svr, msg, len);
-		if (msg != NULL) free(msg);
-	}
-}
-
-static int
-proxy_stdio_svr_init(proxy_svr *svr, void **data)
-{
-	proxy_stdio_conn		*conn;
-
-	proxy_stdio_create_conn(&conn);
-	conn->svr = svr;
-	*data = (void *)conn;
-
-	return PROXY_RES_OK;
-}
-
-/**
- * Create server socket and bind address to it.
- *
- * @return conn structure containing server socket and port
- */
-static int
-proxy_stdio_svr_create(proxy_svr *svr, int port)
-{
-	return PROXY_RES_OK;
-}
-
-/**
- * Connect to a remote proxy.
- */
-static int
-proxy_stdio_svr_connect(proxy_svr *svr, char *host, int port)
-{
-	proxy_stdio_conn *		conn = (proxy_stdio_conn *)svr->svr_data;
-
-	conn->sess_in = 0;
-	conn->sess_out = 1;
-
-	RegisterFileHandler(conn->sess_in, READ_FILE_HANDLER, proxy_stdio_svr_recv_msgs, (void *)svr);
-	RegisterEventHandler(PROXY_EVENT_HANDLER, proxy_stdio_svr_event_callback, (void *)svr);
-	RegisterEventHandler(PROXY_CMD_HANDLER, proxy_stdio_svr_cmd_callback, (void *)svr);
-
-	return PROXY_RES_OK;
-}
-
-/**
- * Cleanup prior to server exit.
- */
-static void
-proxy_stdio_svr_finish(proxy_svr *svr)
-{
-	proxy_stdio_conn *	conn = (proxy_stdio_conn *)svr->svr_data;
-
-	if (conn->sess_in != INVALID_SOCKET) {
-		UnregisterFileHandler(conn->sess_in);
-	}
-
-	if (conn->sess_out != INVALID_SOCKET) {
-		UnregisterFileHandler(conn->sess_out);
-	}
-
-	proxy_stdio_destroy_conn(conn);
-}
-
-/**
- * Check for incoming messages.
- */
-static void
-proxy_stdio_svr_process_cmds()
-{
-	CallEventHandlers(PROXY_CMD_HANDLER, NULL);
-}
-
-static void
-proxy_stdio_svr_process_events(proxy_msg *msg, void *data)
-{
-	CallEventHandlers(PROXY_EVENT_HANDLER, (void *)msg);
-}
-
-/**
- * Processes any queued events Also checks for ready file descriptors
- * and calls appropriate handlers.
- */
-static int
-proxy_stdio_svr_progress(proxy_svr *svr)
-{
-	fd_set					rfds;
-	fd_set					wfds;
-	fd_set					efds;
-	int						res;
-	int						nfds = 0;
-	struct timeval			tv;
-	struct timeval *		timeout = &tv;
-
-	proxy_process_msgs(svr->svr_events, proxy_stdio_svr_process_events, NULL);
-
-	/* Set up fd sets */
-	GenerateFDSets(&nfds, &rfds, &wfds, &efds);
-
-	if (svr->svr_timeout == NULL) {
-		timeout = NULL;
-	} else {
-		memcpy((char *)timeout, (char *)svr->svr_timeout, sizeof(struct timeval));
-	}
-
-	for ( ;; ) {
-		res = select(nfds+1, &rfds, &wfds, &efds, &tv);
-
-		switch (res) {
-		case INVALID_SOCKET:
-			if ( errno == EINTR )
-				continue;
-
-			perror("socket");
-			return PROXY_RES_ERR;
-
-		case 0:
-			/* Timeout. */
-			break;
-
-		default:
-			if (CallFileHandlers(&rfds, &wfds, &efds) < 0)
-				return PROXY_RES_ERR;
-		}
-
-		break;
-	}
-
-	proxy_stdio_svr_process_cmds();
-
-	return 0;
-}
-
-/*
- * Dispatch a command to the server
- *
- * proxy_stdio_svr_dispatch() should never fail. If we get a read error from the client then we just
- * assume the client has gone away. Errors from server commands are just reported back to the
- * client.
- */
-static int
-proxy_stdio_svr_dispatch(proxy_svr *svr, char *msg, int len)
-{
-	int					idx;
-	char *				err_str;
-	proxy_commands * 	cmd_tab = svr->svr_commands;
-	proxy_msg *			m;
-	proxy_cmd			cmd;
-
-	DEBUG_PRINT("SVR received <%s>\n", msg);
-
-	if (proxy_deserialize_msg(msg, len, &m) < 0) {
-		proxy_msg *err = new_proxy_msg(0, PROXY_EV_MESSAGE);
-		proxy_msg_add_int(err, 3); /* 3 attributes */
-		proxy_msg_add_keyval_string(err, MSG_LEVEL_ATTR, MSG_LEVEL_FATAL);
-		proxy_msg_add_keyval_int(err, MSG_CODE_ATTR, PROXY_ERR_PROTO);
-		proxy_msg_add_int(err, ERROR_MALFORMED_COMMAND);
-		asprintf(&err_str, "malformed command, len is %d", len);
-		proxy_msg_add_keyval_string(err, MSG_TEXT_ATTR, err_str);
-		free(err_str);
-		proxy_queue_msg(svr->svr_events, err);
-		return 0;
-	}
-
-    idx = m->msg_id - cmd_tab->cmd_base;
-
-	if (idx >= 0 && idx < cmd_tab->cmd_size) {
-		cmd = cmd_tab->cmd_funcs[idx];
-		if (cmd != NULL) {
-			(void)cmd(m->trans_id, m->num_args, m->args);
-		}
-	} else {
-		proxy_msg *err = new_proxy_msg(0, PROXY_EV_MESSAGE);
-		proxy_msg_add_int(err, 3); /* 3 attributes */
-		proxy_msg_add_keyval_string(err, MSG_LEVEL_ATTR, MSG_LEVEL_FATAL);
-		proxy_msg_add_keyval_int(err, MSG_CODE_ATTR, PROXY_ERR_PROTO);
-		proxy_msg_add_int(err, ERROR_MALFORMED_COMMAND);
-		asprintf(&err_str, "malformed command, len is %d", len);
-		proxy_msg_add_keyval_string(err, MSG_TEXT_ATTR, err_str);
-		free(err_str);
-		proxy_queue_msg(svr->svr_events, err);
-	}
-
-	free_proxy_msg(m);
-
-	return 0;
-}
-
-static int
-proxy_stdio_svr_recv_msgs(int fd, void *data)
-{
-	proxy_svr *			svr = (proxy_svr *)data;
-	proxy_stdio_conn *	conn = (proxy_stdio_conn *)svr->svr_data;
-
-	return proxy_stdio_recv_msgs(conn);
-}

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_svr.c b/core/org.eclipse.ptp.proxy/src/proxy_svr.c
deleted file mode 100644
index e928098..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_svr.c
+++ /dev/null

@@ -1,114 +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
- ******************************************************************************/
-
-/*
- * Miscellaneous proxy functions.
- */
- 
-#include <stdlib.h>
-#include <string.h>
- 
-#include "proxy.h"
-#include "proxy_cmd.h"
-#include "proxy_event.h"
-
-#include <list.h>
-
-extern proxy_svr_funcs 	proxy_tcp_svr_funcs;
-extern proxy_svr_funcs 	proxy_stdio_svr_funcs;
-
-proxy proxies[] = {
-	{"tcp", NULL, NULL,  &proxy_tcp_svr_funcs},
-	{"stdio", NULL, NULL, &proxy_stdio_svr_funcs},
-	{NULL, NULL, NULL, NULL}
-};
-
-int
-proxy_svr_init(char *name, struct timeval *timeout, proxy_svr_helper_funcs *sf, proxy_commands *cmds, proxy_svr **svr)
-{
-	proxy *		p;
-	proxy_svr *	ps;
-	void *		data;
-	
-	if (find_proxy(name, &p) < 0)
-		return PROXY_RES_ERR;
-		
-	ps = (proxy_svr *)malloc(sizeof(proxy_svr));
-	ps->proxy = p;
-	ps->svr_helper_funcs = sf;
-	ps->svr_commands = cmds;
-	ps->svr_timeout = NULL;
-	
-	if (timeout != NULL) {
-		ps->svr_timeout = (struct timeval *)malloc(sizeof(struct timeval));
-		memcpy(ps->svr_timeout, timeout, sizeof(struct timeval));
-	}
-	
-	if (p->svr_funcs->init(ps, &data) < 0) {
-		free(ps);
-		return PROXY_RES_ERR;
-	}
-
-	ps->svr_data = data;
-	ps->svr_events = NewList();
-	
-	*svr = ps;
-	
-	return PROXY_RES_OK;	
-}
-
-int
-proxy_svr_create(proxy_svr *ps, int port)
-{
-	if (ps != NULL)
-		return ps->proxy->svr_funcs->create(ps, port);
-		
-	return PROXY_RES_ERR;
-}
-
-int
-proxy_svr_connect(proxy_svr *ps, char *host, int port)
-{
-	if (ps != NULL)
-		return ps->proxy->svr_funcs->connect(ps, host, port);
-		
-	return PROXY_RES_ERR;
-}
-
-int
-proxy_svr_progress(proxy_svr *ps)
-{
-	if (ps != NULL)
-		return ps->proxy->svr_funcs->progress(ps);
-	
-	return PROXY_RES_ERR;
-}
-
-void
-proxy_svr_finish(proxy_svr *ps)
-{
-	if (ps != NULL)
-		ps->proxy->svr_funcs->finish(ps);
-}
-
-void
-proxy_svr_queue_msg(proxy_svr *ps, proxy_msg *msg)
-{
-	proxy_queue_msg(ps->svr_events, msg);
-}

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_tcp.c b/core/org.eclipse.ptp.proxy/src/proxy_tcp.c
deleted file mode 100644
index a81461d..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_tcp.c
+++ /dev/null

@@ -1,283 +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
- ******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "compat.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "proxy_cmd.h"
-
-struct timeval TCPTIMEOUT = { 25, 0 };
-
-/**
- * Create a conn structure.
- */
-void
-proxy_tcp_create_conn(proxy_tcp_conn **conn)
-{
-	proxy_tcp_conn *c;
-
-	c = (proxy_tcp_conn *) malloc(sizeof(proxy_tcp_conn));
-
-	c->sess_sock = INVALID_SOCKET;
-	c->svr_sock = INVALID_SOCKET;
-	c->host = NULL;
-	c->port = 0;
-	c->connected = 0;
-	c->buf_size = BUFSIZ;
-	c->buf = (char *)malloc(c->buf_size);
-	c->buf_pos = 0;
-	c->total_read = 0;
-	c->msg_len = 0;
-
-	signal(SIGPIPE, SIG_IGN);
-
-	*conn = c;
-}
-
-void
-proxy_tcp_destroy_conn(proxy_tcp_conn *conn)
-{
-	if (conn->host != NULL)
-		free(conn->host);
-	free(conn->buf);
-	free(conn);
-}
-
-static int
-tcp_recv(proxy_tcp_conn *conn)
-{
-	int	n;
-
-	if (conn->total_read == conn->buf_size) {
-		conn->buf_size += BUFSIZ;
-		conn->buf = (char *)realloc(conn->buf, conn->buf_size);
-	}
-
-	n = recv(conn->sess_sock, &conn->buf[conn->buf_pos], conn->buf_size - conn->total_read, 0);
-	if (n <= 0) {
-		if (n < 0)
-			proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		else
-			proxy_set_error(PROXY_ERR_PROTO, "connection terminated");
-
-		CLOSE_SOCKET(conn->sess_sock);
-		conn->connected = 0;
-		return -1;
-	}
-
-	conn->buf_pos += n;
-	conn->total_read += n;
-
-	return n;
-}
-
-static int
-tcp_send(proxy_tcp_conn *conn, char *buf, int len)
-{
-	int		n;
-
-	while ( len > 0 ) {
-		n = send(conn->sess_sock, buf, len, 0);
-		if (n <= 0) {
-			if (n < 0)
-				perror("send");
-			CLOSE_SOCKET(conn->sess_sock);
-			conn->connected = 0;
-			return -1;
-		}
-
-		len -= n;
-		buf += n;
-	}
-
-	return 0;
-}
-
-/*
- * Send a message to a remote peer. proxy_tcp_send() will always send a complete message.
- * If the send fails for any reason, an error is returned.
- *
- * Silently truncates length to a maximum of 32 bits.
- */
-int
-proxy_tcp_send_msg(proxy_tcp_conn *conn, char *message, int len)
-{
-	char 	buf[MSG_LEN_SIZE+1];
-
-	/*
-	 * Send message length first
-	 */
-	sprintf(buf, "%0*x", MSG_LEN_SIZE, len & MSG_LENGTH_MASK);
-
-	if (tcp_send(conn, buf, strlen(buf)) < 0) {
-		return -1;
-	}
-
-	/*
-	 * Now send message
-	 */
-
-	return tcp_send(conn, message, len);
-}
-
-static int
-proxy_tcp_get_msg_len(proxy_tcp_conn *conn)
-{
-	char *	end;
-
-	/*
-	 * If we haven't read enough then return for more...
-	 */
-	if (conn->total_read < MSG_LEN_SIZE)
-		return 0;
-
-	conn->msg_len = strtol(conn->buf, &end, 16);
-
-	/*
-	 * check if we've received the length
-	 */
-	if (conn->msg_len == 0 || (conn->msg_len > 0 && *end != ' ')) {
-		proxy_set_error(PROXY_ERR_PROTO, "could not understand message");
-		return -1;
-	}
-
-	return conn->msg_len;
-}
-
-static int
-proxy_tcp_copy_msg(proxy_tcp_conn *conn, char **result)
-{
-	int	n = conn->msg_len;
-
-	*result = (char *)malloc(conn->msg_len + 1);
-	memcpy(*result, &conn->buf[MSG_LEN_SIZE], conn->msg_len);
-	(*result)[conn->msg_len] = '\0';
-
-	/*
-	 * Move rest of buffer down if necessary
-	 */
-	if (conn->total_read > conn->msg_len + MSG_LEN_SIZE) {
-		conn->total_read -= conn->msg_len + MSG_LEN_SIZE;
-		memmove(conn->buf, &conn->buf[conn->msg_len + MSG_LEN_SIZE], conn->total_read);
-	} else {
-		conn->buf_pos = 0;
-		conn->total_read = 0;
-	}
-
-	conn->msg_len = 0;
-
-	return n;
-}
-
-static int
-proxy_tcp_get_msg_body(proxy_tcp_conn *conn, char **result)
-{
-	/*
-	 * If we haven't read enough then return for more...
-	 */
-	if (conn->total_read - MSG_LEN_SIZE < conn->msg_len)
-		return 0;
-
-	return proxy_tcp_copy_msg(conn, result);
-}
-
-/*
- * Receive a buffer from a remote peer. It is possible that this buffer may contain a partial
- * message or a number of completed messages.
- *
- */
-int
-proxy_tcp_recv_msgs(proxy_tcp_conn *conn)
-{
-	/*
-	 * Get whatever is available
-	 */
-	if (tcp_recv(conn) < 0)
-		return -1;
-
-	return 0;
-}
-
-/*
- * Get the first available message from the buffer. Repeated calls will get subsequent
- * messages from the buffer.
- *
- * @return	0	no messages available
- * 			>0	message available, length returned
- * 			-1	error
- */
-int
-proxy_tcp_get_msg(proxy_tcp_conn *conn, char **result, int *len)
-{
-	int	n;
-
-	if (conn->msg_len == 0 && (n = proxy_tcp_get_msg_len(conn)) <= 0)
-		return n;
-
-	*len = conn->msg_len;
-	return proxy_tcp_get_msg_body(conn, result);
-}
-
-/*
- * Decode string argument
- */
-int
-proxy_tcp_decode_string(char *str, char **arg, char **end)
-{
-	int		arg_len;
-	int 	str_len = strlen(str);
-	char *	ep;
-	char *	p;
-
-	if (str_len < MSG_ARG_LEN_SIZE + 1) {
-		return -1;
-	}
-
-	ep = str + MSG_ARG_LEN_SIZE;
-	*ep++ = '\0';
-	arg_len = strtol(str, NULL, 16);
-
-	if (str_len < MSG_ARG_LEN_SIZE + arg_len + 1) {
-		return -1;
-	}
-
-	p = (char *)malloc(arg_len + 1);
-	memcpy(p, ep, arg_len);
-	p[arg_len] = '\0';
-
-	*arg = p;
-	*end = str + MSG_ARG_LEN_SIZE + arg_len + 1;
-
-	return 0;
-}

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_tcp_clnt.c b/core/org.eclipse.ptp.proxy/src/proxy_tcp_clnt.c
deleted file mode 100644
index cf9191c..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_tcp_clnt.c
+++ /dev/null

@@ -1,371 +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
- ******************************************************************************/
-
-/*
- * The proxy handles communication between the client debug library API and the
- * client debugger, since they may be running on different hosts, and will
- * certainly be running in different processes.
- */
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "compat.h"
-#include "proxy.h"
-#include "proxy_event.h"
-#include "proxy_tcp.h"
-#include "handler.h"
-
-struct timeval	SELECT_TIMEOUT = {0, 1000};
-
-static int proxy_tcp_clnt_init(proxy_clnt *, void **, char *, va_list);
-static int proxy_tcp_clnt_connect(proxy_clnt *);
-static int proxy_tcp_clnt_create(proxy_clnt *);
-static int proxy_tcp_clnt_accept(int, void *);
-static int proxy_tcp_clnt_progress(proxy_clnt *);
-static void	proxy_tcp_clnt_event_callback(void *, void *);
-static void	proxy_tcp_clnt_cmd_callback(void *, void *);
-
-
-proxy_clnt_funcs proxy_tcp_clnt_funcs =
-{
-	proxy_tcp_clnt_init,
-	proxy_tcp_clnt_connect,
-	proxy_tcp_clnt_create,
-	proxy_tcp_clnt_progress,
-};
-
-static int
-proxy_tcp_clnt_recv_msgs(int fd, void *data)
-{
-	proxy_clnt *				clnt = (proxy_clnt *)data;
-	proxy_tcp_conn *			conn = (proxy_tcp_conn *)clnt->clnt_data;
-
-	return proxy_tcp_recv_msgs(conn);
-}
-
-/*
- * CLIENT FUNCTIONS
- */
-static int
-proxy_tcp_clnt_init(proxy_clnt *pc, void **data, char *attr, va_list ap)
-{
-	int					port;
-	char *				host = NULL;
-	proxy_tcp_conn *		conn;
-
-	while (attr != NULL) {
-		if (strcmp(attr, "host") == 0)
-			host = strdup(va_arg(ap, char *));
-		else if (strcmp(attr, "port") == 0)
-			port = va_arg(ap, int);
-
-		attr = va_arg(ap, char *);
-	}
-
-	proxy_tcp_create_conn(&conn);
-
-	conn->clnt = pc;
-	if (host != NULL)
-		conn->host = strdup(host);
-	conn->port = port;
-
-	*data = (void *)conn;
-
-	return PROXY_RES_OK;
-}
-
-/**
- * Connect to a remote proxy.
- */
-static int
-proxy_tcp_clnt_connect(proxy_clnt *pc)
-{
-	SOCKET					sd;
-	struct hostent *			hp;
-	long int					haddr;
-	struct sockaddr_in		scket;
-	proxy_tcp_conn *			conn = (proxy_tcp_conn *)pc->clnt_data;
-
-	if (conn->host == NULL) {
-		proxy_set_error(PROXY_ERR_CLIENT, "no host specified");
-		return PROXY_RES_ERR;
-	}
-
-	hp = gethostbyname(conn->host);
-
-	if (hp == (struct hostent *)NULL) {
-		proxy_set_error(PROXY_ERR_CLIENT, "could not find host");
-		return PROXY_RES_ERR;
-	}
-
-	haddr = ((hp->h_addr[0] & 0xff) << 24) |
-			((hp->h_addr[1] & 0xff) << 16) |
-			((hp->h_addr[2] & 0xff) <<  8) |
-			((hp->h_addr[3] & 0xff) <<  0);
-
-	if ( (sd = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		return PROXY_RES_ERR;
-	}
-
-	memset (&scket,0,sizeof(scket));
-	scket.sin_family = PF_INET;
-	scket.sin_port = htons((u_short) conn->port);
-	scket.sin_addr.s_addr = htonl(haddr);
-
-	if ( connect(sd, (struct sockaddr *) &scket, sizeof(scket)) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	conn->sess_sock = sd;
-	conn->connected++;
-
-	RegisterEventHandler(PROXY_EVENT_HANDLER, proxy_tcp_clnt_event_callback, (void *)pc);
-	RegisterEventHandler(PROXY_CMD_HANDLER, proxy_tcp_clnt_cmd_callback, (void *)pc);
-	RegisterFileHandler(sd, READ_FILE_HANDLER, proxy_tcp_clnt_recv_msgs, (void *)pc);
-
-	return PROXY_RES_OK;
-}
-
-static int
-proxy_tcp_clnt_create(proxy_clnt *pc)
-{
-	socklen_t				slen;
-	SOCKET					sd;
-	struct sockaddr_in		sname;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)pc->clnt_data;
-
-	if ( (sd = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		return PROXY_RES_ERR;
-	}
-
-	memset (&sname, 0, sizeof(sname));
-	sname.sin_family = PF_INET;
-	sname.sin_port = htons(conn->port);
-	sname.sin_addr.s_addr = htonl(INADDR_ANY);
-
-	if (bind(sd,(struct sockaddr *) &sname, sizeof(sname)) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	slen = sizeof(sname);
-
-	if ( getsockname(sd, (struct sockaddr *)&sname, &slen) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	if ( listen(sd, 5) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	conn->svr_sock = sd;
-	conn->port = (int) ntohs(sname.sin_port);
-
-	RegisterFileHandler(sd, READ_FILE_HANDLER, proxy_tcp_clnt_accept, (void *)pc);
-	RegisterEventHandler(PROXY_EVENT_HANDLER, proxy_tcp_clnt_event_callback, (void *)pc);
-	RegisterEventHandler(PROXY_CMD_HANDLER, proxy_tcp_clnt_cmd_callback, (void *)pc);
-
-	return PROXY_RES_OK;
-}
-
-static int
-proxy_tcp_clnt_accept(int fd, void *data)
-{
-	SOCKET					ns;
-	socklen_t				fromlen;
-	struct sockaddr			addr;
-	proxy_clnt *			pc = (proxy_clnt *)data;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)pc->clnt_data;
-
-	fromlen = sizeof(addr);
-	ns = accept(fd, &addr, &fromlen);
-	if (ns < 0) {
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		return PROXY_RES_ERR;
-	}
-
-	/*
-	 * Only allow one connection at a time.
-	 */
-	if (conn->sess_sock != INVALID_SOCKET) {
-		CLOSE_SOCKET(ns); // reject
-		return PROXY_RES_OK;
-	}
-
-	conn->sess_sock = ns;
-	conn->connected++;
-
-	RegisterFileHandler(ns, READ_FILE_HANDLER, proxy_tcp_clnt_recv_msgs, (void *)pc);
-
-	if (pc->clnt_helper_funcs->eventhandler != NULL) {
-		proxy_msg *m = new_proxy_msg(PROXY_EV_CONNECTED, 0); // TODO trans id should NOT be 0
-		proxy_queue_msg(pc->clnt_events, m);
-		pc->clnt_helper_funcs->eventhandler(m, pc->clnt_helper_funcs->eventdata);
-		free_proxy_msg(m);
-	}
-
-	return PROXY_RES_OK;
-
-}
-
-static void
-proxy_tcp_clnt_process_cmds()
-{
-	CallEventHandlers(PROXY_CMD_HANDLER, NULL);
-}
-
-static void
-proxy_tcp_clnt_process_events(proxy_msg *msg, void *data)
-{
-	CallEventHandlers(PROXY_EVENT_HANDLER, (void *)msg);
-}
-
-static int
-proxy_tcp_clnt_progress(proxy_clnt *clnt)
-{
-	fd_set					rfds;
-	fd_set					wfds;
-	fd_set					efds;
-	int						res;
-	int						nfds = 0;
-	struct timeval			tv;
-	struct timeval *		timeout = &tv;
-
-	proxy_process_msgs(clnt->clnt_events, proxy_tcp_clnt_process_events, NULL);
-
-	/* Set up fd sets */
-	GenerateFDSets(&nfds, &rfds, &wfds, &efds);
-
-	if (clnt->clnt_timeout == NULL) {
-		timeout = NULL;
-	} else {
-		memcpy((char *)timeout, (char *)clnt->clnt_timeout, sizeof(struct timeval));
-	}
-
-	for ( ;; ) {
-		res = select(nfds+1, &rfds, &wfds, &efds, &tv);
-
-		switch (res) {
-		case INVALID_SOCKET:
-			if ( errno == EINTR )
-				continue;
-
-			perror("socket");
-			return PROXY_RES_ERR;
-
-		case 0:
-			/* Timeout. */
-			break;
-
-		default:
-			if (CallFileHandlers(&rfds, &wfds, &efds) < 0)
-				return PROXY_RES_ERR;
-		}
-
-		break;
-	}
-
-	proxy_tcp_clnt_process_cmds();
-
-	return PROXY_RES_OK;
-}
-
-/*
- * Reads events from proxy peer and dispatches them.
- */
-static void
-proxy_tcp_clnt_event_callback(void *ev_data, void *data)
-{
-	int						len;
-	char *					result;
-	proxy_msg *				m;
-	proxy_clnt *			clnt = (proxy_clnt *)ev_data;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)clnt->clnt_data;
-
-	if (proxy_tcp_get_msg(conn, &result, &len) <= 0 ||
-		clnt->clnt_helper_funcs->eventhandler == NULL)
-		return;
-
-	if (proxy_deserialize_msg(result, len, &m) < 0) {
-		m = new_proxy_msg(PROXY_EV_MESSAGE, 0); // TODO trans id should NOT be 0
-		proxy_msg_add_int(m, 3); /* 3 attributes */
-		proxy_msg_add_keyval_string(m, MSG_LEVEL_ATTR, MSG_LEVEL_FATAL);
-		proxy_msg_add_keyval_int(m, MSG_CODE_ATTR, PROXY_ERR_PROTO);
-		proxy_msg_add_keyval_string(m, MSG_TEXT_ATTR, "Could not covert to event");
-	}
-
-	free(result);
-
-	clnt->clnt_helper_funcs->eventhandler(m, clnt->clnt_helper_funcs->eventdata);
-}
-
-/*
- * Called to process any commands waiting to be sent. The command
- * is sent to the proxy peer.
- */
-static void
-proxy_tcp_clnt_cmd_callback(void *cmd_data, void *data)
-{
-	int						len;
-	char *					str;
-	proxy_clnt *			clnt = (proxy_clnt *)cmd_data;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)clnt->clnt_data;
-	proxy_msg *				msg = (proxy_msg *)data;
-
-	if (proxy_serialize_msg(msg, &str, &len) < 0) {
-		/*
-		 * TODO should send an error back to proxy peer
-		 */
-		fprintf(stderr, "proxy_tcp_svr_event_callback: event conversion failed\n");
-		return;
-	}
-
-	(void)proxy_tcp_send_msg(conn, str, len);
-	free(str);
-}

diff --git a/core/org.eclipse.ptp.proxy/src/proxy_tcp_svr.c b/core/org.eclipse.ptp.proxy/src/proxy_tcp_svr.c
deleted file mode 100644
index 04e9b95..0000000
--- a/core/org.eclipse.ptp.proxy/src/proxy_tcp_svr.c
+++ /dev/null

@@ -1,426 +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
- ******************************************************************************/
-
-/*
- * The proxy handles communication between the client debug library API and the
- * client debugger, since they may be running on different hosts, and will
- * certainly be running in different processes.
- */
-#include <config.h>
-
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "compat.h"
-#include "args.h"
-#include "proxy.h"
-#include "proxy_event.h"
-#include "proxy_cmd.h"
-#include "proxy_tcp.h"
-#include "handler.h"
-
-static int	proxy_tcp_svr_init(proxy_svr *, void **);
-static int	proxy_tcp_svr_create(proxy_svr *, int);
-static int	proxy_tcp_svr_connect(proxy_svr *, char *, int);
-static int  proxy_tcp_svr_progress(proxy_svr *);
-static void	proxy_tcp_svr_process_cmds(void);
-static void	proxy_tcp_svr_finish(proxy_svr *);
-
-static int	proxy_tcp_svr_recv_msgs(int, void *);
-static int	proxy_tcp_svr_accept(int, void *);
-static int	proxy_tcp_svr_dispatch(proxy_svr *, char *, int);
-
-proxy_svr_funcs proxy_tcp_svr_funcs =
-{
-	proxy_tcp_svr_init,
-	proxy_tcp_svr_create,
-	proxy_tcp_svr_connect,
-	proxy_tcp_svr_progress,
-	proxy_tcp_svr_finish,
-};
-
-/*
- * Called for each event that is placed on the event queue.
- * Sends the event to the proxy peer.
- */
-static void
-proxy_tcp_svr_event_callback(void *ev_data, void *data)
-{
-	int					len;
-	proxy_svr *			svr = (proxy_svr *)ev_data;
-	proxy_tcp_conn *	conn = (proxy_tcp_conn *)svr->svr_data;
-	proxy_msg *			msg = (proxy_msg *)data;
-	char *				str;
-
-	if (proxy_serialize_msg(msg, &str, &len) < 0) {
-		/*
-		 * TODO should send an error back to proxy peer
-		 */
-		fprintf(stderr, "proxy_tcp_svr_event_callback: event conversion failed\n");
-		return;
-	}
-
-	(void)proxy_tcp_send_msg(conn, str, len);
-	free(str);
-}
-
-/*
- * Called to process any commands in the read buffer.
- */
-static void
-proxy_tcp_svr_cmd_callback(void *cmd_data, void *data)
-{
-	int						len;
-	char *					msg = NULL;
-	proxy_svr *				svr = (proxy_svr *)cmd_data;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)svr->svr_data;
-
-	if (proxy_tcp_get_msg(conn, &msg, &len) > 0) {
-		proxy_tcp_svr_dispatch(svr, msg, len);
-		if (msg != NULL) free(msg);
-	}
-}
-
-static int
-proxy_tcp_svr_init(proxy_svr *svr, void **data)
-{
-	proxy_tcp_conn		*conn;
-
-	proxy_tcp_create_conn(&conn);
-	conn->svr = svr;
-	*data = (void *)conn;
-
-	return PROXY_RES_OK;
-}
-
-/**
- * Create server socket and bind address to it.
- *
- * @return conn structure containing server socket and port
- */
-static int
-proxy_tcp_svr_create(proxy_svr *svr, int port)
-{
-	socklen_t				slen;
-	SOCKET					sd;
-	struct sockaddr_in		sname;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)svr->svr_data;
-
-	if ( (sd = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		return PROXY_RES_ERR;
-	}
-
-	memset (&sname, 0, sizeof(sname));
-	sname.sin_family = PF_INET;
-	sname.sin_port = htons(port);
-	sname.sin_addr.s_addr = htonl(INADDR_ANY);
-
-	if (bind(sd,(struct sockaddr *) &sname, sizeof(sname)) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	slen = sizeof(sname);
-
-	if ( getsockname(sd, (struct sockaddr *)&sname, &slen) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	if ( listen(sd, 5) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	conn->svr_sock = sd;
-	conn->port = (int) ntohs(sname.sin_port);
-
-	RegisterFileHandler(sd, READ_FILE_HANDLER, proxy_tcp_svr_accept, (void *)svr);
-	RegisterEventHandler(PROXY_EVENT_HANDLER, proxy_tcp_svr_event_callback, (void *)svr);
-	RegisterEventHandler(PROXY_CMD_HANDLER, proxy_tcp_svr_cmd_callback, (void *)svr);
-
-	return PROXY_RES_OK;
-}
-
-/**
- * Connect to a remote proxy.
- */
-static int
-proxy_tcp_svr_connect(proxy_svr *svr, char *host, int port)
-{
-	SOCKET					sd;
-	struct hostent *		hp;
-	struct sockaddr_in		scket;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)svr->svr_data;
-
-	if (host == NULL) {
-		proxy_set_error(PROXY_ERR_SERVER, "no host specified");
-		return PROXY_RES_ERR;
-	}
-
-	hp = gethostbyname(host);
-
-	if (hp == (struct hostent *)NULL) {
-		proxy_set_error(PROXY_ERR_SERVER, "could not find host");
-		return PROXY_RES_ERR;
-	}
-
-	if ( (sd = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		return PROXY_RES_ERR;
-	}
-
-	memset (&scket,0,sizeof(scket));
-	scket.sin_family = PF_INET;
-	scket.sin_port = htons((u_short) port);
-	memcpy(&(scket.sin_addr), *(hp->h_addr_list), sizeof(struct in_addr));
-
-	if ( connect(sd, (struct sockaddr *) &scket, sizeof(scket)) == SOCKET_ERROR )
-	{
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		CLOSE_SOCKET(sd);
-		return PROXY_RES_ERR;
-	}
-
-	conn->sess_sock = sd;
-	conn->host = strdup(host);
-	conn->port = port;
-
-	RegisterEventHandler(PROXY_EVENT_HANDLER, proxy_tcp_svr_event_callback, (void *)svr);
-	RegisterEventHandler(PROXY_CMD_HANDLER, proxy_tcp_svr_cmd_callback, (void *)svr);
-	RegisterFileHandler(sd, READ_FILE_HANDLER, proxy_tcp_svr_recv_msgs, (void *)svr);
-
-	return PROXY_RES_OK;
-}
-
-/**
- * Accept a new proxy connection. Register dispatch routine.
- */
-static int
-proxy_tcp_svr_accept(int fd, void *data)
-{
-	socklen_t				fromlen;
-	SOCKET					ns;
-	struct sockaddr			addr;
-	proxy_svr *				svr = (proxy_svr *)data;
-	proxy_tcp_conn *		conn = (proxy_tcp_conn *)svr->svr_data;
-
-	fromlen = sizeof(addr);
-	ns = accept(fd, &addr, &fromlen);
-	if (ns < 0) {
-		proxy_set_error(PROXY_ERR_SYSTEM, strerror(errno));
-		return PROXY_RES_ERR;
-	}
-
-	/*
-	 * Only allow one connection at a time.
-	 */
-	if (conn->connected) {
-		CLOSE_SOCKET(ns); // reject
-		return PROXY_RES_OK;
-	}
-
-	if (conn->svr->svr_helper_funcs->newconn != NULL && conn->svr->svr_helper_funcs->newconn() < 0) {
-		CLOSE_SOCKET(ns); // reject
-		return PROXY_RES_OK;
-	}
-
-	conn->sess_sock = ns;
-	conn->connected++;
-
-	RegisterFileHandler(ns, READ_FILE_HANDLER, proxy_tcp_svr_recv_msgs, (void *)svr);
-
-	return PROXY_RES_OK;
-}
-
-/**
- * Cleanup prior to server exit.
- */
-static void
-proxy_tcp_svr_finish(proxy_svr *svr)
-{
-	proxy_tcp_conn *	conn = (proxy_tcp_conn *)svr->svr_data;
-
-	if (conn->sess_sock != INVALID_SOCKET) {
-		UnregisterFileHandler(conn->sess_sock);
-		CLOSE_SOCKET(conn->sess_sock);
-		conn->sess_sock = INVALID_SOCKET;
-	}
-
-	if (conn->svr_sock != INVALID_SOCKET) {
-		UnregisterFileHandler(conn->svr_sock);
-		CLOSE_SOCKET(conn->svr_sock);
-		conn->svr_sock = INVALID_SOCKET;
-	}
-
-	proxy_tcp_destroy_conn(conn);
-}
-
-/**
- * Check for incoming messages.
- */
-static void
-proxy_tcp_svr_process_cmds()
-{
-	CallEventHandlers(PROXY_CMD_HANDLER, NULL);
-}
-
-static void
-proxy_tcp_svr_process_events(proxy_msg *msg, void *data)
-{
-	CallEventHandlers(PROXY_EVENT_HANDLER, (void *)msg);
-}
-
-/**
- * Processes any queued events Also checks for ready file descriptors
- * and calls appropriate handlers.
- */
-static int
-proxy_tcp_svr_progress(proxy_svr *svr)
-{
-	fd_set					rfds;
-	fd_set					wfds;
-	fd_set					efds;
-	int						res;
-	int						nfds = 0;
-	struct timeval			tv;
-	struct timeval *		timeout = &tv;
-
-	proxy_process_msgs(svr->svr_events, proxy_tcp_svr_process_events, NULL);
-
-	/* Set up fd sets */
-	GenerateFDSets(&nfds, &rfds, &wfds, &efds);
-
-	if (svr->svr_timeout == NULL) {
-		timeout = NULL;
-	} else {
-		memcpy((char *)timeout, (char *)svr->svr_timeout, sizeof(struct timeval));
-	}
-
-	for ( ;; ) {
-		res = select(nfds+1, &rfds, &wfds, &efds, &tv);
-
-		switch (res) {
-		case INVALID_SOCKET:
-			if ( errno == EINTR )
-				continue;
-
-			perror("socket");
-			return PROXY_RES_ERR;
-
-		case 0:
-			/* Timeout. */
-			break;
-
-		default:
-			if (CallFileHandlers(&rfds, &wfds, &efds) < 0)
-				return PROXY_RES_ERR;
-		}
-
-		break;
-	}
-
-	proxy_tcp_svr_process_cmds();
-
-	return 0;
-}
-
-/*
- * Dispatch a command to the server
- *
- * proxy_tcp_svr_dispatch() should never fail. If we get a read error from the client then we just
- * assume the client has gone away. Errors from server commands are just reported back to the
- * client.
- */
-static int
-proxy_tcp_svr_dispatch(proxy_svr *svr, char *msg, int len)
-{
-	int					idx;
-	char *				err_str;
-	proxy_commands * 	cmd_tab = svr->svr_commands;
-	proxy_msg *			m;
-	proxy_cmd			cmd;
-
-	DEBUG_PRINT("proxy_tcp_svr_dispatch: received <%s>\n", msg);
-
-	if (proxy_deserialize_msg(msg, len, &m) < 0) {
-		proxy_msg *err = new_proxy_msg(0, PROXY_EV_MESSAGE);
-		proxy_msg_add_int(err, 3); /* 3 attributes */
-		proxy_msg_add_keyval_string(err, MSG_LEVEL_ATTR, MSG_LEVEL_FATAL);
-		proxy_msg_add_keyval_int(err, MSG_CODE_ATTR, PROXY_ERR_PROTO);
-		proxy_msg_add_int(err, ERROR_MALFORMED_COMMAND);
-		asprintf(&err_str, "malformed command, len is %d", len);
-		proxy_msg_add_keyval_string(err, MSG_TEXT_ATTR, err_str);
-		free(err_str);
-		proxy_queue_msg(svr->svr_events, err);
-		return 0;
-	}
-
-    idx = m->msg_id - cmd_tab->cmd_base;
-
-	DEBUG_PRINT("proxy_tcp_svr_dispatch: about to dispatch idx=%d\n", idx);
-
-	if (idx >= 0 && idx < cmd_tab->cmd_size) {
-		cmd = cmd_tab->cmd_funcs[idx];
-		if (cmd != NULL) {
-			(void)cmd(m->trans_id, m->num_args, m->args);
-		}
-	} else {
-		proxy_msg *err = new_proxy_msg(0, PROXY_EV_MESSAGE);
-		proxy_msg_add_int(err, 3); /* 3 attributes */
-		proxy_msg_add_keyval_string(err, MSG_LEVEL_ATTR, MSG_LEVEL_FATAL);
-		proxy_msg_add_keyval_int(err, MSG_CODE_ATTR, PROXY_ERR_PROTO);
-		proxy_msg_add_int(err, ERROR_MALFORMED_COMMAND);
-		asprintf(&err_str, "malformed command, len is %d", len);
-		proxy_msg_add_keyval_string(err, MSG_TEXT_ATTR, err_str);
-		free(err_str);
-		proxy_queue_msg(svr->svr_events, err);
-	}
-
-	free_proxy_msg(m);
-
-	DEBUG_PRINT("%s\n", "Leaving proxy_tcp_svr_dispatch");
-
-	return 0;
-}
-
-static int
-proxy_tcp_svr_recv_msgs(int fd, void *data)
-{
-	proxy_svr *			svr = (proxy_svr *)data;
-	proxy_tcp_conn *	conn = (proxy_tcp_conn *)svr->svr_data;
-
-	return proxy_tcp_recv_msgs(conn);
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/.classpath b/core/org.eclipse.ptp.remote.remotetools.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/.project b/core/org.eclipse.ptp.remote.remotetools.core/.project
deleted file mode 100644
index 0dc2bfd..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remote.remotetools.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.remote.remotetools.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 5d82226..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remote.remotetools.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.remote.remotetools.core.RemoteToolsAdapterCorePlugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.filesystem,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.remotetools.preferences
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.remote.remotetools.core,
- org.eclipse.ptp.remote.remotetools.core.environment,
- org.eclipse.ptp.remote.remotetools.core.environment.conf
-Bundle-Localization: plugin

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

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

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/about.ini b/core/org.eclipse.ptp.remote.remotetools.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/about.ini
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/about.mappings b/core/org.eclipse.ptp.remote.remotetools.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/about.properties b/core/org.eclipse.ptp.remote.remotetools.core/about.properties
deleted file mode 100644
index 6f32147..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/about.properties
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/build.properties b/core/org.eclipse.ptp.remote.remotetools.core/build.properties
deleted file mode 100644
index f7c2b63..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/build.properties
+++ /dev/null

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

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

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/plugin.properties b/core/org.eclipse.ptp.remote.remotetools.core/plugin.properties
deleted file mode 100644
index 976bd0f..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools Support
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/plugin.xml b/core/org.eclipse.ptp.remote.remotetools.core/plugin.xml
deleted file mode 100644
index d7e711d..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/plugin.xml
+++ /dev/null

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.remote.core.remoteServices">
-      <remoteServices
-            class="org.eclipse.ptp.remote.remotetools.core.RemoteToolsServicesFactory"
-            id="org.eclipse.ptp.remote.RemoteTools"
-            name="Remote Tools"
-            scheme="remotetools">
-      </remoteServices>
-   </extension>
-   <extension
-         id="org.eclipse.ptp.remotetools.filesystem"
-         point="org.eclipse.core.filesystem.filesystems">
-      <filesystem
-            scheme="remotetools">
-         <run
-               class="org.eclipse.ptp.remote.remotetools.core.RemoteToolsFileSystem">
-         </run>
-      </filesystem>
-   </extension>
-</plugin>

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsAdapterCorePlugin.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsAdapterCorePlugin.java
deleted file mode 100644
index 579582a..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsAdapterCorePlugin.java
+++ /dev/null

@@ -1,53 +0,0 @@
-package org.eclipse.ptp.remote.remotetools.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RemoteToolsAdapterCorePlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.remote.core.remotetools";
-
-	// The remote services ID
-	public static final String SERVICES_ID = "org.eclipse.ptp.remote.RemoteTools";
-
-	// The shared instance
-	private static RemoteToolsAdapterCorePlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public RemoteToolsAdapterCorePlugin() {
-	}
-
-	/*
-	 * (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 RemoteToolsAdapterCorePlugin getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnection.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnection.java
deleted file mode 100644
index bc1acff..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnection.java
+++ /dev/null

@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.exception.AddressInUseException;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.remote.core.exception.UnableToForwardPortException;
-import org.eclipse.ptp.remote.remotetools.core.environment.PTPTargetControl;
-import org.eclipse.ptp.remote.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.LocalPortBoundException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-
-public class RemoteToolsConnection implements IRemoteConnection {
-	private String connName;
-	private String address;
-	private String userName;
-	private PTPTargetControl control;
-
-	public RemoteToolsConnection(String name, String address, String userName, PTPTargetControl control) {
-		this.control = control;
-		this.connName = name;
-		this.address = address;
-		this.userName = userName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#close()
-	 */
-	public synchronized void close(IProgressMonitor monitor) {
-			if (monitor == null) {
-				monitor = new NullProgressMonitor();
-			}
-			
-			monitor.beginTask(Messages.RemoteToolsConnection_close, 1);
-			
-			if (isOpen()) {
-				try {
-					control.kill(monitor);
-				} catch (CoreException e) {
-			}
-				
-			monitor.done();
-		}
-	}
-	
-	/**
-	 * Create a new execution manager. Required because script execution 
-	 * closes channel after execution.
-	 * 
-	 * @return execution manager
-	 * @throws org.eclipse.ptp.remotetools.exception.RemoteConnectionException 
-	 */
-	public IRemoteExecutionManager createExecutionManager() throws org.eclipse.ptp.remotetools.exception.RemoteConnectionException {
-		return control.createExecutionManager();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#forwardLocalPort(int, java.lang.String, int)
-	 */
-	public void forwardLocalPort(int localPort, String fwdAddress, int fwdPort)
-			throws RemoteConnectionException {
-		if (!isOpen()) {
-			throw new RemoteConnectionException(Messages.RemoteToolsConnection_connectionNotOpen);
-		}
-		try {
-			control.getExecutionManager().createTunnel(localPort, fwdAddress, fwdPort);
-		} catch (LocalPortBoundException e) {
-			throw new AddressInUseException(e.getMessage());
-		} catch (org.eclipse.ptp.remotetools.exception.RemoteConnectionException e) {
-			throw new RemoteConnectionException(e.getMessage());
-		} catch (CancelException e) {
-			throw new RemoteConnectionException(e.getMessage());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#forwardLocalPort(java.lang.String, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public int forwardLocalPort(String fwdAddress, int fwdPort,
-			IProgressMonitor monitor) throws RemoteConnectionException {
-		if (!isOpen()) {
-			throw new RemoteConnectionException(Messages.RemoteToolsConnection_connectionNotOpen);
-		}
-		return 0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#forwardRemotePort(int, java.lang.String, int)
-	 */
-	public void forwardRemotePort(int remotePort, String fwdAddress, int fwdPort)
-			throws RemoteConnectionException {
-		if (!isOpen()) {
-			throw new RemoteConnectionException(Messages.RemoteToolsConnection_connectionNotOpen);
-		}
-		try {
-			control.getExecutionManager().getPortForwardingTools().forwardRemotePort(remotePort, fwdAddress, fwdPort);
-		} catch (org.eclipse.ptp.remotetools.exception.RemoteConnectionException e) {
-			throw new RemoteConnectionException(e.getMessage());
-		} catch (CancelException e) {
-			throw new RemoteConnectionException(e.getMessage());
-		} catch (PortForwardingException e) {
-			throw new AddressInUseException(e.getMessage());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#forwardRemotePort(java.lang.String, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public int forwardRemotePort(String fwdAddress, int fwdPort,
-			IProgressMonitor monitor) throws RemoteConnectionException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask(Messages.RemoteToolsConnection_forwarding, 10);
-		/*
-		 * Start with a different port number, in case we're doing this all on localhost.
-		 */
-		int remotePort = fwdPort + 1;
-		/*
-		 * Try to find a free port on the remote machine. This take a while, so
-		 * allow it to be canceled. If we've tried all ports (which could take a
-		 * very long while) then bail out.
-		 */
-		while (!monitor.isCanceled()) {
-			try {
-				forwardRemotePort(remotePort, fwdAddress, fwdPort);
-			} catch (AddressInUseException e) {
-				if (++remotePort == fwdPort) {
-					throw new UnableToForwardPortException(Messages.RemoteToolsConnection_remotePort);
-				}
-				monitor.worked(1);
-			}
-			monitor.done();
-			return remotePort;
-		}
-		monitor.done();
-		return -1;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#getAddress()
-	 */
-	public String getAddress() {
-		return address;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#getName()
-	 */
-	public String getName() {
-		return connName;
-	}
-
-	public String getUsername() {
-		return userName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#isOpen()
-	 */
-	public synchronized boolean isOpen() {
-		return control.query() == ITargetStatus.RESUMED;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#open()
-	 */
-	public void open(IProgressMonitor monitor) throws RemoteConnectionException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask(Messages.RemoteToolsConnection_open, 2);
-		if (control.query() == ITargetStatus.STOPPED) {
-			Job job = new Job("Start the Environment") {
-				protected IStatus run(IProgressMonitor monitor) {
-					
-					IStatus status = null;
-					
-					try {
-						if (control.create(monitor)) {
-							status = Status.OK_STATUS;
-						}
-					} catch (CoreException e) {
-						status = e.getStatus();
-					}
-					
-					return status;
-				}
-			};
-			job.setUser(true);
-			job.schedule();
-			monitor.worked(1);
-			/*
-			 * Wait for the job to finish
-			 */
-			while (!monitor.isCanceled() && control.query() != ITargetStatus.RESUMED) {
-				try {
-					Thread.sleep(500);
-				} catch (InterruptedException e) {
-				}
-			}
-			
-			if (monitor.isCanceled()) {
-				job.cancel();
-			}
-		}
-		monitor.done();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#setAddress(java.lang.String)
-	 */
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#setUsername(java.lang.String)
-	 */
-	public void setUsername(String userName) {
-		this.userName = userName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnection#supportsTCPPortForwarding()
-	 */
-	public boolean supportsTCPPortForwarding() {
-		return true;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnectionManager.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnectionManager.java
deleted file mode 100644
index 16268c6..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsConnectionManager.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionChangeEvent;
-import org.eclipse.ptp.remote.core.IRemoteConnectionChangeListener;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.remotetools.core.environment.PTPTargetControl;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetEnvironmentManager;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-
-
-public class RemoteToolsConnectionManager implements IRemoteConnectionManager {
-	private final ListenerList listeners = new ListenerList();
-	private TargetTypeElement remoteHost = null;
-	private Map<String, IRemoteConnection> connections = new HashMap<String, IRemoteConnection>();
-	
-	public RemoteToolsConnectionManager() {
-		TargetEnvironmentManager targetMgr = EnvironmentPlugin.getDefault().getTargetsManager();
-		for (Object obj : targetMgr.getTypeElements()) {
-			TargetTypeElement element = (TargetTypeElement)obj;
-			if (element.getName().equals("Remote Host")) {
-				remoteHost = element;
-				break;
-			}
-		}
-		refreshConnections();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnectionManager#addConnectionChangeListener(org.eclipse.ptp.remote.core.IRemoteConnectionChangeListener)
-	 */
-	public void addConnectionChangeListener(IRemoteConnectionChangeListener listener) {
-		listeners.add(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnectionManager#fireConnectionChangeEvent(org.eclipse.ptp.remote.core.IRemoteConnectionChangeEvent)
-	 */
-	public void fireConnectionChangeEvent(IRemoteConnectionChangeEvent event) {
-		for (Object listener : listeners.getListeners()) {
-			((IRemoteConnectionChangeListener)listener).connectionChanged(event);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnectionManager#getConnection(java.lang.String)
-	 */
-	public IRemoteConnection getConnection(String name) {
-		refreshConnections();
-		return connections.get(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnectionManager#getConnections()
-	 */
-	public IRemoteConnection[] getConnections() {
-		refreshConnections();
-		return connections.values().toArray(new IRemoteConnection[connections.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnectionManager#removeConnection(org.eclipse.ptp.remote.core.IRemoteConnection)
-	 */
-	public void removeConnection(IRemoteConnection conn) {
-		connections.remove(conn);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteConnectionManager#removeConnectionChangeListener(org.eclipse.ptp.remote.core.IRemoteConnectionChangeListener)
-	 */
-	public void removeConnectionChangeListener(IRemoteConnectionChangeListener listener) {
-		listeners.remove(listener);
-	}
-
-	/**
-	 * Refresh the list of connections that we know about. Deals with connection that are added or deleted
-	 * by another entity.
-	 */
-	private void refreshConnections() {
-		Map<String, IRemoteConnection> newConns = new HashMap<String, IRemoteConnection>();
-		for (Object obj : remoteHost.getElements()) {
-			ITargetElement element = (ITargetElement)obj;
-			IRemoteConnection conn = connections.get(element.getName());
-			if (conn == null) {
-				ITargetControl control;
-				try {
-					control = element.getControl();
-					/*
-					 * FIXME: need to work out how to get this information correctly!!!!
-					 */
-					String address = (String) element.getAttributes().get("ptp.connection-address");
-					String user = (String) element.getAttributes().get("ptp.login-username");
-					conn = new RemoteToolsConnection(element.getName(), address, user, (PTPTargetControl)control);
-					((PTPTargetControl)control).setConnection(this, conn);
-				} catch (CoreException e) {
-				}
-			}
-			newConns.put(element.getName(), conn);
-		}
-		connections = newConns;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileManager.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileManager.java
deleted file mode 100644
index c495077..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileManager.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-public class RemoteToolsFileManager implements IRemoteFileManager {
-	private IRemoteExecutionManager exeMgr;
-	private RemoteToolsConnection connection;
-	private Map<IPath, IFileStore> pathCache = new HashMap<IPath, IFileStore>();
-	
-	public RemoteToolsFileManager(RemoteToolsConnection conn, IRemoteExecutionManager exeMgr) {
-		this.connection = conn;
-		this.exeMgr = exeMgr;
-	}
-	
-	/**
-	 * Store an IRemoteResource in the cache
-	 * 
-	 * @param path path to the remote resource
-	 * @param resource resource to add to the cache
-	 */
-	public void cache(IPath path, IFileStore resource) {
-		synchronized (pathCache) {
-			pathCache.put(path, resource);
-		}
-	}
-
-	/**
-	 * Get the execution manager for this file manager
-	 * @return
-	 */
-	public IRemoteExecutionManager getExecutionManager() {
-		return exeMgr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteFileManager#getResource(org.eclipse.core.runtime.IPath)
-	 */
-	public IFileStore getResource(IPath path, IProgressMonitor monitor) throws IOException {
-		IFileStore res = lookup(path);
-		if (res != null) {
-			return res;
-		}
-		
-		IRemoteItem item;
-		boolean isDirectory = false;
-		try {
-			String pathStr = path.toString();
-			IRemoteFileTools tools = exeMgr.getRemoteFileTools();
-			item = tools.getItem(pathStr);
-			if (tools.hasDirectory(pathStr)) {
-				isDirectory = true;
-			}
-		} catch (RemoteConnectionException e) {
-			throw new IOException(e.getMessage());
-		} catch (RemoteOperationException e) {
-			throw new IOException(e.getMessage());
-		} catch (CancelException e) {
-			throw new IOException(e.getMessage());
-		}
-		
-		res = new RemoteToolsFileStore(this, item, isDirectory);
-		cache(path, res);
-		return res;
-	}
-	
-	public IPath getWorkingDirectory() {
-		String cwd = "//"; //$NON-NLS-1$
-		try {
-			cwd = exeMgr.getExecutionTools().executeWithOutput("pwd").trim(); //$NON-NLS-1$
-		} catch (RemoteExecutionException e) {
-		} catch (RemoteConnectionException e) {
-		} catch (CancelException e) {
-		}
-		return new Path(cwd);
-	}
-		
-	/**
-	 * Look up a cached IRemoteResource
-	 * 
-	 * @param path path to the remote resource
-	 * @return cached IRemoteResource or null
-	 */
-	public IFileStore lookup(IPath path) {
-		synchronized (pathCache) {
-			return pathCache.get(path);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteFileManager#toPath(java.net.URI)
-	 */
-	public IPath toPath(URI uri) {
-		return new Path(uri.getPath());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteFileManager#toURI(org.eclipse.core.runtime.IPath)
-	 */
-	public URI toURI(IPath path) {
-		try {
-			return new URI("remotetools", connection.getName(), path.toPortableString(), null, null); //$NON-NLS-1$
-		} catch (URISyntaxException e) {
-			return null;
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileStore.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileStore.java
deleted file mode 100644
index 9bcce5e..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileStore.java
+++ /dev/null

@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.provider.FileInfo;
-import org.eclipse.core.filesystem.provider.FileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFile;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.core.IRemoteUploadExecution;
-
-public class RemoteToolsFileStore extends FileStore {
-
-	/**
-	 * Public factory method for obtaining RemoteToolsFileStore instances.
-	 * @param uri URI to get a fileStore for
-	 * @return an RemoteToolsFileStore instance for the URI.
-	 */
-	public static RemoteToolsFileStore getInstance(URI uri) throws IOException {
-		String name = uri.getAuthority();
-		String path = uri.getPath();
-		IRemoteConnectionManager connMgr = RemoteToolsServices.getInstance().getConnectionManager();
-		RemoteToolsConnection conn = (RemoteToolsConnection)connMgr.getConnection(name);
-		IRemoteFileManager fileMgr = RemoteToolsServices.getInstance().getFileManager(conn);
-		return (RemoteToolsFileStore)fileMgr.getResource(new Path(path), new NullProgressMonitor());
-	}
-
-	private IRemoteItem remoteItem;
-	private URI remoteURI;
-	private RemoteToolsFileManager fileMgr;
-	private IRemoteExecutionManager exeMgr;
-	private boolean isDirectory;
-	private IRemoteUploadExecution uploadExecution = null;
-
-	public RemoteToolsFileStore(RemoteToolsFileManager mgr, IRemoteItem remoteItem,
-			boolean isDirectory) {
-		this.fileMgr = mgr;
-		this.exeMgr = mgr.getExecutionManager();
-		this.remoteItem = remoteItem;
-		this.isDirectory = isDirectory;
-		this.remoteURI = mgr.toURI(new Path(remoteItem.getPath()));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.provider.FileStore#childNames(int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public String[] childNames(int options, IProgressMonitor monitor) throws CoreException {
-		IRemoteItem[] items;
-		try {
-			items = exeMgr.getRemoteFileTools().listItems(remoteItem.getPath());
-		} catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-					e.getMessage()));
-		}
-
-		String[] names = new String[items.length];
-
-		for (int i = 0; i < items.length; i++)
-		{
-			IPath path = new Path(items[i].getPath());
-			names[i] = path.lastSegment();
-		}
-
-		return names;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.provider.FileStore#delete(int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public void delete(int options, IProgressMonitor monitor) throws CoreException {
-		try {
-			exeMgr.getRemoteFileTools().removeFile(remoteItem.getPath());
-		}
-		catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-					"Could not delete file", e));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.provider.FileStore#fetchInfo(int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException {
-		FileInfo info = new FileInfo(new Path(remoteItem.getPath()).lastSegment());
-
-		try {
-			remoteItem.refreshAttributes();
-		} catch(Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-					e.getMessage(), e));
-		}
-		
-		if (!remoteItem.exists()) {
-			info.setExists(false);
-			return info;
-		}	
-		
-		info.setExists(true);
-		info.setLastModified(remoteItem.getModificationTime());
-		info.setDirectory(isDirectory);
-		info.setAttribute(EFS.ATTRIBUTE_READ_ONLY, !remoteItem.isWritable());
-
-		if (!isDirectory) {
-			IRemoteFile file = (IRemoteFile)remoteItem;
-			info.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, file.isExecutable());
-			info.setLength(file.getSize());
-		}
-
-		return info;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.provider.FileStore#getChild(java.lang.String)
-	 */
-	@Override
-	public IFileStore getChild(String name) {
-		IPath childPath = new Path(remoteItem.getPath()).append(name);
-
-		IFileStore resource = fileMgr.lookup(childPath);
-		if (resource != null) {
-			return resource;
-		}
-
-		try {
-			return fileMgr.getResource(childPath, new NullProgressMonitor());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteResource#getName()
-	 */
-	@Override
-	public String getName() {
-		IPath path = new Path(remoteItem.getPath());
-		if (path.isRoot()) {
-			return path.toString();
-		}
-		return new Path(remoteItem.getPath()).lastSegment();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteResource#getParent()
-	 * 
-	 * FIXME: should take a progress monitor as argument
-	 * FIXME: should throw a core exception
-	 */
-	@Override
-	public IFileStore getParent() {
-		IPath parent = new Path(exeMgr.getRemotePathTools().parent(remoteItem.getPath()));
-
-		IFileStore resource = fileMgr.lookup(parent);
-		if (resource != null) {
-			return resource;
-		}
-		try {
-			return fileMgr.getResource(parent, new NullProgressMonitor());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteResource#mkdir(int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public IFileStore mkdir(int options, IProgressMonitor monitor) throws CoreException {
-		try {
-			exeMgr.getRemoteFileTools().createDirectory(remoteItem.getPath());
-		} catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-					"The directory could not be created", e));
-		}
-
-		return this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteResource#openInputStream(int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public InputStream openInputStream(int options, IProgressMonitor monitor) throws CoreException {
-		if (isDirectory) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-			"Is a directory"));
-		}
-		try {
-			return exeMgr.getRemoteCopyTools().executeDownload(remoteItem.getPath()).getInputStreamFromProcessRemoteFile();
-		} catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-					"Could not get input stream", e));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteResource#openOutputStream(int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public OutputStream openOutputStream(int options, IProgressMonitor monitor) throws CoreException {
-		if (isDirectory) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-			"Is a directory"));
-		}
-		
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		try {
-			uploadExecution = exeMgr.getRemoteCopyTools().executeUpload(remoteItem.getPath());
-
-			synchronized (remoteItem) {
-				while (!monitor.isCanceled() && !remoteItem.exists()) {
-					remoteItem.wait(500);
-					
-					try {
-						remoteItem.refreshAttributes();
-					} catch(Exception e) {
-						throw new CoreException(new Status(IStatus.ERROR,
-								RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-								e.getMessage(), e));
-					}
-				}
-			}
-
-			if (monitor.isCanceled()) {
-				uploadExecution.cancel();
-				return null;
-			}
-			
-			return uploadExecution.getOutputStreamToProcessRemoteFile();
-		} catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-					"Could not open output stream", e));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteResource#putInfo(org.eclipse.ptp.remote.core.IRemoteResourceInfo, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public void putInfo(IFileInfo info, int options, IProgressMonitor monitor) throws CoreException {
-		try {
-			if (uploadExecution != null) {
-				if (!uploadExecution.wasFinished()) {
-					uploadExecution.waitForEndOfExecution();
-				}
-				uploadExecution = null;
-			}
-			boolean modified = false;
-			remoteItem.refreshAttributes();
-			if ((options & EFS.SET_ATTRIBUTES) != 0) {
-				//We cannot currently write isExecutable(), isHidden()
-				boolean writeable = !info.getAttribute(EFS.ATTRIBUTE_READ_ONLY);
-				remoteItem.setWriteable(writeable);
-				if(!this.isDirectory) {
-					boolean executable = info.getAttribute(EFS.ATTRIBUTE_EXECUTABLE);
-					IRemoteFile file = (IRemoteFile)remoteItem;
-					file.setExecutable(executable);
-				}
-				modified = true;
-			}
-			if ((options & EFS.SET_LAST_MODIFIED) != 0) {
-				long modtime = info.getLastModified();
-				remoteItem.setModificationTime(modtime);
-				modified = true;
-			}
-			if (modified) {
-				remoteItem.commitAttributes();
-			}
-		} catch(Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(),
-					e.getMessage(), e));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteResource#toURI()
-	 */
-	@Override
-	public URI toURI() {
-		return remoteURI;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileSystem.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileSystem.java
deleted file mode 100644
index bc04fb0..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsFileSystem.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
- * Kushal Munir (IBM) - moved to internal package
- * Martin Oberhuber (Wind River) - [181917] EFS Improvements: Avoid unclosed Streams,
- *    - Fix early startup issues by deferring FileStore evaluation and classloading,
- *    - Improve performance by RSEFileStore instance factory and caching IRemoteFile.
- *    - Also remove unnecessary class RSEFileCache and obsolete branding files.
- * Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
- * Martin Oberhuber (Wind River) - [199587] return attributes of RemoteToolsFileSystem
- ********************************************************************************/
-
-package org.eclipse.ptp.remote.remotetools.core;
-
-import java.net.URI;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.provider.FileSystem;
-
-public class RemoteToolsFileSystem extends FileSystem 
-{
-	private static RemoteToolsFileSystem instance = new RemoteToolsFileSystem();
-
-	/**
-	 * Default constructor.
-	 */
-	public RemoteToolsFileSystem() {
-		super();
-	}
-	
-	/**
-	 * Return the singleton instance of this file system.
-	 * @return the singleton instance of this file system.
-	 */
-	public static RemoteToolsFileSystem getInstance() {
-		return instance;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.IFileSystem#attributes()
-	 */
-	public int attributes() {
-		//Attributes supported by RSE IFileService
-		return EFS.ATTRIBUTE_READ_ONLY | EFS.ATTRIBUTE_EXECUTABLE
-		     | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.provider.FileSystem#canDelete()
-	 */
-	public boolean canDelete() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.provider.FileSystem#canWrite()
-	 */
-	public boolean canWrite() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.filesystem.provider.FileSystem#getStore(java.net.URI)
-	 */
-	public IFileStore getStore(URI uri) {
-		try  {
-			return RemoteToolsFileStore.getInstance(uri);
-		} 
-		catch (Exception e) {
-			//Could be an URI format exception
-			return EFS.getNullFileSystem().getStore(uri);
-		}
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcess.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcess.java
deleted file mode 100644
index c197351..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcess.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-
-import org.eclipse.ptp.remote.core.AbstractRemoteProcess;
-import org.eclipse.ptp.remote.core.NullInputStream;
-
-public class RemoteToolsProcess extends AbstractRemoteProcess {
-	private Process remoteProcess;
-	private InputStream procStdout;
-	private InputStream procStderr;
-	private Thread stdoutReader;
-	private Thread stderrReader;
-	
-	private class ProcReader implements Runnable {
-		private final static int BUF_SIZE = 8192;
-		
-		private InputStream input;
-		private OutputStream output;
-		
-		public ProcReader(InputStream input, OutputStream output) {
-			this.input = input;
-			this.output = output;
-		}
-		
-		public void run() {
-			int len;
-			byte b[] = new byte[BUF_SIZE];
-			
-			try {
-				while ((len = input.read(b)) > 0) {
-					output.write(b, 0, len);
-				}
-			} catch (IOException e) {
-			}
-			try {
-				input.close();
-			} catch (IOException e) {
-			}
-			try {
-				output.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	public RemoteToolsProcess(Process proc, boolean merge) throws IOException {
-		remoteProcess = proc;
-		
-		if (merge) {
-			PipedOutputStream pipedOutput = new PipedOutputStream();
-			
-			procStdout = new PipedInputStream(pipedOutput);
-			procStderr = new NullInputStream();
-
-			stderrReader = new Thread(new ProcReader(proc.getErrorStream(), pipedOutput));
-			stdoutReader = new Thread(new ProcReader(proc.getInputStream(), pipedOutput));
-			
-			stderrReader.start();
-			stdoutReader.start();
-		} else {
-			procStdout = proc.getInputStream();
-			procStderr = proc.getErrorStream();
-		}
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Process#destroy()
-	 */
-	@Override
-	public void destroy() {
-		remoteProcess.destroy();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#exitValue()
-	 */
-	@Override
-	public int exitValue() {
-		return remoteProcess.exitValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getErrorStream()
-	 */
-	@Override
-	public InputStream getErrorStream() {
-		return procStderr;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getInputStream()
-	 */
-	@Override
-	public InputStream getInputStream() {
-		return procStdout;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getOutputStream()
-	 */
-	@Override
-	public OutputStream getOutputStream() {
-		return remoteProcess.getOutputStream();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#waitFor()
-	 */
-	@Override
-	public int waitFor() throws InterruptedException {
-		return remoteProcess.waitFor();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteProcess#isCompleted()
-	 */
-	public boolean isCompleted() {
-		try {
-			remoteProcess.exitValue();
-			return true;
-		} catch (IllegalThreadStateException e) {
-			return false;
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcessBuilder.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcessBuilder.java
deleted file mode 100644
index 559c75e..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsProcessBuilder.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.ptp.remote.core.AbstractRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteProcess;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-
-public class RemoteToolsProcessBuilder extends AbstractRemoteProcessBuilder {
-	private RemoteToolsConnection connection;
-	private Map<String, String> remoteEnv = new HashMap<String, String>();
-
-	public RemoteToolsProcessBuilder(RemoteToolsConnection conn, List<String> command) {
-		super(conn, command);
-//		remoteEnv.putAll(System.getenv());
-		this.connection = conn;
-	}
-	
-	public RemoteToolsProcessBuilder(RemoteToolsConnection conn, String... command) {
-		this(conn, Arrays.asList(command));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.AbstractRemoteProcessBuilder#environment()
-	 */
-	@Override
-	public Map<String, String> environment() {
-		return remoteEnv;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteProcessBuilder#start()
-	 */
-	public IRemoteProcess start() throws IOException {
-		// The exit command is called to force the remote shell to close after our command 
-		// is executed. This is to prevent a running process at the end of the debug session.
-		// See Bug 158786.
-		List<String> cmdArgs = command();
-		if (cmdArgs.size() < 1) {
-			throw new IndexOutOfBoundsException();
-		}
-		
-		String remoteCmd = ""; //$NON-NLS-1$
-		
-		for (int i = 0; i < cmdArgs.size(); i++) {
-			if (i > 0) {
-				remoteCmd += " "; //$NON-NLS-1$
-			}
-			remoteCmd += spaceEscapify(cmdArgs.get(i));
-		}
-		
-		try {
-			IRemoteExecutionManager exeMgr = connection.createExecutionManager();
-			IRemoteExecutionTools exeTools = exeMgr.getExecutionTools();
-			IRemoteScript script = exeTools.createScript();
-			if(directory() != null) {
-				String setWorkingDirStr = "cd " + directory().toURI().getPath(); //$NON-NLS-1$
-				script.setScript(new String []{setWorkingDirStr, remoteCmd});
-			} else {
-				script.setScript(remoteCmd);
-			}
-			
-			for (Entry<String,String>  entry : environment().entrySet()) {
-				script.addEnvironment(entry.getKey()+"="+entry.getValue()); //$NON-NLS-1$
-			}
-
-			RemoteProcess process = exeTools.executeProcess(script);
-			return new RemoteToolsProcess(process, redirectErrorStream());
-		} catch (Exception e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-	
-	private String spaceEscapify(String inputString) {
-		if(inputString == null)
-			return null;
-		return inputString.replaceAll(" ", "\\\\ "); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServices.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServices.java
deleted file mode 100644
index 8b93a4c..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServices.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import java.util.List;
-
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServicesDelegate;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-public class RemoteToolsServices implements IRemoteServicesDelegate {
-	private static RemoteToolsServices instance = new RemoteToolsServices();
-	private static RemoteToolsConnectionManager connMgr = null;
-
-	/**
-	 * Get shared instance of this class
-	 * 
-	 * @return instance
-	 */
-	public static RemoteToolsServices getInstance() {
-		return instance;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteServicesDelegate#getConnectionManager()
-	 */
-	public IRemoteConnectionManager getConnectionManager() {
-		return connMgr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteServicesDelegate#getFileManager(org.eclipse.ptp.remote.core.IRemoteConnection)
-	 */
-	public IRemoteFileManager getFileManager(IRemoteConnection conn) {
-		if (!(conn instanceof RemoteToolsConnection)) {
-			return null;
-		}
-		RemoteToolsConnection remConn = (RemoteToolsConnection)conn;
-		IRemoteExecutionManager mgr;
-		try {
-			mgr = remConn.createExecutionManager();
-		} catch (RemoteConnectionException e) {
-			return null;
-		}
-		return new RemoteToolsFileManager(remConn, mgr);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteServicesDelegate#getProcessBuilder(org.eclipse.ptp.remote.core.IRemoteConnection, java.util.List)
-	 */
-	public IRemoteProcessBuilder getProcessBuilder(IRemoteConnection conn, List<String>command) {
-		return new RemoteToolsProcessBuilder((RemoteToolsConnection)conn, command);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteServicesDelegate#getProcessBuilder(org.eclipse.ptp.remote.core.IRemoteConnection, java.lang.String[])
-	 */
-	public IRemoteProcessBuilder getProcessBuilder(IRemoteConnection conn, String... command) {
-		return new RemoteToolsProcessBuilder((RemoteToolsConnection)conn, command);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteServicesDelegate#initialize()
-	 */
-	public boolean initialize() {
-		if (connMgr == null) {
-			connMgr = new RemoteToolsConnectionManager();
-		}
-		return true;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServicesFactory.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServicesFactory.java
deleted file mode 100644
index 07f863e..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/RemoteToolsServicesFactory.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core;
-
-import org.eclipse.ptp.remote.core.IRemoteServicesDelegate;
-import org.eclipse.ptp.remote.core.IRemoteServicesFactory;
-
-public class RemoteToolsServicesFactory implements IRemoteServicesFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteServicesFactory#getServices()
-	 */
-	public IRemoteServicesDelegate getServices() {
-		return RemoteToolsServices.getInstance();
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/ConfigFactory.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/ConfigFactory.java
deleted file mode 100755
index aa87f3e..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/ConfigFactory.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.core.environment;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsAdapterCorePlugin;
-import org.eclipse.ptp.remote.remotetools.core.environment.conf.AttributeNames;
-import org.eclipse.ptp.remote.remotetools.core.environment.conf.DefaultValues;
-import org.eclipse.ptp.remotetools.utils.verification.ControlAttributes;
-import org.eclipse.ptp.remotetools.utils.verification.IllegalAttributeException;
-
-
-/**
- * Defines rules to build the target configuration from an attribute hash map.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class ConfigFactory {
-	Map<String, String> currentMap = null;
-	Map<String, String> defaultMap = null;
-	
-	ControlAttributes attributes = null;
-	
-	private static final String PREFIX = "ptp."; //$NON-NLS-1$
-	public static final String ATTR_LOCALHOST_SELECTION = PREFIX + "localhost-selection"; //$NON-NLS-1$
-	public static final String ATTR_LOGIN_USERNAME = PREFIX + "login-username"; //$NON-NLS-1$
-	public static final String ATTR_LOGIN_PASSWORD = PREFIX + "login-password"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_ADDRESS = PREFIX + "connection-address"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_PORT = PREFIX + "connection-port"; //$NON-NLS-1$
-	public static final String ATTR_KEY_PATH = PREFIX + "key-path"; //$NON-NLS-1$
-	public static final String ATTR_KEY_PASSPHRASE = PREFIX + "key-passphrase"; //$NON-NLS-1$
-	public static final String ATTR_IS_PASSWORD_AUTH = PREFIX + "is-passwd-auth"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_TIMEOUT = PREFIX + "connection-timeout"; //$NON-NLS-1$
-	public static final String ATTR_CIPHER_TYPE = PREFIX + "cipher-type"; //$NON-NLS-1$
-	
-	public final static String[] KEY_ARRAY = { ATTR_LOCALHOST_SELECTION,
-			ATTR_LOGIN_USERNAME, ATTR_CONNECTION_PORT, ATTR_CONNECTION_ADDRESS,
-			ATTR_KEY_PATH, ATTR_IS_PASSWORD_AUTH, ATTR_CONNECTION_TIMEOUT};
-	
-	public final static String[] KEY_CIPHERED_ARRAY = { ATTR_KEY_PASSPHRASE,
-			ATTR_LOGIN_PASSWORD };
-	
-	public ConfigFactory() {
-		createDefaultMap();
-		createCurrentMapFromPreferences();
-		attributes = new ControlAttributes(currentMap, defaultMap);
-	}
-	
-	public ConfigFactory(Map<String, String> newMap) {
-		createDefaultMap();
-		if (newMap == null) {
-			createCurrentMapFromPreferences();
-		} else {
-			currentMap = new HashMap<String, String>(newMap);
-		}
-		attributes = new ControlAttributes(currentMap, defaultMap);
-	}
-	
-	public Map<String, String> getMap() {
-		return currentMap;
-	}
-	
-	public ControlAttributes getAttributes() {
-		return attributes;
-	}
-	
-	private void createDefaultMap() {
-		defaultMap = new HashMap<String, String>();
-		defaultMap.put(ATTR_LOCALHOST_SELECTION, DefaultValues.LOCALHOST_SELECTION);
-		defaultMap.put(ATTR_LOGIN_USERNAME, DefaultValues.LOGIN_USERNAME);
-		defaultMap.put(ATTR_LOGIN_PASSWORD, DefaultValues.LOGIN_PASSWORD);
-		defaultMap.put(ATTR_CONNECTION_PORT, DefaultValues.CONNECTION_PORT);
-		defaultMap.put(ATTR_CONNECTION_ADDRESS, DefaultValues.CONNECTION_ADDRESS);
-		defaultMap.put(ATTR_KEY_PATH, DefaultValues.KEY_PATH);
-		defaultMap.put(ATTR_KEY_PASSPHRASE, DefaultValues.KEY_PASSPHRASE);
-		defaultMap.put(ATTR_IS_PASSWORD_AUTH, DefaultValues.IS_PASSWORD_AUTH);
-		defaultMap.put(ATTR_CONNECTION_TIMEOUT, DefaultValues.CONNECTION_TIMEOUT);
-		defaultMap.put(ATTR_CIPHER_TYPE, PTPTargetControl.DEFAULT_CIPHER);
-	}
-	
-	private void createCurrentMapFromPreferences() {
-		currentMap = new HashMap<String, String>();
-		Preferences store = RemoteToolsAdapterCorePlugin.getDefault().getPluginPreferences();
-		currentMap.put(ATTR_LOGIN_USERNAME, store.getString(ATTR_LOGIN_USERNAME));
-		currentMap.put(ATTR_CONNECTION_ADDRESS, store.getString(ATTR_CONNECTION_ADDRESS));
-		currentMap.put(ATTR_CONNECTION_PORT, store.getString(ATTR_CONNECTION_PORT));
-	}
-	
-	public TargetConfig createTargetConfig() throws CoreException {
-		try {
-			TargetConfig config = new TargetConfig();
-			config.setLoginUserName(attributes.getString(ATTR_LOGIN_USERNAME));
-			config.setLoginPassword(attributes.getString(ATTR_LOGIN_PASSWORD));
-			config.setConnectionPort(attributes.verifyInt(AttributeNames.CONNECTION_PORT, ATTR_CONNECTION_PORT));
-			if (attributes.getBoolean(ATTR_LOCALHOST_SELECTION)) {
-				config.setConnectionAddress("localhost"); //$NON-NLS-1$
-			} else {
-				config.setConnectionAddress(attributes.getString(ATTR_CONNECTION_ADDRESS));
-			}
-			config.setConnectionTimeout(attributes.verifyInt(AttributeNames.CONNECTION_TIMEOUT, ATTR_CONNECTION_TIMEOUT));
-			config.setKeyPassphrase(attributes.getString(ATTR_KEY_PASSPHRASE));
-			config.setKeyPath(attributes.getString(ATTR_KEY_PATH));
-			config.setIsPasswordAuth(attributes.getBoolean(ATTR_IS_PASSWORD_AUTH));
-			config.setCipherType(attributes.getString(ATTR_CIPHER_TYPE));
-			return config;
-		} catch (IllegalAttributeException e) {
-			throw new CoreException(new Status(Status.ERROR, RemoteToolsAdapterCorePlugin.getDefault().getBundle().getSymbolicName(), 0, e.getMessage(), e));
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/PTPTargetControl.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/PTPTargetControl.java
deleted file mode 100755
index c2748d0..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/PTPTargetControl.java
+++ /dev/null

@@ -1,310 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.core.environment;
-
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionChangeEvent;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsAdapterCorePlugin;
-import org.eclipse.ptp.remote.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.RemotetoolsPlugin;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-import org.eclipse.ptp.remotetools.environment.control.SSHTargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetVariables;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * Controls an instance of a target created from the Environment.
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class PTPTargetControl extends SSHTargetControl implements ITargetControl, ITargetVariables {
-
-	private static final int NOT_OPERATIONAL = 1;
-	private static final int CONNECTING = 2;
-	private static final int CONNECTED = 3;
-	private static final int DISCONNECTING = 4;
-	
-	/**
-	 * Default cipher id
-	 */
-	public static final String DEFAULT_CIPHER = RemotetoolsPlugin.CIPHER_DEFAULT;
-	/**
-	 * Configuration provided to the target control.
-	 */
-	private ConfigFactory configFactory;
-	private TargetConfig currentTargetConfig;
-	/**
-	 * BackReference to the target element
-	 */
-	private ITargetElement targetElement;
-	private IRemoteExecutionManager executionManager;
-	
-	/**
-	 * Current connection state.
-	 */
-	private int state;
-	
-	private IRemoteConnectionManager conMgr = null;
-	private IRemoteConnection connection = null;
-
-	/**
-	 * Creates a target control. If some attribute related to the environment has an invalid
-	 * format, an exception is thrown. Simulator attributes are not checked yet, but will be checked when the target is
-	 * created (launched).
-	 * 
-	 * @param attributes
-	 *            Configuration attributes
-	 * @param element
-	 *            Name for the target (displayed in GUI)
-	 * @throws CoreException
-	 *             Some attribute is not valid
-	 */
-	public PTPTargetControl(ITargetElement element) throws CoreException {
-		super();
-		state = NOT_OPERATIONAL;
-		targetElement = element;
-		configFactory = new ConfigFactory(targetElement.getAttributes());
-		currentTargetConfig = configFactory.createTargetConfig();
-	}
-
-	public void setConnection(IRemoteConnectionManager conMgr, IRemoteConnection conn) {
-		this.conMgr = conMgr;
-		this.connection = conn;
-	}
-	
-	/**
-	 * Connect to the remote host. On every error or possible failure, an exception
-	 * (CoreException) is thrown, whose (multi)status describe the error(s) that prevented creating the target control.
-	 * 
-	 * @param monitor
-	 *            Progress indicator or <code>null</code>
-	 * @return Always true.
-	 * @throws CoreException
-	 *             Some attribute is not valid, the simulator cannot be launched, the ssh failed to connect.
-	 */
-	public boolean create(IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(Messages.TargetControl_create_MonitorConnecting, 1);
-		/*
-		 *  Connect to the remote host
-		 */
-		if(currentTargetConfig.isPasswordAuth()) {
-			setConnectionParameters(
-					new SSHParameters(
-							currentTargetConfig.getConnectionAddress(),
-							currentTargetConfig.getConnectionPort(),
-							currentTargetConfig.getLoginUserName(),
-							currentTargetConfig.getLoginPassword(),
-							currentTargetConfig.getCipherType(),
-							currentTargetConfig.getConnectionTimeout()*1000
-					)
-				);
-		} else {
-			setConnectionParameters(
-					new SSHParameters(
-							currentTargetConfig.getConnectionAddress(),
-							currentTargetConfig.getConnectionPort(),
-							currentTargetConfig.getLoginUserName(),
-							currentTargetConfig.getKeyPath(),
-							currentTargetConfig.getKeyPassphrase(),
-							currentTargetConfig.getCipherType(),
-							currentTargetConfig.getConnectionTimeout()*1000
-					)
-				);
-		}
-		
-		try {
-			setState(CONNECTING);
-			super.create(monitor);
-			setState(CONNECTED);
-			
-			if (conMgr != null) {
-				conMgr.fireConnectionChangeEvent(new IRemoteConnectionChangeEvent(){
-					public IRemoteConnection getConnection() {
-						return connection;
-					}
-		
-					public int getType() {
-						return IRemoteConnectionChangeEvent.CONNECTION_OPENED;
-					}
-					
-				});
-			}
-			
-			monitor.worked(1);
-		} catch (CoreException e) {
-			disconnect();
-			setState(NOT_OPERATIONAL);
-			monitor.done();
-			return true;
-		}
-		try {
-			executionManager = super.createRemoteExecutionManager();
-		} catch (RemoteConnectionException e) {
-			disconnect();
-			setState(NOT_OPERATIONAL);
-		}
-		monitor.done();
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.SSHTargetControl#createTargetSocket(int)
-	 */
-	public TargetSocket createTargetSocket(int port) {
-		Assert.isTrue(isConnected());
-		TargetSocket socket = new TargetSocket();
-		socket.host = currentTargetConfig.getConnectionAddress();
-		socket.port = port;
-		return socket;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControl#destroy()
-	 */
-	public void destroy() throws CoreException {
-		// End all jobs, if possible, then disconnect
-		try {
-			terminateJobs(null);
-		} finally {
-			disconnect();
-		}
-	}
-
-	/**
-	 * Get the main execution manager for this control.
-	 * 
-	 * @return execution manager
-	 */
-	public IRemoteExecutionManager getExecutionManager() {
-		return executionManager;
-	}
-	
-	/**
-	 * Create a new execution manager. This is required for script execution
-	 * because KillableExecution closes the channel after execution.
-	 * 
-	 * @return new execution manager;
-	 */
-	public IRemoteExecutionManager createExecutionManager() throws RemoteConnectionException {
-		return super.createRemoteExecutionManager();
-	}
-
-	/**
-	 * @return
-	 */
-	public String getName() {
-		return targetElement.getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.SSHTargetControl#getPluginId()
-	 */
-	protected String getPluginId() {
-		return RemoteToolsAdapterCorePlugin.PLUGIN_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.extension.ITargetVariables#getSystemWorkspace()
-	 */
-	public String getSystemWorkspace() {
-		return currentTargetConfig.getSystemWorkspace();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.SSHTargetControl#kill(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean kill(IProgressMonitor monitor) throws CoreException {
-		try {
-			setState(DISCONNECTING);
-			super.kill(monitor);
-		} finally {
-			setState(NOT_OPERATIONAL);
-			
-			if (conMgr != null) {
-				conMgr.fireConnectionChangeEvent(new IRemoteConnectionChangeEvent(){
-					public IRemoteConnection getConnection() {
-						return connection;
-					}
-		
-					public int getType() {
-						return IRemoteConnectionChangeEvent.CONNECTION_CLOSED;
-					}
-					
-				});	
-			}
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControl#query()
-	 */
-	public synchronized int query() {
-		switch (state) {
-		case NOT_OPERATIONAL:
-			return ITargetStatus.STOPPED;
-		case CONNECTING:
-		case DISCONNECTING:
-			return ITargetStatus.STARTED;
-		case CONNECTED:
-			if (isConnected()) {
-				return ITargetStatus.RESUMED;
-			} else {
-				return ITargetStatus.STARTED;
-			}
-		default:
-			return ITargetStatus.STOPPED;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControl#resume(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean resume(IProgressMonitor monitor) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-				Messages.TargetControl_resume_CannotResume, null));
-	}
-	
-	/**
-	 * @param state
-	 */
-	private synchronized void setState(int state) {
-		this.state = state;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControl#stop(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean stop(IProgressMonitor monitor) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-				Messages.TargetControl_stop_CannotPause, null));
-	}
-
-	/**
-	 * Sets new attributes.
-	 */
-	public void updateConfiguration() throws CoreException {
-		//targetElement.setName(name);
-		configFactory = new ConfigFactory(targetElement.getAttributes());
-		currentTargetConfig = configFactory.createTargetConfig();
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/TargetConfig.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/TargetConfig.java
deleted file mode 100755
index 5751159..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/TargetConfig.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.core.environment;
-
-/**
- * Describes a target created from the environment. This class contains only attributes that apply how the environment
- * interacts with Eclipse. 
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class TargetConfig {
-	private String loginUserName;
-	private String loginPassword;
-	private int connectionPort;
-	private String connectionAddress;
-	private int connectionTimeout;
-	private String keyPath;
-	private String keyPassphrase;
-	private boolean isPasswordAuth;
-	private String systemWorkspace;
-	private String cipherType;
-	
-	public String getConnectionAddress() {
-		return connectionAddress;
-	}
-	public void setConnectionAddress(String connectionAddress) {
-		this.connectionAddress = connectionAddress;
-	}
-	public int getConnectionPort() {
-		return connectionPort;
-	}
-	public void setConnectionPort(int connectionPort) {
-		this.connectionPort = connectionPort;
-	}
-	public String getLoginPassword() {
-		return loginPassword;
-	}
-	public void setLoginPassword(String loginPassword) {
-		this.loginPassword = loginPassword;
-	}
-	public String getLoginUserName() {
-		return loginUserName;
-	}
-	public void setLoginUserName(String loginUserName) {
-		this.loginUserName = loginUserName;
-	}
-	public void setKeyPath(String keyPath) {
-		this.keyPath = keyPath;
-	}
-	public void setKeyPassphrase(String keyPassphrase) {
-		this.keyPassphrase = keyPassphrase;
-	}
-	public void setIsPasswordAuth(boolean isPasswordAuth) {
-		this.isPasswordAuth = isPasswordAuth; 
-		
-	}
-	public int getConnectionTimeout() {
-		return connectionTimeout;
-	}
-	public void setConnectionTimeout(int connectionTimeout) {
-		this.connectionTimeout = connectionTimeout;
-	}
-	public boolean isPasswordAuth() {
-		return isPasswordAuth;
-	}
-	public void setPasswordAuth(boolean isPasswordAuth) {
-		this.isPasswordAuth = isPasswordAuth;
-	}
-	public String getKeyPassphrase() {
-		return keyPassphrase;
-	}
-	public String getKeyPath() {
-		return keyPath;
-	}
-	public void setSystemWorkspace(String systemWorkspace) {
-		this.systemWorkspace = systemWorkspace;
-	}
-	public String getSystemWorkspace() {
-		return systemWorkspace;
-	}
-	public void setCipherType(String cipherType) {
-		this.cipherType = cipherType;
-	}
-	public String getCipherType() {
-		return cipherType;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/AttributeNames.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/AttributeNames.java
deleted file mode 100755
index 04bcf20..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/AttributeNames.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remote.remotetools.core.environment.conf;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Defines names of attributes. Intended for an uniform and consistent use of names for
- * attributes in GUI, error messages and configuration files across plugins.
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public class AttributeNames extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remote.remotetools.core.environment.conf.attribute_names"; //$NON-NLS-1$
-
-	public static String CONNECTION_ADDRESS;
-	public static String CONNECTION_PORT;
-	public static String CONNECTION_TIMEOUT;
-	public static String KEY_PASSPHRASE;
-	public static String KEY_PATH;
-	public static String LOGIN_PASSWORD;
-	public static String LOGIN_USERNAME;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, AttributeNames.class);
-	}
-
-	private AttributeNames() {
-	}
-}
-

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/DefaultValues.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/DefaultValues.java
deleted file mode 100755
index 4cf0319..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/DefaultValues.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.core.environment.conf;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Richard Maciel
- *
- * @since 1.2.1
- */
-public class DefaultValues extends NLS
-{
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remote.remotetools.core.environment.conf.defaults"; //$NON-NLS-1$
-
-
-	public static String LOCALHOST_SELECTION;
-	public static String LOGIN_USERNAME;
-	public static String LOGIN_PASSWORD;
-	public static String CONNECTION_ADDRESS;
-	public static String CONNECTION_PORT;
-	public static String CONNECTION_TIMEOUT;
-	public static String KEY_PATH;
-	public static String KEY_PASSPHRASE;
-	public static String IS_PASSWORD_AUTH;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, DefaultValues.class);
-	}
-
-	private DefaultValues() {
-		// cannot create new instance
-	}
-}
-
-	

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/attribute_names.properties b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/attribute_names.properties
deleted file mode 100755
index 1fcddaa..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/attribute_names.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LOGIN_USERNAME=User name remote connection
-LOGIN_PASSWORD=Password remote connection
-CONNECTION_ADDRESS=Address for remote connection
-CONNECTION_PORT=Port for remote connection
-KEY_PATH=Path to file with private key for remote connection
-KEY_PASSPHRASE=Passphrase to open private key for remote connection
-CONNECTION_TIMEOUT=Timeout for remote connection

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/defaults.properties b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/defaults.properties
deleted file mode 100755
index d42075d..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/environment/conf/defaults.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LOCALHOST_SELECTION=true
-LOGIN_USERNAME=
-LOGIN_PASSWORD=
-CONNECTION_ADDRESS=
-CONNECTION_PORT=22
-CONNECTION_TIMEOUT=5
-KEY_PATH=
-KEY_PASSPHRASE=
-IS_PASSWORD_AUTH=true
-CIPHER_TYPE=

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/Messages.java b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/Messages.java
deleted file mode 100755
index 0eaa7ab..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/Messages.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Daniel Felix Ferber
- *
- * @since 3.0
- */
-public class Messages extends NLS
-{
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remote.remotetools.core.messages.messages"; //$NON-NLS-1$
-
-	public static String TargetControl_create_MonitorConnecting;
-	public static String TargetControl_resume_CannotResume;
-	public static String TargetControl_stop_CannotPause;
-	public static String RemoteToolsConnection_connectionNotOpen;
-	public static String RemoteToolsConnection_remotePort;
-	public static String RemoteToolsConnection_open;
-	public static String RemoteToolsConnection_forwarding;
-	public static String RemoteToolsConnection_close;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, Messages.class);
-	}
-
-	private Messages() {
-		// cannot create new instance
-	}
-}
-
-	

diff --git a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/messages.properties b/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/messages.properties
deleted file mode 100755
index 47e8fb2..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.core/src/org/eclipse/ptp/remote/remotetools/core/messages/messages.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-TargetControl_create_MonitorConnecting=Connecting to remote host
-TargetControl_resume_CannotResume=Remote host cannot be resumed from pause
-TargetControl_stop_CannotPause=Remote host cannot be paused
-RemoteToolsConnection_connectionNotOpen=Connection is not open
-RemoteToolsConnection_remotePort=Could not allocate remote port
-RemoteToolsConnection_open=Opening connection...
-RemoteToolsConnection_forwarding=Setting up remote forwarding
-RemoteToolsConnection_close=Closing connection...

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/.classpath b/core/org.eclipse.ptp.remote.remotetools.ui/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/.project b/core/org.eclipse.ptp.remote.remotetools.ui/.project
deleted file mode 100644
index 8aacab7..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remote.remotetools.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.remote.remotetools.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a8be3be..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Tue Jul 22 14:41:31 PDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.remote.remotetools.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 8550244..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remote.remotetools.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.remote.remotetools.ui.Activator
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ptp.remote.remotetools.core;bundle-version="2.0.1",
- org.eclipse.ptp.remotetools.core;bundle-version="2.1.8",
- org.eclipse.ptp.remotetools.environment.core;bundle-version="1.3.3",
- org.eclipse.ptp.remotetools.preferences;bundle-version="1.3.1",
- org.eclipse.ptp.remotetools.utils;bundle-version="3.0.0",
- org.eclipse.ptp.remote.core;bundle-version="2.0.1",
- org.eclipse.ptp.remote.ui;bundle-version="2.0.0",
- org.eclipse.ui.ide,
- org.eclipse.ptp.utils.ui;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin

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

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

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/build.properties b/core/org.eclipse.ptp.remote.remotetools.ui/build.properties
deleted file mode 100644
index e398e4e..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/build.properties
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/plugin.properties b/core/org.eclipse.ptp.remote.remotetools.ui/plugin.properties
deleted file mode 100644
index 9e3abf4..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools UI Support
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/plugin.xml b/core/org.eclipse.ptp.remote.remotetools.ui/plugin.xml
deleted file mode 100644
index 5a1a823..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/plugin.xml
+++ /dev/null

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.remotetools.environment.core.remoteEnvironmentControlDelegate">
-      <control
-            class="org.eclipse.ptp.remote.remotetools.ui.environment.Environment"
-            name="Remote Host">
-      </control>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage.EnvironmentPreferencePage"
-            class="org.eclipse.ptp.remote.remotetools.ui.environment.preferences.PreferencePage"
-            id="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage.EnvironmentPreferencePage"
-            name="Remote Host"/>      
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.ptp.remote.remotetools.ui.environment.preferences.PreferenceInitializer"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.remote.ui.remoteUIServices">
-      <remoteUIServices
-            class="org.eclipse.ptp.remote.remotetools.ui.RemoteToolsUIServicesFactory"
-            id="org.eclipse.ptp.remote.RemoteTools"
-            name="Remote Tools">
-      </remoteUIServices>
-   </extension>
-   <extension
-         point="org.eclipse.ui.ide.filesystemSupport">
-      <filesystemContributor
-            class="org.eclipse.ptp.remote.remotetools.ui.RemoteToolsFileSystemContributor"
-            label="Remote Tools"
-            scheme="remotetools">
-      </filesystemContributor>
-   </extension>
-</plugin>

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/Activator.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/Activator.java
deleted file mode 100644
index 515d9ae..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/Activator.java
+++ /dev/null

@@ -1,50 +0,0 @@
-package org.eclipse.ptp.remote.remotetools.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.remote.remotetools.ui";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsFileSystemContributor.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsFileSystemContributor.java
deleted file mode 100644
index 4f555b2..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsFileSystemContributor.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Kushal Munir (IBM) - moved to internal package.
- * Martin Oberhuber (Wind River) - [181917] EFS Improvements: Avoid unclosed Streams,
- *    - Fix early startup issues by deferring FileStore evaluation and classloading,
- *    - Improve performance by RSEFileStore instance factory and caching IRemoteFile.
- *    - Also remove unnecessary class RSEFileCache and obsolete branding files.
- * Martin Oberhuber (Wind River) - [188360] renamed from plugin org.eclipse.rse.eclipse.filesystem
- * Martin Oberhuber (Wind River) - [189441] fix EFS operations on Windows (Local) systems
- * David Dykstal (IBM) - [235840] externalizing dialog title
- ********************************************************************************/
-
-
-package org.eclipse.ptp.remote.remotetools.ui;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsAdapterCorePlugin;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ide.fileSystem.FileSystemContributor;
-
-public class RemoteToolsFileSystemContributor extends FileSystemContributor {
-
-	public URI browseFileSystem(String initialPath, Shell shell) {
-		IRemoteServices services = PTPRemoteCorePlugin.getDefault().getRemoteServices(RemoteToolsAdapterCorePlugin.SERVICES_ID);
-		IRemoteUIServices uiServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(services);
-		IRemoteUIFileManager uiFileMgr = uiServices.getUIFileManager();
-		uiFileMgr.showConnections(true);
-		IPath path = uiFileMgr.browseDirectory(shell, "Browse File System", initialPath);
-		if (path != null) {
-			IRemoteConnection conn = uiFileMgr.getConnection();
-			IRemoteFileManager fileMgr = services.getFileManager(conn);
-			return ((RemoteToolsFileManager)fileMgr).toURI(path);
-		}
-		
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ide.fileSystem.FileSystemContributor#getURI(java.lang.String)
-	 */
-	@Override
-	public URI getURI(String string) {
-		try {
-			return new URI(string);
-		}
-		catch (URISyntaxException e) {
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIConnectionManager.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIConnectionManager.java
deleted file mode 100644
index 7b1b783..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIConnectionManager.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.ui;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIConnectionManager;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.core.TargetEnvironmentManager;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-import org.eclipse.ptp.remotetools.environment.wizard.EnvironmentWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class RemoteToolsUIConnectionManager implements IRemoteUIConnectionManager {
-	private TargetTypeElement remoteHost = null;
-	private IRemoteConnectionManager connMgr = null;
-	
-	public RemoteToolsUIConnectionManager(IRemoteServices services) {
-		this.connMgr = services.getConnectionManager();
-		TargetEnvironmentManager targetMgr = EnvironmentPlugin.getDefault().getTargetsManager();
-		for (Object obj : targetMgr.getTypeElements()) {
-			TargetTypeElement element = (TargetTypeElement)obj;
-			if (element.getName().equals("Remote Host")) {
-				remoteHost = element;
-				break;
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteUIConnectionManager#newConnection()
-	 */
-	public IRemoteConnection newConnection(Shell shell) {
-		if (remoteHost != null) {
-			IRemoteConnection[] oldConns = connMgr.getConnections();
-			
-			EnvironmentWizard wizard = new EnvironmentWizard(remoteHost);
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			dialog.create();
-			dialog.setBlockOnOpen(true);
-			
-			if (dialog.open() == WizardDialog.OK) {
-				/*
-				 * Locate the new connection and return it. Assumes connections can
-				 * only be created by the wizard, NOT removed.
-				 */
-				IRemoteConnection[] newConns = connMgr.getConnections();
-				
-				if (newConns.length <= oldConns.length) {
-					return null;
-				}
-				
-				Arrays.sort(oldConns, new Comparator<IRemoteConnection>() {
-					public int compare(IRemoteConnection c1, IRemoteConnection c2) {
-						return c1.getName().compareToIgnoreCase(c2.getName());
-					}
-				});
-				Arrays.sort(newConns, new Comparator<IRemoteConnection>() {
-					public int compare(IRemoteConnection c1, IRemoteConnection c2) {
-						return c1.getName().compareToIgnoreCase(c2.getName());
-					}
-				});
-				for (int i = 0; i < oldConns.length; i++) {
-					if (!oldConns[i].equals(newConns[i])) {
-						return newConns[i];
-					}
-				}
-				return newConns[newConns.length-1];
-			}
-		}
-		return null;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIFileManager.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIFileManager.java
deleted file mode 100644
index b1b7ded..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIFileManager.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.dialogs.RemoteResourceBrowser;
-import org.eclipse.swt.widgets.Shell;
-
-public class RemoteToolsUIFileManager implements IRemoteUIFileManager {
-	private IRemoteServices services = null;
-	private IRemoteConnection connection = null;
-	private boolean showConnections = false;
-	
-	public RemoteToolsUIFileManager(IRemoteServices services) {
-		this.services = services;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteFileManager#browseDirectory(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String)
-	 */
-	public IPath browseDirectory(Shell shell, String message, String filterPath) {
-		RemoteResourceBrowser browser = new RemoteResourceBrowser(services, connection, shell);
-		browser.setType(RemoteResourceBrowser.DIRECTORY_BROWSER);
-		browser.setInitialPath(filterPath);
-		browser.showConnections(showConnections);
-		if (browser.open() == Window.CANCEL) {
-			return null;
-		}
-		connection = browser.getConnection();
-		String path = browser.getPath();
-		if (path == null) {
-			return null;
-		}
-		return new Path(path);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.core.IRemoteFileManager#browseFile(org.eclipse.swt.widgets.Shell, java.lang.String, java.lang.String)
-	 */
-	public IPath browseFile(Shell shell, String message, String filterPath) {
-		RemoteResourceBrowser browser = new RemoteResourceBrowser(services, connection, shell);
-		browser.setType(RemoteResourceBrowser.FILE_BROWSER);
-		browser.setInitialPath(filterPath);
-		browser.showConnections(showConnections);
-		if (browser.open() == Window.CANCEL) {
-			return null;
-		}
-		connection = browser.getConnection();
-		String path = browser.getPath();
-		if (path == null) {
-			return null;
-		}
-		return new Path(path);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.ui.IRemoteUIFileManager#getConnection()
-	 */
-	public IRemoteConnection getConnection() {
-		return connection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.ui.IRemoteUIFileManager#setConnection(org.eclipse.ptp.remote.core.IRemoteConnection)
-	 */
-	public void setConnection(IRemoteConnection connection) {
-		this.connection = connection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.ui.IRemoteUIFileManager#showConnections(boolean)
-	 */
-	public void showConnections(boolean enable) {
-		showConnections = enable;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServices.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServices.java
deleted file mode 100644
index 8bc8c80..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServices.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.ui;
-
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIConnectionManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServicesDelegate;
-
-
-public class RemoteToolsUIServices implements IRemoteUIServicesDelegate {
-	private static RemoteToolsUIServices instance = new RemoteToolsUIServices();
-	private IRemoteServices services;
-
-	/**
-	 * Get shared instance of this class
-	 * 
-	 * @return instance
-	 */
-	public static RemoteToolsUIServices getInstance(IRemoteServices services) {
-		instance.setServices(services);
-		return instance;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.ui.IRemoteUIServicesDelegate#getUIConnectionManager()
-	 */
-	public IRemoteUIConnectionManager getUIConnectionManager() {
-		return new RemoteToolsUIConnectionManager(services);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.ui.IRemoteUIServicesDelegate#getUIFileManager()
-	 */
-	public IRemoteUIFileManager getUIFileManager() {
-		return new RemoteToolsUIFileManager(services);
-	}
-
-	/**
-	 * Set remote services for this provider
-	 * 
-	 * @param services
-	 */
-	private void setServices(IRemoteServices services) {
-		this.services = services;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServicesFactory.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServicesFactory.java
deleted file mode 100644
index cc29475..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/RemoteToolsUIServicesFactory.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remote.remotetools.ui;
-
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIServicesDelegate;
-import org.eclipse.ptp.remote.ui.IRemoteUIServicesFactory;
-
-public class RemoteToolsUIServicesFactory implements IRemoteUIServicesFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remote.ui.IRemoteUIServicesFactory#getServices(org.eclipse.ptp.remote.core.IRemoteServices)
-	 */
-	public IRemoteUIServicesDelegate getServices(IRemoteServices services) {
-		return RemoteToolsUIServices.getInstance(services);
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/ConfigurationPage.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/ConfigurationPage.java
deleted file mode 100755
index 8d6dc39..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/ConfigurationPage.java
+++ /dev/null

@@ -1,206 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.ui.environment;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remote.remotetools.core.environment.ConfigFactory;
-import org.eclipse.ptp.remote.remotetools.core.environment.PTPTargetControl;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-import org.eclipse.ptp.remotetools.utils.verification.ControlAttributes;
-import org.eclipse.ptp.utils.ui.swt.AuthenticationFrame;
-import org.eclipse.ptp.utils.ui.swt.AuthenticationFrameMold;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboGroupItem;
-import org.eclipse.ptp.utils.ui.swt.TextGroup;
-import org.eclipse.ptp.utils.ui.swt.TextMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-
-/**
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- *
- */
-public class ConfigurationPage extends AbstractEnvironmentDialogPage {
-	ConfigFactory configFactory = null;
-	
-	public ConfigurationPage(String targetName, Map attributesMap) {
-		super(targetName);
-		
-		/*if (targetName == null) {
-			this.targetName = Messages.ConfigurationPage_DefaultTargetName;
-		} else {*/
-		this.targetName = targetName;
-		//}
-
-		configFactory = new ConfigFactory(attributesMap);
-	}
-	
-	public ConfigurationPage() {
-		super(Messages.ConfigurationPage_DefaultTargetName);
-		this.targetName = Messages.ConfigurationPage_DefaultTargetName;
-		
-		configFactory = new ConfigFactory();
-	}
-
-	private String targetName;
-	private TextGroup targetNameGroup;
-	private AuthenticationFrame remoteAuthFrame;
-	
-	class DataModifyListener implements ModifyListener {
-		int counter = 0;
-		public synchronized void enable() {
-			counter++;
-		}
-		public synchronized void disable() {
-			counter--;
-		}
-		public synchronized void modifyText(ModifyEvent e) {
-			if (counter < 0) {
-				return;
-			}
-			readControls();
-			
-			// updateButtons() will call is Valid(), that will call validateFields()
-			getContainer().updateButtons();
-		}
-	}
-	
-	private DataModifyListener dataModifyListener;
-	
-	public void createControl(Composite parent) {
-		
-		this.setDescription(Messages.ConfigurationPage_DialogDescription);
-		this.setTitle(Messages.ConfigurationPage_DialogTitle);
-		this.setErrorMessage(null);
-
-		GridLayout topLayout = new GridLayout();
-		final Composite topControl = new Composite(parent, SWT.NONE);
-		setControl(topControl);
-		topControl.setLayout(topLayout);
-
-		/*
-		 * Environment name Label and text controls.
-		 */
-//		TextGroupMold tmold = new TextGroupMold(TextGroupMold.GRID_DATA_ALIGNMENT_FILL
-//				| TextGroupMold.GRID_DATA_GRAB_EXCESS_SPACE, Messages.ConfigurationPage_LabelTargetName, TextGroup.MAX_SIZE);
-		TextMold mold = new TextMold(TextMold.GRID_DATA_ALIGNMENT_FILL | TextMold.GRID_DATA_GRAB_EXCESS_SPACE, Messages.ConfigurationPage_LabelTargetName);
-		targetNameGroup = new TextGroup(topControl, mold);
-		
-		createAuthControl(topControl);
-
-		fillControls();
-		registerListeners();
-	}
-	
-	private void registerListeners() {
-		dataModifyListener = new DataModifyListener();
-		targetNameGroup.addModifyListener(dataModifyListener);
-		remoteAuthFrame.addModifyListener(dataModifyListener);
-	}
-	
-	private void fillControls() {
-		ControlAttributes attributes = configFactory.getAttributes();
-		targetNameGroup.setString(targetName);
-		remoteAuthFrame.setLocalhostSelected(attributes.getBoolean(ConfigFactory.ATTR_LOCALHOST_SELECTION));
-		remoteAuthFrame.setHostPort(attributes.getInteger(ConfigFactory.ATTR_CONNECTION_PORT));
-		remoteAuthFrame.setHostAddress(attributes.getString(ConfigFactory.ATTR_CONNECTION_ADDRESS));
-		remoteAuthFrame.setUserName(attributes.getString(ConfigFactory.ATTR_LOGIN_USERNAME));
-		remoteAuthFrame.setPassword(attributes.getString(ConfigFactory.ATTR_LOGIN_PASSWORD));
-		remoteAuthFrame.setPublicKeyPath(attributes.getString(ConfigFactory.ATTR_KEY_PATH));
-		remoteAuthFrame.setPassphrase(attributes.getString(ConfigFactory.ATTR_KEY_PASSPHRASE));
-		remoteAuthFrame.setTimeout(attributes.getInteger(ConfigFactory.ATTR_CONNECTION_TIMEOUT));
-		remoteAuthFrame.setPasswordBased(attributes.getBoolean(ConfigFactory.ATTR_IS_PASSWORD_AUTH));
-		
-		// Fill the combobox with available cipher types
-		Map cipherMap = PTPTargetControl.getCipherTypesMap();
-		Set cKeySet = cipherMap.keySet();
-		ComboGroup cipherGroup = remoteAuthFrame.getCipherTypeGroup();
-		for(Iterator it = cKeySet.iterator(); it.hasNext();) {
-			String key = (String)it.next();
-			String value = (String)cipherMap.get(key);
-			
-			cipherGroup.add(new ComboGroupItem(key, value));
-		}
-		// Select the cipher type based on the attributes map.
-		cipherGroup.selectIndexUsingID(attributes.getString(ConfigFactory.ATTR_CIPHER_TYPE));
-		
-		
-		//org.eclipse.ptp.remotetools.internal.ssh.systemWorkspaceGroup.setString(attributes.getString(ConfigFactory.ATTR_SYSTEM_WORKSPACE));
-	}
-	
-	private void readControls() {
-		ControlAttributes attributes = configFactory.getAttributes();
-		targetName = targetNameGroup.getString();
-		attributes.setBooleanAttribute(ConfigFactory.ATTR_LOCALHOST_SELECTION, remoteAuthFrame.isLocalhostSelected());
-		attributes.setStringAttribute(ConfigFactory.ATTR_LOGIN_USERNAME, remoteAuthFrame.getUserName());
-		attributes.setStringAttribute(ConfigFactory.ATTR_LOGIN_PASSWORD, remoteAuthFrame.getPassword());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_ADDRESS, remoteAuthFrame.getHostAddress());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_PORT, Integer.toString(remoteAuthFrame.getHostPort()));
-		attributes.setStringAttribute(ConfigFactory.ATTR_KEY_PATH, remoteAuthFrame.getPublicKeyPath());	
-		attributes.setStringAttribute(ConfigFactory.ATTR_KEY_PASSPHRASE, remoteAuthFrame.getPassphrase());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_TIMEOUT, Integer.toString(remoteAuthFrame.getTimeout()));
-		attributes.setBooleanAttribute(ConfigFactory.ATTR_IS_PASSWORD_AUTH, remoteAuthFrame.isPasswordBased());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CIPHER_TYPE, remoteAuthFrame.getSelectedCipherType().getId());
-	}
-
-	private void createAuthControl(Composite topControl) {
-		AuthenticationFrameMold amold = new AuthenticationFrameMold(Messages.ConfigurationPage_ConnectionFrameTitle);
-		amold.setBitmask(AuthenticationFrameMold.SHOW_HOST_TYPE_RADIO_BUTTON);
-		amold.setLabelLocalhost(Messages.ConfigurationPage_LabelLocalhost);
-		amold.setLabelRemoteHost(Messages.ConfigurationPage_LabelRemoteHost);
-		amold.setLabelHideAdvancedOptions(Messages.ConfigurationPage_LabelHideAdvancedOptions);
-		amold.setLabelHostAddress(Messages.ConfigurationPage_LabelHostAddress);
-		amold.setLabelHostPort(Messages.ConfigurationPage_LabelHostPort);
-		amold.setLabelIsPasswordBased(Messages.ConfigurationPage_LabelIsPasswordBased);
-		amold.setLabelIsPublicKeyBased(Messages.ConfigurationPage_LabelIsPublicKeyBased);
-		amold.setLabelPassphrase(Messages.ConfigurationPage_LabelPassphrase);
-		amold.setLabelPassword(Messages.ConfigurationPage_LabelPassword);
-		amold.setLabelPublicKeyPath(Messages.ConfigurationPage_LabelPublicKeyPath);
-		amold.setLabelPublicKeyPathButton(Messages.ConfigurationPage_LabelPublicKeyPathButton);
-		amold.setLabelPublicKeyPathTitle(Messages.ConfigurationPage_LabelPublicKeyPathTitle);
-		amold.setLabelShowAdvancedOptions(Messages.ConfigurationPage_LabelShowAdvancedOptions);
-		amold.setLabelTimeout(Messages.ConfigurationPage_LabelTimeout);
-		amold.setLabelCipherType(Messages.ConfigurationPage_CipherType);
-		amold.setLabelUserName(Messages.ConfigurationPage_LabelUserName);
-
-		this.remoteAuthFrame = new AuthenticationFrame(topControl, amold);
-	}
-
-	public Map getAttributes() {
-		return configFactory.getMap();
-	}
-
-	public boolean isValid() {
-		try {
-			remoteAuthFrame.validateFields();
-			configFactory.createTargetConfig();
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-			return false;
-		}
-		return true;
-	}
-
-	public String getName() {
-	    return targetName;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Environment.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Environment.java
deleted file mode 100755
index abf7107..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Environment.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.ui.environment;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remote.remotetools.core.environment.ConfigFactory;
-import org.eclipse.ptp.remote.remotetools.core.environment.PTPTargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-
-
-/**
- * Factory for the environment.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class Environment implements ITargetTypeExtension {
-	
-	public Environment() {
-		super();
-	}
-
-	public ITargetControl controlFactory(ITargetElement element) throws CoreException {
-		return new PTPTargetControl(element);
-	}
-
-	public String[] getControlAttributeNames() {
-		return ConfigFactory.KEY_ARRAY;
-	}
-
-	public AbstractEnvironmentDialogPage dialogPageFactory(ITargetElement targetElement) {
-		return new ConfigurationPage(targetElement.getName(), targetElement.getAttributes());
-	}
-	
-	public AbstractEnvironmentDialogPage dialogPageFactory() {
-		return new ConfigurationPage();
-	}
-	
-	public String[] getControlAttributeNamesForCipheredKeys() {
-		return ConfigFactory.KEY_CIPHERED_ARRAY;
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Messages.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Messages.java
deleted file mode 100755
index 1d5ab43..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/Messages.java
+++ /dev/null

@@ -1,60 +0,0 @@
-package org.eclipse.ptp.remote.remotetools.ui.environment;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Daniel Felix Ferber
- */
-public class Messages extends NLS {
-	private static String BUNDLE_NAME = "org.eclipse.ptp.remote.remotetools.ui.environment.messages"; //$NON-NLS-1$
-
-	public static String ConfigurationPage_LabelLocalhost;
-	
-	public static String ConfigurationPage_LabelRemoteHost;
-	
-	public static String ConfigurationPage_LabelHideAdvancedOptions;
-
-	public static String ConfigurationPage_LabelHostAddress;
-
-	public static String ConfigurationPage_LabelHostPort;
-
-	public static String ConfigurationPage_LabelIsPasswordBased;
-
-	public static String ConfigurationPage_LabelIsPublicKeyBased;
-
-	public static String ConfigurationPage_LabelPassphrase;
-
-	public static String ConfigurationPage_LabelPassword;
-
-	public static String ConfigurationPage_LabelPublicKeyPath;
-
-	public static String ConfigurationPage_LabelPublicKeyPathButton;
-
-	public static String ConfigurationPage_LabelUserName;
-
-	public static String ConfigurationPage_LabelTimeout;
-
-	public static String ConfigurationPage_LabelShowAdvancedOptions;
-
-	public static String ConfigurationPage_LabelPublicKeyPathTitle;
-
-	public static String ConfigurationPage_ConnectionFrameTitle;
-
-	public static String ConfigurationPage_DefaultTargetName;
-
-	public static String ConfigurationPage_DialogDescription;
-
-	public static String ConfigurationPage_DialogTitle;
-
-	public static String ConfigurationPage_LabelTargetName;
-
-	public static String ConfigurationPage_CipherType;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/messages.properties b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/messages.properties
deleted file mode 100755
index bbf4a48..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/messages.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-ConfigurationPage_DefaultTargetName=Remote Host
-ConfigurationPage_DialogDescription=Properties for connecting to a remote host
-ConfigurationPage_DialogTitle=Remote Host
-ConfigurationPage_LabelTargetName=Target name:
-ConfigurationPage_ConnectionFrameTitle=Host Information
-ConfigurationPage_LabelLocalhost=Localhost
-ConfigurationPage_LabelRemoteHost=Remote host
-ConfigurationPage_LabelHideAdvancedOptions=Simplified
-ConfigurationPage_LabelHostAddress=Host:
-ConfigurationPage_LabelHostPort=Port:
-ConfigurationPage_LabelIsPasswordBased=Password based authentication
-ConfigurationPage_LabelIsPublicKeyBased=Public key based authentication
-ConfigurationPage_LabelPassphrase=Passphrase:
-ConfigurationPage_LabelPassword=Password:
-ConfigurationPage_LabelPublicKeyPath=File with private key:
-ConfigurationPage_LabelPublicKeyPathTitle=Select file with private key
-ConfigurationPage_LabelPublicKeyPathButton=Select
-ConfigurationPage_LabelUserName=User:
-ConfigurationPage_LabelTimeout=Timeout(sec):
-ConfigurationPage_LabelShowAdvancedOptions=Advanced
-ConfigurationPage_CipherType=Cipher Type:
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/Messages.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/Messages.java
deleted file mode 100755
index 1d53eec..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/Messages.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remote.remotetools.ui.environment.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Daniel Felix Ferber
- */
-public class Messages {
-	public static String PreferencePage_HeaderConnection;
-	public static String PreferencePage_LabelConnectionPort;
-	public static String PreferencePage_LabelConnectionAddress;
-	public static String PreferencePage_LabelLoginUserName;
-	public static String PreferencePage_HeaderLaunch;
-	public static String PreferencePage_LabelSystemWorkspace;
-	public static String PreferencePage_Description;
-	public static String PreferencePage_Title;
-
-	static {
-		NLS.initializeMessages("org.eclipse.ptp.remote.remotetools.ui.environment.preferences.messages", Messages.class);
-	}
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferenceInitializer.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferenceInitializer.java
deleted file mode 100755
index c9fade6..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferenceInitializer.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.ui.environment.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsAdapterCorePlugin;
-import org.eclipse.ptp.remote.remotetools.core.environment.ConfigFactory;
-import org.eclipse.ptp.remote.remotetools.core.environment.conf.DefaultValues;
-
-
-/**
- * Initializes preference values
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.2.1
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		Preferences store = RemoteToolsAdapterCorePlugin.getDefault().getPluginPreferences();
-		store.setDefault(ConfigFactory.ATTR_LOGIN_USERNAME, DefaultValues.LOGIN_USERNAME);
-		store.setDefault(ConfigFactory.ATTR_CONNECTION_ADDRESS, DefaultValues.CONNECTION_ADDRESS);
-		store.setDefault(ConfigFactory.ATTR_CONNECTION_PORT, DefaultValues.CONNECTION_PORT);
-	}
-
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferencePage.java b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferencePage.java
deleted file mode 100755
index a87415f..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/PreferencePage.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remote.remotetools.ui.environment.preferences;
-
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsAdapterCorePlugin;
-import org.eclipse.ptp.remote.remotetools.core.environment.ConfigFactory;
-import org.eclipse.ptp.remotetools.preferences.ui.AbstractBaseFieldEditorPreferencePage;
-import org.eclipse.ptp.remotetools.preferences.ui.LabelFieldEditor;
-import org.eclipse.ptp.remotetools.preferences.ui.SpacerFieldEditor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-
-/**
- * Preference page for the Remote Host default values for new targets.
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.2.1
- */
-public class PreferencePage extends AbstractBaseFieldEditorPreferencePage {
-
-	public PreferencePage() {
-		super(GRID);
-
-		ScopedPreferenceStore store = new ScopedPreferenceStore(new InstanceScope(), RemoteToolsAdapterCorePlugin.PLUGIN_ID);
-		setPreferenceStore(store);
-		
-		// setDescription must be called here or it wont work
-		setDescription(Messages.PreferencePage_Description);
-	}
-
-	protected void createFieldEditors() {
-		// setTitle must be called here or it wont work
-		setTitle(Messages.PreferencePage_Title);
-		
-		addField(new LabelFieldEditor(Messages.PreferencePage_HeaderConnection, getFieldEditorParent()));
-
-		StringFieldEditor addrfield = new StringFieldEditor(ConfigFactory.ATTR_CONNECTION_ADDRESS,
-				Messages.PreferencePage_LabelConnectionAddress, getFieldEditorParent());
-		addrfield.setEmptyStringAllowed(true);
-		addField(addrfield);
-
-		IntegerFieldEditor portfield = new IntegerFieldEditor(ConfigFactory.ATTR_CONNECTION_PORT,
-				Messages.PreferencePage_LabelConnectionPort, getFieldEditorParent());
-		portfield.setEmptyStringAllowed(false);
-		addField(portfield);
-
-		StringFieldEditor userfield = new StringFieldEditor(ConfigFactory.ATTR_LOGIN_USERNAME,
-				Messages.PreferencePage_LabelLoginUserName, getFieldEditorParent());
-		userfield.setEmptyStringAllowed(true);
-		addField(userfield);
-
-		addField(new LabelFieldEditor(Messages.PreferencePage_HeaderLaunch, getFieldEditorParent()));
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-	void addSpace() {
-		SpacerFieldEditor spacer1 = new SpacerFieldEditor(getFieldEditorParent());
-		addField(spacer1);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/messages.properties b/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/messages.properties
deleted file mode 100755
index f1345b4..0000000
--- a/core/org.eclipse.ptp.remote.remotetools.ui/src/org/eclipse/ptp/remote/remotetools/ui/environment/preferences/messages.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-PreferencePage_HeaderConnection=Connection to remote host:
-PreferencePage_LabelConnectionPort=Port number:
-PreferencePage_LabelConnectionAddress=Address:
-PreferencePage_LabelLoginUserName=User name:
-PreferencePage_HeaderLaunch=C/C++ remote host target launch properties:
-PreferencePage_Description=Default properties for new remote host Targets
-PreferencePage_Title=Remote Host

diff --git a/core/org.eclipse.ptp.ui/.classpath b/core/org.eclipse.ptp.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/core/org.eclipse.ptp.ui/.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/core/org.eclipse.ptp.ui/.cvsignore b/core/org.eclipse.ptp.ui/.cvsignore
deleted file mode 100644
index f0a691e..0000000
--- a/core/org.eclipse.ptp.ui/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.ui/.options b/core/org.eclipse.ptp.ui/.options
deleted file mode 100644
index e7cec86..0000000
--- a/core/org.eclipse.ptp.ui/.options
+++ /dev/null

@@ -1,5 +0,0 @@
-org.eclipse.ptp.ui/debug=true
-
-# View tracing
-org.eclipse.ptp.ui/views/jobs/tracing=false
-org.eclipse.ptp.ui/views/machines/tracing=false

diff --git a/core/org.eclipse.ptp.ui/.project b/core/org.eclipse.ptp.ui/.project
deleted file mode 100644
index db5c365..0000000
--- a/core/org.eclipse.ptp.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.ui/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index ea79159..0000000
--- a/core/org.eclipse.ptp.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.ui; singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Activator: org.eclipse.ptp.ui.PTPUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.ui,
- org.eclipse.jface.text,
- org.eclipse.search,
- org.eclipse.ui.ide,
- org.eclipse.ui.console,
- org.eclipse.ui.forms,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.views,
- org.eclipse.ptp.core,
- org.eclipse.ptp.utils.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.ui,
- org.eclipse.ptp.ui.actions,
- org.eclipse.ptp.ui.listeners,
- org.eclipse.ptp.ui.managers,
- org.eclipse.ptp.ui.model,
- org.eclipse.ptp.ui.preferences,
- org.eclipse.ptp.ui.utils,
- org.eclipse.ptp.ui.views,
- org.eclipse.ptp.ui.wizards
-Bundle-ClassPath: ptpui.jar

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

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

diff --git a/core/org.eclipse.ptp.ui/build.properties b/core/org.eclipse.ptp.ui/build.properties
deleted file mode 100644
index 3546723..0000000
--- a/core/org.eclipse.ptp.ui/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               icons/,\
-               template/,\
-               about.html,\
-               ptpui.jar
-source.ptpui.jar = src/
-output.ptpui.jar = bin/
-jars.compile.order = ptpui.jar
-source.ptpui.jar = src/

diff --git a/core/org.eclipse.ptp.ui/icons/abort_disable.gif b/core/org.eclipse.ptp.ui/icons/abort_disable.gif
deleted file mode 100644
index 67c491f..0000000
--- a/core/org.eclipse.ptp.ui/icons/abort_disable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/abort_hover.gif b/core/org.eclipse.ptp.ui/icons/abort_hover.gif
deleted file mode 100644
index 8670a38..0000000
--- a/core/org.eclipse.ptp.ui/icons/abort_hover.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/abort_normal.gif b/core/org.eclipse.ptp.ui/icons/abort_normal.gif
deleted file mode 100644
index bfa7987..0000000
--- a/core/org.eclipse.ptp.ui/icons/abort_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/c_app.gif b/core/org.eclipse.ptp.ui/icons/c_app.gif
deleted file mode 100644
index 67c491f..0000000
--- a/core/org.eclipse.ptp.ui/icons/c_app.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/environment_tab.gif b/core/org.eclipse.ptp.ui/icons/environment_tab.gif
deleted file mode 100644
index 65d63ec..0000000
--- a/core/org.eclipse.ptp.ui/icons/environment_tab.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/exit_disable.gif b/core/org.eclipse.ptp.ui/icons/exit_disable.gif
deleted file mode 100644
index 67c491f..0000000
--- a/core/org.eclipse.ptp.ui/icons/exit_disable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/exit_hover.gif b/core/org.eclipse.ptp.ui/icons/exit_hover.gif
deleted file mode 100644
index 8670a38..0000000
--- a/core/org.eclipse.ptp.ui/icons/exit_hover.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/exit_normal.gif b/core/org.eclipse.ptp.ui/icons/exit_normal.gif
deleted file mode 100644
index bfa7987..0000000
--- a/core/org.eclipse.ptp.ui/icons/exit_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/icon_terminate_all.gif b/core/org.eclipse.ptp.ui/icons/icon_terminate_all.gif
deleted file mode 100644
index ec56a24..0000000
--- a/core/org.eclipse.ptp.ui/icons/icon_terminate_all.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/debug_job_error.gif b/core/org.eclipse.ptp.ui/icons/job/debug_job_error.gif
deleted file mode 100644
index e9d050b..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/debug_job_error.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/debug_job_pending.gif b/core/org.eclipse.ptp.ui/icons/job/debug_job_pending.gif
deleted file mode 100644
index c0d8536..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/debug_job_pending.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/debug_job_running.gif b/core/org.eclipse.ptp.ui/icons/job/debug_job_running.gif
deleted file mode 100644
index f0a74da..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/debug_job_running.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/debug_job_started.gif b/core/org.eclipse.ptp.ui/icons/job/debug_job_started.gif
deleted file mode 100644
index 80f920d..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/debug_job_started.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/debug_job_suspended.gif b/core/org.eclipse.ptp.ui/icons/job/debug_job_suspended.gif
deleted file mode 100644
index ece7d8a..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/debug_job_suspended.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/debug_job_terminated.gif b/core/org.eclipse.ptp.ui/icons/job/debug_job_terminated.gif
deleted file mode 100644
index 71d05bc..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/debug_job_terminated.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/debug_job_unknown.gif b/core/org.eclipse.ptp.ui/icons/job/debug_job_unknown.gif
deleted file mode 100644
index deb744f..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/debug_job_unknown.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/job_error.gif b/core/org.eclipse.ptp.ui/icons/job/job_error.gif
deleted file mode 100644
index 9f4551f..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/job_error.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/job_pending.gif b/core/org.eclipse.ptp.ui/icons/job/job_pending.gif
deleted file mode 100644
index 555b36e..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/job_pending.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/job_running.gif b/core/org.eclipse.ptp.ui/icons/job/job_running.gif
deleted file mode 100644
index 57f4102..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/job_running.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/job_started.gif b/core/org.eclipse.ptp.ui/icons/job/job_started.gif
deleted file mode 100644
index e9644aa..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/job_started.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/job_suspended.gif b/core/org.eclipse.ptp.ui/icons/job/job_suspended.gif
deleted file mode 100644
index b7cb969..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/job_suspended.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/job_terminated.gif b/core/org.eclipse.ptp.ui/icons/job/job_terminated.gif
deleted file mode 100644
index 13fc542..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/job_terminated.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/job/job_unknown.gif b/core/org.eclipse.ptp.ui/icons/job/job_unknown.gif
deleted file mode 100644
index afeee35..0000000
--- a/core/org.eclipse.ptp.ui/icons/job/job_unknown.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/legend.gif b/core/org.eclipse.ptp.ui/icons/legend.gif
deleted file mode 100644
index 2cbc4d3..0000000
--- a/core/org.eclipse.ptp.ui/icons/legend.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/machine/machine_alert.gif b/core/org.eclipse.ptp.ui/icons/machine/machine_alert.gif
deleted file mode 100644
index 85efa41..0000000
--- a/core/org.eclipse.ptp.ui/icons/machine/machine_alert.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/machine/machine_down.gif b/core/org.eclipse.ptp.ui/icons/machine/machine_down.gif
deleted file mode 100644
index d97e210..0000000
--- a/core/org.eclipse.ptp.ui/icons/machine/machine_down.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/machine/machine_error.gif b/core/org.eclipse.ptp.ui/icons/machine/machine_error.gif
deleted file mode 100644
index 716ebb1..0000000
--- a/core/org.eclipse.ptp.ui/icons/machine/machine_error.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/machine/machine_unknown.gif b/core/org.eclipse.ptp.ui/icons/machine/machine_unknown.gif
deleted file mode 100644
index 43e38b6..0000000
--- a/core/org.eclipse.ptp.ui/icons/machine/machine_unknown.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/machine/machine_up.gif b/core/org.eclipse.ptp.ui/icons/machine/machine_up.gif
deleted file mode 100644
index d9858d7..0000000
--- a/core/org.eclipse.ptp.ui/icons/machine/machine_up.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_alloc_other.gif b/core/org.eclipse.ptp.ui/icons/node/node_alloc_other.gif
deleted file mode 100644
index 43fd341..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_alloc_other.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_alloc_other_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_alloc_other_sel.gif
deleted file mode 100644
index 4eca90d..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_alloc_other_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_alloc_user.gif b/core/org.eclipse.ptp.ui/icons/node/node_alloc_user.gif
deleted file mode 100644
index c4424cf..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_alloc_user.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_alloc_user_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_alloc_user_sel.gif
deleted file mode 100644
index ca2784f..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_alloc_user_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_down.gif b/core/org.eclipse.ptp.ui/icons/node/node_down.gif
deleted file mode 100644
index ba8541e..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_down.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_down_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_down_sel.gif
deleted file mode 100644
index b179dec..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_down_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_error.gif b/core/org.eclipse.ptp.ui/icons/node/node_error.gif
deleted file mode 100644
index 608ab0d..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_error.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_error_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_error_sel.gif
deleted file mode 100644
index 963cce1..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_error_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_exited.gif b/core/org.eclipse.ptp.ui/icons/node/node_exited.gif
deleted file mode 100644
index f534a21..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_exited.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_exited_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_exited_sel.gif
deleted file mode 100644
index 741c2f5..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_exited_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_other_excl.gif b/core/org.eclipse.ptp.ui/icons/node/node_other_excl.gif
deleted file mode 100644
index 43fd341..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_other_excl.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_other_excl_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_other_excl_sel.gif
deleted file mode 100644
index 4eca90d..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_other_excl_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_other_shared.gif b/core/org.eclipse.ptp.ui/icons/node/node_other_shared.gif
deleted file mode 100644
index dbc85ab..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_other_shared.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_other_shared_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_other_shared_sel.gif
deleted file mode 100644
index 894d32c..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_other_shared_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_running.gif b/core/org.eclipse.ptp.ui/icons/node/node_running.gif
deleted file mode 100644
index 0840008..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_running.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_running_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_running_sel.gif
deleted file mode 100644
index 5df579e..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_running_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_unknown.gif b/core/org.eclipse.ptp.ui/icons/node/node_unknown.gif
deleted file mode 100644
index a27714c..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_unknown.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_unknown_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_unknown_sel.gif
deleted file mode 100644
index b62c977..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_unknown_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_up.gif b/core/org.eclipse.ptp.ui/icons/node/node_up.gif
deleted file mode 100644
index 193b932..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_up.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_up_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_up_sel.gif
deleted file mode 100644
index e11dd48..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_up_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_user_excl.gif b/core/org.eclipse.ptp.ui/icons/node/node_user_excl.gif
deleted file mode 100644
index 9c8c92a..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_user_excl.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_user_excl_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_user_excl_sel.gif
deleted file mode 100644
index c0c1d4f..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_user_excl_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_user_shared.gif b/core/org.eclipse.ptp.ui/icons/node/node_user_shared.gif
deleted file mode 100644
index c3567a5..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_user_shared.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/node/node_user_shared_sel.gif b/core/org.eclipse.ptp.ui/icons/node/node_user_shared_sel.gif
deleted file mode 100644
index 8273b53..0000000
--- a/core/org.eclipse.ptp.ui/icons/node/node_user_shared_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/parallel.gif b/core/org.eclipse.ptp.ui/icons/parallel.gif
deleted file mode 100644
index 6facfb9..0000000
--- a/core/org.eclipse.ptp.ui/icons/parallel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/parallel_perspective.gif b/core/org.eclipse.ptp.ui/icons/parallel_perspective.gif
deleted file mode 100644
index 828a539..0000000
--- a/core/org.eclipse.ptp.ui/icons/parallel_perspective.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_error.gif b/core/org.eclipse.ptp.ui/icons/process/proc_error.gif
deleted file mode 100644
index d00cc04..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_error.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_error_sel.gif b/core/org.eclipse.ptp.ui/icons/process/proc_error_sel.gif
deleted file mode 100644
index d233dbc..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_error_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_exited.gif b/core/org.eclipse.ptp.ui/icons/process/proc_exited.gif
deleted file mode 100644
index 075c8c9..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_exited.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_exited_sel.gif b/core/org.eclipse.ptp.ui/icons/process/proc_exited_sel.gif
deleted file mode 100644
index 156f507..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_exited_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_exited_signal.gif b/core/org.eclipse.ptp.ui/icons/process/proc_exited_signal.gif
deleted file mode 100644
index 807bf0d..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_exited_signal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_exited_signal_sel.gif b/core/org.eclipse.ptp.ui/icons/process/proc_exited_signal_sel.gif
deleted file mode 100644
index 3c25fd4..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_exited_signal_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_running.gif b/core/org.eclipse.ptp.ui/icons/process/proc_running.gif
deleted file mode 100644
index 30749b2..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_running.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_running_sel.gif b/core/org.eclipse.ptp.ui/icons/process/proc_running_sel.gif
deleted file mode 100644
index 5261fbf..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_running_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_starting.gif b/core/org.eclipse.ptp.ui/icons/process/proc_starting.gif
deleted file mode 100644
index a1361f1..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_starting.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_starting_sel.gif b/core/org.eclipse.ptp.ui/icons/process/proc_starting_sel.gif
deleted file mode 100644
index ed782a7..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_starting_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_suspended.gif b/core/org.eclipse.ptp.ui/icons/process/proc_suspended.gif
deleted file mode 100644
index e0af6b9..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_suspended.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_suspended_sel.gif b/core/org.eclipse.ptp.ui/icons/process/proc_suspended_sel.gif
deleted file mode 100644
index 5c4f0fa..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_suspended_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_unknown.gif b/core/org.eclipse.ptp.ui/icons/process/proc_unknown.gif
deleted file mode 100644
index 03986b8..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_unknown.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/process/proc_unknown_sel.gif b/core/org.eclipse.ptp.ui/icons/process/proc_unknown_sel.gif
deleted file mode 100644
index 1c15601..0000000
--- a/core/org.eclipse.ptp.ui/icons/process/proc_unknown_sel.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/rm_error.gif b/core/org.eclipse.ptp.ui/icons/rm/rm_error.gif
deleted file mode 100644
index bafa401..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/rm_error.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/rm_started.gif b/core/org.eclipse.ptp.ui/icons/rm/rm_started.gif
deleted file mode 100644
index e1ff863..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/rm_started.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/rm_starting.gif b/core/org.eclipse.ptp.ui/icons/rm/rm_starting.gif
deleted file mode 100644
index 6f70c02..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/rm_starting.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/rm_stopped.gif b/core/org.eclipse.ptp.ui/icons/rm/rm_stopped.gif
deleted file mode 100644
index 85d8115..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/rm_stopped.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/rm_stopping.gif b/core/org.eclipse.ptp.ui/icons/rm/rm_stopping.gif
deleted file mode 100644
index 6f70c02..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/rm_stopping.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/rm_suspended.gif b/core/org.eclipse.ptp.ui/icons/rm/rm_suspended.gif
deleted file mode 100644
index 98fd4c4..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/rm_suspended.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/rm_view.gif b/core/org.eclipse.ptp.ui/icons/rm/rm_view.gif
deleted file mode 100644
index 0cd3d1c..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/rm_view.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/start.gif b/core/org.eclipse.ptp.ui/icons/rm/start.gif
deleted file mode 100644
index 0aa4a43..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/start.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/rm/stop.gif b/core/org.eclipse.ptp.ui/icons/rm/stop.gif
deleted file mode 100644
index 95b0ea4..0000000
--- a/core/org.eclipse.ptp.ui/icons/rm/stop.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/search.gif b/core/org.eclipse.ptp.ui/icons/search.gif
deleted file mode 100644
index d540a01..0000000
--- a/core/org.eclipse.ptp.ui/icons/search.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/search_dim.gif b/core/org.eclipse.ptp.ui/icons/search_dim.gif
deleted file mode 100644
index f246a63..0000000
--- a/core/org.eclipse.ptp.ui/icons/search_dim.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/changeset_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/changeset_normal.gif
deleted file mode 100644
index acdf80a..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/changeset_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/changeset_normal.png b/core/org.eclipse.ptp.ui/icons/tool/changeset_normal.png
deleted file mode 100644
index 8bf9036..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/changeset_normal.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/createset_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/createset_normal.gif
deleted file mode 100644
index a16b026..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/createset_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/createset_normal.png b/core/org.eclipse.ptp.ui/icons/tool/createset_normal.png
deleted file mode 100644
index b84cf32..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/createset_normal.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.gif
deleted file mode 100644
index 074ec54..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.png b/core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.png
deleted file mode 100644
index d8ccbc2..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/deleteelement_normal.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.gif
deleted file mode 100644
index 5ce5f7b..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.png b/core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.png
deleted file mode 100644
index 77382fa..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/deleteset_normal.png
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/job_focus_disable.gif b/core/org.eclipse.ptp.ui/icons/tool/job_focus_disable.gif
deleted file mode 100755
index 61615d5..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/job_focus_disable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/job_focus_enable.gif b/core/org.eclipse.ptp.ui/icons/tool/job_focus_enable.gif
deleted file mode 100755
index ec50b70..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/job_focus_enable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_disable.gif b/core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_disable.gif
deleted file mode 100644
index ecd1be5..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_disable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_normal.gif
deleted file mode 100644
index 28a3785..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/remove_all_terminated_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/remove_terminated_disable.gif b/core/org.eclipse.ptp.ui/icons/tool/remove_terminated_disable.gif
deleted file mode 100755
index 559e462..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/remove_terminated_disable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/remove_terminated_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/remove_terminated_normal.gif
deleted file mode 100755
index 2cd9c54..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/remove_terminated_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/terminate_job_disable.gif b/core/org.eclipse.ptp.ui/icons/tool/terminate_job_disable.gif
deleted file mode 100644
index 1a33ac8..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/terminate_job_disable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/terminate_job_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/terminate_job_normal.gif
deleted file mode 100644
index 6d47276..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/terminate_job_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/zoomin_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/zoomin_normal.gif
deleted file mode 100644
index e9287db..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/zoomin_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/tool/zoomout_normal.gif b/core/org.eclipse.ptp.ui/icons/tool/zoomout_normal.gif
deleted file mode 100644
index 2ee7c6b..0000000
--- a/core/org.eclipse.ptp.ui/icons/tool/zoomout_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/viewstatus_disable.gif b/core/org.eclipse.ptp.ui/icons/viewstatus_disable.gif
deleted file mode 100644
index 67c491f..0000000
--- a/core/org.eclipse.ptp.ui/icons/viewstatus_disable.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/viewstatus_hover.gif b/core/org.eclipse.ptp.ui/icons/viewstatus_hover.gif
deleted file mode 100644
index 8670a38..0000000
--- a/core/org.eclipse.ptp.ui/icons/viewstatus_hover.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/icons/viewstatus_normal.gif b/core/org.eclipse.ptp.ui/icons/viewstatus_normal.gif
deleted file mode 100644
index bfa7987..0000000
--- a/core/org.eclipse.ptp.ui/icons/viewstatus_normal.gif
+++ /dev/null
Binary files differ

diff --git a/core/org.eclipse.ptp.ui/plugin.properties b/core/org.eclipse.ptp.ui/plugin.properties
deleted file mode 100644
index 6028d09..0000000
--- a/core/org.eclipse.ptp.ui/plugin.properties
+++ /dev/null

@@ -1,63 +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
-#
-# Contributors:
-#     Clement Chu
-#     Tianchao Li (Tianchao.Li@gmail.com)
-#################################################################################
-
-pluginName=PTP User Interface
-pluginProvider=Eclipse.org
-
-ParallelMachinesView.name=Machines
-ParallelMachineView.name=Machines (old)
-ParallelJobsView.name=Jobs
-ParallelJobView.name=Jobs (old)
-JobsListView.name=Jobs List
-ResourceManagersView.name=Resource Managers
-MachinesNodesView.name=Machines, Nodes and Jobs
-
-TerminateAllAction.label=Terminate &All
-TerminateAllAction.tooltip=Terminate All
-
-ParallelViewCategory.name=PTP Runtime
-ParallelControlView.name=Parallel Processes Panel
-ParallelProcessView.name=Parallel Process Viewer
-perspective.name=PTP Runtime
-
-preferencePages.name=PTP
-SimulationpreferencePage.name=Simulation
-OMPIpreferencePage.name=Open RTE
-MPICH2preferencePage.name=MPICH2
-ViewerpreferencePage.name=Viewer
-RMpreferencePage.name=Resource Manager
-
-actionSets.name=PTP
-actionSetsMenu.name=Menu name
-
-searchAction.name=Search
-searchAction.tooltip=Search Node or Process
-
-legendAction.name=Legend dialog
-legendAction.tooltip=Show status icons of node and process
-
-PSearchPage.label=PTP Search
-
-ResourceManagersMenu.label=Resource Managers
-StopResourceManagersAction.label=Stop Resource Manager
-StartResourceManagersAction.label=Start Resource Manager

diff --git a/core/org.eclipse.ptp.ui/plugin.xml b/core/org.eclipse.ptp.ui/plugin.xml
deleted file mode 100644
index 5c2c5c8..0000000
--- a/core/org.eclipse.ptp.ui/plugin.xml
+++ /dev/null

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension-point id="rmConfigurations" name="Resource Manager Configuration Wizard Pages" schema="schema/rmConfigurations.exsd"/>
-	<extension
-		point="org.eclipse.ui.views">
-		<category
-			name="%ParallelViewCategory.name"
-			id="org.eclipse.ptp.ui.views">
-		</category>
-  <view
-        category="org.eclipse.ptp.ui.views"
-        class="org.eclipse.ptp.ui.views.ParallelMachinesView"
-        icon="icons/parallel_perspective.gif"
-        id="org.eclipse.ptp.ui.views.parallelMachinesView"
-        name="%ParallelMachinesView.name">
-  </view>
-  <view
-        category="org.eclipse.ptp.ui.views"
-        class="org.eclipse.ptp.ui.views.MachinesNodesView"
-        icon="icons/parallel_perspective.gif"
-        id="org.eclipse.ptp.ui.views.MachinesNodesView"
-        name="%MachinesNodesView.name">
-  </view>
-		<view
-			name="%ParallelJobsView.name"
-			icon="icons/parallel_perspective.gif"
-			category="org.eclipse.ptp.ui.views"
-			class="org.eclipse.ptp.ui.views.ParallelJobsView"
-			id="org.eclipse.ptp.ui.views.parallelJobsView">
-		</view>
-		<view
-			name="%ResourceManagersView.name"
-			icon="icons/rm/rm_view.gif"
-			category="org.eclipse.ptp.ui.views"
-			class="org.eclipse.ptp.ui.views.ResourceManagerView"
-			id="org.eclipse.ptp.ui.views.resourceManagerView">
-		</view>
-  <view
-        category="org.eclipse.ptp.ui.views"
-        class="org.eclipse.ptp.ui.views.JobsListView"
-        icon="icons/parallel_perspective.gif"
-        id="org.eclipse.ptp.ui.views.JobsListView"
-        name="%JobsListView.name">
-  </view>
-	</extension>
-	<extension
-		point="org.eclipse.ui.editors">
-		<editor
-			name="%ParallelProcessView.name"
-			icon="icons/parallel_perspective.gif"
-            default="true"
-            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"            
-			class="org.eclipse.ptp.ui.views.ParallelProcessView"
-			id="org.eclipse.ptp.ui.views.parallelProcessView">
-		</editor>
-	</extension>
-	
-	<extension
-		point="org.eclipse.ui.perspectives">
-		<perspective
-			icon="icons/parallel_perspective.gif"
-			class="org.eclipse.ptp.internal.ui.PRunPerspectiveFactory"
-			name="%perspective.name"
-			id="org.eclipse.ptp.ui.PTPRunPerspective"/>
-	</extension>   
-	<extension
-		point="org.eclipse.ui.perspectiveExtensions">
-		<perspectiveExtension
-			targetID="org.eclipse.ui.resourcePerspective">
-			<perspectiveShortcut
-				id="org.eclipse.ptp.ui.PTPRunPerspective">
-			</perspectiveShortcut>
-		</perspectiveExtension>
-		<perspectiveExtension
-			targetID="org.eclipse.debug.ui.DebugPerspective">
-			<perspectiveShortcut
-				id="org.eclipse.ptp.ui.PTPRunPerspective">
-			</perspectiveShortcut>
-		</perspectiveExtension>
-		<perspectiveExtension
-			targetID="org.eclipse.ptp.ui.PTPRunPerspective">
-			<perspectiveShortcut
-				id="org.eclipse.ptp.debug.ui.PTPDebugPerspective">
-			</perspectiveShortcut>
-			<perspectiveShortcut
-				id="org.eclipse.debug.ui.DebugPerspective">
-			</perspectiveShortcut>
-			<actionSet
-				id="org.eclipse.debug.ui.launchActionSet">
-			</actionSet>
-			<actionSet
-				id="org.eclipse.ptp.ui.actionSets">
-			</actionSet>
-		</perspectiveExtension>
-	</extension>
-
-	<!-- create preference page //-->
-	<extension
-		point="org.eclipse.ui.preferencePages">
-		<page
-			name="%preferencePages.name"
-			class="org.eclipse.ptp.ui.preferences.PTPPreferencesPage"
-			id="org.eclipse.ptp.ui.preferences.ptpPreferencesPage">
-		</page>
-		<!--      
-		<page
-			name="%SimulationpreferencePage.name"
-			class="org.eclipse.ptp.ui.preferences.SimulationPreferencesPage"
-			id="org.eclipse.ptp.ui.preferences.simulationPreferencesPage"
-			category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage">
-		</page>
-		-->
-  <page
-        category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage"
-        class="org.eclipse.ptp.ui.preferences.RMPreferencesPage"
-        id="org.eclipse.ptp.ui.preferences.rmPreferencesPage"
-        name="Resource Managers">
-  </page>
-		<page
-			name="%ViewerpreferencePage.name"
-			class="org.eclipse.ptp.ui.preferences.ViewerPreferencesPage"
-			id="org.eclipse.ptp.ui.preferences.viewerPreferencesPage"
-			category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage">
-		</page>
-	</extension>
-	<extension
-		point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.ptp.ui.preferences.PreferenceInitializer">
-		</initializer>
-	</extension>
-   
-	<!-- add buttons to editor action toolbar //-->
-	<extension
-		point="org.eclipse.ui.actionSets">
-		<actionSet
-			label="%actionSets.name"
-			visible="false"
-			id="org.eclipse.ptp.ui.actionSets">
-			<action
-				label="%legendAction.name"
-				icon="icons/legend.gif"
-				class="org.eclipse.ptp.internal.ui.actions.ShowLegendAction"
-				tooltip="%legendAction.tooltip"
-				toolbarPath="org.eclipse.ptp.ui.actionSets"
-				id="org.eclipse.ptp.ui.actions.showLegendAction">
-			</action>
-			<!--
-			<action
-				label="%searchAction.name"
-				icon="icons/search.gif"
-				class="org.eclipse.pdt.ui.actions.SearchAction"
-				tooltip="%searchAction.tooltip"
-				toolbarPath="org.eclipse.pdt.actionSets"
-				id="org.eclipse.pdt.ui.actions.searchAction">
-			</action>
-			//-->
-		</actionSet>
-	</extension>
-	<extension
-		point="org.eclipse.ui.popupMenus">
-		<objectContribution
-			id="org.eclipse.ptp.ui.resourceManager.popupuMenu"
-			objectClass="org.eclipse.ptp.rmsystem.IResourceManagerMenuContribution">
-			<action
-				class="org.eclipse.ptp.ui.actions.StopResourceManagersObjectActionDelegate"
-				enablesFor="+"
-				icon="icons/rm/stop.gif"
-				id="org.eclipse.ptp.ui.actions.stopResourceManagersAction"
-				label="%StopResourceManagersAction.label"
-				menubarPath="additions"/>
-			<action
-				class="org.eclipse.ptp.ui.actions.StartResourceManagersObjectActionDelegate"
-				enablesFor="+"
-				icon="icons/rm/start.gif"
-				id="org.eclipse.ptp.ui.actions.startResourceManagersAction"
-				label="%StartResourceManagersAction.label"
-				menubarPath="additions"/>
-			<menu
-				id="org.eclipse.ptp.ui.resourceManager.popupSubMenu"
-				label="%ResourceManagersMenu.label"
-				path="additions">
-				<groupMarker name="content"/>
-				<separator name="additions"/>
-			</menu>
-		</objectContribution>
-	</extension>
-
-</plugin>

diff --git a/core/org.eclipse.ptp.ui/schema/rmConfigurations.exsd b/core/org.eclipse.ptp.ui/schema/rmConfigurations.exsd
deleted file mode 100644
index 1c4b42a..0000000
--- a/core/org.eclipse.ptp.ui/schema/rmConfigurations.exsd
+++ /dev/null

@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.ui" id="rmConfigurations" name="Resource Manager Configuration Wizard Pages"/>
-      </appInfo>
-      <documentation>
-         This extension point allows plug-ins to contribute a resource manager wizard that is used to configure a new resource manager.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="configurationWizard" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="configurationWizard">
-      <complexType>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/PRunPerspectiveFactory.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/PRunPerspectiveFactory.java
deleted file mode 100644
index a1ad745..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/PRunPerspectiveFactory.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui;
-
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.console.IConsoleConstants;
-
-public class PRunPerspectiveFactory implements IPerspectiveFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
-	 */
-	public void createInitialLayout(IPageLayout layout) {
- 		String editorArea = layout.getEditorArea();
-		
-		IFolderLayout rmFolder= layout.createFolder("rmFolder", IPageLayout.LEFT, (float)0.50, editorArea);
-		rmFolder.addView(IPTPUIConstants.VIEW_RESOURCEMANAGER);
-
-		IFolderLayout jobsFolder= layout.createFolder("jobsFolder", IPageLayout.BOTTOM, (float)0.75, "rmFolder");
-		jobsFolder.addView(IPTPUIConstants.VIEW_PARALLELJOBS);
-		jobsFolder.addView(IPTPUIConstants.VIEW_JOBSLIST);
-
-		IFolderLayout machinesFolder = layout.createFolder("machinesFolder", IPageLayout.BOTTOM, (float)0.25, "rmFolder");
-		machinesFolder.addView(IPTPUIConstants.VIEW_PARALLELMACHINES);
-		machinesFolder.addPlaceholder(IPageLayout.ID_BOOKMARKS);
-		
-		IFolderLayout consoleFolder= layout.createFolder("consoleFolder", IPageLayout.BOTTOM, (float)0.75, editorArea);
-		consoleFolder.addView(IConsoleConstants.ID_CONSOLE_VIEW);
-		consoleFolder.addView(IPageLayout.ID_PROBLEM_VIEW);
-		consoleFolder.addView(IPageLayout.ID_PROP_SHEET);
-		consoleFolder.addView(IPageLayout.ID_TASK_LIST);
-		consoleFolder.addView("org.eclipse.pde.runtime.LogView");
-		
-		// set toolbar or menu icon
-		//layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-		//layout.addActionSet(IPTPUIConstants.ACTION_SET);
-
-		// views - build console
-		layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
-		
-		// views - searching
-		layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID);
-		
-		// views - standard workbench
-		layout.addShowViewShortcut(IPTPUIConstants.VIEW_PARALLELMACHINES);
-		layout.addShowViewShortcut(IPTPUIConstants.VIEW_PARALLELJOBS);
-		layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-		layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
-		layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-		layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
-		layout.addShowViewShortcut("org.eclipse.pde.runtime.LogView");
-		
-		// link - things we should do
-		layout.addShowInPart(IPTPUIConstants.VIEW_PARALLELMACHINES);
-		layout.addShowInPart(IPTPUIConstants.VIEW_PARALLELJOBS);
-		//layout.addShowInPart(IPageLayout.ID_RES_NAV);
-		//layout.addShowInPart("org.eclipse.pde.runtime.LogView");
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/ParallelImages.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/ParallelImages.java
deleted file mode 100644
index 39939b5..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/ParallelImages.java
+++ /dev/null

@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class ParallelImages {
-
-	// ==== URLs for Icon Folders ==== 
-	
-	public final static URL ICONURL = PTPUIPlugin.getDefault().getBundle().getEntry("icons/");
-	public final static URL TOOLICONURL = PTPUIPlugin.getDefault().getBundle().getEntry("icons/tool/");
-	public final static URL JOBICONURL = PTPUIPlugin.getDefault().getBundle().getEntry("icons/job/");
-	public final static URL PROCESSICONURL = PTPUIPlugin.getDefault().getBundle().getEntry("icons/process/");
-	public final static URL NODEICONURL = PTPUIPlugin.getDefault().getBundle().getEntry("icons/node/");
-	public final static URL MACHINEICONURL = PTPUIPlugin.getDefault().getBundle().getEntry("icons/machine/");
-	public final static URL RMICONURL = PTPUIPlugin.getDefault().getBundle().getEntry("icons/rm/");
-	
-	// ===== Icon Files =====
-
-	// CHANGE/DELETE SET
-	public static final String ICON_CHANGESET_NORMAL = "changeset_normal.gif";
-	public static final String ICON_CREATESET_NORMAL = "createset_normal.gif";
-	public static final String ICON_DELETESET_NORMAL = "deleteset_normal.gif";
-	public static final String ICON_DELETEELEMENT_NORMAL = "deleteelement_normal.gif";
-
-	//ZOOM
-	public static final String ICON_ZOOMIN_NORMAL = "zoomin_normal.gif";
-	public static final String ICON_ZOOMOUT_NORMAL = "zoomout_normal.gif";
-	
-	// TOOLBAR
-	public static final String ICON_TERMINATE_JOB_DISABLE = "terminate_job_disable.gif";
-	public static final String ICON_TERMINATE_JOB_NORMAL = "terminate_job_normal.gif";
-	public static final String ICON_REMOVEALLTERMINATED_NORMAL = "remove_all_terminated_normal.gif";
-	public static final String ICON_REMOVETERMINATED_NORMAL = "remove_terminated_normal.gif";
-	public static final String ICON_JOB_FOCUS_DISABLE = "job_focus_disable.gif";
-	public static final String ICON_JOB_FOCUS_ENABLE = "job_focus_enable.gif";
-	
-	// SHOW LEGEND
-	public static final String ICON_SHOWLEGEND_ACTION_NORMAL =  "legend.gif";
-
-	// JOB
-	public static final String IMG_JOB_PENDING = "job_pending.gif";
-	public static final String IMG_JOB_STARTED = "job_started.gif";
-	public static final String IMG_JOB_RUNNING = "job_running.gif";
-	public static final String IMG_JOB_TERMINATED = "job_terminated.gif";
-	public static final String IMG_JOB_SUSPENDED = "job_suspended.gif";
-	public static final String IMG_JOB_ERROR = "job_error.gif";
-	public static final String IMG_JOB_UNKNOWN = "job_unknown.gif";
-	public static final String IMG_DEBUG_JOB_PENDING = "debug_job_pending.gif";
-	public static final String IMG_DEBUG_JOB_STARTED = "debug_job_started.gif";
-	public static final String IMG_DEBUG_JOB_RUNNING = "debug_job_running.gif";
-	public static final String IMG_DEBUG_JOB_TERMINATED = "debug_job_terminated.gif";
-	public static final String IMG_DEBUG_JOB_SUSPENDED = "debug_job_suspended.gif";
-	public static final String IMG_DEBUG_JOB_ERROR = "debug_job_error.gif";
-	public static final String IMG_DEBUG_JOB_UNKNOWN = "debug_job_unknown.gif";
-	
-	// NODE
-	public static final String IMG_NODE_USER_ALLOC_EXCL = "node_user_excl.gif";
-	public static final String IMG_NODE_USER_ALLOC_EXCL_SEL = "node_user_excl_sel.gif";
-	public static final String IMG_NODE_USER_ALLOC_SHARED = "node_user_shared.gif";
-	public static final String IMG_NODE_USER_ALLOC_SHARED_SEL = "node_user_shared_sel.gif";
-	public static final String IMG_NODE_OTHER_ALLOC_EXCL = "node_other_excl.gif";
-	public static final String IMG_NODE_OTHER_ALLOC_EXCL_SEL = "node_other_excl_sel.gif";
-	public static final String IMG_NODE_OTHER_ALLOC_SHARED = "node_other_shared.gif";
-	public static final String IMG_NODE_OTHER_ALLOC_SHARED_SEL = "node_other_shared_sel.gif";
-	public static final String IMG_NODE_DOWN = "node_down.gif";
-	public static final String IMG_NODE_DOWN_SEL = "node_down_sel.gif";
-	public static final String IMG_NODE_ERROR = "node_error.gif";
-	public static final String IMG_NODE_ERROR_SEL = "node_error_sel.gif";
-	public static final String IMG_NODE_EXITED_PROCESS = "node_exited.gif";
-	public static final String IMG_NODE_EXITED_PROCESS_SEL = "node_exited_sel.gif";
-	public static final String IMG_NODE_RUNNING_PROCESS = "node_running.gif";
-	public static final String IMG_NODE_RUNNING_PROCESS_SEL = "node_running_sel.gif";
-	public static final String IMG_NODE_UNKNOWN = "node_unknown.gif";
-	public static final String IMG_NODE_UNKNOWN_SEL = "node_unknown_sel.gif";
-	public static final String IMG_NODE_UP = "node_up.gif";
-	public static final String IMG_NODE_UP_SEL = "node_up_sel.gif";
-	
-	// PROCESS
-	public static final String IMG_PROC_ERROR = "proc_error.gif";
-	public static final String IMG_PROC_ERROR_SEL = "proc_error_sel.gif"; 
-	public static final String IMG_PROC_EXITED = "proc_exited.gif";
-	public static final String IMG_PROC_EXITED_SEL = "proc_exited_sel.gif";
-	public static final String IMG_PROC_EXITED_SIGNAL = "proc_exited_signal.gif";
-	public static final String IMG_PROC_EXITED_SIGNAL_SEL = "proc_exited_signal_sel.gif";
-	public static final String IMG_PROC_RUNNING = "proc_running.gif";
-	public static final String IMG_PROC_RUNNING_SEL = "proc_running_sel.gif";
-	public static final String IMG_PROC_STARTING = "proc_starting.gif";
-	public static final String IMG_PROC_STARTING_SEL = "proc_starting_sel.gif";
-	public static final String IMG_PROC_SUSPENDED = "proc_suspended.gif";
-	public static final String IMG_PROC_SUSPENDED_SEL = "proc_suspended_sel.gif";
-	public static final String IMG_PROC_UNKNOWN = "proc_unknown.gif";
-	public static final String IMG_PROC_UNKNOWN_SEL = "proc_unknown_sel.gif";
-	
-	// MACHINE
-	public static final String IMG_MACHINE_UNKNOWN = "machine_unknown.gif";
-	public static final String IMG_MACHINE_UP = "machine_up.gif";
-	public static final String IMG_MACHINE_DOWN = "machine_down.gif";
-	public static final String IMG_MACHINE_ALERT = "machine_alert.gif";
-	public static final String IMG_MACHINE_ERROR = "machine_error.gif";
-
-	// RESOURCE MANAGERS
-	public static final String IMG_RM_STOPPED = "rm_stopped.gif";
-	public static final String IMG_RM_STARTED = "rm_started.gif";
-	public static final String IMG_RM_STARTING = "rm_starting.gif";
-	public static final String IMG_RM_STOPPING = "rm_stopping.gif";
-	public static final String IMG_RM_SUSPENDED = "rm_suspended.gif";
-	public static final String IMG_RM_ERROR = "rm_error.gif";
-	public static final String IMG_RM_START = "start.gif";
-	public static final String IMG_RM_STOP = "stop.gif";
-	
-	// ==== Image Descriptors ====
-	
-	// CHANGE/DELETE SET
-	public static final ImageDescriptor ID_ICON_CHANGESET_NORMAL = createImageDescriptor(TOOLICONURL, ICON_CHANGESET_NORMAL, ICON_CHANGESET_NORMAL);
-	public static final ImageDescriptor ID_ICON_CREATESET_NORMAL = createImageDescriptor(TOOLICONURL, ICON_CREATESET_NORMAL, ICON_CREATESET_NORMAL);
-	public static final ImageDescriptor ID_ICON_DELETESET_NORMAL = createImageDescriptor(TOOLICONURL, ICON_DELETESET_NORMAL, ICON_DELETESET_NORMAL);
-	public static final ImageDescriptor ID_ICON_DELETEELEMENT_NORMAL = createImageDescriptor(TOOLICONURL, ICON_DELETEELEMENT_NORMAL, ICON_DELETEELEMENT_NORMAL);
-
-	//ZOOM
-	public static final ImageDescriptor ID_ICON_ZOOMIN_NORMAL = createImageDescriptor(TOOLICONURL, ICON_ZOOMIN_NORMAL, ICON_ZOOMIN_NORMAL);
-	public static final ImageDescriptor ID_ICON_ZOOMOUT_NORMAL = createImageDescriptor(TOOLICONURL, ICON_ZOOMOUT_NORMAL, ICON_ZOOMOUT_NORMAL);
-
-	// TOOLBAR
-	public static final ImageDescriptor ID_ICON_TERMINATE_JOB_DISABLE = createImageDescriptor(TOOLICONURL, ICON_TERMINATE_JOB_DISABLE, ICON_TERMINATE_JOB_DISABLE);
-	public static final ImageDescriptor ID_ICON_TERMINATE_JOB_NORMAL = createImageDescriptor(TOOLICONURL, ICON_TERMINATE_JOB_NORMAL, ICON_TERMINATE_JOB_NORMAL);
-	public static final ImageDescriptor ID_ICON_REMOVEALLTERMINATED_NORMAL = createImageDescriptor(TOOLICONURL, ICON_REMOVEALLTERMINATED_NORMAL, ICON_REMOVEALLTERMINATED_NORMAL);
-	public static final ImageDescriptor ID_ICON_REMOVETERMINATED_NORMAL = createImageDescriptor(TOOLICONURL, ICON_REMOVETERMINATED_NORMAL, ICON_REMOVETERMINATED_NORMAL);
-	public static final ImageDescriptor ID_ICON_JOB_FOCUS_DISABLE = createImageDescriptor(TOOLICONURL, ICON_JOB_FOCUS_DISABLE, ICON_JOB_FOCUS_DISABLE);
-	public static final ImageDescriptor ID_ICON_JOB_FOCUS_ENABLE = createImageDescriptor(TOOLICONURL, ICON_JOB_FOCUS_ENABLE, ICON_JOB_FOCUS_ENABLE);
-	
-	// SHOW LEGEND
-	public static final ImageDescriptor ID_ICON_SHOWLEGEND_ACTION_NORMAL = createImageDescriptor(TOOLICONURL, ICON_SHOWLEGEND_ACTION_NORMAL, ICON_SHOWLEGEND_ACTION_NORMAL);
-
-	// JOB
-	public static final ImageDescriptor ID_IMG_JOB_PENDING = createImageDescriptor(JOBICONURL, IMG_JOB_PENDING, IMG_JOB_PENDING);
-	public static final ImageDescriptor ID_IMG_JOB_STARTED = createImageDescriptor(JOBICONURL, IMG_JOB_STARTED, IMG_JOB_STARTED);
-	public static final ImageDescriptor ID_IMG_JOB_RUNNING = createImageDescriptor(JOBICONURL, IMG_JOB_RUNNING, IMG_JOB_RUNNING);
-	public static final ImageDescriptor ID_IMG_JOB_TERMINATED = createImageDescriptor(JOBICONURL, IMG_JOB_TERMINATED, IMG_JOB_TERMINATED);
-	public static final ImageDescriptor ID_IMG_JOB_SUSPENDED = createImageDescriptor(JOBICONURL, IMG_JOB_SUSPENDED, IMG_JOB_SUSPENDED);
-	public static final ImageDescriptor ID_IMG_JOB_ERROR = createImageDescriptor(JOBICONURL, IMG_JOB_ERROR, IMG_JOB_ERROR);
-	public static final ImageDescriptor ID_IMG_JOB_UNKNOWN = createImageDescriptor(JOBICONURL, IMG_JOB_UNKNOWN, IMG_JOB_UNKNOWN);
-	public static final ImageDescriptor ID_IMG_DEBUG_JOB_PENDING = createImageDescriptor(JOBICONURL, IMG_DEBUG_JOB_PENDING, IMG_DEBUG_JOB_PENDING);
-	public static final ImageDescriptor ID_IMG_DEBUG_JOB_STARTED = createImageDescriptor(JOBICONURL, IMG_DEBUG_JOB_STARTED, IMG_DEBUG_JOB_STARTED);
-	public static final ImageDescriptor ID_IMG_DEBUG_JOB_RUNNING = createImageDescriptor(JOBICONURL, IMG_DEBUG_JOB_RUNNING, IMG_DEBUG_JOB_RUNNING);
-	public static final ImageDescriptor ID_IMG_DEBUG_JOB_TERMINATED = createImageDescriptor(JOBICONURL, IMG_DEBUG_JOB_TERMINATED, IMG_DEBUG_JOB_TERMINATED);
-	public static final ImageDescriptor ID_IMG_DEBUG_JOB_SUSPENDED = createImageDescriptor(JOBICONURL, IMG_DEBUG_JOB_SUSPENDED, IMG_DEBUG_JOB_SUSPENDED);
-	public static final ImageDescriptor ID_IMG_DEBUG_JOB_ERROR = createImageDescriptor(JOBICONURL, IMG_DEBUG_JOB_ERROR, IMG_DEBUG_JOB_ERROR);
-	public static final ImageDescriptor ID_IMG_DEBUG_JOB_UNKNOWN = createImageDescriptor(JOBICONURL, IMG_DEBUG_JOB_UNKNOWN, IMG_DEBUG_JOB_UNKNOWN);
-
-	// NODE
-	public static final ImageDescriptor ID_IMG_NODE_USER_ALLOC_EXCL = createImageDescriptor(NODEICONURL, IMG_NODE_USER_ALLOC_EXCL, IMG_NODE_USER_ALLOC_EXCL);
-	public static final ImageDescriptor ID_IMG_NODE_USER_ALLOC_EXCL_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_USER_ALLOC_EXCL_SEL, IMG_NODE_USER_ALLOC_EXCL_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_USER_ALLOC_SHARED = createImageDescriptor(NODEICONURL, IMG_NODE_USER_ALLOC_SHARED, IMG_NODE_USER_ALLOC_SHARED);
-	public static final ImageDescriptor ID_IMG_NODE_USER_ALLOC_SHARED_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_USER_ALLOC_SHARED_SEL, IMG_NODE_USER_ALLOC_SHARED_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_OTHER_ALLOC_EXCL = createImageDescriptor(NODEICONURL, IMG_NODE_OTHER_ALLOC_EXCL, IMG_NODE_OTHER_ALLOC_EXCL);
-	public static final ImageDescriptor ID_IMG_NODE_OTHER_ALLOC_EXCL_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_OTHER_ALLOC_EXCL_SEL, IMG_NODE_OTHER_ALLOC_EXCL_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_OTHER_ALLOC_SHARED = createImageDescriptor(NODEICONURL, IMG_NODE_OTHER_ALLOC_SHARED, IMG_NODE_OTHER_ALLOC_SHARED);
-	public static final ImageDescriptor ID_IMG_NODE_OTHER_ALLOC_SHARED_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_OTHER_ALLOC_SHARED_SEL, IMG_NODE_OTHER_ALLOC_SHARED_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_DOWN = createImageDescriptor(NODEICONURL, IMG_NODE_DOWN, IMG_NODE_DOWN);
-	public static final ImageDescriptor ID_IMG_NODE_DOWN_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_DOWN_SEL, IMG_NODE_DOWN_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_ERROR = createImageDescriptor(NODEICONURL, IMG_NODE_ERROR, IMG_NODE_ERROR);
-	public static final ImageDescriptor ID_IMG_NODE_ERROR_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_ERROR_SEL, IMG_NODE_ERROR_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_EXITED_PROCESS = createImageDescriptor(NODEICONURL, IMG_NODE_EXITED_PROCESS, IMG_NODE_EXITED_PROCESS);
-	public static final ImageDescriptor ID_IMG_NODE_EXITED_PROCESS_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_EXITED_PROCESS_SEL, IMG_NODE_EXITED_PROCESS_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_RUNNING_PROCESS = createImageDescriptor(NODEICONURL, IMG_NODE_RUNNING_PROCESS, IMG_NODE_RUNNING_PROCESS);
-	public static final ImageDescriptor ID_IMG_NODE_RUNNING_PROCESS_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_RUNNING_PROCESS_SEL, IMG_NODE_RUNNING_PROCESS_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_UNKNOWN = createImageDescriptor(NODEICONURL, IMG_NODE_UNKNOWN, IMG_NODE_UNKNOWN);
-	public static final ImageDescriptor ID_IMG_NODE_UNKNOWN_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_UNKNOWN_SEL, IMG_NODE_UNKNOWN_SEL);
-	public static final ImageDescriptor ID_IMG_NODE_UP = createImageDescriptor(NODEICONURL, IMG_NODE_UP, IMG_NODE_UP);
-	public static final ImageDescriptor ID_IMG_NODE_UP_SEL = createImageDescriptor(NODEICONURL, IMG_NODE_UP_SEL, IMG_NODE_UP_SEL);
-
-	// PROCESS
-	public static final ImageDescriptor ID_IMG_PROC_ERROR = createImageDescriptor(PROCESSICONURL, IMG_PROC_ERROR, IMG_PROC_ERROR);
-	public static final ImageDescriptor ID_IMG_PROC_ERROR_SEL = createImageDescriptor(PROCESSICONURL, IMG_PROC_ERROR_SEL, IMG_PROC_ERROR_SEL);
-	public static final ImageDescriptor ID_IMG_PROC_EXITED = createImageDescriptor(PROCESSICONURL, IMG_PROC_EXITED, IMG_PROC_EXITED);
-	public static final ImageDescriptor ID_IMG_PROC_EXITED_SEL = createImageDescriptor(PROCESSICONURL, IMG_PROC_EXITED_SEL, IMG_PROC_EXITED_SEL);
-	public static final ImageDescriptor ID_IMG_PROC_EXITED_SIGNAL = createImageDescriptor(PROCESSICONURL, IMG_PROC_EXITED_SIGNAL, IMG_PROC_EXITED_SIGNAL);
-	public static final ImageDescriptor ID_IMG_PROC_EXITED_SIGNAL_SEL = createImageDescriptor(PROCESSICONURL, IMG_PROC_EXITED_SIGNAL_SEL, IMG_PROC_EXITED_SIGNAL_SEL);
-	public static final ImageDescriptor ID_IMG_PROC_RUNNING = createImageDescriptor(PROCESSICONURL, IMG_PROC_RUNNING, IMG_PROC_RUNNING);
-	public static final ImageDescriptor ID_IMG_PROC_RUNNING_SEL = createImageDescriptor(PROCESSICONURL, IMG_PROC_RUNNING_SEL, IMG_PROC_RUNNING_SEL);
-	public static final ImageDescriptor ID_IMG_PROC_STARTING = createImageDescriptor(PROCESSICONURL, IMG_PROC_STARTING, IMG_PROC_STARTING);
-	public static final ImageDescriptor ID_IMG_PROC_STARTING_SEL = createImageDescriptor(PROCESSICONURL, IMG_PROC_STARTING_SEL, IMG_PROC_STARTING_SEL);
-	public static final ImageDescriptor ID_IMG_PROC_SUSPENDED = createImageDescriptor(PROCESSICONURL, IMG_PROC_SUSPENDED, IMG_PROC_SUSPENDED);
-	public static final ImageDescriptor ID_IMG_PROC_SUSPENDED_SEL = createImageDescriptor(PROCESSICONURL, IMG_PROC_SUSPENDED_SEL, IMG_PROC_SUSPENDED_SEL);
-	public static final ImageDescriptor ID_IMG_PROC_UNKNOWN = createImageDescriptor(PROCESSICONURL, IMG_PROC_UNKNOWN, IMG_PROC_UNKNOWN);
-	public static final ImageDescriptor ID_IMG_PROC_UNKNOWN_SEL = createImageDescriptor(PROCESSICONURL, IMG_PROC_UNKNOWN_SEL, IMG_PROC_UNKNOWN_SEL);
-	
-	// MACHINE
-	public static final ImageDescriptor ID_IMG_MACHINE_UNKNOWN = createImageDescriptor(MACHINEICONURL, IMG_MACHINE_UNKNOWN, IMG_MACHINE_UNKNOWN);
-	public static final ImageDescriptor ID_IMG_MACHINE_UP = createImageDescriptor(MACHINEICONURL, IMG_MACHINE_UP, IMG_MACHINE_UP);
-	public static final ImageDescriptor ID_IMG_MACHINE_DOWN = createImageDescriptor(MACHINEICONURL, IMG_MACHINE_DOWN, IMG_MACHINE_DOWN);
-	public static final ImageDescriptor ID_IMG_MACHINE_ALERT = createImageDescriptor(MACHINEICONURL, IMG_MACHINE_ALERT, IMG_MACHINE_ALERT);
-	public static final ImageDescriptor ID_IMG_MACHINE_ERROR = createImageDescriptor(MACHINEICONURL, IMG_MACHINE_ERROR, IMG_MACHINE_ERROR);
-
-	// RESOURCE MANAGERS
-	public static final ImageDescriptor ID_IMG_RM_STOPPED = createImageDescriptor(RMICONURL, IMG_RM_STOPPED, IMG_RM_STOPPED);
-	public static final ImageDescriptor ID_IMG_RM_STARTED = createImageDescriptor(RMICONURL, IMG_RM_STARTED, IMG_RM_STARTED);
-	public static final ImageDescriptor ID_IMG_RM_STARTING = createImageDescriptor(RMICONURL, IMG_RM_STARTING, IMG_RM_STARTING);
-	public static final ImageDescriptor ID_IMG_RM_STOPPING = createImageDescriptor(RMICONURL, IMG_RM_STOPPING, IMG_RM_STOPPING);
-	public static final ImageDescriptor ID_IMG_RM_SUSPENDED = createImageDescriptor(RMICONURL, IMG_RM_SUSPENDED, IMG_RM_SUSPENDED);
-	public static final ImageDescriptor ID_IMG_RM_ERROR = createImageDescriptor(RMICONURL, IMG_RM_ERROR, IMG_RM_ERROR);
-	public static final ImageDescriptor ID_IMG_RM_START= createImageDescriptor(RMICONURL, IMG_RM_START, IMG_RM_START);
-	public static final ImageDescriptor ID_IMG_RM_STOP = createImageDescriptor(RMICONURL, IMG_RM_STOP, IMG_RM_STOP);
-	
-	// ==== Image Arrays ====
-	
-	// NOTE: The order of images in these arrays must correspond to the ordinal
-	// values of the element state attributes.
-	
-	// NODE
-	public static final Image[][] nodeImages = {
-		{ getImage(ParallelImages.IMG_NODE_UP),					getImage(ParallelImages.IMG_NODE_UP_SEL)					},             
-		{ getImage(ParallelImages.IMG_NODE_DOWN),				getImage(ParallelImages.IMG_NODE_DOWN_SEL)					},
-		{ getImage(ParallelImages.IMG_NODE_ERROR),				getImage(ParallelImages.IMG_NODE_ERROR_SEL)					},
-		{ getImage(ParallelImages.IMG_NODE_UNKNOWN),			getImage(ParallelImages.IMG_NODE_UNKNOWN_SEL)				},
-		// Extra State
-		{ getImage(ParallelImages.IMG_NODE_USER_ALLOC_EXCL),	getImage(ParallelImages.IMG_NODE_USER_ALLOC_EXCL_SEL)		},
-		{ getImage(ParallelImages.IMG_NODE_USER_ALLOC_SHARED),	getImage(ParallelImages.IMG_NODE_USER_ALLOC_SHARED_SEL)		},
-		{ getImage(ParallelImages.IMG_NODE_OTHER_ALLOC_EXCL),	getImage(ParallelImages.IMG_NODE_OTHER_ALLOC_EXCL_SEL)		},
-		{ getImage(ParallelImages.IMG_NODE_OTHER_ALLOC_SHARED),	getImage(ParallelImages.IMG_NODE_OTHER_ALLOC_SHARED_SEL)	},
-		{ getImage(ParallelImages.IMG_NODE_RUNNING_PROCESS),	getImage(ParallelImages.IMG_NODE_RUNNING_PROCESS_SEL)		},
-		{ getImage(ParallelImages.IMG_NODE_EXITED_PROCESS),		getImage(ParallelImages.IMG_NODE_EXITED_PROCESS_SEL)		}
-	};
-
-	// JOB
-	public static Image[][] jobImages = {
-		{ getImage(ParallelImages.IMG_JOB_PENDING),		getImage(ParallelImages.IMG_DEBUG_JOB_PENDING)		},
-		{ getImage(ParallelImages.IMG_JOB_STARTED),		getImage(ParallelImages.IMG_DEBUG_JOB_STARTED)		},
-		{ getImage(ParallelImages.IMG_JOB_RUNNING),		getImage(ParallelImages.IMG_DEBUG_JOB_RUNNING)		},
-		{ getImage(ParallelImages.IMG_JOB_TERMINATED),	getImage(ParallelImages.IMG_DEBUG_JOB_TERMINATED)	},
-		{ getImage(ParallelImages.IMG_JOB_SUSPENDED),	getImage(ParallelImages.IMG_DEBUG_JOB_SUSPENDED)	},
-		{ getImage(ParallelImages.IMG_JOB_ERROR),		getImage(ParallelImages.IMG_DEBUG_JOB_ERROR)		},
-		{ getImage(ParallelImages.IMG_JOB_UNKNOWN),		getImage(ParallelImages.IMG_DEBUG_JOB_UNKNOWN)		}
-	};
-	
-	// PROCESS
-	public static final Image[][] procImages = {
-		{ getImage(ParallelImages.IMG_PROC_STARTING),		getImage(ParallelImages.IMG_PROC_STARTING_SEL)			},
-		{ getImage(ParallelImages.IMG_PROC_RUNNING),		getImage(ParallelImages.IMG_PROC_RUNNING_SEL)			},
-		{ getImage(ParallelImages.IMG_PROC_EXITED),			getImage(ParallelImages.IMG_PROC_EXITED_SEL)			},
-		{ getImage(ParallelImages.IMG_PROC_EXITED_SIGNAL),	getImage(ParallelImages.IMG_PROC_EXITED_SIGNAL_SEL)		},
-		{ getImage(ParallelImages.IMG_PROC_SUSPENDED),		getImage(ParallelImages.IMG_PROC_SUSPENDED_SEL)			},
-		{ getImage(ParallelImages.IMG_PROC_ERROR),			getImage(ParallelImages.IMG_PROC_ERROR_SEL)				},
-		{ getImage(ParallelImages.IMG_PROC_UNKNOWN),		getImage(ParallelImages.IMG_PROC_UNKNOWN_SEL)			}
-	};
-
-	// MACHINE
-	public static Image[] machineImages = {
-		getImage(ParallelImages.IMG_MACHINE_UP),
-		getImage(ParallelImages.IMG_MACHINE_DOWN),
-		getImage(ParallelImages.IMG_MACHINE_ALERT),
-		getImage(ParallelImages.IMG_MACHINE_ERROR),
-		getImage(ParallelImages.IMG_MACHINE_UNKNOWN)
-	};
-
-	// RESOURCE MANAGERS
-	public static Image[] rmImages = {
-		getImage(ParallelImages.IMG_RM_STARTING),
-		getImage(ParallelImages.IMG_RM_STARTED),
-		getImage(ParallelImages.IMG_RM_STOPPING),
-		getImage(ParallelImages.IMG_RM_STOPPED),
-		getImage(ParallelImages.IMG_RM_SUSPENDED),
-		getImage(ParallelImages.IMG_RM_ERROR),
-	};
-	
-    private static ImageRegistry imageRegistry = null;
-
-	/** Get image
-	 * @param key
-	 * @return
-	 */
-	public static Image getImage(String key) {
-		return getImageRegistry().get(key);
-	}
-	/** Get image descriptor
-	 * @param key
-	 * @return
-	 */
-	public static ImageDescriptor getDescriptor(String key) {
-		return getImageRegistry().getDescriptor(key);
-	}
-	
-	/** Get image registry
-	 * @return
-	 */
-	private static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-		}
-		return imageRegistry;
-	}
-	
-	/** add image 
-	 * @param key
-	 * @param image
-	 */
-	public static void addImage(String key, Image image) {
-		getImageRegistry().put(key, image);
-	}
-	/** add image descriptor
-	 * @param key
-	 * @param imageDescriptor
-	 */
-	public static void addImageDescriptor(String key, ImageDescriptor imageDescriptor) {
-		getImageRegistry().put(key, imageDescriptor);
-	}
-		
-	/** Create image descriptor
-	 * @param iconURL
-	 * @param key
-	 * @param name
-	 * @return
-	 */
-	public static ImageDescriptor createImageDescriptor(URL iconURL, String key, String name) {
-		try {
-			ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(getIconURL(iconURL, name));
-			addImageDescriptor(key, imageDescriptor);
-			return imageDescriptor;
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	/** Get icon url
-	 * @param iconURL
-	 * @param name
-	 * @return
-	 * @throws MalformedURLException
-	 */
-	private static URL getIconURL(URL iconURL, String name) throws MalformedURLException {
-		if (iconURL == null)
-			throw new MalformedURLException();
-			
-		return new URL(iconURL, name);
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ChangeSetAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ChangeSetAction.java
deleted file mode 100644
index 94ec7a3..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ChangeSetAction.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.actions.GotoAction;
-import org.eclipse.ptp.ui.actions.GotoDropDownAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-
-/**
- * @author Clement chu
- *
- */
-public class ChangeSetAction extends GotoDropDownAction {
-	public static final String name = "Change Set";
-    
-	/** Constructor
-	 * @param view
-	 */
-	public ChangeSetAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_CHANGESET_NORMAL);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.GotoDropDownAction#createDropDownMenu(org.eclipse.jface.action.MenuManager)
-	 */
-	protected void createDropDownMenu(MenuManager dropDownMenuMgr) {
-	    String curID = view.getCurrentSetID();    	
-	    if (curID == null || curID.length() == 0)
-	    		return;
-	    
-	    addAction(dropDownMenuMgr, IElementHandler.SET_ROOT_ID, IElementHandler.SET_ROOT_ID, curID, null);
-		IElementHandler setManager = view.getCurrentElementHandler();
-		if (setManager == null)
-			return;
-
-		IElement[] sets = setManager.getElements();
-    	if (sets.length > 1)
-    		dropDownMenuMgr.add(new Separator());
-    	for (IElement set : sets) {
-    		if (set instanceof IElementSet) {
-	    		if (set.getID().equals(IElementHandler.SET_ROOT_ID))
-	    			continue;
-	    		
-	    		addAction(dropDownMenuMgr, set.getID(), set.getID(), curID, null);
-    		}
-    	}		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.GotoDropDownAction#addAction(org.eclipse.jface.action.MenuManager, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	protected void addAction(MenuManager dropDownMenuMgr, String e_name, String id, String curID, Object data) {
-		IAction action = new InternalSetAction(e_name, id, view, this);
-		action.setChecked(curID.equals(id));
-		action.setEnabled(true);
-		dropDownMenuMgr.add(action);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IElementHandler setManager = view.getCurrentElementHandler();
-		if (setManager == null)
-			return;
-		
-		IElement[] sets = setManager.getElements();		
-    	for (int i=0; i<sets.length; i++) {
-    		if (view.getCurrentSetID().equals(sets[i].getID())) {
-    			if (i + 1 < sets.length)
-    				run(null, (IElementSet)sets[i+1]);
-    			else
-    				run(null, (IElementSet)sets[0]);
-    			break;
-    		}
-    	}
-	}
-	
-	/** run action
-	 * @param elements
-	 * @param set
-	 */
-	public void run(IElement[] elements, IElementSet set) {
-		view.selectSet(set);
-		//view.update();
-		view.refresh(false);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.GotoDropDownAction#run(org.eclipse.ptp.ui.model.IElement[], java.lang.String)
-	 */
-	public void run(IElement[] elements, String id, Object data) {
-		IElementHandler setManager = view.getCurrentElementHandler();
-		if (setManager == null)
-			return;
-		
-		run(elements, (IElementSet)setManager.getElementByID(id));
-	}
-
-	/** Inner internal set action
-	 * @author clement
-	 *
-	 */
-	private class InternalSetAction extends GotoAction {
-		public InternalSetAction(String name, String id, AbstractParallelElementView view, GotoDropDownAction action) {
-			super(name, id, view, action, null);
-		}	
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/CreateSetAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/CreateSetAction.java
deleted file mode 100644
index 1f826b9..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/CreateSetAction.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.actions.GotoAction;
-import org.eclipse.ptp.ui.actions.GotoDropDownAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-/**
- * @author clement chu
- *
- */
-public class CreateSetAction extends GotoDropDownAction {
-	public static final String name = "Create Set";
-    
-	/** Constructor
-	 * @param view
-	 */
-	public CreateSetAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_CREATESET_NORMAL);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.GotoDropDownAction#createDropDownMenu(org.eclipse.jface.action.MenuManager)
-	 */
-	protected void createDropDownMenu(MenuManager dropDownMenuMgr) {
-    	String curID = view.getCurrentSetID();
-		IElementHandler setManager = view.getCurrentElementHandler();
-		if (setManager == null)
-			return;
-
-    	for (IElement set : setManager.getElements()) {
-    		addAction(dropDownMenuMgr, set.getID(), set.getID(), curID, null);
-    	}		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.GotoDropDownAction#addAction(org.eclipse.jface.action.MenuManager, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	protected void addAction(MenuManager dropDownMenuMgr, String e_name, String id, String curID, Object data) {
-		IAction action = new InternalSetAction("Add to set: " + e_name, id, view, this);
-		action.setEnabled(!curID.equals(id));
-		dropDownMenuMgr.add(action);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {
-		run(elements, null, null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.GotoDropDownAction#run(org.eclipse.ptp.ui.model.IElement[], java.lang.String)
-	 */
-	public void run(IElement[] elements, String setID, Object data) {
-		if (validation(elements)) {
-			final IElementHandler setManager = view.getCurrentElementHandler();
-			if (setManager == null)
-				return;
-			
-			if (setID == null) {
-				IInputValidator inputValidator = new IInputValidator() {
-					public String isValid(String newText) {
-						if (newText == null || newText.length() == 0)
-							return "This field cannot be empty.";
-						
-						if (setManager.contains(newText))
-							return "Entered set name (" + newText + ") is already used.";						
-
-						return null;
-					}
-				};
-				InputDialog inputDialog = new InputDialog(getShell(), "Create a new set name", "Please enter the new set name.", "", inputValidator);
-				if (inputDialog.open() == InputDialog.CANCEL)
-					return;
-
-				String name = inputDialog.getValue();
-				setID = view.getUIManager().createSet(elements, name, name, setManager);				
-			} else
-				view.getUIManager().addToSet(elements, setID, setManager);
-			
-			view.selectSet((IElementSet)setManager.getElementByID(setID));
-			//Need to deselect all elements manually
-			//view.update();
-			view.refresh(false);
-		}
-	}
-	
-	/** Inner internal set action
-	 * @author clement
-	 *
-	 */
-	private class InternalSetAction extends GotoAction {
-		public InternalSetAction(String name, String id, AbstractParallelElementView view, GotoDropDownAction action) {
-			super(name, id, view, action, null);
-		    setImageDescriptor(ParallelImages.ID_ICON_CREATESET_NORMAL);
-		}	
-	}	
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DeleteSetAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DeleteSetAction.java
deleted file mode 100644
index 0e60918..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DeleteSetAction.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-
-/**
- * @author clement chu
- *
- */
-public class DeleteSetAction extends ParallelAction {
-	public static final String name = "Delete Set";
-	
-	/** Constructor
-	 * @param view
-	 */
-	public DeleteSetAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_DELETESET_NORMAL);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IElementSet set = view.getCurrentSet();
-		if (set != null && set.size() > 0) {
-			IElementHandler setManager = view.getCurrentElementHandler();
-			if (setManager == null)
-				return;
-
-			if (UIUtils.showQuestionDialog(name + " " + set.getID() + " Confirmation", "Are you sure you want to delete all elements from this set?")) {
-				IManager uiManager = view.getUIManager();
-				uiManager.removeSet(set.getID(), setManager);
-						
-				IElement[] sets = setManager.getElements();
-				if (sets.length > 0) {
-					IElement lastSet = sets[sets.length-1];
-					view.selectSet((IElementSet)setManager.getElementByID(lastSet.getID()));
-					//view.update();
-					view.refresh(false);
-				}
-			}
-		}		
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DisplayRulerAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DisplayRulerAction.java
deleted file mode 100644
index 274dd6e..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/DisplayRulerAction.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-
-/**
- * @author Clement chu
- * 
- */
-public class DisplayRulerAction extends ParallelAction {
-	public static final String name = "Show ruler";
-	private boolean checked = false;
-	
-	/** Constructor
-	 * @param view
-	 */
-	public DisplayRulerAction(AbstractParallelElementView view) {
-		super(name, IAction.AS_CHECK_BOX, view);
-		setEnabled(view.getCurrentID().length()>0);
-		checked = view.isDisplayRuler();
-		setChecked(checked);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		getViewPart().setDisplayRuler(!checked);
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/JobFocusAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/JobFocusAction.java
deleted file mode 100644
index fbbd6fb..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/JobFocusAction.java
+++ /dev/null

@@ -1,33 +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.internal.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.views.ParallelJobsView;
-
-public class JobFocusAction extends Action {
-	private ParallelJobsView view = null;
-	
-	public JobFocusAction(ParallelJobsView view) {
-		super("Job Focus", IAction.AS_CHECK_BOX);
-		this.view = view;
-		setToolTipText("Focus On New Job");
-	    setImageDescriptor(ParallelImages.ID_ICON_JOB_FOCUS_ENABLE);
-	    setDisabledImageDescriptor(ParallelImages.ID_ICON_JOB_FOCUS_DISABLE);
-	    this.setChecked(true);
-	}
-
-	public void run() {
-		view.setJobFocus(isChecked());
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveAllTerminatedAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveAllTerminatedAction.java
deleted file mode 100644
index f6c9d57..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveAllTerminatedAction.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.managers.JobManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-
-/**
- * @author Clement chu
- *
- */
-public class RemoveAllTerminatedAction extends ParallelAction {
-	public static final String name = "Remove All Terminated";
-	
-	/** Constructor
-	 * @param view
-	 */
-	public RemoveAllTerminatedAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_REMOVEALLTERMINATED_NORMAL);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		((JobManager) view.getUIManager()).removeAllStoppedJobs();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveElementAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveElementAction.java
deleted file mode 100644
index 86fe460..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveElementAction.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-
-/**
- * @author clement chu
- *
- */
-public class RemoveElementAction extends ParallelAction {
-	public static final String name = "Remove Elements";
-	
-	/** Constructor
-	 * @param view
-	 */
-	public RemoveElementAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_DELETEELEMENT_NORMAL);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {
-		if (validation(elements)) {
-			IElementSet set = view.getCurrentSet();
-			if (set.size() == elements.length) {
-				callDeleteGroupAction();
-			} else {
-				IElementHandler setManager = view.getCurrentElementHandler();
-				if (setManager == null)
-					return;
-
-				if (UIUtils.showQuestionDialog("Remove Confirmation", "Are you sure you want to remove (" + elements.length + ") elements from this set?"))	{			
-					view.getUIManager().removeFromSet(elements, set.getID(), setManager);
-					view.selectSet((IElementSet)setManager.getElementByID(set.getID()));
-					view.updateTitle();
-					view.refresh(false);
-				}
-			}
-		}		
-	}
-	
-	/** Call delete group action
-	 * 
-	 */
-	private void callDeleteGroupAction() {
-		IToolBarManager manager = view.getViewSite().getActionBars().getToolBarManager();
-		IContributionItem item = manager.find(DeleteSetAction.name);
-		if (item != null && item instanceof ActionContributionItem) {
-			((ActionContributionItem)item).getAction().run();
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveSelectedJobAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveSelectedJobAction.java
deleted file mode 100644
index e7108dc..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/RemoveSelectedJobAction.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.jface.viewers.AbstractTableViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.managers.JobManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-import org.eclipse.ptp.ui.views.ParallelJobsView;
-
-public class RemoveSelectedJobAction extends ParallelAction {
-	public static final String name = "Remove Selected Job";
-	AbstractTableViewer jobViewer;
-
-	public RemoveSelectedJobAction(AbstractParallelElementView view,
-			AbstractTableViewer viewer) {
-		super(name, view);
-		jobViewer = viewer;
-		setImageDescriptor(ParallelImages.ID_ICON_REMOVETERMINATED_NORMAL);
-	}
-
-	@Override
-	/**
-	 * Remove the specified job from the jobs view.
-	 * @param elements - should contain the set of selected elements at the time the action was invoked
-	 */
-	public void run(IElement[] elements) {
-		ISelection selection;
-		IPJob selectedJob;
-
-		selection = jobViewer.getSelection();
-		if (!selection.isEmpty()) {
-			selectedJob = (IPJob) ((IStructuredSelection) selection)
-					.getFirstElement();
-			((JobManager) view.getUIManager()).removeJob(selectedJob);
-			((ParallelJobsView) view).changeJobRefresh(null);
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ShowLegendAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ShowLegendAction.java
deleted file mode 100644
index 9af1bd3..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ShowLegendAction.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.ui.LegendDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class ShowLegendAction implements IWorkbenchWindowActionDelegate {
-	private IWorkbenchWindow window;
-
-	public void run(IAction action) {
-		new LegendDialog(window.getShell()).open();
-	}
-	public void selectionChanged(IAction action, ISelection selection) {
-	}	
-	public void dispose() {
-	}	
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}	
-}
-
-/*
-public class ShowLegendAction extends ParallelAction {
-	public ShowLegendAction(ViewPart view) {
-		super(view);
-	}
-
-	protected void init(boolean isEnable) {
-	    this.setText(UIMessage.getResourceString("ShowLegendAction.text"));
-	    this.setToolTipText(UIMessage.getResourceString("ShowLegendAction.tooltip"));
-	    this.setImageDescriptor(ParallelImages.getDescriptor(ParallelImages.IMG_SHOWLEGEND_ACTION_NORMAL));
-	    this.setDisabledImageDescriptor(ParallelImages.getDescriptor(ParallelImages.IMG_SHOWLEGEND_ACTION_DISABLE));
-	    this.setHoverImageDescriptor(ParallelImages.getDescriptor(ParallelImages.IMG_SHOWLEGEND_ACTION_HOVER));
-	    this.setEnabled(getLaunchManager().isMPIRuning());
-	}
-
-	public void run() {
-		LegendDialog ld = new LegendDialog(getShell());
-		ld.open();
-	}
-}
-*/

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobAction.java
deleted file mode 100644
index 2ebbffa..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobAction.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.UIMessage;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.managers.AbstractUIManager;
-import org.eclipse.ptp.ui.managers.JobManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-
-/**
- * @author Clement chu
- *
- */
-public class TerminateJobAction extends ParallelAction {
-	public static final String name = "Terminate Job";
-	
-	/** Constructor
-	 * @param view
-	 */
-	public TerminateJobAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_TERMINATE_JOB_NORMAL);
-	    setDisabledImageDescriptor(ParallelImages.ID_ICON_TERMINATE_JOB_DISABLE);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IManager manager = view.getUIManager();
-		if (manager instanceof AbstractUIManager) {
-			boolean terminate = MessageDialog.openConfirm(getShell(),
-					UIMessage.getResourceString("TerminateJobAction.Title"), //$NON-NLS-1$
-					UIMessage.getResourceString("TerminateJobAction.Question") //$NON-NLS-1$
-					+ ((JobManager)manager).getJob().getName()
-					+ UIMessage.getResourceString("TerminateJobAction.Confirm")); //$NON-NLS-1$
-			if (terminate) {
-				try {
-					((JobManager)manager).terminateJob();
-				} catch (CoreException e) {
-					ErrorDialog.openError(getShell(), "Terminate Job Error", "Cannot terminate the job.", e.getStatus());
-				}
-			}
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobFromListAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobFromListAction.java
deleted file mode 100644
index d9b57dc..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/TerminateJobFromListAction.java
+++ /dev/null

@@ -1,208 +0,0 @@
-/**
- * 
- */
-package org.eclipse.ptp.internal.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.UIMessage;
-import org.eclipse.ptp.ui.managers.AbstractUIManager;
-import org.eclipse.ptp.ui.managers.JobManager;
-import org.eclipse.ptp.ui.views.JobsListView;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Richard Maciel
- *
- */
-public class TerminateJobFromListAction extends Action {
-
-	JobsListView view;
-
-	/**
-	 * 
-	 */
-	public TerminateJobFromListAction(JobsListView view) {
-		super(UIMessage.getResourceString("TerminateJobFromListAction.button.text"), IAction.AS_PUSH_BUTTON);
-		setToolTipText(UIMessage.getResourceString("TerminateJobFromListAction.button.tooltip")); //"Terminate all selected jobs");
-		setEnabled(false);
-		setId(UIMessage.getResourceString("TerminateJobFromListAction.button.text"));
-
-		this.view = view;
-
-		setImageDescriptor(ParallelImages.ID_ICON_TERMINATE_JOB_NORMAL);
-		setDisabledImageDescriptor(ParallelImages.ID_ICON_TERMINATE_JOB_DISABLE);
-		
-		view.getViewer().addPostSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				// Sanity check over viewer data
-				if(event.getSelection() instanceof IStructuredSelection) {
-					IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-					
-					if(sel.isEmpty())
-						setEnabled(false);
-					else {
-						Object [] selJobs = sel.toArray();
-
-						// Only enables if at least one is running
-						boolean running = false;
-						for(int i=0; i < selJobs.length; i++) {
-								IPJob job = (IPJob)selJobs[i];
-								
-								if(!job.isTerminated())
-									running = true;
-						}
-						
-						if(running)
-							setEnabled(true);
-						else
-							setEnabled(false);
-						
-					}
-						
-				}
-			}
-		});
-		
-/*		view.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				// Sanity check over viewer data
-				if(event.getSelection() instanceof IStructuredSelection) {
-					IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-					
-					if(sel.isEmpty())
-						setEnabled(false);
-					else {
-						Object [] selJobs = sel.toArray();
-
-						// Only enables if at least one is running
-						boolean running = false;
-						for(int i=0; i < selJobs.length; i++) {
-								IPJob job = (IPJob)selJobs[i];
-								
-								if(!job.isTerminated())
-									running = true;
-						}
-						
-						if(running)
-							setEnabled(true);
-						else
-							setEnabled(false);
-						
-					}
-						
-				}
-			}
-		});
-*/	}
-
-	public void updateTerminateJobState() {
-		// Sanity check over viewer data
-		if(view.getViewer().getSelection() instanceof IStructuredSelection) {
-			IStructuredSelection sel = (IStructuredSelection)view.getViewer().getSelection();
-			
-			if(sel.isEmpty())
-				setEnabled(false);
-			else {
-				Object [] selJobs = sel.toArray();
-
-				// Only enables if at least one is running
-				boolean running = false;
-				for(int i=0; i < selJobs.length; i++) {
-						IPJob job = (IPJob)selJobs[i];
-						
-						if(!job.isTerminated())
-							running = true;
-				}
-				
-				if(running)
-					setEnabled(true);
-				else
-					setEnabled(false);
-			}
-		}
-		
-	}		
-	
-	/** Get Shell
-	 * @return
-	 */
-	public Shell getShell() {
-		return view.getViewSite().getShell();
-	}
-
-	public void run() {
-		TableViewer viewer = view.getViewer();
-
-		// Sanity check over viewer data
-		if(viewer.getSelection() instanceof IStructuredSelection) {
-			IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
-
-			IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-
-			// Must select at least one item
-			if(sel.size() == 0)
-				return;
-
-			Object [] selJobs = sel.toArray();
-
-			// Iterate over all selected items, killing the respective jobs
-			for(int i=0; i < selJobs.length; i++) {
-				try {
-					IPJob job = (IPJob)selJobs[i];
-					
-					IResourceManager rm = job.getQueue().getResourceManager();
-					if(!job.isTerminated())
-						rm.terminateJob(job);
-					// TODO: Look for job change event to wait for jobs to be finished.
-					viewer.update(selJobs[i], null);
-					
-				} catch (CoreException e) {
-					//ErrorDialog.openError(getShell(), "Terminate Job Error", "Cannot terminate the job.", e.getStatus());
-					ErrorDialog.openError(getShell(), UIMessage.getResourceString("TerminateJobFromListAction.msgbox.title"),
-							UIMessage.getResourceString("TerminateJobFromListAction.msgbox.message"),
-							e.getStatus());
-					
-				}
-			}
-
-
-		}
-	}
-
-
-	/*//IManager manager = view.getUIManager();
-		//if (manager instanceof AbstractUIManager) {
-			boolean terminate = MessageDialog.openConfirm(getShell(),
-					UIMessage.getResourceString("TerminateJobAction.Title"), //$NON-NLS-1$
-					UIMessage.getResourceString("TerminateJobAction.Question") //$NON-NLS-1$
-					//+ ((JobManager)manager).getJob().getName()
-					+ UIMessage.getResourceString("TerminateJobAction.Confirm")); //$NON-NLS-1$
-			if (terminate) {
-				try {
-					((JobManager)manager).terminateJob();
-				} catch (CoreException e) {
-					ErrorDialog.openError(getShell(), "Terminate Job Error", "Cannot terminate the job.", e.getStatus());
-				}
-			}*/
-	//}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomInAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomInAction.java
deleted file mode 100644
index 75b8c91..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomInAction.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-import org.eclipse.ptp.ui.views.AbstractParallelSetView;
-
-/**
- * @author clement chu
- *
- */
-public class ZoomInAction extends ParallelAction {
-	public static final String name = "Zoom in";
-	
-	/** Constructor
-	 * @param view
-	 */
-	public ZoomInAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_ZOOMIN_NORMAL);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (view instanceof AbstractParallelSetView) {
-			((AbstractParallelSetView)view).zoomIn();
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomOutAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomOutAction.java
deleted file mode 100644
index def6a19..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/actions/ZoomOutAction.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.actions;
-
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-import org.eclipse.ptp.ui.views.AbstractParallelSetView;
-
-/**
- * @author clement chu
- *
- */
-public class ZoomOutAction extends ParallelAction {
-	public static final String name = "Zoom out";
-	
-	/** Constructor
-	 * @param view
-	 */
-	public ZoomOutAction(AbstractParallelElementView view) {
-		super(name, view);
-	    setImageDescriptor(ParallelImages.ID_ICON_ZOOMOUT_NORMAL);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (view instanceof AbstractParallelSetView) {
-			((AbstractParallelSetView)view).zoomOut();
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PElementPropertySource.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PElementPropertySource.java
deleted file mode 100644
index 0496470..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PElementPropertySource.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-public class PElementPropertySource implements IPropertySource {
-
-	private final IPElement pelement;
-	private final List<PropertyDescriptor> descriptors = new ArrayList<PropertyDescriptor>();
-
-	public PElementPropertySource(IPElement pelement) {
-		this.pelement = pelement;
-		IAttributeDefinition<?,?,?>[] attrDefs = pelement.getAttributeKeys();
-        String[] keys = new String[attrDefs.length];
-        for (int i = 0; i < attrDefs.length; i++) {
-        	if (attrDefs[i].getDisplay()) {
-        		keys[i] = attrDefs[i].getId();
-                addDescriptor(new PropertyDescriptor(keys[i], attrDefs[i].getName()));
-        	}
-        }
-	}
-
-	public Object getEditableValue() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		return descriptors.toArray(new IPropertyDescriptor[0]);
-	}
-
-	public Object getPropertyValue(Object id) {
-        final IAttribute<?, ?, ?> attribute = pelement.getAttribute(id.toString());
-        if (attribute != null) {
-        	return attribute.getValueAsString();
-        }
-        return null;
-	}
-
-	public boolean isPropertySet(Object id) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void resetPropertyValue(Object id) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void setPropertyValue(Object id, Object value) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	protected void addDescriptor(PropertyDescriptor desc) {
-		descriptors.add(desc);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PJobWorkbenchAdapter.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PJobWorkbenchAdapter.java
deleted file mode 100644
index 3c6a54c..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PJobWorkbenchAdapter.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.utils.ui.ImageImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-
-public class PJobWorkbenchAdapter extends WorkbenchAdapter {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-		IPJob job = (IPJob) object;
-		final Image image = getImage(job);
-		if (image != null) {
-			return new ImageImageDescriptor(image);
-		}
-		return null;
-	}
-
-	/**
-	 * @param job
-	 * @return
-	 */
-	private Image getImage(IPJob job) {
-		return ParallelImages.jobImages[job.getState().ordinal()][job.isDebug() ? 1 : 0];
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PMachineWorkbenchAdapter.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PMachineWorkbenchAdapter.java
deleted file mode 100644
index dc67d3d..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PMachineWorkbenchAdapter.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.utils.ui.ImageImageDescriptor;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class PMachineWorkbenchAdapter extends WorkbenchAdapter {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-		IPMachine machine = (IPMachine) object;
-		return new ImageImageDescriptor(ParallelImages.machineImages[machine.getState().ordinal()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	@Override
-	public Object[] getChildren(Object object) {
-		IPMachine machine = (IPMachine) object;
-		return machine.getNodes();
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PNodeWorkbenchAdapter.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PNodeWorkbenchAdapter.java
deleted file mode 100644
index d5e21bf..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PNodeWorkbenchAdapter.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.utils.ui.ImageImageDescriptor;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-
-public class PNodeWorkbenchAdapter extends WorkbenchAdapter {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-		IPNode node = (IPNode) object;
-		return new ImageImageDescriptor(ParallelImages.nodeImages[node.getState().ordinal()][0]);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PQueueWorkbenchAdapter.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PQueueWorkbenchAdapter.java
deleted file mode 100644
index 756d5dd..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PQueueWorkbenchAdapter.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class PQueueWorkbenchAdapter extends WorkbenchAdapter {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	@Override
-	public Object[] getChildren(Object object) {
-		IPQueue queue = (IPQueue) object;
-		return queue.getJobs();
-	}
-
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PropertyAdapterFactory.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PropertyAdapterFactory.java
deleted file mode 100644
index 8043c84..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/PropertyAdapterFactory.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-public class PropertyAdapterFactory implements IAdapterFactory {
-
-	@SuppressWarnings("unchecked")
-    public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType == IPropertySource.class) {
-			if (adaptableObject instanceof IResourceManager) {
-				return new ResourceManagerPropertySource((IResourceManager)adaptableObject);
-			}
-			if (adaptableObject instanceof IPElement) {
-				return new PElementPropertySource((IPElement)adaptableObject);
-			}
-			if (adaptableObject instanceof IElement) {
-				return new PElementPropertySource(((IElement)adaptableObject).getPElement());
-			}
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-    public Class[] getAdapterList() {
-		return new Class[] {IPropertySource.class};
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerPropertySource.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerPropertySource.java
deleted file mode 100644
index 8248341..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerPropertySource.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-public class ResourceManagerPropertySource extends PElementPropertySource {
-
-	private final IResourceManager resourceManager;
-
-	public ResourceManagerPropertySource(IResourceManager resourceManager) {
-		super(resourceManager);
-		
-		this.resourceManager = resourceManager;
-		addDescriptor(new PropertyDescriptor("rm.machines", "num machines"));
-		addDescriptor(new PropertyDescriptor("rm.queues", "num queues"));
-		
-	}
-
-	public Object getPropertyValue(Object id) {
-		Object value = super.getPropertyValue(id);
-		if (value != null) {
-			return value;
-		}
-		if ("rm.machines".equals(id)) {
-			final IPMachine[] machines = resourceManager.getMachines();
-			return Integer.toString(machines.length);
-		}
-		if ("rm.queues".equals(id)) {
-			final IPQueue[] queues = resourceManager.getQueues();
-			return Integer.toString(queues.length);
-		}
-		return null;
-	}
-
-}
-

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerWorkbenchAdapter.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerWorkbenchAdapter.java
deleted file mode 100644
index d156a41..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/ResourceManagerWorkbenchAdapter.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.UIMessage;
-import org.eclipse.ptp.utils.ui.ImageImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.model.IWorkbenchAdapter2;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class ResourceManagerWorkbenchAdapter extends WorkbenchAdapter {
-
-	private class ChildContainer extends WorkbenchAdapter implements IAdaptable {
-
-		private final Object parent;
-
-		private final String name;
-
-		private final Object[] children;
-
-		public ChildContainer(Object parent, String name, Object[] children) {
-			this.parent = parent;
-			this.name = name;
-			this.children = children;
-		}
-
-		public Object getAdapter(@SuppressWarnings("unchecked") Class adapter) {
-			if (adapter == IWorkbenchAdapter.class || adapter == IWorkbenchAdapter2.class) {
-				return this;
-			}
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.model.WorkbenchAdapter#getChildren(java.lang.Object)
-		 */
-		@Override
-		public Object[] getChildren(Object object) {
-			return children.clone();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.model.WorkbenchAdapter#getLabel(java.lang.Object)
-		 */
-		@Override
-		public String getLabel(Object object) {
-			return name;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.model.WorkbenchAdapter#getParent(java.lang.Object)
-		 */
-		@Override
-		public Object getParent(Object object) {
-			return parent;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	@Override
-	public Object[] getChildren(Object parentElement) {
-		IResourceManager rm = getResourceManager(parentElement);
-		if (rm != null) {
-			if (rm.getState() != ResourceManagerAttributes.State.STARTED) {
-				return new Object[0];
-			}
-			IPMachine[] machines = rm.getMachines();
-			IPQueue[] queues = rm.getQueues();
-			return new Object[] {
-					makeChildContainer(parentElement,
-							UIMessage.getResourceString("ResourceManagerView.Machines"), machines), //$NON-NLS-1$
-					makeChildContainer(parentElement,
-							UIMessage.getResourceString("ResourceManagerView.Queues"), queues) }; //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	/**
-	 * @param parentElement
-	 * @return
-	 */
-	private IResourceManager getResourceManager(Object parentElement) {
-		IResourceManager rm = null;
-		if (parentElement instanceof IAdaptable) {
-			rm = (IResourceManager) ((IAdaptable) parentElement).getAdapter(IResourceManager.class);
-		}
-		return rm;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-		ResourceManagerAttributes.State status = ((IResourceManager) object).getState();
-		return new ImageImageDescriptor(ParallelImages.rmImages[status.ordinal()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getLabel(java.lang.Object)
-	 */
-	@Override
-	public String getLabel(Object object) {
-		final IResourceManagerControl resourceManager = (IResourceManagerControl) object;
-		final IModelManager modelManager = PTPCorePlugin.getDefault().getModelManager();
-		final String resourceManagerId = resourceManager.getConfiguration().getResourceManagerId();
-		if (resourceManagerId == null)
-			return resourceManager.getName();
-		IResourceManagerFactory factory = modelManager.getResourceManagerFactory(
-				resourceManagerId);
-		return resourceManager.getName() + " (" + factory.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getParent(java.lang.Object)
-	 */
-	@Override
-	public Object getParent(Object object) {
-		IResourceManagerControl rm = (IResourceManagerControl) getResourceManager(object);
-		if (rm != null) {
-			return rm.getParent();
-		}
-		return null;
-	}
-
-	private ChildContainer makeChildContainer(Object parent, String name,
-			final Object[] children) {
-		final ChildContainer container = new ChildContainer(parent, name,
-				children);
-		return container;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/UniverseWorkbenchAdapter.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/UniverseWorkbenchAdapter.java
deleted file mode 100644
index ce9818d..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/UniverseWorkbenchAdapter.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-
-public class UniverseWorkbenchAdapter extends WorkbenchAdapter {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	@Override
-	public Object[] getChildren(Object object) {
-		IPUniverse universe = (IPUniverse) object;
-		return universe.getResourceManagers();
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/WorkbenchAdapterAdapterFactory.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/WorkbenchAdapterAdapterFactory.java
deleted file mode 100644
index 4919780..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/adapters/WorkbenchAdapterAdapterFactory.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.internal.ui.adapters;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.model.IWorkbenchAdapter2;
-
-public class WorkbenchAdapterAdapterFactory implements IAdapterFactory {
-
-	private static final UniverseWorkbenchAdapter UNIVERSE_WORKBENCH_ADAPTER =
-		new UniverseWorkbenchAdapter();
-	private static final ResourceManagerWorkbenchAdapter RESOURCE_MANAGER_WORKBENCH_ADAPTER =
-		new ResourceManagerWorkbenchAdapter();
-	private static final PMachineWorkbenchAdapter MACHINE_WORKBENCH_ADAPTER =
-		new PMachineWorkbenchAdapter();
-	private static final PQueueWorkbenchAdapter QUEUE_WORKBENCH_ADAPTER =
-		new PQueueWorkbenchAdapter();
-	private static final PNodeWorkbenchAdapter NODE_WORKBENCH_ADAPTER =
-		new PNodeWorkbenchAdapter();
-	private static final PJobWorkbenchAdapter JOB_WORKBENCH_ADAPTER =
-		new PJobWorkbenchAdapter();
-
-	public Object getAdapter(Object adaptableObject, 
-			@SuppressWarnings("unchecked") Class adapterType) {
-		if (adapterType == IWorkbenchAdapter.class || adapterType == IWorkbenchAdapter2.class) {
-			if (adaptableObject instanceof IPUniverse) {
-				return UNIVERSE_WORKBENCH_ADAPTER;
-			}
-			if (adaptableObject instanceof IResourceManager) {
-				return RESOURCE_MANAGER_WORKBENCH_ADAPTER;
-			}
-			if (adaptableObject instanceof IPMachine) {
-				return MACHINE_WORKBENCH_ADAPTER;
-			}
-			if (adaptableObject instanceof IPNode) {
-				return NODE_WORKBENCH_ADAPTER;
-			}
-			if (adaptableObject instanceof IPQueue) {
-				return QUEUE_WORKBENCH_ADAPTER;
-			}
-			if (adaptableObject instanceof IPJob) {
-				return JOB_WORKBENCH_ADAPTER;
-			}
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Class[] getAdapterList() {
-		return new Class[] {IWorkbenchAdapter.class, IWorkbenchAdapter2.class};
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/DefaultInformationControl.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/DefaultInformationControl.java
deleted file mode 100644
index 2f567b9..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/DefaultInformationControl.java
+++ /dev/null

@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.hover;
-
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.ptp.ui.hover.IIconInformationControl;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Clement chu
- * 
- */
-public class DefaultInformationControl implements IIconInformationControl, DisposeListener {
-	public static final int SHELL_DEFAULT_WIDTH = 400;
-	public static final int SHELL_DEFAULT_HEIGHT = 200;
-	
-	public interface IInformationPresenter {
-		/** Update presentation
-		 * @param display
-		 * @param hoverInfo
-		 * @param presentation
-		 * @param maxWidth
-		 * @param maxHeight
-		 * @return formatted text
-		 */
-		String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight);
-	}
-	
-	private static final int OUTER_BORDER= 1;
-	private static final int INNER_BORDER= 1;
-	private Shell fShell;
-	private StyledText fText;
-	private IInformationPresenter fPresenter;
-	private TextPresentation fPresentation= new TextPresentation();
-	private int fMaxWidth= -1;
-	private int fMaxHeight= -1;
-	private Font fHeaderTextFont;
-	private Label headerField = null;
-	private ScrolledComposite sc = null;
-	private boolean showDetails = false;
-	
-	/** Constructor
-	 * @param parent
-	 * @param showDetails
-	 */
-	public DefaultInformationControl(Shell parent, boolean showDetails) {
-		this(parent, showDetails, SWT.NONE | SWT.WRAP);
-	}
-	/** Constructor
-	 * @param parent
-	 * @param showDetails
-	 * @param style
-	 */
-	public DefaultInformationControl(Shell parent, boolean showDetails, int style) {
-		this(parent, SWT.TOOL | SWT.NO_TRIM, showDetails, style, new IconHoverPresenter(false), false);
-	}
-	/** Constructor
-	 * @param parent
-	 */
-	public DefaultInformationControl(Shell parent) {
-		this(parent, false);
-	}
-	/** Constructor
-	 * @param parent
-	 * @param style
-	 * @param presenter
-	 */
-	public DefaultInformationControl(Shell parent, int style, IInformationPresenter presenter, boolean enableKey) {
-		this(parent, SWT.TOOL | SWT.NO_TRIM, true, style, presenter, enableKey);
-	}
-	
-	/** Constructor
-	 * @param parent
-	 * @param shellStyle
-	 * @param showDetails
-	 * @param style
-	 * @param presenter
-	 */
-	public DefaultInformationControl(Shell parent, int shellStyle, boolean showDetails, int style, IInformationPresenter presenter, boolean enableKey) {
-		this.showDetails = showDetails;
-		GridLayout layout;
-		GridData gd;
-
-		fShell= new Shell(parent, SWT.NO_FOCUS | SWT.ON_TOP | shellStyle);
-		Display display= fShell.getDisplay();
-		fShell.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
-		
-		layout= new GridLayout(1, false);
-		int border= ((shellStyle & SWT.NO_TRIM) == 0) ? 0 : OUTER_BORDER;
-		layout.marginHeight= border;
-		layout.marginWidth= border;
-		fShell.setLayout(layout);
-		fShell.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		sc = new ScrolledComposite(fShell, SWT.V_SCROLL | SWT.H_SCROLL);
-		sc.setLayoutData(new GridData(GridData.FILL_BOTH));
-		Composite composite = new Composite(sc, SWT.NONE);
-		layout= new GridLayout(1, false);
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.marginBottom = showDetails?10:0;
-		layout.verticalSpacing= 1;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-		composite.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-	    
-		sc.setContent(composite);
-		sc.setExpandVertical(true);
-	    sc.setExpandHorizontal(true);
-	    sc.setAlwaysShowScrollBars(true);
-
-    	Composite hdComposite = new Composite(composite, SWT.NONE);
-		layout= new GridLayout(2, false);
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.horizontalSpacing= 0;
-		layout.verticalSpacing= 1;
-		hdComposite.setLayout(layout);
-		hdComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		hdComposite.setForeground(composite.getForeground());
-		hdComposite.setBackground(composite.getBackground());
-	     
-		headerField= new Label(hdComposite, SWT.LEFT);
-		createHeadLabel(headerField);
-		
-		if (showDetails) {
-			if (enableKey) {
-				Label labelField = new Label(hdComposite, SWT.RIGHT);
-				labelField.setText("Press ESC to close");
-				createHeadLabel(labelField);
-			}
-			
-			// Horizontal separator line
-			Label separator= new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.LINE_DOT);
-			separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			// Text field
-			fText= new StyledText(composite, SWT.MULTI | SWT.READ_ONLY | style);
-			if ((style & SWT.WRAP) != 0) {//is warp
-				fMaxWidth = SHELL_DEFAULT_WIDTH / 2;
-			}
-			
-			fText.setCaret(null);
-			gd= new GridData(GridData.BEGINNING | GridData.FILL_BOTH);
-			gd.horizontalIndent= INNER_BORDER;
-			gd.verticalIndent= INNER_BORDER;
-			fText.setLayoutData(gd);
-			fText.setForeground(composite.getForeground());
-			fText.setBackground(composite.getBackground());
-			fText.addFocusListener(new FocusListener() {
-				public void focusGained(FocusEvent e) {}
-				public void focusLost(FocusEvent e) {
-					close();
-				}
-			});
-			if (enableKey) {
-				fText.addKeyListener(new KeyListener() {
-					public void keyPressed(KeyEvent e) {
-						if (e.character == 0x1B) {// ESC
-							close();
-						}
-					}
-					public void keyReleased(KeyEvent e) {}
-				});
-			}
-			fPresenter= presenter;
-		}
-		addDisposeListener(this);
-	}
-	/** Close shell
-	 * 
-	 */
-	private void close() {
-		if (fShell != null && !fShell.isDisposed())
-			fShell.dispose();		
-	}
-	/** Create head label field
-	 * @param labelField
-	 */
-	private void createHeadLabel(Label labelField) {
-		Font font= labelField.getFont();
-		if (fHeaderTextFont == null) {
-			FontData[] fontDatas= font.getFontData();
-			for (int i= 0; i < fontDatas.length; i++) {
-				fontDatas[i].setHeight((fontDatas[i].getHeight() * 9 / 10));
-			}
-			fHeaderTextFont = new Font(labelField.getDisplay(), fontDatas);
-		}
-		labelField.setFont(fHeaderTextFont);
-		labelField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING));
-		labelField.setForeground(labelField.getParent().getForeground());
-		labelField.setBackground(labelField.getParent().getBackground());		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.hover.IIconInformationControl#setHeader(java.lang.String)
-	 */
-	public void setHeader(String header) {
-		if (headerField != null) {
-			headerField.setText(header + " ");
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String)
-	 */
-	public void setInformation(String content) {
-		if (fPresenter == null) {
-			fText.setText(content);
-		} else {
-			fPresentation.clear();
-			content= fPresenter.updatePresentation(fShell.getDisplay(), content, fPresentation, fMaxWidth, fMaxHeight);
-			if (content != null) {
-				fText.setText(content);
-				TextPresentation.applyTextPresentation(fPresentation, fText);
-			} else {
-				fText.setText("");
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		fShell.setVisible(visible);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#dispose()
-	 */
-	public void dispose() {
-		if (fShell != null && !fShell.isDisposed())
-			fShell.dispose();
-		else
-			widgetDisposed(null);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-	 */
-	public void widgetDisposed(DisposeEvent event) {
-		if (fHeaderTextFont != null && !fHeaderTextFont.isDisposed())
-			fHeaderTextFont.dispose();
-
-		fShell= null;
-		fText= null;
-		fHeaderTextFont= null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setSize(int, int)
-	 */
-	public void setSize(int width, int height) {
-		int new_width = showDetails?(width + 75):width;
-		if (width > SHELL_DEFAULT_WIDTH || height > SHELL_DEFAULT_HEIGHT) {
-			sc.setMinSize(width, height);
-			sc.getHorizontalBar().setVisible(width > SHELL_DEFAULT_WIDTH);
-			sc.getVerticalBar().setVisible(height > SHELL_DEFAULT_HEIGHT);
-			new_width = (width>SHELL_DEFAULT_WIDTH?SHELL_DEFAULT_WIDTH:new_width);
-			int new_height = (height>SHELL_DEFAULT_HEIGHT?SHELL_DEFAULT_HEIGHT:(width>SHELL_DEFAULT_WIDTH?(sc.getHorizontalBar().getSize().y+height):height));
-			fShell.setSize(new_width+5, new_height+2);
-		}
-		else {
-			int min_h = sc.getHorizontalBar().getSize().y;
-			if (height <= min_h) {
-				height = min_h + 1;
-			}
-			sc.setAlwaysShowScrollBars(false);
-			fShell.setSize(new_width+5, height+2);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setLocation(org.eclipse.swt.graphics.Point)
-	 */
-	public void setLocation(Point location) {
-		fShell.setLocation(location);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setSizeConstraints(int, int)
-	 */
-	public void setSizeConstraints(int maxWidth, int maxHeight) {
-		fMaxWidth= maxWidth;
-		fMaxHeight= maxHeight;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#computeSizeHint()
-	 */
-	public Point computeSizeHint() {
-		//return fShell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		return sc.getContent().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#addDisposeListener(org.eclipse.swt.events.DisposeListener)
-	 */
-	public void addDisposeListener(DisposeListener listener) {
-		fShell.addDisposeListener(listener);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#removeDisposeListener(org.eclipse.swt.events.DisposeListener)
-	 */
-	public void removeDisposeListener(DisposeListener listener) {
-		fShell.removeDisposeListener(listener);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setForegroundColor(org.eclipse.swt.graphics.Color)
-	 */
-	public void setForegroundColor(Color foreground) {
-		fText.setForeground(foreground);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setBackgroundColor(org.eclipse.swt.graphics.Color)
-	 */
-	public void setBackgroundColor(Color background) {
-		fText.setBackground(background);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#isFocusControl()
-	 */
-	public boolean isFocusControl() {
-		return fText.isFocusControl();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#setFocus()
-	 */
-	public void setFocus() {
-		if (showDetails) {
-			//fShell.forceFocus();
-			if (fText != null) {
-				fText.setFocus();
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#addFocusListener(org.eclipse.swt.events.FocusListener)
-	 */
-	public void addFocusListener(FocusListener listener) {
-		fText.addFocusListener(listener);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IInformationControl#removeFocusListener(org.eclipse.swt.events.FocusListener)
-	 */
-	public void removeFocusListener(FocusListener listener) {
-		fText.removeFocusListener(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.hover.IIconInformationControl#getShellSize()
-	 */
-	public Point getShellSize() {
-		Point size = computeSizeHint();
-		//set Shell size
-		setSize(size.x, size.y);
-		
-		if (size.x > SHELL_DEFAULT_WIDTH) {
-			size.x = SHELL_DEFAULT_WIDTH;
-		}
-		if (size.y > SHELL_DEFAULT_HEIGHT) {
-			size.y = SHELL_DEFAULT_HEIGHT;
-		}
-		return size;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.hover.IIconInformationControl#isWrap()
-	 */
-	public boolean isWrap() {
-		return (fMaxWidth>-1);
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHover.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHover.java
deleted file mode 100644
index eac5fec..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHover.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.hover;
-
-import org.eclipse.ptp.ui.hover.IIconInformationControl;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Clement chu
- * 
- */
-public class IconHover {
-	/** Create hover control
-	 * @param parent
-	 * @param showDetails
-	 * @param isWrap
-	 * @return
-	 */
-	public IIconInformationControl getHoverControlCreator(Shell parent, boolean showDetails, boolean isWrap) {
-		return new DefaultInformationControl(parent, showDetails, isWrap?(SWT.NONE | SWT.WRAP):SWT.NONE);
-	}
-}
-

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHoverPresenter.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHoverPresenter.java
deleted file mode 100644
index af42157..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconHoverPresenter.java
+++ /dev/null

@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.hover;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Iterator;
-
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Display;
-/**
- * @author Clement chu
- */
-public class IconHoverPresenter implements DefaultInformationControl.IInformationPresenter {
-	private static final String LINE_DELIM = System.getProperty("line.separator", "\n");
-	//private static final String LINE_INDENTATION = "  ";
-	private int fCounter;
-	private boolean fEnforceUpperLineLimit;
-	/**
-	 * Constructor
-	 * 
-	 * @param enforceUpperLineLimit
-	 */
-	public IconHoverPresenter(boolean enforceUpperLineLimit) {
-		super();
-		fEnforceUpperLineLimit = enforceUpperLineLimit;
-	}
-	/**
-	 * Constructor
-	 */
-	public IconHoverPresenter() {
-		this(true);
-	}
-	/**
-	 * Create Reader
-	 * 
-	 * @param hoverInfo
-	 * @param presentation
-	 * @return
-	 */
-	protected Reader createReader(String hoverInfo, TextPresentation presentation) {
-		return new IconTextReader(new StringReader(hoverInfo), presentation);
-	}
-	/**
-	 * Adpat text presentation
-	 * 
-	 * @param presentation
-	 * @param offset
-	 * @param insertLength
-	 */
-	protected void adaptTextPresentation(TextPresentation presentation, int offset, int insertLength) {
-		int yoursStart = offset;
-		int yoursEnd = offset + insertLength - 1;
-		yoursEnd = Math.max(yoursStart, yoursEnd);
-		Iterator e = presentation.getAllStyleRangeIterator();
-		while (e.hasNext()) {
-			StyleRange range = (StyleRange) e.next();
-			int myStart = range.start;
-			int myEnd = range.start + range.length - 1;
-			myEnd = Math.max(myStart, myEnd);
-			if (myEnd < yoursStart)
-				continue;
-			if (myStart < yoursStart)
-				range.length += insertLength;
-			else
-				range.start += insertLength;
-		}
-	}
-	/**
-	 * Append text
-	 * 
-	 * @param buffer
-	 * @param string
-	 * @param presentation
-	 */
-	private void append(StringBuffer buffer, String string, TextPresentation presentation) {
-		int length = string.length();
-		buffer.append(string);
-		if (presentation != null) {
-			adaptTextPresentation(presentation, fCounter, length);
-		}
-		fCounter += length;
-	}
-	/**
-	 * Get indentation
-	 * 
-	 * @param line
-	 * @return
-	 */
-	/*
-	private String getIndent(String line) {
-		int length = line.length();
-		int i = 0;
-		while (i < length && Character.isWhitespace(line.charAt(i)))
-			++i;
-		return (i == length ? line : line.substring(0, i)) + LINE_INDENTATION;
-	}
-	*/
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.internal.ui.hover.DefaultInformationControl.IInformationPresenter#updatePresentation(org.eclipse.swt.widgets.Display, java.lang.String, org.eclipse.jface.text.TextPresentation, int, int)
-	 */
-	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
-		if (hoverInfo == null)
-			return null;
-		GC gc = new GC(display);
-		try {
-			StringBuffer buffer = new StringBuffer();
-			int maxNumberOfLines = Math.round(maxHeight / gc.getFontMetrics().getHeight());
-			fCounter = 0;
-			LineBreakingReader reader = new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
-			String line = reader.readLine();
-			while (line != null) {
-				if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
-					break;
-
-				append(buffer, line, null);
-				append(buffer, LINE_DELIM, reader.isFormattedLine()?presentation:null);
-				line = reader.readLine();
-				maxNumberOfLines--;
-			}
-			// display "..." if the content is over the shell size
-			if (line != null && buffer.length() > 0) {
-				append(buffer, LINE_DELIM, null);
-				append(buffer, "...", null);
-			}
-			return trim(buffer, presentation);
-		} catch (IOException e) {
-			PTPUIPlugin.log(e);
-			return null;
-		} finally {
-			gc.dispose();
-		}
-	}
-	/**
-	 * implemented another method to replace orginial 
-	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
-		if (hoverInfo == null)
-			return null;
-		GC gc = new GC(display);
-		try {
-			StringBuffer buffer = new StringBuffer();
-			int maxNumberOfLines = Math.round(maxHeight / gc.getFontMetrics().getHeight());
-			fCounter = 0;
-			LineBreakingReader reader = new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
-			boolean lastLineFormatted = false;
-			String lastLineIndent = null;
-			String line = reader.readLine(lastLineIndent);
-			boolean lineFormatted = reader.isFormattedLine();
-			boolean firstLineProcessed = false;
-			while (line != null) {
-				if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
-					break;
-				if (firstLineProcessed) {
-					if (!lastLineFormatted)
-						append(buffer, LINE_DELIM, null);
-					else {
-						append(buffer, LINE_DELIM, presentation);
-						if (lastLineIndent != null)
-							append(buffer, lastLineIndent, presentation);
-					}
-				}
-				append(buffer, line, null);
-				firstLineProcessed = true;
-				lastLineFormatted = lineFormatted;
-				if (!lineFormatted)
-					lastLineIndent = null;
-				else if (lastLineIndent == null)
-					lastLineIndent = getIndent(line);
-				line = reader.readLine(lastLineIndent);
-				lineFormatted = reader.isFormattedLine();
-				maxNumberOfLines--;
-			}
-			// display "..." if the content is over the shell size
-			if (line != null && buffer.length() > 0) {
-				append(buffer, LINE_DELIM, lineFormatted ? presentation : null);
-				append(buffer, "...", presentation);
-			}
-			return trim(buffer, presentation);
-		} catch (IOException e) {
-			PTPUIPlugin.log(e);
-			return null;
-		} finally {
-			gc.dispose();
-		}
-	}
-	 * 
-	 */
-	
-	/**
-	 * Trim given buffer
-	 * 
-	 * @param buffer
-	 * @param presentation
-	 * @return
-	 */
-	private String trim(StringBuffer buffer, TextPresentation presentation) {
-		int length = buffer.length();
-		int end = length - 1;
-		while (end >= 0 && Character.isWhitespace(buffer.charAt(end)))
-			--end;
-		if (end == -1)
-			return "";
-		if (end < length - 1)
-			buffer.delete(end + 1, length);
-		else
-			end = length;
-		int start = 0;
-		while (start < end && Character.isWhitespace(buffer.charAt(start)))
-			++start;
-		buffer.delete(0, start);
-		presentation.setResultWindow(new Region(start, buffer.length()));
-		return buffer.toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconTextReader.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconTextReader.java
deleted file mode 100644
index 04816fc..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/IconTextReader.java
+++ /dev/null

@@ -1,403 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.hover;
-
-import java.io.IOException;
-import java.io.PushbackReader;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.ptp.ui.hover.IIconHoverTag;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Clement chu
- * 
- */
-public class IconTextReader extends SubstitutionTextReader {
-	private static final String EMPTY_STRING= "";
-	private static final Map<String, String> fgEntityLookup;
-	private static final Set<String> fgTags;
-	
-	private Color red_color = Display.getDefault().getSystemColor(SWT.COLOR_RED);
-	private Color green_color = Display.getDefault().getSystemColor(SWT.COLOR_GREEN);
-
-	static {
-		fgTags= new HashSet<String>();
-		fgTags.add(IIconHoverTag.UNDERLINE_TAG);
-		fgTags.add(IIconHoverTag.STRIKE_TAG);
-		fgTags.add(IIconHoverTag.BOLD_TAG);
-		fgTags.add(IIconHoverTag.ITALIC_TAG);
-		fgTags.add(IIconHoverTag.P_TAG);
-		fgTags.add(IIconHoverTag.KEY_TAG);
-		fgTags.add(IIconHoverTag.HIGHLIGHT_TAG);
-		fgTags.add(IIconHoverTag.NEXT_LINE_TAG);
-		fgTags.add(IIconHoverTag.INDENT_TAG);
-
-		fgEntityLookup= new HashMap<String, String>(7);
-		fgEntityLookup.put("lt", "<");
-		fgEntityLookup.put("gt", ">");
-		fgEntityLookup.put("nbsp", " ");
-		fgEntityLookup.put("amp", "&");
-		fgEntityLookup.put("circ", "^");
-		fgEntityLookup.put("tilde", "~");
-		fgEntityLookup.put("quot", "\"");		
-	}
-
-	private int fCounter= 0;
-	private TextPresentation fTextPresentation;
-	private int fStrike= 0;
-	private int fUnderline= 0;
-	private int fBold= 0;
-	private int fItalic= 0;
-	private int fKey= 0;
-	private int fHighlight = 0;
-	private int fStartOffset= -1;
-	private boolean fInParagraph= false;
-
-	/** Constructor
-	 * @param reader
-	 * @param presentation
-	 */
-	public IconTextReader(Reader reader, TextPresentation presentation) {
-		super(new PushbackReader(reader));
-		fTextPresentation= presentation;
-	}
-	/* (non-Javadoc)
-	 * @see java.io.Reader#read()
-	 */
-	public int read() throws IOException {
-		int c= super.read();
-		if (c != -1)
-			++ fCounter;
-		return c;
-	}
-	/** Start bold
-	 * 
-	 */
-	protected void startBold() {
-		if (fBold == 0)
-			fStartOffset= fCounter;
-		++ fBold;
-	}
-	/** Stop bold
-	 * 
-	 */
-	protected void stopBold() {
-		-- fBold;
-		if (fBold == 0) {
-			fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
-			fStartOffset= -1;
-		}
-	}
-
-	/** start underline
-	 * 
-	 */
-	protected void startUnderLine() {
-		if (fUnderline == 0)
-			fStartOffset= fCounter;
-		++ fUnderline;
-	}
-	/** stop underline
-	 * 
-	 */
-	protected void stopUnderLine() {
-		-- fUnderline;
-		if (fUnderline == 0) {
-			StyleRange styleRange = new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.NORMAL);
-			styleRange.underline = true;
-			fTextPresentation.addStyleRange(styleRange);
-			fStartOffset= -1;
-		}
-	}
-
-	/** start strike
-	 * 
-	 */
-	protected void startStrike() {
-		if (fStrike == 0)
-			fStartOffset= fCounter;
-		++ fStrike;
-	}
-	/** stop strike
-	 * 
-	 */
-	protected void stopStrike() {
-		-- fStrike;
-		if (fStrike == 0) {
-			StyleRange styleRange = new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.NORMAL);
-			styleRange.strikeout = true;
-			fTextPresentation.addStyleRange(styleRange);
-			fStartOffset= -1;
-		}
-	}
-	
-	/** start italic
-	 * 
-	 */
-	protected void startItalic() {
-		if (fItalic == 0)
-			fStartOffset= fCounter;
-		++ fItalic;
-	}
-	/** stop italic
-	 * 
-	 */
-	protected void stopItalic() {
-		-- fItalic;
-		if (fItalic == 0) {
-			fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.ITALIC));
-			fStartOffset= -1;
-		}
-	}
-	
-	/** start key
-	 * 
-	 */
-	protected void startKey() {
-		if (fKey == 0)
-			fStartOffset= fCounter;
-		++ fKey;
-	}
-	/** stop key
-	 * 
-	 */
-	protected void stopKey() {
-		-- fKey;
-		if (fKey == 0) {
-			fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, red_color, null, SWT.NORMAL));
-			fStartOffset= -1;
-		}
-	}
-
-	/** start highlight
-	 * 
-	 */
-	protected void startHighlight() {
-		if (fHighlight == 0)
-			fStartOffset= fCounter;
-		++ fHighlight;
-	}
-	/** stop highlight
-	 * 
-	 */
-	protected void stopHighlight() {
-		-- fHighlight;
-		if (fHighlight == 0) {
-			fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, green_color, SWT.NORMAL));
-			fStartOffset= -1;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.ui.hover.SubstitutionTextReader#computeSubstitution(int)
-	 */
-	protected String computeSubstitution(int c) throws IOException {
-		if (c == '<')
-			return  processTag();
-		else if (c == '&')
-			return processEntity();
-
-		return null;
-	}
-
-	/** To formatted text
-	 * @param html original text
-	 * @return formatted text
-	 */
-	private String toText(String html) {
-		if (html == null || html.length() == 0)
-			return EMPTY_STRING;
-
-		String tag= html;
-		boolean isClosing = false;
-		if (tag.charAt(0) == IIconHoverTag.CLOSED_TAG) {
-			tag= tag.substring(1);
-			isClosing = true;
-		}
-		if (!fgTags.contains(tag)) {
-			return EMPTY_STRING;
-		}
-
-		if (tag.equals(IIconHoverTag.INDENT_TAG)) {
-			return "\t" + EMPTY_STRING;
-		}
-
-		if (tag.equals(IIconHoverTag.NEXT_LINE_TAG)) {
-			return LINE_DELIM;
-		}
-
-		if (tag.equals(IIconHoverTag.BOLD_TAG)) {
-			if (isClosing)
-				stopBold();
-			else
-				startBold();
-
-			return EMPTY_STRING;
-		}
-
-		if (tag.equals(IIconHoverTag.UNDERLINE_TAG)) {
-			if (isClosing)
-				stopUnderLine();
-			else
-				startUnderLine();
-
-			return EMPTY_STRING;
-		}
-
-		if (tag.equals(IIconHoverTag.STRIKE_TAG)) {
-			if (isClosing)
-				stopStrike();
-			else
-				startStrike();
-
-			return EMPTY_STRING;
-		}
-
-		if (tag.equals(IIconHoverTag.ITALIC_TAG)) {
-			if (isClosing)
-				stopItalic();
-			else
-				startItalic();
-
-			return EMPTY_STRING;
-		}
-
-		if (tag.equals(IIconHoverTag.KEY_TAG)) {
-			if (isClosing)
-				stopKey();
-			else
-				startKey();
-
-			return EMPTY_STRING;
-		}
-
-		if (tag.equals(IIconHoverTag.HIGHLIGHT_TAG)) {
-			if (isClosing)
-				stopHighlight();
-			else
-				startHighlight();
-
-			return EMPTY_STRING;
-		}
-		
-		if (tag.equals(IIconHoverTag.P_TAG)) {
-			if (isClosing) {
-				boolean inParagraph= fInParagraph;
-				fInParagraph= false;
-				return inParagraph ? EMPTY_STRING : LINE_DELIM;
-			}
-			else {
-				fInParagraph= true;
-				return LINE_DELIM;
-			}
-		}
-		return EMPTY_STRING;
-	}
-
-	/** Get process tag
-	 * @return
-	 * @throws IOException
-	 */
-	private String processTag() throws IOException {
-		StringBuffer buf= new StringBuffer();
-		int ch= nextChar();
-		while (ch != -1 && ch != IIconHoverTag.END_TAG) {
-			buf.append(Character.toLowerCase((char) ch));
-			ch= nextChar();
-			if (ch == '"'){
-				buf.append(Character.toLowerCase((char) ch));
-				ch= nextChar();
-				while (ch != -1 && ch != '"'){
-					buf.append(Character.toLowerCase((char) ch));
-					ch= nextChar();
-				}
-			}
-			if (ch == IIconHoverTag.START_TAG){
-				unread(ch);
-				return IIconHoverTag.START_TAG + buf.toString();
-			}
-		}
-		if (ch == -1)
-			return null;
-			
-		return toText(buf.toString());
-	}
-
-	/** unread
-	 * @param ch
-	 * @throws IOException
-	 */
-	private void unread(int ch) throws IOException {
-		((PushbackReader) getReader()).unread(ch);
-	}
-
-	/** entity to text
-	 * @param symbol
-	 * @return
-	 */
-	protected String entity2Text(String symbol) {
-		if (symbol.length() > 1 && symbol.charAt(0) == '#') {
-			int ch;
-			try {
-				if (symbol.charAt(1) == 'x') {
-					ch= Integer.parseInt(symbol.substring(2), 16);
-				} else {
-					ch= Integer.parseInt(symbol.substring(1), 10);
-				}
-				return EMPTY_STRING + (char)ch;
-			} catch (NumberFormatException e) {
-			}
-		} else {
-			String str= (String) fgEntityLookup.get(symbol);
-			if (str != null) {
-				return str;
-			}
-		}
-		return "&" + symbol; // not found
-	}
-
-	/** Get process entity
-	 * @return
-	 * @throws IOException
-	 */
-	private String processEntity() throws IOException {
-		StringBuffer buf= new StringBuffer();
-		int ch= nextChar();
-		while (Character.isLetterOrDigit((char)ch) || ch == '#') {
-			buf.append((char) ch);
-			ch= nextChar();
-		}
-
-		if (ch == ';')
-			return entity2Text(buf.toString());
-
-		buf.insert(0, '&');
-		if (ch != -1)
-			buf.append((char) ch);
-		return buf.toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/LineBreakingReader.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/LineBreakingReader.java
deleted file mode 100644
index cadf867..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/LineBreakingReader.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.hover;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.text.BreakIterator;
-import org.eclipse.swt.graphics.GC;
-/**
- * @author Clement chu
- */
-public class LineBreakingReader {
-	private BufferedReader fReader;
-	private GC fGC;
-	private int fMaxWidth;
-	private String fLine;
-	private int fOffset;
-	private int fLineLen;
-	private BreakIterator fLineBreakIterator;
-	/**
-	 * Creates a reader that breaks an input text to fit in a given width.
-	 * 
-	 * @param reader
-	 *            Reader of the input text
-	 * @param gc
-	 *            The graphic context that defines the currently used font sizes
-	 * @param maxLineWidth
-	 *            The max width (pixes) where the text has to fit in
-	 */
-	public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
-		fReader = new BufferedReader(reader);
-		fGC = gc;
-		fMaxWidth = maxLineWidth;
-		fOffset = 0;
-		fLine = null;
-		fLineBreakIterator = BreakIterator.getLineInstance();
-	}
-	/**
-	 * Is formatted line
-	 * 
-	 * @return true if it is a formatted line
-	 */
-	public boolean isFormattedLine() {
-		return fLine != null;
-	}
-	/**
-	 * Reads the next line. The lengths of the line will not exceed the gived maximum width
-	 * 
-	 * @param indent
-	 * @return
-	 * @throws IOException
-	 */
-	public String readLine(String indent) throws IOException {
-		if (fLine == null) {
-			String line = fReader.readLine();
-			if (line == null)
-				return null;
-			int lineLen = fGC.textExtent(line).x;
-			if (fMaxWidth > -1 && lineLen < fMaxWidth) {
-				return line;
-			}
-			fLine = line;
-			fLineBreakIterator.setText(line);
-			fOffset = 0;
-		}
-		int breakOffset = findNextBreakOffset(fOffset, indent);
-		String res;
-		if (breakOffset != BreakIterator.DONE) {
-			res = fLine.substring(fOffset, breakOffset);
-			fOffset = findWordBegin(breakOffset);
-			if (fOffset == fLine.length()) {
-				fLine = null;
-			}
-			if (breakOffset == 1 && res.charAt(0) == '\t') {// added to prevent empty line
-				return "\t" + readLine(indent);
-			}
-		} else {
-			res = fLine.substring(fOffset);
-			fLine = null;
-		}
-		return res;
-	}
-	public String readLine() throws IOException {
-		if (fLine == null) {
-			String line = fReader.readLine();
-			if (line == null)
-				return null;
-			fLineLen = line.length();
-			if (fMaxWidth == -1 || fLineLen < fMaxWidth) {
-				return line;
-			}
-			fLine = line;
-			fOffset = 0;
-		}
-		int endLen = fOffset + fMaxWidth;
-		if (endLen > fLineLen)
-			endLen = fLineLen;
-		String res = fLine.substring(fOffset, endLen);
-		fOffset = endLen;
-		if (fOffset >= fLineLen) {
-			fLine = null;
-			fLineLen = 0;
-		}
-		if (res.charAt(0) == '\t') {// added to prevent empty line
-			return "\t" + res;
-		}
-		return res;
-	}
-	/**
-	 * Find next breaj offset
-	 * 
-	 * @param currOffset
-	 * @param indent
-	 * @return
-	 */
-	private int findNextBreakOffset(int currOffset, String indent) {
-		int currWidth = indent != null ? fGC.textExtent(indent).x : 0;
-		int nextOffset = fLineBreakIterator.following(currOffset);
-		while (nextOffset != BreakIterator.DONE) {
-			String word = fLine.substring(currOffset, nextOffset);
-			int wordWidth = fGC.textExtent(word).x;
-			int nextWidth = wordWidth + currWidth;
-			if (fMaxWidth > -1 && nextWidth > fMaxWidth) {
-				if (currWidth > 0) {
-					return currOffset;
-				} else {
-					return nextOffset;
-				}
-			}
-			currWidth = nextWidth;
-			currOffset = nextOffset;
-			nextOffset = fLineBreakIterator.next();
-		}
-		return nextOffset;
-	}
-	/**
-	 * Find word begin index
-	 * 
-	 * @param idx
-	 * @return
-	 */
-	private int findWordBegin(int idx) {
-		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
-			idx++;
-		}
-		return idx;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SingleCharReader.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SingleCharReader.java
deleted file mode 100644
index 698132e..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SingleCharReader.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.hover;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
- * @author Clement chu
- * 
- */
-/**
- * @author clement
- *
- */
-public abstract class SingleCharReader extends Reader {
-	/* (non-Javadoc)
-	 * @see java.io.Reader#read()
-	 */
-	public abstract int read() throws IOException;
-	/* (non-Javadoc)
-	 * @see java.io.Reader#read(char[], int, int)
-	 */
-	public int read(char cbuf[], int off, int len) throws IOException {
-		int end= off + len;
-		for (int i= off; i < end; i++) {
-			int ch= read();
-			if (ch == -1) {
-				if (i == off) {
-					return -1;
-				} else {
-					return i - off;
-				}
-			}
-			cbuf[i]= (char)ch;
-		}
-		return len;
-	}		
-    /* (non-Javadoc)
-     * @see java.io.Reader#ready()
-     */
-    public boolean ready() throws IOException {
-		return true;
-	}
-	/** Get string
-	 * @return
-	 * @throws IOException
-	 */
-	public String getString() throws IOException {
-		StringBuffer buf= new StringBuffer();
-		int ch;
-		while ((ch= read()) != -1) {
-			buf.append((char)ch);
-		}
-		return buf.toString();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SubstitutionTextReader.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SubstitutionTextReader.java
deleted file mode 100644
index 1fe0f35..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/internal/ui/hover/SubstitutionTextReader.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.internal.ui.hover;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class SubstitutionTextReader extends SingleCharReader {
-	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n");
-
-	private Reader fReader;
-	protected boolean fWasWhiteSpace;
-	private int fCharAfterWhiteSpace;
-
-	/**
-	 * Tells whether white space characters are skipped.
-	 */
-	private boolean fSkipWhiteSpace= true;
-
-	private boolean fReadFromBuffer;
-	private StringBuffer fBuffer;
-	private int fIndex;
-
-	/** Constructor
-	 * @param reader
-	 */
-	protected SubstitutionTextReader(Reader reader) {
-		fReader= reader;
-		fBuffer= new StringBuffer();
-		fIndex= 0;
-		fReadFromBuffer= false;
-		fCharAfterWhiteSpace= -1;
-		fWasWhiteSpace= true;
-	}
-
-	/**
-	 * Implement to compute the substitution for the given character and
-	 * if necessary subsequent characters. Use <code>nextChar</code>
-	 * to read subsequent characters.
-	 */
-	protected abstract String computeSubstitution(int c) throws IOException;
-	/**
-	 * @return the internal reader.
-	 */
-	protected Reader getReader() {
-		return fReader;
-	}
-	/**
-	 * @return the next character.
-	 * @throws IOException
-	 */
-	protected int nextChar() throws IOException {
-		fReadFromBuffer= (fBuffer.length() > 0);
-		if (fReadFromBuffer) {
-			char ch= fBuffer.charAt(fIndex++);
-			if (fIndex >= fBuffer.length()) {
-				fBuffer.setLength(0);
-				fIndex= 0;
-			}
-			return ch;
-		} else {
-			int ch= fCharAfterWhiteSpace;
-			if (ch == -1) {
-				ch= fReader.read();
-			}
-			if (fSkipWhiteSpace && Character.isWhitespace((char)ch)) {
-				do {
-					ch= fReader.read();
-				} while (Character.isWhitespace((char)ch));
-				if (ch != -1) {
-					fCharAfterWhiteSpace= ch;
-					return ' ';
-				}
-			} else {
-				fCharAfterWhiteSpace= -1;
-			}
-			return ch;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see java.io.Reader#read()
-	 */
-	public int read() throws IOException {
-		int c;
-		do {
-			c= nextChar();
-			while (!fReadFromBuffer) {
-				String s= computeSubstitution(c);
-				if (s == null)
-					break;
-				if (s.length() > 0)
-					fBuffer.insert(0, s);
-				c= nextChar();
-			}
-
-		} while (fSkipWhiteSpace && fWasWhiteSpace && (c == ' '));
-		fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n');
-		return c;
-	}
-    /* (non-Javadoc)
-     * @see java.io.Reader#ready()
-     */
-    public boolean ready() throws IOException {
-		return fReader.ready();
-	}
-	/* (non-Javadoc)
-	 * @see java.io.Closeable#close()
-	 */
-	public void close() throws IOException {
-		fReader.close();
-	}
-	/* (non-Javadoc)
-	 * @see java.io.Reader#reset()
-	 */
-	public void reset() throws IOException {
-		fReader.reset();
-		fWasWhiteSpace= true;
-		fCharAfterWhiteSpace= -1;
-		fBuffer.setLength(0);
-		fIndex= 0;
-	}
-	/** Set skip white space
-	 * @param state
-	 */
-	protected final void setSkipWhitespace(boolean state) {
-		fSkipWhiteSpace= state;
-	}
-	/** Is skip white space
-	 * @return
-	 */
-	protected final boolean isSkippingWhitespace() {
-		return fSkipWhiteSpace;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IManager.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IManager.java
deleted file mode 100644
index ce94a41..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IManager.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui;
-
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.ui.listeners.IJobChangedListener;
-import org.eclipse.ptp.ui.listeners.ISetListener;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-
-/**
- * @author clement chu
- *
- */
-public interface IManager {
-	public static final String EMPTY_ID = "";
-	public static final int CREATE_SET_TYPE = 0;
-	public static final int DELETE_SET_TYPE = 1;
-	public static final int CHANGE_SET_TYPE = 2;
-	public static final int ADD_ELEMENT_TYPE = 3;
-	public static final int REMOVE_ELEMENT_TYPE = 4;	
-	
-	public void shutdown();
-	/** Get element size
-	 * @return size of element
-	 */
-	public int size();
-	/**
-	 * clean all setting
-	 */
-	public void clear();
-	/** initial elements
-	 * @return first element name
-	 */
-	public IPElement initial(IPUniverse universe);
-	/** Get IElementHandler
-	 * @param id element ID
-	 * @return IElementHandler
-	 */
-	public IElementHandler getElementHandler(String id);
-	/** Get name of element
-	 * @param id element ID
-	 * @return name of element
-	 */
-	public String getName(String id);
-	
-	/** Get fully qualified name of element
-	 * @param id element ID
-	 * @return fully quallified name of element
-	 */
-	public String getFullyQualifiedName(String id);
-
-	/** Get current set ID
-	 * @return current set ID
-	 */
-	public String getCurrentSetId();
-	/** set current set ID
-	 * @param set_id set ID
-	 */
-	public void setCurrentSetId(String set_id);
-	
-	//set listener
-	/** Add Set Listener
-	 * @param setListener ISetListener
-	 */
-	public void addSetListener(ISetListener setListener);
-	/** Remove Set Listener
-	 * @param setListener ISetListener
-	 */
-	public void removeSetListener(ISetListener setListener);
-	/** Fire Event for set change
-	 * @param eventType the type of event
-	 * @param elements the selected elements
-	 * @param cur_set the current set
-	 * @param pre_set the previous set
-	 */
-	public void fireSetEvent(int eventType, IElement[] elements, IElementSet cur_set, IElementSet pre_set);
-	/** Add elements to set
-	 * @param elements selected elements
-	 * @param set Set
-	 */
-	public void addToSet(IElement[] elements, IElementSet set);
-	/** Add elements to set
-	 * @param elements selected elements
-	 * @param setID set ID
-	 * @param elementHandler IElementHandler
-	 */
-	public void addToSet(IElement[] elements, String setID, IElementHandler elementHandler);
-	/** Create a Set
-	 * @param elements selected elements
-	 * @param setID set ID
-	 * @param setName set Name
-	 * @param elementHandler IElementHandler
-	 * @return set ID
-	 */
-	public String createSet(IElement[] elements, String setID, String setName, IElementHandler elementHandler);
-	/** Remove Set
-	 * @param setID set ID
-	 * @param elementHandler IElementHandler
-	 */
-	public void removeSet(String setID, IElementHandler elementHandler);
-	/** Remove elements in specific Set
-	 * @param elements selected elements
-	 * @param setID set ID
-	 * @param elementHandler IElementHandler
-	 */
-	public void removeFromSet(IElement[] elements, String setID, IElementHandler elementHandler);
-	
-	/** Add job listener
-	 * @param jobListener
-	 */
-	public void addJobChangedListener(IJobChangedListener jobListener);
-	/** Remove job listener
-	 * @param jobListener
-	 */
-	public void removeJobChangedListener(IJobChangedListener jobListener);
-	/** Fire job event when job is changed
-	 * @param type job change type or remove type
-	 * @param cur_jid
-	 * @param pre_jid
-	 */
-	public void fireJobChangedEvent(int type, String cur_jid, String pre_jid);
-	//job
-	
-	//image
-	/** Get element status
-	 * @param element IElement
-	 * @param index IElement index position
-	 * @return element status
-	 */
-	public int getStatus(IElement element, int index);
-	/** Get element status
-	 * @param id Element ID
-	 * @return element status
-	 */
-	public int getStatus(String id);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IPTPUIConstants.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IPTPUIConstants.java
deleted file mode 100644
index c3a08bc..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/IPTPUIConstants.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui;
-
-/**
- * @author Clement chu
- *
- */
-public interface IPTPUIConstants {
-	public static final String PLUGIN_ID = PTPUIPlugin.getUniqueIdentifier();
-	public static final String PREFIX = PLUGIN_ID + ".";
-	
-	public static final String VIEW_PARALLELMACHINES = PREFIX + "views.parallelMachinesView";
-	public static final String VIEW_PARALLELJOBS = PREFIX + "views.parallelJobsView";
-	public static final String VIEW_JOBSLIST = PREFIX + "views.JobsListView";
-	public static final String VIEW_PARALLELProcess = PREFIX + "views.parallelProcessView";
-	public static final String VIEW_RESOURCEMANAGER = PREFIX + "views.resourceManagerView";
-
-	public static final String RM_REMOTE_SERVICES = PREFIX + "remoteServices";
-	
-	public static final String PERSPECTIVE_RUN = PREFIX + "PTPRunPerspective";
-
-	public static final String SEARCH_PAGE = PREFIX + "PSearchPage";
-	public static final String SEARCH_RESULT_PAGE = PREFIX + "PSearchResultPage";
-	
-    public static final String ACTION_SET = PREFIX + "actionSets";
-    public static final String ACTION_SHOW_LEGEND = PREFIX + "actions.showLegendAction";
-    
-    public static final String IUINAVIGATORGROUP = "navigatorgroup";
-    public static final String IUIACTIONGROUP = "actiongroup";
-    public static final String IUISETGROUP = "setgroup";
-    public static final String IUICHANGESETGROUP = "changesetgroup";
-    public static final String IUIVIEWGROUP = "viewgroup";
-    public static final String IUIZOOMGROUP = "zoomgroup";
-    public static final String IUIEMPTYGROUP = "emptygroup";
-    public static final String IUIJOBGROUP = "jobgroup";
- 	
-	public static final int INTERNAL_ERROR = 150;
-	public static final int STATUS_CODE_QUESTION = 10000;
-	public static final int STATUS_CODE_INFO = 10001;
-	public static final int STATUS_CODE_ERROR = 10002;
-	
-	//preferences
-	public static final String VIEW_ICON_SPACING_X = "icon_spacing_x";
-	public static final String VIEW_ICON_SPACING_Y = "icon_spacing_y";
-	public static final String VIEW_ICON_WIDTH = "icon_width";
-	public static final String VIEW_ICON_HEIGHT = "icon_height";
-	public static final String VIEW_TOOLTIP_SHOWALLTIME = "tt_show_all_time";
-	public static final String VIEW_TOOLTIP_TIMEOUT = "tt_timeout";
-	public static final String VIEW_TOOLTIP_ISWRAP = "tt_iswap";
-	public static final int DEFAULT_VIEW_ICON_SPACING_X = 4;
-	public static final int DEFAULT_VIEW_ICON_SPACING_Y = 4;
-	public static final int DEFAULT_VIEW_ICON_WIDTH = 16;
-	public static final int DEFAULT_VIEW_ICON_HEIGHT = 16;
-	public static final long DEFAULT_VIEW_TOOLTIP = 5000;
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/LegendDialog.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/LegendDialog.java
deleted file mode 100644
index facdd4c..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/LegendDialog.java
+++ /dev/null

@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.ui;
-
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Dialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-
-public class LegendDialog extends Dialog 
-{
-	private String rmStateText[] = {
-		"STARTING",
-		"STARTED",
-		"STOPPING",
-		"STOPPED",
-		"SUSPENDED",
-		"ERROR"
-	};
-	
-	private String machineStateText[] = {
-		"UP",
-		"DOWN",
-		"ALERT",
-		"ERROR",
-		"UNKNOWN"
-	};
-
-	private String jobStateText[] = {
-		"PENDING",
-		"STARTED",
-		"RUNNING",
-		"TERMINATED",
-		"SUSPENDED",
-		"ERROR",
-		"UNKNOWN"		
-	};
-	
-	private String nodeStateText[] = {
-		"UP",
-		"DOWN",
-		"ERROR",
-		"UNKNOWN",
-		"USER EXCLUSIVE",
-		"USER SHARED",
-		"OTHER EXCLUSIVE",
-		"OTHER SHARED",
-		"PROCESS RUNNING",
-		"PROCESS TERMINATED",
-	};
-	
-	private String processStateText[] = {
-		"STARTING",
-		"RUNNING",
-		"EXITED NORMALLY",
-		"EXITED WITH SIGNAL",
-		"SUSPENDED",
-		"ERROR",
-		"UNKNOWN"
-	};
-	
-	/**
-	 * @param parent
-	 */
-	public LegendDialog(Shell parent) {
-		/* we DON'T want this to be modal */
-		this(parent, SWT.DIALOG_TRIM | SWT.NONE);
-	}
-	
-	public LegendDialog(Shell parent, int style) {
-		super(parent, style);
-		setText("Legend");
-	}
-	
-	public String open() {
-		Shell shell = new Shell(getParent(), getStyle());
-		shell.setText(getText());
-		createContents(shell);
-		shell.pack();
-		shell.open();
-		Display display = getParent().getDisplay();
-		while(!shell.isDisposed()) {
-			if(!display.readAndDispatch()) {
-				display.sleep();
-			}
-		}
-		return null;
-	}
-	
-	private void createContents(final Shell shell) {
-		GridLayout grid = new GridLayout();
-		grid.numColumns = 2;
-		shell.setLayout(grid);
-		
-		/* the RM box */
-		Group box = new Group(shell, SWT.BORDER);
-		box.setText("Resource Manager Icons");
-		FillLayout fill = new FillLayout(SWT.VERTICAL);
-		fill.marginHeight = 5;
-		fill.marginWidth = 5;
-		box.setLayout(fill);
-		
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		box.setLayoutData(data);
-
-		for (int i = 0; i < rmStateText.length; i++) {
-			/* one horizontal box */
-			Composite c = new Composite(box, SWT.NONE);
-			RowLayout r = new RowLayout();
-			r.wrap = true;
-			r.pack = true;
-			r.justify = false;
-			r.marginBottom = 0;
-			r.marginLeft = 5;
-			r.marginRight = 5;
-			r.marginTop = 0;
-			r.spacing = 10;
-			c.setLayout(r);
-			CLabel b = new CLabel(c, SWT.FLAT);
-			b.setImage(ParallelImages.rmImages[i]);
-			CLabel l = new CLabel(c, SWT.LEFT);
-			l.setText(rmStateText[i]);
-		}
-		
-		/* the machines box */
-		box = new Group(shell, SWT.BORDER);
-		box.setText("Machine Icons");
-		fill = new FillLayout(SWT.VERTICAL);
-		fill.marginHeight = 5;
-		fill.marginWidth = 5;
-		box.setLayout(fill);
-		data = new GridData(GridData.FILL_BOTH);
-		box.setLayoutData(data);
-
-		for (int i = 0; i < machineStateText.length; i++) {
-			/* one horizontal box */
-			Composite c = new Composite(box, SWT.NONE);
-			RowLayout r = new RowLayout();
-			r.wrap = true;
-			r.pack = true;
-			r.justify = false;
-			r.marginBottom = 0;
-			r.marginLeft = 5;
-			r.marginRight = 5;
-			r.marginTop = 0;
-			r.spacing = 10;
-			c.setLayout(r);
-			CLabel b = new CLabel(c, SWT.FLAT);
-			b.setImage(ParallelImages.machineImages[i]);
-			CLabel l = new CLabel(c, SWT.LEFT);
-			l.setText(machineStateText[i]);
-		}
-		
-		/* the node box */
-		box = new Group(shell, SWT.BORDER);
-		box.setText("Node Icons");
-		GridLayout g = new GridLayout(2, true);
-		box.setLayout(g);
-		data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		box.setLayoutData(data);
-
-		/* layout column first instead of row first */
-		for (int j = 0; j < nodeStateText.length/2; j++) {
-			for (int i = 0 ; i < 2; i++) {
-				Composite c = new Composite(box, SWT.NONE);
-				RowLayout r = new RowLayout();
-				r.wrap = true;
-				r.pack = true;
-				r.justify = false;
-				r.marginBottom = 0;
-				r.marginLeft = 5;
-				r.marginRight = 5;
-				r.marginTop = 0;
-				r.spacing = 10;
-				c.setLayout(r);
-				CLabel b = new CLabel(c, SWT.FLAT);
-				b.setImage(ParallelImages.nodeImages[i*nodeStateText.length/2 + j][0]);
-				CLabel l = new CLabel(c, SWT.LEFT);
-				l.setText(nodeStateText[i*nodeStateText.length/2 + j]);
-			}
-		}
-		
-		/* the job box */
-		box = new Group(shell, SWT.BORDER);
-		box.setText("Job Icons");
-		fill = new FillLayout(SWT.VERTICAL);
-		fill.marginHeight = 5;
-		fill.marginWidth = 5;
-		box.setLayout(fill);
-		data = new GridData(GridData.FILL_BOTH);
-		box.setLayoutData(data);
-
-		for (int i = 0; i < jobStateText.length; i++) {
-			/* one horizontal box */
-			Composite c = new Composite(box, SWT.NONE);
-			RowLayout r = new RowLayout();
-			r.wrap = true;
-			r.pack = true;
-			r.justify = false;
-			r.marginBottom = 0;
-			r.marginLeft = 5;
-			r.marginRight = 5;
-			r.marginTop = 0;
-			r.spacing = 10;
-			c.setLayout(r);
-			CLabel b = new CLabel(c, SWT.FLAT);
-			b.setImage(ParallelImages.jobImages[i][0]);
-			CLabel l = new CLabel(c, SWT.LEFT);
-			l.setText(jobStateText[i]);
-		}
-				
-		/* the process box */
-		box = new Group(shell, SWT.BORDER);
-		box.setText("Process Icons");
-		fill = new FillLayout(SWT.VERTICAL);
-		fill.marginHeight = 5;
-		fill.marginWidth = 5;
-		box.setLayout(fill);
-		data = new GridData(GridData.FILL_BOTH);
-		box.setLayoutData(data);
-		
-		for (int i = 0; i < processStateText.length; i++) {
-			/* one horizontal box */
-			Composite c = new Composite(box, SWT.NONE);
-			RowLayout r = new RowLayout();
-			r.wrap = true;
-			r.pack = true;
-			r.justify = false;
-			r.marginBottom = 0;
-			r.marginLeft = 5;
-			r.marginRight = 5;
-			r.marginTop = 0;
-			r.spacing = 10;
-			c.setLayout(r);
-	        CLabel b = new CLabel(c, SWT.FLAT);
-			b.setImage(ParallelImages.procImages[i][0]);
-			CLabel l = new CLabel(c, SWT.LEFT);
-			l.setText(processStateText[i]);
-		}
-		
-        Button close = new Button(shell, SWT.PUSH);
-        close.setText("Close");
-        data = new GridData(GridData.HORIZONTAL_ALIGN_CENTER);
-        data.horizontalSpan = 2;
-		close.setLayoutData(data);
-
-        close.addSelectionListener(new SelectionAdapter() {
-        	public void widgetSelected(SelectionEvent event) {
-        		shell.close();
-        	}
-        });
-                    
-        shell.setDefaultButton(close);
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/OutputConsole.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/OutputConsole.java
deleted file mode 100644
index a19501a..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/OutputConsole.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui;
-
-import java.io.IOException;
-import java.io.InputStream;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
-/**
- * @author clement
- *
- */
-public class OutputConsole extends MessageConsole {
-	private InputStream inputStream = null;
-	private MessageConsoleStream messageOutputStream = null;
-	private Thread thread = null;
-	private static final int BUFFER_SIZE = 8192;
-	private boolean isKilled = false;
-
-	/** Constructor
-	 * @param name name of console window
-	 * @param inputStream
-	 */
-	public OutputConsole(String name, InputStream inputStream) {
-		this(name, null, inputStream);
-	}
-	/** Constructor
-	 * @param name name of console window
-	 * @param imageDescriptor image of console window
-	 * @param inputStream
-	 */
-	public OutputConsole(String name, ImageDescriptor imageDescriptor, InputStream inputStream) {
-		super(name, imageDescriptor);
-		this.inputStream = inputStream;
-		messageOutputStream = newMessageStream();
-		startMonitorOutput();
-	}
-	/** Start monitoring output
-	 * 
-	 */
-	protected void startMonitorOutput() {
-		if (thread == null) {
-			ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] { this });
-			Runnable runnable = new Runnable() {
-				public void run() {
-					try {
-						read();
-					} catch (IOException e) {
-						kill();
-					}
-				}
-			};
-			thread = new Thread(runnable, "Output Console Monitor");
-			thread.start();
-		}
-	}
-	/** Close console window
-	 * @throws IOException
-	 */
-	private void close() throws IOException {
-		if (thread != null) {
-			try {
-				closeStream();
-				messageOutputStream.close();
-				thread.interrupt();
-			} finally {
-				thread = null;
-				isKilled = true;
-				ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new IConsole[] { this });
-			}
-		}
-	}
-	/** Append text into console
-	 * @param text
-	 */
-	private void appendText(String text) {
-		messageOutputStream.print(text);
-	}
-	/** Kill console window
-	 * 
-	 */
-	public void kill() {
-		try {
-			close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	/** Close console input stream
-	 * @throws IOException
-	 */
-	private void closeStream() throws IOException {
-		try {
-			if (inputStream != null)
-				inputStream.close();
-		} finally {
-			inputStream = null;
-			isKilled = true;
-		}
-	}
-	/** Read from input stream
-	 * @throws IOException
-	 */
-	private void read() throws IOException {
-		byte[] bytes = new byte[BUFFER_SIZE];
-		int read = 0;
-		while (read >= 0) {
-			try {
-				if (isKilled) {
-					break;
-				}
-				read = inputStream.read(bytes);
-				if (read > 0) {
-					appendText(new String(bytes, 0, read));
-				}
-			} catch (NullPointerException e) {
-				break;
-			}
-		}
-		closeStream();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/PTPUIPlugin.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/PTPUIPlugin.java
deleted file mode 100644
index 0548881..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/PTPUIPlugin.java
+++ /dev/null

@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.ui;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.internal.ui.adapters.PropertyAdapterFactory;
-import org.eclipse.ptp.internal.ui.adapters.WorkbenchAdapterAdapterFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.consoles.ConsoleManager;
-import org.eclipse.ptp.ui.managers.AbstractUIManager;
-import org.eclipse.ptp.ui.managers.JobManager;
-import org.eclipse.ptp.ui.managers.MachineManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.utils.DebugUtil;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main PTP user interface plugin.
- */
-public class PTPUIPlugin extends AbstractUIPlugin {
-    public static final String PLUGIN_ID = "org.eclipse.ptp.ui"; //$NON-NLS-1$
-    public static final String EXTENSION_POINT_ID = "rmConfigurations"; //$NON-NLS-1$
-    
-	//The shared instance.
-	private static PTPUIPlugin plugin;
-	
-	/**
-	 * Get the currently active workbench page from the active workbench window.
-	 * 
-	 * @return currently active workbench page
-	 */
-	public static IWorkbenchPage getActivePage() {
-		IWorkbenchWindow w = getActiveWorkbenchWindow();
-		if (w != null) {
-			return w.getActivePage();
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the currently active workbench window
-	 * 
-	 * @return the active workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-	
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PTPUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Get the display instance.
-	 * 
-	 * @return the display instance
-	 */
-	public static Display getDisplay() {
-		Display display= Display.getCurrent();
-		if (display == null) {
-			display= Display.getDefault();
-		}
-		return display;		
-	}
-	
-	/**
-	 * Get a unique identifier for this plugin (used for logging)
-	 * 
-	 * @return unique identifier
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			return PLUGIN_ID;
-
-		return getDefault().getBundle().getSymbolicName();
-	}
-	
-	/**
-	 * Generate a log message given an IStatus object
-	 * 
-	 * @param status IStatus object
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Generate a log message
-	 * 
-	 * @param msg message to log
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Generate a log message for an exception
-	 * 
-	 * @param e exception used to generate message
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, "Internal Error", e)); //$NON-NLS-1$
-	}
-
-	//Resource bundle.
-	private final HashMap<String, RMConfigurationWizardPageFactory> configurationWizardPageFactories = new HashMap<String, RMConfigurationWizardPageFactory>();
-	
-	private AbstractUIManager machineManager = null;	
-	
-	private AbstractUIManager jobManager = null;
-	
-	private ConsoleManager consoleManager = null;
-	
-	public PTPUIPlugin() {
-		super();
-		plugin = this;
-	}	
-	
-	/**
-	 * Get the job manager instance
-	 * 
-	 * @return job manager
-	 */
-	public AbstractUIManager getJobManager() {
-		return jobManager;
-	}
-	
-	/**
-	 * Get the machine manager instance
-	 * 
-	 * @return machine manager
-	 */
-	public AbstractUIManager getMachineManager() {
-		return machineManager;
-	}
-	
-	/**
-	 * Get the wizard page factory associated with a resource manager factory
-	 * 
-	 * @param factory resource manager factory
-	 * @return factory for creating wizard pages for this resource manager
-	 */
-	public RMConfigurationWizardPageFactory getRMConfigurationWizardPageFactory(IResourceManagerFactory factory) {
-		return (RMConfigurationWizardPageFactory) configurationWizardPageFactories.get(factory.getClass().getName());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		DebugUtil.configurePluginDebugOptions();
-		registerAdapterFactories();
-		retrieveConfigurationWizardPageFactories();
-		machineManager = new MachineManager();
-		jobManager = new JobManager();
-		consoleManager = new ConsoleManager();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		machineManager.shutdown();
-		jobManager.shutdown();
-		consoleManager.shutdown();
-		machineManager = null;
-		jobManager = null;
-		consoleManager = null;
-		plugin = null;
-	}
-	
-	/**
-	 * Register adapter factories
-	 */
-	private void registerAdapterFactories() {
-		IAdapterManager manager = Platform.getAdapterManager();
-		IAdapterFactory factory = new PropertyAdapterFactory();
-		manager.registerAdapters(factory, IPElement.class);
-		manager.registerAdapters(factory, IElement.class);
-		factory = new WorkbenchAdapterAdapterFactory();
-		manager.registerAdapters(factory, IPElement.class);
-	}
-
-	/**
-	 * Locate and load wizard page factory extensions
-	 */
-	private void retrieveConfigurationWizardPageFactories() {
-    	configurationWizardPageFactories.clear();
-    	
-    	IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-		final IExtension[] extensions = extensionPoint.getExtensions();
-		
-		for (int iext = 0; iext < extensions.length; ++iext) {
-			final IExtension ext = extensions[iext];
-			
-			final IConfigurationElement[] elements = ext.getConfigurationElements();
-		
-			for (int i=0; i< elements.length; i++)
-			{
-				IConfigurationElement ce = elements[i];
-				try {
-					RMConfigurationWizardPageFactory factory = (RMConfigurationWizardPageFactory) ce.createExecutableExtension("class");
-					Class rmFactoryClass = factory.getRMFactoryClass();
-					configurationWizardPageFactories.put(rmFactoryClass.getName(), factory);
-				} catch (CoreException e) {
-					log(e);
-				}
-			}
-		}
-    }
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessage.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessage.java
deleted file mode 100644
index 1ebafa0..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessage.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2005 The Regents of the University of California. 

- * This material was produced under U.S. Government contract W-7405-ENG-36 

- * for Los Alamos National Laboratory, which is operated by the University 

- * of California for the U.S. Department of Energy. The U.S. Government has 

- * rights to use, reproduce, and distribute this software. NEITHER THE 

- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 

- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 

- * to produce derivative works, such modified software should be clearly marked, 

- * so as not to confuse it with the version available from LANL.

- * 

- * Additionally, this program and the accompanying materials 

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

- * which accompanies this distribution, and is available at

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

- * 

- * LA-CC 04-115

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

-package org.eclipse.ptp.ui;

-

-import java.text.MessageFormat;

-import java.util.MissingResourceException;

-import java.util.ResourceBundle;

-

-public class UIMessage {

-	public static final String REFRESH_SYSTEM_JOB_NAME = "Refresh runtime system";

-    private static final String BUNDLE_NAME = PTPUIPlugin.PLUGIN_ID + ".UIMessages";

-    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

-

-    /** Get string

-     * @param key

-     * @return

-     */

-    public static String getResourceString(String key) {

-		// No point trying if bundle is null as exceptions are costly

-		if (RESOURCE_BUNDLE != null) {

-			try {

-				return RESOURCE_BUNDLE.getString(key);

-			} catch (MissingResourceException e) {

-				return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$

-			} catch (NullPointerException e) {

-				return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$

-			}

-		}

-

-		// If we get here, then bundle is null.

-		return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	public static String getFormattedResourceString(String key, String arg) {

-		return MessageFormat.format(getResourceString(key), new String[]{arg});

-	}

-

-	public static String getFormattedResourceString(String key, String[] args) {

-		return MessageFormat.format(getResourceString(key), args);

-	}

-}


diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessages.properties b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessages.properties
deleted file mode 100644
index d9d7593..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIMessages.properties
+++ /dev/null

@@ -1,192 +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
-#
-# Contributors:
-#     Clement Chu
-#################################################################################
-
-CommonTab.common.Exception_occurred_reading_configuration_EXCEPTION=Cannot read configuration
-Tab.common.&Browse_1=&Browse
-Tab.common.B&rowse_2=B&rowse
-
-
-#PMainTab
-PMainTab.Main=Main
-PMainTab.&Project_Label=Parallel &Project:
-PMainTab.&Application_Label=&Application program:
-PMainTab.St&op_in_main=St&op in main
-PMainTab.Project_Selection_Title=Project Selection
-PMainTab.Project_Selection_Message=Choose one of projects
-PMainTab.Project_required=Please select the project first
-PMainTab.Enter_project_before_browsing_for_program=Enter project before browing for program
-PMainTab.Program_selection=Program Selection
-PMainTab.Choose_program_to_run_from_NAME=Choose program to run
-PMainTab.Selection_must_be_file=Selection must be file
-PMainTab.Illegal_project=Illegal project name: {0}
-PMainTab.Project_not_exits=Project {0} does not exist
-PMainTab.Project_is_closed=Project {0} is closed
-PMainTab.Application_program_not_specified=Application program is not specified
-
-
-#ParallelTab
-ParallelTab.Parallel=Parallel
-ParallelTab.StartupLabel=Startup:
-ParallelTab.Parallel_Options=Parallel Options
-ParallelTab.Number_Of_Processes=Number of &processes:
-ParallelTab.NetworkTypeLabel=Network &type:
-ParallelTab.Processes_Per_Node=Processes per n&ode:
-ParallelTab.First_Node_Number=First &node number:
-
-#ArgumentTab
-ArgumentTab.Argument=Argument
-ArgumentTab.Parallel_Program_Arguments=Parallel program &arguments:
-
-
-#WorkingDirectoryBlock
-WorkingDirectoryBlock.Working_directory=Working Directory
-WorkingDirectoryBlock.Working_directory_colon=Working directory:
-WorkingDirectoryBlock.Use_de&fault_working_directory=Use de&fault working directory
-WorkingDirectoryBlock.&Local_directory=&Local directory
-WorkingDirectoryBlock.Works&pace=Works&pace
-WorkingDirectoryBlock.Select_&workspace_relative_working_directory=Select &workspace relative working directory
-WorkingDirectoryBlock.Select_&working_directory_for_launch_configuration=Select &working directory for launch configuration
-WorkingDirectoryBlock.Working_directory_does_not_exist=Working directory does not exist
-WorkingDirectoryBlock.Working_directory_is_not_a_directory=Working directoru is not a directory
-WorkingDirectoryBlock.Project_or_folder_does_not_exist=Project or folder does not exist
-
-
-#ParallelLaunchConfigurationDelegate
-ParallelLaunchConfigurationDelegate.Verifying_launch_attributes=Verifying launch attributes
-ParallelLaunchConfigurationDelegate.Creating_source_locator=Creating source locator
-
-
-#AbstractParallelLaunchConfigurationDelegate
-AbstractParallelLaunchConfigurationDelegate.Project_not_specified=Project is not specified
-AbstractParallelLaunchConfigurationDelegate.Project_does_not_exist_or_is_not_a_project=Project does not exist or is not a project type
-AbstractParallelLaunchConfigurationDelegate.Application_file_not_specified=Application file is not specified
-AbstractParallelLaunchConfigurationDelegate.Application_file_does_not_exist=Application file does not exist
-AbstractParallelLaunchConfigurationDelegate.Number_of_process_not_specified=Number of processes is not specified
-AbstractParallelLaunchConfigurationDelegate.Working_directory_does_not_exist=Working directory does not exist
-AbstractParallelLaunchConfigurationDelegate.Application_path_not_found=Program path is not found
-
-
-#LaunchManager
-LaunchManager.Exception_occurred_executing_command_line=Exception occurred executing command line
-LaunchManager.Eclipse_runtime_does_not_support_working_directory=Eclipse runtime does not support working directory
-LaunchManager.{0}_({1})={0} ({1})
-
-
-#ExitAction
-ExitAction.text=Exit
-ExitAction.tooltip=Exit parallel program
-
-#AbortAction
-AbortAction.text=Abort
-AbortAction.tooltip=Abort parallel program
-
-#TerminationAllAction
-TerminationAllAction.text=Terminate parallel program
-TerminationAllAction.tooltip=Terminate parallel program
-
-#TerminateJobFromListAction
-TerminateJobFromListAction.button.text=Terminate job
-TerminateJobFromListAction.button.tooltip=Terminate all selected jobs
-TerminateJobFromListAction.msgbox.title=Terminate Job Error
-TerminateJobFromListAction.msgbox.message=Cannot terminate the job.
-
-#ViewStatusAction
-ViewStatusAction.text=View Status
-ViewStatusAction.tooltip=View parallel program status
-
-
-#ShowAllNodesAction
-ShowAllNodesAction.text=Show all nodes
-ShowAllNodesAction.tooltip=Show all nodes
-
-#ShowProcessesAction
-ShowProcessesAction.text=Show processes
-ShowProcessesAction.tooltip=Show processes
-
-#SearchAction
-SearchAction.text=Search
-SearchAction.tooltip=Search
-
-#LegendAction
-ShowLegendAction.text=Legend
-ShowLegendAction.tooltip=Legend
-
-#ShowMyAllocatedNodesAction
-ShowMyAllocatedNodesAction.text=Show my allocated nodes
-ShowMyAllocatedNodesAction.tooltip=Show my allocated nodes
-
-#ShowMyUsedNodesAction
-ShowMyUsedNodesAction.text=Show my used nodes
-ShowMyUsedNodesAction.tooltip=Show my used nodes
-
-#PTPPreferencesPage
-PTPPreferencesPage.preferencesDescription=PTP Setting
-PTPPreferencesPage.MPI_PATH=MPI path:
-PTPPreferencesPage.browseButton=Browse
-PTPPreferencesPage.Incorrect_MPI_file=Invalid mpi file
-PTPPreferencesPage.Select_MPI_FILE=Select MPI file
-PTPPreferencesPage.Request_timeout_text=Request timeout:
-PTPPreferencesPage.Launch_timeout_text=Launch timeout:
-PTPPreferencesPage.mpiFile_text=MPI file:
-PTPPreferencesPage.group_mpictrl=MPI setting
-
-PTPPreferencesPage.group_output=Program output setting
-PTPPreferencesPage.output_text=Output directory:
-PTPPreferencesPage.Select_Output_Directory=Select output directory
-PTPPreferencesPage.output_text=Output directory:
-PTPPreferencesPage.store_line_text=Store line number:
-PTPPreferencesPage.Incorrect_Output_directory=invalid directory
-
-
-#PSearchQuery
-PSearchQuery.singularNumberPostfix={0} - 1 Number in {1}
-PSearchQuery.singularPIDPostfix={0} - 1 PID in {1}
-PSearchQuery.singularExitCodePostfix={0} - 1 Exit Code in {1}
-PSearchQuery.pluralNumberPostfix={0} - {1} Number in {2}
-PSearchQuery.pluralPIDPostfix={0} - {1} PID in {2}
-PSearchQuery.pluralExitCodePostfix={0} - {1} Exit Code in {2}
-
-#ConfigurationWizard
-ConfigurationWizard.SelectFactoryDesc=Select the type of resource manager to use
-ConfigurationWizard.NameDesc=Enter a name and description for the resource manager
-ConfigurationWizard.NameLabel=Name:       
-ConfigurationWizard.DescriptionLabel=Description:
-ConfigurationWizard.UseDefaultButtonLabel=Use default name and description:
-ConfigurationWizard.ResourceManagerTypesLabel=Resource Manager Types:
-ConfigurationWizard.FirstWizardPageName=Choose Resource Manager Type
-ConfigurationWizard.SecondWizardPageName=Choose Resource Manager Name and Description
-ConfigurationWizard.ThirdWizardPageName=Configure Remote Access
-
-#ResourceManagerView
-ResourceManagerView.Machines=Machines
-ResourceManagerView.Queues=Queues
-ResourceManagerView.ResourceManagers=Resource Managers
-StopResourceManagersObjectActionDelegate.Title=Shutdown Resource Manager
-StopResourceManagersObjectActionDelegate.ResourceManager=" Resource Manager?
-StopResourceManagersObjectActionDelegate.Confirm= Are you sure you want to shutdown "
-StopResourceManagersObjectActionDelegate.UnableStopResourceManager=Unable to stop ResourceManager "
-StopResourceManagersObjectActionDelegate.ErrorStopingResourceManager=Error Stopping Resource Manager
-RemoveResourceManagersAction.Title=Remove Resource Manager
-RemoveResourceManagersAction.Question= Are you sure you want to remove the following resource manager(s):
-TerminateJobAction.Title=Terminate Job
-TerminateJobAction.Question= Are you sure you want to terminate job "
-TerminateJobAction.Confirm="?

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIUtils.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIUtils.java
deleted file mode 100644
index 00d9c00..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/UIUtils.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui;
-
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.WorkbenchException;
-
-/**
- *
- */
-public class UIUtils {
-    public static final int NORMAL = 0;
-    public static final int ASYNC = 1;
-
-    protected static void showDialog(final Shell shell, final String title, final String message, final int style) {
-        MessageBox dialog = new MessageBox(shell, style);
-        dialog.setMessage(message);
-        dialog.setText(title);
-        dialog.open();
-    }
-
-    protected static void showDialogAsync(final Shell shell, final String title, final String message, final int style) {
-        shell.getDisplay().asyncExec(new Runnable() {
-            public void run() {
-                showDialog(shell, title, message, style);
-            }
-        });
-    }
-
-    public static void showWarningDialog(final Shell shell, final String title, final String message, int flag) {
-        if (flag == NORMAL)
-            showDialog(shell, title, message, SWT.ICON_WARNING | SWT.OK);
-        else
-            showDialogAsync(shell, title, message, SWT.ICON_WARNING | SWT.OK);
-    }
-
-    public static void showInformationDialog(final Shell shell, final String title, final String message, int flag) {
-        if (flag == NORMAL)
-            showDialog(shell, title, message, SWT.ICON_INFORMATION | SWT.OK);
-        else
-            showDialogAsync(shell, title, message, SWT.ICON_INFORMATION | SWT.OK);
-    }
-
-    public static void showErrorDialog(final Shell shell, final String title, final String message, int flag) {
-        if (flag == NORMAL)
-            showDialog(shell, title, message, SWT.ICON_ERROR | SWT.OK);
-        else
-            showDialogAsync(shell, title, message, SWT.ICON_ERROR | SWT.OK);
-    }
-
-    // IStatus can be retrieved from CoreException e.getStatus()
-    public static void showDetailErrorDialog(final Shell shell, final String title, final String message, final IStatus status) {
-        shell.getDisplay().asyncExec(new Runnable() {
-            public void run() {
-                ErrorDialog.openError(shell, title, message, status);
-            }
-        });
-    }
-
-    public static void showErrorDialog(final String title, final String message, final IStatus status) {
-        Display.getDefault().asyncExec(new Runnable() {
-            public void run() {
-                final Shell shell = Display.getDefault().getActiveShell();
-                if (status == null)
-                    MessageDialog.openError(shell, title, message);
-                else
-                    ErrorDialog.openError(shell, title, message, status);
-            }
-        });
-    }
-
-    public static boolean showQuestionDialog(final String title, final String message) {
-        final Shell shell = Display.getDefault().getActiveShell();
-        return MessageDialog.openQuestion(shell, title, message);
-    }
-
-    public static void showView(final String viewID) {
-        BusyIndicator.showWhile(null, new Runnable() {
-            public void run() {
-                Display.getDefault().syncExec(new Runnable() {
-                    public void run() {
-                        try {
-                            displayView(viewID);
-                        } catch (NullPointerException e) {
-                            System.out.println("Show View err: " + e.getMessage());
-                        }
-                    }
-                });
-            }
-        });
-    }
-
-    public static void switchPerspectiveTo(final String perspectiveID) {
-        Display.getDefault().syncExec(new Runnable() {
-            public void run() {
-                IWorkbenchPage page = getActivePage();
-                if (page.getPerspective().getId().equals(perspectiveID))
-                    return;
-                IWorkbench bench = PTPUIPlugin.getDefault().getWorkbench();
-                try {
-                    bench.showPerspective(perspectiveID, PTPUIPlugin.getActiveWorkbenchWindow());
-                } catch (WorkbenchException e) {
-                    showErrorDialog("Display Error", "Cannot switch Perspective to: " + perspectiveID, e.getStatus());
-                }
-            }
-        });
-    }
-
-    public static IWorkbenchPage getActivePage() {
-        return PTPUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
-    }
-
-    public static void displayView(String viewID) throws NullPointerException {
-        IWorkbenchPage page = getActivePage();
-        try {
-            page.showView(viewID);
-        } catch (PartInitException e) {
-            showErrorDialog("Display Error", "Cannot show View ID: " + viewID, e.getStatus());
-        }
-    }
-
-    public static IViewPart findView(String viewID) {
-        IWorkbenchPage page = getActivePage();
-        return page.findView(viewID);
-    }
-
-    public static void closeView(String viewID) {
-        IViewPart viewPart = findView(viewID);
-        if (viewPart == null)
-            return;
-        viewPart.dispose();
-    }
-    
-
-    public static void safeRunAsyncInUIThread(final ISafeRunnable safeRunnable) {
-		if (PTPUIPlugin.getDisplay().isDisposed()) {
-			try {
-				safeRunnable.run();
-			} catch (Exception e) {
-				PTPCorePlugin.log(e);
-			}
-		}
-		else {
-			PTPUIPlugin.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					SafeRunnable.run(safeRunnable);
-				}
-			});
-		}
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AbstractResourceManagerSelectionActionDelegate.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AbstractResourceManagerSelectionActionDelegate.java
deleted file mode 100644
index 3f3aa19..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AbstractResourceManagerSelectionActionDelegate.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManagerMenuContribution;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public abstract class AbstractResourceManagerSelectionActionDelegate implements
-		IObjectActionDelegate, IActionDelegate2 {
-
-	private Shell targetShell;
-
-	private List<IResourceManagerMenuContribution> menuContribs =
-		new ArrayList<IResourceManagerMenuContribution>();
-
-	public void dispose() {
-		menuContribs.clear();
-	}
-
-	public void init(IAction action) {
-	}
-
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		IStructuredSelection ss = (IStructuredSelection) selection;
-		menuContribs.clear();
-		menuContribs.addAll(ss.toList());
-
-		boolean isEnabled = isEnabled();
-		action.setEnabled(isEnabled);
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		targetShell = targetPart.getSite().getShell();
-	}
-
-	protected List<IResourceManagerMenuContribution> getMenuContribs() {
-		return menuContribs;
-	}
-
-	protected Shell getTargetShell() {
-		return targetShell;
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isEnabled() {
-		if (menuContribs.size() == 0) {
-			return false;
-		}
-		boolean isEnabled = true;
-		for (IResourceManagerMenuContribution menuContrib : menuContribs) {
-			final IResourceManager rmManager = 
-				(IResourceManager) menuContrib.getAdapter(IResourceManager.class);
-			if (rmManager == null) {
-				return false;
-			}
-			if (!isEnabledFor(rmManager)) {
-				isEnabled = false;
-				break;
-			}
-		}
-		return isEnabled;
-	}
-
-	/**
-	 * @param rmManager
-	 * @return - is this rmManager allowed with this action
-	 */
-	protected abstract boolean isEnabledFor(IResourceManager rmManager);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AddResourceManagerAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AddResourceManagerAction.java
deleted file mode 100644
index 5f97d0d..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/AddResourceManagerAction.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-
-public class AddResourceManagerAction extends Action {
-	
-	private final Shell shell;
-
-	public AddResourceManagerAction(Shell shell) {
-		super("Add Resource Manager...");
-		this.shell = shell;
-	}
-
-	public void dispose() {
-	}
-
-	public void run() {
-		final IResourceManagerFactory[] resourceManagerFactories = PTPCorePlugin.getDefault().getModelManager().getResourceManagerFactories();
-		if (resourceManagerFactories.length == 0) {
-			MessageBox dialog = new MessageBox(shell, SWT.OK | SWT.ICON_INFORMATION);
-			dialog.setText("No Resource Managers Factories");
-			dialog.setMessage("No Resource Managers Factories are plugged into this application");
-			dialog.open();
-			return;
-		}
-
-		final RMConfigurationWizard wizard = new RMConfigurationWizard(resourceManagerFactories);
-		
-		final WizardDialog dialog = new WizardDialog(shell, wizard);
-		int status = dialog.open();
-		if (status != Dialog.OK) {
-			return;
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-	
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/EditResourceManagerAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/EditResourceManagerAction.java
deleted file mode 100644
index 13d4bdb..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/EditResourceManagerAction.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.swt.widgets.Shell;
-
-public class EditResourceManagerAction extends Action {
-	
-	private IResourceManagerControl selectedRMManager;
-	private final Shell shell;
-
-	public EditResourceManagerAction(Shell shell) {
-		super("Edit Resource Manager");
-		this.shell = shell;
-	}
-
-	public void dispose() {
-	}
-
-	public void run() {
-		final IModelManager modelManager = PTPCorePlugin.getDefault().getModelManager();
-		final String resourceManagerId = selectedRMManager.getConfiguration().getResourceManagerId();
-		
-		if (resourceManagerId != null) {
-			IResourceManagerFactory factory = modelManager.getResourceManagerFactory(
-					resourceManagerId);
-
-			final RMConfigurationWizard wizard = new RMConfigurationWizard(factory, selectedRMManager);
-			
-			final WizardDialog dialog = new WizardDialog(shell, wizard);
-			int status = dialog.open();
-			if (status != Dialog.OK) {
-				return;
-			}
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-	
-	}
-	
-	public void setResourceManager(IResourceManagerControl rmManager) {
-		this.selectedRMManager = rmManager;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoAction.java
deleted file mode 100644
index fba4c57..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoAction.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class GotoAction extends ParallelAction {
-	protected String id = "";
-	protected GotoDropDownAction action = null;
-	protected Object data;
-	
-	
-	/** Constructor
-	 * @param name name of action
-	 * @param id action ID
-	 * @param view view
-	 * @param action drop down action
-	 */
-	public GotoAction(String name, String id, AbstractParallelElementView view, GotoDropDownAction action, Object data) {
-		this(name, id, view, IAction.AS_CHECK_BOX, action, data);
-	}
-	/** Constructor
-	 * @param name name of action
-	 * @param id action ID
-	 * @param view view
-	 * @param style style of action
-	 * @param action drop down action
-	 */
-	public GotoAction(String name, String id, AbstractParallelElementView view, int style, GotoDropDownAction action, Object data) {
-		super(name, style, view);
-		this.id = id;
-		this.action = action;	
-		this.data = data;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {
-		action.run(elements, id, data);
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoDropDownAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoDropDownAction.java
deleted file mode 100644
index e1790fb..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/GotoDropDownAction.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class GotoDropDownAction extends ParallelAction {
-    protected IMenuCreator menuCreator = new IMenuCreator() {
-        private MenuManager dropDownMenuMgr = null;
-
-        private void createDropDownMenuMgr() {
-        	if (dropDownMenuMgr != null)
-        		dispose();
-        	
-        	dropDownMenuMgr = new MenuManager();
-        	createDropDownMenu(dropDownMenuMgr);
-        }
-        public Menu getMenu(Control parent) {
-            createDropDownMenuMgr();
-            return dropDownMenuMgr.createContextMenu(parent);
-        }
-        public Menu getMenu(Menu parent) {
-            createDropDownMenuMgr();
-            Menu menu = new Menu(parent);
-            IContributionItem[] items = dropDownMenuMgr.getItems();
-            for (int i = 0; i < items.length; i++) {
-                IContributionItem item = items[i];
-                IContributionItem newItem = item;
-                if (item instanceof ActionContributionItem) {
-                    newItem = new ActionContributionItem(((ActionContributionItem) item).getAction());
-                }
-                newItem.fill(menu, -1);
-            }
-            return menu;
-        }
-        public void dispose() {
-            if (dropDownMenuMgr != null) {
-                dropDownMenuMgr.dispose();
-                dropDownMenuMgr = null;
-            }
-        }
-    };
-    
-    /** Constructor
-     * @param name name of action
-     * @param view view
-     */
-    public GotoDropDownAction(String name, AbstractParallelElementView view) {
-		super(name, IAction.AS_DROP_DOWN_MENU, view);
-	    setMenuCreator(menuCreator);
-    }
-     
-	/** Create drop down menu
-	 * @param dropDownMenuMgr
-	 */
-	protected abstract void createDropDownMenu(MenuManager dropDownMenuMgr);	
-	/** run action
-	 * @param elements elements to take this action
-	 * @param setID set ID
-	 */
-	protected abstract void run(IElement[] elements, String setID, Object data);
-	/** Add action into drop down menu
-	 * @param dropDownMenuMgr
-	 * @param name name of action
-	 * @param id action ID
-	 * @param curID current ID
-	 */
-	protected abstract void addAction(MenuManager dropDownMenuMgr, String name, String id, String curID, Object data);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/ParallelAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/ParallelAction.java
deleted file mode 100644
index 273adeb..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/ParallelAction.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.views.AbstractParallelElementView;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author clement chu
- *
- */
-public abstract class ParallelAction extends Action {
-	protected AbstractParallelElementView view = null;
-	
-	/** Constructor
-	 * @param text name of action
-	 * @param view
-	 */
-	public ParallelAction(String text, AbstractParallelElementView view) {
-		this(text, IAction.AS_PUSH_BUTTON, view);
-	}
-	
-	/** Constructor
-	 * @param text name of action
-	 * @param style style of action
-	 * @param view
-	 */
-	public ParallelAction(String text, int style, AbstractParallelElementView view) {
-		super(text, style);
-		this.view = view;
-	    setToolTipText(text);
-	    setEnabled(false);
-	    setId(text);
-	}
-	
-	/** Get view part
-	 * @return
-	 */
-	public AbstractParallelElementView getViewPart() {
-        return view;
-    }
-    
-    /** Get Shell
-     * @return
-     */
-    public Shell getShell() {
-        return view.getViewSite().getShell();
-    }
-    
-    /** run action
-     * @param elements action acts with these elements
-     */
-    public abstract void run(IElement[] elements);
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IAction#run()
-     */
-    public void run() {
-    	ISelection selection = getViewPart().getSelection();
-    	if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-        	Object[] objs = ((IStructuredSelection)selection).toArray();
-        	IElement[] elements = new IElement[objs.length];
-        	System.arraycopy(objs, 0, elements, 0, objs.length);
-        	run(elements);
-    	}
-    	else
-    		run(new IElement[0]);
-    }
-    
-	/** Validation of given elements
-	 * @param elements elements to be doing validation
-	 * @return true if valid
-	 */
-	protected boolean validation(IElement[] elements) {
-		if (elements == null || elements.length == 0) {
-			UIUtils.showErrorDialog("No selected elements", "Please select some elements first", null);
-			return false;
-		}
-		return true;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/RemoveResourceManagersAction.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/RemoveResourceManagersAction.java
deleted file mode 100644
index edcbbb6..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/RemoveResourceManagersAction.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.ui.UIMessage;
-import org.eclipse.swt.widgets.Shell;
-
-public class RemoveResourceManagersAction extends Action {
-	
-	private IResourceManagerControl[] selectedRMManagers;
-	@SuppressWarnings("unused")
-	private final Shell shell;
-
-	public RemoveResourceManagersAction(Shell shell) {
-		super("Remove Resource Manager");
-		this.shell = shell;
-	}
-
-	public void run() {
-		String rmNames = "";
-		for (int i = 0; i < selectedRMManagers.length; i++) {
-			if (i > 0) {
-				rmNames += ",";
-			}
-			rmNames += "\n\t" + selectedRMManagers[i].getName();
-		}
-		
-		boolean remove = MessageDialog.openConfirm(shell,
-				UIMessage.getResourceString("RemoveResourceManagersAction.Title"), //$NON-NLS-1$
-				UIMessage.getResourceString("RemoveResourceManagersAction.Question") //$NON-NLS-1$
-				+ rmNames);
-		
-		if (remove) {
-			PTPCorePlugin.getDefault().getModelManager().removeResourceManagers(selectedRMManagers);
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-	
-	}
-
-	public void setResourceManager(IResourceManagerControl[] rmManagers) {
-		this.selectedRMManagers = rmManagers.clone();
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StartResourceManagersObjectActionDelegate.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StartResourceManagersObjectActionDelegate.java
deleted file mode 100644
index 9b9b97c..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StartResourceManagersObjectActionDelegate.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.rmsystem.IResourceManagerMenuContribution;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.ui.PlatformUI;
-
-public class StartResourceManagersObjectActionDelegate extends
-		AbstractResourceManagerSelectionActionDelegate {
-
-	public void run(IAction action) {
-		
-		for (IResourceManagerMenuContribution menuContrib : getMenuContribs()) {
-			final IResourceManager rmManager = 
-				(IResourceManager) menuContrib.getAdapter(IResourceManager.class);
-
-			if (!isEnabledFor(rmManager)) {
-				continue;
-			}
-			IRunnableWithProgress runnable = new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor)
-						throws InvocationTargetException, InterruptedException {
-					try {
-						rmManager.startUp(monitor);
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
-					if (monitor.isCanceled()) {
-						throw new InterruptedException();
-					}
-				}
-			};
-			try {
-				PlatformUI.getWorkbench().getProgressService().run(true, true, runnable);
-			} catch (InvocationTargetException e) {
-				Throwable t = e.getCause();
-				IStatus status = null;
-				if (t != null && t instanceof CoreException) {
-					status = ((CoreException)t).getStatus();
-				}
-				UIUtils.showErrorDialog("Start Resource Manager", "Failed to start resource manager", status);
-			} catch (InterruptedException e) {
-				// Do nothing. Operation has been canceled.
-			}
-		}
-	}
-
-	@Override
-	protected boolean isEnabledFor(IResourceManager rmManager) {
-		if (rmManager.getState() == ResourceManagerAttributes.State.STOPPED) {
-			return true;		
-		}
-		return false;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StopResourceManagersObjectActionDelegate.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StopResourceManagersObjectActionDelegate.java
deleted file mode 100644
index 8d1d763..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/actions/StopResourceManagersObjectActionDelegate.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.rmsystem.IResourceManagerMenuContribution;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.UIMessage;
-
-public class StopResourceManagersObjectActionDelegate
-extends AbstractResourceManagerSelectionActionDelegate {
-
-	public void run(IAction action) {
-		
-		for (IResourceManagerMenuContribution menuContrib : getMenuContribs()) {
-			IResourceManager rmManager = (IResourceManager) menuContrib.getAdapter(IResourceManager.class);
-
-			if (!isEnabledFor(rmManager)) {
-				continue;
-			}
-			
-			/*
-			 * Only ask if we are really shutting down the RM
-			 */
-			ResourceManagerAttributes.State state = rmManager.getState();
-			if (state == ResourceManagerAttributes.State.STARTED) {
-				boolean shutdown = MessageDialog.openConfirm(getTargetShell(),
-						UIMessage.getResourceString("StopResourceManagersObjectActionDelegate.Title"), //$NON-NLS-1$
-						UIMessage.getResourceString("StopResourceManagersObjectActionDelegate.Confirm") //$NON-NLS-1$
-						+ rmManager.getName()
-						+ UIMessage.getResourceString("StopResourceManagersObjectActionDelegate.ResourceManager")); //$NON-NLS-1$
-				if (!shutdown) {
-					return;
-				}
-			}
-
-			try {
-				rmManager.shutdown();
-			} catch (CoreException e) {
-				final String message = UIMessage.getResourceString("StopResourceManagersObjectActionDelegate.UnableStopResourceManager") //$NON-NLS-1$
-						+ rmManager.getName() + "\""; //$NON-NLS-1$
-				Status status = new Status(Status.ERROR, PTPUIPlugin.PLUGIN_ID,
-						1, message, e);
-				ErrorDialog dlg = new ErrorDialog(getTargetShell(),
-						UIMessage.getResourceString("StopResourceManagersObjectActionDelegate.ErrorStopingResourceManager"), message, status, //$NON-NLS-1$
-						IStatus.ERROR);
-				dlg.open();
-				PTPUIPlugin.log(status);
-			}
-		}
-	}
-
-	@Override
-	protected boolean isEnabledFor(IResourceManager rmManager) {
-		ResourceManagerAttributes.State state = rmManager.getState();
-		if (state == ResourceManagerAttributes.State.STARTED ||
-				state == ResourceManagerAttributes.State.ERROR) {
-			return true;
-		}
-		return false;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/ConsoleManager.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/ConsoleManager.java
deleted file mode 100644
index f358ad3..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/ConsoleManager.java
+++ /dev/null

@@ -1,198 +0,0 @@
-/**
- * Copyright (c) 2007 ORNL and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the term of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 
- * @author - Feiyi Wang
- * initial API and implementation
- * 
- */
- 
-package org.eclipse.ptp.ui.consoles;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-
-public class ConsoleManager implements IModelManagerChildListener,
-		IResourceManagerChildListener, IQueueChildListener {
-	
-	private IModelManager imm = null;
-	private Map<IPJob, JobConsole> consoles = new HashMap<IPJob, JobConsole>();
-	
-	public ConsoleManager() {
-		imm = PTPCorePlugin.getDefault().getModelManager();
-		imm.addListener(this);
-		for (IResourceManager rm: imm.getUniverse().getResourceManagers()) {
-			rm.addChildListener(this);
-			for (IPQueue queue: rm.getQueues()) {
-				queue.addChildListener(this);
-			}
-		}		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedJobEvent)
-	 */
-	public void handleEvent(IChangedJobEvent e) {
-		// OK to ignore
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedMachineEvent)
-	 */
-	public void handleEvent(IChangedMachineEvent e) {
-		// Nothing to do
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedQueueEvent)
-	 */
-	public void handleEvent(IChangedQueueEvent e) {
-		// Nothing to do
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IChangedResourceManagerEvent)
-	 */
-	public void handleEvent(IChangedResourceManagerEvent e) {
-		// Nothing to do
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewJobEvent)
-	 */
-	public void handleEvent(INewJobEvent e) {
-		for (IPJob job: e.getJobs()) {
-			ILaunchConfiguration configuration = job.getLaunchConfiguration();
-			try {
-				if (configuration != null &&
-						configuration.getAttribute(
-							IPTPLaunchConfigurationConstants.ATTR_CONSOLE, 
-							false)) {
-					JobConsole jc = new JobConsole(job);
-					job.addChildListener(jc);
-					synchronized (consoles) {
-						consoles.put(job, jc);
-					}
-				}
-			} catch (CoreException e1) {
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewMachineEvent)
-	 */
-	public void handleEvent(INewMachineEvent e) {
-		// Nothing to do
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewQueueEvent)
-	 */
-	public void handleEvent(INewQueueEvent e) {
-		for (IPQueue queue: e.getQueues()) {
-			queue.addChildListener(this);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.INewResourceManagerEvent)
-	 */
-	public void handleEvent(INewResourceManagerEvent e) {
-		e.getResourceManager().addChildListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveJobEvent)
-	 */
-	public void handleEvent(IRemoveJobEvent e) {
-		for (IPJob job: e.getJobs()) {
-			removeConsole(job);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveMachineEvent)
-	 */
-	public void handleEvent(IRemoveMachineEvent e) {
-		// Nothing to do
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveQueueEvent)
-	 */
-	public void handleEvent(IRemoveQueueEvent e) {
-		for (IPQueue queue: e.getQueues()) {
-			queue.removeChildListener(this);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IRemoveResourceManagerEvent)
-	 */
-	public void handleEvent(IRemoveResourceManagerEvent e) {
-		e.getResourceManager().removeChildListener(this);
-	}
-
-	/**
-	 * Shut down the console manager. This removes any job consoles that
-	 * have been created and all listeners.
-	 */
-	public void shutdown() {
-		imm.removeListener(this);
-		for (IResourceManager rm: imm.getUniverse().getResourceManagers()) {
-			rm.removeChildListener(this);
-			for (IPQueue queue: rm.getQueues()) {
-				queue.removeChildListener(this);
-				for (IPJob job : queue.getJobs()) {
-					removeConsole(job);
-				}
-			}
-		}		
-	}
-
-	/**
-	 * Convenience method to remove the console associated with a job.
-	 * 
-	 * @param job job that has an associated console
-	 */
-	private void removeConsole(IPJob job) {
-		synchronized (consoles) {
-			JobConsole jc = consoles.get(job);
-			if (jc != null) {
-				jc.removeConsole();
-				job.removeChildListener(jc);
-				consoles.remove(jc);
-			}
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/JobConsole.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/JobConsole.java
deleted file mode 100644
index c1cf9bb..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/consoles/JobConsole.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/**
- * Copyright (c) 2007 ORNL and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the term of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * 
- * @author - Feiyi Wang
- * initial API and implementation
- * 
- */
-
-package org.eclipse.ptp.ui.consoles;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
-public class JobConsole implements IJobChildListener {
-
-	/** 
-	 * search for console name first, if non-existed, 
-	 * create a new one
-	 * 
-	 * @param name
-	 * @return
-	 */
-	public static MessageConsole findAndCreateConsole(String name) {
-		MessageConsole myConsole = findConsole(name);
-		if (myConsole == null) {
-			// no console found, so create a new one
-			ConsolePlugin plugin = ConsolePlugin.getDefault();
-			myConsole = new MessageConsole(name, null);
-			IConsoleManager conMan = plugin.getConsoleManager();
-			conMan.addConsoles(new IConsole[] {myConsole});
-		}
-		return myConsole;
-	}
-
-	/**
-	 * search and return a message console with given name
-	 * 
-	 * @param name
-	 * @return null if not found
-	 */
-	public static MessageConsole findConsole(String name) {
-		ConsolePlugin plugin = ConsolePlugin.getDefault();
-		IConsoleManager conMan = plugin.getConsoleManager();
-		IConsole[] existing = conMan.getConsoles();
-		for (int i = 0; i < existing.length; i++) {
-			if (name.equals(existing[i].getName()))
-				return (MessageConsole) existing[i];
-		}
-		return null;
-	}
-
-	/**
-	 * utility method that allow direct output to a particular console
-	 * 
-	 * @param name - console name
-	 * @param msg  - method for the output
-	 */
-	public static void jout(String name, String msg) {
-		MessageConsole myConsole = findAndCreateConsole(name);
-		MessageConsoleStream out = myConsole.newMessageStream();
-		out.println(msg);		
-	}
-	
-	private MessageConsole myConsole;	// MessageConsole associated with this job
-	private MessageConsoleStream myConsoleStream;	// Output stream for the console
-	// TODO get this flag from preferences
-	private boolean prefix = true;	// Flag indicating if output should be prefixed with process index
-	
-	public JobConsole(IPJob job) {
-		ConsolePlugin plugin = ConsolePlugin.getDefault();
-		IConsoleManager conMan = plugin.getConsoleManager();
-		boolean haveConsole = false;
-		// check if this id is already associated with a console
-		// if it is, no new console will be created
-		IConsole[] existing = conMan.getConsoles();
-		String id = getUniqueName(job);
-		for (int i = 0; i < existing.length; i++) {
-			if (id.equals(existing[i].getName())) {
-				myConsole =  (MessageConsole) existing[i];
-				haveConsole = true;
-				break;
-			}
-		}
-		if (!haveConsole) {
-			myConsole = new MessageConsole(id, null);
-			myConsoleStream = myConsole.newMessageStream();
-			conMan.addConsoles(new IConsole[] {myConsole});
-		}
-	}
-	
-	/**
-	 * Send output from a process to the console. If the prefix flag is true,
-	 * each line of the output will be prefixed by the process index.
-	 * 
-	 * @param index prefix added to each line of output
-	 * @param msg output from process
-	 */
-	public void cout(String index, String msg) {
-		String output = "";
-		
-		if (prefix) {
-			String[] lines = msg.split("\n");
-			for (int i = 0; i < lines.length; i++) {
-				if (i > 0) {
-					output += "\n";
-				}
-				output += "[" + index + "] " + lines[i];
-			}
-		} else {
-			output = msg;
-		}
-		
-		myConsoleStream.println(output);				
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedProcessEvent)
-	 */
-	public void handleEvent(IChangedProcessEvent e) {
-		for (IPProcess process : e.getProcesses()) {
-			StringAttribute stdout = process.getAttribute(
-						ProcessAttributes.getStdoutAttributeDefinition());
-			EnumeratedAttribute<State> state = process.getAttribute(
-						ProcessAttributes.getStateAttributeDefinition());
-			IntegerAttribute index = process.getAttribute(
-						ProcessAttributes.getIndexAttributeDefinition());
-			if (state.getValue() == State.RUNNING && stdout != null) {
-				cout(index.getValueAsString(), stdout.getValueAsString());			
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewProcessEvent)
-	 */
-	public void handleEvent(INewProcessEvent e) {
-		// Nothing to do
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveProcessEvent)
-	 */
-	public void handleEvent(IRemoveProcessEvent e) {
-		// Nothing to do
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	public boolean removeConsole() {
-		if (myConsole != null) {
-			ConsolePlugin plugin = ConsolePlugin.getDefault();
-			IConsoleManager conMan = plugin.getConsoleManager();
-			conMan.removeConsoles(new IConsole[] {myConsole});
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Generate a unique name for the job
-	 * 
-	 * @param job
-	 * @return unique name for the job
-	 */
-	private String getUniqueName(IPJob job) {
-		String rmName    = job.getQueue().getResourceManager().getName();
-		String queueName = job.getQueue().getName();
-		String jobName   = job.getName();
-		return rmName + ":" + queueName + ":" + jobName;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconHoverTag.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconHoverTag.java
deleted file mode 100644
index 3577806..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconHoverTag.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.hover;
-/**
- * @author Clement chu
- * 
- */
-public interface IIconHoverTag {
-	public final static String UNDERLINE_TAG = "u";
-	public final static String STRIKE_TAG = "s";
-	public final static String BOLD_TAG = "b";
-	public final static String ITALIC_TAG = "i";
-	public final static String P_TAG = "p";
-	public final static String KEY_TAG = "key";
-	public final static String HIGHLIGHT_TAG = "hl";
-	public final static String INDENT_TAG = "ind";
-	public final static String NEXT_LINE_TAG = "br";
-		
-	public final static char CLOSED_TAG = '/';
-	public final static char START_TAG = '<';
-	public final static char END_TAG = '>';
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconInformationControl.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconInformationControl.java
deleted file mode 100644
index 31b925b..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/hover/IIconInformationControl.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.hover;
-
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IIconInformationControl extends IInformationControl {
-	/** Set header
-	 * @param header
-	 */
-	public void setHeader(String header);
-	/** Get shell size
-	 * @return x is width, y is height
-	 */
-	public Point getShellSize();
-	/** Is wrap text
-	 * @return true if wrap text
-	 */
-	public boolean isWrap();
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IJobChangedListener.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IJobChangedListener.java
deleted file mode 100644
index ff88846..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IJobChangedListener.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.listeners;
-
-/**
- * @author Clement chu
- *
- */
-public interface IJobChangedListener {
-	public static final int CHANGED = 0;
-	public static final int REMOVED = 1;
-	/** Change job event
-	 * @param cur_job_id current job ID
-	 * @param pre_job_id previous job ID
-	 */
-	public void jobChangedEvent(int type, String cur_job_id, String pre_job_id);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IPaintListener.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IPaintListener.java
deleted file mode 100644
index 17863ad..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/IPaintListener.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.listeners;
-
-/**
- * @author Clement chu
- * @deprecated
- */
-public interface IPaintListener {
-	/** Repaint the view
-	 * 
-	 */
-	public void repaint();
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/ISetListener.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/ISetListener.java
deleted file mode 100644
index da73a6c..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/listeners/ISetListener.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.listeners;
-
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementSet;
-
-/**
- * @author clement chu
- *
- */
-public interface ISetListener {
-	/** Change set event
-	 * @param currentSet current Set
-	 * @param preSet previous Set
-	 */
-	public void changeSetEvent(IElementSet currentSet, IElementSet preSet);
-	/** Create set event
-	 * @param set new Set
-	 * @param elements add elements into a given Set
-	 */
-	public void createSetEvent(IElementSet set, IElement[] elements);
-	/** Delete set event
-	 * @param set Set
-	 */
-	public void deleteSetEvent(IElementSet set);
-	/** Add element to set event
-	 * @param set Set
-	 * @param elements elements to add to set
-	 */
-	public void addElementsEvent(IElementSet set, IElement[] elements);
-	/** Remove elements event
-	 * @param set Set  
-	 * @param elements elements to remove from set
-	 */
-	public void removeElementsEvent(IElementSet set, IElement[] elements);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/AbstractUIManager.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/AbstractUIManager.java
deleted file mode 100644
index 43398f2..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/AbstractUIManager.java
+++ /dev/null

@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.managers;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ptp.core.IModelPresentation;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.listeners.IJobChangedListener;
-import org.eclipse.ptp.ui.listeners.ISetListener;
-import org.eclipse.ptp.ui.model.ElementSet;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class AbstractUIManager implements IManager {
-	protected IModelPresentation modelPresentation = null;
-	protected String cur_set_id = EMPTY_ID;
-	protected ListenerList setListeners = new ListenerList();
-	protected ListenerList jListeners = new ListenerList();
-
-	/** 
-	 * Constructor 
-	 */
-	public AbstractUIManager() {
-		modelPresentation = PTPCorePlugin.getDefault().getModelPresentation();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#addJobListener(org.eclipse.ptp.ui.listeners.IJobListener)
-	 */
-	public void addJobChangedListener(IJobChangedListener jobListener) {
-		jListeners.add(jobListener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#addSetListener(org.eclipse.ptp.ui.listeners.ISetListener)
-	 */
-	public void addSetListener(ISetListener setListener) {
-		setListeners.add(setListener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#addToSet(org.eclipse.ptp.ui.model.IElement[], org.eclipse.ptp.ui.model.IElementSet)
-	 */
-	public void addToSet(IElement[] elements, IElementSet set) {
-		set.addElements(elements);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#addToSet(org.eclipse.ptp.ui.model.IElement[], java.lang.String, org.eclipse.ptp.ui.model.IElementHandler)
-	 */
-	public void addToSet(IElement[] elements, String setID,
-			IElementHandler elementHandler) {
-		IElementSet set = (IElementSet) elementHandler.getElementByID(setID);
-		addToSet(elements, set);
-		fireSetEvent(ADD_ELEMENT_TYPE, elements, set, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#createSet(org.eclipse.ptp.ui.model.IElement[], java.lang.String, java.lang.String, org.eclipse.ptp.ui.model.IElementHandler)
-	 */
-	public String createSet(IElement[] elements, String setID, String setName,
-			IElementHandler elementHandler) {
-		IElementSet set = new ElementSet(elementHandler, setID, setName);
-		addToSet(elements, set);
-		elementHandler.addElements(new IElement[] { set });
-		fireSetEvent(CREATE_SET_TYPE, elements, set, null);
-		return set.getID();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#fireJobListener(int, java.lang.String, java.lang.String)
-	 */
-	public void fireJobChangedEvent(final int type, final String cur_job_id,
-			final String pre_job_id) {
-		Object[] array = jListeners.getListeners();
-		for (int i = 0; i < array.length; i++) {
-			final IJobChangedListener listener = (IJobChangedListener) array[i];
-			SafeRunner.run(new SafeRunnable() {
-				public void run() {
-					listener.jobChangedEvent(type, cur_job_id, pre_job_id);
-				}
-			});
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#fireEvent(int, org.eclipse.ptp.ui.model.IElement[], org.eclipse.ptp.ui.model.IElementSet, org.eclipse.ptp.ui.model.IElementSet)
-	 */
-	public void fireSetEvent(final int eventType, final IElement[] elements,
-			final IElementSet cur_set, final IElementSet pre_set) {
-		Object[] array = setListeners.getListeners();
-		for (int i = 0; i < array.length; i++) {
-			final ISetListener setListener = (ISetListener) array[i];
-			SafeRunner.run(new SafeRunnable() {
-				public void run() {
-					switch (eventType) {
-					case CREATE_SET_TYPE:
-						setListener.createSetEvent(cur_set, elements);
-						break;
-					case DELETE_SET_TYPE:
-						setListener.deleteSetEvent(cur_set);
-						break;
-					case CHANGE_SET_TYPE:
-						setListener.changeSetEvent(cur_set, pre_set);
-						break;
-					case ADD_ELEMENT_TYPE:
-						setListener.addElementsEvent(cur_set, elements);
-						break;
-					case REMOVE_ELEMENT_TYPE:
-						setListener.removeElementsEvent(cur_set, elements);
-						break;
-					}
-				}
-			});
-		}
-	}
-
-	/** 
-	 * Get Resource Managers
-	 * @return
-	 */
-	public IResourceManager[] getResourceManagers() {
-		IPUniverse universe = modelPresentation.getUniverse();
-		if (universe == null) {
-			return new IResourceManager[0];
-		}
-		return universe.getResourceManagers();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getStatus(org.eclipse.ptp.ui.model.IElement)
-	 */
-	public int getStatus(IElement element, int index) {
-		return getStatus(element.getID());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#removeFromSet(org.eclipse.ptp.ui.model.IElement[], java.lang.String, org.eclipse.ptp.ui.model.IElementHandler)
-	 */
-	public void removeFromSet(IElement[] elements, String setID,
-			IElementHandler elementHandler) {
-		IElementSet set = (IElementSet) elementHandler.getElementByID(setID);
-		set.removeElements(elements);
-		fireSetEvent(REMOVE_ELEMENT_TYPE, elements, set, null);
-		if (set.size() == 0)
-			removeSet(setID, elementHandler);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#removeJobListener(org.eclipse.ptp.ui.listeners.IJobListener)
-	 */
-	public void removeJobChangedListener(IJobChangedListener jobListener) {
-		jListeners.remove(jobListener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#removeSet(java.lang.String, org.eclipse.ptp.ui.model.IElementHandler)
-	 */
-	public void removeSet(String setID, IElementHandler elementHandler) {
-		IElementSet set = (IElementSet) elementHandler.getElementByID(setID);
-		elementHandler.removeElements(new IElement[] { set });
-		fireSetEvent(DELETE_SET_TYPE, null, set, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#removeSetListener(org.eclipse.ptp.ui.listeners.ISetListener)
-	 */
-	public void removeSetListener(ISetListener setListener) {
-		setListeners.remove(setListener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#shutdown()
-	 */
-	public void shutdown() {
-		setListeners.clear();
-		jListeners.clear();
-		//setListeners = null;
-		//jListeners = null;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/JobManager.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/JobManager.java
deleted file mode 100644
index b324ed8..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/JobManager.java
+++ /dev/null

@@ -1,473 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.managers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.ui.listeners.IJobChangedListener;
-import org.eclipse.ptp.ui.model.Element;
-import org.eclipse.ptp.ui.model.ElementHandler;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-
-/**
- * @author Clement chu
- * 
- */
-
-public class JobManager extends AbstractUIManager {
-	protected Map<String, IElementHandler> jobElementHandlerList = new HashMap<String, IElementHandler>();
-	protected Map<String, IPJob> jobList = new HashMap<String, IPJob>();
-	protected IPJob cur_job = null;
-	protected IPQueue cur_queue = null;
-	protected final String DEFAULT_TITLE = "Please select a job";
-
-	/** 
-	 * Add a new job to jobList. Check for any new processes and add these to
-	 * the element handler for the job.
-	 * 
-	 * @param job
-	 */
-	public void addJob(IPJob job) {
-		if (job != null) {
-			IElementSet set = createElementHandler(job).getSetRoot();
-			List<IElement> elements = new ArrayList<IElement>();
-			for (IPProcess proc : job.getProcesses()) {
-				if (proc == null || set.contains(proc.getID()))
-					continue;
-				elements.add(createProcessElement(set, proc.getID(), proc.getProcessIndex(), proc));
-			}
-			set.addElements(elements.toArray(new IElement[0]));
-		}
-	}
-	
-	/**
-	 * @param proc
-	 */
-	public void addProcess(IPProcess proc) {
-		IPJob job = proc.getJob();
-		IElementSet set = createElementHandler(job).getSetRoot();
-		if (!set.contains(proc.getID())) {
-			set.addElements(new IElement[] { createProcessElement(set, proc.getID(), proc.getProcessIndex(), proc) });
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#clear()
-	 */
-	public void clear() {
-		jobList.clear();
-		jobElementHandlerList.clear();
-	}
-	
-	/**
-	 * @param job
-	 * @return
-	 */
-	public IElementHandler createElementHandler(IPJob job) {
-		IElementHandler handler = getElementHandler(job.getID());
-		if (handler == null) {
-			handler = new ElementHandler();
-			jobList.put(job.getID(), job);
-			jobElementHandlerList.put(job.getID(), handler);
-		}
-		return handler;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#findJobById(java.lang.String)
-	 */
-	public IPJob findJobById(String job_id) {
-		return jobList.get(job_id);
-	}
-	
-	/** 
-	 * Find process
-	 * @param job job
-	 * @param id process ID
-	 * @return
-	 */
-	public IPProcess findProcess(IPJob job, String task_id) {
-		if (job == null)
-			return null;
-		return job.getProcessByIndex(task_id);
-		//return job.findProcess(id);
-	}
-	
-	/**
-	 * @param proc_id
-	 * @return
-	 */
-	public IPProcess findProcess(String proc_id) {
-		IPJob job = getJob();
-		if (job != null) {
-			return job.getProcessById(proc_id);
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getCurrentSetId()
-	 */
-	public String getCurrentSetId() {
-		return cur_set_id;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getElementHandler(java.lang.String)
-	 */
-	public IElementHandler getElementHandler(String id) {
-		return (IElementHandler) jobElementHandlerList.get(id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getFullyQualifiedName(java.lang.String)
-	 */
-	public String getFullyQualifiedName(String id) {
-		if (id.equals(EMPTY_ID)) {
-			return DEFAULT_TITLE;
-		}
-		IPJob job = getJob();
-		if (job != null) {
-			IPQueue queue = job.getQueue();
-			if (queue != null) {
-				IResourceManager rm = queue.getResourceManager();
-				if (rm != null) {
-					return rm.getName() + ": " + queue.getName() + ":" + job.getName();
-				}
-			}
-		}
-		return "";
-	}
-	
-	/** 
-	 * Get current job ID. This is the job that is currently selected by the view.
-	 * 
-	 * @return current job ID
-	 */
-	public IPJob getJob() {
-		return cur_job;
-	}
-	
-	/** 
-	 * Get Jobs that we know about. This is typically all jobs in the system.
-	 * 
-	 * @return jobs
-	 */
-	public IPJob[] getJobs() {
-		return jobList.values().toArray(new IPJob[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getName(java.lang.String)
-	 */
-	public String getName(String id) {
-		IPJob job = findJobById(id);
-		if (job == null)
-			return "";
-		return job.getName();
-	}
-	
-	/** 
-	 * Get process status text
-	 * @param proc process
-	 * @return status
-	 */
-	public String getProcessStatusText(IPProcess proc) {
-		if (proc != null) {
-			return proc.getState().toString();
-		}
-		return "Error";
-	}
-	
-	/**
-	 * @return
-	 */
-	public IPQueue getQueue() {
-		return cur_queue;
-	}
-	
-	/**
-	 * @return
-	 */
-	public IPQueue[] getQueues() {
-		if (cur_queue != null) {
-			return cur_queue.getResourceManager().getQueues();
-		}
-		return new IPQueue[] {};
-	}
-	
-	/** 
-	 * Return set id
-	 * @param jid
-	 * @return
-	 */
-	public String[] getSets(String jid) {
-		IElementHandler eHandler = getElementHandler(jid);
-		if (eHandler == null)
-			return new String[0];
-		
-		IElement[] elements = eHandler.getElements();
-		String[] sets = new String[elements.length];
-		for (int i=1; i<sets.length+1; i++) {
-			String tmp = elements[i-1].getID();
-			if (tmp.equals(IElementHandler.SET_ROOT_ID)) {
-				continue;
-			}
-			if (i == sets.length) {
-				sets[i-1] = tmp;				
-			}
-			else {
-				sets[i] = tmp;				
-			}
-		}
-		if (sets.length > 0) {
-			sets[0] = IElementHandler.SET_ROOT_ID;
-		}
-		return sets;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getStatus(java.lang.String)
-	 */
-	public int getStatus(String id) {
-		IPJob job = getJob();
-		if (job != null) {
-			IPProcess proc = job.getProcessById(id);
-			if (proc != null) {
-				return proc.getState().ordinal();
-			}
-		}
-		return ProcessAttributes.State.UNKNOWN.ordinal();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#hasStoppedJob()
-	 */
-	public boolean hasStoppedJob() {
-		for (IPJob job : getJobs()) {
-			if (job.isTerminated())
-				return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#initial()
-	 */
-	public IPElement initial(IPUniverse universe) {
-		for (IResourceManager rm : universe.getResourceManagers()) {
-			for (IPQueue queue : rm.getQueues()) {
-				for (IPJob job : queue.getJobs()) {
-					addJob(job);
-				}
-			}
-		}
-
-		setCurrentSetId(IElementHandler.SET_ROOT_ID);
-		return null;
-	}
-	
-	/** 
-	 * Is current set contain process
-	 * @param jid job ID
-	 * @param processID process ID
-	 * @return true if job contains process
-	 */
-	public boolean isCurrentSetContainProcess(String jid, String processID) {
-		IPJob job = getJob();
-		if (job != null) {
-			if (!job.getID().equals(jid))
-				return false;
-			IElementHandler elementHandler = getElementHandler(jid);
-			if (elementHandler == null)
-				return false;
-			IElementSet set = (IElementSet)elementHandler.getElementByID(getCurrentSetId());
-			if (set == null)
-				return false;
-			return set.contains(processID);
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#isJobStop(java.lang.String)
-	 */
-	public boolean isJobStop(String job_id) {
-		if (isNoJob(job_id))
-			return true;
-		IPJob job = findJobById(job_id);
-		return (job == null || job.isTerminated());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#isNoJob(java.lang.String)
-	 */
-	public boolean isNoJob(String jid) {
-		return (jid == null || jid.length() == 0);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#removeAllStoppedJobs()
-	 */
-	public void removeAllStoppedJobs() {
-		Map<String, IPQueue> queues = new HashMap<String, IPQueue>();
-		for (IPJob job : getJobs()) {
-			IPQueue queue = job.getQueue();
-			if (!queues.containsKey(queue.getID())) {
-				queue.getResourceManager().removeTerminatedJobs(queue);
-				queues.put(queue.getID(), queue);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#removeJob(org.eclipse.ptp.core.IPJob)
-	 */
-	public void removeJob(IPJob job) {
-		//remove launch from debug view
-		ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-		String jid = job.getID();
-		for (ILaunch launch : launchManager.getLaunches()) {
-			String launchedJobID = launch.getAttribute(ElementAttributes.getIdAttributeDefinition().getId());
-			if (launchedJobID != null && launchedJobID.equals(jid)) {
-				launchManager.removeLaunch(launch);
-			}
-		}
-		jobList.remove(jid);
-		removeElementHandler(job);
-		fireJobChangedEvent(IJobChangedListener.REMOVED, null, jid);
-	}
-
-	/**
-	 * @param proc
-	 */
-	public void removeProcess(IPProcess proc) {
-		IElementHandler elementHandler = jobElementHandlerList.get(proc.getJob().getID());
-		if (elementHandler != null) {
-			IElementSet set = elementHandler.getSetRoot();
-			IElement element = set.getElementByID(proc.getID());
-			if (element != null) {
-				set.removeElement(proc.getID());
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#setCurrentSetId(java.lang.String)
-	 */
-	public void setCurrentSetId(String set_id) {
-		cur_set_id = set_id;
-	}
-	
-	/** 
-	 * Set current job ID
-	 * @param job_id Job ID
-	 */
-	public void setJob(IPJob job) {
-		String old_id = (cur_job==null)?EMPTY_ID:cur_job.getID();
-		String new_id = (job==null)?EMPTY_ID:job.getID();
-		if (job != null) {
-			addJob(job);
-		}
-		cur_job = job;
-		fireJobChangedEvent(IJobChangedListener.CHANGED, new_id, old_id);
-	}
-	
-	/**
-	 * @param queue
-	 */
-	public void setQueue(IPQueue queue) {
-		if (queue != cur_queue) {
-			cur_queue = queue;
-			setJob(null);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#shutdown()
-	 */
-	public void shutdown() {
-		clear();
-		modelPresentation = null;
-		super.shutdown();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#size()
-	 */
-	public int size() {
-		return jobList.size();
-	}
-	
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * terminate action
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/
-	/** terminate all processes in current job
-	 * @throws CoreException
-	 */
-	public void terminateJob() throws CoreException {
-		IPJob job = getJob();
-		if (job != null) {
-			job.getQueue().getResourceManager().terminateJob(job);
-		}
-	}
-	
-	/**
-	 * @param job
-	 */
-	private void removeElementHandler(IPJob job) {
-		IElementHandler elementHandler = getElementHandler(job.getID());
-		if (elementHandler != null) {
-			elementHandler.removeAllRegistered();
-			elementHandler.clean();
-		}
-		jobElementHandlerList.remove(job.getID());		
-	}
-	
-	/**
-	 * @param set
-	 * @param key
-	 * @param taskID
-	 * @return
-	 */
-	protected IElement createProcessElement(IElementSet set, String key, String taskID, IPProcess process) {
-		return new Element(set, key, taskID, process) {
-			public int compareTo(IElement e) {
-				return new Integer(getName()).compareTo(new Integer(e.getName()));
-			}
-		};
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/MachineManager.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/MachineManager.java
deleted file mode 100644
index c10c135..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/managers/MachineManager.java
+++ /dev/null

@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.managers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes;
-import org.eclipse.ptp.ui.model.Element;
-import org.eclipse.ptp.ui.model.ElementHandler;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-
-/**
- * @author clement chu
- * 
- */
-public class MachineManager extends AbstractUIManager {
-	private Map<String, IElementHandler> machineElementHandlerList = new HashMap<String, IElementHandler>();
-	private Map<String, IPMachine> machineList = new HashMap<String, IPMachine>();
-	protected IPMachine cur_machine = null;
-	protected final String DEFAULT_TITLE = "Please select a machine";
-	
-	/** 
-	 * Add a new machine to machineList. Add any new nodes to the element
-	 * handler for the machine.
-	 * 
-	 * @param mac machine
-	 * @return true if the machine was added
-	 */
-	public void addMachine(IPMachine mac) {
-		if (mac != null) {
-			IElementHandler handler;
-			if (!machineList.containsKey(mac.getID())) {
-				handler = new ElementHandler();
-				machineList.put(mac.getID(), mac);
-				machineElementHandlerList.put(mac.getID(), handler);
-			} else {
-				handler = machineElementHandlerList.get(mac.getID());				
-			}
-			List<IElement> elements = new ArrayList<IElement>();
-			IElementSet set = handler.getSetRoot();
-			for (IPNode node : mac.getNodes()) {
-				elements.add(createNodeElement(set, node.getID(), node.getName(), node));
-			}
-			set.addElements(elements.toArray(new IElement[0]));
-		}
-	}
-	
-	/** Add machine
-	 * @param mac machine
-	 */
-	public void addNode(IPNode node) {
-		addMachine(node.getMachine());
-		IElementHandler elementHandler = machineElementHandlerList.get(node.getMachine().getID());
-		IElementSet set = elementHandler.getSetRoot();
-		set.addElements(new IElement[] { createNodeElement(set, node.getID(), node.getName(), node) });
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#clear()
-	 */
-	public void clear() {
-		if (machineList != null) {
-			machineList.clear();
-			machineElementHandlerList.clear();
-		}
-	}
-	
-	/**
-	 * @param id
-	 * @return
-	 */
-	public IPMachine findMachineById(String id) {
-		return (IPMachine) machineList.get(id);
-	}
-	
-	/** Find node 
-	 * @param node_id node ID
-	 * @return null is not found
-	 */
-	public IPNode findNode(String node_id) {
-		IPMachine machine = getCurrentMachine();
-		if (machine == null) {
-			System.out.println("\t*** POSSIBLE ERROR: Unable to find machine");
-			return null;
-		}
-		return machine.getNodeById(node_id);
-	}
-	
-	/** Get current machine ID
-	 * @return current machine ID
-	 */
-	public IPMachine getCurrentMachine() {
-		return cur_machine;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getCurrentSetId()
-	 */
-	public String getCurrentSetId() {
-		return cur_set_id;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getElementHandler(java.lang.String)
-	 */
-	public IElementHandler getElementHandler(String id) {
-		return (IElementHandler) machineElementHandlerList.get(id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getFullyQualifiedName(java.lang.String)
-	 */
-	public String getFullyQualifiedName(String id) {
-		if (id.equals(EMPTY_ID)) {
-			return DEFAULT_TITLE;
-		}
-		//TODO check that this is what should happen. Can we just use cur_machine?
-		IPMachine machine = getCurrentMachine();
-		if (machine != null) {
-			IResourceManager rm = machine.getResourceManager();
-			if (rm != null) {
-				return rm.getName() + ": " + machine.getName();
-			}
-		}
-		return "";
-	}
-	
-	/** Get machines
-	 * @return machines
-	 */
-	public IPMachine[] getMachines() {
-		return machineList.values().toArray(new IPMachine[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getName(java.lang.String)
-	 */
-	public String getName(String id) {
-		if (cur_machine == null)
-			return "";
-		return cur_machine.getName();
-	}
-	
-	/** 
-	 * Get node status.
-	 * 
-	 * Currently the node status is determined as follows:
-	 * 	- if the node is up:
-	 * 		- if there are *any* running processes on the node: NODE_RUNNING
-	 * 		- if there are no running processes, but one or more exited processes on the node: NODE_EXITED
-	 *  	- if there is extraState: extraState
-	 *  	- if there is no extraState: NODE_UP
-	 *  - if the node is down: NODE_DOWN
-	 *  - if the node is error: NODE_ERROR
-	 *  
-	 *  TODO: in the future, the machine view should be linked to the jobs view. The node state should only
-	 *  be shown as NODE_RUNNING if any processes belonging to the current job are running.
-	 *  
-	 * @param node
-	 * @return
-	 */
-	public int getNodeStatus(IPNode node) {
-		if (node != null) {
-			NodeAttributes.State nodeState = node.getState();
-			
-			EnumeratedAttribute<NodeAttributes.ExtraState> extraStateAttr = 
-				node.getAttribute(NodeAttributes.getExtraStateAttributeDefinition());
-			
-			if (extraStateAttr != null) {
-				return NodeAttributes.State.values().length + extraStateAttr.getValueIndex();
-			}
-			
-			// FIXME: this should be provided by the proxy
-			
-			if (nodeState == NodeAttributes.State.UP) {
-				IPProcess[] procs = node.getProcesses();
-				if (procs.length > 0) {
-					for (IPProcess proc : procs) {
-						if (!proc.isTerminated()) {
-							return NodeAttributes.State.values().length + NodeAttributes.ExtraState.RUNNING_PROCESS.ordinal();
-						}
-					}
-					return NodeAttributes.State.values().length + NodeAttributes.ExtraState.EXITED_PROCESS.ordinal();
-				}
-				
-			}
-			
-			return nodeState.ordinal();
-		}
-		return NodeAttributes.State.UNKNOWN.ordinal();
-	}
-	
-	/** Get node status text
-	 * @param node
-	 * @return status text
-	 */
-	public String getNodeStatusText(IPNode node) {
-		if (node == null) {
-			return "Unknown";
-		}
-		EnumeratedAttribute<NodeAttributes.State> nodeStateAttr =
-			node.getAttribute(NodeAttributes.getStateAttributeDefinition());
-		if(nodeStateAttr == null) {
-			return "Unknown";
-		}
-		NodeAttributes.State nodeState = nodeStateAttr.getValue();
-		
-		if (nodeState == NodeAttributes.State.UP) {
-			if (node.getProcesses().length > 0) {
-				if (node.getProcesses()[0].getJob().isTerminated()) {
-					return "Exited";
-				}
-				return "Running";
-			}
-
-			EnumeratedAttribute<NodeAttributes.ExtraState> extraStateAttr =
-				node.getAttribute(NodeAttributes.getExtraStateAttributeDefinition());
-			NodeAttributes.ExtraState extraState = NodeAttributes.ExtraState.NONE;
-			if (extraStateAttr != null) {
-				extraState = extraStateAttr.getValue();
-			}
-			
-			if (extraState != NodeAttributes.ExtraState.NONE) {
-				return extraState.toString();
-			}
-		}
-		return nodeState.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#getStatus(java.lang.String)
-	 */
-	public int getStatus(String id) {
-		IPMachine machine = getCurrentMachine();
-		if (machine != null) {
-			return getNodeStatus(machine.getNodeById(id));
-		}
-		return getNodeStatus(null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#initial()
-	 */
-	public IPElement initial(IPUniverse universe) {
-		for (IResourceManager rm : universe.getResourceManagers()) {
-			for (IPMachine machine : rm.getMachines()) {
-				addMachine(machine);
-			}
-		}
-
-		setCurrentSetId(IElementHandler.SET_ROOT_ID);
-		return null;
-	}
-	
-	/** Is current set contain node
-	 * @param mid machine ID
-	 * @param nodeID node iD
-	 * @return true if current set contains node
-	 */
-	public boolean isCurrentSetContainNode(String mid, String nodeID) {
-		IPMachine machine = getCurrentMachine();
-		if (machine != null) {
-			if (!machine.getID().equals(mid))
-				return false;
-			IElementHandler elementHandler = getElementHandler(machine.getID());
-			if (elementHandler == null)
-				return false;
-			IElementSet set = (IElementSet)elementHandler.getElementByID(getCurrentSetId());
-			if (set == null)
-				return false;
-			return set.contains(nodeID);
-		}
-		return false;
-	}
-	
-	/** Is no machine
-	 * @return true if there is no machine
-	 */
-	public boolean isNoMachine() {
-		return cur_machine == null;
-	}
-
-	/**
-	 * @param machine
-	 */
-	public void removeMachine(IPMachine machine) {
-		machineList.remove(machine.getID());
-		machineElementHandlerList.remove(machine.getID());
-		IElementHandler handler = machineElementHandlerList.get(machine.getID());
-		if (handler != null) {
-			IElementSet set = handler.getSetRoot();
-			for (IPNode node : machine.getNodes()) {
-				IElement element = set.getElementByID(node.getID());
-				if (element != null) {
-					set.removeElement(node.getID());
-				}
-			}
-		}
-		if (cur_machine == machine) {
-			cur_machine = null;
-		}
-	}	
-	
-	/** Add machine
-	 * @param mac machine
-	 */
-	public void removeNode(IPNode node) {
-		IElementHandler elementHandler = machineElementHandlerList.get(node.getMachine().getID());
-		IElementSet set = elementHandler.getSetRoot();
-		IElement element = set.getElementByID(node.getID());
-		if (element != null) {
-			set.removeElement(node.getID());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#setCurrentSetId(java.lang.String)
-	 */
-	public void setCurrentSetId(String set_id) {
-		cur_set_id = set_id;
-	}
-	
-	/** 
-	 * Set current machine ID. If the machine has never been set before, add an entry to
-	 * the machineList, and add the nodes to the element handler.
-	 * 
-	 * @param machine_id machine ID
-	 */
-	public void setMachine(IPMachine machine) {
-		if (machine != cur_machine) {
-			cur_machine = machine;
-			addMachine(machine);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#shutdown()
-	 */
-	public void shutdown() {
-		clear();
-		modelPresentation = null;
-		super.shutdown();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#size()
-	 */
-	public int size() {
-		return machineList.size();
-	}
-	
-	/**
-	 * @param set
-	 * @param key
-	 * @param name
-	 * @return
-	 */
-	protected IElement createNodeElement(IElementSet set, String key, String name, IPNode node) {
-		return new Element(set, key, name, node) {
-			public int compareTo(IElement e) {
-				return getID().compareTo(e.getID());
-			}
-		};
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/Element.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/Element.java
deleted file mode 100644
index e54f238..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/Element.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.model;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.ptp.core.elements.IPElement;
-
-/**
- * @author clement chu
- *
- */
-public class Element extends PlatformObject implements IElement {
-	protected String id = "0";
-	protected String name = "";
-	protected boolean registered = false;
-	protected IElement parent = null;
-	protected IPElement pElement = null;
-	
-	/** 
-	 * Constructor
-	 * @param parent Parent element
-	 * @param id element ID
-	 * @param name element name
-	 */
-	public Element(IElement parent, String id, String name, IPElement pElement) {
-		this.parent = parent;
-		this.id = id;
-		this.name = name;
-		this.pElement = pElement;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.model.IElement#cloneElement()
-	 */
-	public IElement cloneElement() {
-		try {
-			return (IElement)clone();
-		} catch (CloneNotSupportedException e) {
-			return null;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-	 */
-	public int compareTo(IElement e) {
-		return getName().compareTo(e.getName());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.model.IElement#getID()
-	 */
-	public String getID() {
-		return id;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.model.IElement#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.model.IElement#getParent()
-	 */
-	public IElement getParent() {
-		return parent;
-	}
-	
-	public IPElement getPElement() {
-		return pElement;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.model.IElement#isRegistered()
-	 */
-	public boolean isRegistered() {
-		return registered;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.model.IElement#setRegistered(boolean)
-	 */
-	public void setRegistered(boolean registered) {
-		this.registered = registered;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementHandler.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementHandler.java
deleted file mode 100644
index 0343725..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementHandler.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author clement chu
- *
- */
-public class ElementHandler extends ElementSet implements IElementHandler {
-	private List<IElement> registerList = new ArrayList<IElement>();
-	
-	public ElementHandler() {
-		super(null, SET_ROOT_ID, SET_ROOT_ID);
-		//create root 
-		addElements(new IElement[] { new ElementSet(this, SET_ROOT_ID, SET_ROOT_ID) });
-	}
-	public IElementSet getSetRoot() {
-		return (IElementSet)getElementByID(SET_ROOT_ID);
-	}
-	public IElementSet[] getSetsWithElement(String id) {
-		List<IElementSet> aList = new ArrayList<IElementSet>();
-		for (IElement element : getElements()) {
-			if (((IElementSet)element).getElementByID(id) != null) {
-				aList.add((IElementSet)element);
-			}
-		}
-		return (IElementSet[])aList.toArray(new IElementSet[0]);
-	}
-	public boolean containsRegister(IElement element) {
-		return registerList.contains(element);
-	}
-	public void addToRegister(IElement[] elements) {
-		for (IElement element : elements) {
-			if (!containsRegister(element)) {
-				element.setRegistered(true);
-				registerList.add(element);
-			}
-		}
-	}
-	public void removeFromRegister(IElement[] elements) {
-		for (IElement element : elements) {
-			if (registerList.remove(element))
-				element.setRegistered(false);
-		}
-	}
-	public IElement[] getRegistered() {
-		return registerList.toArray(new IElement[0]);
-	}
-	public void removeAllRegistered() {
-		registerList.clear();
-	}
-	public int totalRegistered() {
-		return registerList.size();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementSet.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementSet.java
deleted file mode 100644
index 2168c4f..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/ElementSet.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.model;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-/**
- * @author clement chu
- *
- */
-public class ElementSet extends Element implements IElementSet {
-	private Map<String,IElement> elementMap = new HashMap<String,IElement>();
-	private List<IElement> elementList = new ArrayList<IElement>();
-	private List<String> matchSetList = new ArrayList<String>();
-	private int number_of_elements = 0;
-	
-	public ElementSet(IElement parent, String id, String name) {
-		super(parent, id, name, null);
-	}
-	public boolean isRootSet() {
-		return (id.equals(IElementHandler.SET_ROOT_ID));
-	}
-	public void addElements(IElement[] elements) {
-		for (IElement element : elements) {
-			if (contains(element.getID()))
-				continue;
-
-			if (!isRootSet()) {
-				IElementSet[] sets = ((IElementHandler)getParent()).getSetsWithElement(element.getID());
-				for (IElementSet set : sets) {
-					set.addMatchSet(getID());
-					addMatchSet(set.getID());
-				}
-			}
-			elementMap.put(element.getID(), element);
-			elementList.add(element);
-			number_of_elements++;
-		}
-		sorting();
-	}
-	private void sorting() {
-		Collections.sort(elementList);
-	}
-	public IElement getElement(int index) {
-		if (index < 0 || index >= size())
-			return null;
-		return elementList.get(index);
-	}
-	private int binarySearch(String name) {
-		int lo = 0;
-		int hi = number_of_elements - 1;
-		int mid = 0;
-		while (lo <= hi) {
-			mid = (lo + hi) / 2;
-			int comp_res = compare(getElement(mid), name);
-			if (comp_res == 0)
-				return mid;
-			else if (comp_res > 0)
-				hi = mid - 1;
-			else
-				lo = ++mid;
-		}
-		return -mid - 1;
-	}
-	public IElement getElementByID(String id) {
-		return elementMap.get(id);
-	}
-	public IElement getElementByName(String name) {
-		int index = binarySearch(name);
-		if (index < number_of_elements)
-			return elementList.get(index);
-		return null;
-	}
-	public int findIndexByID(String id) {
-		IElement element = getElementByID(id);
-		if (element != null) {
-			return findIndexByName(element.getName());
-		}
-		return -1;
-	}
-	public int findIndexByName(String name) {
-		int index = binarySearch(name);
-		if (index < number_of_elements)
-			return index;
-		return -1;
-	}
-	public IElement[] getElements() {
-		return elementList.toArray(new IElement[0]);
-	}
-	public void removeElements(IElement[] elements) {
-		for (IElement element : elements) {
-			removeElement(element.getID());
-		}
-	}
-	public void removeElement(String id) {
-		IElement elmenet = elementMap.remove(id);
-		elementList.remove(elmenet);
-		number_of_elements--;
-
-		if (!isRootSet()) {
-			IElementSet[] sets = ((IElementHandler)getParent()).getSetsWithElement(id);
-			for (IElementSet set : sets) {
-				set.removeMatchSet(getID());
-				removeMatchSet(set.getID());
-			}
-		}
-	}
-	private int compare(IElement e1, String val) {
-		return compareTo(e1.getName(), val);
-	}
-	public int compareTo(String s1, String s2) {
-		return s1.compareTo(s2);
-	}
-	public int size() {
-		return number_of_elements;
-	}
-	public void clean() {
-		elementMap.clear();
-		elementList.clear();
-		matchSetList.clear();
-		number_of_elements = 0;
-	}
-	public boolean contains(IElement element) {
-		return contains(element.getID());
-	}
-	public boolean contains(String id) {
-		return elementMap.containsKey(id);
-	}
-	
-	public void addMatchSet(String setID) {
-		if (!containsMatchSet(setID)) {
-			matchSetList.add(setID);
-		}
-	}
-	public void removeMatchSet(String setID) {
-		matchSetList.remove(setID);
-	}
-	public boolean containsMatchSet(String setID) {
-		return matchSetList.contains(setID);
-	}
-	public String[] getMatchSetIDs() {
-		return matchSetList.toArray(new String[0]);
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElement.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElement.java
deleted file mode 100644
index 01f1016..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElement.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ptp.core.elements.IPElement;
-
-/**
- * @author clement chu
- *
- */
-public interface IElement extends Cloneable, Comparable<IElement>, IAdaptable {
-	/** 
-	 * Clone a new element
-	 * @return cloned element
-	 */
-	public IElement cloneElement();
-
-	/** 
-	 * Get element ID
-	 * @return element ID in string format
-	 */
-	public String getID();
-	
-	/** 
-	 * Get element name
-	 * @return name of element
-	 */
-	public String getName();
-
-	/**
-	 * Get parent
-	 * @return element
-	 */
-	public IElement getParent();
-	
-	/**
-	 * Get the core model element associated with this element.
-	 * @return IPElement
-	 */
-	public IPElement getPElement();
-	
-	/** 
-	 * Is element registered
-	 * @return true if element is registered
-	 */
-	public boolean isRegistered();
-	
-	/** 
-	 * Set element to register or not
-	 * @param registered is register
-	 */
-	public void setRegistered(boolean registered);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementHandler.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementHandler.java
deleted file mode 100644
index affb60e..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementHandler.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.model;
-
-import org.eclipse.ptp.core.PreferenceConstants;
-
-/**
- * @author clement chu
- *
- */
-public interface IElementHandler extends IElementSet {
-	public final static String SET_ROOT_ID = PreferenceConstants.SET_ROOT_ID;
-	/** Get Set root
-	 * @return root set
-	 */
-	IElementSet getSetRoot();
-	
-	/** Get sets included
-	 * @param id Target element ID
-	 * @return included sets
-	 */
-	IElementSet[] getSetsWithElement(String id);
-	
-	/** Is element registered
-	 * @param element Target element
-	 * @return true if element is registered
-	 */
-	boolean containsRegister(IElement element);
-	/** Add element to registered list
-	 * @param element Target element
-	 */
-	void addToRegister(IElement[] elements);
-	/** Remove element from registered list
-	 * @param element Target element
-	 */
-	void removeFromRegister(IElement[] elements);
-	/** Get registered elements
-	 * @return registered elements
-	 */
-	IElement[] getRegistered();
-	/** 
-	 * Remove all registered elements
-	 */
-	void removeAllRegistered();
-	/** Get total of registered elements
-	 * @return number of registered elements
-	 */
-	int totalRegistered();
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementSet.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementSet.java
deleted file mode 100644
index af651a3..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/model/IElementSet.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.model;
-
-/**
- * @author clement chu
- *
- */
-public interface IElementSet extends IElement {
-	/**
-	 * Removes Element from this set
-	 * @param element id 
-	 */
-	public void removeElement(String id);
-	
-	/**
-	 * Adds given elements to this set
-	 * @param elements
-	 */
-	public void addElements(IElement[] elements);
-
-	/**
-	 * Removes given elements from this set
-	 * @param elements
-	 */
-	public void removeElements(IElement[] elements);
-
-	/**
-	 * Returns an array of elements of this set
-	 * @return an array of elements
-	 */
-	public IElement[] getElements();
-
-	/**
-	 * Returns whether this set is root or not
-	 * @return true if this set is root
-	 */
-	public boolean isRootSet();
-
-	/**
-	 * Returns element by given element id
-	 * @param id element id
-	 * @return element 
-	 */
-	public IElement getElementByID(String id);
-	
-	/**
-	 * Returns element by given element name
-	 * @param name element name
-	 * @return element
-	 */
-	public IElement getElementByName(String name);
-
-	/**
-	 * Returns element by given index
-	 * @param index 
-	 * @return element
-	 */
-	public IElement getElement(int index);
-	
-	/**
-	 * Returns total elements of this set
-	 * @return total elements of this set
-	 */
-	public int size();
-	
-	/**
-	 * Remove all the elements in this set
-	 */
-	public void clean();
-	
-	/**
-	 * Returns whether this set contains given element
-	 * @param element
-	 * @return whether this set contains given element
-	 */
-	public boolean contains(IElement element);
-	
-	/**
-	 * Returns whether this set contains given element id
-	 * @param id
-	 * @return whether this set contains given element id
-	 */
-	public boolean contains(String id);
-	
-	/**
-	 * Store a list which set also contains the same element 
-	 * Adds to match set of given set id
-	 * @param setID set id
-	 */
-	public void addMatchSet(String setID);
-	
-	/**
-	 * Removes match sets of given set id
-	 * @param setID set id
-	 */
-	public void removeMatchSet(String setID);
-	
-	/**
-	 * Returns whether given set id contains in match list
-	 * @param setID
-	 * @return true if given set id contains in match list
-	 */
-	public boolean containsMatchSet(String setID);
-	
-	/**
-	 * Returns an array of match set id
-	 * @return an array of match set id
-	 */
-	public String[] getMatchSetIDs();
-	
-	/**
-	 * Returns position of given element id
-	 * @param id element id
-	 * @return position of given element id
-	 */
-	public int findIndexByID(String id);
-
-	/**
-	 * Returns position of given element name
-	 * @param name element name
-	 * @return position of given element name
-	 */
-	public int findIndexByName(String name);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/AbstractPreferencePage.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/AbstractPreferencePage.java
deleted file mode 100644
index f021263..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/AbstractPreferencePage.java
+++ /dev/null

@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class AbstractPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-	protected IWorkbench fWorkbench;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		fWorkbench = workbench;
-	}
-	
-	/** 
-	 * Get Workbench
-	 * @return
-	 */
-	protected IWorkbench getWorkbench() {
-		return fWorkbench;
-	}
-	
-	/** 
-	 * Create group composite
-	 * @param parent
-	 * @param numColumns
-	 * @param makeBalance
-	 * @param labelText
-	 * @return
-	 */
-	protected Composite createGroupComposite(Composite parent, int numColumns, boolean makeBalance, String labelText) {
-        Group comp = new Group(parent, SWT.SHADOW_ETCHED_IN);
-        GridLayout layout = new GridLayout(numColumns, makeBalance);
-        comp.setLayout(layout);
-        layout.marginLeft = 2;
-        layout.marginTop = 2;
-        layout.marginRight = 2;
-        layout.marginBottom = 2;
-        GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-        gd.verticalAlignment = SWT.CENTER ;
-        gd.horizontalAlignment = SWT.FILL;
-        comp.setLayoutData(gd);
-        comp.setText(labelText);
-        comp.setFont(parent.getFont());
-        return comp;
-    }
-	
-	/** 
-	 * Create composite
-	 * @param parent
-	 * @param numColumns
-	 * @return
-	 */
-	protected Composite createComposite(Composite parent, int numColumns) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(numColumns, false));
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));		
-		return composite;
-	}	
-	
-	/** 
-	 * Create check type button
-	 * @param parent
-	 * @param label
-	 * @return
-	 */
-	protected Button createCheckButton(Composite parent, String label) {
-		return createButton(parent, label, SWT.CHECK | SWT.LEFT);
-	}
-	
-	/** 
-	 * Create normal button
-	 * @param parent
-	 * @param label
-	 * @param type
-	 * @return
-	 */
-	protected Button createButton(Composite parent, String label, int type) {
-		Button button = new Button(parent, type);
-		button.setText(label);
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		return button;
-	}
-	
-	/** 
-	 * Create combo box
-	 * @param parent
-	 * @param label
-	 * @param data
-	 * @param selectedData
-	 * @return
-	 */
-	protected Combo createCombo(Composite parent, String label, String[] data, String selectedData) {
-		createLabel(parent, label, SWT.DEFAULT, SWT.DEFAULT, SWT.LEFT);
-		Combo combo = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
-		combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		combo.setItems(data);
-		int selectedIndex = combo.indexOf(selectedData);
-		combo.select((selectedIndex<0)?0:selectedIndex);		
-		return combo;
-	}
-	
-	/** 
-	 * Create label
-	 * @param parent
-	 * @param text
-	 * @param widthHint
-	 * @param heightHint
-	 * @param style
-	 * @return
-	 */
-	protected Label createLabel(Composite parent, String text, int widthHint, int heightHint, int style) {
-		Label label = new Label(parent, style);		
-		label.setText(text);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 1;
-		gd.widthHint = widthHint;
-		gd.heightHint = heightHint;
-		label.setLayoutData(gd);
-		return label;
-	}	
-	
-	/** 
-	 * Create spacer
-	 * @param composite
-	 * @param columnSpan
-	 */
-	protected void createSpacer(Composite composite, int columnSpan) {
-		Label label = new Label(composite, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = columnSpan;
-		label.setLayoutData(gd);
-	}
-		
-	/** 
-	 * Get pages
-	 * @return
-	 */
-	protected IWorkbenchPage[] getPages() {
-		final List<IWorkbenchPage> pages = new ArrayList<IWorkbenchPage>();
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			public void run() {
-				if (fWorkbench != null) {
-					IWorkbenchWindow[] windows = fWorkbench.getWorkbenchWindows();
-					for (int i=0; i<windows.length; i++) {
-						pages.add(windows[i].getActivePage());
-					}
-				}
-			}
-		} );
-		return (IWorkbenchPage[])pages.toArray(new IWorkbenchPage[0]);
-	}   
-
-	/** 
-	 * Store preference values
-	 */
-	protected abstract void storeValues();
-	
-	/** 
-	 * Set preference values
-	 */
-	protected abstract void setValues();
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PTPPreferencesPage.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PTPPreferencesPage.java
deleted file mode 100644
index e404e43..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PTPPreferencesPage.java
+++ /dev/null

@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.PreferenceConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.UIMessage;
-import org.eclipse.ptp.utils.ui.swt.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class PTPPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage {
-	public static final String EMPTY_STRING = "";
-	protected Text outputDirText = null;
-	protected Button browseButton = null;
-	protected IntegerFieldEditor storeLineField = null;
-	private String outputDIR = EMPTY_STRING;
-	private String defaultOutputDIR = "/tmp";
-	private int storeLine = PreferenceConstants.DEF_STORE_LINE;
-
-	public PTPPreferencesPage() {
-		setPreferenceStore(PTPUIPlugin.getDefault().getPreferenceStore());
-		// setDescription(UIMessage.getResourceString("PTPPreferencesPage.preferencesDescription"));
-	}
-
-	protected class WidgetListener extends SelectionAdapter implements ModifyListener, IPropertyChangeListener {
-		public void widgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == browseButton)
-				handleOutputDirectoryBrowseButtonSelected();
-			else
-				updatePreferencePage();
-		}
-		public void modifyText(ModifyEvent evt) {
-			updatePreferencePage();
-		}
-		public void propertyChange(PropertyChangeEvent event) {
-			if (event.getProperty().equals(FieldEditor.IS_VALID))
-				updatePreferencePage();
-		}
-	}
-
-	protected WidgetListener listener = new WidgetListener();
-
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(createGridLayout(1, true, 0, 0));
-		composite.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL, 2));
-		createOutputContents(composite);
-		loadSaved();
-		defaultSetting();
-		return composite;
-	}
-	
-	protected Button createCheckButton(Composite parent, String label) {
-		return createButton(parent, label, SWT.CHECK | SWT.LEFT);
-	}
-	
-	protected Button createButton(Composite parent, String label, int type) {
-		Button button = new Button(parent, type);
-		button.setText(label);
-		GridData data = new GridData();
-		button.setLayoutData(data);
-		return button;
-	}
-	
-	private void createOutputContents(Composite parent) {
-		Group aGroup = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		aGroup.setLayout(createGridLayout(1, true, 10, 10));
-		aGroup.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL, 2));
-		aGroup.setText(UIMessage.getResourceString("PTPPreferencesPage.group_output"));
-		Composite outputComposite = new Composite(aGroup, SWT.NONE);
-		outputComposite.setLayout(createGridLayout(3, false, 0, 0));
-		outputComposite.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL, 5));
-		new Label(outputComposite, SWT.NONE).setText(UIMessage.getResourceString("PTPPreferencesPage.output_text"));
-		outputDirText = new Text(outputComposite, SWT.SINGLE | SWT.BORDER);
-		outputDirText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		outputDirText.addModifyListener(listener);
-		browseButton = SWTUtil.createPushButton(outputComposite, UIMessage.getResourceString("PTPPreferencesPage.browseButton"), null);
-		browseButton.addSelectionListener(listener);
-		Composite lineComposite = new Composite(aGroup, SWT.NONE);
-		lineComposite.setLayout(new FillLayout());
-		lineComposite.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL, 5));
-		storeLineField = new IntegerFieldEditor(PreferenceConstants.STORE_LINE, UIMessage.getResourceString("PTPPreferencesPage.store_line_text"), lineComposite);
-		storeLineField.setPropertyChangeListener(listener);
-		storeLineField.setEmptyStringAllowed(false);
-	}
-	protected void defaultSetting() {
-		outputDirText.setText(outputDIR);
-		storeLineField.setStringValue(String.valueOf(storeLine));
-	}
-	private void loadSaved() {
-		Preferences preferences = PTPCorePlugin.getDefault().getPluginPreferences();
-		// System.out.println("PREFS:");
-		// String[] foo = preferences.defaultPropertyNames();
-		// for(int i=0; i<foo.length; i++) {
-		// System.out.println("DEFAULT["+i+"] = "+foo[i]);
-		// }
-		// foo = preferences.propertyNames();
-		// for(int i=0; i<foo.length; i++) {
-		// System.out.println("non-default prop["+i+"] = "+foo[i]);
-		// }
-		outputDIR = preferences.getString(PreferenceConstants.OUTPUT_DIR);
-		if (outputDIR.equals(""))
-			outputDIR = defaultOutputDIR;
-		if (outputDIR != null)
-			outputDirText.setText(outputDIR);
-		storeLine = preferences.getInt(PreferenceConstants.STORE_LINE);
-		storeLineField.setStringValue(String.valueOf(storeLine));
-	}
-	/* do stuff on init() of preferences, if anything */
-	public void init(IWorkbench workbench) {}
-	public void dispose() {
-		super.dispose();
-	}
-	public void performDefaults() {
-		defaultSetting();
-		updateApplyButton();
-	}
-	private void store() {
-		outputDIR = outputDirText.getText();
-		storeLine = storeLineField.getIntValue();
-	}
-	public boolean performOk() {
-		store();
-		Preferences preferences = PTPCorePlugin.getDefault().getPluginPreferences();
-		preferences.setValue(PreferenceConstants.OUTPUT_DIR, outputDIR);
-		preferences.setValue(PreferenceConstants.STORE_LINE, storeLine);
-		PTPCorePlugin.getDefault().savePluginPreferences();
-		/*
-		 * IModelManager manager = PTPCorePlugin.getDefault().getModelManager(); 
-		 * if (manager.isParallelPerspectiveOpen() && (lastMSChoiceID != MSChoiceID || lastCSChoiceID != CSChoiceID)) {
-		 * manager.refreshRuntimeSystems(CSChoiceID, MSChoiceID); }
-		 */
-		File outputDirPath = new File(outputDIR);
-		if (!outputDirPath.exists())
-			outputDirPath.mkdir();
-		return true;
-	}
-	protected void handleOutputDirectoryBrowseButtonSelected() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		dialog.setText(UIMessage.getResourceString("PTPPreferencesPage.Select_Output_Directory"));
-		String currectDirPath = getFieldContent(outputDirText.getText());
-		if (currectDirPath != null) {
-			File path = new File(currectDirPath);
-			if (path.exists())
-				dialog.setFilterPath(currectDirPath);
-		}
-		String selectedDirPath = dialog.open();
-		if (selectedDirPath != null)
-			outputDirText.setText(selectedDirPath);
-	}
-	protected boolean isValidOutputSetting() {
-		String name = getFieldContent(outputDirText.getText());
-		if (name == null) {
-			setErrorMessage(UIMessage.getResourceString("PTPPreferencesPage.Incorrect_Output_directory"));
-			setValid(false);
-			return false;
-		}
-		File path = new File(name);
-		if (!path.exists()) {
-			File parent = path.getParentFile();
-			if (parent == null || !parent.exists()) {
-				setErrorMessage(UIMessage.getResourceString("PTPPreferencesPage.Incorrect_Output_directory"));
-				setValid(false);
-				return false;
-			}
-		}
-		if (!storeLineField.isValid()) {
-			setErrorMessage(storeLineField.getErrorMessage());
-			setValid(false);
-			return false;
-		}
-		return true;
-	}
-	protected void updatePreferencePage() {
-		setErrorMessage(null);
-		setMessage(null);
-		if (!isValidOutputSetting())
-			return;
-		setValid(true);
-	}
-	protected String getFieldContent(String text) {
-		if (text.trim().length() == 0 || text.equals(EMPTY_STRING))
-			return null;
-		return text;
-	}
-	protected GridLayout createGridLayout(int columns, boolean isEqual, int mh, int mw) {
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = columns;
-		gridLayout.makeColumnsEqualWidth = isEqual;
-		gridLayout.marginHeight = mh;
-		gridLayout.marginWidth = mw;
-		return gridLayout;
-	}
-	protected GridData spanGridData(int style, int space) {
-		GridData gd = null;
-		if (style == -1)
-			gd = new GridData();
-		else
-			gd = new GridData(style);
-		gd.horizontalSpan = space;
-		return gd;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceInitializer.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceInitializer.java
deleted file mode 100644
index 5b44d06..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceInitializer.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-
-/**
- * @author Clement chu
- * 
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = PTPUIPlugin.getDefault().getPreferenceStore();
-		store.setDefault(IPTPUIConstants.VIEW_ICON_SPACING_X, IPTPUIConstants.DEFAULT_VIEW_ICON_SPACING_X);
-		store.setDefault(IPTPUIConstants.VIEW_ICON_SPACING_Y, IPTPUIConstants.DEFAULT_VIEW_ICON_SPACING_Y);
-		store.setDefault(IPTPUIConstants.VIEW_ICON_WIDTH, IPTPUIConstants.DEFAULT_VIEW_ICON_WIDTH);
-		store.setDefault(IPTPUIConstants.VIEW_ICON_HEIGHT, IPTPUIConstants.DEFAULT_VIEW_ICON_HEIGHT);
-		store.setDefault(IPTPUIConstants.VIEW_TOOLTIP_SHOWALLTIME, false);
-		store.setDefault(IPTPUIConstants.VIEW_TOOLTIP_TIMEOUT, IPTPUIConstants.DEFAULT_VIEW_TOOLTIP);
-		store.setDefault(IPTPUIConstants.VIEW_TOOLTIP_ISWRAP, true);
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.java
deleted file mode 100644
index c88fa2a..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.preferences;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class PreferenceMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.ui.preferences.PreferenceMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/** Get String text
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.properties b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.properties
deleted file mode 100644
index 7d6c621..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/PreferenceMessages.properties
+++ /dev/null

@@ -1,36 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-
-RMPreferencesPage.desc=General settings for resource managers
-RMPreferencesPage.label=Default remote services provider:
-
-ViewerPreferencePage.desc=PTP Viewer Settings
-ViewerPreferencesPage.iconName=Icons
-ViewerPreferencesPage.icon_spacing_x=Spacing x:
-ViewerPreferencesPage.icon_spacing_y=Spacing y:
-ViewerPreferencesPage.icon_width=Spacing width:
-ViewerPreferencesPage.icon_height=Spacing height:
-ViewerPreferencesPage.tooltipName=Tooltip
-ViewerPreferencesPage.tooltip_timeout=Timeout (ms):
-ViewerPreferencesPage.tooltip_iswrap=Wrap text
-ViewerPreferencesPage.tooltip_showAllTime=Show all the time
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/RMPreferencesPage.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/RMPreferencesPage.java
deleted file mode 100644
index 852518d..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/RMPreferencesPage.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.preferences;
-
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author Clement chu
- * 
- */
-public class RMPreferencesPage extends AbstractPreferencePage {
-	protected Combo remoteServicesCombo;
-		
-	/** Constructor
-	 * 
-	 */
-	public RMPreferencesPage() {
-		super();
-		setPreferenceStore(PTPUIPlugin.getDefault().getPreferenceStore());
-		setDescription(PreferenceMessages.getString("RMPreferencesPage.desc"));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	public void performDefaults() { 
-		super.performDefaults();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#setValues()
-	 */
-	protected void setValues() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#storeValues()
-	 */
-	protected void storeValues() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#isValid()
-	 */
-	public boolean isValid() {
-		setErrorMessage(null);
-		setMessage(null);
-		return true;
-	}	
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/ViewerPreferencesPage.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/ViewerPreferencesPage.java
deleted file mode 100644
index e9bafab..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/preferences/ViewerPreferencesPage.java
+++ /dev/null

@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Clement chu
- * 
- */
-public class ViewerPreferencesPage extends AbstractPreferencePage {
-	private ViewIntFieldEditor toolTipField = null;
-	private Button tooltipIsWrapButton = null;
-	private Button tooltipShowAllTimeButton = null;
-	
-	/** Inner class ViewIntFieldEditor
-	 *	used for validation of text field
-	 *
-	 */
-	private class ViewIntFieldEditor {
-		private int textLimit = 5;
-		private String labelText = null;
-		private int min = 0;
-		private int max = 10;
-		private Text textField = null;		
-		private String msg = "";
-		
-		/** Constructor
-		 * @param labelText
-		 * @param min
-		 * @param max
-		 * @param parent
-		 */
-		ViewIntFieldEditor(String labelText, int min, int max, Composite parent) {
-			this.labelText = labelText;
-			this.min = min;
-			this.max = max;
-			createControl(parent);
-		}
-		
-		/** Create control
-		 * @param parent
-		 */
-		protected void createControl(Composite parent) {
-			doFillIntoGrid(parent);
-		}
-		
-		/** Create text field into given composite
-		 * @param parent
-		 */
-		protected void doFillIntoGrid(Composite parent) {
-			new Label(parent, SWT.LEFT).setText(labelText);
-            
-			textField = new Text(parent, SWT.SINGLE | SWT.BORDER);
-            textField.setFont(parent.getFont());
-            textField.setTextLimit(textLimit);
-            textField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        	textField.addModifyListener(new ModifyListener() {
-        		public void modifyText(ModifyEvent e) {
-        			ViewerPreferencesPage.this.isValid();
-        		}	        		
-        	});
-			
-			new Label(parent, SWT.RIGHT).setText("(" + min + "-" + max + ")");
-		}
-		
-		/** Set text field enabled
-		 * @param isEnable
-		 */
-		public void setEnabled(boolean isEnable) {
-			if (textField != null) {
-				textField.setEnabled(isEnable);
-			}
-		}
-		
-	    /** Set value into text field
-	     * @param value
-	     */
-	    public void setValue(int value) {
-	        if (textField != null) {
-	        	textField.setText(String.valueOf(value));
-	        }
-	    }
-	    
-	    /** Get value from text field
-	     * @return
-	     */
-	    public int getValue() {
-	    	try {
-	    		return Integer.parseInt(textField.getText());
-	    	} catch (NumberFormatException e) {
-	    		return 0;
-	    	}
-	    }
-	    
-	    /** Set error message 
-	     * @param msg
-	     */
-	    public void setErrorMessage(String msg) {
-	    	this.msg = msg;
-	    }
-	    
-	    /** Get error message
-	     * @return
-	     */
-	    public String getErrorMessage() {
-	    	return msg;
-	    }
-	    
-	    /** Is text field valid
-	     * @return
-	     */
-	    public boolean isValid() {
-	    	setErrorMessage("");
-	    	try {
-	    		int value = Integer.parseInt(textField.getText());
-	    		if (value < min || value > max) {
-	    			setErrorMessage("Value must be in the range of (" + min + "-" + max + ")");
-	    			return false;
-	    		}
-	    	} catch (NumberFormatException e) {
-	    		setErrorMessage("Value must be integer: " + e.getMessage());
-	    		return false;
-	    	}
-	    	return true;
-	    }
-	}
-	
-	/** Constructor
-	 * 
-	 */
-	public ViewerPreferencesPage() {
-		super();
-		setPreferenceStore(PTPUIPlugin.getDefault().getPreferenceStore());
-		setDescription(PreferenceMessages.getString("ViewerPreferencePage.desc"));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		//getWorkbench().getHelpSystem().setHelp(getControl(), IPDebugHelpContextIds.P_DEBUG_PREFERENCE_PAGE);
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-		createSpacer(composite, 1);
-		createViewSettingPreferences(composite);
-		setValues();
-		return composite;
-	}
-	
-	/** Create tooltip group composite
-	 * @param parent
-	 */
-	protected void createTooltipGroup(Composite parent) {
-		Composite group = createGroupComposite(parent, 1, false, PreferenceMessages.getString("ViewerPreferencesPage.tooltipName"));
-		Composite compTooltip = createComposite(group, 1);
-
-		tooltipShowAllTimeButton = createCheckButton(compTooltip, PreferenceMessages.getString("ViewerPreferencesPage.tooltip_showAllTime"));
-		tooltipShowAllTimeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				toolTipField.setEnabled(!tooltipShowAllTimeButton.getSelection());
-				if (tooltipShowAllTimeButton.getSelection())
-					toolTipField.setValue((int)getPreferenceStore().getDefaultLong(IPTPUIConstants.VIEW_TOOLTIP_TIMEOUT));
-			}
-		});
-		toolTipField = new ViewIntFieldEditor(PreferenceMessages.getString("ViewerPreferencesPage.tooltip_timeout"), 1000, 10000, createComposite(compTooltip, 3));
-		tooltipIsWrapButton = createCheckButton(compTooltip, PreferenceMessages.getString("ViewerPreferencesPage.tooltip_iswrap"));
-	}
-	
-	/** Create icon group composite
-	 * @param parent
-	 */
-	protected void createIconGroup(Composite parent) {
-		/*
-		Composite group = createGroupComposite(parent, 1, false, PreferenceMessages.getString("ViewerPreferencesPage.iconName"));
-		Composite compIcon = createComposite(group, 3);
-
-		iconSpacingXField = new ViewIntFieldEditor(PreferenceMessages.getString("ViewerPreferencesPage.icon_spacing_x"), 1, 10, compIcon);
-		iconSpacingYField = new ViewIntFieldEditor(PreferenceMessages.getString("ViewerPreferencesPage.icon_spacing_y"), 1, 10, compIcon);
-
-		iconWidthField = new ViewIntFieldEditor(PreferenceMessages.getString("ViewerPreferencesPage.icon_width"), 12, 100, compIcon);
-		iconHeightField = new ViewIntFieldEditor(PreferenceMessages.getString("ViewerPreferencesPage.icon_height"), 12, 100, compIcon);
-		*/		
-	}
-	
-	/** Create view setting preferences
-	 * @param parent
-	 */
-	protected void createViewSettingPreferences(Composite parent) {
-		//createIconGroup(parent);
-		createTooltipGroup(parent);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	public void performDefaults() { 
-		IPreferenceStore store = getPreferenceStore();
-		/*
-		iconSpacingXField.setValue(store.getDefaultInt(IPTPUIConstants.VIEW_ICON_SPACING_X));
-		iconSpacingYField.setValue(store.getDefaultInt(IPTPUIConstants.VIEW_ICON_SPACING_Y));
-		iconWidthField.setValue(store.getDefaultInt(IPTPUIConstants.VIEW_ICON_WIDTH));
-		iconHeightField.setValue(store.getDefaultInt(IPTPUIConstants.VIEW_ICON_HEIGHT));
-		*/
-		toolTipField.setValue((int)store.getDefaultLong(IPTPUIConstants.VIEW_TOOLTIP_TIMEOUT));
-		tooltipIsWrapButton.setSelection(store.getDefaultBoolean(IPTPUIConstants.VIEW_TOOLTIP_ISWRAP));
-		tooltipShowAllTimeButton.setSelection(store.getDefaultBoolean(IPTPUIConstants.VIEW_TOOLTIP_SHOWALLTIME));
-		super.performDefaults();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		storeValues();
-		PTPUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#setValues()
-	 */
-	protected void setValues() {
-		IPreferenceStore store = getPreferenceStore();
-		/*
-		iconSpacingXField.setValue(store.getInt(IPTPUIConstants.VIEW_ICON_SPACING_X));
-		iconSpacingYField.setValue(store.getInt(IPTPUIConstants.VIEW_ICON_SPACING_Y));
-		iconWidthField.setValue(store.getInt(IPTPUIConstants.VIEW_ICON_WIDTH));
-		iconHeightField.setValue(store.getInt(IPTPUIConstants.VIEW_ICON_HEIGHT));
-		*/
-		toolTipField.setValue((int)store.getLong(IPTPUIConstants.VIEW_TOOLTIP_TIMEOUT));
-		tooltipIsWrapButton.setSelection(store.getBoolean(IPTPUIConstants.VIEW_TOOLTIP_ISWRAP));
-		tooltipShowAllTimeButton.setSelection(store.getBoolean(IPTPUIConstants.VIEW_TOOLTIP_SHOWALLTIME));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#storeValues()
-	 */
-	protected void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		/*
-		store.setValue(IPTPUIConstants.VIEW_ICON_SPACING_X, iconSpacingXField.getValue());
-		store.setValue(IPTPUIConstants.VIEW_ICON_SPACING_Y, iconSpacingYField.getValue());
-		store.setValue(IPTPUIConstants.VIEW_ICON_WIDTH, iconWidthField.getValue());
-		store.setValue(IPTPUIConstants.VIEW_ICON_HEIGHT, iconHeightField.getValue());
-		*/
-		store.setValue(IPTPUIConstants.VIEW_TOOLTIP_TIMEOUT, (long)toolTipField.getValue());
-		store.setValue(IPTPUIConstants.VIEW_TOOLTIP_ISWRAP, tooltipIsWrapButton.getSelection());
-		store.setValue(IPTPUIConstants.VIEW_TOOLTIP_SHOWALLTIME, tooltipShowAllTimeButton.getSelection());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#isValid()
-	 */
-	public boolean isValid() {
-		setErrorMessage(null);
-		setMessage(null);
-		/*
-		if (!iconSpacingXField.isValid()) {
-			setErrorMessage(iconSpacingXField.getErrorMessage());
-			return false;
-		}
-		if (!iconSpacingYField.isValid()) {
-			setErrorMessage(iconSpacingYField.getErrorMessage());
-			return false;
-		}
-		if (!iconWidthField.isValid()) {
-			setErrorMessage(iconWidthField.getErrorMessage());
-			return false;
-		}
-		if (!iconHeightField.isValid()) {
-			setErrorMessage(iconHeightField.getErrorMessage());
-			return false;
-		}
-		*/
-		if (!toolTipField.isValid()) {
-			setErrorMessage(toolTipField.getErrorMessage());
-			return false;
-		}
-		return true;
-	}	
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/utils/DebugUtil.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/utils/DebugUtil.java
deleted file mode 100644
index b43861d..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/utils/DebugUtil.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.ui.utils;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-
-public class DebugUtil {
-	private static final String JOBS_VIEW_TRACING_OPTION = "org.eclipse.ptp.ui/views/jobs/tracing";
-	private static final String MACHINES_VIEW_TRACING_OPTION = "org.eclipse.ptp.ui/views/machines/tracing";
-
-	public static boolean JOBS_VIEW_TRACING = false;
-	public static boolean MACHINES_VIEW_TRACING = false; 
-
-	public static void configurePluginDebugOptions() {
-		if (PTPUIPlugin.getDefault().isDebugging()) {
-			String option = Platform.getDebugOption(JOBS_VIEW_TRACING_OPTION);
-			if (option != null) {
-				JOBS_VIEW_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(MACHINES_VIEW_TRACING_OPTION);
-			if (option != null) {
-				MACHINES_VIEW_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-		}
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelElementView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelElementView.java
deleted file mode 100644
index 2e27d9c..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelElementView.java
+++ /dev/null

@@ -1,484 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- *
- * @author clement chu
- * 
- */
-public abstract class AbstractParallelElementView extends AbstractParallelView implements IIconCanvasActionListener,
-		IToolTipProvider, IImageProvider, IContentProvider, ISelectionChangedListener {
-
-	protected final String DEFAULT_TITLE = "Parallel";
-	protected IManager manager = null;
-	// Set
-	protected IElementSet cur_element_set = null;
-	protected int cur_set_size = 0;
-	protected ElementIconCanvas canvas = null;
-	// title
-	protected final String EMPTY_TITLE = " ";
-	protected Color registerColor = null;
-	
-	protected IconRefreshWorkbenchJob iconreFreshJob = new IconRefreshWorkbenchJob();
-	
-	private boolean debug = false;
-
-	/**
-	 * update preference setting 
-	 */
-	protected IPropertyChangeListener propertyChangeListener = new IPropertyChangeListener() {
-		public void propertyChange(PropertyChangeEvent event) {
-			final String preferenceType = event.getProperty();
-			final Object value = event.getNewValue();
-			if (value != null) {
-				showWhile(new Runnable() {
-					public void run() {
-						if (!canvas.isDisposed()) {
-							if (preferenceType.startsWith("icon")) {
-								IPreferenceStore store = PTPUIPlugin.getDefault().getPreferenceStore();
-								canvas.setIconSpace(store.getInt(IPTPUIConstants.VIEW_ICON_SPACING_X), store.getInt(IPTPUIConstants.VIEW_ICON_SPACING_Y));
-								canvas.setIconSize(store.getInt(IPTPUIConstants.VIEW_ICON_WIDTH), store.getInt(IPTPUIConstants.VIEW_ICON_HEIGHT));
-							}
-							else if (preferenceType.equals(IPTPUIConstants.VIEW_TOOLTIP_SHOWALLTIME)) {
-								canvas.showTooltipAllthetime(new Boolean((String)value).booleanValue());
-							}
-							else if (preferenceType.equals(IPTPUIConstants.VIEW_TOOLTIP_TIMEOUT)) {
-								canvas.setTooltipTimeout(new Long((String)value).longValue());
-							}
-							else if (preferenceType.equals(IPTPUIConstants.VIEW_TOOLTIP_ISWRAP)) {
-								canvas.setTooltipWrap(new Boolean((String)value).booleanValue());
-							}
-							canvas.resetCanvas();
-						}
-						refresh(false);
-					}
-				});
-			}
-		}
-	};
-	
-	public AbstractParallelElementView(IManager manager) {
-		this.manager = manager;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		registerPartListener();
-		PTPUIPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(propertyChangeListener);
-		createView(parent);
-		setContentDescription(EMPTY_TITLE);
-		registerColor = getDisplay().getSystemColor(SWT.COLOR_WIDGET_BORDER);
-	}
-	/** Set the color of registered element
-	 * @param color
-	 */
-	public void setRegisterColor(Color color) {
-		this.registerColor = color;
-	}
-	/** Create Element View
-	 * @param parent
-	 */
-	protected void createView(Composite parent) {
-		createElementView(parent);
-	}
-	/** Get IManager
-	 * @return IManager
-	 */
-	public IManager getUIManager() {
-		return manager;
-	}
-	public IElementHandler getElementHandler(String id) {
-		return manager.getElementHandler(id);
-	}
-	/** Get current element handler
-	 * @return IElementHandler
-	 */
-	public IElementHandler getCurrentElementHandler() {
-		return getElementHandler(getCurrentID());
-	}
-	/** Change view title
-	 * @param title title
-	 * @param setName set name
-	 * @param size element size
-	 */
-	protected void changeTitle(String title, String setName, int size) {
-		changeTitle(" " + title + " - " + setName + " [" + size + "]");
-	}
-	/** Change view title
-	 * @param message Message of title
-	 */
-	protected void changeTitle(final String message) {
-		asyncExec(new Runnable() {
-			public void run() {
-				setContentDescription(message);
-			}
-		});
-	}
-	/** Create element videw
-	 * @param parent parent composite
-	 * @return composite
-	 */
-	protected Composite createElementView(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new FillLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setBackground(getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		canvas = new ElementIconCanvas(this, composite, SWT.NONE);
-		canvas.setContentProvider(this);
-		canvas.setImageProvider(this);
-		canvas.setToolTipProvider(this);
-		canvas.addActionListener(this);
-		canvas.addSelectionChangedListener(this);
-		//getSite().setSelectionProvider(canvas);
-		return composite;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		canvas.removeActionListener(this);
-		canvas.removeSelectionChangedListener(this);
-		canvas.dispose();
-		PTPUIPlugin.getDefault().getPluginPreferences().removePropertyChangeListener(propertyChangeListener);
-		deregisterPartListener();
-		super.dispose();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		canvas.setFocus();
-	}
-	/** Get current set ID
-	 * @return current set ID
-	 */
-	public String getCurrentSetID() {
-		return manager.getCurrentSetId();
-	}
-	/** Fire set change event
-	 * @param cur_set current set 
-	 * @param pre_set previous set
-	 */
-	public void fireSetChangeEvent(IElementSet cur_set, IElementSet pre_set) {
-		manager.fireSetEvent(IManager.CHANGE_SET_TYPE, null, cur_set, pre_set);
-	}
-	/** Select set
-	 * @param set Target set
-	 */
-	public void selectSet(IElementSet set) {
-		if (!canvas.isDisposed()) {
-			cur_set_size = 0;
-			if (set != null) {
-				cur_set_size = set.size();
-				manager.setCurrentSetId(set.getID());
-			}
-			canvas.setElementSet(set);
-			// send event if current viewer is visible
-			if (isVisible())
-				fireSetChangeEvent(set, cur_element_set);
-			cur_element_set = set;
-		}
-		//updateAction();
-	}
-	/** Get current set
-	 * @return current set
-	 */
-	public IElementSet getCurrentSet() {
-		return cur_element_set;
-	}
-	public void build() {
-		initialView();
-	}
-	/**
-	 * Refresh view
-	 */
-	public void refresh(boolean all, boolean force) {
-		if (isVisible())
-			iconreFreshJob.schedule(all, force);
-	}
-	public void refresh(boolean all) {
-		refresh(all, false);
-		/*
-		WorkbenchJob uiJob = new WorkbenchJob("Refreshing icons...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				repaint(all);
-				if (!canvas.isDisposed()) {
-					canvas.redraw();
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		uiJob.setSystem(true);
-		uiJob.schedule();
-		*/
-		/*
-		getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (all)
-					updateAction();
-				repaint(all);
-				if (!canvas.isDisposed()) {
-					canvas.redraw();
-				}
-			}
-		});
-		 */
-	}
-	public abstract void updateAction();
-	// Set element info
-	/** Initial view setting
-	 * 
-	 */
-	protected abstract void initialView();
-	// Set element to display
-	/** Initial elements setting
-	 * 
-	 */
-	protected abstract void initialElement();
-	// set update view details
-	/** Update view details
-	 * 
-	 */
-	public abstract void update();
-	/** Update view title
-	 * 
-	 */
-	public abstract void updateTitle();
-	/** Get current ID
-	 * @return element ID
-	 */
-	public abstract String getCurrentID();
-	/** Double click action
-	 * @param element Target element
-	 */
-	protected abstract void doubleClick(IElement element);
-	/** Get element image
-	 * @param index1 first array index
-	 * @param index2 second array index
-	 * @return image
-	 */
-	protected abstract Image getImage(int index1, int index2);
-	/** Get tooltip text
-	 * @param obj Selected element
-	 * @return text of tooltip
-	 */
-	protected abstract String[] getToolTipText(Object obj);
-	/** Find actual object
-	 * @param element Target element
-	 * @return object represent of element
-	 */
-	protected abstract Object convertElementObject(IElement element);
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * IContentProvider
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IContentProvider#getObject(int)
-	 */
-	public Object getObject(int index) {
-		if (canvas != null && manager != null) {
-			return canvas.getElement(index);
-		}
-		return null;
-	}
-	public String getRulerIndex(Object obj, int index) {
-		return String.valueOf(index);
-	}
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * IToolTipProvider
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IToolTipProvider#toolTipText(java.lang.Object)
-	 */
-	public String[] toolTipText(Object obj) {
-		if (obj instanceof IElement) {			
-			return getToolTipText(convertElementObject((IElement)obj));
-		}
-		return new String[] { "" };
-	}
-	public void update(Object obj, String content) {
-		canvas.updateToolTipText(obj, content);
-	}
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * Image Provider
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IImageProvider#getStatusIcon(java.lang.Object, boolean)
-	 */
-	public Image getStatusIcon(Object obj, int index, boolean isSelected) {
-		if (cur_element_set != null && obj instanceof IElement) {
-			int status = manager.getStatus((IElement)obj, index);
-			return getImage(status, isSelected ? 1 : 0);
-		}
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IImageProvider#drawSpecial(java.lang.Object, org.eclipse.swt.graphics.GC, int, int, int, int)
-	 */
-	public void drawSpecial(Object obj, int index, GC gc, int x_loc, int y_loc, int width, int height) {
-		if (cur_element_set != null && obj instanceof IElement) {
-			if (((IElement)obj).isRegistered()) {
-				gc.setForeground(registerColor);
-				gc.drawRectangle(x_loc, y_loc, width, height);
-				gc.setForeground(canvas.getForeground());
-			}
-		}
-	}
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * IIconCanvasActionListener
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IIconCanvasActionListener#handleAction(int, int)
-	 */
-	public void handleAction(int type, int index) {
-		if (index > -1) {
-			IElement element = canvas.getElement(index);
-			switch (type) {
-				case IIconCanvasActionListener.DOUBLE_CLICK_ACTION:
-					doubleClick(element);
-					break;
-			}
-		}
-	}
-	/** Show ruler
-	 * @param showRuler true if show ruler
-	 */
-	public void setDisplayRuler(final boolean showRuler) {
-		asyncExec(new Runnable() {
-			public void run() {
-				if (!canvas.isDisposed()) {
-					canvas.setDisplayRuler(showRuler);
-				}
-				refresh(false);
-			}
-		});
-	}
-	/** Is ruler displayed
-	 * @return true if ruler is displayed
-	 */
-	public boolean isDisplayRuler() {
-		if (!canvas.isDisposed()) {
-			return canvas.isDisplayRuler();
-		}
-		return false;
-	}
-	
-	public ISelection getSelection() {
-		return canvas.getSelection();
-	}
-    
-	class IconRefreshWorkbenchJob extends WorkbenchJob {
-		private final ReentrantLock	waitLock = new ReentrantLock();
-		private List<Boolean> refreshList = new ArrayList<Boolean>();
-		public IconRefreshWorkbenchJob() {
-			super("Refreshing icons...");
-		}
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			boolean refreshAll = isRefreshAll();
-			if (debug) {
-				System.err.println("---------- IconRefreshWorkbenchJob refresh: " + refreshAll);
-			}
-			repaint(refreshAll);
-			if (!canvas.isDisposed()) {
-				canvas.redraw();
-			}
-			
-			//if last refresh object is true and previous refresh is false, then refresh again 
-			boolean lastValue = isRefreshAll();
-			waitLock.lock();
-			try {
-				refreshList.clear();
-				if (refreshAll != lastValue && !refreshAll) {
-					refreshList.add(new Boolean(true));
-					schedule();
-				}
-			}
-			finally {
-				waitLock.unlock();
-			}
-			return Status.OK_STATUS;
-		}
-		public boolean shouldSchedule() {
-			int size = size();
-			if (debug) {
-				System.err.println("---------- IconRefreshWorkbenchJob: " + refreshList.size());
-			}
-			return (size == 1);
-		}
-		private int size() {
-			waitLock.lock();
-			try {
-				return refreshList.size();
-			}
-			finally {
-				waitLock.unlock();
-			}
-		}
-		private boolean isRefreshAll() {
-			waitLock.lock();
-			try {
-				return refreshList.get(refreshList.size()-1).booleanValue();
-			}
-			finally {
-				waitLock.unlock();
-			}
-		}
-		public void schedule(boolean refresh_all, boolean force) {
-			waitLock.lock();
-			try {
-				if (force)
-					refreshList.clear();
-				refreshList.add(new Boolean(refresh_all));
-			}
-			finally {
-				waitLock.unlock();
-			}
-			schedule();
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelSetView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelSetView.java
deleted file mode 100644
index a29d772..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelSetView.java
+++ /dev/null

@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.internal.ui.actions.ChangeSetAction;
-import org.eclipse.ptp.internal.ui.actions.CreateSetAction;
-import org.eclipse.ptp.internal.ui.actions.DeleteSetAction;
-import org.eclipse.ptp.internal.ui.actions.DisplayRulerAction;
-import org.eclipse.ptp.internal.ui.actions.RemoveElementAction;
-import org.eclipse.ptp.internal.ui.actions.ZoomInAction;
-import org.eclipse.ptp.internal.ui.actions.ZoomOutAction;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PartInitException;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class AbstractParallelSetView extends AbstractParallelElementView {
-	protected List<IElement[]> clipboard = new ArrayList<IElement[]>();
-	
-	// selected element
-	protected String cur_selected_element_id = IManager.EMPTY_ID;
-	// default actions
-	protected ParallelAction createSetAction = null;
-	protected ParallelAction deleteSetAction = null;
-	protected ParallelAction deleteProcessAction = null;
-	protected ParallelAction changeSetAction = null;
-	protected ParallelAction zoomInAction = null;
-	protected ParallelAction zoomOutAction = null;
-
-	//zoom
-	protected int zoom_depth = 0;
-	protected Zoom zoom = new Zoom();
-
-	//last action
-	protected int last_action = -1;
-	protected IElementSet last_element_set = null;
-	
-	public AbstractParallelSetView(IManager manager) {
-		super(manager);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		clipboard.clear();
-		super.dispose();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		super.createPartControl(parent);
-		IToolBarManager toolBarMgr = getViewSite().getActionBars().getToolBarManager();
-		createToolBarActionGroup(toolBarMgr);
-		createToolBarActions(toolBarMgr);
-		IMenuManager menuMgr = getViewSite().getActionBars().getMenuManager();
-		createMenuActions(menuMgr);
-		createContextMenu();
-		initialView();
-	}
-	protected void createToolBarActionGroup(IToolBarManager toolBarMgr) {
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUIZOOMGROUP));
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUINAVIGATORGROUP));
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUIACTIONGROUP));
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUIEMPTYGROUP));
-
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUISETGROUP));
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUICHANGESETGROUP));
-	}
-	/** Build-in Toolbar actions
-	 * @param toolBarMgr
-	 */
-	protected void buildInToolBarActions(IToolBarManager toolBarMgr) {
-		zoomOutAction = new ZoomOutAction(this);
-		zoomInAction = new ZoomInAction(this);
-		createSetAction = new CreateSetAction(this);
-		deleteSetAction = new DeleteSetAction(this);
-		deleteProcessAction = new RemoveElementAction(this);
-		changeSetAction = new ChangeSetAction(this);
-		
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUIZOOMGROUP, zoomOutAction);
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUIZOOMGROUP, zoomInAction);
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUISETGROUP, createSetAction);
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUISETGROUP, deleteSetAction);
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUISETGROUP, deleteProcessAction);
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUICHANGESETGROUP, changeSetAction);
-	}
-	/** Create toolbar actions
-	 * @param toolBarMgr
-	 */
-	protected void createToolBarActions(IToolBarManager toolBarMgr) {
-		buildInToolBarActions(toolBarMgr);
-	}
-	/** Create menu actions
-	 * @param menuMgr
-	 */
-	protected void createMenuActions(IMenuManager menuMgr) {}
-	/** Create context menu
-	 * 
-	 */
-	protected void createContextMenu() {
-		MenuManager menuMgr = new MenuManager("#popupmenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(canvas);
-		canvas.setMenu(menu);
-		// Be sure to register it so that other plug-ins can add actions.
-		getSite().registerContextMenu(menuMgr, canvas);
-	}
-	/** Create context menu
-	 * @param manager
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(new Separator(IPTPUIConstants.IUIACTIONGROUP));
-		manager.add(new Separator(IPTPUIConstants.IUIEMPTYGROUP));
-		manager.add(new Separator(IPTPUIConstants.IUIZOOMGROUP));
-		manager.add(zoomOutAction);
-		manager.add(zoomInAction);
-		manager.add(new Separator(IPTPUIConstants.IUICHANGESETGROUP));
-		manager.add(changeSetAction);
-		manager.add(new Separator(IPTPUIConstants.IUIVIEWGROUP));
-		manager.add(new DisplayRulerAction(this));
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#update()
-	 */
-	public void update() {
-		updateAction();
-		updateTitle();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#updateTitle()
-	 */
-	public void updateTitle() {
-		if (cur_element_set != null)
-			changeTitle(manager.getFullyQualifiedName(getCurrentID()),
-					cur_element_set.getID(), cur_set_size);
-		else
-			changeTitle(manager.getFullyQualifiedName(getCurrentID()));
-	}
-	/** Update action
-	 * 
-	 */
-	public void updateAction() {
-		boolean deleteActionEnable = (manager.getCurrentSetId().length() == 0 || manager.getCurrentSetId().equals(IElementHandler.SET_ROOT_ID));
-		deleteSetAction.setEnabled(!deleteActionEnable);
-		deleteProcessAction.setEnabled(!deleteActionEnable);
-		createSetAction.setEnabled(cur_set_size > 0);
-		IElementHandler elementHandler = getCurrentElementHandler();
-		changeSetAction.setEnabled(!(elementHandler == null || elementHandler.size() == 0));
-		
-		zoomInAction.setEnabled(cur_set_size > 0 && zoom_depth > 0);
-		zoomOutAction.setEnabled(cur_set_size > 0 && zoom_depth < Zoom.max_depth);
-	}
-	/** Open process viewer
-	 * @param element Target IPProcess
-	 */
-	protected void openProcessViewer(final IPProcess element) {
-		if (element == null)
-			return;
-		showWhile(new Runnable() {
-			public void run() {
-				try {
-					PTPUIPlugin.getActivePage().openEditor(new ProcessEditorInput(element), IPTPUIConstants.VIEW_PARALLELProcess);
-				} catch (PartInitException e) {
-					PTPUIPlugin.log(e);
-				}
-			}
-		});
-	}
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * IIconCanvasActionListener
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IIconCanvasActionListener#handleAction(int, int[])
-	 */
-	public void handleAction(int type, int[] indexes) {
-		if (cur_element_set == null)
-			return;
-		
-		IElement[] elements = canvas.getElements(indexes);
-		switch (type) {
-		case IIconCanvasActionListener.COPY_ACTION:
-			if (elements.length > 0) {
-				clipboard.clear();
-				clipboard.add(elements);
-			}
-			break;
-		case IIconCanvasActionListener.CUT_ACTION:
-			if (elements.length > 0) {
-				if (!cur_element_set.isRootSet()) {
-					clipboard.clear();
-					clipboard.add(elements);
-					last_action = type;
-					last_element_set = cur_element_set;
-					//manager.removeFromSet(elements, cur_element_set.getID(), cur_element_set.getElementHandler());
-					//selectSet(cur_element_set.getElementHandler().getSet(cur_element_set.getID()));
-					//updateTitle();
-					//refresh(false);
-				}
-			}
-			break;
-		case IIconCanvasActionListener.PASTE_ACTION:
-			if (clipboard.size() > 0) {
-				IElement[] clipElements = (IElement[])clipboard.get(0);
-				if (last_action == IIconCanvasActionListener.CUT_ACTION) {
-					if (last_element_set != null && !last_element_set.getID().equals(cur_element_set.getID())) {
-						if (last_element_set.size() == clipElements.length) {
-							manager.removeSet(last_element_set.getID(), (IElementHandler)last_element_set.getParent());
-						}
-						else {
-							manager.removeFromSet(clipElements, last_element_set.getID(), (IElementHandler)last_element_set.getParent());
-						}
-					}
-				}
-				
-				if (cur_element_set.isRootSet())
-					createSetAction.run(clipElements);
-				else {
-					manager.addToSet(clipElements, cur_element_set.getID(), (IElementHandler)cur_element_set.getParent());
-					selectSet((IElementSet)((IElementHandler)cur_element_set.getParent()).getElementByID(cur_element_set.getID()));					
-					//update();
-					refresh(false);
-				}
-				type = -1;
-				last_element_set = null;
-			}
-			break;
-		case IIconCanvasActionListener.DELETE_ACTION:
-			if (elements.length > 0) {
-				if (!cur_element_set.isRootSet()) {
-					deleteProcessAction.run(elements);
-				}
-			}
-			break;
-		}
-	}
-	/*****************************************************************
-	 * Zoom
-	 *****************************************************************/
-	public void zoomOut() {
-		if (zoom_depth < Zoom.max_depth) {
-			zoom_depth++;
-			update();
-			if (!canvas.isDisposed()) {
-				canvas.setIconSize(zoom.scaled(IPTPUIConstants.DEFAULT_VIEW_ICON_WIDTH, zoom_depth), zoom.scaled(IPTPUIConstants.DEFAULT_VIEW_ICON_HEIGHT, zoom_depth));
-				canvas.setIconSpace(IPTPUIConstants.DEFAULT_VIEW_ICON_SPACING_X - zoom_depth, IPTPUIConstants.DEFAULT_VIEW_ICON_SPACING_Y);
-				canvas.setFontSizeSmaller();
-				canvas.resetCanvas();
-			}
-		}
-	}
-	public void zoomIn() {
-		if (zoom_depth > 0) {
-			zoom_depth--;
-			update();
-			if (!canvas.isDisposed()) {
-				canvas.setIconSize(zoom.scaled(IPTPUIConstants.DEFAULT_VIEW_ICON_WIDTH, zoom_depth), zoom.scaled(IPTPUIConstants.DEFAULT_VIEW_ICON_HEIGHT, zoom_depth));
-				canvas.setIconSpace(IPTPUIConstants.DEFAULT_VIEW_ICON_SPACING_X - zoom_depth, IPTPUIConstants.DEFAULT_VIEW_ICON_SPACING_Y);
-				canvas.setFontSizeBigger();
-				canvas.resetCanvas();
-			}
-		}
-	}
-	public Image getStatusIcon(Object obj, int index, boolean isSelected) {
-		Image img = super.getStatusIcon(obj, index, isSelected);
-		if (img != null) {
-			return zoom.getImage(img, zoom_depth);
-		}
-		return null;
-	}
-    
-	class Zoom {
-		protected static final int max_depth = 3;
-		protected Map<Image, Image[]> zoomImageMap = new HashMap<Image, Image[]>();
-		
-		public void cleanup() {
-			zoomImageMap.clear();
-		}
-		public Image getImage(Image image, int depth) {
-			if (depth == 0)
-				return image;
-			
-			Image[] images = (Image[])zoomImageMap.get(image);
-			if (images == null) {
-				images = new Image[max_depth];
-				zoomImageMap.put(image, images);
-			}
-			return getZoomImage(images, image, depth);
-		}
-		public Image getZoomImage(Image[] images, Image orgImg, int depth) {
-			if (images[depth-1] == null) {
-				images[depth-1] = scaledImage(orgImg, depth);
-			}
-			return images[depth-1];
-		}
-		public double getScale(int depth) {
-			double fix_factor = 0.2;
-			return (1 - (fix_factor * depth));
-		}
-		public int scaled(int measure, int depth) {
-			return (int)(measure * getScale(depth));
-		}
-		public Image scaledImage(Image image, int depth) {
-			return new Image(image.getDevice(), image.getImageData().scaledTo(scaled(IPTPUIConstants.DEFAULT_VIEW_ICON_WIDTH, depth), scaled(IPTPUIConstants.DEFAULT_VIEW_ICON_HEIGHT, depth)));
-		}
-	}    
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelView.java
deleted file mode 100644
index cadf37f..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/AbstractParallelView.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.part.ViewPart;
-/**
- * @author clement chu
- *
- */
-public abstract class AbstractParallelView extends ViewPart {
-	private boolean fIsVisible = false;
-	private ParallelViewPartListener partListener = null;
-	private boolean debug = false;
-
-	protected void registerPartListener() {
-		if (partListener == null) {
-			partListener = new ParallelViewPartListener();
-			getSite().getPage().addPartListener(partListener);
-		}
-	}
-	protected void deregisterPartListener() {
-		if (partListener != null) {
-			getSite().getPage().removePartListener(partListener);
-			partListener = null;
-		}
-	}
-
-	/** Get Display
-	 * @return display
-	 */
-	protected Display getDisplay() {
-		return getViewSite().getShell().getDisplay();
-	}
-	public void asyncExec(Runnable r) {
-		if (isVisible())
-			getDisplay().asyncExec(r);
-	}
-	public void syncExec(Runnable r) {
-		if (isVisible())
-			getDisplay().syncExec(r);
-	}
-	public void showWhile(Runnable r) {
-		if (isVisible())
-			BusyIndicator.showWhile(getDisplay(), r);
-	}
-	
-	public abstract void repaint(boolean all);
-	
-	/**
-	 * Notification this view is now visible.
-	 */
-	protected void becomesVisible() {}
-	/**
-	 * Notification this view is now hidden.
-	 */
-	protected void becomesHidden() {}
-	
-	public boolean isVisible() {
-		return fIsVisible;
-	}
-	private class ParallelViewPartListener implements IPartListener2 {
-		public void partActivated(IWorkbenchPartReference partRef) {
-			if (debug) {
-				System.err.println("-------------------- partActivated");
-			}
-			repaint(true);
-		}
-		public void partBroughtToTop(IWorkbenchPartReference partRef) {}
-		public void partClosed(IWorkbenchPartReference partRef) {}
-		public void partDeactivated(IWorkbenchPartReference partRef) {}
-		public void partInputChanged(IWorkbenchPartReference partRef) {}
-		public void partOpened(IWorkbenchPartReference partRef) {}
-		public void partHidden(IWorkbenchPartReference partRef) {
-			IWorkbenchPart part = partRef.getPart(false);
-			if (part == AbstractParallelView.this) {
-				fIsVisible = false;
-				becomesHidden();
-			}
-		}
-		public void partVisible(IWorkbenchPartReference partRef) {
-			IWorkbenchPart part = partRef.getPart(false);
-			if (part == AbstractParallelView.this) {
-				fIsVisible = true;
-				becomesVisible();
-			}
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ElementIconCanvas.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ElementIconCanvas.java
deleted file mode 100644
index bcce436..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ElementIconCanvas.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-
-/**
- * @author Clement chu
- * 
- */
-public class ElementIconCanvas extends IconCanvas implements ISelectionProvider {
-	private IElementSet cur_element_set = null;
-	private ListenerList listeners = new ListenerList();
-	private ISelection selection = null; 
-
-	/** Constructor
-	 * @param view 
-	 * @param parent
-	 * @param style view style
-	 */
-	public ElementIconCanvas(AbstractParallelElementView view, Composite parent, int style) {
-		super(parent, style);
-		IPreferenceStore store = PTPUIPlugin.getDefault().getPreferenceStore();
-		setIconSpace(store.getInt(IPTPUIConstants.VIEW_ICON_SPACING_X), store.getInt(IPTPUIConstants.VIEW_ICON_SPACING_Y));
-		setIconSize(store.getInt(IPTPUIConstants.VIEW_ICON_WIDTH), store.getInt(IPTPUIConstants.VIEW_ICON_HEIGHT));
-		setTooltip(store.getBoolean(IPTPUIConstants.VIEW_TOOLTIP_SHOWALLTIME), store.getLong(IPTPUIConstants.VIEW_TOOLTIP_TIMEOUT), store.getBoolean(IPTPUIConstants.VIEW_TOOLTIP_ISWRAP));
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Widget#dispose()
-	 */
-	public void dispose() {
-		listeners.clear();
-		selection = null;
-		cur_element_set = null;
-		super.dispose();
-	}
-
-    public void addSelectionChangedListener(ISelectionChangedListener listener) {
-   		listeners.add(listener);
-    }
-    public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-   		listeners.remove(listener);
-    }	
-	/** Change set
-	 * @param e_set
-	 */
-	public void setElementSet(IElementSet e_set) {
-		this.cur_element_set = e_set;
-		this.selection = null;
-		getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				setTotal(cur_element_set == null ? 0 : cur_element_set.size());
-			}
-		});
-	}
-	/** Get current set
-	 * @return current set
-	 */
-	public IElementSet getCurrentElementSet() {
-		return cur_element_set;
-	}
-	/** Get element
-	 * @param index Element index
-	 * @return element
-	 */
-	public IElement getElement(int index) {
-		if (cur_element_set == null)
-			return null;
-		return cur_element_set.getElement(index);
-	}
-	/** Get elements
-	 * @param indexes Element indexes
-	 * @return elements
-	 */
-	public IElement[] getElements(int[] indexes) {
-		if (cur_element_set == null)
-			return new IElement[0];
-		List<IElement> selectedElements = new ArrayList<IElement>();
-		for (int index : indexes) {
-			selectedElements.add(cur_element_set.getElement(index));
-		}
-		return (IElement[]) selectedElements.toArray(new IElement[0]);
-	}
-	/** Get selected elements
-	 * @return selected elements
-	 */
-	public IElement[] getSelectedElements() {
-		if (cur_element_set == null)
-			return new IElement[0];
-		IElement[] elements = new IElement[selectedElements.cardinality()];
-		for (int i = selectedElements.nextSetBit(0), j = 0; i >= 0; i = selectedElements.nextSetBit(i + 1), j++) {
-			elements[j] = cur_element_set.getElement(i);
-		}
-		return elements;
-		//return getElements(getSelectedIndexes());
-	}
-	
-    public ISelection getSelection() {
-    	if (selection == null) {
-    		return StructuredSelection.EMPTY;
-    	}
-    	return selection;
-    }
-    public void setSelection(ISelection selection) {
-    	this.selection = selection;
-        final SelectionChangedEvent e = new SelectionChangedEvent(ElementIconCanvas.this, selection);
-        Object[] array = listeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            final ISelectionChangedListener l = (ISelectionChangedListener) array[i];
-            SafeRunnable.run(new SafeRunnable() {
-                public void run() {
-                    l.selectionChanged(e);
-                }
-            });
-        }
-    }
-    public void setCurrentSelection(boolean sendEvent, IElement[] elements) {
-    	selection = new StructuredSelection(elements);
-    	if (sendEvent) {
-    		setSelection(selection);
-    	}
-    }
-    public void setCurrentSelection(boolean sendEvent) {
-    	setCurrentSelection(sendEvent, getSelectedElements());
-    }
-	protected void handleMouseUp(Event event) {
-		super.handleMouseUp(event);
-		setSelection(new StructuredSelection(getSelectedElements()));
-	}
-	protected void doSelectionAll() {
-		super.doSelectionAll();
-		setSelection(new StructuredSelection(getSelectedElements()));
-	}
-	public void updateToolTipText(Object obj, final String content) {
-		getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (fInformationControl != null) {
-					fInformationControl.setInformation(content);
-					fInformationControl.getShellSize();
-				}
-			}
-		});
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IContentProvider.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IContentProvider.java
deleted file mode 100644
index 3d98b4e..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IContentProvider.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-/**
- * @author Clement chu
- * 
- */
-public interface IContentProvider {
-	/** Get target element
-	 * @param index element index
-	 * @return element
-	 */
-	public Object getObject(int index);
-	/** Get index of left hand element
-	 * @param obj Target element
-	 * @param index element index
-	 * @return element ID
-	 */
-	public String getRulerIndex(Object obj, int index);
-}
-

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IIconCanvasActionListener.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IIconCanvasActionListener.java
deleted file mode 100644
index f8845b8..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IIconCanvasActionListener.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-
-/**
- * @author Clement chu
- *
- */
-public interface IIconCanvasActionListener {
-	public static final int COPY_ACTION = 1;
-	public static final int CUT_ACTION = 2;
-	public static final int PASTE_ACTION = 3;
-	public static final int DELETE_ACTION = 4;
-	public static final int DOUBLE_CLICK_ACTION = 5;
-	//public static final int SELECTION_ACTION = 6;
-	
-	/** Handle action
-	 * @param type action type
-	 * @param indexes element indexes
-	 */
-	public void handleAction(int type, int[] indexes);
-	/**Handle action
-	 * @param type action type
-	 * @param index element index
-	 */
-	public void handleAction(int type, int index);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IImageProvider.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IImageProvider.java
deleted file mode 100644
index 6af0f83..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IImageProvider.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Clement chu
- *
- */
-public interface IImageProvider {
-	/** Get icon status
-	 * @param obj Target element
-	 * @param index Tagret index position
-	 * @param isSelected whether it is selected or not
-	 * @return Image
-	 */
-	public Image getStatusIcon(Object obj, int index, boolean isSelected);
-	/** Draw special on the image
-	 * @param obj Target element
-	 * @param index Tagret index position
-	 * @param gc GC
-	 * @param x_loc x coordinate
-	 * @param y_loc y corrdinate
-	 * @param width image size
-	 * @param height image height
-	 */
-	public void drawSpecial(Object obj, int index, GC gc, int x_loc, int y_loc, int width, int height);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IToolTipProvider.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IToolTipProvider.java
deleted file mode 100644
index a6d614a..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IToolTipProvider.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-/**
- * @author Clement chu
- *
- */
-public interface IToolTipProvider {
-	public final String[] NO_TOOLTIP = new String[] { "" };
-	/** Get tooltip content
-	 * @param obj Selected element
-	 * @return content of tooltip
-	 */
-	public String[] toolTipText(Object obj);
-	
-	public void update(Object obj, String content);
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IconCanvas.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IconCanvas.java
deleted file mode 100644
index ae478f1..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/IconCanvas.java
+++ /dev/null

@@ -1,2351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import java.io.File;
-import java.net.URL;
-import java.util.BitSet;
-import java.util.Hashtable;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ptp.internal.ui.hover.IconHover;
-import org.eclipse.ptp.ui.hover.IIconInformationControl;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.Accessible;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.ST;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Clement chu
- * 
- */
-public class IconCanvas extends Canvas {
-	public final static int SE = 1;
-	public final static int SW = 2;
-	public final static int NW = 3;
-	public final static int NE = 4;
-	protected ListenerList actionListeners = new ListenerList();
-	protected IToolTipProvider toolTipProvider = null;
-	protected IImageProvider imageProvider = null;
-	protected IContentProvider contentProvider = null;
-	// default element info
-	protected int e_offset_x = 5;
-	protected int e_offset_y = 5;
-	protected int e_spacing_x = 4;
-	protected int e_spacing_y = 4;
-	protected int e_width = 16;
-	protected int e_height = 16;
-	protected int max_e_row = -1;
-	protected int max_e_col = -1;
-	// key and listener
-	protected Hashtable<Integer, Integer> keyActionMap = new Hashtable<Integer, Integer>();
-	protected Listener listener = null;
-	protected boolean mouseDown = false;
-	protected boolean mouseDoubleClick = false;
-	// scrolling and selection
-	protected int firstSelectedIndex = -1;
-	protected int secondSelectedIndex = -1; //for mac	
-	protected BitSet selectedElements = new BitSet();
-	protected BitSet tempSelectedElements = new BitSet();
-	protected int sel_size = 1;
-	protected final int sel_length = 2;
-	protected final int sel_gap = 2;
-	protected Color sel_color = null;
-	protected Point selection = null;
-	protected Point movingSelectionStart = null;
-	protected Point movingSelectionEnd = null;
-	protected int current_top_row = -1;
-	protected int actualScrollStart_y = 0;
-	protected int autoScrollDirection = SWT.NULL;
-	protected int verticalScrollOffset = 0;
-	// mouse and color
-	protected Cursor defaultCursor = null;
-	protected Color background = null;
-	protected Color foreground = null;
-	//font
-	protected final int DEFAULT_FONT_SIZE = 9;
-	protected int font_size = DEFAULT_FONT_SIZE;
-	//margin
-	protected final int margin_text = 2;
-	protected Color margin_color = null;
-	protected boolean displayRuler = true;
-	private final int DEFAULT_OFFSET = 5;
-	// tooltip
-	private IconHover iconHover = new IconHover();
-	protected IIconInformationControl fInformationControl = null; 
-	protected long tooltip_timeout = 10000;
-	protected boolean show_tooltip_allthetime = false;
-	private Timer hoverTimer = null;
-	protected boolean tooltip_wrap = true; 
-	protected boolean show_tooltip = true;
-	
-	// input
-	protected int total_elements = 0;
-	final static boolean IS_CARBON, IS_GTK, IS_MOTIF;
-	final static boolean DOUBLE_BUFFER;
-	static {
-		String platform = SWT.getPlatform();
-		IS_CARBON = "carbon".equals(platform);
-		IS_GTK = "gtk".equals(platform);
-		IS_MOTIF = "motif".equals(platform);
-		DOUBLE_BUFFER = !IS_CARBON;
-	}
-
-	/** Constructor
-	 * @param parent
-	 * @param style composite style
-	 */
-	public IconCanvas(Composite parent, int style) {
-		super(parent, SWT.V_SCROLL | SWT.WRAP | SWT.MULTI | style);
-		Display display = getDisplay();
-		calculateVerticalScrollBar();
-		createKeyBindings();
-		defaultCursor = new Cursor(display, SWT.CURSOR_ARROW);
-		setCursor(defaultCursor);
-		installListeners();
-		initializeAccessible();
-		sel_color = display.getSystemColor(SWT.COLOR_RED);
-		margin_color = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-
-		changeFontSize(display);
-		super.setBackground(getBackground());
-		super.setForeground(getForeground());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Widget#dispose()
-	 */
-	public void dispose() {
-		if (fInformationControl != null) {
-			fInformationControl.dispose();
-		}
-		super.dispose();
-	}
-	/** Change font size
-	 * @param display
-	 */
-	private void changeFontSize(Display display) {
-        FontData[] data = getFont().getFontData();
-        for (int i = 0; i < data.length; i++) {
-            data[i].setHeight(font_size);
-        }
-        setFont(new Font(display, data));
-	}
-	
-	/** Add action listener
-	 * @param actionListener
-	 */
-	public void addActionListener(IIconCanvasActionListener actionListener) {
-		actionListeners.add(actionListener);
-	}
-	/** Remove action listener
-	 * @param actionListener
-	 */
-	public void removeActionListener(IIconCanvasActionListener actionListener) {
-		actionListeners.remove(actionListener);
-	}
-	/** Fire action
-	 * @param type type of action
-	 */
-	protected void fireAction(final int type) {
-        Object[] array = actionListeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            final IIconCanvasActionListener l = (IIconCanvasActionListener) array[i];
-            SafeRunnable.run(new SafeRunnable() {
-                public void run() {
-                    l.handleAction(type, getSelectedIndexes());
-                }
-            });
-        }
-	}
-	/** Fire action
-	 * @param type type of action
-	 * @param index element index
-	 */
-	protected void fireAction(final int type, final int index) {
-		if (index > -1) {
-	        Object[] array = actionListeners.getListeners();
-	        for (int i = 0; i < array.length; i++) {
-	            final IIconCanvasActionListener l = (IIconCanvasActionListener) array[i];
-	            SafeRunnable.run(new SafeRunnable() {
-	                public void run() {
-	                    l.handleAction(type, index);
-	                }
-	            });
-	        }
-		}
-	}
-	/** Reset canvas setting
-	 * 
-	 */
-	public void resetCanvas() {
-		checkWidget();
-		current_top_row = -1;
-		actualScrollStart_y = 0;
-		autoScrollDirection = SWT.NULL;
-		verticalScrollOffset = 0;
-		unselectAllElements();
-		firstSelectedIndex = -1;
-		secondSelectedIndex = -1;
-		selection = null;
-		resetMargin();
-		resetInfo();
-		getVerticalBar().setSelection(0);
-		calculateVerticalScrollBar();
-		redraw();
-	}
-	/** Get tooltip provider
-	 * @return
-	 */
-	public IToolTipProvider getToolTipProvider() {
-		return toolTipProvider;
-	}
-	/** Set tooltip provider
-	 * @param toolTipProvider
-	 */
-	public void setToolTipProvider(IToolTipProvider toolTipProvider) {
-		this.toolTipProvider = toolTipProvider;
-	}
-	public void setShowTooltip(boolean show) {
-		this.show_tooltip = show;
-	}
-	/** Get image provider
-	 * @return
-	 */
-	public IImageProvider getImageProvider() {
-		return imageProvider;
-	}
-	/** Set image provider
-	 * @param imageProvider
-	 */
-	public void setImageProvider(IImageProvider imageProvider) {
-		this.imageProvider = imageProvider;
-	}
-	/** Get content provider
-	 * @return
-	 */
-	public IContentProvider getContentProvider() {
-		return contentProvider;
-	}
-	/** Set content provider
-	 * @param contentProvider
-	 */
-	public void setContentProvider(IContentProvider contentProvider) {
-		this.contentProvider = contentProvider;
-	}
-	/** Get totla elements
-	 * @param total total elements
-	 */
-	public void setTotal(int total) {
-		if (total < 0) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		this.total_elements = total;
-		resetCanvas();
-	}
-	/** Reset margin of view
-	 * 
-	 */
-	private void resetMargin() {
-		e_offset_x = DEFAULT_OFFSET;
-		if (isDisplayRuler()) {
-			GC newGC = getGC();
-			newGC.setFont(getFont());
-			if (total_elements > 0) {
-				//Get the last index number to determine the width of ruler bar
-				Object obj = contentProvider.getObject(total_elements-1);
-				if (obj != null) {
-					String text = contentProvider.getRulerIndex(obj, total_elements-1);
-					e_offset_x = newGC.stringExtent(text).x + e_spacing_x + margin_text;
-				}
-			}
-			newGC.dispose();
-		}
-	}
-	public void setFontSizeSmaller() {
-		setFontSize(font_size-1);
-	}
-	public void setFontSizeBigger() {
-		setFontSize(font_size+1);
-	}
-	public void setFontSize(int fontSize) {
-		if (fontSize < 5) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		this.font_size = fontSize;
-		changeFontSize(getDisplay());
-	}
-	/** Set icon spacing
-	 * @param e_spacing_x
-	 * @param e_spacing_y
-	 */
-	public void setIconSpace(int e_spacing_x, int e_spacing_y) {
-		if (e_spacing_x < 0 || e_spacing_y < 0) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		this.e_spacing_x = e_spacing_x;
-		this.e_spacing_y = e_spacing_y;
-	}
-	/** Set icon size
-	 * @param e_width
-	 * @param e_height
-	 */
-	public void setIconSize(int e_width, int e_height) {
-		if (e_width <= 0 || e_height <= 0) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		this.e_height = e_height;
-		this.e_width = e_width;
-	}
-	/** Set tooltip setting
-	 * @param showAllTime
-	 * @param timeout
-	 * @param isWrap
-	 */
-	public void setTooltip(boolean showAllTime, long timeout, boolean isWrap) {
-		showTooltipAllthetime(showAllTime);
-		setTooltipTimeout(timeout);
-		setTooltipWrap(isWrap);
-	}
-	/** Set tooltip timeout
-	 * @param timeout
-	 */
-	public void setTooltipTimeout(long timeout) {
-		if (timeout <= 0) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		tooltip_timeout = timeout;
-	}
-	/** Set tooltip to show all the time
-	 * @param isAll
-	 */
-	public void showTooltipAllthetime(boolean isAll) {
-		show_tooltip_allthetime = isAll;
-	}
-	/** Set tooltip content displaying
-	 * @param isWrap
-	 */
-	public void setTooltipWrap(boolean isWrap) {
-		tooltip_wrap = isWrap;
-	}
-	/** Get total elements
-	 * @return total elements
-	 */
-	public int getTotalElements() {
-		return total_elements;
-	}
-	/** Set selection size
-	 * @param size 
-	 */
-	public void setSelectionSize(int size) {
-		this.sel_size = size;
-	}
-	/** Set selection color
-	 * @param colorIndex
-	 */
-	public void setSelectionColor(int colorIndex) {
-		checkWidget();
-		this.sel_color = getDisplay().getSystemColor(colorIndex);
-	}
-	/**Show ruler
-	 * @param displayRuler
-	 */
-	public void setDisplayRuler(boolean displayRuler) {
-		this.displayRuler = displayRuler;
-		resetCanvas();
-	}
-	/** Is ruler displayed
-	 * @return
-	 */
-	public boolean isDisplayRuler() {
-		return displayRuler;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#getBackground()
-	 */
-	public Color getBackground() {
-		checkWidget();
-		if (background == null) {
-			return getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-		}
-		return background;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#setBackground(org.eclipse.swt.graphics.Color)
-	 */
-	public void setBackground(Color color) {
-		checkWidget();
-		background = color;
-		super.setBackground(getBackground());
-		redraw();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#getForeground()
-	 */
-	public Color getForeground() {
-		checkWidget();
-		if (foreground == null) {
-			return getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-		}
-		return foreground;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#setForeground(org.eclipse.swt.graphics.Color)
-	 */
-	public void setForeground(Color color) {
-		checkWidget();
-		foreground = color;
-		super.setForeground(getForeground());
-		redraw();
-	}
-	/** Get element height
-	 * @return element height
-	 */
-	protected int getElementHeight() {
-		return (e_spacing_y + e_height);
-	}
-	/** Get element width
-	 * @return element width
-	 */
-	protected int getElementWidth() {
-		return (e_spacing_x + e_width);
-	}
-	/** Get maximum column to display
-	 * @return maximum column
-	 */
-	protected int getMaxCol() {
-		if (max_e_col == -1) {
-			int width = getClientArea().width - getVerticalBar().getSize().x;
-			max_e_col = Math.max(0, (width - e_offset_x) / getElementWidth() + 1);
-		}
-		return max_e_col;
-	}
-	/** Get maximum client row 
-	 * @return maximum row number
-	 */
-	protected int getMaxClientRow() {
-		return (getClientArea().height - e_offset_y) / getElementHeight();
-	}
-	/** Get maximum row
-	 * @return maximum row
-	 */
-	protected int getMaxRow() {
-		if (max_e_row == -1) {
-			int total = getTotalElements();
-			if (total == 0)
-				return 0;
-			int max_col = getMaxCol();
-			if (max_col == 0)
-				return 0;
-			int max_row = total / max_col;
-			max_e_row = total % max_col == 0 ? max_row : max_row + 1;
-		}
-		return max_e_row;
-	}
-	/** Get maximum height of view
-	 * @return maximum height
-	 */
-	protected int getMaxHeight() {
-		return getMaxRow() * getElementHeight();
-	}
-	/** Get vertical increment
-	 * @return
-	 */
-	protected int getVerticalIncrement() {
-		return e_spacing_y + e_height;
-	}
-	/** Calculate vertical scrollbar 
-	 * 
-	 */
-	protected void calculateVerticalScrollBar() {
-		setVerticalScrollBar(getVerticalBar());
-	}
-	/** Set vertical scrollbar
-	 * @param verticalBar
-	 */
-	protected void setVerticalScrollBar(ScrollBar verticalBar) {
-		if (verticalBar != null) {
-			Rectangle clientArea = getClientArea();
-			final int INACTIVE = 1;
-			int max_height = getMaxHeight() + e_offset_y + sel_size;
-			if (clientArea.height < max_height) {
-				verticalBar.setValues(verticalBar.getSelection(), verticalBar.getMinimum(), max_height, clientArea.height, getVerticalIncrement(), clientArea.height);
-			} else if (verticalBar.getThumb() != INACTIVE || verticalBar.getMaximum() != INACTIVE) {
-				verticalBar.setValues(verticalBar.getSelection(), verticalBar.getMinimum(), INACTIVE, INACTIVE, getVerticalIncrement(), INACTIVE);
-			}
-		}
-	}
-	/** Claim bottom free space
-	 * @return
-	 */
-	protected boolean claimBottomFreeSpace() {
-		int newVerticalOffset = Math.max(0, getMaxHeight() - getClientArea().height);
-		if (newVerticalOffset < verticalScrollOffset) {
-			return setVerticalScrollOffset(newVerticalOffset, true);
-		}
-		return false;
-	}
-	/** Get current top row
-	 * @return top row number
-	 */
-	protected int getCurrentTopRow() {
-		return current_top_row;
-	}
-	/** Get key 
-	 * @param key unique key
-	 * @return keyboard key ID
-	 */
-	public int getKeyBinding(int key) {
-		checkWidget();
-		Integer action = keyActionMap.get(new Integer(key));
-		int intAction;
-		if (action == null) {
-			intAction = SWT.NULL;
-		} else {
-			intAction = action.intValue();
-		}
-		return intAction;
-	}
-	/** Set key
-	 * @param key unique key
-	 * @param action keyboard key ID 
-	 */
-	public void setKeyBinding(int key, int action) {
-		checkWidget();
-		int keyValue = key & SWT.KEY_MASK;
-		int modifierValue = key & SWT.MODIFIER_MASK;
-		char keyChar = (char) keyValue;
-		if (Character.isLetter(keyChar)) {
-			char ch = Character.toUpperCase(keyChar);
-			int newKey = ch | modifierValue;
-			if (action == SWT.NULL) {
-				keyActionMap.remove(new Integer(newKey));
-			} else {
-				keyActionMap.put(new Integer(newKey), new Integer(action));
-			}
-			ch = Character.toLowerCase(keyChar);
-			newKey = ch | modifierValue;
-			if (action == SWT.NULL) {
-				keyActionMap.remove(new Integer(newKey));
-			} else {
-				keyActionMap.put(new Integer(newKey), new Integer(action));
-			}
-		} else {
-			if (action == SWT.NULL) {
-				keyActionMap.remove(new Integer(key));
-			} else {
-				keyActionMap.put(new Integer(key), new Integer(action));
-			}
-		}
-	}
-	/** Create keyboard binding
-	 * 
-	 */
-	protected void createKeyBindings() {
-		// Navigation
-		setKeyBinding(SWT.ARROW_UP, ST.LINE_UP);
-		setKeyBinding(SWT.ARROW_DOWN, ST.LINE_DOWN);
-		setKeyBinding(SWT.ARROW_LEFT, ST.COLUMN_PREVIOUS);
-		setKeyBinding(SWT.ARROW_RIGHT, ST.COLUMN_NEXT);
-		setKeyBinding(SWT.HOME, ST.LINE_START);
-		setKeyBinding(SWT.END, ST.LINE_END);
-		setKeyBinding(SWT.PAGE_UP, ST.PAGE_UP);
-		setKeyBinding(SWT.PAGE_DOWN, ST.PAGE_DOWN);
-		// Selection
-		setKeyBinding('A' | SWT.MOD1, ST.SELECT_ALL);
-		setKeyBinding(SWT.ARROW_UP | SWT.MOD2, ST.SELECT_LINE_UP);
-		setKeyBinding(SWT.ARROW_DOWN | SWT.MOD2, ST.SELECT_LINE_DOWN);
-		setKeyBinding(SWT.ARROW_LEFT | SWT.MOD2, ST.SELECT_COLUMN_PREVIOUS);
-		setKeyBinding(SWT.ARROW_RIGHT | SWT.MOD2, ST.SELECT_COLUMN_NEXT);
-		setKeyBinding(SWT.HOME | SWT.MOD2, ST.SELECT_LINE_START);
-		setKeyBinding(SWT.END | SWT.MOD2, ST.SELECT_LINE_END);
-		setKeyBinding(SWT.PAGE_UP | SWT.MOD2, ST.SELECT_PAGE_UP);
-		setKeyBinding(SWT.PAGE_DOWN | SWT.MOD2, ST.SELECT_PAGE_DOWN);
-		// Modification
-		// Cut, Copy, Paste, delete
-		setKeyBinding('X' | SWT.MOD1, ST.CUT);
-		setKeyBinding('C' | SWT.MOD1, ST.COPY);
-		setKeyBinding('V' | SWT.MOD1, ST.PASTE);
-		setKeyBinding(SWT.BS, ST.DELETE_PREVIOUS);
-		setKeyBinding(SWT.DEL, ST.DELETE_NEXT);
-	}
-	/** Invoke action
-	 * @param action action ID
-	 */
-	public void invokeAction(int action) {
-		checkWidget();
-		switch (action) {
-		// Navigation
-		case ST.LINE_UP:
-			doUp(false);
-			break;
-		case ST.LINE_DOWN:
-			doDown(false);
-			break;
-		case ST.COLUMN_PREVIOUS:
-			doPrevious(false);
-			break;
-		case ST.COLUMN_NEXT:
-			doNext(false);
-			break;
-		case ST.LINE_START:
-			doLineStart(false);
-			break;
-		case ST.LINE_END:
-			doLineEnd(false);
-			break;
-		case ST.PAGE_UP:
-			doPageUp(getMaxClientRow());
-			break;
-		case ST.PAGE_DOWN:
-			doPageDown(getMaxClientRow());
-			break;
-		// Selection
-		case ST.SELECT_ALL:
-			doSelectionAll();
-			break;
-		case ST.SELECT_LINE_UP:
-			doUp(true);
-			break;
-		case ST.SELECT_LINE_DOWN:
-			doDown(true);
-			break;
-		case ST.SELECT_COLUMN_PREVIOUS:
-			doPrevious(true);
-			break;
-		case ST.SELECT_COLUMN_NEXT:
-			doNext(true);
-			break;
-		case ST.SELECT_LINE_START:
-			doLineStart(true);
-			break;
-		case ST.SELECT_LINE_END:
-			doLineEnd(true);
-			break;
-		case ST.SELECT_PAGE_UP:
-			doSelectionPageUp(getMaxClientRow());
-			break;
-		case ST.SELECT_PAGE_DOWN:
-			doSelectionPageDown(getMaxClientRow());
-			break;
-		// Modification
-		case ST.CUT:
-			doCut();
-			break;
-		case ST.COPY:
-			doCopy();
-			break;
-		case ST.PASTE:
-			doPaste();
-			break;
-		case ST.DELETE_PREVIOUS:
-			doDelete();
-			break;
-		case ST.DELETE_NEXT:
-			doDelete();
-			break;
-		default:
-			break;
-		}
-	}
-	/** initial accessiable
-	 * 
-	 */
-	protected void initializeAccessible() {
-		final Accessible accessible = getAccessible();
-		accessible.addAccessibleListener(new AccessibleAdapter() {
-			public void getHelp(AccessibleEvent e) {
-				e.result = getToolTipText();
-			}
-		});
-		accessible.addAccessibleControlListener(new AccessibleControlAdapter() {
-			public void getRole(AccessibleControlEvent e) {
-				e.detail = ACC.ROLE_TEXT;
-			}
-			public void getState(AccessibleControlEvent e) {
-				int state = 0;
-				if (isEnabled())
-					state |= ACC.STATE_FOCUSABLE;
-				if (isFocusControl())
-					state |= ACC.STATE_FOCUSED;
-				if (isVisible() == false)
-					state |= ACC.STATE_INVISIBLE;
-				e.detail = state;
-			}
-		});
-		addListener(SWT.FocusIn, new Listener() {
-			public void handleEvent(Event event) {
-				accessible.setFocus(ACC.CHILDID_SELF);
-			}
-		});
-	}
-	/** install listeners
-	 * 
-	 */
-	protected void installListeners() {
-		ScrollBar verticalBar = getVerticalBar();
-		listener = new Listener() {
-			public void handleEvent(Event event) {
-				switch (event.type) {
-				case SWT.Dispose:
-					handleDispose(event);
-					break;
-				case SWT.KeyDown:
-					handleKeyDown(event);
-					break;
-				case SWT.KeyUp:
-					handleKeyUp(event);
-					break;
-				case SWT.MouseDown:
-					handleMouseDown(event);
-					break;
-				case SWT.MouseUp:
-					handleMouseUp(event);
-					break;
-				case SWT.MouseDoubleClick:
-					handleMouseDoubleClick(event);
-					break;
-				case SWT.MouseMove:
-					handleMouseMove(event);
-					break;
-				case SWT.MouseHover:
-					handleMouseHover(event);
-					break;
-				case SWT.Paint:
-					handlePaint(event);
-					break;
-				case SWT.Resize:
-					handleResize(event);
-					break;
-				case SWT.FocusOut:
-					handleFocusOut(event);
-					break;
-				}
-			}
-		};
-		addListener(SWT.Dispose, listener);
-		addListener(SWT.KeyDown, listener);
-		addListener(SWT.KeyUp, listener);
-		addListener(SWT.MouseDown, listener);
-		addListener(SWT.MouseUp, listener);
-		addListener(SWT.MouseDoubleClick, listener);
-		addListener(SWT.MouseMove, listener);
-		addListener(SWT.MouseHover, listener);
-		addListener(SWT.Paint, listener);
-		addListener(SWT.Resize, listener);
-		addListener(SWT.FocusOut, listener);
-		if (verticalBar != null) {
-			verticalBar.addListener(SWT.Selection, new Listener() {
-				public void handleEvent(Event event) {
-					setVerticalScrollOffset(getVerticalBar().getSelection(), true);
-				}
-			});
-		}
-	}
-	/** Handle key
-	 * @param event
-	 */
-	protected void handleKey(Event event) {
-		int action;
-		if (event.keyCode != 0) {
-			action = getKeyBinding(event.keyCode | event.stateMask);
-		} else {
-			action = getKeyBinding(event.character | event.stateMask);
-			if (action == SWT.NULL) {
-				if ((event.stateMask & SWT.CTRL) != 0 && (event.character >= 0) && event.character <= 31) {
-					int c = event.character + 64;
-					action = getKeyBinding(c | event.stateMask);
-				}
-			}
-		}
-		if (action != SWT.NULL) {
-			invokeAction(action);
-		}
-	}
-	/** Is reached top of view
-	 * @return true if vertical scroll offset is 0
-	 */
-	protected boolean isReachTop() {
-		return (verticalScrollOffset <= 0);
-	}
-	/** Is reach bottom of view
-	 * @return true if vertical scroll to bottom of view
-	 */
-	protected boolean isReachBottom() {
-		return (getMaxRow() - current_top_row <= getMaxClientRow());
-	}
-	/** Do auto scrolling
-	 * @param x_loc
-	 * @param y_loc
-	 */
-	protected void doAutoScroll(int x_loc, int y_loc) {
-		if (y_loc > getClientArea().height && !isReachBottom()) {
-			hideToolTip();
-			doAutoScroll(SWT.DOWN, getVerticalIncrement(), x_loc, y_loc);
-		} else if (y_loc < 0 && !isReachTop()) {
-			hideToolTip();
-			doAutoScroll(SWT.UP, -getVerticalIncrement(), x_loc, y_loc);
-		} else {
-			if (movingSelectionStart == null) {
-				movingSelectionStart = new Point(selection.x, selection.y);
-			} else {
-				doMouseSelection(movingSelectionStart.x, movingSelectionStart.y, x_loc, y_loc, false);
-			}
-			endAutoScroll();
-		}
-	}
-	/** Do auto scrolling
-	 * @param direction 
-	 * @param distance
-	 * @param x_loc
-	 * @param y_loc
-	 */
-	protected void doAutoScroll(int direction, final int distance, final int x_loc, final int y_loc) {
-		// If we're already autoscrolling in the given direction do nothing
-		if (autoScrollDirection == direction) {
-			return;
-		}
-		Runnable timer = null;
-		final int TIMER_INTERVAL = 50;
-		final Display display = getDisplay();
-		if (direction == SWT.UP) {
-			timer = new Runnable() {
-				public void run() {
-					if (autoScrollDirection == SWT.UP && !isReachTop()) {
-						doSelectionPageUp(distance, x_loc, y_loc, true);
-						display.timerExec(TIMER_INTERVAL, this);
-					}
-				}
-			};
-		} else if (direction == SWT.DOWN) {
-			timer = new Runnable() {
-				public void run() {
-					if (autoScrollDirection == SWT.DOWN && !isReachBottom()) {
-						doSelectionPageDown(distance, x_loc, y_loc, true);
-						display.timerExec(TIMER_INTERVAL, this);
-					}
-				}
-			};
-		}
-		if (timer != null) {
-			autoScrollDirection = direction;
-			display.timerExec(TIMER_INTERVAL, timer);
-		}
-	}
-	/** Do selection page up
-	 * @param distance
-	 */
-	protected void doSelectionPageUp(int distance) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > 0) {
-			int max_col = getMaxCol();
-			int max_row = getMaxClientRow() - 1;
-			int total_in_page = max_col * max_row;
-			int start_index = Math.max(0, (index - total_in_page));
-			actualScrollStart_y -= max_row * getElementHeight();
-			if (actualScrollStart_y - verticalScrollOffset < 0) {
-				doPageUp(max_row);
-			}
-			selection.y = Math.max(0, actualScrollStart_y - verticalScrollOffset);
-			selectElements(start_index, index);
-			redraw(start_index, index);
-		}
-	}
-	/** Do selection page down
-	 * @param distance
-	 */
-	protected void doSelectionPageDown(int distance) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > -1) {
-			int max_col = getMaxCol();
-			int max_row = getMaxClientRow() - 1;
-			int total_in_page = max_col * max_row;
-			int end_index = Math.min(getTotalElements(), (index + total_in_page));
-			actualScrollStart_y += max_row * getElementHeight();
-			if (actualScrollStart_y - verticalScrollOffset > (max_row + 1) * getElementHeight()) {
-				doPageDown(max_row);
-			}
-			selection.y = Math.max(0, actualScrollStart_y - verticalScrollOffset);
-			selectElements(index, end_index);
-			redraw(index, end_index);
-		}
-	}
-	/** Do selection page up
-	 * @param distance
-	 * @param x_loc
-	 * @param y_loc
-	 * @param isSelect
-	 */
-	protected void doSelectionPageUp(int distance, int x_loc, int y_loc, boolean isSelect) {
-		doPageUp(distance / getElementHeight());
-		if (movingSelectionStart != null && isSelect) {
-			movingSelectionStart.y += getVerticalIncrement();
-			doMouseSelection(movingSelectionStart.x, movingSelectionStart.y, x_loc, y_loc, true);
-		}
-	}
-	/** Do selection page down
-	 * @param distance
-	 * @param x_loc
-	 * @param y_loc
-	 * @param isSelect
-	 */
-	protected void doSelectionPageDown(int distance, int x_loc, int y_loc, boolean isSelect) {
-		doPageDown(distance / getElementHeight());
-		if (movingSelectionStart != null && isSelect) {
-			movingSelectionStart.y -= getVerticalIncrement();
-			doMouseSelection(movingSelectionStart.x, movingSelectionStart.y, x_loc, y_loc, true);
-		}
-	}
-	/** Do delete
-	 * 
-	 */
-	protected void doDelete() {
-		fireAction(IIconCanvasActionListener.DELETE_ACTION);
-	}
-	/** Do copy
-	 * 
-	 */
-	protected void doCopy() {
-		fireAction(IIconCanvasActionListener.COPY_ACTION);
-	}
-	/** Do cut
-	 * 
-	 */
-	protected void doCut() {
-		fireAction(IIconCanvasActionListener.CUT_ACTION);
-	}
-	/** Do paste
-	 * 
-	 */
-	protected void doPaste() {
-		fireAction(IIconCanvasActionListener.PASTE_ACTION);
-	}
-	/** Do page up
-	 * @param rows number of row to page up
-	 */
-	protected void doPageUp(int rows) {
-		if (current_top_row >= 0 && verticalScrollOffset > 0) {
-			int scrollRows = Math.max(1, Math.min(current_top_row, rows));
-			current_top_row -= scrollRows;
-			if (current_top_row < 0)
-				current_top_row = 0;
-			// scroll one page up or to the top
-			int scrollOffset = Math.max(0, verticalScrollOffset - scrollRows * getVerticalIncrement());
-			if (scrollOffset < verticalScrollOffset) {
-				setVerticalScrollOffset(scrollOffset, true);
-			}
-		}
-	}
-	/** Do page down
-	 * @param rows number of row to page down
-	 */
-	protected void doPageDown(int rows) {
-		int max_row = getMaxRow();
-		int max_client_row = getMaxClientRow();
-		if (current_top_row < max_row - max_client_row) {
-			int scrollRows = Math.max(1, Math.min(max_row - current_top_row - max_client_row, rows));
-			current_top_row += scrollRows;
-			// scroll one page down or to the bottom
-			int scrollOffset = Math.min(verticalScrollOffset + (scrollRows * getVerticalIncrement()), (max_row - max_client_row) * getElementHeight());
-			if (scrollOffset > verticalScrollOffset) {
-				setVerticalScrollOffset(scrollOffset, true);
-			}
-		}
-	}
-	/** Do up
-	 * @param isSelect true if element is selected
-	 */
-	protected void doUp(boolean isSelect) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > 0) {
-			int max_col = getMaxCol();
-			if ((index - max_col) > -1) {
-				actualScrollStart_y -= getElementHeight();
-				if (selection.y < getVerticalIncrement()) {
-					doPageUp(1);
-				}
-				selection.y = actualScrollStart_y - verticalScrollOffset;
-				boolean redrawAll = !selectedElements.isEmpty();
-				if (!isSelect) {
-					unselectAllElements();
-					selectedElements.set(index - max_col);
-				}
-				else {
-					if (!isSelected(index - max_col))
-						selectElements(index-max_col, index);
-					else
-						unselectElements(index-max_col+1, index);						
-				}
-				
-				if (redrawAll)
-					redraw();
-				else
-					redraw(index - max_col, index);
-			}
-		}
-	}
-	/** Do down
-	 * @param isSelect true if element is selected
-	 */
-	protected void doDown(boolean isSelect) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > -1) {
-			int max_col = getMaxCol();
-			if ((index + max_col) < getTotalElements()) {
-				actualScrollStart_y += getElementHeight();
-				if (selection.y + getVerticalIncrement() > getMaxClientRow() * getElementHeight()) {
-					doPageDown(1);
-				}
-				selection.y = actualScrollStart_y - verticalScrollOffset;
-				boolean redrawAll = !selectedElements.isEmpty();
-				if (!isSelect) {
-					unselectAllElements();
-					selectedElements.set(index + max_col);
-				}
-				else {
-					if (!isSelected(index + max_col))
-						selectElements(index, index+max_col);
-					else
-						unselectElements(index, index+max_col-1);						
-				}
-			
-				if (redrawAll)
-					redraw();
-				else
-					redraw(index, index + max_col);
-
-			}
-		}
-	}
-	/** Go previous
-	 * @param isSelect true if element is selected
-	 */
-	protected void doPrevious(boolean isSelect) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > 0) {
-			selection.x -= getElementWidth();
-			if (selection.x < e_offset_x) {
-				actualScrollStart_y -= getElementHeight();
-				if (actualScrollStart_y - verticalScrollOffset < getVerticalIncrement()) {
-					doPageUp(1);
-				}
-				selection.x = e_offset_x + (getMaxCol() * getElementWidth()) - e_width;
-				selection.y = actualScrollStart_y - verticalScrollOffset;
-			}
-			boolean redrawAll = !selectedElements.isEmpty();
-			if (!isSelect) {
-				unselectAllElements();
-			}
-			if (!isSelected(index - 1))
-				autoSelectUnselectElement(index - 1);
-			else
-				selectedElements.clear(index);
-			
-			if (redrawAll)
-				redraw();
-			else
-				redraw(index-1, index);
-		}
-	}
-	/** Go next
-	 * @param isSelect true if element is selected
-	 */
-	protected void doNext(boolean isSelect) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > -1 && index < getTotalElements() - 1) {
-			selection.x += getElementWidth();
-			if (selection.x > (getMaxCol() * getElementWidth() + e_offset_x)) {
-				actualScrollStart_y += getElementHeight();
-				if (selection.y + getVerticalIncrement() > getMaxClientRow() * getElementHeight()) {
-					doPageDown(1);
-				}
-				selection.x = e_offset_x + e_spacing_x;
-				selection.y = actualScrollStart_y - verticalScrollOffset;
-			}
-			boolean redrawAll = !selectedElements.isEmpty();
-			if (!isSelect) {
-				unselectAllElements();
-			}
-			if (!isSelected(index + 1))
-				autoSelectUnselectElement(index + 1);
-			else
-				selectedElements.clear(index);
-			if (redrawAll)
-				redraw();
-			else
-				redraw(index, index+1);
-		}
-	}
-	/** Go to line start
-	 * @param isSelect true if element is selected
-	 */
-	protected void doLineStart(boolean isSelect) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > -1) {
-			int start_pos_x = e_offset_x + e_spacing_x;
-			int start_index = findSelectedIndexByLocation(start_pos_x, (actualScrollStart_y - verticalScrollOffset), false);
-			if (start_index > -1) {
-				selection.x = start_pos_x;
-				if (!isSelect) {
-					selectedElements.clear(index);
-					autoSelectUnselectElement(start_index);
-				}
-				else {
-					selectElements(start_index, index);
-				}
-				redraw(start_index, index);
-			}
-		}
-	}
-	/** Go to line end
-	 * @param isSelect true if element is selected
-	 */
-	protected void doLineEnd(boolean isSelect) {
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > -1) {
-			if (!isSelect)
-				selectedElements.clear(index);
-			int total = getTotalElements() - 1;
-			if (index > total - getMaxCol()) {
-				int end_counter = total - index;
-				selection.x = (end_counter + 1) * getElementWidth() + e_offset_x;
-				if (!isSelect)
-					autoSelectUnselectElement(index + end_counter);
-				else
-					selectElements(index, index + end_counter);
-				redraw(index, index + end_counter);
-			} else {
-				int end_pos_x = e_offset_x + (getMaxCol() * getElementWidth()) - e_width;
-				int end_index = findSelectedIndexByLocation(end_pos_x, (actualScrollStart_y - verticalScrollOffset), false);
-				if (end_index > -1) {
-					selection.x = end_pos_x;
-					if (!isSelect)
-						autoSelectUnselectElement(end_index);
-					else
-						selectElements(index, end_index);
-					redraw(index, end_index);
-				} else {
-					redraw(index, index);
-				}
-			}
-		}
-	}
-	/** Select all elements
-	 * 
-	 */
-	protected void doSelectionAll() {
-		selectedElements.set(0, getTotalElements());
-		redraw();
-	}
-	/** Set vertical scrollbar offset
-	 * @param pixelOffset
-	 * @param adjustScrollBar
-	 * @return
-	 */
-	protected boolean setVerticalScrollOffset(int pixelOffset, boolean adjustScrollBar) {
-		if (pixelOffset == verticalScrollOffset) {
-			return false;
-		}
-		ScrollBar verticalBar = getVerticalBar();
-		if (verticalBar != null && adjustScrollBar) {
-			verticalBar.setSelection(pixelOffset);
-		}
-		Rectangle clientArea = getClientArea();
-		scroll(0, 0, 0, pixelOffset - verticalScrollOffset, clientArea.width, clientArea.height, adjustScrollBar);
-		verticalScrollOffset = pixelOffset;
-		calculateTopIndex();
-		return true;
-	}
-	/** Finished auto scrolling
-	 * 
-	 */
-	protected void endAutoScroll() {
-		autoScrollDirection = SWT.NULL;
-	}
-	/** Calculate top index
-	 * 
-	 */
-	protected void calculateTopIndex() {
-		int verticalIncrement = getVerticalIncrement();
-		if (verticalIncrement == 0) {
-			return;
-		}
-		current_top_row = verticalScrollOffset / verticalIncrement;
-		if (current_top_row > 0) {
-			int max_row = getMaxRow();
-			int clientAreaHeight = getClientArea().height;
-			if (clientAreaHeight > 0) {
-				int fullRowTopPixel = current_top_row * verticalIncrement;
-				if (verticalScrollOffset < fullRowTopPixel) {
-					current_top_row--;
-				}
-			} else if (current_top_row >= max_row) {
-				current_top_row = max_row - 1;
-			}
-		}
-	}
-	/** Get selected column
-	 * @param x_loc
-	 * @param isApproximate
-	 * @return column number
-	 */
-	protected int getSelectedCol(int x_loc, boolean isApproximate) {
-		int col = Math.min(x_loc / getElementWidth(), getMaxCol() - 1);
-		if (isApproximate)
-			return col;
-		int test_loc_x = getElementWidth() * col;
-		if (x_loc > test_loc_x && x_loc < (test_loc_x + e_width)) {
-			return col;
-		}
-		return -1;
-	}
-	/** Get selected row
-	 * @param y_loc
-	 * @param isApproximate
-	 * @return row number
-	 */
-	protected int getSelectedRow(int y_loc, boolean isApproximate) {
-		int row = Math.max(0, (verticalScrollOffset + y_loc) / getElementHeight());
-		if (isApproximate)
-			return row;
-		int test_loc_y = (getElementHeight() * row) - verticalScrollOffset;
-		if (y_loc > test_loc_y && y_loc < (test_loc_y + e_height)) {
-			return row;
-		}
-		return -1;
-	}
-	/** Find selected index
-	 * @param row
-	 * @param col
-	 * @return selected index
-	 */
-	protected int findSelectedIndex(int row, int col) {
-		return row * getMaxCol() + col;
-	}
-	/** Find selected index
-	 * @param loc_x
-	 * @param loc_y
-	 * @param isApproximate true if searching is approximate
-	 * @return -1 if not found
-	 */
-	protected int findSelectedIndexByLocation(int loc_x, int loc_y, boolean isApproximate) {
-		int col = getSelectedCol(loc_x - e_offset_x, isApproximate);
-		if (col > -1) {
-			int row = getSelectedRow(loc_y - e_offset_y, isApproximate);
-			if (row > -1) {
-				int index = findSelectedIndex(row, col);
-				if (index < getTotalElements())
-					return index;
-			}
-		}
-		return -1;
-	}
-	/** Find column and row
-	 * @param index element index
-	 * @return x is column and y is row
-	 */
-	protected Point findSection(int index) {
-		int max_col = getMaxCol();
-		int col = (int) Math.floor(index % max_col);
-		int row = (int) Math.floor(index / max_col);
-		return new Point(col, row);
-	}
-	/** Find location 
-	 * @param index element index
-	 * @return location of target element
-	 */
-	protected Point findLocation(int index) {
-		Point section = findSection(index);
-		int x_loc = (section.x * getElementWidth() + e_offset_x + 1); //plus 1 for margin
-		int y_loc = (section.y * getElementHeight() + e_offset_y + 1) - verticalScrollOffset;
-		return new Point(x_loc, y_loc);
-	}
-	/** Get direction 
-	 * @param s_x
-	 * @param s_y
-	 * @param e_x
-	 * @param e_y
-	 * @return
-	 */
-	protected int getDirection(int s_x, int s_y, int e_x, int e_y) {
-		int direction = SE;
-		if (s_x > e_x) {
-			direction = SW;
-		}
-		if (s_y > e_y) {
-			if (direction == SW)
-				direction = NW;
-			else
-				direction = NE;
-		}
-		return direction;
-	}
-	/** Get select elements
-	 * @param col_start
-	 * @param col_end
-	 * @param row_start
-	 * @param row_end
-	 * @return selected elements
-	 */
-	protected BitSet selectElements(int col_start, int col_end, int row_start, int row_end) {
-		BitSet newElements = new BitSet();
-		int total = getTotalElements();
-		for (int row_count = row_start; row_count < row_end; row_count++) {
-			for (int col_count = col_start; col_count < col_end; col_count++) {
-				int index = findSelectedIndex(row_count, col_count);
-				if (index > -1 && index < total) {
-					newElements.set(index);
-				}
-				//indicate the first selected element when dragging
-				if (firstSelectedIndex == -1 || firstSelectedIndex > index) {
-					firstSelectedIndex = index;
-				}
-			}
-		}
-		return newElements;
-	}
-	/** Get started point
-	 * @param x
-	 * @param y
-	 * @return
-	 */
-	private Point getStartedPoint(int x, int y) {
-		return new Point(Math.max(e_offset_x-e_spacing_x, x), Math.max(0, Math.min((getMaxRow() - current_top_row) * getElementHeight() + sel_size, y)));
-	}
-	/** Get finished point
-	 * @param x
-	 * @param y
-	 * @return
-	 */
-	private Point getFinishedPoint(int x, int y) {
-		return new Point(Math.min(getMaxCol()*getElementWidth() + e_offset_x - e_spacing_x, Math.max(e_offset_x-e_spacing_x, x)), Math.min((getMaxRow() - current_top_row) * getElementHeight() + sel_size, Math.max(0 + sel_size, y)));
-	}
-	/** Do mouse selection
-	 * @param mouse_start_x
-	 * @param mouse_start_y
-	 * @param mouse_end_x
-	 * @param mouse_end_y
-	 * @param isScrolling
-	 */
-	protected void doMouseSelection(int mouse_start_x, int mouse_start_y, int mouse_end_x, int mouse_end_y, boolean isScrolling) {
-		if (mouse_start_x < (e_offset_x - getElementWidth()) || mouse_start_y > (getMaxRow() - current_top_row + 1) * getElementHeight())
-			return;
-		
-		boolean isInitialPage = (mouse_start_y - verticalScrollOffset == actualScrollStart_y);
-		Point start_pt = getStartedPoint(mouse_start_x, mouse_start_y);
-		Point end_pt = getFinishedPoint(mouse_end_x, mouse_end_y);
-		int direction = getDirection(movingSelectionStart.x, movingSelectionStart.y, end_pt.x, end_pt.y);
-		int s_x = start_pt.x;
-		int e_x = end_pt.x;
-		int s_y = isInitialPage ? start_pt.y : (actualScrollStart_y - verticalScrollOffset);
-		int e_y = end_pt.y;
-
-		switch (direction) {
-		case SW:
-			s_x = end_pt.x;
-			e_x = start_pt.x;
-			break;
-		case NW:
-			s_x = end_pt.x;
-			e_x = start_pt.x;
-			s_y = end_pt.y;
-			e_y = start_pt.y;
-			break;
-		case NE:
-			s_y = end_pt.y;
-			e_y = start_pt.y;
-			break;
-		}
-		int d_sx = s_x - e_offset_x + e_spacing_x;
-		int d_ex = e_x - e_offset_x;
-		int d_sy = s_y - e_offset_y + e_spacing_y;
-		int d_ey = e_y - e_offset_y;
-
-		int col_start = Math.max(0, getSelectedCol(d_sx, true));
-		int col_end = Math.min(getSelectedCol(d_ex, true) + 1, getMaxCol());
-		int row_start = Math.max(0, getSelectedRow(d_sy, true));
-		int row_end = Math.min(getSelectedRow(d_ey, true) + 1, getMaxRow());
-
-		tempSelectedElements.clear();
-		tempSelectedElements.or(selectElements(col_start, col_end, row_start, row_end));
-		if (movingSelectionEnd != null) {
-			int last_end_x = movingSelectionEnd.x;
-			int last_end_y = movingSelectionEnd.y;
-			// redraw whole view if changed the direction
-			if (getDirection(movingSelectionStart.x, movingSelectionStart.y, last_end_x, last_end_y) != direction || (isScrolling && (isReachTop() || isReachBottom()))) {
-				movingSelectionEnd.x = end_pt.x;
-				movingSelectionEnd.y = end_pt.y;
-				redraw();
-				return;
-			}
-			switch (direction) {
-			case SE:
-				if (e_x < last_end_x) {
-					d_ex = last_end_x - e_offset_x - e_spacing_x;
-					col_end = Math.min(getSelectedCol(d_ex, true) + 1, getMaxCol());
-				}
-				if (e_y < last_end_y) {
-					d_ey = last_end_y - e_offset_y - e_spacing_y;
-					row_end = Math.min(getSelectedRow(d_ey, true) + 1, getMaxRow());
-				}
-				break;
-			case SW:
-				if (e_x > last_end_x) {
-					d_sx = last_end_x - e_offset_x + e_spacing_x;
-					col_start = Math.max(0, getSelectedCol(d_sx, true));
-				}
-				if (e_y < last_end_y) {
-					d_ey = last_end_y - e_offset_y - e_spacing_y;
-					row_end = Math.min(getSelectedRow(d_ey, true) + 1, getMaxRow());
-				}
-				break;
-			case NW:
-				if (e_x > last_end_x) {
-					d_sx = last_end_x - e_offset_x + e_spacing_x;
-					col_start = Math.max(0, getSelectedCol(d_sx, true));
-				}
-				if (e_y > last_end_y) {
-					d_sy = last_end_y - e_offset_y + e_spacing_y;
-					row_start = Math.max(0, getSelectedRow(d_sy, true));
-				}
-				break;
-			case NE:
-				if (e_x < last_end_x) {
-					d_ex = last_end_x - e_offset_x - e_spacing_x;
-					col_end = Math.min(getSelectedCol(d_ex, true) + 1, getMaxCol());
-				}
-				if (e_y > last_end_y) {
-					d_sy = last_end_y - e_offset_y + e_spacing_y;
-					row_start = Math.max(0, getSelectedRow(d_sy, true));
-				}
-				break;
-			}
-		}
-		movingSelectionEnd = new Point(end_pt.x, end_pt.y);
-		redrawByIndex(col_start, col_end, row_start, row_end, direction, isScrolling);
-		//redrawByLocation(d_sx, d_ex, d_sy, d_ey, direction, isScrolling);
-	}
-	/** Redraw by location
-	 * @param d_sx
-	 * @param d_ex
-	 * @param d_sy
-	 * @param d_ey
-	 * @param direction
-	 * @param isScrolling
-	 */
-	protected void redrawByLocation(int d_sx, int d_ex, int d_sy, int d_ey, int direction, boolean isScrolling) {
-		int d_x = d_sx;
-		int d_y = d_sy + ((direction==NW||direction==NE)?(isScrolling ? getVerticalIncrement():0):0);
-		int d_w = e_offset_x + Math.abs(d_ex - d_sx);
-		int d_h = e_offset_y + Math.abs(d_ey - d_sy) + ((direction==SE||direction==SW)?(isScrolling ? getVerticalIncrement():0):0); 
-		redraw(d_x, d_y, d_w, d_h, false);
-	}
-	/** Redraw by index
-	 * @param col_start
-	 * @param col_end
-	 * @param row_start
-	 * @param row_end
-	 * @param direction
-	 * @param isScrolling
-	 */
-	protected void redrawByIndex(int col_start, int col_end, int row_start, int row_end, int direction, boolean isScrolling) {
-		int redrawStart_x = e_offset_x + (col_start * getElementWidth()) - e_spacing_x;
-		int redrawEnd_x = e_offset_x + (col_end * getElementWidth()) + e_spacing_x;
-		int redrawStart_y = e_offset_y + (row_start * getElementHeight()) - verticalScrollOffset;
-		int redrawEnd_y = e_offset_y + (row_end * getElementHeight()) + verticalScrollOffset;
-		int margin_x = getElementWidth() + sel_size;
-		int margin_y = getElementHeight() + sel_size;
-		int d_x = Math.max(0, (redrawStart_x - margin_x));
-		int d_y = Math.max(0, (redrawStart_y - margin_y)) + ((direction==NW||direction==NE)?(isScrolling ? getVerticalIncrement():0):0);
-		int d_w = Math.abs(redrawEnd_x - redrawStart_x) + (margin_x*2);
-		int d_h = Math.abs(redrawEnd_y - redrawStart_y) + (margin_y*2) + ((direction==SE||direction==SW)?(isScrolling ? getVerticalIncrement():0):0);
-		if (d_x < e_offset_x) {
-			d_x = 0;
-			d_w += e_offset_x;
-		}
-		redraw(d_x, d_y, d_w, d_h, false);
-	}
-	/** Redraw
-	 * @param start_index
-	 * @param end_index
-	 */
-	protected void redraw(int start_index, int end_index) {
-		int max_col = getMaxCol();
-		int start_row = (int) Math.floor(start_index / max_col);
-		int start_y_loc = (start_row * getElementHeight() + e_offset_y) - verticalScrollOffset;
-		int end_row = (int) Math.floor(end_index / max_col);
-		int end_y_loc = (end_row * getElementHeight() + e_offset_y) - verticalScrollOffset;
-		int diff = Math.abs(end_row - start_row) + 1;
-		redraw(0, Math.min(start_y_loc, end_y_loc), (max_col * getElementWidth() + e_offset_x), diff * getElementHeight(), false);
-	}
-	/** select elements
-	 * @param start_index
-	 * @param end_index
-	 * @param checkStatus
-	 * @return true if element can be selected
-	 */
-	protected boolean canSelectElements(int start_index, int end_index, boolean checkStatus) {
-		if (start_index == -1 || end_index == -1)
-			return false;
-
-		selectElements(start_index, end_index, checkStatus);						
-		return true;
-	}
-	/** unselect all elements
-	 * 
-	 */
-	public void unselectAllElements() {
-		selectedElements.clear();
-		tempSelectedElements.clear();
-	}
-	/** Select element
-	 * @param index Element index
-	 */
-	public void autoSelectUnselectElement(int index) {
-		if (isSelected(index)) {
-			selectedElements.clear(index);
-		} else {
-			selectedElements.set(index);
-		}
-	}
-	/** Is element selected
-	 * @param index
-	 * @return true if element is selected
-	 */
-	public boolean isSelected(int index) {
-		return selectedElements.get(index);
-	}
-	/** unselect element
-	 * @param index Target element index
-	 */
-	public void unselectElement(int index) {
-		selectedElements.clear(index);
-	}
-	/** select element
-	 * @param index
-	 */
-	public void selectElement(int index) {
-		selectedElements.set(index);
-		firstSelectedIndex = index;
-		//selection = findLocation(index);
-		//actualScrollStart_y = selection.y + verticalScrollOffset;
-	}
-	/** Select elements 
-	 * @param from_index
-	 * @param to_index
-	 */
-	public void selectElements(int from_index, int to_index) {
-		selectElements(from_index, to_index, false);
-	}
-	/** Select elements
-	 * @param from_index
-	 * @param to_index
-	 * @param checkStatus
-	 */
-	public void selectElements(int from_index, int to_index, boolean checkStatus) {
-		for (int index = from_index; index < to_index + 1; index++) {
-			if (checkStatus)
-				autoSelectUnselectElement(index);
-			else
-				selectedElements.set(index);
-		}
-	}
-	public void unselectElements(int from_index, int to_index) {
-		for (int index = from_index; index < to_index + 1; index++) {
-			selectedElements.clear(index);
-		}
-	}
-	/** Paint the view
-	 * @param gc
-	 * @param col_start
-	 * @param col_end
-	 * @param row_start
-	 * @param row_end
-	 * @param render_x
-	 * @param render_y
-	 * @param renderWidth
-	 * @param renderHeight
-	 */
-	protected void performPaint(GC gc, int col_start, int col_end, int row_start, int row_end, int render_x, int render_y, int renderWidth, int renderHeight) {
-		Image imageBuffer = null;
-		GC newGC = null;
-		if (DOUBLE_BUFFER) {
-			imageBuffer = new Image(getDisplay(), renderWidth, renderHeight);
-			newGC = new GC(imageBuffer, SWT.LEFT_TO_RIGHT);
-		} else {
-			newGC = gc;
-		}
-		newGC.setFont(getFont());
-		//draw margin background
-		if (isDisplayRuler()) {
-			newGC.setBackground(margin_color);
-			newGC.fillRectangle(0, 0, e_offset_x - e_spacing_x, getClientArea().height);
-		}
-
-		int total = getTotalElements();
-		for (int row_count = row_start; row_count < row_end; row_count++) {
-			for (int col_count = col_start; col_count < col_end; col_count++) {
-				int index = findSelectedIndex(row_count, col_count);
-				if (index > -1 && index < total) {
-					Object obj = getObject(index);
-					
-					int x_loc = e_offset_x + ((col_count) * getElementWidth());
-					int y_loc = e_offset_y + ((row_count) * getElementHeight()) - verticalScrollOffset;
-					if (col_count == 0 && isDisplayRuler()) {
-						drawIndex(newGC, obj, index, y_loc);
-					}
-					drawImage(newGC, obj, index, x_loc, y_loc, (selectedElements.get(index) || tempSelectedElements.get(index)));
-				}
-			}
-		}
-		if (movingSelectionStart != null && movingSelectionEnd != null) {
-			drawSelection(newGC);
-		}
-		if (DOUBLE_BUFFER) {
-			gc.drawImage(imageBuffer, render_x, render_y);
-			newGC.dispose();
-			imageBuffer.dispose();
-		}
-		clearMargin(gc, getBackground());
-	}
-	/** Draw index
-	 * @param gc
-	 * @param obj
-	 * @param index
-	 * @param y_loc
-	 */
-	protected void drawIndex(GC gc, Object obj, int index, int y_loc) {
-		String text = contentProvider.getRulerIndex(obj, index);
-		Point text_size = gc.stringExtent(text);
-		int align =  e_offset_x - e_spacing_x - text_size.x;
-		int valign = y_loc + e_height/2 - text_size.y/2 ;
-		gc.drawText(text, align, valign);
-	}
-	/** Draw image
-	 * @param gc
-	 * @param obj
-	 * @param x_loc
-	 * @param y_loc
-	 * @param isSelected
-	 */
-	protected void drawImage(GC gc, Object obj, int index, int x_loc, int y_loc, boolean isSelected) {
-		Image statusImage = getStatusIcon(obj, index, isSelected);
-		if (statusImage != null) {
-			gc.drawImage(statusImage, x_loc, y_loc);
-			drawSpecial(obj, index, gc, x_loc, y_loc, e_width, e_height);
-		}
-	}
-	/** Draw selection
-	 * @param gc
-	 */
-	private void drawSelection(GC gc) {
-		gc.setForeground(sel_color);
-		gc.setLineWidth(sel_size);
-		Point stationary_pt = getStartedPoint(movingSelectionStart.x, movingSelectionStart.y);
-		int start_x = stationary_pt.x;
-		int start_y = stationary_pt.y;
-		int end_x = 0;
-		int end_y = 0;
-		switch (getDirection(movingSelectionStart.x, movingSelectionStart.y, movingSelectionEnd.x, movingSelectionEnd.y)) {
-		case SE:
-			while (start_x < movingSelectionEnd.x) {
-				gc.drawLine(start_x, stationary_pt.y, start_x + sel_length, stationary_pt.y);
-				start_x += (sel_length * sel_gap);
-			}
-			while (start_y < movingSelectionEnd.y) {
-				gc.drawLine(stationary_pt.x, start_y, stationary_pt.x, start_y + sel_length);
-				start_y += (sel_length * sel_gap);
-			}
-			start_x -= sel_gap;
-			start_y -= sel_gap;
-			end_x = start_x;
-			end_y = start_y;
-			if (isReachBottom() || movingSelectionEnd.y < getClientArea().height) {
-				while (end_x > stationary_pt.x) {
-					gc.drawLine(end_x - sel_length, start_y, end_x, start_y);
-					end_x -= (sel_length * sel_gap);
-				}
-			}
-			while (end_y > stationary_pt.y) {
-				gc.drawLine(start_x, end_y - sel_length, start_x, end_y);
-				end_y -= (sel_length * sel_gap);
-			}
-			break;
-		case SW:
-			while (start_x > movingSelectionEnd.x) {
-				gc.drawLine(start_x - sel_length, stationary_pt.y, start_x, stationary_pt.y);
-				start_x -= (sel_length * sel_gap);
-			}
-			while (start_y < movingSelectionEnd.y) {
-				gc.drawLine(stationary_pt.x, start_y, stationary_pt.x, start_y + sel_length);
-				start_y += (sel_length * sel_gap);
-			}
-			start_x += sel_gap;
-			start_y -= sel_gap;
-			end_x = start_x;
-			end_y = start_y;
-			if (isReachBottom() || movingSelectionEnd.y < getClientArea().height) {
-				while (end_x < stationary_pt.x) {
-					gc.drawLine(end_x, start_y, end_x + sel_length, start_y);
-					end_x += (sel_length * sel_gap);
-				}
-			}
-			while (end_y > stationary_pt.y) {
-				gc.drawLine(start_x, end_y - sel_length, start_x, end_y);
-				end_y -= (sel_length * sel_gap);
-			}
-			break;
-		case NW:
-			while (start_x > movingSelectionEnd.x) {
-				gc.drawLine(start_x - sel_length, stationary_pt.y, start_x, stationary_pt.y);
-				start_x -= (sel_length * sel_gap);
-			}
-			while (start_y > movingSelectionEnd.y) {
-				gc.drawLine(stationary_pt.x, start_y - sel_length, stationary_pt.x, start_y);
-				start_y -= (sel_length * sel_gap);
-			}
-			start_x += sel_gap;
-			start_y += sel_gap;
-			end_x = start_x;
-			end_y = start_y;
-			if (isReachTop() || movingSelectionEnd.y > 1) {
-				while (end_x < stationary_pt.x) {
-					gc.drawLine(end_x, start_y, end_x + sel_length, start_y);
-					end_x += (sel_length * sel_gap);
-				}
-			}
-			while (end_y < stationary_pt.y) {
-				gc.drawLine(start_x, end_y, start_x, end_y + sel_length);
-				end_y += (sel_length * sel_gap);
-			}
-			break;
-		case NE:
-			while (start_x < movingSelectionEnd.x) {
-				gc.drawLine(start_x, stationary_pt.y, start_x + sel_length, stationary_pt.y);
-				start_x += (sel_length * sel_gap);
-			}
-			while (start_y > movingSelectionEnd.y) {
-				gc.drawLine(stationary_pt.x, start_y - sel_length, stationary_pt.x, start_y);
-				start_y -= (sel_length * sel_gap);
-			}
-			start_x -= sel_gap;
-			start_y += sel_gap;
-			end_x = start_x;
-			end_y = start_y;
-			if (isReachTop() || movingSelectionEnd.y > 1) {
-				while (end_x > stationary_pt.x) {
-					gc.drawLine(end_x - sel_length, start_y, end_x, start_y);
-					end_x -= (sel_length * sel_gap);
-				}
-			}
-			while (end_y < stationary_pt.y) {
-				gc.drawLine(start_x, end_y, start_x, end_y + sel_length);
-				end_y += (sel_length * sel_gap);
-			}
-			break;
-		}
-	}
-	/** Clear margin background
-	 * @param gc
-	 * @param background
-	 */
-	protected void clearMargin(GC gc, Color background) {
-		gc.setBackground(background);
-	}
-	/** Get GC
-	 * @return
-	 */
-	public GC getGC() {
-		return getGC(SWT.NONE);
-	}
-	/** Get GC by creating a new
-	 * @param style
-	 * @return
-	 */
-	protected GC getGC(int style) {
-		return new GC(this, style);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#setCursor(org.eclipse.swt.graphics.Cursor)
-	 */
-	public void setCursor(Cursor cursor) {
-		if (cursor == null) {
-			super.setCursor(defaultCursor);
-		} else {
-			super.setCursor(cursor);
-		}
-	}
-	
-	/** Do mouse moving
-	 * @param event
-	 */
-	protected void doMouseMoving(Event event) {
-		int index = findSelectedIndexByLocation(event.x, event.y, false);
-		if (index > -1) {
-			setCursor(new Cursor(getDisplay(), SWT.CURSOR_HAND));
-		} else {
-			setCursor(null);
-		}
-		hideToolTip();
-	}
-	/** Hide tooltip
-	 * 
-	 */
-	protected void hideToolTip() {
-		if (fInformationControl != null) {
-			fInformationControl.setVisible(false);
-			if (fInformationControl != null)
-				fInformationControl.dispose();
-		}
-		disableTooltipTimer();
-	}
-	protected void disableTooltipTimer() {
-		if (hoverTimer != null) {
-			hoverTimer.cancel();
-			//hoverTimer.purge();
-			hoverTimer = null;
-		}
-	}
-	protected void enableTooltipTimer() {
-		if (!show_tooltip_allthetime && fInformationControl != null) {
-			getHoverTimer().schedule(new TimerTask() {
-				public void run() {
-					getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							hideToolTip();								
-						}
-					});
-				}
-			}, tooltip_timeout);
-		}
-	}
-	/** Get hover timer
-	 * @return
-	 */
-	private Timer getHoverTimer() {
-		if (hoverTimer == null) {
-			hoverTimer = new Timer();
-		}
-		return hoverTimer;
-	}
-	/** Reset info
-	 * 
-	 */
-	protected void resetInfo() {
-		hideToolTip();
-		mouseDown = false;
-		mouseDoubleClick = false;
-		movingSelectionStart = null;
-		movingSelectionEnd = null;
-		max_e_row = -1;
-		max_e_col = -1;
-		setCursor(null);
-	}
-	/** Handle dispose event
-	 * @param event
-	 */
-	protected void handleDispose(Event event) {
-		removeListener(SWT.Dispose, listener);
-		event.type = SWT.None;
-		resetInfo();
-		keyActionMap = null;
-		defaultCursor.dispose();
-		defaultCursor = null;
-		actionListeners.clear();
-		total_elements = 0;
-	}
-	/** Handle key down event
-	 * @param event
-	 */
-	protected void handleKeyDown(Event event) {
-		if (event.doit == true) {
-			handleKey(event);
-		}
-	}
-	/** Handle key up event
-	 * @param event
-	 */
-	protected void handleKeyUp(Event event) {
-		resetInfo();
-	}
-	/** Handle mouse down event
-	 * @param event
-	 */
-	protected void handleMouseDown(Event event) {
-		mouseDown = true;
-		mouseDoubleClick = false;
-		if (getTotalElements() == 0 || (event.button != 1) || (IS_CARBON && (event.stateMask & SWT.MOD4) != 0)) {
-			return;
-		}
-		boolean isCtrl = (event.stateMask & SWT.MOD1) != 0;
-		boolean isShift = (event.stateMask & SWT.MOD2) != 0;
-		
-		int end = findSelectedIndexByLocation(event.x, event.y, false);
-		int start = isShift?firstSelectedIndex:end;
-
-		if (start == -1)
-			start = end;
-		
-		if (start > end) {// swarp
-			int tmp = start;
-			start = end;
-			end = tmp;
-		}
-
-		if (IS_CARBON) {// mac
-			if (start > -1 && end > -1 && !isCtrl) {
-				firstSelectedIndex = start;
-				secondSelectedIndex = end;
-			}
-			if (isShift) {
-				if (firstSelectedIndex > -1 && secondSelectedIndex > -1 && firstSelectedIndex < secondSelectedIndex) {
-					end = secondSelectedIndex;
-				}
-			}
-		}
-		else if (IS_GTK || IS_MOTIF) {// linux
-			if (isShift && isCtrl) {//only apply ctrl if both keys pressed
-				isShift = false;
-				if (start < secondSelectedIndex)
-					end = start;
-				else
-					start = end;
-			}
-			if (start > -1 && end > -1 && (!isShift || start == end)) {//get last selection if no shift or start==end
-				firstSelectedIndex = start;
-				secondSelectedIndex = end;
-			}
-		}
-		else {// others eg. windows
-			if (start > -1 && end > -1 && (!isShift || start == end)) {//get last selection if no shift or start==end
-				firstSelectedIndex = start;
-			}
-		}
-		if (!isShift && !isCtrl) { //no shift, no ctrl
-			unselectAllElements();
-		}
-		if (start > -1 && end > -1 && isShift && !isCtrl) { //shift
-			unselectAllElements();
-		}
-		if ((start == -1 || end == -1) && !isShift && !isCtrl) {//clear all elementd if no selected
-			unselectAllElements();
-			firstSelectedIndex = -1;
-			secondSelectedIndex = -1;
-		}
-
-		selection = new Point(event.x, event.y);
-		actualScrollStart_y = selection.y + verticalScrollOffset;
-		canSelectElements(start, end, (isCtrl && !isShift));
-		redraw();
-	}
-	/** Handle mouse up event
-	 * @param event
-	 */
-	protected void handleMouseUp(Event event) {
-		selectedElements.or(tempSelectedElements);
-		if (movingSelectionStart != null) {
-			redraw();
-		}
-		resetInfo();
-		endAutoScroll();
-	}
-	/** Handle mouse double click event
-	 * @param event
-	 */
-	protected void handleMouseDoubleClick(Event event) {
-		if (event.button != 1) {
-			return;
-		}
-		resetInfo();
-		mouseDoubleClick = true;
-		int index = findSelectedIndexByLocation(event.x, event.y, false);
-		if (index > -1) {
-			fireAction(IIconCanvasActionListener.DOUBLE_CLICK_ACTION, index);
-			redraw(index, index);
-		}
-	}
-	protected void handleMouseHover(Event event) {
-		int index = findSelectedIndexByLocation(event.x, event.y, false);
-		if (index > -1) {
-			if (fInformationControl == null)
-				showToolTip(index, event);
-			
-			enableTooltipTimer();
-		} else {
-			hideToolTip();
-		}
-	}
-	/** Handle mouse move event
-	 * @param event
-	 */
-	protected void handleMouseMove(Event event) {
-		if (autoScrollDirection == SWT.NULL)
-			doMouseMoving(event);
-		if (!mouseDown || mouseDoubleClick || getTotalElements() == 0)
-			return;
-		if ((event.stateMask & SWT.BUTTON1) == 0) {
-			return;
-		}
-		if ((event.stateMask & SWT.MOD2) != 0) { //shift key
-			return;
-		}
-		update();
-		doAutoScroll(event.x, event.y);
-	}
-	/** Handle paint event
-	 * @param event
-	 */
-	protected void handlePaint(Event event) {
-		Rectangle clientArea = getClientArea();
-		if (getTotalElements() == 0 || event.height == 0 || (clientArea.width == 0 && clientArea.height == 0)) {
-			// Check if there is work to do
-			return;
-		}
-		// default
-		int renderWidth = clientArea.width;
-		int renderHeight = clientArea.height;
-		int col_start = 0;
-		int col_end = getMaxCol();
-		int row_start = 0;
-		int row_end = getMaxClientRow();
-		if (event.y > 0) {
-			Point start_pt = null;
-			if (movingSelectionStart != null)
-				start_pt = getStartedPoint(movingSelectionStart.x, movingSelectionStart.y);
-			else
-				start_pt = getStartedPoint(event.x + event.width, event.y + event.height);
-			Point end_pt = getFinishedPoint(event.x, event.y);
-			int s_x = start_pt.x;
-			int e_x = end_pt.x;
-			int s_y = start_pt.y;
-			int e_y = end_pt.y;
-			switch (getDirection(start_pt.x, start_pt.y, end_pt.x, end_pt.y)) {
-			case SW:
-				s_x = end_pt.x;
-				e_x = start_pt.x;
-				break;
-			case NW:
-				s_x = end_pt.x;
-				e_x = start_pt.x;
-				s_y = end_pt.y;
-				e_y = start_pt.y;
-				break;
-			case NE:
-				s_y = end_pt.y;
-				e_y = start_pt.y;
-				break;
-			}
-			col_start = Math.max(0, getSelectedCol(s_x - e_offset_x, true));
-			col_end = Math.min(getSelectedCol(e_x + event.width - e_offset_x, true) + 1, getMaxCol());
-			row_start = Math.max(0, getSelectedRow(s_y - e_offset_y, true));
-			row_end = Math.min(getSelectedRow(e_y + event.height - e_offset_y, true) + 1, getMaxRow());
-			renderWidth = s_x + e_x + event.width;
-			renderHeight = s_y + e_y + event.height;
-		} else {
-			row_start = Math.max(0, current_top_row);
-			row_end = Math.min(row_end + row_start + 1, getMaxRow());
-		}
-		// System.out.println("performPaint: " + col_start + "," + col_end + " - " + row_start + "," + row_end);
-		performPaint(event.gc, col_start, col_end, row_start, row_end, 0, 0, renderWidth, renderHeight);
-	}
-	/** Handle resize event
-	 * @param event
-	 */
-	protected void handleResize(Event event) {
-		/*
-		int index = selection == null ? -1 : findSelectedIndexByLocation(selection.x, (actualScrollStart_y - verticalScrollOffset), false);
-		if (index > -1) {
-			selectedElements.clear(index);
-			selection = null;
-		}
-		*/
-		resetInfo();
-		setVerticalScrollBar(getVerticalBar());
-		if (!claimBottomFreeSpace())
-			calculateTopIndex();
-	}
-	/** Handle focus out event
-	 * @param event
-	 */
-	protected void handleFocusOut(Event event) {
-		//hideToolTip();
-	}
-	/** Show tooltip
-	 * @param index Target element index
-	 * @param event mouse move event
-	 */
-	protected void showToolTip(int index, Event event) {
-		if (!show_tooltip || index == -1) {
-			hideToolTip();
-			return;
-		}
-		boolean isShift = (event.stateMask & SWT.MOD2) != 0;
-		boolean isCtrl = (event.stateMask & SWT.MOD1) != 0;
-		showToolTip(index, (!isShift && !isCtrl));
-	}
-	protected void showToolTip(int index, boolean showExtra) {
-		String[] tooltipTexts = getToolTipText(getObject(index));
-		// confirm to show extra if array is larger than 1
-		if (showExtra)
-			showExtra = (tooltipTexts.length>1);
-		IIconInformationControl informationControl = getInformationControl(showExtra);
-		if (informationControl != null) {
-			Rectangle clientArea = getClientArea();
-			//informationControl.setSizeConstraints(clientArea.width, clientArea.height);
-			informationControl.setHeader(tooltipTexts[0]);
-			if (showExtra) {
-				informationControl.setInformation(tooltipTexts[1]);
-			}
-			Point location = findLocation(index);
-			Point t_size = informationControl.getShellSize();
-			
-			final int x_gap = getElementWidth()/2;
-			final int y_gap = showExtra?(getElementHeight()* 1/2):getElementHeight();
-			
-			int display_x = location.x + x_gap;
-			int display_y = location.y + y_gap;
-			if (display_x + t_size.x > clientArea.width) {
-				int lx = location.x - t_size.x + x_gap;
-				if (lx > 0)
-					display_x = lx; 
-			}
-			if (display_y + t_size.y > clientArea.height) {
-				int ly = location.y - t_size.y + y_gap;
-				if (ly > 0)
-					display_y = ly;
-			}
-			Point real_location = getViewActualLocation(this, null, display_x-2, display_y-2);
-			informationControl.setLocation(real_location);
-			informationControl.setVisible(true);
-			//informationControl.setFocus();
-		}
-	}
-	/** Get actual view location 
-	 * @param from
-	 * @param to
-	 * @param mx
-	 * @param my
-	 * @return
-	 */
-	protected Point getViewActualLocation(Control from, Control to, int mx, int my) {
-		Point mappedpt = getDisplay().map(from, to, 0, 0);
-		Point newpt = new Point(mx, my);
-		newpt.x += mappedpt.x;
-		newpt.y += mappedpt.y;
-		return newpt;
-	}
-	/** Get selected indexes
-	 * @return selected indexes
-	 */
-	public int[] getSelectedIndexes() {
-		int[] retValue = new int[selectedElements.cardinality()];
-		for (int i = selectedElements.nextSetBit(0), j = 0; i >= 0; i = selectedElements.nextSetBit(i + 1), j++) {
-			retValue[j] = i;
-		}
-		return retValue;
-	}
-	/** Get tooltip text
-	 * @param obj
-	 * @return text of tooltip
-	 */
-	protected String[] getToolTipText(Object obj) {
-		if (toolTipProvider == null)
-			return IToolTipProvider.NO_TOOLTIP;
-		return toolTipProvider.toolTipText(obj);
-	}
-	/** Get object from selected elementindex 
-	 * @param index element index
-	 * @return
-	 */
-	protected Object getObject(int index) {
-		if (contentProvider == null) {
-			return null;
-		}
-		return contentProvider.getObject(index);
-	}
-
-	/** Get status image
-	 * @param obj
-	 * @param index target index position
-	 * @param isSelected true if element is selected
-	 * @return
-	 */
-	protected Image getStatusIcon(Object obj, int index, boolean isSelected) {
-		if (imageProvider == null)
-			return null;
-		return imageProvider.getStatusIcon(obj, index, isSelected);
-	}
-	/** Draw special on selected element
-	 * @param obj
-	 * @param gc
-	 * @param x_loc
-	 * @param y_loc
-	 * @param width
-	 * @param height
-	 */
-	protected void drawSpecial(Object obj, int index, GC gc, int x_loc, int y_loc, int width, int height) {
-		if (imageProvider != null) {
-			imageProvider.drawSpecial(obj, index, gc, x_loc, y_loc, width, height);
-		}
-	}
-	/** Get information control
-	 * @param showDetails
-	 * @return
-	 */
-	protected IIconInformationControl getInformationControl(boolean showDetails) {
-		if (fInformationControl == null) {
-			fInformationControl= iconHover.getHoverControlCreator(getShell(), showDetails, tooltip_wrap);
-			fInformationControl.addDisposeListener(new DisposeListener() {
-				public void widgetDisposed(DisposeEvent e) {
-					handleInformationControlDisposed();
-				}
-			});
-		}
-		return fInformationControl;
-	}
-	/** Handle information control disposed event
-	 * 
-	 */
-	protected void handleInformationControlDisposed() {
-		fInformationControl= null;
-	}
-
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * Self testing
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/
-	public static void main(String[] args) {
-		final int totalImage = 200;
-        final Display display = new Display();
-        final Shell shell = new Shell(display);
-        shell.setLocation(100, 200);
-        shell.setSize(600, 300);
-        shell.setLayout(new FillLayout());
-
-		//File normalFile = new File("D:/eclipse3.1/workspace/org.eclipse.ptp.ui/icons/node/node_running.gif");
-		//File selectedFile = new File("D:/eclipse3.1/workspace/org.eclipse.ptp.ui/icons/node/node_running_sel.gif");
-		File normalFile = new File("/home/clement/Desktop/workspace_1.1/org.eclipse.ptp.ui/icons/node/node_running.gif");
-		File selectedFile = new File("/home/clement/Desktop/workspace_1.1/org.eclipse.ptp.ui/icons/node/node_running_sel.gif");
-		
-		URL normalURL = null;
-		URL selectedlURL = null;
-		try {
-			normalURL = normalFile.toURI().toURL();
-			selectedlURL = selectedFile.toURI().toURL();
-		} catch (Exception e) {
-			System.out.println("Cannot create the URL: " + e.getMessage());
-			return;
-		}
-		final Image normalImage1 = ImageDescriptor.createFromURL(normalURL).createImage();
-		final Image selectedImage1 = ImageDescriptor.createFromURL(selectedlURL).createImage();
-        
-		int w = 16;
-		int h = 16;
-		final Image normalImage = new Image(normalImage1.getDevice(), normalImage1.getImageData().scaledTo(w, h));		
-		final Image selectedImage = new Image(selectedImage1.getDevice(), selectedImage1.getImageData().scaledTo(w, h));		
-
-        IconCanvas iconCanvas = new IconCanvas(shell, SWT.NONE);
-        iconCanvas.setShowTooltip(false);
-        iconCanvas.setIconSize(w, h);
-        iconCanvas.setFontSize(10);
-        iconCanvas.setIconSpace(1, 4);
-        iconCanvas.setTooltipWrap(true);
-        iconCanvas.setContentProvider(new IContentProvider() {
-        	public Object getObject(int index) {
-        		return new Integer(index);
-        	}
-        	public String getRulerIndex(Object obj, int index) {
-        		return String.valueOf(index);
-        	}
-        });
-        iconCanvas.setImageProvider(new IImageProvider() {
-        	public Image getStatusIcon(Object obj, int index, boolean isSelected) {
-        		return isSelected?selectedImage:normalImage;
-        	}
-        	public void drawSpecial(Object obj, int index, GC gc, int x_loc, int y_loc, int width, int height) {
-        	}
-        });
-        iconCanvas.setToolTipProvider(new IToolTipProvider() {
-        	public String[] toolTipText(Object obj) {
-        		//if (obj.toString().indexOf("1") > -1) {
-        		String t = "<i>12345678901234567890123456789a<br>";
-	    		t += "12345678901234567890</i>1<b>23456789</b>a";
-	    		t += "12345678901234567890123456789a";
-	       		return new String[] { "Object: " + obj, t };
-        		//return new String[] { "" };
-        		//}
-        		/*
-        		String[] texts = new String[2];
-        		String contentText = "<u>Variables</u><br>";
-        		contentText += "<ind>abc: <key>PrintStream</key><br>";
-        		contentText += "<ind><hl>aaaaaaaaaaa hhhhhhhhhh gggggggggggggggg bbbbbbbbbbbbbbb ccccccccccccccc:</hl> PrintStream<br>";
-        		contentText += "<ind><hl>aaaaaaa hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh ccccccccccccccc dddddddddddddddd eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:</hl> PrintStream<br>";
-        		contentText += "<ind><hl>1aasdbc:</hl> PrintStream<br>";
-        		contentText += "<ind><hl>2aasdbc:</hl> PrintStream<br>";
-        		
-        		contentText += "<ind><hl>3aasdbc:</hl> PrintStream<br>";
-        		contentText += "<ind><hl>4aasdbc:</hl> PrintStream<br>";
-        		contentText += "<ind><hl>5aasdbc:</hl> PrintStream<br>";
-        		contentText += "<ind><hl>6aasdbc:</hl> PrintStream<br>";
-        		contentText += "<ind><hl>7aasdbc:</hl> PrintStream<br>";
-        		contentText += "<ind><i>8ab99213 32c:</i> PrintStream<br>";
-        		
-        		texts[0] = "abc\nObject: " + obj;
-        		texts[1] = contentText;
-        		return texts;
-        		*/
-        	}
-        	public void update(Object obj, String content) {
-        		
-        	}
-        });
-        iconCanvas.setTotal(totalImage);
-
-        shell.open();
-        while (!shell.isDisposed()) {
-        	if (!display.readAndDispatch())
-        		display.sleep();
-       	}
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/JobsListView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/JobsListView.java
deleted file mode 100644
index b901268..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/JobsListView.java
+++ /dev/null

@@ -1,401 +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.ui.views;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.internal.ui.actions.TerminateJobFromListAction;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.utils.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-
-public class JobsListView extends ViewPart {
-	private final class MMChildListener implements IModelManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IChangedResourceManagerEvent)
-		 */
-		public void handleEvent(IChangedResourceManagerEvent e) {
-			// Don't need to do anything
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.INewResourceManagerEvent)
-		 */
-		public void handleEvent(INewResourceManagerEvent e) {
-			/*
-			 * Add resource manager child listener so we get notified when new
-			 * machines are added to the model.
-			 */
-			final IResourceManager rm = e.getResourceManager();
-	        rm.addChildListener(resourceManagerListener);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IRemoveResourceManagerEvent)
-		 */
-		// Update the button here.
-		public void handleEvent(IRemoveResourceManagerEvent e) {
-			/*
-			 * Removed resource manager child listener when resource manager is removed.
-			 */
-			e.getResourceManager().removeChildListener(resourceManagerListener);
-		}		
-	}
-	
-	private final class QueueChildListener implements IQueueChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedJobEvent)
-		 */
-		public void handleEvent(IChangedJobEvent e) {
-			for (IPJob job : e.getJobs()) {
-				refresh(job);
-			}
-			
-			// Refresh the terminate job button
-			PTPUIPlugin.getDisplay().syncExec(new Runnable() {
-				public void run() {
-					terminateAllAction.updateTerminateJobState();
-				}
-			});
-			
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewJobEvent)
-		 */
-		public void handleEvent(final INewJobEvent e) {
-			PTPUIPlugin.getDisplay().syncExec(new Runnable() {
-				public void run() {
-					updateColumns(e.getJobs().iterator().next());
-				}
-			});
-			refresh(null);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveJobEvent)
-		 */
-		public void handleEvent(IRemoveJobEvent e) {
-			refresh(null);
-		}
-	}
-	
-	private final class RMChildListener implements IResourceManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedMachineEvent)
-		 */
-		public void handleEvent(IChangedMachineEvent e) {
-			// Don't need to do anything
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedQueueEvent)
-		 */
-		public void handleEvent(IChangedQueueEvent e) {
-			// Can safely ignore
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerNewMachineEvent)
-		 */
-		public void handleEvent(INewMachineEvent e) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewQueueEvent)
-		 */
-		public void handleEvent(INewQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.addChildListener(queueChildListener);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveMachineEvent)
-		 */
-		public void handleEvent(IRemoveMachineEvent e) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveQueueEvent)
-		 */
-		public void handleEvent(IRemoveQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.removeChildListener(queueChildListener);
-			}
-		}
-	}
-
-	private static final String TAG_COLUMN_WIDTHS = "columnWidths"; //$NON-NLS-1$
-	private TableViewer viewer;
-	private IMemento memento;
-	private TerminateJobFromListAction terminateAllAction;
-
-	/*
-	 * Model listeners
-	 */
-	private final IModelManagerChildListener modelManagerListener = new MMChildListener();
-	private final IResourceManagerChildListener resourceManagerListener = new RMChildListener();
-	private final IQueueChildListener queueChildListener = new QueueChildListener();
-
-	private final Set<IAttributeDefinition<?,?,?>> colDefs = Collections.synchronizedSet(new HashSet<IAttributeDefinition<?,?,?>>());
-	
-	public TableViewer getViewer() {
-		return viewer;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	public void createPartControl(Composite parent) {
-		parent.setLayout(new FillLayout());
-		
-		viewer = new TableViewer(parent, SWT.H_SCROLL
-				| SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
-
-		viewer.getTable().setLinesVisible(true);
-		viewer.getTable().setHeaderVisible(true);
-		viewer.setUseHashlookup(true);
-
-		createColumns(viewer);
-
-		viewer.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {
-			}
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof IPUniverse) {
-					IPUniverse universe = ((IPUniverse)inputElement);
-					List<IPJob> jobList = new ArrayList<IPJob>();
-					for (IResourceManager rm : universe.getResourceManagers()) {
-						for (IPQueue queue : rm.getQueues()) {
-							for (IPJob job : queue.getJobs()) {
-								jobList.add(job);
-							}
-						}
-					}
-					return jobList.toArray(new IPJob[jobList.size()]);
-				}
-				return new Object[0];
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			}
-		});
-		viewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object j1, Object j2) {
-				return ((IPJob)j1).getName().compareTo(((IPJob)j2).getName());
-			}
-		});
-		getSite().setSelectionProvider(viewer);
-		
-		// Use view toolbar
-		IToolBarManager toolBarMgr = getViewSite().getActionBars().getToolBarManager();
-		
-		terminateAllAction = new TerminateJobFromListAction(this);
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUIACTIONGROUP));
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUIACTIONGROUP, terminateAllAction);
-		
-		
-		/*terminateAllAction = new TerminateJobAction(viewer);
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUIACTIONGROUP, terminateAllAction);*/
-		
-		IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-		viewer.setInput(mm.getUniverse());
-
-		/*
-	     * Add us to any existing RM's. I guess it's possible we could
-	     * miss a RM if a new event arrives while we're doing this, but is 
-	     * it a problem?
-	     */
-	    for (IResourceManager rm : mm.getUniverse().getResourceManagers()) {
-	        rm.addChildListener(resourceManagerListener);
-	        for (IPQueue queue : rm.getQueues()) {
-	        	queue.addChildListener(queueChildListener);
-	        }
-	    }
-	    mm.addListener(modelManagerListener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.ViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento)
-	 */
-	@Override
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-		this.memento = memento;
-	}
-
-	/**
-	 * @param job
-	 */
-	private void refresh(final IPJob job) {
-		PTPUIPlugin.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (!viewer.getTable().isDisposed()) {
-					if (job != null) {
-						updateColumns(job);
-						viewer.refresh(job);
-					} else {
-						viewer.refresh();
-					}
-				}
-			}
-		});
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	@Override
-	public void setFocus() {
-	}
-	
-	/**
-	 * @param tableViewer
-	 * @param fontMetrics
-	 * @param attrDef
-	 */
-	private void addColumn(final IAttributeDefinition<?, ?, ?> attrDef) {
-		TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
-		
-		column.setLabelProvider(new ColumnLabelProvider(){
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.jface.viewers.ColumnLabelProvider#getImage(java.lang.Object)
-			 */
-			@Override
-			public Image getImage(Object element) {
-				if (element instanceof IPJob) {
-					if (attrDef.equals(JobAttributes.getStateAttributeDefinition())) {
-						IPJob job = (IPJob)element;
-						return ParallelImages.jobImages[job.getState().ordinal()][job.isDebug() ? 1 : 0];
-					}
-				}
-				return null;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang.Object)
-			 */
-			@Override
-			public String getText(Object element) {
-				if (element instanceof IPJob) {
-					IPJob job = (IPJob) element;
-					if (!attrDef.equals(JobAttributes.getStateAttributeDefinition())) {
-						IAttribute<?,?,?> attr = job.getAttribute(attrDef.getId());
-						if (attr != null) {
-							return attr.getValueAsString();
-						}
-					}
-				}
-				return null;
-			}
-			
-		});
-		column.getColumn().setData(attrDef);
-		column.getColumn().setResizable(true);
-		column.getColumn().setMoveable(true);
-		// this will need to sort by the col
-		//column.getColumn().addSelectionListener(getHeaderListener());
-		String name = attrDef.getName();
-		column.getColumn().setText(name);
-		PixelConverter converter = new PixelConverter(viewer.getControl());
-		int width = Math.max(converter.convertWidthInCharsToPixels(name.length()+2),
-								converter.convertWidthInCharsToPixels(5));
-		column.getColumn().setWidth(width);
-		colDefs.add(attrDef);
-	}
-	
-	/**
-	 * @param tableViewer
-	 * @param job
-	 */
-	private void addColumns(TableViewer tableViewer, IPJob job) {
-		addColumn(JobAttributes.getStateAttributeDefinition());
-		addColumn(ElementAttributes.getNameAttributeDefinition());
-
-		if (job != null) {
-			for (IAttribute<?,?,?> attr : job.getAttributes()) {
-				IAttributeDefinition<?,?,?> attrDef = attr.getDefinition();
-				if (!colDefs.contains(attrDef) && attrDef.getDisplay()) {
-					addColumn(attrDef);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * @param tableViewer
-	 */
-	private void createColumns(TableViewer tableViewer) {
-		addColumns(tableViewer, null);
-	}
-	
-	/**
-	 * @param job
-	 */
-	private void updateColumns(IPJob job) {
-		for (IAttribute<?,?,?> attr : job.getAttributes()) {
-			IAttributeDefinition<?,?,?> attrDef = attr.getDefinition();
-			if (!colDefs.contains(attrDef) && attrDef.getDisplay()) {
-				addColumn(attrDef);
-			}
-		}
-		viewer.getTable().layout(true);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/MachinesNodesView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/MachinesNodesView.java
deleted file mode 100644
index 3da917c..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/MachinesNodesView.java
+++ /dev/null

@@ -1,1031 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2005 The Regents of the University of California. 
-* This material was produced under U.S. Government contract W-7405-ENG-36 
-* for Los Alamos National Laboratory, which is operated by the University 
-* of California for the U.S. Department of Energy. The U.S. Government has 
-* rights to use, reproduce, and distribute this software. NEITHER THE 
-* GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-* ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-* to produce derivative works, such modified software should be clearly marked, 
-* so as not to confuse it with the version available from LANL.
-* 
-* Additionally, this program and the accompanying materials 
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-* 
-* LA-CC 04-115
-*******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedNodeEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewNodeEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveNodeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.listeners.IMachineChildListener;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
-* @author Daniel (JD) Barboza
-* 
-* Based on original work by Greg Watson and Clement Chu
-* 
-*/
-public class MachinesNodesView extends ViewPart {
-	
-	private final IModelManagerChildListener modelManagerListener = new MMChildListener();
-
-	private final IResourceManagerChildListener resourceManagerListener = new RMChildListener();
-
-	private final IMachineChildListener machineListener = new MachineChildListener();
-	
-	private final IQueueChildListener queueChildListener = new QueueChildListener();
-	
-	private final ArrayList <MachineGraphicalRepresentation> machinesGraphicalRepresentations = 
-		new ArrayList <MachineGraphicalRepresentation>();
-	
-	private final Hashtable <String, NodeGraphicalRepresentation> nodesHashMap = 
-		new Hashtable <String, NodeGraphicalRepresentation> ();
-
-	protected RefreshWorkbenchJob refreshWorkbench = new RefreshWorkbenchJob();
-
-	private MachineNodesCanvas canvas = null;
-	private Listener listener = null;
-	private Font defaultFont = null;
-	private Object elementSelected = null;
-	
-	public MachinesNodesView() {
-        super();
-	}
-	
-	public void createPartControl(final Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new FillLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		canvas = new MachineNodesCanvas(composite, SWT.BORDER |  SWT.V_SCROLL | SWT.H_SCROLL);
-		FontData[] fd = composite.getDisplay().getSystemFont().getFontData();
-		for (int i = 0; i < fd.length; i++) {
-		  fd[i].setHeight(8);
-		}
-		defaultFont = new Font( composite.getDisplay(),fd);
-		
-		/*
-		 * Wait until the view has been created before registering for events
-		 */
-		IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-		
-		synchronized (mm) {
-		    /*
-		     * Add us to any existing RM's. I guess it's possible we could
-		     * miss a RM if a new event arrives while we're doing this, but is 
-		     * it a problem?
-		     */
-		    for (IResourceManager rm : mm.getUniverse().getResourceManagers()) {
-		        rm.addChildListener(resourceManagerListener);
-		        /*
-		         * We need to get the current state of the nodes on this
-		         * resource manager, browsing through the machines and adding
-		         * them to our view
-		         */
-		        for (int i = 0; i < rm.getMachines().length; i++) {
-		        	IPMachine machine = rm.getMachines()[i];
-					machine.addChildListener(machineListener);
-		        	MachineGraphicalRepresentation machinegr = 
-						new MachineGraphicalRepresentation(machine.getName(), machine.getID());
-		        	for (IPNode node : machine.getNodes()) {
-						// create graphical representation of the node
-						NodeGraphicalRepresentation nodegr = 
-							new NodeGraphicalRepresentation(node.getName(), node.getID());
-						machinegr.addNode(nodegr);
-						machinesGraphicalRepresentations.add(machinegr);
-					}	
-		        }
-		    }
-		    mm.addListener(modelManagerListener);
-		}
-		
-		refreshView();
-	}
-	
-	private void refreshView() {
-		refreshWorkbench.schedule(true, true);
-	}
-
-	/*
-	 * Method required so the class can extends ViewPart
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		
-	}
-
-	private class MachineGraphicalRepresentation {
-		private ArrayList <NodeGraphicalRepresentation> nodes = null;
-		private Rectangle rectangle = null;
-		private String machineName = "";
-		private String machineID = "";
-		private static final int WIDTH = 50;
-		private static final int HEIGHT = 50;
-		private Color color = null;
-		private boolean halted;
-		private boolean selected = false;
-		
-		public MachineGraphicalRepresentation(String machineName, String machineID) {
-			this.machineName = machineName;
-			this.setMachineID(machineID);
-			nodes = new ArrayList <NodeGraphicalRepresentation> ();
-			rectangle = new Rectangle(0, 0, WIDTH, HEIGHT);
-			halted = false;
-		}
-		
-		public MachineGraphicalRepresentation(String machineName, String machineID, Color color) {
-			this.machineName = machineName;
-			this.setMachineID(machineID);
-			nodes = new ArrayList <NodeGraphicalRepresentation> ();
-			rectangle = new Rectangle(0, 0, WIDTH, HEIGHT);
-			this.color = color;
-			halted = false;
-		}
-		
-		public MachineGraphicalRepresentation(String machineName, Color color, int Ox, int Oy, int width, int height) {
-			this.machineName = machineName;
-			this.color = color;
-			nodes = new ArrayList <NodeGraphicalRepresentation> ();
-			rectangle = new Rectangle(Ox, Oy, width, height);
-		}
-		
-		public MachineGraphicalRepresentation(String machineName, Color color, int Ox, int Oy) {
-			this.machineName = machineName;
-			this.color = color;
-			nodes = new ArrayList <NodeGraphicalRepresentation> ();
-			rectangle = new Rectangle(Ox, Oy, WIDTH, HEIGHT);
-		}
-		
-		public boolean containsPoint(int x, int y) {
-			return rectangle.contains(x, y);
-		}
-		
-		public String getMachineName() {
-			return machineName;
-		}
-		
-		public Rectangle getGraphicalRepresentation() {
-			return rectangle;
-		}
-		
-		public Color getColor() {
-			return color;
-		}
-		
-		public void setColor(Color color) {
-			this.color = color;
-		}
-		
-		public boolean addNode(NodeGraphicalRepresentation node) {
-			return nodes.add(node);
-		}
-		
-		public boolean removeNode(NodeGraphicalRepresentation node) {
-			return nodes.remove(node);
-		}
-		
-		public void removeNode(String nodeID) {
-			for (int i = 0; i < nodes.size(); i ++) {
-				if (nodes.get(i).getNodeID().equals(nodeID)) {
-					nodes.remove(i);
-					break;
-				}
-			}			
-		}
-
-		public void setHalted(boolean halted) {
-			this.halted = halted;
-		}
-		
-		public boolean isHalted() {
-			return halted;
-		}
-
-		public void setSelected(boolean selected) {
-			this.selected = selected;
-		}
-		
-		public boolean isSelected() {
-			return selected;
-		}
-		
-		public ArrayList <NodeGraphicalRepresentation> getNodes() {
-			return nodes;
-		}
-
-		public void setMachineID(String nodeID) {
-			this.machineID = nodeID;
-		}
-
-		public String getMachineID() {
-			return machineID;
-		}
-	}
-
-	private class NodeGraphicalRepresentation {
-		private Rectangle rectangle = null;
-		private String nodeName = "";
-		private String nodeID = "";
-		private static final int WIDTH = 20;
-		private static final int HEIGHT = 20;
-		private boolean selected = false;
-		private ArrayList <String> jobsIDs = null;
-		
-		public NodeGraphicalRepresentation (String nodeName, String nodeID) {
-			this.nodeName = nodeName;
-			this.nodeID = nodeID;
-			rectangle = new Rectangle(0, 0, WIDTH, HEIGHT);
-			jobsIDs = new ArrayList<String> ();
-		}
-		
-		public String getNodeName() {
-			return nodeName;
-		}
-		
-		public Rectangle getGraphicalRepresentation() {
-			return rectangle;
-		}
-		
-		public void setGraphicalRepresentation(Rectangle ret) {
-			rectangle = ret;
-		}
-		
-		public void setNodeID(String nodeID) {
-			this.nodeID = nodeID;
-		}
-		
-		public String getNodeID() {
-			return nodeID;
-		}
-		
-		public int getNumberOfJobs() {
-			return jobsIDs.size();
-		}
-		
-		public void addJob(String jobID) {
-			if (! jobsIDs.contains(jobID))
-				jobsIDs.add(jobID);
-		}
-		
-		public void removeJob(String jobID) {
-			jobsIDs.remove(jobID);
-		}
-		
-		public ArrayList <String> getJobsIDs () {
-			return jobsIDs;
-		}
-		
-		public void setSelected(boolean selected) {
-			this.selected = selected;
-		}
-		
-		public boolean isSelected() {
-			return selected;
-		}
-		
-		public boolean containsPoint(int x, int y) {
-			return rectangle.contains(x, y);
-		}
-		
-	}
-	
-	private class MachineNodesCanvas extends Canvas {
-		private Composite composite = null;
-		Point origin = new Point (0, 0);
-		ScrollBar verticalBar = null;
-		ScrollBar horizontalBar = null;
-		int WIDTH = 1000;
-		int HEIGHT = 3000;
-		
-		public MachineNodesCanvas(Composite composite, int style) {
-			super(composite, style);
-			this.composite = composite;
-			/*
-			 * Limit the width size based on screen width
-			 */
-			if (getDisplay(). getPrimaryMonitor() != null)
-				WIDTH = getDisplay(). getPrimaryMonitor().getBounds().width;
-			installListeners();
-		}
-
-		protected void installListeners() {
-
-			listener = new Listener() {
-				public void handleEvent(Event event) {
-					switch (event.type) {
-					case SWT.Dispose:
-						//handleDispose(event);
-						break;
-					case SWT.KeyDown:
-						//handleKeyDown(event);
-						break;
-					case SWT.KeyUp:
-						//handleKeyUp(event);
-						break;
-					case SWT.MouseDown:
-						handleMouseDown(event);
-						break;
-					case SWT.MouseUp:
-						//handleMouseUp(event);
-						break;
-					case SWT.MouseDoubleClick:
-						//handleMouseDoubleClick(event);
-						break;
-					case SWT.MouseMove:
-						//handleMouseMove(event);
-						break;
-					case SWT.MouseHover:
-						//handleMouseHover(event);
-						break;
-					case SWT.Paint:
-						handlePaint(event);
-						break;
-					case SWT.Resize:
-						handleResize(event);
-						break;
-					case SWT.FocusOut:
-						//handleFocusOut(event);
-						break;
-					}
-				}
-			};
-			addListener(SWT.Dispose, listener);
-			addListener(SWT.KeyDown, listener);
-			addListener(SWT.KeyUp, listener);
-			addListener(SWT.MouseDown, listener);
-			addListener(SWT.MouseUp, listener);
-			addListener(SWT.MouseDoubleClick, listener);
-			addListener(SWT.MouseMove, listener);
-			addListener(SWT.MouseHover, listener);
-			addListener(SWT.Paint, listener);
-			addListener(SWT.Resize, listener);
-			addListener(SWT.FocusOut, listener);
-
-			verticalBar = this. getVerticalBar();
-			horizontalBar = this.getHorizontalBar();
-			
-			if (horizontalBar != null) {
-				horizontalBar.addListener (SWT.Selection, new Listener () {
-				public void handleEvent (Event e) {
-					int hSelection = horizontalBar.getSelection ();
-					origin.x = -hSelection;
-					redraw();
-				}
-			});
-			}
-			
-			if ( verticalBar!= null) {
-				verticalBar.addListener (SWT.Selection, new Listener () {
-				public void handleEvent (Event e) {
-					int vSelection = verticalBar.getSelection ();
-					origin.y = -vSelection;
-					redraw();
-				}
-			});
-			}
-			
-		}
-		
-		protected void handleMouseDown(Event e) {
-			/*
-			 * Check if the user clicked on some element of our view. First, check 
-			 * if the y coordinate matches with some of our machine representations, 
-			 * considering that our nodes y's range will be the same as their respective
-			 * machines.
-			 */
-			int mouseX = e.x - origin.x;
-			int mouseY = e.y - origin.y;
-			Object selection = null;
-			for (MachineGraphicalRepresentation machinegr: machinesGraphicalRepresentations) {
-				if ( (mouseY > machinegr.getGraphicalRepresentation().y ) && (mouseY < machinegr.getGraphicalRepresentation().y + machinegr.getGraphicalRepresentation().height ))  {
-					/*
-					 * mouseY belongs to this machine representation's Y range. Now
-					 * we check the machine and its nodes to see if we have a match  
-					 */
-					if (machinegr.containsPoint(mouseX, mouseY) )
-						selection = machinegr;
-					else {
-						for (NodeGraphicalRepresentation nodegr: machinegr.getNodes()) {
-							if (nodegr.containsPoint(mouseX, mouseY)) {
-								selection = nodegr;
-								break;
-							}
-						}
-					}
-					break;
-				}
-			}
-			if (selection != elementSelected) {
-				elementSelected = selection;
-				refreshView();
-			}
-		}
-		
-		protected void handleResize(Event event) {
-			Rectangle rect = getBounds ();
-			Rectangle client = getClientArea ();
-			horizontalBar.setMaximum (WIDTH);
-			verticalBar.setMaximum (HEIGHT);
-			horizontalBar.setThumb (Math.min (rect.width, client.width));
-			verticalBar.setThumb (Math.min (rect.height, client.height));
-			int hPage = WIDTH - client.width;
-			int vPage = HEIGHT - client.height;
-			int hSelection = horizontalBar.getSelection ();
-			int vSelection = verticalBar.getSelection ();
-			if (hSelection >= hPage) {
-				if (hPage <= 0) hSelection = 0;
-				origin.x = -hSelection;
-			}
-			if (vSelection >= vPage) {
-				if (vPage <= 0) vSelection = 0;
-				origin.y = -vSelection;
-			}
-			redraw ();
-		}
-		
-		protected void handlePaint(Event event){
-			Rectangle clientArea = getClientArea();
-			
-			int renderWidth = clientArea.width;
-			int renderHeight = clientArea.height;
-			
-			if (event.height == 0 || (renderWidth == 0 && renderHeight == 0)) {
-				// Check if there is work to do
-				return;
-			}
-			
-			Image imageBuffer = null;
-			GC newGC = null;
-			imageBuffer = new Image(getDisplay(), WIDTH, HEIGHT);
-			newGC = new GC(imageBuffer, SWT.LEFT_TO_RIGHT);
-
-			/*
-			 * set font to our predefined default font
-			 */
-			newGC.setFont(defaultFont);
-		
-			/*
-			 *  set some parameters regarding font size
-			 */
-			int fontHeight = defaultFont .getFontData()[0].getHeight();	
-			
-			/*
-			 * If some graphical element is selected, write additional info about it
-			 * on the top of the view.
-			 */
-			String additionalInfo= null;
-			if (elementSelected != null) {
-				additionalInfo="Selected: ";
-				newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-				if (elementSelected instanceof MachineGraphicalRepresentation) {
-					MachineGraphicalRepresentation machine = (MachineGraphicalRepresentation) elementSelected;
-					additionalInfo += "Machine name : " + machine.getMachineName() + " || ID: " + machine.getMachineID();
-				}
-				else if (elementSelected instanceof NodeGraphicalRepresentation) {
-					NodeGraphicalRepresentation node = (NodeGraphicalRepresentation) elementSelected;
-					additionalInfo += "Node name : " + node.getNodeName() + " || ID: " + node.getNodeID();
-					if (node.getNumberOfJobs() > 0) {
-						additionalInfo += " || jobs current running: ";
-						for (String jobID: node.getJobsIDs())
-							additionalInfo += jobID + " ";
-					}
-				}
-				
-				
-				// mark this element to receive different background color			
-				if (elementSelected instanceof MachineGraphicalRepresentation)
-					((MachineGraphicalRepresentation) elementSelected).setSelected(true);
-				else
-					((NodeGraphicalRepresentation) elementSelected).setSelected(true);
-			}
-			
-			/*
-			 * Some constants used to paint machines and nodes
-			 */
-			int Ox = 10;
-			int x = Ox;
-			int Oy = 10;
-			int y = Oy;
-			int nodeWidth =fontHeight*2;
-			int nodeHeight = fontHeight*2;
-			
-			/*
-			 * It seems that 2* fontHeight is equivalent to the exact height size
-			 * of the font in pixels. This space will be used to draw the 
-			 * info string later
-			 */
-			y = y + (fontHeight * 4);
-			
-
-			/*
-			 * paint machines and processes
-			 */
-			for (MachineGraphicalRepresentation machinegr: machinesGraphicalRepresentations)
-			{
-				if (! machinegr.isHalted() )
-				{	
-					if (machinegr.isSelected()) {
-						newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
-						machinegr.setSelected(false);
-					}
-					else
-						newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_RED));
-					
-					machinegr.getGraphicalRepresentation().x = x;
-					machinegr.getGraphicalRepresentation().y = y;				
-					newGC.fillGradientRectangle(x, y, machinegr.getGraphicalRepresentation().width, machinegr.getGraphicalRepresentation().height, false);
-					int currentX = machinegr.getGraphicalRepresentation().x + MachineGraphicalRepresentation.WIDTH + 10;
-					int currentY = machinegr.getGraphicalRepresentation().y;
-					// paint process of this node
-					if ( machinegr.getNodes() != null)
-					{
-						/*
-						 * If the machine has more than 5 nodes, we draw them in 2 rows.
-						 * otherwise, draw them in a single row
-						 */
-						if (machinegr.getNodes().size() > 5) {
-							int totalSize =machinegr.getNodes().size();
-							int half = totalSize / 2;
-							int i;
-							int xRow = currentX;
-							for ( i = 0; i < half +(totalSize % 2); i++) {
-								NodeGraphicalRepresentation nodegr = machinegr.getNodes() .get(i);
-								// adjusting node graphical representation
-								nodegr.getGraphicalRepresentation().width = nodeWidth;
-								nodegr.getGraphicalRepresentation().height = nodeHeight;
-								nodegr.getGraphicalRepresentation().x = currentX;
-								nodegr.getGraphicalRepresentation().y = currentY;
-								if (nodegr.isSelected()) {
-									newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
-									nodegr.setSelected(false);
-								}
-								else
-									newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-								newGC.fillRectangle(nodegr.getGraphicalRepresentation());
-								newGC.setForeground(composite.getDisplay().getSystemColor(SWT.COLOR_BLACK));
-								if (nodegr.getNumberOfJobs() > 9)
-									newGC.drawString("+", currentX + fontHeight/2, currentY);
-								else
-									newGC.drawString(String.valueOf(nodegr.getNumberOfJobs()), currentX + fontHeight/2, currentY);
-								newGC.drawRectangle(nodegr.getGraphicalRepresentation());
-								currentX = currentX + NodeGraphicalRepresentation.WIDTH + 1;
-							}
-							
-							// updatex and  y to paint next row
-							// 
-							currentX = xRow;
-							currentY += nodeHeight + 5; 
-							for (int j = i ; j < totalSize; j++) {
-								NodeGraphicalRepresentation nodegr = machinegr.getNodes() .get(j);
-								// adjusting node graphical representation
-								nodegr.getGraphicalRepresentation().width = nodeWidth;
-								nodegr.getGraphicalRepresentation().height = nodeHeight;
-								nodegr.getGraphicalRepresentation().x = currentX;
-								nodegr.getGraphicalRepresentation().y = currentY;
-								if (nodegr.isSelected()) {
-									newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
-									nodegr.setSelected(false);
-								}
-								else
-									newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-								newGC.fillRectangle(nodegr.getGraphicalRepresentation());
-								newGC.setForeground(composite.getDisplay().getSystemColor(SWT.COLOR_BLACK));
-								if (nodegr.getNumberOfJobs() > 9)
-									newGC.drawString("+", currentX + fontHeight/2, currentY);
-								else
-									newGC.drawString(String.valueOf(nodegr.getNumberOfJobs()), currentX + fontHeight/2, currentY);
-								newGC.drawRectangle(nodegr.getGraphicalRepresentation());
-								currentX = currentX + NodeGraphicalRepresentation.WIDTH + 1;	
-							}
-						}
-						/*
-						 * If the machine has less than 5 nodes, paint all of them in a single row.
-						 */
-						else 
-						for (NodeGraphicalRepresentation nodegr : machinegr.getNodes()) {
-							// adjusting node graphical representation
-							nodegr.getGraphicalRepresentation().width = nodeWidth;
-							nodegr.getGraphicalRepresentation().height = nodeHeight;
-							nodegr.getGraphicalRepresentation().x = currentX;
-							nodegr.getGraphicalRepresentation().y = currentY;
-							if (nodegr.isSelected()) {
-								newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
-								nodegr.setSelected(false);
-							}
-							else
-								newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-							newGC.fillRectangle(nodegr.getGraphicalRepresentation());
-							newGC.setForeground(composite.getDisplay().getSystemColor(SWT.COLOR_BLACK));
-							if (nodegr.getNumberOfJobs() > 9)
-								newGC.drawString("+", currentX + fontHeight/2, currentY);
-							else
-								newGC.drawString(String.valueOf(nodegr.getNumberOfJobs()), currentX + fontHeight/2, currentY);
-							newGC.drawRectangle(nodegr.getGraphicalRepresentation());
-							currentX = currentX + NodeGraphicalRepresentation.WIDTH + 1;
-						}
-					}
-					// update y to print machine name
-					y = y + MachineGraphicalRepresentation.HEIGHT + 10;
-					newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-					newGC.drawString(machinegr.getMachineName(), x, y);
-					// update y to paint next machine
-					y = y + 30;
-				}
-			}
-			/*
-			 * We write the info string now, thus it'll be on top and
-			 * always visible. Note that we use x instead of
-			 * the relative position because we want this string
-			 * to be 'scrollable' on the horizontal., but not
-			 * on the vertical
-			 */
-			if (additionalInfo != null) {
-				newGC.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
-				newGC.drawString(additionalInfo, x, Oy - origin.y);
-			}
-			
-			event.gc.drawImage(imageBuffer, origin.x, origin.y);
-			newGC.dispose();
-			imageBuffer.dispose();
-		}
-	}
-	
-	private boolean machineRepresentationExists(String machineID) {
-		for (MachineGraphicalRepresentation machinegr : machinesGraphicalRepresentations)
-			if (machinegr.getMachineID().equals(machineID)) 
-				return true;
-		return false;
-	}
-	
-	/*
-	 * Listener to take care of job events.
-	 */
-	private final class QueueChildListener implements IQueueChildListener {
-		public void handleEvent(IChangedJobEvent e) {
-			boolean needRefresh = false;
-			for (IPJob job : e.getJobs()) {
-				if ( (job.getState() ==   JobAttributes.State.STARTED) || ( job.getState() == JobAttributes.State.RUNNING) || 
-						(job.getState() == JobAttributes.State.PENDING ) )  {
-					/*
-					 * Add job to the graphical representation of its node
-					 */
-					for (int i = 0; i < job.getProcesses().length; i ++) {
-						IPProcess process= job.getProcesses()[i];
-						if (process.getNode() != null) {
-							nodesHashMap.get(process.getNode().getID())
-							.addJob(job.getID());
-							needRefresh = true;
-						}
-					}
-				}
-				else {
-					/*
-					 * remove job from the graphical representation of its node
-					 */
-					for (int i = 0; i < job.getProcesses().length; i ++) {
-						IPProcess process= job.getProcesses()[i];
-						if (process.getNode() != null) {
-							nodesHashMap.get(process.getNode().getID())
-							.removeJob(job.getID());
-							needRefresh = true;
-						}
-					}
-				}
-				if (needRefresh)
-					refreshView();
-			}
-		}
-		
-		public void handleEvent(final INewJobEvent e) {
-			boolean needRefresh = false;
-			for (IPJob job: e.getJobs()) {
-				/*
-				 * Add job to the graphical representation of its node
-				 */
-				for (int i = 0; i < job.getProcesses().length; i ++) {
-					IPProcess process= job.getProcesses()[i];
-					if (process.getNode() != null) {
-						nodesHashMap.get(process.getNode().getID())
-								.addJob(job.getID());
-						needRefresh = true;
-					}
-				}
-			}
-			if (needRefresh)
-				refreshView();
-		}
-		
-		public void handleEvent(IRemoveJobEvent e) {
-			boolean needRefresh = false;
-			for (IPJob job: e.getJobs()) {
-				/*
-				 * remove job from the graphical representation of its node
-				 */
-				for (int i = 0; i < job.getProcesses().length; i ++) {
-					IPProcess process= job.getProcesses()[i];
-					if (process.getNode() != null) {
-						nodesHashMap.get(process.getNode().getID())
-								.removeJob(job.getID());
-						break;
-					}
-				}
-			}
-			if (needRefresh)
-				refreshView();
-		}
-	}
-	
-	
-	private final class MachineChildListener implements IMachineChildListener {
-		public void handleEvent(final IChangedNodeEvent e) {
-		}
-		
-		public void handleEvent(final INewNodeEvent e) {
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() {
-					for (IPNode node : e.getNodes()) {
-						// create graphical representation of the node
-						NodeGraphicalRepresentation nodegr = new NodeGraphicalRepresentation(node.getName(), node.getID());
-						// associate it with the correspondent IPMachine
-							for (MachineGraphicalRepresentation machine : machinesGraphicalRepresentations) {
-								if (machine.getMachineID().equals(node.getMachine().getID()) ){
-									machine.addNode(nodegr);
-									nodesHashMap.put(node.getID(), nodegr);
-									break;
-								}			
-							}
-					}
-				}
-			});
-			refreshView();
-		}
-
-		public void handleEvent(final IRemoveNodeEvent e) {
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() {
-					for (IPNode node : e.getNodes()) {
-						// delete the node graphical view on the corresponding IPMachine
-							for (MachineGraphicalRepresentation machine : machinesGraphicalRepresentations) {
-								if (machine.getMachineID().equals(node.getMachine().getID()) ){
-									machine.removeNode(node.getID());
-									nodesHashMap.remove(node.getID());
-									break;
-								}			
-							}
-					}
-				}
-			});
-			refreshView();
-		}
-	}
-
-	private final class MMChildListener implements IModelManagerChildListener {
-		
-		public void handleEvent(IChangedResourceManagerEvent e) {
-			boolean needRefresh = false;
-			for (IResourceManager rm : e.getResourceManagers()) {
-				if ( ( rm.getState() == ResourceManagerAttributes.State.STOPPED ) || 
-						( rm.getState() == ResourceManagerAttributes.State.SUSPENDED) ||
-						( rm.getState() == ResourceManagerAttributes.State.ERROR) ) {
-					/* 
-					 * refresh the view, removing the resource manager machines, but
-					 * not removing machine listeners.
-					 */
-					for (IPMachine machine : rm.getMachines()) {
-						String machineID = machine.getID();
-						for (MachineGraphicalRepresentation machinegr : machinesGraphicalRepresentations) 
-							if (machinegr.getMachineID().equals(machineID)) {
-								machinegr.setHalted(true);
-								needRefresh = true;
-								break;
-							}
-								
-					}
-				}
-				/*
-				 * otherwise, reactivate machines of the started / starting resource
-				 * manager
-				 */
-				else {
-					for (IPMachine machine : rm.getMachines()) {
-						String machineID = machine.getID();
-						for (MachineGraphicalRepresentation machinegr : machinesGraphicalRepresentations) 
-							if (machinegr.getMachineID().equals(machineID)) {
-								machinegr.setHalted(false);
-								needRefresh = true;
-								break;
-							}
-					}
-				}
-			}
-			if (needRefresh)
-				refreshView();
-			
-		}
-
-		public void handleEvent(INewResourceManagerEvent e) {
-			/*
-			 * Add resource manager child listener so we get notified when new
-			 * machines are added to the model.
-			 */
-			final IResourceManager rm = e.getResourceManager();
-	        rm.addChildListener(resourceManagerListener);
-		}
-		
-		public void handleEvent(IRemoveResourceManagerEvent e) {
-			/*
-			 * Removed resource manager child listener when resource manager is removed.
-			 */
-			e.getResourceManager().removeChildListener(resourceManagerListener);
-			
-		}		
-	}
-
-	private final class RMChildListener implements IResourceManagerChildListener {
-
-		public void handleEvent(IChangedMachineEvent e) {
-		}
-		
-		public void handleEvent(IChangedQueueEvent e) {
-		}
-
-		public void handleEvent(final INewMachineEvent e) {
-			boolean needRefresh = false;
-			for (IPMachine machine : e.getMachines()) {
-				/*
-				 * check if the machine wasn't added already on the 
-				*  start of the view
-				 */ 
-				if (!  machineRepresentationExists(machine.getID()) ){
-					/*
-					 * Add us as a child listener so we get notified of node events
-					 */
-					machine.addChildListener(machineListener);
-					MachineGraphicalRepresentation machinegr = new MachineGraphicalRepresentation(machine.getName(), machine.getID() );
-					machinesGraphicalRepresentations.add(machinegr);
-					needRefresh = true;
-				}
-			}
-			//refresh if needed
-			if (needRefresh)
-				refreshView();
-		}
-		
-		public void handleEvent(INewQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.addChildListener(queueChildListener);
-			}
-		}
-		
-		public void handleEvent(final IRemoveMachineEvent e) {
-			/*
-			 * Update views when a machine is removed.
-			 */
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() {
-					for (IPMachine machine : e.getMachines()) {
-						for (int i = 0; i < machinesGraphicalRepresentations.size(); i++) {
-							if (machinesGraphicalRepresentations.get(i).getMachineID().equals(machine.getID())) {
-								machinesGraphicalRepresentations.remove(i);
-								break;
-							}
-						}
-						/*
-						 * Remove child listener
-						 */
-						machine.removeChildListener(machineListener);
-					}
-					
-				}
-			});
-			refreshView();
-		}
-
-		public void handleEvent(IRemoveQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.removeChildListener(queueChildListener);
-			}
-		}
-	}
-	
-	class RefreshWorkbenchJob extends WorkbenchJob {
-		private final ReentrantLock	waitLock = new ReentrantLock();
-		private List<Boolean> refreshList = new ArrayList<Boolean>();
-		public RefreshWorkbenchJob() {
-			super("Refreshing workbench...");
-		}
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			boolean refreshAll = isRefreshAll();
-			
-			if (!canvas.isDisposed()) {
-				canvas.redraw();
-			}
-			
-			//if last refresh object is true and previous refresh is false, then refresh again 
-			boolean lastValue = isRefreshAll();
-			waitLock.lock();
-			try {
-				refreshList.clear();
-				if (refreshAll != lastValue && !refreshAll) {
-					refreshList.add(new Boolean(true));
-					schedule();
-				}
-			}
-			finally {
-				waitLock.unlock();
-			}
-			return Status.OK_STATUS;
-		}
-		public boolean shouldSchedule() {
-			int size = size();
-			
-			return (size == 1);
-		}
-		private int size() {
-			waitLock.lock();
-			try {
-				return refreshList.size();
-			}
-			finally {
-				waitLock.unlock();
-			}
-		}
-		private boolean isRefreshAll() {
-			waitLock.lock();
-			try {
-				return refreshList.get(refreshList.size()-1).booleanValue();
-			}
-			finally {
-				waitLock.unlock();
-			}
-		}
-		public void schedule(boolean refresh_all, boolean force) {
-			waitLock.lock();
-			try {
-				if (force)
-					refreshList.clear();
-				refreshList.add(new Boolean(refresh_all));
-			}
-			finally {
-				waitLock.unlock();
-			}
-			schedule();
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelJobsView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelJobsView.java
deleted file mode 100644
index 1637311..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelJobsView.java
+++ /dev/null

@@ -1,895 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.internal.ui.actions.JobFocusAction;
-import org.eclipse.ptp.internal.ui.actions.RemoveAllTerminatedAction;
-import org.eclipse.ptp.internal.ui.actions.TerminateJobAction;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.managers.JobManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ptp.ui.utils.DebugUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * @author Clement chu
- * Additional changes Greg Watson
- * 
- */
-public class ParallelJobsView extends AbstractParallelSetView implements ISelectionProvider {
-	private final class JobChildListener implements IJobChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedProcessEvent)
-		 */
-		public void handleEvent(IChangedProcessEvent e) {
-			if (e.getSource() instanceof IPJob) {
-				if (debug) {
-					System.err.println("----------------- IJobChildListener - IChangedProcessEvent: " + this);
-				}
-				if (!((IPJob)e.getSource()).isDebug()) {
-					refresh(true);
-				}
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewProcessEvent)
-		 */
-		public void handleEvent(INewProcessEvent e) {
-			if (e.getSource() instanceof IPJob) {
-				if (debug) {
-					System.err.println("----------------- IJobChildListener - INewProcessEvent: " + this);
-				}
-				for (IPProcess proc : e.getProcesses()) {
-					getJobManager().addProcess(proc);
-				}
-				boolean isCurrent = e.getSource().getID().equals(getCurrentID());
-				if (isCurrent) {
-					updateJobSet();
-					changeJobRefresh((IPJob)e.getSource());
-					// should this just be refreshJobView()?
-					// refresh will need to be batched in the future
-				}
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveProcessEvent)
-		 */
-		public void handleEvent(IRemoveProcessEvent e) {
-			if (e.getSource() instanceof IPJob) {
-				if (debug) {
-					System.err.println("----------------- IJobChildListener - IRemoveProcessEvent: " + this);
-				}
-				boolean isCurrent = e.getSource().getID().equals(getCurrentID());
-				for (IPProcess proc : e.getProcesses()) {
-					getJobManager().removeProcess(proc);
-				}
-				if (isCurrent) {
-					updateJobSet();
-					changeJobRefresh((IPJob)e.getSource());
-					// should this just be refreshJobView()?
-					// refresh will need to be batched in the future
-				}
-			}
-		}
-	}
-	
-	private final class MMChildListener implements IModelManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IChangedResourceManagerEvent)
-		 */
-		public void handleEvent(IChangedResourceManagerEvent e) {
-			// Don't need to do anything
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.INewResourceManagerEvent)
-		 */
-		public void handleEvent(INewResourceManagerEvent e) {
-			/*
-			 * Add resource manager child listener so we get notified when new
-			 * machines are added to the model.
-			 */
-			final IResourceManager rm = e.getResourceManager();
-	        rm.addChildListener(resourceManagerListener);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IRemoveResourceManagerEvent)
-		 */
-		public void handleEvent(IRemoveResourceManagerEvent e) {
-			/*
-			 * Removed resource manager child listener when resource manager is removed.
-			 */
-			e.getResourceManager().removeChildListener(resourceManagerListener);
-		}		
-	}
-	
-	private final class QueueChildListener implements IQueueChildListener {
-		public void handleEvent(IChangedJobEvent e) {
-			refreshJobView();
-		}
-		
-		public void handleEvent(INewJobEvent e) {
-			if (debug) {
-				System.err.println("----------------- QueueChildListener - INewJobEvent: " + this);
-			}
-			IPJob lastJob = null;
-			for (IPJob job : e.getJobs()) {
-				getJobManager().createElementHandler(job);
-				lastJob = job;
-			}
-			if (lastJob != null) {
-				if (jobFocus) {
-					changeJobRefresh(lastJob, true);
-				} else {
-					refreshJobView();
-				}
-			}
-		}
-		public void handleEvent(IRemoveJobEvent e) {
-			if (debug) {
-				System.err.println("----------------- QueueChildListener - IRemoveJobEvent: " + this);
-			}
-			for (IPJob job : e.getJobs()) {
-				getJobManager().removeJob(job);
-			}
-			changeJobRefresh(null, true);
-		}
-	}
-	
-	private final class RMChildListener implements IResourceManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedMachineEvent)
-		 */
-		public void handleEvent(IChangedMachineEvent e) {
-			// Don't need to do anything
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedQueueEvent)
-		 */
-		public void handleEvent(IChangedQueueEvent e) {
-			// Can safely ignore
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerNewMachineEvent)
-		 */
-		public void handleEvent(INewMachineEvent e) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewQueueEvent)
-		 */
-		public void handleEvent(INewQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.addChildListener(queueChildListener);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveMachineEvent)
-		 */
-		public void handleEvent(IRemoveMachineEvent e) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveQueueEvent)
-		 */
-		public void handleEvent(IRemoveQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queue.removeChildListener(queueChildListener);
-			}
-		}
-	}
-	
-	class JobViewUpdateWorkbenchJob extends WorkbenchJob {
-		private final ReentrantLock	waitLock = new ReentrantLock();
-		private List<ISelection> refreshJobList = new ArrayList<ISelection>();
-		
-		public JobViewUpdateWorkbenchJob() {
-			super("Refreshing job view...");
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			if (size() == 0)
-				return Status.CANCEL_STATUS;
-			
-			ISelection selection = getLastJobSelection();
-			if (debug) {
-				System.err.println("============= JobViewUpdateWorkbenchJob refresh: " + selection);
-			}
-			if (!jobTableViewer.getTable().isDisposed()) {
-				jobTableViewer.setSelection(selection, true);
-				jobTableViewer.refresh(true);
-			}
-			
-			//if last refresh object is true and previous refresh is false, then refresh again 
-			ISelection lastSelection = getLastJobSelection();
-			waitLock.lock();
-			try {
-				refreshJobList.clear();
-				if (!selection.equals(lastSelection)) {
-					refreshJobList.add(lastSelection);
-					schedule();
-				}
-			}
-			finally {
-				waitLock.unlock();
-			}
-			return Status.OK_STATUS;
-		}
-		
-		/**
-		 * @param selection
-		 * @param force
-		 */
-		public void schedule(ISelection selection, boolean force) {
-			waitLock.lock();
-			try {
-				if (force) {
-					refreshJobList.clear();
-				}
-				if (!refreshJobList.contains(selection)) {
-					refreshJobList.add(selection);
-				}
-			}
-			finally {
-				waitLock.unlock();
-			}
-			schedule();
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.progress.WorkbenchJob#shouldSchedule()
-		 */
-		public boolean shouldSchedule() {
-			int size = size();
-			if (debug) {
-				System.err.println("============= JobViewUpdateWorkbenchJob: " + refreshJobList.size());
-			}
-			return (size == 1);
-		}
-		
-		/**
-		 * @return
-		 */
-		private ISelection getLastJobSelection() {
-			waitLock.lock();
-			try {
-				return refreshJobList.get(refreshJobList.size()-1);
-			}
-			finally {
-				waitLock.unlock();
-			}
-		}
-		
-		/**
-		 * @return
-		 */
-		private int size() {
-			waitLock.lock();
-			try {
-				return refreshJobList.size();
-			}
-			finally {
-				waitLock.unlock();
-			}
-		}
-	}
-	
-	/*
-	 * Job focus flag
-	 */
-	private boolean jobFocus = true;
-	
-	/*
-	 * Model listeners
-	 */
-	private final IModelManagerChildListener modelManagerListener = new MMChildListener();
-	private final IResourceManagerChildListener resourceManagerListener = new RMChildListener();
-	private final IJobChildListener jobChildListener = new JobChildListener();
-	private final IQueueChildListener queueChildListener = new QueueChildListener();
-	
-	/*
-	 * Debug flag
-	 */
-	private boolean debug = DebugUtil.JOBS_VIEW_TRACING;
-	
-	/*
-	 * Element selection
-	 */
-	private ISelection selection = null;
-	private ListenerList listeners = new ListenerList();
-	private Action jobFocusAction = null;
-
-	protected String cur_selected_element_id = IManager.EMPTY_ID;
-	/*
-	 * UI components
-	 */
-	protected Menu jobPopupMenu = null;
-	protected SashForm sashForm = null;
-	protected TableViewer jobTableViewer = null;
-	protected Composite elementViewComposite = null;
-	
-	protected JobViewUpdateWorkbenchJob jobViewUpdateJob = new JobViewUpdateWorkbenchJob();
-	/*
-	 * Actions
-	 */
-	protected ParallelAction terminateAllAction = null;
-	
-	public ParallelJobsView() {
-		this(PTPUIPlugin.getDefault().getJobManager());
-	}
-	
-	public ParallelJobsView(IManager manager) {
-		super(manager);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		listeners.add(listener);
-	}
-	
-	/**
-	 * @param job
-	 */
-	public void changeJobRefresh(IPJob job) {
-		changeJobRefresh(job , false);
-	} 	
-	
-	/**
-	 * @param job
-	 * @param force
-	 */
-	public void changeJobRefresh(IPJob job, boolean force) {
-		IPJob cur_job = getJobManager().getJob();
-		ISelection selection = null;
-		if (cur_job == null && job != null) {
-			doChangeJob(job);
-			selection = new StructuredSelection(job);
-		} else if (cur_job != null && job == null) {
-			doChangeJob((IPJob)null);
-			selection = new StructuredSelection();
-		} else if (cur_job != null && job != null) {
-			if (!cur_job.getID().equals(job.getID())) {
-				doChangeJob(job);
-			}
-			selection = new StructuredSelection(job);
-		} else { //cur_job == null && job == null
-			selection = new StructuredSelection();
-		}
-		if (isVisible()) {
-			jobViewUpdateJob.schedule(selection, force);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#dispose()
-	 */
-	public void dispose() {
-		IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-		synchronized (mm) {
-		    for (IResourceManager rm : mm.getUniverse().getResourceManagers()) {
-				for (IPQueue queue : rm.getQueues()) {
-					for (IPJob job : queue.getJobs()) {
-						job.removeChildListener(jobChildListener);
-					}
-					queue.removeChildListener(queueChildListener);
-				}
-		    	rm.removeChildListener(resourceManagerListener);
-		    }
-		    mm.removeListener(modelManagerListener);
-		}
-		elementViewComposite.dispose();
-		super.dispose();
-	}
-	
-	/**
-	 * Change the currently selected job in the job viewer
-	 * 
-	 * @param job
-	 */
-	public void doChangeJob(final IPJob job) {
-		syncExec(new Runnable() {
-			public void run() {
-				selectJob(job);
-				update();
-			}
-		});
-	}
-	
-	/**
-	 * Change the currently selected job in the job viewer
-	 * 
-	 * @param job_id
-	 */
-	public void doChangeJob(String job_id) {
-		doChangeJob(((JobManager)manager).findJobById(job_id));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#doubleClick(org.eclipse.ptp.ui.model.IElement)
-	 */
-	public void doubleClick(IElement element) {
-		openProcessViewer(getJobManager().findProcess(element.getID()));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getCurrentID()
-	 */
-	public synchronized String getCurrentID() {
-		IPJob job = getJobManager().getJob();
-		if (job != null) {
-			return job.getID();
-		}
-		return IManager.EMPTY_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getImage(int, int)
-	 */
-	public Image getImage(int index1, int index2) {
-		return ParallelImages.procImages[index1][index2];
-	}
-	
-	/**
-	 * Get the queue of the currently selected job
-	 * 
-	 * @return queue
-	 */
-	public IPQueue getQueue() {
-		return getJobManager().getQueue();
-	}
-	
-	/**
-	 * Get the queue ID of the currently selected job
-	 * 
-	 * @return queue ID
-	 */
-	public String getQueueID() {
-		IPQueue queue = getQueue();
-		if (queue != null) {
-			return queue.getID();
-		}
-		return IManager.EMPTY_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IContentProvider#getRulerIndex(java.lang.Object, int)
-	 */
-	public String getRulerIndex(Object obj, int index) {
-		if (obj instanceof IElement) {
-			return ((IElement)obj).getName();
-		}
-		return super.getRulerIndex(obj, index);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getSelection()
-	 */
-	public ISelection getSelection() {
-    	if (selection == null) {
-    		return StructuredSelection.EMPTY;
-    	}
-    	return selection;
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getToolTipText(java.lang.Object)
-	 */
-	public String[] getToolTipText(Object obj) {
-		IElementHandler setManager = getCurrentElementHandler();
-		if (obj == null || !(obj instanceof IPProcess) || setManager == null || cur_element_set == null)
-			return IToolTipProvider.NO_TOOLTIP;
-
-		IPProcess proc = (IPProcess)obj;
-		StringBuffer buffer = new StringBuffer();
-		String num = proc.getProcessIndex();
-		if (num != null) {
-			buffer.append("Index: " + num);
-			buffer.append("\n");
-		}
-		buffer.append("PID: " + proc.getPid());
-		IElementSet[] sets = setManager.getSetsWithElement(proc.getID());
-		if (sets.length > 1)
-			buffer.append("\nSet: ");
-		for (int i = 1; i < sets.length; i++) {
-			buffer.append(sets[i].getID());
-			if (i < sets.length - 1)
-				buffer.append(",");
-		}
-		// buffer.append("\nStatus: " + getJobManager().getProcessStatusText(proc));
-		return new String[] { buffer.toString() };
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		listeners.remove(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#updateView(java.lang.Object)
-	 */
-	public void repaint(boolean all) {
-		if (all) {
-			if (!jobTableViewer.getTable().isDisposed()) {
-				jobTableViewer.refresh(true);
-			}
-		}
-		update();
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-     */
-    public void selectionChanged(SelectionChangedEvent event) {
-    	// Selection change could come from either the jobTableViewer of the elementViewComposite
-    	selection = event.getSelection();
-    	setSelection(selection);
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#setFocus()
-	 */
-	public void setFocus() {
-		super.setFocus();
-		IPJob job = getJobManager().getJob();
-		if (job == null) {
-			changeJobRefresh(null);
-		}
-	}
-	
-	/**
-	 * Set flag that determines if new jobs are give focus
-	 * in the jobs view.
-	 * 
-	 * @param focus a value of true will cause new jobs to be displayed in
-	 * the jobs view
-	 */
-	public void setJobFocus(boolean focus) {
-		jobFocus = focus;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-        final SelectionChangedEvent e = new SelectionChangedEvent(this, selection);
-        Object[] array = listeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            final ISelectionChangedListener l = (ISelectionChangedListener) array[i];
-            SafeRunnable.run(new SafeRunnable() {
-                public void run() {
-                    l.selectionChanged(e);
-                }
-            });
-        }
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#updateAction()
-	 */
-	public void updateAction() {
-		super.updateAction();
-		if (terminateAllAction != null) {
-			ISelection selection = jobTableViewer.getSelection();
-			if (selection.isEmpty()) {
-				terminateAllAction.setEnabled(false);
-			} else {
-				IPJob job = (IPJob) ((IStructuredSelection) selection).getFirstElement();
-				terminateAllAction.setEnabled(!(job.isDebug() || job.isTerminated()));
-			}
-		}
-	}
-	
-	/** 
-	 * Update Job
-	 */
-	public void updateJobSet() {
-		IElementHandler setManager = getCurrentElementHandler();
-		selectSet(setManager == null ? null : setManager.getSetRoot());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#convertElementObject(org.eclipse.ptp.ui.model.IElement)
-	 */
-	protected Object convertElementObject(IElement element) {
-		if (element == null)
-			return null;
-		
-		return getJobManager().findProcess(element.getID());
-	}
-	
-	/** 
-	 * Create Job context menu
-	 */
-	protected void createJobContextMenu() {
-		MenuManager menuMgr = new MenuManager("#jobpopupmenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				manager.add(new Separator(IPTPUIConstants.IUIACTIONGROUP));
-				manager.add(new Separator(IPTPUIConstants.IUIEMPTYGROUP));
-				fillJobContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(jobTableViewer.getTable());
-		jobTableViewer.getTable().setMenu(menu);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#createToolBarActions(org.eclipse.jface.action.IToolBarManager)
-	 */
-	protected void createToolBarActions(IToolBarManager toolBarMgr) {
-		terminateAllAction = new TerminateJobAction(this);
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUIACTIONGROUP, terminateAllAction);
-		jobFocusAction = new JobFocusAction(this);
-		toolBarMgr.add(new Separator(IPTPUIConstants.IUIJOBGROUP));
-		toolBarMgr.appendToGroup(IPTPUIConstants.IUIJOBGROUP, jobFocusAction);
-		super.buildInToolBarActions(toolBarMgr);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#createView(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createView(Composite parent) {
-		parent.setLayout(new FillLayout(SWT.VERTICAL));
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		sashForm = new SashForm(parent, SWT.HORIZONTAL);
-		sashForm.setLayout(new FillLayout(SWT.VERTICAL));
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		jobTableViewer = new TableViewer(sashForm, SWT.SINGLE | SWT.BORDER);
-		jobTableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
-		jobTableViewer.setLabelProvider(new LabelProvider() {
-			public Image getImage(Object element) {
-				if (element instanceof IPJob) {
-					IPJob job = (IPJob) element;
-					return ParallelImages.jobImages[job.getState().ordinal()][job.isDebug() ? 1 : 0];
-				}
-				return null;
-			}
-			public String getText(Object element) {
-				if (element instanceof IPJob) {
-					return ((IPJob) element).getName();
-				}
-				return "";
-			}
-		});
-		jobTableViewer.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {}
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof JobManager)
-					return ((JobManager) inputElement).getJobs();
-				return new Object[0];
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		});
-		jobTableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object j1, Object j2) {
-				return ((IPJob)j1).getName().compareTo(((IPJob)j2).getName());
-			}
-		});
-		jobTableViewer.setInput(manager);
-		jobTableViewer.getTable().addMouseListener(new MouseAdapter() {
-			public void mouseDown(MouseEvent e) {
-				ISelection selection = jobTableViewer.getSelection();
-				TableItem item = jobTableViewer.getTable().getItem(new Point(e.x, e.y));
-				if (item == null && !selection.isEmpty()) {
-					jobTableViewer.getTable().deselectAll();
-					doChangeJob((IPJob) null);
-				} else if (item != null) {
-					IPJob job = (IPJob)item.getData();
-					if (job == null) {
-						doChangeJob((IPJob) null);
-					} else if (selection.isEmpty()) {
-						doChangeJob(job);
-					} else {
-						String cur_id = getCurrentID();
-						if (cur_id == null || !cur_id.equals(job.getID())) {
-							doChangeJob(job);
-						}
-					}
-					update(); // Added to ensure that terminate button is updated correctly
-				}
-			}
-		});
-		// ----------------------------------------------------------------------
-		// Enable property sheet updates when tree items are selected.
-		// Note for this to work each item in the tree must either implement
-		// IPropertySource, or support IPropertySource.class as an adapter type
-		// in its AdapterFactory.
-		// ----------------------------------------------------------------------
-		jobTableViewer.addSelectionChangedListener(this);
-		getSite().setSelectionProvider(this);
-		
-		createJobContextMenu();
-		elementViewComposite = createElementView(sashForm);
-		
-		jobTableViewer.getTable().setVisible(true);
-		elementViewComposite.setVisible(true);
-		sashForm.setWeights(new int[] { 1, 2 });
-
-		/*
-		 * Wait until the view has been created before registering for events
-		 */
-		IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-		synchronized (mm) {
-		    /*
-		     * Add us to any existing RM's. I guess it's possible we could
-		     * miss a RM if a new event arrives while we're doing this, but is 
-		     * it a problem?
-		     */
-		    for (IResourceManager rm : mm.getUniverse().getResourceManagers()) {
-		        rm.addChildListener(resourceManagerListener);
-		    }
-		    mm.addListener(modelManagerListener);
-		}
-	}
-
-	/** 
-	 * Create job context menu
-	 * @param menuManager
-	 */
-	protected void fillJobContextMenu(IMenuManager menuManager) {
-		ParallelAction removeAllTerminatedAction = new RemoveAllTerminatedAction(this);
-		removeAllTerminatedAction.setEnabled(getJobManager().hasStoppedJob());
-		menuManager.add(removeAllTerminatedAction);
-	}
-	
-	/**
-	 * @return
-	 */
-	protected JobManager getJobManager() {
-		return ((JobManager) manager);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#initialElement()
-	 */
-	protected void initialElement() {
-		IPUniverse universe = PTPCorePlugin.getDefault().getUniverse();
-		/*
-		 * Add us as a child listener to any existing queue
-		 */
-		for (IResourceManager rm : universe.getResourceManagers()) {
-			for (IPQueue queue : rm.getQueues()) {
-				queue.addChildListener(queueChildListener);
-			}
-		}
-		
-		manager.initial(universe);
-		changeJobRefresh(null, true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#initialView()
-	 */
-	protected void initialView() {
-		initialElement();
-	}
-	
-	/**
-	 * Refresh the job view. Called to notify the job view that
-	 * the model has changed and it needs to update the view.
-	 */
-	protected void refreshJobView() {
-		syncExec(new Runnable() {
-			public void run() {
-				if (!jobTableViewer.getTable().isDisposed()) {
-					jobTableViewer.refresh(true);
-				}
-			}
-		});
-	}
-	
-	/** 
-	 * Change job
-	 * @param job_id Target job ID
-	 */
-	protected void selectJob(IPJob job) {
-		IPJob old = getJobManager().getJob();
-		if (old != null) {
-			old.removeChildListener(jobChildListener);
-		}
-		if (job != null) {
-			job.addChildListener(jobChildListener);
-		}
-		getJobManager().setJob(job);
-		updateJobSet();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelMachinesView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelMachinesView.java
deleted file mode 100644
index f826c40..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelMachinesView.java
+++ /dev/null

@@ -1,1042 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedNodeEvent;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewNodeEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveNodeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.listeners.IMachineChildListener;
-import org.eclipse.ptp.core.elements.listeners.INodeChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.internal.ui.ParallelImages;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.managers.AbstractUIManager;
-import org.eclipse.ptp.ui.managers.MachineManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author Greg Watson
- * 
- * Based on original work by Clement Chu
- * 
- */
-public class ParallelMachinesView extends AbstractParallelSetView implements ISelectionProvider {
-	private final class MachineChildListener implements IMachineChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IMachineNodeListener#handleEvent(org.eclipse.ptp.core.elements.events.IMachineChangedNodeEvent)
-		 */
-		public void handleEvent(final IChangedNodeEvent e) {
-			refresh(true);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IMachineNodeListener#handleEvent(org.eclipse.ptp.core.elements.events.IMachineNewNodeEvent)
-		 */
-		public void handleEvent(final INewNodeEvent e) {
-			final boolean isCurrent = e.getSource().equals(getCurrentMachine());
-
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() {
-					for (IPNode node : e.getNodes()) {
-						if (isCurrent) {
-							/*
-							 * Add node child listener so that we get notified when new processes
-							 * are added to the node and can update the node icons.
-							 */
-							node.addChildListener(nodeListener);
-						}
-						
-						getMachineManager().addNode(node);
-					}
-					
-					if (isCurrent) {
-						updateMachineSet();
-						repaint(true);
-					}
-				}
-			});	
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IMachineNodeListener#handleEvent(org.eclipse.ptp.core.elements.events.IMachineRemoveNodeEvent)
-		 */
-		public void handleEvent(final IRemoveNodeEvent e) {
-			final boolean isCurrent = e.getSource().equals(getCurrentMachine());
-
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() {
-					for (IPNode node : e.getNodes()) {
-						if (isCurrent) {
-							/*
-							 * Remove node child listener when node is removed (if ever)
-							 */
-							node.removeChildListener(nodeListener);
-							
-						}
-	
-						getMachineManager().removeNode(node);
-					}
-			
-					if (isCurrent) {
-						updateMachineSet();
-						repaint(true);
-						nodeAttrTableViewer.refresh();
-						processTableViewer.refresh();
-					}
-				}
-			});	
-		}
-	}
-
-	private final class MMChildListener implements IModelManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IChangedResourceManagerEvent)
-		 */
-		public void handleEvent(IChangedResourceManagerEvent e) {
-			// Don't need to do anything
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.INewResourceManagerEvent)
-		 */
-		public void handleEvent(INewResourceManagerEvent e) {
-			/*
-			 * Add resource manager child listener so we get notified when new
-			 * machines are added to the model.
-			 */
-			final IResourceManager rm = e.getResourceManager();
-	        rm.addChildListener(resourceManagerListener);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.listeners.IModelManagerChildListener#handleEvent(org.eclipse.ptp.core.events.IRemoveResourceManagerEvent)
-		 */
-		public void handleEvent(IRemoveResourceManagerEvent e) {
-			/*
-			 * Removed resource manager child listener when resource manager is removed.
-			 */
-			e.getResourceManager().removeChildListener(resourceManagerListener);
-		}		
-	}
-
-	private final class NodeChildListener implements INodeChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.INodeChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedProcessEvent)
-		 */
-		public void handleEvent(final IChangedProcessEvent e) {
-			/*
-			 * Update views if any node's processes status changes
-			 */
-			if (e.getSource() instanceof IPNode) {
-				if ((IPNode) e.getSource() == getRegisteredNode()) {	
-					UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-						public void run() {
-							processTableViewer.refresh();
-						}
-					});
-				}
-				refresh(false);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.INodeProcessListener#handleEvent(org.eclipse.ptp.core.elements.events.INodeNewProcessEvent)
-		 */
-		public void handleEvent(final INewProcessEvent e) {
-			/*
-			 * Update node icons when a process is added to a node. 
-			 */
-			if (e.getSource() instanceof IPNode) {
-				if ((IPNode) e.getSource() == getRegisteredNode()) {	
-					UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-						public void run() {
-							processTableViewer.refresh();
-						}
-					});
-					refresh(false);
-				}
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.INodeChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveProcessEvent)
-		 */
-		public void handleEvent(final IRemoveProcessEvent e) {
-			/*
-			 * Update node icons when a process is removed from a node. 
-			 */
-			if (e.getSource() instanceof IPNode) {
-				UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-					public void run() {
-						IPNode node = (IPNode)e.getSource();
-						if (node == getRegisteredNode()) {
-							processTableViewer.refresh();
-						}
-					}
-				});
-				refresh(false);
-			}
-		}	
-	}
-
-	private final class RMChildListener implements IResourceManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedMachineEvent)
-		 */
-		public void handleEvent(IChangedMachineEvent e) {
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() {
-					if (!elementViewComposite.isDisposed()) {
-						machineTableViewer.refresh(true);
-					}
-				}
-			});
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedQueueEvent)
-		 */
-		public void handleEvent(IChangedQueueEvent e) {
-			// Can safely ignore
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerNewMachineEvent)
-		 */
-		public void handleEvent(final INewMachineEvent e) {
-			for (IPMachine machine : e.getMachines()) {
-				/*
-				 * Add us as a child listener so we get notified of node events
-				 */
-				machine.addChildListener(machineListener);
-				
-				/*
-				 * Update views when a new machine is added
-				 */
-				changeMachineRefresh(machine);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewQueueEvent)
-		 */
-		public void handleEvent(INewQueueEvent e) {
-			// Can safely ignore
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveMachineEvent)
-		 */
-		public void handleEvent(final IRemoveMachineEvent e) {
-			/*
-			 * Update views when a machine is removed.
-			 */
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() {
-					for (IPMachine machine : e.getMachines()) {
-						/*
-						 * Remove child listener
-						 */
-						machine.removeChildListener(machineListener);
-						
-						/* 
-						 * remove from machine manager
-						 */
-						getMachineManager().removeMachine(machine);
-					}
-					
-					changeMachineRefresh(null);
-				}
-			});	
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveQueueEvent)
-		 */
-		public void handleEvent(IRemoveQueueEvent e) {
-			// Can safely ignore
-		}
-	}
-
-	// view flag
-	public static final String BOTH_VIEW = "0";
-
-	public static final String MACHINE_VIEW = "1";
-	
-	public static final String INFO_VIEW = "2";
-	
-	private ListenerList listeners = new ListenerList();
-	
-	private final IModelManagerChildListener modelManagerListener = new MMChildListener();
-
-	private final IResourceManagerChildListener resourceManagerListener = new RMChildListener();
-
-	private final IMachineChildListener machineListener = new MachineChildListener();
-
-	private final INodeChildListener nodeListener = new NodeChildListener();
-	
-	private ISelection selection = null;
-	
-	// selected element
-	protected String cur_selected_element_id = IManager.EMPTY_ID;
-	
-	protected Menu jobPopupMenu = null;
-	
-	protected SashForm upperSashForm = null;
-	protected SashForm sashForm = null;
-	protected TableViewer machineTableViewer = null;
-	protected TableViewer processTableViewer = null;
-	protected TableViewer nodeAttrTableViewer = null;
-	protected Composite elementViewComposite = null;
-	protected Composite infoComposite = null;
-	
-	protected ParallelAction terminateAllAction = null;
-	protected String current_view = BOTH_VIEW;
-	
-	public ParallelMachinesView() {
-		this(PTPUIPlugin.getDefault().getMachineManager());
-	}
-	
-	public ParallelMachinesView(IManager manager) {
-		super(manager);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		listeners.add(listener);
-	} 
-	
-	/** 
-	 * Change machine
-	 * @param id Machine ID
-	 */
-	public void changeMachine(final String id) {
-		IPMachine machine = ((MachineManager)manager).findMachineById(id);
-		changeMachineRefresh(machine);
-	}
-	
-	public void changeMachineRefresh(final IPMachine machine) {
-		UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-			public void run() {
-				if (!elementViewComposite.isDisposed()) {
-					changeMachine(machine);
-					machineTableViewer.refresh(true);
-					machineTableViewer.setSelection(machine == null ? new StructuredSelection() : new StructuredSelection(machine), true);
-					nodeAttrTableViewer.refresh();
-					processTableViewer.refresh();
-				}
-			}
-		});
-	}
-	/** Change view
-	 * @param view_flag
-	 */
-	public void changeView(String view_flag) {
-		current_view = view_flag;
-		if (current_view.equals(ParallelMachinesView.MACHINE_VIEW)) {
-			machineTableViewer.getTable().setVisible(true);
-			elementViewComposite.setVisible(false);
-			infoComposite.setVisible(false);
-			sashForm.setWeights(new int[] { 1, 0 });
-		} else if (current_view.equals(ParallelMachinesView.INFO_VIEW)) {
-			machineTableViewer.getTable().setVisible(false);
-			elementViewComposite.setVisible(true);
-			infoComposite.setVisible(true);
-			sashForm.setWeights(new int[] { 0, 1 });
-		} else {
-			machineTableViewer.getTable().setVisible(true);
-			elementViewComposite.setVisible(true);
-			infoComposite.setVisible(true);
-			//sashForm.setWeights(new int[] { 3, 1 });
-		}
-	}
-
-	public void dispose() {
-		elementViewComposite.dispose();
-		super.dispose();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#doubleClick(org.eclipse.ptp.ui.model.IElement)
-	 */
-	public void doubleClick(IElement element) {
-		boolean isElementRegistered = element.isRegistered();
-		
-		/*
-		 * Unregister any registered elements
-		 */
-		unregister();
-
-		/*
-		 * Register the new element only if we're not trying
-		 * to register the same one.
-		 */
-		if (!isElementRegistered) {
-			/*
-			 * Now register the new element
-			 */
-			getCurrentElementHandler().addToRegister(new IElement[] { element });
-		}
-		
-		/*
-		 * Refresh the attribute and process panes.
-		 */
-		nodeAttrTableViewer.refresh();
-		processTableViewer.refresh();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getCurrentID()
-	 */
-	public String getCurrentID() {
-		IPMachine machine = getMachineManager().getCurrentMachine();
-		if (machine != null) {
-			return machine.getID();
-		}
-		return IManager.EMPTY_ID;
-	}
-	
-	/** 
-	 * Get selected machine
-	 * @return selected machine
-	 */
-	public synchronized IPMachine getCurrentMachine() {
-		return getMachineManager().getCurrentMachine();
-	}
-	
-	/** 
-	 * Get current view flag
-	 * @return flag of view
-	 */
-	public String getCurrentView() {
-		return current_view;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getImage(int, int)
-	 */
-	public Image getImage(int index1, int index2) {
-		return ParallelImages.nodeImages[index1][index2];
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IContentProvider#getRulerIndex(java.lang.Object, int)
-	 */
-	public String getRulerIndex(Object obj, int index) {
-		if (obj instanceof IElement) {
-			Object nodeObj = convertElementObject((IElement)obj);
-			if (nodeObj instanceof IPNode) {
-				return ((IPNode)nodeObj).getNodeNumber();
-			}
-		}
-		return super.getRulerIndex(obj, index);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getSelection()
-	 */
-	public ISelection getSelection() {
-    	if (selection == null) {
-    		return StructuredSelection.EMPTY;
-    	}
-    	return selection;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getToolTipText(java.lang.Object)
-	 */
-	public String[] getToolTipText(Object obj) {
-		IElementHandler setManager = getCurrentElementHandler();
-		if (obj == null || !(obj instanceof IPNode) || setManager == null || cur_element_set == null)
-			return IToolTipProvider.NO_TOOLTIP;
-
-		IPNode node = (IPNode)obj;
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(node.getName());
-		IElementSet[] sets = setManager.getSetsWithElement(node.getID());
-		if (sets.length > 1)
-			buffer.append("\n Set: ");
-		for (int i = 1; i < sets.length; i++) {
-			buffer.append(sets[i].getID());
-			if (i < sets.length - 1)
-				buffer.append(",");
-		}
-		// buffer.append("\nStatus: " + getMachineManager().getNodeStatusText(node));
-		return new String[] { buffer.toString() };
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		listeners.remove(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#updateView(java.lang.Object)
-	 */
-	public void repaint(boolean all) {
-		if (all) {
-			if (!machineTableViewer.getTable().isDisposed()) {
-				machineTableViewer.refresh(true);
-			}
-		}
-		update();
-		//updateLowerRegions();
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-     */
-    public void selectionChanged(SelectionChangedEvent event) {
-    	// Selection change could come from either the machineTableViewer of the elementViewComposite
-    	selection = event.getSelection();
-    	setSelection(selection);
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#setFocus()
-	 */
-	public void setFocus() {
-		super.setFocus();
-		IPMachine machine = getCurrentMachine();
-		if (machine == null) {
-			changeMachine((String)null);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-        final SelectionChangedEvent e = new SelectionChangedEvent(this, selection);
-        Object[] array = listeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            final ISelectionChangedListener l = (ISelectionChangedListener) array[i];
-            SafeRunnable.run(new SafeRunnable() {
-                public void run() {
-                    l.selectionChanged(e);
-                }
-            });
-        }
-    }
-	
-	/** 
-	 * Unregister all registered elements
-	 */
-	public void unregister() {
-		IElementHandler elementHandler = getCurrentElementHandler();
-		elementHandler.removeFromRegister(elementHandler.getRegistered());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#updateAction()
-	 */
-	public void updateAction() {
-		super.updateAction();
-	}
-	
-	/** 
-	 * Update machine set
-	 * 
-	 */
-	public void updateMachineSet() {
-		IElementHandler setManager = getCurrentElementHandler();
-		selectSet(setManager == null ? null : setManager.getSetRoot());
-	}
-	
-	/**
-	 * @return
-	 */
-	private MachineManager getMachineManager() {
-		return ((MachineManager) manager);
-	}
-	
-	private IPNode getRegisteredNode() {
-		cur_selected_element_id = "";
-		IElementHandler elementHandler = getCurrentElementHandler();
-		if (elementHandler == null || cur_element_set == null || elementHandler.totalRegistered() == 0)
-			return null;
-		String firstRegisteredElementID = elementHandler.getRegistered()[0].getID();
-		if (!cur_element_set.contains(firstRegisteredElementID))
-			return null;
-		cur_selected_element_id = firstRegisteredElementID;
-		return getMachineManager().findNode(cur_selected_element_id);
-	}
-	
-	/** 
-	 * Change machine
-	 * @param machine
-	 */
-	protected void changeMachine(final IPMachine machine) {
-		selectMachine(machine);
-		update();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#convertElementObject(org.eclipse.ptp.ui.model.IElement)
-	 */
-	protected Object convertElementObject(IElement element) {
-		if (element == null)
-			return null;
-		
-		return getMachineManager().findNode(element.getID());
-	}
-	
-	/** 
-	 * Create lower text region layout
-	 * @param parent
-	 * @return
-	 */
-	protected Composite createLowerRegions(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, true);
-		layout.verticalSpacing = 0;
-		layout.horizontalSpacing = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		/* inner bottom composite - this one uses a grid layout */
-		Group nodeGroup = new Group(composite, SWT.BORDER);
-		nodeGroup.setLayout(new FillLayout());
-		GridData gdtext = new GridData(GridData.FILL_BOTH);
-		gdtext.grabExcessVerticalSpace = true;
-		gdtext.grabExcessHorizontalSpace = true;
-		gdtext.horizontalAlignment = GridData.FILL;
-		gdtext.verticalAlignment = GridData.FILL;
-		nodeGroup.setLayoutData(gdtext);
-		nodeGroup.setText("Node Attributes");
-		
-		Group procGroup = new Group(composite, SWT.BORDER);
-		procGroup.setLayout(new FillLayout());
-		GridData gdlist = new GridData(GridData.FILL_BOTH);
-		gdlist.grabExcessVerticalSpace = true;
-		gdlist.grabExcessHorizontalSpace = true;
-		gdlist.horizontalAlignment = GridData.FILL;
-		gdlist.verticalAlignment = GridData.FILL;
-		procGroup.setLayoutData(gdlist);
-		procGroup.setText("Process Info");
-		
-		nodeAttrTableViewer = new TableViewer(nodeGroup, SWT.FULL_SELECTION | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		Table nodeAttrTable = nodeAttrTableViewer.getTable();
-		TableColumn col = new TableColumn(nodeAttrTable, SWT.LEFT);
-		col.setText("Attribute");
-		col.setWidth(80);
-		col.setResizable(true);
-		col = new TableColumn(nodeAttrTable, SWT.LEFT);
-		col.setText("Value");
-		col.setWidth(200);
-		col.setResizable(false);
-		nodeAttrTable.setHeaderVisible(true);
-		nodeAttrTable.setLinesVisible(true);
-		nodeAttrTable.addControlListener(new ControlListener() {
-			public void controlMoved(ControlEvent e) {}
-			public void controlResized(ControlEvent e) {
-				Table table = (Table)e.getSource();
-				int width = table.getClientArea().width;
-				switch (table.getColumnCount()) {
-				case 1:
-					table.getColumn(0).setWidth(width);
-					break;
-				case 2:
-					TableColumn col0 = table.getColumn(0);
-					TableColumn col1 = table.getColumn(1);
-					if (col0.getWidth() + col1.getWidth() < width) {
-						col1.setWidth(width - col0.getWidth());
-					}
-				}
-			}
-		});
-		nodeAttrTableViewer.setLabelProvider(new ITableLabelProvider() {
-			public void addListener(ILabelProviderListener listener) {}
-			public void dispose() {}
-			public Image getColumnImage(Object element, int columnIndex) {
-				return null;
-			}
-			public String getColumnText(Object element, int columnIndex) {
-				if (element instanceof IAttribute) {
-					IAttribute<?,?,?> attr = (IAttribute<?,?,?>) element;
-					switch (columnIndex) {
-					case 0:
-						return attr.getDefinition().getName();
-					case 1:
-						return attr.getValueAsString();
-					default:
-						return "unknown " + columnIndex;
-					}
-				}
-				return "";
-			}
-			public boolean isLabelProperty(Object element, String property) {
-				return false;
-			}
-			public void removeListener(ILabelProviderListener listener) {}
-		});
-		nodeAttrTableViewer.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {}
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof AbstractUIManager) {
-					IPNode node = getRegisteredNode();
-					if (node != null) {
-						return node.getDisplayAttributes();
-					}
-				}
-				return new Object[0];
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		});
-		nodeAttrTableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object a1, Object a2) {
-				final IAttribute<?,?,?> attr1 = (IAttribute<?,?,?>)a1;
-				final IAttribute<?,?,?> attr2 = (IAttribute<?,?,?>)a2;
-				final IAttributeDefinition<?, ?, ?> def1 = attr1.getDefinition();
-				final IAttributeDefinition<?, ?, ?> def2 = attr2.getDefinition();
-				return def1.compareTo(def2);
-			}
-		});
-		nodeAttrTableViewer.setInput(manager);
-		
-		processTableViewer = new TableViewer(procGroup, SWT.FULL_SELECTION | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		Table processTable = processTableViewer.getTable();
-		new TableColumn(processTable, SWT.LEFT).setWidth(300);
-		processTable.setLinesVisible(true);
-		processTable.addControlListener(new ControlListener() {
-			public void controlMoved(ControlEvent e) {}
-			public void controlResized(ControlEvent e) {
-				Table table = (Table)e.getSource();
-				int width = table.getClientArea().width;
-				switch (table.getColumnCount()) {
-				case 1:
-					table.getColumn(0).setWidth(width);
-					break;
-				case 2:
-					TableColumn col0 = table.getColumn(0);
-					TableColumn col1 = table.getColumn(1);
-					if (col0.getWidth() + col1.getWidth() < width) {
-						col1.setWidth(width - col0.getWidth());
-					}
-				}
-			}
-		});
-		processTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-				openProcessViewer((IPProcess)sel.getFirstElement());
-			}
-		});
-		processTableViewer.setLabelProvider(new LabelProvider() {
-			@SuppressWarnings("unchecked")
-			public Image getImage(Object element) {
-				if (element instanceof IPProcess) {
-					IPProcess process = (IPProcess) element;
-					return ParallelImages.procImages[process.getState().ordinal()][0];
-				}
-				return null;
-			}
-			public String getText(Object element) {
-				if (element instanceof IPProcess) {
-					IPProcess process = (IPProcess) element;
-					return process.getJob().getName() + ":" + process.getName();
-				}
-				return "";
-			}
-		});
-		processTableViewer.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {}
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof AbstractUIManager) {
-					IPNode node = getRegisteredNode();
-					if (node != null) {
-						return node.getProcesses();
-					}
-				}
-				return new Object[0];
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		});
-		processTableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object p1, Object p2) {
-				IPProcess proc1 = (IPProcess)p1;
-				IPProcess proc2 = (IPProcess)p2;
-				String name1 = proc1.getJob().getName() + ":" + proc1.getName();
-				String name2 = proc2.getJob().getName() + ":" + proc2.getName();
-				return name1.compareTo(name2);
-			}
-		});
-		processTableViewer.setInput(manager);
-
-		return composite;
-	}
-	
-	/** 
-	 * Create context menu
-	 */
-	protected void createMachineContextMenu() {
-		MenuManager menuMgr = new MenuManager("#machinepopupmenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				manager.add(new Separator(IPTPUIConstants.IUIACTIONGROUP));
-				manager.add(new Separator(IPTPUIConstants.IUIEMPTYGROUP));
-				fillMachineContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(machineTableViewer.getTable());
-		machineTableViewer.getTable().setMenu(menu);
-	}
-	
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#createToolBarActions(org.eclipse.jface.action.IToolBarManager)
-	 */
-	protected void createToolBarActions(IToolBarManager toolBarMgr) {
-		super.buildInToolBarActions(toolBarMgr);
-	}
-    
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#createView(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createView(Composite parent) {
-		parent.setLayout(new FillLayout(SWT.VERTICAL));
-		parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		sashForm = new SashForm(parent, SWT.VERTICAL);
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		upperSashForm = new SashForm(sashForm, SWT.HORIZONTAL);
-		upperSashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		machineTableViewer = new TableViewer(upperSashForm, SWT.SINGLE | SWT.BORDER);
-		machineTableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
-		machineTableViewer.setLabelProvider(new LabelProvider() {
-			public Image getImage(Object element) {
-				if (element instanceof IPMachine) {
-					IPMachine machine = (IPMachine) element;
-					EnumeratedAttribute<MachineAttributes.State> attr = 
-						machine.getAttribute(MachineAttributes.getStateAttributeDefinition());
-					if (attr != null) {
-						return ParallelImages.machineImages[attr.getValueIndex()];
-					}
-				}
-				return null;
-			}
-			public String getText(Object element) {
-				if (element instanceof IPMachine) {
-					return ((IPMachine) element).getName();
-				}
-				return "";
-			}
-		});
-		machineTableViewer.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {}
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof AbstractUIManager)
-					return ((MachineManager) inputElement).getMachines();
-				return new Object[0];
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		});
-		machineTableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object j1, Object j2) {
-				return ((IPMachine)j1).getName().compareTo(((IPMachine)j2).getName());
-			}
-		});
-		machineTableViewer.setInput(manager);
-		machineTableViewer.getTable().addMouseListener(new MouseAdapter() {
-			public void mouseDown(MouseEvent e) {
-				ISelection selection = machineTableViewer.getSelection();
-				TableItem item = machineTableViewer.getTable().getItem(new Point(e.x, e.y));
-				if (item == null && !selection.isEmpty()) {
-					machineTableViewer.getTable().deselectAll();
-					changeMachineRefresh((IPMachine) null);
-				}
-				else if (item != null) {
-					IPMachine machine = (IPMachine)item.getData();
-					if (machine == null) {
-						changeMachineRefresh((IPMachine) null);
-					}
-					else if (selection.isEmpty()) {
-						changeMachineRefresh(machine);
-					}
-					else {
-						String cur_id = getCurrentID();
-						if (cur_id == null || !cur_id.equals(machine.getID())) {
-							changeMachineRefresh(machine);
-						}
-					}
-				}
-			}
-		});
-		createMachineContextMenu();
-		elementViewComposite = createElementView(upperSashForm);
-		
-		// ----------------------------------------------------------------------
-		// Enable property sheet updates when table items are selected.
-		// Note for this to work each item in the table must either implement
-		// IPropertySource, or support IPropertySource.class as an adapter type
-		// in its AdapterFactory.
-		// ----------------------------------------------------------------------
-		machineTableViewer.addSelectionChangedListener(this);
-		getSite().setSelectionProvider(this);
-		
-		infoComposite = createLowerRegions(sashForm);
-		changeView(current_view);
-		
-		/*
-		 * Wait until the view has been created before registering for events
-		 */
-		IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-		
-		synchronized (mm) {
-		    /*
-		     * Add us to any existing RM's. I guess it's possible we could
-		     * miss a RM if a new event arrives while we're doing this, but is 
-		     * it a problem?
-		     */
-		    for (IResourceManager rm : mm.getUniverse().getResourceManagers()) {
-		        rm.addChildListener(resourceManagerListener);
-		    }
-		    
-		    mm.addListener(modelManagerListener);
-		}
-	}
-    
-	/** 
-	 * Fill the context menu
-	 * @param menuManager
-	 */
-	protected void fillMachineContextMenu(IMenuManager menuManager) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#initialElement()
-	 */
-	protected void initialElement() {
-		IPUniverse universe = PTPCorePlugin.getDefault().getUniverse();
-		
-		/*
-		 * Add us as a child listener to any existing machines
-		 */
-		for (IResourceManager rm : universe.getResourceManagers()) {
-			for (IPMachine machine : rm.getMachines()) {
-				machine.addChildListener(machineListener);
-			}
-		}
-		
-		/*
-		 * Select initial machine
-		 */
-		changeMachineRefresh((IPMachine) manager.initial(universe));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#initialView()
-	 */
-	protected void initialView() {
-		initialElement();
-		update();
-	}
-	
-	/**
-	 * Change machine
-	 * @param machine
-	 */
-	protected void selectMachine(IPMachine machine) {
-		IPMachine old = getMachineManager().getCurrentMachine();
-		if (old != null) {
-			for (IPNode node : old.getNodes()) {
-				node.removeChildListener(nodeListener);
-			}
-		}
-		getMachineManager().setMachine(machine);
-		if (machine != null) {
-			for (IPNode node : machine.getNodes()) {
-				node.addChildListener(nodeListener);
-			}
-		}
-		updateMachineSet();
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelProcessView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelProcessView.java
deleted file mode 100644
index 435e8a6..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ParallelProcessView.java
+++ /dev/null

@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-import org.eclipse.ptp.core.elements.listeners.IProcessListener;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.editors.text.StorageDocumentProvider;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-import org.eclipse.ui.texteditor.IStatusField;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-
-/**
- * View for displaying details about an individual process
- */
-public class ParallelProcessView extends AbstractTextEditor implements IProcessListener {
-	private Label pidLabel = null;
-	private Label statusLabel = null;
-	private Text outputText = null;
-	private FormToolkit toolkit = null;
-	private ScrolledForm myForm = null;
-	private IPProcess process = null;
-
-	public ParallelProcessView() {
-		super();
-		setDocumentProvider(new StorageDocumentProvider());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#dispose()
-	 */
-	public void dispose() {
-		process.removeElementListener(this);
-		myForm.dispose();
-		toolkit.dispose();
-		super.dispose();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#setFocus()
-	 */
-	public void setFocus() {
-		myForm.setFocus();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#doSaveAs()
-	 */
-	public void doSaveAs() {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#isDirty()
-	 */
-	public boolean isDirty() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		setSite(site);
-		setPartName(input.getName());
-		setInput(input);
-		Object obj = getEditorInput().getAdapter(IPProcess.class);
-		if (obj instanceof IPProcess) {
-			process = (IPProcess) obj;
-			process.addElementListener(this);
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	public void close() {
-		if (process != null) {
-			process.removeElementListener(this);
-		}
-		getSite().getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (toolkit != null) {
-					getSite().getPage().closeEditor(ParallelProcessView.this, false);
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		toolkit = new FormToolkit(parent.getDisplay());
-		myForm = toolkit.createScrolledForm(parent);
-		myForm.getBody().setLayout(createGridLayout(1, false, 5, 5));
-		myForm.getBody().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		detailsSection();
-		outputSection();
-		initialText();
-	}
-	
-	/**
-	 * Add the process details to the view
-	 */
-	protected void detailsSection() {
-		Section detailsSection = toolkit.createSection(myForm.getBody(), Section.TITLE_BAR);
-		detailsSection.setText("Process details");
-		detailsSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Composite detailsContainer = createClientContainer(detailsSection, toolkit, 3, true, 2, 2);
-		pidLabel = toolkit.createLabel(detailsContainer, null);
-		pidLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Composite statusContainer = createClientContainer(detailsContainer, toolkit, 3, true, 0, 0);
-		statusContainer.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL, 3));
-		statusLabel = toolkit.createLabel(statusContainer, null);
-		statusLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		detailsSection.setClient(detailsContainer);
-	}
-	
-	/**
-	 * Add the process output section to the view
-	 */
-	protected void outputSection() {
-		Section outputSection = toolkit.createSection(myForm.getBody(), Section.TITLE_BAR | Section.TWISTIE);
-		outputSection.setText("Program output");
-		outputSection.setLayoutData(new GridData(GridData.FILL_BOTH));
-		outputSection.setExpanded(true);
-		Composite ouputContainer = createClientContainer(outputSection, toolkit, 1, true, 2, 2);
-		outputText = toolkit.createText(ouputContainer, null, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY | SWT.V_SCROLL);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 200;
-		outputText.setLayoutData(gd);
-		outputSection.setClient(ouputContainer);
-		toolkit.paintBordersFor(ouputContainer);
-	}
-	
-	/**
-	 * Convenience method to create a container
-	 * 
-	 * @param parent
-	 * @param toolkit
-	 * @param columns
-	 * @param isEqual
-	 * @param mh
-	 * @param mw
-	 * @return
-	 */
-	protected Composite createClientContainer(Composite parent, FormToolkit toolkit, int columns, 
-			boolean isEqual, int mh, int mw) {
-		Composite container = toolkit.createComposite(parent);
-		container.setLayout(createGridLayout(columns, isEqual, mh, mw));
-		return container;
-	}
-	
-	/**
-	 * Initialize the view
-	 */
-	public void initialText() {
-		pidLabel.setText("PID: N/A");
-		statusLabel.setText("Status: N/A");
-		outputText.setText("N/A");
-		
-		if (process != null) {
-			pidLabel.setText("PID: " + process.getPid());
-			statusLabel.setText("Status: " + process.getState());
-
-			/*
-			 * Set initial output text
-			 */
-			outputText.setText(process.getSavedOutput(ProcessAttributes.getStdoutAttributeDefinition()));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.core.elements.listeners.IProcessListener#handleEvent(org.eclipse.ptp.core.elements.events.IProcessChangedEvent)
-	 */
-	public void handleEvent(final IProcessChangeEvent e) {
-		UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-			public void run() {
-				EnumeratedAttribute<ProcessAttributes.State> stateAttr = e.getAttributes().getAttribute(ProcessAttributes.getStateAttributeDefinition());
-				if (stateAttr != null) {
-					ProcessAttributes.State state = stateAttr.getValue();
-					statusLabel.setText("Status: " + state.toString());
-				} 
-				
-				StringAttribute stdoutAttr = e.getAttributes().getAttribute(ProcessAttributes.getStdoutAttributeDefinition());
-				if (stdoutAttr != null) {
-					outputText.append(stdoutAttr.getValue() + "\n");
-				}
-			}
-		});
-	}
-	
-	/**
-	 * Convenience method to create a grid layout
-	 * 
-	 * @param columns
-	 * @param isEqual
-	 * @param mh
-	 * @param mw
-	 * @return
-	 */
-	protected GridLayout createGridLayout(int columns, boolean isEqual, int mh, int mw) {
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = columns;
-		gridLayout.makeColumnsEqualWidth = isEqual;
-		gridLayout.marginHeight = mh;
-		gridLayout.marginWidth = mw;
-		return gridLayout;
-	}
-	
-	/**
-	 * Convenience method to create a GridData object
-	 * 
-	 * @param style
-	 * @param space
-	 * @return
-	 */
-	protected GridData spanGridData(int style, int space) {
-		GridData gd = null;
-		if (style == -1) {
-			gd = new GridData();
-		} else {
-			gd = new GridData(style);
-		}
-		gd.horizontalSpan = space;
-		return gd;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#updateStatusField(java.lang.String)
-	 */
-	protected void updateStatusField(String category) {
-		if (category == null) {
-			return;
-		}
-		IStatusField field = getStatusField(category);
-		if (field != null) {
-			String text = null;
-			if (ITextEditorActionConstants.STATUS_CATEGORY_INPUT_POSITION.equals(category)) {
-				text = pidLabel.getText();
-			} else if (ITextEditorActionConstants.STATUS_CATEGORY_INPUT_MODE.equals(category)) {
-				if (process != null) {
-					text = process.getState().toString();
-				}
-			}
-			field.setText(text == null ? fErrorLabel : text);
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ProcessEditorInput.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ProcessEditorInput.java
deleted file mode 100644
index 1af638b..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ProcessEditorInput.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.views;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-/**
- *
- */
-
-public class ProcessEditorInput implements IEditorInput {
-    private IPProcess process = null;
-    
-    /** Constructor
-     * @param process
-     */
-    public ProcessEditorInput(IPProcess process) {
-		if (process == null) {
-			throw new IllegalArgumentException();
-		}
-        this.process = process;
-    }
-    
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!(obj instanceof ProcessEditorInput))
-			return false;
-		ProcessEditorInput other = (ProcessEditorInput) obj;
-		return process.equals(other.process);
-	}
-	
-	/**
-	 * From the implementing class IEditorInput.  This method only has to do
-	 * with whether "an editor input should appear in the "File Most Recently 
-	 * Used" menu.  In our case, just return true.
-	 * 
-	 * @see	IEditorInput
-	 */
-	public boolean exists() {
-		/* return process.exists(); */
-		return true;
-	}
-	/*
-	public boolean exists() {
-		return process.exists();
-	}
-	*/
-	
-	/** Get process
-	 * @return
-	 */
-	public IPProcess getProcess() {
-		return process;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return process.getJob().getName() + ":" + process.getName();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return getName();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IPProcess.class)
-			return process;
-		return null;
-	}	
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ResourceManagerView.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ResourceManagerView.java
deleted file mode 100644
index fd833f2..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/views/ResourceManagerView.java
+++ /dev/null

@@ -1,517 +0,0 @@
-package org.eclipse.ptp.ui.views;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.ptp.core.IModelManager;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.elements.events.IChangedJobEvent;
-import org.eclipse.ptp.core.elements.events.IChangedMachineEvent;
-import org.eclipse.ptp.core.elements.events.IChangedNodeEvent;
-import org.eclipse.ptp.core.elements.events.IChangedQueueEvent;
-import org.eclipse.ptp.core.elements.events.IMachineChangeEvent;
-import org.eclipse.ptp.core.elements.events.INewJobEvent;
-import org.eclipse.ptp.core.elements.events.INewMachineEvent;
-import org.eclipse.ptp.core.elements.events.INewNodeEvent;
-import org.eclipse.ptp.core.elements.events.INewQueueEvent;
-import org.eclipse.ptp.core.elements.events.IQueueChangeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveJobEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveMachineEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveNodeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveQueueEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerChangeEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent;
-import org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent;
-import org.eclipse.ptp.core.elements.listeners.IMachineChildListener;
-import org.eclipse.ptp.core.elements.listeners.IMachineListener;
-import org.eclipse.ptp.core.elements.listeners.IQueueChildListener;
-import org.eclipse.ptp.core.elements.listeners.IQueueListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener;
-import org.eclipse.ptp.core.elements.listeners.IResourceManagerListener;
-import org.eclipse.ptp.core.events.IChangedResourceManagerEvent;
-import org.eclipse.ptp.core.events.INewResourceManagerEvent;
-import org.eclipse.ptp.core.events.IRemoveResourceManagerEvent;
-import org.eclipse.ptp.core.listeners.IModelManagerChildListener;
-import org.eclipse.ptp.rmsystem.IResourceManagerMenuContribution;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.ptp.ui.actions.AddResourceManagerAction;
-import org.eclipse.ptp.ui.actions.EditResourceManagerAction;
-import org.eclipse.ptp.ui.actions.RemoveResourceManagersAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.ViewPart;
-
-public class ResourceManagerView extends ViewPart {
-	
-	private final class MachineListener implements IMachineChildListener, IMachineListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IMachineChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedNodeEvent)
-		 */
-		public void handleEvent(IChangedNodeEvent e) {
-			updateViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IMachineListener#handleEvent(org.eclipse.ptp.core.elements.events.IMachineChangeEvent)
-		 */
-		public void handleEvent(IMachineChangeEvent e) {
-			updateViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IMachineChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewNodeEvent)
-		 */
-		public void handleEvent(INewNodeEvent e) {
-			refreshViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IMachineChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveNodeEvent)
-		 */
-		public void handleEvent(IRemoveNodeEvent e) {
-			refreshViewer(e.getSource());
-		}
-	}
-
-	private final class MMChildListener implements IModelManagerChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.events.IModelManagerResourceManagerListener#handleEvent(org.eclipse.ptp.core.events.IChangedResourceManagerEvent)
-		 */
-		public void handleEvent(IChangedResourceManagerEvent e) {
-			// No need to do anything
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.events.IModelManagerResourceManagerListener#handleEvent(org.eclipse.ptp.core.events.INewResourceManagerEvent)
-		 */
-		public synchronized void handleEvent(INewResourceManagerEvent e) {
-			final IResourceManager resourceManager = e.getResourceManager();
-			resourceManagers.add(resourceManager);
-			resourceManager.addElementListener(rmListener);
-			resourceManager.addChildListener(rmChildListener);
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable(){
-				public void run() {
-					refreshViewer(PTPCorePlugin.getDefault().getUniverse());
-				}});
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.events.IModelManagerResourceManagerListener#handleEvent(org.eclipse.ptp.core.events.IRemoveResourceManagerEvent)
-		 */
-		public synchronized void handleEvent(IRemoveResourceManagerEvent e) {
-			final IResourceManager resourceManager = e.getResourceManager();
-			resourceManagers.remove(resourceManager);
-			resourceManager.removeElementListener(rmListener);
-			resourceManager.removeChildListener(rmChildListener);
-			rmChildListener.removeListeners(resourceManager);
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable(){
-				public void run() {
-					refreshViewer(PTPCorePlugin.getDefault().getUniverse());
-				}});
-		}
-	}
-
-	private final class QueueListener implements IQueueListener, IQueueChildListener {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedJobEvent)
-		 */
-		public void handleEvent(IChangedJobEvent e) {
-			updateViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewJobEvent)
-		 */
-		public void handleEvent(INewJobEvent e) {
-			refreshViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueListener#handleEvent(org.eclipse.ptp.core.elements.events.IQueueChangeEvent)
-		 */
-		public void handleEvent(IQueueChangeEvent e) {
-			updateViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IQueueChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveJobEvent)
-		 */
-		public void handleEvent(IRemoveJobEvent e) {
-			refreshViewer(e.getSource());
-		}
-
-	}
-	
-	private final class RMChildListener implements
-			IResourceManagerChildListener {
-		private final MachineListener machineListener = new MachineListener();
-		private QueueListener queueListener = new QueueListener();		
-		private final Set<IPMachine> machines = new HashSet<IPMachine>();
-		private final Set<IPQueue> queues = new HashSet<IPQueue>();
-
-		public synchronized void dispose() {
-			for (IPMachine machine : machines) {
-				removeListeners(machine);
-			}
-			machines.clear();
-			
-			for (IPQueue queue : queues) {
-				removeListeners(queue);
-			}
-			queues.clear();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedMachineEvent)
-		 */
-		public void handleEvent(IChangedMachineEvent e) {
-			updateViewer(e.getSource());
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedQueueEvent)
-		 */
-		public void handleEvent(IChangedQueueEvent e) {
-			updateViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewMachineEvent)
-		 */
-		public synchronized void handleEvent(INewMachineEvent e) {
-			for (IPMachine machine : e.getMachines()) {
-				machines.add(machine);
-				addListeners(machine);
-			}
-			refreshViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewQueueEvent)
-		 */
-		public void handleEvent(INewQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queues.add(queue);
-				addListeners(queue);
-			}
-			refreshViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveMachineEvent)
-		 */
-		public synchronized void handleEvent(IRemoveMachineEvent e) {
-			for (IPMachine machine : e.getMachines()) {
-				machines.remove(machine);
-				removeListeners(machine);
-			}
-			refreshViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerRemoveQueueEvent)
-		 */
-		public void handleEvent(IRemoveQueueEvent e) {
-			for (IPQueue queue : e.getQueues()) {
-				queues.remove(queue);
-				removeListeners(queue);
-			}
-			refreshViewer(e.getSource());
-		}
-
-		/**
-		 * @param resourceManager
-		 */
-		public synchronized void removeListeners(IResourceManager resourceManager) {
-			List<IPMachine> removeMachines = Arrays.asList(resourceManager.getMachines());
-			removeMachines.retainAll(machines);
-			for (IPMachine machine : removeMachines) {
-				removeListeners(machine);
-			}
-			machines.removeAll(removeMachines);
-			
-			List<IPQueue> removeQueues = Arrays.asList(resourceManager.getQueues());
-			removeQueues.retainAll(queues);
-			for (IPQueue queue : removeQueues) {
-				removeListeners(queue);
-			}
-			queues.removeAll(removeQueues);
-		}
-		
-		/**
-		 * @param machine
-		 */
-		private void addListeners(final IPMachine machine) {
-			machine.addElementListener(machineListener);
-			machine.addChildListener(machineListener);
-		}
-
-		/**
-		 * @param queue
-		 */
-		private void addListeners(final IPQueue queue) {
-			queue.addElementListener(queueListener);
-			queue.addChildListener(queueListener);
-		}
-		
-		/**
-		 * @param machine
-		 */
-		private void removeListeners(final IPMachine machine) {
-			machine.removeElementListener(machineListener);
-			machine.removeChildListener(machineListener);
-		}
-
-		/**
-		 * @param queue
-		 */
-		private void removeListeners(IPQueue queue) {
-			queue.removeElementListener(queueListener);
-			queue.removeChildListener(queueListener);
-		}	
-	}
-
-	private final class RMListener implements IResourceManagerListener {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerChangedEvent)
-		 */
-		public void handleEvent(IResourceManagerChangeEvent e) {
-			refreshViewer(e.getSource());
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerErrorEvent)
-		 */
-		public void handleEvent(final IResourceManagerErrorEvent e) {
-			refreshViewer(e.getSource());
-			UIUtils.safeRunAsyncInUIThread(new SafeRunnable() {
-				public void run() throws Exception {
-					IStatus status = new Status(IStatus.ERROR, PTPUIPlugin.PLUGIN_ID, e.getMessage());
-					ErrorDialog.openError(PTPUIPlugin.getDisplay().getActiveShell(), "Resource Manager Error", "The \"" + e.getSource().getName() + "\" resource manager reported the following error", status);
-				}
-			});
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IResourceManagerListener#handleEvent(org.eclipse.ptp.core.elements.events.IResourceManagerSubmitJobErrorEvent)
-		 */
-		public void handleEvent(IResourceManagerSubmitJobErrorEvent e) {
-			// Handled by launch framework
-		}
-	}
-
-	private final Set<IResourceManager> resourceManagers = new HashSet<IResourceManager>();
-
-	private TreeViewer viewer;
-
-	private RemoveResourceManagersAction removeResourceManagerAction;
-	private AddResourceManagerAction addResourceManagerAction;
-	private EditResourceManagerAction editResourceManagerAction;
-
-	private final MMChildListener mmChildListener = new MMChildListener();
-	private final RMListener rmListener = new RMListener();
-	private final RMChildListener rmChildListener = new RMChildListener();
-
-	public ResourceManagerView() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		viewer = new TreeViewer(parent, SWT.MULTI);
-		viewer.setContentProvider(new WorkbenchContentProvider());
-		viewer.setLabelProvider(new WorkbenchLabelProvider());
-
-		viewer.setInput(PTPCorePlugin.getDefault().getUniverse());
-
-		// -----------------------------
-		// Enable right-click popup menu
-		// -----------------------------
-		createContextMenu();
-
-		// ----------------------------------------------------------------------
-		// Enable property sheet updates when tree items are selected.
-		// Note for this to work each item in the tree must either implement
-		// IPropertySource, or support IPropertySource.class as an adapter type
-		// in its AdapterFactory.
-		// ----------------------------------------------------------------------
-		getSite().setSelectionProvider(viewer);
-
-		viewer.getTree().addMouseListener(new MouseAdapter() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.MouseAdapter#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-			 */
-			@Override
-			public void mouseDoubleClick(MouseEvent e) {
-				ITreeSelection selection = (ITreeSelection)viewer.getSelection();
-				if (!selection.isEmpty()) {
-					IResourceManagerControl rm = (IResourceManagerControl)selection.getFirstElement();
-					if (rm.getState() == ResourceManagerAttributes.State.STOPPED) {
-						editResourceManagerAction.setResourceManager(rm);
-						editResourceManagerAction.run();
-					}
-				}
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.MouseAdapter#mouseDown(org.eclipse.swt.events.MouseEvent)
-			 */
-			public void mouseDown(MouseEvent e) {
-				ISelection selection = viewer.getSelection();
-				TreeItem item = viewer.getTree().getItem(new Point(e.x, e.y));
-				if (item == null && !selection.isEmpty()) {
-					viewer.getTree().deselectAll();
-				}
-				else if (item != null) {
-				}
-			}
-		});
-
-		IModelManager mm = PTPCorePlugin.getDefault().getModelManager();
-		
-	    /*
-	     * Add us to any existing RM's. I guess it's possible we could
-	     * miss a RM if a new event arrives while we're doing this, but is 
-	     * it a problem?
-	     */
-	    for (IResourceManager rm : mm.getUniverse().getResourceManagers()) {
-	        rm.addElementListener(rmListener);
-	    }
-		mm.addListener(mmChildListener);
-	}
-
-	public synchronized void dispose() {
-		PTPCorePlugin.getDefault().getModelManager().removeListener(mmChildListener);
-		for (IResourceManager resourceManager : resourceManagers) {
-			resourceManager.removeElementListener(rmListener);
-			resourceManager.removeChildListener(rmChildListener);
-		}
-		resourceManagers.clear();
-		rmChildListener.dispose();
-		super.dispose();
-	}
-
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-
-	private void createContextMenu() {
-		final Shell shell = getSite().getShell();
-		addResourceManagerAction = new AddResourceManagerAction(shell);
-		removeResourceManagerAction = new RemoveResourceManagersAction(shell);
-		editResourceManagerAction = new EditResourceManagerAction(shell);
-
-		MenuManager menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuManager.setRemoveAllWhenShown(true);
-		menuManager.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				fillContextMenu(manager);
-			}
-		});
-
-		Menu menu = menuManager.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuManager, viewer);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
-		manager.add(addResourceManagerAction);
-		Object[] selectedObjects = selection.toArray();
-		boolean inContextForRM = selection.size() > 0;
-		boolean inContextForEditRM = inContextForRM;
-		boolean inContextForRemoveRM = inContextForRM;
-		for (int i = 0; i < selectedObjects.length; ++i) {
-			if (!(selectedObjects[i] instanceof IResourceManagerMenuContribution)) {
-				// Not all of the selected are RMs
-				inContextForRM = false;
-				inContextForEditRM = false;
-				inContextForRemoveRM = false;
-				break;
-			}
-			else {
-                final IResourceManagerMenuContribution menuContrib = (IResourceManagerMenuContribution) selectedObjects[i];
-			    IResourceManagerControl rm = (IResourceManagerControl) menuContrib.getAdapter(IResourceManagerControl.class);
-			    if (rm.getState() != ResourceManagerAttributes.State.STOPPED) {
-			    	inContextForEditRM = false;
-			        inContextForRemoveRM = false;
-			    }
-			}
-		}
-		manager.add(removeResourceManagerAction);
-		removeResourceManagerAction.setEnabled(inContextForRemoveRM);
-		if (inContextForRemoveRM) {
-			IResourceManagerControl[] rmManagers = new IResourceManagerControl[selection.size()];
-			for (int i = 0; i < rmManagers.length; ++i) {
-				final IResourceManagerMenuContribution menuContrib = (IResourceManagerMenuContribution) selectedObjects[i];
-				rmManagers[i] = (IResourceManagerControl) menuContrib.getAdapter(IResourceManagerControl.class);
-			}
-			removeResourceManagerAction.setResourceManager(rmManagers);
-		}
-		manager.add(editResourceManagerAction);
-		editResourceManagerAction.setEnabled(inContextForEditRM);
-		if (inContextForEditRM) {
-			final IResourceManagerMenuContribution menuContrib = (IResourceManagerMenuContribution) selectedObjects[0];
-			IResourceManagerControl rmManager = (IResourceManagerControl) menuContrib.getAdapter(IResourceManagerControl.class);
-			editResourceManagerAction.setResourceManager(rmManager);
-		}
-		manager.add(new Separator());
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS
-				+ "-end")); //$NON-NLS-1$
-	}
-
-	private void refreshViewer(final IPElement element) {
-		ISafeRunnable safeRunnable = new SafeRunnable(){
-
-			public void run() throws Exception {
-				viewer.refresh(element);
-			}
-		};
-		UIUtils.safeRunAsyncInUIThread(safeRunnable);
-	}
-
-	private void updateViewer(final IPElement element) {
-		ISafeRunnable safeRunnable = new SafeRunnable(){
-
-			public void run() throws Exception {
-				viewer.update(element, null);
-			}
-		};
-		UIUtils.safeRunAsyncInUIThread(safeRunnable);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizard.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizard.java
deleted file mode 100644
index 621a737..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizard.java
+++ /dev/null

@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.ptp.ui.UIMessage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Text;
-
-public class RMConfigurationWizard extends Wizard {
-
-	public final static String EMPTY_STRING = ""; //$NON-NLS-1$
-	
-	public class NameAndDescPage extends WizardPage {
-
-		private Text descText;
-		private Text nameText;
-
-		public NameAndDescPage(String pageName) {
-			super(pageName);
-			setTitle(pageName);
-			setDescription(UIMessage.getResourceString("ConfigurationWizard.NameDesc")); //$NON-NLS-1$
-		}
-
-		public void createControl(Composite parent) {
-	        Composite composite = new Composite(parent, SWT.NULL);
-	        composite.setFont(parent.getFont());
-	        composite.setLayout(new GridLayout());
-	        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			createNameDescControl(composite);
-
-			final boolean textAndDescriptionEnabled = hasFactories;
-			nameText.setEnabled(textAndDescriptionEnabled);
-			descText.setEnabled(textAndDescriptionEnabled);
-
-			setControl(composite);
-		}
-
-		private void createNameDescControl(Composite container) {
-
-			Composite nameGroup = new Composite(container, SWT.NONE);
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 2;
-			nameGroup.setLayout(layout);
-			nameGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-			final Button useDefaultsButton = new Button(nameGroup,
-					SWT.TOGGLE | SWT.CHECK);
-			useDefaultsButton.setText(UIMessage.getResourceString("ConfigurationWizard.UseDefaultButtonLabel")); //$NON-NLS-1$
-			useDefaultsButton.setSelection(useDefaultNameAndDesc);
-			GridData buttonData = new GridData();
-			buttonData.horizontalSpan = 2;
-			useDefaultsButton.setLayoutData(buttonData);
-			useDefaultsButton.addSelectionListener(new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-
-				public void widgetSelected(SelectionEvent e) {
-					useDefaultNameAndDesc = useDefaultsButton.getSelection();
-					final boolean enabled = hasFactories
-							&& !useDefaultNameAndDesc;
-					if (useDefaultNameAndDesc) {
-						configs[selectedFactory].setDefaultNameAndDesc();
-						setNameAndDescription(configs[selectedFactory]);
-						setPageComplete(true);
-						setErrorMessage(null);
-					}
-					nameAndDescPage.setEnabled(enabled);
-					getContainer().updateButtons();
-				}
-			});
-			
-			Label nameLabel = new Label(nameGroup, SWT.NONE);
-			nameLabel.setText(UIMessage.getResourceString("ConfigurationWizard.NameLabel")); //$NON-NLS-1$
-			nameText = new Text(nameGroup, SWT.BORDER);
-			nameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			nameText.setText(""); //$NON-NLS-1$
-			nameText.addModifyListener(new ModifyListener(){
-				public void modifyText(ModifyEvent e) {
-					configs[selectedFactory].setName(nameText.getText());
-					if (nameText.getText().equals(EMPTY_STRING)) {
-						setPageComplete(false);
-						setErrorMessage("Please specify a resource manager name");
-					}
-				}});
-
-			Label descLabel = new Label(nameGroup, SWT.NONE);
-			descLabel.setText(UIMessage.getResourceString("ConfigurationWizard.DescriptionLabel")); //$NON-NLS-1$
-			descText = new Text(nameGroup, SWT.BORDER);
-			descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			descText.setText(""); //$NON-NLS-1$
-			descText.addModifyListener(new ModifyListener(){
-				public void modifyText(ModifyEvent e) {
-					configs[selectedFactory].setDescription(descText.getText());
-				}});
-			
-			setPageComplete(true);
-		}
-
-		private void setEnabled(boolean enabled) {
-			nameText.setEnabled(enabled);
-			descText.setEnabled(enabled);
-		}
-
-		private void setNameAndDescription(IResourceManagerConfiguration config) {
-			nameText.setText(config.getName());
-			descText.setText(config.getDescription());
-		}
-
-	}
-
-	private class SelectFactoryPage extends WizardPage {
-
-		private List factoryList;
-
-		public SelectFactoryPage(String pageName) {
-			super(pageName);
-			setTitle(pageName);
-			setDescription(UIMessage.getResourceString("ConfigurationWizard.SelectFactoryDesc")); //$NON-NLS-1$
-		}
-
-		public void createControl(Composite parent) {
-	        Composite composite = new Composite(parent, SWT.NULL);
-	        composite.setFont(parent.getFont());
-	        composite.setLayout(new GridLayout());
-	        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-	        
-			createRMFactoryChoiceControl(composite);
-
-			if (hasFactories) {
-				parent.getDisplay().asyncExec(new Runnable() {
-
-					public void run() {
-						factoryList.select(0);
-						handleFactorySeclection();
-					}
-				});
-			}
-
-			setControl(composite);
-		}
-
-		private void createRMFactoryChoiceControl(Composite container) {
-			String[] factoryNames = new String[factories.length];
-			for (int i = 0; i < factories.length; ++i) {
-				factoryNames[i] = factories[i].getName();
-			}
-
-			Label factoryLabel = new Label(container, SWT.NONE);
-			factoryLabel.setText(UIMessage.getResourceString("ConfigurationWizard.ResourceManagerTypesLabel")); //$NON-NLS-1$
-			factoryList = new List(container, SWT.SINGLE | SWT.BORDER
-					| SWT.V_SCROLL);
-			factoryList.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			factoryList.setItems(factoryNames);
-			factoryList.setEnabled(hasFactories);
-			factoryList.addSelectionListener(new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent e) {
-					// no-op
-				}
-
-				public void widgetSelected(SelectionEvent e) {
-					handleFactorySeclection();
-				}
-			});
-		}
-
-		private void handleFactorySeclection() {
-			int index = factoryList.getSelectionIndex();
-			factorySelected(index);
-			setPageComplete(true);
-		}
-	}
-
-	private RMConfigurationWizardPage[][] cachedPages;
-
-	private final ArrayList<WizardPage> wizardPages = new ArrayList<WizardPage>();
-
-	private IResourceManagerConfiguration[] configs = null;
-
-	private final SelectFactoryPage selectFactoryPage;
-
-	private final IResourceManagerFactory[] factories;
-
-	private final boolean hasFactories;
-
-	private IResourceManagerFactory resourceManagerFactory;
-
-	private boolean useDefaultNameAndDesc;
-	
-	private final NameAndDescPage nameAndDescPage;
-
-	private int selectedFactory = -1;
-	
-	private IResourceManagerControl resourceManager;
-
-	/*
-	 * Constructor used when creating a new resource manager.
-	 */
-	public RMConfigurationWizard(
-			IResourceManagerFactory[] resourceManagerFactories) {
-		setForcePreviousAndNextButtons(true);
-		this.factories = resourceManagerFactories;
-		this.hasFactories = factories != null && factories.length > 0;
-		this.cachedPages = new RMConfigurationWizardPage[factories.length][];
-		this.configs = new IResourceManagerConfiguration[factories.length];
-		this.selectFactoryPage = new SelectFactoryPage(
-				UIMessage.getResourceString("ConfigurationWizard.FirstWizardPageName")); //$NON-NLS-1$
-		this.nameAndDescPage = new NameAndDescPage(
-				UIMessage.getResourceString("ConfigurationWizard.SecondWizardPageName")); //$NON-NLS-1$
-		this.useDefaultNameAndDesc = true;
-		this.resourceManager = null;
-	}
-
-	/*
-	 * Constructor used when editing configuration of an existing resource manager.
-	 */
-	public RMConfigurationWizard(IResourceManagerFactory resourceManagerFactory,
-			IResourceManagerControl resourceManager) {
-		this(new IResourceManagerFactory[] { resourceManagerFactory });
-		this.configs[0] = resourceManagerFactory.copyConfiguration(resourceManager.getConfiguration());
-		this.useDefaultNameAndDesc = false;
-		this.resourceManager = resourceManager;
-		factorySelected(0);
-	}
-
-	public void addPages() {
-		if (resourceManager == null) {
-			addPage(selectFactoryPage);
-		}
-		addPage(nameAndDescPage);
-		super.addPages();
-	}
-
-	public boolean canFinish() {
-		if (!hasFactories)
-			return false;
-
-		int numPages = getNumPages();
-		for (int i = 0; i < numPages; ++i) {
-			WizardPage page = (WizardPage) wizardPages.get(i);
-			if (!page.isPageComplete())
-				return false;
-		}
-
-		return true;
-	}
-
-	public IResourceManagerConfiguration getConfiguration() {
-		return configs[selectedFactory];
-	}
-
-	public String getDescription() {
-		return nameAndDescPage.descText.getText();
-	}
-
-	public String getName() {
-		return nameAndDescPage.nameText.getText();
-	}
-
-	public IWizardPage getNextPage(IWizardPage page) {
-		int numPages = getNumPages();
-
-		int index = wizardPages.indexOf(page);
-		if (index == numPages - 1 || index == -1) {
-			// last page or page not found
-			return null;
-		}
-		if (index == numPages - 2) {
-			// initialize last page
-			if (useDefaultNameAndDesc) {
-				configs[selectedFactory].setDefaultNameAndDesc();
-			}
-			nameAndDescPage.setNameAndDescription(configs[selectedFactory]);
-			nameAndDescPage.setEnabled(!useDefaultNameAndDesc);
-		}
-		return (IWizardPage) wizardPages.get(index + 1);
-	}
-
-	public IWizardPage getPreviousPage(IWizardPage page) {
-        int index = wizardPages.indexOf(page);
-        if (index == 0 || index == -1) {
-			// first page or page not found
-            return null;
-		} else {
-			return (IWizardPage) wizardPages.get(index - 1);
-		}
-	}
-
-	public boolean performFinish() {
-		final IResourceManagerConfiguration config = configs[selectedFactory];
-		if (useDefaultNameAndDesc) {
-			config.setDefaultNameAndDesc();
-		}
-		if (resourceManager != null) {
-			resourceManager.setConfiguration(config);
-			PTPCorePlugin.getDefault().getModelManager().saveResourceManagers();
-		} else {
-			IResourceManagerControl rm = resourceManagerFactory.create(config);
-			PTPCorePlugin.getDefault().getModelManager().addResourceManager(rm);
-		}
-		Arrays.fill(configs, null);
-		return true;
-	}
-
-	private void factorySelected(int selectedFactory) {
-		this.selectedFactory = selectedFactory;
-		resourceManagerFactory = factories[selectedFactory];
-		if (configs[selectedFactory] == null) {
-			configs[selectedFactory] = resourceManagerFactory.createConfiguration();
-		}
-
-		setWizardPages(selectedFactory);
-	}
-
-	private int getNumPages() {
-		return wizardPages.size();
-	}
-
-	private void setWizardPages(int index) {
-		// If this factory has not been selected before
-		// then we must get the additional wizard pages for
-		// the factory and cache them.
-		
-		if (cachedPages[index] == null) {
-			final PTPUIPlugin uiPlugin = PTPUIPlugin.getDefault();
-			final RMConfigurationWizardPageFactory factory = uiPlugin.getRMConfigurationWizardPageFactory(resourceManagerFactory);
-			if (factory != null) {
-				cachedPages[index] = factory.getPages(this);
-			}
-
-			if (cachedPages[index] == null) {
-				cachedPages[index] = new RMConfigurationWizardPage[0];
-			}
-			
-			// All wizard pages must be registered with
-			// a call to addPage(...)
-			for (int i = 0; i < cachedPages[index].length; ++i) {
-				addPage(cachedPages[index][i]);
-			}
-		}
-
-		// add the first and last pages to the selected factory's pages
-		
-		wizardPages.clear();
-		if (resourceManager == null) {
-			wizardPages.add(selectFactoryPage);
-		}
-		wizardPages.addAll(Arrays.asList(cachedPages[index]));
-		wizardPages.add(nameAndDescPage);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPage.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPage.java
deleted file mode 100644
index 874f636..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPage.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.wizards;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Abstract class to subclass contributed WizardPages to create
- * new Resource Managers
- * 
- * @author rsqrd
- *
- */
-public abstract class RMConfigurationWizardPage extends WizardPage {
-
-	private final RMConfigurationWizard wizard;
-	
-	/**
-	 * @param wizard
-	 * @param pageName
-	 */
-	public RMConfigurationWizardPage(RMConfigurationWizard wizard, String pageName) {
-		super(pageName);
-		this.wizard = wizard;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public abstract void createControl(Composite parent);
-
-	/**
-	 * @return
-	 */
-	protected RMConfigurationWizard getConfigurationWizard() {
-		return wizard;
-	}
-}

diff --git a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPageFactory.java b/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPageFactory.java
deleted file mode 100644
index 87a7c81..0000000
--- a/core/org.eclipse.ptp.ui/src/org/eclipse/ptp/ui/wizards/RMConfigurationWizardPageFactory.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.ui.wizards;
-
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-
-
-/**
- * Abstract class that is the extension point for contributing
- * ConfigurationWizardPages to this plug-in.
- * 
- * @author rsqrd
- *
- */
-public abstract class RMConfigurationWizardPageFactory {
-
-	/**
-	 * @param wizard 
-	 * @param config
-	 * @return The contributed ConfigurationWizardPages
-	 */
-	public abstract RMConfigurationWizardPage[] getPages(RMConfigurationWizard wizard);
-
-	/**
-	 * Which IResourceManagerFactory does this contributed set
-	 * of ConfigurationWizardPages serve?
-	 * 
-	 * @return
-	 */
-	public abstract Class<? extends IResourceManagerFactory> getRMFactoryClass();
-
-}

diff --git a/core/org.eclipse.ptp.ui/template/ctemplate.txt b/core/org.eclipse.ptp.ui/template/ctemplate.txt
deleted file mode 100644
index 3830b07..0000000
--- a/core/org.eclipse.ptp.ui/template/ctemplate.txt
+++ /dev/null

@@ -1,31 +0,0 @@
-#include <stdio.h>
-
-void display() {
-	const int s1 = 10;
-	const int s2 = 20;
-
-	int array1[s1];
-	int array2[s1][s2];
-	int num = 10;
-	int i,j = 0;
-
-	for (i=0; i<s1; i++) {
-		array1[i] = i;
-		for (j=0; j<s2; j++) {
-			array2[i][j] = i + j;
-			printf("Array: %d\n", array2[i][j]);
-		}
-	}
-
-	for (i=0; i<10; i++) {
-		num += i;
-		printf("Num: %d\n", num);
-	}
-	printf("Finished\n");
-}
-
-int main() {
-	printf("Hello C\n");
-	display();
-	return 0;
-}

diff --git a/core/org.eclipse.ptp.utils.core/.classpath b/core/org.eclipse.ptp.utils.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/core/org.eclipse.ptp.utils.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/core/org.eclipse.ptp.utils.core/.project b/core/org.eclipse.ptp.utils.core/.project
deleted file mode 100644
index 262baa9..0000000
--- a/core/org.eclipse.ptp.utils.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.utils.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.utils.core/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.utils.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 01bae16..0000000
--- a/core/org.eclipse.ptp.utils.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Thu Sep 04 15:20:32 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/core/org.eclipse.ptp.utils.core/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.utils.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 06ebbe0..0000000
--- a/core/org.eclipse.ptp.utils.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.utils.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.utils.core.Activator
-Require-Bundle: org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.ptp.utils.core,
- org.eclipse.ptp.utils.core.extensionpoints,
- org.eclipse.ptp.utils.core.file,
- org.eclipse.ptp.utils.core.linux
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin

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

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

diff --git a/core/org.eclipse.ptp.utils.core/about.ini b/core/org.eclipse.ptp.utils.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/core/org.eclipse.ptp.utils.core/about.ini
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.utils.core/about.mappings b/core/org.eclipse.ptp.utils.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/core/org.eclipse.ptp.utils.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.utils.core/about.properties b/core/org.eclipse.ptp.utils.core/about.properties
deleted file mode 100644
index a47ba72..0000000
--- a/core/org.eclipse.ptp.utils.core/about.properties
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.utils.core/build.properties b/core/org.eclipse.ptp.utils.core/build.properties
deleted file mode 100644
index 428d49e..0000000
--- a/core/org.eclipse.ptp.utils.core/build.properties
+++ /dev/null

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

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

diff --git a/core/org.eclipse.ptp.utils.core/plugin.properties b/core/org.eclipse.ptp.utils.core/plugin.properties
deleted file mode 100644
index ff314ec..0000000
--- a/core/org.eclipse.ptp.utils.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Core Utilities
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.utils.core/plugin.xml b/core/org.eclipse.ptp.utils.core/plugin.xml
deleted file mode 100644
index 33ca93c..0000000
--- a/core/org.eclipse.ptp.utils.core/plugin.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-</plugin>

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Activator.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Activator.java
deleted file mode 100644
index 7a4fe3e..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Activator.java
+++ /dev/null

@@ -1,50 +0,0 @@
-package org.eclipse.ptp.utils.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.utils.core";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/ArgumentParser.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/ArgumentParser.java
deleted file mode 100644
index 8c4996c..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/ArgumentParser.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.utils.core;
-
-import java.io.IOException;
-import java.io.StreamTokenizer;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Convert a string containing a command and arguments separated by whitespace into an
- * array of strings for each token. Preserve whitespace if the token is
- * quoted.
- * @deprecated This calss was replaced by {@link org.eclipse.ptp.utils.core.linux.ArgumentParser}.
- */
-public class ArgumentParser {
-	private String cmdLine;
-	private List<String> arguments = null;
-	
-	// Prevent instances
-	//public ArgumentParser(String cmdLine) {
-	private ArgumentParser(String cmdLine) {
-		this.cmdLine = cmdLine;
-	}
-	
-	/**
-	 * Parse the command line into arguments.
-	 * 
-	 * @return string array containing individual arguments
-	 */
-	public List<String> getArguments() {
-		if (arguments != null) {
-			return arguments;
-		}
-		
-		List<String> result = new ArrayList<String>();
-		StreamTokenizer tokens = new StreamTokenizer(new StringReader(cmdLine));
-		tokens.resetSyntax();
-		tokens.wordChars('a', 'z');
-		tokens.wordChars('A', 'Z');
-		tokens.wordChars('0', '9');
-		tokens.wordChars('+', '/');
-		tokens.wordChars(':', ':');
-		tokens.wordChars('=', '=');
-		tokens.wordChars('_', '_');
-		tokens.whitespaceChars(0, ' ');
-		tokens.quoteChar('"');
-		tokens.quoteChar('\'');
-		
-		try {
-			while (tokens.nextToken() != StreamTokenizer.TT_EOF) {
-				result.add(tokens.sval);
-			}
-			arguments = result;
-		} catch (IOException e) {
-		}
-		
-		return arguments;
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Range.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Range.java
deleted file mode 100644
index 17d840d..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/Range.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.utils.core;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * Represents a range of numbers inclusive of max and min.
- *
- */
-public class Range implements Iterable<String> {
-	private Integer min;
-	private Integer max;
-	private Integer curr;
-	
-	public Range(int val) {
-		this(val, val);
-	}
-	
-	public Range(int min, int max) throws IllegalArgumentException {
-		if (min > max) {
-			throw new IllegalArgumentException();
-		}
-		this.min = min;
-		this.max = max;
-	}
-	
-	public int getMinValue() {
-		return min;
-	}
-	
-	public int getMaxValue() {
-		return max;
-	}
-	
-	public void setMinValue(int val) {
-		min = val;
-	}
-	
-	public void setMaxValue(int val) {
-		max = val;
-	}
-	
-	public boolean inRange(int val) {
-		return val >= min && val <= max;
-	}
-	
-	public int size() {
-		return max - min + 1;
-	}
-	
-	public String toString() {
-		if (min == max)
-			return "" + min;
-		
-		return min + "-" + max;
-	}
-
-	public Iterator<String> iterator() {
-		curr = min;
-		
-		return new Iterator<String>() {
-			public boolean hasNext() {
-				return curr <= max;
-			}
-
-			public String next() {
-				if (hasNext()) {
-					return (curr++).toString();
-				} else {
-					throw new NoSuchElementException();
-				}
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-		};
-	}
-}
-

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/RangeSet.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/RangeSet.java
deleted file mode 100644
index 3369b08..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/RangeSet.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.utils.core;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-/**
- * Represents a range of numbers. Note: ranges are ALWAYS disjoint and
- * kept in a sorted list.
- *
- */
-public class RangeSet implements Iterable<String> {
-	private ArrayList<Range>	rangeList = new ArrayList<Range>(0);
-	private Iterator<Range>		rangeListIter;
-	private Iterator<String>	rangeIter;
-	
-	public RangeSet() {
-		
-	}
-	
-	public RangeSet(String str) {
-		if (str != null) {
-			String[] ranges = str.split(",");
-			for (String range : ranges) {
-				String[] vals = range.split("-");
-				if (vals.length == 1) {
-					add(Integer.parseInt(vals[0]));
-				} else {
-					add(Integer.parseInt(vals[0]), Integer.parseInt(vals[1]));
-				}
-			}
-		}
-	}
-	
-	public RangeSet(int val) {
-		this(val, val);
-	}
-	
-	public RangeSet(int min, int max) {
-		rangeList.add(new Range(min, max));
-	}
-	
-	public void add(int val) {
-		int pos = 0;
-		
-		if (rangeList.size() > 0) {
-			pos = findIndex(val);
-			
-			if (pos >= 0)
-				return;
-			
-			pos = -(pos + 1);
-	    }
-	    
-        rangeList.add(pos, new Range(val));  
-        fixupRanges();
-	}
-	
-	public void add(int min, int max) {
-		if (min == max) {
-			add(min);
-			return;
-		} 
-		
-		if (min > max) {
-			return;
-		}
-		
-		if (rangeList.size() == 0) {
-			rangeList.add(new Range(min,max));
-			return;
-		}
-		
-	    Range rlow = null;
-	    Range rhigh = null;
-	    
-	    int ilow = findIndex(min);
-	    int ihigh = findIndex(max);
-	    
-	    if (ilow >= 0) {
-	    	/*
-	    	 * Quick check to see if subset
-	    	 */
-	    	if (ilow == ihigh) {
-	    		return;
-	    	}
-	    	
-	    	/*
-	    	 * min is already covered by a range
-	    	 */
-	    	rlow = rangeList.get(ilow);
-	    	
-	    	if (ihigh >= 0) {
-	    		/*
-	    		 * max is already covered by a range.
-	    		 * Need to merge ranges.
-	    		 */
-	    		rhigh = rangeList.get(ihigh);
-	    		rlow.setMaxValue(rhigh.getMaxValue());
-	    	} else {
-		    	/*
-		    	 * max falls outside a range.
-		    	 * Extend current range.
-		    	 */
-	    		rlow.setMaxValue(max);
-	    		ihigh = -(ihigh+2);
-	    	}
-	    	
-	    	/*
-	    	 * Remove ranges
-	    	 */
-    		for (; ihigh != ilow; ihigh--) {
-    			rangeList.remove(ilow+1);
-    		}
-	    } else {
-	    	/*
-	    	 * min falls outside a range
-	    	 */
-	    	ilow = -(ilow + 1);
-	    	
-	    	if (ihigh >= 0) {
-	    		/*
-	    		 * max falls inside a range
-	    		 */
-	    		rhigh = rangeList.get(ihigh);
-	    		rhigh.setMinValue(min);
-	    		
-		    	/*
-		    	 * Remove ranges
-		    	 */
-	    		for (; ihigh != ilow; ihigh--) {
-	    			rangeList.remove(ilow);
-	    		}
-	    	} else {
-	    		ihigh = -(ihigh + 1);
-	    		
-	    		if (ilow == ihigh) {
-	    			rangeList.add(ilow, new Range(min, max));
-	    		} else {
-	    			rlow = rangeList.get(ilow);
-	    			rlow.setMinValue(min);
-	    			rlow.setMaxValue(max);
-	    			
-			    	/*
-			    	 * Remove ranges
-			    	 */
-		    		for (; ihigh > ilow + 1; ihigh--) {
-		    			rangeList.remove(ilow+1);
-		    		}
-	    		}
-	    	}
-	    }
-	    
-	    fixupRanges();
-	}
-	
-	private void fixupRanges() {
-	    for (int pos = rangeList.size() - 2; pos >= 0; pos--) {
-	    	Range r1 = rangeList.get(pos);
-	    	Range r2 = rangeList.get(pos + 1);
-	    	if (r1.getMaxValue() >= r2.getMinValue() - 1) {
-	    		r1.setMaxValue(r2.getMaxValue());
-	    		rangeList.remove(pos + 1);
-	    	}
-	    }
-	}
-	
-	public void remove(int val) {
-		
-	}
-	
-	public void remove(int min, int max) {
-		
-	}
-	
-	public boolean inRange(int val) {
-		return findIndex(val) >= 0;
-	}
-	
-	public int size() {
-		int nels = 0;
-		
-		for (Range r : rangeList) {
-			nels += r.size();
-		}
-		
-		return nels;
-	}
-	
-	public int[] toArray() {
-		int elt = 0;
-		int[] vals = new int[size()];
-		
-		for (Range r : rangeList) {
-			for (int i = r.getMinValue(); i <= r.getMaxValue(); i++) {
-				vals[elt++] = i;
-			}
-		}
-		
-		return vals;
-	}
-	
-	public String toString() {
-		String str = "";
-		
-		for (int i = 0; i < rangeList.size(); i++) {
-			if (i > 0)
-				str += ",";
-			str += rangeList.get(i).toString();
-		}
-		
-		return str;
-	}
-	
-	public int findIndex(int val) {
-	    int low = 0;
-	    int high = rangeList.size() - 1;
-	    
-	    while (low <= high) {
-	        int pos = (low == high) ? low : ((low + high) / 2);
-	        Range r = rangeList.get(pos);
-
-	        if (r.inRange(val)) {
-	            return pos;
-	        } else if (val < r.getMinValue()) {
-	            high = pos - 1;
-	        } else if (val > r.getMaxValue()) {
-	            low = pos + 1;
-	        }
-	    }
-	    
-	    return -(low+1);
-	}
-
-	public Iterator<String> iterator() {
-		rangeListIter = rangeList.iterator();
-		
-		if (rangeListIter.hasNext())
-			rangeIter = rangeListIter.next().iterator();
-		else
-			rangeIter = null;
-		
-		return new Iterator<String>() {
-			public boolean hasNext() {
-				return rangeIter != null && (rangeIter.hasNext() || rangeListIter.hasNext());
-			}
-
-			public String next() {
-				if (hasNext()) {
-					if (!rangeIter.hasNext()) {
-						rangeIter = rangeListIter.next().iterator();
-					}
-					return rangeIter.next();
-				} else {
-					throw new NoSuchElementException();
-				}
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-		};
-	}
-}
-	
-

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ExtensionPointEnumeration.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ExtensionPointEnumeration.java
deleted file mode 100644
index 410e6e2..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ExtensionPointEnumeration.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.core.extensionpoints;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class ExtensionPointEnumeration implements Enumeration {
-
-	IExtension[] extensions;
-	IConfigurationElement[] elements;
-	
-	IConfigurationElement currentConfigurationElement;
-	private int nextConfigurationIndex;
-	private int nextExtensionIndex;
-	
-	public ExtensionPointEnumeration(String extensionPointId) {
-		this.nextExtensionIndex = 0;
-		this.nextConfigurationIndex = 0;
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry.getExtensionPoint(extensionPointId);
-		if (extensionPoint == null) {
-			return;
-		}
-		
-		this.extensions = extensionPoint.getExtensions();
-		this.currentConfigurationElement = getNextConfigurationElement();
-	}
-	
-	private IConfigurationElement getNextConfigurationElement() {
-		if (extensions == null) {
-			return null;
-		}
-		while (nextExtensionIndex < extensions.length) {
-			IExtension extension = extensions[nextExtensionIndex];
-			if (nextConfigurationIndex == 0) {
-				elements = extension.getConfigurationElements();
-			}
-			if (nextConfigurationIndex >= elements.length) {
-				nextConfigurationIndex = 0;
-				nextExtensionIndex++;
-				continue;
-			}
-			IConfigurationElement selectedConfigurationElement = elements[nextConfigurationIndex];
-			nextConfigurationIndex++;
-			return selectedConfigurationElement;
-		}
-		return null;
-	}
-
-	public boolean hasMoreElements() {
-		return currentConfigurationElement != null;
-	}
-
-	public Object nextElement() {
-		IConfigurationElement element = currentConfigurationElement;
-		currentConfigurationElement = getNextConfigurationElement();
-		if (element == null) {
-			throw new NoSuchElementException();
-		}
-		return element;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/IProcessMemberVisitor.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/IProcessMemberVisitor.java
deleted file mode 100644
index 610906f..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/IProcessMemberVisitor.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.core.extensionpoints;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public interface IProcessMemberVisitor {
-
-	public Object process(IExtension extension, IConfigurationElement member);
-}

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ProcessExtensions.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ProcessExtensions.java
deleted file mode 100644
index 6d915a4..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/extensionpoints/ProcessExtensions.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.core.extensionpoints;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class ProcessExtensions {
-	public static void process(String xpid, IProcessMemberVisitor processor) {
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry.getExtensionPoint(xpid);
-		IExtension[] extensions = extensionPoint.getExtensions();
-
-		for (int i = 0; i < extensions.length; i++) {
-			IExtension extension = extensions[i];
-			IConfigurationElement[] elements = extension
-					.getConfigurationElements();
-			for (int j = 0; j < elements.length; j++) {
-				IConfigurationElement element = elements[j];
-				processor.process(extension, element);
-			}
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileEnumeration.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileEnumeration.java
deleted file mode 100644
index 6add821..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileEnumeration.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.core.file;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Enumeration;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.osgi.util.NLS;
-
-public class FileEnumeration implements Enumeration {
-
-	File[] files;
-	int currentFile;
-	
-	public FileEnumeration(File root) throws IOException {
-		if (! root.exists()) {
-			throw new FileNotFoundException();
-		} else if (root.isFile()) {
-			files = new File[1];
-			files[0] = root;
-		} else if (root.isDirectory()) {
-			files = root.listFiles();
-			if (files == null) {
-				throw new IOException(NLS.bind("Cannot list directory {0}", root.getAbsolutePath()));
-			}
-		} else {
-			Assert.isTrue(false);
-		}
-		currentFile = 0;
-	}
-	
-	FileEnumeration(String root) throws IOException {
-		this(new File(root));
-	}
-	
-	public boolean hasMoreElements() {
-		return currentFile < files.length;
-	}
-
-	public Object nextElement() {
-		if (currentFile < files.length) {
-			return files[currentFile++];
-		} else {
-			return null;
-		}
-	}
-
-	public static void main(String[] args) {
-		FileEnumeration enumeration = null;
-		try {
-			enumeration = new FileEnumeration("c:/command"); //$NON-NLS-1$
-		} catch (IOException e) {
-			e.printStackTrace();
-			return;
-		} 
-		while (enumeration.hasMoreElements()) {
-			// System.out.println(enumeration.nextElement().toString());
-		}
-	}
-}
-

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileRecursiveEnumeration.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileRecursiveEnumeration.java
deleted file mode 100644
index 715a26c..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/file/FileRecursiveEnumeration.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.core.file;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-import java.util.Stack;
-
-
-public class FileRecursiveEnumeration implements Enumeration {
-
-	Stack roots;
-	FileEnumeration currentDirectory;
-	File nextFile;
-	LinkedList exceptionList = new LinkedList();
-
-	public FileRecursiveEnumeration(String root) {
-		this(new File(root));
-	}
-	
-	public FileRecursiveEnumeration(File root) {
-		if (! root.exists()) {
-			throw new IllegalArgumentException();
-		}
-		roots = new Stack();
-		roots.add(root);
-		fetchNextFile();
-	}
-	
-	private void fetchNextFile() {
-		nextFile = null;
-		while (true) {
-			if (currentDirectory == null) {
-				if (roots.empty()) {
-					return;
-				}
-				File root = (File)roots.pop();
-				try {
-					currentDirectory = new FileEnumeration(root);
-				} catch (IOException e) {
-					exceptionList.addLast(e);
-				}
-			} else {
-				if (currentDirectory.hasMoreElements()) {
-					nextFile = (File)currentDirectory.nextElement();
-					if (nextFile.isDirectory()) {
-						roots.add(nextFile);
-					}
-					return;
-				} else {
-					currentDirectory = null;
-				}
-			}	
-		}		
-	}
-	
-	public boolean hasMoreExceptions() {
-		return exceptionList.size() > 0;
-	}
-	
-	public Exception nextException() {
-		if (exceptionList.size() == 0) {
-			throw new NoSuchElementException();
-		}
-		return (Exception) exceptionList.removeFirst();
-	}
-	
-	public boolean hasMoreElements() {
-		return nextFile != null;
-	}
-
-	public Object nextElement() {
-		File result = nextFile;
-		fetchNextFile();
-		return result;
-	}
-
-	public static void main(String[] args) {
-		Enumeration enumeration = new FileRecursiveEnumeration("c:/command/gs"); //$NON-NLS-1$
-		while (enumeration.hasMoreElements()) {
-			// System.out.println(enumeration.nextElement().toString());
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/linux/ArgumentParser.java b/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/linux/ArgumentParser.java
deleted file mode 100644
index 9621387..0000000
--- a/core/org.eclipse.ptp.utils.core/src/org/eclipse/ptp/utils/core/linux/ArgumentParser.java
+++ /dev/null

@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.utils.core.linux;
-
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-
-public class ArgumentParser {
-	List<String> tokens;
-
-	/**
-	 * Create a command line representation from the string with a shell command line.
-	 * The command line is parsed and split on spaces. Quoted or escaped spaces are preserved..
-	 */
-	public ArgumentParser(String commandline) {
-		this.tokens = parseCommandline(commandline);
-	}
-
-	/**
-	 * Create a command line representation from an array of strings.
-	 * The first element of the array is assumed to be the command, the remaining, the arguments.
-	 * The elements are not parsed not (un)escaped., but taked as the are.
-	 */
-	public ArgumentParser(String tokenArray[]) {
-		this(Arrays.asList(tokenArray));
-	}
-	
-	/**
-	 * Create a command line representation from an array of strings.
-	 * The first element of the list is assumed to be the command, the remaining, the arguments.
-	 * The elements are not parsed not (un)escaped., but taked as the are.
-	 */
-	public ArgumentParser(List tokenList) {
-		this.tokens = new ArrayList(tokenList);
-	}
-	
-	/**
-	 * Create a command line representation from the command and an array of parameters.
-	 * The elements are not parsed not (un)escaped., but taked as the are.
-	 */
-	public ArgumentParser(String command, String parameterArray[]) {
-		this(command, Arrays.asList(parameterArray));
-	}
-	
-	/**
-	 * Create a command line representation from the command and an list of parameters.
-	 * The elements are not parsed not (un)escaped., but taked as the are.
-	 */
-	public ArgumentParser(String command, List<String> parameterList) {
-		this.tokens = new ArrayList<String>();
-		this.tokens.add(command);
-		this.tokens.addAll(parameterList);
-	}
-
-	private static List<String> parseCommandline(String commandline) {
-		ArrayList<String> result = new ArrayList<String>();
-		StringCharacterIterator iterator = new StringCharacterIterator(commandline);
-	    
-		for (iterator.first(); iterator.current() != CharacterIterator.DONE; iterator.next()) {
-
-			// Restart to skip white space
-	    	if (Character.isWhitespace(iterator.current())) {
-	    		continue;
-	    	}
-	    	
-	    	// Read token
-	    	StringBuffer buffer = new StringBuffer();
-	    	token_reader: for (; iterator.current() != CharacterIterator.DONE; iterator.next()) {
-	    		char tokenChar = iterator.current();
-		    	
-	    		// A white space terminates the token
-	    		if (Character.isWhitespace(tokenChar)) {
-		    		break token_reader;
-		    	}
-		    	
-	    		// Handle character that composes the token
-	    		switch (tokenChar) {
-	    		case '"':
-	    		{
-	    			/*
-	    			 * Read all text within double quotes or until end of string. Allows escaping.
-	    			 */
-	    			iterator.next(); // Skip quote
-	    			quoted_reader: while ((iterator.current() != CharacterIterator.DONE) && (iterator.current() != '"')) {
-	    				char innerChar = iterator.current();
-	    				switch (innerChar) {
-	    				case '\\':
-	    					char nextChar = iterator.next();
-	    					switch (nextChar) {
-	    					case CharacterIterator.DONE:
-	    						break quoted_reader;
-	    					case '"':
-	    						// Add the character, but remove the escape
-	    						buffer.append(nextChar);
-	    						iterator.next();
-	    						continue quoted_reader;
-	    					default:
-	    						// Add the character and keep escape
-	    						buffer.append(innerChar);
-	    						buffer.append(nextChar);
-	    						iterator.next();
-	    						continue quoted_reader;
-	    					}
-	    				default:
-	    					buffer.append(innerChar);
-	    					iterator.next();
-	    					continue quoted_reader;
-	    				}
-	    			}
-	    			continue token_reader;
-	    		}
-	    		case '\'':
-	    		{
-	    			/*
-	    			 * Read all text within single quotes or until end of string. No escaping.
-	    			 */
-	    			iterator.next(); // Skip the quote
-	    			while ((iterator.current() != CharacterIterator.DONE) && (iterator.current() != '\'')) {
-	    				buffer.append(iterator.current());
-	    				iterator.next();
-	    			}
-	    			continue token_reader;
-	    		}
-	    		case '\\':
-	    		{
-	    			/*
-	    			 * Read escaped char.
-	    			 */
-	    			char nextChar = iterator.next();
-	    			switch (nextChar) {
-	    			case CharacterIterator.DONE:
-	    				break token_reader;
-	    			case '\n':
-	    				// Ignore newline. Both lines are concatenated.
-	    				continue token_reader;
-	    			default:
-	    				// Add the character, but remove the escape
-	    				buffer.append(nextChar);
-	    				continue token_reader;
-	    			}
-	    		}
-	    		default:
-	    			/*
-	    			 * Any other char, add to the buffer.
-	    			 */
-	    			buffer.append(tokenChar);
-	    			continue token_reader;
-	    		}
-	    	}
-	    	result.add(buffer.toString()); 	
-	    }
-		
-		return result;
-	}
-	
-	/**
-	 * Convert all tokens in a full command line that can be executed in a shell.
-	 * @param fullEscape If every special character shall be escaped. If false, only white spaces
-	 * are escaped and the shell will interpret the special chars. If true, then all special chars are
-	 * quoted.
-	 * @return
-	 */
-	public String getCommandLine(boolean fullEscape) {
-		StringBuffer buffer = new StringBuffer();
-		Iterator<String> iterator = this.tokens.iterator();
-		boolean first = true;
-		while (iterator.hasNext()) {
-			String token = (String) iterator.next();
-			if (! first) {
-				buffer.append(' ');
-			} else {
-				first = false;
-			}
-			buffer.append(escapeToken(token, fullEscape));
-		}
-		return buffer.toString();
-	}
-	
-	private StringBuffer escapeToken(String token, boolean fullEscape) {
-		StringBuffer buffer = new StringBuffer();
-		StringCharacterIterator iter = new StringCharacterIterator(token);
-	    for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) {
-	    	if (Character.isWhitespace(c)) {
-	    		buffer.append('\\');
-	    		buffer.append(c);
-	    		continue;
-	    	}
-	    	switch (c) {
-	    	case '(':
-	    	case ')':
-	    	case '[':
-	    	case ']':
-	    	case '{':
-	    	case '}':
-	    	case '|':
-	    	case '\\':
-	    	case '*':
-	    	case '&':
-	    	case '^':
-	    	case '%':
-	    	case '$':
-	    	case '#':
-	    	case '@':
-	    	case '!':
-	    	case '~':
-	    	case '`':
-	    	case '\'':
-	    	case '"':
-	    	case ':':
-	    	case ';':
-	    	case '?':
-	    	case '>':
-	    	case '<':
-	    	case '\n':
-	    		if (fullEscape) {
-	    			buffer.append('\\');
-	    		}
-		    	buffer.append(c);
-	    		continue;
-	    	case ' ':
-    			buffer.append('\\');
-		    	buffer.append(c);
-	    		continue;    			
-	    	default:
-		    	buffer.append(c);
-	    		continue;
-	    	}
-	     }
-	    return buffer;
-	}
-
-	/**
-	 * Returns a List of all entries of the command line.
-	 * @return The Array
-	 */
-	public String[] getTokenArray() {
-		return (String[]) this.tokens.toArray(new String[this.tokens.size()]);
-	}
-	
-	/**
-	 * Returns a List of all entries of the command line.
-	 * @return The List
-	 */
-	public List<String> getTokenList() {
-		return new ArrayList(this.tokens);
-	}
-	
-	/**
-	 * Returns the command of the command line, assuming that the first entry is always the command.
-	 * @return The command or null if the command lines has no command nor arguments.
-	 * @return
-	 */
-	public String getCommand() {
-		if (this.tokens.size() == 0) {
-			return null;
-		}
-		return (String) this.tokens.get(0);
-	}
-	
-	/**
-	 * Returns the command of the command line, assuming that the first entry is always the command.
-	 * @return The command or null if the command lines has no command nor arguments.
-	 * @param fullEscape If every special character shall be escaped. If false, only white spaces
-	 * are escaped and the shell will interpret the special chars. If true, then all special chars are
-	 * quoted.
-	 * @return
-	 */
-	public String getEscapedCommand(boolean fullEscalpe) {
-		if (this.tokens.size() == 0) {
-			return null;
-		}
-		return escapeToken((String) this.tokens.get(0), fullEscalpe).toString();		
-	}
-	
-	/**
-	 * Returns a list of all arguments, assuming that the first entry is the command name.
-	 * @return The Array or null if the command lines has no command nor arguments.
-	 */
-	public String[] getParameterArray() {
-		if (this.tokens.size() == 0) {
-			return null;
-		}
-		return (String[]) this.tokens.subList(1, this.tokens.size()).toArray(new String[this.tokens.size()-1]);
-	}
-	
-	/**
-	 * Returns a list of all arguments, assuming that the first entry is the command name.
-	 * @return The List or null if the command lines has no command nor arguments.
-	 */
-	public List getParameterList() {
-		if (this.tokens.size() == 0) {
-			return null;
-		}
-		return new ArrayList(this.tokens.subList(1, this.tokens.size()));
-	}
-	
-	/**
-	 * Returns the total number of entries.
-	 * @return
-	 */
-	public int getSize() {
-		return this.tokens.size();
-	}
-	
-	/**
-	 * Returns a representation of the command line for debug purposes.
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<"); //$NON-NLS-1$
-		Iterator iterator = this.tokens.iterator();
-		boolean first = true;
-		while (iterator.hasNext()) {
-			String token = (String) iterator.next();
-			if (! first) {
-				buffer.append('\n');
-			} else {
-				first = false;
-			}
-			buffer.append(token);
-		}
-		buffer.append(">"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-	
-	public static void main(String[] args) {
-		ArgumentParser parser = new ArgumentParser("foobar", new String[] {"arg1", "arg2", "arg\\3", "arg\"4", "arg'5", "more arguments"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-		System.out.println(parser.getCommandLine(false));
-		System.out.println(parser.getCommandLine(true));
-		
-		parser = new ArgumentParser(" foo"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo "); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo  a"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a "); System.out.println(parser); //$NON-NLS-1$
-		System.out.println();
-		parser = new ArgumentParser(" foo a"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser(" foo a "); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser(" foo   a "); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo	a"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a	"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo	a	"); System.out.println(parser); //$NON-NLS-1$
-		System.out.println();
-		parser = new ArgumentParser("foo a b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a b "); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a b c "); System.out.println(parser); //$NON-NLS-1$
-		System.out.println();
-		parser = new ArgumentParser("foo\\ a b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo \\ab"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a\\ b\\ c "); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("\\foo a b c "); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a b c\\"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \\b c"); System.out.println(parser); //$NON-NLS-1$
-		System.out.println();
-		parser = new ArgumentParser("foo a\\'c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a\\\"c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \\'c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \\\"c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a\\' c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a\\\" c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \\' c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \\\" c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a c b\\'"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a c b\\\""); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a c b \\'"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("foo a c b \\\""); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("\\'foo a c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("\\\"foo a c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("\\' foo a c b"); System.out.println(parser); //$NON-NLS-1$
-		parser = new ArgumentParser("\\\" foo a c b"); System.out.println(parser); //$NON-NLS-1$		
-		System.out.println();
-		parser = new ArgumentParser("'foo a' b c d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a b 'c d'"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a 'b c' d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a 'b\\e' d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \"b\\e\" d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a 'b c d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \"b c d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \"b c\" d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \"b c\"d"); System.out.println(parser);	 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a 'b c' d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a 'b c'd"); System.out.println(parser);	 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a 'b \" c' d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \"b ' c\" d"); System.out.println(parser);	 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a 'b \\\" c' d"); System.out.println(parser);		 //$NON-NLS-1$
-		parser = new ArgumentParser("foo a \"b \' c\" d"); System.out.println(parser);	 //$NON-NLS-1$		
-		
-		System.out.println();		
-		parser = new ArgumentParser(new String[] {}); System.out.println(parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"a"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$
-		parser = new ArgumentParser(new String[] {"av"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$
-		parser = new ArgumentParser(new String[] {"a d"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$
-		parser = new ArgumentParser(new String[] {"a", "a"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$ //$NON-NLS-2$
-		parser = new ArgumentParser(new String[] {"av", "a"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$ //$NON-NLS-2$
-		parser = new ArgumentParser(new String[] {"a d", "a"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$ //$NON-NLS-2$
-		parser = new ArgumentParser(new String[] {"a", "b b"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$ //$NON-NLS-2$
-		parser = new ArgumentParser(new String[] {"av", "b b"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$ //$NON-NLS-2$
-		parser = new ArgumentParser(new String[] {"a d", "b b"}); System.out.println(parser.getCommandLine(true)); //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-	
-}

diff --git a/core/org.eclipse.ptp.utils.ui/.classpath b/core/org.eclipse.ptp.utils.ui/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/core/org.eclipse.ptp.utils.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/core/org.eclipse.ptp.utils.ui/.project b/core/org.eclipse.ptp.utils.ui/.project
deleted file mode 100644
index befe1a6..0000000
--- a/core/org.eclipse.ptp.utils.ui/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.utils.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.utils.ui/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.utils.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 819fe90..0000000
--- a/core/org.eclipse.ptp.utils.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Thu Sep 04 15:21:10 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/core/org.eclipse.ptp.utils.ui/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.utils.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 02c18e6..0000000
--- a/core/org.eclipse.ptp.utils.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.utils.ui
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.utils.ui.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.utils.ui.swt
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin

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

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

diff --git a/core/org.eclipse.ptp.utils.ui/build.properties b/core/org.eclipse.ptp.utils.ui/build.properties
deleted file mode 100644
index b67aba1..0000000
--- a/core/org.eclipse.ptp.utils.ui/build.properties
+++ /dev/null

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

diff --git a/core/org.eclipse.ptp.utils.ui/plugin.properties b/core/org.eclipse.ptp.utils.ui/plugin.properties
deleted file mode 100644
index c74380c..0000000
--- a/core/org.eclipse.ptp.utils.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP UI Utilities
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/Activator.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/Activator.java
deleted file mode 100644
index 169918f..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/Activator.java
+++ /dev/null

@@ -1,50 +0,0 @@
-package org.eclipse.ptp.utils.ui;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.utils.ui";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/ImageImageDescriptor.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/ImageImageDescriptor.java
deleted file mode 100644
index dc9ec99..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/ImageImageDescriptor.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.utils.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-
-public class ImageImageDescriptor extends ImageDescriptor {
-	private Image fImage;
-
-	/**
-	 * Constructor for ImagImageDescriptor.
-	 */
-	public ImageImageDescriptor(Image image) {
-		super();
-		fImage= image;
-	}
-
-	/* (non-Javadoc)
-	 * @see Object#equals(Object)
-	 */
-	public boolean equals(Object obj) {
-		return (obj != null) && getClass().equals(obj.getClass()) && fImage.equals(((ImageImageDescriptor)obj).fImage);
-	}
-
-	/* (non-Javadoc)
-	 * @see ImageDescriptor#getImageData()
-	 */
-	public ImageData getImageData() {
-		return fImage.getImageData();
-	}
-
-	/* (non-Javadoc)
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		return fImage.hashCode();
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/PixelConverter.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/PixelConverter.java
deleted file mode 100644
index a5036d2..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/PixelConverter.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.utils.ui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Control;
-
-public class PixelConverter {
-	private FontMetrics fFontMetrics;
-	
-	public PixelConverter(Control control) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		fFontMetrics= gc.getFontMetrics();
-		gc.dispose();
-	}
-		
-	/**
-	 * @see DialogPage#convertHorizontalDLUsToPixels
-	 */
-	public int convertHorizontalDLUsToPixels(int dlus) {
-		return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
-	}
-	
-	/**
-	 * @see DialogPage#convertWidthInCharsToPixels
-	 */
-	public int convertWidthInCharsToPixels(int chars) {
-		return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
-	}	
-
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrame.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrame.java
deleted file mode 100755
index 9ed189d..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrame.java
+++ /dev/null

@@ -1,550 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.utils.ui.Activator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Frame specialized for use in environments that must retrieve information on how to connect to a remote host
- * from the user.
- * 
- * @author Richard Maciel
- *
- */
-public final class AuthenticationFrame extends Frame {
-
-	/**
-	 * Implements a {@link SelectionListener} that receives events from the {@link Button} 
-	 * (SWT.OPTION style) children controls convert them to {@link ModifyEvent} and forwards 
-	 * them to this control listeners.
-	 * Also, it updates all widgets that depend on the controls that generate the event.
-	 *  
-	 * @author Richard Maciel
-	 *
-	 */
-	class OptionSelectionListener extends SelectionAdapter {
-		public void widgetSelected(SelectionEvent event) {
-			updateEnabledWidgets();
-			
-			// Copy the SelectionEvent to the ModifyEvent
-			Event newEvent = new Event();
-			newEvent.data = event.data;
-			newEvent.display = event.display;
-			newEvent.time = event.time;
-			newEvent.widget = event.widget;
-			ModifyEvent mevent = new ModifyEvent(newEvent);
-			
-			forwardEventToExternalListeners(mevent);
-		}
-	}
-	
-	/**
-	 * Implements a {@link SelectionListener} that receives events from the {@link Combo} 
-	 * children controls convert them to {@link ModifyEvent} and forwards 
-	 * them to this control listeners.
-	 *  
-	 * @author Richard Maciel
-	 *
-	 */
-	class ComboSelectionListener extends SelectionAdapter {
-		public void widgetSelected(SelectionEvent event) {
-//			 Copy the SelectionEvent to the ModifyEvent
-			Event newEvent = new Event();
-			newEvent.data = event.data;
-			newEvent.display = event.display;
-			newEvent.time = event.time;
-			newEvent.widget = event.widget;
-			ModifyEvent mevent = new ModifyEvent(newEvent);
-			
-			forwardEventToExternalListeners(mevent);
-		}
-	}
-	
-	// Top controls
-	Button localhost;
-	Button remotehost;
-	TextGroup hostAddressTextGroup;
-	TextGroup hostPortTextGroup;
-	Button passwordAuthButton;
-	Button publicKeyAuthButton;
-	TextGroup usernameTextGroup;
-	TextGroup passwordTextGroup;
-	FileGroup privateKeyPathGroup;
-	TextGroup passphraseTextGroup;
-	
-	// Bottom controls
-	TextGroup timeoutTextGroup;
-	ComboGroup cipherTypeGroup;
-	
-	// List of all listeners
-	Collection modifyListeners = new HashSet();
-	
-	public AuthenticationFrame(Composite parent, AuthenticationFrameMold mold) {
-		super(parent, 
-					FrameMold.HAS_EXPAND | FrameMold.HAS_FRAME | ((mold.bitmask & AuthenticationFrameMold.HAS_DESCRIPTION) != 0 ? FrameMold.HAS_DESCRIPTION : 0), 
-					2);
-		setTitle(mold.title);
-		super.setExpandButtonLabel(mold.labelShowAdvancedOptions);
-		super.setShrinkButtonLabel(mold.labelHideAdvancedOptions);
-		if (mold.description != null) {
-			setDescription(mold.description);
-		}
-		
-		createTopControls(mold);
-		createBottomControls(mold);
-		registerListeners();
-		updateEnabledWidgets();
-	}
-
-	/**
-	 * Register listeners for all user-interactive controls
-	 *
-	 */
-	private void registerListeners() {
-		// Get controls from both top and bottom composites.
-		Control [] controls = {this.localhost, this.remotehost, this.hostAddressTextGroup, this.hostPortTextGroup, this.passwordAuthButton,
-				this.publicKeyAuthButton, this.usernameTextGroup, this.passwordTextGroup, this.privateKeyPathGroup,
-				this.passphraseTextGroup, this.timeoutTextGroup, this.cipherTypeGroup};
-		
-		// Add listeners to all controls in the array
-		for(int i=0; i < controls.length; i++) {
-			if(controls[i] instanceof TextGroup) {
-				((TextGroup)controls[i]).getText().addModifyListener(new TextModifyListener());
-			} else if (controls[i] instanceof Button) {
-				Button b = (Button)controls[i];
-				b.addSelectionListener(new OptionSelectionListener());
-			} else if(controls[i] instanceof ComboGroup) {
-				((ComboGroup)controls[i]).getCombo().addSelectionListener(new ComboSelectionListener());
-			}
-		}
-	}
-
-	/**
-	 * Create controls for the top composite.
-	 * @param mold 
-	 *
-	 */
-	private void createTopControls(AuthenticationFrameMold mold) {
-		Composite topUserReservedComposite = this.getTopUserReservedComposite();
-
-		FrameMold lmold = new FrameMold(2);
-		Frame line = new Frame(topUserReservedComposite, lmold);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		line.setLayoutData(gridData);
-		
-		if ((mold.getBitmask() & AuthenticationFrameMold.SHOW_HOST_TYPE_RADIO_BUTTON) != 0) {
-			// Radio buttons to select if target is localhost or a remote host.
-			this.localhost = new Button(line, SWT.RADIO);
-			this.localhost.setText(mold.labelLocalhost);
-			this.remotehost = new Button(line, SWT.RADIO);
-			this.remotehost.setText(mold.labelRemoteHost);
-			
-			line = new Frame(topUserReservedComposite, lmold);
-			gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-			gridData.horizontalSpan = 2;
-			line.setLayoutData(gridData);
-		}
-		
-		// Will reuse this mold for all TextGroup controls.
-		TextMold tmold = new TextMold(TextMold.GRID_DATA_ALIGNMENT_FILL | 
-				TextMold.GRID_DATA_GRAB_EXCESS_SPACE, Messages.AuthenticationFrame_Host);
-		
-		// Host field
-		tmold.setLabel(mold.labelHostAddress);
-		hostAddressTextGroup = new TextGroup(line, tmold);
-				
-		// Port field
-		tmold.removeBitmask(TextMold.GRID_DATA_GRAB_EXCESS_SPACE);
-//		tmold.removeBitmask(TextGroupMold.GRID_DATA_ALIGNMENT_FILL);
-		tmold.addBitmask(TextMold.WIDTH_PROPORTIONAL_NUM_CHARS);
-		tmold.setTextFieldWidth(5);
-		tmold.setLabel(mold.labelHostPort);
-		hostPortTextGroup = new TextGroup(line, tmold);
-//		hostPortTextGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
-//		 Username field
-		tmold.addBitmask(TextMold.GRID_DATA_GRAB_EXCESS_SPACE);
-//		tmold.addBitmask(TextGroupMold.GRID_DATA_ALIGNMENT_FILL);
-		tmold.removeBitmask(TextMold.WIDTH_PROPORTIONAL_NUM_CHARS);
-		tmold.unsetTextFieldWidth();
-		tmold.setLabel(mold.labelUserName);
-		usernameTextGroup = new TextGroup(topUserReservedComposite, tmold);
-		
-		// User option box
-		passwordAuthButton = new Button(topUserReservedComposite, SWT.RADIO);
-		passwordAuthButton.setText(mold.labelIsPasswordBased);
-		GridData gdauthkind0 = new GridData();
-		gdauthkind0.horizontalSpan = 2;
-		passwordAuthButton.setLayoutData(gdauthkind0);
-		
-		// Password field
-		tmold.setLabel(mold.labelPassword);
-		tmold.addBitmask(TextMold.PASSWD_FIELD);
-		passwordTextGroup = new TextGroup(topUserReservedComposite, tmold);
-		
-		// Key option box
-		publicKeyAuthButton = new Button(topUserReservedComposite, SWT.RADIO);
-		publicKeyAuthButton.setText(mold.labelIsPublicKeyBased);
-		GridData gdauthkind1 = new GridData();
-		gdauthkind1.horizontalSpan = 2;
-		publicKeyAuthButton.setLayoutData(gdauthkind1);
-		
-		// Key file selection
-		FileMold fsmold = new FileMold(FileMold.GRID_DATA_ALIGNMENT_FILL
-				| FileMold.GRID_DATA_SPAN, 
-				mold.labelPrivateKeyPath, mold.labelPrivateKeyPathTitle, mold.labelPublicKeyPathButton);
-		privateKeyPathGroup = new FileGroup(topUserReservedComposite, fsmold);
-		
-		// Passphrase field
-		tmold.setLabel(mold.labelPassphrase);
-		tmold.addBitmask(TextMold.GRID_DATA_SPAN);
-		passphraseTextGroup = new TextGroup(topUserReservedComposite, tmold);
-		
-		passwordAuthButton.setSelection(true);
-		publicKeyAuthButton.setSelection(false);
-		
-		// This solves the taborder issue.
-		if ((mold.getBitmask() & AuthenticationFrameMold.SHOW_HOST_TYPE_RADIO_BUTTON) != 0) {
-			topUserReservedComposite.setTabList(new Control [] {localhost.getParent(), hostPortTextGroup.getParent(), 
-					usernameTextGroup, passwordAuthButton, passwordTextGroup, 
-					publicKeyAuthButton ,privateKeyPathGroup, 
-					passphraseTextGroup});
-		} else {
-			topUserReservedComposite.setTabList(new Control [] {hostPortTextGroup.getParent(), 
-					usernameTextGroup, passwordAuthButton, passwordTextGroup, 
-					publicKeyAuthButton ,privateKeyPathGroup, 
-					passphraseTextGroup});
-		}
-	}
-
-	/**
-	 * Create controls for the bottom (hideable) composite
-	 * @param mold 
-	 *
-	 */
-	private void createBottomControls(AuthenticationFrameMold mold) {
-		Composite bottomUserReservedComposite = this.getBottomUserReservedComposite();
-		// Timeout field
-		TextMold tmold = new TextMold(TextMold.WIDTH_PROPORTIONAL_NUM_CHARS, 
-				mold.labelTimeout,	5);
-		timeoutTextGroup = new TextGroup(bottomUserReservedComposite, tmold);
-		ComboMold cmold = new ComboMold(ComboMold.GRID_DATA_SPAN | 
-				ComboMold.GRID_DATA_ALIGNMENT_FILL | ComboMold.GRID_DATA_GRAB_EXCESS_SPACE, 
-				mold.labelCipherType); //empty combo
-		cipherTypeGroup = new ComboGroup(bottomUserReservedComposite, cmold);
-	}
-
-	/**
-	 * Add a modify listener for this control. The modify listener will listen to all textbox and
-	 * also listen to the option buttons, converting their events {@link SelectionEvent} to
-	 * {@link ModifyEvent} when necessary.
-	 * 
-	 * @param listener
-	 */
-	public void addModifyListener(ModifyListener listener) {
-		modifyListeners.add(listener);
-	}
-
-	public void removeModifyListener(ModifyListener listener) {
-		modifyListeners.remove(listener);
-	}
-
-	/**
-	 * When a {@link ModifyEvent} arrives, forward it to all listeners of this control.
-	 * 
-	 * @param mevent
-	 */
-	private void forwardEventToExternalListeners(ModifyEvent mevent) {
-		Iterator iterator = modifyListeners.iterator();
-		while (iterator.hasNext()) {
-			ModifyListener listener = (ModifyListener) iterator.next();
-			listener.modifyText(mevent);
-		}
-	}
-	
-	/**
-	 * Implements a {@link ModifyListener} that receives events from the {@link Text} children controls and 
-	 * forwards them to this control listeners'.
-	 * 
-	 * @author Richard Maciel
-	 *
-	 */
-	class TextModifyListener implements ModifyListener {
-		public void modifyText(ModifyEvent arg0) {
-			forwardEventToExternalListeners(arg0);
-		}
-	}
-
-	/**
-	 * Use this method to enable/disable options based on status of some control(s) of the 
-	 * authentication frame.
-	 *
-	 */
-	private void updateEnabledWidgets() {
-		if (isLocalhostSelected()) {
-			this.hostAddressTextGroup.getText().setEnabled(false);
-		} else {
-			this.hostAddressTextGroup.getText().setEnabled(true);
-		}
-		if(isPasswdBased())
-		{
-			//usernameTextGroup.setEnabled(true);
-			passwordTextGroup.setEnabled(true);
-			privateKeyPathGroup.setEnabled(false);
-			passphraseTextGroup.setEnabled(false);
-		} else {
-			//usernameTextGroup.setEnabled(false);
-			passwordTextGroup.setEnabled(false);
-			privateKeyPathGroup.setEnabled(true);
-			passphraseTextGroup.setEnabled(true);
-		}
-	}
-
-	/**
-	 * Validate all frame fields. Throw a {@link CoreException} if field is invalid.
-	 * 
-	 * @throws CoreException
-	 */
-	public void validateFields() throws CoreException {
-		String pluginID = Activator.getDefault().getBundle().getSymbolicName();
-		
-		if ((!isLocalhostSelected()) && (hostAddressTextGroup.getText().getText().trim().length() == 0)) {
-			throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_EmptyHostAddressException, 
-					null));
-		} 
-		if(hostPortTextGroup.getText().getText().trim().length() == 0) {
-			throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_EmptyHostPortException, 
-					null));
-		} 
-		if(usernameTextGroup.getText().getText().trim().length() == 0) {
-			throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_EmptyUsernameException, 
-					null));
-		}
-		if(!isPasswdBased()) {
-			if(privateKeyPathGroup.getText().getText().trim().length() == 0) {
-				throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_EmptyPrivateKeyPathException, 
-						null));
-			} 
-			File path = new File(privateKeyPathGroup.getText().getText());
-			if(!path.exists()) {
-				throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_FileDoesNotExistException, 
-							null));
-			}
-			if(!path.isFile()) {
-				throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_PathIsNotFileExcpetion, 
-						null));
-			} 
-			if(!path.canRead()) {
-				throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_FileNotReadableException, 
-						null));
-			} 
-		}
-		try {
-			Integer.parseInt(timeoutTextGroup.getText().getText());
-		} catch(NumberFormatException ne) {
-			throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_TimeoutException,
-					null));
-		}
-		try {
-			Integer.parseInt(hostPortTextGroup.getText().getText());
-		} catch(NumberFormatException ne) {
-			throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_PortNumberException,
-					null));
-		}
-		if(cipherTypeGroup.getSelectedItem() == null || cipherTypeGroup.getSelectedItem().getId().equals("")) { //$NON-NLS-1$
-						throw new CoreException(new Status(IStatus.ERROR, pluginID, 0, Messages.AuthenticationFrame_InvalidCipherTypeException, null));
-		}
-	}
-	
-	public TextGroup getHostAddrTextGroup() {
-		return hostAddressTextGroup;
-	}
-
-	public TextGroup getHostPortTextGroup() {
-		return hostPortTextGroup;
-	}
-
-	public TextGroup getPassphraseTextGroup() {
-		return passphraseTextGroup;
-	}
-
-	public TextGroup getPasswordTextGroup() {
-		return passwordTextGroup;
-	}
-
-	public TextGroup getTimeoutTextGroup() {
-		return timeoutTextGroup;
-	}
-
-	public TextGroup getUsernameTextGroup() {
-		return usernameTextGroup;
-	}
-	
-	public FileGroup getPublicKeyPathGroup() {
-		return privateKeyPathGroup;
-	}
-	
-	public boolean isPasswdBased() {
-		return passwordAuthButton.getSelection();
-	}
-
-	public boolean isLocalhostSelected() {
-		if (this.localhost != null) {
-			return this.localhost.getSelection();
-		}
-		return false;
-	}
-	
-	public Button[] getAuthKindSelectionButtons() {
-		Button [] buttons = new Button[2];
-		buttons[0] = passwordAuthButton;
-		buttons[1] = publicKeyAuthButton;
-		return buttons;
-	}
-
-	public String getHostAddress() {
-		return hostAddressTextGroup.getString();
-	}
-	
-	public void setHostAddress(String s) {
-		hostAddressTextGroup.setString(s);
-	}
-	
-	public int getHostPort() {
-		try {
-			return Integer.parseInt(hostPortTextGroup.getString());
-		} catch (NumberFormatException e) {
-			return 22;
-		}
-	}
-
-	public void setHostPort(int port) {
-		hostPortTextGroup.setString(Integer.toString(port));
-	}
-
-	public boolean isPasswordBased() {
-		return passwordAuthButton.getSelection();
-	}
-	
-	public void setPasswordBased(boolean flag) {
-		passwordAuthButton.setSelection(flag);
-		publicKeyAuthButton.setSelection(! flag);
-		updateEnabledWidgets();
-	}
-	
-	public void setLocalhostSelected(boolean selection) {
-		if ((this.localhost != null) && (this.remotehost != null)) {
-			this.localhost.setSelection(selection);
-			this.remotehost.setSelection(!selection);
-			updateEnabledWidgets();
-		}
-	}
-	
-	public boolean isPublicKeyBased() {
-		return publicKeyAuthButton.getSelection();
-	}
-
-	public void setPublicKeyBased(boolean flag) {
-		passwordAuthButton.setSelection(! flag);
-		publicKeyAuthButton.setSelection(flag);
-		updateEnabledWidgets();
-	}
-
-	public String getPassword() {
-		return passwordTextGroup.getString();
-	}
-
-	public void setPassword(String s) {
-		passwordTextGroup.setString(s);
-	}
-	
-	public String getUserName() {
-		return usernameTextGroup.getString();
-	}
-	
-	public void setUserName(String s) {
-		usernameTextGroup.setString(s);
-	}
-
-	public String getPassphrase() {
-		return passphraseTextGroup.getString();
-	}
-	
-	public void setPassphrase(String s) {
-		passphraseTextGroup.setString(s);
-	}
-
-	
-	public int getTimeout() {
-		try {
-			return Integer.parseInt(timeoutTextGroup.getString());
-		} catch (NumberFormatException e) {
-			return 5000;
-		}
-	}
-
-	public void setTimeout(int port) {
-		timeoutTextGroup.setString(Integer.toString(port));
-	}
-
-	public String getPublicKeyPath() {
-		return privateKeyPathGroup.getString();
-	}
-	
-	public void setPublicKeyPath(String s) {
-		privateKeyPathGroup.setString(s);
-	}
-
-	public ComboGroupItem getSelectedCipherType() {
-		return cipherTypeGroup.getSelectedItem();
-	}
-	
-	public ComboGroupItem getCipherType(String id) {
-		return cipherTypeGroup.getItemUsingID(id);
-	}
-	
-	public ComboGroupItem getCipherType(int index) {
-		return cipherTypeGroup.getItemUsingIndex(index);
-	}
-	
-	public void addCipherType(ComboGroupItem citem) {
-		cipherTypeGroup.add(citem);
-	}
-	
-	public ComboGroup getCipherTypeGroup() {
-		return cipherTypeGroup;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMold.java
deleted file mode 100755
index 6524de3..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMold.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-/**
- * @author Richard Maciel
- *
- */
-public final class AuthenticationFrameMold {
-	
-	public static final int HAS_DESCRIPTION = 1 << 0;
-
-	public static final int SHOW_HOST_TYPE_RADIO_BUTTON = 1 << 1;
-	
-	int bitmask;
-
-	String description;
-	String title;
-
-	String labelLocalhost = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Option_localhost;
-	String labelRemoteHost=AuthenticationFrameMoldMessages.AuthenticationFrameMold_Option_Remotehost;
-	String labelShowAdvancedOptions = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Button_ShowAdvanced;
-	String labelHideAdvancedOptions = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Button_HideAdvanced;
-	String labelPassword = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Field_Password;
-	String labelUserName = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Field_User;
-	String labelIsPasswordBased = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Option_PasswordAuthentication;
-	String labelHostPort = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Field_Port;
-	String labelHostAddress = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Field_Host;
-	String labelTimeout = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Field_Timeout;
-	String labelPassphrase = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Field_Passphrase;
-	String labelPublicKeyPathButton = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Button_PrivateKeyPath;
-	String labelPrivateKeyPath = AuthenticationFrameMoldMessages.AuthenticationFrameMold_SelectionWindow_Label_PrivateKeyPath;
-	String labelPrivateKeyPathTitle = AuthenticationFrameMoldMessages.AuthenticationFrameMold_SelectionWindow_Title_PrivateKeyPath;
-	String labelIsPublicKeyBased = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Option_PublicKeyAuth;
-	String labelCipherType = AuthenticationFrameMoldMessages.AuthenticationFrameMold_Combo_CipherType;
-	
-	public AuthenticationFrameMold(String title) {
-		this.bitmask = 0;
-		setTitle(title);
-	}
-	
-	public AuthenticationFrameMold(String title, String description) {
-		this.bitmask = 0;
-		setTitle(title);
-		setDescription(description);
-	}
-
-	public int getBitmask() {
-		return bitmask;
-	}
-
-	public void setBitmask(int bitmask) {
-		this.bitmask = bitmask;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String label) {
-		this.title = label;
-	}
-
-	public void setLabelLocalhost(String labelLocalhost) {
-		this.labelLocalhost = labelLocalhost;
-	}
-	
-	public void setLabelRemoteHost(String labelRemoteHost) {
-		this.labelRemoteHost = labelRemoteHost;
-	}
-	
-	public void setLabelHideAdvancedOptions(String labelHideAdvancedOptions) {
-		this.labelHideAdvancedOptions = labelHideAdvancedOptions;
-	}
-
-	public void setLabelHostAddress(String labelHostAddress) {
-		this.labelHostAddress = labelHostAddress;
-	}
-
-	public void setLabelHostPort(String labelHostPort) {
-		this.labelHostPort = labelHostPort;
-	}
-
-	public void setLabelIsPasswordBased(String labelIsPasswordBased) {
-		this.labelIsPasswordBased = labelIsPasswordBased;
-	}
-
-	public void setLabelIsPublicKeyBased(String labelIsPublicKeyBased) {
-		this.labelIsPublicKeyBased = labelIsPublicKeyBased;
-	}
-
-	public void setLabelPassphrase(String labelPassphrase) {
-		this.labelPassphrase = labelPassphrase;
-	}
-
-	public void setLabelPassword(String labelPassword) {
-		this.labelPassword = labelPassword;
-	}
-
-	public void setLabelPublicKeyPath(String labelPublicKeyPath) {
-		this.labelPrivateKeyPath = labelPublicKeyPath;
-	}
-
-	public void setLabelPublicKeyPathButton(String labelPublicKeyPathButton) {
-		this.labelPublicKeyPathButton = labelPublicKeyPathButton;
-	}
-
-	public void setLabelPublicKeyPathTitle(String labelPublicKeyPathTitle) {
-		this.labelPrivateKeyPathTitle = labelPublicKeyPathTitle;
-	}
-
-	public void setLabelShowAdvancedOptions(String labelShowAdvancedOptions) {
-		this.labelShowAdvancedOptions = labelShowAdvancedOptions;
-	}
-
-	public void setLabelTimeout(String labelTimeout) {
-		this.labelTimeout = labelTimeout;
-	}
-
-	public void setLabelUserName(String labelUserName) {
-		this.labelUserName = labelUserName;
-	}
-
-	public void setLabelCipherType(String labelCipherType) {
-		this.labelCipherType = labelCipherType;
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMoldMessages.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMoldMessages.java
deleted file mode 100755
index b7ba2d3..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/AuthenticationFrameMoldMessages.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.osgi.util.NLS;
-
-public class AuthenticationFrameMoldMessages extends NLS {
-	// FIXME wrong reference to bundle
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.utils.ui.swt.auth_frame_messages"; //$NON-NLS-1$
-
-	public static String AuthenticationFrameMold_Button_HideAdvanced;
-
-	public static String AuthenticationFrameMold_Button_PrivateKeyPath;
-
-	public static String AuthenticationFrameMold_Button_ShowAdvanced;
-
-	public static String AuthenticationFrameMold_Combo_CipherType;
-
-	public static String AuthenticationFrameMold_Field_Host;
-
-	public static String AuthenticationFrameMold_Field_Passphrase;
-
-	public static String AuthenticationFrameMold_Field_Password;
-
-	public static String AuthenticationFrameMold_Field_Port;
-
-	public static String AuthenticationFrameMold_Field_Timeout;
-
-	public static String AuthenticationFrameMold_Field_User;
-
-	public static String AuthenticationFrameMold_Option_localhost;
-
-	public static String AuthenticationFrameMold_Option_PasswordAuthentication;
-
-	public static String AuthenticationFrameMold_Option_PublicKeyAuth;
-
-	public static String AuthenticationFrameMold_Option_Remotehost;
-
-	public static String AuthenticationFrameMold_SelectionWindow_Label_PrivateKeyPath;
-
-	public static String AuthenticationFrameMold_SelectionWindow_Title_PrivateKeyPath;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, AuthenticationFrameMoldMessages.class);
-	}
-
-	private AuthenticationFrameMoldMessages() {
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroup.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroup.java
deleted file mode 100755
index 1c2b104..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroup.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * Combobox based group
- * 
- * @author Richard Maciel
- *
- */
-public class ComboGroup extends GenericControlGroup {
-	
-	public static final int MAX_SIZE = Combo.LIMIT;
-	
-	Combo combo;
-	
-	// Array that keep track of the combo items. Its index is based on the combo index.
-	Vector comboItems = new Vector();
-	
-	/**
-	 * @param parent
-	 * @param mold
-	 */
-	public ComboGroup(Composite parent, GenericControlMold mold) {
-		super(parent, mold);
-
-		ComboMold cmold = (ComboMold)mold;
-
-		for (Iterator iter = cmold.items.iterator(); iter.hasNext();) {
-			ComboGroupItem item = (ComboGroupItem) iter.next();
-			add(item);
-		}
-	}
-
-	protected Control createCustomControl(int bitmask, GridData gd) {
-		
-		if((bitmask & ComboMold.EDITABLE) != 0) {
-			combo = new Combo(this, SWT.BORDER);
-		} else {
-			combo = new Combo(this, SWT.BORDER | SWT.READ_ONLY);
-		}		
-		return combo;
-	}
-
-	public Combo getCombo() {
-		return combo;
-	}
-	
-	public int getSelectionIndex() {
-		return combo.getSelectionIndex();
-	}
-	
-	public String getSelectionId() {
-		if (combo.getSelectionIndex() == -1) {
-			return null;
-		} else {
-			return getItemUsingIndex(combo.getSelectionIndex()).getId();
-		}
-	}
-	
-	public void setSelectionIndex(int index) {
-		combo.select(index);
-	}
-	
-	public void add(ComboGroupItem comboItem) {
-		comboItems.add(comboItem);
-		combo.add(comboItem.value);
-	}
-	
-	public void add(ComboGroupItem comboItem, int index) {
-		comboItems.add(index, comboItem);
-		combo.add(comboItem.value, index);
-	}
-	
-	/**
-	 * Retrieves an item using the item id.
-	 * @param id
-	 * @return A ComboGroupItem or null if the id doesn't exist.
-	 */
-	public ComboGroupItem getItemUsingID(String id) {
-		Iterator it = comboItems.iterator();
-		while(it.hasNext()) {
-			ComboGroupItem citem = (ComboGroupItem)it.next();
-			if(citem.id.equals(id)) {
-				return citem;
-			}
-		}
-		return null;
-	}
-	
-	public void selectIndexUsingID(String id) {
-		Iterator it = comboItems.iterator();
-		int index = 0;
-		while(it.hasNext()) {
-			ComboGroupItem citem = (ComboGroupItem)it.next();
-			if(citem.id.equals(id)) {
-				combo.select(index);
-				return;
-			}
-			index++;
-		}
-		if(comboItems.size() > 0)
-			combo.select(0);
-	}
-	
-	/**
-	 * Returns the {@link ComboGroupItem} located at index 
-	 * @param index
-	 * @return
-	 */
-	public ComboGroupItem getItemUsingIndex(int index) {
-		if(index < 0 || comboItems.get(index) == null)
-			return new ComboGroupItem("", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		return (ComboGroupItem)comboItems.get(index);
-	}
-	
-	public ComboGroupItem getSelectedItem() {
-		return getItemUsingIndex(combo.getSelectionIndex());
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroupItem.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroupItem.java
deleted file mode 100755
index 88d7925..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboGroupItem.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-public class ComboGroupItem {
-	public String id;
-	public String value;
-	/**
-	 * @param id
-	 * @param value
-	 */
-	public ComboGroupItem(String id, String value) {
-		this.id = id;
-		this.value = value;
-	}
-	
-	public ComboGroupItem(ComboGroupItem item) {
-		this.id = item.id;
-		this.value = item.value;
-	}
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return value;
-	}
-	/**
-	 * @param value the value to set
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboMold.java
deleted file mode 100755
index e9f537b..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ComboMold.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author richardm
- *
- */
-public class ComboMold extends GenericControlMold {
-
-	public static final int WIDTH_PROPORTIONAL_NUM_CHARS = 1 << index++;
-
-	public static final int EDITABLE = 1 << index++;
-
-	List items = new ArrayList();
-	int size = -1;
-	
-	public ComboMold() {
-		super(0);
-	}
-	
-	public ComboMold(int bitmask) {
-		super(bitmask);
-	}
-
-	public ComboMold(String label) {
-		super(0, label);
-	}
-
-	public ComboMold(int bitmask, String label) {
-		super(bitmask, label);
-	}
-
-//	public ComboMold(int bitmask, String label, String [] items) {
-//		super(bitmask, label);
-//		setItems(items);
-//	}
-
-	public void setItems(String[] entries) {
-		for (int i = 0; i < entries.length; i++) {
-			String string = entries[i];
-			this.items.add(new ComboGroupItem(null, string));
-		}	
-	}
-	
-	public void addItem(String key, String value) {
-		this.items.add(new ComboGroupItem(key, value));
-	}
-
-	public int getTextFieldWidth() {
-		return size;
-	}
-
-	public void setTextFieldWidth(int size) {
-		this.size = size;
-		if (size > 0) {
-			addBitmask(WIDTH_PROPORTIONAL_NUM_CHARS);
-		} else {
-			removeBitmask(WIDTH_PROPORTIONAL_NUM_CHARS);
-		}
-	}
-
-	protected int getHeight() {
-		return 0;
-	}
-
-	protected int getWidth() {
-		return size;
-	}
-
-	protected boolean hasHeight() {
-		return false;
-	}
-
-	protected boolean hasWidth() {
-		return (bitmask & WIDTH_PROPORTIONAL_NUM_CHARS) != 0;
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ControlsRelationshipHandler.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ControlsRelationshipHandler.java
deleted file mode 100755
index 36412e4..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ControlsRelationshipHandler.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * This handler class provides a simple implementation to enable/disable controls dependent
- * on buttons state.
- * 
- * @author Richard Maciel
- *
- */
-public class ControlsRelationshipHandler {
-
-	Map controlsRelationship;
-	ControlRelationshipListener controlHandler;
-	boolean enableWhenMasterEnabled;
-	
-	/**
-	 * Builds the handler from using a {@link Map} that contains the relationship between a master control and
-	 * a List of slave controls. The slave controls on the list only will be enabled when the associated master control is
-	 * selected. 
-	 * 
-	 * @param controlsRelationship {@link Map} A map containing the relation  
-	 * @param enableWhenMasterEnabled boolean Flag that let the user choose between enable controls when the master control is enabled or disabled
-	 */
-	public ControlsRelationshipHandler(Map controlsRelationship, boolean enableWhenMasterEnabled) {
-		this.controlsRelationship = controlsRelationship;
-		controlHandler = new ControlRelationshipListener();
-		this.enableWhenMasterEnabled = enableWhenMasterEnabled;
-	}
-	
-	/**
-	 * Build the handler using an empty relation map.
-	 *
-	 */
-	public ControlsRelationshipHandler() {
-		this(new HashMap(), true);
-	}
-
-	/**
-	 * Build a handler and add a relationship. This constructor is useful for checkbox controls that
-	 * enable/disable the interface
-	 * 
-	 * @param master
-	 * @param slaves
-	 */
-	public ControlsRelationshipHandler(Button master, Control [] slaves, boolean enableWhenTrue) {
-		this(new HashMap(), enableWhenTrue);
-		addControlRelationship(master, slaves);
-	}
-	
-	public ControlsRelationshipHandler(Button master, Control slave, boolean enableWhenTrue) {
-		this(new HashMap(), enableWhenTrue);
-		addControlRelationship(master, slave);
-	}
-
-	/**
-	 * This method creates a relationship between master and slaves, so the slaves will only be enabled when
-	 * the master is selected. 
-	 * 
-	 * @param master
-	 * @param slaves
-	 */
-	public void addControlRelationship(Button master, Control [] slaves) {
-		controlsRelationship.put(master, slaves);
-		master.addSelectionListener(controlHandler);
-	}
-
-	public void addControlRelationship(Button master, Control slave) {
-		controlsRelationship.put(master, new Control[] { slave });
-		master.addSelectionListener(controlHandler);
-	}
-
-	public void deleteControlRelationship(Button master) {
-		controlsRelationship.remove(master);
-		master.removeSelectionListener(controlHandler);
-	}
-
-	/**
-	 * Enables the controls dependent on the selected control and disables all the others
-	 * @param btn Button Control that generated a SelectionEvent
-	 */
-	public void manageDependentControls(Button btn) {
-		// Iterates over all the Map keys to get associated controls
-		Set masterSet = controlsRelationship.keySet();
-		Iterator it = masterSet.iterator();
-		while(it.hasNext()) {
-			// Get the list of controls of related to the key
-			Button master = (Button)it.next();
-			
-			// List can be null
-			Object obj = controlsRelationship.get(master);
-			if(obj != null) {
-				Control [] controlList = (Control [])obj;
-				
-				// Enable all controls that are related to the key received as parameter.
-				for(int i=0; i < controlList.length; i++) {
-					if(btn == master && btn.getSelection()) {
-						controlList[i].setEnabled(enableWhenMasterEnabled);
-					} else {
-						controlList[i].setEnabled(!enableWhenMasterEnabled);
-					}
-				}
-			}
-		}
-	}
-
-	class ControlRelationshipListener extends SelectionAdapter {
-
-		public void widgetSelected(SelectionEvent arg0) {
-			manageDependentControls((Button)arg0.widget);
-		}
-	}
-	
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/DirectoryButtonSelectionListener.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/DirectoryButtonSelectionListener.java
deleted file mode 100755
index b5f4e86..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/DirectoryButtonSelectionListener.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Text;
-
-public class DirectoryButtonSelectionListener extends SelectionAdapter {
-	
-	private Text text;
-	private String title;
-	private String message;
-
-	public DirectoryButtonSelectionListener(Text text, String title, String message) {
-		this.text = text;
-		this.title = title;
-		this.message = message;
-	}
-	
-	public void widgetSelected(SelectionEvent e) {
-		super.widgetSelected(e);
-		
-		DirectoryDialog directoryDialog = new DirectoryDialog(text.getShell(), SWT.OPEN);
-		
-		directoryDialog.setFilterPath(text.getText());
-		directoryDialog.setText(title);
-		
-		if (message != null) {
-			directoryDialog.setMessage(message);
-		}
-		String newPath = directoryDialog.open();
-
-		if (newPath != null) {
-			text.setText(newPath);
-		}
-	}
-}
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceGroup.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceGroup.java
deleted file mode 100644
index e9faa4b..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceGroup.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
-
-*****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import java.io.File;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.jface.viewers.TreeNodeContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-
-/**
- * @author Richard Maciel
- *
- */
-public class FileAndWorkspaceGroup extends GenericControlGroup {
-	FileAndWorkspaceMold mold;
-	
-	Composite container;
-	Button findInWorkspace;
-	Text path;
-
-	FilesystemTreeNode pai = new FilesystemTreeNode(new Integer(1));
-	FilesystemTreeNode filho1 = new FilesystemTreeNode(new String("filho1")); //$NON-NLS-1$
-	FilesystemTreeNode filho2 = new FilesystemTreeNode(new String("filho2")); //$NON-NLS-1$
-	
-	public class FilesystemTreeNode extends TreeNode {
-		@Override
-		public String toString() {
-			if(value != null) {
-				return value.toString();
-			} else {
-				return "null"; //$NON-NLS-1$
-			}
-		}
-		
-		public FilesystemTreeNode(Object value) {
-			super(value);
-		}
-	}
-	
-	
-	
-	/**
-	 * @param parent
-	 * @param mold
-	 */
-	private FileAndWorkspaceGroup(Composite parent, FileAndWorkspaceMold mold) {
-		super(parent, mold);
-		this.mold = mold;
-		
-		findInWorkspace.setText(mold.workspaceLabel);
-		getButton().setText(mold.buttonLabel);
-
-		pai.setChildren(new TreeNode[]{filho1, filho2});
-		
-		generateButtonsHandler(mold);
-	}
-
-	private void generateButtonsHandler(FileAndWorkspaceMold mold2) {
-		// If bit IS_DIRECTORY is on, register a directory handler
-		// for both buttons.
-		SelectionAdapter browseSelectionListener;
-		if((mold.bitmask & FileAndWorkspaceMold.DIRECTORY_SELECTION) != 0) {
-			browseSelectionListener = 
-				new DirectoryButtonSelectionListener(path, mold.browseWindowLabel, mold.browseWindowMessage);
-			
-		} else {
-			// Else register a file handler
-			browseSelectionListener = 
-				new FileButtonSelectionListener(path, mold.browseWindowLabel);
-		}
-		getButton().addSelectionListener(browseSelectionListener);
-		
-		///org.eclipse.ui.dialogs.
-		findInWorkspace.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				ElementTreeSelectionDialog treeSelect = new ElementTreeSelectionDialog(getShell(), new LabelProvider(), new TreeNodeContentProvider());
-				//treeSelect.setInput(new TreeNode []{pai});
-				
-				File workspace = new File("/home/richardm/tmp"); //$NON-NLS-1$
-				FilesystemToTreeMapper treeMapper = new FilesystemToTreeMapper();
-				treeSelect.setInput(new TreeNode []{treeMapper.filesystemTreeFactory(workspace)});
-				//treeSelect.se
-				
-				treeSelect.open();
-				
-				TreeNode selNode;
-				if((selNode = (TreeNode)treeSelect.getFirstResult()) != null) {
-					path.setText(selNode.getValue().toString());
-				}
-			}
-		});
-		///findInWorkspace.addSelectionListener(new )
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.cell.ui.swt.GenericControlGroup#createCustomControl(int, org.eclipse.swt.layout.GridData)
-	 */
-	@Override
-	protected Control createCustomControl(int bitmask, GridData gridData) {
-		container = new Composite(this, SWT.NONE);
-		
-		// Set layout
-		GridLayout containerLayout = new GridLayout();
-		containerLayout.marginHeight = 0;
-		containerLayout.marginWidth = 0;
-		containerLayout.horizontalSpacing = 5;
-		containerLayout.verticalSpacing = 0;
-		containerLayout.numColumns = 2;
-		//containerLayout.marginLeft = 0;
-		
-		container.setLayout(containerLayout);
-		
-		// Set grid data
-		gridData.horizontalAlignment = SWT.FILL;
-		
-		// Create griddata for the controls
-		GridData pathGD = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
-		GridData workplaceGD = GridDataFactory.copyData(pathGD);
-		workplaceGD.grabExcessHorizontalSpace = false;
-		
-		// Insert text and button inside the container
-		path = new Text(container, SWT.SINGLE | SWT.BORDER);
-		path.setLayoutData(pathGD);
-		findInWorkspace = new Button(container, SWT.PUSH);
-		findInWorkspace.setLayoutData(workplaceGD);
-		
-		
-		
-		
-		return container;
-	}
-	
-	public void addModifyListener(ModifyListener listener) {
-		path.addModifyListener(listener);
-	}
-	
-	public void removeModifyListener(ModifyListener listener) {
-		path.removeModifyListener(listener);
-	}
-	
-	public void setString(String string) {
-		path.setText(string);
-	}
-	
-	public String getString() {
-		return path.getText();
-	}
-	
-	public Button getWorkspaceButton() {
-		return this.findInWorkspace;
-	}
-	
-	public Button getBrowseButton() {
-		return getButton();
-	}
-
-	@Override
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		
-		path.setEnabled(enabled);
-		findInWorkspace.setEnabled(enabled);
-	}
-	
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceMold.java
deleted file mode 100644
index f1be59e..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileAndWorkspaceMold.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
-
-*****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-/**
- * Component that displays a textbox (which will be used to enter a path)
- * with a button to find the path in the workspace and another to find the
- * path in the filesystem. The path can be a file path or a directory path.
- * 
- * @author Richard Maciel
- *
- */
-public class FileAndWorkspaceMold extends GenericControlMold {
-
-	public static final int DIRECTORY_SELECTION = 1 << index++;
-	
-	String workspaceLabel;
-	
-	String browseWindowLabel;
-	String browseWindowMessage;
-	
-	public FileAndWorkspaceMold(int bitmask, String label, String workspaceLabel, String fileLabel) {
-		super(bitmask | GenericControlMold.HASBUTTON, label);
-		setButtonLabel(fileLabel);
-		this.workspaceLabel = workspaceLabel;
-	}
-
-	public String getBrowseWindowLabel() {
-		return browseWindowLabel;
-	}
-
-	public void setBrowseWindowLabel(String browseWindowLabel) {
-		this.browseWindowLabel = browseWindowLabel;
-	}
-
-	public String getBrowseWindowMessage() {
-		return browseWindowMessage;
-	}
-
-	public void setBrowseWindowMessage(String browseWindowMessage) {
-		this.browseWindowMessage = browseWindowMessage;
-	}
-	
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileButtonSelectionListener.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileButtonSelectionListener.java
deleted file mode 100755
index b1d33d0..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileButtonSelectionListener.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Text;
-
-public class FileButtonSelectionListener extends SelectionAdapter {
-	
-	private Text text;
-	private String title;
-
-	public FileButtonSelectionListener(Text text, String title) {
-		this.text = text;
-		this.title = title;
-	}
-	
-	public void widgetSelected(SelectionEvent e) {
-		super.widgetSelected(e);
-		
-		FileDialog fileDialog = new FileDialog(text.getShell(), SWT.OPEN);
-
-		/*
-		 * Filter path must be set to the directory that contains the file.
-		 */
-		String fileName = text.getText();
-		IPath path = new Path(fileName);
-		fileDialog.setFilterPath(path.removeLastSegments(1).toString());
-		fileDialog.setText(title);
-		fileDialog.setFileName(path.lastSegment());
-				
-		String result = fileDialog.open();
-
-		if (result != null) {
-			text.setText(result);
-		}
-	}
-}
-    
-    
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileGroup.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileGroup.java
deleted file mode 100755
index 86ead3a..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileGroup.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Richard Maciel
- *
- */
-public class FileGroup extends TextGroup {
-
-	public FileGroup(Composite parent, FileMold mold) {
-		super(parent, mold.getTextGroupMold());
-		
-		generateButtonHandler(mold);
-	}
-	
-	protected void generateButtonHandler(FileMold mold) {
-		SelectionListener btnlisten;
-		
-		if((mold.bitmask & FileMold.DIRECTORY_SELECTION) != 0) {
-			btnlisten = new DirectoryButtonSelectionListener(
-				getText(), mold.dialogLabel, mold.dialogMessage);
-		} else {
-			btnlisten = new FileButtonSelectionListener(
-					getText(), mold.dialogLabel);
-		}
-		
-		getButton().addSelectionListener(btnlisten);
-	}
-
-	public String getString() {
-		return text.getText();
-	}
-	
-	public void setString(String s) {
-		if (s != null) {
-			text.setText(s);
-		} else {
-			text.setText(""); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileMold.java
deleted file mode 100755
index 0672b10..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FileMold.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-/**
- * Mold to a {@link FileGroup}. This isn't a derivated class
- * from {@link TextMold} because some of the its fields doesn't make sense
- * for this class.
- * 
- * @author Richard Maciel
- *
- */
-public class FileMold extends GenericControlMold {
-	
-	public static final int DIRECTORY_SELECTION = 
-		1 << index++;
-	
-	protected static final String BUTTON_TEXT = Messages.BrowseButtonText;
-	
-	int bitmask;
-	
-	/*String controlLabel;
-	
-	boolean labelAbove;
-	*/
-	
-	String controlValue;
-	
-	String dialogLabel;
-	String dialogMessage;
-	
-	public FileMold(int bitmask, String label,
-			String dialogLabel, String dialogMessage) {
-		super(bitmask, label);
-		this.bitmask = bitmask;
-		//this.controlLabel = label;
-		//this.controlValue = value;
-		this.dialogLabel = dialogLabel;
-		this.dialogMessage = dialogMessage;
-	}
-
-	public String getControlValue() {
-		return controlValue;
-	}
-
-	public void setControlValue(String controlValue) {
-		this.controlValue = controlValue;
-	}
-
-	public String getDialogLabel() {
-		return dialogLabel;
-	}
-
-	public void setDialogLabel(String dialogLabel) {
-		this.dialogLabel = dialogLabel;
-	}
-
-	public String getDialogMessage() {
-		return dialogMessage;
-	}
-
-	public void setDialogMessage(String dialogMessage) {
-		this.dialogMessage = dialogMessage;
-	}
-	
-	protected TextMold getTextGroupMold() {
-		
-		int bitmask = this.bitmask;
-		
-		// Must have button!
-		bitmask |= HASBUTTON;	
-		
-		TextMold tmold = new TextMold(bitmask, label);
-		tmold.setButtonLabel(BUTTON_TEXT);
-		
-		return tmold;
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemToTreeMapper.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemToTreeMapper.java
deleted file mode 100644
index 560d7d8..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemToTreeMapper.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
-
-*****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * This class receives a top directory and maps all files and subdirectories
- * (recursively) to a tree structure where each node correspond to a file or directory. 
- * 
- * Main use for this method is to generate a tree to be displayed in a 
- * ElementTreeSelectionDialog whose content provider is a TreeNodeContentProvider
- * 
- * 
- * @author Richard Maciel
- *
- */
-public class FilesystemToTreeMapper {
-	public FilesystemTreeNode filesystemTreeFactory(File basedir) {
-		
-		if(!basedir.isDirectory())
-			return null;
-		
-		// Create a node for the basedir
-		FilesystemTreeNode baseNode = new FilesystemTreeNode(basedir);
-		
-		// Sweep the filesystem under basedir
-		baseNode.setChildren(generateFilesystemTree(baseNode));
-		
-		return baseNode;
-	}
-
-	private FilesystemTreeNode[] generateFilesystemTree(FilesystemTreeNode parentNode) {
-		
-		List<FilesystemTreeNode> children = new LinkedList<FilesystemTreeNode>();
-		
-		// List dir entries
-		//File dir = new File(directory.getAbsolutePath());
-		File [] dirChildren = parentNode.getFile().listFiles();
-		
-		// Iterates over all items
-		for(int i=0; i < dirChildren.length; i++) {
-			// TODO: filter here before processing
-			
-			FilesystemTreeNode node = new FilesystemTreeNode(dirChildren[i]);
-			node.setParent(parentNode);
-			if(dirChildren[i].isDirectory()) {
-				// If directory, generate directory information
-				node.setChildren(generateFilesystemTree(node));
-			} else {
-				node.setChildren(null);
-			}
-			children.add(node);
-		}
-		
-		// Transform it into an array
-		FilesystemTreeNode [] temp = new FilesystemTreeNode[children.size()];
-		children.toArray(temp);
-		
-		return temp;
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemTreeNode.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemTreeNode.java
deleted file mode 100644
index 617fe4f..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FilesystemTreeNode.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
-
-*****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import java.io.File;
-
-import org.eclipse.jface.viewers.TreeNode;
-
-/**
- * A node of a filesystem tree structure
- * 
- * @author Richard Maciel
- *
- */
-public class FilesystemTreeNode extends TreeNode {
-	
-	public FilesystemTreeNode(File fileOrDirectory) {
-		super(fileOrDirectory);
-	}
-	
-	/**
-	 * Convenience method to get the path object stored into the tree node.
-	 * 
-	 * @return An IPath object
-	 */
-	public File getFile() {
-		return (File)getValue();
-	}
-	
-	@Override
-	public String toString() {
-		if(value != null) {
-			return getFile().getName();
-		} else {
-			return super.toString();
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Frame.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Frame.java
deleted file mode 100755
index 7aea33d..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Frame.java
+++ /dev/null

@@ -1,512 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * A frame is a customized container for controls with many additional features.
- * The frame may be used simply to group controls, without border or additional facilities. 
- * Or create a multi column layout.
- * It may also be created as a frame with a user-reserved area, a description area and a 
- * hideable user-reserved area. The first one is on the top and the latter is on the bottom. 
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- *
- */
-public class Frame extends Composite {
-	
-	private Composite topUserReservedComposite;
-	private Composite bottomUserReservedComposite;
-	private Composite enclosingControl;
-
-	private Button expandButton;
-	private Label descriptionLabel;
-	private Group enclosingGroup;
-	
-	private boolean isExpandedLayout;
-	
-	// Keep all possible button labels
-	private String expandButtonLabel = "More options";
-	private String shrinkButtonLabel = "Less options";
-	
-	private int  debugBitmask = SWT.None;//SWT.BORDER;
-
-	/**
-	 * Create the full featured frame based on information provided by the mold.
-	 * This is the most complete and most advanced use of the Frame. Used
-	 * typically to create a frame with hideable panel and explanation message.
-	 * <p>
-	 * The frame may have border if corresponding bit is set. The frame has
-	 * margin if border is enabled. The frame has one or more columns.
-	 * 
-	 * @param parent
-	 * @param mold
-	 */
-	public Frame(Composite parent, FrameMold mold) {
-		this(parent, mold.bitmask, mold.columns);
-
-		if (mold.description != null) {
-			setDescription(mold.description);
-		}
-		if (mold.title != null) {
-			setTitle(mold.getTitle());
-		}
-		if ((mold.bitmask & FrameMold.HAS_EXPAND) != 0 && 
-			mold.expandButtonLabel != null) {
-			setExpandButtonLabel(mold.expandButtonLabel);
-		}
-		if ((mold.bitmask & FrameMold.HAS_EXPAND) != 0 &&
-			mold.shrinkButtonLabel != null) {
-			setShrinkButtonLabel(mold.shrinkButtonLabel);
-		}
-	}
-	
-	/**
-	 * Create the full featured frame only based on structural information.
-	 * Intended for classes that extend the frame and provide their own logic
-	 * to configure itself (like its own mold).
-	 * 
-	 * <p>
-	 * The frame may have border if corresponding bit is set. The frame has
-	 * margin if border is enabled. The frame has one or more columns.
-
-	 * @param parent
-	 * @param bitmask
-	 * @param columns
-	 */
-	public Frame(Composite parent, int bitmask, int columns) {
-		super(parent, SWT.NONE);
-		createContent(bitmask, columns);
-	}
-	
-	/**
-	 * Create a frame to group controls logically.
-	 * The frame has no border.
-	 * The frame has no margin.
-	 * The frame as one column.
-	 */
-	public Frame(Composite parent) {
-		this(parent, 0, 1);
-	}
-
-	/**
-	 * Create a frame to group controls logically.
-	 * The frame has no border.
-	 * The frame has no margin.
-	 * The frame as one or more columns.
-	 */
-	public Frame(Composite parent, int columns) {
-		this(parent, 0, columns);
-	}
-
-	/**
-	 * Create a frame to group controls visually.
-	 * The frame has border.
-	 * The frame has margin.
-	 */
-	public Frame(Composite parent, String title) {
-		this(parent, FrameMold.HAS_FRAME, 1);
-		setTitle(title);
-	}
-
-	protected void createContent(int bitmask, int columns) {
-		createEnclosingControl(bitmask);
-		createTopUserComposite(bitmask, columns);
-		createSeparatorComposite(bitmask);
-		createBottomUserComposite(bitmask, columns);
-		
-		changeExpandLayout(false);
-	}
-
-	/**
-	 * Create and setup the Group control that draws the frame with the title.
-	 * Only create the group if necessary. 
-	 */
-	private void createEnclosingControl(int bitmask) {
-		if ((bitmask & FrameMold.HAS_FRAME) != 0) {
-			/*
-			 * Create the group. The FillLayout is used to ensure that
-			 * the Group will stretch over all available space.
-			 */
-			FillLayout fillLayout = new FillLayout();
-			fillLayout.type = SWT.HORIZONTAL;
-			fillLayout.marginHeight = 0;
-			fillLayout.marginWidth = 0;
-			fillLayout.spacing = 0;
-			this.setLayout(fillLayout);
-
-			enclosingGroup = new Group(this, SWT.NONE | debugBitmask);
-			enclosingControl = enclosingGroup;
-		} else  {
-			/*
-			 * If frame is not required, then use the composite itself to hold content.
-			 * This saves ressources by avoinding to create an invisible fake Group.
-			 */
-			enclosingControl = this;
-		}
-		
-		/*
-		 * Set the layout for the enclosing control.
-		 */ 
-		GridLayout enclosingControlLayout = new GridLayout();
-		if ((bitmask & FrameMold.HAS_FRAME) != 0) {
-			enclosingControlLayout.numColumns = 2;
-			enclosingControlLayout.marginHeight = LayoutDefinitions.marginHeight;
-			enclosingControlLayout.marginWidth = LayoutDefinitions.marginWidth;
-			enclosingControlLayout.marginRight = LayoutDefinitions.marginRight;
-			enclosingControlLayout.marginLeft = LayoutDefinitions.marginLeft;
-			enclosingControlLayout.marginBottom = LayoutDefinitions.marginBottom;
-			enclosingControlLayout.marginTop = LayoutDefinitions.marginTop;
-			enclosingControlLayout.horizontalSpacing = LayoutDefinitions.horizontalSpacing;
-			enclosingControlLayout.verticalSpacing = LayoutDefinitions.verticalSpacing;
-		} else {
-			enclosingControlLayout.marginHeight = LayoutDefinitions.marginHeight;
-			enclosingControlLayout.marginWidth = LayoutDefinitions.marginWidth;
-			enclosingControlLayout.marginRight = 0;
-			enclosingControlLayout.marginLeft = 0;
-			enclosingControlLayout.marginBottom = 0;
-			enclosingControlLayout.marginTop = 0;
-			enclosingControlLayout.horizontalSpacing = LayoutDefinitions.horizontalSpacing;
-			enclosingControlLayout.verticalSpacing = LayoutDefinitions.verticalSpacing;
-		}
-		enclosingControl.setLayout(enclosingControlLayout);
-
-		// Make the control fill all available width
-		Composite parent = this.getParent();
-		Layout parentLayout = parent.getLayout();
-		if (parentLayout instanceof GridLayout) {
-			GridData layoutData = (GridData) this.getLayoutData();
-			if (layoutData == null) {
-				layoutData = new GridData();
-			}
-			layoutData.grabExcessHorizontalSpace = true;
-			layoutData.horizontalAlignment = SWT.FILL;
-			this.setLayoutData(layoutData);			
-		}
-	}
-
-	/**
-	 * Create the main composite.
-	 */
-	private void createTopUserComposite(int bitmask, int columns) {
-		/*
-		 * Only create this composite if a description is present or if the frame is expandable.
-		 * Else, use the enclosing group itself to save ressources.
-		 */
-		boolean needComposite = ((bitmask & FrameMold.HAS_DESCRIPTION) != 0) || ((bitmask & FrameMold.HAS_EXPAND) != 0);
-		if (needComposite) {
-			topUserReservedComposite = new Composite(enclosingControl, SWT.NONE | debugBitmask);
-			
-			GridData topUserReservedCompositeLayoutData = new GridData();
-			topUserReservedCompositeLayoutData.horizontalSpan = 2;
-			topUserReservedCompositeLayoutData.grabExcessHorizontalSpace = true;
-			topUserReservedCompositeLayoutData.grabExcessVerticalSpace = false;
-			topUserReservedCompositeLayoutData.horizontalAlignment = SWT.FILL;
-			topUserReservedCompositeLayoutData.verticalAlignment = SWT.FILL;
-			topUserReservedComposite.setLayoutData(topUserReservedCompositeLayoutData);
-			
-			GridLayout userReservedLayout = new GridLayout();
-			userReservedLayout.marginHeight = LayoutDefinitions.marginHeight;
-			userReservedLayout.marginWidth = LayoutDefinitions.marginWidth;
-			userReservedLayout.marginRight = 0;
-			userReservedLayout.marginLeft = 0;
-			userReservedLayout.marginBottom = 0;
-			userReservedLayout.marginTop = 0;
-			userReservedLayout.horizontalSpacing = LayoutDefinitions.horizontalSpacing;
-			userReservedLayout.verticalSpacing = LayoutDefinitions.verticalSpacing;
-			userReservedLayout.numColumns = columns;
-			topUserReservedComposite.setLayout(userReservedLayout);
-		} else {
-			topUserReservedComposite = enclosingControl;
-			GridLayout layout = (GridLayout) enclosingControl.getLayout();
-			layout.numColumns = columns;
-			if ((bitmask & FrameMold.COLUMNS_EQUAL_WIDTH) != 0) {
-				layout.makeColumnsEqualWidth = true;
-			}
-			enclosingControl.setLayout(layout);
-		}
-		
-	}
-	/**
-	 * Generate the expandable composite.
-	 * 
-	 * @param mold
-	 */
-	private void createBottomUserComposite(int bitmask, int columns) {
-		if ((bitmask & FrameMold.HAS_EXPAND) != 0) {
-			/*
-			 * Put the second user-reserved composite.
-			 */
-			bottomUserReservedComposite = new Composite(enclosingControl, SWT.NONE | debugBitmask);
-			GridData bottomUserReservedCompositeLayoutData = new GridData();
-			bottomUserReservedCompositeLayoutData.horizontalSpan = 2;
-			bottomUserReservedCompositeLayoutData.grabExcessHorizontalSpace = true;
-			bottomUserReservedCompositeLayoutData.grabExcessVerticalSpace = false;
-			bottomUserReservedCompositeLayoutData.horizontalAlignment = SWT.FILL;
-			bottomUserReservedCompositeLayoutData.verticalAlignment = SWT.FILL;
-			bottomUserReservedComposite.setLayoutData(bottomUserReservedCompositeLayoutData);
-			
-			/*
-			 * Create a grid layout with ne number of required columns
-			 * Note that when no composite was created, the layout for the enclosing control is overriden.
-			 */
-			GridLayout userReservedLayout = new GridLayout();
-			userReservedLayout.marginHeight = LayoutDefinitions.marginHeight;
-			userReservedLayout.marginWidth = LayoutDefinitions.marginWidth;
-			userReservedLayout.marginRight = 0;
-			userReservedLayout.marginLeft = 0;
-			userReservedLayout.marginBottom = 0;
-			userReservedLayout.marginTop = 0;
-			userReservedLayout.horizontalSpacing = LayoutDefinitions.horizontalSpacing;
-			userReservedLayout.verticalSpacing = LayoutDefinitions.verticalSpacing;
-			userReservedLayout.numColumns = columns;
-			if ((bitmask & FrameMold.COLUMNS_EQUAL_WIDTH) != 0) {
-				userReservedLayout.makeColumnsEqualWidth = true;
-			}
-			bottomUserReservedComposite.setLayout(userReservedLayout);
-		}
-	}
-	
-	/**
-	 * Create the description and the button responsible for showing/hiding the bottom composite. 
-	 */
-	private void createSeparatorComposite(int bitmask) {
-		/*
-		 * Put the description.
-		 */
-		if ((bitmask & FrameMold.HAS_DESCRIPTION) != 0) {
-			descriptionLabel = new Label(enclosingControl, SWT.NONE | SWT.WRAP | debugBitmask);
-			GridData descriptionLabeLayoutData = new GridData();
-			descriptionLabeLayoutData.horizontalSpan = ((bitmask & FrameMold.HAS_EXPAND) != 0 ? 1 : 2);
-			descriptionLabeLayoutData.grabExcessHorizontalSpace = true;
-			descriptionLabeLayoutData.grabExcessVerticalSpace = false;
-			descriptionLabeLayoutData.horizontalAlignment = SWT.FILL;
-			descriptionLabeLayoutData.verticalAlignment = SWT.FILL;
-			descriptionLabel.setLayoutData(descriptionLabeLayoutData);
-		}
-		
-		/*
-		 * Put the expand button.
-		 */
-		if ((bitmask & FrameMold.HAS_EXPAND) != 0) {
-			expandButton = new Button(enclosingControl, SWT.BUTTON1);
-			GridData buttonLayoutData = new GridData();
-			buttonLayoutData.horizontalSpan = ((bitmask & FrameMold.HAS_DESCRIPTION) != 0 ? 1 : 2);
-			buttonLayoutData.grabExcessHorizontalSpace = false;
-			buttonLayoutData.grabExcessVerticalSpace = false;
-			buttonLayoutData.horizontalAlignment = SWT.RIGHT;
-			buttonLayoutData.verticalAlignment = SWT.BOTTOM;
-			expandButton.setLayoutData(buttonLayoutData);
-			expandButton.addSelectionListener(
-				new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						changeExpandLayout( ! isExpandedLayout);
-						adjustShellSizeToFrame();
-					}
-				}
-			);
-		}
-	}
-
-	/**
-	 * Show (or hide) bottom composite according to visible parameter.
-	 * 
-	 * @param visible boolean Defines if the composite will be visible or not.
-	 */
-	private void changeExpandLayout(boolean visible) {
-		if (bottomUserReservedComposite == null) {
-			return;
-		}
-		if (expandButton == null) {
-			return;
-		}
-		
-		isExpandedLayout = visible;
-		
-		GridData bottomUserReservedCompositeLayoutData = (GridData) bottomUserReservedComposite.getLayoutData();
-		
-		if(isExpandedLayout) {
-			// Show it
-			bottomUserReservedCompositeLayoutData.exclude = false;
-			bottomUserReservedComposite.setVisible(true);	
-		} else {
-			// Hide it
-			bottomUserReservedCompositeLayoutData.exclude = true;
-			bottomUserReservedComposite.setVisible(false);
-		}
-		bottomUserReservedComposite.setLayoutData(bottomUserReservedCompositeLayoutData);
-		
-		updateExpandButton();
-	}
-
-	private void updateExpandButton() {
-		if (expandButton == null) {
-			return;
-		}
-		String newLabel = null;
-		if (isExpandedLayout) {
-			newLabel = shrinkButtonLabel;
-		} else {
-			newLabel = expandButtonLabel;
-		}
-		if (newLabel != null) {
-			expandButton.setText(newLabel);
-		} else {
-			expandButton.setText(""); //$NON-NLS-1$
-		}
-	}
-
-	private void adjustShellSizeToFrame() {
-		Point newSize = enclosingControl.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		Point currentSize = enclosingControl.getSize();
-		int deltaY = newSize.y - currentSize.y;
-		Point shellSize = getShell().getSize();
-		shellSize.y += deltaY;
-		getShell().setSize(shellSize);
-		getShell().layout(true, true);
-	}
-
-	/**
-	 * Get a composite control that represents a reserved space to the user add
-	 * his controls. This method returns the top composite control
-	 * 
-	 * @return Composite Composite control.
-	 */
-	public Composite getTopUserReservedComposite() {
-		return topUserReservedComposite;
-	}
-	
-	/**
-	 * Facility getter for {@link #getTopUserReservedComposite()}.
-	 * @return
-	 */
-	public Composite getComposite() {
-		return topUserReservedComposite;
-	}
-	
-	/**
-	 * Get a composite control that represents a reserved space to the user add
-	 * his controls. This method returns the bottom, hideable composite control.
-	 * 
-	 * @return Composite Composite control.
-	 */
-	public Composite getBottomUserReservedComposite() {
-		return bottomUserReservedComposite;
-	}
-
-	public boolean isExpanded() {
-		return isExpandedLayout;
-	}
-	
-	/**
-	 * Set the user-reserved bottom composite visible state 
-	 * 
-	 * @param expanded boolean True if composite will be visible. False, otherwise.
-	 */
-	public void setExpanded(boolean expanded) {
-		changeExpandLayout(expanded);
-		adjustShellSizeToFrame();
-	}
-
-	public String getExpandButtonLabel() {
-		return expandButtonLabel;
-	}
-
-	public void setExpandButtonLabel(String expandButtonLabel) {
-		if (expandButton == null) {
-			throw new IllegalArgumentException(Messages.Frame_NoExpandButton);
-		}
-		this.expandButtonLabel = expandButtonLabel;
-		updateExpandButton();
-	}
-
-	public String getShrinkButtonLabel() {
-		return shrinkButtonLabel;
-	}
-
-	public void setShrinkButtonLabel(String shrinkButtonLabel) {
-		if (expandButton == null) {
-			throw new IllegalArgumentException(Messages.Frame_NoExpandButton);
-		}
-		this.shrinkButtonLabel = shrinkButtonLabel;
-		updateExpandButton();
-	}
-	
-	public String getTitle() {
-		if (enclosingGroup != null) {
-			return enclosingGroup.getText();
-		} else {
-			return null;
-		}
-	}
-
-	public void setTitle(String label) {
-		if (enclosingGroup != null) {
-			enclosingGroup.setText(label);
-		} else {
-			throw new IllegalArgumentException(Messages.Frame_NoEnclosingGroup);
-		}
-	}
-	
-	public String getDescription() {
-		if (descriptionLabel != null) {
-			return descriptionLabel.getText();
-		} else {
-			return null;
-		}
-	}
-
-	public void setDescription(String description) {
-		if (descriptionLabel != null) {
-			descriptionLabel.setText(description);
-		} else {
-			throw new IllegalArgumentException(Messages.Frame_NoDescriptionSet);
-		}
-	}
-	
-	public static void main(String[] args) {
-		Display display = new Display();
-		Shell shell = new Shell(display);
-		FillLayout fillLayout =  new FillLayout();
-		fillLayout.marginHeight = 10;
-		fillLayout.marginWidth = 10;
-		shell.setLayout(fillLayout);
-		
-		FrameMold mold = new FrameMold("Frame 1", true); //$NON-NLS-1$
-//		mold.setDescription("This frame illustrates a frame with some random stuff and a long description.");
-		Frame frame = new Frame(shell, mold);
-		
-		shell.pack(true);
-		shell.open();
-		while (!shell.isDisposed()) {
-			if (!display.readAndDispatch()) {
-				display.sleep();
-			}
-		}
-		display.dispose();
-	}
-}
-

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FrameMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FrameMold.java
deleted file mode 100755
index 2e6f055..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/FrameMold.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-/**
- * @author Richard Maciel
- *
- */
-public class FrameMold {
-	protected static int bitIndex = 0;
-	
-	public static final int HAS_DESCRIPTION = 1 << bitIndex++;
-	public static final int HAS_FRAME = 1 << bitIndex++;
-	public static final int HAS_EXPAND = 1 << bitIndex++;
-	public static final int COLUMNS_EQUAL_WIDTH = 1 << bitIndex++;
-	
-	int bitmask;
-	
-	String title;
-	String description;	
-	int columns;
-	String expandButtonLabel;
-	String shrinkButtonLabel;
-
-	public FrameMold() {
-		this.bitmask = 0;
-		this.columns = 1;
-	}
-	
-	public FrameMold(String title, boolean expandable) {
-		this.bitmask = (expandable ? HAS_EXPAND : 0);
-		this.columns = 1;
-		setTitle(title);
-	}
-	
-	public FrameMold(String title, int columns, boolean expandable) {
-		this.bitmask = (expandable ? HAS_EXPAND : 0);
-		this.columns = columns;
-		setTitle(title);
-	}
-	
-	public FrameMold(String title) {
-		this.bitmask = 0;
-		this.columns = 1;
-		setTitle(title);
-	}
-	
-	public FrameMold(String title, int columns) {
-		this.bitmask = 0;
-		this.columns = columns;
-		setTitle(title);
-	}
-	
-	public FrameMold(int columns) {
-		this.bitmask = 0;
-		this.columns = columns;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-		if (description == null) {
-			bitmask &= ~HAS_DESCRIPTION;
-		} else {
-			bitmask |= HAS_DESCRIPTION; 
-		}
-	}
-	
-	public void addOption(int bitmask) {
-		this.bitmask |= bitmask;
-	}
-	
-	public void removeOption(int bitmask) {
-		this.bitmask &= ~bitmask;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-		if (title != null) {
-			bitmask |= HAS_FRAME; 
-		}
-	}
-
-	public int getColumns() {
-		return columns;
-	}
-
-	public void setColumns(int columns) {
-		this.columns = columns;
-	}
-
-	public String getExpandLabel() {
-		return expandButtonLabel;
-	}
-	
-	public String getShrinkButtonLabel() {
-		return shrinkButtonLabel;
-	}
-	
-	public void setExpandButtonLabel(String expandLabel) {
-		this.expandButtonLabel = expandLabel;
-		this.bitmask |= HAS_EXPAND;
-	}
-	
-	public void setShrinkButtonLabel(String shrinkLabel) {
-		this.shrinkButtonLabel = shrinkLabel;
-		this.bitmask |= HAS_EXPAND;
-	}
-	
-	public void setButtonLabels(String expandLabel, String shrinkLabel) {
-		this.shrinkButtonLabel = shrinkLabel;
-		this.expandButtonLabel = expandLabel;
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlGroup.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlGroup.java
deleted file mode 100755
index a6827e9..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlGroup.java
+++ /dev/null

@@ -1,289 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-
-/**
- * This generic group of controls provides an structure with
- * an optional label and an optional button and provides space
- * for a user-defined control.
- * 
- * @author Richard Maciel
- *
- */
-public abstract class GenericControlGroup extends Composite {
-	Label label;
-	Button button;
-	Control customControl;
-	boolean buttonEnabled = true;
-	
-	public GenericControlGroup(Composite parent, int bitmask, int rows, int chars) {
-		super(parent, SWT.NONE);
-		createContents(bitmask, rows, chars);
-	}
-	
-	public GenericControlGroup(Composite parent, GenericControlMold mold) {
-		super(parent, SWT.NONE);
-		int rows = 0, chars = 0;
-		if (mold.hasHeight()) {
-			rows = mold.getHeight();
-		}
-		if (mold.hasWidth()) {
-			chars = mold.getWidth();
-		}
-		createContents(mold.bitmask, rows, chars);
-		
-		if (mold.label != null) {
-			setLabel(mold.label);
-		}
-		if (mold.buttonLabel != null) {
-			setButtonLabel(mold.buttonLabel);
-		}
-		if (mold.tooltip != null) {
-			setToolTip(mold.tooltip);
-		}
-	}
-	
-	protected void createContents(int bitmask, int rows, int chars) {
-		createLayout(bitmask);
-		createLabel(bitmask);
-
-		// Generate GridData for control
-		GridData gd = new GridData();
-		gd.grabExcessHorizontalSpace = true;
-		gd.horizontalAlignment = SWT.FILL;
-		gd.horizontalSpan = 1;		
-		customControl = createCustomControl(bitmask, gd);
-		if (rows > 0) {
-			gd.heightHint = getControlCharHeight(customControl) * rows;
-		}
-		if (chars > 0) {
-			gd.widthHint = getControlCharWidth(customControl) * chars;
-		}
-		customControl.setLayoutData(gd);
-
-		createButton(bitmask);
-	}
-
-	/**
-	 * Create the layout for the enclosing composite..
-	 * 
-	 * @param mold
-	 * @return Layout
-	 */
-	protected void createLayout(int bitmask) {
-		GridLayout layout = new GridLayout();
-		
-		layout.marginHeight = LayoutDefinitions.marginHeight;
-		layout.marginWidth = LayoutDefinitions.marginWidth;
-		layout.marginRight = 0;
-		layout.marginLeft = 0;
-		layout.marginBottom = 0;
-		layout.marginTop = 0;
-		layout.horizontalSpacing = LayoutDefinitions.horizontalSpacing;
-		layout.verticalSpacing = LayoutDefinitions.verticalSpacing;
-		
-		/*
-		 * Start with one column
-		 */
-		layout.numColumns = 1;
-		
-		/* 
-		 * Add a second column if the label is shown on the left/
-		 */
-		if( ( (bitmask & GenericControlMold.HAS_LABEL) != 0 ) && 
-		    ( (bitmask & GenericControlMold.LABELABOVE) == 0 ) ) {
-				layout.numColumns++;
-		}
-		
-		/*
-		 * Add one more column if the button is shown on the right.
-		 */
-		if( (bitmask & GenericControlMold.HASBUTTON ) != 0 ) {
-			layout.numColumns++;
-		}
-		
-		this.setLayout(layout);
-		
-		/**
-		 * Set layout data if parent has a GridLayout
-		 */
-		if (this.getParent().getLayout() instanceof GridLayout) {
-			if ((bitmask & TextMold.GRID_DATA_ALIGNMENT_FILL) != 0
-					|| (bitmask & TextMold.GRID_DATA_GRAB_EXCESS_SPACE) != 0
-					|| (bitmask & TextMold.GRID_DATA_SPAN) != 0) {
-				GridData gdpp = new GridData();
-				
-				if( (bitmask & GenericControlMold.GRID_DATA_ALIGNMENT_FILL) != 0) {
-					//gdpp.grabExcessHorizontalSpace = true;
-					gdpp.horizontalAlignment = SWT.FILL;
-				}
-				
-				if( (bitmask & GenericControlMold.GRID_DATA_GRAB_EXCESS_SPACE) != 0) {
-					gdpp.grabExcessHorizontalSpace = true;
-					//gdpp.horizontalAlignment = SWT.FILL;
-				}
-				
-				if( (bitmask & GenericControlMold.GRID_DATA_SPAN) != 0) {
-					GridLayout glayout = (GridLayout)this.getParent().getLayout();
-					
-					gdpp.horizontalSpan = glayout.numColumns;
-				}
-				this.setLayoutData(gdpp);
-			}
-		}
-
-	}
-	
-	/**
-	 * Generates a label control on this composite
-	 * 
-	 * @param mold
-	 */
-	protected void createLabel(int bitmask) {
-		if ((bitmask & GenericControlMold.HAS_LABEL) != 0) {
-			label = new Label(this, SWT.NONE);
-		
-			GridData gd = new GridData();
-			gd.horizontalAlignment = SWT.LEFT;
-			gd.verticalAlignment = SWT.CENTER;
-			gd.verticalSpan = 1;
-		
-			if( (bitmask & GenericControlMold.LABELABOVE )
-					!= 0 ) {
-				gd.horizontalSpan = 
-					((GridLayout)this.getLayout()).numColumns;			
-			}
-		
-			label.setLayoutData(gd);
-		}
-	}
-	
-	/**
-	 * User-implemented method to generate a control on this
-	 * composite
-	 * 
-	 * @param mold
-	 */
-	abstract protected Control createCustomControl(int bitmask, GridData gridData);
-	
-	protected void createButton(int bitmask) {
-		// Create Button if desired
-		if( (bitmask & GenericControlMold.HASBUTTON) != 0) {
-			button = new Button(this, SWT.BUTTON1);
-			
-			GridData gd = new GridData();
-			gd.horizontalAlignment = SWT.RIGHT;
-			gd.verticalAlignment = SWT.TOP;
-			gd.verticalSpan = 1;
-			gd.horizontalSpan = 1;
-			button.setLayoutData(gd);
-		}
-	}
-
-	protected int getControlCharWidth(Control control) {
-		GC gc = new GC (control);
-		FontMetrics fm = gc.getFontMetrics ();
-		int width = fm.getAverageCharWidth();
-		gc.dispose();
-		return width;
-	}
-	
-	protected int getControlCharHeight(Control control) {
-		GC gc = new GC (control);
-		FontMetrics fm = gc.getFontMetrics ();
-		int height = fm.getHeight();
-		gc.dispose();
-		return height;
-	}
-	
-	public Button getButton() {
-		return button;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-
-		enableButton();
-		if(label != null) {
-			label.setEnabled(enabled);
-		}
-		customControl.setEnabled(enabled);
-	}
-	
-	public void setButtonEnabled(boolean enabled) {
-		this.buttonEnabled = enabled;
-		enableButton();
-	}
-	
-	private void enableButton() {
-		if(button != null) {
-			button.setEnabled(buttonEnabled && this.getEnabled());
-		}
-	}
-	
-	public String getLabel() {
-		if (label != null) {
-			return label.getText();
-		} else {
-			return null;
-		}
-	}
-
-	public void setLabel(String text) {
-		if (label != null) {
-			label.setText(text);
-		} else {
-			throw new IllegalArgumentException(Messages.GenericControlGroup_NoControlGroupLabel);
-		}
-	}
-
-	public String getButtonLabel() {
-		if (button != null) {
-			return button.getText();
-		} else {
-			return null;
-		}
-	}
-
-	public void setButtonLabel(String text) {
-		if (button != null) {
-			button.setText(text);
-		} else {
-			throw new IllegalArgumentException(Messages.GenericControlGroup_NoControlGroupButton);
-		}
-	}
-
-	public void setToolTip(String text) {
-		this.setToolTipText(text);
-		if (button != null) {
-			button.setToolTipText(text);
-		} 
-		if (label != null) {
-			label.setToolTipText(text);
-		} 
-	}
-	
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlMold.java
deleted file mode 100755
index 15d8916..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/GenericControlMold.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-
-/**
- * @author Richard Maciel
- * 
- */
-public abstract class GenericControlMold {
-	int bitmask;
-
-	/**
-	 * This field is responsible for alloc bitset fields. It will always
-	 * represent the smaller bitset index available. Its name comes from the
-	 * abbr of exponent, because it indicates the n in the exponentiation
-	 * exp(2,n)
-	 */
-	protected static int index = 0;
-
-	public static final int NONE = 0;
-	
-	/** A label is shown above or on the left (default) of the component. */
-	public static final int HAS_LABEL = 1 << index++;
-
-	/** A label is shown above the component. Has effect only when HAS_LABEL is set. */
-	public static final int LABELABOVE = 1 << index++;
-
-	/** A tooltip is shown when the mouse moves over the component. */
-	public static final int HASTOOLTIP = 1 << index++;
-
-//	public static final int EQUALWIDTH = 1 << index++;
-
-	/** A button is shown on the right of the component. */
-	public static final int HASBUTTON = 1 << index++;
-
-	public static final int GRID_DATA_ALIGNMENT_FILL = 1 << index++;
-
-	public static final int GRID_DATA_GRAB_EXCESS_SPACE = 1 << index++;
-
-	public static final int GRID_DATA_SPAN = 1 << index++;
-
-	String label = null;
-
-	String buttonLabel = null;
-
-	String tooltip = null;
-
-	/**
-	 * @param hasLabel
-	 */
-	public GenericControlMold(int bitmask) {
-		this.bitmask = bitmask;
-	}
-
-	public GenericControlMold(int bitmask, String label) {
-		this.bitmask = bitmask;
-		setLabel(label);
-	}
-
-	public int getBitmask() {
-		return bitmask;
-	}
-
-	public void addBitmask(int bitmask) {
-		this.bitmask |= bitmask;
-	}
-
-	public void removeBitmask(int bitmask) {
-		this.bitmask &= ~bitmask;
-	}
-
-//	public void setBitmask(int bitmask) {
-//		this.bitmask = bitmask;
-//	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public void setLabel(String label) {
-		this.label = label;
-		if (label != null) {
-			addBitmask(HAS_LABEL);
-		} else {
-			removeBitmask(HAS_LABEL);
-		}
-	}
-
-	public String getTooltip() {
-		return tooltip;
-	}
-
-	public void setTooltip(String tooltip) {
-		this.tooltip = tooltip;
-		if (tooltip != null) {
-			addBitmask(HASTOOLTIP);
-		} else {
-			removeBitmask(HASTOOLTIP);
-		}
-	}
-
-	public String getButtonLabel() {
-		return buttonLabel;
-	}
-
-	public void setButtonLabel(String buttonLabel) {
-		this.buttonLabel = buttonLabel;
-		if (buttonLabel != null) {
-			addBitmask(HASBUTTON);
-		} else {
-			// not necessary, a button without label is allowed.
-		}
-	}
-
-	protected boolean hasHeight() {
-		return false;
-	}
-	protected boolean hasWidth() {
-		return false;
-	}
-	protected int getHeight() {
-		return 0;
-	}
-	protected int getWidth() {
-		return 0;
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/LayoutDefinitions.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/LayoutDefinitions.java
deleted file mode 100755
index 757cb80..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/LayoutDefinitions.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class LayoutDefinitions {
-	public static final int marginHeight = 0;
-	public static final int marginWidth = 0;
-	public static final int marginRight = 5;
-	public static final int marginLeft = 5;
-	public static final int marginBottom = 5;
-	public static final int marginTop = 5;
-	public static final int horizontalSpacing = 4;
-	public static final int verticalSpacing = 5;	
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Messages.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Messages.java
deleted file mode 100644
index 00e935c..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/Messages.java
+++ /dev/null

@@ -1,33 +0,0 @@
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.utils.ui.swt.messages"; //$NON-NLS-1$
-	public static String AuthenticationFrame_EmptyHostAddressException;
-	public static String AuthenticationFrame_EmptyHostPortException;
-	public static String AuthenticationFrame_EmptyPrivateKeyPathException;
-	public static String AuthenticationFrame_EmptyUsernameException;
-	public static String AuthenticationFrame_FileDoesNotExistException;
-	public static String AuthenticationFrame_FileNotReadableException;
-	public static String AuthenticationFrame_Host;
-	public static String AuthenticationFrame_InvalidCipherTypeException;
-	public static String AuthenticationFrame_PathIsNotFileExcpetion;
-	public static String AuthenticationFrame_PortNumberException;
-	public static String AuthenticationFrame_TimeoutException;
-	public static String BrowseButtonText;
-	public static String Frame_ExpandButtonLabel;
-	public static String Frame_NoDescriptionSet;
-	public static String Frame_NoEnclosingGroup;
-	public static String Frame_NoExpandButton;
-	public static String Frame_ShrinkButtonLable;
-	public static String GenericControlGroup_NoControlGroupButton;
-	public static String GenericControlGroup_NoControlGroupLabel;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SWTUtil.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SWTUtil.java
deleted file mode 100644
index fafb5e6..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SWTUtil.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.ptp.utils.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-public class SWTUtil {
-	/**
-	 * Creates and returns a new push button with the given label and/or image.
-	 * 
-	 * @param parent
-	 *            parent control
-	 * @param label
-	 *            button label or <code>null</code>
-	 * @param image
-	 *            image of <code>null</code>
-	 * 
-	 * @return a new push button
-	 */
-	public static Button createPushButton(Composite parent, String label,
-			Image image) {
-		Button button = new Button(parent, SWT.PUSH);
-		button.setFont(parent.getFont());
-		if (image != null) {
-			button.setImage(image);
-		}
-		if (label != null) {
-			button.setText(label);
-		}
-		GridData gd = new GridData();
-		button.setLayoutData(gd);
-		setButtonDimensionHint(button);
-		return button;
-	}
-
-	/**
-	 * Sets width and height hint for the button control. <b>Note:</b> This is
-	 * a NOP if the button's layout data is not an instance of
-	 * <code>GridData</code>.
-	 * 
-	 * @param the
-	 *            button for which to set the dimension hint
-	 */
-	public static void setButtonDimensionHint(Button button) {
-		Assert.isNotNull(button);
-		Object gd = button.getLayoutData();
-		if (gd instanceof GridData) {
-			((GridData) gd).widthHint = getButtonWidthHint(button);
-			((GridData) gd).horizontalAlignment = GridData.FILL;
-		}
-	}
-
-	/**
-	 * Returns a width hint for a button control.
-	 */
-	public static int getButtonWidthHint(Button button) {
-		button.setFont(JFaceResources.getDialogFont());
-		PixelConverter converter = new PixelConverter(button);
-		int widthHint = converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT,
-				true).x);
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerGroup.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerGroup.java
deleted file mode 100755
index 1df8862..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerGroup.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Spinner;
-
-/**
- * @author Richard Maciel
- *
- */
-public class SpinnerGroup extends GenericControlGroup {
-
-	public static final int MAX_VALUE = Integer.MAX_VALUE;
-	
-	Spinner spinner;
-	
-	/**
-	 * @param parent
-	 * @param mold
-	 */
-	public SpinnerGroup(Composite parent, GenericControlMold mold) {
-		super(parent, mold);
-		SpinnerMold sgm = (SpinnerMold)mold;
-		spinner.setMinimum(sgm.min);
-		spinner.setMaximum(sgm.max);
-		spinner.setIncrement(sgm.increment);
-	}
-
-	protected Control createCustomControl(int bitmask, GridData gridData) {
-		spinner = new Spinner(this, SWT.BORDER);
-		return spinner;
-	}
-
-	/**
-	 * @return the spinner
-	 */
-	public Spinner getSpinner() {
-		return spinner;
-	}
-
-	/**
-	 * @return the control's value
-	 */
-	public int getValue() {
-		return spinner.getSelection();
-	}
-	
-	/**
-	 * Set the control value
-	 */
-	public void setValue(int newValue) {
-		spinner.setSelection(newValue);
-	}
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerMold.java
deleted file mode 100755
index 557a5ca..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/SpinnerMold.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-/**
- * @author Richard Maciel, Daniel Ferber
- *
- */
-public class SpinnerMold extends GenericControlMold {
-
-	int min = 0;
-	int max = 100;
-	int increment = 10;
-	
-	public SpinnerMold(int bitmask, String label, int min, int max, int inc) {
-		super(bitmask, label);
-		this.min = min;
-		this.max = max;
-		increment = inc;		
-	}
-
-	/** Increment. */
-	public int getIncrement() {
-		return increment;
-	}
-
-	/** Increment. */
-	public void setIncrement(int increment) {
-		this.increment = increment;
-	}
-
-	/** Maximum value. */
-	public int getMax() {
-		return max;
-	}
-
-	/** Maximum value. */
-	public void setMax(int max) {
-		this.max = max;
-	}
-
-	/** Minimum value. */
-	public int getMin() {
-		return min;
-	}
-
-	/** Minimum value. */
-	public void setMin(int min) {
-		this.min = min;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextGroup.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextGroup.java
deleted file mode 100755
index 581d5a0..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextGroup.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Richard Maciel, Daniel Ferber
- *
- */
-public class TextGroup extends GenericControlGroup {
-	
-//	public static final int MAX_SIZE = Text.LIMIT;
-	
-	Text text;
-	
-	public TextGroup(Composite parent, TextMold mold) {
-		super(parent, mold);
-		TextMold tmold = (TextMold)mold;
-		if(tmold.value != null)
-			text.setText(tmold.getValue());
-		
-		if((tmold.bitmask & TextMold.LIMIT_SIZE) != 0) {
-			text.setTextLimit(tmold.getTextFieldWidth());
-		}
-
-	}
-
-	protected Control createCustomControl(int bitmask, GridData gd) {
-		if ( (bitmask & TextMold.MULTILINE_TEXT) != 0) {
-			text = new Text(this, SWT.BORDER | SWT.MULTI);	
-		} else if( (bitmask & TextMold.PASSWD_FIELD) != 0) {
-			text = new Text(this, SWT.BORDER | SWT.SINGLE | SWT.PASSWORD);
-		} else {
-			text = new Text(this, SWT.BORDER | SWT.SINGLE);
-		}
-			
-		gd.grabExcessHorizontalSpace = true;
-		if ((bitmask & TextMold.WIDTH_PROPORTIONAL_NUM_CHARS) != 0) {
-			gd.horizontalAlignment = SWT.LEFT;
-		} else {
-			gd.horizontalAlignment = SWT.FILL;
-		}		
-		return text;
-	}
-
-	public Text getText() {
-		return text;
-	}
-
-	public String getString() {
-		return text.getText();
-	}
-	
-	public void setString(String s) {
-		if (s == null) {
-			text.setText(""); //$NON-NLS-1$
-		} else {
-			text.setText(s);
-		}
-	}
-	
-	public void addModifyListener(ModifyListener listener) {
-		text.addModifyListener(listener);
-	}
-
-	public void removeModifyListener(ModifyListener listener) {
-		text.removeModifyListener(listener);
-	}
-
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextMold.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextMold.java
deleted file mode 100755
index 60d35fd..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/TextMold.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Describe a group containing a textbox and associated controls like labels,
- * text descriptions.
- * 
- * @author Richard Maciel, Daniel Ferber
- * 
- */
-public class TextMold extends GenericControlMold {
-
-	public static final int LIMIT_SIZE = 1 << index++;
-
-	public static final int MULTILINE_TEXT = 1 << index++;
-
-	public static final int WIDTH_PROPORTIONAL_NUM_CHARS = 1 << index++;
-
-	public static final int PASSWD_FIELD = 1 << index++;
-
-	int size = -1;
-
-	int numberOfLines = 1;
-
-	String value;
-
-	public TextMold(int bitmask, String label, int size) {
-		super(bitmask, label);
-		setTextFieldWidth(size);
-	}
-
-	public TextMold(int bitmask, String label) {
-		super(bitmask, label);
-	}
-
-	public TextMold(String label) {
-		super(0, label);
-	}
-
-	/** Number of chars (average) shown in the text field. */
-	public int getTextFieldWidth() {
-		return size;
-	}
-
-	/** Number of chars (average) shown in the text field. */
-	public void setTextFieldWidth(int size) {
-		this.size = size;
-		if (size > 0) {
-			addBitmask(WIDTH_PROPORTIONAL_NUM_CHARS);
-			addBitmask(LIMIT_SIZE);
-		} else {
-			removeBitmask(WIDTH_PROPORTIONAL_NUM_CHARS);
-			removeBitmask(LIMIT_SIZE);			
-		}
-	}
-
-	public void unsetTextFieldWidth() {
-		removeBitmask(WIDTH_PROPORTIONAL_NUM_CHARS);
-		removeBitmask(LIMIT_SIZE);
-	}
-
-	/** Initial value. */
-	public String getValue() {
-		return value;
-	}
-
-	/** Initial value. */
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	/** Number of lines shown in the text field. */
-	public int getNumberOfLines() {
-		return numberOfLines;
-	}
-
-	/** Number of lines shown in the text field. */
-	public void setNumberOfLines(int numberOfLines) {
-		if (numberOfLines < 2) {
-			numberOfLines = 1;
-			removeBitmask(MULTILINE_TEXT);
-		} else {
-			this.numberOfLines = numberOfLines;
-			addBitmask(MULTILINE_TEXT);
-		}
-	}
-
-	protected boolean hasHeight() {
-		return (bitmask & TextMold.MULTILINE_TEXT) != 0;
-	}
-
-	protected int getHeight() {
-		return numberOfLines;
-	}
-
-	protected boolean hasWidth() {
-		return (bitmask & TextMold.WIDTH_PROPORTIONAL_NUM_CHARS) != 0;
-	}
-
-	protected int getWidth() {
-		return size;
-	}
-
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ToolKit.java b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ToolKit.java
deleted file mode 100755
index c9e5e45..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/ToolKit.java
+++ /dev/null

@@ -1,346 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.utils.ui.swt;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Set of useful GUI constructing methods.
- * Useful for creating GUI blocks that recur frequently
- * while building form (like Launcher tabs, Dialogs/Wizard tabs).
- * @author Daniel Felix Ferber
- * @since 1.1
- */
-public class ToolKit {
-	
-	/**
-	 * Creates a label and a text box and add them to the parent.
-	 * The label is on the left of the text box.
-	 * The box size fill available space.
-	 * A ":" is automatically added to the label.
-	 * Note: does not create a row for both widgets.
-	 * 
-	 * @param parent Composite that will be added to.
-	 * @param labelString Label for the Text box
-	 * @param valueString Initial value for the TextBox
-	 * @return The text box.
-	 */
-	public static Text createTextWithLabel(
-			Composite parent,
-			String labelString, 
-			String valueString) {
-		return createTextWithLabel(parent, labelString, valueString, 0);
-	}
-
-	public static Text createTextWithLabel(
-			Composite parent,
-			String labelString, 
-			String valueString,
-			int numberOfChars) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(labelString + ":"); //$NON-NLS-1$
-		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
-		if (valueString == null) valueString = ""; //$NON-NLS-1$
-		text.setText(valueString);
-		if (numberOfChars <= 0) {
-			text.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		} else {
-			GC gc = new GC (text);
-			FontMetrics fm = gc.getFontMetrics ();
-			int width = numberOfChars * fm.getAverageCharWidth ();
-			int height = fm.getHeight ();
-			gc.dispose ();
-			GridData layout = new GridData();
-			layout.widthHint = width;
-			layout.minimumWidth = width;
-			text.setLayoutData(layout);
-		}
-		return text;
-	}
-
-	public static Text createPasswordWithLabel(
-			Composite parent,
-			String labelString, 
-			String valueString) {
-		Label label = new Label(parent,SWT.NONE);
-		label.setText(labelString + ":");
-		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.PASSWORD);
-		if (valueString == null) valueString = "";
-		text.setText(valueString);
-		text.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		return text;
-	}
-	
-	/**
-	 * Creates a row containing a label and a text box.
-	 * Adds this row to the parent.
-	 * The label is on the left of the text box.
-	 * The methods is called "Short" because the label on the left
-	 * makes the available space for the text box 'shorter' as if the
-	 * label were on the top of the text box.
-	 * This layout is more space saving that the layout from createTextRow().
-	 * The box size fill available space in the row.
-	 * A ":" is automatically added to the label.
-	 * 
-	 * @param parent Composite that the row will be added to.
-	 * @param labelString Label for the Text box
-	 * @param valueString Initial value for the TextBox
-	 * @return The text box.
-	 */	
-	public static Text createShortTextRow(
-			Composite parent,
-			String labelString, 
-			String valueString) {
-
-		GridLayout rowLayout = new GridLayout();
-		rowLayout.numColumns = 2;
-		rowLayout.marginWidth = 0;
-		rowLayout.marginHeight = 0;
-		Composite row = new Composite(parent, SWT.NONE);
-		row.setLayout(rowLayout);
-		row.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		return createTextWithLabel(row, labelString, valueString);
-	}
-	
-	/**
-	 * Creates a row containing a label and a text box.
-	 * Adds this row to the parent.
-	 * The label is on the left of the text box.
-	 * The methods is called "Short" because the label on the left
-	 * makes the available space for the text box 'shorter' as if the
-	 * label were on the top of the text box.
-	 * The box size fill available space in the row.
-	 * A ":" is automatically added to the label.
-	 * 
-	 * @param parent Composite that the row will be added to.
-	 * @param labelString Label for the Text box
-	 * @param valueString Initial value for the TextBox
-	 * @return The text box.
-	 */
-	public static Text createTextRow(
-			Composite parent,
-			String labelString, 
-			String valueString) {
-		return createTextRow(parent, labelString, valueString, 0);
-	}
-
-	public static Text createTextRow(
-			Composite parent,
-			String labelString, 
-			String valueString,
-			int numRows) {
-		GridLayout rowLayout = new GridLayout();
-		rowLayout.verticalSpacing = 1;
-		rowLayout.marginWidth = 0;
-		rowLayout.marginHeight = 0;
-		Composite row = new Composite(parent, SWT.NONE);
-		row.setLayout(rowLayout);
-		row.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(row, SWT.NONE);
-		label.setText(labelString + ":");
-		
-		Text text = null;
-		if (numRows == 0) {
-			text = new Text(row, SWT.SINGLE | SWT.BORDER);
-			text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		} else {
-			text = new Text(row, SWT.MULTI | SWT.BORDER);
-			GC gc = new GC (text);
-			FontMetrics fm = gc.getFontMetrics ();
-			int height = fm.getHeight () * numRows;
-			gc.dispose ();
-			GridData layout = new GridData(GridData.FILL_HORIZONTAL);
-			layout.heightHint = height;
-			layout.minimumWidth = SWT.DEFAULT;
-			text.setLayoutData(layout);
-		}
-		if (valueString == null) valueString = "";
-		text.setText(valueString);
-
-		return text;
-	}
-	
-	public static Text createFileFieldRow(
-			Composite parent, 
-			String labelString, 
-			String valueString, 
-			String title) {
-		
-		GridLayout rowLayout = new GridLayout();
-		rowLayout.verticalSpacing = 1;
-		rowLayout.marginWidth = 0;
-		rowLayout.marginHeight = 0;
-		Composite row = new Composite(parent, SWT.NONE);
-		row.setLayout(rowLayout);
-		row.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(row, SWT.NONE);
-		label.setText(labelString + ":"); //$NON-NLS-1$
-		
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		Composite item = new Composite(row, SWT.NONE);
-		item.setLayout(layout);
-		item.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Text text = new Text(item, SWT.SINGLE | SWT.BORDER);
-		if (valueString == null) valueString = "";
-		text.setText(valueString);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Button button = new Button(item, SWT.PUSH);
-		button.setText(Messages.BrowseButtonText);
-		button.addSelectionListener(new FileButtonSelectionListener(text, title));
-		
-		return text;
-	}
-	
-	public static Text createDirectoryFieldRow(
-			Composite parent, 
-			String labelString, 
-			String valueString, 
-			String title,
-			String message) {
-		
-		GridLayout rowLayout = new GridLayout();
-		rowLayout.verticalSpacing = 1;
-		rowLayout.marginWidth = 0;
-		rowLayout.marginHeight = 0;
-		Composite row = new Composite(parent, SWT.NONE);
-		row.setLayout(rowLayout);
-		row.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(row, SWT.NONE);
-		label.setText(labelString + ":"); //$NON-NLS-1$
-		
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		Composite item = new Composite(row, SWT.NONE);
-		item.setLayout(layout);
-		item.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Text text = new Text(item, SWT.SINGLE | SWT.BORDER);
-		if (valueString == null) valueString = ""; //$NON-NLS-1$
-		text.setText(valueString);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Button button = new Button(item, SWT.PUSH);
-		button.setText(Messages.BrowseButtonText);
-		button.addSelectionListener(new DirectoryButtonSelectionListener(text, title, message));
-		
-		return text;
-	}
-
-	/**
-	 * Create a group where new rows can be added.
-	 * Group is a box that surrounds other components. The group
-	 * may have a title.
-	 * 
-	 * @param parent Composite that the row will be added to.
-	 * @param title The text shown as title.
-	 * @return
-	 */
-	public static Group createGroup(Composite parent, String title) {
-		return createGroup(parent, title, 1, false);
-	}
-	
-	/**
-	 * Create a group where new rows can be added in more that one column.
-	 * Group is a box that surrounds other components. The group
-	 * may have a title.
-	 * This layout is more space saving that only one row. Useful for
-	 * many check boxes, small text boxes (use createTextWithLabel).
-	 * 
-	 * @param parent Composite that the row will be added to.
-	 * @param title The text shown as title.
-	 * @return
-	 */
-	public static Group createGroup(Composite parent, String title, int columns, boolean equalWidth) {
-		GridLayout groupLayout = new GridLayout();
-		groupLayout.verticalSpacing = 3;
-		groupLayout.horizontalSpacing = 3;
-		groupLayout.numColumns = columns;
-		groupLayout.makeColumnsEqualWidth = equalWidth;
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(title);
-		group.setLayout(groupLayout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		return group;
-	}
-
-	public static List createListBoxRow(
-			Composite parent,
-			String labelString) {
-
-		GridLayout rowLayout = new GridLayout();
-		rowLayout.verticalSpacing = 1;
-		rowLayout.marginWidth = 0;
-		rowLayout.marginHeight = 0;
-		Composite row = new Composite(parent, SWT.NONE);
-		row.setLayout(rowLayout);
-		row.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(row, SWT.NONE);
-		label.setText(labelString + ":"); //$NON-NLS-1$
-		
-		List combo = new List(row, SWT.SINGLE);
-		//combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		return combo;
-	}
-
-	public static Combo createShortDropDownRow(Composite parent, String labelString) {
-		GridLayout rowLayout = new GridLayout();
-		rowLayout.verticalSpacing = 1;
-		rowLayout.marginWidth = 0;
-		rowLayout.marginHeight = 0;
-		rowLayout.numColumns = 2;
-		Composite row = new Composite(parent, SWT.NONE);
-		row.setLayout(rowLayout);
-		row.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(row, SWT.NONE);
-		label.setText(labelString + ":"); //$NON-NLS-1$
-		
-		Combo combo = new Combo(row, SWT.DROP_DOWN | SWT.READ_ONLY);
-		combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		return combo;
-	}
-
-	public static Label createLabelRow(Composite parent, String string) {
-		return createLabelRow(parent, string, 1);
-	}
-
-	public static Label createLabelRow(Composite parent, String string, int colSpan) {
-		Label row = new Label(parent, SWT.NONE);
-		row.setText(string);
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment = GridData.FILL;
-		gridData.horizontalSpan = colSpan;
-		row.setLayoutData(gridData);
-		return row;
-	}	
-}

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/auth_frame_messages.properties b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/auth_frame_messages.properties
deleted file mode 100755
index 634cab3..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/auth_frame_messages.properties
+++ /dev/null

@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-AuthenticationFrameMold_Option_localhost=Localhost
-AuthenticationFrameMold_Option_Remotehost=Remote host
-AuthenticationFrameMold_Button_ShowAdvanced=Show Advanced Options
-AuthenticationFrameMold_Button_HideAdvanced=Hide Advanced Options
-AuthenticationFrameMold_Field_Password=Password:
-AuthenticationFrameMold_Field_User=User:
-AuthenticationFrameMold_Option_PasswordAuthentication=Password based authentication
-AuthenticationFrameMold_Field_Port=Port:
-AuthenticationFrameMold_Field_Host=Host:
-AuthenticationFrameMold_Field_Timeout=Timeout(sec):
-AuthenticationFrameMold_Field_Passphrase=Passphrase:
-AuthenticationFrameMold_Button_PrivateKeyPath=Select
-AuthenticationFrameMold_SelectionWindow_Label_PrivateKeyPath=File with private key
-AuthenticationFrameMold_SelectionWindow_Title_PrivateKeyPath=Select file with private key
-AuthenticationFrameMold_Option_PublicKeyAuth=Public key based authentication
-AuthenticationFrameMold_Combo_CipherType=Cipher type:

diff --git a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/messages.properties b/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/messages.properties
deleted file mode 100644
index e86498e..0000000
--- a/core/org.eclipse.ptp.utils.ui/src/org/eclipse/ptp/utils/ui/swt/messages.properties
+++ /dev/null

@@ -1,29 +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
-###############################################################################
-AuthenticationFrame_Host=Host:
-AuthenticationFrame_EmptyHostAddressException=Host Address cannot be empty
-AuthenticationFrame_EmptyHostPortException=Host Port cannot be empty
-AuthenticationFrame_EmptyUsernameException=Username cannot be empty
-AuthenticationFrame_EmptyPrivateKeyPathException=Private key path cannot be empty
-AuthenticationFrame_FileDoesNotExistException=File doesn't exist
-AuthenticationFrame_PathIsNotFileExcpetion=Path doesn't point to a file
-AuthenticationFrame_FileNotReadableException=File isn't readable
-AuthenticationFrame_TimeoutException=Timeout must be an integer
-AuthenticationFrame_PortNumberException=Port number must be an integer
-AuthenticationFrame_InvalidCipherTypeException=Invalid cipher type
-BrowseButtonText=Browse
-Frame_ExpandButtonLabel=More options
-Frame_ShrinkButtonLable=Less options
-Frame_NoExpandButton=Frame has not expand button to set label
-Frame_NoEnclosingGroup=Frame has not enclosing group to set title
-Frame_NoDescriptionSet=Frame has no description to be set
-GenericControlGroup_NoControlGroupLabel=ControlGroup has not a label
-GenericControlGroup_NoControlGroupButton=ControlGroup has not a button

diff --git a/core/org.eclipse.ptp.utils/.cdtproject b/core/org.eclipse.ptp.utils/.cdtproject
deleted file mode 100644
index 62bd06c..0000000
--- a/core/org.eclipse.ptp.utils/.cdtproject
+++ /dev/null

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<data>
-<item id="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</item>
-<item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</item>
-
-
-</data>
-</cdtproject>

diff --git a/core/org.eclipse.ptp.utils/.cproject b/core/org.eclipse.ptp.utils/.cproject
deleted file mode 100644
index 94ef5a0..0000000
--- a/core/org.eclipse.ptp.utils/.cproject
+++ /dev/null

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="converted.config.379004676">
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</storageModule>
-<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.379004676" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-</extensions>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="all" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>all</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>true</runAllBuilders>
-</target>
-<target name="clean" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>clean</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>true</runAllBuilders>
-</target>
-</buildTargets>
-</storageModule>
-</cconfiguration>
-</storageModule>
-</cproject>

diff --git a/core/org.eclipse.ptp.utils/.cvsignore b/core/org.eclipse.ptp.utils/.cvsignore
deleted file mode 100644
index 7f8f307..0000000
--- a/core/org.eclipse.ptp.utils/.cvsignore
+++ /dev/null

@@ -1,14 +0,0 @@
-.deps
-stamp-h1
-libtool
-config.status
-Makefile
-config.h
-autom4te.cache
-*.a
-bitset_test
-.libs
-.gdb_history
-args_test
-rangeset_test
-a.out.dSYM

diff --git a/core/org.eclipse.ptp.utils/.project b/core/org.eclipse.ptp.utils/.project
deleted file mode 100644
index 10f9c7a..0000000
--- a/core/org.eclipse.ptp.utils/.project
+++ /dev/null

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.utils</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.makeBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.core.errorOutputParser</key>
-					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.environment</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.inc</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.location</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.command</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.clean</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.full</key>
-					<value>clean all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.auto</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>false</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</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.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.make.core.makeNature</nature>
-		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/core/org.eclipse.ptp.utils/.settings/org.eclipse.cdt.core.prefs b/core/org.eclipse.ptp.utils/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index 67e7e91..0000000
--- a/core/org.eclipse.ptp.utils/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Tue May 01 12:59:12 MDT 2007
-eclipse.preferences.version=1
-indexer/indexerId=org.eclipse.cdt.core.domsourceindexer
-indexerId=org.eclipse.cdt.core.domsourceindexer

diff --git a/core/org.eclipse.ptp.utils/AUTHORS b/core/org.eclipse.ptp.utils/AUTHORS
deleted file mode 100644
index e5cbfbc..0000000
--- a/core/org.eclipse.ptp.utils/AUTHORS
+++ /dev/null

@@ -1 +0,0 @@
-Greg Watson <g.watson@computer.org>
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.utils/COPYING b/core/org.eclipse.ptp.utils/COPYING
deleted file mode 100644
index 8b7e105..0000000
--- a/core/org.eclipse.ptp.utils/COPYING
+++ /dev/null

@@ -1,16 +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
\ No newline at end of file

diff --git a/core/org.eclipse.ptp.utils/ChangeLog b/core/org.eclipse.ptp.utils/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/core/org.eclipse.ptp.utils/ChangeLog
+++ /dev/null


diff --git a/core/org.eclipse.ptp.utils/INSTALL b/core/org.eclipse.ptp.utils/INSTALL
deleted file mode 100644
index e69de29..0000000
--- a/core/org.eclipse.ptp.utils/INSTALL
+++ /dev/null


diff --git a/core/org.eclipse.ptp.utils/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.utils/META-INF/MANIFEST.MF
deleted file mode 100644
index 33e1c94..0000000
--- a/core/org.eclipse.ptp.utils/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.utils
-Bundle-Version: 2.1.4.qualifier
-Bundle-Vendor: %pluginProvider

diff --git a/core/org.eclipse.ptp.utils/Makefile.am b/core/org.eclipse.ptp.utils/Makefile.am
deleted file mode 100644
index a800cf8..0000000
--- a/core/org.eclipse.ptp.utils/Makefile.am
+++ /dev/null

@@ -1,30 +0,0 @@
-noinst_LIBRARIES =		libutils.a
-noinst_PROGRAMS =		bitset_test \
-						args_test \
-						rangeset_test
-
-libutils_a_SOURCES =	src/bitset.c \
-						src/args.c \
-						src/list.c \
-						src/hash.c \
-						src/handler.c \
-						src/compat.c \
-						src/rangeset.c \
-						src/serdes.c
-						
-libutils_a_CFLAGS =		-I./include $(AM_CFLAGS) -g 
-
-bitset_test_SOURCES =	src/bitset_test.c
-bitset_test_CFLAGS =	-I./include $(AM_CFLAGS) -g
-bitset_test_LDFLAGS =	-g
-bitset_test_LDADD =		libutils.a
-
-args_test_SOURCES =		src/args_test.c
-args_test_CFLAGS =		-I./include $(AM_CFLAGS) -g
-args_test_LDFLAGS =		-g
-args_test_LDADD =		libutils.a
-
-rangeset_test_SOURCES =	src/rangeset_test.c
-rangeset_test_CFLAGS =	-I./include $(AM_CFLAGS) -g
-rangeset_test_LDFLAGS =	-g
-rangeset_test_LDADD =	libutils.a

diff --git a/core/org.eclipse.ptp.utils/Makefile.in b/core/org.eclipse.ptp.utils/Makefile.in
deleted file mode 100644
index 785b3ac..0000000
--- a/core/org.eclipse.ptp.utils/Makefile.in
+++ /dev/null

@@ -1,754 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-noinst_PROGRAMS = bitset_test$(EXEEXT) args_test$(EXEEXT) \
-	rangeset_test$(EXEEXT)
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libutils_a_AR = $(AR) $(ARFLAGS)
-libutils_a_LIBADD =
-am_libutils_a_OBJECTS = libutils_a-bitset.$(OBJEXT) \
-	libutils_a-args.$(OBJEXT) libutils_a-list.$(OBJEXT) \
-	libutils_a-hash.$(OBJEXT) libutils_a-handler.$(OBJEXT) \
-	libutils_a-compat.$(OBJEXT) libutils_a-rangeset.$(OBJEXT) \
-	libutils_a-serdes.$(OBJEXT)
-libutils_a_OBJECTS = $(am_libutils_a_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
-am_args_test_OBJECTS = args_test-args_test.$(OBJEXT)
-args_test_OBJECTS = $(am_args_test_OBJECTS)
-args_test_DEPENDENCIES = libutils.a
-args_test_LINK = $(CCLD) $(args_test_CFLAGS) $(CFLAGS) \
-	$(args_test_LDFLAGS) $(LDFLAGS) -o $@
-am_bitset_test_OBJECTS = bitset_test-bitset_test.$(OBJEXT)
-bitset_test_OBJECTS = $(am_bitset_test_OBJECTS)
-bitset_test_DEPENDENCIES = libutils.a
-bitset_test_LINK = $(CCLD) $(bitset_test_CFLAGS) $(CFLAGS) \
-	$(bitset_test_LDFLAGS) $(LDFLAGS) -o $@
-am_rangeset_test_OBJECTS = rangeset_test-rangeset_test.$(OBJEXT)
-rangeset_test_OBJECTS = $(am_rangeset_test_OBJECTS)
-rangeset_test_DEPENDENCIES = libutils.a
-rangeset_test_LINK = $(CCLD) $(rangeset_test_CFLAGS) $(CFLAGS) \
-	$(rangeset_test_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libutils_a_SOURCES) $(args_test_SOURCES) \
-	$(bitset_test_SOURCES) $(rangeset_test_SOURCES)
-DIST_SOURCES = $(libutils_a_SOURCES) $(args_test_SOURCES) \
-	$(bitset_test_SOURCES) $(rangeset_test_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LIBRARIES = libutils.a
-libutils_a_SOURCES = src/bitset.c \
-						src/args.c \
-						src/list.c \
-						src/hash.c \
-						src/handler.c \
-						src/compat.c \
-						src/rangeset.c \
-						src/serdes.c
-
-libutils_a_CFLAGS = -I./include $(AM_CFLAGS) -g 
-bitset_test_SOURCES = src/bitset_test.c
-bitset_test_CFLAGS = -I./include $(AM_CFLAGS) -g
-bitset_test_LDFLAGS = -g
-bitset_test_LDADD = libutils.a
-args_test_SOURCES = src/args_test.c
-args_test_CFLAGS = -I./include $(AM_CFLAGS) -g
-args_test_LDFLAGS = -g
-args_test_LDADD = libutils.a
-rangeset_test_SOURCES = src/rangeset_test.c
-rangeset_test_CFLAGS = -I./include $(AM_CFLAGS) -g
-rangeset_test_LDFLAGS = -g
-rangeset_test_LDADD = libutils.a
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libutils.a: $(libutils_a_OBJECTS) $(libutils_a_DEPENDENCIES) 
-	-rm -f libutils.a
-	$(libutils_a_AR) libutils.a $(libutils_a_OBJECTS) $(libutils_a_LIBADD)
-	$(RANLIB) libutils.a
-
-clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-args_test$(EXEEXT): $(args_test_OBJECTS) $(args_test_DEPENDENCIES) 
-	@rm -f args_test$(EXEEXT)
-	$(args_test_LINK) $(args_test_OBJECTS) $(args_test_LDADD) $(LIBS)
-bitset_test$(EXEEXT): $(bitset_test_OBJECTS) $(bitset_test_DEPENDENCIES) 
-	@rm -f bitset_test$(EXEEXT)
-	$(bitset_test_LINK) $(bitset_test_OBJECTS) $(bitset_test_LDADD) $(LIBS)
-rangeset_test$(EXEEXT): $(rangeset_test_OBJECTS) $(rangeset_test_DEPENDENCIES) 
-	@rm -f rangeset_test$(EXEEXT)
-	$(rangeset_test_LINK) $(rangeset_test_OBJECTS) $(rangeset_test_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/args_test-args_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitset_test-bitset_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-args.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-bitset.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-compat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-handler.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-hash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-rangeset.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libutils_a-serdes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rangeset_test-rangeset_test.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-libutils_a-bitset.o: src/bitset.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-bitset.o -MD -MP -MF $(DEPDIR)/libutils_a-bitset.Tpo -c -o libutils_a-bitset.o `test -f 'src/bitset.c' || echo '$(srcdir)/'`src/bitset.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-bitset.Tpo $(DEPDIR)/libutils_a-bitset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/bitset.c' object='libutils_a-bitset.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-bitset.o `test -f 'src/bitset.c' || echo '$(srcdir)/'`src/bitset.c
-
-libutils_a-bitset.obj: src/bitset.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-bitset.obj -MD -MP -MF $(DEPDIR)/libutils_a-bitset.Tpo -c -o libutils_a-bitset.obj `if test -f 'src/bitset.c'; then $(CYGPATH_W) 'src/bitset.c'; else $(CYGPATH_W) '$(srcdir)/src/bitset.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-bitset.Tpo $(DEPDIR)/libutils_a-bitset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/bitset.c' object='libutils_a-bitset.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-bitset.obj `if test -f 'src/bitset.c'; then $(CYGPATH_W) 'src/bitset.c'; else $(CYGPATH_W) '$(srcdir)/src/bitset.c'; fi`
-
-libutils_a-args.o: src/args.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-args.o -MD -MP -MF $(DEPDIR)/libutils_a-args.Tpo -c -o libutils_a-args.o `test -f 'src/args.c' || echo '$(srcdir)/'`src/args.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-args.Tpo $(DEPDIR)/libutils_a-args.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/args.c' object='libutils_a-args.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-args.o `test -f 'src/args.c' || echo '$(srcdir)/'`src/args.c
-
-libutils_a-args.obj: src/args.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-args.obj -MD -MP -MF $(DEPDIR)/libutils_a-args.Tpo -c -o libutils_a-args.obj `if test -f 'src/args.c'; then $(CYGPATH_W) 'src/args.c'; else $(CYGPATH_W) '$(srcdir)/src/args.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-args.Tpo $(DEPDIR)/libutils_a-args.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/args.c' object='libutils_a-args.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-args.obj `if test -f 'src/args.c'; then $(CYGPATH_W) 'src/args.c'; else $(CYGPATH_W) '$(srcdir)/src/args.c'; fi`
-
-libutils_a-list.o: src/list.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-list.o -MD -MP -MF $(DEPDIR)/libutils_a-list.Tpo -c -o libutils_a-list.o `test -f 'src/list.c' || echo '$(srcdir)/'`src/list.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-list.Tpo $(DEPDIR)/libutils_a-list.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/list.c' object='libutils_a-list.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-list.o `test -f 'src/list.c' || echo '$(srcdir)/'`src/list.c
-
-libutils_a-list.obj: src/list.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-list.obj -MD -MP -MF $(DEPDIR)/libutils_a-list.Tpo -c -o libutils_a-list.obj `if test -f 'src/list.c'; then $(CYGPATH_W) 'src/list.c'; else $(CYGPATH_W) '$(srcdir)/src/list.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-list.Tpo $(DEPDIR)/libutils_a-list.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/list.c' object='libutils_a-list.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-list.obj `if test -f 'src/list.c'; then $(CYGPATH_W) 'src/list.c'; else $(CYGPATH_W) '$(srcdir)/src/list.c'; fi`
-
-libutils_a-hash.o: src/hash.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-hash.o -MD -MP -MF $(DEPDIR)/libutils_a-hash.Tpo -c -o libutils_a-hash.o `test -f 'src/hash.c' || echo '$(srcdir)/'`src/hash.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-hash.Tpo $(DEPDIR)/libutils_a-hash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/hash.c' object='libutils_a-hash.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-hash.o `test -f 'src/hash.c' || echo '$(srcdir)/'`src/hash.c
-
-libutils_a-hash.obj: src/hash.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-hash.obj -MD -MP -MF $(DEPDIR)/libutils_a-hash.Tpo -c -o libutils_a-hash.obj `if test -f 'src/hash.c'; then $(CYGPATH_W) 'src/hash.c'; else $(CYGPATH_W) '$(srcdir)/src/hash.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-hash.Tpo $(DEPDIR)/libutils_a-hash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/hash.c' object='libutils_a-hash.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-hash.obj `if test -f 'src/hash.c'; then $(CYGPATH_W) 'src/hash.c'; else $(CYGPATH_W) '$(srcdir)/src/hash.c'; fi`
-
-libutils_a-handler.o: src/handler.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-handler.o -MD -MP -MF $(DEPDIR)/libutils_a-handler.Tpo -c -o libutils_a-handler.o `test -f 'src/handler.c' || echo '$(srcdir)/'`src/handler.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-handler.Tpo $(DEPDIR)/libutils_a-handler.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/handler.c' object='libutils_a-handler.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-handler.o `test -f 'src/handler.c' || echo '$(srcdir)/'`src/handler.c
-
-libutils_a-handler.obj: src/handler.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-handler.obj -MD -MP -MF $(DEPDIR)/libutils_a-handler.Tpo -c -o libutils_a-handler.obj `if test -f 'src/handler.c'; then $(CYGPATH_W) 'src/handler.c'; else $(CYGPATH_W) '$(srcdir)/src/handler.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-handler.Tpo $(DEPDIR)/libutils_a-handler.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/handler.c' object='libutils_a-handler.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-handler.obj `if test -f 'src/handler.c'; then $(CYGPATH_W) 'src/handler.c'; else $(CYGPATH_W) '$(srcdir)/src/handler.c'; fi`
-
-libutils_a-compat.o: src/compat.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-compat.o -MD -MP -MF $(DEPDIR)/libutils_a-compat.Tpo -c -o libutils_a-compat.o `test -f 'src/compat.c' || echo '$(srcdir)/'`src/compat.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-compat.Tpo $(DEPDIR)/libutils_a-compat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/compat.c' object='libutils_a-compat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-compat.o `test -f 'src/compat.c' || echo '$(srcdir)/'`src/compat.c
-
-libutils_a-compat.obj: src/compat.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-compat.obj -MD -MP -MF $(DEPDIR)/libutils_a-compat.Tpo -c -o libutils_a-compat.obj `if test -f 'src/compat.c'; then $(CYGPATH_W) 'src/compat.c'; else $(CYGPATH_W) '$(srcdir)/src/compat.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-compat.Tpo $(DEPDIR)/libutils_a-compat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/compat.c' object='libutils_a-compat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-compat.obj `if test -f 'src/compat.c'; then $(CYGPATH_W) 'src/compat.c'; else $(CYGPATH_W) '$(srcdir)/src/compat.c'; fi`
-
-libutils_a-rangeset.o: src/rangeset.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-rangeset.o -MD -MP -MF $(DEPDIR)/libutils_a-rangeset.Tpo -c -o libutils_a-rangeset.o `test -f 'src/rangeset.c' || echo '$(srcdir)/'`src/rangeset.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-rangeset.Tpo $(DEPDIR)/libutils_a-rangeset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rangeset.c' object='libutils_a-rangeset.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-rangeset.o `test -f 'src/rangeset.c' || echo '$(srcdir)/'`src/rangeset.c
-
-libutils_a-rangeset.obj: src/rangeset.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-rangeset.obj -MD -MP -MF $(DEPDIR)/libutils_a-rangeset.Tpo -c -o libutils_a-rangeset.obj `if test -f 'src/rangeset.c'; then $(CYGPATH_W) 'src/rangeset.c'; else $(CYGPATH_W) '$(srcdir)/src/rangeset.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-rangeset.Tpo $(DEPDIR)/libutils_a-rangeset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rangeset.c' object='libutils_a-rangeset.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-rangeset.obj `if test -f 'src/rangeset.c'; then $(CYGPATH_W) 'src/rangeset.c'; else $(CYGPATH_W) '$(srcdir)/src/rangeset.c'; fi`
-
-libutils_a-serdes.o: src/serdes.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-serdes.o -MD -MP -MF $(DEPDIR)/libutils_a-serdes.Tpo -c -o libutils_a-serdes.o `test -f 'src/serdes.c' || echo '$(srcdir)/'`src/serdes.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-serdes.Tpo $(DEPDIR)/libutils_a-serdes.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/serdes.c' object='libutils_a-serdes.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-serdes.o `test -f 'src/serdes.c' || echo '$(srcdir)/'`src/serdes.c
-
-libutils_a-serdes.obj: src/serdes.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -MT libutils_a-serdes.obj -MD -MP -MF $(DEPDIR)/libutils_a-serdes.Tpo -c -o libutils_a-serdes.obj `if test -f 'src/serdes.c'; then $(CYGPATH_W) 'src/serdes.c'; else $(CYGPATH_W) '$(srcdir)/src/serdes.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libutils_a-serdes.Tpo $(DEPDIR)/libutils_a-serdes.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/serdes.c' object='libutils_a-serdes.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libutils_a_CFLAGS) $(CFLAGS) -c -o libutils_a-serdes.obj `if test -f 'src/serdes.c'; then $(CYGPATH_W) 'src/serdes.c'; else $(CYGPATH_W) '$(srcdir)/src/serdes.c'; fi`
-
-args_test-args_test.o: src/args_test.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(args_test_CFLAGS) $(CFLAGS) -MT args_test-args_test.o -MD -MP -MF $(DEPDIR)/args_test-args_test.Tpo -c -o args_test-args_test.o `test -f 'src/args_test.c' || echo '$(srcdir)/'`src/args_test.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/args_test-args_test.Tpo $(DEPDIR)/args_test-args_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/args_test.c' object='args_test-args_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(args_test_CFLAGS) $(CFLAGS) -c -o args_test-args_test.o `test -f 'src/args_test.c' || echo '$(srcdir)/'`src/args_test.c
-
-args_test-args_test.obj: src/args_test.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(args_test_CFLAGS) $(CFLAGS) -MT args_test-args_test.obj -MD -MP -MF $(DEPDIR)/args_test-args_test.Tpo -c -o args_test-args_test.obj `if test -f 'src/args_test.c'; then $(CYGPATH_W) 'src/args_test.c'; else $(CYGPATH_W) '$(srcdir)/src/args_test.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/args_test-args_test.Tpo $(DEPDIR)/args_test-args_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/args_test.c' object='args_test-args_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(args_test_CFLAGS) $(CFLAGS) -c -o args_test-args_test.obj `if test -f 'src/args_test.c'; then $(CYGPATH_W) 'src/args_test.c'; else $(CYGPATH_W) '$(srcdir)/src/args_test.c'; fi`
-
-bitset_test-bitset_test.o: src/bitset_test.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitset_test_CFLAGS) $(CFLAGS) -MT bitset_test-bitset_test.o -MD -MP -MF $(DEPDIR)/bitset_test-bitset_test.Tpo -c -o bitset_test-bitset_test.o `test -f 'src/bitset_test.c' || echo '$(srcdir)/'`src/bitset_test.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/bitset_test-bitset_test.Tpo $(DEPDIR)/bitset_test-bitset_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/bitset_test.c' object='bitset_test-bitset_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitset_test_CFLAGS) $(CFLAGS) -c -o bitset_test-bitset_test.o `test -f 'src/bitset_test.c' || echo '$(srcdir)/'`src/bitset_test.c
-
-bitset_test-bitset_test.obj: src/bitset_test.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitset_test_CFLAGS) $(CFLAGS) -MT bitset_test-bitset_test.obj -MD -MP -MF $(DEPDIR)/bitset_test-bitset_test.Tpo -c -o bitset_test-bitset_test.obj `if test -f 'src/bitset_test.c'; then $(CYGPATH_W) 'src/bitset_test.c'; else $(CYGPATH_W) '$(srcdir)/src/bitset_test.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/bitset_test-bitset_test.Tpo $(DEPDIR)/bitset_test-bitset_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/bitset_test.c' object='bitset_test-bitset_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bitset_test_CFLAGS) $(CFLAGS) -c -o bitset_test-bitset_test.obj `if test -f 'src/bitset_test.c'; then $(CYGPATH_W) 'src/bitset_test.c'; else $(CYGPATH_W) '$(srcdir)/src/bitset_test.c'; fi`
-
-rangeset_test-rangeset_test.o: src/rangeset_test.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rangeset_test_CFLAGS) $(CFLAGS) -MT rangeset_test-rangeset_test.o -MD -MP -MF $(DEPDIR)/rangeset_test-rangeset_test.Tpo -c -o rangeset_test-rangeset_test.o `test -f 'src/rangeset_test.c' || echo '$(srcdir)/'`src/rangeset_test.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/rangeset_test-rangeset_test.Tpo $(DEPDIR)/rangeset_test-rangeset_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rangeset_test.c' object='rangeset_test-rangeset_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rangeset_test_CFLAGS) $(CFLAGS) -c -o rangeset_test-rangeset_test.o `test -f 'src/rangeset_test.c' || echo '$(srcdir)/'`src/rangeset_test.c
-
-rangeset_test-rangeset_test.obj: src/rangeset_test.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rangeset_test_CFLAGS) $(CFLAGS) -MT rangeset_test-rangeset_test.obj -MD -MP -MF $(DEPDIR)/rangeset_test-rangeset_test.Tpo -c -o rangeset_test-rangeset_test.obj `if test -f 'src/rangeset_test.c'; then $(CYGPATH_W) 'src/rangeset_test.c'; else $(CYGPATH_W) '$(srcdir)/src/rangeset_test.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/rangeset_test-rangeset_test.Tpo $(DEPDIR)/rangeset_test-rangeset_test.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/rangeset_test.c' object='rangeset_test-rangeset_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rangeset_test_CFLAGS) $(CFLAGS) -c -o rangeset_test-rangeset_test.obj `if test -f 'src/rangeset_test.c'; then $(CYGPATH_W) 'src/rangeset_test.c'; else $(CYGPATH_W) '$(srcdir)/src/rangeset_test.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) config.h
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
-	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
-	dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

diff --git a/core/org.eclipse.ptp.utils/NEWS b/core/org.eclipse.ptp.utils/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/core/org.eclipse.ptp.utils/NEWS
+++ /dev/null


diff --git a/core/org.eclipse.ptp.utils/README b/core/org.eclipse.ptp.utils/README
deleted file mode 100644
index e69de29..0000000
--- a/core/org.eclipse.ptp.utils/README
+++ /dev/null


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

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

diff --git a/core/org.eclipse.ptp.utils/aclocal.m4 b/core/org.eclipse.ptp.utils/aclocal.m4
deleted file mode 100644
index b6d1f15..0000000
--- a/core/org.eclipse.ptp.utils/aclocal.m4
+++ /dev/null

@@ -1,896 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
-
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

diff --git a/core/org.eclipse.ptp.utils/build.properties b/core/org.eclipse.ptp.utils/build.properties
deleted file mode 100644
index 21a22c7..0000000
--- a/core/org.eclipse.ptp.utils/build.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-bin.includes = AUTHORS,\
-               COPYING,\
-               ChangeLog,\
-               INSTALL,\
-               Makefile.am,\
-               Makefile.in,\
-               NEWS,\
-               README,\
-               about.html,\
-               aclocal.m4,\
-               compile,\
-               config.guess,\
-               config.h.in,\
-               config.status,\
-               config.sub,\
-               configure,\
-               configure.in,\
-               depcomp,\
-               include/,\
-               install-sh,\
-               libtool,\
-               ltmain.sh,\
-               missing,\
-               src/,\
-               META-INF/

diff --git a/core/org.eclipse.ptp.utils/compile b/core/org.eclipse.ptp.utils/compile
deleted file mode 100755
index a81e000..0000000
--- a/core/org.eclipse.ptp.utils/compile
+++ /dev/null

@@ -1,136 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-	*.o | *.obj)
-	  ;;
-	*)
-	  args="$args -o $ofile"
-	  ofile=
-	  ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/core/org.eclipse.ptp.utils/config.guess b/core/org.eclipse.ptp.utils/config.guess
deleted file mode 100755
index f4f7772..0000000
--- a/core/org.eclipse.ptp.utils/config.guess
+++ /dev/null

@@ -1,1321 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-04'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
-		fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-	CPU=mipsel 
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif 
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-		echo i386-${UNAME_MACHINE}-nto-qnx
-	else
-		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	fi
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/core/org.eclipse.ptp.utils/config.h.in b/core/org.eclipse.ptp.utils/config.h.in
deleted file mode 100644
index 99abdc3..0000000
--- a/core/org.eclipse.ptp.utils/config.h.in
+++ /dev/null

@@ -1,28 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the `asprintf' function. */
-#undef HAVE_ASPRINTF
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Version number of package */
-#undef VERSION

diff --git a/core/org.eclipse.ptp.utils/config.sub b/core/org.eclipse.ptp.utils/config.sub
deleted file mode 100755
index f365797..0000000
--- a/core/org.eclipse.ptp.utils/config.sub
+++ /dev/null

@@ -1,1443 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-07'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 | mipsisa64 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-        sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/core/org.eclipse.ptp.utils/configure b/core/org.eclipse.ptp.utils/configure
deleted file mode 100755
index a6c192c..0000000
--- a/core/org.eclipse.ptp.utils/configure
+++ /dev/null

@@ -1,5077 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for org.eclipse.ptp.utils 2.1.4.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='org.eclipse.ptp.utils'
-PACKAGE_TARNAME='org-eclipse-ptp-utils'
-PACKAGE_VERSION='2.1.4'
-PACKAGE_STRING='org.eclipse.ptp.utils 2.1.4'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="src/args.c"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures org.eclipse.ptp.utils 2.1.4 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/org-eclipse-ptp-utils]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of org.eclipse.ptp.utils 2.1.4:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-org.eclipse.ptp.utils configure 2.1.4
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by org.eclipse.ptp.utils $as_me 2.1.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='org-eclipse-ptp-utils'
- VERSION='2.1.4'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-	CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-	CFLAGS="$CFLAGS -Wall"
-fi
-
-
-
-for ac_func in asprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by org.eclipse.ptp.utils $as_me 2.1.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-org.eclipse.ptp.utils config.status 2.1.4
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-

diff --git a/core/org.eclipse.ptp.utils/configure.in b/core/org.eclipse.ptp.utils/configure.in
deleted file mode 100644
index df70a3e..0000000
--- a/core/org.eclipse.ptp.utils/configure.in
+++ /dev/null

@@ -1,37 +0,0 @@
-dnl
-dnl
-
-AC_PREREQ(2.50)
-
-AC_INIT(org.eclipse.ptp.utils, 2.1.4)
-AC_CONFIG_SRCDIR(src/args.c)
-AC_CONFIG_HEADERS(config.h)
-
-AM_INIT_AUTOMAKE
-
-AC_CANONICAL_BUILD
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-	CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-	CFLAGS="$CFLAGS -Wall"
-fi
-
-dnl
-dnl Check for asprintf
-dnl
-AC_CHECK_FUNCS(asprintf)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

diff --git a/core/org.eclipse.ptp.utils/depcomp b/core/org.eclipse.ptp.utils/depcomp
deleted file mode 100755
index 11e2d3b..0000000
--- a/core/org.eclipse.ptp.utils/depcomp
+++ /dev/null

@@ -1,522 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2004-05-31.23
-
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit 0
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/core/org.eclipse.ptp.utils/include/args.h b/core/org.eclipse.ptp.utils/include/args.h
deleted file mode 100644
index 6485b06..0000000
--- a/core/org.eclipse.ptp.utils/include/args.h
+++ /dev/null

@@ -1,32 +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
- ******************************************************************************/
-
-#ifndef _ARGS_H_
-#define _ARGS_H_
-
-extern char **	StrToArgs(char *);
-extern char **	NewArgs(char *, ...);
-extern char **	AppendArgv(char **, char **);
-extern char **	AppendArgs(char **, ...);
-extern char **	AppendStr(char **, char *);
-extern void		ArgsToBuf(char **, int, char *, int);
-extern char *	ArgsToStr(char **);
-extern void		FreeArgs(char **);
-
-#endif /* !_ARGS_H_ */

diff --git a/core/org.eclipse.ptp.utils/include/bitset.h b/core/org.eclipse.ptp.utils/include/bitset.h
deleted file mode 100644
index 09f09bc..0000000
--- a/core/org.eclipse.ptp.utils/include/bitset.h
+++ /dev/null

@@ -1,65 +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
- ******************************************************************************/
-
-#ifndef _BITSET_H_
-#define _BITSET_H_
-
-#define BIT_INDEX(bit)		((bit) >> 3) / (sizeof(bits))
-#define BIT_IN_OBJ(bit)		((bit) % (sizeof(bits) << 3))
-#define SIZE_TO_BYTES(size)	(sizeof(bits) * (size))
-
-/*
- * NOTE: if you change the size of bits, then the ffs() routine may no longer work.
- */
-typedef unsigned int	bits;
-
-/*
- * Bitset definition. Note that the LSB is bit number '0'.
- */
-struct bitset {
-	unsigned int	bs_nbits;	/* total number of bits in set */
-	bits *			bs_bits;	/* actual bits (unused bits are always 0)*/
-	unsigned int	bs_size;	/* number of 'bits' objects */
-};
-typedef struct bitset bitset;
-
-bitset *	bitset_new(int num);						/* create a new bitset to contain 'num' bits */
-void		bitset_free(bitset *b);						/* dispose of a bitset */
-bitset *	bitset_dup(bitset *b);						/* create a copy of a bitset */
-void		bitset_copy(bitset *b1, bitset *b2);		/* copy bits from b2 to b1 */
-int			bitset_isempty(bitset *b);					/* test if all bits are 0 */
-void		bitset_clear(bitset *b);					/* set all bits to 0 */
-void		bitset_set(bitset *b, int n);				/* set bit 'n' (0 == LSB) to 1 */
-void		bitset_unset(bitset *b, int n);				/* set bit 'n' to 0 */
-int			bitset_test(bitset *b, int n);				/* return the value of bit 'n' */
-int			bitset_firstset(bitset *b);					/* find the first bit set to 1 (starting from LSB) */
-bitset *	bitset_and(bitset *b1, bitset *b2);			/* compute b3 = b1 & b2 */
-void		bitset_andeq(bitset *b1, bitset *b2);		/* compute b1 &= b2 */
-void		bitset_andeqnot(bitset *b1, bitset *b2);	/* compute b1 &= ~b2 */
-bitset *	bitset_or(bitset *b1, bitset *b2);			/* compute b3 = b1 | b2 */
-void		bitset_oreq(bitset *b1, bitset *b2);		/* compute b1 |= b2 */
-void		bitset_invert(bitset *b);					/* compute ~b */
-int			bitset_eq(bitset *b1, bitset *b2);			/* test if (b1 & b2) == b1 */
-int			bitset_compare(bitset *b1, bitset *b2);		/* test if (b1 & b2) != 0 */
-char *		bitset_to_str(bitset *b);					/* convert b to a portable string representation */
-bitset *	str_to_bitset(char *str, char **end);		/* convert a portable string represetation to a bitset */
-int			bitset_count(bitset *b);					/* return the number of bits in the set */
-int			bitset_size(bitset *b);						/* number of bits this bitset can represent */
-char *		bitset_to_set(bitset *b);					/* convert b to set notation */
-#endif /*_BITSET_H_*/

diff --git a/core/org.eclipse.ptp.utils/include/compat.h b/core/org.eclipse.ptp.utils/include/compat.h
deleted file mode 100644
index 9bd5e32..0000000
--- a/core/org.eclipse.ptp.utils/include/compat.h
+++ /dev/null

@@ -1,69 +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
- ******************************************************************************/
- 
-#ifndef _COMPAT_H_
-#define _COMPAT_H_
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#ifdef USE_POSIX_THREADS
-#include <pthread.h>
-#define THREAD_DECL(context)	pthread_mutex_t context ## _thread_mutex = PTHREAD_MUTEX_INITIALIZER
-#define THREAD_LOCK(context)	pthread_mutex_lock(&context ## _thread_mutex)
-#define THREAD_UNLOCK(context)	pthread_mutex_unlock(&context ## _thread_mutex)
-#else /* USE_POSIX_THREADS */
-#define THREAD_DECL(context)
-#define THREAD_LOCK(context)
-#define THREAD_UNLOCK(context)
-#endif /* USE_POSIX_THREADS */
-
-#ifndef MAX
-#define MAX(a, b)		((a) < (b) ? (b) : (a))
-#endif /* MAX */
-
-#ifndef MIN
-#define MIN(a, b)		((a) > (b) ? (b) : (a))
-#endif /* MAX */
-
-#ifdef __APPLE__
-#define BITSPERBYTE     NBBY
-#elif __linux__
-#include <limits.h>
-#define BITSPERBYTE     CHAR_BIT
-extern int digittoint(int);
-#elif _AIX
-#define BITSPERBYTE 8
-#else
-#error "Need to define BITSPERBYTE for your operating system"
-#endif
-
-#ifndef HAVE_ASPRINTF
-int asprintf(char ** ret, const char * fmt, ...);
-#endif /* !HAVE_ASPRINTF */
-
-#define SOCKET			int
-#define CLOSE_SOCKET(s)	(void)close(s)
-#define INVALID_SOCKET	-1
-#define SOCKET_ERROR		-1
-
-#endif /* _COMPAT_H_*/

diff --git a/core/org.eclipse.ptp.utils/include/handler.h b/core/org.eclipse.ptp.utils/include/handler.h
deleted file mode 100644
index 696263d..0000000
--- a/core/org.eclipse.ptp.utils/include/handler.h
+++ /dev/null

@@ -1,69 +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
- ******************************************************************************/
- 
-#ifndef _HANDLER_H_
-#define _HANDLER_H_
-
-#include <sys/select.h>
-
-#define HANDLER_FILE		1
-#define HANDLER_SIGNAL		2
-#define HANDLER_EVENT		3
-
-#define READ_FILE_HANDLER	1
-#define WRITE_FILE_HANDLER	2
-#define EXCEPT_FILE_HANDLER	4
-
-struct handler {
-	int		htype;
-	void *	data;
-		
-	/*
-	 * HANDLER_FILE
-	 */
-	int		file_type; 							/* type of this file handler */
-	int		fd;									/* file descriptor */
-	int		error;								/* last operation result */
-	int		(*file_handler)(int, void *);		/* handler callback function */
-	
-	/*
-	 * HANDLER_SIGNAL
-	 */
-	int		signal;								/* signal to handle */
-
-	/*
-	 * HANDLER_EVENT
-	 */
-	int		event_type;							/* type of this event handler */
-	void 	(*event_handler)(void *, void *);	/* handler callback function */
-};
-typedef struct handler	handler;
-
-handler *	NewHandler(int, void *);
-void		DestroyHandler(handler *);
-void		SetHandler(void);
-handler *	GetHandler(void);
-void		RegisterEventHandler(int, void (*)(void *, void *), void *);
-void		UnregisterEventHandler(int, void (*)(void *, void *));
-void		RegisterFileHandler(int fd, int type, int (*)(int, void *), void *);
-void		UnregisterFileHandler(int);
-void		CallEventHandlers(int, void *);
-int			CallFileHandlers(fd_set *rfds, fd_set *wfds, fd_set *efds);
-void		GenerateFDSets(int *, fd_set *, fd_set *, fd_set *);
-#endif /* !_HANDLER_H_ */

diff --git a/core/org.eclipse.ptp.utils/include/hash.h b/core/org.eclipse.ptp.utils/include/hash.h
deleted file mode 100644
index 90278c0..0000000
--- a/core/org.eclipse.ptp.utils/include/hash.h
+++ /dev/null

@@ -1,53 +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
- ******************************************************************************/
-
-#ifndef _HASH_H_
-#define _HASH_H_
-
-struct HashEntry
-{
-	unsigned int		h_hval;	/* actual hash value */
-	void *				h_data;	/* entry data */
-	struct HashEntry *	h_next;	/* next in chain */
-};
-typedef struct HashEntry	HashEntry;
-
-/* Data type for reentrant functions.  */
-struct Hash
-{
-    HashEntry **	table;		/* hash chain entries */
-    unsigned int	logsize;	/* log 2 number of chains in table */
-    unsigned int	size;		/* number of chains in table */
-    unsigned int	count;		/* number of entries in table */
-    unsigned int	mask;		/* mask used to compute chain */
-    unsigned int	scan;		/* used for scanning hash table */
-    HashEntry *		scan_entry;
-};
-typedef struct Hash	Hash;
-
-extern Hash *		HashCreate(int);
-extern void			HashDestroy(Hash *, void (*)(void *));
-extern void *		HashSearch(Hash *, unsigned int);
-extern unsigned int	HashCompute(char *, int);
-extern HashEntry *	HashInsert(Hash *, unsigned int, void *);
-extern void			HashRemove(Hash *, unsigned int);
-extern void			HashSet(Hash *);
-extern HashEntry *	HashGet(Hash *);
-
-#endif /* !_HASH_H_ */

diff --git a/core/org.eclipse.ptp.utils/include/list.h b/core/org.eclipse.ptp.utils/include/list.h
deleted file mode 100644
index babad4a..0000000
--- a/core/org.eclipse.ptp.utils/include/list.h
+++ /dev/null

@@ -1,53 +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
- ******************************************************************************/
-
-#ifndef _LIST_H_
-#define _LIST_H_
-
-struct List
-{
-	int						l_nel;
-	struct ListElement *	l_head;
-	struct ListElement *	l_scan;
-	struct ListElement **	l_tail;
-};
-typedef struct List	List;
-
-struct ListElement
-{
-	void *					l_value;
-	struct ListElement *	l_next;
-};
-typedef struct ListElement	ListElement;
-
-extern List *	NewList(void);
-extern void		AddToList(List *, void *);
-extern void		AddFirst(List *, void *);
-extern void		AppendList(List *, List *);
-extern void		InsertBefore(List *l, void *val, void *new_val);
-extern void		RemoveFromList(List *, void *);
-extern void *	RemoveFirst(List *);
-extern void		DestroyList(List *, void (*)());
-extern void		SetList(List *);
-extern void *	GetListElement(List *);
-extern void *	GetFirstElement(List *);
-extern int		EmptyList(List *);
-extern int		InList(List *, void *);
-extern int		SizeOfList(List *);
-#endif /* !_LIST_H_ */

diff --git a/core/org.eclipse.ptp.utils/include/rangeset.h b/core/org.eclipse.ptp.utils/include/rangeset.h
deleted file mode 100644
index e5d7650..0000000
--- a/core/org.eclipse.ptp.utils/include/rangeset.h
+++ /dev/null

@@ -1,37 +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
- *******************************************************************************/
-
-#include "list.h"
-
-struct str_buf {
-	int		len;
-	int		count;
-	char *	contents;
-};
-typedef struct str_buf str_buf;
-
-struct rangeset {
-	List 	*	elements;
-	str_buf *	buf;
-	int			changed;
-};
-typedef struct rangeset	rangeset;
-
-struct range {
-	int low;
-	int high;
-};
-typedef struct range	range;
-
-extern rangeset *new_rangeset(void);
-extern void insert_in_rangeset(rangeset *set, int val);
-extern char *rangeset_to_string(rangeset *set);
-extern void free_rangeset(rangeset *set);

diff --git a/core/org.eclipse.ptp.utils/include/serdes.h b/core/org.eclipse.ptp.utils/include/serdes.h
deleted file mode 100644
index 70b2846..0000000
--- a/core/org.eclipse.ptp.utils/include/serdes.h
+++ /dev/null

@@ -1,18 +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
- *******************************************************************************/
-
-#ifndef SERDES_H_
-#define SERDES_H_
-
-extern unsigned int	hex_str_to_int(char *str, int len, char **end);
-extern void			int_to_hex_str(unsigned int val, char *str, int len, char **end);
-
-#endif /* SERDES_H_ */

diff --git a/core/org.eclipse.ptp.utils/install-sh b/core/org.eclipse.ptp.utils/install-sh
deleted file mode 100755
index ebc6691..0000000
--- a/core/org.eclipse.ptp.utils/install-sh
+++ /dev/null

@@ -1,250 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

diff --git a/core/org.eclipse.ptp.utils/ltmain.sh b/core/org.eclipse.ptp.utils/ltmain.sh
deleted file mode 100644
index 9e71d27..0000000
--- a/core/org.eclipse.ptp.utils/ltmain.sh
+++ /dev/null

@@ -1,6530 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.20
-TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
-  setopt NO_GLOB_SUBST
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-        darwin_framework)
-	  compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch)
-        prev=darwin_framework
-        compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-        continue
-        ;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char *
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:

diff --git a/core/org.eclipse.ptp.utils/missing b/core/org.eclipse.ptp.utils/missing
deleted file mode 100755
index e7ef83a..0000000
--- a/core/org.eclipse.ptp.utils/missing
+++ /dev/null

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/core/org.eclipse.ptp.utils/plugin.properties b/core/org.eclipse.ptp.utils/plugin.properties
deleted file mode 100644
index 5d4298f..0000000
--- a/core/org.eclipse.ptp.utils/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Utility Library
-pluginProvider=Eclipse.org

diff --git a/core/org.eclipse.ptp.utils/src/args.c b/core/org.eclipse.ptp.utils/src/args.c
deleted file mode 100644
index f25182b..0000000
--- a/core/org.eclipse.ptp.utils/src/args.c
+++ /dev/null

@@ -1,380 +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
- ******************************************************************************/
-
-#include	<stdio.h>
-#include	<stdarg.h>
-#include	<stdlib.h>
-#include	<string.h>
-#include	<ctype.h>
-
-#include	"args.h"
-
-#define CHUNK_SIZE				8
-#define LENGTH_TO_CHUNKS(len)	(len / CHUNK_SIZE + 1)
-#define FREE_SPACE(len)			(CHUNK_SIZE - (len - 1) % CHUNK_SIZE - 1)
-
-/*
- * Convert a string to an arg array
- */
-char **
-StrToArgs(char *s)
-{
-	int		squote = 0;
-	int		dquote = 0;
-	int		bsquote = 0;
-	int		argc = 0;
-	int		maxargc = 0;
-	char *	arg;
-	char *	copybuf;
-	char **	argv = NULL;
-	char **	nargv;
-
-	if ( s == NULL )
-		return argv;
-
-	copybuf = (char *)malloc(strlen(s) + 1);
-
-	do
-	{
-		while (isspace ((int)*s))
-			s++;
-
-		if ( (maxargc == 0) || (argc >= (maxargc - 1)) )
-		{
-			if ( argv == NULL )
-			{
-				maxargc = CHUNK_SIZE;
-				nargv = (char **)malloc(maxargc * sizeof (char *));
-			}
-			else
-			{
-				maxargc += CHUNK_SIZE;
-				nargv = (char **)realloc(argv, maxargc * sizeof (char *));
-			}
-
-			argv = nargv;
-			argv[argc] = NULL;
-		}
-
-		arg = copybuf;
-
-		while ( *s != '\0' )
-		{
-			if ( isspace((int)*s) && !squote && !dquote && !bsquote )
-				break;
-
-			switch (*s) {
-			case '\\':
-				if (bsquote) {
-					*arg++ = *s;
-					bsquote = 0;
-				} else
-					bsquote = 1;
-				break;
-			
-			
-			case '\'':
-				if (squote)
-					squote = 0;
-				else
-					squote = 1;
-				break;
-			
-			case '"':
-				if (dquote)
-					dquote = 0;
-				else
-					dquote = 1;
-				break;
-
-			default:
-				if (bsquote)
-				{
-					bsquote = 0;
-					
-					switch (*s) {
-					case 'n':
-						*arg++ = '\n';
-						break;
-					case 't':
-						*arg++ = '\t';
-						break;
-					default:
-						*arg++ = *s;
-						break;
-					}
-					
-					break;
-				}
-				
-				*arg++ = *s;
-				break;
-			}
-
-			s++;
-		}
-
-		*arg = '\0';
-
-		if ( (argv[argc] = strdup(copybuf)) == NULL )
-		{
-			free(copybuf);
-			FreeArgs(argv);
-			argv = NULL;
-			return argv;
-		}
-
-		argc++;
-		argv[argc] = NULL;
-
-		while ( isspace ((int)*s) )
-			s++;
-
-	}
-	while ( *s != '\0' );
-
-	free(copybuf);
-
-	return argv;
-}
-
-/*
- * Free an arg array
- */
-void
-FreeArgs(char **args)
-{
-	char **	ap;
-
-	if ( args == (char **)NULL )
-		return;
-
-	for ( ap = args ; *ap != NULL ; ap++ )
-		free(*ap);
-
-	free(args);
-}
-
-/*
- * Create a new arg array. If a0 is NULL, create an empty array.
- */
-char **
-NewArgs(char *a0, ...)
-{
-	int		n = 1;
-	char **	ap;
-	char **	app;
-	va_list args;
-
-	if ( a0 == NULL )
-	{
-		ap = (char **)malloc(CHUNK_SIZE * sizeof(char *));
-		*ap = NULL;
-		return ap;
-	}
-
-	/*
-	 * Calclulate number of arguments (n starts at 1 to allow for a0)
-	 */
-	va_start(args, a0);
-
-	while ( va_arg(args, char *) != NULL )
-		n++;
-
-	va_end(args);
-	
-	/*
-	 * Round up to multiple of CHUNK_SIZE. This takes into account the
-	 * NULL entry also.
-	 */
-	app = ap = (char **)malloc(LENGTH_TO_CHUNKS(n + 2) * CHUNK_SIZE * sizeof(char *));
-	*app++ = strdup(a0);
-
-	va_start(args, a0);
-
-	while ( --n > 0 )
-		*app++ = strdup(va_arg(args, char *));
-
-	va_end(args);
-
-	*app = NULL;
-
-	return ap;
-}
-
-/*
- * Append arg array ep to arg array ap. Returns a newly allocated array.
- */
-char **
-AppendArgv(char **ap, char **ep)
-{
-	int		na = 0;
-	int 	ne = 0;
-	char **	app;
-	char ** npp;
-
-	for ( app = ap ; *app != NULL ; app++ )
-		na++;
-
-	for ( app = ep ; *app != NULL ; app++ )
-		ne++;
-	
-	npp = (char **)malloc(LENGTH_TO_CHUNKS(na + ne + 1) * CHUNK_SIZE * sizeof(char *));
-
-	for ( app = npp ; *ap != NULL ; ap++ )
-		*app++ = strdup(*ap);
-
-	for ( app = npp + na ; *ep != NULL ; ep++ )
-		*app++ = strdup(*ep);
-
-	*app = NULL;
-
-	return npp;
-}
-
-/*
- * Append arguments to an arg array. Returns a newly allocted array.
- */
-char **
-AppendArgs(char **ap, ...)
-{
-	int		na = 0;
-	int 	ne = 0;
-	char *	a;
-	char **	app;
-	char ** npp;
-	va_list args;
-
-	for ( app = ap ; *app != NULL ; app++ )
-		na++;
-
-	va_start(args, ap);
-
-	while ( va_arg(args, char *) != NULL )
-		ne++;
-
-	va_end(args);
-	
-	npp = (char **)malloc(LENGTH_TO_CHUNKS(na + ne + 1) * CHUNK_SIZE * sizeof(char *));
-
-	for ( app = npp ; *ap != NULL ; ap++ )
-		*app++ = strdup(*ap);
-
-	va_start(args, ap);
-
-	for ( app = npp + na; (a = va_arg(args, char *)) != NULL ; )
-		*app++ = strdup(a);
-
-	va_end(args);
-
-	*app = NULL;
-
-	return npp;
-}
-
-/*
- * Append a string to the array. Will expand the size of
- * the array if necessary. Returns the array with the string
- * appended.
- */
-char **
-AppendStr(char **ap, char *str)
-{
-	int		n;
-	int		na = 0;
-	char **	app;
-	
-	for ( app = ap ; *app != NULL ; app++ )
-		na++;
-
-	n = FREE_SPACE(na);
-	
-	if (n < 2) {
-		ap = (char **)realloc(ap, LENGTH_TO_CHUNKS(na + 2) * CHUNK_SIZE * sizeof(char *));
-	}
-	
-	*(ap + na) = strdup(str);
-	*(ap + na + 1) = NULL;
-	
-	return ap;
-}
-
-/*
-** Copy arguments into a string buffer.
-*/
-void
-ArgsToBuf(char *argv[], int argc, char *buf, int len)
-{
-	int	i;
-	int	l;
-
-	*buf = '\0';
-
-	for ( i = 0 ; i < argc ; i++ )
-	{
-		l = strlen(argv[i]);
-
-		if ( l > len - 1 )
-			return;
-
-		strcpy(buf, argv[i]);
-		buf += l;
-		len -= l;
-
-		if ( i < argc - 1 )
-		{
-			if ( len < 2 )
-				return;
-
-			strcpy(buf, " ");
-			buf++;
-			len--;
-		}
-	}
-}
-
-/*
- * Convert arguments to a string
- */
-char *
-ArgsToStr(char **ap) 
-{
-	int 	n = 0;
-	char **	app;
-	char *	res;
-	char *	rp;
-	
-	for ( app = ap ; *app != NULL ; app++ ) {
-		n += strlen(*app) + 1;
-	}
-
-	rp = res = (char *)malloc(sizeof(char *) * n + 1);
-	
-	for ( app = ap ; *app != NULL ; app++ ) {
-		if (app != ap) {
-			*rp++ = ' ';
-		}
-		n = strlen(*app);
-		memcpy(rp, *app, n);
-		rp += n;
-	}
-	*rp = '\0';
-	
-	return res;
-}

diff --git a/core/org.eclipse.ptp.utils/src/args_test.c b/core/org.eclipse.ptp.utils/src/args_test.c
deleted file mode 100644
index 3155330..0000000
--- a/core/org.eclipse.ptp.utils/src/args_test.c
+++ /dev/null

@@ -1,73 +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
- *******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-
-#include "compat.h"
-#include "args.h"
-
-int
-main(int argc, char *argv[])
-{
-	char **	a1;
-	char **	a2;
-	char **	a3;
-	char **	a4;
-	char **	a5;
-	char **	r1;
-	char **	r2;
-	char **	r3;
-	char **	r4;
-	char **	r5;
-	char **	r6;
-	
-	a1 = NewArgs("1", "2", "3", "4", "5", "6", "7", NULL);
-	printf("a1 = %s\n", ArgsToStr(a1));
-	a2 = NewArgs("1", "2", "3", "4", "5", "6", "7", "8", NULL);
-	printf("a2 = %s\n", ArgsToStr(a2));
-	a3 = StrToArgs("a b c d e");
-	printf("a3 = %s\n", ArgsToStr(a3));
-	a4 = StrToArgs("a b c d e f g");
-	printf("a4 = %s\n", ArgsToStr(a4));
-	a5 = StrToArgs("a b c d e f g h");
-	printf("a5 = %s\n", ArgsToStr(a5));
-	
-	r1 = AppendArgv(a1, a3);
-	printf("r1 = %s\n", ArgsToStr(r1));
-	r2 = AppendArgv(a2, a3);
-	printf("r2 = %s\n", ArgsToStr(r2));
-	r3 = AppendArgv(a1, a4);
-	printf("r3 = %s\n", ArgsToStr(r3));
-	r4 = AppendArgv(a2, a4);
-	printf("r4 = %s\n", ArgsToStr(r4));
-	r5 = AppendArgv(a1, a5);
-	printf("r5 = %s\n", ArgsToStr(r5));
-	r6 = AppendArgv(a2, a5);
-	printf("r6 = %s\n", ArgsToStr(r6));
-	
-	FreeArgs(a1);
-	FreeArgs(a2);
-	FreeArgs(a3);
-	FreeArgs(a4);
-	FreeArgs(a5);
-	FreeArgs(r1);
-	FreeArgs(r2);
-	FreeArgs(r3);
-	FreeArgs(r4);
-	FreeArgs(r5);
-	FreeArgs(r6);
-	
-	return 0;
-}

diff --git a/core/org.eclipse.ptp.utils/src/bitset.c b/core/org.eclipse.ptp.utils/src/bitset.c
deleted file mode 100644
index 62233ac..0000000
--- a/core/org.eclipse.ptp.utils/src/bitset.c
+++ /dev/null

@@ -1,508 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-
-#include "compat.h"
-#include "bitset.h"
-
-bitset *
-bitset_new(int nbits)
-{
-	bitset *	b;
-
-	b = malloc(sizeof(bitset));
-
-	b->bs_nbits = nbits;
-	b->bs_size = BIT_INDEX(nbits-1) + 1;
-	b->bs_bits = (bits *)malloc(SIZE_TO_BYTES(b->bs_size));
-	memset(b->bs_bits, 0, SIZE_TO_BYTES(b->bs_size));
-
-	return b;
-}
-
-void
-bitset_free(bitset *b)
-{
-	free(b->bs_bits);
-	free(b);
-}
-
-void
-bitset_copy(bitset *b1, bitset *b2)
-{
-	memcpy(b1->bs_bits, b2->bs_bits, MIN(SIZE_TO_BYTES(b1->bs_size), SIZE_TO_BYTES(b2->bs_size)));
-}
-
-bitset *
-bitset_dup(bitset *b)
-{
-	bitset *nb = bitset_new(b->bs_nbits);
-
-	bitset_copy(nb, b);
-
-	return nb;
-}
-
-int
-bitset_isempty(bitset *b)
-{
-	int	i;
-
-	for (i = 0; i < b->bs_size; i++)
-		if (b->bs_bits[i] != 0)
-			return 0;
-
-	return 1;
-}
-
-
-void
-bitset_clear(bitset *b)
-{
-	memset(b->bs_bits, 0, SIZE_TO_BYTES(b->bs_size));
-}
-
-/*
- * Compute logical AND of bitsets
- *
- * If bitsets are different sizes, create a new bitset that
- * is the same size as the larger of the two. The high bits
- * will be ANDed with 0.
- */
-bitset *
-bitset_and(bitset *b1, bitset *b2)
-{
-	bitset *	nb;
-
-	if (b1->bs_size > b2->bs_size) {
-		nb = bitset_dup(b1);
-		bitset_andeq(nb, b2);
-	} else {
-		nb = bitset_dup(b2);
-		bitset_andeq(nb, b1);
-	}
-
-	return nb;
-}
-
-/*
- * Compute b1 &= b2
- *
- * If bitsets are different sizes, high bits are assumed
- * to be 0.
- */
-void
-bitset_andeq(bitset *b1, bitset *b2)
-{
-	int	i;
-
-	for (i = 0; i < MIN(b1->bs_size, b2->bs_size); i++)
-		b1->bs_bits[i] &= b2->bs_bits[i];
-
-	/*
-	 * Mask high bits (if any)
-	 */
-	for ( ; i < b1->bs_size; i++)
-		b1->bs_bits[i] = 0;
-}
-
-/*
- * Compute b1 &= ~b2
- *
- * If bitsets are different sizes, high bits are assumed
- * to be 0.
- */
-void
-bitset_andeqnot(bitset *b1, bitset *b2)
-{
-	int	i;
-
-	for (i = 0; i < MIN(b1->bs_size, b2->bs_size); i++)
-		b1->bs_bits[i] &= ~b2->bs_bits[i];
-
-	/*
-	 * Mask high bits (if any)
-	 */
-	for ( ; i < b1->bs_size; i++)
-		b1->bs_bits[i] = 0;
-}
-
-/*
- * Compute logical OR of bitsets
- */
-bitset *
-bitset_or(bitset *b1, bitset *b2)
-{
-	bitset *	nb;
-
-	if (b1->bs_size > b2->bs_size) {
-		nb = bitset_dup(b1);
-		bitset_oreq(nb, b2);
-	} else {
-		nb = bitset_dup(b2);
-		bitset_oreq(nb, b1);
-	}
-
-	return nb;
-}
-
-/*
- * Compute b1 |= b2
- */
-void
-bitset_oreq(bitset *b1, bitset *b2)
-{
-	int	i;
-
-	for (i = 0; i < MIN(b1->bs_size, b2->bs_size); i++)
-		b1->bs_bits[i] |= b2->bs_bits[i];
-
-	/*
-	 * Mask out unused high bits
-	 */
-	if (BIT_IN_OBJ(b1->bs_nbits) != 0)
-		b1->bs_bits[b1->bs_size-1] &= (1 << (BIT_IN_OBJ(b1->bs_nbits-1) + 1)) - 1;
-}
-
-/*
- * Compute ~b
- */
-void
-bitset_invert(bitset *b)
-{
-	int		i;
-
-	for (i = 0; i < b->bs_size; i++)
-		b->bs_bits[i] = ~b->bs_bits[i];
-
-	/*
-	 * Mask out unused high bits
-	 */
-	if (BIT_IN_OBJ(b->bs_nbits) != 0)
-		b->bs_bits[b->bs_size-1] &= (1 << (BIT_IN_OBJ(b->bs_nbits-1) + 1)) - 1;
-}
-
-/*
- * Test if two bitsets are equal
- *
- * Bitsets must be the same size
- */
-int
-bitset_eq(bitset *b1, bitset *b2)
-{
-	int	i;
-
-	if (b1->bs_nbits != b2->bs_nbits)
-		return 0;
-
-	for (i = 0; i < b1->bs_size; i++)
-		if (b1->bs_bits[i] != b2->bs_bits[i])
-			return 0;
-
-	return 1;
-}
-
-/*
- * Test if two bitsets share any bits
- *
- * If bitsets are different sizes, high bits are assumed
- * to be 0.
- */
-int
-bitset_compare(bitset *b1, bitset *b2)
-{
-	int	i;
-
-	for (i = 0; i < MIN(b1->bs_size, b2->bs_size); i++)
-		if ((b1->bs_bits[i] & b2->bs_bits[i]) != 0)
-			return 1;
-
-	return 0;
-}
-
-/**
- * Add a bit to the set. Bits are numbered from 0.
- */
-void
-bitset_set(bitset *b, int bit)
-{
-	if (bit < 0 || bit >= b->bs_nbits)
-		return;
-
-	b->bs_bits[BIT_INDEX(bit)] |= (1 << BIT_IN_OBJ(bit));
-}
-
-void
-bitset_unset(bitset *b, int bit)
-{
-	if (bit < 0 || bit >= b->bs_nbits)
-		return;
-
-	b->bs_bits[BIT_INDEX(bit)] &= ~(1 << BIT_IN_OBJ(bit));
-}
-
-int
-bitset_test(bitset *b, int bit)
-{
-	bits		mask = (1 << BIT_IN_OBJ(bit));
-
-	if (bit < 0 || bit >= b->bs_nbits)
-		return 0;
-
-	return (b->bs_bits[BIT_INDEX(bit)] & mask) == mask;
-}
-
-/*
- * Find the first bit set in the bitset.
- *
- * NOTE: ffs() assumes an integer argument. If sizeof(bits) is anything
- * else this will need to be fixed.
- */
-int
-bitset_firstset(bitset *b)
-{
-	int	i;
-
-	for (i = 0; i < b->bs_size; i++)
-		if (b->bs_bits[i] != 0)
-			break;
-
-	if (i == b->bs_size)
-		return -1;
-
-	return (SIZE_TO_BYTES(i) << 3) + ffs(b->bs_bits[i]) - 1;
-}
-
-static char tohex[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-#define NUM_BYTES(bits) (((bits-1) >> 3) + 1)
-
-/**
- * Return a string representation of a bitset. We use hex to compress
- * the string somewhat and drop leading zeros.
- *
- * Format is "NN:HHHHHH..." where "NN" is the actual number of bits in hex,
- * and "HHHHH...." is a hex representation of the bits in the set. The number
- * of characters in the bit string is always rounded to the nearest byte.
- *
- * e.g. "111" -> "3:07"
- * 		"11011010101011101" -> "11:01b55d"
- */
-char *
-bitset_to_str(bitset *b)
-{
-	int				n;
-	int				bytes;
-	int				pbit;
-	int				bit;
-	char *			str;
-	char *			s;
-	unsigned char	val;
-
-	if (b == NULL) {
-		return strdup("0:00");
-	}
-
-	/*
-	 * Find out how many bytes needed (rounded up)
-	 */
-	bytes = NUM_BYTES(b->bs_nbits);
-
-	str = (char *)malloc(bytes + 8 + 2);
-
-	/*
-	 * Start with actual number of bits (silently truncate to 32 bits)
-	 */
-	n = sprintf(str, "%x", b->bs_nbits & 0xffffffff);
-
-	s = str + n;
-
-	*s++ = ':';
-
-	for (pbit = (bytes << 3) - 1; pbit > 0; ) {
-		for (val = 0, bit = 3; bit >= 0; bit--, pbit--) {
-			if (pbit < b->bs_nbits && bitset_test(b, pbit)) {
-				val |= (1 << bit);
-			}
-		}
-		*s++ = tohex[val & 0x0f];
-	}
-
-	if (b->bs_nbits == 0) {
-		*s++ = '0';
-	}
-
-	*s = '\0';
-
-	return str;
-}
-
-/**
- * Convert string into a bitset. Inverse of bitset_to_str().
- *
- */
-bitset *
-str_to_bitset(char *str, char **end)
-{
-	int			nbits;
-	int			bytes;
-	int			n;
-	int			pos;
-	int			b;
-	bitset *	bp;
-
-	if (str == NULL) {
-		return NULL;
-	}
-
-	for (nbits = 0; *str != ':' && *str != '\0' && isxdigit(*str); str++) {
-		nbits <<= 4;
-		nbits += digittoint(*str);
-	}
-
-	bytes = NUM_BYTES(nbits);
-
-	if (*str++ != ':' || nbits == 0) {
-		return NULL;
-	}
-
-	bp = bitset_new(nbits);
-
-	for (pos = (bytes << 3) - 1; *str != '\0' && isxdigit(*str) && pos >= 0; str++) {
-		b = digittoint(*str);
-		for (n = 3; n >= 0; n--, pos--) {
-			if (b & (1 << n)) {
-				bitset_set(bp, pos);
-			}
-		}
-	}
-
-	if (end != NULL) {
-		*end = str;
-	}
-
-	return bp;
-}
-
-int
-emit_range(char ** str, char sep, int lower, int upper)
-{
-	int			n;
-
-	if (lower < 0 || upper < lower)
-		return 0;
-
-	if (sep)
-		*(*str)++ = sep;
-
-	if (lower != upper) {
-		n = sprintf(*str, "%d-%d", lower, upper);
-	} else {
-		n = sprintf(*str, "%d", lower);
-	}
-
-	*str += n;
-
-	return 1;
-}
-
-/*
- * Convert bitset to set notation of the form
- *
- * 	{0-2,4,5-100}
- */
-char *
-bitset_to_set(bitset *b)
-{
-	int			bit;
-	int			lower;
-	int			upper;
-	char		sep = 0;
-	char *		str;
-	char *		s;
-
-	if (b == NULL)
-		return strdup("{}");
-
-	str = s = (char *)malloc(b->bs_nbits * 2 + 3);
-
-	*s++ = '{';
-
-	for (bit = 0, lower = -1, upper = -1; bit < b->bs_nbits; bit++) {
-		if (bitset_test(b, bit)) {
-			if (lower < 0)
-				lower = bit;
-
-			upper = bit;
-		} else {
-			if (emit_range(&s, sep, lower, upper))
-				sep = ',';
-			lower = bit + 1;
-		}
-	}
-
-	emit_range(&s, sep, lower, upper);
-
-	*s++ = '}';
-	*s = '\0';
-
-	return str;
-}
-
-unsigned int
-count_bits(bits b)
-{
-	unsigned int	n = 0;
-
-	while (b != 0) {
-		n++;
-		b &= (b-1);
-	}
-
-	return n;
-}
-
-/**
- * Number of bits in the set (as opposed to the total size of the set)
- */
-int
-bitset_count(bitset *b)
-{
-	int	i;
-	int	count = 0;
-
-	for (i = 0; i < b->bs_size; i++)
-		count += count_bits(b->bs_bits[i]);
-
-	return count;
-}
-
-/**
- * Number of bits this set can represent
- */
-int
-bitset_size(bitset *b)
-{
-	return b->bs_nbits;
-}

diff --git a/core/org.eclipse.ptp.utils/src/bitset_test.c b/core/org.eclipse.ptp.utils/src/bitset_test.c
deleted file mode 100644
index 1b19a4c..0000000
--- a/core/org.eclipse.ptp.utils/src/bitset_test.c
+++ /dev/null

@@ -1,142 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-
-#include "compat.h"
-#include "bitset.h"
-
-void test_invert_mask(int tnum, int nbits);
-void test_oreq(int tnum, int nb1, int nb2);
-void test_str(int);
-void test_boundary(int);
-
-int
-main(int argc, char *argv[])
-{
-	int bits_size = (sizeof(bits)<<3);
-
-	test_invert_mask(1, bits_size*2-4);
-	test_oreq(2, bits_size*2-4,bits_size*2);
-	test_oreq(3, bits_size*2,bits_size*2-4);
-	test_str(4);
-	test_boundary(5);
-
-	return 0;
-}
-
-void
-test_invert_mask(int tnum, int nbits)
-{
-	int			i;
-	bits 		r;
-	bitset *	b;
-
-	memset((char *)&r, 0, sizeof(bits));
-	for (i = 0; i < nbits % (sizeof(bits) << 3); i++)
-		r |= (1 << i);
-
-	b = bitset_new(nbits);
-	bitset_invert(b);
-	if (b->bs_bits[b->bs_size-1] != r)
-		printf("TEST_%d FAIL: high bits should be 0x%x, actually 0x%x\n", tnum, r, b->bs_bits[b->bs_size-1]);
-	else
-		printf("TEST_%d SUCCEDED\n", tnum);
-	bitset_free(b);
-}
-
-
-void
-test_oreq(int tnum, int nb1, int nb2)
-{
-	int			i;
-	bitset *	b1;
-	bitset *	b2;
-	bitset *	r;
-
-	b1 = bitset_new(nb1);
-	b2 = bitset_new(nb2);
-	bitset_set(b1, 1);
-	bitset_set(b2, nb2-1);
-
-	bitset_oreq(b1, b2);
-
-	r = bitset_new(nb1);
-	bitset_set(r, 1);
-	if (nb1 >= nb2)
-		bitset_set(r, nb2 - 1);
-
-	for (i = 0; i < r->bs_size; i++) {
-		if (r->bs_bits[i] != b1->bs_bits[i]) {
-			printf("TEST_%d FAIL: [%d] 0x%x != 0x%x\n", i, r->bs_bits[i], b1->bs_bits[i], tnum);
-			return;
-		}
-	}
-
-	printf("TEST_%d SUCCEDED\n", tnum);
-}
-
-void
-test_str(int tnum)
-{
-	char *		str2;
-	char * 		str1 = "17:6411eda";
-	char *		end;
-	bitset *	b = str_to_bitset(str1, &end);
-	str2 = bitset_to_str(b);
-	if (strncmp(str1, str2, 9) != 0) {
-		printf("TEST_%d_1 FAIL: %s != %s\n", tnum, str1, str2);
-	} else if (*end != 'a') {
-		printf("TEST_%d_1 FAIL: end == %d\n", tnum, *end);
-	} else {
-		printf("TEST_%d_1 SUCCEDED\n", tnum);
-	}
-
-	str1 = "3:07";
-	b = str_to_bitset(str1, NULL);
-	str2 = bitset_to_str(b);
-	if (strncmp(str1, str2, 9) != 0) {
-		printf("TEST_%d_2 FAIL: %s != %s\n", tnum, str1, str2);
-	} else if (*end != 'a') {
-		printf("TEST_%d_2 FAIL: end == %d\n", tnum, *end);
-	} else {
-		printf("TEST_%d_2 SUCCEDED\n", tnum);
-	}
-}
-
-void
-test_boundary(int tnum)
-{
-	char * 		str1 = "8:7f";
-	char *		str2;
-	char *		str3 = "8:ff";
-	char *		end;
-	bitset *	b = str_to_bitset(str1, &end);
-	bitset_set(b, 7);
-	str2 = bitset_to_str(b);
-	if (strncmp(str3, str2, 4) != 0) {
-		printf("TEST_%d_1 FAIL: %s != %s\n", tnum, str3, str2);
-	} else {
-		printf("TEST_%d_1 SUCCEDED\n", tnum);
-	}
-}

diff --git a/core/org.eclipse.ptp.utils/src/compat.c b/core/org.eclipse.ptp.utils/src/compat.c
deleted file mode 100644
index e88ab6d..0000000
--- a/core/org.eclipse.ptp.utils/src/compat.c
+++ /dev/null

@@ -1,82 +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
- ******************************************************************************/
-
-#include "compat.h"
-
-#if defined (__linux__) || defined (_AIX)
-int
-digittoint(int c)
-{
-	if (c >= '0' && c <= '9')
-		return c - '0';
-		
-	if (c >= 'a' && c <= 'f')
-		return c - 'a' + 10;
-		
-	if (c >= 'A' && c <= 'F')
-		return c - 'A' + 10;
-	
-	return 0;
-}
-#endif /* __linux__ */
-
-
-#ifndef HAVE_ASPRINTF
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-/* 
- * assumes presence of snprintf (ISO C99) to calculate length of formatted string 
- */
-
-int
-asprintf(char ** ret, const char * fmt, ...)
-{
-	va_list ap;
-	size_t len;
-	char buf[2];
-
-	va_start(ap, fmt);
-
-	len = vsnprintf(buf, 2, fmt, ap);	/* get length of string first */
-	*ret = malloc(len+1);
-	len = vsnprintf(*ret, len+1, fmt, ap);
-
-	va_end(ap);
-	return len;
-}
-
-#endif /* !HAVE_ASPRINTF */
-
-#ifdef _AIX
-/*
-* The vasprintf function is not implemented for AIX. Since no
-* code in the Parallel Environment proxy calls vasprintf at this 
-* time, the only requirement is to provide an alternate function
-* to satisfy the linker (since code in proxy_event.c, unused by
-* the PE proxy, does call vasprintf).
-* For now, all this alternate function does is call abort(),
-* assuring a proxy crash if anything ever does call vasprintf
-*/
-int vasprintf(char **strp, const char *fmt, va_list ap)
-{
-	abort();
-}
-#endif /* _AIX */

diff --git a/core/org.eclipse.ptp.utils/src/handler.c b/core/org.eclipse.ptp.utils/src/handler.c
deleted file mode 100644
index 9638ba2..0000000
--- a/core/org.eclipse.ptp.utils/src/handler.c
+++ /dev/null

@@ -1,187 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "handler.h"
-#include "list.h"
-
-static List *		dbg_handlers = NULL;
-
-/**
- * Create an event handler structure and add it to the list of handlers
- */
-handler *
-NewHandler(int type, void *data)
-{
-	handler *	h;
-	
-	if (dbg_handlers == NULL)
-		dbg_handlers = NewList();
-		
-	h = (handler *)malloc(sizeof(handler));
-	h->htype = type;
-	h->data = data;
-	
-	AddToList(dbg_handlers, (void *)h);
-	
-	return h;
-}
-
-/**
- * Remove handler from list and dispose of memory
- */
-void
-DestroyHandler(handler *h)
-{
-	RemoveFromList(dbg_handlers, (void *)h);
-	free(h);
-}
-
-void
-SetHandler(void)
-{
-	SetList(dbg_handlers);
-}
-
-handler *
-GetHandler(void)
-{
-	return (handler *)GetListElement(dbg_handlers);
-}
-
-void
-RegisterEventHandler(int type, void (*event_callback)(void *, void *), void *data)
-{
-	handler *	h;
-
-	h = NewHandler(HANDLER_EVENT, NULL);
-	h->event_type = type;
-	h->event_handler = event_callback;
-	h->data = data;
-}
-
-/**
- * Unregister file descriptor handler
- */
-void
-UnregisterEventHandler(int type, void (*event_callback)(void *, void *))
-{
-	handler *	h;
-
-	for (SetHandler(); (h = GetHandler()) != NULL; ) {
-		if (h->htype == HANDLER_EVENT && h->event_type == type && h->event_handler == event_callback)
-			DestroyHandler(h);
-	}
-}
-
-/**
- * Register a handler for file descriptor events.
- */
-void
-RegisterFileHandler(int fd, int type, int (*file_handler)(int, void *), void *data)
-{
-	handler *	h;
-	
-	h = NewHandler(HANDLER_FILE, data);
-	h->file_type = type;
-	h->fd = fd;
-	h->error = 0;
-	h->file_handler = file_handler;
-}
-
-/**
- * Unregister file descriptor handler
- */
-void
-UnregisterFileHandler(int fd)
-{
-	handler *	h;
-
-	for (SetHandler(); (h = GetHandler()) != NULL; ) {
-		if (h->htype == HANDLER_FILE && h->fd == fd)
-			DestroyHandler(h);
-	}
-}
-
-/**
- * Call all event handlers of a particular type
- */
-void
-CallEventHandlers(int type, void *data)
-{
-	handler *	h;
-
-	for (SetHandler(); (h = GetHandler()) != NULL; ) {
-		if (h->htype == HANDLER_EVENT && h->event_type == type)
-			h->event_handler(h->data, data);
-	}
-}
-
-/*
- * Call all file handlers
- */
-int
-CallFileHandlers(fd_set *rfds, fd_set *wfds, fd_set *efds)
-{
-	int			ret = 0;
-	handler *	h;
-	
-	for (SetHandler(); (h = GetHandler()) != NULL; ) {
-		if (h->htype == HANDLER_FILE
-			&& h->error >= 0
-			&& ((h->file_type & READ_FILE_HANDLER && FD_ISSET(h->fd, rfds))
-				|| (h->file_type & WRITE_FILE_HANDLER && FD_ISSET(h->fd, wfds))
-				|| (h->file_type & EXCEPT_FILE_HANDLER && FD_ISSET(h->fd, efds)))) {
-			h->error = h->file_handler(h->fd, h->data);
-			if (h->error < 0)
-				ret = -1;
-		}
-	}
-	
-	return ret;
-}
-
-/*
- * Generate file descriptor sets
- */
-void
-GenerateFDSets(int *nfds, fd_set *rfds, fd_set *wfds, fd_set *efds)
-{
-	handler *	h;
-	
-	*nfds = 0;
-	FD_ZERO(rfds);
-	FD_ZERO(wfds);
-	FD_ZERO(efds);
-	
-	for (SetHandler(); (h = GetHandler()) != NULL; ) {
-		if (h->htype == HANDLER_FILE) {
-			if (h->file_type & READ_FILE_HANDLER)
-				FD_SET(h->fd, rfds);
-			if (h->file_type & WRITE_FILE_HANDLER)
-				FD_SET(h->fd, wfds);
-			if (h->file_type & EXCEPT_FILE_HANDLER)
-				FD_SET(h->fd, efds);
-			if (h->fd > *nfds)
-				*nfds = h->fd;
-		}
-	}
-}

diff --git a/core/org.eclipse.ptp.utils/src/hash.c b/core/org.eclipse.ptp.utils/src/hash.c
deleted file mode 100644
index c66c5f5..0000000
--- a/core/org.eclipse.ptp.utils/src/hash.c
+++ /dev/null

@@ -1,417 +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
- ******************************************************************************/
- 
-/*
-** Original copyright by Bob Jenkins, December 1996.
-*/
-
-/*
- * NOTE: This hash implementation is not synchronized across iteration (HashSet/HashGet). If there are two 
- * threads simultaneously accessing the hash, then one thread may affect the other's access. For instance, 
- * if thread 1 calls HashGet(), then thread 2 calls HashGet(), then the next time thread 1 calls
- * HashGet(), it will get the 3rd element in the hash, not the 2nd. Also, if two threads are accessing 
- * objects in the hash, and freeing data associated with those objects while traversing the hash, then this 
- * may cause problems where thread 1 frees data that thread 2 is about to access.
- * 
- * Applications wishing to use threads to access hashes in this way should provide functions that obtain 
- * and release a global lock on the hash which prevents any other thread from accessing the hash while 
- * that lock is held.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "compat.h"
-#include "hash.h"
-
-THREAD_DECL(hash);
-
-/*
-** mix 3 32-bit values reversibly.
-** For every delta with one or two bit set, and the deltas of all three
-**   high bits or all three low bits, whether the original value of a,b,c
-**   is almost all zero or is uniformly distributed,
-** If mix() is run forward or backward, at least 32 bits in a,b,c
-**  have at least 1/4 probability of changing.
-** If mix() is run forward, every bit of c will change between 1/3 and
-**  2/3 of the time.  (Well, 22/100 and 78/100 for some 2-bit deltas.)
-** mix() was built out of 36 single-cycle latency instructions in a 
-**  structure that could supported 2x parallelism, like so:
-**      a -= b; 
-**      a -= c; x = (c>>13);
-**      b -= c; a ^= x;
-**      b -= a; x = (a<<8);
-**      c -= a; b ^= x;
-**      c -= b; x = (b>>13);
-**      ...
-**  Unfortunately, superscalar Pentiums and Sparcs can't take advantage 
-**  of that parallelism.  They've also turned some of those single-cycle
-**  latency instructions into multi-cycle latency instructions.  Still,
-**  this is the fastest good hash I could find.  There were about 2^^68
-**  to choose from.  I only looked at a billion or so.
-*/
-#define mix(a,b,c) \
-{ \
-  a -= b; a -= c; a ^= (c>>13); \
-  b -= c; b -= a; b ^= (a<<8); \
-  c -= a; c -= b; c ^= (b>>13); \
-  a -= b; a -= c; a ^= (c>>12);  \
-  b -= c; b -= a; b ^= (a<<16); \
-  c -= a; c -= b; c ^= (b>>5); \
-  a -= b; a -= c; a ^= (c>>3);  \
-  b -= c; b -= a; b ^= (a<<10); \
-  c -= a; c -= b; c ^= (b>>15); \
-}
-
-static void _hgrow(Hash *);
-
-Hash *
-HashCreate(int size)
-{
-	unsigned int	i;
-	unsigned int	logsize = -1;
-	Hash *	htab;
-
-	htab = (Hash *)malloc(sizeof(Hash));
-
-	/*
-	 * Compute log2(size)
-	 */
-	for (i = (unsigned int)size; i > 0; i >>= 1)
-		logsize++;
-		
-	/*
-	** Maximum size is 2^31
-	*/
-	if ( logsize > BITSPERBYTE * sizeof(unsigned int) - 1 )
-		logsize = BITSPERBYTE * sizeof(unsigned int) - 1;
-		
-	if ( logsize <= 0 )
-		logsize = 2;
-
-	htab->logsize = logsize;
-	htab->size = (unsigned int)(1 << logsize);
-	htab->mask = htab->size - 1;
-	htab->count = 0;
-
-	/* allocate memory and zero out */
-	htab->table = (HashEntry **)malloc(htab->size * sizeof(HashEntry *));
-
-	for ( i = 0 ; i < htab->size ; i++ )
-		htab->table[i] = (HashEntry *)NULL;
-
-	/* everything went alright */
-	return htab;
-}
-
-void
-HashDestroy(Hash *htab,  void (*destroy)(void *))
-{
-	int		i;
-	HashEntry *	h;
-	HashEntry *	hn;
-
-	/* Test for correct arguments.  */
-	if ( htab == NULL )
-		return;
-
-	THREAD_LOCK(hash);
-	
-	for ( i = 0 ; i < (int)htab->size ; i++ )
-	{
-		for ( h = htab->table[i] ; h != NULL ; )
-		{
-			if ( destroy != NULL )
-				destroy(h->h_data);
-
-			hn = h->h_next;
-			free(h);
-			h = hn;
-		}
-	}
-
-	if (htab->table != NULL)
-		free(htab->table);
-
-	free(htab);
-	
-	THREAD_UNLOCK(hash);
-}
-
-/*
-** findentry(tab, key, hv) -- hash a variable-length key into a 32-bit value
-**
-**  key: the key (the unaligned variable-length array of bytes)
-**  hv : can be any 4-byte value
-**
-** Returns a 32-bit value.  Every bit of the key affects every bit of
-** the return value.  Every 1-bit and 2-bit delta achieves avalanche.
-** About 6len+35 instructions.
-**
-** The best hash table sizes are powers of 2.  There is no need to do
-** mod a prime (mod is sooo slow!).  If you need less than 32 bits,
-** use a bitmask.  For example, if you need only 10 bits, do
-**   h = (h & hashmask(10));
-** In which case, the hash table should have hashsize(10) elements.
-** 
-** If you are hashing n strings (ub1 **)k, do it like this:
-**   for (i=0, h=0; i<n; ++i) h = findentry( k[i], h);
-** 
-** By Bob Jenkins, 1996.  bob_jenkins@burtleburtle.net.  You may use this
-** code any way you wish, private, educational, or commercial.
-** 
-** See http://burtleburtle.net/bob/hash/evahash.html
-** Use for hash table lookup, or anything where one collision in 2^32 is
-** acceptable.  Do NOT use for cryptographic purposes.
-*/
-
-unsigned int
-findentry(char *key, int len, int hv)
-{
-	unsigned int	a;
-	unsigned int	b;
-	unsigned int	c;
-	unsigned int	l;
-
-	if ( key == NULL )
-		return 0;
-
-	/* Set up the internal state */
-	a = b = 0x9e3779b9;  /* the golden ratio; an arbitrary value */
-	c = hv;           /* the previous hash value */
-
-	/*---------------------------------------- handle most of the key */
-	for ( l = len ; l >= 12 ; l -= 12 )
-	{
-		a += (key[0] +((unsigned int)key[1]<<8) +((unsigned int)key[2]<<16) +((unsigned int)key[3]<<24));
-		b += (key[4] +((unsigned int)key[5]<<8) +((unsigned int)key[6]<<16) +((unsigned int)key[7]<<24));
-		c += (key[8] +((unsigned int)key[9]<<8) +((unsigned int)key[10]<<16)+((unsigned int)key[11]<<24));
-
-		mix(a,b,c);
-
-		key += 12;
-	}
-
-	/*------------------------------------- handle the last 11 bytes */
-	c += len;
-
-	switch ( l )              /* all the case statements fall through */
-	{
-	case 11: c += ((unsigned int)key[10]<<24);
-	case 10: c += ((unsigned int)key[9]<<16);
-	case 9 : c += ((unsigned int)key[8]<<8);
-	/* the first byte of c is reserved for the length */
-	case 8 : b += ((unsigned int)key[7]<<24);
-	case 7 : b += ((unsigned int)key[6]<<16);
-	case 6 : b += ((unsigned int)key[5]<<8);
-	case 5 : b += key[4];
-	case 4 : a += ((unsigned int)key[3]<<24);
-	case 3 : a += ((unsigned int)key[2]<<16);
-	case 2 : a += ((unsigned int)key[1]<<8);
-	case 1 : a += key[0];
-	/* case 0: nothing left to add */
-	}
-
-	mix(a,b,c);
-
-	return c;
-}
-
-unsigned int 
-HashCompute(char *key, int len)
-{
-	return findentry(key, len, 0);
-}
-
-void *
-HashSearch(Hash *htab, unsigned int idx)
-{
-	HashEntry *	h;
-	
-	THREAD_LOCK(hash);
-	
-	for ( h = htab->table[idx & htab->mask] ; h != NULL ; h = h->h_next)
-	{
-		if ( idx == h->h_hval ) {
-			THREAD_UNLOCK(hash);
-			return h->h_data;
-		}
-	}
-	
-	THREAD_UNLOCK(hash);
-
-	return NULL;
-}
-
-HashEntry *
-HashInsert(Hash *htab, unsigned int idx, void *data)
-{
-	HashEntry *	h;
-	HashEntry **	hp;
-	
-	THREAD_LOCK(hash);
-	
-	/*
-	** Check if entry already exists
-	*/
-	for ( h = htab->table[idx & htab->mask] ; h != (HashEntry *)NULL ; h = h->h_next)
-	{
-		if ( idx == h->h_hval ) {
-			THREAD_UNLOCK(hash);
-			return NULL;
-		}
-	}
-
-	/*
-	** Grow hash table if it's getting full.
-	*/
-
-	if ( ++htab->count > htab->size )
-		_hgrow(htab);
-
-	h = (HashEntry *)malloc(sizeof(HashEntry));
-	h->h_hval = idx;	
-	h->h_data = data;
-
-	hp = &htab->table[idx & htab->mask];
-	h->h_next = *hp;
-	*hp = h;
-
-	THREAD_UNLOCK(hash);
-
-	return h;
-}
-
-void
-HashRemove(Hash *htab, unsigned int idx)
-{
-	HashEntry *		h;
-	HashEntry **	hp;
-	
-	THREAD_LOCK(hash);
-	
-	/*
-	** Find item.
-	*/
-	for ( hp = &htab->table[idx & htab->mask] ; *hp != NULL && (*hp)->h_hval != idx ; )
-		hp = &(*hp)->h_next;
-
-	/*
-	 * Found item?
-	 */
-	if (*hp == NULL) {
-		THREAD_UNLOCK(hash);
-		return;
-	}
-	
-	/*
-	 * Update scan values
-	 */
-	if (htab->scan_entry == *hp)
-		htab->scan_entry = htab->scan_entry->h_next;
-	
-	/*
-	** Remove item.
-	*/
-	h = *hp;
-	*hp = (*hp)->h_next;
-	free(h);
-
-	htab->count--;
-	
-	THREAD_UNLOCK(hash);
-}
-
-void
-HashSet(Hash *htab)
-{
-	THREAD_LOCK(hash);
-	htab->scan = 0;
-	htab->scan_entry = NULL;
-	THREAD_UNLOCK(hash);
-}
-
-HashEntry *
-HashGet(Hash *htab)
-{
-	HashEntry *	h;
-	
-	THREAD_LOCK(hash);
-	
-	if ((h = htab->scan_entry) != NULL) {
-		htab->scan_entry = htab->scan_entry->h_next;
-		THREAD_UNLOCK(hash);
-		return h;
-	}
-	
-	while (htab->scan < htab->size) {
-		if ((h = htab->table[htab->scan++]) != NULL) {
-			htab->scan_entry = h->h_next;
-			THREAD_UNLOCK(hash);
-			return h;
-		}
-	}
-	
-	THREAD_UNLOCK(hash);
-	
-	return NULL;
-}	
-
-static void
-_hgrow(Hash *htab)
-{
-	unsigned int	i;
-	unsigned int	nsize;
-	unsigned int	nmask;
-	HashEntry **	ntab;
-
-	nsize = (unsigned int)(1 << ++htab->logsize);
-	nmask = nsize - 1;
-	ntab = (HashEntry **)malloc(nsize * sizeof(HashEntry *));
-
-	for ( i = 0 ; i < nsize ; i++ )
-		ntab[i] = (HashEntry *)NULL;
-
-	/*
-	** Move old entries to new table.
-	*/
-	for ( i = 0 ; i < htab->size ; i++ )
-	{
-		HashEntry *		h;
-		HashEntry *		h2;
-		HashEntry **	hp;
-
-		for ( h = htab->table[i] ; h != (HashEntry *)NULL ; )
-		{
-			h2 = h;
-			h = h->h_next;
-
-			hp = &ntab[h2->h_hval & nmask];
-			h2->h_next = *hp;
-			*hp = h2;
-		}
-	}
-
-	free(htab->table);
-
-	htab->table = ntab;
-	htab->size = nsize;
-	htab->mask = nmask;
-}

diff --git a/core/org.eclipse.ptp.utils/src/list.c b/core/org.eclipse.ptp.utils/src/list.c
deleted file mode 100644
index 0c2a669..0000000
--- a/core/org.eclipse.ptp.utils/src/list.c
+++ /dev/null

@@ -1,417 +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
- ******************************************************************************/
-
-/*
- * NOTE: This list implementation is not synchronized across list iteration. If there are two threads 
- * simultaneously accessing the list, then one thread may affect the other's list access. For instance, 
- * if thread 1 calls GetNextElement(), then thread 2 calls GetListElelemt(), then the next time thread 1 calls
- * GetListElement(), it will get the 3rd element in the list, not the 2nd. Also, if two threads are accessing 
- * objects in the list, and freeing data associated with those objects while traversing the list, then this 
- * may cause problems where thread 1 frees data that thread 2 is about to access.
- * 
- * Applications wishing to use threads to access lists in this way should provide functions that obtain 
- * and release a global lock on the list which prevents any other thread from accessing the list while 
- * that lock is held.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include	"compat.h"
-#include	"list.h"
-
-THREAD_DECL(list);
-
-/*
- * Create a new empty list
- */
-List *
-NewList(void)
-{
-	List *	l;
-
-	l = (List *)malloc(sizeof(List));
-
-	l->l_head = (ListElement *)NULL;
-	l->l_tail = &l->l_head;
-	l->l_nel = 0;
-	l->l_scan = NULL;
-
-	return l;
-}
-
-/*
- * Add new element to end of list.
- */
-void		
-AddToList(List *l, void *v)
-{
-	ListElement *	e;
-
-	if ( l == (List *)NULL)
-		return;
-
-	e = malloc(sizeof(ListElement));
-
-	e->l_value = v;
-	e->l_next = (ListElement *)NULL;
-	
-	THREAD_LOCK(list);
-	
-	*(l->l_tail) = e;
-	l->l_tail = &e->l_next;
-	l->l_nel++;
-	
-	THREAD_UNLOCK(list);
-}
-
-/*
- * Add new element to beginning of list (stack emulation).
- */
-void		
-AddFirst(List *l, void *v)
-{
-	ListElement *	e;
-	ListElement *	ep;
-
-	if (l == (List *)NULL)
-		return;
-
-	e = malloc(sizeof(ListElement));
-
-	e->l_value = v;
-	e->l_next = l->l_head;
-
-	THREAD_LOCK(list);
-	
-	/*
-	** Adjust tail if necessary.
-	*/
-	if
-	(
-		(ep = l->l_head) != (ListElement *)NULL 
-		&&
-		ep->l_next == (ListElement *)NULL 
-	)
-		l->l_tail = &ep->l_next;
-
-	l->l_head = e;
-	l->l_nel++;
-	
-	THREAD_UNLOCK(list);
-}
-
-/*
- * Insert new element before given element
- */
-void
-InsertBefore(List *l, void *val, void *new_val) 
-{
-	ListElement **	e;
-	ListElement *	ne;
-
-	if (l == (List *)NULL) {
-		return;
-	}
-	
-	/*
-	 * Find the element corresponding to val
-	 */
-	THREAD_LOCK(list);
-	for (e = &l->l_head ; *e != (ListElement *)NULL ; e = &(*e)->l_next) {
-		if ((*e)->l_value == val) {
-			break;
-		}
-	}
-	THREAD_UNLOCK(list);
-	
-	if (*e == NULL) {
-		return;
-	}
-
-	ne = malloc(sizeof(ListElement));
-
-	ne->l_value = new_val;
-	THREAD_LOCK(list);
-	ne->l_next = *e;
-	*e = ne;
-	l->l_nel++;
-	THREAD_UNLOCK(list);	
-}
-
-/*
- * Append source list to destination list
- */
-void
-AppendList(List *dst, List *src)
-{
-	void *	e;
-
-	SetList(src);
-
-	while ( (e = GetListElement(src)) != (void *)NULL)
-		AddToList(dst, e);
-}
-
-/*
- * Remove element from list
- */
-void		
-RemoveFromList(List *l, void *v)
-{
-	ListElement *	e;
-	ListElement *	ep;
-
-	THREAD_LOCK(list);
-	
-	if ( l == (List *)NULL || l->l_nel == 0 ) {
-		THREAD_UNLOCK(list);
-		return;
-	}
-
-	for ( ep = e = l->l_head ; e != (ListElement *)NULL ; )
-	{
-		if ( e->l_value != v )
-		{
-			if ( ep != e )
-				ep = ep->l_next;
-			e = e->l_next;
-			continue;
-		}
-
-		if ( l->l_scan == e )
-			l->l_scan = ep;
-
-		if ( ep == e )
-		{
-			l->l_head = e->l_next;
-
-			if ( e->l_next == (ListElement *)NULL )
-				l->l_tail = &l->l_head;
-		}
-		else
-		{
-			ep->l_next = e->l_next;
-
-			if ( e->l_next == (ListElement *)NULL )
-				l->l_tail = &ep->l_next;
-		}
-
-		free(e);
-
-		break;
-	}
-
-	l->l_nel--;
-	
-	THREAD_UNLOCK(list);
-}
-
-/*
- * Remove first element of list (stack emulation)
- */
-void *
-RemoveFirst(List *l)
-{
-	void *		v;
-	ListElement *	e;
-	ListElement *	ep;
-
-	THREAD_LOCK(list);
-
-	if ( l == (List *)NULL || l->l_nel == 0 ) {
-		THREAD_UNLOCK(list);
-		return (void *)NULL;
-	}
-
-	ep = e = l->l_head;
-
-	if ( l->l_scan == e )
-		l->l_scan = e->l_next;
-
-	l->l_head = e->l_next;
-
-	if ( e->l_next == (ListElement *)NULL )
-		l->l_tail = &l->l_head;
-
-	v = e->l_value;
-
-	free(e);
-
-	l->l_nel--;
-
-	THREAD_UNLOCK(list);
-
-	return v;
-}
-
-/*
- * Destroy list and its contents
- */
-void		
-DestroyList(List *l, void (*destroy)())
-{
-	ListElement *	ep;
-	ListElement *	en;
-
-	if ( l == (List *)NULL )
-		return;
-
-	THREAD_LOCK(list);
-
-	ep = l->l_head;
-
-	while ( ep != (ListElement *)NULL )
-	{
-		en = ep->l_next;
-
-		if ( destroy != (void (*)())NULL )
-			destroy(ep->l_value);
-
-		free(ep);
-
-		ep = en;
-	}
-
-	free(l);
-
-	THREAD_UNLOCK(list);
-}
-
-/*
- * Initialize list iterator
- */
-void
-SetList(List *l)
-{
-	if ( l == (List *)NULL )
-		return;
-
-	THREAD_LOCK(list);
-	l->l_scan = l->l_head;
-	THREAD_UNLOCK(list);
-}
-
-/*
- * Get next element from list. Returns NULL when there are no more elements
- */
-void *
-GetListElement(List *l)
-{
-	void *			val;
-	ListElement *	le;
-
-	THREAD_LOCK(list);
-	
-	if ( l == (List *)NULL || l->l_scan == (ListElement *)NULL ) {
-		THREAD_UNLOCK(list);
-		return (void *)NULL;
-	}
-
-	le = l->l_scan;
-	l->l_scan = le->l_next;
-	
-	val = le->l_value;
-	
-	THREAD_UNLOCK(list);
-	
-	return val;
-}
-
-/*
- * Get the first element in the list
- */
-void *
-GetFirstElement(List *l)
-{
-	void *	val;
-	
-	THREAD_LOCK(list);
-	
-	if ( l == (List *)NULL || l->l_head == (ListElement *) NULL) {
-		THREAD_UNLOCK(list);
-		return (void *)NULL;
-	}
-
-	val = l->l_head->l_value;
-	
-	THREAD_UNLOCK(list);
-	
-	return val;
-}
-
-/*
- * Check if the list is empty. Returns true (1) if it is.
- */
-int
-EmptyList(List *l)
-{
-	int	res;
-	
-	THREAD_LOCK(list);
-	res = (int)(l == (List *)NULL || l->l_nel == 0);
-	THREAD_UNLOCK(list);
-	
-	return res;
-}
-
-/*
- * Check if element is in the list
- */
-int
-InList(List *l, void *v)
-{
-	ListElement *	e;
-
-	THREAD_LOCK(list);
-
-	if ( l == (List *)NULL ) {
-		THREAD_UNLOCK(list);
-		return 0;
-	}
-
-	for ( e = l->l_head ; e != (ListElement *)NULL ; e = e->l_next ) {
-		if ( e->l_value == v ) {
-			THREAD_UNLOCK(list);
-			return 1;
-		}
-	}
-
-	THREAD_UNLOCK(list);
-
-	return 0;
-}
-
-/*
- * Get the number of elements in the list
- */
-int
-SizeOfList(List *l)
-{
-	int	res;
-	
-	if ( l == (List *)NULL )
-		return 0;
-
-	THREAD_LOCK(list);
-	res = l->l_nel;
-	THREAD_UNLOCK(list);
-	
-	return res;
-}

diff --git a/core/org.eclipse.ptp.utils/src/rangeset.c b/core/org.eclipse.ptp.utils/src/rangeset.c
deleted file mode 100644
index 76a628b..0000000
--- a/core/org.eclipse.ptp.utils/src/rangeset.c
+++ /dev/null

@@ -1,168 +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
- *******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "compat.h"
-#include "rangeset.h"
-
-#define INITIAL_SIZE	BUFSIZ
-
-static str_buf *
-new_buf(void)
-{
-	str_buf *	buf = (str_buf *)malloc(sizeof(str_buf));
-	buf->contents = (char *)malloc(INITIAL_SIZE);
-	buf->contents[0] = '\0';
-	buf->len = INITIAL_SIZE;
-	buf->count = 0;
-	return buf;
-}
-
-static void
-buf_printf(str_buf *buf, char *fmt, ...)
-{
-	int 	len;
-	char *	str;
-    va_list ap;
-    
-    va_start(ap, fmt);
-    vasprintf(&str, fmt, ap);
-    va_end(ap);
-
-	len = strlen(str);
-	
-	while (buf->count + len >= buf->len) {
-		buf->len *= 2;
-		buf->contents = (char *)realloc(buf->contents, buf->len);
-	}
-	
-	memcpy(buf->contents + buf->count, str, len);
-	buf->count += len;
-	buf->contents[buf->count] = '\0';
-	
-	free(str);
-}
-
-void
-reset_buf(str_buf *buf)
-{
-	buf->count = 0;
-}
-
-char *
-buf_contents(str_buf *buf)
-{
-	return buf->contents;
-}
-
-static void
-free_buf(str_buf *buf)
-{
-	free(buf->contents);
-	free(buf);
-}
-
-rangeset *
-new_rangeset(void)
-{
-	rangeset * set = (rangeset *)malloc(sizeof(rangeset));
-	set->elements = NewList();
-	set->buf = new_buf();
-	set->changed = 0;
-	return set;
-}
-
-static range *
-new_range(int low, int high)
-{
-	range * r = (range *)malloc(sizeof(range));
-	r->low = low;
-	r->high = high;
-	return r;
-}
-
-void
-insert_in_rangeset(rangeset *set, int val)
-{
-	range * r;
-	range *	element;
-	range * last = NULL;
-	
-	if (EmptyList(set->elements)) {
-		r = new_range(val, val);
-		AddToList(set->elements, r);
-	} else {
-		for (SetList(set->elements); (element = (range *)GetListElement(set->elements)) != NULL; ) {
-			if (val < element->low - 1) {
-				if (last == NULL) {
-					r = new_range(val, val);
-					AddFirst(set->elements, r);
-				} else if (last != NULL && val > last->high + 1) {
-					r = new_range(val, val);
-					InsertBefore(set->elements, element, r);
-				}
-			} else if (val == element->low - 1) {
-				element->low = val;
-			} else if (val == element->high + 1) {
-				element->high = val;
-			}
-			
-			last = element;
-		}
-		
-		if (val > last->high + 1) {
-			r = new_range(val, val);
-			AddToList(set->elements, r);
-		}
-	}
-	
-	set->changed = 1;
-}
-
-char *
-rangeset_to_string(rangeset *set)
-{
-	int			first = 1;
-	range *		element;
-	
-	if (set->changed) {
-		reset_buf(set->buf);
-		
-		for (SetList(set->elements); (element = (range *)GetListElement(set->elements)) != NULL; ) {
-			if (!first) {
-				buf_printf(set->buf, ",");
-			} else {
-				first = 0;
-			}
-			if (element->low == element->high) {
-				buf_printf(set->buf, "%d", element->low);
-			} else {
-				buf_printf(set->buf, "%d-%d", element->low, element->high);
-			}
-		}
-		
-		set->changed = 0;
-	}
-	
-	return buf_contents(set->buf);
-}
-
-void
-free_rangeset(rangeset *set)
-{
-	DestroyList(set->elements, free);
-	free_buf(set->buf);
-	free(set);
-}

diff --git a/core/org.eclipse.ptp.utils/src/rangeset_test.c b/core/org.eclipse.ptp.utils/src/rangeset_test.c
deleted file mode 100644
index 0fd6b68..0000000
--- a/core/org.eclipse.ptp.utils/src/rangeset_test.c
+++ /dev/null

@@ -1,43 +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
- *******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-
-#include "compat.h"
-#include "rangeset.h"
-
-int
-main(int argc, char *argv[])
-{
-	rangeset *	set = new_rangeset();
-
-	insert_in_rangeset(set, 5);
-	printf("rangeset = %s\n", rangeset_to_string(set));
-
-	insert_in_rangeset(set, 1);
-	insert_in_rangeset(set, 2);
-	insert_in_rangeset(set, 6);
-	insert_in_rangeset(set, 7);
-	insert_in_rangeset(set, 4);
-	insert_in_rangeset(set, 15);
-	insert_in_rangeset(set, 9);
-	insert_in_rangeset(set, 14);
-
-	printf("rangeset = %s\n", rangeset_to_string(set));
-	
-	free_rangeset(set);
-	
-	return 0;
-}

diff --git a/core/org.eclipse.ptp.utils/src/serdes.c b/core/org.eclipse.ptp.utils/src/serdes.c
deleted file mode 100644
index be67c6e..0000000
--- a/core/org.eclipse.ptp.utils/src/serdes.c
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#include "serdes.h"
-
-/*
- * Convert a hexadecimal string containing len digits into an integer.
- */
-unsigned int
-hex_str_to_int(char *str, int len, char **end)
-{
-	int				n;
-	unsigned int	val = 0;
-
-	for (n = 0; n < len && *str != '\0' && isxdigit(*str); n++, str++) {
-		val <<= 4;
-		val += digittoint(*str);
-	}
-
-	if (end != NULL) {
-		*end = str;
-	}
-
-	return val;
-}
-
-/*
- * Convert an integer to a hexadecimal string of len digits.
- */
-void
-int_to_hex_str(unsigned int val, char *str, int len, char **end)
-{
-	char *	buf = (char *)malloc(len+1);
-
-	/*
-	 * Need a separate buffer because sprintf adds a null to
-	 * the end of the string.
-	 */
-	sprintf(buf, "%0*x", len, val & 0xffffffff);
-
-	memcpy(str, buf, len);
-
-	if (end != NULL) {
-		*end = str + len;
-	}
-
-	free(buf);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/.classpath b/debug/org.eclipse.ptp.debug.core/.classpath
deleted file mode 100644
index 55d4f32..0000000
--- a/debug/org.eclipse.ptp.debug.core/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="pdi"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/debug/org.eclipse.ptp.debug.core/.cvsignore b/debug/org.eclipse.ptp.debug.core/.cvsignore
deleted file mode 100644
index f0a691e..0000000
--- a/debug/org.eclipse.ptp.debug.core/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.core/.project b/debug/org.eclipse.ptp.debug.core/.project
deleted file mode 100644
index c42b6a3..0000000
--- a/debug/org.eclipse.ptp.debug.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.debug.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/debug/org.eclipse.ptp.debug.core/.settings/org.eclipse.jdt.ui.prefs b/debug/org.eclipse.ptp.debug.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index de78733..0000000
--- a/debug/org.eclipse.ptp.debug.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Fri Jun 22 18:50:33 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\n * 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 *******************************************************************************/\n${filecomment}\n${package_declaration}\n\n/**\n * @author ${user}\n *\n */\n${typecomment}\n${type_declaration}\n</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/debug/org.eclipse.ptp.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.ptp.debug.core/META-INF/MANIFEST.MF
deleted file mode 100644
index bb09cfb..0000000
--- a/debug/org.eclipse.ptp.debug.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.debug.core; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.debug.core.PTPDebugCorePlugin
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.debug.core,
- org.eclipse.ptp.debug.core.event,
- org.eclipse.ptp.debug.core.launch,
- org.eclipse.ptp.debug.core.model,
- org.eclipse.ptp.debug.core.pdi,
- org.eclipse.ptp.debug.core.pdi.event,
- org.eclipse.ptp.debug.core.pdi.manager,
- org.eclipse.ptp.debug.core.pdi.model,
- org.eclipse.ptp.debug.core.pdi.model.aif,
- org.eclipse.ptp.debug.core.pdi.request,
- org.eclipse.ptp.debug.core.sourcelookup,
- org.eclipse.ptp.debug.internal.core.sourcelookup
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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

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

diff --git a/debug/org.eclipse.ptp.debug.core/build.properties b/debug/org.eclipse.ptp.debug.core/build.properties
deleted file mode 100644
index 324f5a5..0000000
--- a/debug/org.eclipse.ptp.debug.core/build.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-source.. = src/,\
-           pdi/
-output.. = bin/
-bin.includes = plugin.xml,\
-               .,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
-               
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIAddressLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIAddressLocation.java
deleted file mode 100644
index a218636..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIAddressLocation.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import java.math.BigInteger;
-
-/**
- * Represents the address location in the debuggable program
- * @author clement
- *
- */
-public interface IPDIAddressLocation extends IPDILocation {
-	/**
-	 * Returns the address of this location or null if the address is unknown
-	 * @return the address of this location
-	 */
-	BigInteger getAddress();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIBreakpointManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIBreakpointManagement.java
deleted file mode 100644
index b6372a79..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIBreakpointManagement.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-
-/**
- * Represents breakpoint action management. Each methods send to debugger and replied by event.
- * @author clement
- *
- */
-public interface IPDIBreakpointManagement {
-	/**
-	 * Requests to set a line breakpoint of specify process
-	 * @param tasks target process 
-	 * @param bpt line breakpoint to be set
- 	 * @throws PDIException on failure
-	 */
-	void setLineBreakpoint(BitList tasks, IPDILineBreakpoint bpt) throws PDIException;
-	
-	/**
-	 * Requests to set a function breakpoint of specify process
-	 * @param tasks target process
-	 * @param bpt function breakpoint to be set
-	 * @throws PDIException on failure
-	 */
-	void setFunctionBreakpoint(BitList tasks, IPDIFunctionBreakpoint bpt) throws PDIException;
-	
-	/**
-	 * Requests to set a address breakpoint of specify process
-	 * @param tasks target process
-	 * @param bpt address breakpoint to be set
-	 * @throws PDIException on failure
-	 */
-	void setAddressBreakpoint(BitList tasks, IPDIAddressBreakpoint bpt) throws PDIException;
-
-	/**
-	 * Requests to set a watchpoint of specify process
-	 * @param tasks target process
-	 * @param bpt watchpoint to be set
-	 * @throws PDIException on failure
-	 */
-	void setWatchpoint(BitList tasks, IPDIWatchpoint bpt) throws PDIException;
-	
-	/**
-	 * Requests to set an exceptionpoint of specify process
-	 * @param tasks target process
-	 * @param bpt an exceptionpoint to be set
-	 * @throws PDIException failure
-	 */
-	void setExceptionpoint(BitList tasks, IPDIExceptionpoint bpt) throws PDIException;
-	
-	/**
-	 * Requests to delete a given breakpoint of specify process
-	 * @param tasks target process
-	 * @param bpid breakpoint id to be deleted
-	 * @throws PDIException on failure
-	 */
-	void deleteBreakpoint(BitList tasks, int bpid) throws PDIException;
-	
-	/**
-	 * Requests to set enable / disable a given breakpoint of specify process  
-	 * @param tasks target process
-	 * @param bpid breakpoint id to be enabled / disabled
-	 * @param enabled true if enable
-	 * @throws PDIException on failure
-	 */
-	void setEnabledBreakpoint(BitList tasks, int bpid, boolean enabled) throws PDIException;
-	
-	/**
-	 * Requests to set condition on given breakpoint of specify process 
-	 * @param tasks target process
-	 * @param bpid breakpoint id to be set condition 
-	 * @param condition condition rule
-	 * @throws PDIException on failure
-	 */
-	void setConditionBreakpoint(BitList tasks, int bpid, String condition) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDICondition.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDICondition.java
deleted file mode 100644
index 434f3b0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDICondition.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * Represents a breakpoint condition
- * @author clement
- *
- */
-public interface IPDICondition {
-	/**
-	 * Returns the condition expression
-	 * @return the condition expression
-	 */
-	String getExpression();
-	
-	/**
-	 * Returns the ignore count of this condition
-	 * @return the ignore count of this condition
-	 */
-	int getIgnoreCount();
-	
-	/**
-	 * Return the string array of thread ids of this condition 
-	 * @return the string array of thread ids of this condition
-	 */
-	String[] getThreadIds();
-	
-	/**
-	 * Determines whether both conditions are the same
-	 * @param condition another condition to be compared
-	 * @return true if both conditions are the same
-	 */
-	boolean equals(IPDICondition condition);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIDebugger.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIDebugger.java
deleted file mode 100644
index 5a1d916..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIDebugger.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import java.util.List;
-import java.util.Observer;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Represents a number of methods to communication to a debugger
- * @author clement
- *
- */
-public interface IPDIDebugger extends 
-			IPDIBreakpointManagement, 
-			IPDIExecuteManagement, 
-			IPDIVariableManagement, 
-			IPDISignalManagement, 
-			IPDIStackframeManagement, 
-			IPDIThreadManagement, 
-			IPDIMemoryBlockManagement {
-	/**
-	 * Requests a special command for specify process
-	 * @param tasks target process
-	 * @param command command
-	 * @throws PDIException on failure
-	 */
-	public void commandRequest(BitList tasks, String command) throws PDIException;
-
-	/**
-	 * Disconnects observer from debugger
-	 * @param observer disconnect observer from debugger
-	 * @throws PDIException on failure
-	 */
-	public void disconnect(Observer observer) throws PDIException;
-	
-	/**
-	 * Returns an action when error occurred
-	 * 
-	 * @param errorCode error code
-	 * @return an action when error occurred
-	 */
-	public int getErrorAction(int errorCode);
-	
-	/**
-	 * Connects debugger and adds observer to debugger
-	 * 
-	 * @param monitor
-	 * @return true if connection is established
-	 * @throws PDIException on failure
-	 */
-	public boolean isConnected(IProgressMonitor monitor) throws PDIException;
-	
-	/**
-	 * Register observer for notify event from sdm
-	 * 
-	 * @param observer
-	 */
-	public void register(Observer observer);
-	
-	/**
-	 * Starts debugger
-	 * 
-	 * @throws PDIException on failure
-	 */
-	public void startDebugger(String app, String path, String dir, String[] args) throws PDIException;
-	
-	/**
-	 * Stops debugger
-	 * 
-	 * @throws PDIException on failure
-	 */
-	public void stopDebugger() throws PDIException;
-	
-	/**
-	 * Initialize the debugger. If args is an empty list, attempt to initialize the debugger
-	 * and add any necessary arguments to the list. If args is not empty, then attempt to
-	 * initialize the debugger using the supplied arguments.
-	 * 
-	 * @param configuration debugger launch configuration
-	 * @param args debugger arguments
-	 * @param monitor progress monitor
-	 * @throws PDIException
-	 */
-	public void initialize(ILaunchConfiguration configuration, List<String> args, IProgressMonitor monitor) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIExecuteManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIExecuteManagement.java
deleted file mode 100644
index 017cfb7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIExecuteManagement.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * Provides the ability to resume a thread.
- * Provides the ability to step into, over, and until from the current execution location.  Implementations must be non-blocking.
- * Provides the ability to step  return from the frame. Implementations must be non-blocking.
- * @author clement
- *
- */
-public interface IPDIExecuteManagement {
-	/**
-	 * Causes this target to resume its execution. 
-	 * if passSignal is <code>false</code> and the target was suspended by a signal when resuming the signal will be discarded
-	 * Has no effect on a target that is not suspended.
-	 * @param tasks target process
-	 * @param passSignal whether to discard the signal
-	 * @throws PDIException on failure
-	 */
-	void resume(BitList tasks, boolean passSignal) throws PDIException;
-
-	/**
-	 * Resume execution at location. Note the method does not change stackframe.
-	 * The result is undefined if it jumps outside of the stackframe.
-	 * Can  only be called when the associated target is suspended.
-	 * @param tasks target process
-	 * @param location
-	 * @throws PDIException on failure
-	 */
-	void resume(BitList tasks, IPDILocation location) throws PDIException;
-
-	/**
-	 * Resume execution where the program stopped but immediately give the signal.
-	 * @param tasks target process
-	 * @param signal
-	 * @throws PDIException on failure
-	 */
-	void resume(BitList tasks, IPDISignal signal) throws PDIException;
-
-	/**
-	 * Steps over the current source line. if count <= 0 it is a loop. Can only be called when the associated target/thread is suspended. 
-	 * @param tasks target process
-	 * @param count as in `step', but do so count times.
-	 * @throws PDIException on failure
-	 */
-	void stepOver(BitList tasks, int count) throws PDIException;
-
-	/**
-	 * Steps over the current machine instruction. Can only be called when the associated target/thread is suspended. if count <= 0 it is a loop.
-	 * @param tasks target process
-	 * @param count as in `stepOverInstruction', but do so count times.
-	 * @throws PDIException on failure
-	 */
-	void stepOverInstruction(BitList tasks, int count) throws PDIException;
-
-	/**
-	 * Steps into the current source line. Can only be called when the associated target/thread is suspended. if count <= 0 it is a loop.
-	 * @param tasks target process
-	 * @param count as in `step', but do so count times.
-	 * @throws PDIException on failure
-	 */
-	void stepInto(BitList tasks, int count) throws PDIException;
-
-	/**
-	 * Steps into the current machine instruction. Can only be called when the associated target/thread is suspended. if count <= 0 it is a loop.
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	void stepIntoInstruction(BitList tasks, int count) throws PDIException;
-
-	/**
-	 * Continues running until location is reached.
-	 * If the program will be suspended if attempt to exit the current frame.
-	 * Can only be called when the associated target is suspended.
-	 * @param tasks target process
-	 * @param location location
-	 * @throws PDIException on failure
-	 */
-	void stepUntil(BitList tasks, IPDILocation location) throws PDIException;
-	
-	/**
-	 * Continue execution until the frame return.
-	 * @param count as in `step', but do so count times.
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	void stepReturn(BitList tasks, int count) throws PDIException;
-
-	/**
-	 * Cancel execution of the frame and return with value.
-	 * value can be <code>null</code>, if no return value is needed.
-	 * Can only be called when the associated target/thread is suspended.
-	 * @param tasks target process
-	 * @param aif value use as the returning value.
-	 * @throws PDIException on failure
-	 */
-	void stepReturn(BitList tasks, IAIF aif) throws PDIException;
-	
-	/**
-	 * Causes this target/thread to suspend its execution. 
-	 * Has no effect on an already suspended thread.
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	void suspend(BitList tasks) throws PDIException;
-
-	/**
-	 * Requests to terminate of specify process
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	void terminate(BitList tasks) throws PDIException;	
-
-	/**
-	 * TODO not implemented yet in 2.0
-	 * Requests to restart of debugging
-	 * @param tasks
-	 * @throws PDIException on failure
-	 */
-	void restart(BitList tasks) throws PDIException;
-	
-	/**
-	 * Starts specify process
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	void start(BitList tasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFileLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFileLocation.java
deleted file mode 100644
index a085176..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFileLocation.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * Represents file location
- * @author clement
- *
- */
-public interface IPDIFileLocation extends IPDILocation {
-	/**
-	 * Returns the source file of this location or null if the source file is unknown
-	 * @return the source file of this location
-	 */
-	String getFile();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFormat.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFormat.java
deleted file mode 100644
index c40b86d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFormat.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * Format constants
- * @author clement
- *
- */
-public interface IPDIFormat {
-	final static int NATURAL = 0;
-	final static int DECIMAL = 1;
-	final static int BINARY  = 2;
-	final static int OCTAL = 3;
-	final static int HEXADECIMAL = 4;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFunctionLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFunctionLocation.java
deleted file mode 100644
index 15f4096..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIFunctionLocation.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * Represents function location in the debuggable program
- * @author clement
- *
- */
-public interface IPDIFunctionLocation extends IPDIFileLocation {
-	/**
-	 * Returns the function of this location or null if the function is unknown
-	 * @return function name of this location
-	 */
-	String getFunction();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILineLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILineLocation.java
deleted file mode 100644
index ed09bca..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILineLocation.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * Represents line location in the debuggable program
- * @author clement
- *
- */
-public interface IPDILineLocation extends IPDIFileLocation {
-	/**
-	 * Return the line number of this location or 0 if the line number is unknown
-	 * @return line number of this location
-	 */
-	int getLineNumber();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocation.java
deleted file mode 100644
index 0708f55..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocation.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * Represents a location in the debuggable program
- * @author clement
- *
- */
-public interface IPDILocation {
-	/**
-	 * Determines whether the both locations is in the same place
-	 * @param locaiton another location to compare 
-	 * @return true if both locations refer to the same place
-	 */
-	boolean equals(IPDILocation locaiton);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocator.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocator.java
deleted file mode 100644
index 81043f4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDILocator.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import java.math.BigInteger;
-
-/**
- * Represents the information of file, function, line, address
- * @author clement
- *
- */
-public interface IPDILocator extends IPDIFileLocation, IPDILineLocation, IPDIFunctionLocation, IPDIAddressLocation {
-	/**
-	 * @param oAddress
-	 * @return
-	 */
-	public boolean equalAddress(BigInteger oAddress);
-
-	/**
-	 * @param oFile
-	 * @return
-	 */
-	public boolean equalFile(String oFile);
-
-	/**
-	 * @param oFunction
-	 * @return
-	 */
-	public boolean equalFunction(String oFunction);
-
-	/**
-	 * @param oLine
-	 * @return
-	 */
-	public boolean equalLine(int oLine);
-
-	/**
-	 * @param locator
-	 * @return
-	 */
-	public boolean equals(IPDILocator locator);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIMemoryBlockManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIMemoryBlockManagement.java
deleted file mode 100644
index 0864b6a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIMemoryBlockManagement.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * The memory manager manages the collection of memory blocks specified for the debug session.
- * @author clement
- *
- */
-public interface IPDIMemoryBlockManagement {
-	/**
-	 * Requests to create data read memory
-	 * @param tasks target process
-	 * @param offset 
-	 * @param address
-	 * @param wordFormat HEXADECIMAL || OCTAL || BINARY || DECIMAL || RAW || NATURAL
-	 * @param wordSize The size of each memory word in bytes
-	 * @param rows
-	 * @param cols
-	 * @param asChar
-	 * @throws PDIException on failure
-	 */
-	void createDataReadMemory(BitList tasks, long offset, String address, int wordFormat, int wordSize, int rows, int cols, Character asChar) throws PDIException;
-	
-	/**
-	 * Requests to create data write memory
-	 * @param tasks target process
-	 * @param offset
-	 * @param address
-	 * @param wordFormat HEXADECIMAL || OCTAL || BINARY || DECIMAL || RAW || NATURAL
-	 * @param wordSize
-	 * @param value
-	 * @throws PDIException
-	 */
-	void createDataWriteMemory(BitList tasks, long offset, String address, int wordFormat, int wordSize, String value) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISession.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISession.java
deleted file mode 100644
index dac80fb..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISession.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIEventRequestManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDISignalManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDISourceManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIThreadManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory;
-
-/**
- * Represents a debug session
- * @author clement
- *
- */
-public interface IPDISession extends IPDISessionObject, IPDIExecuteManagement {
-	public static final int CONNECTING = 1;  
-	public static final int CONNECTED = 2;
-	public static final int STARTED = 3;
-	public static final int EXITING = 4;
-	public static final int EXITED = 5;
-	
-	/**
-	 * @param tasks
-	 */
-	public void processRunningEvent(BitList tasks);
-	
-	/**
-	 * @return
-	 */
-	public IPDISourceManager getSourceManager();
-	
-	/**
-	 * @param tasks
-	 * @param thread_id
-	 * @param vars
-	 */
-	public void processSupsendedEvent(BitList tasks, final int thread_id, final String[] vars);
-
-	/**
-	 * @param monitor
-	 * @param app
-	 * @param path
-	 * @param dir
-	 * @param args
-	 * @throws PDIException on failure
-	 */
-	public void connectToDebugger(IProgressMonitor monitor, String app, String path, String dir, String[] args) throws PDIException;
-	
-	/**
-	 * Causes this session to exit
-	 * @throws PDIException on failure
-	 */
-	public void exit() throws PDIException;
-	
-	/**
-	 * Returns debug target on given task id or null if target is not registered
-	 * @param tid task id
-	 * @return debug target
-	 * @throws PDIException on failure
-	 */
-	public IPDITarget findTarget(BitList task) throws PDIException;
-
-	/**
-	 * Returns the breakpoint manager for this session
-	 * @return IPDIBreakpointManager the breakpoint manager for this session
-	 */
-	public IPDIBreakpointManager getBreakpointManager();
-
-	/**
-	 * Returns a debugger for this session
-	 * @return a debugger for this session
-	 */
-	public IPDIDebugger getDebugger();
-		
-	/**
-	 * Get the factory to create events for this session
-	 * 
-	 * @return
-	 */
-	public IPDIEventFactory getEventFactory();
-	
-	/**
-	 * Returns the event manager for this session
-	 * @return IPDIEventManager the event request manager for this session
-	 */
-	public IPDIEventManager getEventManager();
-	
-	/**
-	 * Returns the event request manager for this session
-	 * @return IPDIEventRequestManager the event request manager for this session
-	 */
-	public IPDIEventRequestManager getEventRequestManager();
-	
-	/**
-	 * Returns the expression manager for this session
-	 * @return IPDIExpressionManager the expression manager for this session
-	 */
-	public IPDIExpressionManager getExpressionManager();
-
-	/** 
-	 * Returns job id associated with this session
-	 * @return job id
-	 */
-	public String getJobID();
-	
-	/**
-	 * Returns the memory manager for this session
-	 * @return IPDIMemoryManager the memory manager for this session
-	 */
-	public IPDIMemoryManager getMemoryManager();
-
-	/**
-	 * Get the factory to create model elements for this session
-	 * 
-	 * @return
-	 */
-	public IPDIModelFactory getModelFactory();
-
-	/**
-	 * Returns the register manager for this session
-	 * @return IPDIRegisterManager the register manager for this session
-	 */
-	public IPDIRegisterManager getRegisterManager();
-
-	/**
-	 * Returns request factory
-	 * @return request factory
-	 */
-	public IPDIRequestFactory getRequestFactory();
-
-	/**
-	 * Returns the signal manager for this session
-	 * @return IPDISignalManager the signal manager for this session
-	 */
-	public IPDISignalManager getSignalManager();
-
-	/**
-	 * Returns current status of this session
-	 * @return current status of this session
-	 */
-	public int getStatus();
-	
-	/**
-	 * Returns the target manager for this session
-	 * @return IPDITargetManager the target manager for this session
-	 */
-	public IPDITargetManager getTargetManager();
-
-	/**
-	 * Returns the task manager for this session
-	 * @return IPDITaskManager the task manager for this session
-	 */
-	public IPDITaskManager getTaskManager();
-	
-	/**
-	 * Returns all tasks of this session
-	 * @return all tasks of this session
-	 */
-	public BitList getTasks();
-	
-	/**
-	 * Returns the thread manager for this session
-	 * @return IPDIThreadManager the thread manager for this session
-	 */
-	public IPDIThreadManager getThreadManager();
-	
-	/**
-	 * @return
-	 */
-	public long getTimeout();
-	
-	/**
-	 * Returns total tasks in this session
-	 * @return total tasks in this session
-	 */
-	public int getTotalTasks();
-	
-	/**
-	 * Returns the variable manager for this session
-	 * @return IPDIVariableManager the variable manager for this session
-	 */
-	public IPDIVariableManager getVariableManager();
-	
-	/**
-	 * Returns whether this target/thread is currently suspended.
-	 * @param tasks target process
-	 * @return whether this target/thread is currently suspended
-	 */
-	public boolean isSuspended(BitList tasks);
-	
-	/**
-	 * Returns whether this target/thread is currently terminated.
-	 * @param tasks target process
-	 * @return whether this target/thread is currently terminated
-	 */
-	public boolean isTerminated(BitList tasks);
-	
-	/**
-	 * @param runnable
-	 */
-	public void queueRunnable(Runnable runnable);
-	
-	/**
-	 * Sets a timeout for request
-	 */
-	public void setRequestTimeout(long timeout);
-	
-	/**
-	 * Set status for session
-	 * @param status status of current session
-	 */
-	public void setStatus(int status);
-	
-	/**
-	 * Shutdown this session 
-	 * @param force whether force to terminate debugger 
-	 */
-	public void shutdown(boolean force);
-	
-	/**
-	 * Checks whether request tasks can do step return
-	 * @param tasks
-	 * @throws PDIException
-	 */
-	public void validateStepReturn(BitList tasks) throws PDIException;	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISessionObject.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISessionObject.java
deleted file mode 100644
index 8ea847f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISessionObject.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * Represents an object associated with a debug session
- * @author clement
- *
- */
-public interface IPDISessionObject extends IPDISet {
-	/**
-	 * Returns debug session
-	 * @return the debug session
-	 */
-	IPDISession getSession();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISet.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISet.java
deleted file mode 100644
index ace2f35..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISet.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Represents a set of processes in PDI model
- * @author clement
- */
-public interface IPDISet {
-	/**
-	 * Returns a list of Task IDs
-	 * @return BitList of all processes
-	 */
-	BitList getTasks();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISignalManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISignalManagement.java
deleted file mode 100644
index 4486d3f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDISignalManagement.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Represents signal management
- * @author clement
- *
- */
-public interface IPDISignalManagement {
-	/**
-	 * Requests to retrieve a list signals information with given signal name of specify process
-	 * @param tasks target process 
-	 * @param name name of signal
-	 * @throws PDIException on failure
-	 */
-	void listSignals(BitList tasks, String name) throws PDIException;
-	
-	/**
-	 * Requests to retrieve signal information with given argument of specify process
-	 * @param tasks target process
-	 * @param arg argument 
-	 * @throws PDIException on failure
-	 * @deprecated
-	 */
-	void retrieveSignalInfo(BitList tasks, String arg) throws PDIException;	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIStackframeManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIStackframeManagement.java
deleted file mode 100644
index 314bc88..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIStackframeManagement.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Represents stackframe management
- * @author clement
- *
- */
-public interface IPDIStackframeManagement {
-	/**
-	 * Lists stack frames with given range of frames
-	 * @param tasks target process
-	 * @param low lower of frame
-	 * @param depth depth of frame
-	 * @throws PDIException on failure
-	 */
-	void listStackFrames(BitList tasks, int low, int depth) throws PDIException;
-	
-	/**
-	 * Sets current stack frame with given level
-	 * @param tasks target process
-	 * @param level level of stack frame
-	 * @throws PDIException on failure
-	 */
-	void setCurrentStackFrame(BitList tasks, int level) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIThreadManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIThreadManagement.java
deleted file mode 100644
index 2f68925..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIThreadManagement.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Represents thread management
- * @author clement
- *
- */
-public interface IPDIThreadManagement {
-	/**
-	 * Requests to retrieve information of threads of specify process
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	void listInfoThreads(BitList tasks) throws PDIException;
-	
-	/**
-	 * Requests to select thread with given thread id of specify process
-	 * @param tasks target process
-	 * @param tid thread id to be selected
-	 * @throws PDIException on failure
-	 */
-	void selectThread(BitList tasks, int tid) throws PDIException;
-	
-	/**
-	 * Requests to retrieve a stack info depth of specify process
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	void retrieveStackInfoDepth(BitList tasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDITraceSnapshot.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDITraceSnapshot.java
deleted file mode 100644
index a3114f6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDITraceSnapshot.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-/**
- * TODO
- * Represents a trace snapshot in the debug session
- * @author clement
- *
- */
-public interface IPDITraceSnapshot extends IPDISessionObject {
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIVariableManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIVariableManagement.java
deleted file mode 100644
index 9db476f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/IPDIVariableManagement.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Provides the ability to evaluated variable
- * @author clement
- *
- */
-public interface IPDIVariableManagement {
-	/**
-	 * Requests IAIF value of given variable name
-	 * @param tasks target process
-	 * @param expr variable name
-	 * @throws PDIException on failure
-	 */
-	void retrieveAIF(BitList tasks, String expr) throws PDIException;
-
-	/**
-	 * Requests partial IAIF value of given variable name
-	 * @param tasks target process
-	 * @param expr variable name
-	 * @param key variable key
-	 * @param listChildren is list a children?
-	 * @param express is expression?
-	 * @throws PDIException on failure
-	 */
-	void retrievePartialAIF(BitList tasks, String expr, String key, boolean listChildren, boolean express) throws PDIException;
-
-	/**
-	 * Requests String value of given variable name
-	 * @param tasks target process
-	 * @param expr variable name
-	 * @throws PDIException on failure
-	 */
-	void evaluateExpression(BitList tasks, String expr) throws PDIException;
-	
-	/**
-	 * Requests String value of given variable name 
-	 * @param tasks target process
-	 * @param expr variable name
-	 * @throws PDIException on failure
-	 */
-	void dataEvaluateExpression(BitList tasks, String expr) throws PDIException;
-	
-	/**
-	 * Requests IAIFType of given variable name
-	 * @param tasks target process
-	 * @param var variable name
-	 * @throws PDIException on failure
-	 */
-	void retrieveVariableType(BitList tasks, String var) throws PDIException;
-	
-	/**
-	 * Request a list of argument for a range of level
-	 * @param tasks target process
-	 * @param low minimum level
-	 * @param high maximum level
-	 * @throws PDIException failure
-	 */
-	void listArguments(BitList tasks, int low, int high) throws PDIException;
-	
-	/**
-	 * Requests a list of local variables 
-	 * @param tasks target process
-	 * @throws PDIException on failure 
-	 */
-	void listLocalVariables(BitList tasks) throws PDIException;
-	
-	/**
-	 * Requests a list of global variables
-	 * @param tasks target process 
-	 * @throws PDIException on failure
-	 */
-	void listGlobalVariables(BitList tasks) throws PDIException;
-
-	/**
-	 * Requests to delete watching variable
-	 * @param tasks target process
-	 * @param var watching variable name
-	 * @throws PDIException on failure
-	 */
-	void deleteVariable(BitList tasks, String var) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIException.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIException.java
deleted file mode 100644
index fb56d8e..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIException.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Thrown to indicate some unexpected error has occurred
- * @author clement
- *
- */
-public class PDIException extends Exception {
-	/**
-	 * All serializable objects should have a stable serialVersionUID
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	protected BitList tasks;
-	/**
-     * Constructs a new exception.
-	 * @param tasks specify tasks throw exception 
-	 */
-	public PDIException(BitList tasks) {
-		super();
-		this.tasks = tasks;
-	}
-	/**
-     * Constructs a new exception.
-	 * @param tasks specify tasks throw exception 
-     * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
-	 */
-	public PDIException(BitList tasks, String message) {
-		super(message);
-		this.tasks = tasks;
-	}
-	
-	public BitList getTasks() {
-		return tasks;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIInternalException.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIInternalException.java
deleted file mode 100644
index 14f6409..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDIInternalException.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Thrown to indicate some unexpected internal error has occurred 
- * @author clement
- * 
- */
-public class PDIInternalException extends RuntimeException {
-	/**
-	 * All serializable objects should have a stable serialVersionUID
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	protected BitList tasks;
-	/**
-     * Constructs a new exception.
-	 * @param tasks specify tasks throw exception 
-	 */
-	public PDIInternalException(BitList tasks) {
-		super();
-		this.tasks = tasks;
-	}
-	/**
-     * Constructs a new exception.
-	 * @param tasks specify tasks throw exception 
-     * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
-	 */
-	public PDIInternalException(BitList tasks, String message) {
-		super(message);
-		this.tasks = tasks;
-	}
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDILocationFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDILocationFactory.java
deleted file mode 100644
index 8e6ef80..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/PDILocationFactory.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.internal.core.pdi.AddressLocation;
-import org.eclipse.ptp.debug.internal.core.pdi.FileLocation;
-import org.eclipse.ptp.debug.internal.core.pdi.FunctionLocation;
-import org.eclipse.ptp.debug.internal.core.pdi.LineLocation;
-import org.eclipse.ptp.debug.internal.core.pdi.Locator;
-
-/**
- * @author greg
- *
- */
-public class PDILocationFactory {
-	/**
-	 * @param addr
-	 * @return
-	 */
-	public static IPDIAddressLocation newAddressLocation(BigInteger addr) {
-		return new AddressLocation(addr);
-	}
-	
-	/**
-	 * @param file
-	 * @return
-	 */
-	public static IPDIFileLocation newFileLocationLocation(String file) {
-		return new FileLocation(file);
-	}
-
-	/**
-	 * @param file
-	 * @param function
-	 * @return
-	 */
-	public static IPDIFunctionLocation newFunctionLocation(String file, String function) {
-		return new FunctionLocation(file, function);
-	}
-
-	/**
-	 * @param file
-	 * @param line
-	 * @return
-	 */
-	public static IPDILineLocation newLineLocation(String file, int line) {
-		return new LineLocation(file, line);
-	}
-
-	/**
-	 * @param file
-	 * @param function
-	 * @param line
-	 * @param address
-	 * @return
-	 */
-	public static IPDILocator newLocator(String file, String function, int line, BigInteger address) {
-		return new Locator(file, function, line, address);
-	}
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/Session.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/Session.java
deleted file mode 100644
index d76a767..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/Session.java
+++ /dev/null

@@ -1,800 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import java.util.Vector;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIEventRequestManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDISignalManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDISourceManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIThreadManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStartDebuggerRequest;
-
-/**
- * @author clement
- *
- */
-public class Session implements IPDISession {
-	private IPDIBreakpointManager breakpointManager;
-	private IPDIEventManager eventManager;
-	private IPDIEventRequestManager eventRequestManager;
-	private IPDITaskManager taskManager;
-	private IPDITargetManager targetManager; 
-	private IPDIThreadManager threadManager; 
-	private IPDIExpressionManager expressionManager;
-	private IPDIVariableManager variableManager;
-	private IPDISourceManager sourceManager;
-	private IPDIMemoryManager memoryManager;
-	private IPDISignalManager signalManager;
-	private IPDIRegisterManager registerManager;
-	private IPDIDebugger debugger = null;
-	private String job_id;
-	private int total_tasks = 0;
-	private int status;
-	private long timeout = 30000;
-	private NotifyJob notifyJob = null;
-	private IPDIRequestFactory requestFactory;
-	private IPDIEventFactory eventFactory;
-	private IPDIModelFactory modelFactory;
-	private final ReentrantLock	waitLock = new ReentrantLock();
-	private ILaunchConfiguration config = null;
-	
-	public Session(IPDIManagerFactory managerFactory,IPDIRequestFactory requestFactory, 
-			IPDIEventFactory eventFactory, IPDIModelFactory modelFactory, 
-			ILaunchConfiguration config, long timeout, IPDIDebugger debugger, 
-			String job_id, int total_tasks) throws PDIException {
-		this.config = config;
-		this.timeout = timeout;
-		this.debugger = debugger;
-		this.job_id = job_id;
-		this.total_tasks = total_tasks;
-		this.notifyJob = new NotifyJob();
-		this.requestFactory = requestFactory;
-		this.eventFactory = eventFactory;
-		this.modelFactory = modelFactory;
-		
-		setEventRequestManager(managerFactory.newEventRequestManager(this));
-		setEventManager(managerFactory.newEventManager(this));
-		setTaskManager(managerFactory.newTaskManager(this));
-		setTargetManager(managerFactory.newTargetManager(this));
-		setThreadManager(managerFactory.newThreadManager(this));
-		setBreakpointManager(managerFactory.newBreakpointManager(this));
-		setExpressionManager(managerFactory.newExpressionManager(this));
-		setVariableManager(managerFactory.newVariableManager(this));
-		setSourceManager(managerFactory.newSourceManager(this));
-		setMemeoryManager(managerFactory.newMemoryManager(this));
-		setSignalManager(managerFactory.newSignalManager(this));
-		setRegisterManager(managerFactory.newRegisterManager(this));
-	}
-	
-	/**
-	 * @return
-	 */
-	public ILaunchConfiguration getConfiguration() {
-		return config;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getRequestFactory()
-	 */
-	public IPDIRequestFactory getRequestFactory() {
-		return requestFactory;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getTimeout()
-	 */
-	public long getTimeout() {
-		return timeout;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#setRequestTimeout(long)
-	 */
-	public void setRequestTimeout(long timeout) {
-		this.timeout = timeout;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#connectToDebugger(org.eclipse.core.runtime.IProgressMonitor, java.lang.String, java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public void connectToDebugger(IProgressMonitor monitor, String app, String path, String dir, String[] args) throws PDIException {
-		setStatus(CONNECTING);
-		if (!getDebugger().isConnected(monitor)) {
-			throw new PDIException(getTasks(), "Cannot connect to debugger");
-		}
-		getDebugger().register(eventManager);
-		monitor.beginTask("Initialising debug processes ("+total_tasks+")...", total_tasks);
-		IPDIStartDebuggerRequest request = getRequestFactory().getStartDebuggerRequest(getTasks(), app, path, dir, args);
-		eventRequestManager.addEventRequest(request);
-		request.waitUntilCompleted(null, monitor);
-		setStatus(CONNECTED);
-		eventManager.fireEvent(getEventFactory().newStartedEvent(this, getTasks()));
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setEventRequestManager(IPDIEventRequestManager manager) {
-		eventRequestManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setEventManager(IPDIEventManager manager) {
-		eventManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setTaskManager(IPDITaskManager manager) {
-		taskManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setTargetManager(IPDITargetManager manager) {
-		targetManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setThreadManager(IPDIThreadManager manager) {
-		threadManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setBreakpointManager(IPDIBreakpointManager manager) {
-		breakpointManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setExpressionManager(IPDIExpressionManager manager) {
-		expressionManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setVariableManager(IPDIVariableManager manager) {
-		variableManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setSourceManager(IPDISourceManager manager) {
-		sourceManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setMemeoryManager(IPDIMemoryManager manager) {
-		memoryManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setSignalManager(IPDISignalManager manager) {
-		signalManager = manager;
-	}
-	
-	/**
-	 * @param manager
-	 */
-	protected void setRegisterManager(IPDIRegisterManager manager) {
-		registerManager = manager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getEventRequestManager()
-	 */
-	public IPDIEventRequestManager getEventRequestManager() {
-		return eventRequestManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getEventManager()
-	 */
-	public IPDIEventManager getEventManager() {
-		return eventManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getTaskManager()
-	 */
-	public IPDITaskManager getTaskManager() {
-		return taskManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getThreadManager()
-	 */
-	public IPDIThreadManager getThreadManager() {
-		return threadManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getTargetManager()
-	 */
-	public IPDITargetManager getTargetManager() {
-		return targetManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getBreakpointManager()
-	 */
-	public IPDIBreakpointManager getBreakpointManager() {
-		return breakpointManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getExpressionManager()
-	 */
-	public IPDIExpressionManager getExpressionManager() {
-		return expressionManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getVariableManager()
-	 */
-	public IPDIVariableManager getVariableManager() {
-		return variableManager;
-	}
-	
-	/**
-	 * @return
-	 */
-	public IPDISourceManager getSourceManager() {
-		return sourceManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getMemoryManager()
-	 */
-	public IPDIMemoryManager getMemoryManager() {
-		return memoryManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getSignalManager()
-	 */
-	public IPDISignalManager getSignalManager() {
-		return signalManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getRegisterManager()
-	 */
-	public IPDIRegisterManager getRegisterManager() {
-		return registerManager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#shutdown(boolean)
-	 */
-	public void shutdown(boolean force) {
-		try {
-			if (!force) {
-				exit();
-			}
-			else
-				setStatus(EXITING);
-			debugger.disconnect(eventManager);
-		}
-		catch (PDIException e) {
-			e.printStackTrace();
-		}
-		finally {
-			variableManager.shutdown();
-			expressionManager.shutdown();
-			breakpointManager.shutdown();
-			eventManager.shutdown();
-			sourceManager.shutdown();
-			taskManager.shutdown();
-			targetManager.shutdown();
-			threadManager.shutdown();
-			memoryManager.shutdown();
-			signalManager.shutdown();
-			eventRequestManager.shutdown();
-			notifyJob.schedule();
-		}
-	}
-	
-	/*******************************************
-	 * IPDIExecuteManagement
-	 *******************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#restart(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void restart(BitList tasks) throws PDIException {
-		checkStatus();
-		throw new PDIException(tasks, "Not implement restart() yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#start(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void start(BitList tasks) throws PDIException {
-		checkStatus();
-		getEventRequestManager().addEventRequest(getRequestFactory().getResumeRequest(tasks, false));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#resume(org.eclipse.ptp.core.util.BitList, boolean)
-	 */
-	public void resume(BitList tasks, boolean passSignal) throws PDIException {
-		checkStatus();
-		if (passSignal)
-			throw new PDIException(tasks, "Not implment resume() - Pass Signal yet");
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		getEventRequestManager().addEventRequest(getRequestFactory().getResumeRequest(tasks, passSignal));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#resume(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.IPDILocation)
-	 */
-	public void resume(BitList tasks, IPDILocation location) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		throw new PDIException(tasks, "Not implment resume(IPDILocation) yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#resume(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDISignal)
-	 */
-	public void resume(BitList tasks, IPDISignal signal) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		throw new PDIException(tasks, "Not implment resume(IPDISignal) yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepInto(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepInto(BitList tasks, int count) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		getEventRequestManager().addEventRequest(getRequestFactory().getStepIntoRequest(tasks, count));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepIntoInstruction(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepIntoInstruction(BitList tasks, int count) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		throw new PDIException(tasks, "Not implment stepIntoInstruction() yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepOver(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepOver(BitList tasks, int count) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		getEventRequestManager().addEventRequest(getRequestFactory().getStepOverRequest(tasks, count));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepOverInstruction(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepOverInstruction(BitList tasks, int count) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		throw new PDIException(tasks, "Not implment stepOverInstruction() yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepReturn(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.aif.IAIF)
-	 */
-	public void stepReturn(BitList tasks, IAIF aif) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		throw new PDIException(tasks, "Not implment stepReturn(IAIF) yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepReturn(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepReturn(BitList tasks, int count) throws PDIException {
-		checkStatus();
-		taskManager.getCanStepReturnTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		getEventRequestManager().addEventRequest(getRequestFactory().getStepFinishRequest(tasks, count));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepUntil(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.IPDILocation)
-	 */
-	public void stepUntil(BitList tasks, IPDILocation location) throws PDIException {
-		checkStatus();
-		taskManager.getSuspendedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No suspended processes found");
-		throw new PDIException(tasks, "Not implment stepUntil(IPDILocation) yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#suspend(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void suspend(BitList tasks) throws PDIException {
-		checkStatus();
-		taskManager.getRunningTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "No running processes found");
-		getEventRequestManager().addEventRequest(getRequestFactory().getSuspendRequest(tasks));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#terminate(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void terminate(BitList tasks) throws PDIException {
-		checkStatus();
-		taskManager.getNonTerminatedTasks(tasks);
-		if (tasks.isEmpty())
-			throw new PDIException(tasks, "All processes have been terminated");
-
-		BitList nonTerTasks = tasks.copy();
-		taskManager.getRunningTasks(nonTerTasks);
-		if (!nonTerTasks.isEmpty()) {
-			getEventRequestManager().addEventRequest(getRequestFactory().getSuspendRequest(nonTerTasks, false));
-		}
-		getEventRequestManager().addEventRequest(getRequestFactory().getTerminateRequest(tasks));
-		taskManager.setPendingTasks(true, tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#validateStepReturn(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void validateStepReturn(BitList tasks) throws PDIException {
-		/*
-		taskManager.getUnregisteredTasks(tasks);
-		if (!tasks.isEmpty()) {
-			getEventRequestManager().addEventRequest(getRequestFactory().getGetStackInfoDepthRequest(tasks));
-			//FIXME: for testing
-			//getEventRequestManager().addEventRequest(getRequestFactory().getTerminateRequest(tasks.copy()));
-		}
-		*/
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#exit()
-	 */
-	public void exit() throws PDIException {
-		if (status != EXITING && status != EXITED) {
-			setStatus(EXITING);
-			eventRequestManager.cleanEventRequests();
-			BitList tasks = getTasks();
-			taskManager.getRunningTasks(tasks);
-			if (!tasks.isEmpty()) {
-				getEventRequestManager().addEventRequest(getRequestFactory().getSuspendRequest(tasks, false));
-			}
-			tasks = getTasks();
-			taskManager.getNonTerminatedTasks(tasks);
-			if (!tasks.isEmpty())
-				getEventRequestManager().addEventRequest(getRequestFactory().getTerminateRequest(tasks));
-			
-			getEventRequestManager().addEventRequest(getRequestFactory().getStopDebuggerRequest(new BitList(total_tasks)));
-			taskManager.setPendingTasks(true, tasks);
-		}
-	}
-	
-	/*******************************************
-	 * IPDISession
-	 *******************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getDebugger()
-	 */
-	public IPDIDebugger getDebugger() {
-		return debugger;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getJobID()
-	 */
-	public String getJobID() {
-		return job_id;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#isTerminated(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean isTerminated(BitList tasks) {
-		return taskManager.isAllTerminated(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#isSuspended(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean isSuspended(BitList tasks) {
-		return taskManager.isAllSuspended(tasks);
-	}
-	
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public boolean isRunning(BitList tasks) {
-		return taskManager.isAllRunning(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getTasks()
-	 */
-	public BitList getTasks() {
-		BitList tasks = new BitList(total_tasks);
-		tasks.set(0, total_tasks);
-		return tasks;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getTotalTasks()
-	 */
-	public int getTotalTasks() {
-		return total_tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISessionObject#getSession()
-	 */
-	public IPDISession getSession() {
-		return this;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#setStatus(int)
-	 */
-	public void setStatus(int status) {
-		waitLock.lock();
-		try {
-			this.status = status;
-		}
-		finally {
-			waitLock.unlock();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getStatus()
-	 */
-	public int getStatus() {
-		return status;
-	}
-	
-	/**
-	 * @throws PDIException
-	 */
-	protected void checkStatus() throws PDIException {
-		if (status == EXITING || status == EXITED)
-			throw new PDIException(null, "Cannot process for your request due to session is exiting or exited.");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#findTarget(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDITarget findTarget(BitList qTasks) throws PDIException {
-		IPDITarget target = targetManager.getTarget(qTasks);
-		if (target == null)
-			throw new PDIException(qTasks, "No target found.");
-		return target;
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	public boolean isTarget(BitList qTasks) {
-		return (targetManager.getTarget(qTasks) != null);
-	}
-	
-	/**********************************************
-	 * process on running or suspended 
-	 **********************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#processRunningEvent(org.eclipse.ptp.core.util.BitList)
-	 */
-	public synchronized void processRunningEvent(BitList tasks) {
-		IPDITarget[] targets = targetManager.getTargets();
-		for (final IPDITarget target : targets) {
-			if (target.getTasks().intersects(tasks)) {
-				Runnable runnable = new Runnable() {
-					public void run() {
-						target.setSupended(false);
-					}
-				};
-				queueRunnable(runnable);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#processSupsendedEvent(org.eclipse.ptp.core.util.BitList, int, java.lang.String[])
-	 */
-	public synchronized void processSupsendedEvent(BitList tasks, final int thread_id, final String[] vars) {
-		IPDITarget[] targets = targetManager.getTargets();
-		for (final IPDITarget target : targets) {
-			if (target.getTasks().intersects(tasks)) {
-				Runnable runnable = new Runnable() {
-					public void run() {
-						target.setSupended(true);
-						target.updateState(thread_id);
-						try {
-							IPDIThread pthread = target.getCurrentThread();
-							if (pthread == null)
-								return;
-							
-							pthread.getCurrentStackFrame();
-						} catch (PDIException e) {
-							return;
-						}
-
-						try {
-							if (variableManager.isAutoUpdate()) {
-								variableManager.update(target.getTasks(), vars);
-							}
-							if (expressionManager.isAutoUpdate()) { 
-								expressionManager.update(target.getTasks(), vars);
-							}
-							if (registerManager.isAutoUpdate()) {
-								registerManager.update(target.getTasks());
-							}
-							if (memoryManager.isAutoUpdate()) {
-								memoryManager.update(target.getTasks());
-							}
-							if (breakpointManager.isAutoUpdate()) {
-								breakpointManager.update(target.getTasks());
-							}
-							if (signalManager.isAutoUpdate()) {
-								signalManager.update(target.getTasks());
-							}
-							if (sourceManager.isAutoUpdate()) {
-								sourceManager.update(target.getTasks());
-							}
-						} catch (PDIException e) {
-							return;
-						}
-					}
-				};
-				queueRunnable(runnable);
-			}
-		}
-	}
-	
-	/*************************************************
-	 * Notify Job
-	 *************************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#queueRunnable(java.lang.Runnable)
-	 */
-	public void queueRunnable(Runnable runnable) {
-		notifyJob.addRunnable(runnable);
-	}
-	
-	class NotifyJob extends Job {
-		private Vector<Runnable> fRunnables;
-		public NotifyJob() {
-			super("PTP Notify Job");
-			setSystem(true);
-			fRunnables = new Vector<Runnable>(10);
-		}
-		public void addRunnable(Runnable runnable) {
-			synchronized (fRunnables) {
-				fRunnables.add(runnable);
-			}
-			schedule();
-		}
-		public boolean shouldRun() {
-			return !fRunnables.isEmpty();
-		}
-		public IStatus run(IProgressMonitor monitor) {
-			Runnable[] runnables;
-			synchronized (fRunnables) {
-				runnables = fRunnables.toArray(new Runnable[0]);
-				fRunnables.clear();
-			}
-			MultiStatus failed = null;
-			monitor.beginTask(getName(), runnables.length);
-			PDebugUtils.println("Msg: NotifyJob - size of runnables: " + runnables.length);
-			for (Runnable runnable : runnables) {
-				try {
-					runnable.run();
-				}
-				catch (Exception e) {
-					if (failed == null)
-						failed = new MultiStatus(PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, "Event notify error", null);
-					failed.add(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, "Event notify error", e));
-				}
-				monitor.worked(1);
-			}
-			monitor.done();
-			if (failed == null)
-				return Status.OK_STATUS;
-			
-			return failed;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getEventFactory()
-	 */
-	public IPDIEventFactory getEventFactory() {
-		return eventFactory;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISession#getModelFactory()
-	 */
-	public IPDIModelFactory getModelFactory() {
-		return modelFactory;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/SessionObject.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/SessionObject.java
deleted file mode 100644
index 5f917c4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/SessionObject.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi;
-
-import org.eclipse.ptp.core.util.BitList;
-
-
-/**
- * @author Clement chu
- *
- */
-public class SessionObject implements IPDISessionObject {
-	protected IPDISession session = null;
-	protected BitList tasks = null;
-
-	public SessionObject(IPDISession s, BitList t) {
-		this.session = s;
-		if (t != null)
-			this.tasks = t.copy();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISessionObject#getSession()
-	 */
-	public IPDISession getSession() {
-		return session;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISet#getTasks()
-	 */
-	public BitList getTasks() {
-		return tasks;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/AbstractEventFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/AbstractEventFactory.java
deleted file mode 100644
index 887d1d8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/AbstractEventFactory.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.internal.core.pdi.event.BreakpointInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.ChangedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.ConnectedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.CreatedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.DataReadMemoryInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.DestroyedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.DisconnectedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.EndSteppingRangeInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.ErrorEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.ErrorInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.ExitInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.LocationReachedInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.MemoryBlockInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.ResumedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.SignalInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.StartedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.SuspendedEvent;
-import org.eclipse.ptp.debug.internal.core.pdi.event.ThreadInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.event.VariableInfo;
-
-
-public abstract class AbstractEventFactory implements IPDIEventFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newDataReadMemoryInfo(java.lang.String, long, long, long, long, long, long, org.eclipse.ptp.debug.core.pdi.model.IPDIMemory[])
-	 */
-	public Object newDataReadMemoryInfo(String address, long nextRow, long prevRow, long nextPage, long prevPage, long numBytes,
-			long totalBytes, IPDIMemory[] memories) {
-		return new DataReadMemoryInfo(address, nextRow, prevRow, nextPage, prevPage, numBytes, totalBytes, memories);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newBreakpointInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public IPDIBreakpointInfo newBreakpointInfo(IPDISession session, BitList tasks, IPDIBreakpoint bpt) {
-		return new BreakpointInfo(session, tasks, bpt);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newChangedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject)
-	 */
-	public IPDIChangedEvent newChangedEvent(IPDISessionObject reason) {
-		return new ChangedEvent(reason);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newConnectedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject, org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIConnectedEvent newConnectedEvent(IPDISessionObject reason, BitList tasks) {
-		return new ConnectedEvent(reason, tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newCreatedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject)
-	 */
-	public IPDICreatedEvent newCreatedEvent(IPDISessionObject reason) {
-		return new CreatedEvent(reason);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newDestroyedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject)
-	 */
-	public IPDIDestroyedEvent newDestroyedEvent(IPDISessionObject reason) {
-		return new DestroyedEvent(reason);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newDisconnectedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject, org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIDisconnectedEvent newDisconnectedEvent(IPDISessionObject reason, BitList tasks) {
-		return new DisconnectedEvent(reason, tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newEndSteppingRangeInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.IPDILocator)
-	 */
-	public IPDIEndSteppingRangeInfo newEndSteppingRangeInfo(IPDISession session, BitList tasks, IPDILocator locator) {
-		return new EndSteppingRangeInfo(session, tasks, locator);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newErrorEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject)
-	 */
-	public IPDIErrorEvent newErrorEvent(IPDISessionObject reason) {
-		return new ErrorEvent(reason);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newErrorInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int, java.lang.String, java.lang.String)
-	 */
-	public IPDIErrorInfo newErrorInfo(IPDISession session, BitList tasks, int code, String msg, String detailMsg) {
-		return new ErrorInfo(session, tasks, code, msg, detailMsg);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newExitInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public IPDIExitInfo newExitInfo(IPDISession session, BitList tasks, int code) {
-		return new ExitInfo(session, tasks, code);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newLocationReachedInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.IPDILocator)
-	 */
-	public IPDILocationReachedInfo newLocationReachedInfo(IPDISession session, BitList tasks, IPDILocator locator) {
-		return new LocationReachedInfo(session, tasks, locator);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newMemoryBlockInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.math.BigInteger[], org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock)
-	 */
-	public IPDISessionObject newMemoryBlockInfo(IPDISession session, BitList tasks, BigInteger[] bigIntegers, IPDIMemoryBlock block) {
-		return new MemoryBlockInfo(session, tasks, bigIntegers, block);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newResumedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject, org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public IPDIResumedEvent newResumedEvent(IPDISessionObject reason, BitList tasks, int type) {
-		return new ResumedEvent(reason, tasks, type);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newSignalInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.lang.String, java.lang.String, org.eclipse.ptp.debug.core.pdi.model.IPDISignal, org.eclipse.ptp.debug.core.pdi.IPDILocator)
-	 */
-	public IPDISignalInfo newSignalInfo(IPDISession session, BitList tasks, String name, String desc, IPDISignal signal,
-			IPDILocator locator) {
-		return new SignalInfo(session, tasks, name, desc, signal, locator);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newStartedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject, org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIStartedEvent newStartedEvent(IPDISessionObject reason, BitList tasks) {
-		return new StartedEvent(reason, tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newSuspendedEvent(org.eclipse.ptp.debug.core.pdi.IPDISessionObject, java.lang.String[], int, int, int)
-	 */
-	public IPDISuspendedEvent newSuspendedEvent(IPDISessionObject reason, String[] vars, int thread_id, int level, int depth) {
-		return new SuspendedEvent(reason, vars, thread_id, level, depth);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newThreadInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int, org.eclipse.ptp.debug.core.pdi.model.IPDIThread)
-	 */
-	public IPDISessionObject newThreadInfo(IPDISession session, BitList tasks, int id, IPDIThread thread) {
-		return new ThreadInfo(session, tasks, id, thread);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory#newVariableInfo(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.lang.String, org.eclipse.ptp.debug.core.pdi.model.IPDIVariable)
-	 */
-	public IPDIVariableInfo newVariableInfo(IPDISession session, BitList tasks, String name, IPDIVariable var) {
-		return new VariableInfo(session, tasks, name, var);
-	}
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIBreakpointInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIBreakpointInfo.java
deleted file mode 100644
index efcfd37..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIBreakpointInfo.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-
-/**
- * Represents an information provided by the session when the program stopped by a breakpoint
- * @author clement
- *
- */
-public interface IPDIBreakpointInfo extends IPDISessionObject {
-	/**
-	 * Returns the breakpoint that stopped the program
-	 * @return the breakpoint that stopped the program
-	 */
-	IPDIBreakpoint getBreakpoint();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIChangedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIChangedEvent.java
deleted file mode 100644
index 35970c0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIChangedEvent.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Notifies that the originator has changed. Can be originated by any PDI model object.
- * @author clement
- *
- */
-public interface IPDIChangedEvent extends IPDIEvent {
-	/**
-	 * Returns the reason why changed
-	 * eg:
-	 * IPDIBreakpointInfo
-	 * IPDIMemoryBlockInfo
-	 * IPDISignalInfo
-	 * IPDIVariableInfo
-	 * @return the reason why changed
-	 */
-	IPDISessionObject getReason();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIConnectedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIConnectedEvent.java
deleted file mode 100644
index a7c16d6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIConnectedEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-/**
- * Notifies that the originator has connected
- * @author clement
- *
- */
-public interface IPDIConnectedEvent extends IPDIEvent {
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDICreatedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDICreatedEvent.java
deleted file mode 100644
index bc6e919..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDICreatedEvent.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Notifies that the originator has been created.
- * @author clement
- *
- */
-public interface IPDICreatedEvent extends IPDIEvent {
-	/**
-	 * Returns the reason why created
-	 * eg:
-	 * IPDIBreakpointInfo
-	 * IPDIThreadInfo
-	 * IPDIMemoryBlockInfo
-	 * IPDIRegisterInfo
-	 * IPDISharedLibraryInfo
-	 * IPDISignalInfo
-	 * IPDIVariableInfo
-	 * @return the reason why created
-	 */
-	IPDISessionObject getReason();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDataReadMemoryInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDataReadMemoryInfo.java
deleted file mode 100644
index 1ea25ff..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDataReadMemoryInfo.java
+++ /dev/null

@@ -1,47 +0,0 @@
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemory;
-
-public interface IPDIDataReadMemoryInfo {
-
-	/**
-	 * @return
-	 */
-	public String getAddress();
-
-	/**
-	 * @return
-	 */
-	public long getNumberBytes();
-
-	/**
-	 * @return
-	 */
-	public long getTotalBytes();
-
-	/**
-	 * @return
-	 */
-	public long getNextRow();
-
-	/**
-	 * @return
-	 */
-	public long getPreviousRow();
-
-	/**
-	 * @return
-	 */
-	public long getNextPage();
-
-	/**
-	 * @return
-	 */
-	public long getPreviousPage();
-
-	/**
-	 * @return
-	 */
-	public IPDIMemory[] getMemories();
-
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDestroyedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDestroyedEvent.java
deleted file mode 100644
index 3d62a3a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDestroyedEvent.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Notifies that the originator has terminated
- * @author clement
- *
- */
-public interface IPDIDestroyedEvent extends IPDIEvent {
-	/**
-	 * Returns the reason why destroyed
-	 * eg:
-	 * IPDIBreakpointInfo
-	 * IPDIErrorInfo
-	 * IPDIExitInfo
-	 * IPDISharedLibraryInfo
-	 * IPDISignalInfo
-	 * IPDIThreadInfo
-	 * IPDIVariableInfo
-	 * @return the reason why destroyed
-	 */
-	IPDISessionObject getReason();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDisconnectedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDisconnectedEvent.java
deleted file mode 100644
index 2ed912c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIDisconnectedEvent.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-/**
- * Notifies that the originator has disconnected
- * @author clement
- *
- */
-public interface IPDIDisconnectedEvent extends IPDIEvent {
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEndSteppingRangeInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEndSteppingRangeInfo.java
deleted file mode 100644
index 7a27428..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEndSteppingRangeInfo.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Represents an information provided by the session when a step command is completed
- * @author clement
- *
- */
-public interface IPDIEndSteppingRangeInfo extends IPDISessionObject {
-	/**
-	 * Returns locator
-	 * @return locator
-	 */
-	IPDILocator getLocator();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorEvent.java
deleted file mode 100644
index 801bc46..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorEvent.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Notifies that the originator has error
- * @author clement
- *
- */
-public interface IPDIErrorEvent extends IPDIEvent {
-	/**
-	 * Returns the reason why got error
-	 * eg:
-	 * IPDIErrorInfo
-	 * @return the reason why got error
-	 */
-	IPDISessionObject getReason();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorInfo.java
deleted file mode 100644
index f54010c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIErrorInfo.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Represents an information provided by the session when the program exited
- * @author clement
- *
- */
-public interface IPDIErrorInfo extends IPDISessionObject {
-	public static final int DBG_NORMAL = 0; // show in error log and pupup error dialog and no action
-	public static final int DBG_WARNING = 1; // show in error log and pupup error dialog and terminate error proceses
-	public static final int DBG_FATAL = 2; // show in error log and pupup error dialog and action - terminate all processes and stop debugger
-	public static final int DBG_IGNORE = 3; //ignore this error
-	/**
-	 * Returns the error message
-	 * @return the error message
-	 */
-	String getMessage();
-	
-	/**
-	 * Returns a more verbatim error message (if any)
-	 * @return a more verbatim error message
-	 */
-	String getDetailMessage();
-	
-	/**
-	 * Returns error code
-	 * @return error code
-	 */
-	int getCode();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEvent.java
deleted file mode 100644
index ec7c07b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEvent.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * IPDIEvent is the common super interface for all events.
- * @author clement
- *
- */
-public interface IPDIEvent extends IPDISessionObject {
-	/**
-	 * Checks whether this event contains the given tasks
-	 * @param tasks Tasks
-	 * @return true if this event contains the given tasks
-	 */
-	boolean contains(BitList tasks);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventFactory.java
deleted file mode 100644
index 202fb20..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventFactory.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-
-public interface IPDIEventFactory {
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param bpt
-	 * @return
-	 */
-	public IPDIBreakpointInfo newBreakpointInfo(IPDISession session, BitList tasks, IPDIBreakpoint bpt);
-	
-	/**
-	 * @param reason
-	 * @return
-	 */
-	public IPDIChangedEvent newChangedEvent(IPDISessionObject reason);
-	
-	/**
-	 * @param reason
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIConnectedEvent newConnectedEvent(IPDISessionObject reason, BitList tasks);
-	
-	/**
-	 * @param reason
-	 * @return
-	 */
-	public IPDICreatedEvent newCreatedEvent(IPDISessionObject reason);
-	
-	/**
-	 * @param address
-	 * @param nextRow
-	 * @param prevRow
-	 * @param nextPage
-	 * @param prevPage
-	 * @param numBytes
-	 * @param totalBytes
-	 * @param memories
-	 * @return
-	 */
-	public Object newDataReadMemoryInfo(String address, long nextRow, long prevRow, long nextPage, long prevPage, long numBytes,
-			long totalBytes, IPDIMemory[] memories);
-	
-	/**
-	 * @param reason
-	 * @return
-	 */
-	public IPDIDestroyedEvent newDestroyedEvent(IPDISessionObject reason);
-	
-	/**
-	 * @param reason
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIDisconnectedEvent newDisconnectedEvent(IPDISessionObject reason, BitList tasks);
-	
-	/**
-	 * @param reason
-	 * @param tasks
-	 * @param locator
-	 * @return
-	 */
-	public IPDIEndSteppingRangeInfo newEndSteppingRangeInfo(IPDISession session, BitList tasks, IPDILocator locator);
-	
-	/**
-	 * @param reason
-	 * @return
-	 */
-	public IPDIErrorEvent newErrorEvent(IPDISessionObject reason);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param code
-	 * @param msg
-	 * @param detailMsg
-	 * @return
-	 */
-	public IPDIErrorInfo newErrorInfo(IPDISession session, BitList tasks, int code, String msg, String detailMsg);
-	
-	/**
-	 * @param reason
-	 * @param tasks
-	 * @param code
-	 * @return
-	 */
-	public IPDIExitInfo newExitInfo(IPDISession session, BitList tasks, int code);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param locator
-	 * @return
-	 */
-	public IPDILocationReachedInfo newLocationReachedInfo(IPDISession session, BitList tasks, IPDILocator locator);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param bigIntegers
-	 * @param block
-	 * @return
-	 */
-	public IPDISessionObject newMemoryBlockInfo(IPDISession session, BitList tasks, BigInteger[] bigIntegers, IPDIMemoryBlock block);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param type
-	 * @return
-	 */
-	public IPDIResumedEvent newResumedEvent(IPDISessionObject reason, BitList tasks, int type);
-
-	/**
-	 * @param reason
-	 * @param tasks
-	 * @param name
-	 * @param desc
-	 * @param signal
-	 * @param locator
-	 * @return
-	 */
-	public IPDISignalInfo newSignalInfo(IPDISession session, BitList tasks, String name, String desc, IPDISignal signal, IPDILocator locator);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIStartedEvent newStartedEvent(IPDISessionObject reason, BitList tasks);
-	
-	/**
-	 * @param reason
-	 * @param vars
-	 * @param thread_id
-	 * @param level
-	 * @param depth
-	 * @return
-	 */
-	public IPDISuspendedEvent newSuspendedEvent(IPDISessionObject reason, String[] vars, int thread_id, int level, int depth);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param id
-	 * @param thread
-	 * @return
-	 */
-	public IPDISessionObject newThreadInfo(IPDISession session, BitList tasks, int id, IPDIThread thread);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param name
-	 * @param var
-	 */
-	public IPDIVariableInfo newVariableInfo(IPDISession session, BitList tasks, String name, IPDIVariable var);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventListener.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventListener.java
deleted file mode 100644
index 00b4c04..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIEventListener.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-/**
- * An event listener registers with the event manager to receive event notification from the PDI model objects
- * @author clement
- *
- */
-public interface IPDIEventListener {
-	/**
-	 * Notifies this listener of the given event.
-	 * @param events - the event
-	 */
-	void handleDebugEvents(IPDIEvent[] events);
-}
-
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIExitInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIExitInfo.java
deleted file mode 100644
index 07008ff..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIExitInfo.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Represents an information provided by the session when the program exited
- * @author clement
- *
- */
-public interface IPDIExitInfo extends IPDISessionObject {
-	/**
-	 * Returns an exit code.
-	 * @return an exit code
-	 */
-	int getCode();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIFunctionFinishedInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIFunctionFinishedInfo.java
deleted file mode 100644
index 72c7451..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIFunctionFinishedInfo.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * Represents a function finsihed
- * @author clement
- *
- */
-public interface IPDIFunctionFinishedInfo extends IPDIEndSteppingRangeInfo {
-	/**
-	 * Return the AIF of the return value of the function.
-	 * @return IAIF return AIF value
-	 * @throws PDIException on failure
-	 */
-	IAIF getReturnAIF() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDILocationReachedInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDILocationReachedInfo.java
deleted file mode 100644
index c354701..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDILocationReachedInfo.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Represents a location reached
- * @author clement
- *
- */
-public interface IPDILocationReachedInfo extends IPDISessionObject {
-	IPDILocator getLocator();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIMemoryBlockInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIMemoryBlockInfo.java
deleted file mode 100644
index 7312d19..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIMemoryBlockInfo.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-
-/**
- * Represents memory block info
- * @author clement
- *
- */
-public interface IPDIMemoryBlockInfo extends IPDISessionObject {
-	/**
-	 * Returns the modified addresses.
-	 * @return the modified addresses.
-	 */
-	BigInteger[] getAddresses();
-	
-	/**
-	 * Returns the modified memory block
-	 * @return the modified memory block
-	 */
-	IPDIMemoryBlock getMemoryBlock();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRegisterInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRegisterInfo.java
deleted file mode 100644
index 89cb2bd..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRegisterInfo.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegister;
-
-/**
- * Represents register info
- * @author clement
- *
- */
-public interface IPDIRegisterInfo extends IPDISessionObject {
-	/**
-	 * Returns register name
-	 * @return register name
-	 */
-	String getName();
-	
-	/**
-	 * Returns register
-	 * @return register
-	 */
-	IPDIRegister getRegister();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRestartedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRestartedEvent.java
deleted file mode 100644
index 0abca96..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIRestartedEvent.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-/**
- * Notifies that the originator has been restarted.
- * @author clement
- *
- */
-public interface IPDIRestartedEvent extends IPDIEvent {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIResumedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIResumedEvent.java
deleted file mode 100644
index 344d302..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIResumedEvent.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-/**
- * Notifies that the originator has been resumed.
- * @author clement
- *
- */
-public interface IPDIResumedEvent extends IPDIEvent {
-	public final static int CONTINUE = 0;
-	public final static int STEP_OVER = 1;
-	public final static int STEP_INTO = 2;
-	public final static int STEP_OVER_INSTRUCTION = 3;
-	public final static int STEP_INTO_INSTRUCTION = 4;
-	public final static int STEP_RETURN = 5;
-
-	/**
-	 * Returns the stepping type.
-	 * @return the stepping type
-	 */
-	int getType();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISharedLibraryInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISharedLibraryInfo.java
deleted file mode 100644
index b4b6d49..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISharedLibraryInfo.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISharedLibrary;
-
-/**
- * Represents shared library info
- * @author clement
- *
- */
-public interface IPDISharedLibraryInfo extends IPDISessionObject {
-	/**
-	 * Returns shared library name
-	 * @return shared library name
-	 */
-	String getName();
-	
-	/**
-	 * Returns shared library
-	 * @return shared library
-	 */
-	IPDISharedLibrary getSharedLibrary();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISignalInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISignalInfo.java
deleted file mode 100644
index 94989a3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISignalInfo.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-
-/**
- * Represents signal info
- * @author clement
- *
- */
-public interface IPDISignalInfo extends IPDISessionObject {
-	/**
-	 * Returns signal name
-	 * @return signal name
-	 */
-	String getName();
-	
-	/**
-	 * Returns signal
-	 * @return signal - can be null
-	 */
-	IPDISignal getSignal();
-	
-	/**
-	 * Returns signal description
-	 * @return String signal description
-	 */
-	String getDescription();
-	
-	/**
-	 * Returns the location of this signal
-	 * @return location of this signal - can be null
-	 */
-	IPDILocator getLocator();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIStartedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIStartedEvent.java
deleted file mode 100644
index 1f2ebec..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIStartedEvent.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-/**
- * Notifies that the originator has been started.
- * @author clement
- *
- */
-public interface IPDIStartedEvent extends IPDIEvent {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISuspendedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISuspendedEvent.java
deleted file mode 100644
index 6f5b444..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDISuspendedEvent.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Notifies that the originator has been suspended. 
- * @author clement
- *
- */
-public interface IPDISuspendedEvent extends IPDIEvent {
-	/**
-	 * Returns the session object that caused the suspension
-	 * eg:
-	 * IPDIBreakpointInfo
-	 * IPDIEndSteppingRangeInfo
-	 * IPDILocationReachedInfo
-	 * IPDISignalInfo
-	 * IPDIFunctionFinishedInfo
-	 * IPDISharedLibraryInfo
-	 * IPDIWatchpointScopeInfo
-	 * IPDIWatchpointTriggerInfo
-	 * @return IPDISessionObject the session object that caused the suspension
-	 */
-	IPDISessionObject getReason();
-	
-	/**
-	 * Returns a list of variables that are changed
-	 * @return a list of variables
-	 */
-	String[] getUpdatedVariables();
-	
-	/**
-	 * Returns thread ID
-	 * @return thread ID
-	 */
-	int getThreadID();
-
-	/**
-	 * Returns level of current suspended frame
-	 * @return level of current suspended frame
-	 */
-	int getLevel();
-	
-	/**
-	 * Returns the maximum level of suspended frame
-	 * @return the maximum level of suspended frame
-	 */
-	int getDepth();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIThreadInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIThreadInfo.java
deleted file mode 100644
index a3dd654..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIThreadInfo.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * Represensts thread destroy info
- * @author clement
- *
- */
-public interface IPDIThreadInfo extends IPDISessionObject {
-	/**
-	 * Returns destroyed thread id
-	 * @return destroyed thread id
-	 */
-	int getThreadID();
-	
-	/**
-	 * Returns destroyed thread
-	 * @return destroyed thread
-	 */
-	IPDIThread getThread();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIVariableInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIVariableInfo.java
deleted file mode 100644
index 43f20f1..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIVariableInfo.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-/**
- * Represents variable info
- * @author clement
- *
- */
-public interface IPDIVariableInfo extends IPDISessionObject {
-	/**
-	 * Returns variable name
-	 * @return variable name
-	 */
-	String getName();
-	
-	/**
-	 * Returns variable
-	 * @return variable
-	 */
-	IPDIVariable getVariable();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointScopeInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointScopeInfo.java
deleted file mode 100644
index 78d599f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointScopeInfo.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-
-/**
- * Represents an information provided by the session when a watchpoint is going out of scope.
- * @author clement
- *
- */
-public interface IPDIWatchpointScopeInfo extends IPDISessionObject {
-	/**
-	 * Returns the out of scope watchpoint.
-	 * @return the watchpoint
-	 */
-	IPDIWatchpoint getWatchpoint();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointTriggerInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointTriggerInfo.java
deleted file mode 100644
index c9b9cb9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/event/IPDIWatchpointTriggerInfo.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-
-/**
- * Represents an information provided by the session when a watchpoint is triggered
- * @author clement
- *
- */
-public interface IPDIWatchpointTriggerInfo extends IPDISessionObject {
-	/**
-	 * Returns the triggered watchpoint
-	 * @return the triggered watchpoint
-	 */
-	IPDIWatchpoint getWatchpoint();
-	
-	/**
-	 * Returns the old value of the watching expression
-	 * @return the old value of the watching expression
-	 */
-	String getOldValue();
-	
-	/**
-	 * Returns the new value of the watching expression
-	 * @return the new value of the watching expression
-	 */
-	String getNewValue();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractEventManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractEventManager.java
deleted file mode 100644
index eec6159..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractEventManager.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Observable;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStopDebuggerRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.AbstractPDIManager;
-
-public abstract class AbstractEventManager extends AbstractPDIManager implements IPDIEventManager {
-	/************************************ 
-	 * event scheduler 
-	 ***********************************/
-	class EventRequestScheduledTask {
-		Timer eventTimer = null;
-		IPDIEventRequest request = null;
-		
-		public EventRequestScheduledTask(IPDIEventRequest request) {
-			this.request = request;
-			this.eventTimer = new Timer();
-			scheduleTimeout();
-		}
-		
-		public void cancelTimeout() {
-			eventTimer.cancel();
-		}
-		
-		public IPDIEventRequest getRequest() {
-			return request;
-		}
-		
-		public void scheduleTimeout() {
-			eventTimer.schedule(new TimerTask() {
-				public void run() {
-					PDebugUtils.println("Msg: EventRequestScheduledTask - scheduleTimeout(): Request: " + request);
-					request.error("Time out for this request.");
-					notifyEventRequest(request);
-				}
-			}, session.getTimeout());
-		}
-	}
-	
-	/*****************************************
-	 * Request Notifier
-	 *****************************************/
-	class RequestNotifier extends Observable {
-		public void notify(IPDIEventRequest request) {
-			setChanged();
-			notifyObservers(request);
-		}
-	}
-	
-	private List<IPDIEventListener> listenerList = Collections.synchronizedList(new ArrayList<IPDIEventListener>());
-	private List<EventRequestScheduledTask> requestList = Collections.synchronizedList(new ArrayList<EventRequestScheduledTask>());
-	private RequestNotifier requestNotifier = new RequestNotifier();
-	
-	public AbstractEventManager(IPDISession session) {
-		super(session, false);
-		requestNotifier.addObserver(session.getEventRequestManager());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager#addEventListener(org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener)
-	 */
-	public void addEventListener(IPDIEventListener listener) {
-		if (!listenerList.contains(listener)) {
-			listenerList.add(listener);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager#fireEvent(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent)
-	 */
-	public void fireEvent(IPDIEvent event) {
-		fireEvents(new IPDIEvent[] { event });
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager#fireEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public void fireEvents(final IPDIEvent[] events) {
-		if (events.length > 0) {
-			IPDIEventListener[] listeners = (IPDIEventListener[])listenerList.toArray(new IPDIEventListener[0]);
-			for (final IPDIEventListener listener : listeners) {
-				Runnable runnable = new Runnable() {
-					public void run() {
-						listener.handleDebugEvents(events);
-					}
-				};
-				session.queueRunnable(runnable);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager#notifyEventRequest(org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest)
-	 */
-	public void notifyEventRequest(IPDIEventRequest request) {
-		synchronized (requestList) {
-			if (!requestList.isEmpty()) {
-				requestList.remove(0).cancelTimeout();
-			}
-			requestNotifier.notify(request);
-			PDebugUtils.println("**** Msg: AbstractEventManager - notifyEventRequest(): Request: " + request);
-			switch (request.getStatus()) {
-			//case IPDIEventRequest.DONE:
-			//case IPDIEventRequest.RUNNING:
-			case IPDIEventRequest.UNKNOWN:
-				fireEvent(session.getEventFactory().newErrorEvent(
-						session.getEventFactory().newErrorInfo(session, request.getTasks(), IPDIErrorInfo.DBG_NORMAL, request.getName() + " error!", "Unknown error")));
-	   			break;
-			case IPDIEventRequest.CANCELLED:
-				fireEvent(session.getEventFactory().newErrorEvent(
-						session.getEventFactory().newErrorInfo(session, request.getTasks(), IPDIErrorInfo.DBG_NORMAL, request.getName() + " error!", "Request has been cancelled")));
-	   			break;
-			case IPDIEventRequest.ERROR:
-				int errorType = IPDIErrorInfo.DBG_NORMAL;
-				if (request.getResponseAction() == IPDIEventRequest.ACTION_TERMINATED) {
-					errorType = IPDIErrorInfo.DBG_FATAL;
-					try {
-						session.terminate(request.getTasks().copy());
-					}
-					catch (PDIException ex) {
-						//error on terminate, manually change tasks' status
-						session.getTaskManager().setPendingTasks(false, request.getTasks());
-						session.getTaskManager().setTerminateTasks(true, request.getTasks());
-					}
-				}
-				fireEvent(session.getEventFactory().newErrorEvent(
-						session.getEventFactory().newErrorInfo(session, request.getTasks(), errorType, request.getName() + " error!", request.getErrorMessage())));
-	   			break;
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager#registerEventRequest(org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest)
-	 */
-	public void registerEventRequest(IPDIEventRequest request) {
-		synchronized (requestList) {
-			if (request instanceof IPDIStopDebuggerRequest) {
-				request.done();
-				notifyEventRequest(request);
-				session.setStatus(IPDISession.EXITED);
-				return;
-			}
-			else {
-				PDebugUtils.println("**** Msg: AbstractEventManager - registerEventRequest(): Request: " + request);
-				requestList.add(new EventRequestScheduledTask(request));
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager#removeAllRegisteredEventRequests()
-	 */
-	public void removeAllRegisteredEventRequests() {
-		synchronized (requestList) {
-			EventRequestScheduledTask[] scheduledTasks = requestList.toArray(new EventRequestScheduledTask[0]);
-			for (EventRequestScheduledTask scheduledTask : scheduledTasks) {
-				scheduledTask.cancelTimeout();
-			}
-			requestList.clear();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager#removeEventListener(org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener)
-	 */
-	public void removeEventListener(IPDIEventListener listener) {
-		listenerList.remove(listener);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		requestNotifier.deleteObserver(session.getEventRequestManager());
-		listenerList.clear();
-		requestList.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	@Override
-	public void update(BitList tasks) throws PDIException {
-	}
-	
-	/**
-	 * @return
-	 */
-	public IPDIEventRequest getCurrentRequest() {
-		synchronized (requestList) {
-			if (!requestList.isEmpty()) {
-				return requestList.get(0).getRequest();
-			}
-			return null;
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractManagerFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractManagerFactory.java
deleted file mode 100644
index 9723bc9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/AbstractManagerFactory.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.BreakpointManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.EventRequestManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.ExpressionManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.MemoryManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.RegisterManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.SignalManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.SourceManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.TargetManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.TaskManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.ThreadManager;
-import org.eclipse.ptp.debug.internal.core.pdi.manager.VariableManager;
-
-
-public abstract class AbstractManagerFactory implements IPDIManagerFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newBreakpointManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIBreakpointManager newBreakpointManager(IPDISession session) {
-		return new BreakpointManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newEventRequestManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIEventRequestManager newEventRequestManager(IPDISession session) {
-		return new EventRequestManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newExpressionManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIExpressionManager newExpressionManager(IPDISession session) {
-		return new ExpressionManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newMemoryManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIMemoryManager newMemoryManager(IPDISession session) {
-		return new MemoryManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newRegisterManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIRegisterManager newRegisterManager(IPDISession session) {
-		return new RegisterManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newSignalManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDISignalManager newSignalManager(IPDISession session) {
-		return new SignalManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newSourceManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDISourceManager newSourceManager(IPDISession session) {
-		return new SourceManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newTargetManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDITargetManager newTargetManager(IPDISession session) {
-		return new TargetManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newTaskManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDITaskManager newTaskManager(IPDISession session) {
-		return new TaskManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newThreadManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIThreadManager newThreadManager(IPDISession session) {
-		return new ThreadManager(session);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newVariableManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIVariableManager newVariableManager(IPDISession session) {
-		return new VariableManager(session);
-	}
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIBreakpointManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIBreakpointManager.java
deleted file mode 100644
index 70295c7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIBreakpointManager.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIAddressLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDIFunctionLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILineLocation;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-
-/**
- * Represent breakpoint manager to manage breakpoints
- * @author clement
- *
- */
-public interface IPDIBreakpointManager extends IPDIManager {
-	/**
-	 * Called when new tasks are added to a set. Updates the breakpoint so that
-	 * it is set on the new tasks.
-	 * 
-	 * @param tasks tasks that have been added
-	 * @param breakpoint breakpoint to update
-	 * @throws PDIException on failure 
-	 */
-	public void addSetBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException;
-	
-	/**
-	 * Create address location
-	 * @param address
-	 * @return
-	 */
-	public IPDIAddressLocation createAddressLocation(BigInteger address);
-
-	/**
-	 * Creates condition
-	 * @param ignoreCount
-	 * @param expression
-	 * @param tids
-	 * @return
-	 */
-	public IPDICondition createCondition(int ignoreCount, String expression, String[] tids);
-
-	/**
-	 * Create function location
-	 * @param file
-	 * @param function
-	 * @return
-	 */
-	public IPDIFunctionLocation createFunctionLocation(String file, String function);
-	
-	/**
-	 * Creates line location
-	 * @param file
-	 * @param line
-	 * @return
-	 */
-	public IPDILineLocation createLineLocation(String file, int line);
-
-	/**
-	 * Deletes all breakpoint of all processes
-	 * @throws PDIException on failure
-	 */
-	public void deleteAllBreakpoints() throws PDIException;
-
-	/**
-	 * Deletes all breakpoints of specify process
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	public void deleteAllBreakpoints(BitList tasks) throws PDIException;
-
-	/**
-	 * Deletes breakpoint
-	 * @param tasks
-	 * @param breakpoint
-	 * @throws PDIException on failure 
-	 */
-	public void deleteBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException;
-	
-	/**
-	 * Deletes a breakpoint that is different from original task
-	 * @param tasks latest tasks
-	 * @param breakpoint breakpoint to be deleted
-	 * @throws PDIException on failure 
-	 */
-	public void deleteSetBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException;
-
-	/**
-	 * Disable breakpoint
-	 * @param tasks
-	 * @param breakpoint
-	 * @throws PDIException
-	 */
-	public void disableBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException;
-
-	/**
-	 * Enables breakpoint
-	 * @param tasks
-	 * @param breakpoint
-	 * @throws PDIException
-	 */
-	public void enableBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException;
-	
-	/**
-	 * @param id
-	 * @return
-	 */
-	public IPDIBreakpoint getBreakpoint(int id);
-	
-	/**
-	 * Sets address breakpoint
-	 * @param tasks
-	 * @param type
-	 * @param location
-	 * @param condition
-	 * @param deferred
-	 * @param enabled
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIAddressBreakpoint setAddressBreakpoint(BitList tasks, int type, IPDIAddressLocation location, IPDICondition condition, boolean deferred, boolean enabled) throws PDIException;
-
-	/**
-	 * Sets condition
-	 * @param tasks
-	 * @param breakpoint
-	 * @param newCondition
-	 * @throws PDIException
-	 */
-	public void setCondition(BitList tasks, IPDIBreakpoint breakpoint, IPDICondition newCondition) throws PDIException;
-
-	/**
-	 * Sets exceptionpoint
-	 * @param tasks
-	 * @param clazz
-	 * @param stopOnThrow
-	 * @param stopOnCatch
-	 * @param enabled
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIExceptionpoint setExceptionpoint(BitList tasks, String clazz, boolean stopOnThrow, boolean stopOnCatch, boolean enabled) throws PDIException;
-	
-	/**
-	 * Sets function breakpoint
-	 * @param tasks
-	 * @param type
-	 * @param location
-	 * @param condition
-	 * @param deferred
-	 * @param enabled
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIFunctionBreakpoint setFunctionBreakpoint(BitList tasks, int type, IPDIFunctionLocation location, IPDICondition condition, boolean deferred, boolean enabled) throws PDIException;
-
-	/**
-	 * Sets line breakpoint
-	 * @param tasks
-	 * @param type
-	 * @param location
-	 * @param condition
-	 * @param deferred
-	 * @param enabled
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDILineBreakpoint setLineBreakpoint(BitList tasks, int type, IPDILineLocation location, IPDICondition condition, boolean deferred, boolean enabled) throws PDIException;
-
-	/**
-	 * Sets watchpoint
-	 * @param tasks
-	 * @param type
-	 * @param watchType
-	 * @param expression
-	 * @param condition
-	 * @param enabled
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIWatchpoint setWatchpoint(BitList tasks, int type, int watchType, String expression, IPDICondition condition, boolean enabled) throws PDIException;
-
-	/**
-	 * Update any pending breakpoints. This should be called when the debugger enters suspended state
-	 * to update any breakpoints that could not be set or deleted because tasks were running.
-	 * 
-	 * @throws PDIException
-	 */
-	public void updatePendingBreakpoints() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventManager.java
deleted file mode 100644
index 1bccbde..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventManager.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import java.util.Observer;
-
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest;
-
-/**
- * Clients interested in the PDI model change notification may register with this object
- * @author clement
- *
- */
-public interface IPDIEventManager extends IPDIManager, Observer {
-	/**
-	 * Adds the given listener to the collection of registered event listeners. 
-	 * Has no effect if an identical listener is already registered 
-	 * @param listener - the listener to add
-	 */
-	public void addEventListener(IPDIEventListener listener);
-
-	/**
-	 * @param event
-	 */
-	public void fireEvent(IPDIEvent event);
-	
-	/**
-	 * @param events
-	 */
-	public void fireEvents(final IPDIEvent[] events);
-	
-	/**
-	 * @return
-	 */
-	public IPDIEventRequest getCurrentRequest();
-	
-	/**
-	 * @param request
-	 */
-	public void notifyEventRequest(IPDIEventRequest request);
-	
-	/**
-	 * Register a request in event manager for lookup
-	 * @param request an event request
-	 */
-	public void registerEventRequest(IPDIEventRequest request);
-	
-	/**
-	 * 
-	 */
-	public void removeAllRegisteredEventRequests();
-	
-	/**
-	 * Removes the given listener from the collection of registered event listeners.
-	 * Has no effect if an identical listener is not already registered
-	 * @param listener - the listener to remove
-	 */
-	public void removeEventListener(IPDIEventListener listener);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventRequestManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventRequestManager.java
deleted file mode 100644
index 660a922..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIEventRequestManager.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import java.util.Observer;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest;
-
-/**
- * Manages a number of EventRequests for a target debugger.
- * @author clement
- *
- */
-public interface IPDIEventRequestManager extends IPDIManager, Observer {
-	/**
-	 * 
-	 */
-	public void cleanEventRequests();
-	
-	/**
-	 * Adds an event request
-	 * @param request event request is being added
-	 * @throws PDIException on failure
-	 */
-	public void addEventRequest(IPDIEventRequest request) throws PDIException;
-	
-	/**
-	 * Determines whether this handler can execute on the elements specified
-	 * in the given request by reporting enabled state to the request.
-	 * @param request specifies elements to operate on and collects enabled state
-	 * @return whether this handler can execute this request
-	 */
-	public boolean canExecute(IPDIEventRequest request);
-	/**
-	 * Deletes all event requests
-	 * @throws PDIException on failure
-	 */
-	public void deleteAllEventRequests() throws PDIException;
-	
-	/**
-	 * Deletes an event request
-	 * @param request event request is being removed
-	 * @throws PDIException on failure
-	 */
-	public void deleteEventRequest(IPDIEventRequest request) throws PDIException;
-	
-	/**
-	 * Executes this command on the elements specified in the given request
-	 * reporting status to the given request and returns whether this handler should
-	 * remain enabled while the command is executing.
-	 * @param request specifies elements to operate on and collects execution status
-	 * @throws PDIException on failure
-	 */
-	public void execute(IPDIEventRequest request) throws PDIException;
-	
-	/**
-	 * Returns an array of stored requests
-	 * @return an array of stored requests
-	 */
-	public IPDIEventRequest[] getRequests();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIExpressionManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIExpressionManager.java
deleted file mode 100644
index 7f1fddf..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIExpressionManager.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITargetExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * Represent expression manager to manage multiple expression
- * @author clement
- *
- */
-public interface IPDIExpressionManager extends IPDIManager {
-	/**
-	 * Clean expression value with given tasks
-	 * @param tasks tasks
-	 * @param monitor
-	 * @throws PDIException
-	 */
-	public void cleanMultiExpressions(BitList tasks, IProgressMonitor monitor) throws PDIException;
-	
-	/**
-	 * Clean expression value with given tasks
-	 * @param exprText
-	 * @param tasks tasks
-	 * @param monitor
-	 * @throws PDIException
-	 */
-	public void cleanMultiExpressions(String exprText, BitList tasks, IProgressMonitor monitor) throws PDIException;
-	
-	/**
-	 * Creates an expression for specify variable
-	 * @param qTasks task 
-	 * @param expr variable
-	 * @return IPDIExpression expression
-	 * @throws PDIException on failure
-	 */
-	public IPDITargetExpression createExpression(BitList qTasks, String expr) throws PDIException;
-	
-	/**
-	 * Creates mutliple expression object for a number of processes with one variable
-	 * @param tasks task
-	 * @param exprText variable
-	 * @param enabled status of this expression
-	 */
-	public void createMutliExpressions(BitList tasks, String exprText, boolean enabled);
-	
-	/**
-	 * @param frame
-	 * @param expr
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIVariable createVariable(IPDIStackFrame frame, String expr) throws PDIException;
-	
-	/**
-	 * @param variable
-	 * @throws PDIException
-	 */
-	public void deleteVariable(IPDIVariable variable) throws PDIException;
-	
-	/**
-	 * @param qTasks
-	 * @param expressions
-	 * @throws PDIException
-	 */
-	public void destroyExpressions(BitList qTasks, IPDIExpression[] expressions) throws PDIException;
-	
-	/**
-	 * @param qTasks
-	 * @param expr
-	 * @return
-	 * @throws PDIException
-	 */
-	public IAIF getExpressionValue(BitList qTasks, String expr) throws PDIException;
-
-	/**
-	 * Returns IPDIMultiExpressions with specific expression value
-	 * @param exprText expression value
-	 * @return IPDIMultiExpressions
-	 */
-	public IPDIMultiExpressions getMultiExpression(String exprText);
-	
-	/**
-	 * Returns an array of multiple expressions
-	 * @return an array of multiple expressions
-	 */
-	public IPDIMultiExpressions[] getMultiExpressions();
-	
-	/**
-	 * Returns array of enabled IPDIExpression with specific task id
-	 * @param task task id
-	 * @return array of enabled IPDIExpression with specific task id
-	 */
-	public IPDIExpression[] getMultiExpressions(int task);
-	
-	/**
-	 * Remove multiple expressions from store
-	 * @param qTasks task 
-	 * @param exprText expression name
-	 */
-	public void removeMutliExpressions(BitList tasks, String exprText);
-	
-	/**
-	 * Remove multiple expressions from store
-	 * @param exprText expression name
-	 */
-	public void removeMutliExpressions(String exprText);
-
-	/**
-	 * @param qTasks
-	 * @param varList
-	 * @throws PDIException
-	 */
-	public void update(BitList qTasks, String[] varList) throws PDIException;
-	
-	/**
-	 * Update expression value
-	 * @param tasks
-	 * @param monitor
-	 * @throws PDIException
-	 */
-	public void updateMultiExpressions(BitList tasks, IProgressMonitor monitor) throws PDIException;
-	
-	/**
-	 * Update expression value
-	 * @param exprText
-	 * @param tasks
-	 * @param monitor
-	 * @throws PDIException
-	 */
-	public void updateMultiExpressions(String exprText, BitList tasks, IProgressMonitor monitor) throws PDIException;
-	
-	/**
-	 * Update status of multiple expressions
-	 * @param exprText expression name
-	 * @param enabled status of this expression
-	 */
-	public void updateStatusMultiExpressions(String exprText, boolean enabled);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManager.java
deleted file mode 100644
index 4909a3e..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManager.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Base manager interfaces
- * 
- * @author greg
- *
- */
-public interface IPDIManager extends IPDISessionObject {
-	/**
-	 * @return
-	 */
-	public boolean isAutoUpdate();
-	
-	/**
-	 * @param update
-	 */
-	public void setAutoUpdate(boolean update);
-	
-	/**
-	 * 
-	 */
-	public void shutdown();
-	
-	/**
-	 * @param tasks
-	 * @throws PDIException
-	 */
-	public void update(BitList tasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManagerFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManagerFactory.java
deleted file mode 100644
index eb60d25..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIManagerFactory.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-
-public interface IPDIManagerFactory {
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIBreakpointManager newBreakpointManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIEventManager newEventManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIEventRequestManager newEventRequestManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIExpressionManager newExpressionManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIMemoryManager newMemoryManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIRegisterManager newRegisterManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDISignalManager newSignalManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDISourceManager newSourceManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDITargetManager newTargetManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDITaskManager newTaskManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIThreadManager newThreadManager(IPDISession session);
-
-	/**
-	 * @param session
-	 * @return
-	 */
-	public IPDIVariableManager newVariableManager(IPDISession session);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIMemoryManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIMemoryManager.java
deleted file mode 100644
index ae9be27..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIMemoryManager.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-
-/**
- * Represent memeory manager to manage memory
- * @author clement
- *
- */
-public interface IPDIMemoryManager extends IPDIManager {
-	/**
-	 * Returns a memory block specified by given identifier.
-	 * @param qTasks target process
-	 * @param address 
-	 * @param units - number of bytes
-	 * @param wordSize - this parameter has been deprecated and will always be passed as the value 1. If the memory has an addressable size (number of bytes per address) greather than 1, the PDI client should take care not to
-	 * @return a memory block with the specified identifier
-	 * @throws PDIException on failure
-	 */
-	public IPDIMemoryBlock createMemoryBlock(BitList qTasks, String address, int units, int wordSize) throws PDIException;
-	
-	/**
-	 * Returns an array of all memory blocks set for this debug session.
-	 * @param qTasks target process
-	 * @return an array of all memory blocks set for this debug session
-	 * @throws PDIException on failure
-	 */
-	public IPDIMemoryBlock[] getMemoryBlocks(BitList qTasks) throws PDIException;
-
-	/**
-	 * Requests to remove all memory blocks from the debug session.
-	 * @param tasks target process
-	 * @throws PDIException on failure
-	 */
-	public void removeAllBlocks(BitList tasks) throws PDIException;
-
-	/**
-	 * Requests to remove the given array of memory blocks from the debug session.
-	 * @param tasks target process
-	 * @param memoryBlock - the array of memory blocks to be removed
-	 * @throws PDIException on failure
-	 */
-	public void removeBlocks(BitList tasks, IPDIMemoryBlock[] memoryBlocks) throws PDIException;
-
-	/**
-	 * @param block
-	 * @param aList
-	 * @return
-	 * @throws PDIException
-	 */
-	public BigInteger[] update(IPDIMemoryBlock block, List<IPDIEvent> aList) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIRegisterManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIRegisterManager.java
deleted file mode 100644
index 747c5c5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIRegisterManager.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegister;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterGroup;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-
-/**
- * Represent register manager to manage register
- * @author clement
- *
- */
-public interface IPDIRegisterManager extends IPDIManager {
-	/**
-	 * @param regDesc
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIRegister createRegister(IPDIRegisterDescriptor regDesc) throws PDIException;
-	
-	/**
-	 * @param register
-	 * @param frame
-	 * @param regName
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIVariable createShadowRegister(IPDIRegister register, IPDIStackFrame frame, String regName) throws PDIException;
-	
-	/**
-	 * @param reg
-	 */
-	public void destroyRegister(IPDIRegister reg);
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIRegisterGroup[] getRegisterGroups(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISignalManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISignalManager.java
deleted file mode 100644
index 261b5d9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISignalManager.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-
-/**
- * Represent signal manager to manage signal
- * @author clement
- *
- */
-public interface IPDISignalManager extends IPDIManager {
-	/**
-	 * Returns the array of signals defined for this target.
-	 * @param tasks target process 
-	 * @return the array of signals
-	 * @throws PDIException on failure
-	 */
-	public IPDISignal[] getSignals(BitList tasks) throws PDIException;
-	
-	/**
-	 * @param sig
-	 * @param isIgnore
-	 * @param isStop
-	 * @throws PDIException
-	 */
-	public void handle(IPDISignal sig, boolean isIgnore, boolean isStop) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISourceManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISourceManager.java
deleted file mode 100644
index 747c1af..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDISourceManager.java
+++ /dev/null

@@ -1,127 +0,0 @@
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIInstruction;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMixedInstruction;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-
-public interface IPDISourceManager extends IPDIManager {
-
-	/**
-	 * @param target
-	 * @param typename
-	 * @return
-	 * @throws PDIException
-	 */
-	public String getDetailTypeName(IPDITarget target, String typename)
-			throws PDIException;
-
-	/**
-	 * @param frame
-	 * @param variable
-	 * @return
-	 * @throws PDIException
-	 */
-	public String getDetailTypeNameFromVariable(IPDIStackFrame frame,
-			String variable) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param start
-	 * @param end
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIInstruction[] getInstructions(BitList qTasks, BigInteger start,
-			BigInteger end) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param filename
-	 * @param linenum
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIInstruction[] getInstructions(BitList qTasks, String filename,
-			int linenum) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param filename
-	 * @param linenum
-	 * @param lines
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIInstruction[] getInstructions(BitList qTasks, String filename,
-			int linenum, int lines) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param start
-	 * @param end
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(BitList qTasks,
-			BigInteger start, BigInteger end) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param filename
-	 * @param linenum
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(BitList qTasks,
-			String filename, int linenum) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param filename
-	 * @param linenum
-	 * @param lines
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(BitList qTasks,
-			String filename, int linenum, int lines) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public String[] getSourcePaths(BitList qTasks) throws PDIException;
-
-	/**
-	 * @param target
-	 * @param variable
-	 * @return
-	 * @throws PDIException
-	 */
-	public String getTypeName(IPDITarget target, String variable)
-			throws PDIException;
-
-	/**
-	 * @param frame
-	 * @param variable
-	 * @return
-	 * @throws PDIException
-	 */
-	public String getTypeNameFromVariable(IPDIStackFrame frame, String variable)
-			throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param dirs
-	 * @throws PDIException
-	 */
-	public void setSourcePaths(BitList qTasks, String[] dirs)
-			throws PDIException;
-
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITargetManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITargetManager.java
deleted file mode 100644
index c3379f0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITargetManager.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-
-/**
- * Represent expression manager to manage processes
- * @author clement
- *
- */
-public interface IPDITargetManager extends IPDIManager {
-	/**
-	 * Returns target of specify tasks
-	 * @param qTasks
-	 * @return target of specify tasks
-	 */
-	IPDITarget getTarget(BitList qTasks);
-
-	/**
-	 * Returns all targets
-	 * @return all targets
-	 */
-	IPDITarget[] getTargets();
-
-	/**
-	 * Adds task to be a target
-	 * @param qTasks
-	 * @return created target
-	 */
-	IPDITarget addTarget(BitList qTasks);
-
-	/**
-	 * Returns whether given tasks are deleted its target
-	 * @param qTasks
-	 * @return true if given tasks are deleted its target
-	 */
-	boolean removeTarget(BitList qTasks);
-	
-	/**
-	 * Cleans up storage
-	 */
-	void cleanup();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITaskManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITaskManager.java
deleted file mode 100644
index 7c49c5a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITaskManager.java
+++ /dev/null

@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * Represent expression manager to manage processes
- * 
- * @author clement
- * 
- */
-public interface IPDITaskManager extends IPDIManager {
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public boolean canAllStepReturn(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getCannotStepReturnTasks(BitList tasks);
-
-	/**
-	 * @return
-	 */
-	public BitList getCanStepReturnTasks();
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getCanStepReturnTasks(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getNonPendingTasks(BitList tasks);
-
-	/**
-	 * Find terminated or suspended tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getNonRunningTasks(BitList tasks);
-
-	/**
-	 * Find terminated or running tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getNonSuspendedTasks(BitList tasks);
-
-	/**
-	 * Find running or suspended tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getNonTerminatedTasks(BitList tasks);
-
-	/**
-	 * @return
-	 */
-	public BitList getPendingTasks();
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getPendingTasks(BitList tasks);
-
-	/**
-	 * Get all registered tasks
-	 * 
-	 * @return
-	 */
-	public BitList getRegisteredTasks();
-
-	/**
-	 * Find registered tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getRegisteredTasks(BitList tasks);
-
-	/**
-	 * Find running tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getRunningTasks(BitList tasks);
-
-	/**
-	 * Get all suspended tasks
-	 * 
-	 * @return
-	 */
-	public BitList getSuspendedTasks();
-
-	/**
-	 * Find suspended tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getSuspendedTasks(BitList tasks);
-
-	/**
-	 * Get all terminated tasks
-	 * 
-	 * @return
-	 */
-	public BitList getTerminatedTasks();
-
-	/**
-	 * Find terminated tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getTerminatedTasks(BitList tasks);
-
-	/**
-	 * Find unregistered tasks
-	 * 
-	 * @param tasks
-	 * @return
-	 */
-	public BitList getUnregisteredTasks(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public boolean isAllPending(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public boolean isAllRegistered(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public boolean isAllRunning(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public boolean isAllSuspended(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public boolean isAllTerminated(BitList tasks);
-
-	/**
-	 * @param isAdd
-	 * @param tasks
-	 */
-	public void setCanStepReturnTasks(boolean isAdd, BitList tasks);
-
-	/**
-	 * @param isAdd
-	 * @param tasks
-	 */
-	public void setPendingTasks(boolean isAdd, BitList tasks);
-
-	/**
-	 * @param isAdd
-	 * @param tasks
-	 */
-	public void setRegisterTasks(boolean isAdd, BitList tasks);
-
-	/**
-	 * @param isAdd
-	 * @param tasks
-	 */
-	public void setSuspendTasks(boolean isAdd, BitList tasks);
-
-	/**
-	 * @param isAdd
-	 * @param tasks
-	 */
-	public void setTerminateTasks(boolean isAdd, BitList tasks);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIThreadManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIThreadManager.java
deleted file mode 100644
index 250f4cd..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIThreadManager.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-
-/**
- * Represent expression manager to manage processes
- * @author clement
- *
- */
-public interface IPDIThreadManager extends IPDIManager {
-	public IPDIThread[] getThreads(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITraceManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITraceManager.java
deleted file mode 100644
index ce19b26..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDITraceManager.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-
-/**
- * TODO
- * @author clement
- *
- */
-public interface IPDITraceManager extends IPDIManager {
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIVariableManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIVariableManager.java
deleted file mode 100644
index 26c9ff2..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/manager/IPDIVariableManager.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgument;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorage;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorageDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-
-
-/**
- * Represent expression manager to manage processes
- * @author clement
- *
- */
-public interface IPDIVariableManager extends IPDIManager {
-	public IPDIArgument createArgument(IPDIArgumentDescriptor argDesc) throws PDIException;
-	public IPDIGlobalVariable createGlobalVariable(IPDIGlobalVariableDescriptor varDesc) throws PDIException;
-	public IPDILocalVariable createLocalVariable(IPDILocalVariableDescriptor varDesc) throws PDIException;
-	public IPDIArgumentDescriptor[] getArgumentDescriptors(IPDIStackFrame frame) throws PDIException;
-	public IPDILocalVariableDescriptor[] getLocalVariableDescriptors(IPDIStackFrame frame) throws PDIException;
-	public IPDIVariable getVariableByName(BitList tasks, String varname);
-	public IPDIGlobalVariableDescriptor getGlobalVariableDescriptor(BitList tasks, String filename, String function, String name) throws PDIException;
-	public IPDIThreadStorage createThreadStorage(IPDIThreadStorageDescriptor desc) throws PDIException;
-	public IPDIThreadStorageDescriptor[] getThreadStorageDescriptors(IPDIThread thread) throws PDIException;
-	public void destroyVariable(IPDIVariable variable) throws PDIException;
-	public IPDIVariable createVariable(IPDIVariableDescriptor varDesc) throws PDIException;
-	
-	/**
-	 * @param varDesc
-	 * @param start
-	 * @param length
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsArray(IPDIVariableDescriptor varDesc, int start, int length) throws PDIException;
-	
-	/**
-	 * @param varDesc
-	 * @param type
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsType(IPDIVariableDescriptor varDesc, String type) throws PDIException;
-
-	/**
-	 * @param qTasks
-	 * @param vars
-	 * @throws PDIException
-	 */
-	public void update(BitList qTasks, String[] vars) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/AbstractModelFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/AbstractModelFactory.java
deleted file mode 100644
index 5a4231c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/AbstractModelFactory.java
+++ /dev/null

@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-import org.eclipse.ptp.debug.internal.core.pdi.model.AddressBreakpoint;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Argument;
-import org.eclipse.ptp.debug.internal.core.pdi.model.ArgumentDescriptor;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Condition;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Exceptionpoint;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Expression;
-import org.eclipse.ptp.debug.internal.core.pdi.model.FunctionBreakpoint;
-import org.eclipse.ptp.debug.internal.core.pdi.model.GlobalVariable;
-import org.eclipse.ptp.debug.internal.core.pdi.model.GlobalVariableDescriptor;
-import org.eclipse.ptp.debug.internal.core.pdi.model.LineBreakpoint;
-import org.eclipse.ptp.debug.internal.core.pdi.model.LocalVariable;
-import org.eclipse.ptp.debug.internal.core.pdi.model.LocalVariableDescriptor;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Memory;
-import org.eclipse.ptp.debug.internal.core.pdi.model.MemoryBlock;
-import org.eclipse.ptp.debug.internal.core.pdi.model.MultiExpressions;
-import org.eclipse.ptp.debug.internal.core.pdi.model.RegisterDescriptor;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Signal;
-import org.eclipse.ptp.debug.internal.core.pdi.model.SignalDescriptor;
-import org.eclipse.ptp.debug.internal.core.pdi.model.StackFrame;
-import org.eclipse.ptp.debug.internal.core.pdi.model.StackFrameDescriptor;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Target;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Thread;
-import org.eclipse.ptp.debug.internal.core.pdi.model.ThreadStorageDescriptor;
-import org.eclipse.ptp.debug.internal.core.pdi.model.Watchpoint;
-
-
-public abstract class AbstractModelFactory implements IPDIModelFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newAddressBreakpoint(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int, org.eclipse.ptp.debug.core.pdi.IPDILocation, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean)
-	 */
-	public IPDIAddressBreakpoint newAddressBreakpoint(IPDISession session,
-			BitList tasks, int type, IPDILocation location,
-			IPDICondition condition, boolean enabled) {
-		return new AddressBreakpoint(session, tasks, type, location, condition, enabled);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newArgument(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor, java.lang.String)
-	 */
-	public IPDIArgument newArgument(IPDISession session,
-			IPDIArgumentDescriptor argDesc, String varId) {
-		return new Argument(session, argDesc, varId);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newArgumentDescriptor(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int)
-	 */
-	public IPDIArgumentDescriptor newArgumentDescriptor(IPDISession session,
-			BitList tasks, IPDIThread thread, IPDIStackFrame frame,
-			String name, String fullName, int pos, int depth) {
-		return new ArgumentDescriptor(session, tasks, thread, frame, name, fullName, pos, depth);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newCondition(int, java.lang.String, java.lang.String[])
-	 */
-	public IPDICondition newCondition(int ignore, String exp, String[] ids) {
-		return new Condition(ignore, exp, ids);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newExceptionpoint(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.lang.String, boolean, boolean, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean, org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint[])
-	 */
-	public IPDIExceptionpoint newExceptionpoint(IPDISession session,
-			BitList tasks, String clazz, boolean stopOnThrow,
-			boolean stopOnCatch, IPDICondition condition, boolean enabled,
-			IPDIFunctionBreakpoint[] funcBpts) {
-		return new Exceptionpoint(session, tasks, clazz, stopOnThrow, stopOnCatch, condition, enabled, funcBpts);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newExpression(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDITargetExpression newExpression(IPDISession session,
-			BitList tasks, String ex) {
-		return new Expression(session, tasks, ex);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newFunctionBreakpoint(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int, org.eclipse.ptp.debug.core.pdi.IPDILocation, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean)
-	 */
-	public IPDIFunctionBreakpoint newFunctionBreakpoint(IPDISession session,
-			BitList tasks, int type, IPDILocation location,
-			IPDICondition condition, boolean enabled) {
-		return new FunctionBreakpoint(session, tasks, type, location, condition, enabled);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newGlobalVariable(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor, java.lang.String)
-	 */
-	public IPDIGlobalVariable newGlobalVariable(IPDISession session,
-			IPDIGlobalVariableDescriptor varDesc, String varId) {
-		return new GlobalVariable(session, varDesc, varId);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newGlobalVariableDescriptor(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int)
-	 */
-	public IPDIGlobalVariableDescriptor newGlobalVariableDescriptor(
-			IPDISession session, BitList tasks, IPDIThread thread,
-			IPDIStackFrame frame, String name, String fullName, int pos,
-			int depth) {
-		return new GlobalVariableDescriptor(session, tasks, thread, frame, name, fullName, pos, depth);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newLineBreakpoint(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int, org.eclipse.ptp.debug.core.pdi.IPDILocation, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean)
-	 */
-	public IPDILineBreakpoint newLineBreakpoint(IPDISession session,
-			BitList tasks, int type, IPDILocation location,
-			IPDICondition condition, boolean enabled) {
-		return new LineBreakpoint(session, tasks, type, location, condition, enabled);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newLocalVariable(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int, java.lang.String)
-	 */
-	public IPDILocalVariable newLocalVariable(IPDISession session,
-			BitList tasks, IPDIThread thread, IPDIStackFrame frame,
-			String name, String fullName, int pos, int depth, String varid) {
-		return new LocalVariable(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newLocalVariable(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor, java.lang.String)
-	 */
-	public IPDILocalVariable newLocalVariable(IPDISession session,
-			IPDILocalVariableDescriptor varDesc, String varId) {
-		return new LocalVariable(session, varDesc, varId);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newLocalVariableDescriptor(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int)
-	 */
-	public IPDILocalVariableDescriptor newLocalVariableDescriptor(
-			IPDISession session, BitList tasks, IPDIThread thread,
-			IPDIStackFrame frame, String name, String fullName, int pos,
-			int depth) {
-		return new LocalVariableDescriptor(session, tasks, thread, frame, name, fullName, pos, depth);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newMemory(java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IPDIMemory newMemory(String address, String ascii, String[] data) {
-		return new Memory(address, ascii, data);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newMemoryBlock(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.lang.String, int, boolean, org.eclipse.ptp.debug.core.pdi.model.IPDIDataReadMemoryInfo)
-	 */
-	public IPDIMemoryBlock newMemoryBlock(IPDISession session, BitList tasks,
-			String exp, int wordSize, boolean b, IPDIDataReadMemoryInfo info) {
-		return new MemoryBlock(session, tasks, exp, wordSize, b, info);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newMultiExpressions(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.lang.String, boolean)
-	 */
-	public IPDIMultiExpressions newMultiExpressions(IPDISession session,
-			BitList tasks, String ex, boolean enabled) {
-		return new MultiExpressions(session, tasks, ex, enabled);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newRegisterDescriptor(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int)
-	 */
-	public IPDIVariableDescriptor newRegisterDescriptor(IPDISession session,
-			BitList tasks, IPDIThread thread, IPDIStackFrame frame,
-			String name, String fullName, int pos, int depth) {
-		return new RegisterDescriptor(session, tasks, thread, frame, name, fullName, pos, depth);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newSignal(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor)
-	 */
-	public IPDISignal newSignal(IPDISession session, BitList tasks,
-			IPDISignalDescriptor signalDescriptor) {
-		return new Signal(session, tasks, signalDescriptor);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newSignalDescriptor(java.lang.String, boolean, boolean, boolean, java.lang.String)
-	 */
-	public IPDISignalDescriptor newSignalDescriptor(String name, boolean stop,
-			boolean pass, boolean print, String description) {
-		return new SignalDescriptor(name, stop, pass, print, description);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newStackFrame(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, int, org.eclipse.ptp.debug.core.pdi.IPDILocator)
-	 */
-	public IPDIStackFrame newStackFrame(IPDISession session,
-			IPDIThread pthread, int i, IPDILocator locator) {
-		return new StackFrame(session, pthread, i, locator);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newStackFrame(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, int, java.lang.String, java.lang.String, int, java.math.BigInteger)
-	 */
-	public IPDIStackFrame newStackFrame(IPDISession session, IPDIThread thread,
-			int level, String file, String func, int line, BigInteger addr) {
-		return new StackFrame(session, thread, level, file, func, line, addr);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newStackFrameDescriptor(int, org.eclipse.ptp.debug.core.pdi.IPDILocator)
-	 */
-	public IPDIStackFrameDescriptor newStackFrameDescriptor(int level,
-			IPDILocator loc) {
-		return new StackFrameDescriptor(level, loc);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newTarget(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDITarget newTarget(IPDISession session, BitList tasks) {
-		return new Target(session, tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newThread(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.debug.core.pdi.model.IPDITarget, int)
-	 */
-	public IPDIThread newThread(IPDISession session, IPDITarget target,
-			int parseInt) {
-		return new Thread(session, target, parseInt);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newThreadStorageDescriptor(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIThread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int)
-	 */
-	public IPDIVariableDescriptor newThreadStorageDescriptor(
-			IPDISession session, BitList tasks, IPDIThread thread,
-			IPDIStackFrame frame, String name, String fullName, int pos,
-			int depth) {
-		return new ThreadStorageDescriptor(session, tasks, thread, frame, name, fullName, pos, depth);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory#newWatchpoint(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int, java.lang.String, int, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean)
-	 */
-	public IPDIWatchpoint newWatchpoint(IPDISession session, BitList tasks,
-			int type, String expression, int type2, IPDICondition condition,
-			boolean enabled) {
-		return new Watchpoint(session, tasks, type, expression, type2, condition, enabled);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIAddressBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIAddressBreakpoint.java
deleted file mode 100644
index 11d1e63..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIAddressBreakpoint.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents an address breakpoint
- * @author clement
- *
- */
-public interface IPDIAddressBreakpoint extends IPDILocationBreakpoint {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgument.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgument.java
deleted file mode 100644
index 17c5dcf..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgument.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents an argument in the stack frame
- * @author clement
- *
- */
-public interface IPDIArgument extends IPDILocalVariable, IPDIArgumentDescriptor {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgumentDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgumentDescriptor.java
deleted file mode 100644
index ac9fe47..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIArgumentDescriptor.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents argument descriptor
- * @author clement
- *
- */
-public interface IPDIArgumentDescriptor extends IPDIVariableDescriptor {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIBreakpoint.java
deleted file mode 100644
index 85879e6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIBreakpoint.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Provides a basic functionality for the location breakpoints, watchpoints and catchpoints.
- * @author clement
- *
- */
-public interface IPDIBreakpoint extends IPDISessionObject {
-	/**
-	 * Regular type
-	 */
-	public final static int REGULAR = 0x0;
-	
-	/**
-	 * Temporary type 
-	 */
-	public final static int TEMPORARY = 0x1;
-	
-	/**
-	 * Hardware type 
-	 */
-	public final static int HARDWARE = 0x2;
-	
-	/**
-	 * Returns breakpoint id of this breakpoint
-	 * 
-	 * @return breakpoint id of this breakpoint
-	 */
-	public int getBreakpointID();
-	
-	/**
-	 * Returns the condition of this breakpoint or null if no condition in this breakpoint
-	 * 
-	 * @return the condition of this breakpoint
-	 * @throws PDIException on failure
-	 */
-	public IPDICondition getCondition() throws PDIException;
-	
-	/**
-	 * Returns internal breakpoint id
-	 * 
-	 * @return internal breakpoint id
-	 */
-	public int getInternalID();
-	
-	/**
-	 * This is the set of pending tasks for the current operation. If the breakpoint is marked
-	 * for deletion, it's the tasks that still require the breakpoint to be removed. Otherwise,
-	 * its the tasks on which the breakpoint still needs to be set.
-	 * 
-	 * @return pending tasks
-	 */
-	public BitList getPendingTasks();
-	
-	/**
-	 * Breakpoint has been marked for deletion. The breakpoint is not
-	 * actually removed until getPendingTasks().isEmpty() is true.
-	 * 
-	 * @return true if breakpoint is being deleted
-	 */
-	public boolean isDeleted();
-	
-	/**
-	 * Determines whether this breakpoint is enabled
-	 * 
-	 * @return whether this breakpoint is enabled
-	 * @throws PDIException on failure
-	 */
-	public boolean isEnabled() throws PDIException;
-	
-	/**
-	 * Determines whether this breakpoint is hardware-assisted
-	 * 
-	 * @return whether this breakpoint is hardware-assisted
-	 */
-	public boolean isHardware();
-	
-	/**
-	 * Determines whether this breakpoint is temporary
-	 * 
-	 * @return whether this breakpoint is temporary
-	 */
-	public boolean isTemporary();
-	
-	/**
-	 * Sets a breakpoint id for this breakpoint
-	 * 
-	 * @param bpid breakpoint id 
-	 */
-	public void setBreakpointID(int bpid);
-	
-	/**
-	 * Marks the breakpoint for deletion. The breakpoint should be
-	 * considered deleted at this point and no further operations
-	 * permitted.
-	 */
-	public void setDeleted();
-	
-	/**
-	 * Sets the breakpoint state to be enabled or disabled.
-	 * 
-	 * @param enabled whether this breakpoint should be enabled
-	 * @throws PDIException on failure
-	 */
-	public void setEnabled(boolean enabled) throws PDIException;
-	
-	/**
-	 * Sets the condition of this breakpoint.
-	 * 
-	 * @param condition the condition to set
-	 * @throws PDIException on failure
-	 */
-	void setCondition(IPDICondition condition) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExceptionpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExceptionpoint.java
deleted file mode 100644
index a5334cc..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExceptionpoint.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents a exception breakpoint
- * @author clement
- *
- */
-public interface IPDIExceptionpoint extends IPDIBreakpoint {
-	/**
-	 * Determines if this exception point is stopped on throw
-	 * @return true if this exception point is stopped on throw
-	 */
-	boolean isStopOnThrow();
-	
-	/**
-	 * Determines if this exception point is stopped on catch
-	 * @return true if this exception point is stopped on catch
-	 */
-	boolean isStopOnCatch();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExpression.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExpression.java
deleted file mode 100644
index 4dbc5e6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIExpression.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * An expression is a snippet of code that can be evaluated to produce a value
- * @author clement
- *
- */
-public interface IPDIExpression {
-	/**
-	 * Returns the expression snippet of code.
-	 * @return the expression
-	 */
-	String getExpressionText();
-
-	/**
-	 * Determines whether the variable Object are the same,
-	 * For example event if the name is the same because of casting this may return false;
-	 * @return true if the same
-	 */
-	boolean equals(IPDIExpression expr);
-	
-	/**
-	 * Remove the expression from the manager list
-	 * @param var
-	 * @throws PDIException on failure
-	 */
-	void dispose() throws PDIException;
-	
-	/**
-	 * Returns AIF of this expression
-	 * @return aif
-	 * @throws PDIException on failure
-	 */
-	IAIF getAIF() throws PDIException;
-	
-	/**
-	 * Set aif for this expression
-	 * @param aif
-	 */
-	void setAIF(IAIF aif);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIFunctionBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIFunctionBreakpoint.java
deleted file mode 100644
index 6453732..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIFunctionBreakpoint.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents a function breakpoint
- * @author clement
- *
- */
-public interface IPDIFunctionBreakpoint extends IPDILocationBreakpoint {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariable.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariable.java
deleted file mode 100644
index ea4766f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariable.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents global variable
- * @author clement
- *
- */
-public interface IPDIGlobalVariable extends IPDIVariable, IPDIGlobalVariableDescriptor {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariableDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariableDescriptor.java
deleted file mode 100644
index 81f8369..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIGlobalVariableDescriptor.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents global variable descriptor
- * @author clement
- *
- */
-public interface IPDIGlobalVariableDescriptor extends IPDIVariableDescriptor {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIInstruction.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIInstruction.java
deleted file mode 100644
index 019ad22..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIInstruction.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Represents a machine instruction.
- * @author clement
- *
- */
-public interface IPDIInstruction extends IPDISessionObject {
-	/**
-	 * Returns the Address.
-	 * @return the address.
-	 */
-	BigInteger getAdress();
-	
-	/**
-	 * Returns the function name
-	 * @return the function name.
-	 */
-	String getFuntionName();
-	
-	/**
-	 * Returns the instruction
-	 * @return the instruction.
-	 */
-	String getInstruction();
-  
-	/**
-	 * Returns the opcode
-	 * @return the opcode
-	 */
-	String getOpcode();
-
-	/**
-	 * Returns any arguments to the argument
-	 * @return any arguments to the argument
-	 */
-	String getArgs();
-
-	/**
-	 * Returns the instruction's offset.
-	 * @return the offset of this machine instruction
-	 */
-	long getOffset();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILineBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILineBreakpoint.java
deleted file mode 100644
index 0fe5b73..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILineBreakpoint.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents a line breakpoint
- * @author clement
- *
- */
-public interface IPDILineBreakpoint extends IPDILocationBreakpoint {
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariable.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariable.java
deleted file mode 100644
index e675f90..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariable.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents local variable
- * @author clement
- *
- */
-public interface IPDILocalVariable extends IPDIVariable, IPDILocalVariableDescriptor {
-
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariableDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariableDescriptor.java
deleted file mode 100644
index 65e7950..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocalVariableDescriptor.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents local variable descriptor
- * @author clement
- *
- */
-public interface IPDILocalVariableDescriptor extends IPDIVariableDescriptor {
-	/**
-	 * Returns stackframe of this variable
-	 * @return stackframe of this variable
-	 * @throws PDIException on failure
-	 */
-	IPDIStackFrame getStackFrame() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocationBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocationBreakpoint.java
deleted file mode 100644
index 0088e6b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDILocationBreakpoint.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-
-/**
- * Represents the location of breakpoint: file, line, function, address
- * @author clement
- *
- */
-public interface IPDILocationBreakpoint extends IPDIBreakpoint {
-	/**
-	 * Returns the location of the breakpoint
-	 * @return IPDILocator object
-	 */
-	IPDILocator getLocator();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemory.java
deleted file mode 100644
index 7a4ae08..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemory.java
+++ /dev/null

@@ -1,30 +0,0 @@
-package org.eclipse.ptp.debug.core.pdi.model;
-
-public interface IPDIMemory {
-
-	/**
-	 * @return
-	 */
-	public String getAddress();
-
-	/**
-	 * @return
-	 */
-	public long[] getData();
-
-	/**
-	 * @return
-	 */
-	public int[] getBadOffsets();
-
-	/**
-	 * @return
-	 */
-	public String getAscii();
-
-	/**
-	 * @return
-	 */
-	public String toString();
-
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemoryBlock.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemoryBlock.java
deleted file mode 100644
index 13c8499..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMemoryBlock.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-
-/**
- * A contiguous segment of memory in an execution context.
- * A memory block is represented by a starting memory address and a length.
- * @author clement
- *
- */
-public interface IPDIMemoryBlock extends IPDISessionObject {
-    /**
-     * Bit mask used to indicate a byte is read-only
-     */
-	public static final byte READ_ONLY = 0x01;
-
-	/**
-	 * Bit mask used to indicate a byte is valid
-	 */
-	public static final byte VALID = 0x02;
-
-	/**
-	 * @return
-	 */
-	public IPDIDataReadMemoryInfo getDataReadMemoryInfo();
-	
-	/**
-	 * @return
-	 */
-	public String getExpression();
-
-	/**
-	 * Returns this memory byte's attribute as a bit mask.
-	 * The method throw IndexOutOfBoundsException if the offset is out of range of the block.
-	 * @return this memory byte's attribute as a bit mask
-	 */
-	public byte getFlags(int offset);
-
-	/**
-	 * @param m
-	 */
-	public void setDataReadMemoryInfo(IPDIDataReadMemoryInfo m);
-
-	/**
-	 * Returns the values of the bytes currently contained in this this memory block.
-	 * Note: the number maybe greater or lower to what was requested.
-	 * @return the values of the bytes currently contained in this this memory block
-	 * throws PCDIException if this method fails.  Reasons include:
-	 * <ul><li>Failure communicating with the debug target.  The PDIException's status code contains the underlying exception responsible for the failure.</li></ul>
-	 */	
-	byte[] getBytes() throws PDIException;
-
-	/**
-	 * Returns the length of this memory block in bytes
-	 * @return the length of this memory block in bytes
-	 */	
-	long getLength();
-
-	/**
-	 * Returns the start address of this memory block
-	 * @return the start address of this memory block
-	 */
-	BigInteger getStartAddress();
-
-	/**
-	 * Returns the size of each memory word in bytes
-	 * @return The size of each memory word in bytes
-	 */
-	int getWordSize();
-
-	/**
-	 * Determines whether the block does not update
-	 * @return true if the block does not update
-	 */
-	boolean isFrozen();
-	
-	/**
-	 * Refresh the data, this may cause events to be trigger if the data values changed.
-	 * @throws PDIException on failure
-	 */
-	void refresh() throws PDIException;
-	
-	/**
-	 * A memoryBlock set frozen means that the block will not update and check for new data
-	 * @param frozen the block is frozen by default
-	 */
-	void setFrozen(boolean frozen);
-	
-	/**
-	 * Sets the value of the bytes in this memory block at the specified offset within this memory block to the specified bytes.
-	 * The offset is zero based.
-	 * @param offset the offset at which to set the new values
-	 * @param bytes the new values
-	 * throws PDIException if this method fails.  Reasons include:
-	 * <ul>
-	 * <li>Failure communicating with the debug target.  The PDIException's status code contains the underlying exception responsible for the failure.</li>
-	 * <li>This memory block does not support value modification</li>
-	 * <li>The specified offset is greater than or equal to the length of this memory block, or the number of bytes specified goes beyond the end of this memory block (index of out of range)</li>
-	 * </ul>
-	 */
-	void setValue(long offset, byte[] bytes) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMixedInstruction.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMixedInstruction.java
deleted file mode 100644
index 7c6005e..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMixedInstruction.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-
-/**
- * Represents a machine instruction.
- * @author clement
- *
- */
-public interface IPDIMixedInstruction extends IPDISessionObject {
-	/**
-	 * Returns the line number
-	 * @return the line Number
-	 */
-	int getLineNumber();
-	
-	/**
-	 * Returns the file name
-	 * @return the file name
-	 */
-	String getFileName();
-	
-	/**
-	 * Returns the array of instruction
-	 * @return the array of instruction
-	 */
-	IPDIInstruction[] getInstructions();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIModelFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIModelFactory.java
deleted file mode 100644
index cc02b9b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIModelFactory.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-
-
-public interface IPDIModelFactory {
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param type
-	 * @param location
-	 * @param condition
-	 * @param enabled
-	 * @return
-	 */
-	public IPDIAddressBreakpoint newAddressBreakpoint(IPDISession session, BitList tasks, int type, 
-			IPDILocation location, IPDICondition condition, boolean enabled);
-	
-	/**
-	 * @param session
-	 * @param argDesc
-	 * @param varId
-	 * @return
-	 */
-	public IPDIArgument newArgument(IPDISession session,
-			IPDIArgumentDescriptor argDesc, String varId);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param thread
-	 * @param frame
-	 * @param name
-	 * @param fullName
-	 * @param pos
-	 * @param depth
-	 * @return
-	 */
-	public IPDIArgumentDescriptor newArgumentDescriptor(IPDISession session,
-			BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name,
-			String fullName, int pos, int depth);
-
-	/**
-	 * @param ignore
-	 * @param exp
-	 * @param ids
-	 * @return
-	 */
-	public IPDICondition newCondition(int ignore, String exp, String[] ids);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param clazz
-	 * @param stopOnThrow
-	 * @param stopOnCatch
-	 * @param condition
-	 * @param enabled
-	 * @param funcBpts
-	 * @return
-	 */
-	public IPDIExceptionpoint newExceptionpoint(IPDISession session, BitList tasks, String clazz, boolean stopOnThrow, 
-			boolean stopOnCatch, IPDICondition condition, boolean enabled, IPDIFunctionBreakpoint[] funcBpts);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param ex
-	 * @return
-	 */
-	public IPDITargetExpression newExpression(IPDISession session, BitList tasks, String ex);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param type
-	 * @param location
-	 * @param condition
-	 * @param enabled
-	 * @return
-	 */
-	public IPDIFunctionBreakpoint newFunctionBreakpoint(IPDISession session, BitList tasks, int type, 
-			IPDILocation location, IPDICondition condition, boolean enabled);
-	
-	/**
-	 * @param session
-	 * @param varDesc
-	 * @param varId
-	 * @return
-	 */
-	public IPDIGlobalVariable newGlobalVariable(IPDISession session,
-			IPDIGlobalVariableDescriptor varDesc, String varId);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param thread
-	 * @param frame
-	 * @param name
-	 * @param fullName
-	 * @param pos
-	 * @param depth
-	 * @return
-	 */
-	public IPDIGlobalVariableDescriptor newGlobalVariableDescriptor(
-			IPDISession session, BitList tasks, IPDIThread thread,
-			IPDIStackFrame frame, String name, String fullName, int pos,
-			int depth);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param type
-	 * @param location
-	 * @param condition
-	 * @param enabled
-	 * @return
-	 */
-	public IPDILineBreakpoint newLineBreakpoint(IPDISession session, BitList tasks, int type, 
-			IPDILocation location, IPDICondition condition, boolean enabled);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param thread
-	 * @param frame
-	 * @param name
-	 * @param fullName
-	 * @param pos
-	 * @param depth
-	 * @param varid
-	 */
-	public IPDILocalVariable newLocalVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid);
-	
-	/**
-	 * @param session
-	 * @param varDesc
-	 * @param varId
-	 * @return
-	 */
-	public IPDILocalVariable newLocalVariable(IPDISession session,
-			IPDILocalVariableDescriptor varDesc, String varId);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param thread
-	 * @param frame
-	 * @param name
-	 * @param fullName
-	 * @param pos
-	 * @param depth
-	 * @return
-	 */
-	public IPDILocalVariableDescriptor newLocalVariableDescriptor(IPDISession session,
-			BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name,
-			String fullName, int pos, int depth);
-
-	/**
-	 * @param address
-	 * @param ascii
-	 * @param data
-	 * @return
-	 */
-	public IPDIMemory newMemory(String address, String ascii, String[] data);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param exp
-	 * @param wordSize
-	 * @param b
-	 * @param info
-	 * @return
-	 */
-	public IPDIMemoryBlock newMemoryBlock(IPDISession session, BitList tasks,
-			String exp, int wordSize, boolean b, IPDIDataReadMemoryInfo info);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param ex
-	 * @param enabled
-	 * @return
-	 */
-	public IPDIMultiExpressions newMultiExpressions(IPDISession session, BitList tasks, String ex, boolean enabled);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param thread
-	 * @param frame
-	 * @param name
-	 * @param fullName
-	 * @param pos
-	 * @param depth
-	 * @return
-	 */
-	public IPDIVariableDescriptor newRegisterDescriptor(IPDISession session,
-			BitList tasks, IPDIThread thread, IPDIStackFrame frame,
-			String name, String fullName, int pos, int depth);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param signalDescriptor
-	 * @return
-	 */
-	public IPDISignal newSignal(IPDISession session, BitList tasks, IPDISignalDescriptor signalDescriptor);
-
-
-	/**
-	 * @param name
-	 * @param stop
-	 * @param pass
-	 * @param print
-	 * @param description
-	 * @return
-	 */
-	public IPDISignalDescriptor newSignalDescriptor(String name, boolean stop,
-			boolean pass, boolean print, String description);
-
-	/**
-	 * @param session
-	 * @param pthread
-	 * @param i
-	 * @param locator
-	 * @return
-	 */
-	public IPDIStackFrame newStackFrame(IPDISession session, IPDIThread pthread, int i, IPDILocator locator);
-
-	/**
-	 * @param session
-	 * @param thread
-	 * @param level
-	 * @param file
-	 * @param func
-	 * @param line
-	 * @param addr
-	 * @param args
-	 * @return
-	 */
-	public IPDIStackFrame newStackFrame(IPDISession session, IPDIThread thread, int level, String file, String func, 
-			int line, BigInteger addr);
-
-	/**
-	 * @param level
-	 * @param loc
-	 * @return
-	 */
-	public IPDIStackFrameDescriptor newStackFrameDescriptor(int level, IPDILocator loc);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @return
-	 */
-	public IPDITarget newTarget(IPDISession session, BitList tasks);
-
-	/**
-	 * @param session
-	 * @param target
-	 * @param parseInt
-	 * @return
-	 */
-	public IPDIThread newThread(IPDISession session, IPDITarget target, int parseInt);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param thread
-	 * @param frame
-	 * @param name
-	 * @param fullName
-	 * @param pos
-	 * @param depth
-	 * @return
-	 */
-	public IPDIVariableDescriptor newThreadStorageDescriptor(
-			IPDISession session, BitList tasks, IPDIThread thread,
-			IPDIStackFrame frame, String name, String fullName, int pos,
-			int depth);
-
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param type
-	 * @param expression
-	 * @param wType
-	 * @param condition
-	 * @param enabled
-	 * @return
-	 */
-	public IPDIWatchpoint newWatchpoint(IPDISession session, BitList tasks, int type, String expression, 
-			int wType, IPDICondition condition, boolean enabled);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMultiExpressions.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMultiExpressions.java
deleted file mode 100644
index c8b0d49..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIMultiExpressions.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * Handles more than one expression for multi-processes
- * @author clement
- *
- */
-public interface IPDIMultiExpressions extends IPDISessionObject {
-	/**
-	 * Stores an expression
-	 * @param expression Expression
-	 */
-	public void addExpression(IPDIExpression expression);
-	
-	/**
-	 * @param tasks
-	 * @param monitor
-	 */
-	public void cleanExpressionsValue(BitList tasks, IProgressMonitor monitor);
-	
-	/**
-	 * Returns the value of this expression.
-	 * @param expression an expression for getting value
-	 * @return the value of this expression
-	 * @throws PDIException on failure
-	 */
-	public IAIF getAIF(IPDIExpression expression) throws PDIException;
-	
-	/**
-	 * @param task
-	 * @return
-	 */
-	public IPDIExpression getExpression(int task);
-	
-	/**
-	 * Returns an array of expressions
-	 * @return an array of expressions
-	 */
-	public IPDIExpression[] getExpressions();
-
-	/**
-	 * Returns expression text
-	 * @return expression text
-	 */
-	public String getExpressionText();
-	
-	/**
-	 * Returns status of this expression
-	 * @return status of this expression
-	 */
-	public boolean isEnabled();
-	
-	/**
-	 * Remove an expression from store
-	 * @param tasks BitList
-	 */
-	public void removeExpression(BitList tasks);
-	
-	/**
-	 * Remove an expression from store
-	 * @param expression an expression going to be removed
-	 */
-	public void removeExpression(IPDIExpression expression);
-	
-	/**
-	 * @param enabled
-	 */
-	public void setEnabled(boolean enabled);
-	
-	/**
-	 * 
-	 */
-	public void shutdown();
-
-	/**
-	 * @param tasks
-	 * @param monitor
-	 * @throws PDIException
-	 */
-	public void updateExpressionsValue(BitList tasks, IProgressMonitor monitor) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegister.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegister.java
deleted file mode 100644
index ff69ced..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegister.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * A register is special kind of variable that is contained in a register group.
- * Each register has a name and a AIF value
- * @author clement
- *
- */
-public interface IPDIRegister extends IPDIVariable, IPDIRegisterDescriptor {
-	/**
-	 * Returns whether the value of this variable could be changed
-	 * @return true if the value of this variable could be changed
-	 * @throws PDIException on failure
-	 */
-	boolean isEditable() throws PDIException;
-	
-	/**
-	 * Returns AIF value of this variable
-	 * @param context StackFrame
-	 * @return AIF value of this variable 
-	 * @throws PDIException on failure
-	 */
-	IAIF getAIF(IPDIStackFrame context) throws PDIException;
-	
-	/**
-	 * Sets value of this variable by given expression
-	 * @param expression an expression to generate a new AIF value
-	 * @throws PDIException on failure
-	 */
-	void setValue(String expression) throws PDIException;
-
-	/**
-	 * Remove the variable from the manager list
-	 * @throws PDIException on failure
-	 */
-	void dispose() throws PDIException;
-	
-	/**
-	 * Determines whether both variables are the same
-	 * @param variable IPDIVariable for comparing
-	 * @return true if given variable is same as the current variable
-	 */
-	boolean equals(IPDIVariable variable);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterDescriptor.java
deleted file mode 100644
index 7a4dedc..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterDescriptor.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents a break condition
- * @author clement
- *
- */
-public interface IPDIRegisterDescriptor extends IPDIVariableDescriptor {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterGroup.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterGroup.java
deleted file mode 100644
index 0bbc32c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRegisterGroup.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents a group of registers that are assigned to a target.
- * @author clement
- *
- */
-public interface IPDIRegisterGroup extends IPDISessionObject {
-	/**
-	 * The name of the group
-	 * @return String name
-	 */
-	String getName();
-
-	/**
-	 * Returns the register descriptors in this register group.
-	 * @return IPDIRegisterDescriptor[] in this register group
-	 * @throws PDIException on failure
-	 */
-	IPDIRegisterDescriptor[] getRegisterDescriptors() throws PDIException;
-
-	/**
-	 * Returns whether this register group currently contains any registers.
-	 * @return whether this register group currently contains any registers
-	 * @throws PDIException on failure
-	 */
-	public boolean hasRegisters() throws PDIException;	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRuntimeOptions.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRuntimeOptions.java
deleted file mode 100644
index d2842d9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIRuntimeOptions.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import java.util.Properties;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Describes the configuration of debug session.
- * @author clement
- *
- */
-public interface IPDIRuntimeOptions extends IPDISessionObject {
-	/**
-	 * Program/Inferior arguments
-	 * @param args the string representing the arguments
-	 * @throws PDIException on failure
-	 */
-	void setArguments(String[] args) throws PDIException;
-
-	/**
-	 * Program/Inferior environment settings
-	 * @param props the new environment variable to add
-	 * @throws PDIException on failure
-	 */
-	void setEnvironment(Properties props) throws PDIException;
-
-	/**
-	 * Program/Inferior working directory
-	 * @param wd the working directory to start the program
-	 * @throws PDIException on failure
-	 */
-	void setWorkingDirectory(String wd) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibrary.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibrary.java
deleted file mode 100644
index b6936e1..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibrary.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents a shared library which has been loaded into the debug target.
- * @author clement
- *
- */
-public interface IPDISharedLibrary extends IPDISessionObject {
-	/**
-	 * Returns the name of shared library file
-	 * @return the name of shared library file
-	 */
-	String getFileName();
-	
-	/**
-	 * Returns the start address of this library
-	 * @return the start address of this library
-	 */
-	BigInteger getStartAddress();
-
-	/**
-	 * Returns the end address of this library
-	 * @return the end address of this library
-	 */
-	BigInteger getEndAddress();
-
-	/**
-	 * Returns whether the symbols of this library are read
-	 * @return whether the symbols of this library are read
-	 */
-	boolean areSymbolsLoaded();
-	
-	/**
-	 * Loads the library symbols.
-	 * @throws PDIException on failure
-	 */
-	void loadSymbols() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibraryManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibraryManagement.java
deleted file mode 100644
index b20f5a1..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISharedLibraryManagement.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Manages the sharedLibraries in the target.
- * @author clement
- *
- */
-public interface IPDISharedLibraryManagement {
-	/**
-	 * Returns the array of shared libraries for this target.
-	 * @return IPDISharedLibrary[] array
-	 * @throws PDIException on failure.
-	 */
-	IPDISharedLibrary[] getSharedLibraries() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignal.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignal.java
deleted file mode 100644
index 4eb24fa..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignal.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents a signal
- * @author clement
- *
- */
-public interface IPDISignal extends IPDISessionObject {
-	/**
-	 * Returns the meaning of this signal.
-	 * @return the meaning of this signal
-	 */
-	public String getDescription();
-	
-	/**
-	 * Returns the name of this signal.
-	 * @return the name of this signal
-	 */
-	public String getName();
-	
-	/**
-	 * Change the way debugger handles this signal.
-	 * @param ignore - if true the debugger should not allow your program to see this signal
-	 * @param stop - if true the debugger should stop your program when this signal happens
-	 * @throws PDIException on failure
-	 */
-	public void handle(boolean ignore, boolean stop) throws PDIException;
-
-	/**
-	 * if false means program will see the signal.
-	 * Otherwise program does not know.
-	 * @return boolean
-	 */
-	public boolean isIgnore();
-
-	/**
-	 * Means reenter debugger if this signal happens
-	 * Method  isStopSet.
-	 * @return boolean
-	 */
-	public boolean isStopSet();
-
-	/**
-	 * @param desc
-	 */
-	public void setDescriptor(IPDISignalDescriptor desc);
-
-	/**
-	 * @param isIgnore
-	 * @param isStop
-	 */
-	public void setHandle(boolean isIgnore, boolean isStop);
-	
-	/**
-	 * Continue program giving it this signal.
-	 * @throws PDIException on failure
-	 */
-	public void signal() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignalDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignalDescriptor.java
deleted file mode 100644
index f27d3a5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISignalDescriptor.java
+++ /dev/null

@@ -1,58 +0,0 @@
-package org.eclipse.ptp.debug.core.pdi.model;
-
-
-/**
- * Represents the data associated with a signal
- *
- */
-public interface IPDISignalDescriptor {
-	/**
-	 * @return
-	 */
-	public String getDescription();
-	
-	/**
-	 * @return
-	 */
-	public String getName();
-	
-	/**
-	 * @return
-	 */
-	public boolean getPass();
-	
-	/**
-	 * @return
-	 */
-	public boolean getPrint();
-	
-	/**
-	 * @return
-	 */
-	public boolean getStop();
-	
-	/**
-	 * @param desc
-	 */
-	public void setDescription(String desc);
-
-	/**
-	 * @param name
-	 */
-	public void setName(String name);
-
-	/**
-	 * @param pass
-	 */
-	public void setPass(boolean pass);
-
-	/**
-	 * @param print
-	 */
-	public void setPrint(boolean print);
-
-	/**
-	 * @param stop
-	 */
-	public void setStop(boolean stop);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISourceManagement.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISourceManagement.java
deleted file mode 100644
index 2fdb695..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDISourceManagement.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Maintains the list of directories to search for source files.
- * @author clement
- * 
- */
-public interface IPDISourceManagement {
-	/**
-	 * Set the source search paths for the debug session.
-	 * @param String array of search paths
-	 * @throws PDIException on failure
-	 */
-	void setSourcePaths(String[] srcPaths) throws PDIException;
-
-	/**
-	 * Return the array of source paths
-	 * @return String array of search paths.
-	 * @throws PDIException on failure
-	 */
-	String[] getSourcePaths() throws PDIException;
-
-	/**
-	 * @param startAddress is the begining address
-	 * @param endAddress is the end address
-	 * @throws PDIException on failure.
-	 */
-	IPDIInstruction[] getInstructions(BigInteger startAddress, BigInteger endAddress) throws PDIException;
-
-	/**
-	 * @param filename is the name of the file to disassemble
-	 * @param linenum is the line number to disassemble around
-	 * @throws PDIException on failure.
-	 */
-	IPDIInstruction[] getInstructions(String filename, int linenum) throws PDIException;
-
-	/**
-	 * @param filename is the name of the file to disassemble
-	 * @param linenum is the line number to disassemble around
-	 * @param lines is the number of disassembly to produced
-	 * @throws PDIException on failure.
-	 */
-	IPDIInstruction[] getInstructions(String filename, int linenum, int lines) throws PDIException;
-
-	/**
-	 * @param startAddress is the begining address
-	 * @param endAddress is the end address
-	 * @throws PDIException on failure.
-	 */
-	IPDIMixedInstruction[] getMixedInstructions(BigInteger startAddress, BigInteger endAddress) throws PDIException;
-
-	/**
-	 * @param filename is the name of the file to disassemble
-	 * @param linenum is the line number to disassemble around
-	 * @param lines is the number of disassembly to produced
-	 * @throws PDIException on failure.
-	 */
-	IPDIMixedInstruction[] getMixedInstructions(String filename, int linenum) throws PDIException;
-
-	/**
-	 * @param filename is the name of the file to disassemble
-	 * @param linenum is the line number to disassemble around
-	 * @param lines is the number of disassembly to produced
-	 * @throws PDIException on failure.
-	 */
-	IPDIMixedInstruction[] getMixedInstructions(String filename, int linenum, int lines) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrame.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrame.java
deleted file mode 100644
index d233860..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrame.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * A stack frame in a suspended thread.
- * A stack frame contains variables representing visible locals and arguments at the current execution location.
- * @author clement
- *
- */
-public interface IPDIStackFrame extends IPDISessionObject {
-	/**
-	 * Returns the location of the instruction pointer in this  stack frame.
-	 * @return the location of the instruction pointer
-	 */
-	IPDILocator getLocator();
-	
-	/**
-	 * Returns the visible variables in this stack frame. An empty collection is returned if there are no visible variables.
-	 * @return a collection of visible variables 
-	 * @throws PDIException on failure
-	 */
-	IPDILocalVariableDescriptor[] getLocalVariableDescriptors() throws PDIException;
-
-	/**
-	 * Create a variable from the descriptor for evaluation.  A CreatedEvent will be trigger and
-	 * ChangedEvent will also be trigger when the variable is assign a new value.
-	 * DestroyedEvent is fired when the variable is out of scope and automatically removed from the manager list.
-	 * @param varDesc IPDIArgumentDescriptor
-	 * @return argument
-	 * @throws PDIException on failure
-	 */
-	IPDIArgument createArgument(IPDIArgumentDescriptor varDesc) throws PDIException;
-
-	/**
-	 * Create a variable from the descriptor for evaluation.  A CreatedEvent will be trigger and
-	 * ChangedEvent will also be trigger when the variable is assign a new value.
-	 * DestroyedEvent is fired when the variable is out of scope and automatically removed from the manager list.
-	 * @param varDesc IPDILocalVariableDescriptor
-	 * @return local variable
-	 * @throws PDIException on failure
-	 */
-	IPDILocalVariable createLocalVariable(IPDILocalVariableDescriptor varDesc) throws PDIException;
-
-	/**
-	 * Returns the arguments in this stack frame. An empty collection is returned if there are no arguments.
-	 * @return a collection of arguments 
-	 * @throws PDIException on failure
-	 */
-	IPDIArgumentDescriptor[] getArgumentDescriptors() throws PDIException;
-
-	/**
-	 * Returns the thread this stackframe is contained in.
-	 * @return the thread
-	 */
-	IPDIThread getThread();
-	
-	/**
-	 * Returns the target this stackframe is contained in.
-	 * @return the target
-	 */
-	IPDITarget getTarget();
-
-	/**
-	 * Returns the level of the stack frame, 1 based.
-	 * @return the level of the stack frame 
-	 */
-	int getLevel();
-	
-	/**
-	 * Determines whether both stackframes are the same
-	 * @param stackframe
-	 * @return true if the frames are the same.
-	 */
-	boolean equals(IPDIStackFrame stackframe);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrameDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrameDescriptor.java
deleted file mode 100644
index eaba2ad..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIStackFrameDescriptor.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-
-public interface IPDIStackFrameDescriptor {
-
-	/**
-	 * @return
-	 */
-	public int getLevel();
-
-	/**
-	 * @return
-	 */
-	public IPDILocator getLocator();
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITarget.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITarget.java
deleted file mode 100644
index 48fe980..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITarget.java
+++ /dev/null

@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-
-/**
- * Represents a debuggable process. This is a root object of the PDI model.
- * @author clement
- *
- */
-public interface IPDITarget extends IPDISourceManagement, IPDISharedLibraryManagement, IPDISessionObject {
-	/**
-	 * Create a variable from the descriptor for evaluation.  A CreatedEvent will be trigger and
-	 * ChangedEvent will also be trigger when the variable is assign a new value.
-	 * DestroyedEvent is fired when the variable is out of scope and automatically
-	 * removed from the manager list.
-	 * 
-	 * @param varDesc IPDIGlobalVariableDescriptor
-	 * @return IPDIGlobalVariable
-	 * @throws PDIException on failure
-	 */
-	public IPDIGlobalVariable createGlobalVariable(IPDIGlobalVariableDescriptor varDesc) throws PDIException;
-	
-	/**
-	 * Create a variable from the descriptor for evaluation.  A CreatedEvent will be trigger and
-	 * ChangedEvent will also be trigger when the variable is assign a new value.
-	 * DestroyedEvent is fired when the variable is out of scope and automatically
-	 * removed from the manager list.
-	 * @param varDesc IPDThreadStorageDesc
-	 * @return IPDIRegister
-	 * @throws PDIException on failure
-	 */
-	public IPDIRegister createRegister(IPDIRegisterDescriptor varDesc) throws PDIException;
-	
-	/**
-	 * Evaluates the expression specified by the given string. Returns the evaluation result as a String.
-	 * @param - expression string to be evaluated
-	 * @return the result of the evaluation
-	 * @throws PDIException on failure
-	 */
-	public String evaluateExpressionToString(IPDIStackFrame context, String expressionText) throws PDIException;
-	
-	/**
-	 * Returns the currently selected thread.
-	 * @return the currently selected thread
-	 */
-	public IPDIThread getCurrentThread() throws PDIException;
-	
-	/**
-	 * A static/global variable in a particular function or file,
-	 * filename or/and function is the context for the static IPDIVariableDescriptor.
-	 * <pre>
-	 * hello.c:
-	 *   int bar;
-	 *   int main() {
-	 *   	static int bar;
-	 *   }
-	 * file.c:
-	 *   int foo() {
-	 *   	static int bar;
-	 *   }
-	 * getVariableObject(null, null, "bar");
-	 * getVariableObject(null, "main", "bar");
-	 * getVariableObject("file.c", "foo", "bar");
-	 * </pre>
-	 * @param filename
-	 * @param function
-	 * @param name
-	 * @return IPDIGlobalVariableDescriptor
-	 * @throws PDIException on failure
-	 */
-	public IPDIGlobalVariableDescriptor getGlobalVariableDescriptors(String filename, String function, String name) throws PDIException;
-	
-	/**
-	 * Return the register groups.
-	 * @return IPDIRegisterGroup[]
-	 * @throws PDIException on failure
-	 */
-	public IPDIRegisterGroup[] getRegisterGroups() throws PDIException;
-
-	/**
-	 * Returns the Runtime options for this target debug session.
-	 * @return the configuration description
-	 */
-	public IPDIRuntimeOptions getRuntimeOptions();
-
-	/**
-	 * Returns the threads contained in this target. An empty collection is returned if this target contains no threads.
-	 * @return a collection of threads
-	 * @throws PDIException on failure
-	 */
-	public IPDIThread[] getThreads() throws PDIException;
-	
-	/**
-	 * 
-	 */
-	public void lockTarget();
-	
-	/**
-	 * 
-	 */
-	public void releaseTarget();
-	
-	/**
-	 * @param pthread
-	 * @param doUpdate
-	 * @throws PDIException
-	 */
-	public void setCurrentThread(IPDIThread pthread, boolean doUpdate) throws PDIException;
-	
-	/**
-	 * @param state
-	 */
-	public void setSupended(boolean state);
-	
-	/**
-	 * @param newThreadId
-	 */
-	public void updateState(int newThreadId);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITargetExpression.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITargetExpression.java
deleted file mode 100644
index 01dd61f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITargetExpression.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * An expression is a snippet of code that can be evaluated to produce a value for registered process
- * @author clement
- *
- */
-public interface IPDITargetExpression extends IPDIExpression {
-	/**
-	 * Returns the variable of this expression
-	 * @param IPDIStackFrame frame context
-	 * @return the variable of this expression
-	 * @throws PDIException on failure
-	 */
-	IPDIVariable getVariable(IPDIStackFrame context) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThread.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThread.java
deleted file mode 100644
index 8ec4332..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThread.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * A thread in a debug target.
- * A thread contains stack frames.  Stack frames are only available when the thread is suspended, and are returned in top-down order.
- * @author clement
- *
- */
-public interface IPDIThread extends IPDISessionObject {
-	final public static int STACKFRAME_DEFAULT_DEPTH = 200;
-
-	/**
-	 * Create a variable from the descriptor for evaluation.  A CreatedEvent will be trigger and
-	 * ChangedEvent will also be trigger when the variable is assign a new value.
-	 * DestroyedEvent is fired when the variable is out of scope and automatically removed from the manager list.
-	 * @param varDesc IPDThreadStorageDesc
-	 * @return IPDIThreadStorage
-	 * @throws PDIException on failure
-	 */
-	public IPDIThreadStorage createThreadStorage(IPDIThreadStorageDescriptor varDesc) throws PDIException;
-	
-	/**
-	 * Determines whether both threads are the same.
-	 * @param thead
-	 * @return true if the threads are the same.
-	 */
-	public boolean equals(IPDIThread thead);
-	
-	/**
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIStackFrame getCurrentStackFrame() throws PDIException;
-	
-	/**
-	 * @return
-	 */
-	public int getId();
-
-	/**
-	 * Returns the depth of the stack frames.
-	 * @return  depth of stack frames
-	 * @throws PDIException on failure
-	 */
-	public int getStackFrameCount() throws PDIException;
-
-	/**
-	 * Returns the stack frames contained in this thread. An empty collection is returned if this thread contains
-	 * no stack frames, or is not currently suspended. Stack frames are returned in top down order.
-	 * @return  a collection of stack frames
-	 * @throws PDIException on failure
-	 */
-	public IPDIStackFrame[] getStackFrames() throws PDIException;
-
-	/**
-	 * Returns the stack frames contained in this thread between the specified
-     * <tt>fromIndex</tt>, inclusive, and <tt>toIndex</tt>, exclusive.
-	 * An empty collection is returned if this thread contains
-	 * no stack frames, or is not currently suspended. Stack frames are returned in top down order.
-	 * @return  a collection of stack frames
-	 * @throws PDIException on failure
-	 * @throws IndexOutOfBoundsException for an illegal endpoint index value
-     *     (fromIndex &lt; 0 || toIndex &gt; size || fromIndex &gt; toIndex).
- 
-	 */
-	public IPDIStackFrame[] getStackFrames(int fromIndex, int len) throws PDIException;
-
-	/**
-	 * Returns pdi target in this thread
-	 * @return pdi target in this thread
-	 */
-	public IPDITarget getTarget();
-
-	/**
-	 * Return thread local storage variables descriptor.
-	 * @return IPDIThreadStorageDescriptor
-	 * @throws PDIException on failure
-	 */
-	public IPDIThreadStorageDescriptor[] getThreadStorageDescriptors() throws PDIException;
-	
-	/**
-	 * @param stackframe
-	 * @throws PDIException
-	 */
-	public void setCurrentStackFrame(IPDIStackFrame stackframe) throws PDIException;
-	
-	/**
-	 * @param stackframe
-	 * @param doUpdate
-	 * @throws PDIException
-	 */
-	public void setCurrentStackFrame(IPDIStackFrame stackframe, boolean doUpdate) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadGroup.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadGroup.java
deleted file mode 100644
index 5afb366..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadGroup.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents thread group
- * @author clement
- *
- */
-public interface IPDIThreadGroup extends IPDISessionObject {
-	/**
-	 * Returns the threads contained in this target. 
-	 * An empty collection is returned if this target contains no threads.
-	 * @return a collection of threads
-	 * @throws PDIException on failure
-	 */
-	IPDIThread[] getThreads() throws PDIException;
-
-	/**
-	 * Returns the currently selected thread.
-	 * @return the currently selected thread
-	 * @throws PDIException on failure
-	 */
-	IPDIThread getCurrentThread() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorage.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorage.java
deleted file mode 100644
index b67d053..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorage.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-/**
- * Represents thread Storage
- * @author clement
- *
- */
-public interface IPDIThreadStorage extends IPDIVariable, IPDIThreadStorageDescriptor {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorageDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorageDescriptor.java
deleted file mode 100644
index 7332193..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIThreadStorageDescriptor.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents thread storage descriptor
- * @author clement
- *
- */
-public interface IPDIThreadStorageDescriptor extends IPDIVariableDescriptor {
-	/**
-	 * Returns the thread
-	 * @return the thread
-	 * @throws PDIException on failure
-	 */
-	IPDIThread getThread() throws PDIException;
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITracepoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITracepoint.java
deleted file mode 100644
index dbdb17c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDITracepoint.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Defines a point in the program execution when the specified data to be collected.
- * @author clement
- *
- */
-public interface IPDITracepoint extends IPDISessionObject {
-	/**
-	 * Represents an action to be taken when the tracepoint is hit.
-	 * @author clement
-	 *
-	 */
-	public interface IAction {}
-
-	/**
-	 * Returns the location of this tracepoint.
-	 * @return the location of this tracepoint
-	 * @throws PDIException on failure
-	 */
-	IPDILocation getLocation() throws PDIException;
-
-	/**
-	 * Returns whether this tracepoint is enabled.
-	 * @return whether this tracepoint is enabled
-	 * @throws PDIException on failure
-	 */
-	boolean isEnabled() throws PDIException;
-
-	/**
-	 * Sets the enabled state of this tracepoint. This has no effect 
-	 * if the current enabled state is the same as specified by the enabled parameter.
-	 * @param enabled - whether this tracepoint should be enabled 
-	 * @throws PDIException on failure
-	 */
-	void setEnabled(boolean enabled) throws PDIException;
-
-	/**
-	 * Returns the pass count of this tracepoint.
-	 * @return the pass count of this tracepoint
-	 * @throws PDIException on failure
-	 */
-	int getPassCount() throws PDIException;
-	
-	/**
-	 * Sets the pass count of this tracepoint.
-	 * @param the pass count to set
-	 * @throws PDIException on failure
-	 */
-	void setPassCount(int passCount) throws PDIException;
-
-	/**
-	 * Adds the given actions to the action list of this tracepoint.
-	 * @param actions to add
-	 * @throws PDIException on failure
-	 */
-	void addActions(IPDITracepoint.IAction[] actions) throws PDIException;
-
-	/**
-	 * Removes the given actions from the action list of this tracepoint.
-	 * @param actions to remove
-	 * @throws PDIException on failure
-	 */
-	void removeActions(IPDITracepoint.IAction[] actions) throws PDIException;
-
-	/**
-	 * Clears the action list of this tracepoint.
-	 * @throws PDIException on failure
-	 */
-	void clearActions() throws PDIException;
-
-	/**
-	 * Returns the actions assigned to this tracepoint.
-	 * @return the actions of this tracepoint
-	 */
-	IPDITracepoint.IAction[] getActions();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariable.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariable.java
deleted file mode 100644
index 2a31209..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariable.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents a data structure in the program.
- * @author clement
- *
- */
-public interface IPDIVariable extends IPDIVariableDescriptor {
-	/**
-	 * Remove the variable from the manager list
-	 * @throws PDIException on failure
-	 */
-	public void dispose() throws PDIException;
-	
-	/**
-	 * Determines whether both variables are the same
-	 * @param variable IPDIVariable for comparing
-	 * @return true if given variable is same as the current variable
-	 */
-	public boolean equals(IPDIVariable variable);
-	
-	/**
-	 * @param varid
-	 * @return
-	 */
-	public IPDIVariable getChild(String varid);
-	
-	/**
-	 * Returns an array of IPDIVariables of the children of current variable or empty array if nothing
-	 * @return an array of IPDIVariables of the children of current variable
-	 * @throws PDIException on failure
-	 */
-	public IPDIVariable[] getChildren() throws PDIException;
-	
-	/**
-	 * Returns an array of IPDIVariables of the children of current variable by given a range  or empty array if nothing
-	 * @param findex first index of this variable 
-	 * @param psize size of this variable
-	 * @return an array of IPDIVariable of the children of current variable
-	 * @throws PDIException on failure
-	 */
-	public IPDIVariable[] getChildren(int findex, int psize) throws PDIException;
-	
-	/**
-	 * Returns the number of children of this variable
-	 * @return the number of children of this variable
-	 * @throws PDIException on failure
-	 */
-	public int getChildrenNumber() throws PDIException;
-	
-	/**
-	 * Determines whether the value of this variable could be edited
-	 * @return true if the value of this variable could be edited
-	 * @throws PDIException on failure
-	 */
-	public boolean isEditable() throws PDIException;
-	
-	/**
-	 * Resets value of the current variable
-	 */
-	public void resetValue();
-	
-	/**
-	 * Sets value of this variable by given expression
-	 * @param expression an expression to generate a new AIF value
-	 * @throws PDIException on failure
-	 */
-	public void setValue(String expression) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariableDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariableDescriptor.java
deleted file mode 100644
index 4ecef43..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIVariableDescriptor.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * Represents variable description
- * @author clement
- *
- */
-public interface IPDIVariableDescriptor extends IPDISessionObject {
-	/**
-	 * Determines whether both descriptors are the same
-	 * @param variable IPDIVariableDescriptor for comparing
-	 * @return true if given descriptors is same as the current descriptors
-	 */
-	public boolean equalDescriptors(IPDIVariableDescriptor variable);
-	
-	/**
-	 * Returns AIF of this variable
-	 * @return AIF of this variable
-	 * @throws PDIException on failure
-	 */
-	public IAIF getAIF() throws PDIException;
-	
-	/**
-	 * Returns the end position
-	 * @return the end position
-	 */
-	public int getCastingArrayEnd();
-
-	
-	/**
-	 * Returns the start position
-	 * @return the start position
-	 */
-	public int getCastingArrayStart();
-
-	/**
-	 * @return
-	 */
-	public String[] getCastingTypes();
-	
-	/**
-	 * Returns the full name of this variable
-	 * @return the name of this variable
-	 */
-	public String getFullName();
-	
-	/**
-	 * Returns the name of this variable
-	 * @return the name of this variable
-	 */
-	public String getName();
-	
-	/**
-	 * @return
-	 */
-	public int getPosition();
-	
-	/**
-	 * Return the qualified name of this variable descriptor
-	 * @return the qualified name of this variable descriptor
-	 * @throws PDIException on failure
-	 */
-	public String getQualifiedName() throws PDIException;
-	
-	/**
-	 * @return
-	 */
-	public int getStackDepth();
-	
-	/**
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIStackFrame getStackFrame() throws PDIException;
-	
-	/**
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIThread getThread() throws PDIException;
-	
-	/**
-	 * Returns the type name of this variable descriptor
-	 * @return the type name of this variable descriptor
-	 * @throws PDIException on failure
-	 */
-	public String getTypeName() throws PDIException;
-	
-	/**
-	 * Consider the variable object as an Array of type and rang [start, start + length - 1]
-	 * @param start start index
-	 * @param length size of array
-	 * @return IPDIVariableDescriptor
-	 * @throws PDIException on failure
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsArray(int start, int length) throws PDIException;
-	
-	/**
-	 *  Consider the variable object as a type
-	 * @param type type of variable
-	 * @return IPDIVariableDescriptor
-	 * @throws PDIException on failure
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsType(String type) throws PDIException;
-
-	/**
-	 * Returns an unique id of this variable
-	 * @return an unique id of this variable
-	 */
-	public String getVarId();
-	
-	/**
-	 * Sets IAIF to this variable
-	 * @param aif AIF object
-	 */
-	public void setAIF(IAIF aif);
-	
-	/**
-	 * Sets end position of casting array
-	 * @param end position to end
-	 */
-	public void setCastingArrayEnd(int end);
-	
-	/**
-	 * Sets start position of casting array
-	 * @param start position to start
-	 */
-	public void setCastingArrayStart(int start);
-	
-	/**
-	 * Returns the size of this variable descriptor
-	 * @return the size of this variable descriptor
-	 * @throws PDIException on failure
-	 */
-	public int sizeof() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIWatchpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIWatchpoint.java
deleted file mode 100644
index 3c8cc91..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/IPDIWatchpoint.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents a watchpoint
- * @author clement
- *
- */
-public interface IPDIWatchpoint extends IPDIBreakpoint {
-	/**
-	 * Write value
-	 */
-	public final static int WRITE = 0x1;
-	
-	/**
-	 * Read value
-	 */
-	public final static int READ = 0x2;
-
-	/**
-	 * Determines whether this watchpoint is a write watchpoint
-	 * @return true if this wwatchpoint is a write watchpoint
-	 */
-	boolean isWriteType();
-	
-	/**
-	 * Determines whether this watchpoint is a read watchpoint
-	 * @return true if this watchpoint is a read watchpiont
-	 */
-	boolean isReadType();
-	
-	/**
-	 * Returns the expression of this watchpoint
-	 * @return the expression of this watchpoint
-	 * @throws PDIException on failure
-	 */
-	String getWatchExpression() throws PDIException;
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFException.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFException.java
deleted file mode 100644
index 2232d37..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFException.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-/**
- * @author Clement chu
- * 
- */
-public class AIFException extends Exception {
-    static final long serialVersionUID = -3387516993124229949L;
-    
-    public AIFException(String msg) {
-    	super(msg);
-    }
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFFactory.java
deleted file mode 100644
index b2af5c2..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/AIFFactory.java
+++ /dev/null

@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-import java.util.Random;
-
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIF;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeAddress;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeArray;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeBool;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeChar;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeCharPointer;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeClass;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeEnum;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeFloat;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeFunction;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeIncomplete;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeInt;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeNamed;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypePointer;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeReference;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeString;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeStruct;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeUnion;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFTypeVoid;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueAddress;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueArray;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueBool;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueChar;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueCharPointer;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueClass;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueEnum;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueFloat;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueInt;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueNamed;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValuePointer;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueReference;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueString;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueStruct;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueUnion;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueUnknown;
-import org.eclipse.ptp.debug.internal.core.pdi.aif.AIFValueVoid;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFFactory {
-	public static class SimpleByteBuffer {
-		byte[] bytes;
-		int pos = 0;
-		SimpleByteBuffer(byte[] bytes) {
-			if (bytes == null) {
-				bytes = new byte[0];
-			}
-			this.bytes = bytes;
-		}
-		public boolean end() {
-			return (pos == bytes.length);
-		}
-		public byte get() {
-			return bytes[pos++];
-		}
-		public byte get(int pos) {
-			return bytes[pos];
-		}
-		public byte[] getByte() {
-			return bytes;
-		}
-		public int getCapacity() {
-			return bytes.length;
-		}
-		public int getPosition() {
-			return pos;
-		}
-		public void setPos(int pos) {
-			this.pos = pos;
-		}
-	}
-	
-	public static final char FDS_ARRAY = '[';
-	public static final char FDS_BOOL = 'b';
-	public static final char FDS_CHAR = 'c';
-	public static final char FDS_ENUM = '<';
-	public static final char FDS_FLOAT = 'f';
-	public static final char FDS_FUNCTION = '&';
-	public static final char FDS_INT = 'i';
-	public static final char FDS_POINTER = '^';
-	public static final char FDS_STRING = 's';
-	public static final char FDS_STRUCT_CLASS = '{';
-	public static final char FDS_UNION = '(';
-	public static final char FDS_VOID = 'v';
-	public static final char FDS_REFERENCE = '>';
-	public static final char FDS_NAMED = '%';
-	public static final char FDS_ADDRESS = 'a';
-
-	public static final char FDS_CHAR_POINTER = 'p';
-	public static final int FDS_FLOAT_SIZE_POS = 1;
-	public static final int FDS_VOID_SIZE_POS = 1;
-	public static final int FDS_INTEGER_SIGN_POS = 1;
-	public static final int FDS_INTEGER_SIZE_POS = 2;
-	
-	public static final int FDS_RANGE_DOT_LEN = 2;
-	public static final String SIGN_OPEN = "[";
-	public static final String SIGN_CLOSE = "]";
-	public static final String SIGN_STROKE = "|";
-	public static final String SIGN_COMMA = ",";
-	public static final String SIGN_EQUAL = "=";
-	public static final String SIGN_SEMI_COLON = ";";
-	public static final String SIGN_COLON = ":";
-	
-	public static final String SIGN_DOT = ".";
-	public static final String FDS_STRUCT_END = ";;;}";
-	public static final String FDS_CLASS_END = "}";
-	public static final String FDS_UNION_END = ")";
-	public static final String FDS_ENUM_END =  ">";
-	public static final String FDS_FUNCTION_END =  "/";
-	public static final String FDS_REFERENCE_END = "/";
-	
-	public static final String FDS_NAMED_END = "/";
-	public static final int NO_SIZE = 0;
-	public static final int SIZE_BOOL = 1;
-	public static final int SIZE_CHAR = 1;
-	public static final int SIZE_FLOAT = 4;
-	public static final int SIZE_DOUBLE = 8;
-	
-	public static final int SIZE_INVALID = 0;
-	public static final IAIFType UNKNOWNTYPE = new AIFTypeIncomplete();
-	
-	public static final IAIFValue UNKNOWNVALUE = new AIFValueUnknown(UNKNOWNTYPE);
-	
-	/**
-	 * @param fmt
-	 * @param start_pos
-	 * @param end_pos
-	 * @return
-	 */
-	public static String extractFormat(String fmt, int start_pos, int end_pos) {
-		return fmt.substring(start_pos, end_pos);
-	}
-	
-	/**
-	 * Create an AIF object
-	 * 
-	 * @param fds
-	 * @param data
-	 * @param description
-	 * @return
-	 */
-	public static IAIF newAIF(String fds, byte[] data, String description) {
-		return new AIF(fds, data, description);
-	}
-	
-	/**
-	 * Create an AIF object
-	 * 
-	 * @param aifType
-	 * @param aifValue
-	 * @return
-	 */
-	public static IAIF newAIF(IAIFType aifType, IAIFValue aifValue) {
-		return new AIF(aifType, aifValue);
-	}
-	
-	/**
-	 * Create an AIF object
-	 * 
-	 * @param fds
-	 * @param data
-	 * @return
-	 */
-	public static IAIF newAIF(String fds, byte[] data) {
-		return new AIF(fds, data);
-	}
-
-	/**
-	 * @param fmt
-	 * @return
-	 */
-	public static IAIFType getAIFType(String fmt) {
-		if (fmt == null || fmt.length() == 0) {
-			PDebugUtils.println("        ======= null: " + fmt);
-			return UNKNOWNTYPE;			
-		}
-		switch (fmt.charAt(0)) {
-		case FDS_CHAR: //char is signed or unsigned ???
-			PDebugUtils.println("        ======= character: " + fmt);
-			return new AIFTypeChar();
-		case FDS_FLOAT:
-			int float_size = Character.digit(fmt.charAt(FDS_FLOAT_SIZE_POS), 10);
-			PDebugUtils.println("        ======= floating: " + fmt + ", size: " + float_size);
-			return new AIFTypeFloat(float_size);
-		case FDS_INT: //long and int is same???  long long type
-			boolean signed = (fmt.charAt(FDS_INTEGER_SIGN_POS) == 's');
-			int int_size = Character.digit(fmt.charAt(FDS_INTEGER_SIZE_POS), 10);
-			PDebugUtils.println("        ======= int: " + fmt + ", size: " + int_size);
-			return new AIFTypeInt(signed, int_size);
-		case FDS_CHAR_POINTER:
-			PDebugUtils.println("        ======= char pointer: " + fmt);
-			return new AIFTypeCharPointer(getAIFType(fmt.substring(1, 3)));
-		case FDS_STRING:
-			PDebugUtils.println("        ======= string: " + fmt);
-			return new AIFTypeString();
-		case FDS_BOOL:
-			PDebugUtils.println("        ======= boolean: " + fmt);
-			return new AIFTypeBool();
-		case FDS_ENUM:
-			PDebugUtils.println("        ======= enum: " + fmt);
-			int enum_end_pos = getEndPosFromLast(fmt, FDS_ENUM_END);
-			String enum_type = fmt.substring(enum_end_pos+FDS_ENUM_END.length());
-			return new AIFTypeEnum(extractFormat(fmt, 1, enum_end_pos), getAIFType(enum_type));
-		case FDS_FUNCTION:
-			PDebugUtils.println("        ======= function: " + fmt);
-			int func_end_pos = getEndPosFromLast(fmt, FDS_FUNCTION_END);
-			String func_type = fmt.substring(func_end_pos+FDS_FUNCTION_END.length());
-			return new AIFTypeFunction(extractFormat(fmt, 1, func_end_pos), getAIFType(func_type));
-		case FDS_STRUCT_CLASS: //struct or class
-			int struct_end_pos = getEndPosFromLast(fmt, FDS_STRUCT_END);
-			if (fmt.length() == struct_end_pos + FDS_STRUCT_END.length()) {
-				PDebugUtils.println("        ======= struct " + fmt);
-				return new AIFTypeStruct(extractFormat(fmt, 1, struct_end_pos));
-			}
-			else {
-				struct_end_pos = getEndPosFromLast(fmt, FDS_CLASS_END);
-				PDebugUtils.println("        ======= class " + fmt);
-				return new AIFTypeClass(extractFormat(fmt, 1, struct_end_pos));
-			}
-		case FDS_UNION:
-			PDebugUtils.println("        ======= union: " + fmt);
-			int union_end_pos = getEndPosFromLast(fmt, FDS_UNION_END);
-			return new AIFTypeUnion(extractFormat(fmt, 1, union_end_pos));
-		case FDS_REFERENCE:
-			PDebugUtils.println("        ======= reference: " + fmt);
-			int ref_end_pos = getEndPosFromStart(fmt, FDS_REFERENCE_END);
-			return new AIFTypeReference(extractFormat(fmt, 1, ref_end_pos));
-		case FDS_ADDRESS:
-			PDebugUtils.println("        ======= address: " + fmt);
-			return new AIFTypeAddress(Character.digit(fmt.charAt(1), 10));
-		case FDS_POINTER:
-			PDebugUtils.println("        ======= pointer: " + fmt);
-			return new AIFTypePointer(getAIFType(fmt.substring(1, 3)), getAIFType(fmt.substring(3)));
-		case FDS_VOID:
-			PDebugUtils.println("        ======= void: " + fmt);
-			int void_size = Character.digit(fmt.charAt(FDS_VOID_SIZE_POS), 10);
-			return new AIFTypeVoid(void_size);
-		case FDS_ARRAY:
-			PDebugUtils.println("        ======= array: " + fmt);
-			int array_end_pos = getEndPosFromStart(fmt, SIGN_CLOSE);
-			return new AIFTypeArray(extractFormat(fmt, 1, array_end_pos), getAIFType(fmt.substring(array_end_pos+1)));
-		case FDS_NAMED:
-			PDebugUtils.println("        ======= named: " + fmt);
-			int named_end_pos = getEndPosFromStart(fmt, FDS_NAMED_END);
-			return new AIFTypeNamed(extractFormat(fmt, 1, named_end_pos), getAIFType(fmt.substring(named_end_pos+1)));
-		default:
-			PDebugUtils.println("        ======= unknown: " + fmt);
-			return new AIFTypeIncomplete();
-		}
-	}
-	
-	/**
-	 * @param parent
-	 * @param type
-	 * @param data
-	 * @return
-	 */
-	public static IAIFValue getAIFValue(IValueParent parent, IAIFType type, byte[] data) {
-		if (data == null || data.length < 0) {
-			return new AIFValueUnknown(type);
-		}
-		return getAIFValue(parent, type, new SimpleByteBuffer(data));
-	}
-	
-	/**
-	 * @param parent
-	 * @param type
-	 * @param buffer
-	 * @return
-	 */
-	public static IAIFValue getAIFValue(IValueParent parent, IAIFType type, SimpleByteBuffer buffer) {
-		if (buffer.end()) {
-			return new AIFValueUnknown(type);
-		} else if (type instanceof IAIFTypeChar) {
-			 return new AIFValueChar((IAIFTypeChar)type, buffer);
-		} else if (type instanceof IAIFTypeFloat) {
-			return new AIFValueFloat((IAIFTypeFloat)type, buffer);
-		} else if (type instanceof IAIFTypeInt) {
-			return new AIFValueInt((IAIFTypeInt)type, buffer);
-		} else if (type instanceof IAIFTypeCharPointer) {
-			return new AIFValueCharPointer((IAIFTypeCharPointer)type, buffer);
-		} else if (type instanceof IAIFTypeString) {
-			return new AIFValueString((IAIFTypeString)type, buffer);
-		} else if (type instanceof IAIFTypeBool) {
-			return new AIFValueBool((IAIFTypeBool)type, buffer);
-		} else if (type instanceof IAIFTypeArray) {
-			return new AIFValueArray((IAIFTypeArray)type, buffer);
-		} else if (type instanceof IAIFTypeEnum) {
-			return new AIFValueEnum((IAIFTypeEnum)type, buffer);		
-		} else if (type instanceof IAIFTypeAddress) {
-			return new AIFValueAddress((IAIFTypeAddress)type, buffer);
-		} else if (type instanceof IAIFTypePointer) {
-			return new AIFValuePointer(parent, (IAIFTypePointer)type, buffer);
-		} else if (type instanceof IAIFTypeNamed) {
-			return new AIFValueNamed(parent, (IAIFTypeNamed)type, buffer);
-		} else if (type instanceof IAIFTypeReference) {
-			return new AIFValueReference(parent, (IAIFTypeReference)type, buffer);
-		} else if (type instanceof IAIFTypeStruct) {
-			return new AIFValueStruct(parent, (IAIFTypeStruct)type, buffer);			
-		} else if (type instanceof IAIFTypeUnion) {
-			return new AIFValueUnion(parent, (IAIFTypeUnion)type, buffer);
-		} else if (type instanceof IAIFTypeClass) {
-			return new AIFValueClass(parent, (IAIFTypeClass)type, buffer);
-		} else if (type instanceof IAIFTypeVoid) {
-			return new AIFValueVoid((IAIFTypeVoid)type, buffer);
-		/*
-		} else if (type instanceof IAIFTypeFunction) {
-			return new AIFValueFunction((IAIFTypeFunction)type, data);			
-		*/				
-		}		
-		return new AIFValueUnknown(type);
-	}
-	
-	/**
-	 * @param format
-	 * @param pos
-	 * @return
-	 */
-	public static int getDigitPos(String format, int pos) {
-		int len = format.length();
-		while (pos < len) {
-			char aChar = format.charAt(pos);
-			if (!Character.isDigit(aChar)) {
-				break;
-			}
-			pos++;
-		}
-		return pos;
-	}
-	
-	/**
-	 * @param fmt
-	 * @param regex
-	 * @return
-	 */
-	public static int getEndPosFromLast(String fmt, String regex) {
-		return fmt.lastIndexOf(regex);
-	}
-	
-	/**
-	 * @param fmt
-	 * @param regex
-	 * @return
-	 */
-	public static int getEndPosFromStart(String fmt, String regex) {
-		return fmt.indexOf(regex);
-	}
-	
-	/**
-	 * testing purpose 
-	 */
-	public static int random_num(int min, int max) {
-	    Random generator = new Random();
-	    long range = (long)max - (long)min + 1;
-	    long fraction = (long)(range * generator.nextDouble());
-	    return (int)(fraction + min);
-	}
-
-	/**
-	 * @return
-	 */
-	public static IAIF UNKNOWNAIF() {
-		return new AIF(UNKNOWNTYPE, UNKNOWNVALUE);
-	}
-}
-
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIF.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIF.java
deleted file mode 100644
index 06d5800..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIF.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents value and type of the variable in AIF format  
- * @author clement
- *
- */
-public interface IAIF {
-	/**
-	 * Returns IAIFType of this AIF
-	 * @return IAIFType of this AIF
-	 */
-	IAIFType getType();
-	
-	/**
-	 * Returns IAIFValue of this AIF
-	 * @return IAIFValue of this AIF
-	 */
-	IAIFValue getValue();
-	
-	/**
-	 * Returns description of this AIF
-	 * @return description of this AIF
-	 */
-	String getDescription();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFType.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFType.java
deleted file mode 100644
index 8e214c6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFType.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents type of AIF object
- * @author clement
- *
- */
-public interface IAIFType {
-	/**
-	 * Returns size of this AIF type
-	 * @return size of this AIF type
-	 */
-	int sizeof();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeAddress.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeAddress.java
deleted file mode 100644
index e9df9cc..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeAddress.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents address type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeAddress extends IAIFType {};

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeArray.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeArray.java
deleted file mode 100644
index e91281d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeArray.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents array type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeArray extends ITypeDerived {
-	/**
-	 * Returns the dimension of this array
-	 * @return dimension of this array
-	 */
-	int getDimension();
-	
-	/**
-	 * Returns an array of dimension size
-	 * @return an array of dimension size
-	 */
-	int[] getDimensionDetails();
-	
-	/**
-	 * Determines whether this array type is dimension or not
-	 * @return true if this array type has dimension
-	 */
-	boolean isDimensionArray();
-	
-	/**
-	 * Returns array type in given dimension position 
-	 * @param dim_pos dimension position of current array
-	 * @return array type
-	 */
-	IAIFTypeArray getAIFTypeArray(int dim_pos);
-	
-	/**
-	 * Returns string format in given range
-	 * @param range range number
-	 * @return string format of the current type
-	 */
-	String toString(int range);
-	
-	/**
-	 * Returns the lowest index of this array
-	 * @return the lowest index of this array
-	 */
-	int getLow();
-	
-	/**
-	 * Returns the highest index of this array
-	 * @return the highest index of this array
-	 */
-	int getHigh();
-	
-	/**
-	 * Returns the range of this array
-	 * @return the range of this array
-	 */
-	int getRange();
-	
-	/**
-	 * Returns base type of this array 
-	 * @return base type of this array
-	 */
-	IAIFType getFoundationType();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeBool.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeBool.java
deleted file mode 100644
index 0be7ea8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeBool.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents boolean type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeBool extends ITypeIntegral {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeChar.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeChar.java
deleted file mode 100644
index ca29a94..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeChar.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents char type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeChar extends ITypeIntegral {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeCharPointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeCharPointer.java
deleted file mode 100644
index 1544b64..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeCharPointer.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents char pointer type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeCharPointer extends IAIFTypeString {
-	/**
-	 * Returns address type of this char point type
-	 * @return address type of this char point type
-	 */
-	IAIFTypeAddress getAddressType();	
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeClass.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeClass.java
deleted file mode 100644
index ef8b0ec..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeClass.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents class type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeClass extends ITypeAggregate {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeEnum.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeEnum.java
deleted file mode 100644
index 09000c6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeEnum.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents enum type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeEnum extends ITypeIntegral {
-	/**
-	 * Returns base type of the current type
-	 * @return base type of the current type
-	 */
-	IAIFType getBaseType();
-	
-	/**
-	 * Returns name of the current type
-	 * @return name of the current type
-	 */
-	String getName();
-	
-	/**
-	 * Returns a list of fields of the current type
-	 * @return a list of fields of the current type
-	 */
-	String[] getFields();
-	
-	/**
-	 * Returns a list of type names of the current type
-	 * @return a list of type names of the current type
-	 */
-	String[] getTypes();
-	
-	/**
-	 * Returns the name of field of the current type by given position
-	 * @param index position of this enum type
-	 * @return the name of field of the current type
-	 */
-	String getField(int index);
-	
-	/**
-	 * Returns name of value of this type by given position
-	 * @param index position of this type
-	 * @return name of value of this type by given position
-	 */
-	String getValue(int index);
-	
-	/**
-	 * Returns number of children of this type
-	 * @return number of children of this type
-	 */
-	int getNumberOfChildren();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFloat.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFloat.java
deleted file mode 100644
index e512034..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFloat.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents float type in this IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeFloat extends IAIFType {
-	/**
-	 * Determines whether this type is imaginary
-	 * @return true if this type is imaginary
-	 */
-	boolean isImaginary();
-	
-	/**
-	 * Determines whether this is complex type
-	 * @return true if current type is complex
-	 */
-	boolean isComplex();
-	
-	/**
-	 * Determines whether current type is long
-	 * @return true if current type is long
-	 */
-	boolean isLong();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFunction.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFunction.java
deleted file mode 100644
index 92e28f8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeFunction.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents function type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeFunction extends ITypeDerived {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeInt.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeInt.java
deleted file mode 100644
index 1057d11..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeInt.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents int type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeInt extends ITypeIntegral {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLong.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLong.java
deleted file mode 100644
index 3a21f1a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLong.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents long type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeLong extends ITypeIntegral {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLongLong.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLongLong.java
deleted file mode 100644
index 5732167..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeLongLong.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents long long type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeLongLong extends ITypeIntegral {}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeNamed.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeNamed.java
deleted file mode 100644
index fe2b600..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeNamed.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents named type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeNamed extends ITypeDerived {
-	/**
-	 * Returns name of this type
-	 * @return name of this type
-	 */
-	String getName();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypePointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypePointer.java
deleted file mode 100644
index 8279a29..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypePointer.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents pointer type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypePointer extends ITypeDerived {
-	/**
-	 * Returns address type of this type
-	 * @return address type of this type
-	 */
-	IAIFTypeAddress getAddressType();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeRange.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeRange.java
deleted file mode 100644
index dd3372a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeRange.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents range type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeRange {
-	/**
-	 * Returns the lowest index of this type
-	 * @return the lowest index of this type
-	 */
-	int getLower();
-	
-	/**
-	 * Returns the highest index of this type
-	 * @return the highest index of this type
-	 */
-	int getUpper();
-	
-	/**
-	 * Return internal type of this type or null if no internal type
-	 * @return internal type of this type
-	 */
-	IAIFType getInternalType();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeReference.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeReference.java
deleted file mode 100644
index f23c48d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeReference.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents reference type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeReference extends IAIFType {
-	/**
-	 * Returns the name of this type
-	 * @return the name of this type
-	 */
-	String getName();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeShort.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeShort.java
deleted file mode 100644
index 3a1f49d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeShort.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents short type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeShort extends ITypeIntegral {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeString.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeString.java
deleted file mode 100644
index ed74643..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeString.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents string type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeString extends IAIFType {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeStruct.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeStruct.java
deleted file mode 100644
index 2d1807a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeStruct.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents struct type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeStruct extends ITypeAggregate {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeUnion.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeUnion.java
deleted file mode 100644
index 57ba986..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeUnion.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents union type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeUnion extends ITypeAggregate {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeVoid.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeVoid.java
deleted file mode 100644
index f2e69cf..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFTypeVoid.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents void type in IAIFType
- * @author clement
- *
- */
-public interface IAIFTypeVoid extends IAIFType {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValue.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValue.java
deleted file mode 100644
index be89aca..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValue.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents value of AIF object
- * @author clement
- *
- */
-public interface IAIFValue {
-	/**
-	 * Returns IAIFType of current value
-	 * @return IAIFType of current value
-	 */
-	IAIFType getType();
-	
-	/**
-	 * Returns name of current value
-	 * @return name of current value
-	 * @throws AIFException on failure
-	 */
-	String getValueString() throws AIFException;
-	
-	/**
-	 * Returns number of children of current value
-	 * @return number of children of current value
-	 * @throws AIFException on failure
-	 */
-	int getChildrenNumber() throws AIFException;
-	
-	/**
-	 * Determines whether this value contains more than one
-	 * @return true if this value contains more than one
-	 * @throws AIFException on failure
-	 */
-	boolean hasChildren() throws AIFException;
-	
-	/**
-	 * Returns size of this value
-	 * @return size of this value
-	 */
-	int sizeof();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueAddress.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueAddress.java
deleted file mode 100644
index 2b4b6b0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueAddress.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-import java.math.BigInteger;
-
-/**
- * Represents address value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueAddress extends IAIFValue {
-	/**
-	 * Returns address value of this value
-	 * @return address value of this value
-	 * @throws AIFException on failure
-	 */
-	BigInteger getAddress() throws AIFException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueArray.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueArray.java
deleted file mode 100644
index bb2c5db..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueArray.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents array value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueArray extends IValueDerived {
-	/**
-	 * Returns a list of IAIFValues of this value
-	 * @return a list of IAIFValues of this value
-	 */
-	IAIFValue[] getValues();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueBool.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueBool.java
deleted file mode 100644
index 3823ec4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueBool.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents boolean value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueBool extends IValueIntegral {
-	/**
-	 * Determines whether this value is true 
-	 * @return true if this value is true
-	 * @throws AIFException on failure
-	 */
-	boolean booleanValue() throws AIFException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueChar.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueChar.java
deleted file mode 100644
index a96a2f5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueChar.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents char value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueChar extends IValueIntegral {
-	/**
-	 * Returns char of this value
-	 * @return char of this value
-	 * @throws AIFException on failure
-	 */
-	char charValue() throws AIFException;
-	
-	/**
-	 * Returns byte of this value
-	 * @return byte of this value
-	 * @throws AIFException on failure
-	 */
-	byte byteValue() throws AIFException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueCharPointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueCharPointer.java
deleted file mode 100644
index a51f5ea..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueCharPointer.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-import java.math.BigInteger;
-
-/**
- * Represents char pointer value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueCharPointer extends IAIFValueString {
-	/**
-	 * Returns address value of this value
-	 * @return address value of this value
-	 * @throws AIFException on failure
-	 */
-	BigInteger pointerValue() throws AIFException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueClass.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueClass.java
deleted file mode 100644
index 3c1c244..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueClass.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents class value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueClass extends IValueAggregate {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueEnum.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueEnum.java
deleted file mode 100644
index 9d7030e..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueEnum.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents enum value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueEnum extends IValueIntegral {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFloat.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFloat.java
deleted file mode 100644
index 45dfb87..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFloat.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents float value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueFloat extends IValueParent {
-	/**
-	 * Determines whether this value is float
-	 * @return true if this value if float
-	 */
-	boolean isFloat();
-	
-	/**
-	 * Determines if this value is double
-	 * @return true if this value is double
-	 */
-	boolean isDouble();
-	
-	/**
-	 * Returns value of this value
-	 * @return value of this value
-	 * @throws AIFException on failure
-	 */
-	double doubleValue() throws AIFException;
-	
-	/**
-	 * Returns value of this value
-	 * @return value of this value
-	 * @throws AIFException on failure
-	 */
-	float floatValue() throws AIFException;	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFunction.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFunction.java
deleted file mode 100644
index cf06913..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueFunction.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents function value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueFunction extends IValueDerived {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueInt.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueInt.java
deleted file mode 100644
index 0289fed..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueInt.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents int value of IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueInt extends IValueIntegral {
-	/**
-	 * Determines whether this value is long
-	 * @return true if this value if long
-	 */
-	boolean isLong();
-	
-	/**
-	 * Determines whether this value is short
-	 * @return true if this value is short
-	 */
-	boolean isShort();
-	
-	/**
-	 * Determines whether this value is int
-	 * @return true if this value is int
-	 */
-	boolean isInt();
-	
-	/**
-	 * Returns byte array of this value
-	 * @return bute array of this value 
-	 * @throws AIFException on failure
-	 */
-	byte[] byteValue() throws AIFException;
-	
-	/**
-	 * Returns value of this value
-	 * @return value of this value
-	 * @throws AIFException on failure
-	 */
-	long longValue() throws AIFException;
-	
-	/**
-	 * Returns value of this value
-	 * @return value of this value
-	 * @throws AIFException on failure
-	 */
-	short shortValue() throws AIFException;
-
-	/**
-	 * Returns value of this value
-	 * @return value of this value
-	 * @throws AIFException on failure
-	 */
-	int intValue() throws AIFException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueNamed.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueNamed.java
deleted file mode 100644
index 3b237e3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueNamed.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents named value in IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueNamed extends IValueDerived {
-	/**
-	 * Returns IAIFValue of this value
-	 * @return IAIFValue of this value
-	 */
-	IAIFValue getValue();
-
-	/**
-	 * Returns name of this value
-	 * @return name of this value
-	 */
-	String getName();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValuePointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValuePointer.java
deleted file mode 100644
index a539023..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValuePointer.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-import java.math.BigInteger;
-
-/**
- * Represents pointer value in IAIFValue
- * @author clement
- *
- */
-public interface IAIFValuePointer extends IValueParent {
-	/**
-	 * Returns value of this value
-	 * @return value of this value
-	 * @throws AIFException on failure
-	 */
-	BigInteger pointerValue() throws AIFException;
-	
-	/**
-	 * Returns IAIFValue of this value or null if nothing
-	 * @return IAIFValue of this value
-	 */
-	IAIFValue getValue();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueReference.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueReference.java
deleted file mode 100644
index c8d21bd..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueReference.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents reference value in IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueReference extends IValueParent {
-	/**
-	 * Returns name of this value
-	 * @return name of this value
-	 */
-	String getName();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueString.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueString.java
deleted file mode 100644
index 7ce5352..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueString.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents string value in IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueString extends IAIFValue {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueStruct.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueStruct.java
deleted file mode 100644
index 49df9e3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueStruct.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents struct value in IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueStruct extends IValueAggregate {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueUnion.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueUnion.java
deleted file mode 100644
index 0f4134d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IAIFValueUnion.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents union value in IAIFValue
- * @author clement
- *
- */
-public interface IAIFValueUnion extends IValueAggregate {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeAggregate.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeAggregate.java
deleted file mode 100644
index 0df5a4b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeAggregate.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents a type of aggregate
- * @author clement
- *
- */
-public interface ITypeAggregate extends IAIFType {
-	/**
-	 * Returns name of this type
-	 * @return name of this type
-	 */
-	String getName();
-	
-	/**
-	 * Returns an array of field names of this type
-	 * @return array of field names 
-	 */
-	String[] getFields();
-	
-	/**
-	 * Returns an array of this type or empty of array if nothing
-	 * @return array of this type
-	 */
-	IAIFType[] getTypes();
-	
-	/**
-	 * Returns field name of this type by given position
-	 * @param index position of this type
-	 * @return field name of this type by given position
-	 */
-	String getField(int index);
-	
-	/**
-	 * Returns IAIFType of this type by given position
-	 * @param index position of type
-	 * @return IAIFType of this type by given position
-	 */
-	IAIFType getType(int index);
-	
-	/**
-	 * Returns number of children of this type
-	 * @return number of children of this type
-	 */
-	int getNumberOfChildren();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeDerived.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeDerived.java
deleted file mode 100644
index 4e463f8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeDerived.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents derived type
- * @author clement
- *
- */
-public interface ITypeDerived extends IAIFType {
-	/**
-	 * Returns base type of this type
-	 * @return base type of this type
-	 */
-	IAIFType getBaseType();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeIntegral.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeIntegral.java
deleted file mode 100644
index 7f26587..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/ITypeIntegral.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents integral type of IAIFType
- * @author clement
- *
- */
-public interface ITypeIntegral extends IAIFType {
-	/**
-	 * Determines whether this type is signed
-	 * @return true if this type is signed
-	 */
-	boolean isSigned();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueAggregate.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueAggregate.java
deleted file mode 100644
index 34a583f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueAggregate.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents aggresgate value
- * @author clement
- *
- */
-public interface IValueAggregate extends IValueParent {
-	/**
-	 * Return IAIFValue of this value by given position or null if nothing found
-	 * @param index position of this value
-	 * @return IAIFValue of this value
-	 */
-	IAIFValue getValue(int index);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueDerived.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueDerived.java
deleted file mode 100644
index baa45d3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueDerived.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents derived value of IAIFValue
- * @author clement
- *
- */
-public interface IValueDerived extends IValueParent {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueIntegral.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueIntegral.java
deleted file mode 100644
index 794cb72..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueIntegral.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-import java.math.BigInteger;
-
-/**
- * Represents integral value of IAIFValue
- * @author clement
- *
- */
-public interface IValueIntegral extends IAIFValue {
-	/**
-	 * Returns value of this value
-	 * @return value of this value
-	 * @throws AIFException on failure
-	 */
-	BigInteger bigIntegerValue() throws AIFException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueParent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueParent.java
deleted file mode 100644
index 4df44e1..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/model/aif/IValueParent.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.model.aif;
-
-/**
- * Represents parent on AIFIValue
- * @author clement
- *
- */
-public interface IValueParent extends IAIFValue {
-	/**
-	 * Returns IValueParent of this value
-	 * @return IValueParent of this value
-	 */
-	IValueParent getParent();
-	
-	/**
-	 * Sets IValueParent to this value
-	 * @param parent IValueParent going to set to this value
-	 */
-	void setParent(IValueParent parent);	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataEvaluateExpressionRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataEvaluateExpressionRequest.java
deleted file mode 100644
index 7c29f02..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataEvaluateExpressionRequest.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractDataEvaluateExpressionRequest extends AbstractEventResultRequest implements IPDIDataEvaluateExpressionRequest {
-	private String expr;
-	
-	public AbstractDataEvaluateExpressionRequest(BitList tasks, String expr) {
-		super(tasks);
-		this.expr = expr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.dataEvaluateExpression(tasks, expr);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIDataEvaluateExpressionRequest#getAIF(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IAIF getAIF(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof IAIF) {
-			return (IAIF)obj;
-		}
-		throw new PDIException(qTasks, "Variable "+ expr +": No value found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Data evaluate expression request";
-	}
-	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataReadMemoryRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataReadMemoryRequest.java
deleted file mode 100644
index 1223977..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractDataReadMemoryRequest.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractDataReadMemoryRequest extends AbstractEventResultRequest implements IPDIDataReadMemoryRequest {
-	private long offset;
-	private String address;
-	private int wordFormat;
-	private int wordSize;
-	private int rows;
-	private int cols;
-	private Character asChar;
-	
-	public AbstractDataReadMemoryRequest(BitList tasks, long offset, String address, int wordFormat, int wordSize, int rows, int cols, Character asChar) {
-		super(tasks);
-		this.offset = offset;
-		this.address = address;
-		this.wordFormat = wordFormat;
-		this.wordSize = wordSize;
-		this.rows = rows;
-		this.cols = cols;
-		this.asChar = asChar;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.createDataReadMemory(tasks, offset, address, wordFormat, wordSize, rows, cols, asChar);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIDataReadMemoryRequest#getDataReadMemoryInfo(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIDataReadMemoryInfo getDataReadMemoryInfo(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof IPDIDataReadMemoryInfo) {
-			return (IPDIDataReadMemoryInfo)obj;
-		}
-		throw new PDIException(qTasks, "No data read memory info");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Create data read memory request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventRequest.java
deleted file mode 100644
index f9eedb2..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventRequest.java
+++ /dev/null

@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractEventRequest implements IPDIEventRequest {
-	protected int status = UNKNOWN;
-	protected BitList tasks = null;
-	protected String message = "";
-	
-	public AbstractEventRequest(BitList tasks) {
-		this.tasks = tasks.copy();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#cancel()
-	 */
-	public void cancel() {
-		try {
-			doFinish();
-			this.status = IPDIEventRequest.CANCELLED;
-		} catch (PDIException e) {
-			error(e.getMessage());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#completed(org.eclipse.ptp.core.util.BitList, java.lang.Object)
-	 */
-	public boolean completed(BitList cTasks, Object result) {
-		tasks.andNot(cTasks);
-		return tasks.isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#done()
-	 */
-	public void done() {
-		try {
-			doFinish();
-			this.status = IPDIEventRequest.DONE;
-		} catch (PDIException e) {
-			error(e.getMessage());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#error(java.lang.String)
-	 */
-	public void error(String message) {
-		this.status = IPDIEventRequest.ERROR;
-		this.message = message;
-		try {
-			doFinish();
-		} catch (PDIException e) {
-			this.message += " - " + e.getMessage();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#execute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void execute(IPDIDebugger debugger) {
-		try {
-			doExecute(debugger);
-			this.status = IPDIEventRequest.RUNNING;
-		} catch (PDIException e) {
-			error(e.getMessage());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		return message;
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getResponseAction()
-     */
-    public int getResponseAction() {
-    	return ACTION_NONE;// default action
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getStatus()
-	 */
-	public int getStatus() {
-		return status;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISet#getTasks()
-	 */
-	public BitList getTasks() {
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#setStatus(int)
-	 */
-	public void setStatus(int status) {
-		this.status = status;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		String res = getName() + " in status [";
-		
-		switch (status) {
-		case ERROR:
-			res += "ERROR";
-			break;
-		case RUNNING:
-			res += "RUNNING";
-			break;
-		case DONE:
-			res += "DONE";
-			break;
-		case CANCELLED:
-			res += "CANCELLED";
-			break;
-		default:
-			res += "UNKNOWN";
-			break;
-		}
-		
-		return res + "] for " + BitList.showBitList(getTasks()) + ".";
-	}
-	
-    /**
-	 * @param debugger
-	 * @throws PDIException
-	 */
-	protected abstract void doExecute(IPDIDebugger debugger) throws PDIException;
-    
-    /**
-	 * @throws PDIException
-	 */
-	protected abstract void doFinish() throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventResultRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventResultRequest.java
deleted file mode 100644
index 08838a8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractEventResultRequest.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Abstract base class of events that return results
- * 
- * @author clement
- *
- */
-public abstract class AbstractEventResultRequest extends AbstractEventRequest implements IPDIInternalEventRequest {
-	private final Object lock = new Object();
-	protected Map<BitList, Object> results = new HashMap<BitList, Object>();
-	protected long DEFAULT_TIMEOUT = 5000;
-	
-	public AbstractEventResultRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#completed(org.eclipse.ptp.core.util.BitList, java.lang.Object)
-	 */
-	public boolean completed(BitList cTasks, Object result) {
-		//if (!(result instanceof IProxyDebugEvent))
-		//	return false;
-		if (tasks.intersects(cTasks)) {
-			storeResult(cTasks.copy(), result);
-			notifyWaiting();
-			return super.completed(cTasks, result);
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#getResponseAction()
-	 */
-	public int getResponseAction() {
-    	return ACTION_TERMINATED;
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIInternalEventRequest#getResult(org.eclipse.ptp.core.util.BitList)
-	 */
-	public Object getResult(BitList  qTasks) throws PDIException {
-		if (findResult(qTasks))
-			return results.get(qTasks);
-		
-		for (Iterator<BitList> i = results.keySet().iterator(); i.hasNext();) {
-			BitList sTasks = i.next();
-			if (sTasks.intersects(qTasks))
-				return results.get(sTasks);
-		}
-		throw new PDIException(qTasks, getName() + ": No request task found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIInternalEventRequest#getResultMap(org.eclipse.ptp.core.util.BitList)
-	 */
-	public Map<BitList, Object> getResultMap(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		return results;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIInternalEventRequest#waitUntilCompleted(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void waitUntilCompleted(BitList qTasks) throws PDIException {
-		waiting();
-		if (status == ERROR)
-			throw new PDIException(qTasks, getErrorMessage());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIInternalEventRequest#waitUntilCompleted(org.eclipse.ptp.core.util.BitList, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void waitUntilCompleted(BitList qTasks, IProgressMonitor monitor) throws PDIException {
-		while (!tasks.isEmpty() && (status == UNKNOWN || status == RUNNING)) {
-			if (monitor.isCanceled()) {
-				error("This request is interrupted.");
-				break;
-			}
-			lockRequest(500);
-			monitor.worked(1);
-		}
-		if (status == ERROR)
-			throw new PDIException(qTasks, getErrorMessage());
-		if (status == DONE)
-			monitor.done();
-	}
-	
-	/**
-	 * 
-	 */
-	private void notifyWaiting() {
-		releaseRequest();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doFinish()
-	 */
-	protected void doFinish() throws PDIException {
-		notifyWaiting();
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	protected boolean findResult(BitList qTasks) {
-		return results.containsKey(qTasks);
-	}
-	
-	/**
-	 * @param timeout
-	 */
-	protected void lockRequest(long timeout) {
-		synchronized (lock) {
-			try {
-				lock.wait(timeout);
-			}
-			catch (InterruptedException ex) {} 
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	protected void releaseRequest() {
-		synchronized (lock) {
-			lock.notifyAll();
-		}
-	}
-	
-	/**
-	 * @param rTasks
-	 * @param result
-	 */
-	protected abstract void storeResult(BitList rTasks, Object result);
-
-	/**
-	 * @param rTasks
-	 * @param result
-	 */
-	protected void storeUnknownResult(BitList rTasks, Object result) {
-		results.put(rTasks, result);
-	}
-	
-	/**
-	 * 
-	 */
-	protected void waiting() {
-		while (!tasks.isEmpty() && (status == UNKNOWN || status == RUNNING)) {
-			lockRequest(DEFAULT_TIMEOUT);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetAIFRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetAIFRequest.java
deleted file mode 100644
index 6ce0ae3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetAIFRequest.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-
-/**
- * @author clement
- *
- */
-/**
- * @author greg
- *
- */
-public abstract class AbstractGetAIFRequest extends AbstractEventResultRequest implements IPDIGetAIFRequest {
-	private String expr;
-	
-	public AbstractGetAIFRequest(BitList tasks, String expr) {
-		super(tasks);
-		this.expr = expr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.retrieveAIF(tasks, expr);
-	}
-	
-	public IAIF getAIF(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof IAIF) {
-			return (IAIF)obj;
-		}
-		throw new PDIException(qTasks, "Variable "+ expr +": No value found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Get aif request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetInfoThreadsRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetInfoThreadsRequest.java
deleted file mode 100644
index b086073..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetInfoThreadsRequest.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractGetInfoThreadsRequest extends AbstractEventResultRequest implements IPDIGetInfoThreadsRequest {
-	public AbstractGetInfoThreadsRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.listInfoThreads(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Get info thread request";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIGetInfoThreadsRequest#getThreadIds(org.eclipse.ptp.core.util.BitList)
-	 */
-	public String[] getThreadIds(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof String[]) {
-			return (String[])obj;
-		}
-		throw new PDIException(qTasks, "No thread ids found");
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetPartialAIFRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetPartialAIFRequest.java
deleted file mode 100644
index 6cd0037..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetPartialAIFRequest.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractGetPartialAIFRequest extends AbstractEventResultRequest implements IPDIGetPartialAIFRequest {
-	private String expr;
-	private String varid;
-	private boolean listChildren = false;
-	private boolean express = false;
-	
-	public AbstractGetPartialAIFRequest(BitList tasks, String expr, String varid) {
-		this(tasks, expr, varid, false, (varid != null));
-	}
-	
-	public AbstractGetPartialAIFRequest(BitList tasks, String expr, String varid, boolean listChildren) {
-		this(tasks, expr, varid, listChildren, false);
-	}
-	
-	public AbstractGetPartialAIFRequest(BitList tasks, String expr, String varid, boolean listChildren, boolean express) {
-		super(tasks);
-		this.expr = expr;
-		this.varid = varid;
-		this.listChildren = listChildren;
-		this.express = express;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.retrievePartialAIF(tasks, expr, varid, listChildren, express);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Get partial aif request";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIGetPartialAIFRequest#getPartialAIF(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IAIF getPartialAIF(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof Object[]) {
-			Object[] returnValues = (Object[])obj;
-			return (IAIF)returnValues[1];
-		}
-		throw new PDIException(qTasks, "Variable " + expr + ": No aif found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIGetPartialAIFRequest#getVarId(org.eclipse.ptp.core.util.BitList)
-	 */
-	public String getVarId(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof Object[]) {
-			Object[] returnValues = (Object[])obj;
-			return (String)returnValues[0];
-		}
-		throw new PDIException(qTasks, "Variable ID " + varid + ": No variable ID found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#toString()
-	 */
-	public String toString() {
-		return getName() + " for tasks " + BitList.showBitList(getTasks()) + ", exp: " + expr + ", var id: " + varid + ", is list children: " + listChildren + ", is express: " + express; 
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetStackInfoDepthRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetStackInfoDepthRequest.java
deleted file mode 100644
index 7b256f4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractGetStackInfoDepthRequest.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractGetStackInfoDepthRequest extends AbstractEventResultRequest implements IPDIGetStackInfoDepthRequest {
-	public AbstractGetStackInfoDepthRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.retrieveStackInfoDepth(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIGetStackInfoDepthRequest#getDepth(org.eclipse.ptp.core.util.BitList)
-	 */
-	public int getDepth(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof Integer) {
-			return ((Integer)obj).intValue();
-		}
-		throw new PDIException(qTasks, "No stack info depth found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Retrieve stack info depth request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListArgumentsRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListArgumentsRequest.java
deleted file mode 100644
index a8470c4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListArgumentsRequest.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractListArgumentsRequest extends AbstractEventResultRequest implements IPDIListArgumentsRequest {
-	private int low = 0;
-	private int high = 0;
-	
-	public AbstractListArgumentsRequest(BitList tasks, int low, int high) {
-		super(tasks);
-		this.low = low;
-		this.high = high;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.listArguments(tasks, low, high);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIListArgumentsRequest#getArguments(org.eclipse.ptp.core.util.BitList)
-	 */
-	public String[] getArguments(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof String[]) {
-			return (String[])obj;
-		}
-		throw new PDIException(qTasks, "No arguments found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "List arguments request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListLocalVariablesRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListLocalVariablesRequest.java
deleted file mode 100644
index 5b3c1a5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListLocalVariablesRequest.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractListLocalVariablesRequest extends AbstractEventResultRequest implements IPDIListLocalVariablesRequest {
-	public AbstractListLocalVariablesRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.listLocalVariables(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIListLocalVariablesRequest#getLocalVariables(org.eclipse.ptp.core.util.BitList)
-	 */
-	public String[] getLocalVariables(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof String[]) {
-			return (String[])obj;
-		}
-		throw new PDIException(qTasks, "No local variables found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "List local variables request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListSignalsRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListSignalsRequest.java
deleted file mode 100644
index 4c71d21..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListSignalsRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractListSignalsRequest extends AbstractEventResultRequest implements IPDIListSignalsRequest {
-	private String name;
-	
-	public AbstractListSignalsRequest(BitList tasks, String name) {
-		super(tasks);
-		this.name = name;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.listSignals(tasks, name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "List signals request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListStackFramesRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListStackFramesRequest.java
deleted file mode 100644
index 259eca2..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractListStackFramesRequest.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractListStackFramesRequest extends AbstractEventResultRequest implements IPDIListStackFramesRequest {
-	private int low = 0;
-	private int high = 0;
-	
-	public AbstractListStackFramesRequest(BitList tasks, int low, int high) {
-		super(tasks);
-		this.low = low;
-		this.high = high;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.listStackFrames(tasks, low, high);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "List stack frames request";
-	}
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractRequestFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractRequestFactory.java
deleted file mode 100644
index 34afa32..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractRequestFactory.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-import org.eclipse.ptp.debug.internal.core.pdi.request.CommandRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.DataWriteMemoryRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.DeleteBreakpointRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.DeleteVariableRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.DisableBreakpointRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.EnableBreakpointRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.ResumeRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.SetAddressBreakpointRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.SetFunctionBreakpointRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.SetLineBreakpointRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.SetWatchpointRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.StartDebuggerRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.StepFinishRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.StepIntoRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.StepOverRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.StopDebuggerRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.SuspendRequest;
-import org.eclipse.ptp.debug.internal.core.pdi.request.TerminateRequest;
-
-/**
- * @author clement
- *
- */
-/**
- * @author greg
- *
- */
-public abstract class AbstractRequestFactory implements IPDIRequestFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getCommandRequest(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDICommandRequest getCommandRequest(BitList tasks, String command) {
-		return new CommandRequest(tasks, command);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getDataWriteMemoryRequest(org.eclipse.ptp.core.util.BitList, long, java.lang.String, int, int, java.lang.String)
-	 */
-	public IPDIDataWriteMemoryRequest getDataWriteMemoryRequest(BitList tasks,
-			long offset, String address, int wordFormat, int wordSize,
-			String value) {
-		return new DataWriteMemoryRequest(tasks, offset, address, wordFormat, wordSize, value);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getDeleteBreakpointRequest(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint, boolean)
-	 */
-	public IPDIDeleteBreakpointRequest getDeleteBreakpointRequest(
-			BitList tasks, IPDIBreakpoint bpt, boolean allowUpdate) {
-		return new DeleteBreakpointRequest(tasks, bpt, allowUpdate);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getDeleteVariableRequest(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDIDeleteVariableRequest getDeleteVariableRequest(BitList tasks,
-			String varid) {
-		return new DeleteVariableRequest(tasks, varid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getDisableBreakpointRequest(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public IPDIDisableBreakpointRequest getDisableBreakpointRequest(
-			BitList tasks, IPDIBreakpoint bpt) {
-		return new DisableBreakpointRequest(tasks, bpt);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getEnableBreakpointRequest(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public IPDIEnableBreakpointRequest getEnableBreakpointRequest(
-			BitList tasks, IPDIBreakpoint bpt) {
-		return new EnableBreakpointRequest(tasks, bpt);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getResumeRequest(org.eclipse.ptp.core.util.BitList, boolean)
-	 */
-	public IPDIGoRequest getResumeRequest(BitList tasks, boolean passSignal) {
-		return new ResumeRequest(tasks, passSignal);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSetAddressBreakpointRequest(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint, boolean)
-	 */
-	public IPDISetAddressBreakpointRequest getSetAddressBreakpointRequest(
-			BitList tasks, IPDIAddressBreakpoint bpt, boolean allowUpdate) {
-		return new SetAddressBreakpointRequest(tasks, bpt, allowUpdate);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSetFunctionBreakpointRequest(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint, boolean)
-	 */
-	public IPDISetFunctionBreakpointRequest getSetFunctionBreakpointRequest(
-			BitList tasks, IPDIFunctionBreakpoint bpt, boolean allowUpdate) {
-		return new SetFunctionBreakpointRequest(tasks, bpt, allowUpdate);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSetLineBreakpointRequest(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint, boolean)
-	 */
-	public IPDISetLineBreakpointRequest getSetLineBreakpointRequest(
-			BitList tasks, IPDILineBreakpoint bpt, boolean allowUpdate) {
-		return new SetLineBreakpointRequest(tasks, bpt, allowUpdate);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSetWatchpointRequest(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint, boolean)
-	 */
-	public IPDISetWatchpointRequest getSetWatchpointRequest(BitList tasks,
-			IPDIWatchpoint bpt, boolean allowUpdate) {
-		return new SetWatchpointRequest(tasks, bpt, allowUpdate);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getStartDebuggerRequest(org.eclipse.ptp.core.util.BitList, java.lang.String, java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IPDIStartDebuggerRequest getStartDebuggerRequest(BitList tasks,
-			String app, String path, String dir, String[] args) {
-		return new StartDebuggerRequest(tasks, app, path, dir, args);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getStepFinishRequest(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public IPDIStepFinishRequest getStepFinishRequest(BitList tasks, int count) {
-		return new StepFinishRequest(tasks, count);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getStepIntoRequest(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public IPDIStepIntoRequest getStepIntoRequest(BitList tasks, int count) {
-		return new StepIntoRequest(tasks, count);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getStepOverRequest(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public IPDIStepOverRequest getStepOverRequest(BitList tasks, int count) {
-		return new StepOverRequest(tasks, count);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getStopDebuggerRequest(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIStopDebuggerRequest getStopDebuggerRequest(BitList tasks) {
-		return new StopDebuggerRequest(tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSuspendRequest(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIHaltRequest getSuspendRequest(BitList tasks) {
-		return new SuspendRequest(tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSuspendRequest(org.eclipse.ptp.core.util.BitList, boolean)
-	 */
-	public IPDIHaltRequest getSuspendRequest(BitList tasks, boolean sendEvent) {
-		return new SuspendRequest(tasks, sendEvent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getTerminateRequest(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDITerminateRequest getTerminateRequest(BitList tasks) {
-		return new TerminateRequest(tasks);
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetCurrentStackFrameRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetCurrentStackFrameRequest.java
deleted file mode 100644
index 5bbe709..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetCurrentStackFrameRequest.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractSetCurrentStackFrameRequest extends AbstractEventResultRequest implements IPDISetCurrentStackFrameRequest {
-	private int level = 0;
-	
-	public AbstractSetCurrentStackFrameRequest(BitList tasks, int level) {
-		super(tasks);
-		this.level = level;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.setCurrentStackFrame(tasks, level);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Set current stack frame request";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#toString()
-	 */
-	public String toString() {
-		return getName() + " set level to " + level; 
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetThreadSelectRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetThreadSelectRequest.java
deleted file mode 100644
index 11a53a0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/AbstractSetThreadSelectRequest.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractSetThreadSelectRequest extends AbstractEventResultRequest implements IPDISetThreadSelectRequest {
-	private int id = 0;
-	
-	public AbstractSetThreadSelectRequest(BitList tasks, int id) {
-		super(tasks);
-		this.id = id;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.selectThread(tasks, id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDISetThreadSelectRequest#getThreadId(org.eclipse.ptp.core.util.BitList)
-	 */
-	public int getThreadId(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof Object[]) {
-			Object[] returnValues = (Object[])obj;
-			return ((Integer)returnValues[0]).intValue();
-		}
-		throw new PDIException(qTasks, "No Thread ID found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Set thread select request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIBreakpointRequest.java
deleted file mode 100644
index a5bbe87..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIBreakpointRequest.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-
-/**
- * Represents to request a breakpoint
- * @author clement
- *
- */
-public interface IPDIBreakpointRequest extends IPDIEventRequest {
-	/**
-	 * Returns pdi breakpoint
-	 * @return pdi breakpoint
-	 */
-	IPDIBreakpoint getBreakpoint();
-	
-	/**
-	 * Whether send PDI event or not
-	 * @return false if don't event pdi event
-	 */
-	boolean isAllowUpdate();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDICommandRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDICommandRequest.java
deleted file mode 100644
index 6e87ed1..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDICommandRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request special command
- * @author clement
- *
- */
-public interface IPDICommandRequest extends IPDIInternalEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConditionBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConditionBreakpointRequest.java
deleted file mode 100644
index 0e2ba27..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConditionBreakpointRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request a condition breakpoint
- * @author clement
- *
- */
-public interface IPDIConditionBreakpointRequest extends IPDIBreakpointRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConnectionRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConnectionRequest.java
deleted file mode 100644
index 31165c5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIConnectionRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request a connection to debugger
- * @author clement
- *
- */
-public interface IPDIConnectionRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataEvaluateExpressionRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataEvaluateExpressionRequest.java
deleted file mode 100644
index 1e9ffe4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataEvaluateExpressionRequest.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * Represents to request a data evaluate expression
- * @author clement
- *
- */
-public interface IPDIDataEvaluateExpressionRequest extends IPDIInternalEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public IAIF getAIF(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataReadMemoryRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataReadMemoryRequest.java
deleted file mode 100644
index 72bca23..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataReadMemoryRequest.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-
-/**
- * Represents to request a data read memory
- * @author clement
- *
- */
-public interface IPDIDataReadMemoryRequest extends IPDIEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIDataReadMemoryInfo getDataReadMemoryInfo(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataWriteMemoryRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataWriteMemoryRequest.java
deleted file mode 100644
index 0e51e81..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDataWriteMemoryRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request a data write memory
- * @author clement
- *
- */
-public interface IPDIDataWriteMemoryRequest extends IPDIInternalEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteBreakpointRequest.java
deleted file mode 100644
index 107305b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteBreakpointRequest.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request deleting a breakpoint
- * @author clement
- *
- */
-public interface IPDIDeleteBreakpointRequest extends IPDIBreakpointRequest {
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteVariableRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteVariableRequest.java
deleted file mode 100644
index aa32074..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDeleteVariableRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request deleting a variable
- * @author clement
- *
- */
-public interface IPDIDeleteVariableRequest extends IPDIInternalEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDisableBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDisableBreakpointRequest.java
deleted file mode 100644
index 71d05ce..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIDisableBreakpointRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request disabling a breakpoint
- * @author clement
- *
- */
-public interface IPDIDisableBreakpointRequest extends IPDIBreakpointRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEnableBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEnableBreakpointRequest.java
deleted file mode 100644
index b11bd0c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEnableBreakpointRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request enabling a breakpoint
- * @author clement
- *
- */
-public interface IPDIEnableBreakpointRequest extends IPDIBreakpointRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEvaluateExpressionRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEvaluateExpressionRequest.java
deleted file mode 100644
index f0930be..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEvaluateExpressionRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request evaluting expression
- * @author clement
- *
- */
-public interface IPDIEvaluateExpressionRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEventRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEventRequest.java
deleted file mode 100644
index c978272..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIEventRequest.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.IPDISet;
-
-/**
- * Represents a request for notification of an event.  
- * @author clement
- *
- */
-public interface IPDIEventRequest extends IPDISet {
-	//status
-	public final static int ERROR = 0x1;
-	public final static int RUNNING = 0x2; 
-	public final static int DONE = 0x3;
-	public final static int CANCELLED = 0x4;
-	public final static int UNKNOWN = 0x5;
-	
-	public final static int ACTION_NONE = 0x1;			//by default, nothing
-	public final static int ACTION_TERMINATED = 0x2;	//terminate all remaining tasks
-	
-	/**
-	 * Sets current status of this request
-	 * @param status
-	 */
-	void setStatus(int status);
-	
-	/**
-	 * Returns the current status of this request
-	 * @return the current status of this request
-	 */
-	int getStatus();
-	
-    /**
-     * Indicates this request is complete. Clients must call this method
-     * whether the request succeeds, fails, or is cancelled to indicate that
-     * processing is complete. Only clients fulfilling a request should call this
-     * method. Clients making a request are not intended to call this method.
-     */
-    void done();
-    
-    /**
-     * Cancels this request. A request may be cancelled by the originator of request
-     * or a client fulfilling a request. Optionally a cancelled status may be set on
-     * this request with more details. A client fulfilling a request must still call
-     * <code>done()</code> to indicate the request is complete.
-     */
-    void cancel();
-    
-    /**
-     * Indicates this request is executing. 
-     * @param debugger
-     */
-    void execute(IPDIDebugger debugger);
-    
-    /**
-     * Indicates this request has an error.
-     * @param message error message
-     */
-    void error(String message);
-    
-    /**
-     * Returns name of this request 
-     * @return name of this request
-     */
-    String getName();
-    
-    /**
-     * Returns error message of this request
-     * @return error message of this request
-     */
-    String getErrorMessage();
-    
-    /**
-     * Returns whether tasks are completed and set result
-     * @param qTasks
-     * @param result
-     * @return true if the tasks are completed
-     */
-    boolean completed(BitList qTasks, Object result);
-    
-    /**
-     * Returns action type for action after completing this request
-     * @return action type
-     */
-    int getResponseAction();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetAIFRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetAIFRequest.java
deleted file mode 100644
index 271b5e9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetAIFRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request an AIF
- * @author clement
- *
- */
-public interface IPDIGetAIFRequest extends IPDIInternalEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetInfoThreadsRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetInfoThreadsRequest.java
deleted file mode 100644
index b296ede..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetInfoThreadsRequest.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents to request getting info threads
- * @author clement
- *
- */
-public interface IPDIGetInfoThreadsRequest extends IPDIEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public String[] getThreadIds(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetPartialAIFRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetPartialAIFRequest.java
deleted file mode 100644
index 0ef2877..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetPartialAIFRequest.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * Represents to request a partial AIF
- * @author clement
- *
- */
-public interface IPDIGetPartialAIFRequest extends IPDIInternalEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public IAIF getPartialAIF(BitList qTasks) throws PDIException;
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public String getVarId(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetStackInfoDepthRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetStackInfoDepthRequest.java
deleted file mode 100644
index d64f22d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetStackInfoDepthRequest.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents to request getting stack info depth
- * @author clement
- *
- */
-public interface IPDIGetStackInfoDepthRequest extends IPDIEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public int getDepth(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetVariableTypeRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetVariableTypeRequest.java
deleted file mode 100644
index 4f28c7c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGetVariableTypeRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request getting variable type
- * @author clement
- *
- */
-public interface IPDIGetVariableTypeRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGoRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGoRequest.java
deleted file mode 100644
index c2f4cbf..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIGoRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request going
- * @author clement
- *
- */
-public interface IPDIGoRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIHaltRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIHaltRequest.java
deleted file mode 100644
index 5fda762..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIHaltRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request halting
- * @author clement
- *
- */
-public interface IPDIHaltRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIInternalEventRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIInternalEventRequest.java
deleted file mode 100644
index ac91dc8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIInternalEventRequest.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * @author clement
- *
- */
-public interface IPDIInternalEventRequest extends IPDIEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public Object getResult(BitList  qTasks) throws PDIException;
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public Map<BitList, Object> getResultMap(BitList qTasks) throws PDIException;
-	
-	/**
-	 * @param qTasks
-	 * @throws PDIException
-	 */
-	public void waitUntilCompleted(BitList qTasks) throws PDIException;
-	
-	/**
-	 * @param qTasks
-	 * @param monitor
-	 * @throws PDIException
-	 */
-	public void waitUntilCompleted(BitList qTasks, IProgressMonitor monitor) throws PDIException;
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListArgumentsRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListArgumentsRequest.java
deleted file mode 100644
index f23300d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListArgumentsRequest.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents to request a list of arguments
- * @author clement
- *
- */
-public interface IPDIListArgumentsRequest extends IPDIEventRequest {
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public String[] getArguments(BitList tasks) throws PDIException;
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListGlobalVariablesRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListGlobalVariablesRequest.java
deleted file mode 100644
index 16a4bd7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListGlobalVariablesRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request a list of global variables
- * @author clement
- *
- */
-public interface IPDIListGlobalVariablesRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListLocalVariablesRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListLocalVariablesRequest.java
deleted file mode 100644
index d29c734..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListLocalVariablesRequest.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-
-/**
- * Represents to request a list of local variables
- * @author clement
- *
- */
-public interface IPDIListLocalVariablesRequest extends IPDIEventRequest {
-
-	/**
-	 * @param tasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public String[] getLocalVariables(BitList tasks) throws PDIException;
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListSignalsRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListSignalsRequest.java
deleted file mode 100644
index 410f6b3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListSignalsRequest.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor;
-
-/**
- * Represents to request a list of signals
- * @author clement
- *
- */
-public interface IPDIListSignalsRequest extends IPDIEventRequest {
-	public IPDISignalDescriptor[] getSignals(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListStackFramesRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListStackFramesRequest.java
deleted file mode 100644
index 8cc0f8c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIListStackFramesRequest.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrameDescriptor;
-
-/**
- * Represents to request a list of stackframes
- * @author clement
- *
- */
-public interface IPDIListStackFramesRequest extends IPDIInternalEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIStackFrameDescriptor[] getStackFrames(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRequestFactory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRequestFactory.java
deleted file mode 100644
index 8200feb..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRequestFactory.java
+++ /dev/null

@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-
-/**
- * @author clement
- *
- */
-public interface IPDIRequestFactory {
-	/**
-	 * @param tasks
-	 * @param expr
-	 * @return
-	 */
-	public IPDIGetAIFRequest getAIFRequest(BitList tasks, String expr);
-	
-	/**
-	 * @param tasks
-	 * @param command
-	 * @return
-	 */
-	public IPDICommandRequest getCommandRequest(BitList tasks, String command);
-	
-	/**
-	 * @param tasks
-	 * @param expr
-	 * @return
-	 */
-	public IPDIDataEvaluateExpressionRequest getDataEvaluateExpresionRequest(BitList tasks, String expr);
-	
-	/**
-	 * @param tasks
-	 * @param expr
-	 * @return
-	 */
-	public IPDIDataEvaluateExpressionRequest getDataEvaluateExpressionRequest(BitList tasks, String expr);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param offset
-	 * @param address
-	 * @param wordFormat
-	 * @param wordSize
-	 * @param rows
-	 * @param cols
-	 * @param asChar
-	 * @return
-	 */
-	public IPDIDataReadMemoryRequest getDataReadMemoryRequest(IPDISession session, BitList tasks, long offset, String address, int wordFormat, int wordSize, int rows, int cols, Character asChar);
-	
-	/**
-	 * @param tasks
-	 * @param offset
-	 * @param address
-	 * @param wordFormat
-	 * @param wordSize
-	 * @param value
-	 * @return
-	 */
-	public IPDIDataWriteMemoryRequest getDataWriteMemoryRequest(BitList tasks, long offset, String address, int wordFormat, int wordSize, String value);
-	
-	/**
-	 * @param tasks
-	 * @param bpt
-	 * @param allowUpdate
-	 * @return
-	 */
-	public IPDIDeleteBreakpointRequest getDeleteBreakpointRequest(BitList tasks, IPDIBreakpoint bpt, boolean allowUpdate);
-	
-	/**
-	 * @param tasks
-	 * @param varid
-	 * @return
-	 */
-	public IPDIDeleteVariableRequest getDeleteVariableRequest(BitList tasks, String varid);
-	
-	/**
-	 * @param tasks
-	 * @param bpt
-	 * @return
-	 */
-	public IPDIDisableBreakpointRequest getDisableBreakpointRequest(BitList tasks, IPDIBreakpoint bpt);
-	
-	/**
-	 * @param tasks
-	 * @param bpt
-	 * @return
-	 */
-	public IPDIEnableBreakpointRequest getEnableBreakpointRequest(BitList tasks, IPDIBreakpoint bpt);
-	
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIGetInfoThreadsRequest getGetInfoThreadsRequest(BitList tasks);
-	
-	/**
-	 * @param tasks
-	 * @param expr
-	 * @param varid
-	 * @return
-	 */
-	public IPDIGetPartialAIFRequest getGetPartialAIFRequest(BitList tasks, String expr, String varid);
-	
-	/**
-	 * @param tasks
-	 * @param expr
-	 * @param varid
-	 * @param listChildren
-	 * @return
-	 */
-	public IPDIGetPartialAIFRequest getGetPartialAIFRequest(BitList tasks, String expr, String varid, boolean listChildren);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIGetStackInfoDepthRequest getGetStackInfoDepthRequest(BitList tasks);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param diff
-	 * @param diff2
-	 * @return
-	 */
-	public IPDIListArgumentsRequest getListArgumentsRequest(BitList tasks, int diff, int diff2);
-	
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIListLocalVariablesRequest getListLocalVariablesRequest(BitList tasks);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param name
-	 * @return
-	 */
-	public IPDIListSignalsRequest getListSignalsRequest(IPDISession session, BitList tasks, String name);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIListStackFramesRequest getListStackFramesRequest(IPDISession session, BitList tasks);
-		
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param low
-	 * @param high
-	 * @return
-	 */
-	public IPDIListStackFramesRequest getListStackFramesRequest(IPDISession session, BitList tasks, int low, int high);
-	
-	/**
-	 * @param tasks
-	 * @param passSignal
-	 * @return
-	 */
-	public IPDIGoRequest getResumeRequest(BitList tasks, boolean passSignal);
-	
-	/**
-	 * @param tasks
-	 * @param bpt
-	 * @param allowUpdate
-	 * @return
-	 */
-	public IPDISetAddressBreakpointRequest getSetAddressBreakpointRequest(BitList tasks, IPDIAddressBreakpoint bpt, boolean allowUpdate);
-	
-	/**
-	 * @param tasks
-	 * @param level
-	 * @return
-	 */
-	public IPDISetCurrentStackFrameRequest getSetCurrentStackFrameRequest(BitList tasks, int level);
-	
-	/**
-	 * @param tasks
-	 * @param bpt
-	 * @param allowUpdate
-	 * @return
-	 */
-	public IPDISetFunctionBreakpointRequest getSetFunctionBreakpointRequest(BitList tasks, IPDIFunctionBreakpoint bpt, boolean allowUpdate);
-	
-	/**
-	 * @param tasks
-	 * @param bpt
-	 * @param allowUpdate
-	 * @return
-	 */
-	public IPDISetLineBreakpointRequest getSetLineBreakpointRequest(BitList tasks, IPDILineBreakpoint bpt, boolean allowUpdate);
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param id
-	 * @return
-	 */
-	public IPDISetThreadSelectRequest getSetThreadSelectRequest(IPDISession session, BitList tasks, int id);
-	
-	/**
-	 * @param tasks
-	 * @param bpt
-	 * @param allowUpdate
-	 * @return
-	 */
-	public IPDISetWatchpointRequest getSetWatchpointRequest(BitList tasks, IPDIWatchpoint bpt, boolean allowUpdate);
-	
-	/**
-	 * @param tasks
-	 * @param app
-	 * @param path
-	 * @param dir
-	 * @param args
-	 * @return
-	 */
-	public IPDIStartDebuggerRequest getStartDebuggerRequest(BitList tasks, String app, String path, String dir, String[] args);
-	
-	/**
-	 * @param tasks
-	 * @param count
-	 * @return
-	 */
-	public IPDIStepFinishRequest getStepFinishRequest(BitList tasks, int count);
-	
-	/**
-	 * @param tasks
-	 * @param count
-	 * @return
-	 */
-	public IPDIStepIntoRequest getStepIntoRequest(BitList tasks, int count);
-	
-	/**
-	 * @param tasks
-	 * @param count
-	 * @return
-	 */
-	public IPDIStepOverRequest getStepOverRequest(BitList tasks, int count);
-	
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIStopDebuggerRequest getStopDebuggerRequest(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIHaltRequest getSuspendRequest(BitList tasks);
-
-	/**
-	 * @param tasks
-	 * @param sendEvent
-	 * @return
-	 */
-	public IPDIHaltRequest getSuspendRequest(BitList tasks, boolean sendEvent);
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDITerminateRequest getTerminateRequest(BitList tasks);
-	
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRestartRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRestartRequest.java
deleted file mode 100644
index 14040a5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIRestartRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request restarting
- * @author clement
- *
- */
-public interface IPDIRestartRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetAddressBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetAddressBreakpointRequest.java
deleted file mode 100644
index ed36281..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetAddressBreakpointRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request setting a function breakpoint
- * @author clement
- *
- */
-public interface IPDISetAddressBreakpointRequest extends IPDIBreakpointRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetCurrentStackFrameRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetCurrentStackFrameRequest.java
deleted file mode 100644
index b4ef703..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetCurrentStackFrameRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request setting current frame
- * @author clement
- *
- */
-public interface IPDISetCurrentStackFrameRequest extends IPDIInternalEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetFunctionBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetFunctionBreakpointRequest.java
deleted file mode 100644
index d0de3ef..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetFunctionBreakpointRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request setting a function breakpoint
- * @author clement
- *
- */
-public interface IPDISetFunctionBreakpointRequest extends IPDIBreakpointRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetLineBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetLineBreakpointRequest.java
deleted file mode 100644
index 835f9ac..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetLineBreakpointRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request setting a line breakpoint
- * @author clement
- *
- */
-public interface IPDISetLineBreakpointRequest extends IPDIBreakpointRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetThreadSelectRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetThreadSelectRequest.java
deleted file mode 100644
index 4bc04ea..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetThreadSelectRequest.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrameDescriptor;
-
-/**
- * Represents to request setting thread select
- * @author clement
- *
- */
-public interface IPDISetThreadSelectRequest extends IPDIEventRequest {
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIStackFrameDescriptor getStackFrame(BitList qTasks) throws PDIException;
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public int getThreadId(BitList qTasks) throws PDIException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetWatchpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetWatchpointRequest.java
deleted file mode 100644
index 4741d97..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDISetWatchpointRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request setting a watchpoint
- * @author clement
- *
- */
-public interface IPDISetWatchpointRequest extends IPDIBreakpointRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStartDebuggerRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStartDebuggerRequest.java
deleted file mode 100644
index fceaa07..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStartDebuggerRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request starting debugger
- * @author clement
- *
- */
-public interface IPDIStartDebuggerRequest extends IPDIInternalEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepFinishRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepFinishRequest.java
deleted file mode 100644
index 3ee0ace..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepFinishRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request stepping finish
- * @author clement
- *
- */
-public interface IPDIStepFinishRequest extends IPDIStepRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoInstructionRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoInstructionRequest.java
deleted file mode 100644
index 5e156b9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoInstructionRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request stepping into
- * @author clement
- *
- */
-public interface IPDIStepIntoInstructionRequest extends IPDIStepRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoRequest.java
deleted file mode 100644
index cdce94a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepIntoRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request stepping into
- * @author clement
- *
- */
-public interface IPDIStepIntoRequest extends IPDIStepRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverInstructionRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverInstructionRequest.java
deleted file mode 100644
index 319def7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverInstructionRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request stepping into
- * @author clement
- *
- */
-public interface IPDIStepOverInstructionRequest extends IPDIStepRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverRequest.java
deleted file mode 100644
index 38f74ab..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepOverRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request stepping over
- * @author clement
- *
- */
-public interface IPDIStepOverRequest extends IPDIStepRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepRequest.java
deleted file mode 100644
index 66392b5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStepRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request stepping
- * @author clement
- *
- */
-public interface IPDIStepRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStopDebuggerRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStopDebuggerRequest.java
deleted file mode 100644
index d119a01..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDIStopDebuggerRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request stopping debugger
- * @author clement
- *
- */
-public interface IPDIStopDebuggerRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDITerminateRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDITerminateRequest.java
deleted file mode 100644
index f840331..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/core/pdi/request/IPDITerminateRequest.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.pdi.request;
-
-/**
- * Represents to request terminating
- * @author clement
- *
- */
-public interface IPDITerminateRequest extends IPDIEventRequest {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/AddressLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/AddressLocation.java
deleted file mode 100644
index 7d6cb50..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/AddressLocation.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDIAddressLocation;
-
-/**
- * @author clement
- *
- */
-public class AddressLocation extends Location implements IPDIAddressLocation {
-	public AddressLocation(BigInteger addr) {
-		super(addr);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FileLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FileLocation.java
deleted file mode 100644
index eaaabf4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FileLocation.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi;
-
-import org.eclipse.ptp.debug.core.pdi.IPDIFileLocation;
-
-
-/**
- * @author clement
- *
- */
-public class FileLocation extends Location implements IPDIFileLocation {
-	public FileLocation(String file) {
-		super(file);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FunctionLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FunctionLocation.java
deleted file mode 100644
index ff3c867..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/FunctionLocation.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi;
-
-import org.eclipse.ptp.debug.core.pdi.IPDIFunctionLocation;
-
-
-/**
- * @author clement
- *
- */
-public class FunctionLocation extends Location implements IPDIFunctionLocation {
-	public FunctionLocation(String file, String function) {
-		super(file, function);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/LineLocation.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/LineLocation.java
deleted file mode 100644
index 9c1c9bc..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/LineLocation.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILineLocation;
-
-
-/**
- * @author clement
- *
- */
-public class LineLocation extends Location implements IPDILineLocation {
-	public LineLocation(String file, int line) {
-		super(file, line);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Location.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Location.java
deleted file mode 100644
index 9715232..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Location.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDIAddressLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDIFileLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDIFunctionLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILineLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-
-/**
- * @author clement
- *
- */
-public class Location implements IPDILocation {
-	private BigInteger addr = null;
-	private String file = null;
-	private String function = null;
-	private int line = 0;
-	
-	public Location(String file) {
-		this(file, null, 0, null);
-	}
-	public Location(String file, String function) {
-		this(file, function, 0, null);
-	}
-	public Location(String file, int line) {
-		this(file, null, line, null);
-	}
-	public Location(BigInteger addr) {
-		this(null, null, 0, addr);
-	}
-	public Location(String file, String function, int line, BigInteger addr) {
-		this.file = file;
-		this.function = function;
-		this.line = line;
-		this.addr = addr;
-	}
-	public BigInteger getAddress() {
-		return addr;
-	}
-	public String getFile() {
-		return file;
-	}
-	public String getFunction() {
-		return function;
-	}
-	public int getLineNumber() {
-		return line;
-	}
-	public boolean equals(IPDILocation location) {
-		if (location == this) {
-			return true;
-		}
-		if (location instanceof IPDILineLocation) {
-			IPDILineLocation lineLocation = (IPDILineLocation)location;
-			String oFile = lineLocation.getFile();
-			if (oFile != null && oFile.length() > 0 && file != null && file.length() > 0 && oFile.equals(file)) {
-				if (lineLocation.getLineNumber() == line) {
-					return true;
-				}
-			} else if ((file == null || file.length() == 0) && (oFile == null || oFile.length() == 0)) {
-				if (lineLocation.getLineNumber() == line) {
-					return true;
-				}
-			}
-		} else if (location instanceof IPDIFunctionLocation) {
-			IPDIFunctionLocation funcLocation = (IPDIFunctionLocation)location;
-			String oFile = funcLocation.getFile();
-			String oFunction = funcLocation.getFunction();
-			if (oFile != null && oFile.length() > 0 && file != null && file.length() > 0 && oFile.equals(file)) {
-				if (oFunction != null && oFunction.length() > 0 && function != null && function.length() > 0 && oFunction.equals(function)) {
-					return true;
-				} else if ((oFunction == null || oFunction.length() == 0) && (function == null || function.length() == 0)) {
-					return true;
-				}
-			} else if ((file == null || file.length() == 0) && (oFile == null || oFile.length() == 0)) {
-				if (oFunction != null && oFunction.length() > 0 && function != null && function.length() > 0 && oFunction.equals(function)) {
-					return true;
-				} else if ((oFunction == null || oFunction.length() == 0) && (function == null || function.length() == 0)) {
-					return true;
-				}
-			}
-		} else if (location instanceof IPDIAddressLocation) {
-			IPDIAddressLocation addrLocation = (IPDIAddressLocation)location;
-			BigInteger oAddr = addrLocation.getAddress();
-			if (oAddr != null && oAddr.equals(addr)) {
-				return true;
-			} else if (oAddr == null && addr == null) {
-				return true;
-			}
-		} else if (location instanceof IPDIFileLocation) {
-			IPDIFileLocation fileLocation = (IPDIFileLocation)location;
-			String oFile = fileLocation.getFile();
-			if (oFile != null && oFile.length() > 0 && file != null && file.length() > 0 && oFile.equals(file)) {
-				return true;
-			} else if ((file == null || file.length() == 0) && (oFile == null || oFile.length() == 0)) {
-				return true;
-			}			
-		}
-		return false;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Locator.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Locator.java
deleted file mode 100644
index ac77fe0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/Locator.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-
-/**
- * @author clement
- * 
- */
-public class Locator extends Location implements IPDILocator {
-	public Locator(String file, String function, int line, BigInteger address) {
-		super(file, function, line, address);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDILocator#equalAddress(java.math.BigInteger)
-	 */
-	public boolean equalAddress(BigInteger oAddress) {
-		if (oAddress == null && getAddress() == null) {
-			return true;
-		}
-		if (oAddress != null && oAddress.equals(getAddress())) {
-			return true;
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDILocator#equalFile(java.lang.String)
-	 */
-	public boolean equalFile(String oFile) {
-		return equalString(oFile, getFile());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDILocator#equalFunction(java.lang.String)
-	 */
-	public boolean equalFunction(String oFunction) {
-		return equalString(oFunction, getFunction());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDILocator#equalLine(int)
-	 */
-	public boolean equalLine(int oLine) {
-		return oLine == getLineNumber();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDILocator#equals(org.eclipse.ptp.debug.core.pdi.IPDILocator)
-	 */
-	public boolean equals(IPDILocator locator) {
-		if (locator == this) {
-			return true;
-		}
-		String oFile = locator.getFile();
-		String oFunction = locator.getFunction();
-		int oLine = locator.getLineNumber();
-		BigInteger oAddress = locator.getAddress();
-
-		if (equalFile(oFile) && equalFunction(oFunction) && equalLine(oLine) && equalAddress(oAddress)) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param f1
-	 * @param f2
-	 * @return
-	 */
-	private boolean equalString(String f1, String f2) {
-		if (f1 != null && f1.length() > 0 && f2 != null && f2.length() > 0) {
-			return f1.equals(f2);
-		} else if ((f1 == null || f1.length() == 0) && (f2 == null || f2.length() == 0)) {
-			return true;
-		}
-		return false;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIF.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIF.java
deleted file mode 100644
index 11f9d18..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIF.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-
-public class AIF implements IAIF {
-	private IAIFType aifType;
-	private IAIFValue aifValue;
-	private String typeDesc = "";
-
-	public AIF(IAIFType aifType, IAIFValue aifValue) {
-		this.aifType = aifType;
-		this.aifValue = aifValue;
-	}
-	
-	public AIF(String fds, byte[] data) {
-		aifType = AIFFactory.getAIFType(fds);
-		aifValue = AIFFactory.getAIFValue(null, aifType, data);
-	}
-	
-	public AIF(String fds, byte[] data, String desc) {
-		this(fds, data);
-		typeDesc = desc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.aif.IAIF#getDescription()
-	 */
-	public String getDescription() {
-		return this.typeDesc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.aif.IAIF#getType()
-	 */
-	public IAIFType getType() {
-		return aifType;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.aif.IAIF#getValue()
-	 */
-	public IAIFValue getValue() {
-		return aifValue;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		try {
-			return "<" + aifType.toString() + "," + aifValue.toString() + ">";
-		} catch (Exception e) {
-			return "err: " + e.getMessage();
-		}
-	}
-	
-	/**
-	 * Set the AIF type
-	 * @param t
-	 */
-	protected void setType(IAIFType t) {
-		aifType = t;
-	}
-	
-	/**
-	 * Set the AIF value
-	 * @param v
-	 */
-	protected void setValue(IAIFValue v) {
-		aifValue = v;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFType.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFType.java
deleted file mode 100644
index 4e897a9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFType.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-
-
-public abstract class AIFType implements IAIFType {}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeAddress.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeAddress.java
deleted file mode 100644
index fbe9393..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeAddress.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeAddress;
-
-public class AIFTypeAddress extends AIFType implements IAIFTypeAddress {
-	int size = 0;
-	//char*: a4
-	public AIFTypeAddress(int size) {
-		this.size = size;
-	}
-	public String toString() {
-		return String.valueOf(AIFFactory.FDS_ADDRESS) + size;
-	}
-	public int sizeof() {
-		return size;
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeArray.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeArray.java
deleted file mode 100644
index 95bbb3f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeArray.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-
-public class AIFTypeArray extends TypeDerived implements IAIFTypeArray {
-	private int size = 1;
-	private int low = 0;
-	private int high = 0;
-	private int dimension = 0;
-
-	//char[]: [r0..3is4]c
-	//2D[3][2]: [r0..1is4][r0..2is4]is4
-	//2D[2][3]: [r0..2is4][r0..1is4]is4
-	//int[]: [r0..9is4]is4
-	//char[]: [r0..4is4]c
-	//separate into two parts:  1-[r0..1is4], 2-[r0..2is4]is4
-	public AIFTypeArray(String format, IAIFType basetype) {
-		super(basetype);
-		parse(format);
-	}
-	private void parse(String fmt) {
-		int low_pos = AIFFactory.getDigitPos(fmt, 1);
-		low = Integer.parseInt(fmt.substring(1, low_pos));
-		int up_pos = AIFFactory.getDigitPos(fmt, low_pos+2);
-		high = Integer.parseInt(fmt.substring(low_pos+2, up_pos));
-		size = size * (high-low+1) * basetype.sizeof();
-	}
-	public int getLow() {
-		return low;
-	}
-	public int getHigh() {
-		return high;
-	}
-	public int getRange() {
-		return (high-low) + 1;
-	}
-	public IAIFType getFoundationType() {
-		if (basetype instanceof IAIFTypeArray) {
-			return ((IAIFTypeArray)basetype).getFoundationType();
-		}
-		return basetype;
-	}
-	public int[] getDimensionDetails() {
-		int[] dims = new int[getDimension()];
-		for (int i=0; i<dims.length; i++) {
-			dims[i] = getAIFTypeArray(i).getRange();
-		}
-		return dims;
-	}
-	public int getDimension() {
-		if (dimension == 0) {
-			dimension = 1;
-			if (basetype instanceof IAIFTypeArray) {
-				dimension += ((IAIFTypeArray)basetype).getDimension();
-			}
-		}
-		return dimension;
-	}
-	public boolean isDimensionArray() {
-		return (basetype instanceof IAIFTypeArray);
-	}
-	public IAIFTypeArray getAIFTypeArray(int dim_pos) {
-		if (dim_pos == 0)
-			return this;
-
-		if (dim_pos < 0 || dim_pos > getDimension()-1)
-			return null;
-
-		return ((IAIFTypeArray)basetype).getAIFTypeArray(dim_pos-1);
-	}
-	public int sizeof() {
-		return size;
-	}
-	public String toString(int range) {
-		return getAIFTypeArray(range).toString();
-	}
-	public String toString() {
-		return "[r" + low + ".." + high + "U]" + basetype.toString();
-	}
-	public static void main(String[] args) {
-		String fmt = "[r0..2is4][r0..5is4][r0..5is4][r0..5is4][r0..5is4]is4";
-		IAIFType type = AIFFactory.getAIFType(fmt);
-		if (type instanceof IAIFTypeArray) {
-			System.err.println("dim: " + ((IAIFTypeArray)type).getDimension());
-			System.err.println("base: " + ((IAIFTypeArray)type).getBaseType());
-			System.err.println("foundation: " + ((IAIFTypeArray)type).getFoundationType());
-		}
-		System.err.println("size: " + type.sizeof());
-		System.err.println("1st: " + ((IAIFTypeArray)type).getAIFTypeArray(0));
-	}
-	
-	/*
-	public IAIFTypeRange[] getRanges() {
-		return (IAIFTypeRange[])ranges.toArray(new IAIFTypeRange[0]);
-	}
-	public IAIFTypeRange getRange(int index) {
-		return (IAIFTypeRange)ranges.get(index);
-	}
-	public int getLower(int index) {
-		return getRange(index).getLower();
-	}
-	public int getUpper(int index) {
-		return getRange(index).getUpper();
-	}
-	public IAIFType getInternalType(int index) {
-		return getRange(index).getInternalType();
-	}	
-	private void parse(String fmt) {
-		while (fmt.length() > 0) {
-			fmt = parseRange(fmt);
-		}
-		size = size * basetype.sizeof();
-	}
-	protected String parseRange(String fmt) {
-		int pos = fmt.indexOf(AIFFactory.SIGN_CLOSE);
-		ranges.add(getRange(fmt.substring(1, pos)));
-		return fmt.substring(pos+1);
-	}
-	//range: rL..UT
-	protected IAIFTypeRange getRange(String fmt) {
-		int low_pos = AIFFactory.getDigitPos(fmt, 1);
-		int lower = Integer.parseInt(fmt.substring(1, low_pos));
-		int up_pos = AIFFactory.getDigitPos(fmt, low_pos+2);
-		int upper = Integer.parseInt(fmt.substring(low_pos+2, up_pos));
-		size = size * (upper-lower+1);
-		//AIFFactory.getAIFType(fmt.substring(up_pos))
-		return new AIFTypeRange(lower, upper, null);
-	}
-	public String toString(int dimension) {
-		IAIFTypeRange range = (IAIFTypeRange)ranges.get(dimension);
-		//range.getInternalType().toString()
-		return "[r" + range.getLower() + ".." + range.getUpper() + "U" +  "]";		
-	}
-	public String toString() {
-		String content = "";
-		for (int i=0; i<ranges.size(); i++) {
-			content += toString(i);
-		}
-		content += getBaseType().toString();
-		return content;
-	}
-	
-	class AIFTypeRange implements IAIFTypeRange {
-		int lower;
-		int upper;
-		//TODO -- not important for that
-		IAIFType interalType;
-		
-		AIFTypeRange(int lower, int upper, IAIFType interalType) {
-			this.lower = lower;
-			this.upper = upper;
-			this.interalType = interalType;
-		}
-		public int getLower() {
-			return lower;
-		}
-		public int getUpper() {
-			return upper;
-		}
-		public IAIFType getInternalType() {
-			return interalType;
-		}
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeBool.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeBool.java
deleted file mode 100644
index 7162a2c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeBool.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeBool;
-
-public class AIFTypeBool extends TypeIntegral implements IAIFTypeBool {
-	//b
-	public AIFTypeBool() {
-		this(true);
-	}
-	public AIFTypeBool(boolean signed) {
-		super(signed);
-	}
-	public int sizeof() {
-		return AIFFactory.SIZE_BOOL;
-	}
-	public String toString() {
-		return "b" + sizeof();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeChar.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeChar.java
deleted file mode 100644
index 90012e1..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeChar.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeChar;
-
-public class AIFTypeChar extends TypeIntegral implements IAIFTypeChar {
-	//c
-	public AIFTypeChar() {
-		this(true);
-	}
-	public AIFTypeChar(boolean signed) {
-		super(signed);
-	}
-	public int sizeof() {
-		return AIFFactory.SIZE_CHAR;
-	}	
-	public String toString() {
-		return "c" + sizeof();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeCharPointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeCharPointer.java
deleted file mode 100644
index 525bd59..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeCharPointer.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeAddress;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeCharPointer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFTypeCharPointer extends AIFTypeString implements IAIFTypeCharPointer {
-	private IAIFType addr;
-	//char*: pa4
-	int size = AIFFactory.SIZE_INVALID;
-	
-	public AIFTypeCharPointer(IAIFType addr) {
-		this.addr = addr;
-	}
-	public int sizeof() {
-		return getAddressType().sizeof() + size;
-	}
-	public IAIFTypeAddress getAddressType() {
-		return (IAIFTypeAddress)addr;
-	}
-	public String toString() {
-		return AIFFactory.FDS_CHAR_POINTER + addr.toString();
-	}		
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeClass.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeClass.java
deleted file mode 100644
index 80b4ee6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeClass.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeClass;
-
-public class AIFTypeClass extends TypeAggregate implements IAIFTypeClass {
-	//{ID|N1=F1,...; N2=F2,...; N3=F3,...; N4=F4,...}
-	public AIFTypeClass(String format) {
-		super(format);
-	}
-	public String toString() {
-		return AIFFactory.FDS_STRUCT_CLASS + super.toString() + AIFFactory.FDS_CLASS_END;
-	}
-	
-	/*
-	private int 				id = -1;
-	private AIFTypeField[]	publicFields;
-	private AIFTypeField[]	protectedFields;
-	private AIFTypeField[]	privateFields;
-	private AIFTypeField[]	hiddenFields;
-	
-	public AIFTypeClass(AIFTypeField[] pub, AIFTypeField[] prot, AIFTypeField[] priv, AIFTypeField[] hid) {
-		this.publicFields = pub;
-		this.protectedFields = prot;
-		this.privateFields = priv;
-		this.hiddenFields = hid;
-	}
-
-	public AIFTypeClass(int id, AIFTypeField[] pub, AIFTypeField[] prot, AIFTypeField[] priv, AIFTypeField[] hid) {
-		this(pub, prot, priv, hid);
-		this.id = id;
-	}
-
-	public int getId() {
-		return this.id;
-	}
-
-	public String toString() {
-		String res = "{";
-		
-		if (this.id >= 0)
-			res += Integer.toString(this.id) + "|";
-		
-		for (int i = 0; i < this.publicFields.length; i++) {
-			if (i > 0)
-				res += ",";
-			res += this.publicFields[i].toString();
-		}
-		
-		res += ";";
-		
-		for (int i = 0; i < this.protectedFields.length; i++) {
-			if (i > 0)
-				res += ",";
-			res += this.protectedFields[i].toString();
-		}
-		
-		res += ";";
-		
-		for (int i = 0; i < this.privateFields.length; i++) {
-			if (i > 0)
-				res += ",";
-			res += this.privateFields[i].toString();
-		}
-		
-		res += ";";
-		
-		for (int i = 0; i < this.hiddenFields.length; i++) {
-			if (i > 0)
-				res += ",";
-			res += this.hiddenFields[i].toString();
-		}
-		
-		return res + "}";
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeEnum.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeEnum.java
deleted file mode 100644
index 8cc82d6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeEnum.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeEnum;
-
-public class AIFTypeEnum extends TypeIntegral implements IAIFTypeEnum {
-	private List<String> fields = new ArrayList<String>();
-	private List<String> values = new ArrayList<String>();
-	private IAIFType basetype;
-	private String name;
-	
-	//<ID|S1=V1,S2=V2>is4
-	public AIFTypeEnum(String format, IAIFType basetype) {
-		this(format, true, basetype);
-	}
-	public AIFTypeEnum(String format, boolean signed, IAIFType basetype) {
-		super(signed);
-		this.basetype = basetype;
-		parse(format);
-	}
-	public IAIFType getBaseType() {
-		return basetype;
-	}
-	public int sizeof() {
-		return getNumberOfChildren() * basetype.sizeof();
-	}
-	
-	protected void parse(String fmt) {
-		fmt = parseName(fmt);
-		if (fmt.length() > 0) {
-			String[] pairs = fmt.split(AIFFactory.SIGN_COMMA);
-			for (int i=0; i<pairs.length; i++) {
-				String[] results = pairs[i].split(AIFFactory.SIGN_EQUAL);
-				fields.add(results[0]);
-				values.add(results[1]);
-			}
-		}
-	}
-	protected String parseName(String fmt) {
-		int pos = fmt.indexOf(AIFFactory.SIGN_STROKE);
-		name = fmt.substring(0, pos);
-		int last_pos = fmt.lastIndexOf(AIFFactory.FDS_ENUM_END);
-		if (last_pos == -1)
-			return "";
-		
-		return fmt.substring(pos+1, last_pos);
-	}
-	
-	public String getName() {
-		return name;
-	}
-	public String[] getFields() {
-		return (String[])fields.toArray(new String[0]);
-	}
-	public String[] getTypes() {
-		return (String[])values.toArray(new String[0]);
-	}
-	public String getField(int index) {
-		return (String)fields.get(index);
-	}
-	public String getValue(int index) {
-		return (String)values.get(index);
-	}
-	public int getNumberOfChildren() {
-		return fields.size();
-	}
-	
-	public String toString() {
-		String content = "<" + getName() + AIFFactory.SIGN_STROKE;
-		for (int i=0; i<fields.size(); i++) {
-			content += (String)fields.get(i) + "=" + (String)values.get(i);
-			if (i < fields.size()-1) {
-				content += ",";
-			}
-		}
-		return content + ">" + super.toString();		
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeField.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeField.java
deleted file mode 100644
index 4ab852c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeField.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-
-/**
- * @deprecated temporary
- */
-public class AIFTypeField {
-	/*
-	private String 	fieldName;
-	private IAIFType	fieldType;
-	
-	public AIFTypeField(String name, IAIFType type) {
-		this.fieldName = name;
-		this.fieldType = type;
-	}
-	
-	public String toString() {
-		return this.fieldName + "=" + this.fieldType.toString();
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFloat.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFloat.java
deleted file mode 100644
index d6bd1d2..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFloat.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFloat;
-
-
-public class AIFTypeFloat extends AIFType implements IAIFTypeFloat {
-	int size;
-	boolean complex;
-	boolean imaginary;
-	boolean islong;
-	
-	public AIFTypeFloat(int size) {
-		this(size, false, false, false);
-	}
-	public AIFTypeFloat(int size, boolean complex, boolean imaginary, boolean islong) {
-		this.size = size;
-		this.complex = complex;
-		this.imaginary = imaginary;
-		this.islong = islong;
-	}
-	public boolean isComplex() {
-		return complex;
-	}
-	public boolean isImaginary() {
-		return imaginary;
-	}
-	public boolean isLong() {
-		return islong;
-	}
-	public int sizeof() {
-		return size;
-	}
-	public String toString() {
-		return "f" + sizeof();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFunction.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFunction.java
deleted file mode 100644
index fb61d6b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeFunction.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFunction;
-
-public class AIFTypeFunction extends TypeDerived implements IAIFTypeFunction {
-	private String[] args = new String[0];
-	
-	//&A1,A2,.../T	
-	public AIFTypeFunction(String format, IAIFType basetype) {
-		super(basetype);
-		parse(format);
-	}
-	private void parse(String fmt) {
-		args = fmt.split(AIFFactory.SIGN_COMMA);
-	}
-	public String toString() {
-		String content = "&";
-		for (int i = 0; i<args.length; i++) {
-			content += args[i];
-			if (i < args.length - 1)
-				content += ",";
-		}
-		return content + "/" + super.toString();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeIncomplete.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeIncomplete.java
deleted file mode 100644
index 9ac8840..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeIncomplete.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-
-public class AIFTypeIncomplete extends AIFType {
-	public int sizeof() {
-		return AIFFactory.SIZE_INVALID;
-	}
-	public String toString() {
-		return "<incomplete type>";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeInt.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeInt.java
deleted file mode 100644
index f30b4e4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeInt.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeInt;
-
-
-public class AIFTypeInt extends TypeIntegral implements IAIFTypeInt {
-	private int size;
-	//is?
-	public AIFTypeInt(int size) {
-		this(true, size);
-	}
-	public AIFTypeInt(boolean signed, int size) {
-		super(signed);
-		this.size = size;
-	}
-	public int sizeof() {
-		return size;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeNamed.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeNamed.java
deleted file mode 100644
index 7524a6a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeNamed.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeNamed;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeAggregate;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFTypeNamed extends TypeDerived implements IAIFTypeNamed {
-	private String name = null;
-	
-	//%0/{s|a=is4,b=^>0/;;;}
-	public AIFTypeNamed(String name, IAIFType basetype) {
-		super(basetype);
-		this.name = name;
-	}
-	public String getName() {
-		return name;
-	}
-	
-	public String toString() {
-		return AIFFactory.FDS_NAMED + getName() + AIFFactory.FDS_NAMED_END + getBaseType().toString();
-	}
-	
-	public String getField(int index) {
-		if (basetype instanceof ITypeAggregate) {
-			return ((ITypeAggregate)basetype).getField(index);
-		}
-		return null;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypePointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypePointer.java
deleted file mode 100644
index 823cff7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypePointer.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeAddress;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-
-public class AIFTypePointer extends TypeDerived implements IAIFTypePointer {
-	private IAIFType addr;
-	//char*: ^a4c
-	//^%1/{s1 *|a=is4,b=^>1/,c=^>1/;;;}
-	//^%1/{s1 *|a=f8,b=^%2/{s *|a=f8,b=^>2/;;;},c=^>1/;;;}
-	public AIFTypePointer(IAIFType addr, IAIFType basetype) {
-		super(basetype);
-		this.addr = addr;
-	}
-	public String toString() {
-		return AIFFactory.FDS_POINTER + addr.toString() + super.toString();
-	}
-	public int sizeof() {
-		return super.sizeof() + getAddressType().sizeof() + 1;
-	}
-	public IAIFTypeAddress getAddressType() {
-		return (IAIFTypeAddress)addr;
-	}
-	
-	public static void main(String[] args) {
-		//IAIFType testType = AIFFactory.getAIFType("^%1/{s1 *|a=is4,b=^>1/,c=^>1/;;;}");
-		IAIFType testType = AIFFactory.getAIFType("^a4^a4");
-		System.out.println("----: " + ((IAIFTypePointer)testType).getBaseType());
-		System.out.println("----: " + testType);
-		System.out.println("----: " + testType.sizeof());
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeReference.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeReference.java
deleted file mode 100644
index 4a62ec2..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeReference.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeReference;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFTypeReference extends AIFType implements IAIFTypeReference {
-	private String name;
-	//>name/
-	public AIFTypeReference(String name) {
-		this.name = name;
-	}
-	public char type() {
-		return AIFFactory.FDS_REFERENCE;
-	}
-	public String getName() {
-		return name;
-	}
-	public int sizeof() {
-		return AIFFactory.NO_SIZE;
-	}	
-	public String toString() {
-		return AIFFactory.FDS_REFERENCE + getName() + AIFFactory.FDS_REFERENCE_END;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeString.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeString.java
deleted file mode 100644
index ec8da25..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeString.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeString;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFTypeString extends AIFType implements IAIFTypeString {
-	int size = AIFFactory.SIZE_INVALID;
-	
-	public int sizeof() {
-		return size;
-	}
-	public void setSizeof(int size) {
-		this.size = size;
-	}
-	public String toString() {
-		return String.valueOf(AIFFactory.FDS_STRING);
-	}		
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeStruct.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeStruct.java
deleted file mode 100644
index 98c0ed4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeStruct.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeStruct;
-
-public class AIFTypeStruct extends TypeAggregate implements IAIFTypeStruct {	
-	//only base type: {structName|floatnumber=f4,intnumber=is4,shortnumber=is2,longnumber=is4,doubleumber=f8;;;}
-	//complex type: {structName|floatnumber=f4,intnumber=is4,tStr22={testStruct|aFloat=f4,intNum=is4;;;},shortnumber=is2;;;}
-	public AIFTypeStruct(String format) {
-		super(format);
-	}
-	public String toString() {
-		return AIFFactory.FDS_STRUCT_CLASS + super.toString() + AIFFactory.FDS_STRUCT_END;
-	}
-	public static void main(String[] args) {
-		IAIFType testType = AIFFactory.getAIFType("{structName|floatnumber=f4,intnumber=is4,tStr22={testStruct|aFloat=f4,intNum=is4;;;},shortnumber=is2;;;}");
-		System.out.println("----: " + testType);
-		System.out.println("----: " + testType.sizeof());
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeUnion.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeUnion.java
deleted file mode 100644
index bbff808..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeUnion.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeUnion;
-
-public class AIFTypeUnion extends TypeAggregate implements IAIFTypeUnion {
-	//(ID|N1=F1,N2=F2)
-	public AIFTypeUnion(String format) {
-		super(format);
-	}
-	public String toString() {
-		return AIFFactory.FDS_UNION + super.toString() + AIFFactory.FDS_UNION_END;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeVoid.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeVoid.java
deleted file mode 100644
index 9e4aa31..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFTypeVoid.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeVoid;
-
-
-public class AIFTypeVoid extends AIFType implements IAIFTypeVoid {
-	private int size;
-	
-	public AIFTypeVoid(int size) {
-		this.size = size;
-	}
-	public int sizeof() {
-		return size;
-	}
-	public String toString() {
-		return "v" + sizeof();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValue.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValue.java
deleted file mode 100644
index c477c87..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValue.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class AIFValue implements IAIFValue {
-	protected IAIFType type = null;
-	protected String result = null;
-	protected int size;
-	
-	public AIFValue(IAIFType type) {
-		this.type = type;
-	}
-	public IAIFType getType() {
-		return type;
-	}
-	public int getChildrenNumber() throws AIFException {
-		return 0;
-	}
-	public boolean hasChildren() throws AIFException {
-		return (getChildrenNumber() > 0);
-	}
-	public String toString() {
-		try {
-			return getValueString();
-		} catch (AIFException e) {
-			return "err: " + e.getMessage();
-		}
-	}
-	
-	protected abstract void parse(SimpleByteBuffer buffer);
-	public int sizeof() {
-		return size;
-	}
-	/*
-	protected ByteBuffer byteBuffer(byte[] data) {
-		return byteBuffer(data, 0);
-	}
-	protected ByteBuffer byteBuffer(byte[] data, int offset) {
-		return ByteBuffer.wrap(data, offset, data.length);
-	}
-	protected byte[] createByteArray(byte[] data, int from, int size) {
-//System.out.println("---data len: " + data.length  + ", from: " + from + ", size: " + size);
-		byte[] newByte = new byte[size];
-		System.arraycopy(data, from, newByte, 0, size);
-		return newByte;
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueAddress.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueAddress.java
deleted file mode 100644
index 46d99c5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueAddress.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeAddress;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueAddress;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueAddress extends AIFValue implements IAIFValueAddress {
-	String addr = "";
-
-	public AIFValueAddress(IAIFTypeAddress type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		size = type.sizeof();
-		for (int i=0; i<size; i++) {
-			addr += Integer.toHexString(0x0100 + (buffer.get() & 0x00FF)).substring(1);
-		}
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = "0x" + addr;
-		}
-		return result;
-	}
-	public BigInteger getAddress() throws AIFException {
-		return ValueIntegral.bigIntegerValue(getValueString());
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueArray.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueArray.java
deleted file mode 100644
index f369ef9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueArray.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueArray;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueArray extends ValueDerived implements IAIFValueArray {
-	IAIFValue[] values = new IAIFValue[0];
-	SimpleByteBuffer buffer = null;
-	
-	public AIFValueArray(IAIFTypeArray type, SimpleByteBuffer buffer) {
-		super(type);
-		this.buffer = buffer;
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		IAIFTypeArray arrType = (IAIFTypeArray)type;
-		IAIFType baseType = arrType.getBaseType();
-		this.values = new IAIFValue[arrType.getRange()];
-		for (int i=0; i<values.length; i++) {
-			values[i] = AIFFactory.getAIFValue(this, baseType, buffer);
-			size += values[i].sizeof();
-		}
-	}
-	public IAIFValue[] getValues() {
-		if (values.length == 0 && buffer != null) {
-			parse(buffer);
-			buffer = null;
-		}
-		return values;
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = getString();
-		}
-		return result;
-	}
-	private String getString() throws AIFException {
-		String content = "[";
-		IAIFValue[] aifValues = getValues();
-		for (int i=0; i<aifValues.length; i++) {
-			content += aifValues[i].getValueString();
-			if (i < aifValues.length - 1) {
-				content += ",";
-			}
-		}
-		content += "]";
-		return content;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueBool.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueBool.java
deleted file mode 100644
index d9c5181..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueBool.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeBool;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueBool;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueBool extends ValueIntegral implements IAIFValueBool {
-	boolean boolValue;
-	
-	public AIFValueBool(IAIFTypeBool type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		boolValue = (buffer.get()>0);
-		size = type.sizeof();
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = String.valueOf(booleanValue());
-		}
-		return result;
-	}
-	public boolean booleanValue() throws AIFException {
-		return boolValue;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueChar.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueChar.java
deleted file mode 100644
index dfbfd31..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueChar.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeChar;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueChar;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-public class AIFValueChar extends ValueIntegral implements IAIFValueChar {
-	byte byteValue;
-
-	public AIFValueChar(IAIFTypeChar type, SimpleByteBuffer buffer) {
-		super(type);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		byteValue = buffer.get();
-		size = type.sizeof();
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = String.valueOf(charValue());
-		}
-		return result;
-	}
-	public char charValue() throws AIFException {
-		return (char)byteValue();
-	}
-	public byte byteValue() throws AIFException {
-		return byteValue;
-	}	
-	public String toString() {
-		try {
-			char charValue = charValue();
-			return ((Character.isISOControl(charValue) && charValue != '\b' && charValue != '\t' && charValue != '\n' && charValue != '\f' && charValue != '\r') || charValue < 0) ? "" : String.valueOf(charValue);		
-		} catch (AIFException e) {
-			return "err: " + e.getMessage();
-		}
-	}
-	/*
-	public String toString() {
-		String ch = ""+(char)val+"";
-		
-		switch (this.val) {
-		case 7:
-			ch = "\\a";
-			break;
-		case 8:
-			ch = "\\b";
-			break;
-		case 9:
-			ch = "\\t";
-			break;
-		case 10:
-			ch = "\n";
-			break;
-		case 11:
-			ch = "\\v";
-			break;
-		case 13:
-			ch = "\\r";
-			break;
-		case 27:
-			ch = "\\e";
-			break;
-		case 39:
-			ch = "\\'";
-			break;
-		case 92:
-			ch = "\\\\";
-			break;
-		default:
-			if (this.val < 32 || this.val >= 127) {
-				ch = "\\" + Integer.toOctalString(val & 0xff);
-			}
-		}
-		return Byte.toString(val) + " '" + ch + "'";
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueCharPointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueCharPointer.java
deleted file mode 100644
index c81c9cb..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueCharPointer.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeCharPointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueCharPointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueCharPointer extends AIFValueString implements IAIFValueCharPointer {	
-	IAIFValue addrValue;
-
-	public AIFValueCharPointer(IAIFTypeCharPointer type, SimpleByteBuffer buffer) {
-		super(type, buffer);
-		((AIFTypeCharPointer)type).size = size;
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		addrValue = AIFFactory.getAIFValue(null, ((IAIFTypeCharPointer)type).getAddressType(), buffer);
-		super.parse(buffer);
-		size += addrValue.sizeof();
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = "";
-		}
-		return result;
-	}
-	public BigInteger pointerValue() throws AIFException {
-		return ValueIntegral.bigIntegerValue(addrValue.getValueString());
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueClass.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueClass.java
deleted file mode 100644
index b68d88b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueClass.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeClass;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueClass;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueClass extends ValueAggregate implements IAIFValueClass {
-	public AIFValueClass(IValueParent parent, IAIFTypeClass type, SimpleByteBuffer buffer) {
-		super(parent, type, buffer);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueEnum.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueEnum.java
deleted file mode 100644
index c362654..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueEnum.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeEnum;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueEnum;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueEnum extends ValueIntegral implements IAIFValueEnum {
-	IAIFValue value;
-	
-	public AIFValueEnum(IAIFTypeEnum type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		IAIFTypeEnum pType = (IAIFTypeEnum)type;
-		value = AIFFactory.getAIFValue(null, pType.getBaseType(), buffer);
-		size = value.sizeof();
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = value.getValueString();
-		}
-		return result;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFloat.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFloat.java
deleted file mode 100644
index 74a7ff7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFloat.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFloat;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueFloat;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueFloat extends ValueParent implements IAIFValueFloat {
-	ByteBuffer byteBuffer;
-	
-	public AIFValueFloat(IAIFTypeFloat type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		byte[] dst = new byte[type.sizeof()]; 
-		for (int i=0; i<dst.length; i++) {
-			dst[i] = buffer.get();
-		}
-		byteBuffer = ByteBuffer.wrap(dst, 0, dst.length);
-		size = type.sizeof();
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = getString();
-		}
-		return result;
-	}
-	private String getString() throws AIFException {
-		if (isFloat()) {
-			return String.valueOf(floatValue());
-		} else if (isDouble()) {
-			return String.valueOf(doubleValue());
-		} else {
-			return new String(byteBuffer.array());
-		}
-	}
-	public float floatValue() throws AIFException {
-		try {
-			return byteBuffer.getFloat();
-		} catch (BufferUnderflowException e) {
-			return 0;
-		} finally {
-			byteBuffer.rewind();			
-		}
-	}
-	public double doubleValue() throws AIFException {
-		try {
-			return byteBuffer.getDouble();
-		} catch (BufferUnderflowException e) {
-			return 0;
-		} finally {
-			byteBuffer.rewind();			
-		}
-	}
-	
-	public boolean isDouble() {
-		return (type.sizeof() == 8);
-	}
-	public boolean isFloat() {
-		return (type.sizeof() == 4);
-	}
-	/*
-	public double doubleValue() throws PCDIException {
-		double result = 0;
-		String valueString = getValueString();
-		if (isNaN(valueString))
-			result = Double.NaN;
-		else if (isNegativeInfinity(valueString))
-			result = Double.NEGATIVE_INFINITY;
-		else if (isPositiveInfinity(valueString))
-			result = Double.POSITIVE_INFINITY;
-		else {		
-			try {
-				result = Double.parseDouble(valueString);
-			} catch (NumberFormatException e) {
-			}
-		}
-		return result;
-	}
-	public float floatValue() throws PCDIException {
-		float result = 0;
-		String valueString = getValueString();
-		if (isNaN(valueString))
-			result = Float.NaN;
-		else if (isNegativeInfinity(valueString))
-			result = Float.NEGATIVE_INFINITY;
-		else if (isPositiveInfinity(valueString))
-			result = Float.POSITIVE_INFINITY;
-		else {		
-			try {
-				result = Float.parseFloat(valueString);
-			} catch (NumberFormatException e) {
-			}
-		}
-		return result;
-	}
-	private boolean isPositiveInfinity(String valueString) {
-		return (valueString != null) ? valueString.indexOf("inf") != -1 : false;
-	}
-	private boolean isNegativeInfinity(String valueString) {
-		return (valueString != null) ? valueString.indexOf("-inf") != -1 : false;
-	}
-	private boolean isNaN(String valueString) {
-		return (valueString != null) ? valueString.indexOf("nan") != -1 : false;
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFunction.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFunction.java
deleted file mode 100644
index 4f1ea6b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueFunction.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFunction;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueFunction;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueFunction extends ValueDerived implements IAIFValueFunction {
-	public AIFValueFunction(IAIFTypeFunction type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		size = type.sizeof();
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = String.valueOf("");
-		}
-		return null;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueInt.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueInt.java
deleted file mode 100644
index 4f47235..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueInt.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeInt;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueInt;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-public class AIFValueInt extends ValueIntegral implements IAIFValueInt {
-	ByteBuffer byteBuffer;
-	
-	public AIFValueInt(IAIFTypeInt type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		byte[] dst = new byte[type.sizeof()]; 
-		for (int i=0; i<dst.length; i++) {
-			dst[i] = buffer.get();
-		}
-		byteBuffer = ByteBuffer.wrap(dst, 0, dst.length);
-		size = type.sizeof();
-	}
-
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = getString();
-		}
-		return result;
-	}
-	private String getString() throws AIFException {
-		if (isShort()) {
-			return String.valueOf(shortValue());
-		}
-		else if (isInt()) {
-			return String.valueOf(intValue());
-		}
-		else if (isLong()) {
-			return String.valueOf(longValue());
-		}
-		else {
-			return new String(byteValue());
-		}
-	}
-	public boolean isLong() {
-		return (size == 8);
-	}
-	public boolean isShort() {
-		return (size == 2);
-	}
-	public boolean isInt() {
-		return (size == 4);
-	}
-	public byte[] byteValue() throws AIFException {
-		return byteBuffer.array();
-	}
-	public long longValue() throws AIFException {
-		try {
-			return byteBuffer.getLong();
-		} catch (BufferUnderflowException e) {
-			return 0;
-		} finally {
-			byteBuffer.rewind();			
-		}
-	}
-	public short shortValue() throws AIFException {
-		try {
-			return byteBuffer.getShort();
-		} catch (BufferUnderflowException e) {
-			return 0;
-		} finally {
-			byteBuffer.rewind();			
-		}
-	}
-	public int intValue() throws AIFException {
-		try {
-			return byteBuffer.getInt();
-		} catch (BufferUnderflowException e) {
-			return 0;
-		} finally {
-			byteBuffer.rewind();			
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueNamed.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueNamed.java
deleted file mode 100644
index 37bed76..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueNamed.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeNamed;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueNamed;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueNamed extends ValueDerived implements IAIFValueNamed {
-	IAIFValue value;
-	String name;
-	
-	public AIFValueNamed(IValueParent parent, IAIFTypeNamed type, SimpleByteBuffer buffer) {
-		super(parent, type);
-		this.name = type.getName();
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		value = AIFFactory.getAIFValue(this, ((IAIFTypeNamed)type).getBaseType(), buffer);
-	}
-	public int getChildrenNumber() throws AIFException {
-		return value.getChildrenNumber();
-	}
-	
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = value.getValueString();
-		}
-		return result;
-	}	
-	public IAIFValue getValue() {
-		return value;
-	}
-	public String getName() {
-		return name;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValuePointer.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValuePointer.java
deleted file mode 100644
index 33b7d38..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValuePointer.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueNamed;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValuePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValuePointer extends ValueDerived implements IAIFValuePointer {
-	IAIFValue value;
-	IAIFValue addrValue;
-	
-	public AIFValuePointer(IValueParent parent, IAIFTypePointer type, SimpleByteBuffer buffer) {
-		super(parent, type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		int marker = buffer.get();
-		IAIFTypePointer pType = (IAIFTypePointer)type;
-
-		switch (marker) {
-		case 0:
-			value = AIFFactory.UNKNOWNVALUE;
-			break;
-		case 1:
-			addrValue = AIFFactory.getAIFValue(null, pType.getAddressType(), buffer);
-			value = AIFFactory.getAIFValue(getParent(), pType.getBaseType(), buffer);
-			break;
-		case 2:
-			break;
-		case 3:
-			break;
-		default:
-			value = AIFFactory.UNKNOWNVALUE;
-			break;
-		}
-		size = addrValue.sizeof() + value.sizeof();
-	}
-	/**
-	 * Get the children number of pointer.  Return 1 if the base type is primitive 
-	 * 
-	 */
-	public int getChildrenNumber() throws AIFException {
-		int children = value.getChildrenNumber();
-		if (children == 0) {
-			return 1;
-		}
-		return children;
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = addrValue.getValueString();
-		}
-		return result;
-	}
-	public BigInteger pointerValue() throws AIFException {
-		return ValueIntegral.bigIntegerValue(addrValue.getValueString());
-	}
-	public IAIFValue getValue() {
-		if (value instanceof IAIFValueNamed) {
-			return ((IAIFValueNamed)value).getValue();
-		}
-		return value;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueReference.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueReference.java
deleted file mode 100644
index 04249f0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueReference.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeReference;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueNamed;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueReference;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueReference extends ValueParent implements IAIFValueReference {
-	private String name = null;
-	
-	public AIFValueReference(IValueParent parent, IAIFTypeReference type, SimpleByteBuffer buffer) {
-		super(parent, type);
-		parse(buffer);
-		this.name = type.getName();
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		size = type.sizeof();
-	}
-	public String getName() {
-		return name;
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = (getParent()==null)?"unknown value":"ref: " + getName();
-		}
-		return result;
-	}
-	public IValueParent getParent() {
-		if (parent instanceof IAIFValueNamed) {
-			if (((IAIFValueNamed)parent).getName().equals(getName())) {
-				return parent.getParent();
-			}
-		}		
-		if (parent == null) {
-			return null;
-		}
-
-		parent = parent.getParent();
-		return getParent();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueString.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueString.java
deleted file mode 100644
index 750d6f5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueString.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeString;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueString;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueString extends AIFValue implements IAIFValueString {	
-	public AIFValueString(IAIFTypeString type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-		((AIFTypeString)type).size = size;
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		size = getSize(buffer);
-		byte[] bytes = new byte[size];
-		for (int i=0; i<size; i++) {
-			bytes[i] = buffer.get();
-		}
-		result = new String(bytes);
-	}
-	
-	public int getSize(SimpleByteBuffer buffer) {
-		String hex = "";
-		for (int i=0; i<2; i++) {
-			hex += Integer.toHexString(0x0100 + (buffer.get() & 0x00FF)).substring(1);
-		}
-		try {
-			return Integer.parseInt(hex, 16);
-		} catch (NumberFormatException e) {
-			return 1;
-		}
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = "";
-		}
-		return result;
-	}
-	public static void main(String[] args) {
-		int length = 30;
-		byte[] bytes = new byte[2];
-		
-		bytes[0] = (byte)((length >> 8) & 0xff);
-		bytes[1] = (byte)(length & 0xff);
-		
-		System.err.println("---- bytes: " + bytes);
-
-		String hex = "";
-		for (int i=0; i<2; i++) {
-			hex += Integer.toHexString(0x0100 + (bytes[i] & 0x00FF));
-			System.err.println("hex: " + hex);
-		}
-
-		int test = 0;
-		try {
-			test = Integer.parseInt(hex, 16);
-		} catch (NumberFormatException e) {
-			test = -1;
-		}
-		System.out.println("---- test: " +  test);
-	}
-		/*
-		int len = data.get();
-		len <<= 8; //2^8
-		len += data.get();
-		byte[] dst = new byte[len];
-		for (int i=0; i<len; i++) {
-		    dst[i] = data.get();
-		}
-		return new String(dst);
-		*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueStruct.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueStruct.java
deleted file mode 100644
index 12c2bbf..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueStruct.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeStruct;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueStruct;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueStruct extends ValueAggregate implements IAIFValueStruct {
-	public AIFValueStruct(IValueParent parent, IAIFTypeStruct type, SimpleByteBuffer buffer) {
-		super(parent, type, buffer);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnion.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnion.java
deleted file mode 100644
index addfdbb..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnion.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeUnion;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueUnion;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeAggregate;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueUnion extends ValueAggregate implements IAIFValueUnion {
-	public AIFValueUnion(IValueParent parent, IAIFTypeUnion type, SimpleByteBuffer buffer) {
-		super(parent, type, buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		ITypeAggregate typeAggregate = (ITypeAggregate)getType();
-		int length = typeAggregate.getNumberOfChildren();
-		for (int i=0; i<length; i++) {
-			IAIFType aifType = typeAggregate.getType(i);
-			IAIFValue val = AIFFactory.getAIFValue(getParent(), aifType, buffer);
-			values.add(val);
-			size += val.sizeof();
-		}
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnknown.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnknown.java
deleted file mode 100644
index e813d8f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueUnknown.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-public class AIFValueUnknown extends AIFValue {
-	public AIFValueUnknown(IAIFType type) {
-		super(type);
-		size = AIFFactory.NO_SIZE;
-	}
-	protected void parse(SimpleByteBuffer buffer) {}
-	
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = "NOT SUPPORTED";
-		}
-		return result;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueVoid.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueVoid.java
deleted file mode 100644
index b956b12..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/AIFValueVoid.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public class AIFValueVoid extends AIFValue {
-	public AIFValueVoid(IAIFType type, SimpleByteBuffer buffer) {
-		super(type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		size = type.sizeof();
-	}	
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			if (size == 0) {
-				result = "(No value)";
-			}
-			else  {
-				result = "";
-			}
-		}
-		return result;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeAggregate.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeAggregate.java
deleted file mode 100644
index 9c5a57c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeAggregate.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeAggregate;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class TypeAggregate extends AIFType implements ITypeAggregate {
-	protected List<String> fields = new ArrayList<String>(); 
-	protected List<IAIFType> types = new ArrayList<IAIFType>();
-	protected String name;
-	private int size = 0;
-
-	public TypeAggregate(String format) {
-		parse(format);
-	}
-	public String getName() {
-		return name;
-	}
-	public String[] getFields() {
-		return (String[])fields.toArray(new String[0]);
-	}
-	public IAIFType[] getTypes() {
-		return (IAIFType[])types.toArray(new IAIFType[0]);
-	}
-	public String getField(int index) {
-		return (String)fields.get(index);
-	}
-	public IAIFType getType(int index) {
-		return (IAIFType)types.get(index);
-	}
-	public int getNumberOfChildren() {
-		return fields.size();
-	}
-	public int sizeof() {
-		return size;
-	}
-	protected void parse(String fmt) {
-		fmt = parseName(fmt);
-		while (fmt.length() > 0) {
-			fmt = parseField(fmt);
-			fmt = parseType(fmt);
-		}
-	}
-	
-	protected String parseName(String fmt) {
-		int pos = fmt.indexOf(AIFFactory.SIGN_STROKE);
-		name = fmt.substring(0, pos);
-		return fmt.substring(pos+1);
-	}
-	protected String parseField(String fmt) {
-		int pos = fmt.indexOf(AIFFactory.SIGN_EQUAL);
-		fields.add(fmt.substring(0, pos));
-		return fmt.substring(pos+1);
-	}
-	protected String parseType(String fmt) {
-		int pos = getSeperatePosition(fmt);
-		if (pos > -1) {
-			String tmp_fmt = fmt.substring(0, pos);
-			if (tmp_fmt.indexOf(AIFFactory.FDS_STRUCT_CLASS) > -1) {
-				pos = getSeperatePosition(fmt, AIFFactory.FDS_STRUCT_END);
-				if (pos == -1) {
-					pos = getSeperatePosition(fmt, AIFFactory.FDS_CLASS_END);
-				}
-			}
-			else if (tmp_fmt.indexOf(AIFFactory.FDS_UNION) > -1) {
-				pos = getSeperatePosition(fmt, AIFFactory.FDS_UNION_END);
-			}
-		}
-
-		if (pos == -1) {
-			pos = fmt.length();
-		}
-		IAIFType aifType = AIFFactory.getAIFType(fmt.substring(0, pos));
-		size += aifType.sizeof();
-		types.add(aifType);
-		
-		if (pos == fmt.length())
-			return "";
-
-		return fmt.substring(pos+1);
-	}
-
-	protected int getSeperatePosition(String fmt) {
-		return getSeperatePosition(fmt, "");
-	}
-	protected int getSeperatePosition(String fmt, String regex) {
-		int regex_len = regex.length();		
-		int pos = fmt.indexOf(regex+AIFFactory.SIGN_COMMA);
-		if (pos == -1) {
-			if (regex_len > 0)
-				pos = fmt.indexOf(regex);
-		}
-		if (pos > -1) {
-			pos += regex_len;
-		}
-		return pos;
-	}
-	
-	public String toString() {
-		String content = getName() + AIFFactory.SIGN_STROKE;
-		for (int i=0; i<fields.size(); i++) {
-			content += (String)fields.get(i) + "=" + ((IAIFType)types.get(i)).toString();
-			if (i < fields.size()-1) {
-				content += ",";
-			}
-		}
-		return content;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeDerived.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeDerived.java
deleted file mode 100644
index a07d589..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeDerived.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeDerived;
-
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class TypeDerived extends AIFType implements ITypeDerived {
-	protected IAIFType basetype;
-	
-	public TypeDerived(IAIFType basetype) {
-		this.basetype = basetype;
-	}
-	public IAIFType getBaseType() {
-		return basetype;
-	}
-	public int sizeof() {
-		return basetype.sizeof();
-	}
-	public String toString() {
-		return getBaseType().toString();
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeIntegral.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeIntegral.java
deleted file mode 100644
index 28944d7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/TypeIntegral.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeIntegral;
-
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class TypeIntegral extends AIFType implements ITypeIntegral {
-	boolean signed;
-	
-	public TypeIntegral(boolean signed) {
-		this.signed = signed;
-	}
-	public boolean isSigned() {
-		return signed;
-	}
-	public String toString() {
-		return "i" + (isSigned()?"s":"u") + sizeof();
-	}	
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueAggregate.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueAggregate.java
deleted file mode 100644
index 7a7ad11..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueAggregate.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeAggregate;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueAggregate;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory.SimpleByteBuffer;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class ValueAggregate extends ValueParent implements IValueAggregate {
-	protected List<IAIFValue> values = new ArrayList<IAIFValue>();
-	
-	public ValueAggregate(IValueParent parent, ITypeAggregate type, SimpleByteBuffer buffer) {
-		super(parent, type);
-		parse(buffer);
-	}
-	protected void parse(SimpleByteBuffer buffer) {
-		ITypeAggregate typeAggregate = (ITypeAggregate)getType();
-		int num_children = typeAggregate.getNumberOfChildren();
-		for (int i=0; i<num_children; i++) {
-			IAIFType aifType = typeAggregate.getType(i);
-			IAIFValue val = AIFFactory.getAIFValue(getParent(), aifType, buffer);
-			values.add(val);
-			size += val.sizeof();
-		}
-	}	
-	public int getChildrenNumber() throws AIFException {
-		return values.size();
-	}
-	public String getValueString() throws AIFException {
-		if (result == null) {
-			result = getString();
-		}
-		return result;
-	}
-	private String getString() throws AIFException {
-		String content = "{";
-		int length = values.size();
-		for (int i=0; i<length; i++) {
-			IAIFValue value = (IAIFValue)values.get(i);
-			content += value.getValueString();
-			if (i < length - 1) {
-				content += ",";
-			}
-		}
-		return content + "}";
-	}
-	public IAIFValue getValue(int index) {
-		return (IAIFValue)values.get(index);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueDerived.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueDerived.java
deleted file mode 100644
index 0fd6ba4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueDerived.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeDerived;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueDerived;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class ValueDerived extends ValueParent implements IValueDerived {
-	public ValueDerived(ITypeDerived type) {
-		super(type);
-	}
-	public ValueDerived(IValueParent parent, ITypeDerived type) {
-		super(parent, type);
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueIntegral.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueIntegral.java
deleted file mode 100644
index f13da94..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueIntegral.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.ExtFormat;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeIntegral;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueIntegral;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class ValueIntegral extends AIFValue implements IValueIntegral {
-	public ValueIntegral(ITypeIntegral type) {
-		super(type);
-	}
-	
-	public BigInteger bigIntegerValue() throws AIFException {
-		return bigIntegerValue(getValueString());
-	}
-	
-	public static BigInteger bigIntegerValue(String valueString) {
-		if (valueString.startsWith("@")) {
-			valueString = valueString.substring(1);
-			int colon = valueString.indexOf(':');
-			if (colon != -1) {
-				valueString = valueString.substring(colon + 1); 
-			}
-		} else {
-			int space = valueString.indexOf(' ');
-			if (space != -1) {
-				valueString = valueString.substring(0, space).trim();
-			}			
-		}
-
-		try {
-			return ExtFormat.getBigInteger(valueString);
-		} catch (NumberFormatException e) {
-		}
-		return BigInteger.ZERO;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueParent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueParent.java
deleted file mode 100644
index da49b51..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/aif/ValueParent.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.aif;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueParent;
-
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class ValueParent extends AIFValue implements IValueParent {
-	protected IValueParent parent;
-	
-	public ValueParent(IAIFType type) {
-		this(null, type);
-	}
-	public ValueParent(IValueParent parent, IAIFType type) {
-		super(type);
-		this.parent = parent;
-	}	
-	public void setParent(IValueParent parent) {
-		this.parent = parent;
-	}
-	public IValueParent getParent() {
-		return (parent==null)?this:parent;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/AbstractEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/AbstractEvent.java
deleted file mode 100644
index 840db17..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/AbstractEvent.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractEvent extends SessionObject implements IPDIEvent {
-	public AbstractEvent(IPDISession session, BitList tasks) {
-		super(session, tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEvent#contains(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean contains(BitList qTasks) {
-		return tasks.intersects(qTasks);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/BreakpointInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/BreakpointInfo.java
deleted file mode 100644
index ac02eb7..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/BreakpointInfo.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIBreakpointInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-
-/**
- * @author clement
- *
- */
-public class BreakpointInfo extends SessionObject implements IPDIBreakpointInfo {
-	private IPDIBreakpoint bpt;
-	
-	public BreakpointInfo(IPDISession session, BitList tasks, IPDIBreakpoint bpt) {
-		super(session, tasks);
-		this.bpt = bpt;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointInfo#getBreakpoint()
-	 */
-	public IPDIBreakpoint getBreakpoint() {
-		return bpt;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ChangedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ChangedEvent.java
deleted file mode 100644
index bbcee09..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ChangedEvent.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.Session;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-
-
-/**
- * @author clement
- *
- */
-public class ChangedEvent extends AbstractEvent implements IPDIChangedEvent {
-	private IPDISessionObject reason;
-	
-	public ChangedEvent(IPDISessionObject reason) {
-		super((Session)reason.getSession(), reason.getTasks());
-		this.reason = reason;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent#getReason()
-	 */
-	public IPDISessionObject getReason() {
-		return reason;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ConnectedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ConnectedEvent.java
deleted file mode 100644
index 06c1113..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ConnectedEvent.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIConnectedEvent;
-
-/**
- * @author clement
- *
- */
-public class ConnectedEvent extends AbstractEvent implements IPDIConnectedEvent {
-	public ConnectedEvent(IPDISessionObject reason, BitList tasks) {
-		super(reason.getSession(), tasks);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/CreatedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/CreatedEvent.java
deleted file mode 100644
index 1999a4b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/CreatedEvent.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDICreatedEvent;
-
-/**
- * @author clement
- *
- */
-public class CreatedEvent extends AbstractEvent implements IPDICreatedEvent {
-	private IPDISessionObject reason;
-	
-	public CreatedEvent(IPDISessionObject reason) {
-		super(reason.getSession(), reason.getTasks());
-		this.reason = reason;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDICreatedEvent#getReason()
-	 */
-	public IPDISessionObject getReason() {
-		return reason;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DataReadMemoryInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DataReadMemoryInfo.java
deleted file mode 100644
index f0758b0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DataReadMemoryInfo.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemory;
-
-/**
- * @author Clement chu
- * 
- */
-public class DataReadMemoryInfo implements IPDIDataReadMemoryInfo {
-	String addr;
-	long nextRow;
-	long prevRow;
-	long nextPage;
-	long prevPage;
-	long numBytes;
-	long totalBytes;
-	IPDIMemory[] memories;
-
-	public DataReadMemoryInfo(String addr, long nextRow, long prevRow,
-			long nextPage, long prevPage, long numBytes, long totalBytes,
-			IPDIMemory[] memories) {
-		this.addr = addr;
-		this.nextRow = nextRow;
-		this.prevRow = prevRow;
-		this.nextPage = nextPage;
-		this.prevPage = prevPage;
-		this.numBytes = numBytes;
-		this.totalBytes = totalBytes;
-		this.memories = memories;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getAddress()
-	 */
-	public String getAddress() {
-		return addr;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getMemories()
-	 */
-	public IPDIMemory[] getMemories() {
-		return memories;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getNextPage()
-	 */
-	public long getNextPage() {
-		return nextPage;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getNextRow()
-	 */
-	public long getNextRow() {
-		return nextRow;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getNumberBytes()
-	 */
-	public long getNumberBytes() {
-		return numBytes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getPreviousPage()
-	 */
-	public long getPreviousPage() {
-		return prevPage;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getPreviousRow()
-	 */
-	public long getPreviousRow() {
-		return prevRow;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIDataReadMemoryInfo#getTotalBytes()
-	 */
-	public long getTotalBytes() {
-		return totalBytes;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DestroyedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DestroyedEvent.java
deleted file mode 100644
index c57f38a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DestroyedEvent.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDestroyedEvent;
-
-
-/**
- * @author clement
- *
- */
-public class DestroyedEvent extends AbstractEvent implements IPDIDestroyedEvent {
-	private IPDISessionObject reason;
-	
-	public DestroyedEvent(IPDISessionObject reason) {
-		super(reason.getSession(), reason.getTasks());
-		this.reason = reason;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIDestroyedEvent#getReason()
-	 */
-	public IPDISessionObject getReason() {
-		return reason;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DisconnectedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DisconnectedEvent.java
deleted file mode 100644
index a2c46a5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/DisconnectedEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDisconnectedEvent;
-
-/**
- * @author clement
- *
- */
-public class DisconnectedEvent extends AbstractEvent implements IPDIDisconnectedEvent {
-	public DisconnectedEvent(IPDISessionObject reason, BitList tasks) {
-		super(reason.getSession(), tasks);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/EndSteppingRangeInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/EndSteppingRangeInfo.java
deleted file mode 100644
index 8daa83a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/EndSteppingRangeInfo.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEndSteppingRangeInfo;
-
-/**
- * @author clement
- *
- */
-public class EndSteppingRangeInfo extends SessionObject implements IPDIEndSteppingRangeInfo {
-	private IPDILocator locator;
-	
-	public EndSteppingRangeInfo(IPDISession session, BitList tasks, IPDILocator locator) {
-		super(session, tasks);
-		this.locator = locator;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIEndSteppingRangeInfo#getLocator()
-	 */
-	public IPDILocator getLocator() {
-		return locator;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorEvent.java
deleted file mode 100644
index f046452..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorEvent.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorEvent;
-
-/**
- * @author clement
- *
- */
-public class ErrorEvent extends AbstractEvent implements IPDIErrorEvent {
-	private IPDISessionObject reason;
-	
-	public ErrorEvent(IPDISessionObject reason) {
-		super(reason.getSession(), reason.getTasks());
-		this.reason = reason;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIErrorEvent#getReason()
-	 */
-	public IPDISessionObject getReason() {
-		return reason;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorInfo.java
deleted file mode 100644
index 83d8605..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ErrorInfo.java
+++ /dev/null

@@ -1,45 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorInfo;
-
-/**
- * @author clement
- *
- */
-public class ErrorInfo extends SessionObject implements IPDIErrorInfo {
-	private int code;
-	private String detailMsg;
-	private String msg;
-
-	public ErrorInfo(IPDISession session, BitList tasks, int code, String msg, String detailMsg) {
-		super(session, tasks);
-		this.code = code;
-		this.msg = msg;
-		this.detailMsg = detailMsg;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIErrorInfo#getCode()
-	 */
-	public int getCode() {
-		return code;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIErrorInfo#getDetailMessage()
-	 */
-	public String getDetailMessage() {
-		return detailMsg;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIErrorInfo#getMessage()
-	 */
-	public String getMessage() {
-		return msg;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ExitInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ExitInfo.java
deleted file mode 100644
index 86ac62b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ExitInfo.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIExitInfo;
-
-/**
- * @author clement
- *
- */
-public class ExitInfo extends SessionObject implements IPDIExitInfo {
-	private int code;
-
-	public ExitInfo(IPDISession session, BitList tasks, int code) {
-		super(session, tasks);
-		this.code = code;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExitInfo#getCode()
-	 */
-	public int getCode() {
-		return code;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/LocationReachedInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/LocationReachedInfo.java
deleted file mode 100644
index 6fd7301..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/LocationReachedInfo.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDILocationReachedInfo;
-
-/**
- * @author clement
- *
- */
-public class LocationReachedInfo extends SessionObject implements IPDILocationReachedInfo {
-	private IPDILocator locator;
-
-	public LocationReachedInfo(IPDISession session, BitList tasks, IPDILocator locator) {
-		super(session, tasks);
-		this.locator = locator;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDILocationReachedInfo#getLocator()
-	 */
-	public IPDILocator getLocator() {
-		return locator;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/MemoryBlockInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/MemoryBlockInfo.java
deleted file mode 100644
index e6504cb..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/MemoryBlockInfo.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIMemoryBlockInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-
-/**
- * @author clement
- *
- */
-public class MemoryBlockInfo extends SessionObject implements IPDIMemoryBlockInfo {
-	private BigInteger[] addresses;
-	private IPDIMemoryBlock block;
-	
-	public MemoryBlockInfo(IPDISession session, BitList tasks, BigInteger[] addresses, IPDIMemoryBlock block) {
-		super(session, tasks);
-		this.addresses = addresses;
-		this.block = block;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIMemoryBlockInfo#getAddresses()
-	 */
-	public BigInteger[] getAddresses() {
-		return addresses;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIMemoryBlockInfo#getMemoryBlock()
-	 */
-	public IPDIMemoryBlock getMemoryBlock() {
-		return block;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/RestartedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/RestartedEvent.java
deleted file mode 100644
index e301975..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/RestartedEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.Session;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIRestartedEvent;
-
-/**
- * @author clement
- *
- */
-public class RestartedEvent extends AbstractEvent implements IPDIRestartedEvent {
-	public RestartedEvent(Session session, BitList tasks) {
-		super(session, tasks);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ResumedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ResumedEvent.java
deleted file mode 100644
index aabd80f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ResumedEvent.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-
-/**
- * @author clement
- *
- */
-public class ResumedEvent extends AbstractEvent implements IPDIResumedEvent {
-	private int type;
-	
-	public ResumedEvent(IPDISessionObject reason, BitList tasks, int type) {
-		super(reason.getSession(), tasks);
-		this.type = type;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent#getType()
-	 */
-	public int getType() {
-		return type;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SignalInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SignalInfo.java
deleted file mode 100644
index 1cdcd6d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SignalInfo.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISignalInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-
-/**
- * @author clement
- *
- */
-public class SignalInfo extends SessionObject implements IPDISignalInfo {
-	private String name;
-	private String desc;
-	private IPDISignal signal;
-	private IPDILocator locator;
-	
-	public SignalInfo(IPDISession session, BitList tasks, String name, String desc, IPDISignal signal, IPDILocator locator) {
-		super(session, tasks);
-		this.name = name;
-		this.signal = signal;
-		this.desc = desc;
-		this.locator = locator;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISignalInfo#getDescription()
-	 */
-	public String getDescription() {
-		return desc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISignalInfo#getLocator()
-	 */
-	public IPDILocator getLocator() {
-		return locator;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISignalInfo#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISignalInfo#getSignal()
-	 */
-	public IPDISignal getSignal() {
-		return signal;
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/StartedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/StartedEvent.java
deleted file mode 100644
index 17cef1d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/StartedEvent.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIStartedEvent;
-
-/**
- * @author clement
- *
- */
-public class StartedEvent extends AbstractEvent implements IPDIStartedEvent {
-	public StartedEvent(IPDISessionObject reason, BitList tasks) {
-		super(reason.getSession(), tasks);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SuspendedEvent.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SuspendedEvent.java
deleted file mode 100644
index e6d9232..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/SuspendedEvent.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent;
-
-/**
- * @author clement
- *
- */
-public class SuspendedEvent extends AbstractEvent implements IPDISuspendedEvent {
-	private IPDISessionObject reason;
-	private String[] vars;
-	private int thread_id;
-	private int level;
-	private int depth;
-	
-	public SuspendedEvent(IPDISessionObject reason, String[] vars, int thread_id, int level, int depth) {
-		super(reason.getSession(), reason.getTasks());
-		this.reason = reason;
-		this.vars = vars;
-		this.thread_id = thread_id;
-		this.level = level;
-		this.depth = depth;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent#getDepth()
-	 */
-	public int getDepth() {
-		return depth;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent#getLevel()
-	 */
-	public int getLevel() {
-		return level;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent#getReason()
-	 */
-	public IPDISessionObject getReason() {
-		return reason;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent#getThreadID()
-	 */
-	public int getThreadID() {
-		return thread_id;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent#getUpdatedVariables()
-	 */
-	public String[] getUpdatedVariables() {
-		return vars;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ThreadInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ThreadInfo.java
deleted file mode 100644
index e9b05a4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/ThreadInfo.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIThreadInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author clement
- *
- */
-public class ThreadInfo extends SessionObject implements IPDIThreadInfo {
-	private int thread_id;
-	private IPDIThread thread;
-	
-	public ThreadInfo(IPDISession session, BitList tasks, int thread_id, IPDIThread thread) {
-		super(session, tasks);
-		this.thread_id = thread_id;
-		this.thread = thread;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIThreadInfo#getThread()
-	 */
-	public IPDIThread getThread() {
-		return thread;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIThreadInfo#getThreadID()
-	 */
-	public int getThreadID() {
-		return thread_id;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/VariableInfo.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/VariableInfo.java
deleted file mode 100644
index 5e9c00b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/event/VariableInfo.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.event;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIVariableInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-/**
- * @author clement
- *
- */
-public class VariableInfo extends SessionObject implements IPDIVariableInfo {
-	private String name;
-	private IPDIVariable var;
-	
-	public VariableInfo(IPDISession session, BitList tasks, String name, IPDIVariable var) {
-		super(session, tasks);
-		this.name = name;
-		this.var = var;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableInfo#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableInfo#getVariable()
-	 */
-	public IPDIVariable getVariable() {
-		return var;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/AbstractPDIManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/AbstractPDIManager.java
deleted file mode 100644
index e5921f6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/AbstractPDIManager.java
+++ /dev/null

@@ -1,47 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIManager;
-
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractPDIManager extends SessionObject implements IPDIManager {
-	boolean autoUpdate;
-
-	public AbstractPDIManager(IPDISession session, boolean update) {
-		super(session, null);
-		autoUpdate = update;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManager#setAutoUpdate(boolean)
-	 */
-	public void setAutoUpdate(boolean update) {
-		autoUpdate = update;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManager#isAutoUpdate()
-	 */
-	public boolean isAutoUpdate() {
-		return autoUpdate;
-	}
-	
-	/**
-	 * @param tasks
-	 * @throws PDIException
-	 */
-	public abstract void update(BitList tasks) throws PDIException;
-	
-	/**
-	 * 
-	 */
-	public abstract void shutdown();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/BreakpointManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/BreakpointManager.java
deleted file mode 100644
index 527f923..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/BreakpointManager.java
+++ /dev/null

@@ -1,428 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIAddressLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDIFunctionLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILineLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.PDILocationFactory;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocationBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest;
-
-/**
- * @author clement
- *
- */
-public class BreakpointManager extends AbstractPDIManager implements IPDIBreakpointManager {
-	public static IPDIBreakpoint[] EMPTY_BREAKPOINTS = {};
-	private final static String[] EXCEPTION_FUNCS = new String[] {"__cxa_throw", "__cxa_begin_catch"};
-
-	private List<IPDIBreakpoint> breakList = Collections.synchronizedList(new ArrayList<IPDIBreakpoint>());
-	
-	private IPDIBreakpoint[] exceptionBps = new IPDIBreakpoint[2];
-	
-	private final int EXCEPTION_THROW_IDX = 0;
-	private final int EXCEPTION_CATCH_IDX = 1;
-	
-	public BreakpointManager(IPDISession session) {
-		super(session, false);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#addSetBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public void addSetBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException {
-		if (!isValid(breakpoint.getBreakpointID())) {
-			throw new PDIException(tasks, PDIResources.getString("pdi.BreakpointManager.Not_a_PTP_breakpoint"));			
-		}
-		breakpoint.getTasks().or(tasks);
-		breakpoint.getPendingTasks().or(tasks);
-		setPendingBreakpoint(breakpoint);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#createAddressLocation(java.math.BigInteger)
-	 */
-	public IPDIAddressLocation createAddressLocation(BigInteger address) {
-		return PDILocationFactory.newAddressLocation(address);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#createCondition(int, java.lang.String, java.lang.String[])
-	 */
-	public IPDICondition createCondition(int ignoreCount, String expression, String[] tids) {
-		return session.getModelFactory().newCondition(ignoreCount, expression, tids);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#createFunctionLocation(java.lang.String, java.lang.String)
-	 */
-	public IPDIFunctionLocation createFunctionLocation(String file, String function) {
-		return PDILocationFactory.newFunctionLocation(file, function);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#createLineLocation(java.lang.String, int)
-	 */
-	public IPDILineLocation createLineLocation(String file, int line) {
-		return PDILocationFactory.newLineLocation(file, line);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#deleteAllBreakpoints()
-	 */
-	public void deleteAllBreakpoints() throws PDIException {
-		IPDIBreakpoint[] pdiBreakpoints = getAllPDIBreakpoints();
-		for (IPDIBreakpoint pdiBpt : pdiBreakpoints) {
-			deleteBreakpoint(session.getTasks(), pdiBpt);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#deleteAllBreakpoints(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void deleteAllBreakpoints(BitList tasks) throws PDIException {
-		IPDIBreakpoint[] pdiBreakpoints = getAllPDIBreakpoints();
-		for (IPDIBreakpoint pdiBpt : pdiBreakpoints) {
-			if (pdiBpt.getTasks().intersects(tasks)) {
-				deleteBreakpoint(tasks, pdiBpt);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#deleteBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public void deleteBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException {
-		if (!isValid(breakpoint.getBreakpointID())) {
-			throw new PDIException(tasks, PDIResources.getString("pdi.BreakpointManager.Not_a_PTP_breakpoint"));			
-		}
-		breakpoint.setDeleted();
-		deletePendingBreakpoint(breakpoint, true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#deleteSetBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public void deleteSetBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException {
-		if (!isValid(breakpoint.getBreakpointID())) {
-			throw new PDIException(tasks, PDIResources.getString("pdi.BreakpointManager.Not_a_PTP_breakpoint"));			
-		}
-		breakpoint.getTasks().andNot(tasks);
-		breakpoint.getPendingTasks().andNot(tasks);
-		breakpoint.setDeleted();
-		deletePendingBreakpoint(breakpoint, false);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#disableBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public void disableBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException {
-		if (!isValid(breakpoint.getBreakpointID())) {
-			throw new PDIException(tasks, PDIResources.getString("pdi.BreakpointManager.Not_a_PTP_breakpoint"));			
-		}
-		breakpoint.setEnabled(false);
-		getSession().getEventRequestManager().addEventRequest(session.getRequestFactory().getDisableBreakpointRequest(tasks, breakpoint));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#enableBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public void enableBreakpoint(BitList tasks, IPDIBreakpoint breakpoint) throws PDIException {
-		if (!isValid(breakpoint.getBreakpointID())) {
-			throw new PDIException(tasks, PDIResources.getString("pdi.BreakpointManager.Not_a_PTP_breakpoint"));			
-		}
-		breakpoint.setEnabled(true);
-		getSession().getEventRequestManager().addEventRequest(session.getRequestFactory().getEnableBreakpointRequest(tasks, breakpoint));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#getBreakpoint(int)
-	 */
-	public IPDIBreakpoint getBreakpoint(int id) {
-		IPDIBreakpoint[] pdiBreakpoints = getAllPDIBreakpoints();
-		for (IPDIBreakpoint pdiBreakpoint : pdiBreakpoints) {
-			if (pdiBreakpoint.getBreakpointID() == id) {
-				return pdiBreakpoint;
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#setAddressBreakpoint(org.eclipse.ptp.core.util.BitList, int, org.eclipse.ptp.debug.core.pdi.IPDIAddressLocation, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean, boolean)
-	 */
-	public IPDIAddressBreakpoint setAddressBreakpoint(BitList tasks, int type, IPDIAddressLocation location, IPDICondition condition, boolean deferred, boolean enabled) throws PDIException {		
-		IPDIAddressBreakpoint bkpt = session.getModelFactory().newAddressBreakpoint(session, tasks, type, location, condition, enabled);
-		setNewLocationBreakpoint(bkpt, deferred);
-		return bkpt;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#setCondition(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint, org.eclipse.ptp.debug.core.pdi.IPDICondition)
-	 */
-	public void setCondition(BitList tasks, IPDIBreakpoint breakpoint, IPDICondition newCondition) throws PDIException {
-		deleteBreakpoint(tasks, breakpoint);
-		breakpoint.setCondition(newCondition);
-		if (breakpoint instanceof IPDILocationBreakpoint) {
-			setLocationBreakpoint((IPDILocationBreakpoint)breakpoint);
-		} else if (breakpoint instanceof IPDIWatchpoint) {
-			setWatchpoint((IPDIWatchpoint)breakpoint);
-		} else {
-			throw new PDIException(tasks, PDIResources.getString("pdi.BreakpointManager.Not_a_PTP_breakpoint"));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#setExceptionpoint(org.eclipse.ptp.core.util.BitList, java.lang.String, boolean, boolean, boolean)
-	 */
-	public IPDIExceptionpoint setExceptionpoint(BitList tasks, String clazz, boolean stopOnThrow, boolean stopOnCatch, boolean enabled) throws PDIException {
-		if (!stopOnThrow && !stopOnCatch) {
-			throw new PDIException(tasks, "Must suspend on throw or catch");
-		}
-		List<IPDIFunctionBreakpoint> funcBptList = new ArrayList<IPDIFunctionBreakpoint>(2);
-		if (stopOnThrow) {
-			synchronized(exceptionBps) {
-				int id = EXCEPTION_THROW_IDX;
-				if (exceptionBps[EXCEPTION_THROW_IDX] == null) {
-					IPDIFunctionLocation location = PDILocationFactory.newFunctionLocation(null, EXCEPTION_FUNCS[id]);
-					IPDIFunctionBreakpoint bp = session.getModelFactory().newFunctionBreakpoint(session, tasks, IPDIBreakpoint.REGULAR, location, null, enabled);
-					setLocationBreakpoint(bp);
-					exceptionBps[id] = bp;
-					funcBptList.add(bp);
-				}
-			}
-		}
-		if (stopOnCatch) {
-			synchronized(exceptionBps) {
-				int id = EXCEPTION_THROW_IDX;
-				if (exceptionBps[id] == null) {
-					IPDIFunctionLocation location = PDILocationFactory.newFunctionLocation(null, EXCEPTION_FUNCS[id]);
-					IPDIFunctionBreakpoint bp = session.getModelFactory().newFunctionBreakpoint(session, tasks, IPDIBreakpoint.REGULAR, location, null, enabled);
-					setLocationBreakpoint(bp);
-					exceptionBps[id] = bp;
-					funcBptList.add(bp);
-				}
-			}
-		}
-		IPDIExceptionpoint excp = session.getModelFactory().newExceptionpoint(session, tasks, clazz, stopOnThrow, stopOnCatch, null, enabled, funcBptList.toArray(new IPDIFunctionBreakpoint[0]));
-		addBreakpoint(excp);
-		return excp;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#setFunctionBreakpoint(org.eclipse.ptp.core.util.BitList, int, org.eclipse.ptp.debug.core.pdi.IPDIFunctionLocation, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean, boolean)
-	 */
-	public IPDIFunctionBreakpoint setFunctionBreakpoint(BitList tasks, int type, IPDIFunctionLocation location, IPDICondition condition, boolean deferred, boolean enabled) throws PDIException {		
-		IPDIFunctionBreakpoint bkpt = session.getModelFactory().newFunctionBreakpoint(session, tasks, type, location, condition, enabled);
-		setNewLocationBreakpoint(bkpt, deferred);
-		return bkpt;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#setLineBreakpoint(org.eclipse.ptp.core.util.BitList, int, org.eclipse.ptp.debug.core.pdi.IPDILineLocation, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean, boolean)
-	 */
-	public IPDILineBreakpoint setLineBreakpoint(BitList tasks, int type, IPDILineLocation location, IPDICondition condition, boolean deferred, boolean enabled) throws PDIException {		
-		IPDILineBreakpoint bkpt = session.getModelFactory().newLineBreakpoint(session, tasks, type, location, condition, enabled);
-		setNewLocationBreakpoint(bkpt, deferred);
-		return bkpt;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#setWatchpoint(org.eclipse.ptp.core.util.BitList, int, int, java.lang.String, org.eclipse.ptp.debug.core.pdi.IPDICondition, boolean)
-	 */
-	public IPDIWatchpoint setWatchpoint(BitList tasks, int type, int watchType, String expression, IPDICondition condition, boolean enabled) throws PDIException {
-		IPDIWatchpoint bkpt = session.getModelFactory().newWatchpoint(session, tasks, type, expression, watchType, condition, enabled);
-		setWatchpoint(bkpt);
-		addBreakpoint(bkpt);
-		return bkpt;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		//breakList.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList tasks) throws PDIException {
-		//TODO
-	}
-	
-	/**
-	 * @param breakpoint
-	 */
-	private void addBreakpoint(IPDIBreakpoint breakpoint) {
-		synchronized(breakList) {
-			if (!breakpoint.isTemporary()) {
-				breakList.add(breakpoint);
-			}
-		}
-	}
-	
-	/**
-	 * @param id
-	 */
-	private void deleteBreakpoint(int id) {
-		IPDIBreakpoint[] pdiBreakpoints = getAllPDIBreakpoints();
-		for (int i=0; i<pdiBreakpoints.length; i++) {
-			if (pdiBreakpoints[i].getBreakpointID() == id) {
-				breakList.remove(i);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private IPDIBreakpoint[] getAllPDIBreakpoints() {
-		synchronized(breakList) {
-			return breakList.toArray(new IPDIBreakpoint[0]);
-		}
-	}
-	
-	/**
-	 * @param id
-	 * @return
-	 */
-	private boolean isValid(int id) {
-		return (getBreakpoint(id) != null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager#updatePendingBreakpoints()
-	 */
-	public void updatePendingBreakpoints() throws PDIException {
-		for (IPDIBreakpoint bp : getAllPDIBreakpoints()) {
-			if (!bp.getPendingTasks().isEmpty()) {
-				if (!bp.isDeleted()) {
-					setPendingBreakpoint(bp);
-				} else {
-					deletePendingBreakpoint(bp, true);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Set a breakpoint on all suspended tasks.
-	 * 
-	 * @param bp breakpoint to set
-	 * @throws PDIException
-	 */
-	public void setPendingBreakpoint(IPDIBreakpoint bp) throws PDIException {
-		BitList suspendedTasks = bp.getPendingTasks().copy();
-		if (session.getStatus() == IPDISession.STARTED) {
-			getSession().getTaskManager().getSuspendedTasks(suspendedTasks);
-		}			
-		if (!suspendedTasks.isEmpty()) {
-			IPDIEventRequest request = null;
-			if (bp instanceof IPDIFunctionBreakpoint) {
-				request = session.getRequestFactory().getSetFunctionBreakpointRequest(suspendedTasks, (IPDIFunctionBreakpoint)bp, true);
-			}
-			else if (bp instanceof IPDIAddressBreakpoint) {
-				request = session.getRequestFactory().getSetAddressBreakpointRequest(suspendedTasks, (IPDIAddressBreakpoint)bp, true);			
-			}
-			else if (bp instanceof IPDILineBreakpoint) {
-				request = session.getRequestFactory().getSetLineBreakpointRequest(suspendedTasks, (IPDILineBreakpoint)bp, true);			
-			}
-			else if (bp instanceof IPDIWatchpoint) {
-				request = session.getRequestFactory().getSetWatchpointRequest(suspendedTasks, (IPDIWatchpoint)bp, true);
-			}
-			else {
-				throw new PDIException(bp.getTasks(), PDIResources.getString("pdi.Common.Not_implemented"));
-			}
-			bp.getPendingTasks().andNot(suspendedTasks);
-			getSession().getEventRequestManager().addEventRequest(request);
-		}
-	}
-	
-	/**
-	 * FIXME work out correct usage of allowUpdate
-	 *  
-	 * Delete a breakpoint from all suspended tasks.
-	 * 
-	 * @param bp breakpoint to delete
-	 * @throws PDIException
-	 */
-	public void deletePendingBreakpoint(IPDIBreakpoint bp, boolean allowUpdate) throws PDIException {
-		BitList suspendedTasks = bp.getPendingTasks().copy();
-		if (session.getStatus() == IPDISession.STARTED) {
-			getSession().getTaskManager().getSuspendedTasks(suspendedTasks);
-		}			
-		if (!suspendedTasks.isEmpty()) {
-			getSession().getEventRequestManager().addEventRequest(
-					session.getRequestFactory().getDeleteBreakpointRequest(suspendedTasks, bp, allowUpdate));
-			bp.getPendingTasks().andNot(suspendedTasks);
-			if (bp.getPendingTasks().isEmpty() && allowUpdate) {
-				deleteBreakpoint(bp.getBreakpointID());
-			}
-		}
-	}
-
-	/**
-	 * @param bkpt
-	 * @throws PDIException
-	 */
-	private void setLocationBreakpoint(IPDILocationBreakpoint bkpt) throws PDIException {
-		setPendingBreakpoint(bkpt);
-		if (!bkpt.isEnabled()) {
-			disableBreakpoint(bkpt.getTasks(), bkpt);
-		}
-	}
-	
-	/**
-	 * @param watchpoint
-	 * @throws PDIException
-	 */
-	private void setWatchpoint(IPDIWatchpoint watchpoint) throws PDIException {
-		setPendingBreakpoint(watchpoint);
-	}
-	
-	/**
-	 * @param bkpt
-	 * @param deferred
-	 * @throws PDIException
-	 */
-	protected void setNewLocationBreakpoint(IPDILocationBreakpoint bkpt, boolean deferred) throws PDIException {
-		setLocationBreakpoint(bkpt);
-		addBreakpoint(bkpt);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/EventRequestManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/EventRequestManager.java
deleted file mode 100644
index 3e00e2b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/EventRequestManager.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-import java.util.Observable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIEventRequestManager;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStopDebuggerRequest;
-
-/**
- * @author clement
- * 
- */
-public class EventRequestManager extends AbstractPDIManager implements IPDIEventRequestManager {
-	public class EventRequestDispatchJob extends Job {
-		private Vector<IPDIEventRequest> fRequests = null;
-		
-		public EventRequestDispatchJob() {
-			super("PTP Debug Request Job");
-			setSystem(true);
-			fRequests = new Vector<IPDIEventRequest>(10);
-		}
-		
-		/**
-		 * @param request
-		 * @throws PDIException
-		 */
-		public void addEventRequest(IPDIEventRequest request) throws PDIException {
-			synchronized (fRequests) {
-				if (containEventRequest(request))
-					throw new PDIException(request.getTasks(), "[" + request.getName() + "] request is already added.");
-
-				PDebugUtils.println("Msg: EventRequestManager - addEventRequest(): Request: " + request);
-				fRequests.add(request);
-			}
-			schedule();
-		}
-		
-		/**
-		 * 
-		 */
-		public void cleanEventRequests() {
-			synchronized (fRequests) {
-				fRequests.clear();
-			}
-		}
-		
-		/**
-		 * @param request
-		 * @return
-		 */
-		public boolean containEventRequest(IPDIEventRequest request) {
-			synchronized (fRequests) {
-				return fRequests.contains(request);
-			}
-		}
-		
-		/**
-		 * @return
-		 */
-		public IPDIEventRequest getCurrentEventRequest() {
-			synchronized (fRequests) {
-				if (fRequests.isEmpty())
-					return null;
-				return fRequests.get(0);
-			}
-		}
-		
-		/**
-		 * @return
-		 */
-		public IPDIEventRequest[] getEventRequests() {
-			synchronized (fRequests) {
-				return fRequests.toArray(new IPDIEventRequest[0]);
-			}
-		}
-		
-		/**
-		 * 
-		 */
-		public void removeCurrentEventRequest() {
-			synchronized (fRequests) {
-				if (!fRequests.isEmpty())
-					fRequests.remove(0);
-			}
-			schedule();
-		}
-		
-		/**
-		 * @param request
-		 * @throws PDIException
-		 */
-		public void removeEventRequest(IPDIEventRequest request) throws PDIException {
-			synchronized (fRequests) {
-				if (request.getStatus() == IPDIEventRequest.RUNNING)
-					throw new PDIException(request.getTasks(), "[" + request.getName() + "] request cannot be deleted during executing.");
-				if (!containEventRequest(request))
-					throw new PDIException(request.getTasks(), "[" + request.getName() + "] request is not existed or already deleted.");
-				fRequests.remove(request);
-			}
-		}
-		
-		/**
-		 * @throws PDIException
-		 */
-		public void removeEventRequests() throws PDIException {
-			synchronized (fRequests) {
-				int end = fRequests.size() - 1;
-				for (int i=end; i>=0; i--) {
-					removeEventRequest(fRequests.get(i));
-					fRequests.remove(i);
-				}
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		public IStatus run(IProgressMonitor monitor) {
-			SafeRunner.run(new ISafeRunnable() {
-				public void handleException(Throwable exception) {
-					PTPDebugCorePlugin.log(exception);
-				}
-				public void run() throws Exception {
-					execute(getCurrentEventRequest());
-				}
-			});			
-			return Status.OK_STATUS;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#shouldRun()
-		 */
-		public boolean shouldRun() {
-			synchronized (fRequests) {
-				return (!fRequests.isEmpty() && getCurrentEventRequest().getStatus() == IPDIEventRequest.UNKNOWN);
-			}
-		}
-	}
-
-	private EventRequestDispatchJob dispatchJob = new EventRequestDispatchJob();
-	
-	public EventRequestManager(IPDISession session) {
-		super(session, false);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequestManager#addEventRequest(org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest)
-	 */
-	public void addEventRequest(IPDIEventRequest request) throws PDIException {
-		if (!(request instanceof IPDIStopDebuggerRequest)) {
-			if (request.getTasks().isEmpty()) {
-				throw new PDIException(request.getTasks(), request.getName()  + ": No tasks found");
-			}
-			if (session.getTaskManager().isAllPending(request.getTasks())) {
-				throw new PDIException(request.getTasks(), request.getName() + ": Request tasks are in pending status.");
-			}
-		}
-		dispatchJob.addEventRequest(request);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequestManager#canExecute(org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest)
-	 */
-	public boolean canExecute(IPDIEventRequest request) {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequestManager#cleanEventRequests()
-	 */
-	public void cleanEventRequests() {
-		session.getEventManager().removeAllRegisteredEventRequests();
-		dispatchJob.cleanEventRequests();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequestManager#deleteAllEventRequests()
-	 */
-	public void deleteAllEventRequests() throws PDIException {
-		dispatchJob.removeEventRequests();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequestManager#deleteEventRequest(org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest)
-	 */
-	public void deleteEventRequest(IPDIEventRequest request) throws PDIException {
-		dispatchJob.removeEventRequest(request);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequestManager#execute(org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest)
-	 */
-	public void execute(IPDIEventRequest request) {
-		session.getEventManager().registerEventRequest(request);
-		request.execute(session.getDebugger());
-		if (request.getStatus() == IPDIEventRequest.ERROR) {
-			session.getEventManager().notifyEventRequest(request);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequestManager#getRequests()
-	 */
-	public IPDIEventRequest[] getRequests() {
-		return dispatchJob.getEventRequests();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	@Override
-	public void update(BitList tasks) throws PDIException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
-	 */
-	public void update(Observable o, Object arg) {
-		if (arg instanceof IPDIEventRequest) {
-			dispatchJob.removeCurrentEventRequest();
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ExpressionManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ExpressionManager.java
deleted file mode 100644
index bcdce29..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ExpressionManager.java
+++ /dev/null

@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITargetExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDataEvaluateExpressionRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDeleteVariableRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetPartialAIFRequest;
-
-/**
- * @author Clement chu
- *
- */
-public class ExpressionManager extends AbstractPDIManager implements IPDIExpressionManager {
-	final static IPDIExpression[] EMPTY_EXPRESSIONS = {};
-	Map<BitList, List<IPDIExpression>> expMap;
-	Map<BitList, List<IPDIVariable>> varMap;
-	Map<String, IPDIMultiExpressions> mutliExprMap;
-
-	public ExpressionManager(IPDISession session) {
-		super(session, true);
-		expMap = new Hashtable<BitList, List<IPDIExpression>>();
-		varMap = new Hashtable<BitList, List<IPDIVariable>>();
-		mutliExprMap = new HashMap<String, IPDIMultiExpressions>();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#cleanMultiExpressions(org.eclipse.ptp.core.util.BitList, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void cleanMultiExpressions(BitList tasks, IProgressMonitor monitor) throws PDIException {
-		for (IPDIMultiExpressions mexpr : getMultiExpressions()) {
-			mexpr.cleanExpressionsValue(tasks, monitor);
-		}
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#cleanMultiExpressions(java.lang.String, org.eclipse.ptp.core.util.BitList, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void cleanMultiExpressions(String exprText, BitList tasks, IProgressMonitor monitor) throws PDIException {
-		IPDIMultiExpressions mexpr = getMultiExpression(exprText);
-		if (mexpr == null)
-			throw new PDIException(tasks, "No expression " + exprText + " found");
-	
-		mexpr.cleanExpressionsValue(tasks, monitor);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#createExpression(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDITargetExpression createExpression(BitList qTasks, String name) throws PDIException {
-		IPDITargetExpression expression = session.getModelFactory().newExpression(session, qTasks, name);
-		List<IPDIExpression> exprList = getExpressionList(qTasks);
-		exprList.add(expression);
-		return expression;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#createMutliExpressions(org.eclipse.ptp.core.util.BitList, java.lang.String, boolean)
-	 */
-	public void createMutliExpressions(BitList tasks, String exprText, boolean enabled) {
-		mutliExprMap.put(exprText, session.getModelFactory().newMultiExpressions(session, tasks, exprText, enabled));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#createVariable(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String)
-	 */
-	public IPDIVariable createVariable(IPDIStackFrame frame, String expr) throws PDIException {
-		IPDITarget target = frame.getTarget();
-		IPDIThread currentThread = target.getCurrentThread();
-		IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-		target.lockTarget();
-		try {
-			target.setCurrentThread(frame.getThread(), false);
-			frame.getThread().setCurrentStackFrame(frame, false);
-
-			IPDIGetPartialAIFRequest request = session.getRequestFactory().getGetPartialAIFRequest(target.getTasks(), expr, null);
-			session.getEventRequestManager().addEventRequest(request);
-			IAIF aif = request.getPartialAIF(target.getTasks());
-			String varid = request.getVarId(target.getTasks());
-			
-			IPDIVariable v = session.getModelFactory().newLocalVariable(session, target.getTasks(), null, frame, expr, null, 0, 0, varid);
-			v.setAIF(aif);
-			
-			List<IPDIVariable> varList = getVariableList(target.getTasks());
-			varList.add(v);
-			return v;
-		} finally {
-			target.setCurrentThread(currentThread, false);
-			currentThread.setCurrentStackFrame(currentFrame, false);
-			target.releaseTarget();
-		}
-	}
-	
-	/**
-	 * @param qTasks
-	 * @throws PDIException
-	 */
-	public void deleteAllVariables(BitList qTasks) throws PDIException {
-		List<IPDIVariable> varList = getVariableList(qTasks);
-		IPDIVariable[] variables = (IPDIVariable[]) varList.toArray(new IPDIVariable[varList.size()]);
-		for (int i = 0; i < variables.length; ++i) {
-			deleteVariable(variables[i]);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#deleteVariable(org.eclipse.ptp.debug.core.pdi.model.IPDIVariable)
-	 */
-	public void deleteVariable(IPDIVariable variable) throws PDIException {
-		IPDIDeleteVariableRequest request = session.getRequestFactory().getDeleteVariableRequest(variable.getTasks(), variable.getVarId());
-		session.getEventRequestManager().addEventRequest(request);
-		request.waitUntilCompleted(variable.getTasks());
-		
-		List<IPDIVariable> varList = getVariableList(variable.getTasks());
-		varList.remove(variable);
-		
-		List<IPDIEvent> eventList = new ArrayList<IPDIEvent>();
-		
-		IPDIVariable[] children = variable.getChildren();
-		if (children != null) {
-			for (int i = 0; i < children.length; ++i) {
-				if (children[0] instanceof IPDIVariable) {
-					IPDIVariable child = (IPDIVariable)children[i];
-					eventList.add(session.getEventFactory().newDestroyedEvent(
-							session.getEventFactory().newVariableInfo(session, variable.getTasks(), child.getVarId(), child)));
-				}
-			}
-		}
-		eventList.add(session.getEventFactory().newDestroyedEvent(
-				session.getEventFactory().newVariableInfo(session, variable.getTasks(), variable.getVarId(), variable)));
-		session.getEventManager().fireEvents((IPDIEvent[]) eventList.toArray(new IPDIEvent[0]));
-	}
-	
-	/**
-	 * @param qTasks
-	 * @throws PDIException
-	 */
-	public void destroyAllExpressions(BitList qTasks) throws PDIException {
-		IPDIExpression[] expressions = getExpressions(qTasks);
-		destroyExpressions(qTasks, expressions);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#destroyExpressions(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIExpression[])
-	 */
-	public void destroyExpressions(BitList qTasks, IPDIExpression[] expressions) throws PDIException {
-		List<IPDIExpression> expList = getExpressionList(qTasks);
-		for (int i = 0; i < expressions.length; ++i) {
-			expList.remove(expressions[i]);
-		}
-	}	
-	
-	/**
-	 * @param qTasks
-	 * @param expr
-	 * @return
-	 * @throws PDIException
-	 */
-	public IAIF getAIF(BitList qTasks, String expr) throws PDIException {
-		IPDIGetPartialAIFRequest request = session.getRequestFactory().getGetPartialAIFRequest(qTasks, expr, null);
-		session.getEventRequestManager().addEventRequest(request);
-		return request.getPartialAIF(qTasks);
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIExpression[] getExpressions(BitList qTasks) throws PDIException {
-		List<IPDIExpression> expList = expMap.get(qTasks);
-		if (expList != null) {
-			return (IPDIExpression[])expList.toArray(EMPTY_EXPRESSIONS);
-		}
-		return EMPTY_EXPRESSIONS;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#getExpressionValue(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IAIF getExpressionValue(BitList qTasks, String expr) throws PDIException {
-		IPDIDataEvaluateExpressionRequest request = session.getRequestFactory().getDataEvaluateExpressionRequest(qTasks, expr);
-		session.getEventRequestManager().addEventRequest(request);
-		return request.getAIF(qTasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#getMultiExpression(java.lang.String)
-	 */
-	public IPDIMultiExpressions getMultiExpression(String exprText) {
-		return mutliExprMap.get(exprText);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#getMultiExpressions()
-	 */
-	public IPDIMultiExpressions[] getMultiExpressions() {
-		return mutliExprMap.values().toArray(new IPDIMultiExpressions[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#getMultiExpressions(int)
-	 */
-	public IPDIExpression[] getMultiExpressions(int task) {
-		List<IPDIExpression> exprList = new ArrayList<IPDIExpression>();
-		for (IPDIMultiExpressions mexpr : getMultiExpressions()) {
-			if (!mexpr.isEnabled())
-				continue;
-			IPDIExpression expr = mexpr.getExpression(task);
-			if (expr != null) {
-				exprList.add(expr);
-			}
-		}
-		return exprList.toArray(new IPDIExpression[0]);
-	}
-	
-	/**
-	 * @param qTasks
-	 * @param varid
-	 * @return
-	 */
-	public IPDIVariable getVariable(BitList qTasks, String varid) {
-		List<IPDIVariable> varList = getVariableList(qTasks);
-		IPDIVariable[] vars = (IPDIVariable[])varList.toArray(new IPDIVariable[0]);
-		for (int i = 0; i < vars.length; i++) {
-			if (vars[i].getVarId().equals(varid)) {
-				return vars[i];
-			}
-			IPDIVariable v = vars[i].getChild(varid);
-			if (v != null) {
-				return v;
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#removeMutliExpressions(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void removeMutliExpressions(BitList tasks, String exprText) {
-		IPDIMultiExpressions mexpr = getMultiExpression(exprText);
-		if (mexpr != null) {
-			mexpr.removeExpression(tasks);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#removeMutliExpressions(java.lang.String)
-	 */
-	public void removeMutliExpressions(String exprText) {
-		IPDIMultiExpressions mexpr = getMultiExpression(exprText);
-		if (mexpr != null) {
-			mexpr.shutdown();
-		}
-		mutliExprMap.remove(exprText);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		expMap.clear();
-		varMap.clear();
-		mutliExprMap.clear();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList qTasks) throws PDIException {
-		update(qTasks, new String[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#update(org.eclipse.ptp.core.util.BitList, java.lang.String[])
-	 */
-	public void update(BitList qTasks, String[] varList) throws PDIException {
-		List<IPDIEvent> eventList = new ArrayList<IPDIEvent>();
-		for (int i=0; i<varList.length; i++) {
-			IPDIVariable variable = getVariable(qTasks, varList[i]);
-			if (variable != null) {
-				eventList.add(session.getEventFactory().newChangedEvent(
-						session.getEventFactory().newVariableInfo(session, qTasks, varList[i], variable)));
-			}
-		}
-		session.getEventManager().fireEvents((IPDIEvent[]) eventList.toArray(new IPDIEvent[0]));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#updateMultiExpressions(org.eclipse.ptp.core.util.BitList, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void updateMultiExpressions(BitList tasks, IProgressMonitor monitor) throws PDIException {
-		for (IPDIMultiExpressions mexpr : getMultiExpressions()) {
-			if (mexpr.isEnabled())
-				mexpr.updateExpressionsValue(tasks, monitor);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#updateMultiExpressions(java.lang.String, org.eclipse.ptp.core.util.BitList, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void updateMultiExpressions(String exprText, BitList tasks, IProgressMonitor monitor) throws PDIException {
-		IPDIMultiExpressions mexpr = getMultiExpression(exprText);
-		if (mexpr == null)
-			throw new PDIException(tasks, "No expression " + exprText + " found");
-	
-		if (mexpr.isEnabled())
-			mexpr.updateExpressionsValue(tasks, monitor);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager#updateStatusMultiExpressions(java.lang.String, boolean)
-	 */
-	public void updateStatusMultiExpressions(String exprText, boolean enabled) {
-		IPDIMultiExpressions mexpr = getMultiExpression(exprText);
-		if (mexpr != null) {
-			mexpr.setEnabled(enabled);
-		}
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	private synchronized List<IPDIExpression> getExpressionList(BitList qTasks) {
-		List<IPDIExpression> expList = expMap.get(qTasks);
-		if (expList == null) {
-			expList = Collections.synchronizedList(new ArrayList<IPDIExpression>());
-			expMap.put(qTasks, expList);
-		}
-		return expList;
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	private synchronized List<IPDIVariable> getVariableList(BitList qTasks) {
-		List<IPDIVariable> varList = varMap.get(qTasks);
-		if (varList == null) {
-			varList = Collections.synchronizedList(new ArrayList<IPDIVariable>());
-			varMap.put(qTasks, varList);
-		}
-		return varList;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/MemoryManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/MemoryManager.java
deleted file mode 100644
index 3348cd5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/MemoryManager.java
+++ /dev/null

@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.ExtFormat;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDataReadMemoryRequest;
-
-/**
- * @author Clement chu
- * 
- */
-public class MemoryManager extends AbstractPDIManager implements IPDIMemoryManager {
-	IPDIMemoryBlock[] EMPTY_MEMORY_BLOCKS = {};
-	Map<BitList, List<IPDIMemoryBlock>> blockMap;
-
-	public MemoryManager(IPDISession session) {
-		super(session, true);
-		blockMap = new Hashtable<BitList, List<IPDIMemoryBlock>>();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager#createMemoryBlock(org.eclipse.ptp.core.util.BitList, java.lang.String, int, int)
-	 */
-	public IPDIMemoryBlock createMemoryBlock(BitList qTasks, String address, int units, int wordSize) throws PDIException {
-		IPDIDataReadMemoryInfo info = createDataReadMemoryInfo(qTasks, address, units, wordSize);
-		IPDIMemoryBlock block = session.getModelFactory().newMemoryBlock(session, qTasks, address, wordSize, true, info);
-		List<IPDIMemoryBlock> blockList = getMemoryBlockList(qTasks);
-		blockList.add(block);
-		IPDIEvent event = session.getEventFactory().newCreatedEvent(
-				session.getEventFactory().newMemoryBlockInfo(session, qTasks, new BigInteger[] { block.getStartAddress() }, block));
-		session.getEventManager().fireEvents(new IPDIEvent[] { event });
-		return block;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager#getMemoryBlocks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIMemoryBlock[] getMemoryBlocks(BitList qTasks) throws PDIException {
-		List<IPDIMemoryBlock> blockList = getMemoryBlockList(qTasks);
-		return (IPDIMemoryBlock[]) blockList.toArray(new IPDIMemoryBlock[blockList.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager#removeAllBlocks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void removeAllBlocks(BitList qTasks) throws PDIException {
-		IPDIMemoryBlock[] blocks = getMemoryBlocks(qTasks);
-		removeBlocks(qTasks, blocks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager#removeBlocks(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock[])
-	 */
-	public void removeBlocks(BitList qTasks, IPDIMemoryBlock[] memoryBlocks) throws PDIException {
-		List<IPDIMemoryBlock> blockList = blockMap.get(qTasks);
-		if (blockList != null) {
-			blockList.removeAll(Arrays.asList(memoryBlocks));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		blockMap.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList qTasks) {
-		List<IPDIMemoryBlock> blockList = getMemoryBlockList(qTasks);
-		IPDIMemoryBlock[] blocks = (IPDIMemoryBlock[]) blockList.toArray(new IPDIMemoryBlock[blockList.size()]);
-		List<IPDIEvent> eventList = new ArrayList<IPDIEvent>(blocks.length);
-		for (int i = 0; i < blocks.length; i++) {
-			if (! blocks[i].isFrozen()) {
-				try {
-					update(blocks[i], eventList);
-				} catch (PDIException e) {
-				}
-			}
-		}
-		IPDIEvent[] events = (IPDIEvent[])eventList.toArray(new IPDIEvent[0]);
-		session.getEventManager().fireEvents(events);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager#update(org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock, java.util.List)
-	 */
-	public BigInteger[] update(IPDIMemoryBlock block, List<IPDIEvent> aList) throws PDIException {
-		IPDIMemoryBlock newBlock = cloneBlock(block);
-		boolean newAddress = ! newBlock.getStartAddress().equals(block.getStartAddress());
-		BigInteger[] array = compareBlocks(block, newBlock);
-		block.setDataReadMemoryInfo(newBlock.getDataReadMemoryInfo());
-		if (array.length > 0 || newAddress) {
-			IPDIEvent event = session.getEventFactory().newChangedEvent(
-					session.getEventFactory().newMemoryBlockInfo(session, block.getTasks(), array, block));
-			if (aList != null) {
-				aList.add(event);
-			} else {
-				session.getEventManager().fireEvents(new IPDIEvent[] { event });
-			}
-		}
-		return array;
-	}
-	
-	/**
-	 * @param block
-	 * @return
-	 * @throws PDIException
-	 */
-	private IPDIMemoryBlock cloneBlock(IPDIMemoryBlock block) throws PDIException {
-		String exp = block.getExpression();
-		int wordSize = block.getWordSize();
-		IPDIDataReadMemoryInfo info = createDataReadMemoryInfo(block.getTasks(), exp, (int)block.getLength(), wordSize);
-		return session.getModelFactory().newMemoryBlock(session, block.getTasks(), exp, wordSize, true, info);
-	}
-	
-	/**
-	 * @param oldBlock
-	 * @param newBlock
-	 * @return
-	 * @throws PDIException
-	 */
-	private BigInteger[] compareBlocks(IPDIMemoryBlock oldBlock, IPDIMemoryBlock newBlock) throws PDIException {
-		byte[] oldBytes = oldBlock.getBytes();
-		byte[] newBytes = newBlock.getBytes();
-		List<BigInteger> aList = new ArrayList<BigInteger>(newBytes.length);
-		BigInteger distance = newBlock.getStartAddress().subtract(oldBlock.getStartAddress());
-		int diff = distance.intValue();
-		if ( Math.abs(diff) <  newBytes.length) {
-			for (int i = 0; i < newBytes.length; i++) {
-				if (i + diff < oldBytes.length && i + diff >= 0) {
-					if (oldBytes[i + diff] != newBytes[i]) {
-						aList.add(newBlock.getStartAddress().add(BigInteger.valueOf(i)));
-					}
-				}
-			}
-		}
-		return (BigInteger[]) aList.toArray(new BigInteger[aList.size()]);
-	}
-	
-	/**
-	 * @param qTasks
-	 * @param exp
-	 * @param units
-	 * @param wordSize
-	 * @return
-	 * @throws PDIException
-	 */
-	private IPDIDataReadMemoryInfo createDataReadMemoryInfo(BitList qTasks, String exp, int units, int wordSize) throws PDIException {
-		IPDIDataReadMemoryRequest request = session.getRequestFactory().getDataReadMemoryRequest(session, qTasks, 0, exp, ExtFormat.HEXADECIMAL, wordSize, 1, units, null);
-		session.getEventRequestManager().addEventRequest(request);
-		return request.getDataReadMemoryInfo(qTasks);
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	private synchronized List<IPDIMemoryBlock> getMemoryBlockList(BitList qTasks) {
-		List<IPDIMemoryBlock> blockList = blockMap.get(qTasks);
-		if (blockList == null) {
-			blockList = Collections.synchronizedList(new ArrayList<IPDIMemoryBlock>());
-			blockMap.put(qTasks, blockList);
-		}
-		return blockList;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.java
deleted file mode 100644
index 0fa51d6..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author clement
- *
- */
-public class PDIResources {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.core.pdi.manager.PDIResources";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-	private PDIResources() {}
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.properties b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.properties
deleted file mode 100644
index 4fcb717..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/PDIResources.properties
+++ /dev/null

@@ -1,33 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 QNX Software Systems 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:
-#     QNX Software Systems - initial API and implementation
-###############################################################################
-
-pdi.Common.No_answer=No answer
-pdi.Common.Not_implemented=Not Implemented
-pdi.SourceManager.Unknown_type=Unknown type
-pdi.RegisterManager.Wrong_register_type=Wrong register type
-pdi.BreakpointManager.Not_a_PTP_breakpoint=Not a PTP breakpoint
-pdi.BreakpointManager.Not_Supported=Not Supported
-pdi.BreakpointManager.Parsing_Error=Parsing Error
-pdi.RuntimeOptions.Unable_to_set_args_target_not_responding=Unable to set arguments: target is not responding
-pdi.RuntimeOptions.Unable_to_set_args=Unable to set arguments: 
-pdi.RuntimeOptions.Unable_to_set_args=Unable to set environment: 
-pdi.RuntimeOptions.Unable_to_set_working_dir=Unable to set working directory: 
-pdi.Session.Unknown_target=Unkown target
-pdi.VariableManager.Unknown_type=Unknown type
-pdi.VariableManager.Wrong_variable_type=Wrong variable type
-pdi.VariableManager.Unknown_variable_object=Unknown variable object
-pdi.model.VariableObject.Target_not_responding=Target is not responding
-pdi.model.Target.Unknown_thread=Unknown thread
-pdi.model.Target.Target_not_responding=Target is not responding
-pdi.model.Target.Cannot_switch_to_thread=Can not switch to thread 
-pdi.model.Target.Inferior_already_running=Inferior is already running
-pdi.model.MemoryBlock.Bad_Offset=Bad Offset
-pdi.mode.Target.Bad_location=Bad location

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/RegisterManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/RegisterManager.java
deleted file mode 100644
index fef6535..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/RegisterManager.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegister;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterGroup;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-/**
- * @author clement
- *
- */
-public class RegisterManager extends AbstractPDIManager implements IPDIRegisterManager {
-	final int MAX_ENTRIES = 150;
-	
-	public RegisterManager(IPDISession session) {
-		super(session, true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager#createRegister(org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor)
-	 */
-	public IPDIRegister createRegister(IPDIRegisterDescriptor regDesc) throws PDIException {
-		throw new PDIException(regDesc.getTasks(), "Not implement RegisterManager - createRegister() yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager#createShadowRegister(org.eclipse.ptp.debug.core.pdi.model.IPDIRegister, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String)
-	 */
-	public IPDIVariable createShadowRegister(IPDIRegister register, IPDIStackFrame frame, String regName) throws PDIException {
-		throw new PDIException(register.getTasks(), "Not implement RegisterManager - createShadowRegister() yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager#destroyRegister(org.eclipse.ptp.debug.core.pdi.model.IPDIRegister)
-	 */
-	public void destroyRegister(IPDIRegister reg) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager#getRegisterGroups(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIRegisterGroup[] getRegisterGroups(BitList qTasks) throws PDIException {
-		//TODO Not implement RegisterManager - getRegisterGroups() yet
-		return new IPDIRegisterGroup[0];
-		//throw new PDIException(qTasks, "Not implement RegisterManager - getRegisterGroups() yet");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList tasks) throws PDIException {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SignalManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SignalManager.java
deleted file mode 100644
index 712fd48..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SignalManager.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDISignalManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor;
-import org.eclipse.ptp.debug.core.pdi.request.IPDICommandRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListSignalsRequest;
-
-/**
- * @author Clement chu
- */
-public class SignalManager extends AbstractPDIManager implements IPDISignalManager {
-	private IPDISignal[] EMPTY_SIGNALS = {};
-	private Map<BitList, List<IPDISignal>> signalsMap;
-
-	public SignalManager(IPDISession session) {
-		super(session, false);
-		signalsMap = new Hashtable<BitList, List<IPDISignal>>();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDISignalManager#getSignals(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDISignal[] getSignals(BitList qTasks) throws PDIException {
-		List<IPDISignal> signalsList = signalsMap.get(qTasks);
-		if (signalsList == null) {
-			update(qTasks);
-		}
-		signalsList = signalsMap.get(qTasks);
-		if (signalsList != null) {
-			return (IPDISignal[])signalsList.toArray(new IPDISignal[0]);
-		}
-		return EMPTY_SIGNALS;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDISignalManager#handle(org.eclipse.ptp.debug.core.pdi.model.IPDISignal, boolean, boolean)
-	 */
-	public void handle(IPDISignal sig, boolean isIgnore, boolean isStop) throws PDIException {
-		StringBuffer buffer = new StringBuffer(sig.getName());
-		buffer.append(" ");
-		if (isIgnore) {
-			buffer.append("ignore");
-		} else {
-			buffer.append("noignore");
-		}
-		buffer.append(" ");
-		if (isStop) {
-			buffer.append("stop");
-		} else  {
-			buffer.append("nostop");
-		}
-		
-		IPDICommandRequest request = session.getRequestFactory().getCommandRequest(sig.getTasks(), buffer.toString());
-		session.getEventRequestManager().addEventRequest(request);
-		request.waitUntilCompleted(sig.getTasks());
-		sig.setHandle(isIgnore, isStop);
-		session.getEventManager().fireEvents(new IPDIEvent[] { 
-				session.getEventFactory().newChangedEvent(
-						session.getEventFactory().newSignalInfo(session, sig.getTasks(), sig.getName(), sig.getDescription(), sig, null)) });
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		signalsMap.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList qTasks) throws PDIException {
-		IPDISignalDescriptor[] new_sigs = createSignals(qTasks);
-		List<IPDIEvent> eventList = new ArrayList<IPDIEvent>(new_sigs.length);
-		List<IPDISignal> signalsList = getSignalsList(qTasks);
-		for (int i = 0; i<new_sigs.length; i++) {
-			IPDISignal sig = findSignal(qTasks, new_sigs[i].getName());
-			if (sig != null) {
-				if (hasSignalChanged(sig, new_sigs[i])) {
-					// Fire ChangedEvent
-					sig.setDescriptor(new_sigs[i]);
-					eventList.add(session.getEventFactory().newChangedEvent(
-							session.getEventFactory().newSignalInfo(session, qTasks, sig.getName(), sig.getDescription(), sig, null)));
-				}
-			} else {
-				signalsList.add(session.getModelFactory().newSignal(session, qTasks, new_sigs[i]));
-			}
-		}
-		IPDIEvent[] events = (IPDIEvent[])eventList.toArray(new IPDIEvent[0]);
-		session.getEventManager().fireEvents(events);
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	private IPDISignalDescriptor[] createSignals(BitList qTasks) throws PDIException {
-		return createSignals(qTasks, null);
-	}
-	
-	/**
-	 * @param qTasks
-	 * @param name
-	 * @return
-	 * @throws PDIException
-	 */
-	private IPDISignalDescriptor[] createSignals(BitList qTasks, String name) throws PDIException {
-		IPDIListSignalsRequest request = session.getRequestFactory().getListSignalsRequest(session, qTasks, name);
-		session.getEventRequestManager().addEventRequest(request);
-		return request.getSignals(qTasks);
-	}
-
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	private synchronized List<IPDISignal> getSignalsList(BitList qTasks) {
-		List<IPDISignal> signalsList = signalsMap.get(qTasks);
-		if (signalsList == null) {
-			signalsList = Collections.synchronizedList(new ArrayList<IPDISignal>());
-			signalsMap.put(qTasks, signalsList);
-		}
-		return signalsList;
-	}
-	
-	/**
-	 * @param sig
-	 * @param desc
-	 * @return
-	 */
-	private boolean hasSignalChanged(IPDISignal sig, IPDISignalDescriptor desc) {
-		return !sig.getName().equals(desc.getName()) || sig.isStopSet() != desc.getStop() || sig.isIgnore() != !desc.getPass();
-	}
-	
-	/**
-	 * @param qTasks
-	 * @param name
-	 * @return
-	 */
-	protected IPDISignal findSignal(BitList qTasks, String name) {
-		IPDISignal sig = null;
-		List<IPDISignal> signalsList = signalsMap.get(qTasks);
-		if (signalsList != null) {
-			IPDISignal[] sigs = (IPDISignal[])signalsList.toArray(new IPDISignal[0]);
-			for (int i = 0; i < sigs.length; i++) {
-				if (sigs[i].getName().equals(name)) {
-					sig = sigs[i];
-					break;
-				}
-			}
-		}
-		return sig;
-	}
-} 

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SourceManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SourceManager.java
deleted file mode 100644
index ee51798..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/SourceManager.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDISourceManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIInstruction;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMixedInstruction;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author Clement chu
- * 
- */
-public class SourceManager extends AbstractPDIManager implements
-		IPDISourceManager {
-	public SourceManager(IPDISession session) {
-		super(session, false);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getDetailTypeName(org.eclipse.ptp.debug.internal.core.pdi.model.Target,
-	 *      java.lang.String)
-	 */
-	public String getDetailTypeName(IPDITarget target, String typename)
-			throws PDIException {
-		throw new PDIException(target.getTasks(),
-				"Not implements SourceManager - getDetailTypeName() yet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getDetailTypeNameFromVariable(org.eclipse.ptp.debug.internal.core.pdi.model.StackFrame,
-	 *      java.lang.String)
-	 */
-	public String getDetailTypeNameFromVariable(IPDIStackFrame frame,
-			String variable) throws PDIException {
-		IPDITarget target = frame.getTarget();
-		IPDIThread currentThread = target.getCurrentThread();
-		IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-		target.lockTarget();
-		try {
-			target.setCurrentThread(frame.getThread(), false);
-			frame.getThread().setCurrentStackFrame(frame, false);
-			return getDetailTypeName(target, variable);
-		} finally {
-			target.setCurrentThread(currentThread, false);
-			currentThread.setCurrentStackFrame(currentFrame, false);
-			target.releaseTarget();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getInstructions(org.eclipse.ptp.core.util.BitList,
-	 *      java.math.BigInteger, java.math.BigInteger)
-	 */
-	public IPDIInstruction[] getInstructions(BitList qTasks, BigInteger start,
-			BigInteger end) throws PDIException {
-		throw new PDIException(qTasks,
-				"Not implemented SourceManager - getInstructions() yet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getInstructions(org.eclipse.ptp.core.util.BitList,
-	 *      java.lang.String, int)
-	 */
-	public IPDIInstruction[] getInstructions(BitList qTasks, String filename,
-			int linenum) throws PDIException {
-		return getInstructions(qTasks, filename, linenum, -1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getInstructions(org.eclipse.ptp.core.util.BitList,
-	 *      java.lang.String, int, int)
-	 */
-	public IPDIInstruction[] getInstructions(BitList qTasks, String filename,
-			int linenum, int lines) throws PDIException {
-		throw new PDIException(qTasks,
-				"Not implemented SourceManager - getInstructions() yet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getMixedInstructions(org.eclipse.ptp.core.util.BitList,
-	 *      java.math.BigInteger, java.math.BigInteger)
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(BitList qTasks,
-			BigInteger start, BigInteger end) throws PDIException {
-		throw new PDIException(qTasks,
-				"Not implemented SourceManager - getMixedInstructions() yet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getMixedInstructions(org.eclipse.ptp.core.util.BitList,
-	 *      java.lang.String, int)
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(BitList qTasks,
-			String filename, int linenum) throws PDIException {
-		return getMixedInstructions(qTasks, filename, linenum, -1);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getMixedInstructions(org.eclipse.ptp.core.util.BitList,
-	 *      java.lang.String, int, int)
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(BitList qTasks,
-			String filename, int linenum, int lines) throws PDIException {
-		throw new PDIException(qTasks,
-				"Not implemented SourceManager - getMixedInstructions() yet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getSourcePaths(org.eclipse.ptp.core.util.BitList)
-	 */
-	public String[] getSourcePaths(BitList qTasks) throws PDIException {
-		throw new PDIException(qTasks,
-				"Not implemented SourceManager - getSourcePaths() yet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getTypeName(org.eclipse.ptp.debug.internal.core.pdi.model.Target,
-	 *      java.lang.String)
-	 */
-	public String getTypeName(IPDITarget target, String variable)
-			throws PDIException {
-		throw new PDIException(target.getTasks(),
-				"Not implements SourceManager - getTypeName() yet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#getTypeNameFromVariable(org.eclipse.ptp.debug.internal.core.pdi.model.StackFrame,
-	 *      java.lang.String)
-	 */
-	public String getTypeNameFromVariable(IPDIStackFrame frame, String variable)
-			throws PDIException {
-		IPDITarget target = frame.getTarget();
-		IPDIThread currentThread = target.getCurrentThread();
-		IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-		target.lockTarget();
-		try {
-			target.setCurrentThread(frame.getThread(), false);
-			frame.getThread().setCurrentStackFrame(frame, false);
-			return getTypeName(target, variable);
-		} finally {
-			target.setCurrentThread(currentThread, false);
-			currentThread.setCurrentStackFrame(currentFrame, false);
-			target.releaseTarget();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.IPDISourceManager#setSourcePaths(org.eclipse.ptp.core.util.BitList,
-	 *      java.lang.String[])
-	 */
-	public void setSourcePaths(BitList qTasks, String[] dirs)
-			throws PDIException {
-		throw new PDIException(qTasks,
-				"Not implemented SourceManager - setSourcePaths() yet");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList qTasks) throws PDIException {
-		// Do dothing here
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TargetManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TargetManager.java
deleted file mode 100644
index dbed54b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TargetManager.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-
-/**
- * @author clement
- *
- */
-public class TargetManager extends AbstractPDIManager implements IPDITargetManager {
-	private Map<BitList, IPDITarget> targetMap;
-
-	public TargetManager(IPDISession session) {
-		super(session, true);
-		targetMap = new HashMap<BitList, IPDITarget>();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager#addTarget(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDITarget addTarget(BitList qTasks) {
-		if (getTarget(qTasks) == null) {
-			IPDITarget target = session.getModelFactory().newTarget(session, qTasks);
-			targetMap.put(qTasks, target);
-			return target;
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager#cleanup()
-	 */
-	public void cleanup() {
-		targetMap.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager#getTarget(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDITarget getTarget(BitList qTasks) {
-		synchronized (targetMap) {
-			return targetMap.get(qTasks);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager#getTargets()
-	 */
-	public IPDITarget[] getTargets() {
-		return targetMap.values().toArray(new IPDITarget[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITargetManager#removeTarget(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean removeTarget(BitList qTasks) {
-		return (targetMap.remove(qTasks) != null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.manager.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		targetMap.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.manager.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList qTasks) throws PDIException {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TaskManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TaskManager.java
deleted file mode 100644
index e0cd381..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/TaskManager.java
+++ /dev/null

@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager;
-
-
-/**
- * @author clement
- *
- */
-public class TaskManager extends AbstractPDIManager implements IPDITaskManager {
-	private BitList terminatedTasks;
-	private BitList suspendedTasks;
-	private BitList registeredTasks;
-	private BitList pendingTasks;
-	private BitList canStepReturnTasks;
-
-	public TaskManager(IPDISession session) {
-		super(session, false);
-		terminatedTasks = new BitList(session.getTotalTasks());
-		suspendedTasks = new BitList(session.getTotalTasks());
-		registeredTasks = new BitList(session.getTotalTasks());
-		pendingTasks = new BitList(session.getTotalTasks());
-		canStepReturnTasks = new BitList(session.getTotalTasks());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#canAllStepReturn(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean canAllStepReturn(BitList tasks) {
-		return getCannotStepReturnTasks(tasks.copy()).isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getCannotStepReturnTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getCannotStepReturnTasks(BitList tasks) {
-		tasks.andNot(getCanStepReturnTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getCanStepReturnTasks()
-	 */
-	public BitList getCanStepReturnTasks() {
-		return canStepReturnTasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getCanStepReturnTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getCanStepReturnTasks(BitList tasks) {
-		tasks.and(getCanStepReturnTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getNonPendingTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getNonPendingTasks(BitList tasks) {
-		tasks.andNot(getPendingTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getNonRunningTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getNonRunningTasks(BitList tasks) {
-		tasks.andNot(getRunningTasks(tasks.copy()));
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getNonSuspendedTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getNonSuspendedTasks(BitList tasks) {
-		tasks.andNot(getSuspendedTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getNonTerminatedTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getNonTerminatedTasks(BitList tasks) {
-		tasks.andNot(getTerminatedTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getPendingTasks()
-	 */
-	public BitList getPendingTasks() {
-		return pendingTasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getPendingTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getPendingTasks(BitList tasks) {
-		tasks.and(getPendingTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getRegisteredTasks()
-	 */
-	public BitList getRegisteredTasks() {
-		return registeredTasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getRegisteredTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getRegisteredTasks(BitList tasks) {
-		tasks.and(getRegisteredTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getRunningTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getRunningTasks(BitList tasks) {
-		tasks.andNot(getTerminatedTasks());
-		tasks.andNot(getSuspendedTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getSuspendedTasks()
-	 */
-	public BitList getSuspendedTasks() {
-		return suspendedTasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getSuspendedTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getSuspendedTasks(BitList tasks) {
-		tasks.and(getSuspendedTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getTerminatedTasks()
-	 */
-	public BitList getTerminatedTasks() {
-		return terminatedTasks;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getTerminatedTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getTerminatedTasks(BitList tasks) {
-		tasks.and(getTerminatedTasks());
-		return tasks;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#getUnregisteredTasks(org.eclipse.ptp.core.util.BitList)
-	 */
-	public BitList getUnregisteredTasks(BitList tasks) {
-		tasks.andNot(getRegisteredTasks());
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#isAllPending(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean isAllPending(BitList tasks) {
-		return getNonPendingTasks(tasks.copy()).isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#isAllRegistered(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean isAllRegistered(BitList tasks) {
-		return getUnregisteredTasks(tasks.copy()).isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#isAllRunning(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean isAllRunning(BitList tasks) {
-		return (!isAllSuspended(tasks) && !isAllTerminated(tasks));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#isAllSuspended(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean isAllSuspended(BitList tasks) {
-		return getNonSuspendedTasks(tasks.copy()).isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#isAllTerminated(org.eclipse.ptp.core.util.BitList)
-	 */
-	public boolean isAllTerminated(BitList tasks) {
-		return getNonTerminatedTasks(tasks.copy()).isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#setCanStepReturnTasks(boolean, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void setCanStepReturnTasks(boolean isAdd, BitList tasks) {
-		if (isAdd)
-			canStepReturnTasks = addTasks(canStepReturnTasks, tasks);
-		else
-			removeTasks(canStepReturnTasks, tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#setPendingTasks(boolean, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void setPendingTasks(boolean isAdd, BitList tasks) {
-		if (isAdd)
-			pendingTasks = addTasks(pendingTasks, tasks);
-		else
-			removeTasks(pendingTasks, tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#setRegisterTasks(boolean, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void setRegisterTasks(boolean isAdd, BitList tasks) {
-		if (isAdd)
-			registeredTasks = addTasks(registeredTasks, tasks);
-		else
-			removeTasks(registeredTasks, tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#setSuspendTasks(boolean, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void setSuspendTasks(boolean isAdd, BitList tasks) {
-		if (isAdd)
-			suspendedTasks = addTasks(suspendedTasks, tasks);
-		else {
-			removeTasks(suspendedTasks, tasks);
-			setCanStepReturnTasks(false, tasks);//remove can step return tasks			
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager#setTerminateTasks(boolean, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void setTerminateTasks(boolean isAdd, BitList tasks) {
-		if (isAdd) {
-			terminatedTasks = addTasks(terminatedTasks, tasks);
-			setSuspendTasks(false, tasks);//remove suspended tasks
-		}
-		else
-			removeTasks(terminatedTasks, tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		/*
-		terminatedTasks = null;
-		suspendedTasks = null;
-		registeredTasks = null;
-		pendingTasks = null;
-		canStepReturnTasks = null;
-		*/
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	@Override
-	public void update(BitList tasks) throws PDIException {
-	}
-	
-	/**
-	 * @param curTasks
-	 * @param newTasks
-	 */
-	private synchronized BitList addTasks(BitList curTasks, BitList newTasks) {
-		if (curTasks.size() < newTasks.size()) {
-			newTasks.or(curTasks);
-			curTasks =  newTasks.copy();
-		}
-		curTasks.or(newTasks);
-		return curTasks;
-	}
-	
-	/**
-	 * @param curTasks
-	 * @param newTasks
-	 */
-	private synchronized void removeTasks(BitList curTasks, BitList newTasks) {
-		curTasks.andNot(newTasks);
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ThreadManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ThreadManager.java
deleted file mode 100644
index 12c3df9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/ThreadManager.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIThreadManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetInfoThreadsRequest;
-
-/**
- * @author clement
- *
- */
-public class ThreadManager extends AbstractPDIManager implements IPDIThreadManager {
-	private static final IPDIThread[] noThreads = new IPDIThread[0];
-	private Map<BitList, IPDIThread[]> threadMap = new Hashtable<BitList, IPDIThread[]>();
-	
-	public ThreadManager(IPDISession session) {
-		super(session, true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIThreadManager#getThreads(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIThread[] getThreads(BitList qTasks) throws PDIException {
-		IPDIThread[] threads =  threadMap.get(qTasks);
-		if (threads == null) {
-			threads = getPThreads(qTasks);
-			threadMap.put(qTasks, threads);
-		}
-		return threads;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		threadMap.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList qTasks) throws PDIException {
-	}
-	
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws PDIException
-	 */
-	private IPDIThread[] getPThreads(BitList qTasks) throws PDIException {
-		IPDIThread[] pthreads = noThreads;
-		int currentThreadId = 0;
-		
-		IPDITarget target = session.findTarget(qTasks);
-		IPDIGetInfoThreadsRequest request = session.getRequestFactory().getGetInfoThreadsRequest(qTasks);
-		session.getEventRequestManager().addEventRequest(request);
-		String[] ids = request.getThreadIds(qTasks);
-		if (ids.length > 0) {
-			pthreads = new IPDIThread[ids.length];
-			for (int i=0; i<ids.length; i++) {
-				pthreads[i] = session.getModelFactory().newThread(session, target, Integer.parseInt(ids[i]));
-			}
-		}
-		else {
-			pthreads = new IPDIThread[] { session.getModelFactory().newThread(session, target, 0) };
-		}
-		currentThreadId = pthreads[0].getId();
-		if (currentThreadId == 0 && pthreads.length > 1) {
-			currentThreadId = pthreads[1].getId();
-		}
-		return pthreads;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/VariableManager.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/VariableManager.java
deleted file mode 100644
index 594e059..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/manager/VariableManager.java
+++ /dev/null

@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.manager;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgument;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegister;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorage;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorageDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListArgumentsRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListLocalVariablesRequest;
-
-/**
- * @author clement
- *
- */
-public class VariableManager extends AbstractPDIManager implements IPDIVariableManager {
-	static final IPDIVariable[] EMPTY_VARIABLES = {};
-	int MAX_STACK_DEPTH = IPDIThread.STACKFRAME_DEFAULT_DEPTH;
-	Map<BitList, List<IPDIVariable>> variablesMap;
-
-	public VariableManager(IPDISession session) {
-		super(session, true);
-		variablesMap = new Hashtable<BitList, List<IPDIVariable>>();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#createArgument(org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor)
-	 */
-	public IPDIArgument createArgument(IPDIArgumentDescriptor argDesc) throws PDIException {
-		IPDIVariable variable = findVariable(argDesc);
-		IPDIArgument argument = null;
-		if (variable != null && variable instanceof IPDIArgument) {
-			argument = (IPDIArgument) variable;
-		}
-		if (argument == null) {
-			IPDIStackFrame stack = argDesc.getStackFrame();
-			IPDITarget target = stack.getTarget();
-			IPDIThread currentThread = target.getCurrentThread();
-			IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-			target.lockTarget();
-			try {
-				target.setCurrentThread(stack.getThread(), false);
-				stack.getThread().setCurrentStackFrame(stack, false);
-				argument = session.getModelFactory().newArgument(session, argDesc, argDesc.getVarId());
-				List<IPDIVariable> variablesList = getVariablesList(argDesc.getTasks());
-				variablesList.add(argument);
-			} finally {
-				target.setCurrentThread(currentThread, false);
-				currentThread.setCurrentStackFrame(currentFrame, false);
-				target.releaseTarget();
-			}
-		}
-		return argument;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#createGlobalVariable(org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor)
-	 */
-	public IPDIGlobalVariable createGlobalVariable(IPDIGlobalVariableDescriptor varDesc) throws PDIException {
-		IPDIVariable variable = findVariable(varDesc);
-		IPDIGlobalVariable global = null;
-		if (variable instanceof IPDIGlobalVariable) {
-			global = (IPDIGlobalVariable)variable;
-		}
-		if (global == null) {
-			global = session.getModelFactory().newGlobalVariable(session, varDesc, varDesc.getVarId());
-			List<IPDIVariable> variablesList = getVariablesList(varDesc.getTasks());
-			variablesList.add(global);
-		}
-		return global;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#createLocalVariable(org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor)
-	 */
-	public IPDILocalVariable createLocalVariable(IPDILocalVariableDescriptor varDesc) throws PDIException {
-		IPDIVariable variable = findVariable(varDesc);
-		IPDILocalVariable local = null;
-		if (variable instanceof IPDILocalVariable) {
-			local = (IPDILocalVariable)variable;
-		}
-		if (local == null) {
-			IPDIStackFrame stack = (IPDIStackFrame)varDesc.getStackFrame();
-			IPDITarget target = stack.getTarget();
-			IPDIThread currentThread = target.getCurrentThread();
-			IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-			target.lockTarget();
-			try {
-				target.setCurrentThread(stack.getThread(), false);
-				stack.getThread().setCurrentStackFrame(stack, false);
-				local = session.getModelFactory().newLocalVariable(session, varDesc, varDesc.getVarId());
-				List<IPDIVariable> variablesList = getVariablesList(varDesc.getTasks());
-				variablesList.add(local);
-			} finally {
-				target.setCurrentThread(currentThread, false);
-				currentThread.setCurrentStackFrame(currentFrame, false);
-				target.releaseTarget();
-			}
-		}
-		return local;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#createThreadStorage(org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorageDescriptor)
-	 */
-	public IPDIThreadStorage createThreadStorage(IPDIThreadStorageDescriptor desc) throws PDIException {
-		throw new PDIException(desc.getTasks(), PDIResources.getString("pdi.VariableManager.Unknown_variable_object"));
-	}
-	
-	/**
-	 * @param varDesc
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIVariable createVariable(IPDIVariableDescriptor varDesc) throws PDIException {
-		if (varDesc instanceof IPDIArgumentDescriptor) {
-			return createArgument((IPDIArgumentDescriptor)varDesc);
-		} else if (varDesc instanceof IPDILocalVariableDescriptor) {
-			return createLocalVariable((IPDILocalVariableDescriptor)varDesc);
-		} else if (varDesc instanceof IPDIGlobalVariableDescriptor) {
-			return createGlobalVariable((IPDIGlobalVariableDescriptor)varDesc);
-		} else if (varDesc instanceof IPDIRegisterDescriptor) {
-			return session.getRegisterManager().createRegister((IPDIRegisterDescriptor)varDesc);
-		} else if (varDesc instanceof IPDIThreadStorageDescriptor) {
-			return createThreadStorage((IPDIThreadStorageDescriptor)varDesc);
-		}
-		throw new PDIException(varDesc.getTasks(), PDIResources.getString("pdi.VariableManager.Unknown_variable_object"));			
-	}
-	
-	/**
-	 * @param qTasks
-	 * @throws PDIException
-	 */
-	public void destroyAllVariables(BitList qTasks) throws PDIException {
-		List<IPDIEvent> eventList = new ArrayList<IPDIEvent>();
-		IPDIVariable[] variables = getVariables(qTasks);
-		for (int i = 0; i < variables.length; ++i) {
-			removeVar(qTasks, variables[i].getVarId());
-			eventList.add(session.getEventFactory().newDestroyedEvent(
-					session.getEventFactory().newVariableInfo(session, qTasks, variables[i].getVarId(), variables[i])));
-		}
-		session.getEventManager().fireEvents((IPDIEvent[]) eventList.toArray(new IPDIEvent[0]));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#destroyVariable(org.eclipse.ptp.debug.core.pdi.model.IPDIVariable)
-	 */
-	public void destroyVariable(IPDIVariable variable) throws PDIException {
-		BitList qTasks = variable.getTasks();
-		List<IPDIVariable> varList = getVariablesList(qTasks);
-		if (varList.contains(variable)) {
-			removeVar(qTasks, variable.getVarId());
-		}
-		IPDIEvent event = session.getEventFactory().newDestroyedEvent(
-				session.getEventFactory().newVariableInfo(session, qTasks, variable.getVarId(), variable));
-		session.getEventManager().fireEvents(new IPDIEvent[] { event });
-	}
-	
-	/**
-	 * XXX: code change that could result in different behavior
-	 * 
-	 * @param v
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIVariable findVariable(IPDIVariableDescriptor v) throws PDIException {
-		IPDIVariable[] vars = getVariables(v.getTasks());
-		for (int i = 0; i < vars.length; i++) {
-			//TODO compare FULL NAME
-			if (vars[i].getFullName().equals(v.getFullName())
-					&& vars[i].equalDescriptors(v)) {
-				return vars[i];
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#getArgumentDescriptors(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame)
-	 */
-	public IPDIArgumentDescriptor[] getArgumentDescriptors(IPDIStackFrame frame) throws PDIException {
-		List<IPDIArgumentDescriptor> argObjects = new ArrayList<IPDIArgumentDescriptor>();
-		IPDITarget target = frame.getTarget();
-		IPDIThread currentThread = target.getCurrentThread();
-		IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-		target.lockTarget();
-		try {
-			target.setCurrentThread(frame.getThread(), false);
-			frame.getThread().setCurrentStackFrame(frame, false);
-						
-			int depth = frame.getThread().getStackFrameCount();
-			int level = frame.getLevel();
-			int diff = depth - level;
-			
-			IPDIListArgumentsRequest request = session.getRequestFactory().getListArgumentsRequest(target.getTasks(), diff, diff);
-			session.getEventRequestManager().addEventRequest(request);
-			String[] args = request.getArguments(target.getTasks());
-			for (int i = 0; i < args.length; i++) {
-				argObjects.add(session.getModelFactory().newArgumentDescriptor(session, target.getTasks(), null, frame, args[i], null, args.length - i, level));
-			}
-		} finally {
-			target.setCurrentThread(currentThread, false);
-			currentThread.setCurrentStackFrame(currentFrame, false);
-			target.releaseTarget();
-		}
-		return (IPDIArgumentDescriptor[]) argObjects.toArray(new IPDIArgumentDescriptor[0]);
-	}
-	
-	/**
-	 * @param tasks
-	 * @param filename
-	 * @param function
-	 * @param name
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDIGlobalVariableDescriptor getGlobalVariableDescriptor(BitList tasks, String filename, String function, String name) throws PDIException {
-		if (filename == null) {
-			filename = new String();
-		}
-		if (function == null) {
-			function = new String();
-		}
-		if (name == null) {
-			name = new String();
-		}
-		StringBuffer buffer = new StringBuffer();
-		if (filename.length() > 0) {
-			buffer.append('\'').append(filename).append('\'').append("::");
-		}
-		if (function.length() > 0) {
-			buffer.append(function).append("::");
-		}
-		buffer.append(name);
-		return session.getModelFactory().newGlobalVariableDescriptor(session, tasks, null, null, buffer.toString(), null, 0, 0);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#getLocalVariableDescriptors(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame)
-	 */
-	public IPDILocalVariableDescriptor[] getLocalVariableDescriptors(IPDIStackFrame frame) throws PDIException {
-		List<IPDILocalVariableDescriptor> varObjects = new ArrayList<IPDILocalVariableDescriptor>();
-		IPDITarget target = frame.getTarget();
-		IPDIThread currentThread = target.getCurrentThread();
-		IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-		target.lockTarget();
-		try {
-			target.setCurrentThread(frame.getThread(), false);
-			frame.getThread().setCurrentStackFrame(frame, false);
-			int level = frame.getLevel();
-			
-			IPDIListLocalVariablesRequest request = session.getRequestFactory().getListLocalVariablesRequest(target.getTasks());
-			session.getEventRequestManager().addEventRequest(request);
-			String[] vars = request.getLocalVariables(target.getTasks());
-			for (int i=0; i<vars.length; i++) {
-				varObjects.add(session.getModelFactory().newLocalVariableDescriptor(session, target.getTasks(), null, frame, vars[i], null, vars.length - i, level));
-			}
-		} finally {
-			target.setCurrentThread(currentThread, false);
-			currentThread.setCurrentStackFrame(currentFrame, false);
-			target.releaseTarget();
-		}
-		return (IPDILocalVariableDescriptor[]) varObjects.toArray(new IPDILocalVariableDescriptor[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#getThreadStorageDescriptors(org.eclipse.ptp.debug.core.pdi.model.IPDIThread)
-	 */
-	public IPDIThreadStorageDescriptor[] getThreadStorageDescriptors(IPDIThread thread) throws PDIException {
-		return new IPDIThreadStorageDescriptor[0];
-	}
-	
-	/**
-	 * @param tasks
-	 * @param varid
-	 * @return
-	 */
-	public IPDIVariable getVariable(BitList tasks, String varid) {
-		IPDIVariable[] vars = getVariables(tasks);
-		for (IPDIVariable var : vars) {
-			if (var.getVarId().equals(varid)) {
-				return var;
-			}
-			IPDIVariable v = var.getChild(varid);
-			if (v != null) {
-				return v;
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#getVariableByName(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDIVariable getVariableByName(BitList tasks, String varname) {
-		IPDIVariable[] vars = getVariables(tasks);
-		for (IPDIVariable var : vars) {
-			if (var.getName().equals(varname))
-				return var;
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#getVariableDescriptorAsArray(org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor, int, int)
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsArray(IPDIVariableDescriptor varDesc, int start, int length) throws PDIException {
-		IPDIThread thread = varDesc.getThread();
-		IPDIStackFrame frame = varDesc.getStackFrame();
-		String name = varDesc.getName();
-		String fullName = varDesc.getFullName();
-		int pos = varDesc.getPosition();
-		int depth = varDesc.getStackDepth();
-		IPDIVariableDescriptor vo = null;
-
-		if (varDesc instanceof IPDIArgumentDescriptor || varDesc instanceof IPDIArgument) {
-			vo = session.getModelFactory().newArgumentDescriptor(session, varDesc.getTasks(), thread, frame, name, fullName, pos, depth);
-		} else if (varDesc instanceof IPDILocalVariableDescriptor || varDesc instanceof IPDILocalVariable) {
-			vo = session.getModelFactory().newLocalVariableDescriptor(session, varDesc.getTasks(), thread, frame, name, fullName, pos, depth);
-		} else if (varDesc instanceof IPDIGlobalVariableDescriptor || varDesc instanceof IPDIGlobalVariable) {
-			vo = session.getModelFactory().newGlobalVariableDescriptor(session, varDesc.getTasks(), thread, frame, name, fullName, pos, depth);
-		} else if (varDesc instanceof IPDIRegisterDescriptor || varDesc instanceof IPDIRegister) {
-			vo = session.getModelFactory().newRegisterDescriptor(session, varDesc.getTasks(), thread, frame, name, fullName, pos, depth);
-		} else if (varDesc instanceof IPDIThreadStorageDescriptor || varDesc instanceof IPDIThreadStorage) {
-			vo = session.getModelFactory().newThreadStorageDescriptor(session, varDesc.getTasks(), thread, frame, name, fullName, pos, depth);
-		} else {
-			throw new PDIException(varDesc.getTasks(), PDIResources.getString("pdi.VariableManager.Unknown_variable_object"));			
-		}
-
-		vo.setCastingArrayStart(varDesc.getCastingArrayStart() + start);
-		vo.setCastingArrayEnd(length);
-		return vo;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager#getVariableDescriptorAsType(org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor, java.lang.String)
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsType(IPDIVariableDescriptor varDesc, String type) throws PDIException {
-		throw new PDIException(varDesc.getTasks(), "Not implemented getVariableDescriptorAsType() yet.");
-	}
-	
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDIVariable[] getVariables(BitList tasks) {
-		List<IPDIVariable> variableList = (List<IPDIVariable>)variablesMap.get(tasks);
-		if (variableList != null) {
-			return (IPDIVariable[]) variableList.toArray(new IPDIVariable[variableList.size()]);
-		}
-		return new IPDIVariable[0];
-	}
-	
-	/**
-	 * @param tasks
-	 * @param varid
-	 * @throws PDIException
-	 */
-	public void removeVar(BitList tasks, String varid) throws PDIException {
-		session.getEventRequestManager().addEventRequest(session.getRequestFactory().getDeleteVariableRequest(tasks, varid));
-	}
-	
-	/**
-	 * @param tasks
-	 * @param varId
-	 * @return
-	 */
-	public IPDIVariable removeVariableFromList(BitList tasks, String varId) {
-		List<IPDIVariable> varList = getVariablesList(tasks);
-		synchronized (varList) {
-			for (Iterator<IPDIVariable> iterator = varList.iterator(); iterator.hasNext();) {
-				IPDIVariable variable = (IPDIVariable)iterator.next();
-				if (variable.getVarId().equals(varId)) {
-					iterator.remove();
-					return variable;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#shutdown()
-	 */
-	public void shutdown() {
-		variablesMap.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.AbstractPDIManager#update(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void update(BitList qTasks) throws PDIException {
-		update(qTasks, new String[0]);
-	}
-	
-	/**
-	 * @param qTasks
-	 * @param vars
-	 * @throws PDIException
-	 */
-	public void update(BitList qTasks, String[] vars) throws PDIException {
-		List<IPDIEvent> eventList = new ArrayList<IPDIEvent>();
-		for (int i = 0; i < vars.length; i++) {
-			IPDIVariable variable = getVariable(qTasks, vars[i]);
-			if (variable != null) {
-				eventList.add(session.getEventFactory().newChangedEvent(
-						session.getEventFactory().newVariableInfo(session, qTasks, variable.getVarId(), variable)));
-			}
-		}
-		session.getEventManager().fireEvents((IPDIEvent[]) eventList.toArray(new IPDIEvent[0]));
-	}
-	
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	private synchronized List<IPDIVariable> getVariablesList(BitList tasks) {
-		List<IPDIVariable> variablesList = (List<IPDIVariable>) variablesMap.get(tasks);
-		if (variablesList == null) {
-			variablesList = Collections.synchronizedList(new ArrayList<IPDIVariable>());
-			variablesMap.put(tasks, variablesList);
-		}
-		return variablesList;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/AddressBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/AddressBreakpoint.java
deleted file mode 100644
index ab2ddc4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/AddressBreakpoint.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-
-/**
- * @author clement
- *
- */
-public class AddressBreakpoint extends LocationBreakpoint implements IPDIAddressBreakpoint {
-	public AddressBreakpoint(IPDISession session, BitList tasks, int type, IPDILocation location, IPDICondition condition, boolean enabled) {
-		super(session, tasks, type, location, condition, enabled);
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Argument.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Argument.java
deleted file mode 100644
index 564876d..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Argument.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgument;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-/**
- * @author clement
- *
- */
-public class Argument extends Variable implements IPDIArgument {
-	public Argument(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		super(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-	
-	public Argument(IPDISession session, IPDIArgumentDescriptor argDesc, String varid) {
-		super(session, argDesc, varid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.Variable#createVariable(org.eclipse.ptp.debug.internal.core.pdi.Session, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.pdi.model.Thread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int, java.lang.String)
-	 */
-	protected IPDIVariable createVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		return new Argument(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ArgumentDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ArgumentDescriptor.java
deleted file mode 100644
index f046a7c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ArgumentDescriptor.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author clement
- *
- */
-public class ArgumentDescriptor extends LocalVariableDescriptor implements IPDIArgumentDescriptor {
-	public ArgumentDescriptor(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String n, String fn, int pos, int depth) {
-		super(session, tasks, thread, frame, n, fn, pos, depth);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Breakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Breakpoint.java
deleted file mode 100644
index f5224be..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Breakpoint.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-
-/**
- * @author clement
- *
- */
-public abstract class Breakpoint extends SessionObject implements IPDIBreakpoint {
-	private static int internal_counter = 0;
-
-	private IPDICondition condition;
-	private int bpid = -1; //by default id is -1
-	private int type;
-	private boolean enable;
-	private boolean deleted = false;
-	private int internal_id;
-
-	private BitList pendingTasks; // tasks remaining to set breakpoint
-
-	public Breakpoint(IPDISession session, BitList tasks, int type, IPDICondition condition, boolean enabled) {
-		super(session, tasks);
-		this.type = type;
-		this.condition = condition;
-		this.enable = enabled;
-		this.internal_id = internal_counter++;
- 		this.pendingTasks = tasks.copy();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#getBreakpointID()
-	 */
-	public int getBreakpointID() {
-		return bpid;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#getCondition()
-	 */
-	public IPDICondition getCondition() throws PDIException {
-		if (condition == null) {
-			condition = new Condition(0, new String(), null);
-		}
-		return condition;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#getInternalID()
-	 */
-	public int getInternalID() {
-		return internal_id;
-	}
-	
-	public BitList getPendingTasks() {
-		return pendingTasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#isDeleted()
-	 */
-	public boolean isDeleted() {
-		return deleted;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#isEnabled()
-	 */
-	public boolean isEnabled() { 
-		return enable;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#isHardware()
-	 */
-	public boolean isHardware() {
-		return (type == IPDIBreakpoint.HARDWARE);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#isTemporary()
-	 */
-	public boolean isTemporary() {
-		return (type == IPDIBreakpoint.TEMPORARY);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#setBreakpointID(int)
-	 */
-	public void setBreakpointID(int bpid) {
-		this.bpid = bpid;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#setCondition(org.eclipse.ptp.debug.core.pdi.IPDICondition)
-	 */
-	public void setCondition(IPDICondition condition) {
-		this.condition = condition;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#setDeleted()
-	 */
-	public void setDeleted() {
-		this.deleted = true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean enabled) {
-		this.enable = enabled;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Condition.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Condition.java
deleted file mode 100644
index da6f3bd..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Condition.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-
-
-/**
- * @author clement
- *
- */
-public class Condition implements IPDICondition {
-	private int ignoreCount;
-	private String expression;
-	private String[] tids;
-
-	public Condition(int ignore, String exp, String[] ids) {
-		ignoreCount = ignore;
-		expression = (exp == null) ? new String() : exp;
-		tids = (ids == null) ? new String[0] : ids;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDICondition#equals(org.eclipse.ptp.debug.core.pdi.IPDICondition)
-	 */
-	public boolean equals(IPDICondition obj) {
-		if (obj instanceof Condition) {
-			Condition cond = (Condition)obj;
-			if (cond.getIgnoreCount() != this.getIgnoreCount())
-				return false;
-			if (cond.getExpression().compareTo(this.getExpression()) != 0)
-				return false;
-			if (cond.getThreadIds().length != this.getThreadIds().length)
-				return false;
-			for (int i = 0; i < cond.getThreadIds().length; ++i) {
-				if (cond.getThreadIds()[i].compareTo(this.getThreadIds()[i]) != 0) {
-					return false;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDICondition#getExpression()
-	 */
-	public String getExpression() {
-		return expression;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDICondition#getIgnoreCount()
-	 */
-	public int getIgnoreCount() {
-		return ignoreCount;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDICondition#getThreadIds()
-	 */
-	public String[] getThreadIds() {
-		return tids;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Exceptionpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Exceptionpoint.java
deleted file mode 100644
index cde71ce..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Exceptionpoint.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-
-/**
- * @author clement
- *
- */
-public class Exceptionpoint extends Breakpoint implements IPDIExceptionpoint {
-	private String clazz;
-	private boolean stopOnThrow;
-	private boolean stopOnCatch;
-	private IPDIFunctionBreakpoint[] funcBpts = {};
-	
-	public Exceptionpoint(IPDISession session, BitList tasks, String clazz, boolean stopOnThrow, boolean stopOnCatch, IPDICondition condition, boolean enabled, IPDIFunctionBreakpoint[] funcBpts) {
-		super(session, tasks, IPDIBreakpoint.REGULAR, condition, enabled);
-		this.clazz = clazz;
-		this.stopOnThrow = stopOnThrow;
-		this.stopOnCatch = stopOnCatch;
-		this.funcBpts = funcBpts;
-	}
-	
-	/**
-	 * @return
-	 */
-	public String getExceptionName() {
-		return clazz;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint#isStopOnThrow()
-	 */
-	public boolean isStopOnThrow() {
-		return stopOnThrow;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint#isStopOnCatch()
-	 */
-	public boolean isStopOnCatch() {
-		return stopOnCatch;
-	}
-	
-	/**
-	 * @return
-	 */
-	public IPDIFunctionBreakpoint[] getFunctionBreakpoints() {
-		return funcBpts;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Expression.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Expression.java
deleted file mode 100644
index 2b5fd59..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Expression.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITargetExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author Clement chu
- *
- */
-public class Expression extends SessionObject implements IPDITargetExpression {
-	private static int ID_COUNT = 0;
-	private int id;
-	private String fExpression;
-	private IPDIVariable variable = null;	
-
-	public Expression(IPDISession session, BitList tasks, String ex) {
-		super(session, tasks);
-		fExpression = ex;
-		id = ++ID_COUNT;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIExpression#dispose()
-	 */
-	public void dispose() throws PDIException {
-		session.getExpressionManager().destroyExpressions(getTasks(), new Expression[] { this });
-		if (variable != null) {
-			session.getExpressionManager().deleteVariable((Variable)variable);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIExpression#equals(org.eclipse.ptp.debug.core.pdi.model.IPDIExpression)
-	 */
-	public boolean equals(IPDIExpression obj) {
-		if (obj instanceof Expression) {
-			Expression other = (Expression) obj;
-			return other.id == id;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIExpression#getAIF()
-	 */
-	public IAIF getAIF() throws PDIException {
-		if (variable == null)
-			return null;
-		return variable.getAIF();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIExpression#getExpressionText()
-	 */
-	public String getExpressionText() {
-		return fExpression;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITargetExpression#getVariable(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame)
-	 */
-	public IPDIVariable getVariable(IPDIStackFrame context) throws PDIException {
-		IPDIVariable var = session.getExpressionManager().createVariable((StackFrame)context, getExpressionText());
-		if (var == null)
-			throw new PDIException(context.getTasks(), "No variable found");
-		
-		variable = var;
-		return var;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIExpression#setAIF(org.eclipse.ptp.debug.core.pdi.model.aif.IAIF)
-	 */
-	public void setAIF(IAIF aif) {
-		if (variable != null) {
-			variable.setAIF(aif);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/FunctionBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/FunctionBreakpoint.java
deleted file mode 100644
index 46a72f8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/FunctionBreakpoint.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-
-/**
- * @author clement
- *
- */
-public class FunctionBreakpoint extends LocationBreakpoint implements IPDIFunctionBreakpoint {
-	public FunctionBreakpoint(IPDISession session, BitList tasks, int type, IPDILocation location, IPDICondition condition, boolean enabled) {
-		super(session, tasks, type, location, condition, enabled);
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariable.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariable.java
deleted file mode 100644
index 34b407b..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariable.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-/**
- * @author clement
- *
- */
-public class GlobalVariable extends Variable implements IPDIGlobalVariable {
-	public GlobalVariable(IPDISession session, IPDIGlobalVariableDescriptor varDesc, String varid) {
-		super(session, varDesc, varid);
-	}
-	
-	public GlobalVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		super(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.Variable#createVariable(org.eclipse.ptp.debug.internal.core.pdi.Session, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.pdi.model.Thread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int, java.lang.String)
-	 */
-	protected IPDIVariable createVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		return new GlobalVariable(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariableDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariableDescriptor.java
deleted file mode 100644
index 1ca2491..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/GlobalVariableDescriptor.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author clement
- *
- */
-public class GlobalVariableDescriptor extends VariableDescriptor implements IPDIGlobalVariableDescriptor {
-	public GlobalVariableDescriptor(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String n, String fn, int pos, int depth) {
-		super(session, tasks, thread, frame, n, fn, pos, depth);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LineBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LineBreakpoint.java
deleted file mode 100644
index 9b2be15..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LineBreakpoint.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-
-/**
- * @author clement
- *
- */
-public class LineBreakpoint extends LocationBreakpoint implements IPDILineBreakpoint {
-	public LineBreakpoint(IPDISession session, BitList tasks, int type, IPDILocation location, IPDICondition condition, boolean enabled) {
-		super(session, tasks, type, location, condition, enabled);
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariable.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariable.java
deleted file mode 100644
index f1de462..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariable.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-/**
- * @author clement
- *
- */
-public class LocalVariable extends Variable implements IPDILocalVariable {
-	public LocalVariable(IPDISession session, IPDILocalVariableDescriptor varDesc, String varid) {
-		super(session, varDesc, varid);
-	}
-	
-	public LocalVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		super(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.Variable#createVariable(org.eclipse.ptp.debug.internal.core.pdi.Session, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.pdi.model.Thread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int, java.lang.String)
-	 */
-	protected IPDIVariable createVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		return new LocalVariable(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariableDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariableDescriptor.java
deleted file mode 100644
index 0b4e5b3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocalVariableDescriptor.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author clement
- *
- */
-public class LocalVariableDescriptor extends VariableDescriptor implements IPDILocalVariableDescriptor {
-	public LocalVariableDescriptor(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String n, String fn, int pos, int depth) {
-		super(session, tasks, thread, frame, n, fn, pos, depth);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocationBreakpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocationBreakpoint.java
deleted file mode 100644
index 04fa153..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/LocationBreakpoint.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIAddressLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDIFunctionLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILineLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDILocationFactory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocationBreakpoint;
-
-/**
- * @author clement
- *
- */
-public abstract class LocationBreakpoint extends Breakpoint implements IPDILocationBreakpoint {
-	private IPDILocation location;
-	
-	public LocationBreakpoint(IPDISession session, BitList tasks, int type, IPDILocation location, IPDICondition condition, boolean enabled) {
-		super(session, tasks, type, condition, enabled);
-		this.location = location;
-	}
-	
-	/**
-	 * @return
-	 */
-	public BigInteger getAddress() {
-		if (location instanceof IPDIAddressLocation) {
-			return ((IPDIAddressLocation)location).getAddress();
-		}
-		return null;
-	}
-	
-	/**
-	 * @return
-	 */
-	public String getFile() {
-		if (location instanceof IPDILineLocation) {
-			return ((IPDILineLocation)location).getFile();
-		}
-		else if (location instanceof IPDIFunctionLocation) {
-			return ((IPDIFunctionLocation)location).getFile();
-		}
-		return null;
-	}
-	
-	/**
-	 * @return
-	 */
-	public String getFunction() {
-		if (location instanceof IPDIFunctionLocation) {
-			return ((IPDIFunctionLocation)location).getFunction();
-		}
-		return null;
-	}
-	
-	/**
-	 * @return
-	 */
-	public int getLineNumber() {
-		if (location instanceof IPDILineLocation) {
-			return ((IPDILineLocation)location).getLineNumber();
-		}
-		return 0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDILocationBreakpoint#getLocator()
-	 */
-	public IPDILocator getLocator() {
-		return PDILocationFactory.newLocator(getFile(), getFunction(), getLineNumber(), getAddress());
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Memory.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Memory.java
deleted file mode 100644
index 7de81ad..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Memory.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemory;
-
-/**
- * @author Clement chu
- * 
- */
-public class Memory implements IPDIMemory {
-	private String addr;
-	private long[] data = new long[0];
-	private List<Integer> badOffsets = new ArrayList<Integer>();
-	private String ascii = "";
-
-	public Memory(String addr, String ascii, String[] values) {
-		this.addr = addr;
-		this.ascii = ascii;
-		parse(values);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIMemory#getAddress()
-	 */
-	public String getAddress() {
-		return addr;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIMemory#getAscii()
-	 */
-	public String getAscii() {
-		return ascii;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIMemory#getBadOffsets()
-	 */
-	public int[] getBadOffsets() {
-		int[] data = new int[badOffsets.size()];
-		for (int i = 0; i < data.length; ++i) {
-			Integer o = (Integer) badOffsets.get(i);
-			data[i] = o.intValue();
-		}
-		return data;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIMemory#getData()
-	 */
-	public long[] getData() {
-		return data;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIMemory#toString()
-	 */
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("addr=\"" + addr + "\"");
-		buffer.append("data=[");
-		for (int i = 0; i < data.length; i++) {
-			if (i != 0) {
-				buffer.append(',');
-			}
-			buffer.append('"').append(Long.toHexString(data[i])).append('"');
-		}
-		buffer.append(']');
-		if (ascii.length() > 0) {
-			buffer.append(",ascii=\"" + ascii + "\"");
-		}
-		return buffer.toString();
-	}
-
-	/**
-	 * @param values
-	 */
-	private void parse(String[] values) {
-		data = new long[values.length];
-		for (int i = 0; i < values.length; i++) {
-			try {
-				data[i] = Long.decode(values[i].trim()).longValue();
-			} catch (NumberFormatException e) {
-				badOffsets.add(new Integer(i));
-				data[i] = 0;
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MemoryBlock.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MemoryBlock.java
deleted file mode 100644
index 01902be..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MemoryBlock.java
+++ /dev/null

@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.ExtFormat;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDataReadMemoryInfo;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIExpressionManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIMemoryManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDataWriteMemoryRequest;
-
-/**
- * @author Clement chu
- * 
- */
-public class MemoryBlock extends SessionObject implements IPDIMemoryBlock {
-	private IPDIDataReadMemoryInfo mem;
-	private int fWordSize;
-	private BigInteger pStartAddress; //cached start address
-
-	private byte[] cBytes; //cached bytes
-	private int[] badOffsets;
-	private boolean fIsLittleEndian;
-	String expression;
-	boolean frozen;
-
-	public MemoryBlock(IPDISession session, BitList tasks, String exp, int wordSize, boolean isLittle, IPDIDataReadMemoryInfo info) {
-		super(session, tasks);
-		expression = exp;
-		fWordSize = wordSize;
-		frozen = true;
-		fIsLittleEndian = isLittle;
-		setDataReadMemoryInfo(info);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#getBytes()
-	 */
-	public byte[] getBytes() throws PDIException {
-		return cBytes;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#getDataReadMemoryInfo()
-	 */
-	public IPDIDataReadMemoryInfo getDataReadMemoryInfo() {
-		return mem;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#getExpression()
-	 */
-	public String getExpression() {
-		return expression;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#getFlags(int)
-	 */
-	public synchronized byte getFlags(int offset) {
-		if (offset < 0 || offset >= getLength()) {
-			throw new IndexOutOfBoundsException();
-		}
-		if (badOffsets == null) {
-			badOffsets = getBadOffsets(mem);
-		}
-		if (badOffsets != null) {
-			for (int i = 0; i < badOffsets.length; ++i) {
-				if (badOffsets[i] == offset) {
-					return 0;
-				}
-			}
-		}
-		return VALID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#getLength()
-	 */
-	public long getLength() {
-		try {
-			return getBytes().length;
-		} catch (PDIException e) {
-			// ignore.
-		}
-		return mem.getTotalBytes();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#getStartAddress()
-	 */
-	public BigInteger getStartAddress() {
-		return pStartAddress;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#getWordSize()
-	 */
-	public int getWordSize() {
-		return fWordSize;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#isFrozen()
-	 */
-	public boolean isFrozen() {
-		return frozen;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#refresh()
-	 */
-	public void refresh() throws PDIException {
-		IPDIMemoryManager mgr = session.getMemoryManager();
-		BigInteger[] addresses = mgr.update(this, null);
-		// Check if this affects other blocks.
-		if (addresses.length > 0) {
-			IPDIMemoryBlock[] blocks = mgr.getMemoryBlocks(getTasks());
-			for (int i = 0; i < blocks.length; i++) {
-				MemoryBlock block = (MemoryBlock)blocks[i];
-				if (! block.equals(this) && block.contains(addresses)) {
-					mgr.update(block, null);
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#setDataReadMemoryInfo(org.eclipse.ptp.debug.core.pdi.model.IPDIDataReadMemoryInfo)
-	 */
-	public void setDataReadMemoryInfo(IPDIDataReadMemoryInfo m) {
-		pStartAddress = ExtFormat.getBigInteger(m.getAddress());
-		cBytes = getBytes(m);
-		mem = m;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#setFrozen(boolean)
-	 */
-	public void setFrozen(boolean frozen) {
-		this.frozen = frozen;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock#setValue(long, byte[])
-	 */
-	public void setValue(long offset, byte[] bytes) throws PDIException {
-		if (offset >= getLength() || offset + bytes.length > getLength()) {
-			throw new PDIException(getTasks(), "No bad offset found");
-		}
-		for (int i = 0; i < bytes.length; i++) {
-			long l = new Byte(bytes[i]).longValue() & 0xff;
-			String value = "0x" + Long.toHexString(l);
-			IPDIDataWriteMemoryRequest request = session.getRequestFactory().getDataWriteMemoryRequest(getTasks(), offset + i, expression, ExtFormat.HEXADECIMAL, 1, value);
-			session.getEventRequestManager().addEventRequest(request);
-			request.waitUntilCompleted(getTasks());
-		}
-		refresh();
-
-		IPDIRegisterManager regMgr = session.getRegisterManager();
-		if (regMgr.isAutoUpdate()) {
-			regMgr.update(getTasks());
-		}
-		
-		IPDIExpressionManager expMgr = session.getExpressionManager();
-		if (expMgr.isAutoUpdate()) {
-			expMgr.update(getTasks());
-		}
-		
-		IPDIVariableManager varMgr = session.getVariableManager();
-		if (varMgr.isAutoUpdate()) {
-			varMgr.update(getTasks());
-		}
-	}
-	
-	/**
-	 * @param addr
-	 * @return
-	 */
-	private boolean contains(BigInteger addr) {
-		BigInteger start = getStartAddress();
-		long length = getLength();
-		if ( start.compareTo(addr) <= 0 && addr.compareTo(start.add(BigInteger.valueOf(length))) <= 0 ) {
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * @param adds
-	 * @return
-	 */
-	private boolean contains(BigInteger[] adds) {
-		for (int i = 0; i < adds.length; i++) {
-			if (contains(adds[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * @param m
-	 * @return
-	 */
-	private int[] getBadOffsets(IPDIDataReadMemoryInfo m) {
-		int[] offsets = new int[0];
-		if (m == null) {
-			return offsets;
-		}
-
-		IPDIMemory[] miMem = m.getMemories();
-		for (int i = 0; i < miMem.length; i++) {
-			int[] data = miMem[i].getBadOffsets();
-			if (data.length > 0) {
-				int olen = offsets.length;
-				int[] newOffsets = new int[olen + data.length];
-				System.arraycopy(offsets, 0, newOffsets, 0, olen);
-				System.arraycopy(data, 0, newOffsets, olen, data.length);
-				offsets = newOffsets;
-			}
-		}
-		return offsets;
-	}
-	
-	/**
-	 * @param m
-	 * @return
-	 */
-	private byte[] getBytes(IPDIDataReadMemoryInfo m) {
-		byte[] bytes = new byte[0];
-		if (m == null) {
-			return bytes;
-		}
-
-		IPDIMemory[] miMem = m.getMemories();
-		for (int i = 0; i < miMem.length; ++i) {
-			long[] data = miMem[i].getData();
-			if (data != null && data.length > 0) {
-				for (int j = 0; j < data.length; ++j) {
-					byte[] bs = longToBytes(data[j]);
-					// grow the array
-					int blen = bytes.length;
-					byte[] newBytes = new byte[blen + bs.length];
-					System.arraycopy(bytes, 0, newBytes, 0, blen);
-					System.arraycopy(bs, 0, newBytes, blen, bs.length);
-					bytes = newBytes;
-				}
-			}
-		}
-		return bytes;
-	}
-	
-	/**
-	 * @param v
-	 * @return
-	 */
-	private byte[] longToBytes(long v) {		
-		// Calculate the number of bytes needed
-		int count = 1;
-		long value = v;
-		for (count = 1; (value /= 0x100) > 0; ++count)
-			;
-
-		// Reset the wordSize if incorrect.
-		if (fWordSize != count) {
-			fWordSize = count;
-		}
-
-		byte[] bytes = new byte[count];
-		if (fIsLittleEndian) {
-			for (int i = count - 1; i >= 0; --i) {
-				int shift = i * count;
-				bytes[i] = (byte)((v >>> shift) & 0xFF);
-			}
-//			bytes[7] = (byte)((v >>> 56) & 0xFF);
-//			bytes[6] = (byte)((v >>> 48) & 0xFF);
-//			bytes[5] = (byte)((v >>> 40) & 0xFF);
-//			bytes[4] = (byte)((v >>> 32) & 0xFF);
-//			bytes[3] = (byte)((v >>> 24) & 0xFF);
-//			bytes[2] = (byte)((v >>> 16) & 0xFF);
-//			bytes[1] = (byte)((v >>>  8) & 0xFF);
-//			bytes[0] = (byte)((v >>>  0) & 0xFF);			
-		} else {
-			for (int i = 0; i < count; ++i) {
-				int shift = (count - i - 1) * count;
-				bytes[i] = (byte)((v >>> shift) & 0xFF);
-			}
-//			bytes[0] = (byte)((v >>> 56) & 0xFF);
-//			bytes[1] = (byte)((v >>> 48) & 0xFF);
-//			bytes[2] = (byte)((v >>> 40) & 0xFF);
-//			bytes[3] = (byte)((v >>> 32) & 0xFF);
-//			bytes[4] = (byte)((v >>> 24) & 0xFF);
-//			bytes[5] = (byte)((v >>> 16) & 0xFF);
-//			bytes[6] = (byte)((v >>>  8) & 0xFF);
-//			bytes[7] = (byte)((v >>>  0) & 0xFF);			
-		}
-		return bytes;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MultiExpressions.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MultiExpressions.java
deleted file mode 100644
index 8c633b8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/MultiExpressions.java
+++ /dev/null

@@ -1,203 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDataEvaluateExpressionRequest;
-
-/**
- * @author clement
- *
- */
-/**
- * @author greg
- *
- */
-public class MultiExpressions extends SessionObject implements IPDIMultiExpressions {
-	class MExpression implements IPDIExpression {
-		private int id;
-		private IAIF aif;
-		public MExpression(int id) {
-			this.id = id;
-		}
-		public void dispose() throws PDIException {
-			aif = null;
-		}
-		public boolean equals(IPDIExpression expr) {
-			if (expr instanceof MExpression) {
-				return ((MExpression)expr).getId() == id;
-			}
-			return false;
-		}
-		public IAIF getAIF() throws PDIException {
-			return aif;
-		}
-		public String getExpressionText() {
-			return expr;
-		}
-		public int getId() {
-			return id;
-		}
-		public void setAIF(IAIF aif) {
-			this.aif = aif;
-		}
-	}
-	
-	private String expr;
-	private boolean enabled;
-	private Map<Integer,IPDIExpression> expressions = new HashMap<Integer,IPDIExpression>();
-	
-	public MultiExpressions(IPDISession session, BitList tasks, String ex, boolean enabled) {
-		super(session, tasks);
-		this.expr = ex;
-		this.enabled = enabled;
-		initital();
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#addExpression(org.eclipse.ptp.debug.core.pdi.model.IPDIExpression)
-	 */
-	public void addExpression(IPDIExpression expression) {
-		if (expression instanceof MExpression) {
-			Integer id = new Integer(((MExpression)expression).getId());
-			expressions.put(id, expression);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#cleanExpressionsValue(org.eclipse.ptp.core.util.BitList, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void cleanExpressionsValue(BitList tasks, IProgressMonitor monitor) {
-		monitor.setTaskName("Cleaning expression ["+expr+"]...");
-		for (int task : tasks.toArray()) {
-			IPDIExpression expression = getExpression(task);
-			if (expression != null) {
-				expression.setAIF(null);
-			}
-			monitor.worked(1);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#getAIF(org.eclipse.ptp.debug.core.pdi.model.IPDIExpression)
-	 */
-	public IAIF getAIF(IPDIExpression expression) throws PDIException {
-		return expression.getAIF();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#getExpression(int)
-	 */
-	public IPDIExpression getExpression(int task) {
-		return expressions.get(new Integer(task));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#getExpressions()
-	 */
-	public IPDIExpression[] getExpressions() {
-		return expressions.values().toArray(new IPDIExpression[0]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#getExpressionText()
-	 */
-	public String getExpressionText() {
-		return expr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return enabled;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#removeExpression(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void removeExpression(BitList tasks) {
-		for (int task : tasks.toArray()) {
-			expressions.remove(new Integer(task));
-		}
-	}
-	
-	public void removeExpression(IPDIExpression expression) {
-		if (expression instanceof MExpression) {
-			Integer id = new Integer(((MExpression)expression).getId());
-			expressions.remove(id);
-		}
-	}
-	
-	/**
-	 * @param enabled
-	 */
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#shutdown()
-	 */
-	public void shutdown() {
-		expressions.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIMultiExpressions#updateExpressionsValue(org.eclipse.ptp.core.util.BitList, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void updateExpressionsValue(BitList tasks, IProgressMonitor monitor) throws PDIException {
-		monitor.setTaskName("Updating expression ["+expr+"]...");
-		IPDIDataEvaluateExpressionRequest request = session.getRequestFactory().getDataEvaluateExpresionRequest(tasks, expr);
-		session.getEventRequestManager().addEventRequest(request);
-		Map<BitList, Object> results = request.getResultMap(tasks);
-		for (Iterator<BitList> i = results.keySet().iterator(); i.hasNext();) {
-			BitList sTasks = i.next();
-			Object obj = results.get(sTasks);
-			if (!(obj instanceof IAIF)) {
-				//set unknown aif for tasks
-				for (int task : sTasks.toArray()) {
-					IPDIExpression expression = getExpression(task);
-					if (expression == null)
-						continue;
-					expression.setAIF(AIFFactory.UNKNOWNAIF());
-				}
-				continue;
-				//throw new PDIException(tasks, "Updating expression value error");
-			}
-				
-			IAIF aif = (IAIF)obj;
-			for (int task : sTasks.toArray()) {
-				IPDIExpression expression = getExpression(task);
-				if (expression == null)
-					continue;
-				if (monitor.isCanceled()) {
-					expression.setAIF(AIFFactory.UNKNOWNAIF());
-					throw new PDIException(tasks, "Updating is cancelled by user");
-				}
-				expression.setAIF(aif);
-				monitor.worked(1);
-			}
-		}
-	}	
-	
-	/**
-	 * 
-	 */
-	private void initital() {
-		for (int task : getTasks().toArray()) {
-			addExpression(new MExpression(task));
-		}
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Register.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Register.java
deleted file mode 100644
index 7b747c5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Register.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegister;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author clement
- *
- */
-public class Register extends Variable implements IPDIRegister {
-	public Register(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String n, String q, int pos, int depth, String varid) {
-		super(session, tasks, thread, frame, n, q, pos, depth, varid);
-	}
-
-	public Register(IPDISession session, RegisterDescriptor obj, String varid) {
-		super(session, obj, varid);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.Variable#dispose()
-	 */
-	public void dispose() throws PDIException {
-		session.getRegisterManager().destroyRegister(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIRegister#getAIF(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame)
-	 */
-	public IAIF getAIF(IPDIStackFrame context) throws PDIException {
-		IPDIVariable var = session.getRegisterManager().createShadowRegister(this, (StackFrame)context, getQualifiedName());
-		return var.getAIF();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.VariableDescriptor#getFullName()
-	 */
-	public String getFullName() {
-		if (fFullName == null) {
-			String n = getName();
-			if (!n.startsWith("$")) {
-				fFullName = "$" + n;
-			} else {
-				fFullName = n;
-			}
-		}
-		return fFullName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.Variable#createVariable(org.eclipse.ptp.debug.internal.core.pdi.Session, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.pdi.model.Thread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int, java.lang.String)
-	 */
-	protected IPDIVariable createVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		return new Register(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/RegisterDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/RegisterDescriptor.java
deleted file mode 100644
index 1d70144..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/RegisterDescriptor.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author clement
- *
- */
-public class RegisterDescriptor extends VariableDescriptor implements IPDIRegisterDescriptor {
-	public RegisterDescriptor(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fn, int pos, int depth) {
-		super(session, tasks, thread, frame, name, fn, pos, depth);
-	}
-	public String getFullName() {
-		if (fFullName == null) {
-			String n = getName();
-			if (!n.startsWith("$")) {
-				fFullName = "$" + n;
-			}
-		}
-		return fFullName;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Signal.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Signal.java
deleted file mode 100644
index 0b397dd..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Signal.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor;
-
-/**
- * @author Clement chu
- */
-public class Signal extends SessionObject implements IPDISignal {
-	private IPDISignalDescriptor desc;
-
-	public Signal(IPDISession session, BitList tasks, IPDISignalDescriptor desc) {
-		super(session, tasks);
-		this.desc = desc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#getDescription()
-	 */
-	public String getDescription() {
-		return desc.getDescription();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#getName()
-	 */
-	public String getName() {
-		return desc.getName();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#handle(boolean, boolean)
-	 */
-	public void handle(boolean isIgnore, boolean isStop) throws PDIException {
-		session.getSignalManager().handle(this, isIgnore, isStop);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#isIgnore()
-	 */
-	public boolean isIgnore() {
-		return !isPass();
-	}
-	
-	/**
-	 * @return
-	 */
-	public boolean isPass() {
-		return desc.getPass();
-	}
-	
-	/**
-	 * @return
-	 */
-	public boolean isPrint() {
-		return desc.getPrint();
-	}
-	
-	/**
-	 * @return
-	 */
-	public boolean isStop() {
-		return desc.getStop();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#isStopSet()
-	 */
-	public boolean isStopSet() {
-		return isStop();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#setHandle(boolean, boolean)
-	 */
-	public void setHandle(boolean isIgnore, boolean isStop) {
-		desc.setPass(!isIgnore);
-		desc.setStop(isStop);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#setDescriptor(org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor)
-	 */
-	public void setDescriptor(IPDISignalDescriptor desc) {
-		this.desc = desc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignal#signal()
-	 */
-	public void signal() throws PDIException {
-		session.resume(getTasks(), this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return desc.toString(); 
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/SignalDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/SignalDescriptor.java
deleted file mode 100644
index 1fe8370..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/SignalDescriptor.java
+++ /dev/null

@@ -1,96 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor;
-
-public class SignalDescriptor implements IPDISignalDescriptor {
-	private String name;
-	private boolean stop;
-	private boolean print;
-	private boolean pass;
-	private String desc;
-
-	public SignalDescriptor(String name, boolean stop, boolean print, boolean pass, String desc) {
-		this.name = name;
-		this.stop = stop;
-		this.print = print;
-		this.pass = pass;
-		this.desc = desc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#getDescription()
-	 */
-	public String getDescription() {
-		return desc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#getPass()
-	 */
-	public boolean getPass() {
-		return pass;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#getPrint()
-	 */
-	public boolean getPrint() {
-		return print;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#getStop()
-	 */
-	public boolean getStop() {
-		return stop;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#setDescription(java.lang.String)
-	 */
-	public void setDescription(String desc) {
-		this.desc = desc;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#setName(java.lang.String)
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#setPass(boolean)
-	 */
-	public void setPass(boolean pass) {
-		this.pass = pass;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#setPrint(boolean)
-	 */
-	public void setPrint(boolean print) {
-		this.print = print;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor#setStop(boolean)
-	 */
-	public void setStop(boolean stop) {
-		this.stop = stop;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return "Name: " + name + ", stop: " + stop + ", print: " + print + ", pass: " + pass + ", desc: " + desc; 
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrame.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrame.java
deleted file mode 100644
index 16e4e92..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrame.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.PDILocationFactory;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgument;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-
-/**
- * @author clement
- *
- */
-public class StackFrame extends SessionObject implements IPDIStackFrame {
-	public class Arg {
-		String name;
-		String value;
-		public Arg(String name, String value) {
-			this.name = name;
-			this.value = value;
-		}
-		public String getName() {
-			return name;
-		}
-		public String getValue() {
-			return value;
-		}
-	}
-	
-	private IPDIThread pthread;
-	private IPDIArgumentDescriptor[] argDescs;
-	private IPDILocalVariableDescriptor[] localDescs;
-	private IPDILocator fLocator;
-
-	//Frame details
-	private int level = -1;
-	private Arg[] args = new Arg[0];
-	
-	public StackFrame(IPDISession session, IPDIThread thread, int level, IPDILocator locator) {
-		super(session, thread.getTasks());
-		this.pthread = thread;
-		this.level = level;
-		this.fLocator = locator;
-		if (args != null) 
-			this.args = args;
-	}
-	
-	public StackFrame(IPDISession session, IPDIThread thread, int level, String file, String func, int line, BigInteger addr) {
-		this(session, thread, level, PDILocationFactory.newLocator(file, func, line, addr));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#createArgument(org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor)
-	 */
-	public IPDIArgument createArgument(IPDIArgumentDescriptor varDesc) throws PDIException {
-		if (varDesc instanceof ArgumentDescriptor) {
-			return session.getVariableManager().createArgument((ArgumentDescriptor)varDesc);
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#createLocalVariable(org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor)
-	 */
-	public IPDILocalVariable createLocalVariable(IPDILocalVariableDescriptor varDesc) throws PDIException {
-		if (varDesc instanceof ArgumentDescriptor) {
-			return createArgument((IPDIArgumentDescriptor)varDesc);
-		} else if (varDesc instanceof LocalVariableDescriptor) {
-			return session.getVariableManager().createLocalVariable((LocalVariableDescriptor)varDesc);			
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#equals(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame)
-	 */
-	public boolean equals(IPDIStackFrame stackframe) {
-		if (stackframe instanceof StackFrame) {
-			StackFrame stack = (StackFrame)stackframe;
-			boolean equal =  pthread != null && pthread.equals(stack.getThread()) && getLevel() == stack.getLevel();
-			if (equal) {
-				IPDILocator otherLocator = stack.getLocator();
-				IPDILocator myLocator = getLocator();
-				if (myLocator.equalFile(otherLocator.getFile())) {
-					if (myLocator.equalFunction(otherLocator.getFunction())) {
-						return true;
-					}
-				}
-			}
-		}
-		return super.equals(stackframe);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#getArgumentDescriptors()
-	 */
-	public IPDIArgumentDescriptor[] getArgumentDescriptors() throws PDIException {
-		if (argDescs == null) {
-			argDescs = session.getVariableManager().getArgumentDescriptors(this);
-		}
-		return argDescs;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#getLevel()
-	 */
-	public int getLevel() {
-		return level;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#getLocalVariableDescriptors()
-	 */
-	public IPDILocalVariableDescriptor[] getLocalVariableDescriptors() throws PDIException {
-		if (localDescs == null) {
-			localDescs = session.getVariableManager().getLocalVariableDescriptors(this);
-		}
-		return localDescs;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#getLocator()
-	 */
-	public IPDILocator getLocator() {
-		if (fLocator != null) {
-			return fLocator;
-		}
-		return PDILocationFactory.newLocator("", "", 0, BigInteger.ZERO);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#getTarget()
-	 */
-	public IPDITarget getTarget() {
-		return getThread().getTarget();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame#getThread()
-	 */
-	public IPDIThread getThread() {
-		return pthread;
-	}
-	
-	/**
-	 * @throws PDIException
-	 */
-	public void stepReturn() throws PDIException {
-		getThread().setCurrentStackFrame(this, false);
-		session.stepReturn(getTasks(), 0);
-	}
-	
-	/**
-	 * @param aif
-	 * @throws PDIException
-	 */
-	public void stepReturn(IAIF aif) throws PDIException {
-		getThread().setCurrentStackFrame(this, false);
-		session.stepReturn(getTasks(), aif);
-	}
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrameDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrameDescriptor.java
deleted file mode 100644
index e2d01c0..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/StackFrameDescriptor.java
+++ /dev/null

@@ -1,35 +0,0 @@
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrameDescriptor;
-
-public class StackFrameDescriptor implements IPDIStackFrameDescriptor {
-	private int			level;
-	private IPDILocator	loc;
-	
-	public StackFrameDescriptor(int level, IPDILocator loc) {
-		this.level = level;
-		this.loc = loc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIStackFrameDescriptor#getLevel()
-	 */
-	public int getLevel() {
-		return this.level;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIStackFrameDescriptor#getLocator()
-	 */
-	public IPDILocator getLocator() {
-		return loc;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.IPDIStackFrameDescriptor#toString()
-	 */
-	public String toString() {
-		return getLevel() + " " + loc.toString();	 
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Target.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Target.java
deleted file mode 100644
index eddbafd..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Target.java
+++ /dev/null

@@ -1,430 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.PDILocationFactory;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIInstruction;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMixedInstruction;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegister;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterGroup;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRuntimeOptions;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISharedLibrary;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrameDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetInfoThreadsRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetThreadSelectRequest;
-
-/**
- * @author clement
- * 
- */
-public class Target extends SessionObject implements IPDITarget {
-	private Thread[] noThreads = new Thread[0];
-	private Thread[] currentThreads;
-	private int currentThreadId;
-	private final ReentrantLock lock = new ReentrantLock();
-
-	public Target(IPDISession session, BitList tasks) {
-		super(session, tasks);
-		currentThreads = noThreads;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#createGlobalVariable(org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor)
-	 */
-	public IPDIGlobalVariable createGlobalVariable(
-			IPDIGlobalVariableDescriptor varDesc) throws PDIException {
-		if (varDesc instanceof IPDIGlobalVariableDescriptor) {
-			IPDIVariableManager varMgr = getSession().getVariableManager();
-			return varMgr.createGlobalVariable((IPDIGlobalVariableDescriptor) varDesc);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#createRegister(org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor)
-	 */
-	public IPDIRegister createRegister(IPDIRegisterDescriptor varDesc)
-			throws PDIException {
-		if (varDesc instanceof RegisterDescriptor) {
-			return session.getRegisterManager().createRegister((RegisterDescriptor) varDesc);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#evaluateExpressionToString(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String)
-	 */
-	public String evaluateExpressionToString(IPDIStackFrame context, String expr)
-			throws PDIException {
-		Target target = (Target) context.getTarget();
-		Thread currentThread = (Thread) target.getCurrentThread();
-		IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-		target.setCurrentThread((IPDIThread) context.getThread(), false);
-		((Thread) context.getThread()).setCurrentStackFrame(
-				(StackFrame) context, false);
-		try {
-			IAIF aif = null;
-			IPDIVariable var = session.getVariableManager().getVariableByName(tasks, expr);
-			if (var == null) {
-				aif = session.getExpressionManager().getExpressionValue(getTasks(), expr);
-			} else {
-				aif = var.getAIF();
-			}
-			if (aif != null)
-				return aif.getValue().toString();
-			throw new PDIException(getTasks(), "Unknonw varibale: " + expr);
-		} finally {
-			target.setCurrentThread(currentThread, false);
-			currentThread.setCurrentStackFrame(currentFrame, false);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#getCurrentThread()
-	 */
-	public synchronized Thread getCurrentThread() throws PDIException {
-		Thread[] threads = getThreads();
-		for (int i = 0; i < threads.length; i++) {
-			Thread pthread = (Thread) threads[i];
-			if (pthread.getId() == currentThreadId) {
-				return pthread;
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#getGlobalVariableDescriptors(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public IPDIGlobalVariableDescriptor getGlobalVariableDescriptors(
-			String filename, String function, String name) throws PDIException {
-		return session.getVariableManager().getGlobalVariableDescriptor(
-				getTasks(), filename, function, name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#getInstructions(java.math.BigInteger, java.math.BigInteger)
-	 */
-	public IPDIInstruction[] getInstructions(BigInteger startAddress,
-			BigInteger endAddress) throws PDIException {
-		return session.getSourceManager().getInstructions(getTasks(),
-				startAddress, endAddress);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#getInstructions(java.lang.String, int)
-	 */
-	public IPDIInstruction[] getInstructions(String filename, int linenum)
-			throws PDIException {
-		return session.getSourceManager().getInstructions(getTasks(), filename,
-				linenum);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#getInstructions(java.lang.String, int, int)
-	 */
-	public IPDIInstruction[] getInstructions(String filename, int linenum,
-			int lines) throws PDIException {
-		return session.getSourceManager().getInstructions(getTasks(), filename,
-				linenum, lines);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#getMixedInstructions(java.math.BigInteger, java.math.BigInteger)
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(BigInteger startAddress,
-			BigInteger endAddress) throws PDIException {
-		return session.getSourceManager().getMixedInstructions(getTasks(),
-				startAddress, endAddress);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#getMixedInstructions(java.lang.String, int)
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(String filename,
-			int linenum) throws PDIException {
-		return session.getSourceManager().getMixedInstructions(getTasks(),
-				filename, linenum);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#getMixedInstructions(java.lang.String, int, int)
-	 */
-	public IPDIMixedInstruction[] getMixedInstructions(String filename,
-			int linenum, int lines) throws PDIException {
-		return session.getSourceManager().getMixedInstructions(getTasks(),
-				filename, linenum, lines);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#getRegisterGroups()
-	 */
-	public IPDIRegisterGroup[] getRegisterGroups() throws PDIException {
-		return session.getRegisterManager().getRegisterGroups(getTasks());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#getRuntimeOptions()
-	 */
-	public IPDIRuntimeOptions getRuntimeOptions() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISharedLibraryManagement#getSharedLibraries()
-	 */
-	public IPDISharedLibrary[] getSharedLibraries() throws PDIException {
-		throw new PDIException(getTasks(),
-				"Not implemented yet - Target: getSharedLibraries()");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#getSourcePaths()
-	 */
-	public String[] getSourcePaths() throws PDIException {
-		return session.getSourceManager().getSourcePaths(getTasks());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#getThreads()
-	 */
-	public synchronized Thread[] getThreads() throws PDIException {
-		if (currentThreads.length == 0) {
-			currentThreads = getPThreads();
-		}
-		return currentThreads;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#lockTarget()
-	 */
-	public void lockTarget() {
-		lock.lock();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#releaseTarget()
-	 */
-	public void releaseTarget() {
-		lock.unlock();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#setCurrentThread(org.eclipse.ptp.debug.internal.core.pdi.model.Thread, boolean)
-	 */
-	public void setCurrentThread(IPDIThread pthread, boolean doUpdate)
-			throws PDIException {
-		if (pthread instanceof IPDIThread) {
-			int id = pthread.getId();
-			if (id == 0) {
-				return;
-			}
-			if (currentThreadId != id) {
-				IPDISetThreadSelectRequest request = session.getRequestFactory().getSetThreadSelectRequest(
-						session, getTasks(), id);
-				session.getEventRequestManager().addEventRequest(request);
-				currentThreadId = request.getThreadId(getTasks());
-				IPDIStackFrameDescriptor frame = request.getStackFrame(getTasks());
-				if (frame != null) {
-					int depth = pthread.getStackFrameCount();
-					IPDILocator locator = PDILocationFactory.newLocator(frame.getLocator()
-							.getFile(), frame.getLocator().getFunction(), frame
-							.getLocator().getLineNumber(), frame.getLocator()
-							.getAddress());
-					pthread.setCurrentStackFrame(session.getModelFactory().newStackFrame(session, pthread, depth
-							- frame.getLevel(), locator));
-				}
-	
-				if (doUpdate) {
-					IPDIRegisterManager regMgr = session.getRegisterManager();
-					if (regMgr.isAutoUpdate()) {
-						regMgr.update(getTasks());
-					}
-					IPDIVariableManager varMgr = session.getVariableManager();
-					if (varMgr.isAutoUpdate()) {
-						varMgr.update(getTasks());
-					}
-				}
-			}
-			if (currentThreadId != id) {
-				session.getEventManager().fireEvents(
-						new IPDIEvent[] { session.getEventFactory().newDestroyedEvent(
-								session.getEventFactory().newThreadInfo(session, getTasks(), id, getThread(id))) });
-				throw new PDIException(getTasks(),
-						"Target - Cannot switch to thread " + id);
-			}
-		} else {
-			throw new PDIException(getTasks(), "Target - Unknown_thread");
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDISourceManagement#setSourcePaths(java.lang.String[])
-	 */
-	public void setSourcePaths(String[] srcPaths) throws PDIException {
-		session.getSourceManager().setSourcePaths(getTasks(), srcPaths);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#setSupended(boolean)
-	 */
-	public synchronized void setSupended(boolean state) {
-		notifyAll();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDITarget#updateState(int)
-	 */
-	public synchronized void updateState(int newThreadId) {
-		Thread[] oldThreads = currentThreads;
-
-		lockTarget();
-		currentThreadId = newThreadId;
-		try {
-			currentThreads = getPThreads();
-		} catch (PDIException e) {
-			currentThreads = noThreads;
-		}
-		releaseTarget();
-
-		List<Integer> pList = new ArrayList<Integer>(currentThreads.length);
-		for (int i = 0; i < currentThreads.length; i++) {
-			boolean found = false;
-			for (int j = 0; j < oldThreads.length; j++) {
-				if (currentThreads[i].getId() == oldThreads[j].getId()) {
-					oldThreads[j].clearState();
-					currentThreads[i] = oldThreads[j];
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				pList.add(new Integer(currentThreads[i].getId()));
-			}
-		}
-		if (!pList.isEmpty()) {
-			IPDIEvent[] events = new IPDIEvent[pList.size()];
-			for (int j = 0; j < events.length; j++) {
-				int id = ((Integer) pList.get(j)).intValue();
-				events[j] = session.getEventFactory().newCreatedEvent(
-						session.getEventFactory().newThreadInfo(session, getTasks(), id, getThread(id)));
-			}
-			session.getEventManager().fireEvents(events);
-		}
-		// Fire destroyed event for old threads
-		List<Integer> dList = new ArrayList<Integer>(oldThreads.length);
-		for (int i = 0; i < oldThreads.length; i++) {
-			boolean found = false;
-			for (int j = 0; j < currentThreads.length; j++) {
-				if (currentThreads[j].getId() == oldThreads[i].getId()) {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				dList.add(new Integer(oldThreads[i].getId()));
-			}
-		}
-		if (!dList.isEmpty()) {
-			IPDIEvent[] events = new IPDIEvent[dList.size()];
-			for (int j = 0; j < events.length; j++) {
-				int id = ((Integer) dList.get(j)).intValue();
-				events[j] = session.getEventFactory().newDestroyedEvent(
-						session.getEventFactory().newThreadInfo(session, getTasks(), id, getThread(id)));
-			}
-			session.getEventManager().fireEvents(events);
-		}
-	}
-
-	/**
-	 * @return
-	 * @throws PDIException
-	 */
-	private synchronized Thread[] getPThreads() throws PDIException {
-		Thread[] pthreads = noThreads;
-		lockTarget();
-		try {
-			IPDIGetInfoThreadsRequest request = session.getRequestFactory().getGetInfoThreadsRequest(
-					getTasks());
-			session.getEventRequestManager().addEventRequest(request);
-			String[] ids = request.getThreadIds(getTasks());
-			if (ids.length > 0) {
-				pthreads = new Thread[ids.length];
-				for (int i = 0; i < ids.length; i++) {
-					int tid = 0;
-					try {
-						tid = Integer.parseInt(ids[i]);
-					} catch (NumberFormatException e) {
-						e.printStackTrace();
-					}
-					pthreads[i] = new Thread(session, this, tid);
-				}
-			} else {
-				pthreads = new Thread[] { new Thread(session, this, 0) };
-			}
-			currentThreadId = pthreads[0].getId();
-			if (currentThreadId == 0 && pthreads.length > 1) {
-				currentThreadId = pthreads[1].getId();
-			}
-		} finally {
-			releaseTarget();
-		}
-		return pthreads;
-	}
-
-	/**
-	 * @param tid
-	 * @return
-	 */
-	private Thread getThread(int tid) {
-		Thread th = null;
-		if (currentThreads != null) {
-			for (int i = 0; i < currentThreads.length; i++) {
-				Thread pthread = currentThreads[i];
-				if (pthread.getId() == tid) {
-					th = pthread;
-					break;
-				}
-			}
-		}
-		return th;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Thread.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Thread.java
deleted file mode 100644
index 0076f5a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Thread.java
+++ /dev/null

@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIRegisterManager;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIVariableManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrameDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorage;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorageDescriptor;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetStackInfoDepthRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListStackFramesRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetCurrentStackFrameRequest;
-
-/**
- * @author clement
- *
- */
-public class Thread extends SessionObject implements IPDIThread {
-	private static IPDIStackFrame[] noStack = new IPDIStackFrame[0];
-	private int id;
-	private String name;
-	private IPDIStackFrame currentFrame = null;
-	private List<IPDIStackFrame> currentFrames = null;
-	private int stackdepth = 0;
-	private IPDITarget target = null;
-
-	public Thread(IPDISession session, IPDITarget target, int threadId) {
-		this(session, target, threadId, null);
-	}
-	
-	public Thread(IPDISession session, IPDITarget target, int threadId, String threadName) {
-		super(session, target.getTasks());
-		this.id = threadId;
-		this.name = threadName;
-		this.target = target;
-	}
-	
-	/**
-	 * 
-	 */
-	public void clearState() {
-		stackdepth = 0;
-		currentFrame = null;
-		currentFrames = null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#createThreadStorage(org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorageDescriptor)
-	 */
-	public IPDIThreadStorage createThreadStorage(IPDIThreadStorageDescriptor varDesc) throws PDIException {
-		if (varDesc instanceof ThreadStorageDescriptor) {
-			IPDIVariableManager varMgr = session.getVariableManager();
-			return varMgr.createThreadStorage((ThreadStorageDescriptor)varDesc);
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#equals(org.eclipse.ptp.debug.core.pdi.model.IPDIThread)
-	 */
-	public boolean equals(IPDIThread thread) {
-		if (thread instanceof Thread) {
-			Thread pthread = (Thread) thread;
-			return id == pthread.getId();
-		}
-		return super.equals(thread);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#getCurrentStackFrame()
-	 */
-	public IPDIStackFrame getCurrentStackFrame() throws PDIException {
-		if (currentFrame == null) {
-			IPDIStackFrame[] frames = getStackFrames(0, 0);
-			if (frames.length > 0) {
-				currentFrame = (StackFrame)frames[0];
-			}
-		}
-		return currentFrame;
-	}
-	
-	/**
-	 * @return
-	 */
-	public int getId() {
-		return id;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#getStackFrameCount()
-	 */
-	public int getStackFrameCount() throws PDIException {
-		if (stackdepth == 0) {
-			Target target = (Target)getTarget();
-			IPDIThread currentThread = (IPDIThread)target.getCurrentThread();
-			target.lockTarget();
-			try {
-				target.setCurrentThread(this, false);
-				IPDIGetStackInfoDepthRequest request = session.getRequestFactory().getGetStackInfoDepthRequest(getTasks());
-				session.getEventRequestManager().addEventRequest(request);
-				stackdepth = request.getDepth(getTasks());
-			} 
-			finally {
-				target.setCurrentThread(currentThread, false);
-				target.releaseTarget();
-			}
-		}
-		return stackdepth;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#getStackFrames()
-	 */
-	public IPDIStackFrame[] getStackFrames() throws PDIException {
-		int depth = getStackFrameCount();
-
-		// refresh if we have nothing or if we have just a subset get everything.
-		if (currentFrames == null || currentFrames.size() < depth) {
-			currentFrames = new ArrayList<IPDIStackFrame>();
-			Target target = (Target)getTarget();
-			IPDIThread currentThread = (IPDIThread)target.getCurrentThread();
-			target.lockTarget();
-			try {
-				target.setCurrentThread(this, false);
-				IPDIListStackFramesRequest request = session.getRequestFactory().getListStackFramesRequest(session, getTasks());
-				session.getEventRequestManager().addEventRequest(request);
-				IPDIStackFrameDescriptor[] frames = request.getStackFrames(getTasks());
-				for (IPDIStackFrameDescriptor frame : frames) {
-					IPDILocator locator = frame.getLocator();
-					currentFrames.add(session.getModelFactory().newStackFrame(session, this, depth - frame.getLevel(), 
-							locator.getFile(), locator.getFunction(), locator.getLineNumber(), locator.getAddress()));
-				}
-			} finally {
-				target.setCurrentThread(currentThread, false);
-				target.releaseTarget();
-			}
-			// assign the currentFrame if it was not done yet.
-			if (currentFrame == null) {
-				for (int i = 0; i < currentFrames.size(); i++) {
-					IPDIStackFrame stack = (IPDIStackFrame) currentFrames.get(i);
-					if (stack.getLevel() == depth) {
-						currentFrame = (StackFrame)stack;
-					}
-				}
-			}
-		}
-		return (IPDIStackFrame[]) currentFrames.toArray(noStack);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#getStackFrames(int, int)
-	 */
-	public IPDIStackFrame[] getStackFrames(int low, int high) throws PDIException {
-		if (currentFrames == null || currentFrames.size() < high) {
-			currentFrames = new ArrayList<IPDIStackFrame>();
-			Target target = (Target)getTarget();
-			IPDIThread currentThread = target.getCurrentThread();
-			target.lockTarget();
-			try {
-				target.setCurrentThread(this, false);
-				int depth = getStackFrameCount();
-				int upperBound;
-				if (high < depth) {
-					upperBound = Math.min(depth, STACKFRAME_DEFAULT_DEPTH);
-				}
-				else {
-					upperBound = depth;
-				}
-				IPDIListStackFramesRequest request = session.getRequestFactory().getListStackFramesRequest(session,
-						getTasks(), 0, upperBound);
-				session.getEventRequestManager().addEventRequest(request);
-				IPDIStackFrameDescriptor[] frames = request.getStackFrames(getTasks());
-				for (IPDIStackFrameDescriptor frame : frames) {
-					IPDILocator locator = frame.getLocator();
-					currentFrames.add(session.getModelFactory().newStackFrame(session, this, depth - frame.getLevel(), 
-							locator.getFile(), locator.getFunction(), locator.getLineNumber(), locator.getAddress()));
-				}
-			} finally {
-				target.setCurrentThread(currentThread, false);
-				target.releaseTarget();
-			}
-			if (currentFrame == null) {
-				for (int i=0; i<currentFrames.size(); i++) {
-					StackFrame f = (StackFrame)currentFrames.get(i);
-					if (f.getLevel() == 0) {
-						currentFrame = f;
-					}
-				}
-			}
-		}
-		List<IPDIStackFrame> list = ((high - low + 1) <= currentFrames.size()) ? currentFrames.subList(low, high + 1) : currentFrames;
-		return (IPDIStackFrame[])list.toArray(noStack);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#getTarget()
-	 */
-	public IPDITarget getTarget() {
-		return target;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#getThreadStorageDescriptors()
-	 */
-	public IPDIThreadStorageDescriptor[] getThreadStorageDescriptors() throws PDIException {
-		IPDIVariableManager varMgr = session.getVariableManager();
-		return varMgr.getThreadStorageDescriptors(this);
-	}
-	
-	public void setCurrentStackFrame(IPDIStackFrame stackframe) throws PDIException {
-		currentFrame = stackframe;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIThread#setCurrentStackFrame(org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, boolean)
-	 */
-	public void setCurrentStackFrame(IPDIStackFrame stackframe, boolean doUpdate) throws PDIException {
-		int frameLevel = 0;
-		if (stackframe != null) {
-			frameLevel = stackframe.getLevel();
-		}
-		// Check to see if we are already at this level
-		if (currentFrame != null && currentFrame.getLevel() == frameLevel) {
-			if (stackframe != null) {
-				Thread aThread = (Thread)stackframe.getThread();
-				if (aThread != null && aThread.getId() == getId()) {
-					return;
-				}
-			}
-		}
-		Target target = (Target)getTarget();
-		int level = getStackFrameCount() - frameLevel;
-		target.lockTarget();
-		try {
-			target.setCurrentThread(this, doUpdate);
-			IPDISetCurrentStackFrameRequest request = session.getRequestFactory().getSetCurrentStackFrameRequest(getTasks(), level);
-			session.getEventRequestManager().addEventRequest(request);
-			request.waitUntilCompleted(getTasks());
-			currentFrame = stackframe;
-			if (doUpdate) {
-				IPDIRegisterManager regMgr = session.getRegisterManager();
-				if (regMgr.isAutoUpdate()) {
-					regMgr.update(target.getTasks());
-				}
-				IPDIVariableManager varMgr = session.getVariableManager();
-				if (varMgr.isAutoUpdate()) {
-					varMgr.update(target.getTasks());
-				}
-			}
-		} 
-		finally {
-			target.releaseTarget();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		String str = Integer.toString(id);
-		if (name != null) {
-			str += " " + name;
-		}
-		return str;
-	}
-	
-	/**
-	 * 
-	 */
-	public void updateState() {
-		try {
-			getCurrentStackFrame();
-		} catch (PDIException e) {}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorage.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorage.java
deleted file mode 100644
index 15d8019..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorage.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorage;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-/**
- * @author clement
- *
- */
-public class ThreadStorage extends Variable implements IPDIThreadStorage {
-	public ThreadStorage(IPDISession session, ThreadStorageDescriptor threadDesc, String varid) {
-		super(session, threadDesc, varid);
-	}
-	
-	public ThreadStorage(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		super(session, tasks, thread, frame, name, fullName, pos, depth, varid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.model.Variable#createVariable(org.eclipse.ptp.debug.internal.core.pdi.Session, org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.pdi.model.Thread, org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame, java.lang.String, java.lang.String, int, int, java.lang.String)
-	 */
-	protected IPDIVariable createVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		return null;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorageDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorageDescriptor.java
deleted file mode 100644
index acdc007..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/ThreadStorageDescriptor.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThreadStorageDescriptor;
-
-/**
- * @author clement
- *
- */
-public class ThreadStorageDescriptor extends VariableDescriptor implements IPDIThreadStorageDescriptor {
-	public ThreadStorageDescriptor(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String n, String fn, int pos, int depth) {
-		super(session, tasks, thread, frame, n, fn, pos, depth);
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Variable.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Variable.java
deleted file mode 100644
index e751c29..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Variable.java
+++ /dev/null

@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeReference;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueArray;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeAggregate;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeDerived;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IValueAggregate;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetPartialAIFRequest;
-
-/**
- * @author clement
- *
- */
-public abstract class Variable extends VariableDescriptor implements IPDIVariable {
-	private static IPDIVariable[] NO_CHILDREN = new IPDIVariable[0];
-	private IPDIVariable[] children = NO_CHILDREN;
-
-	protected String editable = null;
-	protected String language;
-	protected boolean isUpdated = true;
-			
-	public Variable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid) {
-		super(session, tasks, thread, frame, name, fullName, pos, depth);
-		this.varid = varid;
-	}
-	
-	public Variable(IPDISession session, IPDIVariableDescriptor varDesc, String varid) {
-		super(session, varDesc);
-		this.varid = varid;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#dispose()
-	 */
-	public void dispose() throws PDIException {
-		session.getVariableManager().destroyVariable(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#equals(org.eclipse.ptp.debug.core.pdi.model.IPDIVariable)
-	 */
-	public boolean equals(IPDIVariable var) {
-		if (var instanceof Variable) {
-			Variable variable = (Variable) var;
-			return variable.getVarId().equals(getVarId());
-		}
-		return super.equalDescriptors(var);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#getChild(java.lang.String)
-	 */
-	public IPDIVariable getChild(String varid) {
-		for (IPDIVariable variable : children) {
-			if (variable.getVarId().equals(varid)) {
-				return (Variable)variable;
-			}
-			IPDIVariable grandChild = ((IPDIVariable)variable).getChild(varid);
-			if (grandChild != null)
-				return grandChild;
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#getChildren()
-	 */
-	public IPDIVariable[] getChildren() throws PDIException {
-		String fn = getFullName();
-		
-		Target target = (Target)fStackFrame.getTarget();
-		Thread currentThread = (Thread)target.getCurrentThread();
-		IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-		target.lockTarget();
-		try {
-			target.setCurrentThread(fStackFrame.getThread(), false);				
-			((Thread)fStackFrame.getThread()).setCurrentStackFrame(fStackFrame, false);
-
-			IPDIGetPartialAIFRequest request = session.getRequestFactory().getGetPartialAIFRequest(getTasks(), getQualifiedName(), varid, true);
-			session.getEventRequestManager().addEventRequest(request);
-			IAIF aif = request.getPartialAIF(getTasks());
-			String ch_varid = request.getVarId(getTasks());
-	
-			IAIFType type = aif.getType();
-			IAIFValue value = aif.getValue();
-			fTypename = aif.getDescription();
-			if (varid == null) {
-				varid = ch_varid;
-			}
-	
-			if (type instanceof ITypeDerived) {
-				IAIFType baseType = ((ITypeDerived)type).getBaseType();
-				if (type instanceof IAIFTypeArray) {
-					//always get from 0
-					IAIFValue[] values = ((IAIFValueArray)value).getValues();
-					children = new Variable[values.length];
-					for (int i=0; i<children.length; i++) {
-						int index = castingIndex + i;
-						String ch_fn = "(" + fn + ")[" + index + "]";
-						String ch_n = getName() + "[" + index + "]";
-						String ch_k = varid + "." + i;
-						IPDIVariable v = createVariable(session, getTasks(), fThread, fStackFrame, ch_n, ch_fn, getPosition(), getStackDepth(), ch_k);					
-						v.setAIF(AIFFactory.newAIF(baseType, values[i]));
-						children[i] = v;
-					}
-				}
-				else if (type instanceof IAIFTypePointer) {
-					if (baseType instanceof ITypeAggregate) {
-						ITypeAggregate aggrType = (ITypeAggregate)baseType;
-						children = new Variable[aggrType.getNumberOfChildren()];
-						for (int i=0; i<children.length; i++) {
-							String ch_fn = "(" + fn + ")->" + aggrType.getField(i);
-							String ch_n = aggrType.getField(i); 
-							String ch_k = varid + "." + ch_n;
-							IPDIVariable v = createVariable(session, getTasks(), fThread, fStackFrame, ch_n, ch_fn, getPosition(), getStackDepth(), ch_k);
-							v.setAIF(AIFFactory.newAIF(aggrType.getType(i), ((IValueAggregate)value).getValue(i)));
-							children[i] = v;
-						}
-					}
-					else {
-						children = new Variable[1];
-						String ch_fn = "*(" + fn + ")";
-						String ch_n = ch_varid;
-						String ch_k = varid + "." + ch_n;
-						IPDIVariable v = createVariable(session, getTasks(), fThread, fStackFrame, ch_n, ch_fn, getPosition(), getStackDepth(), ch_k);
-						v.setAIF(AIFFactory.newAIF(type, value));
-						children[0] = v;					
-					}
-				}
-			}
-			else if (type instanceof IAIFTypeReference) {
-				children = new Variable[1];
-				String ch_fn = "(" + fn + ")->" + ((IAIFTypeReference)type).getName();
-				String ch_n = ((IAIFTypeReference)type).getName();
-				String ch_k = varid + "." + ch_n;
-				IPDIVariable v = createVariable(session, getTasks(), fThread, fStackFrame, ch_n, ch_fn, getPosition(), getStackDepth(), ch_k);
-				v.setAIF(AIFFactory.newAIF(type, value));
-				children[0] = v;					
-			}
-			else if (type instanceof ITypeAggregate) {
-				ITypeAggregate aggrType = (ITypeAggregate)type;
-				children = new Variable[aggrType.getNumberOfChildren()];
-				for (int i=0; i<children.length; i++) {
-					String ch_fn = "(" + fn + ")." + aggrType.getField(i);
-					String ch_n = aggrType.getField(i); 
-					String ch_k = varid + "." + ch_n;
-					IPDIVariable v = createVariable(session, getTasks(), fThread, fStackFrame, ch_n, ch_fn, getPosition(), getStackDepth(), ch_k);
-					v.setAIF(AIFFactory.newAIF(aggrType.getType(i), ((IValueAggregate)value).getValue(i)));
-					children[i] = v;
-				}
-			}
-			else {
-				children = new Variable[1];
-				String ch_fn = fn;
-				String ch_n = ch_varid;
-				String ch_k = varid + "." + ch_n;
-				IPDIVariable v = createVariable(session, getTasks(), fThread, fStackFrame, ch_n, ch_fn, getPosition(), getStackDepth(), ch_k);
-				v.setAIF(AIFFactory.newAIF(type, value));
-				children[0] = v;
-			}
-			return children;
-		}
-		finally {
-			target.setCurrentThread(currentThread, false);
-			currentThread.setCurrentStackFrame(currentFrame, false);
-			target.releaseTarget();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#getChildren(int, int)
-	 */
-	public IPDIVariable[] getChildren(int findex, int psize) throws PDIException {
-		IPDIVariableDescriptor vo = getVariableDescriptorAsArray(findex, psize);
-		IPDIVariable var = session.getVariableManager().createVariable((VariableDescriptor)vo);
-		return var.getChildren();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#getChildrenNumber()
-	 */
-	public int getChildrenNumber() throws PDIException {
-		IAIF a= getAIF();
-		if (a.getType() instanceof IAIFTypeArray) {
-			return ((IAIFTypeArray)a.getType()).getRange();
-		}
-		if (a.getType() instanceof ITypeAggregate) {
-			return ((ITypeAggregate)a.getType()).getNumberOfChildren();
-		}
-		return 0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#isEditable()
-	 */
-	public boolean isEditable() throws PDIException {
-		if (editable == null) {
-			throw new PDIException(getTasks(), "Not implement yet - Variable: isEditable()");
-		}
-		return (editable == null) ? false : editable.equalsIgnoreCase("true");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#resetValue()
-	 */
-	public void resetValue() {
-		setAIF(null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariable#setValue(java.lang.String)
-	 */
-	public void setValue(String expression) throws PDIException {
-		throw new PDIException(getTasks(), "Not implemented setValue(String) yet.");
-	}
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 * @param thread
-	 * @param frame
-	 * @param name
-	 * @param fullName
-	 * @param pos
-	 * @param depth
-	 * @param varid
-	 * @return
-	 */
-	protected abstract IPDIVariable createVariable(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame frame, String name, String fullName, int pos, int depth, String varid);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/VariableDescriptor.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/VariableDescriptor.java
deleted file mode 100644
index 4336179..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/VariableDescriptor.java
+++ /dev/null

@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.SessionObject;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetPartialAIFRequest;
-
-/**
- * @author clement
- *
- */
-public abstract class VariableDescriptor extends SessionObject implements IPDIVariableDescriptor {
-	/**
-	 * @param var1
-	 * @param var2
-	 * @return
-	 */
-	public static boolean equalsCasting(VariableDescriptor var1, VariableDescriptor var2) {
-		String[] castings1 = var1.getCastingTypes();
-		String[] castings2 = var2.getCastingTypes();
-		if (castings1 == null && castings2 == null) {
-			return true;
-		} else if (castings1 != null && castings2 != null && castings1.length == castings2.length) {
-			for (int i = 0; i < castings1.length; ++i) {
-				if (!castings1[i].equals(castings2[i])) {
-					return false;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	// Casting info.
-	protected String[] castingTypes;
-	protected int castingIndex;
-
-	protected int castingLength;
-	protected String fName;
-	protected int position;
-	protected IPDIStackFrame fStackFrame;
-	protected IPDIThread fThread;
-
-	protected int stackdepth;
-	protected String qualifiedName = null;
-	protected String fFullName = null;
-	protected String fTypename = null;	
-	protected String varid = null;
-	protected IAIF aif = null;
-	
-	public VariableDescriptor(IPDISession session, BitList tasks, IPDIThread thread, IPDIStackFrame stack, String n, String fn, int pos, int depth) {
-		super(session, tasks);
-		fName = n;
-		fFullName = fn;
-		fStackFrame = stack;
-		fThread = thread;
-		position = pos;
-		stackdepth = depth;
-	}
-	
-	public VariableDescriptor(IPDISession session, IPDIVariableDescriptor desc) {
-		super(session, desc.getTasks());
-		this.fName = desc.getName();
-		this.fFullName = desc.getFullName();
-		try {
-			this.fStackFrame = (StackFrame)desc.getStackFrame();
-			this.fThread = (Thread)desc.getThread();
-		} catch (PDIException e) {
-		}
-		this.position = desc.getPosition();
-		this.stackdepth = desc.getStackDepth();
-		this.castingIndex = desc.getCastingArrayStart();
-		this.castingLength = desc.getCastingArrayEnd();
-		this.castingTypes = desc.getCastingTypes();
-	}
-	
-	/*
-	 * FIXME -- it designs for GDB
-	 */
-	/**
-	 * @return
-	 */
-	public String encodeVariable() {
-		String fn = getFullName();
-		if (castingLength > 0 || castingIndex > 0) {
-			StringBuffer buffer = new StringBuffer();
-			buffer.append("*(");
-			buffer.append('(').append(fn).append(')');
-			buffer.append('+').append(castingIndex).append(')');
-			buffer.append('@').append(castingLength);
-			fn = buffer.toString();
-		} else if (castingTypes != null && castingTypes.length > 0) {
-			StringBuffer buffer = new StringBuffer();
-			for (int i = 0; i < castingTypes.length; ++i) {
-				if (castingTypes[i] != null && castingTypes[i].length() > 0) {
-					if (buffer.length() == 0) {
-						buffer.append('(').append(castingTypes[i]).append(')');
-						buffer.append(fn);
-					} else {
-						buffer.insert(0, '(');
-						buffer.append(')');
-						StringBuffer b = new StringBuffer();
-						b.append('(').append(castingTypes[i]).append(')');
-						buffer.insert(0, b.toString());
-					}
-				}
-			}
-			fn = buffer.toString();
-		}
-		return fn;
-	}
-	
-	/**
-	 * @param varDesc
-	 * @return
-	 */
-	public boolean equalDescriptors(IPDIVariableDescriptor varDesc) {
-		if (varDesc instanceof VariableDescriptor) {
-			VariableDescriptor desc = (VariableDescriptor) varDesc;
-			if (desc.getName().equals(getName())
-				&& desc.getCastingArrayStart() == getCastingArrayStart()
-				&& desc.getCastingArrayEnd() == getCastingArrayEnd()
-				&& equalsCasting(desc, this)) {
-
-				// Check the threads
-				IPDIThread varThread = null;
-				IPDIThread ourThread = null;
-				try {
-					varThread = desc.getThread();
-					ourThread = getThread();
-				} catch (PDIException e) {
-					// ignore
-				}
-				if ((ourThread == null && varThread == null) || (varThread != null && ourThread != null && varThread.equals(ourThread))) {
-					// check the stackFrames
-					IPDIStackFrame varFrame = null;
-					IPDIStackFrame ourFrame = null;
-					try {
-						varFrame = desc.getStackFrame();
-						ourFrame = getStackFrame();
-					} catch (PDIException e) {
-						// ignore
-					}
-					if (ourFrame == null && varFrame == null) {
-						return true;
-					} else if (varFrame != null && ourFrame != null && varFrame.equals(ourFrame)) {
-						if (desc.getStackDepth() == getStackDepth()) {
-							if (desc.getPosition() == getPosition()) {
-								return true;
-							}
-						}
-					}
-				}
-				return false;
-			}
-		}
-		return super.equals(varDesc);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getAIF()
-	 */
-	public IAIF getAIF() throws PDIException {
-		if (aif == null) {
-			Target target = (Target)fStackFrame.getTarget();
-			Thread currentThread = (Thread)target.getCurrentThread();
-			IPDIStackFrame currentFrame = currentThread.getCurrentStackFrame();
-			target.lockTarget();
-			try {
-				target.setCurrentThread(fStackFrame.getThread(), false);				
-				((Thread)fStackFrame.getThread()).setCurrentStackFrame(fStackFrame, false);
-			
-				IPDIGetPartialAIFRequest request = session.getRequestFactory().getGetPartialAIFRequest(getTasks(), getQualifiedName(), varid);
-				session.getEventRequestManager().addEventRequest(request);
-				aif = request.getPartialAIF(getTasks());
-				varid = request.getVarId(getTasks());
-			} 
-			finally {
-				target.setCurrentThread(currentThread, false);
-				currentThread.setCurrentStackFrame(currentFrame, false);
-				target.releaseTarget();
-			}
-		}
-		return aif;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getCastingArrayEnd()
-	 */
-	public int getCastingArrayEnd() {
-		return castingLength;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getCastingArrayStart()
-	 */
-	public int getCastingArrayStart() {
-		return castingIndex;
-	}
-	
-	/**
-	 * @return
-	 */
-	public String[] getCastingTypes() {
-		return castingTypes;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getFullName()
-	 */
-	public String getFullName() {
-		if (fFullName == null) {
-			fFullName = getName();
-		}
-		return fFullName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getPosition()
-	 */
-	public int getPosition() {
-		return position;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getQualifiedName()
-	 */
-	public String getQualifiedName() throws PDIException {
-		if (qualifiedName == null) {
-			qualifiedName = encodeVariable();
-		}
-		return qualifiedName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getStackDepth()
-	 */
-	public int getStackDepth() {
-		return stackdepth;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getStackFrame()
-	 */
-	public IPDIStackFrame getStackFrame() throws PDIException {
-		return fStackFrame;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getThread()
-	 */
-	public IPDIThread getThread() throws PDIException {
-		return fThread;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getTypeName()
-	 */
-	public String getTypeName() throws PDIException {
-		if (fTypename == null) {
-			fTypename = getAIF().getType().toString();
-		}
-		return fTypename;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getVariableDescriptorAsArray(int, int)
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsArray(int start, int length) throws PDIException {
-		return session.getVariableManager().getVariableDescriptorAsArray(this, start, length);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getVariableDescriptorAsType(java.lang.String)
-	 */
-	public IPDIVariableDescriptor getVariableDescriptorAsType(String type) throws PDIException {
-		return session.getVariableManager().getVariableDescriptorAsType(this, type);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#getVarId()
-	 */
-	public String getVarId() {
-		return varid;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#setAIF(org.eclipse.ptp.debug.core.pdi.model.aif.IAIF)
-	 */
-	public void setAIF(IAIF aif) {
-		this.aif = aif;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#setCastingArrayEnd(int)
-	 */
-	public void setCastingArrayEnd(int end) {
-		castingLength = end;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#setCastingArrayStart(int)
-	 */
-	public void setCastingArrayStart(int start) {
-		castingIndex = start;
-	}
-	
-	/**
-	 * @param t
-	 */
-	public void setCastingTypes(String[] t) {
-		castingTypes = t;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor#sizeof()
-	 */
-	public int sizeof() throws PDIException {
-		return getAIF().getType().sizeof();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Watchpoint.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Watchpoint.java
deleted file mode 100644
index ca8325a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/model/Watchpoint.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.model;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-
-/**
- * @author clement
- *
- */
-public class Watchpoint extends Breakpoint implements IPDIWatchpoint {
-	private int watchType;
-	private String expression;
-	
-	public Watchpoint(IPDISession session, BitList tasks, int type, String expression, int wType, IPDICondition condition, boolean enabled) {
-		super(session, tasks, type, condition, enabled);
-		this.watchType = wType;
-		this.expression = expression;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint#getWatchExpression()
-	 */
-	public String getWatchExpression() throws PDIException {
-		return expression;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint#isReadType()
-	 */
-	public boolean isReadType() {
-		return ((watchType & IPDIWatchpoint.READ) == IPDIWatchpoint.READ);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint#isWriteType()
-	 */
-	public boolean isWriteType() {
-		return ((watchType & IPDIWatchpoint.WRITE) == IPDIWatchpoint.WRITE);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/BreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/BreakpointRequest.java
deleted file mode 100644
index 5ad6ed5..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/BreakpointRequest.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIBreakpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public abstract class BreakpointRequest extends AbstractEventRequest implements IPDIBreakpointRequest {
-	protected IPDIBreakpoint bpt;
-	protected boolean allowUpdate;
-	
-	public BreakpointRequest(BitList tasks, IPDIBreakpoint bpt) {
-		this(tasks, bpt, true);
-	}
-	
-	public BreakpointRequest(BitList tasks, IPDIBreakpoint bpt, boolean allowUpdate) {
-		super(tasks);
-		this.bpt = bpt;
-		this.allowUpdate = allowUpdate;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIBreakpointRequest#getBreakpoint()
-	 */
-	public IPDIBreakpoint getBreakpoint() {
-		return bpt;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIBreakpointRequest#isAllowUpdate()
-	 */
-	public boolean isAllowUpdate() {
-		return allowUpdate;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/CommandRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/CommandRequest.java
deleted file mode 100644
index d01ac1c..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/CommandRequest.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventResultRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDICommandRequest;
-
-/**
- * @author clement
- *
- */
-public class CommandRequest extends AbstractEventResultRequest implements IPDICommandRequest {
-	private String command;
-	
-	public CommandRequest(BitList tasks, String command) {
-		super(tasks);
-		this.command = command;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Command request";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	protected void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.commandRequest(tasks, command);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DataWriteMemoryRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DataWriteMemoryRequest.java
deleted file mode 100644
index b7b1e56..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DataWriteMemoryRequest.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventResultRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDataWriteMemoryRequest;
-
-/**
- * @author clement
- *
- */
-public class DataWriteMemoryRequest extends AbstractEventResultRequest implements IPDIDataWriteMemoryRequest {
-	private long offset;
-	private String address;
-	private int wordFormat;
-	private int wordSize;
-	private String value;
-	
-	public DataWriteMemoryRequest(BitList tasks, long offset, String address, int wordFormat, int wordSize, String value) {
-		super(tasks);
-		this.offset = offset;
-		this.address = address;
-		this.wordSize = wordSize;
-		this.value = value;
-		this.wordFormat = wordFormat;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.createDataWriteMemory(tasks, offset, address, wordFormat, wordSize, value);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Create data write memory request";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteBreakpointRequest.java
deleted file mode 100644
index 52ae8f9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteBreakpointRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDeleteBreakpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public class DeleteBreakpointRequest extends BreakpointRequest implements IPDIDeleteBreakpointRequest {
-	public DeleteBreakpointRequest(BitList tasks, IPDIBreakpoint bpt, boolean allowUpdate) {
-		super(tasks, bpt, allowUpdate);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.deleteBreakpoint(getTasks(), getBreakpoint().getBreakpointID());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Delete Breakpoint Request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteVariableRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteVariableRequest.java
deleted file mode 100644
index f0bd95a..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DeleteVariableRequest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventResultRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDeleteVariableRequest;
-
-/**
- * @author clement
- *
- */
-public class DeleteVariableRequest extends AbstractEventResultRequest implements IPDIDeleteVariableRequest {
-	private String varid;
-	
-	public DeleteVariableRequest(BitList tasks, String varid) {
-		super(tasks);
-		this.varid = varid;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.deleteVariable(tasks, varid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Delete variable request";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DisableBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DisableBreakpointRequest.java
deleted file mode 100644
index 3c0be99..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/DisableBreakpointRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDisableBreakpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public class DisableBreakpointRequest extends BreakpointRequest implements IPDIDisableBreakpointRequest {
-	public DisableBreakpointRequest(BitList tasks, IPDIBreakpoint bpt) {
-		super(tasks, bpt);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.setEnabledBreakpoint(getTasks(), getBreakpoint().getBreakpointID(), false);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Disable Breakpoint Request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/EnableBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/EnableBreakpointRequest.java
deleted file mode 100644
index 5907e84..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/EnableBreakpointRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEnableBreakpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public class EnableBreakpointRequest extends BreakpointRequest implements IPDIEnableBreakpointRequest {
-	public EnableBreakpointRequest(BitList tasks, IPDIBreakpoint bpt) {
-		super(tasks, bpt);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.setEnabledBreakpoint(getTasks(), getBreakpoint().getBreakpointID(), true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Enable Breakpoint Request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/ResumeRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/ResumeRequest.java
deleted file mode 100644
index dbfa96f..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/ResumeRequest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGoRequest;
-
-
-/**
- * @author clement
- *
- */
-public class ResumeRequest extends AbstractEventRequest implements IPDIGoRequest {
-	private boolean passSignal = false;
-	
-	public ResumeRequest(BitList tasks, boolean passSignal) {
-		super(tasks);
-		this.passSignal = passSignal;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.resume(tasks, passSignal);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Resume request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetAddressBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetAddressBreakpointRequest.java
deleted file mode 100644
index f8c67e3..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetAddressBreakpointRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetAddressBreakpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public class SetAddressBreakpointRequest extends BreakpointRequest implements IPDISetAddressBreakpointRequest {
-	public SetAddressBreakpointRequest(BitList tasks, IPDIAddressBreakpoint bpt, boolean allowUpdate) {
-		super(tasks, bpt, allowUpdate);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.setAddressBreakpoint(getTasks(), (IPDIAddressBreakpoint)getBreakpoint());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Set Address Breakpoint Request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetFunctionBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetFunctionBreakpointRequest.java
deleted file mode 100644
index d46a521..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetFunctionBreakpointRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetFunctionBreakpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public class SetFunctionBreakpointRequest extends BreakpointRequest implements IPDISetFunctionBreakpointRequest {
-	public SetFunctionBreakpointRequest(BitList tasks, IPDIFunctionBreakpoint bpt, boolean allowUpdate) {
-		super(tasks, bpt, allowUpdate);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.setFunctionBreakpoint(getTasks(), (IPDIFunctionBreakpoint)getBreakpoint());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Set Function Breakpoint Request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetLineBreakpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetLineBreakpointRequest.java
deleted file mode 100644
index c888437..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetLineBreakpointRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetLineBreakpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public class SetLineBreakpointRequest extends BreakpointRequest implements IPDISetLineBreakpointRequest {
-	public SetLineBreakpointRequest(BitList tasks, IPDILineBreakpoint bpt, boolean allowUpdate) {
-		super(tasks, bpt, allowUpdate);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.setLineBreakpoint(getTasks(), (IPDILineBreakpoint)getBreakpoint());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Set Line Breakpoint Request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetWatchpointRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetWatchpointRequest.java
deleted file mode 100644
index 9792db4..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SetWatchpointRequest.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetWatchpointRequest;
-
-
-/**
- * @author clement
- *
- */
-public class SetWatchpointRequest extends BreakpointRequest implements IPDISetWatchpointRequest {
-	public SetWatchpointRequest(BitList tasks, IPDIWatchpoint bpt, boolean allowUpdate) {
-		super(tasks, bpt, allowUpdate);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.setWatchpoint(getTasks(), (IPDIWatchpoint)getBreakpoint());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Set Line Breakpoint Request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StartDebuggerRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StartDebuggerRequest.java
deleted file mode 100644
index 12d4603..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StartDebuggerRequest.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventResultRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStartDebuggerRequest;
-
-
-/**
- * @author clement
- *
- */
-public class StartDebuggerRequest extends AbstractEventResultRequest implements IPDIStartDebuggerRequest {
-	private String app;
-	private String path;
-	private String dir;
-	private String[] args;
-	
-	public StartDebuggerRequest(BitList tasks, String app, String path, String dir, String[] args) {
-		super(tasks);
-		this.app = app;
-		this.path = path;
-		this.dir = dir;
-		this.args = args;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.startDebugger(app, path, dir, args);	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Start debugger request";
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#getResponseAction()
-     */
-    public int getResponseAction() {
-    	return ACTION_TERMINATED;
-    }
-    
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepFinishRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepFinishRequest.java
deleted file mode 100644
index 5237c77..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepFinishRequest.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepFinishRequest;
-
-
-/**
- * @author clement
- *
- */
-public class StepFinishRequest extends StepRequest implements IPDIStepFinishRequest {
-	public StepFinishRequest(BitList tasks, int count) {
-		super(tasks, count);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.stepReturn(tasks, count);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.StepRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Step finish request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepIntoRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepIntoRequest.java
deleted file mode 100644
index 064a8b9..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepIntoRequest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepIntoRequest;
-
-
-/**
- * @author clement
- *
- */
-public class StepIntoRequest extends StepRequest implements IPDIStepIntoRequest {
-	public StepIntoRequest(BitList tasks) {
-		this(tasks, 1);
-	}
-	
-	public StepIntoRequest(BitList tasks, int count) {
-		super(tasks, count);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.stepInto(tasks, count);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.StepRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Step into request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepOverRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepOverRequest.java
deleted file mode 100644
index 1d50531..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepOverRequest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepOverRequest;
-
-
-/**
- * @author clement
- *
- */
-public class StepOverRequest extends StepRequest implements IPDIStepOverRequest {
-	public StepOverRequest(BitList tasks) {
-		this(tasks, 1);
-	}
-	
-	public StepOverRequest(BitList tasks, int count) {
-		super(tasks, count);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.stepOver(tasks, count);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.StepRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Step over request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepRequest.java
deleted file mode 100644
index d6195c8..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StepRequest.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepRequest;
-
-
-/**
- * @author clement
- *
- */
-public abstract class StepRequest extends AbstractEventRequest implements IPDIStepRequest {
-	protected int count = 0;
-	
-	public StepRequest(BitList tasks, int count) {
-		super(tasks);
-		this.count = count;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StopDebuggerRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StopDebuggerRequest.java
deleted file mode 100644
index aeba49e..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/StopDebuggerRequest.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStopDebuggerRequest;
-
-
-/**
- * @author clement
- *
- */
-public class StopDebuggerRequest extends AbstractEventRequest implements IPDIStopDebuggerRequest {
-	public StopDebuggerRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.stopDebugger();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Stop debugger request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SuspendRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SuspendRequest.java
deleted file mode 100644
index 3964e1e..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/SuspendRequest.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIHaltRequest;
-
-
-/**
- * @author clement
- *
- */
-public class SuspendRequest extends AbstractEventRequest implements IPDIHaltRequest {
-	private boolean sendEvent;
-
-	public SuspendRequest(BitList tasks) {
-		this(tasks, true);
-	}
-	
-	public SuspendRequest(BitList tasks, boolean sendEvent) {
-		super(tasks);
-		this.sendEvent = sendEvent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.suspend(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Suspend request";
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#sendEvent()
-	 */
-	public boolean sendEvent() {
-		return sendEvent;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/TerminateRequest.java b/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/TerminateRequest.java
deleted file mode 100644
index d74df9e..0000000
--- a/debug/org.eclipse.ptp.debug.core/pdi/org/eclipse/ptp/debug/internal/core/pdi/request/TerminateRequest.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDITerminateRequest;
-
-
-/**
- * @author clement
- *
- */
-public class TerminateRequest extends AbstractEventRequest implements IPDITerminateRequest {
-	public TerminateRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doExecute(org.eclipse.ptp.debug.core.pdi.IPDIDebugger)
-	 */
-	public void doExecute(IPDIDebugger debugger) throws PDIException {
-		debugger.terminate(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventRequest#doFinish()
-	 */
-	public void doFinish() throws PDIException {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest#getName()
-	 */
-	public String getName() {
-		return "Terminate request";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/plugin.properties b/debug/org.eclipse.ptp.debug.core/plugin.properties
deleted file mode 100644
index 0909440..0000000
--- a/debug/org.eclipse.ptp.debug.core/plugin.properties
+++ /dev/null

@@ -1,37 +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
-#
-# Contributors:
-#     Clement Chu
-#################################################################################
-
-pluginName=PTP Debug Core
-pluginProvider=Eclipse.org
-
-containerName.mapping=Path Mapping
-containerDescription.mapping=A path mapping.
-containerName.mapEntry=Path Map Entry
-containerDescription.mapEntry=An entry in a path mapping.
-containerName.directory=Directory
-containerDescription.directory=A directory in the local file system
-
-
-PLineBreakpoint.name=Parallel Line Breakpoint
-PAddressBreakpoint.name=Parallel Address Breakpoint
-PFunctionBreakpoint.name=Parallel Function Breakpoint
-PWatchBreakpoint.name=Parallel Watch Breakpoint

diff --git a/debug/org.eclipse.ptp.debug.core/plugin.xml b/debug/org.eclipse.ptp.debug.core/plugin.xml
deleted file mode 100644
index fbf6147..0000000
--- a/debug/org.eclipse.ptp.debug.core/plugin.xml
+++ /dev/null

@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="parallelDebuggers" name="Parallel Debuggers" schema="schema/parallelDebuggers.exsd"/>
-
-   <extension
-         id="pBreakpointMarker"
-         point="org.eclipse.core.resources.markers">
-     <super
-           type="org.eclipse.debug.core.breakpointMarker">
-     </super>
-     <persistent
-           value="false">
-     </persistent>
-     <attribute
-           name="org.eclipse.ptp.debug.core.condition">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.ignoreCount">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.threadId">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.installCount">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.sourceHandle">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.jobid">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.setid">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.cursetid">
-     </attribute>
-   </extension>
-   <extension
-         id="commonPLineBreakpointMarker"
-         point="org.eclipse.core.resources.markers">
-     <super
-           type="org.eclipse.ptp.debug.core.pBreakpointMarker">
-     </super>
-     <super
-           type="org.eclipse.debug.core.lineBreakpointMarker">
-     </super>
-     <persistent
-           value="false">
-     </persistent>
-   </extension>
-   <extension
-         id="pLineBreakpointMarker"
-         point="org.eclipse.core.resources.markers">
-     <super
-           type="org.eclipse.ptp.debug.core.commonPLineBreakpointMarker">
-     </super>
-     <persistent
-           value="false">
-     </persistent>
-     <attribute
-           name="org.eclipse.ptp.debug.core.function">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.address">
-     </attribute>
-   </extension>
-   <extension
-         id="pAddressBreakpointMarker"
-         point="org.eclipse.core.resources.markers">
-     <super
-           type="org.eclipse.ptp.debug.core.commonPLineBreakpointMarker">
-     </super>
-     <persistent
-           value="false">
-     </persistent>
-   </extension>
-   <extension
-         id="pFunctionBreakpointMarker"
-         point="org.eclipse.core.resources.markers">
-     <super
-           type="org.eclipse.ptp.debug.core.commonPLineBreakpointMarker">
-     </super>
-     <persistent
-           value="false">
-     </persistent>
-   </extension>
-   <extension
-         id="pWatchpointMarker"
-         point="org.eclipse.core.resources.markers">
-     <super
-           type="org.eclipse.ptp.debug.core.pBreakpointMarker">
-     </super>
-     <persistent
-           value="false">
-     </persistent>
-     <attribute
-           name="org.eclipse.ptp.debug.core.expression">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.write">
-     </attribute>
-     <attribute
-           name="org.eclipse.ptp.debug.core.read">
-     </attribute>
-   </extension>
-
-   <extension
-         point="org.eclipse.debug.core.breakpoints">
-      <breakpoint
-            markerType="org.eclipse.ptp.debug.core.pLineBreakpointMarker"
-            class="org.eclipse.ptp.debug.internal.core.breakpoint.PLineBreakpoint"
-            name="%PLineBreakpoint.name"
-            id="pLineBreakpoint">
-      </breakpoint>
-      <breakpoint
-            markerType="org.eclipse.ptp.debug.core.pAddressBreakpointMarker"
-            class="org.eclipse.ptp.debug.internal.core.breakpoint.PAddressBreakpoint"
-            name="%PAddressBreakpoint.name"
-            id="pAddressBreakpoint">
-      </breakpoint>
-      <breakpoint
-            markerType="org.eclipse.ptp.debug.core.pFunctionBreakpointMarker"
-            class="org.eclipse.ptp.debug.internal.core.breakpoint.PFunctionBreakpoint"
-            name="%PFunctionBreakpoint.name"
-            id="pFunctionBreakpoint">
-      </breakpoint>
-      <breakpoint
-            markerType="org.eclipse.ptp.debug.core.pWatchpointMarker"
-            class="org.eclipse.ptp.debug.internal.core.breakpoint.PWatchpoint"
-            name="%PWatchBreakpoint.name"
-            id="pWatchpoint">
-      </breakpoint>
-   </extension>
-   
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.ptp.debug.internal.core.PreferenceInitializer"/>
-   </extension>
-	<extension
-		point="org.eclipse.debug.core.sourcePathComputers">
-		<sourcePathComputer
-			class="org.eclipse.ptp.debug.internal.core.sourcelookup.PSourcePathComputerDelegate"
-			id="org.eclipse.ptp.debug.core.sourcePathComputer"/>
-	</extension>
-	<extension
-		point="org.eclipse.debug.core.sourceLocators">
-		<sourceLocator
-			class="org.eclipse.ptp.debug.core.sourcelookup.PSourceLookupDirector"
-			name="PTP Source Locator"
-			id="org.eclipse.ptp.debug.core.sourceLocator"/>
-	</extension>
-	<extension
-		point="org.eclipse.debug.core.sourceContainerTypes">
-		<sourceContainerType
-			class="org.eclipse.ptp.debug.internal.core.sourcelookup.MappingSourceContainerType"
-			description="%containerDescription.mapping"
-			id="org.eclipse.ptp.debug.core.containerType.mapping"
-			name="%containerName.mapping"/>
-		<sourceContainerType
-			class="org.eclipse.ptp.debug.internal.core.sourcelookup.MapEntrySourceContainerType"
-			description="%containerDescription.mapEntry"
-			id="org.eclipse.ptp.debug.core.containerType.mapEntry"
-			name="%containerName.mapEntry"/>
-		<sourceContainerType
-			class="org.eclipse.ptp.debug.internal.core.sourcelookup.PDirectorySourceContainerType"
-			description="%containerDescription.directory"
-			id="org.eclipse.ptp.debug.core.containerType.directory"
-			name="%containerName.directory"/>
-      <sourceContainerType
-            class="org.eclipse.ptp.debug.internal.core.sourcelookup.AbsolutePathSourceContainerType"
-            description="%containerDescription.absolutePath"
-            id="org.eclipse.ptp.debug.core.containerType.absolutePath"
-            name="%containerName.absolutePath"/>
-	</extension>
-
-</plugin>

diff --git a/debug/org.eclipse.ptp.debug.core/schema/parallelDebuggers.exsd b/debug/org.eclipse.ptp.debug.core/schema/parallelDebuggers.exsd
deleted file mode 100644
index ada641b..0000000
--- a/debug/org.eclipse.ptp.debug.core/schema/parallelDebuggers.exsd
+++ /dev/null

@@ -1,140 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.debug.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.debug.core" id="parallelDebuggers" name="Parallel Debuggers"/>
-      </appInfo>
-      <documentation>
-         This extension point allows plug-ins to contribute a parallel debugger implementation.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="debugger" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="debugger">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.debug.core.IPDebugger"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="cpu" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="platform" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="modes" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.java
deleted file mode 100644
index 8bfe97b..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.java
+++ /dev/null

@@ -1,49 +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
- *******************************************************************************/
-/**********************************************************************
- * Copyright (c) 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * QNX Software Systems - Initial API and implementation
- ***********************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class DebugCoreMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.core.DebugCoreMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private DebugCoreMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.properties b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.properties
deleted file mode 100644
index e16d7b2..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugCoreMessages.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 QNX Software Systems and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     QNX Software Systems - initial API and implementation
-###############################################################################
-PTPDebugCorePlugin.0=No such debugger
-PTPDebugModel.0=Unable to set temporary breakpoint in main.\nReason: {0}\nContinue?
-PCDIDebugModel.0=Unable to parser binary information from file

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugJobStorage.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugJobStorage.java
deleted file mode 100644
index af8f463..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/DebugJobStorage.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Clement chu
- */
-public class DebugJobStorage {
-	private static Map<String, DebugJobStorage> storages = new HashMap<String, DebugJobStorage>();
-	
-	private String name;
-	private Map<String, Storage> jobMap;
-	
-	public DebugJobStorage(String name) {
-		jobMap = new HashMap<String, Storage>();
-		if (containsKey(name))
-			throw new IllegalArgumentException("Key: " + name + " is already defined.");
-
-		this.name = name;
-		addDebugStorage(this.name, this);
-	}
-	public void closeDebugJobStorage() {
-		Storage[] storages = jobMap.values().toArray(new Storage[0]);
-		for (Storage st : storages) {
-			st.clean();
-		}
-		jobMap.clear();
-		removeDebugStorage(name);
-	}
-	private Storage getJobStorage(String job_id) {
-		synchronized (jobMap) {
-			if (!jobMap.containsKey(job_id)) {
-				jobMap.put(job_id, new Storage());
-			}
-			return (Storage)jobMap.get(job_id);
-		}
-	}
-	public void removeJobStorage(String job_id) {
-		synchronized (jobMap) {
-			Storage storage = (Storage)jobMap.remove(job_id);
-			if (storage != null) {
-				storage.clean();
-			}
-		}
-	}
-	public Collection<Object> getJobValueCollection() {
-		synchronized (jobMap) {
-			List<Object> values = new ArrayList<Object>();
-			for (Storage st : jobMap.values()) {
-				values.addAll(st.getValueCollection());
-			}
-			return values;
-		}
-	}
-	public Collection<Object> getValueCollection(String job_id) {
-		synchronized (jobMap) {
-			return getJobStorage(job_id).getValueCollection();
-		}
-	}
-	public Object getValue(String job_id, String key) {
-		synchronized (jobMap) {
-			return getJobStorage(job_id).getStore(key);
-		}
-	}
-	public void addValue(String job_id, String key, Object value) {
-		synchronized (jobMap) {
-			getJobStorage(job_id).addStore(key, value);
-		}
-	}
-	public Object removeValue(String job_id, String key) {
-		synchronized (jobMap) {
-			return getJobStorage(job_id).removeStore(key);
-		}
-	}
-	/***********
-	 * Storage *
-	 ***********/
-	class Storage {
-		Map<String, Object> aMap = new HashMap<String, Object>();
-		void clean() {
-			aMap.clear();
-		}
-		boolean containsStore(String key) {
-			synchronized (aMap) {
-				return aMap.containsKey(key);
-			}
-		}
-		void addStore(String key, Object value) {
-			synchronized (aMap) {
-				aMap.put(key, value);
-			}
-		}
-		Object removeStore(String key) {
-			synchronized (aMap) {
-				return aMap.remove(key);
-			}
-		}
-		Object getStore(String key) {
-			synchronized (aMap) {
-				return aMap.get(key);
-			}
-		}
-		Collection<Object> getValueCollection() {
-			synchronized (aMap) {
-				return aMap.values();
-			}
-		}
-		String[] getKeys() {
-			synchronized (aMap) {
-				return (String[])aMap.keySet().toArray(new String[0]);
-			}
-		}
-	}
-	/***************************
-	 * static functions
-	 ***************************/
-	public static boolean containsKey(String name) {
-		synchronized (storages) {
-			return storages.containsKey(name);
-		}
-	}
-	public static DebugJobStorage getDebugStorage(String name) {
-		synchronized (storages) {
-			return (DebugJobStorage)storages.get(name);
-		}
-	}
-	public static void addDebugStorage(String name, DebugJobStorage storage) {
-		synchronized (storages) {
-			storages.put(name, storage);
-		}
-	}
-	public static DebugJobStorage[] getDebugStorages() {
-		synchronized (storages) {
-			return (DebugJobStorage[])storages.values().toArray(new DebugJobStorage[0]);
-		}
-	}
-	public static void removeDebugStorage(String name) {
-		synchronized (storages) {
-			DebugJobStorage storage = (DebugJobStorage)storages.remove(name);
-			if (storage != null) {
-				storage.closeDebugJobStorage();
-			}
-		}
-	}
-	public static void removeDebugStorages() {
-		synchronized (storages) {
-			DebugJobStorage[] dStoreages = storages.values().toArray(new DebugJobStorage[0]);
-			for (DebugJobStorage dStoreage : dStoreages) {
-				dStoreage.closeDebugJobStorage();
-			}
-			storages.clear();
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ExtFormat.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ExtFormat.java
deleted file mode 100644
index 221c26a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ExtFormat.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.math.BigInteger;
-
-/**
- * @author Clement chu
- * 
- */
-public class ExtFormat {
-	public final static int HEXADECIMAL = 0;
-	public final static int OCTAL = 1;
-	public final static int BINARY = 2;
-	public final static int DECIMAL = 3;
-	public final static int RAW = 4;
-	public final static int NATURAL = 5;
-
-	public final static int FLOAT = 10;
-	public final static int ADDRESS = 11;
-	public final static int INSTRUCTION = 12;
-	public final static int CHAR = 13;
-	public final static int STRING = 14;
-	public final static int UNSIGNED = 15;
-
-	public static BigInteger decodeAdress(String buffer) {
-		int radix = 10;
-		int cursor = 0;
-		int offset = 0;
-		int len = buffer.length();
-
-		if ((offset = buffer.indexOf("0x")) != -1 || (offset = buffer.indexOf("0X")) != -1) {
-			radix = 16;
-			cursor = offset + 2;
-		}
-		while (cursor < len && Character.digit(buffer.charAt(cursor), radix) != -1) {
-			cursor++;
-		}
-		return getBigInteger(buffer.substring(offset, cursor));
-	}
-	
-	public static BigInteger getBigInteger(String address) {
-		int index = 0;
-		int radix = 10;
-		boolean negative = false;
-
-		// Handle zero length
-		address = address.trim();
-		if (address.length() == 0) {
-			return BigInteger.ZERO;
-		}
-
-		// Handle minus sign, if present
-		if (address.startsWith("-")) {
-			negative = true;
-			index++;
-		}
-		if (address.startsWith("0x", index) || address.startsWith("0X", index)) {
-			index += 2;
-			radix = 16;
-		} else if (address.startsWith("#", index)) {
-			index ++;
-			radix = 16;
-		} else if (address.startsWith("0", index) && address.length() > 1 + index) {
-			index ++;
-			radix = 8;
-		}
-
-		if (index > 0) {
-			address = address.substring(index);
-		}
-		if (negative) {
-			address = "-" + address;
-		}
-		try {
-			return new BigInteger(address, radix);
-		} catch (NumberFormatException e) {
-			// What can we do ???
-		}
-		return BigInteger.ZERO;
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPBreakpointManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPBreakpointManager.java
deleted file mode 100644
index 87f81aa..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPBreakpointManager.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.math.BigInteger;
-
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-
-public interface IPBreakpointManager {
-
-	/**
-	 * Called when tasks are added to a task set. This causes the breakpoints
-	 * to be set on the new tasks also.
-	 * 
-	 * @param tasks new tasks being added to the set
-	 * @param breakpoints breakpoints that are to be updated
-	 */
-	public void addSetBreakpoints(BitList tasks, IPBreakpoint[] breakpoints);
-
-	/**
-	 * @param tasks
-	 * @param breakpoints
-	 */
-	public void deleteSetBreakpoints(BitList tasks, IPBreakpoint[] breakpoints);
-
-	/**
-	 * @param pdiBpt
-	 * @return
-	 */
-	public IBreakpoint getBreakpoint(IPDIBreakpoint pdiBpt);
-
-	/**
-	 * @param breakpoint
-	 * @return
-	 */
-	public BigInteger getBreakpointAddress(IPLineBreakpoint breakpoint);
-
-	/**
-	 * @param enabled
-	 */
-	public void skipBreakpoints(boolean enabled);
-
-	/**
-	 * @param tasks
-	 * @param pdiWatchpoint
-	 */
-	public void watchpointOutOfScope(BitList tasks, IPDIWatchpoint pdiWatchpoint);
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConfiguration.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConfiguration.java
deleted file mode 100644
index f42218a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConfiguration.java
+++ /dev/null

@@ -1,83 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import org.eclipse.core.runtime.CoreException;
-
-public interface IPDebugConfiguration {
-	public final static String CPU_NATIVE = "native";
-
-	/**
-	 * @return
-	 */
-	public String[] getCoreFileExtensions();
-
-	/**
-	 * @return
-	 */
-	public String[] getCPUList();
-
-	/**
-	 * @return
-	 * @throws CoreException
-	 */
-	public IPDebugger getDebugger() throws CoreException;
-
-	/**
-	 * @return
-	 */
-	public String getID();
-
-	/**
-	 * @return
-	 */
-	public String[] getModeList();
-
-	/**
-	 * @return
-	 */
-	public String getName();
-
-	/**
-	 * @return
-	 */
-	public String getPlatform();
-
-	/**
-	 * @param cpu
-	 * @return
-	 */
-	public boolean supportsCPU(String cpu);
-
-	/**
-	 * @param mode
-	 * @return
-	 */
-	public boolean supportsMode(String mode);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConstants.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConstants.java
deleted file mode 100644
index 9b60f2f..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugConstants.java
+++ /dev/null

@@ -1,88 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-/**
- * Constant definitions for PTP debug plug-in.
- */
-public interface IPDebugConstants {
-	/**
-	 * Status handler codes.
-	 */
-	public static final int STATUS_CODE_QUESTION = 10000;
-	public static final int STATUS_CODE_INFO = 10001;
-	public static final int STATUS_CODE_ERROR = 10002;
-
-	/**
-	 * String preference for the common source containers.
-	 */
-	public static final String PREF_COMMON_SOURCE_CONTAINERS = PTPDebugCorePlugin.getUniqueIdentifier() + ".pDebug.common_source_containers";
-	
-	/**
-	 * C/C++ debug plug-in identifier (value
-	 * <code>"org.eclipse.ptp.debug.core"</code>).
-	 */
-	public static final String PLUGIN_ID = PTPDebugCorePlugin.getUniqueIdentifier();
-
-	/**
-	 * The identifier of the default variable format to use in the variables view
-	 */
-	public static final String PREF_DEFAULT_VARIABLE_FORMAT = PLUGIN_ID + "pDebug.default_variable_format";
-	
-	/**
-	 * The identifier of the default expression format to use in the expressions views
-	 */
-	public static final String PREF_DEFAULT_EXPRESSION_FORMAT = PLUGIN_ID + "pDebug.default_expression_format";
-
-	/**
-	 * The identifier of the common source locations list
-	 */
-	public static final String PREF_SOURCE_LOCATIONS = PLUGIN_ID + "pDebug.Source.source_locations";
-	
-	public static final String PREF_SHOW_FULL_PATHS = PLUGIN_ID + ".pDebug.show_full_paths";
-
-	public static final String PREF_PTP_DEBUGGER = PLUGIN_ID + ".pDebug.debuggers";
-	public static final String PREF_PTP_DEBUG_COMM_TIMEOUT = PLUGIN_ID + ".pDebug.timeout";
-
-	public static final String PREF_PTP_DEBUG_REGISTER_PROC_0 = PLUGIN_ID + ".pDebug.regPro0";
-	
-	public static final String PREF_DEFAULT_DEBUGGER_TYPE = PLUGIN_ID + ".pDebug.defaultDebugger"; 
-	
-	public static final int DEFAULT_DEBUG_COMM_TIMEOUT = 60000;
-	public static final int MIN_REQUEST_TIMEOUT = 10000;
-	public static final int MAX_REQUEST_TIMEOUT = Integer.MAX_VALUE;	
-
-	public static final String PREF_UPDATE_VARIABLES_ON_SUSPEND = PLUGIN_ID + ".pDebug.update_variables_on_suspend";
-	public static final String PREF_UPDATE_VARIABLES_ON_CHANGE = PLUGIN_ID + ".pDebug.update_variables_on_change";
-
-	public static final String PREF_INSTRUCTION_STEP_MODE_ON = PLUGIN_ID + "pDebug.Disassembly.instructionStepOn";
-	
-	public static final String PREF_DEFAULT_REGISTER_FORMAT = PLUGIN_ID + "pDebug.default_register_format";
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugEventListener.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugEventListener.java
deleted file mode 100644
index ec4d6b9..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugEventListener.java
+++ /dev/null

@@ -1,42 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-/**
- * @author Clement chu
- *
- */
-public interface IPDebugEventListener {
-	/**
-	 * Handle debug event
-	 * @param event IPDebugEvent
-	 */
-	void handleDebugEvent(IPDebugEvent event);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugger.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugger.java
deleted file mode 100644
index 000fcde..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPDebugger.java
+++ /dev/null

@@ -1,73 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2004 QNX Software Systems and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Common Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors: QNX Software Systems - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-
-public interface IPDebugger {
-	/**
-	 * Create a new debugger session.
-	 *
-	 * @param timeout
-	 * @param launch
-	 * @param corefile
-	 * @param monitor
-	 * @return
-	 * @throws CoreException
-	 */
-	public IPDISession createDebugSession(long timeout, IPLaunch launch, IPath corefile) throws CoreException;
-
-	/**
-	 * Initialize the debugger. This does whatever is necessary to get the debugger ready
-	 * to start debugging the user application. The attrMgr argument can supply attributes
-	 * from a previously submitted job that may be used to initialize the debug session.
-	 *
-	 * @param configuration debugger launch configuration
-	 * @param attrMgr attribute manager containing attributes for launch
-	 * @param monitor progress monitor
-	 * @throws CoreException if the debugger cannot be initialized
-	 */
-	public void initialize(ILaunchConfiguration configuration, AttributeManager attrMgr, IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Using the supplied ILaunchConfiguration, add the required attributes to attrMgr
-	 * need to be passed to the submitJob command to launch the application under debugger control.
-	 *
-	 * @param configuration launch configuration for the debug session
-	 * @param attrMgr attribute manager containing attributes for launch
-	 * @throws CoreException
-	 */
-	public void getLaunchAttributes(ILaunchConfiguration configuration, AttributeManager attrMgr) throws CoreException;
-
-	public void cleanup(ILaunchConfiguration configuration, AttributeManager attrMgr, IPLaunch launch);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPMemoryManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPMemoryManager.java
deleted file mode 100644
index 259168d..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPMemoryManager.java
+++ /dev/null

@@ -1,56 +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.debug.core;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-
-/**
- * @author greg
- *
- */
-public interface IPMemoryManager {
-
-	/**
-	 * @param qTasks
-	 */
-	public void dispose(BitList qTasks);
-
-	/**
-	 * @param qTasks
-	 * @param startAddress
-	 * @param length
-	 * @return
-	 * @throws DebugException
-	 */
-	public IMemoryBlock getMemoryBlock(BitList qTasks, long startAddress, long length) throws DebugException;
-
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	public IMemoryBlockRetrievalExtension getMemoryRetrieval(BitList qTasks);
-
-	/**
-	 * @param qTasks
-	 * @param debugTarget
-	 */
-	public void initialize(BitList qTasks, PDebugTarget debugTarget);
-
-	/**
-	 * @param qTasks
-	 */
-	public void save(BitList qTasks);
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPRegisterManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPRegisterManager.java
deleted file mode 100644
index d79944e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPRegisterManager.java
+++ /dev/null

@@ -1,86 +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.debug.core;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup;
-import org.eclipse.ptp.debug.core.model.IPRegisterDescriptor;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-import org.eclipse.ptp.debug.internal.core.model.PStackFrame;
-
-/**
- * @author greg
- *
- */
-public interface IPRegisterManager {
-
-	/**
-	 * @param qTasks
-	 * @param name
-	 * @param descriptors
-	 */
-	public void addRegisterGroup(final BitList qTasks, final String name, final IPRegisterDescriptor[] descriptors);
-
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws DebugException
-	 */
-	public IPRegisterDescriptor[] getAllRegisterDescriptors(BitList qTasks) throws DebugException;
-
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	public IPStackFrame getCurrentFrame(BitList qTasks);
-
-	/**
-	 * @param qTasks
-	 * @param frame
-	 * @return
-	 * @throws DebugException
-	 */
-	public IRegisterGroup[] getRegisterGroups(BitList qTasks, PStackFrame frame) throws DebugException;
-
-	/**
-	 * @param qTasks
-	 * @param debugTarget
-	 */
-	public void initialize(BitList qTasks, PDebugTarget debugTarget);
-
-	/**
-	 * @param qTasks
-	 * @param group
-	 * @param descriptors
-	 */
-	public void modifyRegisterGroup(final BitList qTasks, final IPPersistableRegisterGroup group,
-			final IPRegisterDescriptor[] descriptors);
-
-	/**
-	 * @param qTasks
-	 * @param groups
-	 */
-	public void removeRegisterGroups(final BitList qTasks, final IRegisterGroup[] groups);
-
-	/**
-	 * @param qTasks
-	 */
-	public void restoreDefaults(final BitList qTasks);
-
-	/**
-	 * @param qTasks
-	 */
-	public void targetSuspended(BitList qTasks);
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSession.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSession.java
deleted file mode 100644
index c484cee..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSession.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.event.IPDebugInfo;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-
-public interface IPSession extends IAdaptable {
-	/**
-	 * @param monitor
-	 * @param app
-	 * @param path
-	 * @param cwd
-	 * @param args
-	 * @throws CoreException
-	 */
-	public void connectToDebugger(IProgressMonitor monitor, String app, String path, String cwd, String[] args) throws CoreException;
-
-	/**
-	 * @param tasks
-	 * @param refresh
-	 * @param register
-	 */
-	public void createDebugTarget(BitList tasks, boolean refresh, boolean register);
-	
-	/**
-	 * @param tasks
-	 * @param refresh
-	 * @param register
-	 */
-	public void deleteDebugTarget(BitList tasks, boolean refresh, boolean register);
-
-	/**
-	 * @param register
-	 */
-	public void deleteDebugTargets(boolean register);
-
-	/**
-	 * 
-	 */
-	public void dispose();
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDebugTarget findDebugTarget(BitList tasks);
-
-	/**
-	 * @param change
-	 * @param breakpoint
-	 * @param info
-	 */
-	public void fireDebugEvent(int change, int breakpoint, IPDebugInfo info);
-
-	/**
-	 * @param state
-	 */
-	public void forceStoppedDebugger(ProcessAttributes.State state);
-
-	/**
-	 * @return
-	 */
-	public IPBreakpointManager getBreakpointManager();
-
-	/**
-	 * @param tasks
-	 * @return
-	 */
-	public IPDebugInfo getDebugInfo(BitList tasks);
-	
-	/**
-	 * @return
-	 */
-	public IPJob getJob();
-	
-	/**
-	 * @return
-	 */
-	public IPLaunch getLaunch();
-	
-	/**
-	 * @return
-	 */
-	public IPMemoryManager getMemoryManager();
-
-	/**
-	 * @return
-	 */
-	public IPDISession getPDISession();
-
-	/**
-	 * @return
-	 */
-	public IProject getProject();
-
-	/**
-	 * @return
-	 */
-	public IPRegisterManager getRegisterManager();
-
-	/**
-	 * @return
-	 */
-	public IPSetManager getSetManager();
-
-	/**
-	 * @return
-	 */
-	public IPSignalManager getSignalManager();
-
-	/**
-	 * @return
-	 */
-	public BitList getTasks();
-
-	/**
-	 * @param id
-	 * @return
-	 */
-	public BitList getTasks(int id);
-	
-	/**
-	 * @return
-	 */
-	public boolean isReady();
-
-	/**
-	 * @param tasks
-	 * @param refresh
-	 * @param register
-	 */
-	public void reloadDebugTargets(BitList tasks, boolean refresh, boolean register);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSetManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSetManager.java
deleted file mode 100644
index 5ac5332..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSetManager.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * @author greg
- *
- */
-public interface IPSetManager {
-
-	/**
-	 * @param sid
-	 * @param tasks
-	 */
-	public void addTasks(String sid, BitList tasks);
-
-	/**
-	 * @param sid
-	 * @param tasks
-	 */
-	public void createSet(String sid, BitList tasks);
-
-	/**
-	 * @param sid
-	 */
-	public void deleteSets(String sid);
-
-	/**
-	 * @param sid
-	 * @return
-	 */
-	public BitList getTasks(String sid);
-
-	/**
-	 * @param sid
-	 * @param tasks
-	 */
-	public void removeTasks(String sid, BitList tasks);
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSignalManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSignalManager.java
deleted file mode 100644
index 2a9a7a1..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/IPSignalManager.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-
-/**
- * @author greg
- *
- */
-public interface IPSignalManager {
-
-	/**
-	 * @param qTasks
-	 */
-	public void dispose(BitList qTasks);
-
-	/**
-	 * @param qTasks
-	 * @return
-	 * @throws DebugException
-	 */
-	public IPSignal[] getSignals(BitList qTasks) throws DebugException;
-
-	/**
-	 * @param qTasks
-	 * @param pdiSignal
-	 */
-	public void signalChanged(BitList qTasks, IPDISignal pdiSignal);
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugModel.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugModel.java
deleted file mode 100644
index cfc4ccb..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugModel.java
+++ /dev/null

@@ -1,684 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.core.event.IPDebugInfo;
-import org.eclipse.ptp.debug.core.event.PDebugEvent;
-import org.eclipse.ptp.debug.core.event.PDebugRegisterInfo;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.debug.core.model.IPAddressBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPWatchpoint;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.internal.core.PSession;
-import org.eclipse.ptp.debug.internal.core.PSessionManager;
-import org.eclipse.ptp.debug.internal.core.breakpoint.PAddressBreakpoint;
-import org.eclipse.ptp.debug.internal.core.breakpoint.PFunctionBreakpoint;
-import org.eclipse.ptp.debug.internal.core.breakpoint.PLineBreakpoint;
-import org.eclipse.ptp.debug.internal.core.breakpoint.PWatchpoint;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-
-/**
- * @author clement chu
- * 
- */
-public class PDebugModel {
-	/**
-	 * @param module
-	 * @param sourceHandle
-	 * @param resource
-	 * @param address
-	 * @param enabled
-	 * @param ignoreCount
-	 * @param condition
-	 * @param register
-	 * @param set_id
-	 * @param job_id
-	 * @param jobName
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, BigInteger address, boolean enabled, int ignoreCount, String condition, boolean register, String set_id, String job_id, String jobName) throws CoreException {
-		return createAddressBreakpoint(module, sourceHandle, resource, -1, address, enabled, ignoreCount, condition, register, set_id, job_id, jobName);
-	}
-	
-	/**
-	 * @param module
-	 * @param sourceHandle
-	 * @param resource
-	 * @param lineNumber
-	 * @param address
-	 * @param enabled
-	 * @param ignoreCount
-	 * @param condition
-	 * @param register
-	 * @param set_id
-	 * @param job_id
-	 * @param jobName
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, int lineNumber, BigInteger address, boolean enabled, int ignoreCount, String condition, boolean register, String set_id, String job_id, String jobName) throws CoreException {
-		HashMap<String, Object> attributes = new HashMap<String, Object>(10);
-		attributes.put(IBreakpoint.ID, getPluginIdentifier());
-		attributes.put(IMarker.CHAR_START, new Integer(-1));
-		attributes.put(IMarker.CHAR_END, new Integer(-1));
-		attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
-		attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled));
-		attributes.put(IPLineBreakpoint.ADDRESS, address.toString(10));
-		attributes.put(IPBreakpoint.SOURCE_HANDLE, sourceHandle);
-		attributes.put(IPBreakpoint.IGNORE_COUNT, new Integer(ignoreCount));
-		attributes.put(IPBreakpoint.CONDITION, condition);
-		//attributes.put(IPBreakpoint.MODULE, module);
-		attributes.put(IPBreakpoint.SET_ID, set_id);
-		attributes.put(IPBreakpoint.CUR_SET_ID, set_id);
-		attributes.put(IPBreakpoint.JOB_ID, job_id);
-		attributes.put(IPBreakpoint.JOB_NAME, jobName);
-		return new PAddressBreakpoint(resource, attributes, register);
-	}
-	
-	/**
-	 * @param sourceHandle
-	 * @param resource
-	 * @param function
-	 * @param charStart
-	 * @param charEnd
-	 * @param lineNumber
-	 * @param enabled
-	 * @param ignoreCount
-	 * @param condition
-	 * @param register
-	 * @param set_id
-	 * @param job_id
-	 * @param jobName
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPFunctionBreakpoint createFunctionBreakpoint(String sourceHandle, IResource resource, String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register, String set_id, String job_id, String jobName) throws CoreException {
-		HashMap<String, Object> attributes = new HashMap<String, Object>(10);
-		attributes.put(IBreakpoint.ID, getPluginIdentifier());
-		attributes.put(IMarker.CHAR_START, new Integer(charStart));
-		attributes.put(IMarker.CHAR_END, new Integer(charEnd));
-		attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
-		attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled));
-		attributes.put(IPLineBreakpoint.FUNCTION, function);
-		attributes.put(IPBreakpoint.SOURCE_HANDLE, sourceHandle);
-		attributes.put(IPBreakpoint.IGNORE_COUNT, new Integer(ignoreCount));
-		attributes.put(IPBreakpoint.CONDITION, condition);
-		return new PFunctionBreakpoint(resource, attributes, register);
-	}
-	
-	/**
-	 * @param sourceHandle
-	 * @param resource
-	 * @param lineNumber
-	 * @param enabled
-	 * @param ignoreCount
-	 * @param condition
-	 * @param register
-	 * @param set_id
-	 * @param job
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPLineBreakpoint createLineBreakpoint(String sourceHandle, IResource resource, int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register, String set_id, IPJob job) throws CoreException {
-		String job_id = IPBreakpoint.GLOBAL;
-		String jobName = IPBreakpoint.GLOBAL;
-		if (job != null && !job.isTerminated()) {
-			IPSession session = PTPDebugCorePlugin.getDebugModel().getSession(job);
-			if (session != null) {
-				job_id = job.getID();
-				jobName = job.getName();
-			}
-		}
-		HashMap<String, Object> attributes = new HashMap<String, Object>(10);
-		attributes.put(IBreakpoint.ID, getPluginIdentifier());
-		attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
-		attributes.put(IBreakpoint.ENABLED, new Boolean(enabled));
-		attributes.put(IPBreakpoint.SOURCE_HANDLE, sourceHandle);
-		attributes.put(IPBreakpoint.IGNORE_COUNT, new Integer(ignoreCount));
-		attributes.put(IPBreakpoint.CONDITION, condition);
-		attributes.put(IPBreakpoint.SET_ID, set_id);
-		attributes.put(IPBreakpoint.CUR_SET_ID, set_id);
-		attributes.put(IPBreakpoint.JOB_ID, job_id);
-		attributes.put(IPBreakpoint.JOB_NAME, jobName);
-		return new PLineBreakpoint(resource, attributes, register);
-	}
-	
-	/**
-	 * @param sourceHandle
-	 * @param resource
-	 * @param writeAccess
-	 * @param readAccess
-	 * @param expression
-	 * @param enabled
-	 * @param ignoreCount
-	 * @param condition
-	 * @param register
-	 * @param set_id
-	 * @param job_id
-	 * @param jobName
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPWatchpoint createWatchpoint(String sourceHandle, IResource resource, boolean writeAccess, boolean readAccess, String expression, boolean enabled, int ignoreCount, String condition, boolean register, String set_id, String job_id, String jobName) throws CoreException {
-		HashMap<String, Object> attributes = new HashMap<String, Object>(10);
-		attributes.put(IBreakpoint.ID, getPluginIdentifier());
-		attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled));
-		attributes.put(IPBreakpoint.SOURCE_HANDLE, sourceHandle);
-		attributes.put(IPBreakpoint.IGNORE_COUNT, new Integer(ignoreCount));
-		attributes.put(IPBreakpoint.CONDITION, condition);
-		attributes.put(IPWatchpoint.EXPRESSION, expression );
-		attributes.put(IPWatchpoint.READ, Boolean.valueOf(readAccess));
-		attributes.put(IPWatchpoint.WRITE, Boolean.valueOf(writeAccess));
-		return new PWatchpoint(resource, attributes, register);
-	}
-	
-	/**
-	 * @param sourceHandle
-	 * @param resource
-	 * @param charStart
-	 * @param charEnd
-	 * @param lineNumber
-	 * @param writeAccess
-	 * @param readAccess
-	 * @param expression
-	 * @param enabled
-	 * @param ignoreCount
-	 * @param condition
-	 * @param register
-	 * @param set_id
-	 * @param job_id
-	 * @param jobName
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPWatchpoint createWatchpoint(String sourceHandle, IResource resource, int charStart, int charEnd, int lineNumber, boolean writeAccess, boolean readAccess, String expression, boolean enabled, int ignoreCount, String condition, boolean register, String set_id, String job_id, String jobName) throws CoreException {
-		HashMap<String, Object> attributes = new HashMap<String, Object>(10);
-		attributes.put(IBreakpoint.ID, getPluginIdentifier());
-		attributes.put(IMarker.CHAR_START, new Integer(charStart));
-		attributes.put(IMarker.CHAR_END, new Integer(charEnd));
-		attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
-		attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled));
-		attributes.put(IPBreakpoint.SOURCE_HANDLE, sourceHandle);
-		attributes.put(IPBreakpoint.IGNORE_COUNT, new Integer(ignoreCount));
-		attributes.put(IPBreakpoint.CONDITION, condition);
-		attributes.put(IPWatchpoint.EXPRESSION, expression );
-		attributes.put(IPWatchpoint.READ, Boolean.valueOf(readAccess));
-		attributes.put(IPWatchpoint.WRITE, Boolean.valueOf(writeAccess));
-		return new PWatchpoint(resource, attributes, register);
-	}
-	
-	/**
-	 * @param job_id
-	 * @throws CoreException
-	 */
-	public static void deletePBreakpoint(final String job_id) throws CoreException {
-		IPBreakpoint[] breakpoints = findPBreakpoints(job_id, false);
-		if (breakpoints.length > 0)
-			DebugPlugin.getDefault().getBreakpointManager().removeBreakpoints(breakpoints, true);
-	}
-	
-	/**
-	 * @param job_id
-	 * @param set_id
-	 * @throws CoreException
-	 */
-	public static void deletePBreakpoint(final String job_id, final String set_id) throws CoreException {
-		IPBreakpoint[] breakpoints = findPBreakpoints(job_id, set_id);
-		if (breakpoints.length > 0)
-			DebugPlugin.getDefault().getBreakpointManager().removeBreakpoints(breakpoints, true);		
-	}
-	
-	/**
-	 * @param job_id
-	 * @param includeGlobal
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPBreakpoint[] findPBreakpoints(String job_id, boolean includeGlobal) throws CoreException {
-		List<IPBreakpoint> bptList = new ArrayList<IPBreakpoint>();
-		IBreakpoint[] breakpoints = getPBreakpoints();
-		for (IBreakpoint bpt : breakpoints) {
-			if (!(bpt instanceof IPBreakpoint))
-				continue;
-			IPBreakpoint breakpoint = (IPBreakpoint) bpt;
-			String bp_job_id = breakpoint.getJobId();
-			if (bp_job_id.equals(job_id) || (includeGlobal && bp_job_id.equals(IPBreakpoint.GLOBAL))) {
-				bptList.add(breakpoint);
-			}
-		}
-		return (IPBreakpoint[]) bptList.toArray(new IPBreakpoint[bptList.size()]);
-	}
-	
-	/**
-	 * @param job_id
-	 * @param set_id
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPBreakpoint[] findPBreakpoints(String job_id, String set_id) throws CoreException {
-		List<IPBreakpoint> bptList = new ArrayList<IPBreakpoint>();
-		IBreakpoint[] breakpoints = getPBreakpoints();
-		for (IBreakpoint bpt : breakpoints) {
-			if (!(bpt instanceof IPBreakpoint))
-				continue;
-			IPBreakpoint breakpoint = (IPBreakpoint) bpt;
-			if (breakpoint.getJobId().equals(job_id) && breakpoint.getSetId().equals(set_id)) {
-				bptList.add(breakpoint);
-			}
-		}
-		return (IPBreakpoint[]) bptList.toArray(new IPBreakpoint[0]);
-	}
-	
-	/**
-	 * @param sourceHandle
-	 * @param resource
-	 * @param function
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPFunctionBreakpoint[] functionBreakpointExists(String sourceHandle, IResource resource, String function) throws CoreException {
-		IBreakpoint[] breakpoints = getPBreakpoints();
-		List<IBreakpoint> foundBreakpoints = new ArrayList<IBreakpoint>(0);
-		String markerType = PFunctionBreakpoint.getMarkerType();
-		for (int i = 0; i < breakpoints.length; i++) {
-			if (!(breakpoints[i] instanceof IPFunctionBreakpoint))
-				continue;
-			IPFunctionBreakpoint breakpoint = (IPFunctionBreakpoint) breakpoints[i];
-			if (breakpoint.getMarker().getType().equals(markerType)) {
-				if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) {
-					if (breakpoint.getMarker().getResource().equals(resource)) {
-						if (breakpoint.getFunction() != null && breakpoint.getFunction().equals(function)) {
-							foundBreakpoints.add(breakpoint);
-						}
-					}
-				}
-			}
-		}
-		return foundBreakpoints.toArray(new IPFunctionBreakpoint[0]);
-	}
-	
-	/**
-	 * @return
-	 */
-	public static IBreakpoint[] getPBreakpoints() {
-		return DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(getPluginIdentifier());
-	}
-	
-	/**
-	 * @return
-	 */
-	public static String getPluginIdentifier() {
-		return PTPDebugCorePlugin.getUniqueIdentifier();
-	}
-	
-	/**
-	 * @param breakpoints
-	 * @param job
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPLineBreakpoint lineBreakpointExists(IPLineBreakpoint[] breakpoints, IPJob job) throws CoreException {
-		// remove global breakpoint or the breakpoint same as job id given
-		for (int i = 0; i < breakpoints.length; i++) {
-			String bpt_job_id = breakpoints[i].getJobId();
-			if (bpt_job_id.equals(IPBreakpoint.GLOBAL) || (job != null && bpt_job_id.equals(job.getID())))
-				return breakpoints[i];
-		}
-		return null;
-	}
-	
-	/**
-	 * @param sourceHandle
-	 * @param resource
-	 * @param lineNumber
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPLineBreakpoint[] lineBreakpointsExists(String sourceHandle, IResource resource, int lineNumber) throws CoreException {
-		IBreakpoint[] breakpoints = getPBreakpoints();
-		List<IBreakpoint> foundBreakpoints = new ArrayList<IBreakpoint>(0);
-		for (int i = 0; i < breakpoints.length; i++) {
-			if (!(breakpoints[i] instanceof IPLineBreakpoint))
-				continue;
-			IPLineBreakpoint breakpoint = (IPLineBreakpoint) breakpoints[i];
-			if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) {
-				if (breakpoint.getMarker().getResource().equals(resource)) {
-					if (breakpoint.getLineNumber() == lineNumber) {
-						foundBreakpoints.add(breakpoint);
-					}
-				}
-			}
-		}
-		return foundBreakpoints.toArray(new IPLineBreakpoint[0]);
-	}
-	
-	/**
-	 * @param set_id
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	public static void updatePBreakpoints(String set_id, IProgressMonitor monitor) throws CoreException {
-		try {
-			IBreakpoint[] breakpoints = getPBreakpoints();
-			monitor.beginTask("Updating parallel breakpoint...", breakpoints.length);
-			for (IBreakpoint bpt : breakpoints) {
-				if (!(bpt instanceof IPBreakpoint))
-					continue;
-				((IPBreakpoint) bpt).setCurSetId(set_id);
-				monitor.worked(1);
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	/**
-	 * @param sourceHandle
-	 * @param resource
-	 * @param expression
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IPWatchpoint[] watchpointExists(String sourceHandle, IResource resource, String expression) throws CoreException {
-		IBreakpoint[] breakpoints = getPBreakpoints();
-		List<IBreakpoint> foundBreakpoints = new ArrayList<IBreakpoint>(0);
-		String markerType = PWatchpoint.getMarkerType();
-		for (int i = 0; i < breakpoints.length; i++) {
-			if (!(breakpoints[i] instanceof IPWatchpoint))
-				continue;
-			IPWatchpoint breakpoint = (IPWatchpoint) breakpoints[i];
-			if (breakpoint.getMarker().getType().equals(markerType)) {
-				if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) {
-					if (breakpoint.getMarker().getResource().equals(resource)) {
-						if (breakpoint.getExpression().equals(expression)) {
-							foundBreakpoints.add(breakpoint);
-						}
-					}
-				}
-			}
-		}
-		return foundBreakpoints.toArray(new IPWatchpoint[0]);
-	}
-	
-	/**
-	 * @param handle1
-	 * @param handle2
-	 * @return
-	 */
-	private static boolean sameSourceHandle(String handle1, String handle2) {
-		if (handle1 == null || handle2 == null)
-			return false;
-		IPath path1 = new Path(handle1);
-		IPath path2 = new Path(handle2);
-		if (path1.isValidPath(handle1) && path2.isValidPath(handle2))
-			return path1.equals(path2);
-		return handle1.equals(handle2);
-	}
-	
-	private PSessionManager sessionMgr = new PSessionManager();
-	
-	/**
-	 * @param launch
-	 * @param tasks
-	 * @param pdiTargets
-	 * @param refresh
-	 * @param resumeTarget
-	 */
-	public void addNewDebugTargets(final IPLaunch launch, final BitList tasks, final IPDITarget[] pdiTargets, final boolean refresh, final boolean resumeTarget) {
-		WorkspaceJob aJob = new WorkspaceJob("Creating new debug targets...") {
-			public IStatus runInWorkspace(IProgressMonitor monitor) {
-				boolean allowTerminate = true;
-				boolean allowDisconnect = false;
-				IPSession session = getSession(launch.getPJob());
-				if (session == null)
-					return Status.CANCEL_STATUS;
-				for (IPDITarget pdiTarget: pdiTargets) {
-					IPDebugTarget target = new PDebugTarget(session, pdiTarget, allowTerminate, allowDisconnect);
-					if (resumeTarget) {
-						try {
-							session.getPDISession().resume(target.getTasks(), false);
-						}
-						catch (PDIException e) {
-							PTPDebugCorePlugin.log(e);
-						}
-					}
-					launch.addDebugTarget(target);
-				}
-				fireRegisterEvent(launch.getPJob(), tasks, refresh);
-				return Status.OK_STATUS;
-			}
-		};
-		aJob.setSystem(true);
-		aJob.schedule();
-	}
-	
-	/**
-	 * Add new tasks to a task set
-	 * 
-	 * @param session current debug session
-	 * @param set_id ID of the set to add the tasks to
-	 * @param tasks tasks to add to the set
-	 */
-	public void addTasks(IPSession session, String set_id, BitList tasks) {
-		BitList curSetTasks = getTasks(session, set_id);
-		session.getSetManager().addTasks(set_id, tasks);
-		tasks.andNot(curSetTasks);
-		try {
-			IPBreakpoint[] breakpoints = findPBreakpoints(session.getJob().getID(), set_id);
-			session.getBreakpointManager().addSetBreakpoints(tasks, breakpoints);
-		}
-		catch (CoreException e) {
-			PTPDebugCorePlugin.log(e);
-		}
-	}
-	
-	/**
-	 * @param timeout
-	 * @param debugger
-	 * @param launch
-	 * @param project
-	 * @param coreFile
-	 * @return
-	 * @throws CoreException
-	 */
-	public IPSession createDebugSession(IPDebugger debugger, IPLaunch launch, IProject project, IPath coreFile) throws CoreException {
-		long timeout = PTPDebugCorePlugin.getDefault().getPluginPreferences().getLong(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT);
-		IPDISession pdiSession = debugger.createDebugSession(timeout, launch, coreFile);
-		IPSession session = new PSession(pdiSession, launch, project);
-		sessionMgr.addSession(launch.getPJob(), session);
-		return session;
-	}
-	
-	/**
-	 * @param session
-	 * @param set_id
-	 * @param tasks
-	 */
-	public void createSet(IPSession session, String set_id, BitList tasks) {
-		session.getSetManager().createSet(set_id, tasks);
-	}
-	
-	/**
-	 * @param session
-	 * @param set_id
-	 */
-	public void deleteSet(IPSession session, String set_id) {
-		try {
-			PDebugModel.deletePBreakpoint(session.getJob().getID(), set_id);			
-		}
-		catch (CoreException e) {
-			PTPDebugCorePlugin.log(e);
-		}
-		//must delete breakpoint and then delete set
-		session.getSetManager().deleteSets(set_id);
-	}
-	
-	/**
-	 * @param job
-	 * @param tasks
-	 * @param refresh
-	 */
-	public void fireRegisterEvent(IPJob job, BitList tasks, boolean refresh) {
-		if (!tasks.isEmpty()) {
-			IPSession session = getSession(job);
-			if (session != null) {
-				IPDebugInfo info = new PDebugRegisterInfo(job, tasks, null, null, refresh);
-				PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(session, IPDebugEvent.CREATE, IPDebugEvent.REGISTER, info));
-			}
-		}
-	}
-	
-	/**
-	 * @param job
-	 * @param tasks
-	 * @param refresh
-	 */
-	public void fireUnregisterEvent(IPJob job, BitList tasks, boolean refresh) {
-		if (!tasks.isEmpty()) {
-			IPSession session = getSession(job);
-			if (session != null) {
-				IPDebugInfo info = new PDebugRegisterInfo(job, tasks, null, null, refresh);
-				PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(session, IPDebugEvent.TERMINATE, IPDebugEvent.REGISTER, info));
-			}
-		}
-	}
-	
-	/**
-	 * @param job
-	 * @return
-	 */
-	public IPSession getSession(IPJob job) {
-		return sessionMgr.getSession(job);
-	}
-	
-	/**
-	 * @param session
-	 * @param set_id
-	 * @return
-	 */
-	public BitList getTasks(IPSession session, String set_id) {
-		BitList tasks = session.getSetManager().getTasks(set_id);
-		if (tasks != null)
-			return tasks.copy();
-		return null;
-	}
-	
-	/**
-	 * @param launch
-	 * @param tasks
-	 * @param refresh
-	 */
-	public void removeDebugTarget(final IPLaunch launch, final BitList tasks, final boolean refresh) {
-		WorkspaceJob aJob = new WorkspaceJob("Removing the debug targets...") {
-			public IStatus runInWorkspace(IProgressMonitor monitor) {
-				int[] taskArray = tasks.toArray();
-				for (int task : taskArray) {
-					IPDebugTarget target = launch.getDebugTarget(task);
-					if (target != null) {
-						target.dispose();
-						launch.removeDebugTarget(target);
-					}
-				}
-				fireUnregisterEvent(launch.getPJob(), tasks, refresh);
-				return Status.OK_STATUS;
-			}
-		};
-		aJob.setSystem(true);
-		aJob.schedule();		
-	}
-	
-	/**
-	 * @param session
-	 * @param set_id
-	 * @param tasks
-	 */
-	public void removeTasks(IPSession session, String set_id, BitList tasks) {
-		BitList curSetTasks = getTasks(session, set_id);
-		session.getSetManager().removeTasks(set_id, tasks);
-		tasks.and(curSetTasks);
-		try {
-			IPBreakpoint[] breakpoints = findPBreakpoints(session.getJob().getID(), set_id);
-			session.getBreakpointManager().deleteSetBreakpoints(tasks, breakpoints);
-		}
-		catch (CoreException e) {
-			PTPDebugCorePlugin.log(e);
-		}
-	}
-	
-	/**
-	 * 
-	 */
-	public void shutdown() {
-		for (IPSession session : sessionMgr.getSessions()) {
-			shutdownnSession(session);
-		}
-		sessionMgr.shutdown();
-	}
-	
-	/**
-	 * @param session
-	 */
-	public void shutdownnSession(IPSession session) {
-		if (session != null) {
-			try {
-				deletePBreakpoint(session.getJob().getID());
-			}
-			catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-			session.dispose();
-		}
-	}
-	
-	/**
-	 * @param job
-	 */
-	public void shutdownSession(IPJob job) {
-		if (job != null) {
-			shutdownnSession(getSession(job));
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugUtils.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugUtils.java
deleted file mode 100644
index 2de6add..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PDebugUtils.java
+++ /dev/null

@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IStatusHandler;
-import org.w3c.dom.Document;
-
-/**
- * @author Clement chu
- * 
- */
-public class PDebugUtils {
-	public static final boolean DEBUG = true;
-	
-	public static void println(String msg) {
-		System.err.println(msg);
-	}
-	
-	public static boolean question(IStatus status, Object source) {
-		Boolean result = Boolean.FALSE;
-		IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status);
-		if (handler != null) {
-			try {
-				result = (Boolean)handler.handleStatus(status, source);
-			}
-			catch(CoreException e) {
-			}
-		}
-		return result.booleanValue();
-	}
-	public static void error(IStatus status, Object source) {
-		IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status);
-		if (handler != null) {
-			try {
-				handler.handleStatus(status, source);
-			}
-			catch(CoreException e) {
-			}
-		}
-	}
-	public static void info(IStatus status, Object source) {
-		IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status);
-		if (handler != null) {
-			try {
-				handler.handleStatus(status, source);
-			}
-			catch(CoreException e) {
-			}
-		}
-	}	
-	public static char[] getByteText(byte b) {
-		return new char[]{ charFromByte((byte)((b >>> 4) & 0x0f)), charFromByte((byte)(b & 0x0f)) };
-	}
-
-	public static byte textToByte(char[] text) {
-		byte result = 0;
-		if (text.length == 2) {
-			byte[] bytes = { charToByte(text[0]), charToByte(text[1]) };
-			result = (byte)((bytes[0] << 4) + bytes[1]);
-		}
-		return result;
-	}
-
-	public static char charFromByte(byte value) {
-		if (value >= 0x0 && value <= 0x9)
-			return (char)(value + '0');
-		if (value >= 0xa && value <= 0xf)
-			return (char)(value - 0xa + 'a');
-		return '0';
-	}
-
-	public static byte charToByte(char ch) {
-		if (Character.isDigit(ch)) {
-			return (byte)(ch - '0');
-		}
-		if (ch >= 'a' && ch <= 'f') {
-			return (byte)(0xa + ch - 'a');
-		}
-		if (ch >= 'A' && ch <= 'F') {
-			return (byte)(0xa + ch - 'A');
-		}
-		return 0;
-	}
-
-	public static char bytesToChar(byte[] bytes) {
-		try {
-			return (char)Short.parseShort(new String(bytes), 16);
-		}
-		catch(RuntimeException e) {
-		}
-		return 0;
-	}
-
-	public static byte toByte(char[] bytes, boolean le) {
-		if (bytes.length != 2)
-			return 0;
-		return (byte)Long.parseLong(bytesToString(bytes, le, true), 16);
-	}
-
-	public static short toUnsignedByte(char[] bytes, boolean le) {
-		if (bytes.length != 2)
-			return 0;
-		return (short)Long.parseLong(bytesToString(bytes, le, false), 16);
-	}
-
-	public static short toShort(char[] bytes, boolean le) {
-		if (bytes.length != 4)
-			return 0;
-		return (short)Long.parseLong(bytesToString(bytes, le, true), 16);
-	}
-
-	public static int toUnsignedShort(char[] bytes, boolean le) {
-		if (bytes.length != 4)
-			return 0;
-		return (int)Long.parseLong(bytesToString(bytes, le, false), 16);
-	}
-
-	public static int toInt(char[] bytes, boolean le) {
-		if (bytes.length != 8)
-			return 0;
-		return (int)Long.parseLong(bytesToString(bytes, le, true), 16);
-	}
-
-	public static long toUnsignedInt(char[] bytes, boolean le) {
-		if (bytes.length != 8)
-			return 0;
-		return Long.parseLong(bytesToString(bytes, le, false), 16);
-	}
-
-	private static String bytesToString(char[] bytes, boolean le, boolean signed) {
-		char[] copy = new char[bytes.length];
-		if (le) {
-			for(int i = 0; i < bytes.length / 2; ++i) {
-				copy[2 * i] = bytes[bytes.length - 2 * i - 2];
-				copy[2 * i + 1] = bytes[bytes.length - 2 * i - 1];
-			}
-		}
-		else {
-			System.arraycopy(bytes, 0, copy, 0, copy.length);
-		}
-		return new String(copy);
-	}
-
-	public static String prependString(String text, int length, char ch) {
-		StringBuffer sb = new StringBuffer(length);
-		if (text.length() > length) {
-			sb.append(text.substring(0, length));
-		}
-		else {
-			char[] prefix = new char[length - text.length()];
-			Arrays.fill(prefix, ch);
-			sb.append(prefix);
-			sb.append(text);
-		}
-		return sb.toString();
-	}
-	public static List<IProject> getReferencedProjects(IProject project) {
-		ArrayList<IProject> list = new ArrayList<IProject>(10);
-		if (project != null && project.exists() && project.isOpen()) {
-			IProject[] refs = new IProject[0];
-			try {
-				refs = project.getReferencedProjects();
-			}
-			catch(CoreException e) {
-			}
-			for(int i = 0; i < refs.length; ++i) {
-				if (!project.equals(refs[i]) && refs[i] != null && refs[i].exists() && refs[i].isOpen()) {
-					list.add(refs[i]);
-					getReferencedProjects(project, refs[i], list);
-				}
-			}
-		}
-		return list;
-	}
-	private static void getReferencedProjects(IProject root, IProject project, List<IProject> list) {
-		if (project != null && project.exists() && project.isOpen()) {
-			IProject[] refs = new IProject[0];
-			try {
-				refs = project.getReferencedProjects();
-			}
-			catch(CoreException e) {
-			}
-			for(int i = 0; i < refs.length; ++i) {
-				if (!list.contains(refs[i]) && refs[i] != null && !refs[i].equals(root) && refs[i].exists() && refs[i].isOpen()) {
-					list.add(refs[i]);
-					getReferencedProjects(root, refs[i], list);
-				}
-			}
-		}
-	}
-	public static boolean isReferencedProject(IProject parent, IProject project) {
-		if (parent != null && parent.exists()) {
-			List<IProject> projects = PDebugUtils.getReferencedProjects(project);
-			Iterator<IProject> it = projects.iterator();
-			while(it.hasNext()) {
-				IProject prj = (IProject)it.next();
-				if (prj.exists() && (prj.equals(project)))
-					return true;
-			}
-		}
-		return false;
-	}
-	/**
-	 * Serializes a XML document into a string - encoded in UTF8 format, with platform line separators.
-	 * @param doc document to serialize
-	 * @return the document as a string
-	 */
-	public static String serializeDocument(Document doc) throws IOException, TransformerException {
-		ByteArrayOutputStream s = new ByteArrayOutputStream();
-		TransformerFactory factory = TransformerFactory.newInstance();
-		Transformer transformer = factory.newTransformer();
-		transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-		transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-		DOMSource source = new DOMSource(doc);
-		StreamResult outputTarget = new StreamResult(s);
-		transformer.transform(source, outputTarget);
-		return s.toString("UTF8");			
-	}
-	
-	public static int getAddressSize() {
-		if (Platform.getOSArch().endsWith("64"))
-			return 8;
-		return 4;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PTPDebugCorePlugin.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PTPDebugCorePlugin.java
deleted file mode 100644
index 702e2a3..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/PTPDebugCorePlugin.java
+++ /dev/null

@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.PSourceLookupDirector;
-import org.eclipse.ptp.debug.internal.core.PDebugConfiguration;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.CommonSourceLookupDirector;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.SourceUtils;
-import org.osgi.framework.BundleContext;
-
-public class PTPDebugCorePlugin extends Plugin {
-	class EventDispatchJob extends Job {
-		private EventNotifier fNotifier = new EventNotifier();
-
-		/**
-		 * Creates a new event dispatch job.
-		 */
-		public EventDispatchJob() {
-			super("EventDispatchJob");
-			setPriority(Job.INTERACTIVE);
-			setSystem(true);
-		}
-		
-		public boolean shouldRun() {
-			return shouldSchedule();
-		}
-
-		public boolean shouldSchedule() {
-			return !(isShuttingDown() || fEventListeners.isEmpty());
-		}
-
-		protected IStatus run(IProgressMonitor monitor) {
-			while (!fEventQueue.isEmpty()) {
-				IPDebugEvent event = null;
-				synchronized (fEventQueue) {
-					if (!fEventQueue.isEmpty()) {
-						event = (IPDebugEvent) fEventQueue.remove(0);
-					}
-				}
-				if (event != null) {
-					fNotifier.dispatch(event);
-				}
-			}
-			return Status.OK_STATUS;
-		}
-	}
-	
-	class EventNotifier implements ISafeRunnable {
-		private IPDebugEvent fEvent;
-		private IPDebugEventListener fListener;
-
-		public void dispatch(IPDebugEvent event) {
-			fEvent = event;
-			try {
-				setDispatching(true);
-				Object[] listeners = getEventListeners();
-				for (int i = 0; i < listeners.length; i++) {
-					fListener = (IPDebugEventListener) listeners[i];
-					SafeRunner.run(this);
-				}
-
-			} finally {
-				setDispatching(false);
-			}
-			fEvent = null;
-			fListener = null;
-		}
-
-		public void handleException(Throwable exception) {
-			log(new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR,
-					"PTPDebugCorePlugin occurred exception while dispacthing debug event", exception));
-		}
-
-		public void run() throws Exception {
-			fListener.handleDebugEvent(fEvent);
-		}
-	}
-	
-	public static final String PLUGIN_ID = "org.eclipse.ptp.debug.core";
-	
-	public static final int INTERNAL_ERROR = 1000;
-	
-	/**
-	 * Constant identifying the job family identifier for the background event
-	 * job.
-	 */
-	public static final Object FAMILY_EVENT = new Object();
-	
-	public static final String PDEBUGGER_EXTENSION_POINT_ID = "parallelDebuggers";
-	public static final String DEBUGGER_ELEMENT = "debugger";
-
-	private static PTPDebugCorePlugin plugin;
-	private static PDebugModel debugModel = null;
-
-	/**
-	 * @return
-	 */
-	public static PDebugModel getDebugModel() {
-		return debugModel;
-	}
-	
-	/**
-	 * @return
-	 */
-	public static PTPDebugCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @return
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-	
-	/**
-	 * @return
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	/**
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-	
-	/**
-	 * @param message
-	 */
-	public static void log(String message) {
-		getDefault().getLog().log(new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, message, null));
-	}
-	
-	/**
-	 * @param t
-	 */
-	public static void log(Throwable t) {
-		Throwable top = t;
-		if (t instanceof DebugException) {
-			DebugException de = (DebugException) t;
-			IStatus status = de.getStatus();
-			if (status.getException() != null) {
-				top = status.getException();
-			}
-		}
-		// this message is intentionally not internationalized, as an exception
-		// may
-		// be due to the resource bundle itself
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, "Internal error logged from PDI Debug: ", top));
-	}
-
-	private HashMap<String, PDebugConfiguration> fDebugConfigurations;
-	private CommonSourceLookupDirector fCommonSourceLookupDirector;
-	private EventDispatchJob dispatchJob = new EventDispatchJob();
-	private ListenerList fEventListeners = new ListenerList();
-	private List<IPDebugEvent> fEventQueue = new ArrayList<IPDebugEvent>();
-	private boolean fShuttingDown = false;
-	private int fDispatching = 0;
-
-	public PTPDebugCorePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * @param listener
-	 */
-	public void addDebugEventListener(IPDebugEventListener listener) {
-		fEventListeners.add(listener);
-	}
-
-	/**
-	 * @param event
-	 */
-	public void fireDebugEvent(IPDebugEvent event) {
-		if (isShuttingDown() || event == null || fEventListeners.isEmpty())
-			return;
-		synchronized (fEventQueue) {
-			fEventQueue.add(event);
-		}
-		dispatchJob.schedule();
-	}
-
-	/**
-	 * @return
-	 */
-	public int getCommandTimeout() {
-		return getPluginPreferences().getInt(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT);
-	}
-
-	/**
-	 * @return
-	 */
-	public IPSourceLocation[] getCommonSourceLocations() {
-		return SourceUtils.getCommonSourceLocationsFromMemento(getPluginPreferences().getString(
-				IPDebugConstants.PREF_SOURCE_LOCATIONS));
-	}
-
-	/**
-	 * @return
-	 */
-	public PSourceLookupDirector getCommonSourceLookupDirector() {
-		return fCommonSourceLookupDirector;
-	}
-
-	/**
-	 * @param id
-	 * @return
-	 * @throws CoreException
-	 */
-	public IPDebugConfiguration getDebugConfiguration(String id) throws CoreException {
-		if (fDebugConfigurations == null) {
-			initializeDebugConfiguration();
-		}
-		IPDebugConfiguration dbgCfg = (IPDebugConfiguration) fDebugConfigurations.get(id);
-		if (dbgCfg == null) {
-			IStatus status = new Status(IStatus.ERROR, getUniqueIdentifier(), 100, "PTPDebugCorePlugin Debug Configuration Error",
-					null);
-			throw new CoreException(status);
-		}
-		return dbgCfg;
-	}
-
-	/**
-	 * @return
-	 */
-	public IPDebugConfiguration[] getDebugConfigurations() {
-		if (fDebugConfigurations == null) {
-			initializeDebugConfiguration();
-		}
-		return (IPDebugConfiguration[]) fDebugConfigurations.values().toArray(new IPDebugConfiguration[0]);
-	}
-
-	/**
-	 * @return
-	 */
-	public IPDebugConfiguration getDefaultDebugConfiguration() {
-		IPDebugConfiguration result = null;
-		try {
-			result = getDebugConfiguration(getPluginPreferences().getString(
-					IPDebugConstants.PREF_DEFAULT_DEBUGGER_TYPE));
-		} catch (CoreException e) {
-		}
-		return result;
-	}
-
-	public boolean isDefaultDebugConfiguration(String id) {
-		return (id.compareTo(getPluginPreferences().getString(
-				IPDebugConstants.PREF_DEFAULT_DEBUGGER_TYPE)) == 0);
-	}
-
-	/**
-	 * Returns whether debug events are being dispatched
-	 */
-	public synchronized boolean isDispatching() {
-		return fDispatching > 0;
-	}
-
-	/**
-	 * Returns whether this plug-in is in the process of being shutdown.
-	 * 
-	 * @return whether this plug-in is in the process of being shutdown
-	 */
-	public boolean isShuttingDown() {
-		return fShuttingDown;
-	}
-
-	/**
-	 * @param listener
-	 */
-	public void removeDebugEventListener(IPDebugEventListener listener) {
-		fEventListeners.remove(listener);
-	}
-
-	/**
-	 * @param locations
-	 */
-	public void saveCommonSourceLocations(IPSourceLocation[] locations) {
-		getPluginPreferences().setValue(IPDebugConstants.PREF_SOURCE_LOCATIONS,
-				SourceUtils.getCommonSourceLocationsMemento(locations));
-	}
-
-	public void saveDefaultDebugConfiguration(String id) {
-		getPluginPreferences().setValue(IPDebugConstants.PREF_DEFAULT_DEBUGGER_TYPE,
-				(id != null) ? id : "");
-	}
-
-	/**
-	 * Sets whether this plug-in is in the process of being shutdown.
-	 * 
-	 * @param value
-	 *            whether this plug-in is in the process of being shutdown
-	 */
-	public void setShuttingDown(boolean value) {
-		fShuttingDown = value;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		debugModel = new PDebugModel();
-		initializeCommonSourceLookupDirector();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		try {
-			setShuttingDown(true);
-			debugModel.shutdown();
-			disposeCommonSourceLookupDirector();
-			disposeDebugConfigurations();
-			DebugJobStorage.removeDebugStorages();
-		} finally {
-			super.stop(context);
-		}
-	}
-
-	/**
-	 * @param director
-	 */
-	private void convertSourceLocations(CommonSourceLookupDirector director) {
-		director.setSourceContainers(SourceUtils.convertSourceLocations(getCommonSourceLocations()));
-	}
-
-	/**
-	 * 
-	 */
-	private void disposeCommonSourceLookupDirector() {
-		if (fCommonSourceLookupDirector != null)
-			fCommonSourceLookupDirector.dispose();
-	}
-
-	private void disposeDebugConfigurations() {
-		if (fDebugConfigurations != null) {
-			fDebugConfigurations.clear();
-			fDebugConfigurations = null;
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private Object[] getEventListeners() {
-		return fEventListeners.getListeners();
-	}
-
-	/**
-	 * 
-	 */
-	private void initializeCommonSourceLookupDirector() {
-		if (fCommonSourceLookupDirector == null) {
-			fCommonSourceLookupDirector = new CommonSourceLookupDirector();
-			String newMemento = getPluginPreferences().getString(
-					IPDebugConstants.PREF_COMMON_SOURCE_CONTAINERS);
-			if (newMemento.length() == 0) {
-				// Convert source locations to source containers
-				convertSourceLocations(fCommonSourceLookupDirector);
-			} else {
-				try {
-					fCommonSourceLookupDirector.initializeFromMemento(newMemento);
-				} catch (CoreException e) {
-					log(e.getStatus());
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void initializeDebugConfiguration() {
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(getUniqueIdentifier(),
-				PDEBUGGER_EXTENSION_POINT_ID);
-		if (extensionPoint != null) {
-			IConfigurationElement[] infos = extensionPoint.getConfigurationElements();
-			fDebugConfigurations = new HashMap<String, PDebugConfiguration>(infos.length);
-			for (int i = 0; i < infos.length; i++) {
-				IConfigurationElement configurationElement = infos[i];
-				PDebugConfiguration configType = new PDebugConfiguration(configurationElement);
-				fDebugConfigurations.put(configType.getID(), configType);
-			}
-		}
-	}
-
-	/**
-	 * @param dispatching
-	 */
-	private synchronized void setDispatching(boolean dispatching) {
-		if (dispatching) {
-			fDispatching++;
-		} else {
-			fDispatching--;
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ProcessInputStream.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ProcessInputStream.java
deleted file mode 100644
index dc61bd6..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/ProcessInputStream.java
+++ /dev/null

@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core;
-
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State;
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-import org.eclipse.ptp.core.elements.listeners.IProcessListener;
-
-/**
- * @author Clement chu
- */
-public class ProcessInputStream extends InputStream implements IProcessListener {
-	protected List<String> buffers;
-    protected int pos;
-    protected int count;
-    private String currentBuffer;
-    private IPProcess process;
-
-    public ProcessInputStream(IPProcess process) {
-    	this.process = process;
-    	buffers = Collections.synchronizedList(new LinkedList<String>());
-		process.addElementListener(this);
-    }
-    public IPProcess getProcess() {
-    	return process;
-    }
-    public void addInput(String buffer) {
-    	synchronized(buffers) {
-    		buffers.add(buffer==null?"":buffer);
-	    	buffers.notifyAll();
-    	}
-    }
-    private String getBuffer() {
-		synchronized (buffers) {
-			String buffer;
-			while (buffers.isEmpty()) {
-				try {
-					buffers.wait();
-		    	} catch (InterruptedException e) {
-		    		buffer = "";
-		    	}
-			}
-			buffer = (String)buffers.remove(0);
-			reset(buffer.length());
-			return buffer;
-		}
-    }
-    public void restart() {
-    	process.addElementListener(this);
-    }
-    public void close() {
-    	addInput("");
-    	process.addElementListener(this);
-    }
-    public int read() {
-    	synchronized (buffers) {
-    		if (count <= pos)
-    			currentBuffer = getBuffer();
-    		
-    		return (pos < count) ? (currentBuffer.charAt(pos++) & 0xFF) : -1;
-    	}
-    }
-    public int read(byte b[], int off, int len) {
-    	synchronized (buffers) {
-    		String buffer = getBuffer();
-			if (b == null) {
-			    throw new NullPointerException();
-			} else if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0)) {
-			    throw new IndexOutOfBoundsException();
-			}
-			if (pos >= count) {
-			    return -1;
-			}
-			if (pos + len > count) {
-			    len = count - pos;
-			}
-			if (len <= 0) {
-			    return 0;
-			}
-			int cnt = len;
-			while (--cnt >= 0) {
-			    b[off++] = (byte)buffer.charAt(pos++);
-			}
-			return len;
-    	}
-    }
-    public void reset(int len) {
-    	synchronized (buffers) {
-	    	pos = 0;
-	    	count = len;
-    	}
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ptp.core.elements.listeners.IProcessListener#handleEvent(org.eclipse.ptp.core.elements.events.IProcessChangeEvent)
-     */
-    public void handleEvent(IProcessChangeEvent e) {
-		EnumeratedAttribute<ProcessAttributes.State> stateAttr = e.getAttributes().getAttribute(ProcessAttributes.getStateAttributeDefinition());
-		if (stateAttr != null) {
-			ProcessAttributes.State state = stateAttr.getValue();
-			if (state == State.EXITED || state == State.EXITED_SIGNALLED || state == State.ERROR) {
-				close();
-			}
-		} 
-		
-		StringAttribute stdoutAttr = e.getAttributes().getAttribute(ProcessAttributes.getStdoutAttributeDefinition());
-		if (stdoutAttr != null) {
-			addInput(stdoutAttr.getValue() + "\n");
-		}
-
-    }
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugBreakpointInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugBreakpointInfo.java
deleted file mode 100644
index bf3b330..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugBreakpointInfo.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-import java.util.Map;
-
-/**
- * @author Clement
- */
-public interface IPDebugBreakpointInfo extends IPDebugInfo {
-	int getBreakpointID();
-	Map<String,?> getInfo();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugErrorInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugErrorInfo.java
deleted file mode 100644
index 636784d..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugErrorInfo.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-/**
- * @author Clement
- */
-public interface IPDebugErrorInfo extends IPDebugInfo {
-	String getDetailsMsg();
-	String getMsg();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugEvent.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugEvent.java
deleted file mode 100644
index c5cb6d0..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugEvent.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-
-/**
- * @author Clement
- */
-public interface IPDebugEvent {
-	/**
-	 * Resume event kind.
-	 */
-	public static final int RESUME= 0x0001;
-
-	/**
-	 * Suspend event kind.
-	 */
-	public static final int SUSPEND= 0x0002;
-
-	/**
-	 * Create event kind.
-	 */
-	public static final int CREATE= 0x0004;
-
-	/**
-	 * Terminate event kind.
-	 */
-	public static final int TERMINATE= 0x0008;
-	
-	/**
-	 * Change event kind.
-	 */
-	public static final int CHANGE= 0x0010;
-
-	/**
-	 * Error event kind or detail
-	 */
-	public static final int ERROR= 0x0040;
-
-	/**
-	 * Process specific event detail.
-	 * 
-	 * @since 2.1.2
-	 */
-	//public static final int MODEL_SPECIFIC= 0x0020;
-	public static final int PROCESS_SPECIFIC= 0x0020;
-
-	/**
-	 * Step start detail. Indicates a thread was resumed by a step
-	 * into action.
-	 * @since 2.0
-	 */
-	public static final int STEP_INTO= 0x0001;
-	
-	/**
-	 * Step start detail. Indicates a thread was resumed by a step
-	 * over action.
-	 * @since 2.0
-	 */
-	public static final int STEP_OVER= 0x0002;
-	
-	/**
-	 * Step start detail. Indicates a thread was resumed by a step
-	 * return action.
-	 * @since 2.0
-	 */
-	public static final int STEP_RETURN= 0x0004;
-
-	/**
-	 * Step end detail. Indicates a thread was suspended due
-	 * to the completion of a step action.
-	 */
-	public static final int STEP_END= 0x0008;
-	
-	/**
-	 * Breakpoint detail. Indicates a thread was suspended by a breakpoint.
-	 */
-	public static final int BREAKPOINT= 0x0010;
-	
-	/**
-	 * Client request detail. Indicates a thread was suspended due to a client request.
-	 */
-	public static final int CLIENT_REQUEST= 0x0020;
-	
-	/**
-	 * Evaluation detail. Indicates that a thread was resumed or
-	 * suspended to perform an expression evaluation.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int EVALUATION = 0x0040;
-	
-	/**
-	 * Evaluation detail. Indicates that a thread was resumed or
-	 * suspended to perform an implicit expression evaluation.
-	 * An implicit evaluation is an evaluation that is performed
-	 * as an indirect result of a user action.
-	 * Clients may use this detail event to decide whether or not
-	 * to alert the user that an evaluation is taking place..
-	 * 
-	 * @since 2.0
-	 */
-	public static final int EVALUATION_IMPLICIT = 0x0080;
-
-	/**
-	 * State change detail. Indicates the state of a single 
-	 * debug element has changed. Only valid for <code>CHANGE</code>
-	 * events.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int STATE = 0x0100;
-	
-	/**
-	 * Content change detail. Indicates the content of a debug element
-	 * (and potentially its children) has changed. Only valid for
-	 * <code>CHANGE</code> events.
-	 * 
-	 * @since 2.0
-	 */
-	public static final int CONTENT = 0x0200;
-
-	/**
-	 * Debugger detail. Indicates the debugger is terminated or created
-	 * 
-	 * @since 2.0
-	 */
-	public static final int DEBUGGER = 0x0400;
-
-	/**
-	 * Register detail. Indicates the registered process is created or terminated
-	 * 
-	 * @since 2.0
-	 */
-	public static final int REGISTER = 0x0800;
-	
-	/**
-	 * Constant indicating that the kind or detail of a debug
-	 * event is unspecified.
-	 */
-	public static final int UNSPECIFIED = 0;
-
-	public static final int ERR_NORMAL= 0x0001;
-	public static final int ERR_WARNING= 0x0002;
-	public static final int ERR_FATAL= 0x0004;		
-
-	int getKind();
-	int getDetail();
-	IPDebugInfo getInfo();
-	boolean isStepStart();
-	boolean isEvaluation(); 
-	
-	Object getSource();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugExitInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugExitInfo.java
deleted file mode 100644
index 800dc58..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugExitInfo.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-/**
- * @author Clement
- */
-public interface IPDebugExitInfo extends IPDebugInfo {
-	int getCode();
-	String getMessage();
-	String getName();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugInfo.java
deleted file mode 100644
index 5f77d0a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugInfo.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * @author Clement
- */
-public interface IPDebugInfo {
-	IPJob getJob();
-	BitList getAllTasks();
-	BitList getAllRegisteredTasks();
-	BitList getAllUnregisteredTasks();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugRegisterInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugRegisterInfo.java
deleted file mode 100644
index 5c5cf6b..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugRegisterInfo.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-/**
- * @author Clement
- */
-public interface IPDebugRegisterInfo extends IPDebugInfo {
-	boolean isRefresh();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugSuspendInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugSuspendInfo.java
deleted file mode 100644
index 61e8c15..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugSuspendInfo.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-/**
- * @author Clement
- */
-public interface IPDebugSuspendInfo extends IPDebugInfo {
-	int getLevel();
-	String getFilename();
-	int getLineNumber();
-	int getDepth();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugValueInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugValueInfo.java
deleted file mode 100644
index 9d4b1f3..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/IPDebugValueInfo.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author Clement
- */
-public interface IPDebugValueInfo extends IPDebugInfo {
-	IAIF getAIF();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugBreakpointInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugBreakpointInfo.java
deleted file mode 100644
index dae6be6..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugBreakpointInfo.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * @author Clement
- */
-public class PDebugBreakpointInfo extends PDebugInfo implements IPDebugBreakpointInfo {
-	private int bpid;
-	private Map<String, ?> infoMap;
-	
-	public PDebugBreakpointInfo(IPDebugInfo info, int bpid) {
-		this(info, bpid, Collections.EMPTY_MAP);
-	}
-	public PDebugBreakpointInfo(IPDebugInfo info, int bpid, Map<String, ?> infoMap) {
-		super(info);
-		this.bpid = bpid;
-		this.infoMap = infoMap;
-	}
-	public int getBreakpointID() {
-		return bpid;
-	}
-	public Map<String,?> getInfo() {
-		return infoMap;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugErrorInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugErrorInfo.java
deleted file mode 100644
index 421df25..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugErrorInfo.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-/**
- * @author Clement
- */
-public class PDebugErrorInfo extends PDebugInfo implements IPDebugErrorInfo {
-	private String msg;
-	private String detailsMsg;
-	private int errCode;
-	
-	public PDebugErrorInfo(IPDebugInfo info, String msg, String detailsMsg, int errCode) {
-		super(info);
-		this.msg = msg;
-		this.detailsMsg = detailsMsg;
-		this.errCode = errCode;
-	}
-	public String getDetailsMsg() {
-		return detailsMsg;
-	}
-	public String getMsg() {
-		return msg;
-	}
-	public int getErrorCode() {
-		return errCode;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugEvent.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugEvent.java
deleted file mode 100644
index 807485f..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugEvent.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-import java.util.EventObject;
-
-/**
- * @author Clement
- */
-public final class PDebugEvent extends EventObject implements IPDebugEvent {
-    private static final long serialVersionUID = 1L;
-	/**
-	 * The kind of event - one of the kind constants defined by
-	 * this class.
-	 */
-	private int fKind= UNSPECIFIED;
-	/**
-	 * The detail of the event - one of the detail constants defined by
-	 * this class.
-	 */
-	private int fDetail= UNSPECIFIED;
-
-	private IPDebugInfo fInfo = null;
-	
-	public PDebugEvent(Object eventSource, int kind, int detail, IPDebugInfo info) {
-		super(eventSource);
-		if ((kind & (RESUME | SUSPEND | CREATE | TERMINATE | CHANGE | ERROR | PROCESS_SPECIFIC)) == 0)
-			throw new IllegalArgumentException("Debug event illegal kind"); 
-		if (kind != PROCESS_SPECIFIC && detail != UNSPECIFIED && (detail & (STEP_END | STEP_INTO | STEP_OVER | STEP_RETURN | BREAKPOINT | CLIENT_REQUEST |EVALUATION | EVALUATION_IMPLICIT | STATE | CONTENT | DEBUGGER | REGISTER | ERR_NORMAL | ERR_WARNING | ERR_FATAL)) == 0)
-			throw new IllegalArgumentException("Debug event illegal detail");
-		fKind= kind;
-		fDetail= detail;
-		fInfo = info;
-	}
-	public int getKind() {
-		return fKind;
-	}
-	public int getDetail() {
-		return fDetail;
-	}
-	public IPDebugInfo getInfo() {
-		return fInfo;
-	}
-	public boolean isStepStart() {
-		return (getDetail() & (STEP_INTO | STEP_OVER | STEP_RETURN)) > 0;
-	}
-	public boolean isEvaluation() {
-		return (getDetail() & (EVALUATION | EVALUATION_IMPLICIT)) > 0;
-	}	
-	public String toString() {
-		StringBuffer buf = new StringBuffer("DebugEvent[");
-		if (getSource() != null) {
-			buf.append(getSource().toString());
-		} else {
-			buf.append("null");
-		}
-		buf.append(", ");
-		switch (getKind()) {
-			case CREATE:
-				buf.append("CREATE");
-				break;
-			case TERMINATE:
-				buf.append("TERMINATE");
-				break;
-			case RESUME:
-				buf.append("RESUME");
-				break;
-			case SUSPEND:
-				buf.append("SUSPEND");
-				break;				
-			case CHANGE:
-				buf.append("CHANGE");
-				break;
-			case UNSPECIFIED:
-				buf.append("UNSPECIFIED");
-				break;
-			case PROCESS_SPECIFIC:
-				buf.append("PROCESS_SPECIFIC");
-				break;
-		}
-		buf.append(", ");
-		switch (getDetail()) {
-			case BREAKPOINT:
-				buf.append("BREAKPOINT");
-				break;
-			case CLIENT_REQUEST:
-				buf.append("CLIENT_REQUEST");
-				break;
-			case STEP_END:
-				buf.append("STEP_END");
-				break;
-			case STEP_INTO:
-				buf.append("STEP_INTO");
-				break;
-			case STEP_OVER:
-				buf.append("STEP_OVER");
-				break;
-			case STEP_RETURN:
-				buf.append("STEP_RETURN");
-				break;
-			case EVALUATION:
-				buf.append("EVALUATION");
-				break;
-			case EVALUATION_IMPLICIT:
-				buf.append("EVALUATION_IMPLICIT");
-				break;								
-			case STATE:
-				buf.append("STATE");
-				break;			
-			case CONTENT:
-				buf.append("CONTENT");
-				break;					
-			case UNSPECIFIED:
-				buf.append("UNSPECIFIED");
-				break;
-			default:
-				// model specific
-				buf.append(getDetail());
-				break;
-		}
-		buf.append("]");
-		return buf.toString();
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugExitInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugExitInfo.java
deleted file mode 100644
index effbe96..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugExitInfo.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-/**
- * @author Clement
- */
-public class PDebugExitInfo extends PDebugInfo implements IPDebugExitInfo {
-	private String message;
-	private String name;
-	private int code;
-	
-	public PDebugExitInfo(IPDebugInfo info, int code, String message, String name) {
-		super(info);
-		this.code = code;
-		this.message = message;
-		this.name = name;
-	}
-	public String getMessage() {
-		return message;
-	}
-	public String getName() {
-		return name;
-	}
-	public int getCode() {
-		return code;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugInfo.java
deleted file mode 100644
index 11c7be4..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugInfo.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * @author Clement
- */
-public class PDebugInfo implements IPDebugInfo {
-	private BitList allTasks = null;
-	private BitList allRegTasks = null;
-	private BitList allUnregTasks = null;
-	private IPJob job = null;
-	
-	public PDebugInfo(IPDebugInfo info) {
-		this.job = info.getJob();
-		this.allTasks = info.getAllTasks();
-		this.allRegTasks = info.getAllRegisteredTasks();
-		this.allUnregTasks = info.getAllUnregisteredTasks();
-	}
-	public PDebugInfo(IPJob job, BitList allTasks, BitList allRegTasks, BitList allUnregTasks) {
-		this.job = job;
-		this.allTasks = allTasks;
-		this.allRegTasks = allRegTasks;
-		this.allUnregTasks = allUnregTasks;
-	}
-	public BitList getAllTasks() {
-		return allTasks;
-	}
-	public BitList getAllRegisteredTasks() {
-		return allRegTasks;
-	}
-	public BitList getAllUnregisteredTasks() {
-		return allUnregTasks;
-	}
-	public IPJob getJob() {
-		return job;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugRegisterInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugRegisterInfo.java
deleted file mode 100644
index dfba0b3..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugRegisterInfo.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * @author Clement
- */
-public class PDebugRegisterInfo extends PDebugInfo implements IPDebugRegisterInfo {
-	private boolean refresh;
-	
-	public PDebugRegisterInfo(IPJob job, BitList allProcesses, BitList allRegProcesses, BitList allUnregProcesses, boolean refresh) {
-		super(job, allProcesses, allRegProcesses, allUnregProcesses);
-		this.refresh = refresh;
-	}
-	public PDebugRegisterInfo(IPDebugInfo info, boolean refresh) {
-		super(info);
-		this.refresh = refresh;
-	}
-	public boolean isRefresh() {
-		return refresh;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugSuspendInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugSuspendInfo.java
deleted file mode 100644
index bef83b9..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/event/PDebugSuspendInfo.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.event;
-/**
- * @author Clement
- */
-public class PDebugSuspendInfo extends PDebugInfo implements IPDebugSuspendInfo {
-	private String filename;
-	private int lineNumber;
-	private int level;
-	private int depth;
-	
-	public PDebugSuspendInfo(IPDebugInfo info, String filename, int lineNumber, int level, int depth) {
-		super(info);
-		this.filename = filename;
-		this.lineNumber = lineNumber;
-		this.level = level;
-		this.depth = depth;
-	}
-	public String getFilename() {
-		return filename;
-	}
-	public int getLineNumber() {
-		return lineNumber;
-	}
-	public int getLevel() {
-		return level;
-	}
-	public int getDepth() {
-		return depth;
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/IPLaunch.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/IPLaunch.java
deleted file mode 100644
index 1a18005..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/IPLaunch.java
+++ /dev/null

@@ -1,42 +0,0 @@
-package org.eclipse.ptp.debug.core.launch;
-
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-
-/**
- * Extend ILaunch to support parallel debug jobs
- *
- */
-public interface IPLaunch extends ILaunch {
-	/**
-	 * Get the IPDebugTarget responsible for the processes in procs
-	 * 
-	 * @param tasks BitList containing processes we're interested in
-	 * @return IPDebugTarget responsible for processes
-	 */
-	public IPDebugTarget getDebugTarget(BitList procs);
-	
-	/**
-	 * Get the IPDebugTarget responsible for the procId.
-	 * 
-	 * @param procId process we're interested in
-	 * @return IPDebugTarget responsible for procId
-	 */
-	public IPDebugTarget getDebugTarget(int procId);
-	
-	/**
-	 * Get the job associated with this launch
-	 * 
-	 * @return IPJob
-	 */
-	public IPJob getPJob();
-	
-	/**
-	 * Set the job associated with this launch
-	 * 
-	 * @param job
-	 */
-	public void setPJob(IPJob job);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/PLaunch.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/PLaunch.java
deleted file mode 100644
index 85243c9..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/launch/PLaunch.java
+++ /dev/null

@@ -1,45 +0,0 @@
-package org.eclipse.ptp.debug.core.launch;
-
-import java.util.Iterator;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-
-public class PLaunch extends Launch implements IPLaunch {
-	private IPJob pJob;
-
-	public PLaunch(ILaunchConfiguration launchConfiguration, String mode, ISourceLocator locator) {
-		super(launchConfiguration, mode, locator);
-	}
-	public IPJob getPJob() {
-		return pJob;
-	}
-	public void setPJob(IPJob job) {
-		pJob = job;
-	}
-	public IPDebugTarget getDebugTarget(BitList tasks) {
-		for (Iterator<?> i=getDebugTargets0().iterator(); i.hasNext();) {
-			IPDebugTarget debugTarget = (IPDebugTarget)i.next();
-			if (debugTarget.getTasks().equals(tasks))
-				return debugTarget;
-		}
-		return null;
-	}
-	public IPDebugTarget getDebugTarget(int task_id) {
-		for (Iterator<?> i=getDebugTargets0().iterator(); i.hasNext();) {
-			IPDebugTarget debugTarget = (IPDebugTarget)i.next();
-			if (debugTarget.getTasks().get(task_id))
-				return debugTarget;
-		}
-		return null;
-	}
-	public boolean isTerminated() {
-		if (pJob != null)
-			return pJob.isTerminated();
-		return super.isTerminated();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IEnableDisableTarget.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IEnableDisableTarget.java
deleted file mode 100644
index 8471251..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IEnableDisableTarget.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author Clement chu
- */
-public interface IEnableDisableTarget {
-	/**
-	 * Returns whether this object supports enable/disable operations.
-	 * 
-	 * @return whether this object supports enable/disable operations
-	 */
-	boolean canEnableDisable();
-	
-	/**
-	 * Returns whether this object is enabled.
-	 * 
-	 * @return <code>true</code> if this obvject is enabled, 
-	 * 		   or <code>false</code> otherwise.
-	 */
-	boolean isEnabled();
-
-	/**
-	 * Enables/disables this object
-	 * 
-	 * @param enabled enablement flag value
-	 * @throws DebugException
-	 */
-	void setEnabled(boolean enabled) throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IExecFileInfo.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IExecFileInfo.java
deleted file mode 100644
index 405029e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IExecFileInfo.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IExecFileInfo {
-	/** Get binary file
-	 * @return
-	 */
-	//public IBinaryObject getExecFile();
-	/** Get global variable descriptor
-	 * @return
-	 * @throws DebugException
-	 */
-	public IPGlobalVariableDescriptor[] getGlobals() throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IFormatSupport.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IFormatSupport.java
deleted file mode 100644
index 5d257dd..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IFormatSupport.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IFormatSupport {
-	boolean supportsFormatting();
-	PVariableFormat getFormat();
-	void changeFormat(PVariableFormat format) throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToAddress.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToAddress.java
deleted file mode 100644
index 1d18841..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToAddress.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author clement
- *
- */
-public interface IJumpToAddress {
-	/**
-	 * Returns whether this operation is currently available for this element.
-	 * 
-	 * @return whether this operation is currently available
-	 */
-	public boolean canJumpToAddress(BigInteger address);
-
-	/**
-	 * Causes this element to resume the execution at the specified address.
-	 * 
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void jumpToAddress(BigInteger address) throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToLine.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToLine.java
deleted file mode 100644
index 1996e1c..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IJumpToLine.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.DebugException;
-
-/**
- * Provides the ability to resume a debug target at the given line
- * @author clement
- *
- */
-public interface IJumpToLine {
-	/**
-	 * Returns whether this operation is currently available for this file and line number.
-	 * 
-	 * @return whether this operation is currently available
-	 */
-	public boolean canJumpToLine(IFile file, int lineNumber);
-
-	/**
-	 * Causes this element to resume the execution at the specified line.
-	 * 
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void jumpToLine(IFile file, int lineNumber) throws DebugException;
-
-	/**
-	 * Returns whether this operation is currently available for this file and line number.
-	 * 
-	 * @return whether this operation is currently available
-	 */
-	public boolean canJumpToLine(String fileName, int lineNumber);
-
-	/**
-	 * Causes this element to resume the execution at the specified line.
-	 * 
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void jumpToLine(String fileName, int lineNumber) throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAIF.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAIF.java
deleted file mode 100644
index 5d98c3a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAIF.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPAIF extends IValue, IPDebugElement {
-	IAIF getAIF() throws DebugException;
-	String evaluateAsExpression(IPStackFrame frame);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAddressBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAddressBreakpoint.java
deleted file mode 100644
index e43c233..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPAddressBreakpoint.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * @author Clement chu
- *
- */
-public interface IPAddressBreakpoint extends IPLineBreakpoint {
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPBreakpoint.java
deleted file mode 100644
index e0581d2..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPBreakpoint.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.IBreakpoint;
-
-/**
- * @author Clement chu
- *
- */
-public interface IPBreakpoint extends IBreakpoint {
-	public static final String GLOBAL = "Global";
-	
-	public static final String CONDITION = "org.eclipse.ptp.debug.core.condition";
-	public static final String IGNORE_COUNT = "org.eclipse.ptp.debug.core.ignoreCount";
-	public static final String SOURCE_HANDLE = "org.eclipse.ptp.debug.core.sourceHandle";
-	public static final String INSTALL_COUNT = "org.eclipse.ptp.debug.core.installCount";
-	//public static final String THREAD_ID = "org.eclipse.ptp.debug.core.threadId";
-	//public static final String MODULE = "org.eclipse.ptp.debug.core.module";
-	
-	public static final String SET_ID = "org.eclipse.ptp.debug.core.setid";
-	public static final String CUR_SET_ID = "org.eclipse.ptp.debug.core.cursetid";
-	public static final String JOB_ID = "org.eclipse.ptp.debug.core.jobid";
-	public static final String JOB_NAME = "org.eclipse.ptp.debug.core.jobname";
-
-	void updateMarkerMessage() throws CoreException;
-	
-	boolean isGlobal() throws CoreException;
-	
-	String getCurSetId() throws CoreException;
-	void setCurSetId(String id) throws CoreException;
-
-	String getSetId() throws CoreException;
-	void setSetId(String id) throws CoreException;
-	
-	String getJobId() throws CoreException;
-	void setJobId(String id) throws CoreException;
-	
-	String getJobName() throws CoreException;
-	void setJobName(String name) throws CoreException;
-	
-	boolean isInstalled() throws CoreException;
-	boolean isConditional() throws CoreException;
-
-	int incrementInstallCount() throws CoreException;
-	int decrementInstallCount() throws CoreException;
-	void resetInstallCount() throws CoreException;
-
-	String getCondition() throws CoreException;
-	void setCondition(String condition) throws CoreException;
-	
-	int getIgnoreCount() throws CoreException;
-	void setIgnoreCount(int ignoreCount) throws CoreException;
-	
-	String getSourceHandle() throws CoreException;
-	void setSourceHandle(String sourceHandle) throws CoreException;
-/*
- * TODO - Not Implemented
-	String getThreadId() throws CoreException;
-	void setThreadId(String threadId) throws CoreException;
-	
-	String getModule() throws CoreException;
-	void setModule(String module) throws CoreException;
-	
-	void setTargetFilter(IPDebugTarget target) throws CoreException;
-	void removeTargetFilter(IPDebugTarget target) throws CoreException;
-	void setThreadFilters(IPThread[] threads) throws CoreException;
-	void removeThreadFilters(IPThread[] threads) throws CoreException;
-	IPThread[] getThreadFilters(IPDebugTarget target) throws CoreException;
-	IPDebugTarget[] getTargetFilters() throws CoreException;
-*/ 
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElement.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElement.java
deleted file mode 100644
index e8819f0..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElement.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.ptp.debug.core.IPSession;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPDebugElement extends IDebugElement {
-	PDebugElementState getState();
-	Object getCurrentStateInfo();
-	IPSession getSession();
-	int getID();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElementStatus.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElementStatus.java
deleted file mode 100644
index acf58c6..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugElementStatus.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-/**
- * @author Clement chu
- * 
- */
-public interface IPDebugElementStatus {
-	public static final int OK = 0;
-	public static final int WARNING = 1;
-	public static final int ERROR = 2;
-	boolean isOK();
-	int getSeverity();
-	String getMessage();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugTarget.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugTarget.java
deleted file mode 100644
index 03bc1d7..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDebugTarget.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPDebugTarget extends IDebugTarget, IExecFileInfo, IRestart, IResumeWithoutSignal, IPDebugElement,
-		ITargetProperties, ISteppingModeTarget {
-	/**
-	 * @param name
-	 * @param descriptors
-	 */
-	public void addRegisterGroup(String name, IPRegisterDescriptor[] descriptors);
-
-	/**
-	 * @param globalVariableDescriptor
-	 * @return
-	 */
-	public IPGlobalVariable createGlobalVariable(IPGlobalVariableDescriptor globalVariableDescriptor) throws DebugException;
-
-	/**
-	 * 
-	 */
-	public void dispose();
-
-	/**
-	 * @param content
-	 */
-	public void fireChangeEvent(int content);
-
-	/**
-	 * @param breakpoint
-	 * @return
-	 * @throws DebugException
-	 */
-	public BigInteger getBreakpointAddress(IPLineBreakpoint breakpoint) throws DebugException;
-
-	/**
-	 * @return
-	 */
-	public IPDITarget getPDITarget();
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	public IPRegisterDescriptor[] getRegisterDescriptors() throws DebugException;
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	public IPSignal[] getSignals() throws DebugException;
-
-	/**
-	 * @return
-	 */
-	public BitList getTasks();
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	public boolean hasSignals() throws DebugException;
-
-	/**
-	 * @return
-	 */
-	public boolean isLittleEndian();
-
-	/**
-	 * @return
-	 */
-	public boolean isPostMortem();
-
-	/**
-	 * @param group
-	 * @param descriptors
-	 */
-	public void modifyRegisterGroup(IPPersistableRegisterGroup group, IPRegisterDescriptor[] descriptors);
-
-	/**
-	 * @param groups
-	 */
-	public void removeRegisterGroups(IRegisterGroup[] groups);
-
-	/**
-	 * 
-	 */
-	public void restoreDefaultRegisterGroups();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDummyStackFrame.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDummyStackFrame.java
deleted file mode 100644
index 40c222a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPDummyStackFrame.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * @author clement
- *
- */
-public interface IPDummyStackFrame {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPFunctionBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPFunctionBreakpoint.java
deleted file mode 100644
index 0385a71..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPFunctionBreakpoint.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * @author Clement chu
- *
- */
-public interface IPFunctionBreakpoint extends IPLineBreakpoint {
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariable.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariable.java
deleted file mode 100644
index d07581f..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariable.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPGlobalVariable extends IPVariable {
-	public IPGlobalVariableDescriptor getDescriptor();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariableDescriptor.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariableDescriptor.java
deleted file mode 100644
index b314680..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPGlobalVariableDescriptor.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPGlobalVariableDescriptor {
-	public String getName();
-	public IPath getPath();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPLineBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPLineBreakpoint.java
deleted file mode 100644
index c439a5e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPLineBreakpoint.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-
-/**
- * @author Clement
- *
- */
-public interface IPLineBreakpoint extends IPBreakpoint, ILineBreakpoint {
-	public static final String FUNCTION = "org.eclipse.ptp.debug.core.function";	
-	public static final String ADDRESS = "org.eclipse.ptp.debug.core.address";	
-
-	public String getAddress() throws CoreException;
-	public void setAddress(String address) throws CoreException;
-	
-	public String getFunction() throws CoreException;
-	public void setFunction(String function) throws CoreException;
-	
-	public String getFileName() throws CoreException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPModule.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPModule.java
deleted file mode 100644
index 17ce1ab..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPModule.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author clement
- * 
- */
-public interface IPModule extends IPDebugElement {
-
-	/**
-	 * Type constant which identifies executables.
-	 */
-	public static final int EXECUTABLE = 1;
-
-	/**
-	 * Type constant which identifies shared libraries.
-	 */
-	public static final int SHARED_LIBRARY = 2;
-
-	/**
-	 * Returns the type of this module. The returned value will be one of
-	 * 
-	 * @return the type of this module
-	 */
-	public int getType();
-
-	/**
-	 * Returns the name of this module.
-	 * 
-	 * @return the name of this module
-	 */
-	public String getName();
-
-	/**
-	 * Returns the image name of this module. The name may or may not contain a
-	 * full path.
-	 * 
-	 * @return the image name of this module
-	 */
-	public IPath getImageName();
-
-	/**
-	 * Returns the full path of the file from which symbols to be loaded.
-	 * 
-	 * @return the full path of the file from which symbols to be loaded
-	 */
-	public IPath getSymbolsFileName();
-
-	/**
-	 * Associate the specified file as a symbol provider for this module. If
-	 * <code>null</code> is passed as a file name the internal symbols search
-	 * mechanism will be used.
-	 * 
-	 * @param symbolsFile
-	 *            the symbol provider for this module.
-	 * @throws DebugException
-	 *             if this method fails. Reasons include:
-	 */
-	public void setSymbolsFileName(IPath symbolsFile) throws DebugException;
-
-	/**
-	 * Returns the base address of this module.
-	 * 
-	 * @return the base address of this module
-	 */
-	public BigInteger getBaseAddress();
-
-	/**
-	 * Returns the size of this module.
-	 * 
-	 * @return the size of this module
-	 */
-	public long getSize();
-
-	/**
-	 * Returns whether the symbols of this module are read.
-	 * 
-	 * @return whether the symbols of this module are read
-	 */
-	public boolean areSymbolsLoaded();
-
-	/**
-	 * Returns whether the module's symbols can be loaded or reloaded.
-	 * 
-	 * @return whether the module's symbols can be loaded or reloaded
-	 */
-	public boolean canLoadSymbols();
-
-	/**
-	 * Loads the module symbols from the specified file.
-	 * 
-	 * @throws DebugException if this method fails. Reasons include:
-	 */
-	public void loadSymbols() throws DebugException;
-
-	/**
-	 * Returns the name of the platform.
-	 * 
-	 * @return the name of the platform
-	 */
-	public String getPlatform();
-
-	/**
-	 * Returns whether this module is little endian.
-	 * 
-	 * @return whether this module is little endian
-	 */
-	public boolean isLittleEndian();
-
-	/**
-	 * Returns the CPU identifier.
-	 * 
-	 * @return the CPU identifier
-	 */
-	public String getCPU();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPPersistableRegisterGroup.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPPersistableRegisterGroup.java
deleted file mode 100644
index f89d74f..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPPersistableRegisterGroup.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.IRegisterGroup;
-
-/**
- * @author clement
- *
- */
-public interface IPPersistableRegisterGroup extends IRegisterGroup {
-	/**
-	 * Returns a memento that can be used to reconstruct this group
-	 * @return a memento that can be used to reconstruct this group
-	 * @exception CoreException if unable to construct a memento
-	 */
-	public String getMemento() throws CoreException;
-	
-	/**
-	 * Initializes this group based on the given memento.
-	 * @param memento a memento to initialize this group
-	 * @exception CoreException on failure to initialize 
-	 */
-	public void initializeFromMemento(String memento) throws CoreException;
-
-	/**
-	 * Returns the array of group's register descriptors.
-	 * @return the array of group's register descriptors
-	 */
-	public IPRegisterDescriptor[] getRegisterDescriptors();
-
-	/**
-	 * Replaces the group register descriptors by the specified descriptors.
-	 * @param the array of register descriptors
-	 */
-	public void setRegisterDescriptors(IPRegisterDescriptor[] registerDescriptors);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegister.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegister.java
deleted file mode 100644
index e1ddd54..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegister.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.model.IRegister;
-
-/**
- * @author clement
- *
- */
-public interface IPRegister extends IPVariable, IRegister {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegisterDescriptor.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegisterDescriptor.java
deleted file mode 100644
index 7505964..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPRegisterDescriptor.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * @author clement
- *
- */
-public interface IPRegisterDescriptor {
-	/**
-	 * Returns the regiser's name
-	 * @return the register's name
-	 */
-	public String getName();
-
-	/**
-	 * Returns the name of the hardware register group this register belongs to
-	 * @return the name of the hardware register group
-	 */
-	public String getGroupName();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPSignal.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPSignal.java
deleted file mode 100644
index 2b65778..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPSignal.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author Clement chu
- */
-
-public interface IPSignal extends IPDebugElement {
-	/**
-	 * Returns the name of this signal
-	 * 
-	 * @return this signal's name
-	 * @throws DebugException if this method fails.
-	 */
-	public String getName() throws DebugException;
-	
-	/**
-	 * Returns the description of this signal.
-	 * 
-	 * @return this signal's description
-	 * @throws DebugException if this method fails.
-	 */
-	public String getDescription() throws DebugException;
-	
-	/**
-	 * Returns whether "pass" is in effect for this signal.
-	 * 
-	 * @return whether "pass" is in effect for this signal
-	 * @throws DebugException if this method fails.
-	 */
-	public boolean isPassEnabled() throws DebugException;
-	
-	/**
-	 * Returns whether "stop" is in effect for this signal.
-	 * 
-	 * @return whether "stop" is in effect for this signal
-	 * @throws DebugException if this method fails.
-	 */
-	public boolean isStopEnabled() throws DebugException;
-	
-	/**
-	 * Enables/disables the "pass" flag of this signal.
-	 * 
-	 * @param enable the flag value to set
-	 * @throws DebugException if this method fails.
-	 */
-	public void setPassEnabled(boolean enable) throws DebugException;
-	
-	/**
-	 * Enables/disables the "stop" flag of this signal.
-	 * 
-	 * @param enable the flag value to set
-	 * @throws DebugException if this method fails.
-	 */
-	public void setStopEnabled(boolean enable) throws DebugException;
-
-	/**
-	 * Resumes execution, but immediately gives the target this signal.
-	 * 
-	 * @throws DebugException if this method fails.
-	 */
-	public void signal() throws DebugException;
-	
-	/**
-	 * Returns whether modification is allowed for this signal's parameters.
-	 * 
-	 * @return whether modification is allowed for this signal's parameters
-	 */
-	public boolean canModify();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPStackFrame.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPStackFrame.java
deleted file mode 100644
index d17f80e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPStackFrame.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPStackFrame extends IRunToLine, IRunToAddress, IJumpToLine, IJumpToAddress, IPDebugElement, IStackFrame {
-	/**
-	 * @return
-	 */
-	public boolean canEvaluate();
-
-	/**
-	 * @param expression
-	 * @return
-	 * @throws DebugException
-	 */
-	public IValue evaluateExpression(String expression) throws DebugException;
-
-	/**
-	 * @param expression
-	 * @return
-	 * @throws DebugException
-	 */
-	public String evaluateExpressionToString(String expression) throws DebugException;
-
-	/**
-	 * @return
-	 */
-	public BigInteger getAddress();
-
-	/**
-	 * @return
-	 */
-	public String getFile();
-
-	/**
-	 * @return
-	 */
-	public int getFrameLineNumber();
-
-	/**
-	 * @return
-	 */
-	public String getFunction();
-
-	/**
-	 * @return
-	 */
-	public int getLevel();
-
-	/**
-	 * @return
-	 */
-	public IPDIStackFrame getPDIStackFrame();
-
-	/**
-	 * @return
-	 */
-	public IPDIThread getPDIThread();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPThread.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPThread.java
deleted file mode 100644
index 1c3851a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPThread.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.model.IThread;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPThread extends IThread, IPDebugElement {
-	IPDebugTarget getDebugTarget();
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPValue.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPValue.java
deleted file mode 100644
index 8140603..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPValue.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author clement
- *
- */
-public interface IPValue extends IValue, IPDebugElement {
-	IAIF getAIF() throws DebugException;
-	String evaluateAsExpression(IPStackFrame frame);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPVariable.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPVariable.java
deleted file mode 100644
index 6e4a5c7..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPVariable.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IValueModification;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPVariable extends IVariable, IPDebugElement, IFormatSupport, IValueModification, IEnableDisableTarget {
-	IAIF getAIF() throws DebugException;
-	boolean isArgument();
-	public String getExpressionString() throws DebugException;
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPWatchpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPWatchpoint.java
deleted file mode 100644
index f05ec83..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IPWatchpoint.java
+++ /dev/null

@@ -1,13 +0,0 @@
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-
-public interface IPWatchpoint extends IPBreakpoint, ILineBreakpoint {
-	public static final String EXPRESSION = "org.eclipse.ptp.debug.core.expression";	
-	public static final String WRITE = "org.eclipse.ptp.debug.core.write";	
-	public static final String READ = "org.eclipse.ptp.debug.core.read";
-	boolean isWriteType() throws CoreException;
-	boolean isReadType() throws CoreException;
-	String getExpression() throws CoreException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRestart.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRestart.java
deleted file mode 100644
index 9fc676b..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRestart.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author Clement chu
- */
-public interface IRestart {
-	/**
-	 * Returns whether this element can currently be restarted.
-	 *
-	 * @return whether this element can currently be restarted
-	 */
-	public boolean canRestart();
-	/**
-	 * Causes this element to restart its execution.
-	 *
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void restart() throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IResumeWithoutSignal.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IResumeWithoutSignal.java
deleted file mode 100644
index 944729c..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IResumeWithoutSignal.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * @author Clement
- *
- * Provides the ability to resume execution without giving a signal. 
- * This is useful when the program stopped on account of a signal and would 
- * ordinary see the signal when resumed. 
- */
-public interface IResumeWithoutSignal {
-	/**
-	 * Causes this element to resume its execution ignoring a signal.
-	 * Has no effect on an element that is not suspended because of a signal.
-	 * 
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void resumeWithoutSignal() throws DebugException;
-
-	/**
-	 * Returns whether this element can currently be resumed without signal.
-	 *
-	 * @return whether this element can currently be resumed without signal
-	 */
-	boolean canResumeWithoutSignal();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToAddress.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToAddress.java
deleted file mode 100644
index cef6972..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToAddress.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import java.math.BigInteger;
-
-import org.eclipse.debug.core.DebugException;
-
-/**
- * Provides the ability to run a debug target to the given address
- * @author clement
- *
- */
-public interface IRunToAddress {
-	/**
-	 * Returns whether this operation is currently available for this element.
-	 * 
-	 * @return whether this operation is currently available
-	 */
-	public boolean canRunToAddress(BigInteger address);
-
-	/**
-	 * Causes this element to run to specified address.
-	 * 
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void runToAddress(BigInteger address, boolean skipBreakpoints) throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToLine.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToLine.java
deleted file mode 100644
index 031bed8..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/IRunToLine.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.DebugException;
-
-/**
- * Provides the ability to run a debug target to the given line.
- * @author clement
- *
- */
-public interface IRunToLine {
-
-	/**
-	 * Returns whether this operation is currently available for this file and line number.
-	 * 
-	 * @return whether this operation is currently available
-	 */
-	public boolean canRunToLine(IFile file, int lineNumber);
-
-	/**
-	 * Causes this element to run to specified location.
-	 * 
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void runToLine(IFile file, int lineNumber, boolean skipBreakpoints) throws DebugException;
-
-	/**
-	 * Returns whether this operation is currently available for this file and line number.
-	 * 
-	 * @return whether this operation is currently available
-	 */
-	public boolean canRunToLine(String fileName, int lineNumber);
-
-	/**
-	 * Causes this element to run to specified location.
-	 * 
-	 * @exception DebugException on failure. Reasons include:
-	 */
-	public void runToLine(String fileName, int lineNumber, boolean skipBreakpoints) throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ISteppingModeTarget.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ISteppingModeTarget.java
deleted file mode 100644
index c257d4a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ISteppingModeTarget.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * Support for the instruction stepping mode for a debug target.
- * @author clement
- *
- */
-public interface ISteppingModeTarget {
-	/**
-	 * Returns whether this debug target supports instruction stepping.
-	 * @return whether this debug target supports instruction stepping
-	 */
-	boolean supportsInstructionStepping();
-
-	/**
-	 * Sets whether the instruction stepping are enabled in this debug target.
-	 * @param enabled whether the instruction stepping are enabled in this debug target
-	 */
-	void enableInstructionStepping(boolean enabled);
-	
-	/**
-	 * Returns whether the instruction stepping are currently enabled in this debug target.
-	 * @return whether the instruction stepping are currently enabled in this debug target
-	 */
-	boolean isInstructionSteppingEnabled();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ITargetProperties.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ITargetProperties.java
deleted file mode 100644
index ac1292e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/ITargetProperties.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-import org.eclipse.core.runtime.Preferences;
-
-/**
- * @author clement
- *
- */
-public interface ITargetProperties {
-	public static final String PREF_INSTRUCTION_STEPPING_MODE = "instruction_stepping_mode";
-
-	/**
-	 * Adds a property change listener to this target.
-	 * Has no affect if the identical listener is already registered.
-	 *
-	 * @param listener a property change listener
-	 */
-	void addPropertyChangeListener(Preferences.IPropertyChangeListener listener);
-
-	/**
-	 * Removes the given listener from this target.
-	 * Has no affect if the listener is not registered.
-	 *
-	 * @param listener a property change listener
-	 */
-	void removePropertyChangeListener(Preferences.IPropertyChangeListener listener);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PDebugElementState.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PDebugElementState.java
deleted file mode 100644
index 8382438..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PDebugElementState.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * @author clement
- *
- */
-public class PDebugElementState {
-	private final String name;
-	
-	private PDebugElementState(String name) {
-		this.name = name;
-	}
-	public String toString() {
-		return this.name;
-	}
-	public static final PDebugElementState UNDEFINED = new PDebugElementState("undefined");
-	public static final PDebugElementState TERMINATING = new PDebugElementState("terminating");
-	public static final PDebugElementState TERMINATED = new PDebugElementState("terminated");
-	public static final PDebugElementState DISCONNECTING = new PDebugElementState("disconnecting");
-	public static final PDebugElementState DISCONNECTED = new PDebugElementState("disconnected");
-	public static final PDebugElementState RESUMING = new PDebugElementState("resuming");
-	public static final PDebugElementState RESUMED = new PDebugElementState("resumed");
-	public static final PDebugElementState STEPPING = new PDebugElementState("stepping");
-	public static final PDebugElementState STEPPED = new PDebugElementState("stepped");
-	public static final PDebugElementState SUSPENDING = new PDebugElementState("suspending");
-	public static final PDebugElementState SUSPENDED = new PDebugElementState("suspended");
-	public static final PDebugElementState RESTARTING = new PDebugElementState("restarting");
-	public static final PDebugElementState EXITED = new PDebugElementState("exited");
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PVariableFormat.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PVariableFormat.java
deleted file mode 100644
index 41bedb1..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/model/PVariableFormat.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.model;
-
-/**
- * @author clement
- *
- */
-public class PVariableFormat {
-	private final String name;
-	
-	private PVariableFormat(String name) {
-		this.name = name;
-	}
-	public String toString() {
-		return name;
-	}
-	public static PVariableFormat getFormat(int code) {
-		switch(code) {
-		case 0:
-			return NATURAL;
-		case 1:
-			return DECIMAL;
-		case 2:
-			return BINARY;
-		case 3:
-			return OCTAL;
-		case 4:
-			return HEXADECIMAL;
-		default:
-			return DECIMAL;
-		}
-	}
-	public static final PVariableFormat NATURAL = new PVariableFormat("natural");
-	public static final PVariableFormat DECIMAL = new PVariableFormat("decimal");
-	public static final PVariableFormat BINARY = new PVariableFormat("binary");
-	public static final PVariableFormat OCTAL = new PVariableFormat("octal");
-	public static final PVariableFormat HEXADECIMAL = new PVariableFormat("dexadecimal");
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/AbsolutePathSourceContainer.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/AbsolutePathSourceContainer.java
deleted file mode 100644
index 77ea8f9..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/AbsolutePathSourceContainer.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-
-/**
- * @author clement
- * 
- */
-public class AbsolutePathSourceContainer extends AbstractSourceContainer {
-	public static final String TYPE_ID = PTPDebugCorePlugin.getUniqueIdentifier() + ".containerType.absolutePath";
-
-	private Object[] findSourceElementByFile(File file) {
-		IFile[] wfiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(file.getAbsolutePath()));
-		if (wfiles.length > 0)
-			return wfiles;
-
-		try {
-			// Check the canonical path as well to support case insensitive file systems like Windows.
-			wfiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(file.getCanonicalPath()));
-			if (wfiles.length > 0)
-				return wfiles;
-
-			// The file is not already in the workspace so try to create an external translation unit for it.
-			String projectName = getDirector().getLaunchConfiguration().getAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");
-			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-			if (project != null) {
-				IPath path = Path.fromOSString(file.getCanonicalPath());
-				//TODO
-				//String id = CoreModel.getRegistedContentTypeId(project.getProject(), path.lastSegment());
-				//return new ExternalTranslationUnit[] { new ExternalTranslationUnit(project, new Path(file.getCanonicalPath()), id) };
-			}
-		} catch (IOException e) { // ignore if getCanonicalPath throws
-		} catch (CoreException e) {
-		}
-		// If we can't create an ETU then fall back on LocalFileStorage.
-		return new LocalFileStorage[] { new LocalFileStorage(file) };
-	}
-	public boolean isValidAbsoluteFilePath(String name) {
-		return isValidAbsoluteFilePath(new File(name));
-	}
-	public boolean isValidAbsoluteFilePath(File file) {
-		return file.isAbsolute() && file.exists() && file.isFile();
-	}
-	public Object[] findSourceElements(String name) throws CoreException {
-		if (name != null) {
-			File file = new File(name);
-			if (isValidAbsoluteFilePath(file)) {
-				return findSourceElementByFile(file);
-			}
-		}
-		return new Object[0];
-	}
-	public String getName() {
-		return SourceLookupMessages.getString("AbsolutePathSourceContainer.0");
-	}
-	public ISourceContainerType getType() {
-		return getSourceContainerType(TYPE_ID);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IDirectorySourceLocation.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IDirectorySourceLocation.java
deleted file mode 100644
index 2cc991e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IDirectorySourceLocation.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IDirectorySourceLocation extends IPSourceLocation {
-	IPath getDirectory();
-	IPath getAssociation();
-	boolean searchSubfolders();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocation.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocation.java
deleted file mode 100644
index d03de6e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocation.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPSourceLocation extends IAdaptable {
-	Object findSourceElement(String name) throws CoreException;
-	String getMemento() throws CoreException;
-	void initializeFrom(String memento) throws CoreException;
-	boolean searchForDuplicateFiles();
-	void setSearchForDuplicateFiles(boolean search);
-	void dispose();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocator.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocator.java
deleted file mode 100644
index 00f0361..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLocator.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPSourceLocator extends ISourceLocator {
-	IProject getProject();
-	int getLineNumber(IStackFrame stackFrame);
-	IPSourceLocation[] getSourceLocations();
-	void setSourceLocations(IPSourceLocation[] locations);
-	boolean contains(IResource resource);
-	Object findSourceElement(String fileName);
-	boolean searchForDuplicateFiles();
-	void setSearchForDuplicateFiles(boolean search);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLookupDirector.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLookupDirector.java
deleted file mode 100644
index bd4317c..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IPSourceLookupDirector.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IPSourceLookupDirector {
-	public IPath getCompilationPath(String sourceName);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IProjectSourceLocation.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IProjectSourceLocation.java
deleted file mode 100644
index 619d091..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/IProjectSourceLocation.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author Clement chu
- * 
- */
-public interface IProjectSourceLocation extends IPSourceLocation {
-	IProject getProject();
-	boolean isGeneric();
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/ISourceLookupChangeListener.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/ISourceLookupChangeListener.java
deleted file mode 100644
index e9d0661..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/ISourceLookupChangeListener.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-
-/**
- * @author Clement chu
- * 
- */
-public interface ISourceLookupChangeListener {
-	public void sourceContainersChanged(ISourceLookupDirector director);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/MappingSourceContainer.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/MappingSourceContainer.java
deleted file mode 100644
index 8079e5a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/MappingSourceContainer.java
+++ /dev/null

@@ -1,226 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2004, 2005 QNX Software Systems 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:
- * QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.MapEntrySourceContainer;
-
-/**
- * The source container for path mappings.
- */
-public class MappingSourceContainer extends AbstractSourceContainer {
-	/**
-	 * Unique identifier for the mapping source container type (value <code>org.eclipse.cdt.debug.core.containerType.mapping</code>).
-	 */
-	public static final String TYPE_ID = PTPDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapping";
-
-	private String fName;
-	private ArrayList<MapEntrySourceContainer> fContainers;
-
-	/**
-	 * Constructor for MappingSourceContainer.
-	 */
-	public MappingSourceContainer(String name) {
-		fName = name;
-		fContainers = new ArrayList<MapEntrySourceContainer>();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
-	 */
-	public ISourceContainerType getType() {
-		return getSourceContainerType(TYPE_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#isComposite()
-	 */
-	public boolean isComposite() {
-		return !fContainers.isEmpty();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
-	 */
-	public Object[] findSourceElements(String name) throws CoreException {
-		return findSourceElements(name, getSourceContainers());
-	}
-
-	protected Object[] findSourceElements(String name, ISourceContainer[] containers) throws CoreException {
-		List<Object> results = null;
-		CoreException single = null;
-		MultiStatus multiStatus = null;
-		if (isFindDuplicates()) {
-			results = new ArrayList<Object>();
-		}
-		for (int i = 0; i < containers.length; i++) {
-			ISourceContainer container = containers[i];
-			try {
-				Object[] objects = container.findSourceElements(name);
-				if (objects.length > 0) {
-					if (isFindDuplicates()) {
-						for (int j = 0; j < objects.length; j++) {
-							results.add(objects[j]);
-						}
-					} else {
-						if (objects.length == 1) {
-							return objects;
-						}
-						return new Object[] { objects[0] };
-					}
-				}
-			} catch (CoreException e) {
-				if (single == null) {
-					single = e;
-				} else if (multiStatus == null) {
-					multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, new IStatus[] { single.getStatus() }, SourceLookupMessages.getString("MappingSourceContainer.0"), null); //$NON-NLS-1$
-					multiStatus.add(e.getStatus());
-				} else {
-					multiStatus.add(e.getStatus());
-				}
-			}
-		}
-		if (results == null) {
-			if (multiStatus != null) {
-				throw new CoreException(multiStatus);
-			} else if (single != null) {
-				throw single;
-			}
-			return EMPTY;
-		}
-		return results.toArray();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer#getSourceContainers()
-	 */
-	public ISourceContainer[] getSourceContainers() throws CoreException {
-		return (MapEntrySourceContainer[]) fContainers.toArray(new MapEntrySourceContainer[fContainers.size()]);
-	}
-
-	public void addMapEntry(MapEntrySourceContainer entry) {
-		fContainers.add(entry);
-	}
-
-	public void addMapEntries(MapEntrySourceContainer[] entries) {
-		fContainers.addAll(Arrays.asList(entries));
-	}
-
-	public void removeMapEntry(MapEntrySourceContainer entry) {
-		fContainers.remove(entry);
-	}
-
-	public void removeMapEntries(MapEntrySourceContainer[] entries) {
-		fContainers.removeAll(Arrays.asList(entries));
-	}
-
-	public void clear() {
-		Iterator<MapEntrySourceContainer> it = fContainers.iterator();
-		while (it.hasNext()) {
-			((ISourceContainer) it.next()).dispose();
-		}
-		fContainers.clear();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		Iterator<MapEntrySourceContainer> it = fContainers.iterator();
-		while (it.hasNext()) {
-			((ISourceContainer) it.next()).dispose();
-		}
-		fContainers.clear();
-	}
-
-	public MappingSourceContainer copy() {
-		MappingSourceContainer copy = new MappingSourceContainer(fName);
-		MapEntrySourceContainer[] entries = new MapEntrySourceContainer[fContainers.size()];
-		for (int i = 0; i < entries.length; ++i) {
-			copy.addMapEntry(((MapEntrySourceContainer) fContainers.get(i)).copy());
-		}
-		return copy;
-	}
-
-	public void setName(String name) {
-		fName = name;
-	}
-
-	public IPath getCompilationPath(String sourceName) {
-		IPath path = new Path(sourceName);
-		IPath result = null;
-		try {
-			ISourceContainer[] containers = getSourceContainers();
-			for (int i = 0; i < containers.length; ++i) {
-				MapEntrySourceContainer entry = (MapEntrySourceContainer) containers[i];
-				IPath local = entry.getLocalPath();
-				if (local.isPrefixOf(path)) {
-					result = entry.getBackendPath().append(path.removeFirstSegments(local.segmentCount()));
-					break;
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return result;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/PSourceLookupDirector.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/PSourceLookupDirector.java
deleted file mode 100644
index f9c36ad..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/PSourceLookupDirector.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
-import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.WorkspaceSourceContainer;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PDirectorySourceContainer;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PSourceLookupParticipant;
-
-public class PSourceLookupDirector extends AbstractSourceLookupDirector implements IPSourceLookupDirector {
-	private static Set<String> fSupportedTypes;
-	static {
-		fSupportedTypes = new HashSet<String>();
-		fSupportedTypes.add(WorkspaceSourceContainer.TYPE_ID);
-		fSupportedTypes.add(ProjectSourceContainer.TYPE_ID);
-		fSupportedTypes.add(FolderSourceContainer.TYPE_ID);
-		fSupportedTypes.add(DirectorySourceContainer.TYPE_ID);
-		/**
-		 *	No Mapping
-		 * 	fSupportedTypes.add(MappingSourceContainer.TYPE_ID);
-		 */
-	}
-
-	public void initializeParticipants() {
-		addParticipants(new ISourceLookupParticipant[] { new PSourceLookupParticipant() });
-	}
-	public boolean supportsSourceContainerType(ISourceContainerType type) {
-		return fSupportedTypes.contains(type.getId());
-	}
-	public boolean contains(IPBreakpoint breakpoint) {
-		try {
-			String handle = breakpoint.getSourceHandle();
-			ISourceContainer[] containers = getSourceContainers();
-			for (int i = 0; i < containers.length; ++i) {
-				if (contains(containers[i], handle))
-					return true;
-			}
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-	public boolean contains(IProject project) {
-		ISourceContainer[] containers = getSourceContainers();
-		for (int i = 0; i < containers.length; ++i) {
-			if (contains(containers[i], project))
-				return true;
-		}
-		return false;
-	}
-	private boolean contains(ISourceContainer container, IProject project) {
-		if (container instanceof ProjectSourceContainer && ((ProjectSourceContainer) container).getProject().equals(project)) {
-			return true;
-		}
-		try {
-			ISourceContainer[] containers;
-			containers = container.getSourceContainers();
-			for (int i = 0; i < containers.length; ++i) {
-				if (contains(containers[i], project))
-					return true;
-			}
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-	private boolean contains(ISourceContainer container, String sourceName) {
-		IPath path = new Path(sourceName);
-		if (!path.isValidPath(sourceName))
-			return false;
-		if (container instanceof ProjectSourceContainer) {
-			IProject project = ((ProjectSourceContainer) container).getProject();
-			IPath projPath = project.getLocation();
-			if (projPath.isPrefixOf(path)) {
-				IFile file = ((ProjectSourceContainer) container).getProject().getFile(path.removeFirstSegments(projPath.segmentCount()));
-				return (file != null && file.exists());
-			}
-		}
-		if (container instanceof FolderSourceContainer) {
-			IContainer folder = ((FolderSourceContainer) container).getContainer();
-			IPath folderPath = folder.getLocation();
-			if (folderPath.isPrefixOf(path)) {
-				IFile file = ((FolderSourceContainer) container).getContainer().getFile(path.removeFirstSegments(folderPath.segmentCount()));
-				return (file != null && file.exists());
-			}
-		}
-		if (container instanceof PDirectorySourceContainer) {
-			File dir = ((PDirectorySourceContainer) container).getDirectory();
-			boolean searchSubfolders = ((PDirectorySourceContainer) container).searchSubfolders();
-			IPath dirPath = new Path(dir.getAbsolutePath());
-			if (searchSubfolders || dirPath.segmentCount() + 1 == path.segmentCount())
-				return dirPath.isPrefixOf(path);
-		}
-		if (container instanceof MappingSourceContainer) {
-			return (((MappingSourceContainer) container).getCompilationPath(sourceName) != null);
-		}
-		try {
-			ISourceContainer[] containers;
-			containers = container.getSourceContainers();
-			for (int i = 0; i < containers.length; ++i) {
-				if (contains(containers[i], sourceName))
-					return true;
-			}
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-	public IPath getCompilationPath(String sourceName) {
-		IPath path = null;
-		ISourceContainer[] containers = getSourceContainers();
-		for (int i = 0; i < containers.length; ++i) {
-			IPath cp = getCompilationPath(containers[i], sourceName);
-			if (cp != null) {
-				path = cp;
-				break;
-			}
-		}
-		return path;
-	}
-	private IPath getCompilationPath(ISourceContainer container, String sourceName) {
-		IPath path = null;
-		if (container instanceof MappingSourceContainer) {
-			path = ((MappingSourceContainer) container).getCompilationPath(sourceName);
-		} else {
-			try {
-				ISourceContainer[] containers;
-				containers = container.getSourceContainers();
-				for (int i = 0; i < containers.length; ++i) {
-					path = getCompilationPath(containers[i], sourceName);
-					if (path != null)
-						break;
-				}
-			} catch (CoreException e) {
-			}
-		}
-		return path;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupFactory.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupFactory.java
deleted file mode 100644
index 87680a2..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupFactory.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PDirectorySourceLocation;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PProjectSourceLocation;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PSourceLocator;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PSourceManager;
-
-/**
- * @author Clement chu
- * 
- */
-public class SourceLookupFactory {
-	public static IProjectSourceLocation createProjectSourceLocation(IProject project) {
-		return new PProjectSourceLocation(project);
-	}
-	public static IProjectSourceLocation createProjectSourceLocation(IProject project, boolean generated) {
-		return new PProjectSourceLocation(project, generated);
-	}
-	public static IDirectorySourceLocation createDirectorySourceLocation(IPath directory, IPath association, boolean searchSubfolders) {
-		return new PDirectorySourceLocation(directory, association, searchSubfolders);
-	}
-	public static IPSourceLocator createSourceLocator(IProject project) {
-		return new PSourceManager(new PSourceLocator(project));
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.java
deleted file mode 100644
index 9804fdb..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.java
+++ /dev/null

@@ -1,52 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2004, 2005 QNX Software Systems 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:
- * QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.sourcelookup;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class SourceLookupMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.core.sourcelookup.SourceLookupMessages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private SourceLookupMessages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.properties b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.properties
deleted file mode 100644
index 14b79c7..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/core/sourcelookup/SourceLookupMessages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 QNX Software Systems 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:
-#     QNX Software Systems - initial API and implementation
-###############################################################################
-MappingSourceContainer.0=Source lookup error
-AbsolutePathSourceContainer.0=Absolute File Path

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.java
deleted file mode 100644
index fcb1f33..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.java
+++ /dev/null

@@ -1,49 +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
- *******************************************************************************/
-/**********************************************************************
- * Copyright (c) 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * QNX Software Systems - Initial API and implementation
- ***********************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class InternalDebugCoreMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.core.InternalDebugCoreMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InternalDebugCoreMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.properties b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.properties
deleted file mode 100644
index 0fad709..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/InternalDebugCoreMessages.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 QNX Software Systems and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     QNX Software Systems - initial API and implementation
-###############################################################################
-PGlobalVariableManager.0=Invalid global variables data.
-PTPMemoryBlockRetrievalExtension.0=Expression ''{0}'' evaluated to invalid address value: {1}.
-PTPMemoryBlockRetrievalExtension.1=Invalid expression type: ''{0}''
-PTPMemoryBlockRetrievalExtension.2=Invalid expression: ''{0}''
-PTPMemoryBlockRetrievalExtension.3=Memory initialization: invalid memento.
-PDebugConfiguration.0=This debugger no longer supports this operation
-PDebugAdapter.0=This debugger does not support debugging external files
-PDebugAdapter.1=Debugger Process
-PDebugAdapter.Program_file_not_specified=Program file not specified
-PRegisterManager.0=Unable to restore register groups - invalid memento.
-PRegisterManager.1=Unable to restore register groups - expecting register group list element.

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PBreakpointManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PBreakpointManager.java
deleted file mode 100644
index 55d377f..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PBreakpointManager.java
+++ /dev/null

@@ -1,954 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.io.File;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManagerListener;
-import org.eclipse.debug.core.IBreakpointsListener;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.ptp.core.PreferenceConstants;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPBreakpointManager;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PDebugModel;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.core.event.IPDebugInfo;
-import org.eclipse.ptp.debug.core.event.PDebugBreakpointInfo;
-import org.eclipse.ptp.debug.core.model.IPAddressBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPWatchpoint;
-import org.eclipse.ptp.debug.core.pdi.IPDIAddressLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDIFunctionLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILineLocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIBreakpointInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDICreatedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDestroyedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIBreakpointManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocationBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocator;
-import org.eclipse.ptp.debug.core.sourcelookup.PSourceLookupDirector;
-
-public class PBreakpointManager implements IBreakpointsListener, IBreakpointManagerListener, IPDIEventListener, IAdaptable, IPBreakpointManager {
-	private class BreakpointMap {
-		private final Map<String, IPBreakpoint> fPBreakpoints;
-		private final Map<String, IPDIBreakpoint> fPDIBreakpoints;
-
-		protected BreakpointMap() {
-			fPBreakpoints = new HashMap<String, IPBreakpoint>(10);
-			fPDIBreakpoints = new HashMap<String, IPDIBreakpoint>(10);
-		}
-
-		/**
-		 * @param breakpoint
-		 * @param pdiBreakpoint
-		 * @return
-		 */
-		private boolean isSameBreakpoint(IPBreakpoint breakpoint, IPDIBreakpoint pdiBreakpoint) {
-			try {
-				if (breakpoint instanceof IPFunctionBreakpoint && pdiBreakpoint instanceof IPDIFunctionBreakpoint) {
-					return (((IPFunctionBreakpoint) breakpoint).getFunction().compareTo(
-							((IPDIFunctionBreakpoint) pdiBreakpoint).getLocator().getFunction()) == 0);
-				}
-				if (breakpoint instanceof IPAddressBreakpoint && pdiBreakpoint instanceof IPDIAddressBreakpoint) {
-					return (((IPAddressBreakpoint) breakpoint).getAddress()).equals((((IPDIAddressBreakpoint) pdiBreakpoint)
-							.getLocator().getAddress()));
-				}
-				if (breakpoint instanceof IPLineBreakpoint && pdiBreakpoint instanceof IPDILineBreakpoint) {
-					IPDILocator location = ((IPDILineBreakpoint) pdiBreakpoint).getLocator();
-					String file = location.getFile();
-					String sourceHandle = file;
-					if (!isEmpty(file)) {
-						Object sourceElement = getSourceElement(file);
-						if (sourceElement instanceof IFile) {
-							sourceHandle = ((IFile) sourceElement).getLocation().toOSString();
-						} else if (sourceElement instanceof IStorage) {
-							sourceHandle = ((IStorage) sourceElement).getFullPath().toOSString();
-						}
-						String bpSourceHandle = ((IPLineBreakpoint) breakpoint).getSourceHandle();
-						if (sourceElement instanceof LocalFileStorage) {
-							try {
-								bpSourceHandle = new File(bpSourceHandle).getCanonicalPath();
-							} catch (IOException e) {
-								return false;
-							}
-						}
-						return sourceHandle.equals(bpSourceHandle)
-								&& location.getLineNumber() == ((IPLineBreakpoint) breakpoint).getLineNumber();
-					}
-				}
-				if (breakpoint instanceof IPWatchpoint && pdiBreakpoint instanceof IPDIWatchpoint) {
-					try {
-						IPWatchpoint watchpoint = (IPWatchpoint) breakpoint;
-						IPDIWatchpoint pdiWatchpoint = (IPDIWatchpoint) pdiBreakpoint;
-						return (watchpoint.getExpression().compareTo(pdiWatchpoint.getWatchExpression()) == 0
-								&& watchpoint.isReadType() == pdiWatchpoint.isReadType() && watchpoint.isWriteType() == pdiWatchpoint
-								.isWriteType());
-					} catch (PDIException e) {
-						return false;
-					}
-				}
-			} catch (CoreException e) {
-				return false;
-			}
-			return false;
-		}
-
-		/**
-		 * 
-		 */
-		public void dispose() {
-			fPBreakpoints.clear();
-			fPDIBreakpoints.clear();
-		}
-
-		/**
-		 * @return
-		 */
-		public IPBreakpoint[] getAllPBreakpoints() {
-			Collection<IPBreakpoint> collection = fPBreakpoints.values();
-			return collection.toArray(new IPBreakpoint[collection.size()]);
-		}
-
-		/**
-		 * @return
-		 */
-		public IPDIBreakpoint[] getAllPDIBreakpoints() {
-			Collection<IPDIBreakpoint> collection = fPDIBreakpoints.values();
-			return collection.toArray(new IPDIBreakpoint[collection.size()]);
-		}
-
-		/**
-		 * @param pdiBpt
-		 * @return
-		 */
-		public IPBreakpoint getPBreakpoint(IPDIBreakpoint pdiBpt) {
-			IPBreakpoint breakpoint = fPBreakpoints.get(String.valueOf(pdiBpt.getInternalID()));
-			if (breakpoint == null) {
-				IPBreakpoint[] bpts = getAllPBreakpoints();
-				for (IPBreakpoint bpt : bpts) {
-					if (isSameBreakpoint(bpt, pdiBpt)) {
-						fPBreakpoints.put(String.valueOf(pdiBpt.getInternalID()), bpt);
-						breakpoint = bpt;
-						break;
-					}
-				}
-			}
-			return breakpoint;
-		}
-
-		/**
-		 * @param pBpt
-		 * @return
-		 */
-		public IPDIBreakpoint getPDIBreakpoint(IPBreakpoint pBpt) {
-			return fPDIBreakpoints.get(String.valueOf(pBpt.getMarker().getId()));
-		}
-
-		/**
-		 * @param pBpt
-		 * @param pdiBpt
-		 */
-		public void put(IPBreakpoint pBpt, IPDIBreakpoint pdiBpt) {
-			fPBreakpoints.put(String.valueOf(pdiBpt.getInternalID()), pBpt);
-			fPDIBreakpoints.put(String.valueOf(pBpt.getMarker().getId()), pdiBpt);
-		}
-
-		/**
-		 * @param pdiBpt
-		 */
-		public void removePDIBreakpoint(IPDIBreakpoint pdiBpt) {
-			if (pdiBpt != null) {
-				IPBreakpoint pBpt = fPBreakpoints.remove(String.valueOf(pdiBpt.getInternalID()));
-				if (pBpt != null)
-					fPDIBreakpoints.remove(String.valueOf(pBpt.getMarker().getId()));
-			}
-		}
-	}
-
-	private final IPSession session;
-	private final BreakpointMap fMap = new BreakpointMap();
-	private boolean fSkipBreakpoint = false;
-
-	public PBreakpointManager(IPSession session) {
-		this.session = session;
-		DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this);
-		DebugPlugin.getDefault().getBreakpointManager().addBreakpointManagerListener(this);
-		getPDISession().getEventManager().addEventListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPBreakpointManager#addSetBreakpoints(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.model.IPBreakpoint[])
-	 */
-	public void addSetBreakpoints(BitList tasks, IPBreakpoint[] breakpoints) {
-		if (breakpoints.length == 0) {
-			return;
-		}
-		for (IPBreakpoint bpt : breakpoints) {
-			IPDIBreakpoint pdiBreakpoint = null;
-			synchronized (getBreakpointMap()) {
-				pdiBreakpoint = getBreakpointMap().getPDIBreakpoint(bpt);
-			}
-			if (pdiBreakpoint != null) {
-				try {
-					getPDISession().getBreakpointManager().addSetBreakpoint(tasks, pdiBreakpoint);
-				} catch (PDIException ex) {
-					PTPDebugCorePlugin.log(ex);
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManagerListener#breakpointManagerEnablementChanged(boolean)
-	 */
-	public void breakpointManagerEnablementChanged(boolean enabled) {
-		doSkipBreakpoints(!enabled);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[])
-	 */
-	public void breakpointsAdded(IBreakpoint[] breakpoints) {
-		ArrayList<IPBreakpoint> list = new ArrayList<IPBreakpoint>(breakpoints.length);
-		for (int i = 0; i < breakpoints.length; ++i) {
-			if (isTargetBreakpoint(breakpoints[i])) {
-				list.add((IPBreakpoint) breakpoints[i]);
-			}
-		}
-		if (list.isEmpty())
-			return;
-		final IPBreakpoint[] pBreakpoints = list.toArray(new IPBreakpoint[list.size()]);
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				setBreakpointsOnSession0(pBreakpoints);
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[])
-	 */
-	public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
-		for (int i = 0; i < breakpoints.length; ++i) {
-			if (isTargetBreakpoint(breakpoints[i])) {
-				changeBreakpointProperties((IPBreakpoint) breakpoints[i], deltas[i]);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.resources.IMarkerDelta[])
-	 */
-	public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
-		ArrayList<IPBreakpoint> list = new ArrayList<IPBreakpoint>(breakpoints.length);
-		for (int i = 0; i < breakpoints.length; ++i) {
-			if (isTargetBreakpoint(breakpoints[i])) {
-				list.add((IPBreakpoint) breakpoints[i]);
-			}
-		}
-		if (list.isEmpty())
-			return;
-		final IPBreakpoint[] pBreakpoints = list.toArray(new IPBreakpoint[list.size()]);
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				deleteBreakpointsOnSession0(pBreakpoints);
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPBreakpointManager#deleteSetBreakpoints(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.model.IPBreakpoint[])
-	 */
-	public void deleteSetBreakpoints(BitList tasks, IPBreakpoint[] breakpoints) {
-		if (breakpoints.length == 0)
-			return;
-		for (IPBreakpoint bpt : breakpoints) {
-			IPDIBreakpoint pdiBreakpoint = null;
-			synchronized (getBreakpointMap()) {
-				pdiBreakpoint = getBreakpointMap().getPDIBreakpoint(bpt);
-			}
-			if (pdiBreakpoint != null) {
-				try {
-					getPDISession().getBreakpointManager().deleteSetBreakpoint(tasks, pdiBreakpoint);
-				} catch (PDIException ex) {
-					PTPDebugCorePlugin.log(ex);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param monitor
-	 */
-	public void dispose(IProgressMonitor monitor) {
-		getPDISession().getEventManager().removeEventListener(this);
-		DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
-		DebugPlugin.getDefault().getBreakpointManager().removeBreakpointManagerListener(this);
-		getBreakpointMap().dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(PBreakpointManager.class))
-			return this;
-		if (adapter.equals(PSession.class))
-			return getSession();
-		if (adapter.equals(IPSession.class))
-			return getSession();
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPBreakpointManager#getBreakpoint(org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint)
-	 */
-	public IBreakpoint getBreakpoint(IPDIBreakpoint pdiBpt) {
-		Object b = null;
-		synchronized (getBreakpointMap()) {
-			b = getBreakpointMap().getPBreakpoint(pdiBpt);
-		}
-		return (b instanceof IBreakpoint) ? (IBreakpoint) b : null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPBreakpointManager#getBreakpointAddress(org.eclipse.ptp.debug.core.model.IPLineBreakpoint)
-	 */
-	public BigInteger getBreakpointAddress(IPLineBreakpoint breakpoint) {
-		BigInteger address = null;
-		synchronized (getBreakpointMap()) {
-			IPDIBreakpoint pdiBreakpoint = getBreakpointMap().getPDIBreakpoint(breakpoint);
-			if (pdiBreakpoint instanceof IPDILocationBreakpoint) {
-				IPDILocator locator = ((IPDILocationBreakpoint) pdiBreakpoint).getLocator();
-				if (locator != null) {
-					address = locator.getAddress();
-				}
-			}
-		}
-		return address;
-	}
-
-	/**
-	 * @return
-	 */
-	public IPSession getSession() {
-		return session;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener#handleDebugEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			IPDIEvent event = events[i];
-			if (event instanceof IPDICreatedEvent) {
-				handleCreatedEvent((IPDICreatedEvent) event);
-			} else if (event instanceof IPDIDestroyedEvent) {
-				handleDestroyedEvent((IPDIDestroyedEvent) event);
-			} else if (event instanceof IPDIChangedEvent) {
-				handleChangedEvent((IPDIChangedEvent) event);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public void setInitialBreakpoints() {
-		IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(
-				PDebugModel.getPluginIdentifier());
-		ArrayList<IPBreakpoint> list = new ArrayList<IPBreakpoint>(breakpoints.length);
-		for (int i = 0; i < breakpoints.length; ++i) {
-			if (isTargetBreakpoint(breakpoints[i])) {
-				list.add((IPBreakpoint) breakpoints[i]);
-			}
-		}
-		if (list.isEmpty())
-			return;
-		IPBreakpoint[] pBreakpoints = list.toArray(new IPBreakpoint[list.size()]);
-		setBreakpointsOnSession0(pBreakpoints);
-	}
-
-	/**
-	 * @param tasks
-	 * @throws PDIException
-	 */
-	public void setStopInMain(BitList tasks) throws PDIException {
-		IPDIBreakpointManager pdiBptMgr = getPDISession().getBreakpointManager();
-		IPDIFunctionLocation location = pdiBptMgr.createFunctionLocation("", "main");
-		pdiBptMgr.setFunctionBreakpoint(tasks, IPDIBreakpoint.TEMPORARY, location, null, true, true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPBreakpointManager#skipBreakpoints(boolean)
-	 */
-	public void skipBreakpoints(boolean enabled) {
-		if (fSkipBreakpoint != enabled && (DebugPlugin.getDefault().getBreakpointManager().isEnabled() || !enabled)) {
-			fSkipBreakpoint = enabled;
-			doSkipBreakpoints(enabled);
-		}
-	}
-
-	/**
-	 * @param breakpoint
-	 * @return
-	 */
-	public boolean supportsAddressBreakpoint(IPAddressBreakpoint breakpoint) {
-		// TODO NOT implemented address breakpoint supported
-		return false;
-		/*
-		 * String module = null; try { module = breakpoint.getModule(); }
-		 * catch(CoreException e) { } if (module != null) return
-		 * getExecFilePath().toOSString().equals(module); try { return
-		 * getExecFilePath().toOSString().equals(breakpoint.getSourceHandle()); }
-		 * catch(CoreException e) { } return false;
-		 */
-	}
-
-	/**
-	 * @param tasks
-	 * @param pdiWatchpoint
-	 */
-	public void watchpointOutOfScope(BitList tasks, IPDIWatchpoint pdiWatchpoint) {
-		doHandleDestroyedEvent(tasks, pdiWatchpoint);
-	}
-
-	/**
-	 * @param breakpoint
-	 * @param delta
-	 */
-	private void changeBreakpointProperties(IPBreakpoint breakpoint, IMarkerDelta delta) {
-		IPDIBreakpoint pdiBreakpoint = null;
-		synchronized (getBreakpointMap()) {
-			pdiBreakpoint = getBreakpointMap().getPDIBreakpoint(breakpoint);
-		}
-		if (pdiBreakpoint == null)
-			return;
-		try {
-			boolean enabled = breakpoint.isEnabled();
-			boolean oldEnabled = (delta != null) ? delta.getAttribute(IBreakpoint.ENABLED, true) : enabled;
-			int ignoreCount = breakpoint.getIgnoreCount();
-			int oldIgnoreCount = (delta != null) ? delta.getAttribute(IPBreakpoint.IGNORE_COUNT, 0) : ignoreCount;
-			String condition = breakpoint.getCondition();
-			String oldCondition = (delta != null) ? delta.getAttribute(IPBreakpoint.CONDITION, "") : condition;
-			// TODO not support thread breakpoint
-			Boolean enabled0 = null;
-			IPDICondition condition0 = null;
-			if (enabled != oldEnabled && enabled != pdiBreakpoint.isEnabled()) {
-				enabled0 = Boolean.valueOf(enabled);
-			}
-			if (ignoreCount != oldIgnoreCount || condition.compareTo(oldCondition) != 0) {
-				IPDICondition pdiCondition = getPDISession().getBreakpointManager().createCondition(ignoreCount, condition, null);
-				if (!pdiCondition.equals(pdiBreakpoint.getCondition())) {
-					condition0 = pdiCondition;
-				}
-			}
-			if (enabled0 != null || condition0 != null) {
-				changeBreakpointPropertiesOnSession(getBreakpointTasks(breakpoint), pdiBreakpoint, enabled0, condition0);
-			}
-		} catch (CoreException e) {
-			PTPDebugCorePlugin.log(e);
-		} catch (PDIException e) {
-			PTPDebugCorePlugin.log(e);
-		}
-	}
-
-	/**
-	 * @param breakpoint
-	 * @param pdiBreakpoint
-	 * @throws CoreException
-	 */
-	private void changeBreakpointProperties(IPBreakpoint breakpoint, IPDIBreakpoint pdiBreakpoint) throws CoreException {
-		try {
-			Boolean enabled = null;
-			if (pdiBreakpoint.isEnabled() != breakpoint.isEnabled())
-				enabled = Boolean.valueOf(breakpoint.isEnabled());
-
-			IPDICondition condition = null;
-			IPDICondition c = createCondition(breakpoint);
-			if (!pdiBreakpoint.getCondition().equals(c))
-				condition = c;
-			if (enabled != null || condition != null)
-				changeBreakpointPropertiesOnSession(getBreakpointTasks(breakpoint), pdiBreakpoint, enabled, condition);
-		} catch (PDIException pe) {
-			PTPDebugCorePlugin.log(pe);
-		}
-	}
-
-	/**
-	 * @param tasks
-	 * @param breakpoint
-	 * @param enabled
-	 * @param condition
-	 */
-	private void changeBreakpointPropertiesOnSession(final BitList tasks, final IPDIBreakpoint breakpoint, final Boolean enabled,
-			final IPDICondition condition) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				if (enabled != null) {
-					try {
-						if (enabled.booleanValue())
-							getPDISession().getBreakpointManager().enableBreakpoint(tasks, breakpoint);
-						else
-							getPDISession().getBreakpointManager().disableBreakpoint(tasks, breakpoint);
-					} catch (PDIException e) {
-						PTPDebugCorePlugin.log(e);
-					}
-				}
-				if (condition != null) {
-					try {
-						getPDISession().getBreakpointManager().setCondition(tasks, breakpoint, condition);
-					} catch (PDIException e) {
-						PTPDebugCorePlugin.log(e);
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * @param sourceHandle
-	 * @return
-	 */
-	private IPath convertPath(String sourceHandle) {
-		IPath path = null;
-		if (Path.EMPTY.isValidPath(sourceHandle)) {
-			ISourceLocator sl = getSourceLocator();
-			if (sl instanceof PSourceLookupDirector) {
-				path = ((PSourceLookupDirector) sl).getCompilationPath(sourceHandle);
-			}
-			if (path == null) {
-				path = new Path(sourceHandle);
-			}
-		}
-		return path;
-	}
-
-	/**
-	 * @param pBpt
-	 * @return
-	 * @throws CoreException
-	 * @throws PDIException
-	 */
-	private IPDICondition createCondition(IPBreakpoint pBpt) throws CoreException, PDIException {
-		return getPDISession().getBreakpointManager().createCondition(pBpt.getIgnoreCount(), pBpt.getCondition(), null);
-	}
-
-	/**
-	 * @param tasks
-	 * @param pdiBreakpoint
-	 */
-	private void doHandleChangedEvent(BitList tasks, IPDIBreakpoint pdiBreakpoint) {
-		IPBreakpoint breakpoint = getBreakpointMap().getPBreakpoint(pdiBreakpoint);
-		if (breakpoint != null) {
-			Map<String, Object> map = new HashMap<String, Object>(3);
-			try {
-				if (!fSkipBreakpoint && DebugPlugin.getDefault().getBreakpointManager().isEnabled()) {
-					map.put(IBreakpoint.ENABLED, Boolean.valueOf(pdiBreakpoint.isEnabled()));
-				} else {
-					map.put(IBreakpoint.ENABLED, Boolean.valueOf(breakpoint.isEnabled()));
-				}
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			} catch (PDIException pe) {
-				PTPDebugCorePlugin.log(pe);
-			}
-			try {
-				map.put(IPBreakpoint.IGNORE_COUNT, new Integer(pdiBreakpoint.getCondition().getIgnoreCount()));
-			} catch (PDIException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-			try {
-				map.put(IPBreakpoint.CONDITION, pdiBreakpoint.getCondition().getExpression());
-			} catch (PDIException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-			IPDebugInfo info = new PDebugBreakpointInfo(getSession().getDebugInfo(tasks), pdiBreakpoint.getBreakpointID(), map);
-			getSession().fireDebugEvent(IPDebugEvent.CHANGE, IPDebugEvent.BREAKPOINT, info);
-		}
-	}
-
-	/**
-	 * @param tasks
-	 * @param pdiBreakpoint
-	 */
-	private void doHandleDestroyedEvent(BitList tasks, IPDIBreakpoint pdiBreakpoint) {
-		IPBreakpoint breakpoint = null;
-		synchronized (getBreakpointMap()) {
-			breakpoint = getBreakpointMap().getPBreakpoint(pdiBreakpoint);
-			getBreakpointMap().removePDIBreakpoint(pdiBreakpoint);
-		}
-		if (breakpoint != null) {
-			IPDebugInfo info = new PDebugBreakpointInfo(getSession().getDebugInfo(tasks), pdiBreakpoint.getBreakpointID());
-			getSession().fireDebugEvent(IPDebugEvent.TERMINATE, IPDebugEvent.BREAKPOINT, info);
-		}
-	}
-
-	/**
-	 * @param tasks
-	 * @param pdiBreakpoint
-	 */
-	private void doHandleLocationBreakpointCreatedEvent(BitList tasks, IPDILocationBreakpoint pdiBreakpoint) {
-		if (pdiBreakpoint.isTemporary())
-			return;
-		IPBreakpoint breakpoint = null;
-		synchronized (getBreakpointMap()) {
-			breakpoint = getBreakpointMap().getPBreakpoint(pdiBreakpoint);
-			if (breakpoint != null)
-				getBreakpointMap().put(breakpoint, pdiBreakpoint);
-		}
-		if (breakpoint != null) {
-			try {
-				IPDebugInfo info = new PDebugBreakpointInfo(getSession().getDebugInfo(tasks), pdiBreakpoint.getBreakpointID());
-				getSession().fireDebugEvent(IPDebugEvent.CREATE, IPDebugEvent.BREAKPOINT, info);
-				changeBreakpointProperties(breakpoint, pdiBreakpoint);
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-		}
-	}
-
-	/**
-	 * @param tasks
-	 * @param pdiWatchpoint
-	 */
-	private void doHandleWatchpointCreatedEvent(BitList tasks, IPDIWatchpoint pdiWatchpoint) {
-		IPBreakpoint breakpoint = null;
-		synchronized (getBreakpointMap()) {
-			breakpoint = getBreakpointMap().getPBreakpoint(pdiWatchpoint);
-			if (breakpoint != null)
-				getBreakpointMap().put(breakpoint, pdiWatchpoint);
-		}
-		if (breakpoint != null) {
-			try {
-				IPDebugInfo info = new PDebugBreakpointInfo(getSession().getDebugInfo(tasks), pdiWatchpoint.getBreakpointID());
-				getSession().fireDebugEvent(IPDebugEvent.CREATE, IPDebugEvent.BREAKPOINT, info);
-				changeBreakpointProperties(breakpoint, pdiWatchpoint);
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-		}
-	}
-
-	/**
-	 * @param enabled
-	 */
-	private void doSkipBreakpoints(boolean enabled) {
-		IPBreakpoint[] pBreakpoints = getBreakpointMap().getAllPBreakpoints();
-		for (IPBreakpoint bpt : pBreakpoints) {
-			try {
-				if (bpt.isEnabled()) {
-					IPDIBreakpoint pdiBreakpoint = getBreakpointMap().getPDIBreakpoint(bpt);
-					if (pdiBreakpoint != null) {
-						pdiBreakpoint.setEnabled(!enabled);
-					}
-				}
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			} catch (PDIException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private BreakpointMap getBreakpointMap() {
-		return fMap;
-	}
-
-	/**
-	 * @param pBpt
-	 * @return
-	 * @throws CoreException
-	 */
-	private BitList getBreakpointTasks(IPBreakpoint pBpt) throws CoreException {
-		String sid = pBpt.getSetId();
-		if (sid.equals(PreferenceConstants.SET_ROOT_ID)) {
-			return session.getTasks();
-		}
-		BitList setTasks = session.getSetManager().getTasks(sid);
-		if (setTasks != null)
-			return setTasks.copy();
-
-		IPDIBreakpoint pdiBpt = getBreakpointMap().getPDIBreakpoint(pBpt);
-		if (pdiBpt == null) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), IStatus.ERROR,
-					"No pdi breakpoint found", null));
-		}
-		return pdiBpt.getTasks().copy();
-	}
-
-	/**
-	 * @return
-	 */
-	private IProject getProject() {
-		return session.getProject();
-	}
-
-	/**
-	 * @return
-	 */
-	private ISourceLocator getSourceLocator() {
-		return getSession().getLaunch().getSourceLocator();
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleChangedEvent(IPDIChangedEvent event) {
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-			doHandleChangedEvent(event.getTasks(), ((IPDIBreakpointInfo) reason).getBreakpoint());
-		}
-	}
-
-	/***************************************************************************
-	 * Events
-	 **************************************************************************/
-	/**
-	 * @param event
-	 */
-	private void handleCreatedEvent(IPDICreatedEvent event) {
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-			IPDIBreakpoint pdiBreakpoint = ((IPDIBreakpointInfo) reason).getBreakpoint();
-			if (pdiBreakpoint instanceof IPDIWatchpoint) {
-				doHandleWatchpointCreatedEvent(event.getTasks(), (IPDIWatchpoint) pdiBreakpoint);
-			} else if (pdiBreakpoint instanceof IPDILocationBreakpoint) {
-				doHandleLocationBreakpointCreatedEvent(event.getTasks(), (IPDILocationBreakpoint) pdiBreakpoint);
-			}
-
-			if (!pdiBreakpoint.isTemporary() && !DebugPlugin.getDefault().getBreakpointManager().isEnabled()) {
-				changeBreakpointPropertiesOnSession(event.getTasks(), pdiBreakpoint, new Boolean(false), null);
-			}
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleDestroyedEvent(IPDIDestroyedEvent event) {
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-			doHandleDestroyedEvent(event.getTasks(), ((IPDIBreakpointInfo) reason).getBreakpoint());
-		}
-	}
-
-	/**
-	 * @param breakpoint
-	 * @return
-	 */
-	private boolean isTargetBreakpoint(IBreakpoint breakpoint) {
-		if (breakpoint instanceof IPBreakpoint) {
-			try {
-				String bp_job_id = ((IPBreakpoint) breakpoint).getJobId();
-				if (bp_job_id.equals(getPDISession().getJobID()) || bp_job_id.equals(IPBreakpoint.GLOBAL)) {
-					IResource resource = breakpoint.getMarker().getResource();
-					if (breakpoint instanceof IPAddressBreakpoint)
-						return supportsAddressBreakpoint((IPAddressBreakpoint) breakpoint);
-					if (breakpoint instanceof IPLineBreakpoint) {
-						try {
-							String handle = ((IPBreakpoint) breakpoint).getSourceHandle();
-							ISourceLocator sl = getSourceLocator();
-							if (sl instanceof IPSourceLocator)
-								return (((IPSourceLocator) sl).findSourceElement(handle) != null);
-							else if (sl instanceof PSourceLookupDirector) {
-								return (((PSourceLookupDirector) sl).contains(((IPBreakpoint) breakpoint)));
-							}
-						} catch (CoreException e) {
-							return false;
-						}
-					} else {
-						IProject project = resource.getProject();
-						if (project != null && project.exists()) {
-							ISourceLocator sl = getSourceLocator();
-							if (sl instanceof IPSourceLocator)
-								return ((IPSourceLocator) sl).contains(project);
-							else if (sl instanceof PSourceLookupDirector)
-								return ((PSourceLookupDirector) sl).contains(project);
-							if (project.equals(getProject()))
-								return true;
-							return PDebugUtils.isReferencedProject(getProject(), project);
-						}
-					}
-					return true;
-				}
-			} catch (CoreException e) {
-				return false;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param breakpoints
-	 */
-	protected void deleteBreakpointsOnSession0(IPBreakpoint[] breakpoints) {
-		IPDIBreakpointManager pdiBptMgr = getPDISession().getBreakpointManager();
-		for (IPBreakpoint breakpoint : breakpoints) {
-			IPDIBreakpoint pdiBreakpoint = null;
-			synchronized (getBreakpointMap()) {
-				pdiBreakpoint = getBreakpointMap().getPDIBreakpoint(breakpoint);
-			}
-			if (pdiBreakpoint == null)
-				continue;
-
-			try {
-				pdiBptMgr.deleteBreakpoint(pdiBreakpoint.getTasks().copy(), pdiBreakpoint);
-			} catch (PDIException ex) {
-				PTPDebugCorePlugin.log(ex);
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPDISession getPDISession() {
-		return getSession().getPDISession();
-	}
-
-	/**
-	 * @param file
-	 * @return
-	 */
-	protected Object getSourceElement(String file) {
-		Object sourceElement = null;
-		ISourceLocator locator = getSourceLocator();
-		if (locator instanceof IPSourceLocator || locator instanceof PSourceLookupDirector) {
-			if (locator instanceof IPSourceLocator)
-				sourceElement = ((IPSourceLocator) locator).findSourceElement(file);
-			else
-				sourceElement = ((PSourceLookupDirector) locator).getSourceElement(file);
-		}
-		return sourceElement;
-	}
-
-	/**
-	 * @param str
-	 * @return
-	 */
-	protected boolean isEmpty(String str) {
-		return !(str != null && str.trim().length() > 0);
-	}
-
-	/**
-	 * @param breakpoints
-	 */
-	protected void setBreakpointsOnSession0(IPBreakpoint[] breakpoints) {
-		IPDIBreakpointManager pdiBptMgr = getPDISession().getBreakpointManager();
-		for (IPBreakpoint bpt : breakpoints) {
-			try {
-				IPDIBreakpoint b = null;
-				if (bpt instanceof IPFunctionBreakpoint) {
-					IPFunctionBreakpoint breakpoint = (IPFunctionBreakpoint) bpt;
-					String function = breakpoint.getFunction();
-					String fileName = breakpoint.getFileName();
-					IPDIFunctionLocation location = pdiBptMgr.createFunctionLocation(fileName, function);
-					IPDICondition condition = createCondition(breakpoint);
-					b = pdiBptMgr.setFunctionBreakpoint(getBreakpointTasks(bpt), IPDIBreakpoint.REGULAR, location, condition, true,
-							bpt.isEnabled());
-				} else if (bpt instanceof IPAddressBreakpoint) {
-					IPAddressBreakpoint breakpoint = (IPAddressBreakpoint) bpt;
-					String address = breakpoint.getAddress();
-					IPDIAddressLocation location = pdiBptMgr.createAddressLocation(new BigInteger(
-							(address.startsWith("0x")) ? address.substring(2) : address, 16));
-					IPDICondition condition = createCondition(breakpoint);
-					b = pdiBptMgr.setAddressBreakpoint(getBreakpointTasks(bpt), IPDIBreakpoint.REGULAR, location, condition, true,
-							bpt.isEnabled());
-				} else if (bpt instanceof IPLineBreakpoint) {
-					IPLineBreakpoint breakpoint = (IPLineBreakpoint) bpt;
-					String handle = breakpoint.getSourceHandle();
-					IPath path = convertPath(handle);
-					IPDILineLocation location = pdiBptMgr.createLineLocation(path.toPortableString(), breakpoint.getLineNumber());
-					IPDICondition condition = createCondition(breakpoint);
-					b = pdiBptMgr.setLineBreakpoint(getBreakpointTasks(bpt), IPDIBreakpoint.REGULAR, location, condition, true, bpt
-							.isEnabled());
-				} else if (bpt instanceof IPWatchpoint) {
-					IPWatchpoint watchpoint = (IPWatchpoint) bpt;
-					int accessType = 0;
-					accessType |= (watchpoint.isWriteType()) ? IPDIWatchpoint.WRITE : 0;
-					accessType |= (watchpoint.isReadType()) ? IPDIWatchpoint.READ : 0;
-					String expression = watchpoint.getExpression();
-					IPDICondition condition = createCondition(watchpoint);
-					b = pdiBptMgr.setWatchpoint(getBreakpointTasks(bpt), IPDIBreakpoint.REGULAR, accessType, expression, condition,
-							bpt.isEnabled());
-				}
-				if (b != null) {
-					getBreakpointMap().put(bpt, b);
-				}
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			} catch (PDIException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-		}
-	}
-	
-	/**
-	 * Update any pending breakpoints. This should be called when the debugger enters suspended state
-	 * to update any breakpoints that could not be set or deleted because tasks were running.
-	 * 
-	 * @throws PDIException
-	 */
-	public void updatePendingBreakpoints() throws PDIException {
-		getPDISession().getBreakpointManager().updatePendingBreakpoints();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PDebugConfiguration.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PDebugConfiguration.java
deleted file mode 100644
index 338216b..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PDebugConfiguration.java
+++ /dev/null

@@ -1,163 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.debug.core.IPDebugConfiguration;
-import org.eclipse.ptp.debug.core.IPDebugger;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-
-public class PDebugConfiguration implements IPDebugConfiguration {
-	private IConfigurationElement fElement;
-	private HashSet<String> fModes;
-	private HashSet<String> fCPUs;
-	private String[] fCoreExt;
-
-	public PDebugConfiguration(IConfigurationElement element) {
-		fElement = element;
-	}
-
-	private IConfigurationElement getConfigurationElement() {
-		return fElement;
-	}
-
-	public IPDebugger getDebugger() throws CoreException {
-		Object debugger = getConfigurationElement().createExecutableExtension("class");
-		if (debugger instanceof IPDebugger) {
-			return (IPDebugger)debugger;
-		}
-		throw new CoreException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), -1, InternalDebugCoreMessages.getString("DebugConfiguration.0"), null));
-	}
-
-	public String getName() {
-		String name = getConfigurationElement().getAttribute("name");
-		return name != null ? name : "";
-	}
-
-	public String getID() {
-		return getConfigurationElement().getAttribute("id");
-	}
-
-	public String getPlatform() {
-		String platform = getConfigurationElement().getAttribute("platform");
-		if (platform == null) {
-			return "*";
-		}
-		return platform;
-	}
-
-	public String[] getCPUList() {
-		return (String[]) getCPUs().toArray(new String[0]);
-	}
-
-	public String[] getModeList() {
-		return (String[]) getModes().toArray(new String[0]);
-	}
-
-	public boolean supportsMode(String mode) {
-		return getModes().contains(mode);
-	}
-
-	public boolean supportsCPU(String cpu) {
-		String nativeCPU = Platform.getOSArch();
-		boolean ret = false;
-		if ( nativeCPU.startsWith(cpu) ) {
-			ret = getCPUs().contains(CPU_NATIVE);
-		}
-		return ret || getCPUs().contains(cpu) || getCPUs().contains("*");
-	}
-	
-	/**
-	 * Returns the set of modes specified in the configuration data.
-	 * @return the set of modes specified in the configuration data
-	 */
-	protected Set<String> getModes() {
-		if (fModes == null) {
-			String modes = getConfigurationElement().getAttribute("modes");
-			if (modes == null) {
-				return new HashSet<String>(0);
-			}
-			StringTokenizer tokenizer = new StringTokenizer(modes, ",");
-			fModes = new HashSet<String>(tokenizer.countTokens());
-			while (tokenizer.hasMoreTokens()) {
-				fModes.add(tokenizer.nextToken().trim());
-			}
-		}
-		return fModes;
-	}
-
-	protected Set<String> getCPUs() {
-		if (fCPUs == null) {
-			String cpus = getConfigurationElement().getAttribute("cpu");
-			if (cpus == null) {
-				fCPUs = new HashSet<String>(1);
-				fCPUs.add(CPU_NATIVE);
-			}
-			else {
-				String nativeCPU = Platform.getOSArch();
-				StringTokenizer tokenizer = new StringTokenizer(cpus, ",");
-				fCPUs = new HashSet<String>(tokenizer.countTokens());
-				while (tokenizer.hasMoreTokens()) {
-					String cpu = tokenizer.nextToken().trim();
-					fCPUs.add(cpu);
-					if (nativeCPU.startsWith(cpu)) { // os arch be cpu{le/be}
-						fCPUs.add(CPU_NATIVE);
-					}
-				}
-			}
-		}
-		return fCPUs;
-	}
-	public String[] getCoreFileExtensions() {
-		if (fCoreExt == null) {
-			List<String> exts = new ArrayList<String>();
-			String cexts = getConfigurationElement().getAttribute("coreFileFilter");
-			if (cexts != null) {
-				StringTokenizer tokenizer = new StringTokenizer(cexts, ",");
-				while (tokenizer.hasMoreTokens()) {
-					String ext = tokenizer.nextToken().trim();
-					exts.add(ext);
-				}
-			}
-			exts.add("*.*");
-			fCoreExt = (String[])exts.toArray(new String[exts.size()]);
-		}
-		return fCoreExt;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PMemoryManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PMemoryManager.java
deleted file mode 100644
index d7e9013..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PMemoryManager.java
+++ /dev/null

@@ -1,627 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.math.BigInteger;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.core.model.IMemoryBlockExtension;
-import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPMemoryManager;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIMemoryBlockInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIRestartedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITargetExpression;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeIntegral;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-import org.eclipse.ptp.debug.internal.core.model.PExpression;
-import org.eclipse.ptp.debug.internal.core.model.PMemoryBlockExtension;
-import org.eclipse.ptp.debug.internal.core.model.PStackFrame;
-import org.eclipse.ptp.debug.internal.core.model.PThread;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author clement
- * 
- */
-public class PMemoryManager implements IAdaptable, IPDIEventListener, IPMemoryManager {
-	private class PMemoryBlockRetrievalExtension extends PlatformObject implements IMemoryBlockRetrievalExtension {
-		private IPDebugTarget debugTarget = null;
-		private final BitList mTasks;
-
-		public PMemoryBlockRetrievalExtension(BitList mTasks, PDebugTarget debugTarget) {
-			this.mTasks = mTasks;
-			this.debugTarget = debugTarget;
-		}
-
-		/**
-		 * @param message
-		 * @param e
-		 * @throws CoreException
-		 */
-		public void abort(String message, Throwable e) throws CoreException {
-			IStatus s = new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR,
-					message, e);
-			throw new CoreException(s);
-		}
-
-		/**
-		 * @param expressions
-		 * @param memorySpaceIDs
-		 */
-		public void createMemoryBlocks(String[] expressions, String[] memorySpaceIDs) {
-			ArrayList<PMemoryBlockExtension> list = new ArrayList<PMemoryBlockExtension>(expressions.length);
-			for (int i = 0; i < expressions.length; ++i) {
-				try {
-					BigInteger address = new BigInteger(expressions[i]);
-					if (address != null) {
-						if (memorySpaceIDs[i] == null) {
-							list.add(new PMemoryBlockExtension(session, mTasks, address.toString(16), address));
-						} else {
-							list.add(new PMemoryBlockExtension(session, mTasks, address, memorySpaceIDs[i]));
-						}
-					}
-				} catch (NumberFormatException exc) {
-					PTPDebugCorePlugin.log(exc);
-				}
-			}
-			DebugPlugin.getDefault().getMemoryBlockManager().addMemoryBlocks((IMemoryBlock[]) list.toArray(new IMemoryBlock[0]));
-		}
-
-		/**
-		 * 
-		 */
-		public void dispose() {
-		}
-
-		/**
-		 * @return
-		 */
-		public IPDebugTarget getDebugTarget() {
-			if (debugTarget == null) {
-				debugTarget = session.findDebugTarget(mTasks);
-			}
-			return debugTarget;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension#getExtendedMemoryBlock(java.lang.String, java.lang.Object)
-		 */
-		public IMemoryBlockExtension getExtendedMemoryBlock(String expression, Object selected) throws DebugException {
-			String address = null;
-			PExpression exp = null;
-			String msg = null;
-			try {
-				if (selected instanceof IDebugElement) {
-					IDebugElement debugElement = (IDebugElement) selected;
-					IDebugTarget target = debugElement.getDebugTarget();
-					if (!(target instanceof PDebugTarget)) {
-						throw new DebugException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(),
-								DebugException.REQUEST_FAILED, msg, null));
-					}
-					try {
-						return new PMemoryBlockExtension(session, mTasks, expression, new BigInteger(expression, 16));
-					} catch (NumberFormatException nfexc) {
-					}
-
-					PStackFrame frame = getStackFrame(debugElement);
-					if (frame != null) {
-						// We need to provide a better way for retrieving the
-						// address of expression
-						IPDITargetExpression pdiExpression = session.getPDISession().getExpressionManager().createExpression(
-								frame.getTasks(), expression);
-						exp = new PExpression(frame, pdiExpression, null);
-						IValue value = exp.getValue();
-						if (value instanceof IPValue) {
-							IAIF aif = ((IPValue) value).getAIF();
-							if (aif != null
-									&& (aif.getType() instanceof IAIFTypePointer || aif.getType() instanceof ITypeIntegral || aif
-											.getType() instanceof IAIFTypeArray)) {
-								address = aif.getValue().getValueString();
-								if (address != null) {
-									BigInteger a = (address.startsWith("0x")) ? new BigInteger(address.substring(2), 16)
-											: new BigInteger(address);
-									return new PMemoryBlockExtension(session, mTasks, expression, a);
-								}
-							} else {
-								msg = MessageFormat.format(InternalDebugCoreMessages
-										.getString("PTPMemoryBlockRetrievalExtension.1"), new Object[] { expression });
-							}
-						} else {
-							msg = MessageFormat.format(InternalDebugCoreMessages.getString("PTPMemoryBlockRetrievalExtension.2"),
-									new Object[] { expression });
-						}
-					}
-				}
-			} catch (PDIException pe) {
-				msg = pe.getMessage();
-			} catch (AIFException e) {
-				msg = e.getMessage();
-			} catch (NumberFormatException e) {
-				msg = MessageFormat.format(InternalDebugCoreMessages.getString("PTPMemoryBlockRetrievalExtension.0"), new Object[] {
-						expression, address });
-			} finally {
-				if (exp != null) {
-					exp.dispose();
-				}
-			}
-			throw new DebugException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(),
-					DebugException.REQUEST_FAILED, msg, null));
-		}
-
-		/**
-		 * @return
-		 * @throws CoreException
-		 */
-		public 	String getMemento() throws CoreException {
-			IMemoryBlock[] blocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(getDebugTarget());
-			Document document = DebugPlugin.newDocument();
-			Element exprList = document.createElement(MEMORY_BLOCK_EXPRESSION_LIST);
-			for (int i = 0; i < blocks.length; ++i) {
-				if (blocks[i] instanceof IMemoryBlockExtension) {
-					IMemoryBlockExtension memBlockExt = (IMemoryBlockExtension) blocks[i];
-					Element exprItem = document.createElement(MEMORY_BLOCK_EXPRESSION_ITEM);
-					exprList.appendChild(exprItem);
-
-					BigInteger addrBigInt = null;
-					String memorySpaceID = null;
-					if (hasMemorySpaces()) {
-						try {
-							StringBuffer sbuf = new StringBuffer();
-							addrBigInt = stringToAddress(memBlockExt.getExpression(), sbuf);
-							memorySpaceID = sbuf.toString();
-						} catch (CoreException e) {
-						}
-					}
-					Element child = document.createElement(MEMORY_BLOCK_EXPRESSION);
-					try {
-						if (addrBigInt != null && memorySpaceID != null) {
-							child.setAttribute(ATTR_MEMORY_BLOCK_EXPRESSION_TEXT, addrBigInt.toString());
-						} else {
-							child.setAttribute(ATTR_MEMORY_BLOCK_EXPRESSION_TEXT, memBlockExt.getBigBaseAddress().toString());
-						}
-						exprItem.appendChild(child);
-					} catch (DebugException e) {
-						PTPDebugCorePlugin.log(e.getStatus());
-					}
-					if (memorySpaceID != null) {
-						child = document.createElement(MEMORY_BLOCK_MEMSPACEID);
-						child.setAttribute(ATTR_MEMORY_BLOCK_MEMSPACEID_TEXT, memorySpaceID);
-						exprItem.appendChild(child);
-					}
-				}
-			}
-			document.appendChild(exprList);
-			return DebugPlugin.serializeDocument(document);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long)
-		 */
-		public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException {
-			String expression = Long.toHexString(startAddress);
-			BigInteger address = new BigInteger(expression, 16);
-			expression += "0x";
-			return new PMemoryBlockExtension(session, mTasks, expression, address);
-		}
-
-		/**
-		 * @param address
-		 * @param memorySpaceID
-		 * @param selected
-		 * @return
-		 * @throws DebugException
-		 */
-		public IMemoryBlockExtension getMemoryBlockWithMemorySpaceID(String address, String memorySpaceID, Object selected)
-				throws DebugException {
-			String msg = null;
-			try {
-				if (selected instanceof IDebugElement) {
-					IDebugElement debugElement = (IDebugElement) selected;
-					IDebugTarget target = debugElement.getDebugTarget();
-					if (target instanceof PDebugTarget) {
-						if (address != null) {
-							BigInteger addr = (address.startsWith("0x")) ? new BigInteger(address.substring(2), 16)
-									: new BigInteger(address);
-							return new PMemoryBlockExtension(session, mTasks, addr, memorySpaceID);
-						}
-					}
-				}
-			} catch (NumberFormatException e) {
-				msg = MessageFormat.format(InternalDebugCoreMessages.getString("PMemoryBlockRetrievalExtension.4"),
-						new Object[] { address });
-			}
-			throw new DebugException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(),
-					DebugException.REQUEST_FAILED, msg, null));
-		}
-
-		/**
-		 * @return
-		 */
-		public String[] getMemorySpaces() {
-			return new String[0];
-		}
-
-		/**
-		 * @param selected
-		 * @return
-		 * @throws DebugException
-		 */
-		public PStackFrame getStackFrame(IDebugElement selected) throws DebugException {
-			if (selected instanceof PStackFrame) {
-				return (PStackFrame) selected;
-			}
-			if (selected instanceof PThread) {
-				IStackFrame frame = ((PThread) selected).getTopStackFrame();
-				if (frame instanceof PStackFrame) {
-					return (PStackFrame) frame;
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * @return
-		 */
-		public boolean hasMemorySpaces() {
-			return getMemorySpaces().length > 0;
-		}
-
-		/**
-		 * 
-		 */
-		public void initialize() {
-			ILaunchConfiguration config = session.getLaunch().getLaunchConfiguration();
-			try {
-				String memento = config.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_MEMORY_BLOCKS, "");
-				if (memento != null && memento.trim().length() != 0) {
-					initializeFromMemento(memento);
-				}
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-		}
-
-		/**
-		 * @param memento
-		 * @throws CoreException
-		 */
-		public void initializeFromMemento(String memento) throws CoreException {
-			Element root = DebugPlugin.parseDocument(memento);
-			if (root.getNodeName().equalsIgnoreCase(MEMORY_BLOCK_EXPRESSION_LIST)) {
-				List<String> expressions = new ArrayList<String>();
-				List<String> memorySpaceIDs = new ArrayList<String>();
-				NodeList list = root.getChildNodes();
-				int length = list.getLength();
-				for (int i = 0; i < length; ++i) {
-					Node node = list.item(i);
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						Element entry = (Element) node;
-						if (entry.getNodeName().equalsIgnoreCase(MEMORY_BLOCK_EXPRESSION)) {
-							parseMementoExprItem(entry, expressions, memorySpaceIDs);
-						}
-					}
-				}
-				createMemoryBlocks((String[]) expressions.toArray(new String[0]), (String[]) memorySpaceIDs.toArray(new String[0]));
-				return;
-			}
-			abort(InternalDebugCoreMessages.getString("PTPMemoryBlockRetrievalExtension.3"), null);
-		}
-
-		/**
-		 * @param element
-		 * @param expressions
-		 * @param memorySpaceIDs
-		 */
-		public void parseMementoExprItem(Element element, List<String> expressions, List<String> memorySpaceIDs) {
-			NodeList list = element.getChildNodes();
-			int length = list.getLength();
-			String exp = null;
-			String memorySpaceID = null;
-			for (int i = 0; i < length; ++i) {
-				Node node = list.item(i);
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					Element entry = (Element) node;
-					if (entry.getNodeName().equalsIgnoreCase(MEMORY_BLOCK_EXPRESSION)) {
-						exp = entry.getAttribute(ATTR_MEMORY_BLOCK_EXPRESSION_TEXT);
-					} else if (entry.getNodeName().equalsIgnoreCase(MEMORY_BLOCK_MEMSPACEID)) {
-						memorySpaceID = entry.getAttribute(ATTR_MEMORY_BLOCK_MEMSPACEID_TEXT);
-					}
-				}
-			}
-			if (exp != null) {
-				expressions.add(exp);
-				memorySpaceIDs.add(memorySpaceID);
-			}
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval()
-		 */
-		public boolean supportsStorageRetrieval() {
-			return true;
-		}
-	}
-
-	private static final String MEMORY_BLOCK_EXPRESSION_LIST = "memoryBlockExpressionList";
-	private static final String MEMORY_BLOCK_EXPRESSION_ITEM = "memoryBlockExpressionItem";
-	private static final String MEMORY_BLOCK_EXPRESSION = "expression";
-	private static final String MEMORY_BLOCK_MEMSPACEID = "memorySpaceID";
-	private static final String ATTR_MEMORY_BLOCK_MEMSPACEID_TEXT = "text";
-	private static final String ATTR_MEMORY_BLOCK_EXPRESSION_TEXT = "text";
-
-	/**
-	 * @param address
-	 * @param memorySpaceID
-	 * @return
-	 */
-	public static String addressToString(BigInteger address, String memorySpaceID) {
-		return memorySpaceID + ":0x" + address.toString(16);
-	}
-
-	/**
-	 * @param str
-	 * @param memorySpaceID_out
-	 * @return
-	 * @throws CoreException
-	 */
-	public static BigInteger stringToAddress(String str, StringBuffer memorySpaceID_out) throws CoreException {
-		int index = str.lastIndexOf(':');
-
-		// minimum is "<space>:0x?"
-		if (index == -1 || str.length() <= index + 3 || str.charAt(index + 1) != '0' || str.charAt(index + 2) != 'x') {
-			IStatus s = new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR,
-					InternalDebugCoreMessages.getString("PMemoryBlockRetrievalExtension.5"), null);
-			throw new CoreException(s);
-		}
-		memorySpaceID_out.setLength(0);
-		memorySpaceID_out.append(str.substring(0, index));
-		return new BigInteger(str.substring(index + 3), 16);
-	}
-
-	private final IPSession session;
-	protected final Map<BitList, PMemoryBlockRetrievalExtension> fMemoryRetrievalMap = new HashMap<BitList, PMemoryBlockRetrievalExtension>();
-
-	public PMemoryManager(IPSession session) {
-		this.session = session;
-		session.getPDISession().getEventManager().addEventListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPMemoryManager#dispose(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void dispose(BitList qTasks) {
-		getMemoryRetrieval(qTasks).dispose();
-	}
-
-	/**
-	 * @param monitor
-	 */
-	public void dispose(IProgressMonitor monitor) {
-		fMemoryRetrievalMap.clear();
-		session.getPDISession().getEventManager().removeEventListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPDISession.class))
-			return getSession();
-		if (adapter.equals(PMemoryManager.class))
-			return this;
-		return null;
-	}
-
-	/**
-	 * @param qTasks
-	 * @param expression
-	 * @param selected
-	 * @return
-	 * @throws DebugException
-	 */
-	public IMemoryBlockExtension getExtendedMemoryBlock(BitList qTasks, String expression, Object selected) throws DebugException {
-		return getMemoryRetrieval(qTasks).getExtendedMemoryBlock(expression, selected);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPMemoryManager#getMemoryBlock(org.eclipse.ptp.core.util.BitList, long, long)
-	 */
-	public IMemoryBlock getMemoryBlock(BitList qTasks, long startAddress, long length) throws DebugException {
-		return getMemoryRetrieval(qTasks).getMemoryBlock(startAddress, length);
-	}
-
-	/**
-	 * @param qTasks
-	 * @param address
-	 * @param memorySpaceID
-	 * @param selected
-	 * @return
-	 * @throws DebugException
-	 */
-	public IMemoryBlockExtension getMemoryBlockWithMemorySpaceID(BitList qTasks, String address, String memorySpaceID,
-			Object selected) throws DebugException {
-		return getMemoryRetrieval(qTasks).getMemoryBlockWithMemorySpaceID(address, memorySpaceID, selected);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPMemoryManager#getMemoryRetrieval(org.eclipse.ptp.core.util.BitList)
-	 */
-	public PMemoryBlockRetrievalExtension getMemoryRetrieval(BitList qTasks) {
-		synchronized (fMemoryRetrievalMap) {
-			PMemoryBlockRetrievalExtension set = (PMemoryBlockRetrievalExtension) fMemoryRetrievalMap.get(qTasks);
-			if (set == null) {
-				set = new PMemoryBlockRetrievalExtension(qTasks, null);
-				fMemoryRetrievalMap.put(qTasks, set);
-			}
-			return set;
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	public IPSession getSession() {
-		return session;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener#handleDebugEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			IPDIEvent event = events[i];
-			if (!fMemoryRetrievalMap.containsKey(event.getTasks()))
-				continue;
-
-			if (event instanceof IPDIResumedEvent || event instanceof IPDIRestartedEvent) {
-				doResetChange(event);
-			} else if (event instanceof IPDIChangedEvent) {
-				handleChangedEvent((IPDIChangedEvent) event);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPMemoryManager#initialize(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.model.PDebugTarget)
-	 */
-	public void initialize(BitList qTasks, PDebugTarget debugTarget) {
-		synchronized (fMemoryRetrievalMap) {
-			PMemoryBlockRetrievalExtension set = new PMemoryBlockRetrievalExtension(qTasks, debugTarget);
-			fMemoryRetrievalMap.put(qTasks, set);
-			set.initialize();
-		}
-	}
-
-	/**
-	 * @param qTasks
-	 * @param memento
-	 * @throws CoreException
-	 */
-	public void initializeFromMemento(BitList qTasks, String memento) throws CoreException {
-		getMemoryRetrieval(qTasks).initializeFromMemento(memento);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPMemoryManager#save(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void save(BitList qTasks) {
-		try {
-			String memto = getMemoryRetrieval(qTasks).getMemento();
-			ILaunchConfiguration config = session.getLaunch().getLaunchConfiguration();
-			if (config != null) {
-				ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-				wc.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_MEMORY_BLOCKS, memto);
-				wc.doSave();
-			}
-		} catch (CoreException e) {
-			PTPDebugCorePlugin.log(e.getStatus());
-		}
-	}
-
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	public boolean supportsStorageRetrieval(BitList qTasks) {
-		return true;
-	}
-
-	/**
-	 * @param event
-	 */
-	private void doResetChange(final IPDIEvent event) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			/* (non-Javadoc)
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				IPDebugTarget debugTarget = getMemoryRetrieval(event.getTasks()).getDebugTarget();
-				IMemoryBlock[] blocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(debugTarget);
-				for (IMemoryBlock block : blocks) {
-					if (block instanceof IMemoryBlockExtension) {
-						((PMemoryBlockExtension) block).resetChanges();
-					}
-				}
-			}
-		});
-	}
-	
-	/**
-	 * @param event
-	 */
-	private void handleChangedEvent(final IPDIChangedEvent event) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			/* (non-Javadoc)
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				IPDISessionObject reason = ((IPDIChangedEvent) event).getReason();
-				if (reason instanceof IPDIMemoryBlockInfo) {
-					IPDebugTarget debugTarget = getMemoryRetrieval(event.getTasks()).getDebugTarget();
-					IMemoryBlock[] blocks = DebugPlugin.getDefault().getMemoryBlockManager().getMemoryBlocks(debugTarget);
-					for (IMemoryBlock block : blocks) {
-						if (block instanceof IMemoryBlockExtension) {
-							((PMemoryBlockExtension) block).changes(((IPDIMemoryBlockInfo) reason).getMemoryBlock(),
-									((IPDIMemoryBlockInfo) reason).getAddresses());
-						}
-					}
-				}
-			}
-		});
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PRegisterManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PRegisterManager.java
deleted file mode 100644
index 8af0f9b..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PRegisterManager.java
+++ /dev/null

@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPRegisterManager;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup;
-import org.eclipse.ptp.debug.core.model.IPRegisterDescriptor;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterGroup;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-import org.eclipse.ptp.debug.internal.core.model.PRegisterDescriptor;
-import org.eclipse.ptp.debug.internal.core.model.PRegisterGroup;
-import org.eclipse.ptp.debug.internal.core.model.PStackFrame;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author clement
- * 
- */
-public class PRegisterManager implements IAdaptable, IPRegisterManager {
-	private class PRegisterSet {
-		private final List<IRegisterGroup> fRegisterGroups = Collections.synchronizedList(new ArrayList<IRegisterGroup>(20));
-		private IPRegisterDescriptor[] fRegisterDescriptors;
-		private boolean fUseDefaultRegisterGroups = true;
-		private IPStackFrame fCurrentFrame;
-		private IPDebugTarget debugTarget = null;
-		private final BitList rTasks;
-
-		public PRegisterSet(BitList rTasks, PDebugTarget debugTarget) {
-			this.rTasks = rTasks;
-			this.debugTarget = debugTarget;
-		}
-
-		/**
-		 * @param message
-		 * @param exception
-		 * @throws CoreException
-		 */
-		public void abort(String message, Throwable exception) throws CoreException {
-			IStatus status = new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR,
-					message, exception);
-			throw new CoreException(status);
-		}
-
-		/**
-		 * @param name
-		 * @param descriptors
-		 */
-		public void addRegisterGroup(String name, IPRegisterDescriptor[] descriptors) {
-			fRegisterGroups.add(new PRegisterGroup(session, rTasks, name, descriptors));
-			setUseDefaultRegisterGroups(false);
-			getDebugTarget().fireChangeEvent(DebugEvent.CONTENT);
-		}
-
-		/**
-		 * 
-		 */
-		public void dispose() {
-			synchronized (fRegisterGroups) {
-				Iterator<IRegisterGroup> it = fRegisterGroups.iterator();
-				while (it.hasNext()) {
-					((PRegisterGroup) it.next()).dispose();
-				}
-				fRegisterGroups.clear();
-			}
-		}
-
-		/**
-		 * @param group
-		 */
-		public void doAddRegisterGroup(IRegisterGroup group) {
-			fRegisterGroups.add(group);
-		}
-
-		/**
-		 * @param groupName
-		 * @param name
-		 * @return
-		 */
-		public IPRegisterDescriptor findDescriptor(String groupName, String name) {
-			for (int i = 0; i < fRegisterDescriptors.length; ++i) {
-				IPRegisterDescriptor d = fRegisterDescriptors[i];
-				if (groupName.equals(d.getGroupName()) && name.equals(d.getName()))
-					return d;
-			}
-			return null;
-		}
-
-		/**
-		 * @return
-		 * @throws DebugException
-		 */
-		public IPRegisterDescriptor[] getAllRegisterDescriptors() throws DebugException {
-			return fRegisterDescriptors;
-		}
-
-		/**
-		 * @return
-		 */
-		public IPStackFrame getCurrentFrame() {
-			return fCurrentFrame;
-		}
-
-		/**
-		 * @return
-		 */
-		public IPDebugTarget getDebugTarget() {
-			if (debugTarget == null) {
-				debugTarget = session.findDebugTarget(rTasks);
-			}
-			return debugTarget;
-		}
-
-		/**
-		 * @return
-		 * @throws CoreException
-		 */
-		public String getMemento() throws CoreException {
-			synchronized (fRegisterGroups) {
-				if (useDefaultRegisterGroups() || fRegisterGroups == null) {
-					return "";
-				}
-				Document document = DebugPlugin.newDocument();
-				Element element = document.createElement(ELEMENT_REGISTER_GROUP_LIST);
-				Iterator<IRegisterGroup> it = fRegisterGroups.iterator();
-				while (it.hasNext()) {
-					PRegisterGroup group = (PRegisterGroup) it.next();
-					Element child = document.createElement(ELEMENT_REGISTER_GROUP);
-					child.setAttribute(ATTR_REGISTER_GROUP_MEMENTO, group.getMemento());
-					element.appendChild(child);
-				}
-				document.appendChild(element);
-				return DebugPlugin.serializeDocument(document);
-			}
-		}
-
-		/**
-		 * @param frame
-		 * @return
-		 * @throws DebugException
-		 */
-		public IRegisterGroup[] getRegisterGroups(PStackFrame frame) throws DebugException {
-			IRegisterGroup[] groups = (IRegisterGroup[]) fRegisterGroups.toArray(new IRegisterGroup[0]);
-			if (getCurrentFrame() != frame) {
-				for (int i = 0; i < groups.length; ++i) {
-					((PRegisterGroup) groups[i]).resetRegisterValues();
-				}
-				setCurrentFrame(frame);
-			}
-			return groups;
-		}
-
-		/**
-		 * 
-		 */
-		public void initialize() {
-			IPDIRegisterGroup[] groups = new IPDIRegisterGroup[0];
-			try {
-				groups = getDebugTarget().getPDITarget().getRegisterGroups();
-			} catch (PDIException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-			List<IPRegisterDescriptor> list = new ArrayList<IPRegisterDescriptor>();
-			for (int i = 0; i < groups.length; ++i) {
-				try {
-					IPDIRegisterDescriptor[] pdiDescriptors = groups[i].getRegisterDescriptors();
-					for (int j = 0; j < pdiDescriptors.length; ++j) {
-						list.add(new PRegisterDescriptor(groups[i], pdiDescriptors[j]));
-					}
-				} catch (PDIException e) {
-					PTPDebugCorePlugin.log(e);
-				}
-			}
-			fRegisterDescriptors = (IPRegisterDescriptor[]) list.toArray(new IPRegisterDescriptor[0]);
-			createRegisterGroups();
-		}
-
-		/**
-		 * 
-		 */
-		public void initializeDefaults() {
-			setUseDefaultRegisterGroups(true);
-			String current = null;
-			int startIndex = 0;
-			for (int i = 0; i < fRegisterDescriptors.length; ++i) {
-				PRegisterDescriptor d = (PRegisterDescriptor) fRegisterDescriptors[i];
-				if (current != null && d.getGroupName().compareTo(current) != 0) {
-					IPRegisterDescriptor[] descriptors = new IPRegisterDescriptor[i - startIndex];
-					System.arraycopy(fRegisterDescriptors, startIndex, descriptors, 0, descriptors.length);
-					fRegisterGroups.add(new PRegisterGroup(session, rTasks, current, descriptors));
-					startIndex = i;
-				}
-				current = d.getGroupName();
-			}
-			if (startIndex < fRegisterDescriptors.length) {
-				IPRegisterDescriptor[] descriptors = new IPRegisterDescriptor[fRegisterDescriptors.length - startIndex];
-				System.arraycopy(fRegisterDescriptors, startIndex, descriptors, 0, descriptors.length);
-				fRegisterGroups.add(new PRegisterGroup(session, rTasks, current, descriptors));
-			}
-		}
-
-		/**
-		 * @param group
-		 * @param descriptors
-		 */
-		public void modifyRegisterGroup(IPPersistableRegisterGroup group, IPRegisterDescriptor[] descriptors) {
-			group.setRegisterDescriptors(descriptors);
-			((PRegisterGroup) group).fireChangeEvent(DebugEvent.CONTENT);
-		}
-
-		/**
-		 * 
-		 */
-		public void removeAllRegisterGroups() {
-			synchronized (fRegisterGroups) {
-				Iterator<IRegisterGroup> it = fRegisterGroups.iterator();
-				while (it.hasNext()) {
-					((PRegisterGroup) it.next()).dispose();
-				}
-				fRegisterGroups.clear();
-			}
-			setUseDefaultRegisterGroups(false);
-			getDebugTarget().fireChangeEvent(DebugEvent.CONTENT);
-		}
-
-		/**
-		 * @param groups
-		 */
-		public void removeRegisterGroups(IRegisterGroup[] groups) {
-			for (int i = 0; i < groups.length; ++i) {
-				((PRegisterGroup) groups[i]).dispose();
-			}
-			fRegisterGroups.removeAll(Arrays.asList(groups));
-			setUseDefaultRegisterGroups(false);
-			getDebugTarget().fireChangeEvent(DebugEvent.CONTENT);
-		}
-
-		/**
-		 * 
-		 */
-		public void restoreDefaults() {
-			synchronized (fRegisterGroups) {
-				Iterator<IRegisterGroup> it = fRegisterGroups.iterator();
-				while (it.hasNext()) {
-					((PRegisterGroup) it.next()).dispose();
-				}
-				fRegisterGroups.clear();
-				initializeDefaults();
-			}
-			getDebugTarget().fireChangeEvent(DebugEvent.CONTENT);
-		}
-
-		/**
-		 * @param currentFrame
-		 */
-		public void setCurrentFrame(PStackFrame currentFrame) {
-			fCurrentFrame = currentFrame;
-		}
-
-		/**
-		 * @param useDefaultRegisterGroups
-		 */
-		public void setUseDefaultRegisterGroups(boolean useDefaultRegisterGroups) {
-			fUseDefaultRegisterGroups = useDefaultRegisterGroups;
-		}
-
-		/**
-		 * 
-		 */
-		public void targetSuspended() {
-			synchronized (fRegisterGroups) {
-				Iterator<IRegisterGroup> it = fRegisterGroups.iterator();
-				while (it.hasNext()) {
-					((PRegisterGroup) it.next()).targetSuspended();
-				}
-			}
-		}
-
-		/**
-		 * @return
-		 */
-		public boolean useDefaultRegisterGroups() {
-			return fUseDefaultRegisterGroups;
-		}
-
-		/**
-		 * 
-		 */
-		private void createRegisterGroups() {
-			ILaunchConfiguration config = session.getLaunch().getLaunchConfiguration();
-			try {
-				String memento = config.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_REGISTER_GROUPS, "");
-				if (memento != null && memento.length() > 0) {
-					initializeFromMemento(memento);
-					return;
-				}
-			} catch (CoreException e) {
-			}
-			initializeDefaults();
-		}
-
-		/**
-		 * @param memento
-		 * @throws CoreException
-		 */
-		private void initializeFromMemento(String memento) throws CoreException {
-			Node node = DebugPlugin.parseDocument(memento);
-			if (node.getNodeType() != Node.ELEMENT_NODE) {
-				abort(InternalDebugCoreMessages.getString("PRegisterManager.0"), null);
-			}
-			Element element = (Element) node;
-			if (!ELEMENT_REGISTER_GROUP_LIST.equals(element.getNodeName())) {
-				abort(InternalDebugCoreMessages.getString("PRegisterManager.1"), null);
-			}
-			Node childNode = element.getFirstChild();
-			while (childNode != null) {
-				if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-					Element child = (Element) childNode;
-					if (ELEMENT_REGISTER_GROUP.equals(child.getNodeName())) {
-						String groupMemento = child.getAttribute(ATTR_REGISTER_GROUP_MEMENTO);
-						PRegisterGroup group = new PRegisterGroup(session, rTasks);
-						try {
-							group.initializeFromMemento(groupMemento);
-							doAddRegisterGroup(group);
-						} catch (CoreException e) {
-							// skip this group
-						}
-					}
-				}
-				childNode = childNode.getNextSibling();
-			}
-			setUseDefaultRegisterGroups(false);
-		}
-	}
-
-	private static final String ELEMENT_REGISTER_GROUP_LIST = "registerGroups";
-	private static final String ELEMENT_REGISTER_GROUP = "group";
-	private static final String ATTR_REGISTER_GROUP_MEMENTO = "memento";
-
-	private final IPSession session;
-	protected final Map<BitList, PRegisterSet> fRegisterSetMap = new HashMap<BitList, PRegisterSet>();
-
-	public PRegisterManager(IPSession session) {
-		this.session = session;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#addRegisterGroup(org.eclipse.ptp.core.util.BitList, java.lang.String, org.eclipse.ptp.debug.core.model.IPRegisterDescriptor[])
-	 */
-	public void addRegisterGroup(final BitList qTasks, final String name, final IPRegisterDescriptor[] descriptors) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			/* (non-Javadoc)
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				getRegisterSet(qTasks).addRegisterGroup(name, descriptors);
-			}
-		});
-	}
-
-	/**
-	 * @param monitor
-	 */
-	public void dispose(IProgressMonitor monitor) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			/* (non-Javadoc)
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				synchronized (fRegisterSetMap) {
-					Iterator<PRegisterSet> it = fRegisterSetMap.values().iterator();
-					while (it.hasNext()) {
-						((PRegisterSet) it.next()).dispose();
-					}
-					fRegisterSetMap.clear();
-				}
-			}
-		});
-	}
-
-	/**
-	 * @param qTasks
-	 * @param groupName
-	 * @param name
-	 * @return
-	 */
-	public IPRegisterDescriptor findDescriptor(BitList qTasks, String groupName, String name) {
-		return getRegisterSet(qTasks).findDescriptor(groupName, name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPSession.class))
-			return getSession();
-		if (adapter.equals(PRegisterManager.class))
-			return this;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#getAllRegisterDescriptors(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPRegisterDescriptor[] getAllRegisterDescriptors(BitList qTasks) throws DebugException {
-		return getRegisterSet(qTasks).getAllRegisterDescriptors();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#getCurrentFrame(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPStackFrame getCurrentFrame(BitList qTasks) {
-		return getRegisterSet(qTasks).getCurrentFrame();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#getRegisterGroups(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.model.PStackFrame)
-	 */
-	public IRegisterGroup[] getRegisterGroups(BitList qTasks, PStackFrame frame) throws DebugException {
-		return getRegisterSet(qTasks).getRegisterGroups(frame);
-	}
-
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	public PRegisterSet getRegisterSet(BitList qTasks) {
-		synchronized (fRegisterSetMap) {
-			PRegisterSet set = (PRegisterSet) fRegisterSetMap.get(qTasks);
-			if (set == null) {
-				set = new PRegisterSet(qTasks, null);
-				fRegisterSetMap.put(qTasks, set);
-			}
-			return set;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#initialize(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.internal.core.model.PDebugTarget)
-	 */
-	public void initialize(BitList qTasks, PDebugTarget debugTarget) {
-		synchronized (fRegisterSetMap) {
-			PRegisterSet set = new PRegisterSet(qTasks, debugTarget);
-			fRegisterSetMap.put(qTasks, set);
-			set.initialize();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#modifyRegisterGroup(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup, org.eclipse.ptp.debug.core.model.IPRegisterDescriptor[])
-	 */
-	public void modifyRegisterGroup(final BitList qTasks, final IPPersistableRegisterGroup group,
-			final IPRegisterDescriptor[] descriptors) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				getRegisterSet(qTasks).modifyRegisterGroup(group, descriptors);
-			}
-		});
-	}
-
-	/**
-	 * @param qTasks
-	 */
-	public void removeAllRegisterGroups(final BitList qTasks) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				getRegisterSet(qTasks).removeAllRegisterGroups();
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#removeRegisterGroups(org.eclipse.ptp.core.util.BitList, org.eclipse.debug.core.model.IRegisterGroup[])
-	 */
-	public void removeRegisterGroups(final BitList qTasks, final IRegisterGroup[] groups) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				getRegisterSet(qTasks).removeRegisterGroups(groups);
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#restoreDefaults(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void restoreDefaults(final BitList qTasks) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			/* (non-Javadoc)
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				getRegisterSet(qTasks).restoreDefaults();
-			}
-		});
-	}
-
-	/**
-	 * @param qTasks
-	 */
-	public void save(BitList qTasks) {
-		try {
-			String memto = getRegisterSet(qTasks).getMemento();
-			ILaunchConfiguration config = session.getLaunch().getLaunchConfiguration();
-			ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-			wc.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_REGISTER_GROUPS, memto);
-			wc.doSave();
-		} catch (CoreException e) {
-			PTPDebugCorePlugin.log(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPRegisterManager#targetSuspended(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void targetSuspended(BitList qTasks) {
-		getRegisterSet(qTasks).targetSuspended();
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPSession getSession() {
-		return session;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSession.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSession.java
deleted file mode 100644
index ad632d6..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSession.java
+++ /dev/null

@@ -1,646 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPBreakpointManager;
-import org.eclipse.ptp.debug.core.IPMemoryManager;
-import org.eclipse.ptp.debug.core.IPRegisterManager;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.IPSetManager;
-import org.eclipse.ptp.debug.core.IPSignalManager;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.core.event.IPDebugInfo;
-import org.eclipse.ptp.debug.core.event.PDebugErrorInfo;
-import org.eclipse.ptp.debug.core.event.PDebugEvent;
-import org.eclipse.ptp.debug.core.event.PDebugExitInfo;
-import org.eclipse.ptp.debug.core.event.PDebugInfo;
-import org.eclipse.ptp.debug.core.event.PDebugSuspendInfo;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIBreakpointInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIConnectedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDICreatedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDestroyedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDisconnectedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEndSteppingRangeInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIExitInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIFunctionFinishedInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDILocationReachedInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIMemoryBlockInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIRegisterInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIRestartedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISharedLibraryInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISignalInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIStartedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIThreadInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIVariableInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointScopeInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointTriggerInfo;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDITaskManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocationBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-
-public class PSession implements IPSession, IPDIEventListener {
-	private final IPDISession pdiSession;
-	private final IPLaunch launch;
-	private final IProject project;
-	private final PSignalManager signalMgr;
-	private final PBreakpointManager bptMgr;
-	private final PMemoryManager memMgr;
-	private final PRegisterManager regMgr;
-	private final PSetManager setMgr;
-
-	public PSession(IPDISession pdiSession, IPLaunch launch, IProject project) {
-		this.pdiSession = pdiSession;
-		this.launch = launch;
-		this.project = project;
-		signalMgr = new PSignalManager(this);
-		bptMgr = new PBreakpointManager(this);
-		memMgr = new PMemoryManager(this);
-		regMgr = new PRegisterManager(this);
-		setMgr = new PSetManager(this);
-		getPDISession().getEventManager().addEventListener(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#dispose()
-	 */
-	public void dispose() {
-		dispose(false);
-	}
-	
-	/**
-	 * @param force
-	 */
-	private void dispose(final boolean force) {
-		WorkspaceJob aJob = new WorkspaceJob("Disposing session...") {
-			public IStatus runInWorkspace(IProgressMonitor monitor) {
-				signalMgr.dispose(monitor);
-				bptMgr.dispose(monitor);
-				memMgr.dispose(monitor);
-				regMgr.dispose(monitor);
-				setMgr.dispose(monitor);
-				deleteDebugTargets(true);
-				getPDISession().getEventManager().removeEventListener(PSession.this);
-				getPDISession().shutdown(force);
-				return Status.OK_STATUS;
-			}
-		};
-		aJob.setSystem(true);
-		aJob.schedule();		
-	}
-	
-	/**
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	public void connectToDebugger(IProgressMonitor monitor, String app, String path, String cwd, String[] args) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		boolean failed = false;
-		try {
-			getPDISession().connectToDebugger(monitor, app, path, cwd, args);
-		} catch (PDIException e) {
-			failed = true;
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));			
-		}
-		finally {
-			if (failed || monitor.isCanceled()) {
-				dispose();
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getSetManager()
-	 */
-	public IPSetManager getSetManager() {
-		return setMgr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getSignalManager()
-	 */
-	public IPSignalManager getSignalManager() {
-		return signalMgr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getBreakpointManager()
-	 */
-	public IPBreakpointManager getBreakpointManager() {
-		return bptMgr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getRegisterManager()
-	 */
-	public IPRegisterManager getRegisterManager() {
-		return regMgr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getMemoryManager()
-	 */
-	public IPMemoryManager getMemoryManager() {
-		return memMgr;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	@SuppressWarnings("unchecked")
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPDISession.class))
-			return this;
-		if (adapter.equals(PSignalManager.class))
-			return getSignalManager();
-		return null;
-	}
-	
-	/**
-	 * @param eTasks
-	 * @return
-	 */
-	public IPDebugInfo getDebugInfo(BitList eTasks) {
-		IPDITaskManager taskMgr = getPDISession().getTaskManager();
-		return new PDebugInfo(getJob(), eTasks, taskMgr.getRegisteredTasks(eTasks.copy()), taskMgr.getUnregisteredTasks(eTasks.copy()));
-	}
-	
-	/****************************************
-	 * IPDIEventListener
-	 ****************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener#handleDebugEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for (IPDIEvent event : events) {
-			if (event instanceof IPDIConnectedEvent) {
-				PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(getSession(), IPDebugEvent.CREATE, IPDebugEvent.DEBUGGER, getDebugInfo(event.getTasks())));
-			} else if (event instanceof IPDIStartedEvent) {
-				//only call once
-				bptMgr.setInitialBreakpoints();
-				boolean stopInMain = true;
-				try {
-					stopInMain = getLaunch().getLaunchConfiguration().getAttribute(IPTPLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, false);		
-				}
-				catch (CoreException e) {
-					//do nothing
-				}
-				try {
-					if (stopInMain) {
-						bptMgr.setStopInMain(getPDISession().getTasks());
-					}
-					getPDISession().start(getPDISession().getTasks());
-					getPDISession().setStatus(IPDISession.STARTED);
-					PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(getSession(), IPDebugEvent.CHANGE, IPDebugEvent.PROCESS_SPECIFIC, getDebugInfo(event.getTasks())));
-				} catch (PDIException e) {
-					IPDebugInfo errInfo = new PDebugErrorInfo(getDebugInfo(event.getTasks()), "Starting processes error!", e.getMessage(), PTPDebugCorePlugin.INTERNAL_ERROR);
-					PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, IPDebugEvent.ERROR, IPDebugEvent.UNSPECIFIED, errInfo));		
-				}
-			} else if (event instanceof IPDIDisconnectedEvent) {
-				PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(getSession(), IPDebugEvent.TERMINATE, IPDebugEvent.DEBUGGER, getDebugInfo(event.getTasks())));				
-				dispose();
-			} else if (event instanceof IPDIChangedEvent) {
-				fireChangeEvent((IPDIChangedEvent)event);
-			} else if (event instanceof IPDICreatedEvent) {
-				fireCreateEvent((IPDICreatedEvent)event);
-			} else if (event instanceof IPDIDestroyedEvent) {
-				fireDestroyEvent((IPDIDestroyedEvent)event);
-			} else if (event instanceof IPDIErrorEvent) {
-				fireErrorEvent((IPDIErrorEvent)event);
-			} else if (event instanceof IPDIRestartedEvent) {
-				//TODO
-			} else if (event instanceof IPDIResumedEvent) {
-				fireResumeEvent((IPDIResumedEvent)event);
-			} else if (event instanceof IPDISuspendedEvent) {
-				try {
-					bptMgr.updatePendingBreakpoints();
-				} catch (PDIException e) {
-				}
-				fireSuspendEvent((IPDISuspendedEvent)event);
-			} else {
-				IPDebugEvent debugEvent = new PDebugEvent(this, IPDebugEvent.UNSPECIFIED, IPDebugEvent.UNSPECIFIED, getDebugInfo(event.getTasks()));		
-				PTPDebugCorePlugin.getDefault().fireDebugEvent(debugEvent);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#forceStoppedDebugger(org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State)
-	 */
-	public void forceStoppedDebugger(ProcessAttributes.State state) {
-		BitList tasks = getTasks();
-		changeProcessState(tasks, state);
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(getSession(), IPDebugEvent.TERMINATE, IPDebugEvent.DEBUGGER, getDebugInfo(tasks)));
-		dispose(true);
-	}
-	
-	/**
-	 * @param tasks
-	 * @param state
-	 */
-	private void changeProcessState(BitList tasks, ProcessAttributes.State state) {
-		IPJob job = getJob();
-		List<IPProcessControl> processes = new ArrayList<IPProcessControl>();
-		for (int task : tasks.toArray()) {
-			IPProcess p = job.getProcessByIndex(task);
-			if (p instanceof IPProcessControl) {
-				processes.add((IPProcessControl)p);
-			}
-		}
-		((IPJobControl)job).addProcessAttributes(processes, new IAttribute[] { ProcessAttributes.getStateAttributeDefinition().create(state) });
-	}
-	
-	/**
-	 * @param event
-	 */
-	public void fireSuspendEvent(IPDISuspendedEvent event) {
-		/*
-		try {
-			getPDISession().validateStepReturn(event.getTasks().copy());
-		}
-		catch (PDIException e) {
-			IPDebugInfo errInfo = new PDebugErrorInfo(getDebugInfo(e.getTasks()), "Check step return error!", e.getMessage(), PTPDebugCorePlugin.INTERNAL_ERROR);
-			PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, IPDebugEvent.ERROR, IPDebugEvent.UNSPECIFIED, errInfo));		
-		}
-		*/
-		IPDebugInfo baseInfo = getDebugInfo(event.getTasks());
-		int detail = IPDebugEvent.UNSPECIFIED;
-		
-		int lineNumber = 0;
-		int level = event.getLevel();
-		int depth = event.getDepth();
-		String fileName = "";
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-			IPDIBreakpoint bpt = ((IPDIBreakpointInfo)reason).getBreakpoint();
-			if (bpt instanceof IPDILocationBreakpoint) {
-				IPDILocator locator = ((IPDILocationBreakpoint) bpt).getLocator();
-				if (locator != null) {
-					lineNumber = locator.getLineNumber();
-					fileName += locator.getFile();
-					detail = IPDebugEvent.BREAKPOINT;
-				}
-			}
-		} else if (reason instanceof IPDIEndSteppingRangeInfo) {
-			IPDILocator locator = ((IPDIEndSteppingRangeInfo)reason).getLocator();
-			if (locator != null) {
-				lineNumber = locator.getLineNumber();
-				fileName += locator.getFile();
-				detail = IPDebugEvent.STEP_END;
-			}
-		} else if (reason instanceof IPDILocationReachedInfo) {
-			IPDILocator locator = ((IPDILocationReachedInfo)reason).getLocator();
-			if (locator != null) {
-				lineNumber = locator.getLineNumber();
-				fileName += locator.getFile();
-				detail = IPDebugEvent.CLIENT_REQUEST;
-			}
-		} else if (reason instanceof IPDISignalInfo) {
-			IPDILocator locator = ((IPDISignalInfo)reason).getLocator();
-			if (locator != null) {
-				lineNumber = locator.getLineNumber();
-				fileName += locator.getFile();
-				detail = IPDebugEvent.CLIENT_REQUEST;
-			}
-		} else if (reason instanceof IPDIFunctionFinishedInfo) {
-			//TODO
-		} else if (reason instanceof IPDISharedLibraryInfo) {
-			//TODO
-		} else if (reason instanceof IPDIWatchpointScopeInfo) {
-			//TODO
-		} else if (reason instanceof IPDIWatchpointTriggerInfo) {
-			//TODO
-		}
-		changeProcessState(event.getTasks(), ProcessAttributes.State.SUSPENDED);
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(getSession(), IPDebugEvent.SUSPEND, detail, new PDebugSuspendInfo(baseInfo, fileName, lineNumber, level, depth)));
-	}
-	
-	/**
-	 * @param event
-	 */
-	public void fireResumeEvent(IPDIResumedEvent event) {
-		IPDebugInfo baseInfo = getDebugInfo(event.getTasks());
-		int detail = IPDebugEvent.UNSPECIFIED;
-
-		switch (event.getType()) {
-		case IPDIResumedEvent.STEP_INTO:
-		case IPDIResumedEvent.STEP_INTO_INSTRUCTION:
-			detail = IPDebugEvent.STEP_INTO;
-			break;
-		case IPDIResumedEvent.STEP_OVER:
-		case IPDIResumedEvent.STEP_OVER_INSTRUCTION:
-			detail = IPDebugEvent.STEP_OVER;
-			break;
-		case IPDIResumedEvent.STEP_RETURN:
-			detail = IPDebugEvent.STEP_RETURN;
-			break;
-		}
-
-		changeProcessState(event.getTasks(), ProcessAttributes.State.RUNNING);
-
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, IPDebugEvent.RESUME, detail, baseInfo));
-	}
-	
-	/**
-	 * @param event
-	 */
-	public void fireDestroyEvent(IPDIDestroyedEvent event) {
-		IPDebugEvent debugEvent = null;
-		IPDebugInfo baseInfo = getDebugInfo(event.getTasks());
-		IPDISessionObject reason = event.getReason();
-
-		if (reason instanceof IPDIBreakpointInfo) {
-		} else if (reason instanceof IPDIErrorInfo) {
-			deleteDebugTarget(baseInfo.getAllRegisteredTasks().copy(), true, true);
-			IPDebugInfo errInfo = new PDebugErrorInfo(baseInfo, ((IPDIErrorInfo)reason).getMessage(), ((IPDIErrorInfo)reason).getDetailMessage(), ((IPDIErrorInfo)reason).getCode());
-			debugEvent = new PDebugEvent(this, IPDebugEvent.TERMINATE, IPDebugEvent.ERROR, errInfo);
-			changeProcessState(event.getTasks(), ProcessAttributes.State.ERROR);
-		} else if (reason instanceof IPDIExitInfo) {
-			deleteDebugTarget(baseInfo.getAllRegisteredTasks().copy(), true, true);
-			IPDebugInfo exitInfo = new PDebugExitInfo(baseInfo, ((IPDIExitInfo)reason).getCode(), "Exited", "Exited");
-			debugEvent = new PDebugEvent(this, IPDebugEvent.TERMINATE, IPDebugEvent.PROCESS_SPECIFIC, exitInfo);
-			changeProcessState(event.getTasks(), ProcessAttributes.State.EXITED);
-		} else if (reason instanceof IPDISignalInfo) {
-			deleteDebugTarget(baseInfo.getAllRegisteredTasks().copy(), true, true);
-			IPDebugInfo exitInfo = new PDebugExitInfo(baseInfo, 0, ((IPDISignalInfo)reason).getDescription(), ((IPDISignalInfo)reason).getName());
-			debugEvent = new PDebugEvent(this, IPDebugEvent.TERMINATE, IPDebugEvent.PROCESS_SPECIFIC, exitInfo);
-			changeProcessState(event.getTasks(), ProcessAttributes.State.EXITED_SIGNALLED);
-		} else if (reason instanceof IPDISharedLibraryInfo) {
-			//TODO
-		} else if (reason instanceof IPDIThreadInfo) {
-			//TODO
-		} else if (reason instanceof IPDIVariableInfo) {
-			//TODO
-		} else {
-			debugEvent = new PDebugEvent(this, IPDebugEvent.TERMINATE, IPDebugEvent.UNSPECIFIED, baseInfo);		
-		}
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(debugEvent);
-	}
-	
-	/**
-	 * @param event
-	 */
-	public void fireErrorEvent(IPDIErrorEvent event) {
-		IPDebugInfo baseInfo = getDebugInfo(event.getTasks());
-		int detail = IPDebugEvent.UNSPECIFIED;
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIErrorInfo) {
-			int code = ((IPDIErrorInfo)reason).getCode();
-			switch (code) {
-			case IPDIErrorInfo.DBG_FATAL:
-				detail = IPDebugEvent.ERR_FATAL;
-				//only fatal error reports process error
-				changeProcessState(event.getTasks(), ProcessAttributes.State.ERROR);
-				break;
-			case IPDIErrorInfo.DBG_WARNING:
-				detail = IPDebugEvent.ERR_WARNING;
-				break;
-			case IPDIErrorInfo.DBG_IGNORE:
-			case IPDIErrorInfo.DBG_NORMAL:
-				detail = IPDebugEvent.ERR_NORMAL;
-				break;
-			}
-			IPDebugInfo errInfo = new PDebugErrorInfo(baseInfo, ((IPDIErrorInfo)reason).getMessage(), ((IPDIErrorInfo)reason).getDetailMessage(), ((IPDIErrorInfo)reason).getCode());			
-			PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, IPDebugEvent.ERROR, detail, errInfo));
-		} else {
-			IPDebugInfo errInfo = new PDebugErrorInfo(baseInfo, "Internal Error!", "Unknown", PTPDebugCorePlugin.INTERNAL_ERROR);
-			PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, IPDebugEvent.ERROR, IPDebugEvent.UNSPECIFIED, errInfo));		
-		}
-	}
-	
-	/**
-	 * @param event
-	 */
-	public void fireChangeEvent(IPDIChangedEvent event) {
-		IPDebugInfo baseInfo = getDebugInfo(event.getTasks());
-		int detail = IPDebugEvent.UNSPECIFIED;
-		
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-		} else if (reason instanceof IPDIMemoryBlockInfo) {
-			//TODO
-		} else if (reason instanceof IPDISignalInfo) {
-			//TODO
-		} else if (reason instanceof IPDIVariableInfo) {
-			//TODO
-		}
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, IPDebugEvent.CHANGE, detail, baseInfo));
-	}
-	
-	/**
-	 * @param event
-	 */
-	public void fireCreateEvent(IPDICreatedEvent event) {
-		IPDebugInfo baseInfo = getDebugInfo(event.getTasks());
-		int detail = IPDebugEvent.UNSPECIFIED;
-
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-		} else if (reason instanceof IPDIThreadInfo) {
-		} else if (reason instanceof IPDIMemoryBlockInfo) {
-		} else if (reason instanceof IPDIRegisterInfo) {
-		} else if (reason instanceof IPDISharedLibraryInfo) {
-		} else if (reason instanceof IPDIVariableInfo) {
-		} else {
-		}
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, IPDebugEvent.CREATE, detail, baseInfo));
-	}
-	
-	/**
-	 * @param type
-	 * @param details
-	 * @param info
-	 */
-	public void fireDebugEvent(int type, int details, IPDebugInfo info) {
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, type, details, info));
-	}
-	
-	/**
-	 * @param type
-	 * @param details
-	 * @param tasks
-	 */
-	public void fireDebugEvent(int type, int details, BitList tasks) {
-		PTPDebugCorePlugin.getDefault().fireDebugEvent(new PDebugEvent(this, type, details, getDebugInfo(tasks)));
-	}
-
-	/**
-	 * @return
-	 */
-	public IPSession getSession() {
-		return this;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getPDISession()
-	 */
-	public IPDISession getPDISession() {
-		return pdiSession;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getJob()
-	 */
-	public IPJob getJob() {
-		return getLaunch().getPJob();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getLaunch()
-	 */
-	public IPLaunch getLaunch() {
-		return launch;
-	}
-	
-	/**
-	 * @return
-	 */
-	public IProject getProject() {
-		return project;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#findDebugTarget(org.eclipse.ptp.core.util.BitList)
-	 */
-	public PDebugTarget findDebugTarget(BitList tasks) {
-		return (PDebugTarget)launch.getDebugTarget(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getTasks(int)
-	 */
-	public BitList getTasks(int id) {
-		int max = getPDISession().getTotalTasks();
-		BitList tasks = new BitList(max);
-		if (id >= 0 && id <= max)
-			tasks.set(id);
-		return tasks;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#getTasks()
-	 */
-	public BitList getTasks() {
-		return getPDISession().getTasks();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#isReady()
-	 */
-	public boolean isReady() {
-		return (getPDISession().getStatus() == IPDISession.STARTED);
-	}
-	
-	/****************************************
-	 * register / unregister
-	 ****************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#deleteDebugTargets(boolean)
-	 */
-	public void deleteDebugTargets(boolean register) {
-		if (isReady()) {
-			BitList tasks = getPDISession().getTaskManager().getRegisteredTasks().copy();
-			deleteDebugTarget(tasks, true, register);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#reloadDebugTargets(org.eclipse.ptp.core.util.BitList, boolean, boolean)
-	 */
-	public void reloadDebugTargets(BitList tasks, boolean refresh, boolean register) {
-		if (isReady()) {
-			BitList curRegTasks = getPDISession().getTaskManager().getRegisteredTasks(tasks.copy());
-			BitList othRegTasks = getPDISession().getTaskManager().getRegisteredTasks().copy();
-			othRegTasks.andNot(curRegTasks);
-			deleteDebugTarget(othRegTasks, refresh, register);
-			createDebugTarget(curRegTasks, refresh, register);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#createDebugTarget(org.eclipse.ptp.core.util.BitList, boolean, boolean)
-	 */
-	public void createDebugTarget(BitList tasks, boolean refresh, boolean register) {
-		if (isReady()) {
-			List<IPDITarget> targets = new ArrayList<IPDITarget>();
-			int[] task_array = tasks.toArray();
-			for (int task_id : task_array) {
-				IPDITarget target = getPDISession().getTargetManager().addTarget(getTasks(task_id));
-				if (target != null) {
-					targets.add(target);
-				}
-				else {
-					tasks.clear(task_id);
-				}
-			}
-			if (register)
-				getPDISession().getTaskManager().setRegisterTasks(true, tasks);
-			PTPDebugCorePlugin.getDebugModel().addNewDebugTargets(getLaunch(), tasks, targets.toArray(new IPDITarget[0]), refresh, false);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPSession#deleteDebugTarget(org.eclipse.ptp.core.util.BitList, boolean, boolean)
-	 */
-	public void deleteDebugTarget(BitList tasks, boolean refresh, boolean register) {
-		int[] task_array = tasks.toArray();
-		for (int task_id : task_array) {
-			if (!getPDISession().getTargetManager().removeTarget(getTasks(task_id))) {
-				tasks.clear(task_id);
-			}
-		}
-		if (register)
-			getPDISession().getTaskManager().setRegisterTasks(false, tasks);
-		PTPDebugCorePlugin.getDebugModel().removeDebugTarget(getLaunch(), tasks, refresh);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSessionManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSessionManager.java
deleted file mode 100644
index 08c8c8d..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSessionManager.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.debug.core.IPSession;
-
-/**
- * @author clement
- *
- */
-public class PSessionManager implements IDebugEventSetListener {
-	private Map<IPJob, IPSession> sessionMap;
-	
-	public PSessionManager() {
-		sessionMap = new Hashtable<IPJob, IPSession>();
-		DebugPlugin.getDefault().addDebugEventListener(this);
-	}
-	public IPSession getSession(IPJob job) {
-		synchronized (sessionMap) {
-			return sessionMap.get(job);
-		}
-	}
-	public void addSession(IPJob job, IPSession session) {
-		synchronized (sessionMap) {
-			sessionMap.put(job, session);
-		}
-	}
-	public void removeSession(IPJob job) {
-		synchronized (sessionMap) {
-			sessionMap.remove(job);
-		}
-	}
-	public IPSession[] getSessions() {
-		synchronized (sessionMap) {
-			return sessionMap.values().toArray(new IPSession[0]);
-		}
-	}
-	public void shutdown() {
-		DebugPlugin.getDefault().removeDebugEventListener(this);
-		sessionMap.clear();
-	}
-	public void handleDebugEvents(DebugEvent[] events) {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSetManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSetManager.java
deleted file mode 100644
index 81a68f3..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSetManager.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.PreferenceConstants;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.IPSetManager;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-
-/**
- * @author clement
- * 
- */
-public class PSetManager implements IPSetManager {
-	private final IPSession session;
-	private final Map<String, BitList> setMap = new HashMap<String, BitList>();
-
-	public PSetManager(IPSession session) {
-		this.session = session;
-		createSet(PreferenceConstants.SET_ROOT_ID, session.getTasks());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSetManager#addTasks(java.lang.String, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void addTasks(String sid, BitList tasks) {
-		createSet(sid, tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSetManager#createSet(java.lang.String, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void createSet(String sid, BitList tasks) {
-		BitList oldTasks = getTasks(sid);
-		if (oldTasks == null) {
-			setMap.put(sid, tasks);
-		} else {
-			oldTasks.or(tasks);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSetManager#deleteSets(java.lang.String)
-	 */
-	public void deleteSets(String sid) {
-		setMap.remove(sid);
-	}
-
-	/**
-	 * @param monitor
-	 */
-	public void dispose(IProgressMonitor monitor) {
-		setMap.clear();
-	}
-
-	/**
-	 * @return
-	 */
-	public IPSession getSession() {
-		return session;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSetManager#getTasks(java.lang.String)
-	 */
-	public BitList getTasks(String sid) {
-		return setMap.get(sid);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSetManager#removeTasks(java.lang.String, org.eclipse.ptp.core.util.BitList)
-	 */
-	public void removeTasks(String sid, BitList tasks) {
-		BitList oldTasks = getTasks(sid);
-		if (oldTasks != null) {
-			oldTasks.andNot(tasks);
-		}
-		if (oldTasks.isEmpty()) {
-			deleteSets(sid);
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPDISession getPDISession() {
-		return getSession().getPDISession();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSignalManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSignalManager.java
deleted file mode 100644
index bc8e3b6..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PSignalManager.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.IPSignalManager;
-import org.eclipse.ptp.debug.core.PDebugModel;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-import org.eclipse.ptp.debug.internal.core.model.PSignal;
-
-/**
- * @author Clement chu
- */
-public class PSignalManager implements IAdaptable, IPDIEventListener, IPSignalManager {
-	private class PSignalSet {
-		private IPDebugTarget debugTarget;
-		private final BitList sTasks;
-		private IPSignal[] fSignals = null;
-		private boolean fIsDisposed = false;
-
-		public PSignalSet(BitList sTasks, PDebugTarget debugTarget) {
-			this.sTasks = sTasks;
-			this.debugTarget = debugTarget;
-		}
-
-		/**
-		 * 
-		 */
-		public synchronized void dispose() {
-			if (fSignals != null) {
-				for (int i = 0; i < fSignals.length; ++i) {
-					((PSignal) fSignals[i]).dispose();
-				}
-			}
-			fSignals = null;
-			fIsDisposed = true;
-		}
-
-		/**
-		 * @param pdiSignal
-		 * @return
-		 */
-		public PSignal find(IPDISignal pdiSignal) {
-			try {
-				IPSignal[] signals = getSignals();
-				for (int i = 0; i < signals.length; ++i) {
-					if (signals[i].getName().equals(pdiSignal.getName())) {
-						return (PSignal) signals[i];
-					}
-				}
-			} catch (DebugException e) {
-			}
-			return null;
-		}
-
-		/**
-		 * @return
-		 */
-		public IPDebugTarget getDebugTarget() {
-			if (debugTarget == null) {
-				debugTarget = session.findDebugTarget(sTasks);
-			}
-			return debugTarget;
-		}
-
-		/**
-		 * @return
-		 * @throws DebugException
-		 */
-		public synchronized IPSignal[] getSignals() throws DebugException {
-			if (!fIsDisposed && fSignals == null) {
-				try {
-					IPDISignal[] pdiSignals = session.getPDISession().getSignalManager().getSignals(sTasks);
-					ArrayList<IPSignal> list = new ArrayList<IPSignal>(pdiSignals.length);
-					for (int i = 0; i < pdiSignals.length; ++i) {
-						list.add(new PSignal(session, sTasks, pdiSignals[i]));
-					}
-					fSignals = (IPSignal[]) list.toArray(new IPSignal[list.size()]);
-				} catch (PDIException e) {
-					throwDebugException(e.getMessage(), DebugException.TARGET_REQUEST_FAILED, e);
-				}
-			}
-			return (fSignals != null) ? fSignals : new IPSignal[0];
-		}
-
-		/**
-		 * @param pdiSignal
-		 */
-		public void signalChanged(IPDISignal pdiSignal) {
-			PSignal signal = find(pdiSignal);
-			if (signal != null) {
-				signal.fireChangeEvent(DebugEvent.STATE);
-			}
-		}
-	}
-
-	private final IPSession session;
-	protected final Map<BitList, PSignalSet> fPSignalSetMap = new HashMap<BitList, PSignalSet>();
-
-	public PSignalManager(IPSession session) {
-		this.session = session;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSignalManager#dispose(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void dispose(BitList qTasks) {
-		getSignalSet(qTasks).dispose();
-	}
-
-	/**
-	 * @param monitor
-	 */
-	public void dispose(IProgressMonitor monitor) {
-		DebugPlugin.getDefault().asyncExec(new Runnable() {
-			/* (non-Javadoc)
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run() {
-				synchronized (fPSignalSetMap) {
-					Iterator<PSignalSet> it = fPSignalSetMap.values().iterator();
-					while (it.hasNext()) {
-						((PSignalSet) it.next()).dispose();
-					}
-					fPSignalSetMap.clear();
-				}
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPDISession.class))
-			return getSession();
-		if (adapter.equals(PSignalManager.class))
-			return this;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSignalManager#getSignals(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPSignal[] getSignals(BitList qTasks) throws DebugException {
-		return getSignalSet(qTasks).getSignals();
-	}
-
-	/**
-	 * @param qTasks
-	 * @return
-	 */
-	public PSignalSet getSignalSet(BitList qTasks) {
-		synchronized (fPSignalSetMap) {
-			PSignalSet set = (PSignalSet) fPSignalSetMap.get(qTasks);
-			if (set == null) {
-				set = new PSignalSet(qTasks, null);
-				fPSignalSetMap.put(qTasks, set);
-			}
-			return set;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener#handleDebugEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public void handleDebugEvents(IPDIEvent[] events) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.IPSignalManager#signalChanged(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDISignal)
-	 */
-	public void signalChanged(BitList qTasks, IPDISignal pdiSignal) {
-		getSignalSet(qTasks).signalChanged(pdiSignal);
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPSession getSession() {
-		return session;
-	}
-
-	/**
-	 * @param message
-	 * @param code
-	 * @param exception
-	 * @throws DebugException
-	 */
-	protected void throwDebugException(String message, int code, Throwable exception) throws DebugException {
-		throw new DebugException(new Status(IStatus.ERROR, PDebugModel.getPluginIdentifier(), code, message, exception));
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PreferenceInitializer.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PreferenceInitializer.java
deleted file mode 100644
index b3094cd..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/PreferenceInitializer.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core; 
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.pdi.IPDIFormat;
- 
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-	public PreferenceInitializer() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		Preferences store = PTPDebugCorePlugin.getDefault().getPluginPreferences();
-		store.setDefault(IPDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT, IPDIFormat.NATURAL);
-		store.setDefault(IPDebugConstants.PREF_DEFAULT_EXPRESSION_FORMAT, IPDIFormat.NATURAL);
-		store.setDefault(IPDebugConstants.PREF_SHOW_FULL_PATHS, false);
-		store.setDefault(IPDebugConstants.PREF_PTP_DEBUG_REGISTER_PROC_0, true);
-		store.setDefault(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT, IPDebugConstants.DEFAULT_DEBUG_COMM_TIMEOUT);
-		store.setDefault(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_SUSPEND, true);
-		store.setDefault(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_CHANGE, false);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/AbstractLineBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/AbstractLineBreakpoint.java
deleted file mode 100644
index 7c91f8d..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/AbstractLineBreakpoint.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.breakpoint;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class AbstractLineBreakpoint extends PBreakpoint implements IPLineBreakpoint {
-	public AbstractLineBreakpoint() {
-		super();
-	}
-	public AbstractLineBreakpoint(IResource resource, String markerType, Map<?,?> attributes, boolean add) throws CoreException {
-		super(resource, markerType, attributes, add);
-	}
-	public int getLineNumber() throws CoreException {
-		return ensureMarker().getAttribute(IMarker.LINE_NUMBER, -1);
-	}
-	public int getCharStart() throws CoreException {
-		return ensureMarker().getAttribute(IMarker.CHAR_START, -1);
-	}
-	public int getCharEnd() throws CoreException {
-		return ensureMarker().getAttribute(IMarker.CHAR_END, -1);
-	}
-	public String getAddress() throws CoreException {
-		return ensureMarker().getAttribute(IPLineBreakpoint.ADDRESS, "");
-	}
-	public String getFunction() throws CoreException {
-		return ensureMarker().getAttribute(IPLineBreakpoint.FUNCTION, "");
-	}
-	public void setAddress(String address) throws CoreException {
-		setAttribute(IPLineBreakpoint.ADDRESS, address);
-	}
-	public void setFunction(String function) throws CoreException {
-		setAttribute(IPLineBreakpoint.FUNCTION, function);
-	}
-	public String getFileName() throws CoreException {
-		String fileName = getSourceHandle();
-		IPath path = new Path(fileName);
-		return (path.isValidPath(fileName))?path.lastSegment():null;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.java
deleted file mode 100644
index 58d0629..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.breakpoint;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class BreakpointMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.core.breakpoint.BreakpointMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.properties b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.properties
deleted file mode 100644
index 621c47c..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/BreakpointMessages.properties
+++ /dev/null

@@ -1,49 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-
-PBreakpoint.1=\ [ignore count: {0}]
-PBreakpoint.2=\ if {0}
-
-# The marker message of a line breakpoint. 
-# Format: Line breakpoint: <file name>[line: <line number>] <condition>
-PLineBreakpoint=Line breakpoint:{0}[line: {1}] {2}
-
-PFunctionBreakpoint=Function breakpoint:{0}[function: {1}] {2}
-
-PAddressBreakpoint=Address breakpoint:{0}[address: {1}] {2}
-
-# The marker message of a write watchpoint. 
-# Format: Write watchpoint: <file name> at <expression> <condition>
-PWatchpoint.0=Write watchpoint{0}at{1}{2}
-
-# The marker message of a read watchpoint. 
-# Format: Read watchpoint: <file name> at <expression> <condition>
-PWatchpoint.1=Read watchpoint{0}at{1}{2}
-
-# The marker message of an access watchpoint. 
-# Format: Access watchpoint: <file name> at <expression> <condition>
-PWatchpoint.2=Access watchpoint{0}at{1}{2}
-
-# The marker message of a watchpoint. 
-# Format: Watchpoint: <file name> at <expression> <condition>
-PWatchpoint.3==Watchpoint{0}at{1}{2}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PAddressBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PAddressBreakpoint.java
deleted file mode 100644
index c1ada7d..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PAddressBreakpoint.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.breakpoint;
-
-import java.text.MessageFormat;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.core.model.IPAddressBreakpoint;
-
-/**
- * @author Clement chu
- *
- */
-public class PAddressBreakpoint extends AbstractLineBreakpoint implements IPAddressBreakpoint {
-	private static final String P_ADDRESS_BREAKPOINT = "org.eclipse.ptp.debug.core.pAddressBreakpointMarker";
-
-	public PAddressBreakpoint() {
-	}
-	public PAddressBreakpoint(IResource resource, Map<?,?> attributes, boolean add) throws CoreException {
-		super(resource, getMarkerType(), attributes, add);
-	}
-	public static String getMarkerType() {
-		return P_ADDRESS_BREAKPOINT;
-	}
-	protected String getMarkerMessage() throws CoreException {
-		String fileName = ensureMarker().getResource().getName();
-		if (fileName != null && fileName.length() > 0) {
-			fileName = ' ' + fileName + ' ';
-		}
-		return getJobSetFormat() + " " + MessageFormat.format(BreakpointMessages.getString("PAddressBreakpoint"), new Object[] { fileName, getAddress(), getConditionText() });
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PBreakpoint.java
deleted file mode 100644
index e35493c..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PBreakpoint.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.breakpoint;
-
-import java.text.MessageFormat;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.Breakpoint;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class PBreakpoint extends Breakpoint implements IPBreakpoint {
-	public PBreakpoint() {}
-	
-	public PBreakpoint(final IResource resource, final String markerType, final Map<?,?> attributes, final boolean add) throws CoreException {
-		this();
-		IWorkspaceRunnable wr = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				// create the marker
-				setMarker(resource.createMarker(markerType));
-				// set attributes
-				ensureMarker().setAttributes(attributes);
-				// set the marker message
-				setAttribute(IMarker.MESSAGE, getMarkerMessage());
-				// add to breakpoint manager if requested
-				register(add);
-			}
-		};
-		run(wr);
-	}
-	public void createMarker(final IResource resource, final String markerType, final Map<?,?> attributes, final boolean add) throws DebugException {
-		IWorkspaceRunnable wr = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				// create the marker
-				setMarker(resource.createMarker(markerType));
-				// set attributes
-				ensureMarker().setAttributes(attributes);
-				// set the marker message
-				setAttribute(IMarker.MESSAGE, getMarkerMessage());
-				// add to breakpoint manager if requested
-				register(add);
-			}
-		};
-		run(wr);
-	}
-	public String getModelIdentifier() {
-		return PTPDebugCorePlugin.getUniqueIdentifier();
-	}
-	public boolean isInstalled() throws CoreException {
-		return ensureMarker().getAttribute(INSTALL_COUNT, 0) > 0;
-	}
-	public synchronized void resetInstallCount() throws CoreException {
-		setAttribute(INSTALL_COUNT, 0);
-	}
-	public synchronized int incrementInstallCount() throws CoreException {
-		int count = getInstallCount();
-		setAttribute(INSTALL_COUNT, ++count);
-		return count;
-	}
-	public int getInstallCount() throws CoreException {
-		return ensureMarker().getAttribute(INSTALL_COUNT, 0);
-	}
-	public synchronized int decrementInstallCount() throws CoreException {
-		int count = getInstallCount();
-		if (count > 0) {
-			setAttribute(INSTALL_COUNT, --count);
-		}
-		return count;
-	}
-	public String getCondition() throws CoreException {
-		return ensureMarker().getAttribute(CONDITION, "");
-	}
-	public void setCondition(String condition) throws CoreException {
-		setAttribute(CONDITION, condition);
-		setAttribute(IMarker.MESSAGE, getMarkerMessage());
-	}
-	public int getIgnoreCount() throws CoreException {
-		return ensureMarker().getAttribute(IGNORE_COUNT, 0);
-	}
-	public void setIgnoreCount(int ignoreCount) throws CoreException {
-		setAttribute(IGNORE_COUNT, ignoreCount);
-		setAttribute(IMarker.MESSAGE, getMarkerMessage());
-	}
-	public String getSourceHandle() throws CoreException {
-		return ensureMarker().getAttribute(SOURCE_HANDLE, "");
-	}
-	public void setSourceHandle(String sourceHandle) throws CoreException {
-		setAttribute(SOURCE_HANDLE, sourceHandle);
-	}
-	public String getSetId() throws CoreException {
-		return ensureMarker().getAttribute(SET_ID, "");
-	}
-	public void setSetId(String id) throws CoreException {
-		setAttribute(SET_ID, id);
-	}
-	public boolean isGlobal() throws CoreException {
-		return (getJobId().equals(IPBreakpoint.GLOBAL));
-	}
-	public String getJobId() throws CoreException {
-		return ensureMarker().getAttribute(JOB_ID, "");
-	}
-	public void setJobId(String id) throws CoreException {
-		setAttribute(JOB_ID, id);
-	}
-	public String getJobName() throws CoreException {
-		return ensureMarker().getAttribute(JOB_NAME, "");
-	}
-	public void setJobName(String name) throws CoreException {
-		setAttribute(JOB_NAME, name);
-	}
-	public String getCurSetId() throws CoreException {
-		return ensureMarker().getAttribute(CUR_SET_ID, "");
-	}
-	public void setCurSetId(String id) throws CoreException {
-		setAttribute(CUR_SET_ID, id);
-	}
-	protected void run(IWorkspaceRunnable wr) throws DebugException {
-		try {
-			ResourcesPlugin.getWorkspace().run(wr, null);
-		} catch (CoreException e) {
-			throw new DebugException(e.getStatus());
-		}
-	}
-	public void register(boolean register) throws CoreException {
-		if (register) {
-			DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(this);
-		}
-	}
-	public void updateMarkerMessage() throws CoreException {
-		setAttribute(IMarker.MESSAGE, getMarkerMessage());
-	}
-	public boolean isConditional() throws CoreException {
-		return ((getCondition() != null && getCondition().trim().length() > 0) || getIgnoreCount() > 0);
-	}
-	public void fireChanged() {
-		if (markerExists()) {
-			DebugPlugin.getDefault().getBreakpointManager().fireBreakpointChanged(this);
-		}
-	}
-	protected String getConditionText() throws CoreException {
-		StringBuffer sb = new StringBuffer();
-		int ignoreCount = getIgnoreCount();
-		if (ignoreCount > 0) {
-			sb.append(MessageFormat.format(BreakpointMessages.getString("PBreakpoint.1"), new Object[] { new Integer(ignoreCount) }));
-		}
-		String condition = getCondition();
-		if (condition != null && condition.length() > 0) {
-			sb.append(MessageFormat.format(BreakpointMessages.getString("PBreakpoint.2"), new Object[] { condition }));
-		}
-		return sb.toString();
-	}
-	public String getJobSetFormat() throws CoreException {
-		return "{" + getJobName() + ":" + getSetId() + "}";
-	}
-	protected abstract String getMarkerMessage() throws CoreException;
-	/*
-	public String getThreadId() throws CoreException {
-		return ensureMarker().getAttribute(THREAD_ID, null);
-	}
-	public void setThreadId(String threadId) throws CoreException {
-		setAttribute(THREAD_ID, threadId);
-	}
-	public String getModule() throws CoreException {
-		return ensureMarker().getAttribute(MODULE, null);
-	}
-	public void setModule(String module) throws CoreException {
-		setAttribute(MODULE, module);
-	}
-	public void setTargetFilter(IPDebugTarget target) throws CoreException {
-		fFilteredThreadsByTarget.put(target, null);
-	}
-	public void setThreadFilters(IPThread[] threads) throws CoreException {
-		if (threads != null && threads.length > 0) {
-			fFilteredThreadsByTarget.put((IPDebugTarget)threads[0].getDebugTarget(), new HashSet<IPThread>(Arrays.asList(threads)));
-		}
-	}
-	public IPDebugTarget[] getTargetFilters() throws CoreException {
-		Set<IPDebugTarget> set = fFilteredThreadsByTarget.keySet();
-		return (IPDebugTarget[]) set.toArray(new IPDebugTarget[set.size()]);
-	}
-	public IPThread[] getThreadFilters(IPDebugTarget target) throws CoreException {
-		Set<IPThread> set = fFilteredThreadsByTarget.get(target);
-		return (set != null) ? (IPThread[]) set.toArray(new IPThread[set.size()]) : null;
-	}
-	public void removeTargetFilter(IPDebugTarget target) throws CoreException {
-		if (fFilteredThreadsByTarget.containsKey(target)) {
-			fFilteredThreadsByTarget.remove(target);
-		}
-	}
-	public void removeThreadFilters(IPThread[] threads) throws CoreException {
-		if (threads != null && threads.length > 0) {
-			IDebugTarget target = threads[0].getDebugTarget();
-			if (fFilteredThreadsByTarget.containsKey(target)) {
-				Set<IPThread> set = fFilteredThreadsByTarget.get(target);
-				if (set != null) {
-					set.removeAll(Arrays.asList(threads));
-					if (set.isEmpty()) {
-						fFilteredThreadsByTarget.remove(target);
-					}
-				}
-			}
-		}
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PFunctionBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PFunctionBreakpoint.java
deleted file mode 100644
index 9a5c29e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PFunctionBreakpoint.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.breakpoint;
-
-import java.text.MessageFormat;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.core.model.IPFunctionBreakpoint;
-
-/**
- * @author Clement chu
- *
- */
-public class PFunctionBreakpoint extends AbstractLineBreakpoint implements IPFunctionBreakpoint {
-	private static final String P_FUNCTION_BREAKPOINT = "org.eclipse.ptp.debug.core.pFunctionBreakpointMarker";
-
-	public PFunctionBreakpoint() {
-	}
-	public PFunctionBreakpoint(IResource resource, Map<?,?> attributes, boolean add) throws CoreException {
-		super(resource, getMarkerType(), attributes, add);
-	}
-	public static String getMarkerType() {
-		return P_FUNCTION_BREAKPOINT;
-	}
-	protected String getMarkerMessage() throws CoreException {
-		String fileName = ensureMarker().getResource().getName();
-		if (fileName != null && fileName.length() > 0) {
-			fileName = ' ' + fileName + ' ';
-		}
-		return getJobSetFormat() + " " + MessageFormat.format(BreakpointMessages.getString("PFunctinBreakpoint"), new Object[] { fileName, getFunction(), getConditionText() });
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PLineBreakpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PLineBreakpoint.java
deleted file mode 100644
index 4db0f8e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PLineBreakpoint.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.breakpoint;
-
-import java.text.MessageFormat;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author Clement chu
- *
- */
-public class PLineBreakpoint extends AbstractLineBreakpoint {
-	private static final String P_LINE_BREAKPOINT = "org.eclipse.ptp.debug.core.pLineBreakpointMarker";
-	
-	public PLineBreakpoint() {
-	}	
-	public PLineBreakpoint(IResource resource, Map<?,?> attributes, boolean add) throws CoreException {
-		super(resource, getMarkerType(), attributes, add);
-	}
-	public static String getMarkerType() {
-		return P_LINE_BREAKPOINT;
-	}
-	protected String getMarkerMessage() throws CoreException {
-		String fileName = ensureMarker().getResource().getName();
-		if (fileName != null && fileName.length() > 0) {
-			fileName = ' ' + fileName + ' ';
-		}
-		return getJobSetFormat() + " " + MessageFormat.format(BreakpointMessages.getString("PLineBreakpoint"), new Object[] { fileName, new Integer(getLineNumber()), getConditionText() });
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PWatchpoint.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PWatchpoint.java
deleted file mode 100644
index 8a900b4..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/breakpoint/PWatchpoint.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.breakpoint;
-
-import java.text.MessageFormat;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.core.model.IPWatchpoint;
-
-/**
- * @author clement
- *
- */
-public class PWatchpoint extends PBreakpoint implements IPWatchpoint {
-	private static final String P_WATCHPOINT = "org.eclipse.ptp.debug.core.pWatchpointMarker";
-
-	public PWatchpoint() {
-	}
-	public PWatchpoint(IResource resource, Map<?,?> attributes, boolean add) throws CoreException {
-		super(resource, getMarkerType(), attributes, add);
-	}
-	public boolean isWriteType() throws CoreException {
-		return ensureMarker().getAttribute(WRITE, true);
-	}
-	public boolean isReadType() throws CoreException {
-		return ensureMarker().getAttribute(READ, false);
-	}
-	public String getExpression() throws CoreException {
-		return ensureMarker().getAttribute(EXPRESSION, "");
-	}
-	public static String getMarkerType() {
-		return P_WATCHPOINT;
-	}
-	protected String getMarkerMessage() throws CoreException {
-		String format = BreakpointMessages.getString("PWatchpoint.3");
-		if (isWriteType() && !isReadType())
-			format = BreakpointMessages.getString("PWatchpoint.0");
-		else if (!isWriteType() && isReadType())
-			format = BreakpointMessages.getString("PWatchpoint.1");
-		else if (isWriteType() && isReadType())
-			format = BreakpointMessages.getString("PWatchpoint.2");
-		return getJobSetFormat() + " " + MessageFormat.format(BreakpointMessages.getString("PFunctinBreakpoint"), new Object[] { format });
-	}
-	public int getLineNumber() throws CoreException {
-		return ensureMarker().getAttribute(IMarker.LINE_NUMBER, -1);
-	}
-	public int getCharStart() throws CoreException {
-		return ensureMarker().getAttribute(IMarker.CHAR_START, -1);
-	}
-	public int getCharEnd() throws CoreException {
-		return ensureMarker().getAttribute(IMarker.CHAR_END, -1);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPValue.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPValue.java
deleted file mode 100644
index f82ccfa..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPValue.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueArray;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class AbstractPValue extends PDebugElement implements IPValue {
-	private AbstractPVariable fParent = null;
-
-	public AbstractPValue(AbstractPVariable parent) {
-		super(parent.getSession(), parent.getTasks());
-		fParent = parent;
-	}
-
-	/**
-	 * 
-	 */
-	public abstract void dispose();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPValue#evaluateAsExpression(org.eclipse.ptp.debug.core.model.IPStackFrame)
-	 */
-	public String evaluateAsExpression(IPStackFrame frame) {
-		String valueString = "";
-		AbstractPVariable parent = getParentVariable();
-		if (parent != null) {
-			if (frame != null && frame.canEvaluate()) {
-				try {
-					IAIFValue value = parent.getAIF().getValue();
-					if (value instanceof IAIFValueArray) {
-						//TODO if value is array, show nothing.  Prevent no value for partial aif
-						valueString = "";
-					} else {
-						valueString = value.getValueString();
-						if (valueString == null || valueString.length() == 0)
-							valueString = frame.evaluateExpressionToString(parent.getExpressionString());
-					}
-				} catch (AIFException e) {
-					valueString = e.getMessage();
-				} catch (DebugException e) {
-					valueString = e.getMessage();
-				}
-			}
-		}
-		return valueString;
-	}
-
-	/**
-	 * @return
-	 */
-	public AbstractPVariable getParentVariable() {
-		return fParent;
-	}
-
-	/**
-	 * 
-	 */
-	protected abstract void preserve();
-
-	/**
-	 * 
-	 */
-	protected abstract void reset();
-
-	/**
-	 * @param changed
-	 */
-	protected abstract void setChanged(boolean changed);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPVariable.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPVariable.java
deleted file mode 100644
index 60eb77e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/AbstractPVariable.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.ptp.debug.core.model.IEnableDisableTarget;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPVariable;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class AbstractPVariable extends PDebugElement implements IPVariable {
-	private PDebugElement fParent;
-
-	public AbstractPVariable(PDebugElement parent) {
-		super(parent.getSession(), parent.getTasks());
-		setParent(parent);
-	}
-
-	/**
-	 * 
-	 */
-	public abstract void dispose();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IEnableDisableTarget.class))
-			return this;
-		return super.getAdapter(adapter);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void setParent(PDebugElement parent) {
-		fParent = parent;
-	}
-
-	/**
-	 * @return
-	 */
-	protected PDebugElement getParent() {
-		return fParent;
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPStackFrame getStackFrame() {
-		PDebugElement parent = getParent();
-		if (parent instanceof AbstractPValue) {
-			AbstractPVariable pv = ((AbstractPValue) parent).getParentVariable();
-			if (pv != null)
-				return pv.getStackFrame();
-		}
-		if (parent instanceof PStackFrame)
-			return (PStackFrame) parent;
-		return null;
-	}
-
-	/**
-	 * 
-	 */
-	protected abstract void preserve();
-
-	/**
-	 * 
-	 */
-	protected abstract void resetValue();
-
-	/**
-	 * @param changed
-	 */
-	protected abstract void setChanged(boolean changed);
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.java
deleted file mode 100644
index 2c48437..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.java
+++ /dev/null

@@ -1,46 +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
- *******************************************************************************/
-/**********************************************************************
- * Copyright (c) 2004 QNX Software Systems and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors: 
- * QNX Software Systems - Initial API and implementation
- ***********************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class CoreModelMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.core.model.CoreModelMessages"; //$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private CoreModelMessages() {}
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.properties b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.properties
deleted file mode 100644
index ea9afb3..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/CoreModelMessages.properties
+++ /dev/null

@@ -1,40 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 QNX Software Systems and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     QNX Software Systems - initial API and implementation
-###############################################################################
-PebugTarget.Unable_to_get_globals_1=Unable to get globals. Reason: 
-PArrayPartition.0=Type is not available.
-PArrayPartition.1=Qualified name is not available.
-PDebugTarget.1=Execution is suspended because of error.
-PModificationVariable.0=Unable to set value.
-PModificationVariable.1=Unable to set value.
-PStackFrame.0={0} at {1}: {2}
-PThread.0=Stack is not available: {0}.
-PThread.1=Stack is not available: {0}.
-PValue.0=not available: {0} 
-PVariable.0=not available: {0}
-PVariable.1=not available: {0}
-PVariable.2=Variable does not support value modification.
-PVariable.3=Variable does not support value modification.
-PVariable.4=Qualified name is not available.
-PVariable.5=Type is not available.
-PIndexedValue.0=Index out of bounds.
-PIndexedValue.1=Index out of bounds.
-PIndexedValue.2=Specified range out of bounds.
-PModule.0=Unknown
-PModule.1=Unknown
-PModule.2=Invalid symbols file.
-PModule.4=Not supported
-PModuleManager.0=Error loading symbols.
-PModuleManager.1=Error loading symbols.
-PRegisterGroup.0=Unable to restore register group - invalid memento.
-PRegisterGroup.1=Unable to restore register group - expecting register group element.
-PRegisterGroup.2=Unable to restore register group - missing name attribute.
-PRegisterGroup.3=Unable to restore register - missing attributes.
-PRegisterGroup.4=Register doesn't exist on this target.

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugElement.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugElement.java
deleted file mode 100644
index 7dae95a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugElement.java
+++ /dev/null

@@ -1,404 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PDebugModel;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.model.IPDebugElement;
-import org.eclipse.ptp.debug.core.model.IPDebugElementStatus;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.PDebugElementState;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-
-public abstract class PDebugElement extends PlatformObject implements IPDebugElement, IPDebugElementStatus {
-	/**
-	 * @param message
-	 * @throws DebugException
-	 */
-	public static void notSupported(String message) throws DebugException {
-		throwDebugException(message, DebugException.NOT_SUPPORTED, null);
-	}
-
-	/**
-	 * @param message
-	 * @param e
-	 * @throws DebugException
-	 */
-	public static void requestFailed(String message, Exception e) throws DebugException {
-		requestFailed(message, e, DebugException.REQUEST_FAILED);
-	}
-
-	/**
-	 * @param message
-	 * @param e
-	 * @param code
-	 * @throws DebugException
-	 */
-	public static void requestFailed(String message, Throwable e, int code) throws DebugException {
-		throwDebugException(message, code, e);
-	}
-
-	/**
-	 * @param message
-	 * @param e
-	 * @throws DebugException
-	 */
-	public static void targetRequestFailed(String message, PDIException e) throws DebugException {
-		requestFailed(MessageFormat.format("Target request failed: {0}.", new Object[] { message }), e,
-				DebugException.TARGET_REQUEST_FAILED);
-	}
-
-	/**
-	 * @param message
-	 * @param e
-	 * @throws DebugException
-	 */
-	public static void targetRequestFailed(String message, Throwable e) throws DebugException {
-		throwDebugException(MessageFormat.format("Target request failed: {0}.", new Object[] { message }),
-				DebugException.TARGET_REQUEST_FAILED, e);
-	}
-
-	/**
-	 * @param message
-	 * @param code
-	 * @param exception
-	 * @throws DebugException
-	 */
-	protected static void throwDebugException(String message, int code, Throwable exception) throws DebugException {
-		throw new DebugException(new Status(IStatus.ERROR, PDebugModel.getPluginIdentifier(), code, message, exception));
-	}
-
-	private int fSeverity = IPDebugElementStatus.OK;
-
-	private String fMessage = null;
-	private PDebugElementState fState = PDebugElementState.UNDEFINED;
-	private PDebugElementState fOldState = PDebugElementState.UNDEFINED;
-	private Object fCurrentStateInfo = null;
-	protected final IPSession fSession;
-	protected final BitList tasks;
-
-	public PDebugElement(IPSession session, BitList tasks) {
-		fSession = session;
-		this.tasks = tasks;
-	}
-
-	/**
-	 * @param detail
-	 * @return
-	 */
-	public DebugEvent createChangeEvent(int detail) {
-		return new DebugEvent(this, DebugEvent.CHANGE, detail);
-	}
-
-	/**
-	 * @return
-	 */
-	public DebugEvent createCreateEvent() {
-		return new DebugEvent(this, DebugEvent.CREATE);
-	}
-
-	/**
-	 * @param detail
-	 * @return
-	 */
-	public DebugEvent createResumeEvent(int detail) {
-		return new DebugEvent(this, DebugEvent.RESUME, detail);
-	}
-
-	/**
-	 * @param detail
-	 * @return
-	 */
-	public DebugEvent createSuspendEvent(int detail) {
-		return new DebugEvent(this, DebugEvent.SUSPEND, detail);
-	}
-
-	/**
-	 * @return
-	 */
-	public DebugEvent createTerminateEvent() {
-		return new DebugEvent(this, DebugEvent.TERMINATE);
-	}
-
-	/**
-	 * @param detail
-	 */
-	public void fireChangeEvent(int detail) {
-		fireEvent(new DebugEvent(this, DebugEvent.CHANGE, detail));
-	}
-
-	/**
-	 * 
-	 */
-	public void fireCreationEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.CREATE));
-	}
-
-	/**
-	 * @param detail
-	 */
-	public void fireResumeEvent(int detail) {
-		fireEvent(new DebugEvent(this, DebugEvent.RESUME, detail));
-	}
-
-	/**
-	 * @param detail
-	 */
-	public void fireSuspendEvent(int detail) {
-		fireEvent(new DebugEvent(this, DebugEvent.SUSPEND, detail));
-	}
-
-	/**
-	 * 
-	 */
-	public void fireTerminateEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.TERMINATE));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IDebugElement.class))
-			return this;
-		if (adapter.equals(IPDebugElement.class))
-			return this;
-		if (adapter.equals(IPDebugElementStatus.class))
-			return this;
-		if (adapter.equals(IPSession.class))
-			return fSession;
-		if (adapter.equals(IPDebugTarget.class))
-			return getDebugTarget();
-		if (adapter.equals(IDebugTarget.class))
-			return getDebugTarget();
-		if (adapter.equals(ILaunch.class))
-			return getLaunch();
-
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugElement#getCurrentStateInfo()
-	 */
-	public synchronized Object getCurrentStateInfo() {
-		return fCurrentStateInfo;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
-	 */
-	public IDebugTarget getDebugTarget() {
-		// return fSession.findDebugTarget(getTasks());
-		return fSession.getLaunch().getDebugTarget(getID());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugElement#getID()
-	 */
-	public int getID() {
-		return tasks.nextSetBit(0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
-	 */
-	public ILaunch getLaunch() {
-		return fSession.getLaunch();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugElementStatus#getMessage()
-	 */
-	public String getMessage() {
-		return fMessage;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
-	 */
-	public String getModelIdentifier() {
-		return PDebugModel.getPluginIdentifier();
-	}
-
-	/**
-	 * @return
-	 */
-	public IPDISession getPDISession() {
-		return fSession.getPDISession();
-	}
-
-	/**
-	 * @return
-	 * @throws PDIException
-	 */
-	public IPDITarget getPDITarget() throws PDIException {
-		IPDebugTarget debugTarget = fSession.findDebugTarget(getTasks());
-		if (debugTarget == null) {
-			throw new PDIException(getTasks(), "No PDITarget found");
-		}
-		return debugTarget.getPDITarget();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugElement#getSession()
-	 */
-	public IPSession getSession() {
-		return fSession;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugElementStatus#getSeverity()
-	 */
-	public synchronized int getSeverity() {
-		return fSeverity;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugElement#getState()
-	 */
-	public PDebugElementState getState() {
-		synchronized (fState) {
-			return fState;
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	public BitList getTasks() {
-		return tasks;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugElementStatus#isOK()
-	 */
-	public synchronized boolean isOK() {
-		return (fSeverity == IPDebugElementStatus.OK);
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void fireEvent(DebugEvent event) {
-		DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] { event });
-	}
-
-	/**
-	 * @param events
-	 */
-	protected void fireEventSet(DebugEvent[] events) {
-		DebugPlugin.getDefault().fireDebugEventSet(events);
-	}
-
-	/**
-	 * @param e
-	 */
-	protected void infoMessage(Throwable e) {
-		IStatus newStatus = new Status(IStatus.INFO, PDebugModel.getPluginIdentifier(), IPDebugConstants.STATUS_CODE_INFO, e
-				.getMessage(), null);
-		PDebugUtils.info(newStatus, getDebugTarget());
-	}
-
-	/**
-	 * @param e
-	 */
-	protected void logError(Exception e) {
-		DebugPlugin.log(e);
-	}
-
-	/**
-	 * @param message
-	 */
-	protected void logError(String message) {
-		DebugPlugin.logMessage(message, null);
-	}
-
-	/**
-	 * 
-	 */
-	protected synchronized void resetStatus() {
-		fSeverity = IPDebugElementStatus.OK;
-		fMessage = null;
-	}
-
-	/**
-	 * 
-	 */
-	protected void restoreState() {
-		synchronized (fState) {
-			fState = fOldState;
-		}
-	}
-
-	/**
-	 * @param currentStateInfo
-	 */
-	protected synchronized void setCurrentStateInfo(Object currentStateInfo) {
-		fCurrentStateInfo = currentStateInfo;
-	}
-
-	/**
-	 * @param state
-	 * @throws IllegalArgumentException
-	 */
-	protected void setState(PDebugElementState state) throws IllegalArgumentException {
-		synchronized (fState) {
-			fOldState = fState;
-			fState = state;
-		}
-	}
-
-	/**
-	 * @param severity
-	 * @param message
-	 */
-	protected synchronized void setStatus(int severity, String message) {
-		fSeverity = severity;
-		fMessage = message;
-		if (fMessage != null) {
-			fMessage.trim();
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugTarget.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugTarget.java
deleted file mode 100644
index 23c7d78..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDebugTarget.java
+++ /dev/null

@@ -1,1267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.io.File;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IExpressionListener;
-import org.eclipse.debug.core.IExpressionManager;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchListener;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IExpression;
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
-import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
-import org.eclipse.debug.core.sourcelookup.containers.DirectorySourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IExecFileInfo;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPDebugElement;
-import org.eclipse.ptp.debug.core.model.IPDebugElementStatus;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPGlobalVariable;
-import org.eclipse.ptp.debug.core.model.IPGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup;
-import org.eclipse.ptp.debug.core.model.IPRegisterDescriptor;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.core.model.PDebugElementState;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIBreakpointInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDICreatedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDestroyedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIDisconnectedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEndSteppingRangeInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIFunctionFinishedInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDILocationReachedInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIMemoryBlockInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIRegisterInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISharedLibraryInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISignalInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISuspendedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIThreadInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIVariableInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointScopeInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointTriggerInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITarget;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocator;
-import org.eclipse.ptp.debug.core.sourcelookup.ISourceLookupChangeListener;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PSourceLookupParticipant;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PSourceManager;
-
-/**
- * @author Clement chu
- * 
- */
-public class PDebugTarget extends PDebugElement implements IPDebugTarget, IPDIEventListener, ILaunchListener, IExpressionListener,
-		ISourceLookupChangeListener {
-	private final String PROCESS_NAME = "Process ";
-	private ArrayList<IThread> fThreads;
-	private IPDITarget pdiTarget;
-	private Boolean fIsLittleEndian = null;
-	private Preferences fPreferences = null;
-
-	public PDebugTarget(IPSession session, IPDITarget pdiTarget, boolean allowTerminate, boolean allowDisconnect) {
-		super(session, pdiTarget.getTasks());
-		this.pdiTarget = pdiTarget;
-		initializePreferences();
-		setThreadList(new ArrayList<IThread>(5));
-		if (session.getPDISession().isTerminated(pdiTarget.getTasks())) {
-			setState(PDebugElementState.TERMINATED);
-		} else {
-			if (session.getPDISession().isSuspended(pdiTarget.getTasks())) {
-				setState(PDebugElementState.SUSPENDED);
-			} else {
-				setState(PDebugElementState.UNDEFINED);
-			}
-
-			initialize();
-			DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);
-			DebugPlugin.getDefault().getExpressionManager().addExpressionListener(this);
-			getPDISession().getEventManager().addEventListener(this);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.ITargetProperties#addPropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener)
-	 */
-	public void addPropertyChangeListener(IPropertyChangeListener listener) {
-		if (fPreferences != null)
-			fPreferences.addPropertyChangeListener(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#addRegisterGroup(java.lang.String, org.eclipse.ptp.debug.core.model.IPRegisterDescriptor[])
-	 */
-	public void addRegisterGroup(String name, IPRegisterDescriptor[] descriptors) {
-		fSession.getRegisterManager().addRegisterGroup(getTasks(), name, descriptors);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint)
-	 */
-	public void breakpointAdded(IBreakpoint breakpoint) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDisconnect#canDisconnect()
-	 */
-	public boolean canDisconnect() {
-		// FIXME No disconnect
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRestart#canRestart()
-	 */
-	public boolean canRestart() {
-		return isSuspended();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
-	 */
-	public boolean canResume() {
-		return isSuspended();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal()
-	 */
-	public boolean canResumeWithoutSignal() {
-		// Check if the configuration supports this!!!
-		return (canResume() && getCurrentStateInfo() instanceof IPDISignalInfo);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
-	 */
-	public boolean canSuspend() {
-		if (getState().equals(PDebugElementState.RESUMED)) {
-			// only allow suspend if no threads are currently suspended
-			IThread[] threads = getThreads();
-			for (int i = 0; i < threads.length; i++) {
-				if (threads[i].isSuspended()) {
-					return false;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
-	 */
-	public boolean canTerminate() {
-		return isAvailable();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#createGlobalVariable(org.eclipse.ptp.debug.core.model.IPGlobalVariableDescriptor)
-	 */
-	public IPGlobalVariable createGlobalVariable(IPGlobalVariableDescriptor info) throws DebugException {
-		IPDIVariableDescriptor vo = null;
-		try {
-			vo = (IPDIVariableDescriptor) getPDITarget().getGlobalVariableDescriptors(info.getPath().lastSegment(), null,
-					info.getName());
-		} catch (PDIException e) {
-			throw new DebugException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(),
-					DebugException.TARGET_REQUEST_FAILED, (vo != null) ? vo.getName() + ": " + e.getMessage() : e.getMessage(),
-					null));
-		}
-		return PVariableFactory.createGlobalVariable(this, info, vo);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDisconnect#disconnect()
-	 */
-	public void disconnect() throws DebugException {
-		targetRequestFailed("Not implement PDebugTarget - disconnect() yet", null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#dispose()
-	 */
-	public void dispose() {
-		cleanup();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.ISteppingModeTarget#enableInstructionStepping(boolean)
-	 */
-	public void enableInstructionStepping(boolean enabled) {
-		fPreferences.setValue(PREF_INSTRUCTION_STEPPING_MODE, enabled);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IExpressionListener#expressionAdded(org.eclipse.debug.core.model.IExpression)
-	 */
-	public void expressionAdded(IExpression expression) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IExpressionListener#expressionChanged(org.eclipse.debug.core.model.IExpression)
-	 */
-	public void expressionChanged(IExpression expression) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IExpressionListener#expressionRemoved(org.eclipse.debug.core.model.IExpression)
-	 */
-	public void expressionRemoved(IExpression expression) {
-		if (expression instanceof PExpression && expression.getDebugTarget().equals(this)) {
-			((PExpression) expression).dispose();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPDebugElement.class))
-			return this;
-		if (adapter.equals(IDebugTarget.class))
-			return this;
-		if (adapter.equals(IPDebugTarget.class))
-			return this;
-		if (adapter.equals(IPDITarget.class))
-			return pdiTarget;
-		if (adapter.equals(IExecFileInfo.class))
-			return this;
-		if (adapter.equals(IPDISession.class))
-			return getPDISession();
-		if (adapter.equals(IMemoryBlockRetrievalExtension.class))
-			return fSession.getMemoryManager().getMemoryRetrieval(getTasks());
-		if (adapter.equals(IMemoryBlockRetrieval.class))
-			return fSession.getMemoryManager().getMemoryRetrieval(getTasks());
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#getBreakpointAddress(org.eclipse.ptp.debug.core.model.IPLineBreakpoint)
-	 */
-	public BigInteger getBreakpointAddress(IPLineBreakpoint breakpoint) throws DebugException {
-		return (fSession.getBreakpointManager() != null) ? fSession.getBreakpointManager().getBreakpointAddress(breakpoint)
-				: new BigInteger("0");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getDebugTarget()
-	 */
-	public PDebugTarget getDebugTarget() {
-		return this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IExecFileInfo#getGlobals()
-	 */
-	public IPGlobalVariableDescriptor[] getGlobals() throws DebugException {
-		targetRequestFailed("Not implement PDebugTarget - getGlobal() yet", null);
-		return new IPGlobalVariableDescriptor[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long)
-	 */
-	public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException {
-		return fSession.getMemoryManager().getMemoryBlock(getTasks(), startAddress, length);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugTarget#getName()
-	 */
-	public String getName() throws DebugException {
-		return PROCESS_NAME + getID();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getPDITarget()
-	 */
-	public IPDITarget getPDITarget() {
-		return pdiTarget;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugTarget#getProcess()
-	 */
-	public IProcess getProcess() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#getRegisterDescriptors()
-	 */
-	public IPRegisterDescriptor[] getRegisterDescriptors() throws DebugException {
-		return fSession.getRegisterManager().getAllRegisterDescriptors(getTasks());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#getSignals()
-	 */
-	public IPSignal[] getSignals() throws DebugException {
-		return fSession.getSignalManager().getSignals(getTasks());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugTarget#getThreads()
-	 */
-	public IThread[] getThreads() {
-		List<IThread> threads = getThreadList();
-		return (IThread[]) threads.toArray(new IThread[threads.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener#handleDebugEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for (IPDIEvent event : events) {
-			if (!event.contains(getTasks()))
-				continue;
-
-			if (event instanceof IPDIDestroyedEvent) {
-				handleTerminatedEvent((IPDIDestroyedEvent) event);
-			} else if (event instanceof IPDICreatedEvent) {
-				handleCreatedEvent((IPDICreatedEvent) event);
-			} else if (event instanceof IPDISuspendedEvent) {
-				handleSuspendedEvent((IPDISuspendedEvent) event);
-			} else if (event instanceof IPDIResumedEvent) {
-				handleResumedEvent((IPDIResumedEvent) event);
-			} else if (event instanceof IPDIDisconnectedEvent) {
-				handleDisconnectedEvent((IPDIDisconnectedEvent) event);
-			} else if (event instanceof IPDIChangedEvent) {
-				handleChangedEvent((IPDIChangedEvent) event);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#hasSignals()
-	 */
-	public boolean hasSignals() throws DebugException {
-		return (fSession.getSignalManager().getSignals(getTasks()).length > 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugTarget#hasThreads()
-	 */
-	public boolean hasThreads() throws DebugException {
-		return getThreadList().size() > 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDisconnect#isDisconnected()
-	 */
-	public boolean isDisconnected() {
-		return (getState().equals(PDebugElementState.DISCONNECTED));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.ISteppingModeTarget#isInstructionSteppingEnabled()
-	 */
-	public boolean isInstructionSteppingEnabled() {
-		if (fPreferences == null)
-			return false;
-		return fPreferences.getBoolean(PREF_INSTRUCTION_STEPPING_MODE)
-				|| PTPDebugCorePlugin.getDefault().getPluginPreferences()
-						.getBoolean(IPDebugConstants.PREF_INSTRUCTION_STEP_MODE_ON);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#isLittleEndian()
-	 */
-	public boolean isLittleEndian() {
-		// TODO always true
-		if (fIsLittleEndian == null) {
-			fIsLittleEndian = Boolean.TRUE;
-		}
-		return fIsLittleEndian.booleanValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#isPostMortem()
-	 */
-	public boolean isPostMortem() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
-	 */
-	public boolean isSuspended() {
-		return (getState().equals(PDebugElementState.SUSPENDED));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
-	 */
-	public boolean isTerminated() {
-		return (getState().equals(PDebugElementState.TERMINATED));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch)
-	 */
-	public void launchAdded(ILaunch launch) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch)
-	 */
-	public void launchChanged(ILaunch launch) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch)
-	 */
-	public void launchRemoved(ILaunch launch) {
-		if (!isAvailable()) {
-			return;
-		}
-		if (launch.equals(getLaunch())) {
-			disconnected();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#modifyRegisterGroup(org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup, org.eclipse.ptp.debug.core.model.IPRegisterDescriptor[])
-	 */
-	public void modifyRegisterGroup(IPPersistableRegisterGroup group, IPRegisterDescriptor[] descriptors) {
-		fSession.getRegisterManager().modifyRegisterGroup(getTasks(), group, descriptors);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.ITargetProperties#removePropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener)
-	 */
-	public void removePropertyChangeListener(IPropertyChangeListener listener) {
-		if (fPreferences != null)
-			fPreferences.removePropertyChangeListener(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#removeRegisterGroups(org.eclipse.debug.core.model.IRegisterGroup[])
-	 */
-	public void removeRegisterGroups(IRegisterGroup[] groups) {
-		fSession.getRegisterManager().removeRegisterGroups(getTasks(), groups);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRestart#restart()
-	 */
-	public void restart() throws DebugException {
-		targetRequestFailed("Not implement PDebugTarget - restart() yet", null);
-		if (!canRestart()) {
-			return;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPDebugTarget#restoreDefaultRegisterGroups()
-	 */
-	public void restoreDefaultRegisterGroups() {
-		fSession.getRegisterManager().restoreDefaults(getTasks());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#resume()
-	 */
-	public void resume() throws DebugException {
-		if (!canResume()) {
-			return;
-		}
-		changeState(PDebugElementState.RESUMING);
-		try {
-			getPDISession().resume(getTasks(), false);
-		} catch (PDIException e) {
-			restoreOldState();
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal()
-	 */
-	public void resumeWithoutSignal() throws DebugException {
-		if (!canResume())
-			return;
-		changeState(PDebugElementState.RESUMING);
-		try {
-			getPDISession().resume(getTasks(), false);
-		} catch (PDIException e) {
-			restoreOldState();
-			targetRequestFailed(e.getMessage(), e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.sourcelookup.ISourceLookupChangeListener#sourceContainersChanged(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
-	 */
-	public void sourceContainersChanged(ISourceLookupDirector director) {
-		setSourceLookupPath(director.getSourceContainers());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugTarget#supportsBreakpoint(org.eclipse.debug.core.model.IBreakpoint)
-	 */
-	public boolean supportsBreakpoint(IBreakpoint breakpoint) {
-		return (breakpoint instanceof IPBreakpoint);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.ISteppingModeTarget#supportsInstructionStepping()
-	 */
-	public boolean supportsInstructionStepping() {
-		// TODO Not implement yet
-		// return getConfiguration().supportsInstructionStepping();
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval()
-	 */
-	public boolean supportsStorageRetrieval() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
-	 */
-	public void suspend() throws DebugException {
-		if (!canSuspend()) {
-			return;
-		}
-		changeState(PDebugElementState.SUSPENDING);
-		try {
-			getPDISession().suspend(getTasks());
-		} catch (PDIException e) {
-			restoreOldState();
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#terminate()
-	 */
-	public void terminate() throws DebugException {
-		if (!canTerminate()) {
-			return;
-		}
-		changeState(PDebugElementState.TERMINATING);
-		try {
-			getPDISession().terminate(getTasks());
-		} catch (PDIException e) {
-			restoreOldState();
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		String result = "";
-		try {
-			result = getName();
-		} catch (DebugException e) {
-		}
-		return result;
-	}
-
-	/**
-	 * @param state
-	 */
-	private void changeState(PDebugElementState state) {
-		setState(state);
-		Iterator<IThread> it = getThreadList().iterator();
-		while (it.hasNext()) {
-			((PThread) it.next()).setState(state);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void cleanup() {
-		resetStatus();
-		removeAllThreads();
-		getPDISession().getEventManager().removeEventListener(this);
-		DebugPlugin.getDefault().getExpressionManager().removeExpressionListener(this);
-		DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
-		disposeSignalManager();
-		disposeRegisterManager();
-		saveMemoryBlocks();
-		disposeMemoryManager();
-		disposeSourceManager();
-		disposeSourceLookupPath();
-		removeAllExpressions();
-		disposePreferences();
-	}
-
-	/**
-	 * 
-	 */
-	private void disposePreferences() {
-		fPreferences = null;
-	}
-
-	/**
-	 * @param pdiThread
-	 * @return
-	 */
-	private PThread findThread(IPDIThread pdiThread) {
-		List<IThread> threads = getThreadList();
-		for (int i = 0; i < threads.size(); i++) {
-			PThread t = (PThread) threads.get(i);
-			if (t.getPDIThread().equals(pdiThread))
-				return t;
-		}
-		return null;
-	}
-
-	/**
-	 * @param threads
-	 * @param pdiThread
-	 * @return
-	 */
-	private PThread findThread(List<IThread> threads, IPDIThread pdiThread) {
-		for (int i = 0; i < threads.size(); i++) {
-			PThread t = (PThread) threads.get(i);
-			if (t.getPDIThread().equals(pdiThread))
-				return t;
-		}
-		return null;
-	}
-
-	/**
-	 * @param list
-	 * @param containers
-	 */
-	private void getSourceLookupPath(List<String> list, ISourceContainer[] containers) {
-		for (int i = 0; i < containers.length; ++i) {
-			if (containers[i] instanceof ProjectSourceContainer) {
-				IProject project = ((ProjectSourceContainer) containers[i]).getProject();
-				if (project != null && project.exists())
-					list.add(project.getLocation().toPortableString());
-			}
-			if (containers[i] instanceof FolderSourceContainer) {
-				IContainer container = ((FolderSourceContainer) containers[i]).getContainer();
-				if (container != null && container.exists())
-					list.add(container.getLocation().toPortableString());
-			}
-			if (containers[i] instanceof DirectorySourceContainer) {
-				File dir = ((DirectorySourceContainer) containers[i]).getDirectory();
-				if (dir != null && dir.exists()) {
-					IPath path = new Path(dir.getAbsolutePath());
-					list.add(path.toPortableString());
-				}
-			}
-			if (containers[i].isComposite()) {
-				try {
-					getSourceLookupPath(list, containers[i].getSourceContainers());
-				} catch (CoreException e) {
-					PTPDebugCorePlugin.log(e.getStatus());
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleChangedEvent(IPDIChangedEvent event) {
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDISignalInfo) {
-			fSession.getSignalManager().signalChanged(getTasks(), ((IPDISignalInfo) reason).getSignal());
-		} else if (reason instanceof IPDIBreakpointInfo) {
-		} else if (reason instanceof IPDIMemoryBlockInfo) {
-		} else if (reason instanceof IPDIVariableInfo) {
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleCreatedEvent(IPDICreatedEvent event) {
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-
-		} else if (reason instanceof IPDIThreadInfo) {
-			IPDIThread pdiThread = ((IPDIThreadInfo) reason).getThread();
-			PThread thread = findThread(pdiThread);
-			if (thread == null) {
-				thread = createThread(pdiThread);
-				thread.fireCreationEvent();
-			}
-		} else if (reason instanceof IPDISharedLibraryInfo) {
-			// fSession.getModuleManager().sharedLibraryLoaded(((IPDISharedLibraryInfo)reason).getSharedLibrary());
-		} else if (reason instanceof IPDIMemoryBlockInfo) {
-
-		} else if (reason instanceof IPDIRegisterInfo) {
-
-		} else if (reason instanceof IPDIVariableInfo) {
-
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleDisconnectedEvent(IPDIDisconnectedEvent event) {
-		disconnected();
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleResumedEvent(IPDIResumedEvent event) {
-		setState(PDebugElementState.RESUMED);
-		setCurrentStateInfo(null);
-		resetStatus();
-		ArrayList<DebugEvent> debugEvents = new ArrayList<DebugEvent>(10);
-		int detail = DebugEvent.UNSPECIFIED;
-		switch (event.getType()) {
-		case IPDIResumedEvent.CONTINUE:
-			detail = DebugEvent.CLIENT_REQUEST;
-			break;
-		case IPDIResumedEvent.STEP_INTO:
-		case IPDIResumedEvent.STEP_INTO_INSTRUCTION:
-			detail = DebugEvent.STEP_INTO;
-			break;
-		case IPDIResumedEvent.STEP_OVER:
-		case IPDIResumedEvent.STEP_OVER_INSTRUCTION:
-			detail = DebugEvent.STEP_OVER;
-			break;
-		case IPDIResumedEvent.STEP_RETURN:
-			detail = DebugEvent.STEP_RETURN;
-			break;
-		}
-		debugEvents.add(createResumeEvent(detail));
-		resumeThreads(debugEvents, detail);
-		fireEventSet((DebugEvent[]) debugEvents.toArray(new DebugEvent[debugEvents.size()]));
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleSuspendedEvent(IPDISuspendedEvent event) {
-		setState(PDebugElementState.SUSPENDED);
-		IPDISessionObject reason = event.getReason();
-		setCurrentStateInfo(reason);
-		fSession.getRegisterManager().targetSuspended(getTasks());
-		fSession.getBreakpointManager().skipBreakpoints(false);
-		refreshThreads();
-		suspendThreads(event);
-		if (reason instanceof IPDIEndSteppingRangeInfo) {
-			fireSuspendEvent(DebugEvent.UNSPECIFIED);
-		} else if (reason instanceof IPDIThreadInfo) {
-			IPDIThread pdiThread = ((IPDIThreadInfo) reason).getThread();
-			PThread thread = findThread(pdiThread);
-			if (thread != null) {
-				getThreadList().remove(thread);
-				thread.handleDebugEvents(new IPDIEvent[] { event });
-			}
-		} else if (reason instanceof IPDIBreakpointInfo) {
-			fireSuspendEvent(DebugEvent.BREAKPOINT);
-		} else if (reason instanceof IPDISignalInfo) {
-			fireSuspendEvent(DebugEvent.CLIENT_REQUEST);
-		} else if (reason instanceof IPDIWatchpointTriggerInfo) {
-			fireSuspendEvent(DebugEvent.BREAKPOINT);
-		} else if (reason instanceof IPDIWatchpointScopeInfo) {
-			fSession.getBreakpointManager().watchpointOutOfScope(getTasks(), ((IPDIWatchpointScopeInfo) reason).getWatchpoint());
-			fireSuspendEvent(DebugEvent.BREAKPOINT);
-		} else if (reason instanceof IPDISharedLibraryInfo) {
-			fireSuspendEvent(DebugEvent.UNSPECIFIED);
-		} else if (reason instanceof IPDIFunctionFinishedInfo) {
-
-		} else if (reason instanceof IPDILocationReachedInfo) {
-
-		} else {
-			fireSuspendEvent(DebugEvent.UNSPECIFIED);
-		}
-	}
-
-	/**
-	 * @param event
-	 */
-	private void handleTerminatedEvent(IPDIDestroyedEvent event) {
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIBreakpointInfo) {
-
-		} else if (reason instanceof IPDIThreadInfo) {
-			IPDIThread pdiThread = ((IPDIThreadInfo) reason).getThread();
-			PThread thread = findThread(pdiThread);
-			if (thread != null) {
-				getThreadList().remove(thread);
-				thread.terminated();
-				thread.fireTerminateEvent();
-			}
-		} else if (reason instanceof IPDIErrorInfo) {
-			IPDIErrorInfo info = (IPDIErrorInfo) reason;
-			setStatus(IPDebugElementStatus.ERROR, info.getMessage());
-			MultiStatus status = new MultiStatus(PTPDebugCorePlugin.getUniqueIdentifier(), IPDebugConstants.STATUS_CODE_ERROR,
-					CoreModelMessages.getString("PDebugTarget.1"), null);
-			StringTokenizer st = new StringTokenizer(info.getDetailMessage(), "\n\r");
-			while (st.hasMoreTokens()) {
-				String token = st.nextToken();
-				if (token.length() > 200) {
-					token = token.substring(0, 200);
-				}
-				status.add(new Status(IStatus.ERROR, status.getPlugin(), IPDebugConstants.STATUS_CODE_ERROR, token, null));
-			}
-			PDebugUtils.error(status, this);
-			fireTerminateEvent();
-		} else if (reason instanceof IPDISharedLibraryInfo) {
-			// fSession.getModuleManager().sharedLibraryUnloaded(((IPDISharedLibraryInfo)reason).getSharedLibrary());
-		} else if (reason instanceof IPDISignalInfo) {
-			removeAllThreads();
-			setState(PDebugElementState.EXITED);
-			setCurrentStateInfo(reason);
-			fireChangeEvent(DebugEvent.CONTENT);
-			terminated();
-		} else if (reason instanceof IPDIVariableInfo) {
-
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void initializePreferences() {
-		fPreferences = new Preferences();
-		fPreferences.setDefault(PREF_INSTRUCTION_STEPPING_MODE, false);
-	}
-
-	/**
-	 * @return
-	 */
-	private boolean isAvailable() {
-		return !(isTerminated() || isTerminating() || isDisconnected() || isDisconnecting());
-	}
-
-	/**
-	 * @param containers
-	 */
-	private void setSourceLookupPath(ISourceContainer[] containers) {
-		ArrayList<String> list = new ArrayList<String>(containers.length);
-		getSourceLookupPath(list, containers);
-		try {
-			getPDITarget().setSourcePaths((String[]) list.toArray(new String[list.size()]));
-		} catch (PDIException e) {
-			PTPDebugCorePlugin.log(e);
-		}
-	}
-
-	/**
-	 * @param threads
-	 */
-	private void setThreadList(ArrayList<IThread> threads) {
-		fThreads = threads;
-	}
-
-	/**
-	 * 
-	 */
-	private void terminated() {
-		if (!isTerminated()) {
-			if (!isDisconnected()) {
-				setState(PDebugElementState.TERMINATED);
-			}
-			cleanup();
-			fireTerminateEvent();
-		}
-	}
-
-	/**
-	 * @param pdiThread
-	 * @return
-	 */
-	protected PThread createThread(IPDIThread pdiThread) {
-		PThread thread = new PThread(this, pdiThread);
-		getThreadList().add(thread);
-		return thread;
-	}
-
-	/**
-	 * 
-	 */
-	protected void disconnected() {
-		if (!isDisconnected()) {
-			setState(PDebugElementState.DISCONNECTED);
-			cleanup();
-			fireTerminateEvent();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void disposeMemoryManager() {
-		fSession.getMemoryManager().dispose(getTasks());
-	}
-
-	/**
-	 * 
-	 */
-	protected void disposeRegisterManager() {
-		fSession.getMemoryManager().save(getTasks());
-	}
-
-	/**
-	 * 
-	 */
-	protected void disposeSignalManager() {
-		fSession.getSignalManager().dispose(getTasks());
-	}
-
-	/**
-	 * 
-	 */
-	protected void disposeSourceLookupPath() {
-		ISourceLocator locator = getLaunch().getSourceLocator();
-		if (locator instanceof ISourceLookupDirector) {
-			ISourceLookupParticipant[] participants = ((ISourceLookupDirector) locator).getParticipants();
-			for (int i = 0; i < participants.length; ++i) {
-				if (participants[i] instanceof PSourceLookupParticipant) {
-					((PSourceLookupParticipant) participants[i]).removeSourceLookupChangeListener(this);
-				}
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void disposeSourceManager() {
-		ISourceLocator locator = getLaunch().getSourceLocator();
-		if (locator instanceof IAdaptable) {
-			IResourceChangeListener listener = (IResourceChangeListener) ((IAdaptable) locator)
-					.getAdapter(IResourceChangeListener.class);
-			if (listener != null)
-				PTPDebugCorePlugin.getWorkspace().removeResourceChangeListener(listener);
-		}
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected IThread getCurrentThread() throws DebugException {
-		IThread[] threads = getThreads();
-		for (int i = 0; i < threads.length; ++i) {
-			if (((PThread) threads[i]).isCurrent())
-				return threads[i];
-		}
-		return null;
-	}
-
-	/**
-	 * @return
-	 */
-	protected ArrayList<IThread> getThreadList() {
-		return fThreads;
-	}
-
-	/**
-	 * 
-	 */
-	protected void initialize() {
-		// initializeSourceLookupPath();
-		ArrayList<DebugEvent> debugEvents = new ArrayList<DebugEvent>(1);
-		debugEvents.add(createCreateEvent());
-		initializeThreads(debugEvents);
-		initializeRegisters();
-		initializeSourceManager();
-		initializeMemoryBlocks();
-		fireEventSet((DebugEvent[]) debugEvents.toArray(new DebugEvent[debugEvents.size()]));
-	}
-
-	/**
-	 * 
-	 */
-	protected void initializeMemoryBlocks() {
-		fSession.getMemoryManager().initialize(getTasks(), this);
-	}
-
-	/**
-	 * 
-	 */
-	protected void initializeRegisters() {
-		fSession.getRegisterManager().initialize(getTasks(), this);
-	}
-
-	/**
-	 * 
-	 */
-	protected void initializeSourceLookupPath() {
-		ISourceLocator locator = getLaunch().getSourceLocator();
-		if (locator instanceof ISourceLookupDirector) {
-			ISourceLookupParticipant[] participants = ((ISourceLookupDirector) locator).getParticipants();
-			for (int i = 0; i < participants.length; ++i) {
-				if (participants[i] instanceof PSourceLookupParticipant) {
-					((PSourceLookupParticipant) participants[i]).addSourceLookupChangeListener(this);
-				}
-			}
-			setSourceLookupPath(((ISourceLookupDirector) locator).getSourceContainers());
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void initializeSourceManager() {
-		ISourceLocator locator = getLaunch().getSourceLocator();
-		if (locator instanceof IAdaptable) {
-			IPSourceLocator clocator = (IPSourceLocator) ((IAdaptable) locator).getAdapter(IPSourceLocator.class);
-			if (clocator instanceof IAdaptable) {
-				PSourceManager sm = (PSourceManager) ((IAdaptable) clocator).getAdapter(PSourceManager.class);
-				if (sm != null)
-					sm.setDebugTarget(this);
-			}
-			IResourceChangeListener listener = (IResourceChangeListener) ((IAdaptable) locator)
-					.getAdapter(IResourceChangeListener.class);
-			if (listener != null)
-				ResourcesPlugin.getWorkspace().addResourceChangeListener(listener);
-		}
-	}
-
-	/**
-	 * @param debugEvents
-	 */
-	protected void initializeThreads(List<DebugEvent> debugEvents) {
-		IPDIThread[] pdiThreads = new IPDIThread[0];
-		try {
-			if (isSuspended())
-				pdiThreads = getPDITarget().getThreads();
-		} catch (PDIException e) {
-			// ignore
-		}
-		DebugEvent suspendEvent = null;
-		for (int i = 0; i < pdiThreads.length; ++i) {
-			PThread thread = createThread(pdiThreads[i]);
-			debugEvents.add(thread.createCreateEvent());
-			try {
-				if (pdiThreads[i].equals(getPDITarget().getCurrentThread()) && thread.isSuspended()) {
-					// Use BREAKPOINT as a detail to force perspective switch
-					suspendEvent = thread.createSuspendEvent(DebugEvent.BREAKPOINT);
-				}
-			} catch (PDIException e) {
-				// ignore
-			}
-		}
-		if (suspendEvent != null) {
-			debugEvents.add(suspendEvent);
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isDisconnecting() {
-		return (getState().equals(PDebugElementState.DISCONNECTING));
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isSuspending() {
-		return (getState().equals(PDebugElementState.SUSPENDING));
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isTerminating() {
-		return (getState().equals(PDebugElementState.TERMINATING));
-	}
-
-	/**
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	protected synchronized List<IThread> refreshThreads() {
-		ArrayList<IThread> newThreads = new ArrayList<IThread>(5);
-		ArrayList<IThread> list = new ArrayList<IThread>(5);
-		ArrayList<DebugEvent> debugEvents = new ArrayList<DebugEvent>(5);
-		List<IThread> oldList = (List<IThread>) getThreadList().clone();
-		IPDIThread[] pdiThreads = new IPDIThread[0];
-		IPDIThread currentPDIThread = null;
-		try {
-			pdiThreads = (IPDIThread[]) getPDITarget().getThreads();
-			currentPDIThread = (IPDIThread) getPDITarget().getCurrentThread();
-		} catch (PDIException e) {
-		}
-		for (int i = 0; i < pdiThreads.length; ++i) {
-			PThread thread = findThread(oldList, pdiThreads[i]);
-			if (thread == null) {
-				thread = new PThread(this, pdiThreads[i]);
-				newThreads.add(thread);
-			} else {
-				oldList.remove(thread);
-			}
-			thread.setCurrent(pdiThreads[i].equals(currentPDIThread));
-			list.add(thread);
-		}
-		Iterator<IThread> it = oldList.iterator();
-		while (it.hasNext()) {
-			PThread thread = (PThread) it.next();
-			thread.terminated();
-			debugEvents.add(thread.createTerminateEvent());
-		}
-		setThreadList(list);
-		it = newThreads.iterator();
-		while (it.hasNext()) {
-			debugEvents.add(((PThread) it.next()).createCreateEvent());
-		}
-		if (debugEvents.size() > 0)
-			fireEventSet((DebugEvent[]) debugEvents.toArray(new DebugEvent[debugEvents.size()]));
-		return newThreads;
-	}
-
-	/**
-	 * 
-	 */
-	protected void removeAllExpressions() {
-		IExpressionManager em = DebugPlugin.getDefault().getExpressionManager();
-		IExpression[] expressions = em.getExpressions();
-		for (int i = 0; i < expressions.length; ++i) {
-			if (expressions[i] instanceof PExpression && expressions[i].getDebugTarget().equals(this)) {
-				em.removeExpression(expressions[i]);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void removeAllThreads() {
-		List<IThread> threads = getThreadList();
-		setThreadList(new ArrayList<IThread>(0));
-		ArrayList<DebugEvent> debugEvents = new ArrayList<DebugEvent>(threads.size());
-		Iterator<IThread> it = threads.iterator();
-		while (it.hasNext()) {
-			PThread thread = (PThread) it.next();
-			thread.terminated();
-			debugEvents.add(thread.createTerminateEvent());
-		}
-		fireEventSet((DebugEvent[]) debugEvents.toArray(new DebugEvent[debugEvents.size()]));
-	}
-
-	/**
-	 * 
-	 */
-	protected void restoreOldState() {
-		restoreState();
-		Iterator<IThread> it = getThreadList().iterator();
-		while (it.hasNext()) {
-			((PThread) it.next()).restoreState();
-		}
-	}
-
-	/**
-	 * @param debugEvents
-	 * @param detail
-	 */
-	protected synchronized void resumeThreads(List<DebugEvent> debugEvents, int detail) {
-		IThread[] threads = getThreadList().toArray(new IThread[0]);
-		for (IThread thread : threads) {
-			((PThread) thread).resumedByTarget(detail, debugEvents);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void saveMemoryBlocks() {
-		fSession.getMemoryManager().save(getTasks());
-	}
-
-	/**
-	 * @param event
-	 */
-	protected void suspendThreads(IPDISuspendedEvent event) {
-		Iterator<IThread> it = getThreadList().iterator();
-		while (it.hasNext()) {
-			PThread thread = (PThread) it.next();
-			IPDIThread suspensionThread = null;
-			try {
-				suspensionThread = (IPDIThread) getPDITarget().getCurrentThread();
-			} catch (PDIException e) {
-				// ignore
-			}
-			thread.suspendByTarget(event.getReason(), suspensionThread);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDummyStackFrame.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDummyStackFrame.java
deleted file mode 100644
index 3bf333f..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PDummyStackFrame.java
+++ /dev/null

@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.ptp.debug.core.model.IPDummyStackFrame;
-import org.eclipse.ptp.debug.core.model.IPThread;
-
-/**
- * Implementation of the dummy stack frame.
- */
-public class PDummyStackFrame extends PDebugElement implements IStackFrame, IPDummyStackFrame {
-	private PThread fThread;
-
-	public PDummyStackFrame(PThread thread) {
-		super(thread.getSession(), thread.getTasks());
-		setThread(thread);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
-	 */
-	public boolean canResume() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepInto()
-	 */
-	public boolean canStepInto() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepOver()
-	 */
-	public boolean canStepOver() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepReturn()
-	 */
-	public boolean canStepReturn() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
-	 */
-	public boolean canSuspend() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
-	 */
-	public boolean canTerminate() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPDummyStackFrame.class))
-			return this;
-		if (adapter.equals(IStackFrame.class))
-			return this;
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd()
-	 */
-	public int getCharEnd() throws DebugException {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getCharStart()
-	 */
-	public int getCharStart() throws DebugException {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getDebugTarget()
-	 */
-	public PDebugTarget getDebugTarget() {
-		return fThread.getDebugTarget();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber()
-	 */
-	public int getLineNumber() throws DebugException {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getName()
-	 */
-	public String getName() throws DebugException {
-		return "...";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups()
-	 */
-	public IRegisterGroup[] getRegisterGroups() throws DebugException {
-		return new IRegisterGroup[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getThread()
-	 */
-	public IPThread getThread() {
-		return fThread;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getVariables()
-	 */
-	public IVariable[] getVariables() throws DebugException {
-		return new IVariable[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups()
-	 */
-	public boolean hasRegisterGroups() throws DebugException {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#hasVariables()
-	 */
-	public boolean hasVariables() throws DebugException {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#isStepping()
-	 */
-	public boolean isStepping() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
-	 */
-	public boolean isSuspended() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
-	 */
-	public boolean isTerminated() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#resume()
-	 */
-	public void resume() throws DebugException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepInto()
-	 */
-	public void stepInto() throws DebugException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepOver()
-	 */
-	public void stepOver() throws DebugException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepReturn()
-	 */
-	public void stepReturn() throws DebugException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
-	 */
-	public void suspend() throws DebugException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#terminate()
-	 */
-	public void terminate() throws DebugException {
-	}
-
-	/**
-	 * @param thread
-	 */
-	protected void setThread(PThread thread) {
-		fThread = thread;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PExpression.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PExpression.java
deleted file mode 100644
index d28c3d6..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PExpression.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IExpression;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.model.PVariableFormat;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIVariableInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITargetExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-
-/**
- * @author Clement chu
- * 
- */
-public class PExpression extends PLocalVariable implements IExpression {
-	private String fText;
-	private IPDITargetExpression fPDIExpression;
-	private PStackFrame fStackFrame;
-	private IPValue fValue = PValueFactory.NULL_VALUE;
-
-	/** Constructor
-	 * @param frame
-	 * @param cdiExpression
-	 * @param varObject
-	 */
-	public PExpression(PStackFrame frame, IPDITargetExpression pdiExpression, IPDIVariableDescriptor varObject) {
-		super(frame, varObject);
-		setFormat(PVariableFormat.getFormat(PTPDebugCorePlugin.getDefault().getPluginPreferences().getInt(IPDebugConstants.PREF_DEFAULT_EXPRESSION_FORMAT)));
-		fText = pdiExpression.getExpressionText();
-		fPDIExpression = pdiExpression;
-		fStackFrame = frame;
-	}
-	public String getExpressionText() {
-		return fText;
-	}
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			IPDIEvent event = events[i];
-			if (!event.contains(getTasks()))
-				continue;
-			
-			if (event instanceof IPDIResumedEvent) {
-				setChanged(false);
-				resetValue();
-			}
-			else if (event instanceof IPDIChangedEvent) {
-				IPDISessionObject reason = ((IPDIChangedEvent)event).getReason();
-				if (reason instanceof IPDIVariableInfo) {
-					setChanged(false);
-					resetValue();
-				}
-			}
-		}
-		super.handleDebugEvents(events);
-	}
-	public boolean isEnabled() {
-		return true;
-	}
-	public boolean canEnableDisable() {
-		return true;
-	}
-	protected boolean isBookkeepingEnabled() {
-		return false;
-	}
-	public IPValue getValue() {
-		PStackFrame frame = (PStackFrame) getStackFrame();
-		try {
-			return getValue(frame);
-		} catch (DebugException e) {
-		}
-		return null;
-	}
-	protected synchronized IPValue getValue(PStackFrame frame) throws DebugException {
-		if (fValue.equals(PValueFactory.NULL_VALUE)) {
-			if (frame.isSuspended()) {
-				try {
-					IPDIVariable variable = fPDIExpression.getVariable(frame.getPDIStackFrame());
-					if (variable != null) {
-						IAIF aif = variable.getAIF();
-						if (aif != null && aif.getType() instanceof IAIFTypeArray) {
-							int[] dims = ((IAIFTypeArray)aif.getType()).getDimensionDetails();
-							if (dims.length > 0 && dims[0] > 0)
-								fValue = PValueFactory.createIndexedValue(this, variable, 0, dims[0]);
-						}
-						else {
-							fValue = PValueFactory.createValue(this, variable);
-						}
-					}
-				} catch (PDIException e) {
-					targetRequestFailed(e.getMessage(), null);
-				}
-			}
-		}
-		return fValue;
-	}
-	protected IPStackFrame getStackFrame() {
-		return fStackFrame;
-	}
-	protected void resetValue() {
-		if (fValue instanceof AbstractPValue) {
-			((AbstractPValue) fValue).reset();
-		} 
-		fValue = PValueFactory.NULL_VALUE;
-	}
-	public String getExpressionString() throws DebugException {
-		return getExpressionText();
-	}
-	public void dispose() {
-		if (fPDIExpression != null) {
-			try {
-				fPDIExpression.dispose();
-				fPDIExpression = null;
-			} catch (PDIException e) {
-			}
-		}
-		if (fValue instanceof AbstractPValue) {
-			((AbstractPValue) fValue).dispose();
-			fValue = PValueFactory.NULL_VALUE;
-		}
-		internalDispose(true);
-		setDisposed(true);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PFloatingPointValue.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PFloatingPointValue.java
deleted file mode 100644
index cb38d11..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PFloatingPointValue.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFloat;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueFloat;
-
-/**
- * @author clement CHU
- * 
- */
-public class PFloatingPointValue extends PValue {
-	private Number fFloatingPointValue;
-
-	public PFloatingPointValue(PVariable parent, IPDIVariable variable) {
-		super(parent, variable);
-	}
-	public Number getFloatingPointValue() throws DebugException, AIFException {
-		if (fFloatingPointValue == null) {
-			IAIF aif = getAIF();
-			if (aif != null) {
-				if (aif.getType() instanceof IAIFTypeFloat) {
-					IAIFValueFloat floatValue = (IAIFValueFloat)aif.getValue();
-					if (floatValue.isDouble()) {
-						fFloatingPointValue = new Double(floatValue.doubleValue());
-					}
-					else if (floatValue.isFloat()) {
-						fFloatingPointValue = new Float(floatValue.floatValue());
-					}
-					else {
-						targetRequestFailed("Unknown floating point value", null);
-					}
-				}
-			}
-		}
-		return fFloatingPointValue;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalValue.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalValue.java
deleted file mode 100644
index 43f0fc5..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalValue.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-
-public class PGlobalValue extends PValue {
-	private Boolean fHasChildren = null;
-
-	public PGlobalValue(PVariable parent, IPDIVariable variable) {
-		super(parent, variable);
-	}
-	public boolean hasVariables() throws DebugException {
-		if (fHasChildren == null) {
-			fHasChildren = new Boolean(super.hasVariables());
-		}
-		return fHasChildren.booleanValue();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalVariable.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalVariable.java
deleted file mode 100644
index a01d68a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PGlobalVariable.java
+++ /dev/null

@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.debug.core.model.IPGlobalVariable;
-import org.eclipse.ptp.debug.core.model.IPGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-
-/**
- * @author Clement chu
- * 
- */
-public class PGlobalVariable extends PVariable implements IPGlobalVariable {
-	private class InternalVariable implements IInternalVariable {
-		private PVariable fVariable;
-		private IPDIVariableDescriptor fPDIVariableObject;
-		private IPDIVariable fPDIVariable;
-		private String fQualifiedName;
-		private IPValue fValue = PValueFactory.NULL_VALUE;
-		private boolean fChanged = false;
-
-		InternalVariable(PVariable var, IPDIVariableDescriptor varObject) {
-			setVariable(var);
-			setPDIVariableObject(varObject);
-			setPDIVariable((varObject instanceof IPDIVariable) ? (IPDIVariable) varObject : null);
-		}
-		public IInternalVariable createShadow(int start, int length) throws DebugException {
-			IInternalVariable iv = null;
-			try {
-				iv = new InternalVariable(getVariable(), getPDIVariableObject().getVariableDescriptorAsArray(start, length));
-			}
-			catch (PDIException e) {
-				requestFailed(e.getMessage(), null);
-			}
-			return iv;
-		}
-		public IInternalVariable createShadow(String type) throws DebugException {
-			IInternalVariable iv = null;
-			try {
-				iv = new InternalVariable(getVariable(), getPDIVariableObject().getVariableDescriptorAsType(type));
-			} catch (PDIException e) {
-				requestFailed(e.getMessage(), null);
-			}
-			return iv;
-		}
-		private synchronized IPDIVariable getPDIVariable() throws DebugException {
-			if (fPDIVariable == null) {
-				try {
-					fPDIVariable = getPDITarget().createGlobalVariable((IPDIGlobalVariableDescriptor) getPDIVariableObject());
-				} catch (PDIException e) {
-					requestFailed(e.getMessage(), null);
-				}
-			}
-			return fPDIVariable;
-		}
-		private void setPDIVariable(IPDIVariable variable) {
-			fPDIVariable = variable;
-		}
-		private IPDIVariableDescriptor getPDIVariableObject() {
-			if (fPDIVariable != null) {
-				return fPDIVariable;
-			}
-			return fPDIVariableObject;
-		}
-		private void setPDIVariableObject(IPDIVariableDescriptor variableObject) {
-			fPDIVariableObject = variableObject;
-		}
-		public String getQualifiedName() throws DebugException {
-			if (fQualifiedName == null) {
-				try {
-					fQualifiedName = (fPDIVariableObject != null) ? fPDIVariableObject.getQualifiedName() : null;
-				} catch (PDIException e) {
-					requestFailed(e.getMessage(), null);
-				}
-			}
-			return fQualifiedName;
-		}
-		private synchronized void invalidate(boolean destroy) {
-			try {
-				if (destroy && fPDIVariable != null)
-					fPDIVariable.dispose();
-			} catch (PDIException e) {
-				logError(e.getMessage());
-			}
-			invalidateValue();
-			setPDIVariable(null);
-		}
-		public void dispose(boolean destroy) {
-			invalidate(destroy);
-		}
-		public boolean isSameVariable(IPDIVariable pdiVar) {
-			return (fPDIVariable != null) ? fPDIVariable.equals(pdiVar) : false;
-		}
-		public int sizeof() {
-			if (getPDIVariableObject() != null) {
-				try {
-					return getPDIVariableObject().sizeof();
-				}
-				catch (PDIException e) {
-				}
-			}
-			return 0;
-		}
-		public boolean isArgument() {
-			return (getPDIVariableObject() instanceof IPDIArgumentDescriptor);
-		}
-		public void setValue(String expression) throws DebugException {
-			IPDIVariable pdiVariable = null;
-			try {
-				pdiVariable = getPDIVariable();
-				if (pdiVariable != null)
-					pdiVariable.setValue(expression);
-				else
-					requestFailed(CoreModelMessages.getString("PModificationVariable.0"), null);
-			}
-			catch (PDIException e) {
-				targetRequestFailed(e.getMessage(), null);
-			}
-		}
-		public synchronized IPValue getValue() throws DebugException {
-			if (fValue.equals(PValueFactory.NULL_VALUE)) {
-				IPDIVariable var = getPDIVariable();
-				if (var != null) {
-					try {
-						IAIF aif = var.getAIF();
-						if (aif != null && aif.getType() instanceof IAIFTypeArray) {
-							int[] dims = ((IAIFTypeArray)aif.getType()).getDimensionDetails();
-							if (dims.length > 0 && dims[0] > 0)
-								fValue = PValueFactory.createIndexedValue(getVariable(), var, 0, dims[0]);
-						}
-						else {
-							fValue = PValueFactory.createValue(getVariable(), var);
-						}
-					} catch (PDIException e) {
-						requestFailed(e.getMessage(), e);
-					}
-				}
-			}
-			return fValue;
-		}
-		public void invalidateValue() {
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).dispose();
-				fValue = PValueFactory.NULL_VALUE;
-				if (fPDIVariable != null)
-					fPDIVariable.resetValue();
-			}
-		}
-		public boolean isChanged() {
-			return fChanged;
-		}
-		public synchronized void setChanged(boolean changed) {
-			if (changed) {
-				invalidateValue();
-			}
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).setChanged(changed);
-			}
-			fChanged = changed;
-		}
-		public synchronized void preserve() {
-			setChanged(false);
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).preserve();
-			}
-		}
-		PVariable getVariable() {
-			return fVariable;
-		}
-		private void setVariable(PVariable variable) {
-			fVariable = variable;
-		}
-		public void resetValue() {
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).reset();
-			}
-		}
-		public boolean isEditable() throws DebugException {
-			IPDIVariable var = getPDIVariable();
-			if (var != null) {
-				try {
-					return var.isEditable();
-				}
-				catch (PDIException e) {
-				}
-			}
-			return false;
-		}
-		public boolean equals(Object obj) {
-			if (obj instanceof InternalVariable) {
-				return getPDIVariableObject().equals(((InternalVariable) obj).getPDIVariableObject());
-			}
-			return false;
-		}
-		public boolean isSameDescriptor(IPDIVariableDescriptor desc) {
-			return getPDIVariableObject().equals(desc);
-		}
-	}
-	private IPGlobalVariableDescriptor fDescriptor;
-
-	protected PGlobalVariable(PDebugElement parent, IPGlobalVariableDescriptor descriptor, IPDIVariableDescriptor pdiVariableObject) {
-		super(parent, pdiVariableObject);
-		fDescriptor = descriptor;
-	}
-	protected PGlobalVariable(PDebugElement parent, IPGlobalVariableDescriptor descriptor, IPDIVariableDescriptor pdiVariableObject, String message) {
-		super(parent, pdiVariableObject, message);
-		fDescriptor = descriptor;
-	}
-	public boolean canEnableDisable() {
-		return true;
-	}
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			IPDIEvent event = events[i];
-			if (!event.contains(getTasks()))
-				continue;
-
-			if (event instanceof IPDIResumedEvent) {
-				setChanged(false);
-			}
-		}
-		super.handleDebugEvents(events);
-	}
-	public IPGlobalVariableDescriptor getDescriptor() {
-		return fDescriptor;
-	}
-	public void dispose() {
-		internalDispose(true);
-		setDisposed(true);
-	}
-	protected void createOriginal(IPDIVariableDescriptor vo) {
-		if (vo != null) {
-			setName(vo.getName());
-			setOriginal(new InternalVariable(this, vo));
-		}
-	}
-	public IAIF getAIF() throws DebugException {
-		return getValue().getAIF();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PIndexedValue.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PIndexedValue.java
deleted file mode 100644
index 4985563..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PIndexedValue.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IIndexedValue;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author Clement chu
- * 
- */
-public class PIndexedValue extends AbstractPValue implements IIndexedValue {
-	private IPDIVariable pdiVariable;
-	private IVariable[] fVariables;
-	private int fOffset;
-	private int fSize;
-
-	public PIndexedValue(AbstractPVariable parent, IPDIVariable variable, int offset, int size) {
-		super(parent);
-		fVariables = new IVariable[size];
-		pdiVariable = variable;
-		fOffset = offset;
-		fSize = size;
-	}
-	protected void setChanged(boolean changed) {
-		for (int i = 0; i < fVariables.length; ++i) {
-			if (fVariables[i] != null) {
-				((AbstractPVariable) fVariables[i]).setChanged(changed);
-			}
-		}
-	}
-	public void dispose() {
-		for (int i = 0; i < fVariables.length; ++i) {
-			if (fVariables[i] != null) {
-				((AbstractPVariable) fVariables[i]).dispose();
-			}
-		}
-	}
-	protected void reset() {
-		for (int i = 0; i < fVariables.length; ++i) {
-			if (fVariables[i] != null) {
-				((AbstractPVariable) fVariables[i]).resetValue();
-			}
-		}
-	}
-	protected void preserve() {
-		resetStatus();
-		for (int i = 0; i < fVariables.length; ++i) {
-			if (fVariables[i] != null) {
-				((AbstractPVariable) fVariables[i]).preserve();
-			}
-		}
-	}
-	public IAIF getAIF() throws DebugException {
-		try {
-			return pdiVariable.getAIF();
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), e);
-			return null;
-		}
-	}
-	public String getReferenceTypeName() throws DebugException {
-		return getAIF().getType().toString();
-	}
-	public String getValueString() throws DebugException {
-		return "[" + fOffset + " - " + fSize + "]";
-	}
-	public boolean isAllocated() throws DebugException {
-		return true;
-	}
-	public IVariable[] getVariables() throws DebugException {
-		return getVariables0(getInitialOffset(), getSize());
-	}
-	public boolean hasVariables() throws DebugException {
-		return getSize() > 0;
-	}
-	public IVariable getVariable(int offset) throws DebugException {
-		if (offset >= getSize()) {
-			requestFailed(CoreModelMessages.getString("PIndexedValue.0"), null);
-		}
-		return getVariables0(offset, 1)[0];
-	}
-	public IVariable[] getVariables(int offset, int length) throws DebugException {
-		if (offset >= getSize()) {
-			requestFailed(CoreModelMessages.getString("PIndexedValue.1"), null);
-		}
-		if ((offset + length - 1) >= getSize()) {
-			requestFailed(CoreModelMessages.getString("PIndexedValue.2"), null);
-		}
-		return getVariables0(offset, length);
-	}
-	public int getSize() throws DebugException {
-		return getSize0();
-	}
-	public int getInitialOffset() {
-		return fOffset;
-	}
-	private int getPartitionSize(int index) {
-		int psize = getPreferredPartitionSize();
-		int size = getSize0();
-		int pcount = size / psize + 1;
-		if (pcount - 1 < index)
-			return 0;
-		return (pcount - 1 == index) ? size % psize : psize;
-	}
-	private int getPartitionIndex(int offset) {
-		return offset / getPreferredPartitionSize();
-	}
-	private int getPreferredPartitionSize() {
-		return 100;
-	}
-	private IVariable[] getVariables0(int offset, int length) throws DebugException {
-		IVariable[] result = new IVariable[length];
-		int firstIndex = getPartitionIndex(offset);
-		int lastIndex = getPartitionIndex(offset + Math.max(length - 1, 0));
-		for (int i = firstIndex; i <= lastIndex; ++i) {
-			synchronized (this) {
-				if (!isPartitionLoaded(i)) {
-					loadPartition(i);
-				}
-			}
-		}
-		System.arraycopy(fVariables, offset, result, 0, length);
-		return result;
-	}
-	private boolean isPartitionLoaded(int index) {
-		return fVariables[index * getPreferredPartitionSize()] != null;
-	}
-	private void loadPartition(int index) throws DebugException {
-		int prefSize = getPreferredPartitionSize();
-		int psize = getPartitionSize(index);
-		int findex = index * prefSize;
-		IPDIVariable[] pdiVars = new IPDIVariable[0];
-		try {
-			pdiVars = pdiVariable.getChildren(findex, psize);
-		}
-		catch(PDIException e) {
-			requestFailed(e.getMessage(), null);
-		}
-		for( int i=0; i<pdiVars.length; ++i) {
-			fVariables[i + findex] = PVariableFactory.createLocalVariable(this, pdiVars[i]);
-		}
-	}
-	private int getSize0() {
-		return fSize;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PLocalVariable.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PLocalVariable.java
deleted file mode 100644
index 33694f1..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PLocalVariable.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILocalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-
-/**
- * @author Clement chu
- *
- */
-public class PLocalVariable extends PVariable {
-	private class InternalVariable implements IInternalVariable {
-		private PVariable fVariable;
-		private IPDIVariableDescriptor fPDIVariableObject;
-		private IPDIVariable fPDIVariable;
-		private String fQualifiedName;
-		private IPValue fValue = PValueFactory.NULL_VALUE;
-		private boolean fChanged = false;
-		
-		InternalVariable(PVariable var, IPDIVariableDescriptor varObject) {
-			setVariable(var);
-			setPDIVariableObject(varObject);
-			setPDIVariable((varObject instanceof IPDIVariable) ? (IPDIVariable) varObject : null);
-		}
-		public IInternalVariable createShadow(int start, int length) throws DebugException {
-			IInternalVariable iv = null;
-			try {
-				iv = new InternalVariable(getVariable(), getPDIVariableObject().getVariableDescriptorAsArray(start, length));
-			}
-			catch (PDIException e) {
-				requestFailed(e.getMessage(), null);
-			}
-			return iv;
-		}
-		public IInternalVariable createShadow(String type) throws DebugException {
-			IInternalVariable iv = null;
-			try {
-				iv = new InternalVariable(getVariable(), getPDIVariableObject().getVariableDescriptorAsType(type));
-			}
-			catch (PDIException e) {
-				requestFailed(e.getMessage(), null);
-			}
-			return iv;
-		}
-		private synchronized IPDIVariable getPDIVariable() throws DebugException {
-			if (fPDIVariable == null) {
-				try {
-					fPDIVariable = ((PStackFrame)getStackFrame()).getPDIStackFrame().createLocalVariable((IPDILocalVariableDescriptor)getPDIVariableObject());
-				}
-				catch(PDIException e) {
-					requestFailed(e.getMessage(), null);
-				}
-			}
-			return fPDIVariable;
-		}
-		private void setPDIVariable(IPDIVariable variable) {
-			fPDIVariable = variable;
-		}
-		private IPDIVariableDescriptor getPDIVariableObject() {
-			if (fPDIVariable != null) {
-				return fPDIVariable;
-			}
-			return fPDIVariableObject;
-		}
-		private void setPDIVariableObject(IPDIVariableDescriptor variableObject) {
-			fPDIVariableObject = variableObject;
-		}
-		public String getQualifiedName() throws DebugException {
-			if (fQualifiedName == null) {
-				try {
-					fQualifiedName = (fPDIVariableObject != null) ? fPDIVariableObject.getQualifiedName() : null;
-				} catch (PDIException e) {
-					requestFailed(e.getMessage(), null);
-				}
-			}
-			return fQualifiedName;
-		}
-		private synchronized void invalidate(boolean destroy) {
-			try {
-				if (destroy && fPDIVariable != null)
-					fPDIVariable.dispose();
-			} catch (PDIException e) {
-				logError(e.getMessage());
-			}
-			invalidateValue();			
-			setPDIVariable(null);
-		}
-		public void dispose(boolean destroy) {
-			invalidate(destroy);
-		}
-		public boolean isSameVariable(IPDIVariable pdiVar) {
-			return (fPDIVariable != null) ? fPDIVariable.equals(pdiVar) : false;
-		}
-		public int sizeof() {
-			if (getPDIVariableObject() != null) {
-				try {
-					return getPDIVariableObject().sizeof();
-				}
-				catch (PDIException e) {
-				}
-			}
-			return 0;
-		}
-		public boolean isArgument() {
-			return (getPDIVariableObject() instanceof IPDIArgumentDescriptor);
-		}
-		public void setValue(String expression) throws DebugException {
-			IPDIVariable pdiVariable = null;
-			try {
-				pdiVariable = getPDIVariable();
-				if (pdiVariable != null)
-					pdiVariable.setValue(expression);
-				else
-					requestFailed(CoreModelMessages.getString("PModificationVariable.0"), null);
-			}
-			catch (PDIException e) {
-				targetRequestFailed(e.getMessage(), null);
-			}
-		}
-		public synchronized IPValue getValue() throws DebugException {
-			if (fValue.equals(PValueFactory.NULL_VALUE)) {
-				IPDIVariable var = getPDIVariable();
-				if (var != null) {
-					try {
-						IAIF aif = var.getAIF();
-						if (aif != null && aif.getType() instanceof IAIFTypeArray) {
-							int[] dims = ((IAIFTypeArray)aif.getType()).getDimensionDetails();
-							if (dims.length > 0 && dims[0] > 0)
-								fValue = PValueFactory.createIndexedValue(getVariable(), var, 0, dims[0]);
-						}
-						else {
-							fValue = PValueFactory.createValue(getVariable(), var);
-						}
-					} catch (PDIException e) {
-						requestFailed(e.getMessage(), null);
-					}
-				}
-			}
-			return fValue;
-		}
-		public void invalidateValue() {
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).dispose();
-				fValue = PValueFactory.NULL_VALUE;
-				if (fPDIVariable != null)
-					fPDIVariable.resetValue();
-			}
-		}
-		public boolean isChanged() {
-			return fChanged;
-		}
-		public synchronized void setChanged(boolean changed) {
-			if (changed) {
-				invalidateValue();
-			}
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).setChanged(changed);
-			}
-			fChanged = changed;
-		}
-		public synchronized void preserve() {
-			setChanged(false);
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).preserve();
-			}
-		}
-		PVariable getVariable() {
-			return fVariable;
-		}
-		private void setVariable(PVariable variable) {
-			fVariable = variable;
-		}
-		public void resetValue() {
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue) fValue).reset();
-			}
-		}
-		public boolean isEditable() throws DebugException {
-			IPDIVariable var = getPDIVariable();
-			if (var != null) {
-				try {
-					return var.isEditable();
-				}
-				catch (PDIException e) {
-				}
-			}
-			return false;
-		}
-		public boolean equals(Object obj) {
-			if (obj instanceof InternalVariable) {
-				return getPDIVariableObject().equals(((InternalVariable) obj).getPDIVariableObject());
-			}
-			return false;
-		}
-		public boolean isSameDescriptor(IPDIVariableDescriptor desc) {
-			return getPDIVariableObject().equals(desc);
-		}
-	}
-	public PLocalVariable(PDebugElement parent, IPDIVariableDescriptor pdiVariableObject, String errorMessage) {
-		super(parent, pdiVariableObject, errorMessage);
-	}
-	public PLocalVariable(PDebugElement parent, IPDIVariableDescriptor pdiVariableObject) {
-		super(parent, pdiVariableObject);
-	}
-	protected void createOriginal(IPDIVariableDescriptor vo) {
-		if (vo != null) {
-			setName(vo.getName());
-			setOriginal(new InternalVariable(this, vo));
-		}
-	}
-	public IAIF getAIF() throws DebugException {
-		return getValue().getAIF();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PMemoryBlockExtension.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PMemoryBlockExtension.java
deleted file mode 100644
index 4fd4880..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PMemoryBlockExtension.java
+++ /dev/null

@@ -1,476 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IMemoryBlockExtension;
-import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
-import org.eclipse.debug.core.model.MemoryByte;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemoryBlock;
-import org.eclipse.ptp.debug.internal.core.PMemoryManager;
-
-/**
- * @author Clement chu
- * 
- */
-public class PMemoryBlockExtension extends PDebugElement implements IMemoryBlockExtension {
-	private final String fExpression;
-	private final BigInteger fBaseAddress;
-	private final String fMemorySpaceID;
-	private IPDIMemoryBlock fPDIBlock = null;
-	private MemoryByte[] fBytes = null;
-	private final Set<BigInteger> fChanges = new HashSet<BigInteger>();
-
-	public PMemoryBlockExtension(IPSession session, BitList tasks, BigInteger baseAddress, String memorySpaceID) {
-		super(session, tasks);
-		fBaseAddress = baseAddress;
-		fMemorySpaceID = memorySpaceID;
-		fExpression = PMemoryManager.addressToString(baseAddress, memorySpaceID);
-	}
-
-	public PMemoryBlockExtension(IPSession session, BitList tasks, String expression, BigInteger baseAddress) {
-		this(session, tasks, expression, baseAddress, 1);
-	}
-
-	public PMemoryBlockExtension(IPSession session, BitList tasks, String expression, BigInteger baseAddress, int wordSize) {
-		super(session, tasks);
-		fExpression = expression;
-		fBaseAddress = baseAddress;
-		fMemorySpaceID = null;
-	}
-
-	/**
-	 * @param memoryBlock
-	 * @param addresses
-	 */
-	public void changes(IPDIMemoryBlock memoryBlock, BigInteger[] addresses) {
-		IPDIMemoryBlock block = getPDIBlock();
-		if (block != null && fBytes != null) {
-			if (memoryBlock.equals(block)) {
-				MemoryByte[] memBytes = (MemoryByte[]) fBytes.clone();
-				try {
-					BigInteger start = getRealBlockAddress();
-					long length = block.getLength();
-					byte[] newBytes = block.getBytes();
-					saveChanges(addresses);
-					for (int i = 0; i < addresses.length; ++i) {
-						fChanges.add(addresses[i]);
-						if (addresses[i].compareTo(start) >= 0 && addresses[i].compareTo(start.add(BigInteger.valueOf(length))) < 0) {
-							int index = addresses[i].subtract(start).intValue();
-							if (index >= 0 && index < memBytes.length && index < newBytes.length) {
-								memBytes[index].setChanged(true);
-								memBytes[index].setValue(newBytes[index]);
-							}
-						}
-					}
-					fBytes = memBytes;
-					fireChangeEvent(DebugEvent.CONTENT);
-				} catch (PDIException e) {
-					DebugPlugin.log(e);
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#connect(java.lang.Object)
-	 */
-	public void connect(Object object) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#disconnect(java.lang.Object)
-	 */
-	public void disconnect(Object object) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#dispose()
-	 */
-	public void dispose() {
-		fChanges.clear();
-		IPDIMemoryBlock pdiBlock = getPDIBlock();
-		if (pdiBlock != null) {
-			try {
-				getPDISession().getMemoryManager().removeBlocks(getTasks(), new IPDIMemoryBlock[] { pdiBlock });
-			} catch (PDIException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-			fPDIBlock = null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IMemoryBlockRetrieval.class))
-			return getMemoryBlockRetrieval();
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressableSize()
-	 */
-	public int getAddressableSize() throws DebugException {
-		if (getPDIBlock() == null) {
-			try {
-				setPDIBlock(createPDIBlock(fBaseAddress, 100));
-			} catch (PDIException e) {
-				targetRequestFailed(e.getMessage(), null);
-			}
-		}
-		return getPDIBlock().getWordSize();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressSize()
-	 */
-	public int getAddressSize() {
-		return PDebugUtils.getAddressSize();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigBaseAddress()
-	 */
-	public BigInteger getBigBaseAddress() {
-		return fBaseAddress;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigLength()
-	 */
-	public BigInteger getBigLength() throws DebugException {
-		IPDIMemoryBlock block = getPDIBlock();
-		if (block != null) {
-			BigInteger length = new BigInteger(Long.toHexString(block.getLength()), 16);
-			return length;
-		}
-		return BigInteger.ZERO;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#getBytes()
-	 */
-	public byte[] getBytes() throws DebugException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromAddress(java.math.BigInteger, long)
-	 */
-	public MemoryByte[] getBytesFromAddress(BigInteger address, long length) throws DebugException {
-		IPDIMemoryBlock pdiBlock = getPDIBlock();
-		if (pdiBlock == null
-				|| pdiBlock.getStartAddress().compareTo(address) > 0
-				|| pdiBlock.getStartAddress().add(BigInteger.valueOf(pdiBlock.getLength())).compareTo(
-						address.add(BigInteger.valueOf(length))) < 0) {
-			synchronized (this) {
-				byte[] bytes = null;
-				try {
-					pdiBlock = getPDIBlock();
-					if (pdiBlock == null
-							|| pdiBlock.getStartAddress().compareTo(address) > 0
-							|| pdiBlock.getStartAddress().add(BigInteger.valueOf(pdiBlock.getLength())).compareTo(
-									address.add(BigInteger.valueOf(length))) < 0) {
-						if (pdiBlock != null) {
-							disposePDIBlock();
-							fBytes = null;
-						}
-						setPDIBlock(createPDIBlock(address, length));
-					}
-					bytes = getPDIBlock().getBytes();
-				} catch (PDIException e) {
-					targetRequestFailed(e.getMessage(), null);
-				}
-				fBytes = new MemoryByte[bytes.length];
-				for (int i = 0; i < bytes.length; ++i) {
-					fBytes[i] = createMemoryByte(bytes[i], getPDIBlock().getFlags(i), hasChanged(getRealBlockAddress().add(
-							BigInteger.valueOf(i))));
-				}
-			}
-		}
-		MemoryByte[] result = new MemoryByte[0];
-		if (fBytes != null) {
-			int offset = address.subtract(getRealBlockAddress()).intValue();
-			int offsetInBytes = offset * pdiBlock.getWordSize();
-			long lengthInBytes = length * pdiBlock.getWordSize();
-			if (offset >= 0) {
-				int size = (fBytes.length - offsetInBytes >= lengthInBytes) ? (int) lengthInBytes : fBytes.length - offsetInBytes;
-				if (size > 0) {
-					result = new MemoryByte[size];
-					System.arraycopy(fBytes, offsetInBytes, result, 0, size);
-				}
-			}
-		}
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromOffset(java.math.BigInteger, long)
-	 */
-	public MemoryByte[] getBytesFromOffset(BigInteger unitOffset, long addressableUnits) throws DebugException {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getConnections()
-	 */
-	public Object[] getConnections() {
-		return new Object[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getExpression()
-	 */
-	public String getExpression() {
-		return fExpression;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#getLength()
-	 */
-	public long getLength() {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockEndAddress()
-	 */
-	public BigInteger getMemoryBlockEndAddress() throws DebugException {
-		return null;// return null to mean not bounded ... according to the spec
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockRetrieval()
-	 */
-	public IMemoryBlockRetrieval getMemoryBlockRetrieval() {
-		return (IMemoryBlockRetrieval) getDebugTarget().getAdapter(IMemoryBlockRetrieval.class);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockStartAddress()
-	 */
-	public BigInteger getMemoryBlockStartAddress() throws DebugException {
-		return null; // return null to mean not bounded ... according to the
-						// spec
-	}
-
-	/**
-	 * @return
-	 */
-	public String getMemorySpaceID() {
-		return fMemorySpaceID;
-	}
-
-	/**
-	 * @return
-	 */
-	public IPDIMemoryBlock getPDIBlock() {
-		return fPDIBlock;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#getStartAddress()
-	 */
-	public long getStartAddress() {
-		return 0;
-	}
-
-	/**
-	 * 
-	 */
-	public void resetChanges() {
-		if (fBytes != null) {
-			BigInteger[] changes = (BigInteger[]) fChanges.toArray(new BigInteger[fChanges.size()]);
-			for (int i = 0; i < changes.length; ++i) {
-				BigInteger real = getRealBlockAddress();
-				if (real.compareTo(changes[i]) <= 0 && real.add(BigInteger.valueOf(getBlockSize())).compareTo(changes[i]) > 0) {
-					int index = changes[i].subtract(real).intValue();
-					if (index >= 0 && index < fBytes.length) {
-						fBytes[index].setChanged(false);
-					}
-				}
-			}
-		}
-		fChanges.clear();
-		fireChangeEvent(DebugEvent.CONTENT);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setBaseAddress(java.math.BigInteger)
-	 */
-	public void setBaseAddress(BigInteger address) throws DebugException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setValue(java.math.BigInteger, byte[])
-	 */
-	public void setValue(BigInteger offset, byte[] bytes) throws DebugException {
-		IPDIMemoryBlock block = getPDIBlock();
-		if (block != null) {
-			BigInteger base = getBigBaseAddress();
-			BigInteger real = getRealBlockAddress();
-			long realOffset = base.add(offset).subtract(real).longValue();
-			try {
-				block.setValue(realOffset, bytes);
-			} catch (PDIException e) {
-				targetRequestFailed(e.getMessage(), null);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#setValue(long, byte[])
-	 */
-	public void setValue(long offset, byte[] bytes) throws DebugException {
-		setValue(BigInteger.valueOf(offset), bytes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportBaseAddressModification()
-	 */
-	public boolean supportBaseAddressModification() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportsChangeManagement()
-	 */
-	public boolean supportsChangeManagement() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryBlock#supportsValueModification()
-	 */
-	public boolean supportsValueModification() {
-		return true;
-	}
-
-	/**
-	 * @param value
-	 * @param pdiFlags
-	 * @param changed
-	 * @return
-	 */
-	private MemoryByte createMemoryByte(byte value, byte pdiFlags, boolean changed) {
-		byte flags = 0;
-		if ((pdiFlags & IPDIMemoryBlock.VALID) != 0) {
-			flags |= MemoryByte.HISTORY_KNOWN | MemoryByte.ENDIANESS_KNOWN;
-			if ((pdiFlags & IPDIMemoryBlock.READ_ONLY) != 0) {
-				flags |= MemoryByte.READABLE;
-			} else {
-				flags |= MemoryByte.READABLE | MemoryByte.WRITABLE;
-			}
-			if (isBigEndian()) {
-				flags |= MemoryByte.BIG_ENDIAN;
-			}
-			if (changed)
-				flags |= MemoryByte.CHANGED;
-		}
-		return new MemoryByte(value, flags);
-	}
-
-	/**
-	 * @param address
-	 * @param length
-	 * @return
-	 * @throws PDIException
-	 */
-	private IPDIMemoryBlock createPDIBlock(BigInteger address, long length) throws PDIException {
-		IPDIMemoryBlock block = getPDISession().getMemoryManager().createMemoryBlock(getTasks(), address.toString(), (int) length,
-				1);
-		block.setFrozen(false);
-		return block;
-	}
-
-	/**
-	 * 
-	 */
-	private void disposePDIBlock() {
-		IPDIMemoryBlock block = getPDIBlock();
-		if (block != null) {
-			try {
-				getPDISession().getMemoryManager().removeBlocks(getTasks(), new IPDIMemoryBlock[] { block });
-			} catch (PDIException e) {
-				DebugPlugin.log(e);
-			}
-			setPDIBlock(null);
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private long getBlockSize() {
-		IPDIMemoryBlock block = getPDIBlock();
-		return (block != null) ? block.getLength() : 0;
-	}
-
-	/**
-	 * @return
-	 */
-	private BigInteger getRealBlockAddress() {
-		IPDIMemoryBlock block = getPDIBlock();
-		return (block != null) ? block.getStartAddress() : BigInteger.ZERO;
-	}
-
-	/**
-	 * @param address
-	 * @return
-	 */
-	private boolean hasChanged(BigInteger address) {
-		return fChanges.contains(address);
-	}
-
-	/**
-	 * @return
-	 */
-	private boolean isBigEndian() {
-		// TODO always true
-		return true;
-	}
-
-	/**
-	 * @param addresses
-	 */
-	private void saveChanges(BigInteger[] addresses) {
-		fChanges.addAll(Arrays.asList(addresses));
-	}
-
-	/**
-	 * @param pdiBlock
-	 */
-	private void setPDIBlock(IPDIMemoryBlock pdiBlock) {
-		fPDIBlock = pdiBlock;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegister.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegister.java
deleted file mode 100644
index 8b95b2a..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegister.java
+++ /dev/null

@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPRegister;
-import org.eclipse.ptp.debug.core.model.IPRegisterDescriptor;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.model.PVariableFormat;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIMemoryBlockInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIArgumentDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegister;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-
-/**
- * @author clement
- *
- */
-public class PRegister extends PVariable implements IPRegister {
-	private class InternalVariable implements IInternalVariable {
-		private PVariable fVariable;
-		private IPDIVariableDescriptor fPDIVariableObject;
-		private IPDIRegister fPDIRegister;
-		private String fQualifiedName;
-		private IPValue fValue = PValueFactory.NULL_VALUE;
-		private boolean fChanged = false;
-
-		InternalVariable(PVariable var, IPDIVariableDescriptor varObject) {
-			setVariable(var);
-			setPDIVariableObject(varObject);
-			setPDIRegister((varObject instanceof IPDIRegister) ? (IPDIRegister)varObject : null);
-		}
-
-		public IInternalVariable createShadow(int start, int length) throws DebugException {
-			IInternalVariable iv = null;
-			try {
-				iv = new InternalVariable(getVariable(), getPDIVariableObject().getVariableDescriptorAsArray(start, length));
-			}
-			catch(PDIException e) {
-				requestFailed(e.getMessage(), null);
-			}
-			return iv;
-		}
-
-		public IInternalVariable createShadow(String type) throws DebugException {
-			IInternalVariable iv = null;
-			try {
-				iv = new InternalVariable(getVariable(), getPDIVariableObject().getVariableDescriptorAsType(type));
-			}
-			catch(PDIException e) {
-				requestFailed(e.getMessage(), null);
-			}
-			return iv;
-		}
-		private synchronized IPDIRegister getPDIRegister() throws DebugException {
-			if (fPDIRegister == null) {
-				try {
-					fPDIRegister = getPDITarget().createRegister((IPDIRegisterDescriptor)getPDIVariableObject());
-				}
-				catch(PDIException e) {
-					requestFailed(e.getMessage(), null);
-				}
-			}
-			return fPDIRegister;
-		}
-
-		private void setPDIRegister(IPDIRegister register) {
-			fPDIRegister = register;
-		}
-
-		private IPDIVariableDescriptor getPDIVariableObject() {
-			if (fPDIRegister != null) {
-				return fPDIRegister;
-			}
-			return fPDIVariableObject;
-		}
-
-		private void setPDIVariableObject(IPDIVariableDescriptor variableObject) {
-			fPDIVariableObject = variableObject;
-		}
-
-		public String getQualifiedName() throws DebugException {
-			if (fQualifiedName == null) {
-				try {
-					fQualifiedName = (fPDIVariableObject != null) ? fPDIVariableObject.getQualifiedName() : null;
-				}
-				catch(PDIException e) {
-					requestFailed(e.getMessage(), null);
-				}
-			}
-			return fQualifiedName;
-		}
-		private synchronized void invalidate(boolean destroy) {
-			try {
-				if (destroy && fPDIRegister != null)
-					fPDIRegister.dispose();
-			}
-			catch(PDIException e) {
-				logError(e.getMessage());
-			}
-			invalidateValue();
-			setPDIRegister(null);
-		}
-		public void dispose(boolean destroy) {
-			invalidate(destroy);
-		}
-		public boolean isSameVariable(IPDIVariable pdiVar) {
-			return (fPDIRegister != null) ? fPDIRegister.equals(pdiVar) : false;
-		}
-		public int sizeof() {
-			if (getPDIVariableObject() != null) {
-				try {
-					return getPDIVariableObject().sizeof();
-				}
-				catch(PDIException e) {
-				}
-			}
-			return 0;
-		}
-		public boolean isArgument() {
-			return (getPDIVariableObject() instanceof IPDIArgumentDescriptor);
-		}
-		public void setValue(String expression) throws DebugException {
-			IPDIRegister pdiRegister = null;
-			try {
-				pdiRegister = getPDIRegister();
-				if (pdiRegister != null)
-					pdiRegister.setValue(expression);
-				else
-					requestFailed(CoreModelMessages.getString("CModificationVariable.0"), null);
-			}
-			catch(PDIException e) {
-				targetRequestFailed(e.getMessage(), null);
-			}
-		}
-		public synchronized IPValue getValue() throws DebugException {
-			if (fValue.equals(PValueFactory.NULL_VALUE)) {
-				IPDIRegister reg = getPDIRegister();
-				if (reg != null) {
-					try {
-						IAIF aif = reg.getAIF(getCurrentStackFrame().getPDIStackFrame());
-						if (aif != null && aif.getType() instanceof IAIFTypeArray) {
-							int[] dims = ((IAIFTypeArray)aif.getType()).getDimensionDetails();
-							if (dims.length > 0 && dims[0] > 0)
-								fValue = PValueFactory.createIndexedValue(getVariable(), reg, 0, dims[0]);
-						}
-						else {
-							fValue = PValueFactory.createValue(getVariable(), reg);
-						}
-					}
-					catch(PDIException e) {
-						requestFailed(e.getMessage(), e);
-					}
-				}
-			}
-			return fValue;
-		}
-		public void invalidateValue() {
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue)fValue).dispose();
-				fValue = PValueFactory.NULL_VALUE;
-			}
-		}
-		public boolean isChanged() {
-			return fChanged;
-		}
-		public synchronized void setChanged(boolean changed) {
-			if (changed) {
-				invalidateValue();
-			}
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue)fValue).setChanged(changed);
-			}
-			fChanged = changed;
-		}
-		public synchronized void preserve() {
-			setChanged(false);
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue)fValue).preserve();
-			}
-		}
-		PVariable getVariable() {
-			return fVariable;
-		}
-		private void setVariable(PVariable variable) {
-			fVariable = variable;
-		}
-		public void resetValue() {
-			if (fValue instanceof AbstractPValue) {
-				((AbstractPValue)fValue).reset();
-			}
-		}
-		public boolean isEditable() throws DebugException {
-			IPDIRegister reg = getPDIRegister();
-			if (reg != null) {
-				try {
-					return reg.isEditable();
-				}
-				catch(PDIException e) {
-				}
-			}
-			return false;
-		}
-		public boolean equals(Object obj) {
-			if (obj instanceof InternalVariable) {
-				return getPDIVariableObject().equals(((InternalVariable)obj).getPDIVariableObject());
-			}
-			return false;
-		}
-		public boolean isSameDescriptor(IPDIVariableDescriptor desc) {
-			return getPDIVariableObject().equals(desc);
-		}
-	}
-	protected PRegister(PRegisterGroup parent, IPRegisterDescriptor descriptor) {
-		super(parent, ((PRegisterDescriptor)descriptor).getPDIDescriptor());
-		setFormat(PVariableFormat.getFormat(PTPDebugCorePlugin.getDefault().getPluginPreferences().getInt(IPDebugConstants.PREF_DEFAULT_REGISTER_FORMAT)));
-	}
-	protected PRegister(PRegisterGroup parent, IPRegisterDescriptor descriptor, String message) {
-		super(parent, ((PRegisterDescriptor)descriptor).getPDIDescriptor(), message);
-		setFormat(PVariableFormat.getFormat(PTPDebugCorePlugin.getDefault().getPluginPreferences().getInt(IPDebugConstants.PREF_DEFAULT_REGISTER_FORMAT)));
-	}
-	public IRegisterGroup getRegisterGroup() throws DebugException {
-		return (IRegisterGroup)getParent();
-	}
-	protected boolean isBookkeepingEnabled() {
-		boolean result = false;
-		return result;
-	}
-	public boolean canEnableDisable() {
-		return true;
-	}
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for(int i = 0; i < events.length; i++) {
-			IPDIEvent event = events[i];
-			if (!event.contains(getTasks()))
-				continue;
-
-			if (event instanceof IPDIChangedEvent) {
-				IPDISessionObject reason = ((IPDIChangedEvent)event).getReason();
-				if (reason instanceof IPDIMemoryBlockInfo) {
-					resetValue();
-					return;	// avoid similar but logic inappropriate for us in PVariable
-				}
-			}
-			else if (event instanceof IPDIResumedEvent) {
-				setChanged(false);
-			}
-		}
-		super.handleDebugEvents(events);
-	}
-	public void dispose() {
-		internalDispose(true);
-		setDisposed(true);
-	}
-	protected IPStackFrame getStackFrame() {
-		IPStackFrame frame = super.getStackFrame();
-		if (frame == null)
-			frame = getCurrentStackFrame();
-		return frame;
-	}
-	protected IPStackFrame getCurrentStackFrame() {
-		return fSession.getRegisterManager().getCurrentFrame(getTasks());
-	}
-	protected void createOriginal(IPDIVariableDescriptor vo) {
-		if (vo != null) {
-			setName(vo.getName());
-			setOriginal(new InternalVariable(this, vo));
-		}
-	}
-	public IAIF getAIF() throws DebugException {
-		return getValue().getAIF();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterDescriptor.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterDescriptor.java
deleted file mode 100644
index edfc65e..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterDescriptor.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.ptp.debug.core.model.IPRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIRegisterGroup;
-
-/**
- * @author clement
- *
- */
-public class PRegisterDescriptor implements IPRegisterDescriptor {
-	private String fName;
-	private String fGroupName;
-	private IPDIRegisterDescriptor fPDIDescriptor = null;
-
-	public PRegisterDescriptor(String name, String groupName) {
-		fName = name;
-		fGroupName = groupName;
-	}
-	public PRegisterDescriptor(IPDIRegisterGroup group, IPDIRegisterDescriptor desc) {
-		fName = desc.getName();
-		fGroupName = group.getName();
-		fPDIDescriptor = desc;
-	}
-	public String getName() {
-		return fName;
-	}
-	public String getGroupName() {
-		return fGroupName;
-	}
-	public IPDIRegisterDescriptor getPDIDescriptor() {
-		return fPDIDescriptor;
-	}
-	public void setPDIDescriptor(IPDIRegisterDescriptor descriptor) {
-		fPDIDescriptor = descriptor;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterGroup.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterGroup.java
deleted file mode 100644
index 91bc494..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PRegisterGroup.java
+++ /dev/null

@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IRegister;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IEnableDisableTarget;
-import org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup;
-import org.eclipse.ptp.debug.core.model.IPRegisterDescriptor;
-import org.eclipse.ptp.debug.internal.core.PRegisterManager;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author clement
- * 
- */
-public class PRegisterGroup extends PDebugElement implements IPPersistableRegisterGroup, IEnableDisableTarget {
-	private static final String ELEMENT_REGISTER_GROUP = "registerGroup";
-	private static final String ATTR_REGISTER_GROUP_NAME = "name";
-	private static final String ATTR_REGISTER_GROUP_ENABLED = "enabled";
-	private static final String ELEMENT_REGISTER = "register";
-	private static final String ATTR_REGISTER_NAME = "name";
-	private static final String ATTR_REGISTER_ORIGINAL_GROUP_NAME = "originalGroupName";
-
-	private String fName;
-	private IPRegisterDescriptor[] fRegisterDescriptors;
-	private IRegister[] fRegisters;
-	private boolean fIsEnabled = true;
-	private boolean fDisposed = false;
-
-	public PRegisterGroup(IPSession session, BitList tasks) {
-		this(session, tasks, null, null);
-	}
-
-	public PRegisterGroup(IPSession session, BitList tasks, String name, IPRegisterDescriptor[] descriptors) {
-		super(session, tasks);
-		fName = name;
-		fRegisterDescriptors = descriptors;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IEnableDisableTarget#canEnableDisable()
-	 */
-	public boolean canEnableDisable() {
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public void dispose() {
-		fDisposed = true;
-		invalidate();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IEnableDisableTarget.class))
-			return this;
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup#getMemento()
-	 */
-	public String getMemento() throws CoreException {
-		Document document = DebugPlugin.newDocument();
-		Element element = document.createElement(ELEMENT_REGISTER_GROUP);
-		element.setAttribute(ATTR_REGISTER_GROUP_NAME, getName());
-		element.setAttribute(ATTR_REGISTER_GROUP_ENABLED, Boolean.valueOf(isEnabled()).toString());
-		for (int i = 0; i < fRegisterDescriptors.length; ++i) {
-			Element child = document.createElement(ELEMENT_REGISTER);
-			child.setAttribute(ATTR_REGISTER_NAME, fRegisterDescriptors[i].getName());
-			child.setAttribute(ATTR_REGISTER_ORIGINAL_GROUP_NAME, fRegisterDescriptors[i].getGroupName());
-			element.appendChild(child);
-		}
-		document.appendChild(element);
-		return DebugPlugin.serializeDocument(document);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IRegisterGroup#getName()
-	 */
-	public String getName() throws DebugException {
-		return fName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup#getRegisterDescriptors()
-	 */
-	public IPRegisterDescriptor[] getRegisterDescriptors() {
-		return fRegisterDescriptors;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IRegisterGroup#getRegisters()
-	 */
-	public IRegister[] getRegisters() throws DebugException {
-		if (fDisposed)
-			return new IRegister[0];
-		if (fRegisters == null) {
-			synchronized (this) {
-				if (fRegisters == null) {
-					fRegisters = new IRegister[fRegisterDescriptors.length];
-					for (int i = 0; i < fRegisters.length; ++i) {
-						fRegisters[i] = new PRegister(this, fRegisterDescriptors[i]);
-					}
-				}
-			}
-		}
-		return fRegisters;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IRegisterGroup#hasRegisters()
-	 */
-	public boolean hasRegisters() throws DebugException {
-		return (fRegisterDescriptors.length > 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup#initializeFromMemento(java.lang.String)
-	 */
-	public void initializeFromMemento(String memento) throws CoreException {
-		Node node = DebugPlugin.parseDocument(memento);
-		if (node.getNodeType() != Node.ELEMENT_NODE) {
-			abort(CoreModelMessages.getString("PRegisterGroup.0"), null);
-		}
-		Element element = (Element) node;
-		if (!ELEMENT_REGISTER_GROUP.equals(element.getNodeName())) {
-			abort(CoreModelMessages.getString("PRegisterGroup.1"), null);
-		}
-		String groupName = element.getAttribute(ATTR_REGISTER_GROUP_NAME);
-		if (groupName == null || groupName.length() == 0) {
-			abort(CoreModelMessages.getString("PRegisterGroup.2"), null);
-		}
-		String e = element.getAttribute(ATTR_REGISTER_GROUP_ENABLED);
-		boolean enabled = Boolean.valueOf(e).booleanValue();
-		PRegisterManager rm = getRegisterManager();
-		ArrayList<IPRegisterDescriptor> list = new ArrayList<IPRegisterDescriptor>();
-		Node childNode = element.getFirstChild();
-		while (childNode != null) {
-			if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-				Element child = (Element) childNode;
-				if (ELEMENT_REGISTER.equals(child.getNodeName())) {
-					String name = child.getAttribute(ATTR_REGISTER_NAME);
-					String originalGroupName = child.getAttribute(ATTR_REGISTER_ORIGINAL_GROUP_NAME);
-					if (name == null || name.length() == 0 || originalGroupName == null || originalGroupName.length() == 0) {
-						abort(CoreModelMessages.getString("PRegisterGroup.3"), null);
-					} else {
-						IPRegisterDescriptor d = rm.findDescriptor(getTasks(), originalGroupName, name);
-						if (d != null)
-							list.add(d);
-						else
-							PTPDebugCorePlugin.log(CoreModelMessages.getString("PRegisterGroup.4"));
-					}
-				}
-			}
-			childNode = childNode.getNextSibling();
-		}
-		setName(groupName);
-		fRegisterDescriptors = (IPRegisterDescriptor[]) list.toArray(new IPRegisterDescriptor[list.size()]);
-		setEnabled(enabled);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IEnableDisableTarget#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return fIsEnabled;
-	}
-
-	/**
-	 * 
-	 */
-	public void resetRegisterValues() {
-		if (fRegisters == null) {
-			return;
-		}
-		for (int i = 0; i < fRegisters.length; ++i) {
-			if (fRegisters[i] != null) {
-				((PRegister) fRegisters[i]).invalidateValue();
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IEnableDisableTarget#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean enabled) throws DebugException {
-		if (fRegisters != null) {
-			synchronized (fRegisters) {
-				if (fRegisters != null) {
-					for (int i = 0; i < fRegisters.length; ++i) {
-						if (fRegisters[i] instanceof PRegister) {
-							((PRegister) fRegisters[i]).setEnabled(enabled);
-						}
-					}
-				}
-			}
-		}
-		fIsEnabled = enabled;
-		fireChangeEvent(DebugEvent.CONTENT);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPPersistableRegisterGroup#setRegisterDescriptors(org.eclipse.ptp.debug.core.model.IPRegisterDescriptor[])
-	 */
-	public void setRegisterDescriptors(IPRegisterDescriptor[] registerDescriptors) {
-		invalidate();
-		fRegisterDescriptors = registerDescriptors;
-	}
-
-	/**
-	 * 
-	 */
-	public void targetSuspended() {
-		if (fRegisters == null) {
-			return;
-		}
-		for (int i = 0; i < fRegisters.length; ++i) {
-			if (fRegisters[i] != null && ((PRegister) fRegisters[i]).hasErrors()) {
-				((PRegister) fRegisters[i]).resetStatus();
-			}
-		}
-	}
-
-	/**
-	 * @param message
-	 * @param exception
-	 * @throws CoreException
-	 */
-	private void abort(String message, Throwable exception) throws CoreException {
-		IStatus status = new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR,
-				message, exception);
-		throw new CoreException(status);
-	}
-
-	/**
-	 * @return
-	 */
-	private PRegisterManager getRegisterManager() {
-		return (PRegisterManager) getSession().getAdapter(PRegisterManager.class);
-	}
-
-	/**
-	 * 
-	 */
-	private void invalidate() {
-		if (fRegisters == null) {
-			return;
-		}
-		for (int i = 0; i < fRegisters.length; ++i) {
-			if (fRegisters[i] != null) {
-				((PRegister) fRegisters[i]).dispose();
-			}
-		}
-		fRegisters = null;
-	}
-
-	/**
-	 * @param name
-	 */
-	private void setName(String name) {
-		fName = name;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PSignal.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PSignal.java
deleted file mode 100644
index 61bfa73..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PSignal.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-
-/**
- * @author Clement chu
- */
-public class PSignal extends PDebugElement implements IPSignal {
-	private final IPDISignal pdiSignal;
-
-	public PSignal(IPSession session, BitList tasks, IPDISignal pdiSignal) {
-		super(session, tasks);
-		this.pdiSignal = pdiSignal;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#canModify()
-	 */
-	public boolean canModify() {
-		// TODO add canModify method to IPDISignal
-		return true;
-	}
-
-	/**
-	 * 
-	 */
-	public void dispose() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#getDescription()
-	 */
-	public String getDescription() throws DebugException {
-		return getPDISignal().getDescription();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#getName()
-	 */
-	public String getName() throws DebugException {
-		return getPDISignal().getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#isPassEnabled()
-	 */
-	public boolean isPassEnabled() throws DebugException {
-		return !getPDISignal().isIgnore();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#isStopEnabled()
-	 */
-	public boolean isStopEnabled() throws DebugException {
-		return getPDISignal().isStopSet();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#setPassEnabled(boolean)
-	 */
-	public void setPassEnabled(boolean enable) throws DebugException {
-		handle(enable, isStopEnabled());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#setStopEnabled(boolean)
-	 */
-	public void setStopEnabled(boolean enable) throws DebugException {
-		handle(isPassEnabled(), enable);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPSignal#signal()
-	 */
-	public void signal() throws DebugException {
-		try {
-			getPDISession().resume(getTasks(), getPDISignal());
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/**
-	 * @param pass
-	 * @param stop
-	 * @throws DebugException
-	 */
-	private void handle(boolean pass, boolean stop) throws DebugException {
-		try {
-			getPDISignal().handle(!pass, stop);
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPDISignal getPDISignal() {
-		return pdiSignal;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PStackFrame.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PStackFrame.java
deleted file mode 100644
index 27f9242..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PStackFrame.java
+++ /dev/null

@@ -1,947 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.math.BigInteger;
-import java.text.MessageFormat;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.ptp.debug.core.model.IJumpToAddress;
-import org.eclipse.ptp.debug.core.model.IJumpToLine;
-import org.eclipse.ptp.debug.core.model.IPGlobalVariable;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPVariable;
-import org.eclipse.ptp.debug.core.model.IRestart;
-import org.eclipse.ptp.debug.core.model.IResumeWithoutSignal;
-import org.eclipse.ptp.debug.core.model.IRunToAddress;
-import org.eclipse.ptp.debug.core.model.IRunToLine;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDITargetExpression;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocator;
-import org.eclipse.ptp.debug.internal.core.PSession;
-
-/**
- * @author Clement chu
- * 
- */
-public class PStackFrame extends PDebugElement implements IPStackFrame, IRestart, IResumeWithoutSignal, IPDIEventListener {
-	/**
-	 * @param frameOne
-	 * @param frameTwo
-	 * @return
-	 */
-	protected static boolean equalFrame(IPDIStackFrame frameOne, IPDIStackFrame frameTwo) {
-		if (frameOne == null || frameTwo == null)
-			return false;
-		IPDILocator loc1 = (IPDILocator) frameOne.getLocator();
-		IPDILocator loc2 = (IPDILocator) frameTwo.getLocator();
-		if (loc1 == null || loc2 == null)
-			return false;
-		if (loc1.getFile() != null && loc1.getFile().length() > 0 && loc2.getFile() != null && loc2.getFile().length() > 0
-				&& loc1.getFile().equals(loc2.getFile())) {
-			if (loc1.getFunction() != null && loc1.getFunction().length() > 0 && loc2.getFunction() != null
-					&& loc2.getFunction().length() > 0 && loc1.getFunction().equals(loc2.getFunction()))
-				return true;
-		}
-		if ((loc1.getFile() == null || loc1.getFile().length() < 1) && (loc2.getFile() == null || loc2.getFile().length() < 1)) {
-			if (loc1.getFunction() != null && loc1.getFunction().length() > 0 && loc2.getFunction() != null
-					&& loc2.getFunction().length() > 0 && loc1.getFunction().equals(loc2.getFunction()))
-				return true;
-		}
-		if ((loc1.getFile() == null || loc1.getFile().length() < 1) && (loc2.getFile() == null || loc2.getFile().length() < 1)
-				&& (loc1.getFunction() == null || loc1.getFunction().length() < 1)
-				&& (loc2.getFunction() == null || loc2.getFunction().length() < 1)) {
-			if (loc1.getAddress() == loc2.getAddress())
-				return true;
-		}
-		return false;
-	}
-
-	private IPDIStackFrame pdiStackFrame;
-	private IPDIStackFrame lastPDIStackFrame;
-	private PThread fThread;
-	private List<IPVariable> fVariables;
-	private boolean fRefreshVariables = true;
-	private List<PExpression> fExpressions;
-
-	private boolean fIsDisposed = false;
-
-	public PStackFrame(PThread thread, IPDIStackFrame pdiFrame) {
-		super(thread.getSession(), thread.getTasks());
-		setPDIStackFrame(pdiFrame);
-		setThread(thread);
-		getPDISession().getEventManager().addEventListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#canEvaluate()
-	 */
-	public boolean canEvaluate() {
-		return getDebugTarget().isSuspended();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IJumpToAddress#canJumpToAddress(java.math.BigInteger)
-	 */
-	public boolean canJumpToAddress(BigInteger address) {
-		return getThread().canResume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IJumpToLine#canJumpToLine(org.eclipse.core.resources.IFile, int)
-	 */
-	public boolean canJumpToLine(IFile file, int lineNumber) {
-		return getThread().canResume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IJumpToLine#canJumpToLine(java.lang.String, int)
-	 */
-	public boolean canJumpToLine(String fileName, int lineNumber) {
-		return getThread().canResume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRestart#canRestart()
-	 */
-	public boolean canRestart() {
-		return getDebugTarget() instanceof IRestart && ((IRestart) getDebugTarget()).canRestart();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
-	 */
-	public boolean canResume() {
-		return getThread().canResume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal()
-	 */
-	public boolean canResumeWithoutSignal() {
-		return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal) getDebugTarget())
-				.canResumeWithoutSignal());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRunToAddress#canRunToAddress(java.math.BigInteger)
-	 */
-	public boolean canRunToAddress(BigInteger address) {
-		return getThread().canResume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRunToLine#canRunToLine(org.eclipse.core.resources.IFile, int)
-	 */
-	public boolean canRunToLine(IFile file, int lineNumber) {
-		return getThread().canResume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRunToLine#canRunToLine(java.lang.String, int)
-	 */
-	public boolean canRunToLine(String fileName, int lineNumber) {
-		return getThread().canResume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepInto()
-	 */
-	public boolean canStepInto() {
-		try {
-			return exists() /* && isTopStackFrame() */&& getThread().canStepInto();
-		} catch (DebugException e) {
-			logError(e);
-			return false;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepOver()
-	 */
-	public boolean canStepOver() {
-		try {
-			return exists() && getThread().canStepOver();
-		} catch (DebugException e) {
-			logError(e);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepReturn()
-	 */
-	public boolean canStepReturn() {
-		try {
-			if (!exists()) {
-				return false;
-			}
-			List<IStackFrame> frames = ((PThread) getThread()).computeStackFrames();
-			if (frames != null && !frames.isEmpty()) {
-				boolean bottomFrame = this.equals(frames.get(frames.size() - 1));
-				return !bottomFrame && getThread().canStepReturn();
-			}
-		} catch (DebugException e) {
-			logError(e);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
-	 */
-	public boolean canSuspend() {
-		return getThread().canSuspend();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
-	 */
-	public boolean canTerminate() {
-		boolean exists = false;
-		try {
-			exists = exists();
-		} catch (DebugException e) {
-			logError(e);
-		}
-		return exists && getThread().canTerminate() || getDebugTarget().canTerminate();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#evaluateExpression(java.lang.String)
-	 */
-	public IValue evaluateExpression(String expressionText) throws DebugException {
-		if (!isDisposed()) {
-			PExpression expression = getExpression(expressionText);
-			if (expression != null) {
-				return expression.getValue(this);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#evaluateExpressionToString(java.lang.String)
-	 */
-	public String evaluateExpressionToString(String expression) throws DebugException {
-		try {
-			return getPDITarget().evaluateExpressionToString(getPDIStackFrame(), expression);
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), null);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IRunToLine.class) {
-			return this;
-		}
-		if (adapter == IRunToAddress.class) {
-			return this;
-		}
-		if (adapter == IJumpToLine.class) {
-			return this;
-		}
-		if (adapter == IJumpToAddress.class) {
-			return this;
-		}
-		if (adapter == IPStackFrame.class) {
-			return this;
-		}
-		if (adapter == IStackFrame.class) {
-			return this;
-		}
-		if (adapter == IPDIStackFrame.class) {
-			return getPDIStackFrame();
-		}
-		if (adapter == IMemoryBlockRetrieval.class) {
-			return getDebugTarget().getAdapter(adapter);
-		}
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#getAddress()
-	 */
-	public BigInteger getAddress() {
-		return getPDIStackFrame().getLocator().getAddress();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getCharEnd()
-	 */
-	public int getCharEnd() throws DebugException {
-		return -1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getCharStart()
-	 */
-	public int getCharStart() throws DebugException {
-		return -1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getDebugTarget()
-	 */
-	public PDebugTarget getDebugTarget() {
-		return fThread.getDebugTarget();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#getFile()
-	 */
-	public String getFile() {
-		return getPDIStackFrame().getLocator().getFile();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#getFrameLineNumber()
-	 */
-	public int getFrameLineNumber() {
-		return getPDIStackFrame().getLocator().getLineNumber();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#getFunction()
-	 */
-	public String getFunction() {
-		return getPDIStackFrame().getLocator().getFunction();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#getLevel()
-	 */
-	public int getLevel() {
-		return getPDIStackFrame().getLevel();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getLineNumber()
-	 */
-	public int getLineNumber() throws DebugException {
-		if (isSuspended()) {
-			ISourceLocator locator = getLaunch().getSourceLocator();
-			if (locator != null && locator instanceof IAdaptable
-					&& ((IAdaptable) locator).getAdapter(IPSourceLocator.class) != null)
-				return ((IPSourceLocator) ((IAdaptable) locator).getAdapter(IPSourceLocator.class)).getLineNumber(this);
-			if (getPDIStackFrame() != null && getPDIStackFrame().getLocator() != null)
-				return getPDIStackFrame().getLocator().getLineNumber();
-		}
-		return -1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getName()
-	 */
-	public String getName() throws DebugException {
-		IPDILocator locator = (IPDILocator) getPDIStackFrame().getLocator();
-		String func = "";
-		String file = "";
-		String line = "";
-		if (locator.getFunction() != null && locator.getFunction().trim().length() > 0)
-			func += locator.getFunction() + "() ";
-		if (locator.getFile() != null && locator.getFile().trim().length() > 0) {
-			file = locator.getFile();
-			if (locator.getLineNumber() != 0) {
-				line = NumberFormat.getInstance().format(new Integer(locator.getLineNumber()));
-			}
-		} else {
-			return func;
-		}
-		return MessageFormat.format(CoreModelMessages.getString("PStackFrame.0"), new Object[] { func, file, line });
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#getPDIStackFrame()
-	 */
-	public IPDIStackFrame getPDIStackFrame() {
-		return pdiStackFrame;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IPStackFrame#getPDIThread()
-	 */
-	public IPDIThread getPDIThread() {
-		return (IPDIThread) ((PThread) getThread()).getPDIThread();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getRegisterGroups()
-	 */
-	public IRegisterGroup[] getRegisterGroups() throws DebugException {
-		return (isDisposed()) ? new IRegisterGroup[0] : fSession.getRegisterManager().getRegisterGroups(getTasks(), this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getThread()
-	 */
-	public IThread getThread() {
-		return fThread;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#getVariables()
-	 */
-	public IVariable[] getVariables() throws DebugException {
-		if (isDisposed()) {
-			return new IVariable[0];
-		}
-		IPGlobalVariable[] globals = getGlobals();
-		List<IPVariable> vars = getVariables0();
-		List<IPVariable> all = new ArrayList<IPVariable>(globals.length + vars.size());
-		all.addAll(Arrays.asList(globals));
-		all.addAll(vars);
-		return (IVariable[]) all.toArray(new IVariable[all.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener#handleDebugEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public void handleDebugEvents(IPDIEvent[] events) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#hasRegisterGroups()
-	 */
-	public boolean hasRegisterGroups() throws DebugException {
-		return (isDisposed()) ? false
-				: getDebugTarget().fSession.getRegisterManager().getRegisterGroups(getTasks(), this).length > 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStackFrame#hasVariables()
-	 */
-	public boolean hasVariables() throws DebugException {
-		return getVariables0().size() > 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#isStepping()
-	 */
-	public boolean isStepping() {
-		return getThread().isStepping();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
-	 */
-	public boolean isSuspended() {
-		return getThread().isSuspended();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
-	 */
-	public boolean isTerminated() {
-		return getThread().isTerminated();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IJumpToAddress#jumpToAddress(java.math.BigInteger)
-	 */
-	public void jumpToAddress(BigInteger address) throws DebugException {
-		if (!canJumpToAddress(address))
-			return;
-
-		IPDILocation location = getPDISession().getBreakpointManager().createAddressLocation(address);
-		try {
-			getPDISession().resume(getTasks(), location);
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IJumpToLine#jumpToLine(org.eclipse.core.resources.IFile, int)
-	 */
-	public void jumpToLine(IFile file, int lineNumber) throws DebugException {
-		if (!canJumpToLine(file, lineNumber))
-			return;
-		jumpToLine(file.getLocation().lastSegment(), lineNumber);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IJumpToLine#jumpToLine(java.lang.String, int)
-	 */
-	public void jumpToLine(String fileName, int lineNumber) throws DebugException {
-		if (!canJumpToLine(fileName, lineNumber))
-			return;
-		IPDILocation location = getPDISession().getBreakpointManager().createLineLocation(fileName, lineNumber);
-		try {
-			getPDISession().resume(getTasks(), location);
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRestart#restart()
-	 */
-	public void restart() throws DebugException {
-		if (canRestart()) {
-			((IRestart) getDebugTarget()).restart();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#resume()
-	 */
-	public void resume() throws DebugException {
-		getThread().resume();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal()
-	 */
-	public void resumeWithoutSignal() throws DebugException {
-		if (canResumeWithoutSignal()) {
-			((IResumeWithoutSignal) getDebugTarget()).resumeWithoutSignal();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRunToAddress#runToAddress(java.math.BigInteger, boolean)
-	 */
-	public void runToAddress(BigInteger address, boolean skipBreakpoints) throws DebugException {
-		if (!canRunToAddress(address))
-			return;
-		if (skipBreakpoints) {
-			fSession.getBreakpointManager().skipBreakpoints(true);
-		}
-		IPDILocation location = getPDISession().getBreakpointManager().createAddressLocation(address);
-		try {
-			getPDISession().stepUntil(getTasks(), location);
-		} catch (PDIException e) {
-			if (skipBreakpoints) {
-				fSession.getBreakpointManager().skipBreakpoints(false);
-			}
-			targetRequestFailed(e.getMessage(), e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRunToLine#runToLine(org.eclipse.core.resources.IFile, int, boolean)
-	 */
-	public void runToLine(IFile file, int lineNumber, boolean skipBreakpoints) throws DebugException {
-		if (!canRunToLine(file, lineNumber))
-			return;
-		runToLine(file.getLocation().lastSegment(), lineNumber, skipBreakpoints);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRunToLine#runToLine(java.lang.String, int, boolean)
-	 */
-	public void runToLine(String fileName, int lineNumber, boolean skipBreakpoints) throws DebugException {
-		if (!canRunToLine(fileName, lineNumber))
-			return;
-		if (skipBreakpoints) {
-			fSession.getBreakpointManager().skipBreakpoints(true);
-		}
-		IPDILocation location = getPDISession().getBreakpointManager().createLineLocation(fileName, lineNumber);
-		try {
-			getPDISession().stepUntil(getTasks(), location);
-		} catch (PDIException e) {
-			if (skipBreakpoints) {
-				fSession.getBreakpointManager().skipBreakpoints(false);
-			}
-			targetRequestFailed(e.getMessage(), e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepInto()
-	 */
-	public void stepInto() throws DebugException {
-		if (canStepInto()) {
-			getThread().stepInto();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepOver()
-	 */
-	public void stepOver() throws DebugException {
-		if (canStepOver()) {
-			getThread().stepOver();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepReturn()
-	 */
-	public void stepReturn() throws DebugException {
-		if (canStepReturn()) {
-			getThread().stepReturn();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
-	 */
-	public void suspend() throws DebugException {
-		getThread().suspend();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#terminate()
-	 */
-	public void terminate() throws DebugException {
-		if (getThread().canTerminate()) {
-			getThread().terminate();
-		} else {
-			getDebugTarget().terminate();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		try {
-			return getName();
-		} catch (DebugException e) {
-			return e.getLocalizedMessage();
-		}
-	}
-
-	/**
-	 * @param expressionText
-	 * @return
-	 * @throws DebugException
-	 */
-	private synchronized PExpression getExpression(String expressionText) throws DebugException {
-		if (isDisposed()) {
-			return null;
-		}
-		if (fExpressions == null) {
-			fExpressions = new ArrayList<PExpression>(5);
-		}
-		PExpression expression = null;
-		Iterator<PExpression> it = fExpressions.iterator();
-		while (it.hasNext()) {
-			expression = (PExpression) it.next();
-			if (expression.getExpressionText().compareTo(expressionText) == 0) {
-				return expression;
-			}
-		}
-		try {
-			IPDITargetExpression pdiExpression = getPDISession().getExpressionManager()
-					.createExpression(getTasks(), expressionText);
-			expression = new PExpression(this, pdiExpression, null);
-			fExpressions.add(expression);
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), null);
-		}
-		return expression;
-	}
-
-	/**
-	 * @return
-	 */
-	private IPGlobalVariable[] getGlobals() {
-		// TODO Not implement PStackFrame - getGlobals() yet
-		return new IPGlobalVariable[0];
-	}
-
-	/**
-	 * 
-	 */
-	private void preserveExpressions() {
-		if (fExpressions == null)
-			return;
-		Iterator<PExpression> it = fExpressions.iterator();
-		while (it.hasNext()) {
-			PExpression exp = (PExpression) it.next();
-			exp.preserve();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void preserveVariables() {
-		if (fVariables == null)
-			return;
-		Iterator<IPVariable> it = fVariables.iterator();
-		while (it.hasNext()) {
-			AbstractPVariable av = (AbstractPVariable) it.next();
-			av.preserve();
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private boolean refreshVariables() {
-		return fRefreshVariables;
-	}
-
-	// FIXME - commented synchronized to prevent hanging here
-	/**
-	 * @param isDisposed
-	 */
-	private/* synchronized */void setDisposed(boolean isDisposed) {
-		fIsDisposed = isDisposed;
-	}
-
-	/**
-	 * @param refresh
-	 */
-	private void setRefreshVariables(boolean refresh) {
-		fRefreshVariables = refresh;
-	}
-
-	/**
-	 * 
-	 */
-	protected void dispose() {
-		setDisposed(true);
-		getPDISession().getEventManager().removeEventListener(this);
-		disposeAllVariables();
-		disposeExpressions();
-	}
-
-	/**
-	 * 
-	 */
-	protected void disposeAllVariables() {
-		if (fVariables == null)
-			return;
-		Iterator<IPVariable> it = fVariables.iterator();
-		while (it.hasNext()) {
-			((PVariable) it.next()).dispose();
-		}
-		fVariables.clear();
-		fVariables = null;
-	}
-
-	/**
-	 * 
-	 */
-	protected void disposeExpressions() {
-		if (fExpressions != null) {
-			Iterator<PExpression> it = fExpressions.iterator();
-			while (it.hasNext()) {
-				((PExpression) it.next()).dispose();
-			}
-			fExpressions.clear();
-		}
-		fExpressions = null;
-	}
-
-	/**
-	 * @throws DebugException
-	 */
-	protected void doStepReturn() throws DebugException {
-		try {
-			getPDISession().stepReturn(getTasks(), 0);
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected boolean exists() throws DebugException {
-		return ((PThread) getThread()).computeStackFrames().indexOf(this) != -1;
-	}
-
-	/**
-	 * @param list
-	 * @param var
-	 * @return
-	 */
-	protected IPDIVariableDescriptor findVariable(List<IPDIVariableDescriptor> list, PVariable var) {
-		Iterator<IPDIVariableDescriptor> it = list.iterator();
-		while (it.hasNext()) {
-			IPDIVariableDescriptor newVarObject = (IPDIVariableDescriptor) it.next();
-			if (var.sameVariable(newVarObject))
-				return newVarObject;
-		}
-		return null;
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected List<IPDIVariableDescriptor> getAllPDIVariableObjects() throws DebugException {
-		List<IPDIVariableDescriptor> list = new ArrayList<IPDIVariableDescriptor>();
-		list.addAll(getPDIArgumentObjects());
-		list.addAll(getPDILocalVariableObjects());
-		return list;
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPDIStackFrame getLastPDIStackFrame() {
-		return lastPDIStackFrame;
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected List<IPDIVariableDescriptor> getPDIArgumentObjects() throws DebugException {
-		List<IPDIVariableDescriptor> list = new ArrayList<IPDIVariableDescriptor>();
-		try {
-			list.addAll(Arrays.asList(getPDIStackFrame().getArgumentDescriptors()));
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), null);
-		}
-		return list;
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected List<IPDIVariableDescriptor> getPDILocalVariableObjects() throws DebugException {
-		List<IPDIVariableDescriptor> list = new ArrayList<IPDIVariableDescriptor>();
-		try {
-			list.addAll(Arrays.asList(getPDIStackFrame().getLocalVariableDescriptors()));
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), null);
-		}
-		return list;
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected synchronized List<IPVariable> getVariables0() throws DebugException {
-		if (isDisposed()) {
-			return Collections.EMPTY_LIST;
-		}
-		PThread thread = (PThread) getThread();
-		if (thread.isSuspended()) {
-			if (fVariables == null) {
-				List<IPDIVariableDescriptor> vars = getAllPDIVariableObjects();
-				fVariables = new ArrayList<IPVariable>(vars.size());
-				Iterator<IPDIVariableDescriptor> it = vars.iterator();
-				while (it.hasNext()) {
-					fVariables.add(PVariableFactory.createLocalVariable(this, (IPDIVariableDescriptor) it.next()));
-				}
-			} else {
-				if (refreshVariables()) {
-					updateVariables();
-				}
-			}
-			setRefreshVariables(false);
-		}
-		return (fVariables != null) ? fVariables : Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isDisposed() {
-		return fIsDisposed;
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected boolean isTopStackFrame() throws DebugException {
-		IStackFrame tos = getThread().getTopStackFrame();
-		return tos != null && tos.equals(this);
-	}
-
-	/**
-	 * 
-	 */
-	protected synchronized void preserve() {
-		preserveVariables();
-		preserveExpressions();
-	}
-
-	/**
-	 * @param frame
-	 */
-	protected void setPDIStackFrame(IPDIStackFrame frame) {
-		if (frame != null) {
-			lastPDIStackFrame = frame;
-		} else {
-			lastPDIStackFrame = pdiStackFrame;
-		}
-		pdiStackFrame = frame;
-		setRefreshVariables(true);
-	}
-
-	/**
-	 * @param thread
-	 */
-	protected void setThread(PThread thread) {
-		fThread = thread;
-	}
-
-	/**
-	 * @throws DebugException
-	 */
-	protected void updateVariables() throws DebugException {
-		List<IPDIVariableDescriptor> locals = getAllPDIVariableObjects();
-		int index = 0;
-		while (index < fVariables.size()) {
-			IPDIVariableDescriptor varObject = findVariable(locals, (PVariable) fVariables.get(index));
-			if (varObject != null) {
-				locals.remove(varObject);
-				index++;
-			} else {
-				// remove variable
-				fVariables.remove(index);
-			}
-		}
-		// add any new locals
-		Iterator<IPDIVariableDescriptor> newOnes = locals.iterator();
-		while (newOnes.hasNext()) {
-			fVariables.add(PVariableFactory.createLocalVariable(this, (IPDIVariableDescriptor) newOnes.next()));
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PThread.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PThread.java
deleted file mode 100644
index 7418ae5..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PThread.java
+++ /dev/null

@@ -1,869 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.ptp.debug.core.IPBreakpointManager;
-import org.eclipse.ptp.debug.core.model.IJumpToAddress;
-import org.eclipse.ptp.debug.core.model.IJumpToLine;
-import org.eclipse.ptp.debug.core.model.IPDebugElementStatus;
-import org.eclipse.ptp.debug.core.model.IPDummyStackFrame;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPThread;
-import org.eclipse.ptp.debug.core.model.IRestart;
-import org.eclipse.ptp.debug.core.model.IResumeWithoutSignal;
-import org.eclipse.ptp.debug.core.model.IRunToAddress;
-import org.eclipse.ptp.debug.core.model.IRunToLine;
-import org.eclipse.ptp.debug.core.model.PDebugElementState;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIBreakpointInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEndSteppingRangeInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIFunctionFinishedInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDILocationReachedInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISharedLibraryInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISignalInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointScopeInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointTriggerInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrame;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIThread;
-
-/**
- * @author Clement chu
- *
- */
-public class PThread extends PDebugElement implements IPThread, IRestart, IResumeWithoutSignal, IPDIEventListener {
-	private final static int MAX_STACK_DEPTH = 100;
-	private IPDIThread pdiThread;
-	private ArrayList<IStackFrame> fStackFrames;
-	private boolean fRefreshChildren = true;
-	private boolean fIsCurrent = false;
-	private int fLastStackDepth = 0;
-	private boolean fDisposed = false;
-	private PDebugTarget fDebugTarget = null;
-
-	public PThread(PDebugTarget target, IPDIThread pdiThread) {
-		super(target.getSession(), target.getTasks());
-		this.fDebugTarget = target;
-		this.pdiThread = pdiThread;
-		if (target.getPDISession().isSuspended(target.getTasks())) {
-			setState(PDebugElementState.SUSPENDED);
-			setCurrent(true);
-		} else {
-			setState(PDebugElementState.RESUMED);
-		}
-		initialize();
-		getPDISession().getEventManager().addEventListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRestart#canRestart()
-	 */
-	public boolean canRestart() {
-		return getDebugTarget() instanceof IRestart && ((IRestart) getDebugTarget()).canRestart();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canResume()
-	 */
-	public boolean canResume() {
-		return isSuspended();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IResumeWithoutSignal#canResumeWithoutSignal()
-	 */
-	public boolean canResumeWithoutSignal() {
-		return (getDebugTarget() instanceof IResumeWithoutSignal && ((IResumeWithoutSignal) getDebugTarget())
-				.canResumeWithoutSignal());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepInto()
-	 */
-	public boolean canStepInto() {
-		return canStep();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepOver()
-	 */
-	public boolean canStepOver() {
-		return canStep();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#canStepReturn()
-	 */
-	public boolean canStepReturn() {
-		if (!canResume()) {
-			return false;
-		}
-		return (fStackFrames.size() > 1);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#canSuspend()
-	 */
-	public boolean canSuspend() {
-		PDebugElementState state = getState();
-		return (state.equals(PDebugElementState.RESUMED) || state.equals(PDebugElementState.STEPPED));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
-	 */
-	public boolean canTerminate() {
-		return getDebugTarget().canTerminate();
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	public List<IStackFrame> computeNewStackFrames() throws DebugException {
-		return computeStackFrames(true);
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	public List<IStackFrame> computeStackFrames() throws DebugException {
-		return computeStackFrames(refreshChildren());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IRunToLine.class) || adapter.equals(IRunToAddress.class) || adapter.equals(IJumpToLine.class)
-				|| adapter.equals(IJumpToAddress.class)) {
-			try {
-				return (IPStackFrame) getTopStackFrame();
-			} catch (DebugException e) {
-				// do nothing
-			}
-		}
-		if (adapter.equals(PDebugElementState.class))
-			return this;
-		if (adapter == IPStackFrame.class) {
-			try {
-				return (IPStackFrame) getTopStackFrame();
-			} catch (DebugException e) {
-				// do nothing
-			}
-		}
-		if (adapter == IMemoryBlockRetrieval.class) {
-			return getDebugTarget().getAdapter(adapter);
-		}
-		return super.getAdapter(adapter);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IThread#getBreakpoints()
-	 */
-	public IBreakpoint[] getBreakpoints() {
-		List<IBreakpoint> list = new ArrayList<IBreakpoint>(1);
-		if (isSuspended()) {
-			IBreakpoint bkpt = null;
-			IPBreakpointManager bMgr = fSession.getBreakpointManager();
-			if (getCurrentStateInfo() instanceof IPDIBreakpointInfo) {
-				bkpt = bMgr.getBreakpoint(((IPDIBreakpointInfo) getCurrentStateInfo()).getBreakpoint());
-			} else if (getCurrentStateInfo() instanceof IPDIWatchpointTriggerInfo) {
-				bkpt = bMgr.getBreakpoint(((IPDIWatchpointTriggerInfo) getCurrentStateInfo()).getWatchpoint());
-			}
-			if (bkpt != null)
-				list.add(bkpt);
-		}
-		return (IBreakpoint[]) list.toArray(new IBreakpoint[list.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.model.PDebugElement#getDebugTarget()
-	 */
-	public PDebugTarget getDebugTarget() {
-		return fDebugTarget;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IThread#getName()
-	 */
-	public String getName() throws DebugException {
-		return getPDIThread().toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IThread#getPriority()
-	 */
-	public int getPriority() throws DebugException {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IThread#getStackFrames()
-	 */
-	public IStackFrame[] getStackFrames() throws DebugException {
-		List<IStackFrame> list = Collections.EMPTY_LIST;
-		try {
-			list = computeStackFrames();
-		} catch (DebugException e) {
-			setStatus(IPDebugElementStatus.ERROR, e.getStatus().getMessage());
-			throw e;
-		}
-		return (IStackFrame[]) list.toArray(new IStackFrame[list.size()]);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IThread#getTopStackFrame()
-	 */
-	public IStackFrame getTopStackFrame() throws DebugException {
-		List<IStackFrame> c = computeStackFrames();
-		return (c.isEmpty()) ? null : (IStackFrame) c.get(0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener#handleDebugEvents(org.eclipse.ptp.debug.core.pdi.event.IPDIEvent[])
-	 */
-	public synchronized void handleDebugEvents(IPDIEvent[] events) {
-		/*
-		 * FIXME Not support thread, always fire event by target
-		if (isDisposed())
-			return;
-		for (int i = 0; i < events.length; i++) {
-			IPDIEvent event = events[i];
-			if (!event.contains(getPDITarget().getTasks()))
-				continue;
-			
-			if (event instanceof IPDISuspendedEvent) {
-				handleSuspendedEvent((IPDISuspendedEvent)event);
-			}
-			else if (event instanceof IPDIResumedEvent) {
-				handleResumedEvent((IPDIResumedEvent)event);
-			}
-			else if (event instanceof IPDIDestroyedEvent) {
-				handleTerminatedEvent((IPDIDestroyedEvent)event);
-			}
-			else if (event instanceof IPDIDisconnectedEvent) {
-				handleDisconnectedEvent((IPDIDisconnectedEvent)event);
-			}
-			else if (event instanceof IPDIChangedEvent) {
-				handleChangedEvent((IPDIChangedEvent)event);
-			}
-		}
-		 */
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IThread#hasStackFrames()
-	 */
-	public boolean hasStackFrames() throws DebugException {
-		// Always return true to postpone the stack frames request
-		if (getState().equals(PDebugElementState.RESUMED))
-			return false;
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#isStepping()
-	 */
-	public boolean isStepping() {
-		return (getState().equals(PDebugElementState.STEPPING)) || (getState().equals(PDebugElementState.STEPPED));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended()
-	 */
-	public boolean isSuspended() {
-		return getState().equals(PDebugElementState.SUSPENDED);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
-	 */
-	public boolean isTerminated() {
-		return getDebugTarget().isTerminated();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IRestart#restart()
-	 */
-	public void restart() throws DebugException {
-		if (canRestart()) {
-			((IRestart) getDebugTarget()).restart();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#resume()
-	 */
-	public void resume() throws DebugException {
-		if (!canResume())
-			return;
-		PDebugElementState oldState = getState();
-		setState(PDebugElementState.RESUMING);
-		try {
-			getPDISession().resume(getTasks(), false);
-		} catch (PDIException e) {
-			setState(oldState);
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.model.IResumeWithoutSignal#resumeWithoutSignal()
-	 */
-	public void resumeWithoutSignal() throws DebugException {
-		if (canResumeWithoutSignal()) {
-			((IResumeWithoutSignal) getDebugTarget()).resumeWithoutSignal();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepInto()
-	 */
-	public void stepInto() throws DebugException {
-		if (!canStepInto())
-			return;
-		PDebugElementState oldState = getState();
-		setState(PDebugElementState.STEPPING);
-		try {
-			if (!isInstructionsteppingEnabled()) {
-				getPDISession().stepInto(getTasks(), 1);
-			} else {
-				getPDISession().stepIntoInstruction(getTasks(), 1);
-			}
-		} catch (PDIException e) {
-			setState(oldState);
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepOver()
-	 */
-	public void stepOver() throws DebugException {
-		if (!canStepOver())
-			return;
-		PDebugElementState oldState = getState();
-		setState(PDebugElementState.STEPPING);
-		try {
-			if (!isInstructionsteppingEnabled()) {
-				getPDISession().stepOver(getTasks(), 1);
-			} else {
-				getPDISession().stepOverInstruction(getTasks(), 1);
-			}
-		} catch (PDIException e) {
-			setState(oldState);
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStep#stepReturn()
-	 */
-	public void stepReturn() throws DebugException {
-		if (!canStepReturn())
-			return;
-		IStackFrame[] frames = getStackFrames();
-		if (frames.length == 0)
-			return;
-		PStackFrame f = (PStackFrame) frames[0];
-		PDebugElementState oldState = getState();
-		setState(PDebugElementState.STEPPING);
-		try {
-			f.doStepReturn();
-		} catch (DebugException e) {
-			setState(oldState);
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISuspendResume#suspend()
-	 */
-	public void suspend() throws DebugException {
-		if (!canSuspend())
-			return;
-		PDebugElementState oldState = getState();
-		setState(PDebugElementState.SUSPENDING);
-		try {
-			getPDISession().suspend(getTasks());
-		} catch (PDIException e) {
-			setState(oldState);
-			targetRequestFailed(e.getMessage(), null);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#terminate()
-	 */
-	public void terminate() throws DebugException {
-		getDebugTarget().terminate();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		String result = "";
-		try {
-			result = getName();
-		} catch (DebugException e) {
-		}
-		return result;
-	}
-
-	/**
-	 * @param newFrames
-	 * @param oldFrames
-	 * @param offset
-	 * @param length
-	 * @return
-	 */
-	private boolean compareStackFrames(IPDIStackFrame[] newFrames, List<IStackFrame> oldFrames, int offset, int length) {
-		int index = offset;
-		Iterator<IStackFrame> it = oldFrames.iterator();
-		while (it.hasNext() && index < newFrames.length) {
-			PStackFrame frame = (PStackFrame) it.next();
-			if (!frame.getPDIStackFrame().equals(newFrames[index++]))
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @param info
-	 */
-	private void handleBreakpointHit(IPDIBreakpointInfo info) {
-		fireSuspendEvent(DebugEvent.BREAKPOINT);
-	}
-
-	/**
-	 * @param info
-	 */
-	private void handleEndSteppingRange(IPDIEndSteppingRangeInfo info) {
-		fireSuspendEvent(DebugEvent.STEP_END);
-	}
-
-	/**
-	 * @param info
-	 */
-	private void handleSuspendedBySignal(IPDISignalInfo info) {
-		fireSuspendEvent(DebugEvent.UNSPECIFIED);
-	}
-
-	/**
-	 * @return
-	 */
-	private boolean refreshChildren() {
-		return fRefreshChildren;
-	}
-
-	/**
-	 * @param depth
-	 */
-	private void setLastStackDepth(int depth) {
-		fLastStackDepth = depth;
-	}
-
-	/**
-	 * @param refresh
-	 */
-	private void setRefreshChildren(boolean refresh) {
-		fRefreshChildren = refresh;
-	}
-
-	/**
-	 * 
-	 */
-	private void syncWithBackend() {
-		IPDIThread pdiThread = getPDIThread();
-		IPDIThread currentThread = null;
-		try {
-			currentThread = pdiThread.getTarget().getCurrentThread();
-		} catch (PDIException e) {
-			// ignore
-		}
-		setCurrent(pdiThread.equals(currentThread));
-	}
-
-	/**
-	 * @param newFrames
-	 * @param startIndex
-	 * @param length
-	 * @param append
-	 */
-	protected void addStackFrames(IPDIStackFrame[] newFrames, int startIndex, int length, boolean append) {
-		if (newFrames.length >= startIndex + length) {
-			for (int i = 0; i < length; ++i) {
-				if (append)
-					fStackFrames.add(new PStackFrame(this, newFrames[startIndex + i]));
-				else
-					fStackFrames.add(i, new PStackFrame(this, newFrames[startIndex + i]));
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean canStep() {
-		if (!isSuspended()) {
-			return false;
-		}
-		return !fStackFrames.isEmpty();
-	}
-
-	/**
-	 * 
-	 */
-	protected void cleanup() {
-		getPDISession().getEventManager().removeEventListener(this);
-		disposeStackFrames();
-	}
-
-	/**
-	 * @param refreshChildren
-	 * @return
-	 * @throws DebugException
-	 */
-	protected synchronized List<IStackFrame> computeStackFrames(boolean refreshChildren) throws DebugException {
-		if (isSuspended()) {
-			if (isTerminated()) {
-				fStackFrames = new ArrayList<IStackFrame>();
-			} else if (refreshChildren) {
-				if (fStackFrames.size() > 0) {
-					Object frame = fStackFrames.get(fStackFrames.size() - 1);
-					if (frame instanceof IPDummyStackFrame) {
-						fStackFrames.remove(frame);
-					}
-				}
-				int depth = getStackDepth();
-				if (depth >= getMaxStackDepth())
-					depth = getMaxStackDepth() - 1;
-
-				IPDIStackFrame[] frames = (depth != 0) ? getPDIStackFrames(0, depth - 1) : new IPDIStackFrame[0];
-				depth = frames.length;
-
-				if (fStackFrames.isEmpty()) {
-					if (frames.length > 0) {
-						addStackFrames(frames, 0, frames.length, false);
-					}
-				} else {
-					int diff = depth - getLastStackDepth();
-					int offset = (diff > 0) ? frames.length - diff : 0;
-					int length = (diff > 0) ? diff : -diff;
-					if (!compareStackFrames(frames, fStackFrames, offset, length)) {
-						disposeStackFrames(0, fStackFrames.size());
-						addStackFrames(frames, 0, frames.length, false);
-					}
-					if (diff < 0) {
-						// stepping out of the last frame
-						disposeStackFrames(0, getLastStackDepth() - depth);
-						if (frames.length > 0) {
-							updateStackFrames(frames, 0, fStackFrames, fStackFrames.size());
-							if (fStackFrames.size() < frames.length) {
-								addStackFrames(frames, fStackFrames.size(), frames.length - fStackFrames.size(), true);
-							}
-						}
-					} else if (diff > 0) {
-						// stepping into a new frame
-						disposeStackFrames(frames.length - depth + getLastStackDepth(), depth - getLastStackDepth());
-						addStackFrames(frames, 0, depth - getLastStackDepth(), false);
-						updateStackFrames(frames, depth - getLastStackDepth(), fStackFrames, frames.length - depth
-								+ getLastStackDepth());
-					} else { // diff == 0
-						if (depth != 0) {
-							// we are in the same frame
-							updateStackFrames(frames, 0, fStackFrames, frames.length);
-						}
-					}
-				}
-				if (depth > getMaxStackDepth()) {
-					fStackFrames.add(new PDummyStackFrame(this));
-				}
-				setLastStackDepth(depth);
-				setRefreshChildren(false);
-			}
-		}
-		return fStackFrames;
-	}
-
-	/**
-	 * @param depth
-	 * @param frames
-	 * @return
-	 * @throws DebugException
-	 */
-	protected List<IStackFrame> createAllStackFrames(int depth, IPDIStackFrame[] frames) throws DebugException {
-		List<IStackFrame> list = new ArrayList<IStackFrame>(frames.length);
-		for (int i = 0; i < frames.length; ++i) {
-			list.add(new PStackFrame(this, frames[i]));
-		}
-		if (depth > frames.length) {
-			list.add(new PDummyStackFrame(this));
-		}
-		return list;
-	}
-
-	/**
-	 * 
-	 */
-	protected void dispose() {
-		fDisposed = true;
-		cleanup();
-	}
-
-	/**
-	 * 
-	 */
-	protected synchronized void disposeStackFrames() {
-		Iterator<IStackFrame> it = fStackFrames.iterator();
-		while (it.hasNext()) {
-			Object obj = it.next();
-			if (obj instanceof PStackFrame) {
-				((PStackFrame) obj).dispose();
-			}
-		}
-		fStackFrames.clear();
-		setLastStackDepth(0);
-		resetStatus();
-		setRefreshChildren(true);
-	}
-
-	/**
-	 * @param index
-	 * @param length
-	 */
-	protected void disposeStackFrames(int index, int length) {
-		List<IStackFrame> removeList = new ArrayList<IStackFrame>(length);
-		Iterator<IStackFrame> it = fStackFrames.iterator();
-		int counter = 0;
-		while (it.hasNext()) {
-			IPStackFrame frame = (IPStackFrame) (((IAdaptable) it.next()).getAdapter(IPStackFrame.class));
-			if (frame instanceof PStackFrame && counter >= index && counter < index + length) {
-				((PStackFrame) frame).dispose();
-				removeList.add(frame);
-			}
-			++counter;
-		}
-		fStackFrames.removeAll(removeList);
-	}
-
-	/**
-	 * @return
-	 */
-	protected int getLastStackDepth() {
-		return fLastStackDepth;
-	}
-
-	/**
-	 * @return
-	 */
-	protected int getMaxStackDepth() {
-		return MAX_STACK_DEPTH;
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected IPDIStackFrame[] getPDIStackFrames() throws DebugException {
-		return new IPDIStackFrame[0];
-	}
-
-	/**
-	 * @param lowFrame
-	 * @param highFrame
-	 * @return
-	 * @throws DebugException
-	 */
-	protected IPDIStackFrame[] getPDIStackFrames(int lowFrame, int highFrame) throws DebugException {
-		try {
-			return getPDIThread().getStackFrames(lowFrame, highFrame);
-		} catch (PDIException e) {
-			setStatus(IPDebugElementStatus.WARNING, MessageFormat.format(CoreModelMessages.getString("PThread.0"), new Object[] { e
-					.getMessage() }));
-			targetRequestFailed(e.getMessage(), null);
-		}
-		return new IPDIStackFrame[0];
-	}
-
-	/**
-	 * @return
-	 */
-	protected IPDIThread getPDIThread() {
-		return pdiThread;
-	}
-
-	/**
-	 * @return
-	 * @throws DebugException
-	 */
-	protected int getStackDepth() throws DebugException {
-		int depth = 0;
-		try {
-			depth = getPDIThread().getStackFrameCount();
-		} catch (PDIException e) {
-			setStatus(IPDebugElementStatus.WARNING, MessageFormat.format(CoreModelMessages.getString("PThread.1"), new Object[] { e
-					.getMessage() }));
-		}
-		return depth;
-	}
-
-	/**
-	 * 
-	 */
-	protected void initialize() {
-		fStackFrames = new ArrayList<IStackFrame>();
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isCurrent() {
-		return fIsCurrent;
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isDisposed() {
-		return fDisposed;
-	}
-
-	/**
-	 * @return
-	 */
-	protected boolean isInstructionsteppingEnabled() {
-		return ((PDebugTarget) getDebugTarget()).isInstructionSteppingEnabled();
-	}
-
-	/**
-	 * 
-	 */
-	protected synchronized void preserveStackFrames() {
-		Iterator<IStackFrame> it = fStackFrames.iterator();
-		while (it.hasNext()) {
-			IPStackFrame frame = (IPStackFrame) (((IAdaptable) it.next()).getAdapter(IPStackFrame.class));
-			if (frame instanceof PStackFrame) {
-				((PStackFrame) frame).preserve();
-			}
-		}
-		setRefreshChildren(true);
-	}
-
-	/**
-	 * @param detail
-	 * @param events
-	 */
-	protected void resumedByTarget(int detail, List<DebugEvent> events) {
-		syncWithBackend();
-		if (isCurrent() && detail != DebugEvent.CLIENT_REQUEST && detail != DebugEvent.UNSPECIFIED) {
-			setState(PDebugElementState.STEPPED);
-			preserveStackFrames();
-			events.add(createResumeEvent(detail));
-		} else {
-			setState(PDebugElementState.RESUMED);
-			disposeStackFrames();
-			events.add(createChangeEvent(DebugEvent.CLIENT_REQUEST));
-		}
-		setCurrent(false);
-		setCurrentStateInfo(null);
-	}
-
-	/**
-	 * @param current
-	 */
-	protected void setCurrent(boolean current) {
-		fIsCurrent = current;
-	}
-
-	/**
-	 * @param reason
-	 * @param suspensionThread
-	 */
-	protected void suspendByTarget(IPDISessionObject reason, IPDIThread suspensionThread) {
-		setState(PDebugElementState.SUSPENDED);
-		setCurrentStateInfo(null);
-		if (getPDIThread().equals(suspensionThread)) {
-			setCurrent(true);
-			setCurrentStateInfo(reason);
-			if (reason instanceof IPDIBreakpointInfo) {
-				handleBreakpointHit((IPDIBreakpointInfo) reason);
-			} else if (reason instanceof IPDIEndSteppingRangeInfo) {
-				handleEndSteppingRange((IPDIEndSteppingRangeInfo) reason);
-			} else if (reason instanceof IPDIFunctionFinishedInfo) {
-
-			} else if (reason instanceof IPDILocationReachedInfo) {
-
-			} else if (reason instanceof IPDISignalInfo) {
-				handleSuspendedBySignal((IPDISignalInfo) reason);
-			} else if (reason instanceof IPDISharedLibraryInfo) {
-
-			} else if (reason instanceof IPDIWatchpointScopeInfo) {
-
-			} else if (reason instanceof IPDIWatchpointTriggerInfo) {
-
-			} else {
-				// fireSuspendEvent( DebugEvent.CLIENT_REQUEST );
-				// Temporary fix for bug 56520
-				fireSuspendEvent(DebugEvent.BREAKPOINT);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void terminated() {
-		setState(PDebugElementState.TERMINATED);
-		dispose();
-	}
-
-	/**
-	 * @param newFrames
-	 * @param offset
-	 * @param oldFrames
-	 * @param length
-	 * @throws DebugException
-	 */
-	protected void updateStackFrames(IPDIStackFrame[] newFrames, int offset, List<IStackFrame> oldFrames, int length)
-			throws DebugException {
-		for (int i = 0; i < length; i++) {
-			PStackFrame frame = (PStackFrame) oldFrames.get(offset);
-			frame.setPDIStackFrame(newFrames[offset]);
-			offset++;
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValue.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValue.java
deleted file mode 100644
index cb73494..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValue.java
+++ /dev/null

@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.ptp.debug.core.model.IPDebugElementStatus;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.PVariableFormat;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeChar;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFloat;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeInt;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeReference;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeString;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValue;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueChar;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueFloat;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueInt;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValuePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueReference;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFValueString;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeAggregate;
-import org.eclipse.ptp.debug.core.pdi.model.aif.ITypeDerived;
-
-/**
- * @author Clement chu
- *
- */
-public class PValue extends AbstractPValue {
-	private String fValueString = null;
-	private List<IVariable> fVariables = Collections.EMPTY_LIST;
-	private IPDIVariable fVariable;
-
-	protected PValue(PVariable parent, IPDIVariable variable) {
-		super(parent);
-		fVariable = variable;		
-	}
-	protected PValue(PVariable parent, String message) {
-		super(parent);
-		setStatus(IPDebugElementStatus.ERROR, message);
-	}
-	public String getReferenceTypeName() throws DebugException {
-		return (getParentVariable() != null) ? getParentVariable().getReferenceTypeName() : null;
-	}
-	public String getValueString() throws DebugException {
-		if (fValueString == null && getAIF() != null) {
-			resetStatus();
-			IPStackFrame pframe = getParentVariable().getStackFrame();
-			boolean isSuspended = (pframe == null) ? getPDISession().isSuspended(getTasks()) : pframe.isSuspended();
-			if (isSuspended) {
-				try {
-					if (fVariable == null) {
-						targetRequestFailed("No variable found", null);
-					}
-					fValueString = processUnderlyingValue(getAIF());
-				} catch (AIFException pe) {
-					setStatus(IPDebugElementStatus.ERROR, pe.getMessage());
-				}
-			}
-		}
-		return fValueString;
-	}
-	public boolean isAllocated() throws DebugException {
-		return true;
-	}
-	public IVariable[] getVariables() throws DebugException {
-		List<IVariable> list = getVariables0();
-		return (IVariable[]) list.toArray(new IVariable[list.size()]);
-	}
-	protected synchronized List<IVariable> getVariables0() throws DebugException {
-		if (!isAllocated() || !hasVariables())
-			return Collections.EMPTY_LIST;
-		if (fVariables.size() == 0) {
-			try {
-				List<IPDIVariable> vars = getPDIVariables();
-				fVariables = new ArrayList<IVariable>(vars.size());
-				Iterator<IPDIVariable> it = vars.iterator();
-				while (it.hasNext()) {
-					fVariables.add(PVariableFactory.createLocalVariable(this, (IPDIVariable)it.next()));
-				}
-				resetStatus();
-			} catch (DebugException e) {
-				setStatus(IPDebugElementStatus.ERROR, e.getMessage());
-			}
-		}
-		return fVariables;
-	}
-	public boolean hasVariables() throws DebugException {
-		IAIF aif = getAIF();
-		if (aif != null) {
-			IAIFType type = aif.getType();
-			if (type instanceof ITypeAggregate || type instanceof ITypeDerived) {
-				return true;
-			}
-		}
-		return false;
-	}
-	public IAIF getAIF() throws DebugException {
-		try {
-			return fVariable.getAIF();
-		} catch (PDIException e) {
-			targetRequestFailed(e.getMessage(), e);
-			return null;
-		}
-	}
-	protected List<IPDIVariable> getPDIVariables() throws DebugException {
-		IPDIVariable[] vars = null;
-		try {
-			if (fVariable != null) {
-				vars = fVariable.getChildren();
-				if (vars == null) {
-					vars = new IPDIVariable[0];
-				}
-			}
-		} catch (PDIException e) {
-			requestFailed(e.getMessage(), e);
-		}
-		return Arrays.asList(vars);
-	}
-	protected synchronized void setChanged(boolean changed) {
-		if (changed) {
-			fValueString = null;
-			resetStatus();
-		}
-		Iterator<IVariable> it = fVariables.iterator();
-		while (it.hasNext()) {
-			((AbstractPVariable) it.next()).setChanged(changed);
-		}
-	}
-	public void dispose() {
-		Iterator<IVariable> it = fVariables.iterator();
-		while (it.hasNext()) {
-			((AbstractPVariable) it.next()).dispose();
-		}
-	}
-	protected String processUnderlyingValue(IAIF aif) throws AIFException {
-		if (aif != null) {
-			return processUnderlyingValue(aif.getType(), aif.getValue());
-		}
-		return null;
-	}
-	private String processUnderlyingValue(IAIFType type, IAIFValue value) throws AIFException {
-		if (type instanceof IAIFTypeChar)
-			return getCharValueString((IAIFValueChar) value);
-		else if (type instanceof IAIFTypeInt)
-			return getIntValueString((IAIFValueInt) value);
-		else if (type instanceof IAIFTypeFloat)
-			return getFloatingPointValueString((IAIFValueFloat) value);
-		else if (type instanceof IAIFTypePointer)
-			return getPointerValueString((IAIFValuePointer) value);
-		else if (type instanceof IAIFTypeReference)
-			return processUnderlyingValue(type, ((IAIFValueReference) value).getParent());
-		else if (type instanceof IAIFTypeString)
-			return getWCharValueString((IAIFValueString) value);
-		else if (type instanceof ITypeAggregate)
-			return "{...}";
-		else
-			return value.getValueString();
-	}
-	private String getCharValueString(IAIFValueChar value) throws AIFException {
-		PVariableFormat format = getParentVariable().getFormat();
-		char charValue = value.charValue();
-		if (PVariableFormat.NATURAL.equals(format)) {
-			return ((Character.isISOControl(charValue) && charValue != '\b' && charValue != '\t' && charValue != '\n' && charValue != '\f' && charValue != '\r') || charValue < 0) ? "" : "\'" + value.getValueString() + "\'";
-		} else if (PVariableFormat.DECIMAL.equals(format)) {
-			return Integer.toString((byte)charValue);
-		} else if (PVariableFormat.HEXADECIMAL.equals(format)) {
-			StringBuffer sb = new StringBuffer("0x");
-			String stringValue = Integer.toString((byte)charValue);
-			sb.append((stringValue.length() > 2) ? stringValue.substring(stringValue.length() - 2) : stringValue);
-			return sb.toString();
-		}
-		return null;
-	}
-	private String getIntValueString(IAIFValueInt value) throws AIFException {
-		PVariableFormat format = getParentVariable().getFormat();
-		String stringValue = value.getValueString();
-		if (PVariableFormat.NATURAL.equals(format) || PVariableFormat.DECIMAL.equals(format)) {
-			return stringValue;
-		} else if (PVariableFormat.HEXADECIMAL.equals(format)) {
-			StringBuffer sb = new StringBuffer("0x");
-			if (value.isShort()) {
-				stringValue = Integer.toHexString(value.shortValue());
-			} else if (value.isInt()) {
-				stringValue = Integer.toHexString(value.intValue());
-			} else if (value.isLong()) {
-				stringValue = Long.toHexString(value.longValue());
-			}
-			sb.append((stringValue.length() > 8) ? stringValue.substring(stringValue.length() - 8) : stringValue);
-			return sb.toString();
-		}
-		return null;
-	}
-	private String getFloatingPointValueString(IAIFValueFloat value) throws AIFException {
-		if (value.isDouble()) {
-			return getDoubleValueString(value.getValueString());
-		} else if (value.isFloat()) {
-			return getFloatValueString(value.getValueString());
-		} else {
-			return value.getValueString();
-		}
-	}
-	private String getFloatValueString(String floatValue) throws AIFException {
-		PVariableFormat format = getParentVariable().getFormat();
-		if (PVariableFormat.NATURAL.equals(format)) {
-			return floatValue;
-		}
-		Float flt = new Float(floatValue);
-		if (flt.isNaN() || flt.isInfinite())
-			return "";
-		long longValue = flt.longValue();
-		if (PVariableFormat.DECIMAL.equals(format)) {
-			return Long.toString(longValue);
-		} else if (PVariableFormat.HEXADECIMAL.equals(format)) {
-			StringBuffer sb = new StringBuffer("0x");
-			String stringValue = Long.toHexString(longValue);
-			sb.append((stringValue.length() > 8) ? stringValue.substring(stringValue.length() - 8) : stringValue);
-			return sb.toString();
-		}
-		return floatValue;
-	}
-	private String getDoubleValueString(String doubleValue) throws AIFException {
-		PVariableFormat format = getParentVariable().getFormat();
-		if (PVariableFormat.NATURAL.equals(format)) {
-			return doubleValue;
-		}
-		Double dbl = new Double(doubleValue);
-		if (dbl.isNaN() || dbl.isInfinite())
-			return "";
-		long longValue = dbl.longValue();
-		if (PVariableFormat.DECIMAL.equals(format)) {
-			return Long.toString(longValue);
-		} else if (PVariableFormat.HEXADECIMAL.equals(format)) {
-			StringBuffer sb = new StringBuffer("0x");
-			String stringValue = Long.toHexString(longValue);
-			sb.append((stringValue.length() > 16) ? stringValue.substring(stringValue.length() - 16) : stringValue);
-			return sb.toString();
-		}
-		return doubleValue;
-	}
-	private String getPointerValueString(IAIFValuePointer value) throws AIFException {
-		BigInteger pv = value.pointerValue();
-		if (pv == null)
-			return "";
-		PVariableFormat format = getParentVariable().getFormat();
-		if (PVariableFormat.NATURAL.equals(format) || PVariableFormat.HEXADECIMAL.equals(format))
-			return pv.toString(16);
-		if (PVariableFormat.DECIMAL.equals(format))
-			return pv.toString(10);
-		return null;
-	}
-	private String getWCharValueString(IAIFValueString value) throws AIFException {
-		return value.getValueString();
-	}
-	protected void reset() {
-		resetStatus();
-		fValueString = null;
-		Iterator<IVariable> it = fVariables.iterator();
-		while (it.hasNext()) {
-			((AbstractPVariable) it.next()).resetValue();
-		}
-	}
-	protected void preserve() {
-		setChanged(false);
-		resetStatus();
-		Iterator<IVariable> it = fVariables.iterator();
-		while (it.hasNext()) {
-			((AbstractPVariable) it.next()).preserve();
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValueFactory.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValueFactory.java
deleted file mode 100644
index 56e4057..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PValueFactory.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.model.PDebugElementState;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-
-/**
- * @author Clement chu
- * 
- */
-public class PValueFactory {
-	static public final IPValue NULL_VALUE = new IPValue() {
-		public IAIF getAIF() {
-			return null;
-		}
-		public IPSession getSession() {
-			return null;
-		}
-		public String getReferenceTypeName() throws DebugException {
-			return "";
-		}
-		public String getValueString() throws DebugException {
-			return "";
-		}
-		public boolean isAllocated() throws DebugException {
-			return true;
-		}
-		public IVariable[] getVariables() throws DebugException {
-			return new IVariable[0];
-		}
-		public boolean hasVariables() throws DebugException {
-			return false;
-		}
-		public String getModelIdentifier() {
-			return PTPDebugCorePlugin.getUniqueIdentifier();
-		}
-		public IDebugTarget getDebugTarget() {
-			return null;
-		}
-		public ILaunch getLaunch() {
-			return null;
-		}
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-		public String evaluateAsExpression(IPStackFrame frame) {
-			return "";
-		}
-		public PDebugElementState getState() {
-			return PDebugElementState.UNDEFINED;
-		}
-		public Object getCurrentStateInfo() {
-			return null;
-		}
-		public int getID() {
-			return -1;
-		}
-	};
-	static public PValue createValue(PVariable parent, IPDIVariable variable) {
-		return new PValue(parent, variable);
-	}
-	static public PIndexedValue createIndexedValue(AbstractPVariable parent, IPDIVariable variable, int start, int length) {
-		return new PIndexedValue(parent, variable, start, length);
-	}
-	static public PValue createValueWithError(PVariable parent, String message) {
-		return new PValue(parent, message);
-	}
-	static public PValue createGlobalValue(PVariable parent, IPDIVariable variable) {
-		return new PGlobalValue(parent, variable);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariable.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariable.java
deleted file mode 100644
index f4ea7a5..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariable.java
+++ /dev/null

@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.text.MessageFormat;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPDebugElementStatus;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.model.PVariableFormat;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIChangedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventListener;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIVariableInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariable;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class PVariable extends AbstractPVariable implements IPDIEventListener {
-	interface IInternalVariable {
-		IInternalVariable createShadow(int start, int length) throws DebugException;
-		IInternalVariable createShadow(String type) throws DebugException;
-		String getQualifiedName() throws DebugException;
-		IPValue getValue() throws DebugException;
-		void setValue(String expression) throws DebugException;
-		boolean isChanged();
-		void setChanged(boolean changed);
-		void dispose(boolean destroy);
-		boolean isSameDescriptor(IPDIVariableDescriptor desc);
-		boolean isSameVariable(IPDIVariable pdiVar);
-		void resetValue();
-		boolean isEditable() throws DebugException;
-		boolean isArgument();
-		int sizeof();
-		void invalidateValue();
-		void preserve();
-	}
-
-	private boolean fIsEnabled = true;
-	private IInternalVariable fOriginal;
-	private IInternalVariable fShadow;
-	private String fName;
-	private PVariableFormat fFormat = PVariableFormat.getFormat(PTPDebugCorePlugin.getDefault().getPluginPreferences().getInt(IPDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT));
-	private boolean fIsDisposed = false;
-
-	protected PVariable(PDebugElement parent, IPDIVariableDescriptor pdiVariableObject) {
-		super(parent);
-		if (pdiVariableObject != null) {
-			setName(pdiVariableObject.getName());
-			createOriginal(pdiVariableObject);
-		}
-		fIsEnabled = (parent instanceof AbstractPValue) ? ((AbstractPValue) parent).getParentVariable().isEnabled() : !isBookkeepingEnabled();
-		getPDISession().getEventManager().addEventListener(this);
-	}
-	protected PVariable(PDebugElement parent, IPDIVariableDescriptor pdiVariableObject, String errorMessage) {
-		super(parent);
-		if (pdiVariableObject != null) {
-			setName(pdiVariableObject.getName());
-			createOriginal(pdiVariableObject);
-		}
-		fIsEnabled = !isBookkeepingEnabled();
-		setStatus(IPDebugElementStatus.ERROR, MessageFormat.format(CoreModelMessages.getString("PVariable.1"), new Object[] { errorMessage }));
-		getPDISession().getEventManager().addEventListener(this);
-	}
-	public boolean isEnabled() {
-		return fIsEnabled;
-	}
-	public void setEnabled(boolean enabled) throws DebugException {
-		IInternalVariable iv = getOriginal();
-		if (iv != null)
-			iv.dispose(true);
-		iv = getShadow();
-		if (iv != null)
-			iv.dispose(true);
-		fIsEnabled = enabled;
-		fireChangeEvent(DebugEvent.STATE);
-	}
-	public boolean canEnableDisable() {
-		return !(getParent() instanceof IValue);
-	}
-	public boolean isArgument() {
-		IInternalVariable iv = getOriginal();
-		return (iv != null) ? iv.isArgument() : false;
-	}
-	public IPValue getValue() throws DebugException {
-		if (!isDisposed() && isEnabled()) {
-			IInternalVariable iv = getCurrentInternalVariable();
-			if (iv != null) {
-				try {
-					return iv.getValue();
-				} catch (DebugException e) {
-					setStatus(IPDebugElementStatus.ERROR, e.getMessage());
-				}
-			}
-		}
-		return PValueFactory.NULL_VALUE;
-	}
-	public String getName() throws DebugException {
-		return fName;
-	}
-	public String getReferenceTypeName() throws DebugException {
-		IAIF aif = getAIF();
-		return (aif != null) ? aif.getType().toString() : "";
-	}
-	public boolean hasValueChanged() throws DebugException {
-		if (isDisposed())
-			return false;
-		IInternalVariable iv = getCurrentInternalVariable();
-		return (iv != null) ? iv.isChanged() : false;
-	}
-	public boolean supportsFormatting() {
-		return true;
-	}
-	public PVariableFormat getFormat() {
-		return fFormat;
-	}
-	public void changeFormat(PVariableFormat format) throws DebugException {
-		setFormat(format);
-		resetValue();
-	}
-	public boolean canCastToArray() {
-		try {
-			return (getOriginal() != null && isEnabled() && (getAIF().getType() instanceof IAIFTypePointer));
-		} catch (DebugException e) {
-			return false;
-		}
-	}
-	public void castToArray(int startIndex, int length) throws DebugException {
-		IInternalVariable current = getCurrentInternalVariable();
-		if (current != null) {
-			IInternalVariable newVar = current.createShadow(startIndex, length);
-			if (getShadow() != null)
-				getShadow().dispose(true);
-			setShadow(newVar);
-			resetValue();
-		}
-	}
-	public void setValue(String expression) throws DebugException {
-		IInternalVariable iv = getCurrentInternalVariable();
-		if (iv != null) {
-			String newExpression = processExpression(expression);
-			iv.setValue(newExpression);
-		}
-	}
-	public void setValue(IValue value) throws DebugException {
-		notSupported(CoreModelMessages.getString("PVariable.3"));
-	}
-	public boolean supportsValueModification() {
-		try {
-			return getCurrentInternalVariable().isEditable();
-		} catch (DebugException e) {
-			return false;
-		}
-	}
-	public boolean verifyValue(String expression) throws DebugException {
-		return true;
-	}
-	public boolean verifyValue(IValue value) throws DebugException {
-		return value.getDebugTarget().equals(getDebugTarget());
-	}
-	public boolean canCast() {
-		return (getOriginal() != null && isEnabled());
-	}
-	public void restoreOriginal() throws DebugException {
-		IInternalVariable oldVar = getShadow();
-		setShadow(null);
-		if (oldVar != null)
-			oldVar.dispose(true);
-		IInternalVariable iv = getOriginal();
-		if (iv != null)
-			iv.invalidateValue();
-		resetValue();
-	}
-	public boolean isCasted() {
-		return (getShadow() != null);
-	}
-	public void handleDebugEvents(IPDIEvent[] events) {
-		for (int i = 0; i < events.length; i++) {
-			IPDIEvent event = events[i];
-			if (!event.contains(getTasks()))
-				continue;
-			
-			if (event instanceof IPDIChangedEvent) {
-				handleChangedEvent((IPDIChangedEvent) event);
-			}
-			else if (event instanceof IPDIResumedEvent) {
-				handleResumedEvent((IPDIResumedEvent)event);
-			}
-		}
-	}
-	private void handleResumedEvent(IPDIResumedEvent event) {
-		boolean changed = false;
-		if (hasErrors()) {
-			resetStatus();
-			changed = true;
-			IInternalVariable iv = getCurrentInternalVariable();
-			if (iv != null)
-				iv.invalidateValue();
-		}
-		if (changed)
-			fireChangeEvent(DebugEvent.STATE);
-	}
-	private void handleChangedEvent(IPDIChangedEvent event) {
-		IPDISessionObject reason = event.getReason();
-		if (reason instanceof IPDIVariableInfo) {
-			IInternalVariable iv = getCurrentInternalVariable();
-			if (iv != null) {
-				if (iv.isSameVariable(((IPDIVariableInfo)reason).getVariable())) {
-					iv.setChanged(true);
-					fireChangeEvent(DebugEvent.STATE);
-				}
-			}
-		}
-	}
-	private IInternalVariable getCurrentInternalVariable() {
-		if (getShadow() != null)
-			return getShadow();
-		return getOriginal();
-	}
-	private IInternalVariable getOriginal() {
-		return fOriginal;
-	}
-	protected void setOriginal(IInternalVariable original) {
-		fOriginal = original;
-	}
-	private IInternalVariable getShadow() {
-		return fShadow;
-	}
-	private void setShadow(IInternalVariable shadow) {
-		fShadow = shadow;
-	}
-	protected boolean isBookkeepingEnabled() {
-		boolean result = false;
-		return result;
-	}
-	abstract protected void createOriginal(IPDIVariableDescriptor vo);
-	protected boolean hasErrors() {
-		return !isOK();
-	}
-	protected void setChanged(boolean changed) {
-		IInternalVariable iv = getCurrentInternalVariable();
-		if (iv != null) {
-			iv.setChanged(changed);
-		}
-	}
-	protected void resetValue() {
-		IInternalVariable iv = getCurrentInternalVariable();
-		if (iv != null) {
-			resetStatus();
-			iv.resetValue();
-			fireChangeEvent(DebugEvent.STATE);
-		}
-	}
-	private String processExpression(String oldExpression) throws DebugException {
-		return oldExpression;
-	}
-	public void dispose() {
-		internalDispose(false);
-		setDisposed(true);
-	}
-	protected int sizeof() {
-		IInternalVariable iv = getCurrentInternalVariable();
-		return (iv != null) ? iv.sizeof() : -1;
-	}
-	public boolean equals(Object obj) {
-		if (obj instanceof PVariable) {
-			if (isDisposed() != ((PVariable)obj).isDisposed())
-				return false;
-			IInternalVariable iv = getOriginal();
-			return (iv != null) ? iv.equals(((PVariable) obj).getOriginal()) : false;
-		}
-		return false;
-	}
-	protected boolean sameVariable(IPDIVariableDescriptor vo) {
-		IInternalVariable iv = getOriginal();
-		return (iv != null && iv.isSameDescriptor(vo));
-	}
-	protected void setFormat(PVariableFormat format) {
-		fFormat = format;
-	}
-	public String getExpressionString() throws DebugException {
-		IInternalVariable iv = getCurrentInternalVariable();
-		return (iv != null) ? iv.getQualifiedName() : null;
-	}
-	protected void preserve() {
-		resetStatus();
-		IInternalVariable iv = getCurrentInternalVariable();
-		if (iv != null)
-			iv.preserve();
-	}
-	protected void internalDispose(boolean destroy) {
-		getPDISession().getEventManager().removeEventListener(this);
-		IInternalVariable iv = getOriginal();
-		if (iv != null)
-			iv.dispose(destroy);
-		iv = getShadow();
-		if (iv != null)
-			iv.dispose(destroy);
-	}
-	protected boolean isDisposed() {
-		return fIsDisposed;
-	}
-	protected void setDisposed(boolean isDisposed) {
-		fIsDisposed = isDisposed;
-	}
-	protected void invalidateValue() {
-		resetStatus();
-		IInternalVariable iv = getCurrentInternalVariable();
-		if (iv != null)
-			iv.invalidateValue();
-	}
-	protected void setName(String name) {
-		fName = name;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariableFactory.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariableFactory.java
deleted file mode 100644
index 800e826..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/model/PVariableFactory.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.model;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.debug.core.model.IPGlobalVariableDescriptor;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIVariableDescriptor;
-
-/**
- * @author Clement chu
- * 
- */
-public class PVariableFactory {
-	public static PVariable createLocalVariable(PDebugElement parent, IPDIVariableDescriptor pdiVariableObject) {
-		return new PLocalVariable(parent, pdiVariableObject);
-	}
-	public static PVariable createLocalVariableWithError(PDebugElement parent, IPDIVariableDescriptor pdiVariableObject, String message) {
-		return new PLocalVariable(parent, pdiVariableObject, message);
-	}
-	public static IPGlobalVariableDescriptor createGlobalVariableDescriptor(final String name, final IPath path) {
-		return new IPGlobalVariableDescriptor() {
-			public String getName() {
-				return name;
-			}
-			public IPath getPath() {
-				return (path != null) ? path : new Path("");
-			}
-			public String toString() {
-				return MessageFormat.format("{0}::{1}", new Object[] { getPath().toOSString(), getName() });
-			}
-			public boolean equals(Object obj) {
-				if (!(obj instanceof IPGlobalVariableDescriptor))
-					return false;
-				IPGlobalVariableDescriptor d = (IPGlobalVariableDescriptor) obj;
-				return (getName().compareTo(d.getName()) == 0 && getPath().equals(d.getPath()));
-			}
-		};
-	}
-	public static PGlobalVariable createGlobalVariable(PDebugElement parent, IPGlobalVariableDescriptor descriptor, IPDIVariableDescriptor pdiVariableObject) {
-		return new PGlobalVariable(parent, descriptor, pdiVariableObject);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java
deleted file mode 100644
index e9de1eb..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/AbsolutePathSourceContainerType.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.eclipse.ptp.debug.core.sourcelookup.AbsolutePathSourceContainer;
-
-/**
- * @author clement
- *
- */
-public class AbsolutePathSourceContainerType extends AbstractSourceContainerTypeDelegate {
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		return new AbsolutePathSourceContainer();
-	}
-	public String getMemento(ISourceContainer container) throws CoreException {
-		return "";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java
deleted file mode 100644
index 6ac0edc..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/CommonSourceLookupDirector.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.sourcelookup.PSourceLookupDirector;
-
-public class CommonSourceLookupDirector extends PSourceLookupDirector {
-	public void setSourceContainers(ISourceContainer[] containers) {
-		try {
-			super.setSourceContainers(containers);
-			PTPDebugCorePlugin.getDefault().getPluginPreferences().setValue(IPDebugConstants.PREF_COMMON_SOURCE_CONTAINERS, getMemento());
-			PTPDebugCorePlugin.getDefault().savePluginPreferences();
-		} catch (CoreException e) {
-			PTPDebugCorePlugin.log(e.getStatus());
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.java
deleted file mode 100644
index cdc64fd..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class InternalSourceLookupMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.core.sourcelookup.InternalSourceLookupMessages";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InternalSourceLookupMessages() {}
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.properties b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.properties
deleted file mode 100644
index 0368deb..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/InternalSourceLookupMessages.properties
+++ /dev/null

@@ -1,33 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 QNX Software Systems 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:
-#     QNX Software Systems - initial API and implementation
-###############################################################################
-
-PPDirectorySourceLocation.0=Unable to create memento for PTP directory source location {0}.
-PDirectorySourceLocation.1=Unable to initialize source location - missing directory path.
-PDirectorySourceLocation.2=Unable to initialize source location - invalid directory path {0}.
-PDirectorySourceLocation.3=Exception occurred initializing source location.
-PDirectorySourceContainerType.0=Unable to restore directory source lookup entry - missing path attribute.
-PDirectorySourceContainerType.1=Unable to restore directory source lookup entry - expecting directory element.
-PDirectorySourceContainerType.2=Unable to restore directory source lookup entry - invalid memento.
-PProjectSourceLocation.0=Unable to create memento for PTP project source location {0}.
-PProjectSourceLocation.1=Unable to initialize source location - missing project name
-PProjectSourceLocation.2=Exception occurred initializing source location.
-PSourceLocator.0=Unable to create memento for PTP source locator.
-PSourceLocator.1=Unable to restore PTP source locator - invalid format.
-PSourceLocator.2=Exception occurred initializing source locator.
-PSourceLocator.3=Error initializing directory source location.
-MapEntrySourceContainerType.0=Source lookup: unable to restore map entry - missing backend path attribute.
-MapEntrySourceContainerType.1=Source lookup: unable to restore map entry - missing local path attribute.
-MapEntrySourceContainerType.2=Source lookup: unable to restore map entry - expecting map entry element.
-MapEntrySourceContainerType.3=Source lookup: unable to restore map entry - invalid memento.
-MappingSourceContainerType.0=Source lookup: unable to restore map entry - expecting memnto attribute.
-MappingSourceContainerType.1=Source lookup: unable to restore mapping - expecting mapping element.
-MappingSourceContainerType.2=Source lookup: unable to restore mapping - invalid memento.
-SourceUtils.0=Mapping

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainer.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainer.java
deleted file mode 100644
index 7f72e74..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainer.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-
-public class MapEntrySourceContainer extends AbstractSourceContainer {
-	public static final String TYPE_ID = PTPDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapEntry";
-	private IPath fLocalPath;
-	private IPath fBackendPath;
-
-	public MapEntrySourceContainer() {
-		fBackendPath = Path.EMPTY;
-		fLocalPath = Path.EMPTY;
-	}
-	public MapEntrySourceContainer(IPath backend, IPath local) {
-		fBackendPath = backend;
-		fLocalPath = local;
-	}
-	public Object[] findSourceElements(String name) throws CoreException {
-		IPath path = new Path(name);
-		if (getBackendPath().isPrefixOf(path)) {
-			path = path.removeFirstSegments(getBackendPath().segmentCount());
-			path = getLocalPath().append(path);
-			IFile[] wsFiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
-			ArrayList<IFile> list = new ArrayList<IFile>();
-			for (int j = 0; j < wsFiles.length; ++j) {
-				if (wsFiles[j].exists()) {
-					list.add(wsFiles[j]);
-					if (!isFindDuplicates())
-						break;
-				}
-			}
-			if (list.size() > 0)
-				return list.toArray();
-			File file = path.toFile();
-			if (file.exists() && file.isFile()) {
-				return new Object[] { new LocalFileStorage(file) };
-			}
-		}
-		return EMPTY;
-	}
-	public String getName() {
-		return MessageFormat.format("{0} - {1}", new Object[] { getBackendPath().toOSString(), getLocalPath().toOSString() });
-	}
-	public ISourceContainerType getType() {
-		return getSourceContainerType(TYPE_ID);
-	}
-	public IPath getLocalPath() {
-		return fLocalPath;
-	}
-	public IPath getBackendPath() {
-		return fBackendPath;
-	}
-	public void setLocalPath(IPath local) {
-		fLocalPath = local;
-	}
-	public void setBackendPath(IPath backend) {
-		fBackendPath = backend;
-	}
-	public boolean equals(Object o) {
-		if (!(o instanceof MapEntrySourceContainer))
-			return false;
-		MapEntrySourceContainer entry = (MapEntrySourceContainer) o;
-		return (entry.getBackendPath().equals(getBackendPath()) && entry.getLocalPath().equals(getLocalPath()));
-	}
-	public MapEntrySourceContainer copy() {
-		return new MapEntrySourceContainer(fBackendPath, fLocalPath);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java
deleted file mode 100644
index 54b71c9..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MapEntrySourceContainerType.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author clement
- *
- */
-public class MapEntrySourceContainerType extends AbstractSourceContainerTypeDelegate {
-	private final static String ELEMENT_NAME = "mapEntry";
-	private final static String BACKEND_PATH = "backendPath";
-	private final static String LOCAL_PATH = "localPath";
-
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		Node node = parseDocument(memento);
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element)node;
-			if (ELEMENT_NAME.equals(element.getNodeName())) {
-				String path = element.getAttribute(BACKEND_PATH);
-				IPath backend = new Path(path);
-				if (!backend.isValidPath(path)) {
-					abort(InternalSourceLookupMessages.getString("MapEntrySourceContainerType.0"), null);
-				}
-				path = element.getAttribute(LOCAL_PATH);
-				IPath local = new Path(path);
-				if (!local.isValidPath(path)) {
-					abort(InternalSourceLookupMessages.getString("MapEntrySourceContainerType.1"), null);
-				}
-				return new MapEntrySourceContainer(backend, local);
-			}
-			abort(InternalSourceLookupMessages.getString("MapEntrySourceContainerType.2"), null);
-		}
-		abort(InternalSourceLookupMessages.getString("MapEntrySourceContainerType.3"), null);
-		return null;
-	}
-	public String getMemento(ISourceContainer container) throws CoreException {
-		MapEntrySourceContainer entry = (MapEntrySourceContainer)container;
-		Document document = newDocument();
-		Element element = document.createElement(ELEMENT_NAME);
-		element.setAttribute(BACKEND_PATH, entry.getBackendPath().toOSString());
-		element.setAttribute(LOCAL_PATH, entry.getLocalPath().toOSString());
-		document.appendChild(element);
-		return serializeDocument(document);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MappingSourceContainerType.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MappingSourceContainerType.java
deleted file mode 100644
index 34ed918..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/MappingSourceContainerType.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.eclipse.ptp.debug.core.sourcelookup.MappingSourceContainer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author clement
- *
- */
-public class MappingSourceContainerType extends AbstractSourceContainerTypeDelegate {
-	private final static String ELEMENT_MAPPING = "mapping";
-	private final static String ELEMENT_MAP_ENTRY = "mapEntry";
-	private final static String ATTR_NAME = "name";
-	private final static String ATTR_MEMENTO = "memento";
-
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		Node node = parseDocument(memento);
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element)node;
-			if (ELEMENT_MAPPING.equals(element.getNodeName())) {
-				String name = element.getAttribute(ATTR_NAME);
-				if (name == null) 
-					name = "";
-				List<MapEntrySourceContainer> entries = new ArrayList<MapEntrySourceContainer>();
-				Node childNode = element.getFirstChild();
-				while(childNode != null) {
-					if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-						Element child = (Element)childNode;
-						if (ELEMENT_MAP_ENTRY.equals(child.getNodeName())) {
-							String childMemento = child.getAttribute(ATTR_MEMENTO);
-							if (childMemento == null || childMemento.length() == 0) {
-								abort(InternalSourceLookupMessages.getString("MappingSourceContainerType.0"), null);
-							}
-							ISourceContainerType type = DebugPlugin.getDefault().getLaunchManager().getSourceContainerType(MapEntrySourceContainer.TYPE_ID);
-							MapEntrySourceContainer entry = (MapEntrySourceContainer)type.createSourceContainer(childMemento);
-							entries.add(entry);
-						}
-					}
-					childNode = childNode.getNextSibling();
-				}
-				MappingSourceContainer container = new MappingSourceContainer(name);
-				Iterator<MapEntrySourceContainer> it = entries.iterator();
-				while(it.hasNext()) {
-					container.addMapEntry((MapEntrySourceContainer)it.next());
-				}
-				return container;
-			}
-			abort(InternalSourceLookupMessages.getString("MappingSourceContainerType.1"), null);
-		}
-		abort(InternalSourceLookupMessages.getString("MappingSourceContainerType.2"), null);
-		return null;		
-	}
-	public String getMemento(ISourceContainer container) throws CoreException {
-		Document document = newDocument();
-		Element element = document.createElement(ELEMENT_MAPPING);
-		element.setAttribute(ATTR_NAME, container.getName());
-		ISourceContainer[] entries = ((MappingSourceContainer)container).getSourceContainers();
-		for (int i = 0; i < entries.length; ++i) {
-			Element child = document.createElement(ELEMENT_MAP_ENTRY);
-			child.setAttribute(ATTR_MEMENTO, entries[i].getType().getMemento(entries[i]));
-			element.appendChild(child);
-		}
-		document.appendChild(element);
-		return serializeDocument(document);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainer.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainer.java
deleted file mode 100644
index 8b148c3..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainer.java
+++ /dev/null

@@ -1,197 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2004, 2005 QNX Software Systems 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:
- * QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup; 
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceContainerType;
-import org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
- 
-/**
- * It is not supposed to subclass DirectorySourceContainer, but we need to use 
- * the different browser.
- */
-public class PDirectorySourceContainer extends CompositeSourceContainer {
-
-	/**
-	 * Unique identifier for the PTP directory source container type
-	 * (value <code>org.eclipse.ptp.debug.core.containerType.directory</code>).
-	 */
-	public static final String TYPE_ID = PTPDebugCorePlugin.getUniqueIdentifier() + ".containerType.directory";
-
-	// root directory
-	private File fDirectory;
-	// whether to search subfolders
-	private boolean fSubfolders = false;
-
-	/**
-	 * Consutructs an external folder container for the
-	 * directory identified by the given path.
-	 * 
-	 * @param dirPath path to a directory in the local file system
-	 * @param subfolders whether folders within the root directory
-	 *  should be searched for source elements
-	 */
-	public PDirectorySourceContainer( IPath dirPath, boolean subfolders ) {
-		this( dirPath.toFile(), subfolders );
-	}
-	
-	/**
-	 * Consutructs an external folder container for the
-	 * directory identified by the given file.
-	 * 
-	 * @param dir a directory in the local file system
-	 * @param subfolders whether folders within the root directory
-	 *  should be searched for source elements
-	 */
-	public PDirectorySourceContainer( File dir, boolean subfolders ) {
-		fDirectory = dir;
-		fSubfolders = subfolders;
-	}	
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName()
-	 */
-	public String getName() {
-		return fDirectory.getName();
-	}	
-	
-	/**
-	 * Returns the root directory in the local file system associated
-	 * with this source container.
-	 * 
-	 * @return the root directory in the local file system associated
-	 * with this source container
-	 */
-	public File getDirectory() {
-		return fDirectory;
-	}
-
-	public boolean searchSubfolders() {
-		return fSubfolders;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getType()
-	 */
-	public ISourceContainerType getType() {
-		return getSourceContainerType( TYPE_ID );
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
-	 */
-	public Object[] findSourceElements( String name ) throws CoreException {
-		ArrayList<Object> sources = new ArrayList<Object>();
-		File directory = getDirectory();
-		File file = new File( directory, name );
-		if ( file.exists() && file.isFile() ) {
-			sources.add( new LocalFileStorage( file ) );
-		}
-		// check subfolders
-		if ( (isFindDuplicates() && fSubfolders) || (sources.isEmpty() && fSubfolders) ) {
-			ISourceContainer[] containers = getSourceContainers();
-			for( int i = 0; i < containers.length; i++ ) {
-				Object[] objects = containers[i].findSourceElements( name );
-				if ( objects == null || objects.length == 0 ) {
-					continue;
-				}
-				if ( isFindDuplicates() ) {
-					for( int j = 0; j < objects.length; j++ )
-						sources.add( objects[j] );
-				}
-				else {
-					sources.add( objects[0] );
-					break;
-				}
-			}
-		}
-		if ( sources.isEmpty() )
-			return EMPTY;
-		return sources.toArray();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#isComposite()
-	 */
-	public boolean isComposite() {
-		return fSubfolders;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals( Object obj ) {
-		if ( obj instanceof PDirectorySourceContainer ) {
-			PDirectorySourceContainer container = (PDirectorySourceContainer)obj;
-			return container.getDirectory().equals( getDirectory() );
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getDirectory().hashCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers()
-	 */
-	protected ISourceContainer[] createSourceContainers() throws CoreException {
-		if ( isComposite() ) {
-			String[] files = fDirectory.list();
-			if ( files != null ) {
-				List<ISourceContainer> dirs = new ArrayList<ISourceContainer>();
-				for( int i = 0; i < files.length; i++ ) {
-					String name = files[i];
-					File file = new File( getDirectory(), name );
-					if ( file.exists() && file.isDirectory() ) {
-						dirs.add( new PDirectorySourceContainer( file, true ) );
-					}
-				}
-				ISourceContainer[] containers = (ISourceContainer[])dirs.toArray( new ISourceContainer[dirs.size()] );
-				for( int i = 0; i < containers.length; i++ ) {
-					ISourceContainer container = containers[i];
-					container.init( getDirector() );
-				}
-				return containers;
-			}
-		}
-		return new ISourceContainer[0];
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainerType.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainerType.java
deleted file mode 100644
index 151d561..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceContainerType.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainerTypeDelegate;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author clement
- * See <code>PDirectorySourceContainer</code>.
- */
-public class PDirectorySourceContainerType extends AbstractSourceContainerTypeDelegate {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String)
-	 */
-	public ISourceContainer createSourceContainer(String memento) throws CoreException {
-		Node node = parseDocument(memento);
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element) node;
-			if ("directory".equals(element.getNodeName())) {
-				String string = element.getAttribute("path");
-				if (string == null || string.length() == 0) {
-					abort(InternalSourceLookupMessages.getString("PDirectorySourceContainerType.0"), null);
-				}
-				String nest = element.getAttribute("nest");
-				boolean nested = "true".equals(nest);
-				return new PDirectorySourceContainer(new Path(string), nested);
-			}
-			abort(InternalSourceLookupMessages.getString("PDirectorySourceContainerType.1"), null);
-		}
-		abort(InternalSourceLookupMessages.getString("PDirectorySourceContainerType.2"), null);
-		return null;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
-	public String getMemento(ISourceContainer container) throws CoreException {
-		PDirectorySourceContainer folder = (PDirectorySourceContainer) container;
-		Document document = newDocument();
-		Element element = document.createElement("directory");
-		element.setAttribute("path", folder.getDirectory().getAbsolutePath());
-		String nest = "false";
-		if (folder.isComposite()) {
-			nest = "true";
-		}
-		element.setAttribute("nest", nest);
-		document.appendChild(element);
-		return serializeDocument(document);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceLocation.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceLocation.java
deleted file mode 100644
index d68562d..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PDirectorySourceLocation.java
+++ /dev/null

@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.sourcelookup.IDirectorySourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * @author Clement chu
- * 
- */
-public class PDirectorySourceLocation implements IDirectorySourceLocation {
-	private static final String ELEMENT_NAME = "cDirectorySourceLocation";
-	private static final String ATTR_DIRECTORY = "directory";
-	private static final String ATTR_ASSOCIATION = "association";
-	private static final String ATTR_SEARCH_SUBFOLDERS = "searchSubfolders";
-	private IPath fDirectory;
-	private IPath fAssociation = null;
-	private boolean fSearchForDuplicateFiles = false;
-	private boolean fSearchSubfolders = false;
-	private File[] fFolders = null;
-
-	public PDirectorySourceLocation() {}
-
-	public PDirectorySourceLocation(IPath directory, IPath association, boolean searchSubfolders) {
-		setDirectory(directory);
-		setAssociation(association);
-		setSearchSubfolders(searchSubfolders);
-	}
-	public Object findSourceElement(String name) throws CoreException {
-		Object result = null;
-		if (!isEmpty(name) && getDirectory() != null) {
-			File file = new File(name);
-			if (file.isAbsolute())
-				result = findFileByAbsolutePath(name);
-			else
-				result = findFileByRelativePath(name);
-			if (result == null && getAssociation() != null) {
-				IPath path = new Path(name);
-				if (path.segmentCount() > 1 && getAssociation().isPrefixOf(path)) {
-					path = getDirectory().append(path.removeFirstSegments(getAssociation().segmentCount()));
-					result = findFileByAbsolutePath(path.toOSString());
-				}
-			}
-		}
-		return result;
-	}
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPSourceLocation.class))
-			return this;
-		if (adapter.equals(PDirectorySourceLocation.class))
-			return this;
-		if (adapter.equals(IPath.class))
-			return getDirectory();
-		return null;
-	}
-	private void setDirectory(IPath directory) {
-		fDirectory = directory;
-	}
-	public IPath getDirectory() {
-		return fDirectory;
-	}
-	public void getDirectory(IPath path) {
-		fDirectory = path;
-	}
-	public void setAssociation(IPath association) {
-		fAssociation = association;
-	}
-	public IPath getAssociation() {
-		return fAssociation;
-	}
-	private Object findFileByAbsolutePath(String name) {
-		File file = new File(name);
-		if (!file.isAbsolute())
-			return null;
-		File[] folders = getFolders();
-		if (folders != null) {
-			LinkedList<Object> list = new LinkedList<Object>();
-			for (int i = 0; i < folders.length; ++i) {
-				Object result = findFileByAbsolutePath(folders[i], name);
-				if (result instanceof List) {
-					if (searchForDuplicateFiles())
-						list.addAll((List<?>)result);
-					else
-						return list.getFirst();
-				} else if (result != null) {
-					if (searchForDuplicateFiles())
-						list.add(result);
-					else
-						return result;
-				}
-			}
-			if (list.size() > 0)
-				return (list.size() == 1) ? list.getFirst() : list;
-		}
-		return null;
-	}
-	private Object findFileByAbsolutePath(File folder, String name) {
-		File file = new File(name);
-		if (!file.isAbsolute())
-			return null;
-		IPath filePath = new Path(name);
-		IPath path = new Path(folder.getAbsolutePath());
-		IPath association = getAssociation();
-		if (!isPrefix(path, filePath) || path.segmentCount() + 1 != filePath.segmentCount()) {
-			if (association != null && isPrefix(association, filePath) && association.segmentCount() + 1 == filePath.segmentCount())
-				filePath = path.append(filePath.removeFirstSegments(association.segmentCount()));
-			else
-				return null;
-		}
-		// Try for a file in another workspace project
-		IFile[] wsFiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(filePath);
-		LinkedList<IFile> list = new LinkedList<IFile>();
-		for (int j = 0; j < wsFiles.length; ++j)
-			if (wsFiles[j].exists()) {
-				if (!searchForDuplicateFiles())
-					return wsFiles[j];
-				list.add(wsFiles[j]);
-			}
-		if (list.size() > 0)
-			return (list.size() == 1) ? list.getFirst() : list;
-		file = filePath.toFile();
-		if (file.exists() && file.isFile()) {
-			return createExternalFileStorage(filePath);
-		}
-		return null;
-	}
-	private Object findFileByRelativePath(String fileName) {
-		File[] folders = getFolders();
-		if (folders != null) {
-			LinkedList<Object> list = new LinkedList<Object>();
-			for (int i = 0; i < folders.length; ++i) {
-				Object result = findFileByRelativePath(folders[i], fileName);
-				if (result instanceof List) {
-					if (searchForDuplicateFiles())
-						list.addAll((List<?>) result);
-					else
-						return list.getFirst();
-				} else if (result != null) {
-					if (searchForDuplicateFiles())
-						list.add(result);
-					else
-						return result;
-				}
-			}
-			if (list.size() > 0)
-				return (list.size() == 1) ? list.getFirst() : list;
-		}
-		return null;
-	}
-	private Object findFileByRelativePath(File folder, String fileName) {
-		IPath path = new Path(folder.getAbsolutePath());
-		path = path.append(fileName);
-		File file = path.toFile();
-		if (file.exists() && file.isFile()) {
-			path = new Path(file.getAbsolutePath());
-			IFile[] wsFiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
-			LinkedList<IFile> list = new LinkedList<IFile>();
-			for (int j = 0; j < wsFiles.length; ++j)
-				if (wsFiles[j].exists()) {
-					if (!searchForDuplicateFiles())
-						return wsFiles[j];
-					list.add(wsFiles[j]);
-				}
-			if (list.size() > 0)
-				return (list.size() == 1) ? list.getFirst() : list;
-			return createExternalFileStorage(path);
-		}
-		return null;
-	}
-	private IStorage createExternalFileStorage(IPath path) {
-		return new LocalFileStorage(path.toFile());
-	}
-	public String getMemento() throws CoreException {
-		Document document = null;
-		Throwable ex = null;
-		try {
-			document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-			Element node = document.createElement(ELEMENT_NAME);
-			document.appendChild(node);
-			node.setAttribute(ATTR_DIRECTORY, getDirectory().toOSString());
-			if (getAssociation() != null)
-				node.setAttribute(ATTR_ASSOCIATION, getAssociation().toOSString());
-			node.setAttribute(ATTR_SEARCH_SUBFOLDERS, new Boolean(searchSubfolders()).toString());
-			return PDebugUtils.serializeDocument(document);
-		} catch (ParserConfigurationException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		} catch (TransformerException e) {
-			ex = e;
-		}
-		abort(MessageFormat.format(InternalSourceLookupMessages.getString("PDirectorySourceLocation.0"), new Object[] { getDirectory().toOSString() }), ex);
-		// execution will not reach here
-		return null;
-	}
-	public void initializeFrom(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-			String dir = root.getAttribute(ATTR_DIRECTORY);
-			if (isEmpty(dir)) {
-				abort(InternalSourceLookupMessages.getString("PDirectorySourceLocation.1"), null);
-			} else {
-				IPath path = new Path(dir);
-				if (path.isValidPath(dir) && path.toFile().isDirectory() && path.toFile().exists()) {
-					setDirectory(path);
-				} else {
-					abort(MessageFormat.format(InternalSourceLookupMessages.getString("PDirectorySourceLocation.2"), new Object[] { dir }), null);
-				}
-			}
-			dir = root.getAttribute(ATTR_ASSOCIATION);
-			if (isEmpty(dir)) {
-				setAssociation(null);
-			} else {
-				IPath path = new Path(dir);
-				if (path.isValidPath(dir)) {
-					setAssociation(path);
-				} else {
-					setAssociation(null);
-				}
-			}
-			setSearchSubfolders(Boolean.valueOf(root.getAttribute(ATTR_SEARCH_SUBFOLDERS)).booleanValue());
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(InternalSourceLookupMessages.getString("PDirectorySourceLocation.3"), ex);
-	}
-	private void abort(String message, Throwable e) throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, message, e);
-		throw new CoreException(s);
-	}
-	private boolean isEmpty(String string) {
-		return string == null || string.length() == 0;
-	}
-	public boolean equals(Object obj) {
-		if (obj instanceof IDirectorySourceLocation) {
-			IPath dir = ((IDirectorySourceLocation) obj).getDirectory();
-			IPath association = ((IDirectorySourceLocation) obj).getAssociation();
-			if (dir == null)
-				return false;
-			boolean result = dir.equals(getDirectory());
-			if (result) {
-				if (association == null && getAssociation() == null)
-					return true;
-				if (association != null)
-					return association.equals(getAssociation());
-			}
-		}
-		return false;
-	}
-	private boolean isPrefix(IPath prefix, IPath path) {
-		int segCount = prefix.segmentCount();
-		if (segCount >= path.segmentCount())
-			return false;
-		String prefixString = prefix.toOSString();
-		String pathString = path.removeLastSegments(path.segmentCount() - segCount).toOSString();
-		return prefixString.equalsIgnoreCase(pathString);
-	}
-	public void setSearchForDuplicateFiles(boolean search) {
-		fSearchForDuplicateFiles = search;
-	}
-	public boolean searchForDuplicateFiles() {
-		return fSearchForDuplicateFiles;
-	}
-	public boolean searchSubfolders() {
-		return fSearchSubfolders;
-	}
-	public void setSearchSubfolders(boolean search) {
-		resetFolders();
-		fSearchSubfolders = search;
-	}
-	protected File[] getFolders() {
-		if (fFolders == null)
-			initializeFolders();
-		return fFolders;
-	}
-	protected void resetFolders() {
-		fFolders = null;
-	}
-	private void initializeFolders() {
-		if (getDirectory() != null) {
-			ArrayList<File> list = new ArrayList<File>();
-			File root = getDirectory().toFile();
-			list.add(root);
-			if (searchSubfolders())
-				list.addAll(getFileFolders(root));
-			fFolders = (File[]) list.toArray(new File[list.size()]);
-		}
-	}
-	private List<File> getFileFolders(File file) {
-		ArrayList<File> list = new ArrayList<File>();
-		File[] folders = file.listFiles(new FileFilter() {
-			public boolean accept(File pathname) {
-				return pathname.isDirectory();
-			}
-		});
-		list.addAll(Arrays.asList(folders));
-		for (int i = 0; i < folders.length; ++i)
-			list.addAll(getFileFolders(folders[i]));
-		return list;
-	}
-	public String toString() {
-		return (getDirectory() != null) ? getDirectory().toOSString() : "";
-	}
-	public void dispose() {}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PProjectSourceLocation.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PProjectSourceLocation.java
deleted file mode 100644
index 6ba03bf..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PProjectSourceLocation.java
+++ /dev/null

@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.IProjectSourceLocation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * @author Clement chu
- * 
- */
-public class PProjectSourceLocation implements IProjectSourceLocation {
-	private static final String ELEMENT_NAME = "cProjectSourceLocation";
-	private static final String ATTR_PROJECT = "project";
-	private static final String ATTR_GENERIC = "generic";
-	private IProject fProject;
-	private IResource[] fFolders;
-	private HashMap<String, Object> fCache = new HashMap<String, Object>(20);
-	private HashSet<String> fNotFoundCache = new HashSet<String>(20);
-	private boolean fGenerated = true;
-	private boolean fSearchForDuplicateFiles = false;
-
-	public PProjectSourceLocation() {}
-	public PProjectSourceLocation(IProject project) {
-		setProject(project);
-		fGenerated = true;
-	}
-	public PProjectSourceLocation(IProject project, boolean generated) {
-		setProject(project);
-		fGenerated = generated;
-	}
-	public Object findSourceElement(String name) throws CoreException {
-		Object result = null;
-		if (!isEmpty(name) && getProject() != null && !notFoundCacheLookup(name)) {
-			result = cacheLookup(name);
-			if (result == null) {
-				result = doFindSourceElement(name);
-				if (result != null) {
-					cacheSourceElement(name, result);
-				}
-			}
-			if (result == null) {
-				cacheNotFound(name);
-			}
-		}
-		return result;
-	}
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPSourceLocation.class))
-			return this;
-		if (adapter.equals(PProjectSourceLocation.class))
-			return this;
-		if (adapter.equals(IProject.class))
-			return getProject();
-		return null;
-	}
-	private void setProject(IProject project) {
-		fProject = project;
-	}
-	public IProject getProject() {
-		return fProject;
-	}
-	private Object doFindSourceElement(String name) {
-		File file = new File(name);
-		return (file.isAbsolute()) ? findFileByAbsolutePath(file) : findFileByRelativePath(name);
-	}
-	private Object findFileByAbsolutePath(File file) {
-		LinkedList<IFile> list = new LinkedList<IFile>();
-		if (file.exists()) {
-			IPath path = new Path(file.getAbsolutePath());
-			IFile[] wsFiles = PTPDebugCorePlugin.getWorkspace().getRoot().findFilesForLocation(path);
-			for (int i = 0; i < wsFiles.length; ++i)
-				if (wsFiles[i].getProject().equals(getProject()) && wsFiles[i].exists()) {
-					if (!searchForDuplicateFiles())
-						return wsFiles[i];
-					list.add(wsFiles[i]);
-				}
-		}
-		return (list.size() > 0) ? ((list.size() == 1) ? list.getFirst() : list) : null;
-	}
-	private Object findFileByRelativePath(String fileName) {
-		IResource[] folders = getFolders();
-		LinkedList<IFile> list = new LinkedList<IFile>();
-		for (int i = 0; i < folders.length; ++i) {
-			if (list.size() > 0 && !searchForDuplicateFiles())
-				break;
-			IPath path = folders[i].getLocation();
-			if (path != null) {
-				path = path.append(fileName);
-				File file = new File(path.toOSString());
-				if (file.exists()) {
-					IFile[] wsFiles = PTPDebugCorePlugin.getWorkspace().getRoot().findFilesForLocation(path);
-					for (int j = 0; j < wsFiles.length; ++j)
-						if (wsFiles[j].exists()) {
-							if (!searchForDuplicateFiles())
-								return wsFiles[j];
-							list.add(wsFiles[j]);
-						}
-				}
-			}
-		}
-		return (list.size() > 0) ? ((list.size() == 1) ? list.getFirst() : list) : null;
-	}
-	private Object cacheLookup(String name) {
-		return fCache.get(name);
-	}
-	private boolean notFoundCacheLookup(String name) {
-		return fNotFoundCache.contains(name);
-	}
-	private void cacheSourceElement(String name, Object element) {
-		fCache.put(name, element);
-	}
-	private void cacheNotFound(String name) {
-		fNotFoundCache.add(name);
-	}
-	public void dispose() {
-		fCache.clear();
-		fNotFoundCache.clear();
-	}
-	public String getMemento() throws CoreException {
-		Document document = null;
-		Throwable ex = null;
-		try {
-			document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-			Element node = document.createElement(ELEMENT_NAME);
-			document.appendChild(node);
-			node.setAttribute(ATTR_PROJECT, getProject().getName());
-			node.setAttribute(ATTR_GENERIC, new Boolean(isGeneric()).toString());
-			return PDebugUtils.serializeDocument(document);
-		} catch (ParserConfigurationException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		} catch (TransformerException e) {
-			ex = e;
-		}
-		abort(MessageFormat.format(InternalSourceLookupMessages.getString("PProjectSourceLocation.0"), new Object[] { getProject().getName() }), ex);
-		// execution will not reach here
-		return null;
-	}
-	public void initializeFrom(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-			String name = root.getAttribute(ATTR_PROJECT);
-			if (isEmpty(name)) {
-				abort(InternalSourceLookupMessages.getString("PProjectSourceLocation.1"), null);
-			} else {
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-				setProject(project);
-			}
-			String isGeneric = root.getAttribute(ATTR_GENERIC);
-			if (isGeneric == null || isGeneric.trim().length() == 0)
-				isGeneric = Boolean.FALSE.toString();
-			setGenerated(isGeneric.equals(Boolean.TRUE.toString()));
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(InternalSourceLookupMessages.getString("PProjectSourceLocation.2"), ex);
-	}
-	private void abort(String message, Throwable e) throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, message, e);
-		throw new CoreException(s);
-	}
-	private boolean isEmpty(String string) {
-		return string == null || string.length() == 0;
-	}
-	public boolean isGeneric() {
-		return fGenerated;
-	}
-	public void setGenerated(boolean b) {
-		fGenerated = b;
-	}
-	public boolean equals(Object obj) {
-		if (obj instanceof IProjectSourceLocation && getProject() != null)
-			return getProject().equals(((IProjectSourceLocation) obj).getProject());
-		return false;
-	}
-	private void initializeFolders() {
-		final LinkedList<IResource> list = new LinkedList<IResource>();
-		if (getProject() != null && getProject().exists()) {
-			list.add(getProject());
-			try {
-				getProject().accept(new IResourceProxyVisitor() {
-					public boolean visit(IResourceProxy proxy) throws CoreException {
-						switch (proxy.getType()) {
-						case IResource.FILE:
-							return false;
-						case IResource.FOLDER:
-							list.addLast(proxy.requestResource());
-							return true;
-						}
-						return true;
-					}
-				}, IResource.NONE);
-			} catch (CoreException e) {
-			}
-		}
-		synchronized (this) {
-			if (fFolders == null) {
-				fFolders = (IResource[]) list.toArray(new IResource[list.size()]);
-			}
-		}
-	}
-	protected IResource[] getFolders() {
-		if (fFolders == null)
-			initializeFolders();
-		return fFolders;
-	}
-	public boolean searchForDuplicateFiles() {
-		return fSearchForDuplicateFiles;
-	}
-	public void setSearchForDuplicateFiles(boolean search) {
-		fCache.clear();
-		fNotFoundCache.clear();
-		fSearchForDuplicateFiles = search;
-	}
-	public String toString() {
-		return (getProject() != null) ? fProject.toString() : "";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLocator.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLocator.java
deleted file mode 100644
index 7719ea8..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLocator.java
+++ /dev/null

@@ -1,512 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IPersistableSourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocator;
-import org.eclipse.ptp.debug.core.sourcelookup.IProjectSourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.SourceLookupFactory;
-import org.osgi.framework.Bundle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * @author Clement chu
- * 
- */
-public class PSourceLocator implements IPSourceLocator, IPersistableSourceLocator, IResourceChangeListener {
-	private static final String SOURCE_LOCATOR_NAME = "pSourceLocator";
-	private static final String DISABLED_GENERIC_PROJECT_NAME = "disabledGenericProject";
-	private static final String ADDITIONAL_SOURCE_LOCATION_NAME = "additionalSourceLocation";
-	private static final String SOURCE_LOCATION_NAME = "cSourceLocation";
-	private static final String ATTR_CLASS = "class";
-	private static final String ATTR_MEMENTO = "memento";
-	private static final String ATTR_PROJECT_NAME = "projectName";
-	private static final String ATTR_DUPLICATE_FILES = "duplicateFiles";
-	private IProject fProject = null;
-	private IPSourceLocation[] fSourceLocations;
-	private List<IProject> fReferencedProjects = new ArrayList<IProject>(10);
-	private boolean fDuplicateFiles = false;
-
-	public PSourceLocator(IProject project) {
-		setProject(project);
-		setReferencedProjects();
-		setSourceLocations(getDefaultSourceLocations());
-	}
-	public Object getSourceElement(IStackFrame stackFrame) {
-		return getInput(stackFrame);
-	}
-	public int getLineNumber(IStackFrame frame) {
-		return (frame instanceof IPStackFrame) ? ((IPStackFrame) frame).getFrameLineNumber() : 0;
-	}
-	protected Object getInput(IStackFrame f) {
-		if (f instanceof IPStackFrame) {
-			IPStackFrame frame = (IPStackFrame) f;
-			LinkedList<Object> list = new LinkedList<Object>();
-			if (frame != null) {
-				Object result = null;
-				String fileName = frame.getFile();
-				if (fileName != null && fileName.length() > 0) {
-					IPSourceLocation[] locations = getSourceLocations();
-					for (int i = 0; i < locations.length; ++i) {
-						try {
-							result = locations[i].findSourceElement(fileName);
-						} catch (CoreException e) {
-							// do nothing
-						}
-						if (result != null) {
-							if (result instanceof List)
-								list.addAll((List<?>) result);
-							else
-								list.add(result);
-							if (!searchForDuplicateFiles())
-								break;
-						}
-					}
-				}
-			}
-			return (list.size() > 0) ? ((list.size() == 1) ? list.getFirst() : list) : null;
-		}
-		return null;
-	}
-	public boolean contains(IResource resource) {
-		IPSourceLocation[] locations = getSourceLocations();
-		for (int i = 0; i < locations.length; ++i) {
-			if (resource instanceof IProject) {
-				if (locations[i] instanceof PProjectSourceLocation && ((PProjectSourceLocation) locations[i]).getProject().equals(resource)) {
-					return true;
-				}
-			}
-			if (resource instanceof IFile) {
-				try {
-					Object result = locations[i].findSourceElement(resource.getLocation().toOSString());
-					if (result instanceof IFile && ((IFile) result).equals(resource))
-						return true;
-					if (result instanceof List && ((List<?>) result).contains(resource))
-						return true;
-				} catch (CoreException e) {
-				}
-			}
-		}
-		return false;
-	}
-	public IPSourceLocation[] getSourceLocations() {
-		return fSourceLocations;
-	}
-	public void setSourceLocations(IPSourceLocation[] locations) {
-		fSourceLocations = locations;
-	}
-	public static IPSourceLocation[] getDefaultSourceLocations(IProject project) {
-		ArrayList<IProjectSourceLocation> list = new ArrayList<IProjectSourceLocation>();
-		if (project != null && project.exists()) {
-			list.add(SourceLookupFactory.createProjectSourceLocation(project));
-			addReferencedSourceLocations(list, project);
-		}
-		return (IPSourceLocation[]) list.toArray(new IPSourceLocation[list.size()]);
-	}
-	private static void addReferencedSourceLocations(List<IProjectSourceLocation> list, IProject project) {
-		if (project != null) {
-			try {
-				IProject[] projects = project.getReferencedProjects();
-				for (int i = 0; i < projects.length; i++) {
-					if (projects[i].exists() && !containsProject(list, projects[i])) {
-						list.add(SourceLookupFactory.createProjectSourceLocation(projects[i]));
-						addReferencedSourceLocations(list, projects[i]);
-					}
-				}
-			} catch (CoreException e) {
-				// do nothing
-			}
-		}
-	}
-	private static boolean containsProject(List<IProjectSourceLocation> list, IProject project) {
-		Iterator<IProjectSourceLocation> it = list.iterator();
-		while (it.hasNext()) {
-			IProjectSourceLocation location = (IProjectSourceLocation) it.next();
-			if (project.equals(location.getProject()))
-				return true;
-		}
-		return false;
-	}
-	public Object findSourceElement(String fileName) {
-		Object result = null;
-		if (fileName != null && fileName.length() > 0) {
-			IPSourceLocation[] locations = getSourceLocations();
-			for (int i = 0; i < locations.length; ++i) {
-				try {
-					result = locations[i].findSourceElement(fileName);
-				} catch (CoreException e) {
-					// do nothing
-				}
-				if (result != null)
-					break;
-			}
-		}
-		return result;
-	}
-	public String getMemento() throws CoreException {
-		Document document = null;
-		Throwable ex = null;
-		try {
-			document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-			Element node = document.createElement(SOURCE_LOCATOR_NAME);
-			document.appendChild(node);
-			IPSourceLocation[] locations = getSourceLocations();
-			saveDisabledGenericSourceLocations(locations, document, node);
-			saveAdditionalSourceLocations(locations, document, node);
-			node.setAttribute(ATTR_DUPLICATE_FILES, new Boolean(searchForDuplicateFiles()).toString());
-			return PDebugUtils.serializeDocument(document);
-		} catch (ParserConfigurationException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		} catch (TransformerException e) {
-			ex = e;
-		}
-		abort(InternalSourceLookupMessages.getString("PSourceLocator.0"), ex);
-		// execution will not reach here
-		return null;
-	}
-	public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException {
-		setSourceLocations(getDefaultSourceLocations());
-	}
-	public void initializeFromMemento(String memento) throws CoreException {
-		Exception ex = null;
-		try {
-			Element root = null;
-			DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			StringReader reader = new StringReader(memento);
-			InputSource source = new InputSource(reader);
-			root = parser.parse(source).getDocumentElement();
-			if (!root.getNodeName().equalsIgnoreCase(SOURCE_LOCATOR_NAME)) {
-				abort(InternalSourceLookupMessages.getString("PSourceLocator.1"), null);
-			}
-			List<IPSourceLocation> sourceLocations = new ArrayList<IPSourceLocation>();
-			// Add locations based on referenced projects
-			IProject project = getProject();
-			if (project != null && project.exists() && project.isOpen())
-				sourceLocations.addAll(Arrays.asList(getDefaultSourceLocations()));
-			removeDisabledLocations(root, sourceLocations);
-			addAdditionalLocations(root, sourceLocations);
-			// To support old launch configuration
-			addOldLocations(root, sourceLocations);
-			setSourceLocations((IPSourceLocation[]) sourceLocations.toArray(new IPSourceLocation[sourceLocations.size()]));
-			setSearchForDuplicateFiles(Boolean.valueOf(root.getAttribute(ATTR_DUPLICATE_FILES)).booleanValue());
-			return;
-		} catch (ParserConfigurationException e) {
-			ex = e;
-		} catch (SAXException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		}
-		abort(InternalSourceLookupMessages.getString("PSourceLocator.2"), ex);
-	}
-	private void removeDisabledLocations(Element root, List<IPSourceLocation> sourceLocations) {
-		NodeList list = root.getChildNodes();
-		int length = list.getLength();
-		HashSet<String> disabledProjects = new HashSet<String>(length);
-		for (int i = 0; i < length; ++i) {
-			Node node = list.item(i);
-			short type = node.getNodeType();
-			if (type == Node.ELEMENT_NODE) {
-				Element entry = (Element) node;
-				if (entry.getNodeName().equalsIgnoreCase(DISABLED_GENERIC_PROJECT_NAME)) {
-					String projectName = entry.getAttribute(ATTR_PROJECT_NAME);
-					if (isEmpty(projectName)) {
-						PTPDebugCorePlugin.log("Unable to restore C/C++ source locator - invalid format.");
-					}
-					disabledProjects.add(projectName.trim());
-				}
-			}
-		}
-		Iterator<IPSourceLocation> it = sourceLocations.iterator();
-		while (it.hasNext()) {
-			IPSourceLocation location = (IPSourceLocation) it.next();
-			if (location instanceof IProjectSourceLocation && disabledProjects.contains(((IProjectSourceLocation) location).getProject().getName()))
-				it.remove();
-		}
-	}
-	private void addAdditionalLocations(Element root, List<IPSourceLocation> sourceLocations) throws CoreException {
-		Bundle bundle = PTPDebugCorePlugin.getDefault().getBundle();
-		MultiStatus status = new MultiStatus(PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, InternalSourceLookupMessages.getString("PSourceLocator.3"), null);
-		NodeList list = root.getChildNodes();
-		int length = list.getLength();
-		for (int i = 0; i < length; ++i) {
-			Node node = list.item(i);
-			short type = node.getNodeType();
-			if (type == Node.ELEMENT_NODE) {
-				Element entry = (Element) node;
-				if (entry.getNodeName().equalsIgnoreCase(ADDITIONAL_SOURCE_LOCATION_NAME)) {
-					String className = entry.getAttribute(ATTR_CLASS);
-					String data = entry.getAttribute(ATTR_MEMENTO);
-					if (isEmpty(className)) {
-						PTPDebugCorePlugin.log("Unable to restore C/C++ source locator - invalid format.");
-						continue;
-					}
-					Class clazz = null;
-					try {
-						clazz = bundle.loadClass(className);
-					} catch (ClassNotFoundException e) {
-						PTPDebugCorePlugin.log(MessageFormat.format("Unable to restore source location - class not found {0}", new Object[] { className }));
-						continue;
-					}
-					IPSourceLocation location = null;
-					try {
-						location = (IPSourceLocation) clazz.newInstance();
-					} catch (IllegalAccessException e) {
-						PTPDebugCorePlugin.log("Unable to restore source location.");
-						continue;
-					} catch (InstantiationException e) {
-						PTPDebugCorePlugin.log("Unable to restore source location.");
-						continue;
-					}
-					try {
-						location.initializeFrom(data);
-						sourceLocations.add(location);
-					} catch (CoreException e) {
-						status.addAll(e.getStatus());
-					}
-				}
-			}
-		}
-		if (status.getSeverity() > IStatus.OK)
-			throw new CoreException(status);
-	}
-	private void addOldLocations(Element root, List<IPSourceLocation> sourceLocations) throws CoreException {
-		Bundle bundle = PTPDebugCorePlugin.getDefault().getBundle();
-		NodeList list = root.getChildNodes();
-		int length = list.getLength();
-		for (int i = 0; i < length; ++i) {
-			Node node = list.item(i);
-			short type = node.getNodeType();
-			if (type == Node.ELEMENT_NODE) {
-				Element entry = (Element) node;
-				if (entry.getNodeName().equalsIgnoreCase(SOURCE_LOCATION_NAME)) {
-					String className = entry.getAttribute(ATTR_CLASS);
-					String data = entry.getAttribute(ATTR_MEMENTO);
-					if (isEmpty(className)) {
-						PTPDebugCorePlugin.log("Unable to restore C/C++ source locator - invalid format.");
-						continue;
-					}
-					Class clazz = null;
-					try {
-						clazz = bundle.loadClass(className);
-					} catch (ClassNotFoundException e) {
-						PTPDebugCorePlugin.log(MessageFormat.format("Unable to restore source location - class not found {0}", new Object[] { className }));
-						continue;
-					}
-					IPSourceLocation location = null;
-					try {
-						location = (IPSourceLocation) clazz.newInstance();
-					} catch (IllegalAccessException e) {
-						PTPDebugCorePlugin.log("Unable to restore source location.");
-						continue;
-					} catch (InstantiationException e) {
-						PTPDebugCorePlugin.log("Unable to restore source location.");
-						continue;
-					}
-					location.initializeFrom(data);
-					if (!sourceLocations.contains(location)) {
-						if (location instanceof PProjectSourceLocation)
-							((PProjectSourceLocation) location).setGenerated(isReferencedProject(((PProjectSourceLocation) location).getProject()));
-						sourceLocations.add(location);
-					}
-				}
-			}
-		}
-	}
-	private void abort(String message, Throwable e) throws CoreException {
-		IStatus s = new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, message, e);
-		throw new CoreException(s);
-	}
-	private boolean isEmpty(String string) {
-		return string == null || string.trim().length() == 0;
-	}
-	public void resourceChanged(IResourceChangeEvent event) {
-		if (event.getSource() instanceof IWorkspace && event.getDelta() != null) {
-			IResourceDelta[] deltas = event.getDelta().getAffectedChildren();
-			if (deltas != null) {
-				ArrayList<IResource> list = new ArrayList<IResource>(deltas.length);
-				for (int i = 0; i < deltas.length; ++i)
-					if (deltas[i].getResource() instanceof IProject)
-						list.add(deltas[i].getResource());
-				resetSourceLocations(list);
-			}
-		}
-	}
-	private void saveDisabledGenericSourceLocations(IPSourceLocation[] locations, Document doc, Element node) {
-		IProject project = getProject();
-		if (project != null && project.exists() && project.isOpen()) {
-			List<IProject> list = PDebugUtils.getReferencedProjects(project);
-			HashSet<String> names = new HashSet<String>(list.size() + 1);
-			names.add(project.getName());
-			Iterator<?> it = list.iterator();
-			while (it.hasNext()) {
-				names.add(((IProject) it.next()).getName());
-			}
-			for (int i = 0; i < locations.length; ++i)
-				if (locations[i] instanceof IProjectSourceLocation && ((IProjectSourceLocation) locations[i]).isGeneric())
-					names.remove(((IProjectSourceLocation) locations[i]).getProject().getName());
-
-			it = names.iterator();
-			while (it.hasNext()) {
-				Element child = doc.createElement(DISABLED_GENERIC_PROJECT_NAME);
-				child.setAttribute(ATTR_PROJECT_NAME, (String) it.next());
-				node.appendChild(child);
-			}
-		}
-	}
-	private void saveAdditionalSourceLocations(IPSourceLocation[] locations, Document doc, Element node) {
-		for (int i = 0; i < locations.length; i++) {
-			if (locations[i] instanceof IProjectSourceLocation && ((IProjectSourceLocation) locations[i]).isGeneric())
-				continue;
-			Element child = doc.createElement(ADDITIONAL_SOURCE_LOCATION_NAME);
-			child.setAttribute(ATTR_CLASS, locations[i].getClass().getName());
-			try {
-				child.setAttribute(ATTR_MEMENTO, locations[i].getMemento());
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-				continue;
-			}
-			node.appendChild(child);
-		}
-	}
-	public IProject getProject() {
-		return fProject;
-	}
-	protected void setProject(IProject project) {
-		fProject = project;
-	}
-	private boolean isReferencedProject(IProject ref) {
-		if (getProject() != null) {
-			try {
-				return Arrays.asList(getProject().getReferencedProjects()).contains(ref);
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-			}
-		}
-		return false;
-	}
-	private void setReferencedProjects() {
-		fReferencedProjects.clear();
-		fReferencedProjects = PDebugUtils.getReferencedProjects(getProject());
-	}
-	protected IPSourceLocation[] getDefaultSourceLocations() {
-		Iterator<IProject> it = fReferencedProjects.iterator();
-		ArrayList<IProjectSourceLocation> list = new ArrayList<IProjectSourceLocation>(fReferencedProjects.size());
-		if (getProject() != null && getProject().exists() && getProject().isOpen())
-			list.add(SourceLookupFactory.createProjectSourceLocation(getProject()));
-		while (it.hasNext()) {
-			IProject project = (IProject) it.next();
-			if (project != null && project.exists() && project.isOpen())
-				list.add(SourceLookupFactory.createProjectSourceLocation(project));
-		}
-		return (IPSourceLocation[]) list.toArray(new IPSourceLocation[list.size()]);
-	}
-	private void resetSourceLocations(List<IResource> affectedProjects) {
-		if (affectedProjects.size() != 0 && getProject() != null) {
-			if (!getProject().exists() || !getProject().isOpen()) {
-				removeGenericSourceLocations();
-			} else {
-				updateGenericSourceLocations(affectedProjects);
-			}
-		}
-	}
-	private void removeGenericSourceLocations() {
-		fReferencedProjects.clear();
-		IPSourceLocation[] locations = getSourceLocations();
-		ArrayList<IPSourceLocation> newLocations = new ArrayList<IPSourceLocation>(locations.length);
-		for (int i = 0; i < locations.length; ++i)
-			if (!(locations[i] instanceof IProjectSourceLocation) || !((IProjectSourceLocation) locations[i]).isGeneric())
-				newLocations.add(locations[i]);
-		setSourceLocations((IPSourceLocation[]) newLocations.toArray(new IPSourceLocation[newLocations.size()]));
-	}
-	private void updateGenericSourceLocations(List<IResource> affectedProjects) {
-		List<IProject> newRefs = PDebugUtils.getReferencedProjects(getProject());
-		IPSourceLocation[] locations = getSourceLocations();
-		ArrayList<IPSourceLocation> newLocations = new ArrayList<IPSourceLocation>(locations.length);
-		for (int i = 0; i < locations.length; ++i) {
-			if (!(locations[i] instanceof IProjectSourceLocation) || !((IProjectSourceLocation) locations[i]).isGeneric()) {
-				newLocations.add(locations[i]);
-			} else {
-				IProject project = ((IProjectSourceLocation) locations[i]).getProject();
-				if (project.exists() && project.isOpen()) {
-					if (newRefs.contains(project) || project.equals(getProject())) {
-						newLocations.add(locations[i]);
-						newRefs.remove(project);
-					}
-				}
-			}
-		}
-		Iterator<IProject> it = newRefs.iterator();
-		while (it.hasNext()) {
-			IProject project = (IProject) it.next();
-			if (!fReferencedProjects.contains(project))
-				newLocations.add(SourceLookupFactory.createProjectSourceLocation(project));
-		}
-		fReferencedProjects = newRefs;
-		setSourceLocations((IPSourceLocation[]) newLocations.toArray(new IPSourceLocation[newLocations.size()]));
-	}
-	public boolean searchForDuplicateFiles() {
-		return fDuplicateFiles;
-	}
-	public void setSearchForDuplicateFiles(boolean search) {
-		fDuplicateFiles = search;
-		IPSourceLocation[] locations = getSourceLocations();
-		for (int i = 0; i < locations.length; ++i)
-			locations[i].setSearchForDuplicateFiles(search);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLookupParticipant.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLookupParticipant.java
deleted file mode 100644
index 5f00cce..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceLookupParticipant.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.sourcelookup.ISourceLookupChangeListener;
-
-/**
- * @author Clement chu
- * 
- */
-public class PSourceLookupParticipant extends AbstractSourceLookupParticipant {
-	static private class NoSourceElement {}
-
-	private static final NoSourceElement gfNoSource = new NoSourceElement();
-	private ListenerList fListeners;
-
-	public PSourceLookupParticipant() {
-		super();
-		fListeners = new ListenerList(1);
-	}
-	public String getSourceName(Object object) throws CoreException {
-		if (object instanceof String) {
-			return (String) object;
-		}
-		if (object instanceof IAdaptable) {
-			IPStackFrame frame = (IPStackFrame) ((IAdaptable) object).getAdapter(IPStackFrame.class);
-			if (frame != null) {
-				String name = frame.getFile();
-				return (name != null && name.trim().length() > 0) ? name : null;
-			}
-		}
-		return null;
-	}
-	public Object[] findSourceElements(Object object) throws CoreException {
-		// Workaround for cases when the stack frame doesn't contain the source file name
-		String name = null;
-		if (object instanceof IAdaptable) {
-			IPStackFrame frame = (IPStackFrame) ((IAdaptable) object).getAdapter(IPStackFrame.class);
-			if (frame != null) {
-				name = frame.getFile().trim();
-				if (name == null || name.length() == 0)
-					return new Object[] { gfNoSource };
-			}
-		} else if (object instanceof String) {
-			name = (String) object;
-		}
-		Object[] foundElements = super.findSourceElements(object);
-		if (foundElements.length == 0 && (object instanceof IDebugElement))
-			foundElements = new Object[] { new PSourceNotFoundElement((IDebugElement)object) };
-		return foundElements;
-	}
-	/*
-	private Object[] findSourceElementByFile(File file) {
-		IFile[] wfiles = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(file.getPath()));
-		if (wfiles.length > 0)
-			return wfiles;
-		return new LocalFileStorage[] { new LocalFileStorage(file) };
-	}
-	*/
-	public void dispose() {
-		fListeners.clear();
-		super.dispose();
-	}
-	public void addSourceLookupChangeListener(ISourceLookupChangeListener listener) {
-		fListeners.add(listener);
-	}
-	public void removeSourceLookupChangeListener(ISourceLookupChangeListener listener) {
-		fListeners.remove(listener);
-	}
-	public void sourceContainersChanged(ISourceLookupDirector director) {
-		Object[] listeners = fListeners.getListeners();
-		for (int i = 0; i < listeners.length; ++i)
-			((ISourceLookupChangeListener) listeners[i]).sourceContainersChanged(director);
-		super.sourceContainersChanged(director);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceManager.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceManager.java
deleted file mode 100644
index 637772d..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceManager.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IPersistableSourceLocator;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocator;
-import org.eclipse.ptp.debug.internal.core.model.PDebugTarget;
-
-/**
- * @author Clement chu
- * 
- */
-public class PSourceManager implements IPSourceLocator, IPersistableSourceLocator, IAdaptable {
-	private ISourceLocator fSourceLocator = null;
-	private ILaunch fLaunch = null;
-	private PDebugTarget fDebugTarget = null;
-
-	public PSourceManager(ISourceLocator sourceLocator) {
-		setSourceLocator(sourceLocator);
-	}
-	public int getLineNumber(IStackFrame frame) {
-		if (getPSourceLocator() != null) {
-			return getPSourceLocator().getLineNumber(frame);
-		}
-		if (frame instanceof IPStackFrame) {
-			return ((IPStackFrame) frame).getFrameLineNumber();
-		}
-		return 0;
-	}
-	public IPSourceLocation[] getSourceLocations() {
-		return (getPSourceLocator() != null) ? getPSourceLocator().getSourceLocations() : new IPSourceLocation[0];
-	}
-	public void setSourceLocations(IPSourceLocation[] locations) {
-		if (getPSourceLocator() != null) {
-			getPSourceLocator().setSourceLocations(locations);
-			PDebugTarget target = getDebugTarget();
-			if (target != null) {
-				/**
-				 * FIXME 
-				 Disassembly d = null; 
-				 try { 
-				 	d = (Disassembly)target.getDisassembly(); 
-				 } catch(DebugException e) {} 
-				 if (d != null) {
-				 	d.reset();
-				 }
-				 */
-			}
-		}
-	}
-	public boolean contains(IResource resource) {
-		return (getPSourceLocator() != null) ? getPSourceLocator().contains(resource) : false;
-	}
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(PSourceManager.class))
-			return this;
-		if (adapter.equals(IPSourceLocator.class))
-			return this;
-		if (adapter.equals(IPersistableSourceLocator.class))
-			return this;
-		if (adapter.equals(IResourceChangeListener.class) && fSourceLocator instanceof IResourceChangeListener)
-			return fSourceLocator;
-		return null;
-	}
-	public Object getSourceElement(IStackFrame stackFrame) {
-		Object result = null;
-		if (getSourceLocator() != null)
-			result = getSourceLocator().getSourceElement(stackFrame);
-		return result;
-	}
-	protected IPSourceLocator getPSourceLocator() {
-		if (getSourceLocator() instanceof IPSourceLocator)
-			return (IPSourceLocator) getSourceLocator();
-		return null;
-	}
-	protected ISourceLocator getSourceLocator() {
-		if (fSourceLocator != null)
-			return fSourceLocator;
-		else if (fLaunch != null)
-			return fLaunch.getSourceLocator();
-		return null;
-	}
-	private void setSourceLocator(ISourceLocator sl) {
-		fSourceLocator = sl;
-	}
-	public Object findSourceElement(String fileName) {
-		if (getPSourceLocator() != null) {
-			return getPSourceLocator().findSourceElement(fileName);
-		}
-		return null;
-	}
-	public String getMemento() throws CoreException {
-		if (getPersistableSourceLocator() != null)
-			return getPersistableSourceLocator().getMemento();
-		return null;
-	}
-	public void initializeDefaults(ILaunchConfiguration configuration) throws CoreException {
-		if (getPersistableSourceLocator() != null)
-			getPersistableSourceLocator().initializeDefaults(configuration);
-	}
-	public void initializeFromMemento(String memento) throws CoreException {
-		if (getPersistableSourceLocator() != null)
-			getPersistableSourceLocator().initializeFromMemento(memento);
-	}
-	private IPersistableSourceLocator getPersistableSourceLocator() {
-		if (fSourceLocator instanceof IPersistableSourceLocator)
-			return (IPersistableSourceLocator) fSourceLocator;
-		return null;
-	}
-	public IProject getProject() {
-		return (getPSourceLocator() != null) ? getPSourceLocator().getProject() : null;
-	}
-	public void setDebugTarget(PDebugTarget target) {
-		fDebugTarget = target;
-	}
-	protected PDebugTarget getDebugTarget() {
-		return fDebugTarget;
-	}
-	public void setSearchForDuplicateFiles(boolean search) {
-		if (getPSourceLocator() != null)
-			getPSourceLocator().setSearchForDuplicateFiles(search);
-	}
-	public boolean searchForDuplicateFiles() {
-		return (getPSourceLocator() != null) ? getPSourceLocator().searchForDuplicateFiles() : false;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceNotFoundElement.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceNotFoundElement.java
deleted file mode 100644
index 8f89491..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourceNotFoundElement.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-
-/**
- * @author clement
- * 
- */
-public class PSourceNotFoundElement implements IDebugElement {
-	private IDebugElement element;
-
-	public IDebugElement getElement() {
-		return element;
-	}
-
-	public PSourceNotFoundElement(IDebugElement element) {
-		this.element = element;
-	}
-
-	public IDebugTarget getDebugTarget() {
-		return element.getDebugTarget();
-	}
-
-	public ILaunch getLaunch() {
-		return element.getLaunch();
-	}
-
-	public String getModelIdentifier() {
-		return element.getModelIdentifier();
-	}
-
-	public Object getAdapter(Class adapter) {
-		return element.getAdapter(adapter);
-	}
-
-	public String getFile() {
-		IPStackFrame frame = (IPStackFrame) ((IAdaptable) element).getAdapter(IPStackFrame.class);
-		if (frame != null) {
-			return frame.getFile().trim();
-		}
-		return "";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourcePathComputerDelegate.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourcePathComputerDelegate.java
deleted file mode 100644
index 86f9bb0..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/PSourcePathComputerDelegate.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-
-/**
- * @author clement
- * Computes the default source lookup path for a launch configuration.
- */
-public class PSourcePathComputerDelegate implements ISourcePathComputerDelegate {
-	public PSourcePathComputerDelegate() {
-		super();
-	}
-	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-		ISourceContainer[] common = PTPDebugCorePlugin.getDefault().getCommonSourceLookupDirector().getSourceContainers();
-		ArrayList<ISourceContainer> containers = new ArrayList<ISourceContainer>(common.length + 1);
-		containers.addAll(Arrays.asList(common));
-		String projectName = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
-		if (projectName != null) {
-			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-			if (project.exists()) {
-				containers.add(0, new ProjectSourceContainer(project, true));
-			}
-		}
-		return (ISourceContainer[]) containers.toArray(new ISourceContainer[containers.size()]);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/SourceUtils.java b/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/SourceUtils.java
deleted file mode 100644
index c1c7ddf..0000000
--- a/debug/org.eclipse.ptp.debug.core/src/org/eclipse/ptp/debug/internal/core/sourcelookup/SourceUtils.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.core.sourcelookup;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.sourcelookup.IDirectorySourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.IPSourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.IProjectSourceLocation;
-import org.eclipse.ptp.debug.core.sourcelookup.MappingSourceContainer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class SourceUtils {
-	private static final String NAME_COMMON_SOURCE_LOCATIONS = "commonSourceLocations";
-	private static final String NAME_SOURCE_LOCATION = "sourceLocation";
-	private static final String ATTR_CLASS = "class";
-	private static final String ATTR_MEMENTO = "memento";
-
-	public static String getCommonSourceLocationsMemento(IPSourceLocation[] locations) {
-		Document document = null;
-		Throwable ex = null;
-		try {
-			document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-			Element element = document.createElement(NAME_COMMON_SOURCE_LOCATIONS);
-			document.appendChild(element);
-			saveSourceLocations(document, element, locations);
-			return PDebugUtils.serializeDocument(document);
-		} catch (ParserConfigurationException e) {
-			ex = e;
-		} catch (IOException e) {
-			ex = e;
-		} catch (TransformerException e) {
-			ex = e;
-		}
-		PTPDebugCorePlugin.log(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), 0, "Error saving common source settings.", ex));
-		return null;
-	}
-	private static void saveSourceLocations(Document doc, Element node, IPSourceLocation[] locations) {
-		for (int i = 0; i < locations.length; i++) {
-			Element child = doc.createElement(NAME_SOURCE_LOCATION);
-			child.setAttribute(ATTR_CLASS, locations[i].getClass().getName());
-			try {
-				child.setAttribute(ATTR_MEMENTO, locations[i].getMemento());
-			} catch (CoreException e) {
-				PTPDebugCorePlugin.log(e);
-				continue;
-			}
-			node.appendChild(child);
-		}
-	}
-	public static IPSourceLocation[] getCommonSourceLocationsFromMemento(String memento) {
-		IPSourceLocation[] result = new IPSourceLocation[0];
-		if (!isEmpty(memento)) {
-			try {
-				DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-				StringReader reader = new StringReader(memento);
-				InputSource source = new InputSource(reader);
-				Element root = parser.parse(source).getDocumentElement();
-				if (root.getNodeName().equalsIgnoreCase(NAME_COMMON_SOURCE_LOCATIONS))
-					result = initializeSourceLocations(root);
-			} catch (ParserConfigurationException e) {
-				PTPDebugCorePlugin.log(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), 0, "Error initializing common source settings.", e));
-			} catch (SAXException e) {
-				PTPDebugCorePlugin.log(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), 0, "Error initializing common source settings.", e));
-			} catch (IOException e) {
-				PTPDebugCorePlugin.log(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), 0, "Error initializing common source settings.", e));
-			}
-		}
-		return result;
-	}
-	public static IPSourceLocation[] initializeSourceLocations(Element root) {
-		List<IPSourceLocation> sourceLocations = new LinkedList<IPSourceLocation>();
-		NodeList list = root.getChildNodes();
-		int length = list.getLength();
-		for (int i = 0; i < length; ++i) {
-			Node node = list.item(i);
-			short type = node.getNodeType();
-			if (type == Node.ELEMENT_NODE) {
-				Element entry = (Element) node;
-				if (entry.getNodeName().equalsIgnoreCase(NAME_SOURCE_LOCATION)) {
-					String className = entry.getAttribute(ATTR_CLASS);
-					String data = entry.getAttribute(ATTR_MEMENTO);
-					if (className == null || className.trim().length() == 0) {
-						PTPDebugCorePlugin.log("Unable to restore common source locations - invalid format.");
-						continue;
-					}
-					Class clazz = null;
-					try {
-						clazz = PTPDebugCorePlugin.getDefault().getBundle().loadClass(className);
-					} catch (ClassNotFoundException e) {
-						PTPDebugCorePlugin.log(MessageFormat.format("Unable to restore source location - class not found {0}", new Object[] { className }));
-						continue;
-					}
-					IPSourceLocation location = null;
-					try {
-						location = (IPSourceLocation) clazz.newInstance();
-					} catch (IllegalAccessException e) {
-						PTPDebugCorePlugin.log("Unable to restore source location: " + e.getMessage());
-						continue;
-					} catch (InstantiationException e) {
-						PTPDebugCorePlugin.log("Unable to restore source location: " + e.getMessage());
-						continue;
-					}
-					try {
-						location.initializeFrom(data);
-						sourceLocations.add(location);
-					} catch (CoreException e) {
-						PTPDebugCorePlugin.log("Unable to restore source location: " + e.getMessage());
-					}
-				}
-			}
-		}
-		return (IPSourceLocation[]) sourceLocations.toArray(new IPSourceLocation[sourceLocations.size()]);
-	}
-	private static boolean isEmpty(String string) {
-		return (string == null || string.trim().length() == 0);
-	}
-	static public ISourceContainer[] convertSourceLocations(IPSourceLocation[] locations) {
-		ArrayList<ISourceContainer> containers = new ArrayList<ISourceContainer>(locations.length);
-		int mappingCount = 0;
-		for (int i = 0; i < locations.length; ++i) {
-			if (locations[i] instanceof IProjectSourceLocation) {
-				containers.add(new ProjectSourceContainer(((IProjectSourceLocation) locations[i]).getProject(), false));
-			} else if (locations[i] instanceof IDirectorySourceLocation) {
-				IDirectorySourceLocation d = (IDirectorySourceLocation) locations[i];
-				IPath a = d.getAssociation();
-				if (a != null) {
-					MappingSourceContainer mapping = new MappingSourceContainer(InternalSourceLookupMessages.getString("SourceUtils.0") + (++mappingCount));
-					mapping.addMapEntries(new MapEntrySourceContainer[] { new MapEntrySourceContainer(a, d.getDirectory()) });
-					containers.add(mapping);
-				}
-				containers.add(new PDirectorySourceContainer(d.getDirectory(), d.searchSubfolders()));
-			}
-		}
-		return (ISourceContainer[]) containers.toArray(new ISourceContainer[containers.size()]);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/.classpath b/debug/org.eclipse.ptp.debug.sdm.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/.cvsignore b/debug/org.eclipse.ptp.debug.sdm.core/.cvsignore
deleted file mode 100644
index f0a691e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/.options b/debug/org.eclipse.ptp.debug.sdm.core/.options
deleted file mode 100644
index 4214750..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/.options
+++ /dev/null

@@ -1,5 +0,0 @@
-# Trace job that executes SDM master
-org.eclipse.ptp.debug.sdm.core/debug=true
-org.eclipse.ptp.debug.sdm.core/debug/SDMmaster=true
-org.eclipse.ptp.debug.sdm.core/debug/SDMmaster/more=true
-org.eclipse.ptp.debug.sdm.core/debug/SDMmaster/output=true

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/.project b/debug/org.eclipse.ptp.debug.sdm.core/.project
deleted file mode 100644
index 36d5499..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.debug.sdm.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/META-INF/MANIFEST.MF b/debug/org.eclipse.ptp.debug.sdm.core/META-INF/MANIFEST.MF
deleted file mode 100644
index ea1229a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.debug.sdm.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.debug.sdm.core.SDMDebugCorePlugin
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.debug.sdm.core;
-  uses:="org.eclipse.ptp.core.attributes,
-   org.eclipse.ptp.debug.core,
-   org.eclipse.ptp.debug.core.pdi.manager,
-   org.eclipse.core.runtime.preferences,
-   org.osgi.framework,
-   org.eclipse.ptp.debug.core.pdi.event,
-   org.eclipse.ptp.debug.core.pdi.request,
-   org.eclipse.ptp.debug.core.launch,
-   org.eclipse.ptp.core.util,
-   org.eclipse.ptp.debug.core.pdi,
-   org.eclipse.core.runtime,
-   org.eclipse.ptp.debug.core.pdi.model,
-   org.eclipse.debug.core",
- org.eclipse.ptp.debug.sdm.core.pdi;
-  uses:="org.eclipse.ptp.proxy.event,
-   org.eclipse.ptp.debug.sdm.core.proxy,
-   org.eclipse.ptp.debug.core.pdi.model.aif,
-   org.eclipse.ptp.core.util,
-   org.eclipse.ptp.debug.core.pdi,
-   org.eclipse.core.runtime,
-   org.eclipse.ptp.debug.core.pdi.model",
- org.eclipse.ptp.debug.sdm.core.proxy;uses:="org.eclipse.ptp.core.util,org.eclipse.core.runtime,org.eclipse.ptp.proxy.debug.client"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.proxy.protocol,
- org.eclipse.ptp.core,
- org.eclipse.ptp.debug.core,
- org.eclipse.ptp.launch,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.core.filesystem;bundle-version="1.2.0"
-Eclipse-LazyStart: true
-Bundle-Vendor: %pluginProvider

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

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

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/about.ini b/debug/org.eclipse.ptp.debug.sdm.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/about.ini
+++ /dev/null

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

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/about.mappings b/debug/org.eclipse.ptp.debug.sdm.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/about.properties b/debug/org.eclipse.ptp.debug.sdm.core/about.properties
deleted file mode 100644
index d6c3caa..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/about.properties
+++ /dev/null

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

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/build.properties b/debug/org.eclipse.ptp.debug.sdm.core/build.properties
deleted file mode 100644
index f2f8342..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/build.properties
+++ /dev/null

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

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

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/plugin.properties b/debug/org.eclipse.ptp.debug.sdm.core/plugin.properties
deleted file mode 100644
index ffb9528..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/plugin.properties
+++ /dev/null

@@ -1,27 +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
-#
-# Contributors:
-#     Clement Chu
-#################################################################################
-
-pluginName=PTP Scalable Debug Manager Core
-pluginProvider=Eclipse.org
-
-SDM.name=SDM
-Simulator.name=Simulator
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/plugin.xml b/debug/org.eclipse.ptp.debug.sdm.core/plugin.xml
deleted file mode 100644
index b9dfeba..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/plugin.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-     <extension
-           point="org.eclipse.core.runtime.preferences">
-        <initializer
-              class="org.eclipse.ptp.debug.sdm.core.PreferenceInitializer">
-        </initializer>
-     </extension>
-     <extension
-           point="org.eclipse.ptp.debug.core.parallelDebuggers">
-        <debugger
-              class="org.eclipse.ptp.debug.sdm.core.SDMDebugger"
-              cpu="*"
-              id="org.eclipse.ptp.debug.sdm"
-              modes="run"
-              name="%SDM.name"
-              platform="*">
-        </debugger>
-     </extension>
-</plugin>

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/PreferenceInitializer.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/PreferenceInitializer.java
deleted file mode 100644
index 6c83f57..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/PreferenceInitializer.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-
-/**
- * @author Clement chu
- * 
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		Preferences store = SDMDebugCorePlugin.getDefault().getPluginPreferences();
-
-		//String debuggerFile = PTPCorePlugin.getDefault().locateFragmentFile("org.eclipse.ptp", "sdm");
-		//if (debuggerFile != null)
-			//store.setDefault(SDMPreferenceConstants.SDM_DEBUGGER_FILE, debuggerFile);
- 
-		//store.setDefault(SDMPreferenceConstants.SDM_DEBUGGER_HOST, SDMPreferenceConstants.SDM_DEFAULT_DEUBGGER_HOST);
-		store.setDefault(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE, 
-				SDMPreferenceConstants.SDM_DEBUGGER_BACKENDS[SDMPreferenceConstants.SDM_DEFAULT_DEDUGGER_BACKEND_INDEX]);
-		store.setDefault(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH, SDMPreferenceConstants.SDM_DEFAULT_DEDUGGER_BACKEND_PATH);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugCorePlugin.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugCorePlugin.java
deleted file mode 100644
index 9ac0d32..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugCorePlugin.java
+++ /dev/null

@@ -1,56 +0,0 @@
-package org.eclipse.ptp.debug.sdm.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ptp.debug.sdm.core.utils.DebugUtil;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author clement The main plugin class to be used in the desktop.
- */
-public class SDMDebugCorePlugin extends Plugin {
-	public static final String PLUGIN_ID = "org.eclipse.ptp.debug.sdm.core";
-
-	private static SDMDebugCorePlugin plugin;
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static SDMDebugCorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Get a unique identifier for this plugin
-	 *
-	 * @return
-	 */
-	public static String getUniqueIdentifier() {
-		return PLUGIN_ID;
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public SDMDebugCorePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		DebugUtil.configurePluginDebugOptions();
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java
deleted file mode 100644
index badec89..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java
+++ /dev/null

@@ -1,382 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California.
- * This material was produced under U.S. Government contract W-7405-ENG-36
- * for Los Alamos National Laboratory, which is operated by the University
- * of California for the U.S. Department of Energy. The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
- * to produce derivative works, such modified software should be clearly marked,
- * so as not to confuse it with the version available from LANL.
- *
- * Additionally, this program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.ArrayAttribute;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.debug.core.IPDebugger;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.launch.IPLaunch;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.Session;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEventFactory;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIModelFactory;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory;
-import org.eclipse.ptp.debug.sdm.core.SDMRunner.SDMMasterState;
-import org.eclipse.ptp.debug.sdm.core.pdi.PDIDebugger;
-import org.eclipse.ptp.debug.sdm.core.utils.DebugUtil;
-import org.eclipse.ptp.launch.PTPLaunchPlugin;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-
-/**
- * @author clement
- *
- */
-public class SDMDebugger implements IPDebugger {
-	private IPDIDebugger pdiDebugger = null;
-	private IPDIModelFactory modelFactory = null;
-	private IPDIManagerFactory managerFactory = null;
-	private IPDIEventFactory eventFactory = null;
-	private IPDIRequestFactory requestFactory = null;
-
-	IFileStore routingFileStore = null;
-	SDMRunner sdmRunner = null;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPDebugger#createDebugSession(long, org.eclipse.ptp.debug.core.launch.IPLaunch, org.eclipse.core.runtime.IPath)
-	 */
-	public IPDISession createDebugSession(long timeout, final IPLaunch launch, IPath corefile) throws CoreException {
-		if (modelFactory == null) {
-			modelFactory = new SDMModelFactory();
-		}
-		if (managerFactory == null) {
-			managerFactory = new SDMManagerFactory();
-		}
-		if (eventFactory == null) {
-			eventFactory = new SDMEventFactory();
-		}
-		if (requestFactory == null) {
-			requestFactory = new SDMRequestFactory();
-		}
-
-		/*
-		 * Writing the rounting file actually starts the SDM servers.
-		 */
-		writeRoutingFile(launch);
-
-		/*
-		 * Delay starting the master SDM (aka SDM client), to wait until SDM servers have started and until the sessions
-		 * are listening on the debugger socket.
-		 */
-		sdmRunner.setJob(launch.getPJob());
-		sdmRunner.schedule();
-
-		IPDISession session = createSession(timeout, launch, corefile);
-
-		return session;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPDebugger#initialize(org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	public void initialize(ILaunchConfiguration configuration, AttributeManager attrMgr, IProgressMonitor monitor) throws CoreException {
-		ArrayAttribute<String> dbgArgsAttr = attrMgr.getAttribute(JobAttributes.getDebuggerArgumentsAttributeDefinition());
-
-		if (dbgArgsAttr == null) {
-			dbgArgsAttr = JobAttributes.getDebuggerArgumentsAttributeDefinition().create();
-			attrMgr.addAttribute(dbgArgsAttr);
-		}
-
-		List<String> dbgArgs = dbgArgsAttr.getValue();
-
-		try {
-			getDebugger().initialize(configuration, dbgArgs, monitor);
-		} catch (PDIException e) {
-			throw newCoreException(e);
-		}
-
-		/*
-		 * Store information to create routing file later.
-		 */
-		prepareRoutingFile(configuration, attrMgr, monitor);
-
-		/*
-		 * Prepare the Master SDM controller thread.
-		 */
-		IResourceManagerControl rm = null;
-		rm = (IResourceManagerControl) getResourceManager(configuration);
-		sdmRunner = new SDMRunner(rm);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPDebugger#getLaunchAttributes(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	public void getLaunchAttributes(ILaunchConfiguration configuration, AttributeManager attrMgr) throws CoreException {
-		ArrayAttribute<String> dbgArgsAttr = attrMgr.getAttribute(JobAttributes.getDebuggerArgumentsAttributeDefinition());
-
-		if (dbgArgsAttr == null) {
-			dbgArgsAttr = JobAttributes.getDebuggerArgumentsAttributeDefinition().create();
-			attrMgr.addAttribute(dbgArgsAttr);
-		}
-
-		List<String> dbgArgs = dbgArgsAttr.getValue();
-
-		Preferences store = SDMDebugCorePlugin.getDefault().getPluginPreferences();
-
-		String localAddress = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_HOST, "localhost"); //$NON-NLS-1$
-
-		dbgArgs.add("--host=" + localAddress); //$NON-NLS-1$
-		dbgArgs.add("--debugger=" + store.getString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE)); //$NON-NLS-1$
-
-		String dbgPath = store.getString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH);
-		if (dbgPath.length() > 0) {
-			dbgArgs.add("--debugger_path=" + dbgPath); //$NON-NLS-1$
-		}
-
-		String dbgExtraArgs = store.getString(SDMPreferenceConstants.SDM_DEBUGGER_ARGS);
-		if (dbgExtraArgs.length() > 0) {
-			dbgArgs.addAll(Arrays.asList(dbgExtraArgs.split(" "))); //$NON-NLS-1$
-		}
-
-		// remote setting
-		String dbgExePath = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_EXECUTABLE_PATH, "");
-		//if (dbgExePath == null) {
-			//dbgExePath = store.getString(SDMPreferenceConstants.SDM_DEBUGGER_FILE);
-		//}
-		IPath path = PTPLaunchPlugin.getDefault().verifyResource(dbgExePath, configuration);
-		//IPath path = new Path(dbgExePath);
-		attrMgr.addAttribute(JobAttributes.getDebuggerExecutableNameAttributeDefinition().create(path.lastSegment()));
-		attrMgr.addAttribute(JobAttributes.getDebuggerExecutablePathAttributeDefinition().create(path.removeLastSegments(1).toString()));
-
-		String dbgWD = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_WORKING_DIR, (String)null);
-		if (dbgWD != null) {
-			StringAttribute wdAttr = attrMgr.getAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition());
-			if (wdAttr != null) {
-				wdAttr.setValueAsString(dbgWD);
-			} else {
-				attrMgr.addAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition().create(dbgWD));
-			}
-			attrMgr.addAttribute(JobAttributes.getExecutablePathAttributeDefinition().create(dbgWD + "/Debug")); //$NON-NLS-1$
-		}
-		attrMgr.addAttribute(JobAttributes.getDebugFlagAttributeDefinition().create(true));
-
-		/*
-		 * Save SDM command line for future use.
-		 */
-		List<String> sdmCommand = new ArrayList<String>();
-		sdmCommand.add(attrMgr.getAttribute(JobAttributes.getDebuggerExecutablePathAttributeDefinition()).getValue()+"/"+attrMgr.getAttribute(JobAttributes.getDebuggerExecutableNameAttributeDefinition()).getValue());
-		sdmCommand.add("--master");
-		sdmCommand.addAll(dbgArgs);
-		sdmRunner.setCommand(sdmCommand);
-		sdmRunner.setWorkDir(attrMgr.getAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition()).getValue());
-	}
-
-	public void cleanup(ILaunchConfiguration configuration, AttributeManager attrMgr, IPLaunch launch) {
-		if (sdmRunner != null) {
-			if (sdmRunner.getSdmState() == SDMMasterState.RUNNING) {
-				DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: still running, cancel is to be issued soon"); //$NON-NLS-1$
-				new Thread("SDM master killer thread") {
-					@Override
-					public void run() {
-						DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "sdm master killer: thread started"); //$NON-NLS-1$
-						synchronized (this) {
-							try {
-								wait(5000);
-							} catch (InterruptedException e) {
-								// Ignore
-							}
-						}
-						if (sdmRunner.getSdmState() == SDMMasterState.RUNNING) {
-							DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master killer: cancel SDM master now"); //$NON-NLS-1$
-							sdmRunner.cancel();
-						} else {
-							DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master killer: do not cancel SDM master, since it finished by itself."); //$NON-NLS-1$
-						}
-						DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "sdm master killer: thread finished"); //$NON-NLS-1$
-					}
-				}.start();
-			}
-		}
-	}
-
-	/**
-	 * Get the PDI debugger implementation. Creates the class if necessary.
-	 *
-	 * @return IPDIDebugger
-	 */
-	private IPDIDebugger getDebugger() {
-		if (pdiDebugger == null) {
-			pdiDebugger = new PDIDebugger();
-		}
-		return pdiDebugger;
-	}
-
-	/**
-	 * Work out the expected number of processes in the job. If it hasn't been
-	 * specified, assume one.
-	 *
-	 * @param job job that was launched
-	 * @return number of processes
-	 */
-	private int getJobSize(IPJob job) {
-		int nprocs = job.getProcesses().length;
-		if (nprocs == 0) {
-			nprocs = 1;
-		}
-		return nprocs;
-	}
-
-	/**
-	 * Create a CoreException that can be thrown
-	 *
-	 * @param exception
-	 * @return CoreException
-	 */
-	private CoreException newCoreException(Throwable exception) {
-		MultiStatus status = new MultiStatus(SDMDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, "Cannot start debugging", exception);
-		status.add(new Status(IStatus.ERROR, SDMDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, exception == null ? new String() : exception.getLocalizedMessage(), exception));
-		return new CoreException(status);
-	}
-
-	/**
-	 * Create a PDI session
-	 *
-	 * @param timeout
-	 * @param launch
-	 * @param corefile
-	 * @param monitor
-	 * @return Session
-	 * @throws CoreException
-	 */
-	protected Session createSession(long timeout, IPLaunch launch, IPath corefile) throws CoreException {
-		IPJob job = launch.getPJob();
-		int job_size = getJobSize(job);
-		try {
-			return new Session(managerFactory, requestFactory, eventFactory, modelFactory,
-					launch.getLaunchConfiguration(), timeout, getDebugger(), job.getID(), job_size);
-		}
-		catch (PDIException e) {
-			throw newCoreException(e);
-		}
-	}
-
-	private IResourceManager getResourceManager(ILaunchConfiguration configuration) throws CoreException {
-		IPUniverse universe = PTPCorePlugin.getDefault().getUniverse();
-		IResourceManager[] rms = universe.getResourceManagers();
-		String rmUniqueName = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, (String)null);
-		for (IResourceManager rm : rms) {
-			if (rm.getState() == ResourceManagerAttributes.State.STARTED &&
-					rm.getUniqueName().equals(rmUniqueName)) {
-				return rm;
-			}
-		}
-		return null;
-	}
-
-	private void prepareRoutingFile(ILaunchConfiguration configuration,
-			AttributeManager attrMgr, IProgressMonitor monitor)
-			throws CoreException {
-		IPath routingFilePath = new Path(attrMgr.getAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition()).getValue());
-		routingFilePath = routingFilePath.append("routing_file");
-
-		IResourceManagerControl rm = (IResourceManagerControl) getResourceManager(configuration);
-		IResourceManagerConfiguration conf = rm.getConfiguration();
-		AbstractRemoteResourceManagerConfiguration remConf = (AbstractRemoteResourceManagerConfiguration)conf;
-		IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(remConf.getRemoteServicesId());
-		IRemoteConnectionManager rconnMgr = remoteServices.getConnectionManager();
-		IRemoteConnection rconn = rconnMgr.getConnection(remConf.getConnectionName());
-		IRemoteFileManager remoteFileManager = remoteServices.getFileManager(rconn);
-
-		try {
-			this.routingFileStore = remoteFileManager.getResource(routingFilePath, monitor);
-		} catch (IOException e) {
-			throw newCoreException(e);
-		}
-
-		IFileInfo info = routingFileStore.fetchInfo();
-		if (info.exists()) {
-			try {
-				routingFileStore.delete(0, monitor);
-			} catch (CoreException e) {
-				throw newCoreException(e);
-			}
-			routingFileStore.fetchInfo();
-		}
-	}
-
-	private void writeRoutingFile(IPLaunch launch) throws CoreException {
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "debug: Write routing file");
-		IProgressMonitor monitor = new NullProgressMonitor();
-		OutputStream os = null;
-		try {
-			os = routingFileStore.openOutputStream(0, monitor);
-		} catch (CoreException e) {
-			throw newCoreException(e);
-		}
-		PrintWriter pw = new PrintWriter(os);
-		IPProcess processes[] = launch.getPJob().getProcesses();
-		pw.format("%d\n", processes.length);
-		int base = 10000;
-		int range = 10000;
-		Random random = new Random();
-		for (IPProcess process : processes) {
-			String index = process.getProcessIndex();
-			IPNode node = process.getNode();
-			String nodeName = node.getName();
-			int portNumber = base + random.nextInt(range);
-			pw.format("%s %s %d\n", index, nodeName, portNumber);
-		}
-		pw.close();
-		try {
-			os.close();
-		} catch (IOException e) {
-			throw newCoreException(e);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventFactory.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventFactory.java
deleted file mode 100644
index 96d925e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventFactory.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-import org.eclipse.ptp.debug.core.pdi.event.AbstractEventFactory;
-
-public class SDMEventFactory extends AbstractEventFactory {
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventManager.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventManager.java
deleted file mode 100644
index d84814a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMEventManager.java
+++ /dev/null

@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Observable;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.IPDISessionObject;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.PDILocationFactory;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIEvent;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIResumedEvent;
-import org.eclipse.ptp.debug.core.pdi.manager.AbstractEventManager;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIBreakpointRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDICommandRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIConditionBreakpointRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDeleteBreakpointRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDeleteVariableRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDisableBreakpointRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEnableBreakpointRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIEventRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGoRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetCurrentStackFrameRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStartDebuggerRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepFinishRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepIntoInstructionRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepIntoRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepOverInstructionRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepOverRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIStepRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDITerminateRequest;
-import org.eclipse.ptp.debug.sdm.core.proxy.ProxyDebugClient;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugLocator;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugArgsEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugBreakpointHitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugBreakpointSetEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataExpValueEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugErrorEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugExitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugInfoThreadsEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugInitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugMemoryInfoEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugOKEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugPartialAIFEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSetThreadSelectEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalExitEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalsEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackInfoDepthEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackframeEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStepEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSuspendEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugTypeEvent;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugVarsEvent;
-
-public class SDMEventManager extends AbstractEventManager {
-	public SDMEventManager(IPDISession session) {
-		super(session);
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
-	 */
-	public void update(Observable o, final Object arg) {
-		PDebugUtils.println("Msg: SDMEventManager - update(): Event: " + ((IProxyDebugEvent)arg).toString());
-		IProxyDebugEvent event = (IProxyDebugEvent) arg;
-		IPDIEventRequest request = getCurrentRequest();
-		fireEvent(request, event);
-		verifyEvent(request, event);
-	}
-	
-	/**
-	 * @param reason
-	 * @param thread_id
-	 * @param level
-	 * @param depth
-	 * @param vars
-	 * @return
-	 */
-	private IPDIEvent createSuspendedEvent(IPDISessionObject reason, int thread_id, int level, int depth, String[] vars) {
-		if (depth > 1) {
-			session.getTaskManager().setCanStepReturnTasks(true, reason.getTasks());
-		}
-		session.getTaskManager().setSuspendTasks(true, reason.getTasks());
-		session.processSupsendedEvent(reason.getTasks().copy(), thread_id, vars);
-		return session.getEventFactory().newSuspendedEvent(reason, vars, thread_id, level, depth);
-	}
-	
-	/**
-	 * @param request
-	 * @param event
-	 */
-	private synchronized void fireEvent(IPDIEventRequest request, IProxyDebugEvent event) {
-		BitList eTasks = ProxyDebugClient.decodeBitSet(event.getBitSet());
-
-		PDebugUtils.println("Msg: SDMEventManager - fireEvent(): event " + event);
-		
-		List<IPDIEvent> eventList = new ArrayList<IPDIEvent>() {
-			private static final long serialVersionUID = 1L;
-			public boolean add(IPDIEvent e) {
-				PDebugUtils.println("Msg: SDMEventManager - fireEvent(): added PDIEvent: " + e);
-				return super.add(e);
-			}
-		};
-		if (event instanceof IProxyDebugOKEvent) {
-			if (request != null) {
-				if (request instanceof IPDIGoRequest) {
-					session.getTaskManager().setSuspendTasks(false, eTasks);
-					session.processRunningEvent(eTasks.copy());
-					eventList.add(session.getEventFactory().newResumedEvent(session, eTasks, IPDIResumedEvent.CONTINUE));
-				}
-				else if (request instanceof IPDIStepRequest) {
-					int details;
-					if (request instanceof IPDIStepIntoRequest)
-						details = IPDIResumedEvent.STEP_INTO;
-					else if (request instanceof IPDIStepOverRequest)
-						details = IPDIResumedEvent.STEP_OVER;
-					else if (request instanceof IPDIStepFinishRequest)
-						details = IPDIResumedEvent.STEP_RETURN;
-					else if (request instanceof IPDIStepIntoInstructionRequest)
-						details = IPDIResumedEvent.STEP_INTO_INSTRUCTION;
-					else if (request instanceof IPDIStepOverInstructionRequest)
-						details = IPDIResumedEvent.STEP_OVER_INSTRUCTION;
-					else {
-						details = IPDIResumedEvent.CONTINUE;
-					}
-					session.getTaskManager().setSuspendTasks(false, eTasks);
-					session.processRunningEvent(eTasks.copy());
-					eventList.add(session.getEventFactory().newResumedEvent(session, eTasks, details));
-				}
-				else if (request instanceof IPDIEnableBreakpointRequest) {
-				}
-				else if (request instanceof IPDIDisableBreakpointRequest) {
-				}
-				else if (request instanceof IPDIConditionBreakpointRequest) {
-				}
-				else if (request instanceof IPDIDeleteBreakpointRequest) {
-					if (((IPDIBreakpointRequest)request).isAllowUpdate()) {
-						IPDIBreakpoint bpt = ((IPDIDeleteBreakpointRequest)request).getBreakpoint();
-						if (bpt == null) {
-							eventList.add(session.getEventFactory().newErrorEvent(
-									session.getEventFactory().newErrorInfo(session, eTasks, IPDIErrorInfo.DBG_NORMAL, "Delete Breakpoint Error", "No PDI breakpoint found")));
-						}
-						else {
-							eventList.add(session.getEventFactory().newDestroyedEvent(
-									session.getEventFactory().newBreakpointInfo(session, eTasks, bpt)));
-						}
-					}
-				}
-				else if (request instanceof IPDITerminateRequest) {
-					session.getTaskManager().setPendingTasks(false, eTasks);
-					session.getTaskManager().setTerminateTasks(true, eTasks);
-					eventList.add(session.getEventFactory().newDestroyedEvent(
-							session.getEventFactory().newExitInfo(session, eTasks, 1)));
-					if (session.getTaskManager().isAllTerminated(session.getTasks())) {
-						eventList.add(session.getEventFactory().newDisconnectedEvent(session, session.getTasks()));
-					}
-				}
-				else if (request instanceof IPDIStartDebuggerRequest) {
-					eventList.add(session.getEventFactory().newConnectedEvent(session, eTasks));
-				}
-				else if (request instanceof IPDISetCurrentStackFrameRequest) {
-				}
-				else if (request instanceof IPDIDeleteVariableRequest) {
-				}
-				else if (request instanceof IPDICommandRequest) {
-				}
-				else {
-				}
-			}
-		}
-		else if (event instanceof IProxyDebugBreakpointSetEvent) {
-			if (!(request instanceof IPDIBreakpointRequest) || !((IPDIBreakpointRequest)request).isAllowUpdate())  {
-				IProxyDebugBreakpointSetEvent e = (IProxyDebugBreakpointSetEvent)event;
-				IPDIBreakpoint bpt = session.getBreakpointManager().getBreakpoint(e.getBreakpointId());
-				if (bpt == null) {
-					eventList.add(session.getEventFactory().newErrorEvent(
-							session.getEventFactory().newErrorInfo(session, eTasks, IPDIErrorInfo.DBG_NORMAL, "Set Breakpoint Error", "No PDI breakpoint found")));
-				}
-				else {
-					eventList.add(session.getEventFactory().newCreatedEvent(
-							session.getEventFactory().newBreakpointInfo(session, eTasks, bpt)));
-				}
-			}
-		}
-		else if (event instanceof IProxyDebugExitEvent) {
-			IProxyDebugExitEvent e = (IProxyDebugExitEvent)event;
-			session.getTaskManager().setPendingTasks(false, eTasks);
-			session.getTaskManager().setTerminateTasks(true, eTasks);
-			eventList.add(session.getEventFactory().newDestroyedEvent(
-					session.getEventFactory().newExitInfo(session, eTasks, e.getExitStatus())));
-			if (session.getTaskManager().isAllTerminated(session.getTasks())) {
-				try {
-					session.exit();
-					eventList.add(session.getEventFactory().newDisconnectedEvent(session, session.getTasks()));
-				}
-				catch (PDIException ex) {
-					eventList.add(session.getEventFactory().newErrorEvent(
-							session.getEventFactory().newErrorInfo(session, ex.getTasks(), IPDIErrorInfo.DBG_FATAL, "Shutdown debugger error", ex.getMessage())));
-				}
-			}
-		}
-		else if (event instanceof IProxyDebugErrorEvent) {
-			IProxyDebugErrorEvent e = (IProxyDebugErrorEvent)event;
-			if (request != null) {
-				request.error(e.getErrorMessage());
-			}
-			int actionType = session.getDebugger().getErrorAction(e.getErrorCode());
-			if (actionType == IPDIErrorInfo.DBG_FATAL) {
-				session.getTaskManager().setPendingTasks(false, eTasks);
-				session.getTaskManager().setTerminateTasks(true, eTasks);
-			}
-			eventList.add(session.getEventFactory().newErrorEvent(
-					session.getEventFactory().newErrorInfo(session, eTasks, actionType, "Internal Error", e.getErrorMessage())));
-		}
-		else if (event instanceof IProxyDebugDataExpValueEvent) {
-			
-		}
-		else if (event instanceof IProxyDebugInitEvent) {
-			
-		}
-		else if (event instanceof IProxyDebugMemoryInfoEvent) {
-			
-		}
-		else if (event instanceof IProxyDebugPartialAIFEvent) {
-			
-		}
-		else if (event instanceof IProxyDebugSignalExitEvent) {
-			IProxyDebugSignalExitEvent e = (IProxyDebugSignalExitEvent)event;
-			session.getTaskManager().setPendingTasks(false, eTasks);
-			session.getTaskManager().setTerminateTasks(true, eTasks);
-			eventList.add(session.getEventFactory().newDestroyedEvent(
-					session.getEventFactory().newSignalInfo(session, eTasks, e.getSignalName(), e.getSignalMeaning(), null, null)));
-			if (session.getTaskManager().isAllTerminated(session.getTasks())) {
-				try {
-					session.exit();
-					eventList.add(session.getEventFactory().newDisconnectedEvent(session, session.getTasks()));
-				}
-				catch (PDIException ex) {
-					eventList.add(session.getEventFactory().newErrorEvent(
-							session.getEventFactory().newErrorInfo(session, ex.getTasks(), IPDIErrorInfo.DBG_FATAL, "Shutdown debugger error", ex.getMessage())));
-				}
-			}
-		}
-		else if (event instanceof IProxyDebugBreakpointHitEvent) {
-			IProxyDebugBreakpointHitEvent e = (IProxyDebugBreakpointHitEvent)event;
-			IPDIBreakpoint bpt = session.getBreakpointManager().getBreakpoint(e.getBreakpointId());
-			if (bpt == null) {
-				eventList.add(session.getEventFactory().newErrorEvent(
-						session.getEventFactory().newErrorInfo(session, eTasks, IPDIErrorInfo.DBG_NORMAL, "Hit Breakpoint Error", "No PDI breakpoint found")));
-			}
-			else {
-				eventList.add(createSuspendedEvent(session.getEventFactory().newBreakpointInfo(session, eTasks, bpt), e.getThreadId(), 0, e.getDepth(), e.getChangedVars()));
-			}
-		}
-		else if (event instanceof IProxyDebugSignalEvent) {
-			IProxyDebugSignalEvent e = (IProxyDebugSignalEvent)event;
-			ProxyDebugLocator loc = e.getFrame().getLocator();
-			IPDILocator locator = PDILocationFactory.newLocator(loc.getFile(), loc.getFunction(), loc.getLineNumber(), loc.getAddress());
-			eventList.add(createSuspendedEvent(session.getEventFactory().newSignalInfo(session, eTasks, e.getSignalName(), e.getSignalMeaning(), null, locator), e.getThreadId(), e.getFrame().getLevel(), e.getDepth(), e.getChangedVars()));
-		}
-		else if (event instanceof IProxyDebugStepEvent) {
-			IProxyDebugStepEvent e = (IProxyDebugStepEvent)event;
-			ProxyDebugLocator loc = e.getFrame().getLocator();
-			IPDILocator locator = PDILocationFactory.newLocator(loc.getFile(), loc.getFunction(), loc.getLineNumber(), loc.getAddress());
-			eventList.add(createSuspendedEvent(session.getEventFactory().newEndSteppingRangeInfo(session, eTasks,  locator), e.getThreadId(), e.getFrame().getLevel(), e.getDepth(), e.getChangedVars()));
-		}
-		else if (event instanceof IProxyDebugSuspendEvent) {
-			IProxyDebugSuspendEvent e = (IProxyDebugSuspendEvent)event;
-			ProxyDebugLocator loc = e.getFrame().getLocator();
-			IPDILocator locator = PDILocationFactory.newLocator(loc.getFile(), loc.getFunction(), loc.getLineNumber(), loc.getAddress());
-			eventList.add(createSuspendedEvent(session.getEventFactory().newLocationReachedInfo(session, eTasks, locator), e.getThreadId(), e.getFrame().getLevel(), e.getDepth(), e.getChangedVars()));
-		}
-		else if (event instanceof IProxyDebugTypeEvent) {
-		}
-		else if (event instanceof IProxyDebugVarsEvent) {
-		}
-		else if (event instanceof IProxyDebugDataEvent) { //bypass
-		}
-		else if (event instanceof IProxyDebugArgsEvent) { //bypass
-		}
-		else if (event instanceof IProxyDebugInfoThreadsEvent) { //bypass
-		}
-		else if (event instanceof IProxyDebugSetThreadSelectEvent) { //bypass
-		}
-		else if (event instanceof IProxyDebugSignalsEvent) { //bypass
-		}
-		else if (event instanceof IProxyDebugStackframeEvent) { //bypass
-		}
-		else if (event instanceof IProxyDebugStackInfoDepthEvent) { //bypass
-		}
-		else {
-		}
-		fireEvents(eventList.toArray(new IPDIEvent[0]));
-	}
-	
-	/**
-	 * @param request
-	 * @param result
-	 */
-	private void verifyEvent(IPDIEventRequest request, IProxyDebugEvent result) {
-		if (request != null) {
-			BitList eTasks = ProxyDebugClient.decodeBitSet(result.getBitSet());
-			if (request.completed(eTasks, result)) {
-				request.done();
-				notifyEventRequest(request);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMManagerFactory.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMManagerFactory.java
deleted file mode 100644
index 3a48bda..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMManagerFactory.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.manager.AbstractManagerFactory;
-import org.eclipse.ptp.debug.core.pdi.manager.IPDIEventManager;
-
-
-public class SDMManagerFactory extends AbstractManagerFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.manager.IPDIManagerFactory#newEventManager(org.eclipse.ptp.debug.core.pdi.IPDISession)
-	 */
-	public IPDIEventManager newEventManager(IPDISession session) {
-		return new SDMEventManager(session);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMModelFactory.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMModelFactory.java
deleted file mode 100644
index dc35ea0..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMModelFactory.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-import org.eclipse.ptp.debug.core.pdi.model.AbstractModelFactory;
-
-
-public class SDMModelFactory extends AbstractModelFactory {
-
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMPreferenceConstants.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMPreferenceConstants.java
deleted file mode 100644
index b719bfc..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMPreferenceConstants.java
+++ /dev/null

@@ -1,67 +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
- *******************************************************************************/
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-/**
- * Constant definitions for PTP debug plug-in.
- */
-public interface SDMPreferenceConstants {
-	public static final String PLUGIN_ID = SDMDebugCorePlugin.getUniqueIdentifier();
-
-	/**
-	 * Location of the sdm
-	 */
-	//public static final String SDM_DEBUGGER_FILE = PLUGIN_ID + ".debugger_file";
-	
-	/**
-	 * Extra arguments to pass to the sdm (e.g. debugging flags)
-	 */
-	public static final String SDM_DEBUGGER_ARGS = PLUGIN_ID + ".debugger_args";
-
-	/**
-	 * Host for the sdm client
-	 */
-	//public static final String SDM_DEBUGGER_HOST = PLUGIN_ID + ".debugger_host";
-	//public static final String SDM_DEFAULT_DEUBGGER_HOST = "localhost";
-
-	/**
-	 * Debugger backend
-	 */
-	public static final String SDM_DEBUGGER_BACKEND_TYPE = PLUGIN_ID + ".debugger_backend";
-	public static final int SDM_DEFAULT_DEDUGGER_BACKEND_INDEX = 0;
-	public static final String[] SDM_DEBUGGER_BACKENDS = new String[] {
-		"gdb-mi"
-	};
-	
-	/**
-	 * Path to backend debugger
-	 */
-	public static final String SDM_DEBUGGER_BACKEND_PATH = PLUGIN_ID + ".debugger_backend_path";
-	public static final String SDM_DEFAULT_DEDUGGER_BACKEND_PATH = "";
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRequestFactory.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRequestFactory.java
deleted file mode 100644
index 0fae920..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRequestFactory.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractRequestFactory;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDataEvaluateExpressionRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIDataReadMemoryRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetAIFRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetInfoThreadsRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetPartialAIFRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetStackInfoDepthRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListArgumentsRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListLocalVariablesRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListSignalsRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListStackFramesRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetCurrentStackFrameRequest;
-import org.eclipse.ptp.debug.core.pdi.request.IPDISetThreadSelectRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMDataEvaluateExpressionRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMDataReadMemoryRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMGetAIFRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMGetInfoThreadsRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMGetPartialAIFRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMGetStackInfoDepthRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMListArgumentsRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMListLocalVariablesRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMListSignalsRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMListStackFramesRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMSetCurrentStackFrameRequest;
-import org.eclipse.ptp.debug.sdm.core.pdi.request.SDMSetThreadSelectRequest;
-
-
-public class SDMRequestFactory extends AbstractRequestFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getAIFRequest(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDIGetAIFRequest getAIFRequest(BitList tasks, String expr) {
-		return new SDMGetAIFRequest(tasks, expr);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getDataEvaluateExpresionRequest(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDIDataEvaluateExpressionRequest getDataEvaluateExpresionRequest(BitList tasks, String expr) {
-		return new SDMDataEvaluateExpressionRequest(tasks, expr);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getDataEvaluateExpressionRequest(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDIDataEvaluateExpressionRequest getDataEvaluateExpressionRequest(
-			BitList tasks, String expr) {
-		return new SDMDataEvaluateExpressionRequest(tasks, expr);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getDataReadMemoryRequest(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, long, java.lang.String, int, int, int, int, java.lang.Character)
-	 */
-	public IPDIDataReadMemoryRequest getDataReadMemoryRequest(IPDISession session, BitList tasks,
-			long offset, String address, int wordFormat, int wordSize,
-			int rows, int cols, Character asChar) {
-		return new SDMDataReadMemoryRequest(session, tasks, offset, address, wordFormat, wordSize, rows, cols, asChar);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getGetInfoThreadsRequest(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIGetInfoThreadsRequest getGetInfoThreadsRequest(BitList tasks) {
-		return new SDMGetInfoThreadsRequest(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getGetPartialAIFRequest(org.eclipse.ptp.core.util.BitList, java.lang.String, java.lang.String)
-	 */
-	public IPDIGetPartialAIFRequest getGetPartialAIFRequest(BitList tasks,
-			String expr, String varid) {
-		return new SDMGetPartialAIFRequest(tasks, expr, varid);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getGetPartialAIFRequest(org.eclipse.ptp.core.util.BitList, java.lang.String, java.lang.String, boolean)
-	 */
-	public IPDIGetPartialAIFRequest getGetPartialAIFRequest(BitList tasks,
-			String expr, String varid, boolean listChildren) {
-		return new SDMGetPartialAIFRequest(tasks, expr, varid, listChildren);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getGetStackInfoDepthRequest(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIGetStackInfoDepthRequest getGetStackInfoDepthRequest(
-			BitList tasks) {
-		return new SDMGetStackInfoDepthRequest(tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getListArgumentsRequest(org.eclipse.ptp.core.util.BitList, int, int)
-	 */
-	public IPDIListArgumentsRequest getListArgumentsRequest(BitList tasks, int diff, int diff2) {
-		return new SDMListArgumentsRequest(tasks, diff, diff2);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getListLocalVariablesRequest(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIListLocalVariablesRequest getListLocalVariablesRequest(
-			BitList tasks) {
-		return new SDMListLocalVariablesRequest(tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getListSignalsRequest(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public IPDIListSignalsRequest getListSignalsRequest(IPDISession session, BitList tasks, String name) {
-		return new SDMListSignalsRequest(session, tasks, name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getListStackFramesRequest(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIListStackFramesRequest getListStackFramesRequest(IPDISession session, BitList tasks) {
-		return new SDMListStackFramesRequest(session, tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getListStackFramesRequest(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int, int)
-	 */
-	public IPDIListStackFramesRequest getListStackFramesRequest(IPDISession session, BitList tasks, int low, int high) {
-		return new SDMListStackFramesRequest(session, tasks, low, high);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSetCurrentStackFrameRequest(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public IPDISetCurrentStackFrameRequest getSetCurrentStackFrameRequest(
-			BitList tasks, int level) {
-		return new SDMSetCurrentStackFrameRequest(tasks, level);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIRequestFactory#getSetThreadSelectRequest(org.eclipse.ptp.debug.core.pdi.IPDISession, org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public IPDISetThreadSelectRequest getSetThreadSelectRequest(
-			IPDISession session, BitList tasks, int id) {
-		return new SDMSetThreadSelectRequest(session, tasks, id);
-	}
-
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRunner.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRunner.java
deleted file mode 100644
index 836662e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMRunner.java
+++ /dev/null

@@ -1,220 +0,0 @@
-package org.eclipse.ptp.debug.sdm.core;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.List;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.sdm.core.utils.DebugUtil;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteProcess;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-
-public class SDMRunner extends Job {
-	public enum SDMMasterState {UNKNOWN, STARTING, RUNNING, FINISHED, ERROR};
-
-	private List<String> command;
-	private String workDir;
-	private SDMMasterState sdmState = SDMMasterState.STARTING;
-
-	private IPJob ipJob = null;
-	private IResourceManagerControl rmControl = null;
-	private IRemoteProcess sdmProcess;
-
-	public SDMRunner(IResourceManagerControl rmControl) {
-		super("Master SDM control");
-		this.setPriority(Job.LONG);
-		this.setSystem(true);
-		this.setSystem(false);
-		this.rmControl = rmControl;
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "Created sdm master runner."); //$NON-NLS-1$
-	}
-
-	public void setCommand(List<String> command) {
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "sdm master: command: {0}", command.toString()); //$NON-NLS-1$
-		this.command = command;
-	}
-
-	public void setWorkDir(String workDir) {
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "sdm master: workdir: {0}", workDir); //$NON-NLS-1$
-		this.workDir = workDir;
-	}
-
-	public synchronized SDMMasterState getSdmState() {
-		return sdmState;
-	}
-
-	protected synchronized void setSdmState(SDMMasterState sdmState) {
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "sdm master: changed state to {0}", sdmState.toString()); //$NON-NLS-1$
-		this.sdmState = sdmState;
-		this.notifyAll();
-	}
-
-	public void setJob(IPJob ipJob) {
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "sdm master: associated to job #{0}", ipJob.getID()); //$NON-NLS-1$
-		this.ipJob = ipJob;
-	}
-
-	@Override
-	protected IStatus run(IProgressMonitor monitor) {
-		assert workDir != null;
-		assert command != null;
-		assert sdmProcess == null;
-
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: thread started."); //$NON-NLS-1$
-		/*
-		 * Catch all try...catch
-		 */
-		try {
-			if (monitor.isCanceled()) throw new InterruptedException();
-			/*
-			 * Prepare remote connection.
-			 */
-			AbstractRemoteResourceManagerConfiguration configuration = (AbstractRemoteResourceManagerConfiguration) rmControl.getConfiguration();
-			IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(configuration.getRemoteServicesId());
-			IRemoteConnectionManager connectionManager = remoteServices.getConnectionManager();
-			IRemoteConnection connection = connectionManager.getConnection(configuration.getConnectionName());
-			IRemoteFileManager fileManager = remoteServices.getFileManager(connection);
-
-			IFileStore directory = null;
-			try {
-				directory = fileManager.getResource(new Path(workDir), monitor);
-			} catch (IOException e) {
-				throw new CoreException(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), "Failed to determine working directory for master SDM.", e));
-			}
-			IRemoteProcessBuilder sdmProcessBuilder = remoteServices.getProcessBuilder(connection, command);
-			sdmProcessBuilder.directory(directory);
-
-			/*
-			 * Wait some time to assure that SDM servers and front end have started.
-			 */
-			DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: waiting for SDM servers and front end."); //$NON-NLS-1$
-			if (monitor.isCanceled()) throw new InterruptedException();
-			synchronized (this) {
-				wait(3000);
-			}
-
-			/*
-			 * Create process.
-			 */
-			DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: create process"); //$NON-NLS-1$
-			if (monitor.isCanceled()) throw new InterruptedException();
-			synchronized (this) {
-				sdmProcess = sdmProcessBuilder.start();
-			}
-			final BufferedReader err_reader = new BufferedReader(new InputStreamReader(sdmProcess.getErrorStream()));
-			final BufferedReader out_reader = new BufferedReader(new InputStreamReader(sdmProcess.getInputStream()));
-
-			if (DebugUtil.SDM_MASTER_OUTPUT_TRACING) {
-				new Thread(new Runnable() {
-					public void run() {
-						try {
-							String output;
-							while ((output = out_reader.readLine()) != null) {
-								System.out.println("sdm master: " + output); //$NON-NLS-1$
-							}
-						} catch (IOException e) {
-							// Ignore
-						}
-					}
-				}, "sdm master standard output thread").start(); //$NON-NLS-1$
-			}
-
-			if (DebugUtil.SDM_MASTER_OUTPUT_TRACING) {
-				new Thread(new Runnable() {
-					public void run() {
-						try {
-							String line;
-							while ((line = err_reader.readLine()) != null) {
-								System.err.println("sdm master: " + line); //$NON-NLS-1$
-							}
-						} catch (IOException e) {
-							// Ignore
-						}
-					}
-				}, "sdm master error output thread").start(); //$NON-NLS-1$
-			}
-
-
-			/*
-			 * Wait while running but not canceled.
-			 */
-			setSdmState(SDMMasterState.RUNNING);
-			DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING_MORE, "sdm master: waiting to finish."); //$NON-NLS-1$
-			while (! sdmProcess.isCompleted()) {
-				synchronized (this) {
-					wait(500);
-				}
-				if (monitor.isCanceled()) throw new InterruptedException();
-			}
-
-			/*
-			 * Check if process terminated successfully (if not canceled).
-			 */
-			DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: exit value {0}.", sdmProcess.exitValue()); //$NON-NLS-1$
-			if (sdmProcess.exitValue() != 0) {
-				if (! monitor.isCanceled()) {
-					throw new CoreException(new Status(IStatus.ERROR, SDMDebugCorePlugin.getUniqueIdentifier(), NLS.bind("sdm master process finished with exit code {0}.", sdmProcess.exitValue())));
-				} else {
-					DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: ignoring exit code since requested to terminate."); //$NON-NLS-1$
-				}
-			}
-			setSdmState(SDMMasterState.FINISHED);
-			return Status.OK_STATUS;
-		} catch (Exception e) {
-			/*
-			 * Terminate the job, handling the error.
-			 * Also terminates the ipjob since it does not make sense to the ipjob running without debugger.
-			 */
-			DebugUtil.error(DebugUtil.SDM_MASTER_TRACING, "sdm master: exception: {0}", e); //$NON-NLS-1$
-			setSdmState(SDMMasterState.ERROR);
-			synchronized (this) {
-				DebugUtil.error(DebugUtil.SDM_MASTER_TRACING, "sdm master: destroy process", e); //$NON-NLS-1$
-				sdmProcess.destroy();
-			}
-			try {
-				DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: request job {0} to terminate.", ipJob.getID()); //$NON-NLS-1$
-				rmControl.terminateJob(ipJob);
-			} catch (CoreException e1) {
-				PTPDebugCorePlugin.log(e1);
-			}
-			if (e instanceof InterruptedException) {
-				return Status.CANCEL_STATUS;
-			} else if (e instanceof CoreException) {
-				return ((CoreException) e).getStatus();
-			} else {
-				return new Status(IStatus.ERROR, SDMDebugCorePlugin.getUniqueIdentifier(), "Failed to launch sdm master process.", e);
-			}
-		} finally {
-			DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "sdm master: thread finished."); //$NON-NLS-1$
-			synchronized (this) {
-				sdmProcess = null;
-			}
-		}
-	}
-
-	@Override
-	protected void canceling() {
-		synchronized (this) {
-			if (sdmProcess != null) {
-				sdmProcess.destroy();
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/ISDMErrorCodes.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/ISDMErrorCodes.java
deleted file mode 100644
index 4ff0cec..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/ISDMErrorCodes.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi;
-
-/**
- * Error codes that can be generated by the SDM proxy. These
- * are mapped onto internal error codes.
- * 
- * @author Clement chu
- * @see org.eclipse.ptp.debug.core.pdi.event.IPDIErrorInfo
- * 
- */
-public interface ISDMErrorCodes {
-	public static final int DBGERR_NOTIMP			=	1;
-	public static final int DBGERR_PROXY_TERM		=	2;
-	public static final int DBGERR_PROXY_PROTO		=	3;
-	public static final int DBGERR_DEBUGGER			=	4;
-	public static final int DBGERR_NOBACKEND		=	5;
-	public static final int DBGERR_INPROGRESS		=	6;
-	public static final int DBGERR_CBCREATE			=	7;
-	public static final int DBGERR_NOSESSION		=	8;
-	public static final int DBGERR_SESSION			=	9;
-	public static final int DBGERR_NOLINE			=	10;
-	public static final int DBGERR_NOFUNC			=	11;
-	public static final int DBGERR_NOFILE			=	12;
-	public static final int DBGERR_NOBP				=	13;
-	public static final int DBGERR_NOSYM			=	14;
-	public static final int DBGERR_NOMEM			=	15;
-	public static final int DBGERR_CANTRUN			=	16;
-	public static final int DBGERR_INVOKE			=	17;
-	public static final int DBGERR_ISRUNNING		=	18;
-	public static final int DBGERR_NOTRUN			=	19;
-	public static final int DBGERR_FIRSTFRAME		=	20;
-	public static final int DBGERR_LASTFRAME		=	21;
-	public static final int DBGERR_BADBPARG			=	22;
-	public static final int DBGERR_REGEX			=	23;
-	public static final int DBGERR_NOSTACK			=	24;
-	public static final int DBGERR_OUTOFRANGE		=	25;
-	public static final int DBGERR_NOFILEDIR		=	26;
-	public static final int DBGERR_NOSYMS			=	27;
-	public static final int DBGERR_TEMP				=	28;
-	public static final int DBGERR_PIPE				=	29;
-	public static final int DBGERR_FORK				=	30;
-	public static final int DBGERR_SYSTEM			=	31;
-	public static final int DBGERR_NOTEXEC			=	32;
-	public static final int DBGERR_CHDIR			=	33;
-	public static final int DBGERR_SOURCE			=	34;
-	public static final int DBGERR_SETVAR			=	35;
-	public static final int DBGERR_PROCSET			=	36;
-	public static final int DBGERR_UNKNOWN			=	37;
-	public static final int DBGERR_UNKNOWN_TYPE		=	38;
-	public static final int DBGERR_UNKNOWN_VARIABLE	=	39;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/PDIDebugger.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/PDIDebugger.java
deleted file mode 100644
index 7d66496..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/PDIDebugger.java
+++ /dev/null

@@ -1,765 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.core.elements.IPUniverse;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.ExtFormat;
-import org.eclipse.ptp.debug.core.pdi.IPDICondition;
-import org.eclipse.ptp.debug.core.pdi.IPDIDebugger;
-import org.eclipse.ptp.debug.core.pdi.IPDILocation;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIErrorInfo;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignal;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.sdm.core.proxy.ProxyDebugClient;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent;
-import org.eclipse.ptp.proxy.event.IProxyExtendedEvent;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteProxyOptions;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-
-/**
- * @author clement
- * 
- */
-public class PDIDebugger extends ProxyDebugClient implements IPDIDebugger {
-	private class ProxyNotifier extends Observable {
-		/**
-		 * @param event
-		 */
-		public void notify(IProxyDebugEvent event) {
-			setChanged();
-			notifyObservers(event);
-		}
-	}
-	
-	private int bpid = 0;
-	private ProxyNotifier proxyNotifier = new ProxyNotifier();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#commandRequest(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void commandRequest(BitList tasks, String command) throws PDIException {
-		try {
-			debugCLIHandle(tasks, command);
-		} catch (IOException e) {
-			throw new PDIException(null, "Error on sending generic command: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIMemoryBlockManagement#createDataReadMemory(org.eclipse.ptp.core.util.BitList, long, java.lang.String, int, int, int, int, java.lang.Character)
-	 */
-	public void createDataReadMemory(BitList tasks, long offset, String address, int wordFormat, int wordSize, int rows, int cols,
-			Character asChar) throws PDIException {
-		try {
-			setDataReadMemoryCommand(tasks, offset, address, getFormat(wordFormat), wordSize, rows, cols, asChar);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting data read memory: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIMemoryBlockManagement#createDataWriteMemory(org.eclipse.ptp.core.util.BitList, long, java.lang.String, int, int, java.lang.String)
-	 */
-	public void createDataWriteMemory(BitList tasks, long offset, String address, int wordFormat, int wordSize, String value)
-			throws PDIException {
-		try {
-			setDataWriteMemoryCommand(tasks, offset, address, getFormat(wordFormat), wordSize, value);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting data write memory: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#dataEvaluateExpression(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void dataEvaluateExpression(BitList tasks, String expr) throws PDIException {
-		try {
-			debugDataEvaluateExpression(tasks, expr);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on evaluating data expression: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#deleteBreakpoint(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void deleteBreakpoint(BitList tasks, int bpid) throws PDIException {
-		try {
-			debugDeleteBreakpoint(tasks, bpid);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on deleting breakpoint: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#deleteVariable(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void deleteVariable(BitList tasks, String var) throws PDIException {
-		try {
-			debugVariableDelete(tasks, var);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on deleting variable: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#disconnect(java.util.Observer)
-	 */
-	public void disconnect(Observer observer) throws PDIException {
-		stopDebugger();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#evaluateExpression(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void evaluateExpression(BitList tasks, String expr) throws PDIException {
-		try {
-			debugEvaluateExpression(tasks, expr);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on evaluating expression: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#initialize(java.util.List)
-	 */
-	public void initialize(ILaunchConfiguration configuration, List<String> args, IProgressMonitor monitor) throws PDIException {
-		int port = 0;
-		
-		/*
-		 * If there is an existing port specified, use it if possible.
-		 */
-		for (String arg : args) {
-			if (arg.startsWith("--port=")) {
-				try {
-					port = Integer.parseInt(arg.substring(7, arg.length()));
-				} catch (NumberFormatException e) {
-				}
-				break;
-			}
-		}
-		
-		try {
-			doInitialize(port);
-		} catch (IOException e) {
-			throw new PDIException(null, "Error on getting proxy port number: " + e.getMessage()); //$NON-NLS-1$
-		}
-		
-		IResourceManagerControl rm = getResourceManager(configuration);
-		if (rm != null) {
-			port = getSessionPort();
-			IResourceManagerConfiguration conf = rm.getConfiguration();
-			if (conf instanceof AbstractRemoteResourceManagerConfiguration) {
-				AbstractRemoteResourceManagerConfiguration remConf = (AbstractRemoteResourceManagerConfiguration)conf;
-				if (remConf.testOption(IRemoteProxyOptions.PORT_FORWARDING)) {
-					IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(remConf.getRemoteServicesId());
-					if (remoteServices != null) {
-						IRemoteConnectionManager connMgr = remoteServices.getConnectionManager();
-						if (connMgr != null) {
-							IRemoteConnection conn = connMgr.getConnection(remConf.getConnectionName());
-							if (conn != null) {
-								try {
-									/*
-									 * Bind remote port to all interfaces. This allows the sdm master
-									 * process running on a cluster node to use the tunnel. 
-									 * 
-									 * FIXME: Since this requires a special option to be enabled in sshd
-									 * on the head node (GatewayPorts), I'd like this to go way.
-									 */
-									port = conn.forwardRemotePort("", getSessionPort(), monitor);
-								} catch (RemoteConnectionException e) {
-									throw new PDIException(null, e.getMessage());
-								}
-								if (monitor.isCanceled()) {
-									return;
-								}
-							} else {
-								throw new PDIException(null, "Error getting connection"); //$NON-NLS-1$
-							}
-						} else {
-							throw new PDIException(null, "Error getting connection manager"); //$NON-NLS-1$
-						}
-					} else {
-						throw new PDIException(null, "Error getting remote services for connection"); //$NON-NLS-1$
-					}
-				}
-			}
-			args.add("--port=" + port); //$NON-NLS-1$
-		} else {
-			throw new PDIException(null, "Error getting resource manager"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Get resource manager from a launch configuration
-	 * 
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	private IResourceManagerControl getResourceManager(ILaunchConfiguration configuration) throws PDIException {
-		IPUniverse universe = PTPCorePlugin.getDefault().getUniverse();
-		IResourceManager[] rms = universe.getResourceManagers();
-		String rmUniqueName;
-		try {
-			rmUniqueName = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, (String)null);
-		} catch (CoreException e) {
-			throw new PDIException(null, e.getMessage());
-		}
-		for (IResourceManager rm : rms) {
-			if (rm.getState() == ResourceManagerAttributes.State.STARTED &&
-					rm.getUniqueName().equals(rmUniqueName)) {
-				return (IResourceManagerControl)rm;
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#getErrorAction(int)
-	 */
-	public int getErrorAction(int errorCode) {
-		switch (errorCode) {
-		case ISDMErrorCodes.DBGERR_NOBACKEND:
-		case ISDMErrorCodes.DBGERR_DEBUGGER:
-		case ISDMErrorCodes.DBGERR_NOFILEDIR:
-		case ISDMErrorCodes.DBGERR_CHDIR:
-			return IPDIErrorInfo.DBG_FATAL;
-			// case ISDMErrorCodes.DBGERR_INPROGRESS:
-		case ISDMErrorCodes.DBGERR_UNKNOWN_TYPE:
-		case ISDMErrorCodes.DBGERR_NOFILE:
-		case ISDMErrorCodes.DBGERR_NOBP:
-			return IPDIErrorInfo.DBG_NORMAL;
-		case ISDMErrorCodes.DBGERR_UNKNOWN_VARIABLE:
-			return IPDIErrorInfo.DBG_IGNORE;
-		default:
-			return IPDIErrorInfo.DBG_WARNING;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.proxy.debug.client.AbstractProxyDebugClient#handleEvent(org.eclipse.ptp.proxy.event.IProxyExtendedEvent)
-	 */
-	public void handleEvent(IProxyExtendedEvent e) {
-		if (e instanceof IProxyDebugEvent) {
-			proxyNotifier.notify((IProxyDebugEvent) e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#isConnected(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean isConnected(IProgressMonitor monitor) throws PDIException {
-		try {
-			if (waitConnect(monitor)) {
-				sessionHandleEvents();
-				return true;
-			}
-			disconnect(null);
-			return false;
-		} catch (IOException e) {
-			disconnect(null);
-			throw new PDIException(null, "Error on connecting proxy: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#listArguments(org.eclipse.ptp.core.util.BitList, int, int)
-	 */
-	public void listArguments(BitList tasks, int low, int high) throws PDIException {
-		try {
-			debugListArguments(tasks, low, high);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on listing arguments: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#listGlobalVariables(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void listGlobalVariables(BitList tasks) throws PDIException {
-		try {
-			debugListGlobalVariables(tasks);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on listing global variables: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIThreadManagement#listInfoThreads(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void listInfoThreads(BitList tasks) throws PDIException {
-		try {
-			debugListInfoThreads(tasks);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on listing thread info: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#listLocalVariables(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void listLocalVariables(BitList tasks) throws PDIException {
-		try {
-			debugListLocalVariables(tasks);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on listing local variables: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISignalManagement#listSignals(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void listSignals(BitList tasks, String name) throws PDIException {
-		try {
-			debugListSignals(tasks, name);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on listing signal: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIStackframeManagement#listStackFrames(org.eclipse.ptp.core.util.BitList, int, int)
-	 */
-	public void listStackFrames(BitList tasks, int low, int depth) throws PDIException {
-		try {
-			debugListStackframes(tasks, low, depth);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on listing stack frames: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#register(java.util.Observer)
-	 */
-	public void register(Observer observer) {
-		proxyNotifier.addObserver(observer);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#restart(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void restart(BitList tasks) throws PDIException {
-		throw new PDIException(null, "Not implement PDIDebugger - restart() yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#resume(org.eclipse.ptp.core.util.BitList, boolean)
-	 */
-	public void resume(BitList tasks, boolean passSignal) throws PDIException {
-		try {
-			debugGo(tasks);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on resuming tasks: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#resume(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.IPDILocation)
-	 */
-	public void resume(BitList tasks, IPDILocation location) throws PDIException {
-		throw new PDIException(null, "Not implement PDIDebugger - resume(IPDILocation) yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#resume(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDISignal)
-	 */
-	public void resume(BitList tasks, IPDISignal signal) throws PDIException {
-		throw new PDIException(null, "Not implement PDIDebugger - resume(IPDISignal) yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#retrieveAIF(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void retrieveAIF(BitList tasks, String expr) throws PDIException {
-		try {
-			debugEvaluateExpression(tasks, expr);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on getting aif: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#retrievePartialAIF(org.eclipse.ptp.core.util.BitList, java.lang.String, java.lang.String, boolean, boolean)
-	 */
-	public void retrievePartialAIF(BitList tasks, String expr, String key, boolean listChildren, boolean express)
-			throws PDIException {
-		try {
-			debugGetPartialAIF(tasks, expr, key, listChildren, express);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on getting partial aif: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDISignalManagement#retrieveSignalInfo(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void retrieveSignalInfo(BitList tasks, String arg) throws PDIException {
-		try {
-			debugSignalInfo(tasks, arg);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on getting signal info: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIThreadManagement#retrieveStackInfoDepth(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void retrieveStackInfoDepth(BitList tasks) throws PDIException {
-		try {
-			debugStackInfoDepth(tasks);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on getting stack info depth: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIVariableManagement#retrieveVariableType(org.eclipse.ptp.core.util.BitList, java.lang.String)
-	 */
-	public void retrieveVariableType(BitList tasks, String var) throws PDIException {
-		try {
-			debugGetType(tasks, var);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on getting variable type: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIThreadManagement#selectThread(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void selectThread(BitList tasks, int tid) throws PDIException {
-		try {
-			debugSetThreadSelect(tasks, tid);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting thread id: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#setAddressBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIAddressBreakpoint)
-	 */
-	public void setAddressBreakpoint(BitList tasks, IPDIAddressBreakpoint bpt) throws PDIException {
-		throw new PDIException(tasks, "Not implement PDIDebugger - setAddressBreakpoint() yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#setConditionBreakpoint(org.eclipse.ptp.core.util.BitList, int, java.lang.String)
-	 */
-	public void setConditionBreakpoint(BitList tasks, int bpid, String condition) throws PDIException {
-		try {
-			debugConditionBreakpoint(tasks, bpid, condition);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting condition breakpoint: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIStackframeManagement#setCurrentStackFrame(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void setCurrentStackFrame(BitList tasks, int level) throws PDIException {
-		try {
-			debugSetCurrentStackframe(tasks, level);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting current stack frame level: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#setEnabledBreakpoint(org.eclipse.ptp.core.util.BitList, int, boolean)
-	 */
-	public void setEnabledBreakpoint(BitList tasks, int bpid, boolean enabled) throws PDIException {
-		try {
-			if (enabled)
-				debugEnableBreakpoint(tasks, bpid);
-			else
-				debugDisableBreakpoint(tasks, bpid);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting enabling breakpoint: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#setExceptionpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIExceptionpoint)
-	 */
-	public void setExceptionpoint(BitList tasks, IPDIExceptionpoint bpt) throws PDIException {
-		throw new PDIException(tasks, "Not implement PDIDebugger - setExceptionpoint() yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#setFunctionBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIFunctionBreakpoint)
-	 */
-	public void setFunctionBreakpoint(BitList tasks, IPDIFunctionBreakpoint bpt) throws PDIException {
-		try {
-			IPDICondition condition = bpt.getCondition();
-			int id = bpt.getBreakpointID();
-			if (id == -1) {
-				id = newBreakpointId();
-				bpt.setBreakpointID(id);
-			}
-			// System.err.println("++Func Bpt - file: " +
-			// getFilename(bpt.getLocator().getFile()) + ", func: " +
-			// bpt.getLocator().getFunction());
-			debugSetFuncBreakpoint(tasks, id, bpt.isTemporary(), bpt.isHardware(), getFilename(bpt.getLocator().getFile()), bpt
-					.getLocator().getFunction(), (condition != null ? condition.getExpression() : ""),
-					(condition != null ? condition.getIgnoreCount() : 0), 0);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting function breakpoint: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#setLineBreakpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDILineBreakpoint)
-	 */
-	public void setLineBreakpoint(BitList tasks, IPDILineBreakpoint bpt) throws PDIException {
-		try {
-			IPDICondition condition = bpt.getCondition();
-			int id = bpt.getBreakpointID();
-			if (id == -1) {
-				id = newBreakpointId();
-				bpt.setBreakpointID(id);
-			}
-			// System.err.println("++Line Bpt - file: " +
-			// getFilename(bpt.getLocator().getFile()) + ", line: " +
-			// bpt.getLocator().getLineNumber());
-			debugSetLineBreakpoint(tasks, id, bpt.isTemporary(), bpt.isHardware(), getFilename(bpt.getLocator().getFile()), bpt
-					.getLocator().getLineNumber(), (condition != null ? condition.getExpression() : ""), //$NON-NLS-1$
-					(condition != null ? condition.getIgnoreCount() : 0), 0);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting line breakpoint: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIBreakpointManagement#setWatchpoint(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.IPDIWatchpoint)
-	 */
-	public void setWatchpoint(BitList tasks, IPDIWatchpoint bpt) throws PDIException {
-		try {
-			String expression = bpt.getWatchExpression();
-			boolean access = bpt.isReadType() && bpt.isWriteType();
-			boolean read = !bpt.isWriteType() && bpt.isReadType();
-			IPDICondition condition = bpt.getCondition();
-			int id = bpt.getBreakpointID();
-			if (id == -1) {
-				id = newBreakpointId();
-				bpt.setBreakpointID(id);
-			}
-			debugSetWatchpoint(tasks, id, expression, access, read, (condition != null ? condition.getExpression() : ""), //$NON-NLS-1$
-					(condition != null ? condition.getIgnoreCount() : 0));
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on setting wacthpoint: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#start(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void start(BitList tasks) throws PDIException {
-		resume(tasks, false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#startDebugger(java.lang.String, java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public void startDebugger(String app, String path, String dir, String[] args) throws PDIException {
-		try {
-			debugStartSession(app, path, dir, args);
-		} catch (IOException e) {
-			throw new PDIException(null, "Error on starting debugger: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepInto(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepInto(BitList tasks, int count) throws PDIException {
-		try {
-			debugStep(tasks, count, ProxyDebugClient.STEP_INTO);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on stepping into: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepIntoInstruction(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepIntoInstruction(BitList tasks, int count) throws PDIException {
-		throw new PDIException(null, "Not implement PDIDebugger - stepIntoInstruction() yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepOver(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepOver(BitList tasks, int count) throws PDIException {
-		try {
-			debugStep(tasks, count, ProxyDebugClient.STEP_OVER);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on stepping over: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepOverInstruction(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepOverInstruction(BitList tasks, int count) throws PDIException {
-		throw new PDIException(null, "Not implement PDIDebugger - stepOverInstruction() yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepReturn(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.model.aif.IAIF)
-	 */
-	public void stepReturn(BitList tasks, IAIF aif) throws PDIException {
-		throw new PDIException(null, "Not implement PDIDebugger - stepReturn(IAIF) yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepReturn(org.eclipse.ptp.core.util.BitList, int)
-	 */
-	public void stepReturn(BitList tasks, int count) throws PDIException {
-		try {
-			debugStep(tasks, count, ProxyDebugClient.STEP_FINISH);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on stepping return: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#stepUntil(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.debug.core.pdi.IPDILocation)
-	 */
-	public void stepUntil(BitList tasks, IPDILocation location) throws PDIException {
-		throw new PDIException(null, "Not implement PDIDebugger - stepUntil(IPDILocation) yet"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIDebugger#stopDebugger()
-	 */
-	public void stopDebugger() throws PDIException {
-		try {
-			doShutdown();
-		} catch (IOException e) {
-			throw new PDIException(null, "Error on stopping debugger: " + e.getMessage()); //$NON-NLS-1$
-		} finally {
-			proxyNotifier.deleteObservers();
-			finalize();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#suspend(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void suspend(BitList tasks) throws PDIException {
-		try {
-			debugInterrupt(tasks);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on suspending tasks: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.IPDIExecuteManagement#terminate(org.eclipse.ptp.core.util.BitList)
-	 */
-	public void terminate(BitList tasks) throws PDIException {
-		try {
-			debugTerminate(tasks);
-		} catch (IOException e) {
-			throw new PDIException(tasks, "Error on terminating tasks: " + e.getMessage()); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Extract file name part of a path
-	 * 
-	 * @param fullPath
-	 * @return file name
-	 */
-	private String getFilename(String fullPath) {
-		IPath path = new Path(fullPath);
-		if (path.isEmpty())
-			return ""; //$NON-NLS-1$
-		return path.lastSegment();
-	}
-
-	/**
-	 * Convert word format to character representation
-	 * 
-	 * @param wordFormat
-	 * @return character representation
-	 */
-	private String getFormat(int wordFormat) {
-		switch (wordFormat) {
-		case ExtFormat.UNSIGNED:
-			return "u"; //$NON-NLS-1$
-		case ExtFormat.FLOAT:
-			return "f"; //$NON-NLS-1$
-		case ExtFormat.ADDRESS:
-			return "a"; //$NON-NLS-1$
-		case ExtFormat.INSTRUCTION:
-			return "i"; //$NON-NLS-1$
-		case ExtFormat.CHAR:
-			return "c"; //$NON-NLS-1$
-		case ExtFormat.STRING:
-			return "s"; //$NON-NLS-1$
-		case ExtFormat.DECIMAL:
-			return "d"; //$NON-NLS-1$
-		case ExtFormat.BINARY:
-			return "t"; //$NON-NLS-1$
-		case ExtFormat.OCTAL:
-			return "o"; //$NON-NLS-1$
-		case ExtFormat.HEXADECIMAL:
-		default:
-			return "x"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Generate a new unique breakpoint ID
-	 * 
-	 * @return unique breakpoint ID
-	 */
-	private int newBreakpointId() {
-		return bpid++;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataEvaluateExpressionRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataEvaluateExpressionRequest.java
deleted file mode 100644
index 59ead59..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataEvaluateExpressionRequest.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractDataEvaluateExpressionRequest;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataEvent;
-
-public class SDMDataEvaluateExpressionRequest extends AbstractDataEvaluateExpressionRequest {
-	public SDMDataEvaluateExpressionRequest(BitList tasks, String expr) {
-		super(tasks, expr);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugDataEvent) {
-			ProxyDebugAIF proxyAIF = ((IProxyDebugDataEvent)result).getData();
-			results.put(rTasks, AIFFactory.newAIF(proxyAIF.getFDS(), proxyAIF.getData(), proxyAIF.getDescription()));
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataReadMemoryRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataReadMemoryRequest.java
deleted file mode 100644
index 3bb7812..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMDataReadMemoryRequest.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIMemory;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractDataReadMemoryRequest;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugMemory;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugMemoryInfo;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugMemoryInfoEvent;
-
-public class SDMDataReadMemoryRequest extends AbstractDataReadMemoryRequest {
-	private IPDISession session;
-	
-	public SDMDataReadMemoryRequest(IPDISession session, BitList tasks, long offset, String address, int wordFormat, int wordSize, int rows, int cols, Character asChar) {
-		super(tasks, offset, address, wordFormat, wordSize, rows, cols, asChar);
-		this.session = session;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugMemoryInfoEvent) {
-			ProxyDebugMemoryInfo info = ((IProxyDebugMemoryInfoEvent)result).getMemoryInfo();
-			ProxyDebugMemory[] proxyMems = info.getMemories();
-			IPDIMemory[] memories = new IPDIMemory[proxyMems.length];
-			for (int i=0; i<proxyMems.length; i++) {
-				memories[i] = session.getModelFactory().newMemory(proxyMems[i].getAddress(), proxyMems[i].getAscii(), proxyMems[i].getData());
-			}
-			results.put(rTasks, session.getEventFactory().newDataReadMemoryInfo(info.getAddress(), info.getNextRow(), info.getPrevRow(), info.getNextPage(), info.getPrevPage(), info.getNumBytes(), info.getTotalBytes(), memories));
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetAIFRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetAIFRequest.java
deleted file mode 100644
index 9df8559..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetAIFRequest.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractGetAIFRequest;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugDataEvent;
-
-public class SDMGetAIFRequest extends AbstractGetAIFRequest {
-	public SDMGetAIFRequest(BitList tasks, String expr) {
-		super(tasks, expr);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractGetAIFRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugDataEvent) {
-			ProxyDebugAIF proxyAIF = ((IProxyDebugDataEvent)result).getData();
-			results.put(rTasks, AIFFactory.newAIF(proxyAIF.getFDS(), proxyAIF.getData(), proxyAIF.getDescription()));
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetInfoThreadsRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetInfoThreadsRequest.java
deleted file mode 100644
index c7d3de2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetInfoThreadsRequest.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractGetInfoThreadsRequest;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugInfoThreadsEvent;
-
-public class SDMGetInfoThreadsRequest extends AbstractGetInfoThreadsRequest {
-	public SDMGetInfoThreadsRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugInfoThreadsEvent) {
-			results.put(rTasks, ((IProxyDebugInfoThreadsEvent)result).getThreadIds());
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetPartialAIFRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetPartialAIFRequest.java
deleted file mode 100644
index e1e0aa3..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetPartialAIFRequest.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractGetPartialAIFRequest;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugAIF;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugPartialAIFEvent;
-
-public class SDMGetPartialAIFRequest extends AbstractGetPartialAIFRequest {
-	public SDMGetPartialAIFRequest(BitList tasks, String expr, String varid) {
-		this(tasks, expr, varid, false, (varid != null));
-	}
-	
-	public SDMGetPartialAIFRequest(BitList tasks, String expr, String varid, boolean listChildren) {
-		this(tasks, expr, varid, listChildren, false);
-	}
-	
-	public SDMGetPartialAIFRequest(BitList tasks, String expr, String varid, boolean listChildren, boolean express) {
-		super(tasks, expr, varid, listChildren, express);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugPartialAIFEvent) {
-			Object[] objs = new Object[2];
-			objs[0] = ((IProxyDebugPartialAIFEvent)result).getName();
-			ProxyDebugAIF proxyAIF = ((IProxyDebugPartialAIFEvent)result).getData();
-			objs[1] = AIFFactory.newAIF(proxyAIF.getFDS(), proxyAIF.getData(), proxyAIF.getDescription());
-			results.put(rTasks, objs);
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetStackInfoDepthRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetStackInfoDepthRequest.java
deleted file mode 100644
index b8bd5ae..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMGetStackInfoDepthRequest.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractGetStackInfoDepthRequest;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackInfoDepthEvent;
-
-public class SDMGetStackInfoDepthRequest extends AbstractGetStackInfoDepthRequest {
-	public SDMGetStackInfoDepthRequest(BitList tasks) {
-		super(tasks);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugStackInfoDepthEvent) {
-			results.put(rTasks, new Integer(((IProxyDebugStackInfoDepthEvent)result).getDepth()));
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListArgumentsRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListArgumentsRequest.java
deleted file mode 100644
index b1bf6a7..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListArgumentsRequest.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractListArgumentsRequest;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugArgsEvent;
-
-public class SDMListArgumentsRequest extends AbstractListArgumentsRequest {
-	
-	public SDMListArgumentsRequest(BitList tasks, int low, int high) {
-		super(tasks, low, high);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, java.lang.Object)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugArgsEvent) {
-			results.put(rTasks, ((IProxyDebugArgsEvent)result).getVariables());
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListLocalVariablesRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListLocalVariablesRequest.java
deleted file mode 100644
index d2888cc..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListLocalVariablesRequest.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractListLocalVariablesRequest;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugVarsEvent;
-
-public class SDMListLocalVariablesRequest extends AbstractListLocalVariablesRequest {
-	public SDMListLocalVariablesRequest(BitList tasks) {
-		super(tasks);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugVarsEvent) {
-			results.put(rTasks, ((IProxyDebugVarsEvent)result).getVariables());
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListSignalsRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListSignalsRequest.java
deleted file mode 100644
index 5278434..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListSignalsRequest.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDISignalDescriptor;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractListSignalsRequest;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugSignal;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSignalsEvent;
-
-public class SDMListSignalsRequest extends AbstractListSignalsRequest {
-	private IPDISession session;
-	
-	public SDMListSignalsRequest(IPDISession session, BitList tasks, String name) {
-		super(tasks, name);
-		this.session = session;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIListSignalsRequest#getSignals(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDISignalDescriptor[] getSignals(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof ProxyDebugSignal[]) {
-			ProxyDebugSignal[] proxySigs = (ProxyDebugSignal[])obj;
-			IPDISignalDescriptor[] signals = new IPDISignalDescriptor[proxySigs.length];
-			for (int i = 0; i < signals.length; i++) {
-				signals[i] = session.getModelFactory().newSignalDescriptor(proxySigs[i].getName(), proxySigs[i].isStop(), proxySigs[i].isPass(), 
-						proxySigs[i].isPrint(), proxySigs[i].getDescription());
-			}
-			return signals;
-		}
-		throw new PDIException(qTasks, "No signals found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugSignalsEvent) {
-			results.put(rTasks, ((IProxyDebugSignalsEvent)result).getSignals());
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListStackFramesRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListStackFramesRequest.java
deleted file mode 100644
index 85aab0c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMListStackFramesRequest.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.PDILocationFactory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrameDescriptor;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractListStackFramesRequest;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugStackframeEvent;
-
-public class SDMListStackFramesRequest extends AbstractListStackFramesRequest {
-	private IPDISession session;
-
-	public SDMListStackFramesRequest(IPDISession session, BitList tasks) {
-		this(session, tasks, 0, 0);
-	}
-	
-	public SDMListStackFramesRequest(IPDISession session, BitList tasks, int low, int high) {
-		super(tasks, low, high);
-		this.session = session;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDIListStackFramesRequest#getStackFrames(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIStackFrameDescriptor[] getStackFrames(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof ProxyDebugStackFrame[]) {
-			ProxyDebugStackFrame[] frames = (ProxyDebugStackFrame[])obj;
-			IPDIStackFrameDescriptor[] desc = new IPDIStackFrameDescriptor[frames.length];
-			for (int i = 0; i < desc.length; i++) {
-				IPDILocator loc = PDILocationFactory.newLocator(frames[i].getLocator().getFile(), frames[i].getLocator().getFunction(),
-						frames[i].getLocator().getLineNumber(), frames[i].getLocator().getAddress());
-				desc[i] = session.getModelFactory().newStackFrameDescriptor(frames[i].getLevel(), loc);
-			}
-			return desc;
-		}
-		throw new PDIException(qTasks, "No stack frames found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugStackframeEvent) {
-			results.put(rTasks, ((IProxyDebugStackframeEvent)result).getFrames());
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetCurrentStackFrameRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetCurrentStackFrameRequest.java
deleted file mode 100644
index 3ae2645..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetCurrentStackFrameRequest.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractSetCurrentStackFrameRequest;
-
-public class SDMSetCurrentStackFrameRequest extends AbstractSetCurrentStackFrameRequest {
-	
-	public SDMSetCurrentStackFrameRequest(BitList tasks, int level) {
-		super(tasks, level);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetThreadSelectRequest.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetThreadSelectRequest.java
deleted file mode 100644
index 87a6878..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/pdi/request/SDMSetThreadSelectRequest.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.pdi.request;
-
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.pdi.IPDILocator;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.PDILocationFactory;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIStackFrameDescriptor;
-import org.eclipse.ptp.debug.core.pdi.request.AbstractSetThreadSelectRequest;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.proxy.debug.event.IProxyDebugSetThreadSelectEvent;
-
-public class SDMSetThreadSelectRequest extends AbstractSetThreadSelectRequest {
-	private IPDISession session;
-	
-	public SDMSetThreadSelectRequest(IPDISession session, BitList tasks, int id) {
-		super(tasks, id);
-		this.session = session;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.pdi.request.IPDISetThreadSelectRequest#getStackFrame(org.eclipse.ptp.core.util.BitList)
-	 */
-	public IPDIStackFrameDescriptor getStackFrame(BitList qTasks) throws PDIException {
-		waitUntilCompleted(qTasks);
-		Object obj = getResult(qTasks);
-		if (obj instanceof Object[]) {
-			Object[] returnValues = (Object[])obj;
-			ProxyDebugStackFrame frame = (ProxyDebugStackFrame)returnValues[1];
-			IPDILocator loc = PDILocationFactory.newLocator(frame.getLocator().getFile(), frame.getLocator().getFunction(), 
-					frame.getLocator().getLineNumber(), frame.getLocator().getAddress());
-			return session.getModelFactory().newStackFrameDescriptor(frame.getLevel(), loc);
-		}
-		throw new PDIException(qTasks, "No Stack frame found");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.core.pdi.request.AbstractEventResultRequest#storeResult(org.eclipse.ptp.core.util.BitList, org.eclipse.ptp.proxy.debug.event.IProxyDebugEvent)
-	 */
-	protected void storeResult(BitList rTasks, Object result) {
-		if (result instanceof IProxyDebugSetThreadSelectEvent) {
-			Object[] objs = new Object[2];
-			objs[0] = new Integer(((IProxyDebugSetThreadSelectEvent)result).getThreadId());
-			objs[1] = ((IProxyDebugSetThreadSelectEvent)result).getFrame();
-			results.put(rTasks, objs);
-		}
-		else {
-			storeUnknownResult(rTasks, result);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/proxy/ProxyDebugClient.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/proxy/ProxyDebugClient.java
deleted file mode 100644
index 079d89e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/proxy/ProxyDebugClient.java
+++ /dev/null

@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California.
- * This material was produced under U.S. Government contract W-7405-ENG-36
- * for Los Alamos National Laboratory, which is operated by the University
- * of California for the U.S. Department of Energy. The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
- * to produce derivative works, such modified software should be clearly marked,
- * so as not to confuse it with the version available from LANL.
- *
- * Additionally, this program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.core.proxy;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.sdm.core.utils.DebugUtil;
-import org.eclipse.ptp.proxy.debug.client.AbstractProxyDebugClient;
-import org.eclipse.ptp.proxy.debug.command.IProxyDebugCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugBreakpointAfterCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugCLICommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugConditionBreakpointCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugDataReadMemoryCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugDataWriteMemoryCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugDeleteBreakpointCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugDisableBreakpointCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugEnableBreakpointCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugEvaluateExpressionCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugGetPartialAIFCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugGetTypeCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugGoCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugInterruptCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugListArgumentsCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugListGlobalVariablesCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugListInfoThreadsCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugListLocalVariablesCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugListSignalsCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugListStackframesCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugSetCurrentStackframeCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugSetFunctionBreakpointCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugSetLineBreakpointCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugSetThreadSelectCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugSetWatchpointCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugSignalInfoCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugStackInfoDepthCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugStartSessionCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugStepCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugTerminateCommand;
-import org.eclipse.ptp.proxy.debug.command.ProxyDebugVariableDeleteCommand;
-
-public class ProxyDebugClient extends AbstractProxyDebugClient {
-	public static final int STEP_INTO = 0;
-	public static final int STEP_OVER = 1;
-	public static final int STEP_FINISH = 2;
-
-	/**
-	 * Convert a proxy representation of a bitset into a BitList
-	 *
-	 * @param str
-	 * @return proxy bitset converted to BitList
-	 */
-	public static BitList decodeBitSet(String str) {
-		String[] parts = str.split(":");
-		int len = Integer.parseInt(parts[0], 16); // Skip trailing NULL
-		return new BitList(len, parts[1]);
-	}
-
-	/**
-	 * Convert a BitList to it's proxy representation
-	 *
-	 * @param set
-	 * @return proxy representation of a BitList
-	 */
-	public static String encodeBitSet(BitList set) {
-		String lenStr = Integer.toHexString(set.size());
-		return lenStr + ":" + set.toString();
-	}
-
-	/**
-	 * Wait for the debugger to connect. We will receive a connected event
-	 * when the debug server actually connects, or a timeout event if the server
-	 * fails to connect.
-	 *
-	 * @param monitor
-	 * @return true on successful connection, false otherwise
-	 * @throws IOException
-	 */
-	public boolean waitConnect(IProgressMonitor monitor) throws IOException {
-		DebugUtil.trace(DebugUtil.SDM_MASTER_TRACING, "debug: waiting for connect");
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		waitLock.lock();
-		try {
-			if (state == DebugProxyState.CONNECTING) {
-				while (state == DebugProxyState.CONNECTING && !timeout && !monitor.isCanceled()) {
-					waiting = true;
-					try {
-						//added to wait for 1000
-						waitCondition.await(1000, TimeUnit.MILLISECONDS);
-					} catch (InterruptedException e) {
-						// Expect to be interrupted if monitor is canceled
-						monitor.setCanceled(true);
-					}
-				}
-				if (timeout) {
-					throw new IOException("Timeout waiting for debugger to connect");
-				}
-				if (monitor.isCanceled()) {
-					return false;
-				}
-				if (state != DebugProxyState.CONNECTED) {
-					return false;
-				}
-			}
-			return true;
-		} finally {
-			waitLock.unlock();
-			monitor.done();
-		}
-	}
-
-	public void debugStartSession(String prog, String path, String dir, String[] args) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugStartSessionCommand(prog, path, dir, args);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugSetLineBreakpoint(BitList procs, int bpid, boolean isTemporary, boolean isHardware, String file, int line, String expression, int ignoreCount, int tid) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugSetLineBreakpointCommand(encodeBitSet(procs), bpid, isTemporary, isHardware, file, line, expression, ignoreCount, tid);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugSetFuncBreakpoint(BitList procs, int bpid, boolean isTemporary, boolean isHardware, String file, String func, String expression, int ignoreCount, int tid) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugSetFunctionBreakpointCommand(encodeBitSet(procs), bpid, isTemporary, isHardware, file, func, expression, ignoreCount, tid);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugSetWatchpoint(BitList procs, int bpid, String expression, boolean isAccess, boolean isRead, String condition, int ignoreCount) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugSetWatchpointCommand(encodeBitSet(procs), bpid, expression, isAccess, isRead, condition, ignoreCount);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugDeleteBreakpoint(BitList procs, int bpid) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugDeleteBreakpointCommand(encodeBitSet(procs), bpid);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugEnableBreakpoint(BitList procs, int bpid) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugEnableBreakpointCommand(encodeBitSet(procs), bpid);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugDisableBreakpoint(BitList procs, int bpid) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugDisableBreakpointCommand(encodeBitSet(procs), bpid);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugConditionBreakpoint(BitList procs, int bpid, String expr) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugConditionBreakpointCommand(encodeBitSet(procs), bpid, expr);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugBreakpointAfter(BitList procs, int bpid, int icount) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugBreakpointAfterCommand(encodeBitSet(procs), bpid, icount);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugStackInfoDepth(BitList procs) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugStackInfoDepthCommand(encodeBitSet(procs));
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugGo(BitList procs) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugGoCommand(encodeBitSet(procs));
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugStep(BitList procs, int count, int type) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugStepCommand(encodeBitSet(procs), count, type);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugTerminate(BitList procs) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugTerminateCommand(encodeBitSet(procs));
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugInterrupt(BitList procs) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugInterruptCommand(encodeBitSet(procs));
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugListStackframes(BitList procs, int low, int high) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugListStackframesCommand(encodeBitSet(procs), low, high);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugSetCurrentStackframe(BitList procs, int level) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugSetCurrentStackframeCommand(encodeBitSet(procs), level);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugGetType(BitList procs, String expr) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugGetTypeCommand(encodeBitSet(procs), expr);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugListLocalVariables(BitList procs) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugListLocalVariablesCommand(encodeBitSet(procs));
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugListArguments(BitList procs, int low, int high) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugListArgumentsCommand(encodeBitSet(procs), low, high);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugListGlobalVariables(BitList procs) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugListGlobalVariablesCommand(encodeBitSet(procs));
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugListInfoThreads(BitList procs) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugListInfoThreadsCommand(encodeBitSet(procs));
-		sendCommand(cmd);
-		cmd.completed();
-	}
-	public void debugSetThreadSelect(BitList procs, int threadNum) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugSetThreadSelectCommand(encodeBitSet(procs), threadNum);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void setDataReadMemoryCommand(BitList procs, long offset, String address, String format, int wordSize, int rows, int cols, Character asChar) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugDataReadMemoryCommand(encodeBitSet(procs), offset, address, format, wordSize, rows, cols, asChar);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void setDataWriteMemoryCommand(BitList procs, long offset, String address, String format, int wordSize, String value) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugDataWriteMemoryCommand(encodeBitSet(procs), offset, address, format, wordSize, value);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugListSignals(BitList procs, String name) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugListSignalsCommand(encodeBitSet(procs), name);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugSignalInfo(BitList procs, String arg) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugSignalInfoCommand(encodeBitSet(procs), arg);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugCLIHandle(BitList procs, String arg) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugCLICommand(encodeBitSet(procs), arg);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugGetPartialAIF(BitList procs, String name, String key, boolean listChildren, boolean express) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugGetPartialAIFCommand(encodeBitSet(procs), name, key, listChildren, express);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-
-	public void debugVariableDelete(BitList procs, String name) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugVariableDeleteCommand(encodeBitSet(procs), name);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-	//TODO missing Data Evaluate Expression or Evaluate Expression Command
-	public void debugDataEvaluateExpression(BitList procs, String expr) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugEvaluateExpressionCommand(encodeBitSet(procs), expr);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-	public void debugEvaluateExpression(BitList procs, String expr) throws IOException {
-		IProxyDebugCommand cmd = new ProxyDebugEvaluateExpressionCommand(encodeBitSet(procs), expr);
-		sendCommand(cmd);
-		cmd.completed();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/utils/DebugUtil.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/utils/DebugUtil.java
deleted file mode 100644
index e4a1635..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/utils/DebugUtil.java
+++ /dev/null

@@ -1,55 +0,0 @@
-package org.eclipse.ptp.debug.sdm.core.utils;
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.debug.sdm.core.SDMDebugCorePlugin;
-
-public class DebugUtil {
-	private static final String SDM_MASTER_TRACING_OPTION = "org.eclipse.ptp.debug.sdm.core/debug/SDMmaster"; //$NON-NLS-1$
-	private static final String SDM_MASTER_TRACING_OPTION_MORE = "org.eclipse.ptp.debug.sdm.core/debug/SDMmaster/more"; //$NON-NLS-1$
-	private static final String SDM_MASTER_OUTPUT_TRACING_OPTION = "org.eclipse.ptp.debug.sdm.core/debug/SDMmaster/output"; //$NON-NLS-1$
-
-	public static boolean SDM_MASTER_TRACING = false;
-	public static boolean SDM_MASTER_TRACING_MORE = false;
-	public static boolean SDM_MASTER_OUTPUT_TRACING = false;
-
-	public static void configurePluginDebugOptions() {
-		if (SDMDebugCorePlugin.getDefault().isDebugging()) {
-			String option = Platform.getDebugOption(SDM_MASTER_TRACING_OPTION);
-			if (option != null) {
-				SDM_MASTER_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(SDM_MASTER_TRACING_OPTION_MORE);
-			if (option != null) {
-				SDM_MASTER_TRACING_MORE = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(SDM_MASTER_OUTPUT_TRACING_OPTION);
-			if (option != null) {
-				SDM_MASTER_OUTPUT_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-		}
-	}
-
-	public static void trace(boolean option, String pattern, Object ... arguments) {
-		trace(option, MessageFormat.format(pattern, arguments));
-	}
-
-	public static void trace(boolean option, String message) {
-		if (option) {
-			System.out.println(message);
-			System.out.flush();
-		}
-	}
-
-	public static void error(boolean option, String pattern, Object ... arguments) {
-		error(option, MessageFormat.format(pattern, arguments));
-	}
-
-	public static void error(boolean option, String message) {
-		if (option) {
-			System.err.println(message);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/.classpath b/debug/org.eclipse.ptp.debug.sdm.ui/.classpath
deleted file mode 100644
index 1fa3e68..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/.cvsignore b/debug/org.eclipse.ptp.debug.sdm.ui/.cvsignore
deleted file mode 100644
index f0a691e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/.project b/debug/org.eclipse.ptp.debug.sdm.ui/.project
deleted file mode 100644
index 18b687c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.debug.sdm.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3bfc102..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.debug.sdm.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.debug.sdm.ui.SDMDebugUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.filesystem,
- org.eclipse.debug.ui,
- org.eclipse.ptp.debug.ui,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.core,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.debug.sdm.core,
- org.eclipse.ui
-Eclipse-LazyStart: true

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/about.html b/debug/org.eclipse.ptp.debug.sdm.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/about.html
+++ /dev/null

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

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/build.properties b/debug/org.eclipse.ptp.debug.sdm.ui/build.properties
deleted file mode 100644
index ee7ecd5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/build.properties
+++ /dev/null

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

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/plugin.properties b/debug/org.eclipse.ptp.debug.sdm.ui/plugin.properties
deleted file mode 100644
index 68d0f1b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/plugin.properties
+++ /dev/null

@@ -1,26 +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
-#
-# Contributors:
-#     Clement Chu
-#################################################################################
-
-pluginName=PTP Scalable Debug Manager UI
-pluginProvider=Eclipse.org
-
-SDMPreferencePage.name=SDM

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml b/debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml
deleted file mode 100644
index b9547df..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/plugin.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-    <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%SDMPreferencePage.name"
-            category="org.eclipse.ptp.debug.ui.PDebugPreferencePage"
-            class="org.eclipse.ptp.debug.sdm.internal.ui.preferences.SDMPreferencePage"
-            id="org.eclipse.ptp.debug.sdm.ui.SDMPreferencePage">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.debug.ui.debuggerConfigurations">
-      <debuggerConfiguration
-            class="org.eclipse.ptp.debug.sdm.internal.ui.SDMPage"
-            debuggerID="org.eclipse.ptp.debug.sdm"
-            id="org.eclipse.ptp.debug.sdm.SDMPage">
-      </debuggerConfiguration>
-   </extension>
-</plugin>

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.java
deleted file mode 100644
index b26c1af..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.internal.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.sdm.internal.ui.Messages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.properties b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.properties
deleted file mode 100644
index fd84365..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/Messages.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 QNX Software Systems 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:
-#     QNX Software Systems - initial API and implementation
-###############################################################################
-
-SDMDebuggerPage.debuggname=Debugger
-SDMDebuggerPage.enableremotedebugging=Enable remote debugging
-SDMDebuggerPage.browse=Browse
-SDMDebuggerPage.path=Path to debugger executable:
-SDMDebuggerPage.host=Debugger session address:
-SDMDebuggerPage.selectDebuggerExe=Select Debugger Executable
-SDMDebuggerPage.err1=Executable path must be specified
-SDMDebuggerPage.err2=Exception occurred reading configuration
-SDMDebuggerPage.err3=Debugger host must be specified
-SDMDebuggerPage.err4=SDM path is invalid

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/SDMPage.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/SDMPage.java
deleted file mode 100644
index 0a3f144..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/SDMPage.java
+++ /dev/null

@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems 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:
- *     QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.internal.ui;
-
-import java.io.IOException;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteProxyOptions;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * The dynamic tab for SDM-based debugger implementations.
- */
-public class SDMPage extends AbstractLaunchConfigurationTab {
-	
-	private static final String SDM_LOCATION = "last_valid_applied_location_of_sdm_executable";
-	
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	private IResourceManagerControl resourceManager = null;
-	private IRemoteServices remoteServices = null;
-	private String errMsg = null;
-	private boolean pathIsDirty = true;
-	private boolean pathIsValid = false;
-	
-	protected Text fRMDebuggerPathText = null;
-	protected Text fRMDebuggerAddressText = null;
-	protected Button fRMDebuggerBrowseButton = null;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	@Override
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		/*
-		 * Debugger tab is selected from within an existing page...
-		 */
-		try {
-			fRMDebuggerAddressText.setText(getAddress(workingCopy));
-			fRMDebuggerPathText.setText(workingCopy.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_EXECUTABLE_PATH, EMPTY_STRING));
-		} catch(CoreException e) {
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setLayout(new GridLayout(2, false));
-		comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(Messages.getString("SDMDebuggerPage.path")); //$NON-NLS-1$
-		GridData gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-
-		fRMDebuggerPathText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		fRMDebuggerPathText.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-		fRMDebuggerPathText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				pathIsDirty = true;
-				updateLaunchConfigurationDialog();
-			}
-		});
-		fRMDebuggerBrowseButton = createPushButton(comp, Messages.getString("SDMDebuggerPage.browse"), null); //$NON-NLS-1$
-		fRMDebuggerBrowseButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				String file = browseFile();
-				if (file != null) {
-					fRMDebuggerPathText.setText(file);
-				}
-			}
-		});
-
-		label = new Label(comp, SWT.NONE);
-		label.setText(Messages.getString("SDMDebuggerPage.host")); //$NON-NLS-1$
-		gd = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-
-		fRMDebuggerAddressText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		fRMDebuggerAddressText.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-		fRMDebuggerAddressText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		setControl(parent);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.getString("SDMDebuggerPage.debuggname"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		/*
-		 * Launch configuration is selected or we have just selected SDM as the debugger...
-		 */
-		try {
-			String rmId = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, EMPTY_STRING);
-			resourceManager = (IResourceManagerControl)PTPCorePlugin.getDefault().getModelManager().getResourceManagerFromUniqueName(rmId);
-			fRMDebuggerAddressText.setText(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_HOST, EMPTY_STRING));
-			fRMDebuggerPathText.setText(configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_EXECUTABLE_PATH, EMPTY_STRING));
-		} catch (CoreException e) {
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	@Override
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		setErrorMessage(null);
-		if (getFieldContent(fRMDebuggerAddressText.getText()) == null) {
-			setErrorMessage(Messages.getString("SDMDebuggerPage.err3")); //$NON-NLS-1$
-		} else if (getFieldContent(fRMDebuggerPathText.getText()) == null) {
-			setErrorMessage(Messages.getString("SDMDebuggerPage.err1")); //$NON-NLS-1$
-		} else {
-			if (pathIsDirty) {
-				if (!verifyPath(fRMDebuggerPathText.getText())) {
-					pathIsValid = false;
-				} else {
-					pathIsValid = true;
-				}
-				pathIsDirty = false;
-			} 
-			
-			if (!pathIsValid) {
-				setErrorMessage(Messages.getString("SDMDebuggerPage.err4")); //$NON-NLS-1$
-			}
-		}
-		return (getErrorMessage() == null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#canSave()
-	 */
-	@Override
-	public boolean canSave() {
-		setErrorMessage(null);
-		if (getFieldContent(fRMDebuggerAddressText.getText()) == null) {
-			setErrorMessage(Messages.getString("SDMDebuggerPage.err3")); //$NON-NLS-1$
-		} else if (getFieldContent(fRMDebuggerPathText.getText()) == null) {
-			setErrorMessage(Messages.getString("SDMDebuggerPage.err1")); //$NON-NLS-1$
-		} else {
-			if (pathIsDirty) {
-				if (!verifyPath(fRMDebuggerPathText.getText())) {
-					pathIsValid = false;
-				} else {
-					pathIsValid = true;
-				}
-				pathIsDirty = false;
-			} 
-			
-			if (!pathIsValid) {
-				setErrorMessage(Messages.getString("SDMDebuggerPage.err4")); //$NON-NLS-1$
-			}
-		}
-		//setErrorMessage(errMsg);
-		return (getErrorMessage() == null);
-	}
-	
-	/**
-	 * Verify that the supplied path exists on the remote system
-	 * 
-	 * @param path path to verify
-	 * @return true if path exists
-	 */
-	private boolean verifyPath(String path) {
-		IRemoteConnection rmConn = getRemoteConnection();
-		if (rmConn != null) {
-			IRemoteFileManager fileManager = getRemoteServices().getFileManager(rmConn);
-			try {
-				IFileStore res = fileManager.getResource(new Path(path), new NullProgressMonitor());
-				if (res.fetchInfo().exists()) {
-					return true;
-				}
-			}
-			catch (IOException e) {
-				return false;
-			}
-		}
-		if (new Path(path).toFile().exists()) {
-			return true;
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		/*
-		 * Note: performApply gets called when either text is modified via
-		 * updateLaunchConfigurationDialog(). Only update the configuration if
-		 * things are valid.
-		 */
-		if (isValid(configuration)) {
-			configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_EXECUTABLE_PATH, getFieldContent(fRMDebuggerPathText.getText()));
-			configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_HOST, getFieldContent(fRMDebuggerAddressText.getText()));
-			
-			Plugin plugin=org.eclipse.ptp.debug.sdm.ui.SDMDebugUIPlugin.getDefault();
-			Preferences prefs = plugin.getPluginPreferences();
-			
-			prefs.setValue(SDM_LOCATION, getFieldContent(fRMDebuggerPathText.getText()));
-			
-			plugin.savePluginPreferences();
-			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		/*
-		 * We have just selected SDM as the debugger...
-		 */
-		//Preferences store = SDMDebugCorePlugin.getDefault().getPluginPreferences();
-		String path = "";//store.getString(SDMPreferenceConstants.SDM_DEBUGGER_FILE);
-		/*
-		 * Guess that the sdm executable is in the same location as the proxy. If not then use the
-		 * preference setting.
-		 */
-		try {
-			String rmId = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, EMPTY_STRING);
-			IResourceManagerControl rm = (IResourceManagerControl)PTPCorePlugin.getDefault().getModelManager().getResourceManagerFromUniqueName(rmId);
-			if (rm != null) {
-				IResourceManagerConfiguration rmConfig = rm.getConfiguration();
-				if (rmConfig instanceof AbstractRemoteResourceManagerConfiguration) {
-					AbstractRemoteResourceManagerConfiguration remConfig = (AbstractRemoteResourceManagerConfiguration)rmConfig;
-					IPath rmPath = new Path(remConfig.getProxyServerPath());
-					path = rmPath.removeLastSegments(1).append("sdm").toString(); //$NON-NLS-1$/
-					
-				}
-				
-				if(path.equals("sdm")||path.equals("")){
-					Plugin plugin=org.eclipse.ptp.debug.sdm.ui.SDMDebugUIPlugin.getDefault();
-					Preferences prefs = plugin.getPluginPreferences();
-					path=prefs.getString(SDM_LOCATION);
-					if(path==null||path.equals("")){
-						path="sdm";
-					}
-				}
-				
-			}
-		} catch (CoreException e) {
-		}
-
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_EXECUTABLE_PATH, path);
-		configuration.setAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_HOST, getAddress(configuration));
-	}
-
-	/**
-	 * Browse for a file. If remoteServices is not null, then the currently
-	 * select resource manager supports remote browsing.
-	 * 
-	 * @return path to file selected in browser
-	 */
-	private String browseFile() {
-		IRemoteUIServices remoteUISrv = getRemoteUIServices();
-		if (remoteUISrv != null) {
-			IRemoteUIFileManager fileManager = remoteUISrv.getUIFileManager();
-			if (fileManager != null) {
-				fileManager.setConnection(getRemoteConnection());
-				IPath path = fileManager.browseFile(getShell(),
-						Messages.getString("SDMDebuggerPage.selectDebuggerExe"),
-						fRMDebuggerPathText.getText());
-				if (path != null)
-					return path.toString();
-			}
-		} else {
-			FileDialog dialog = new FileDialog(getShell());
-			dialog.setText(Messages.getString("SDMDebuggerPage.selectDebuggerExe"));
-			dialog.setFileName(fRMDebuggerPathText.getText());
-			return dialog.open();
-		}
-		return null;
-	}
-
-	/**
-	 * Work out the address to supply as argument to the debug server. There are currently
-	 * two cases:
-	 * 
-	 * 1. If port forwarding is enabled, then the address needs to be the address of the host that is
-	 * running the proxy (since this is where the tunnel begins), but accessible from the machine running
-	 * the debug server. Since the debug server machine may be on a local network (e.g. a node in a
-	 * cluster), it will typically NOT be the same address that is used to start the proxy.
-	 * 
-	 * 2. If port forwarding is not enabled, then the address will be the address of the host running
-	 * Eclipse). NOTE: this assumes that the machine running the debug server can contact the local host directly.
-	 * In the case of the SDM, the "master" debug server process can potentially run on any node in the cluster.
-	 * In many environments, compute nodes cannot communicate outside their local network.
-	 * 
-	 * @param configuration
-	 * @return
-	 */
-	private String getAddress(ILaunchConfigurationWorkingCopy configuration) {
-		String address;
-		String rmId;
-		try {
-			address = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_HOST, EMPTY_STRING);
-			rmId = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_RESOURCE_MANAGER_UNIQUENAME, EMPTY_STRING);
-		} catch (CoreException e) {
-			return EMPTY_STRING;
-		}
-
-		IResourceManagerControl rm = (IResourceManagerControl)PTPCorePlugin.getDefault().getModelManager().getResourceManagerFromUniqueName(rmId);
-		if (rm != null) {
-			/*
-			 * If the resource manager has been changed and this is a remote
-			 * resource manager, then update the host field
-			 */
-			if (resourceManager != rm) {
-				resourceManager = rm;
-				AbstractRemoteResourceManagerConfiguration config = getRemoteResourceManagerConfigure();
-				if (config != null) {
-					if (config.testOption(IRemoteProxyOptions.PORT_FORWARDING))
-						return getRemoteConnection().getAddress();
-					else
-						return  config.getLocalAddress();
-				} else
-					return "localhost"; //$NON-NLS-1$
-			}
-		}
-		return address;
-	}
-
-	/**
-	 * Get the RM configuration information
-	 * 
-	 * @return AbstractRemoteResourceManagerConfiguration
-	 */
-	private AbstractRemoteResourceManagerConfiguration getRemoteResourceManagerConfigure() {
-		if (resourceManager != null) {
-			IResourceManagerConfiguration rmConfig = resourceManager.getConfiguration();
-			if (rmConfig instanceof AbstractRemoteResourceManagerConfiguration)
-				return (AbstractRemoteResourceManagerConfiguration)rmConfig;
-		}
-		return null;
-
-	}
-
-	/**
-	 * Return remote services
-	 * @return remote services
-	 */
-	private IRemoteServices getRemoteServices() {
-		if (resourceManager == null)
-			return null;
-
-		if (remoteServices == null) {
-			IResourceManagerConfiguration rmConfig = resourceManager.getConfiguration();
-			if (rmConfig instanceof AbstractRemoteResourceManagerConfiguration) {
-				AbstractRemoteResourceManagerConfiguration remConfig = (AbstractRemoteResourceManagerConfiguration)rmConfig;
-				remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(remConfig.getRemoteServicesId());
-			}
-		}
-		return remoteServices;
-	}
-	
-	/**
-	 * Look up remote UI services
-	 * 
-	 * @return IRemoteUIServices
-	 */
-	private IRemoteUIServices getRemoteUIServices() {
-		IRemoteServices rsrv = getRemoteServices();
-		if (rsrv != null)
-			return PTPRemoteUIPlugin.getDefault().getRemoteUIServices(rsrv);
-		return null;
-	}
-
-	/**
-	 * Get the current remote connection selected in the RM
-	 * 
-	 * @return IRemoteConnection
-	 */
-	private IRemoteConnection getRemoteConnection() {
-		IRemoteServices rsrv = getRemoteServices();
-		if (rsrv != null) {
-			AbstractRemoteResourceManagerConfiguration config = getRemoteResourceManagerConfigure();
-			if (config != null)
-				return rsrv.getConnectionManager().getConnection(config.getConnectionName());
-		}
-		return null;
-	}
-
-	/**
-	 * Get and clean content of a Text field
-	 * @param text text obtained from a Text field
-	 * @return cleaned up content
-	 */
-	protected String getFieldContent(String text) {
-		if (text.trim().length() == 0 || text.equals(EMPTY_STRING))
-			return null;
-		return text;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.java
deleted file mode 100644
index 95a550e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.internal.ui.preferences;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class PreferenceMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.sdm.internal.ui.preferences.PreferenceMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private PreferenceMessages() {}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.properties b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.properties
deleted file mode 100644
index 465b117..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/PreferenceMessages.properties
+++ /dev/null

@@ -1,40 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
- 
-SDMPreferencePage.browse_1=B&rowse
-SDMPreferencePage.sdm_desc=Scalable Debug Manager settings
-SDMPreferencePage.sdm_group=Debugger launch preferences
-SDMPreferencePage.sdm_selection=SDM executable
-SDMPreferencePage.sdm_args=Extra SDM arguments
-SDMPreferencePage.sdm_host=SDM client host
-SDMPreferencePage.sdm_backend=Backend debugger
-SDMPreferencePage.sdm_backend_path=Path to backend debugger
-SDMPreferencePage.Selection_must_be_file=Selection must be a file type
-SDMPreferencePage.no_sdm=No sdm found
-
-SDMPreferencePage.default3=Communication
-SDMPreferencePage.default4=Time out
-SDMPreferencePage.default5=Event
-SDMPreferencePage.default6=Time range
-
- 
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/SDMPreferencePage.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/SDMPreferencePage.java
deleted file mode 100644
index b832c8f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/internal/ui/preferences/SDMPreferencePage.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.sdm.internal.ui.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ptp.debug.sdm.core.SDMDebugCorePlugin;
-import org.eclipse.ptp.debug.sdm.core.SDMPreferenceConstants;
-import org.eclipse.ptp.debug.ui.PreferencesAdapter;
-import org.eclipse.ptp.ui.preferences.AbstractPreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Clement chu
- *
- */
-public class SDMPreferencePage extends AbstractPreferencePage {
-	protected class WidgetListener extends SelectionAdapter implements ModifyListener {
-   		public void modifyText(ModifyEvent e) {
-	    		setValid(isValid());        	
-	    }
-	    public void widgetSelected(SelectionEvent e) {
-   			Object source = e.getSource();
-   			//if (source == sdmPathButton)
-   				//handleSDMButtonSelected();
-   			if (source == sdmBackendCombo)
-   				handleSDMComboSelected();
-   		}
-    }
-	//private Text sdmPathText = null;
-	//private Text sdmHostText = null;
-	private Text sdmBackendPathText = null;
-	private Text sdmArgsText = null;
-	private Combo sdmBackendCombo = null;
-	
-    //private Button sdmPathButton = null;
-    protected WidgetListener listener = new WidgetListener();
-    
-	public SDMPreferencePage() {
-		super();
-		setPreferenceStore(new PreferencesAdapter(SDMDebugCorePlugin.getDefault().getPluginPreferences()));
-		setDescription(PreferenceMessages.getString("SDMPreferencePage.sdm_desc"));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#isValid()
-	 */
-	public boolean isValid() {
-		setErrorMessage(null);
-		setMessage(null);
-		/*
-		String name = sdmPathText.getText();
-		if (name == null) {
-			setErrorMessage(PreferenceMessages.getString("SDMPreferencePage.no_sdm"));
-			return false;
-		}
-		File sdmFile = new File(name);
-		if (!sdmFile.isFile()) {
-			setErrorMessage(PreferenceMessages.getString("SDMPreferencePage.Selection_must_be_file"));
-			return false;
-		}
-		*/
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	public void performDefaults() { 
-		IPreferenceStore store = getPreferenceStore();
-		//sdmPathText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_FILE));
-		sdmArgsText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_ARGS));
-		//sdmHostText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_HOST));
-		sdmBackendCombo.select(sdmBackendCombo.indexOf(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE)));
-		sdmBackendPathText.setText(store.getDefaultString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH));
-		super.performDefaults();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		storeValues();
-		SDMDebugCorePlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-	
-	/**
-	 * Handle property change event
-	 * 
-     * @param event
-     */
-    public void propertyChange(PropertyChangeEvent event) {
-    	setValid(isValid());
-    }	
-	
-	/**
-	 * Handle sdm path button selected
-	 */
-    /*
-	private void handleSDMButtonSelected() {
-		FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-		String filePath = dialog.open();
-		if (filePath != null) {
-			sdmPathText.setText(filePath);
-		}
-	}
-	*/
-	
-    /**
-	 * Handle combo selection
-	 */
-	private void handleSDMComboSelected() {
-	}	
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		//TODO ignored help
-		//getWorkbench().getHelpSystem().setHelp(getControl(), IPDebugHelpContextIds.P_DEBUG_PREFERENCE_PAGE);
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-		createSpacer(composite, 1);
-		createSDMSetting(composite);
-		setValues();
-		return composite;
-	}
-	
-	/**
-	 * @param parent
-	 */
-	protected void createSDMSetting(Composite parent) {
-		Composite group = createGroupComposite(parent, 1, false, PreferenceMessages.getString("SDMPreferencePage.sdm_group"));
-		Composite comp = createComposite(group, 2);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		/*
-		gd.horizontalSpan = 2;
-		new Label(comp, SWT.NONE).setText(PreferenceMessages.getString("SDMPreferencePage.sdm_host"));
-		sdmHostText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		sdmHostText.setLayoutData(gd);
-		sdmHostText.addModifyListener(listener);
-		*/
-		
-		new Label(comp, SWT.NONE).setText(PreferenceMessages.getString("SDMPreferencePage.sdm_backend"));
-		sdmBackendCombo = new Combo(comp, SWT.READ_ONLY);
-		sdmBackendCombo.setLayoutData(gd);
-		sdmBackendCombo.setItems(SDMPreferenceConstants.SDM_DEBUGGER_BACKENDS);
-		sdmBackendCombo.addSelectionListener(listener);
-
-		new Label(comp, SWT.NONE).setText(PreferenceMessages.getString("SDMPreferencePage.sdm_backend_path"));
-		sdmBackendPathText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		sdmBackendPathText.setLayoutData(gd);
-		sdmBackendPathText.addModifyListener(listener);
-		
-		/*
-		new Label(comp, SWT.NONE).setText(PreferenceMessages.getString("SDMPreferencePage.sdm_selection"));
-		sdmPathText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		sdmPathText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		sdmPathText.addModifyListener(listener);		
-		sdmPathButton = createButton(comp, PreferenceMessages.getString("SDMPreferencePage.browse_1"), SWT.PUSH);
-		sdmPathButton.addSelectionListener(listener);
-		*/
-		new Label(comp, SWT.NONE).setText(PreferenceMessages.getString("SDMPreferencePage.sdm_args"));
-		sdmArgsText = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		sdmArgsText.setLayoutData(gd);
-		sdmArgsText.addModifyListener(listener);		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#setValues()
-	 */
-	protected void setValues() {
-		IPreferenceStore store = getPreferenceStore();
-		//sdmPathText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_FILE));
-		sdmArgsText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_ARGS));
-		//sdmHostText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_HOST));
-		sdmBackendCombo.select(sdmBackendCombo.indexOf(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE)));
-		sdmBackendPathText.setText(store.getString(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#storeValues()
-	 */
-	protected void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		//store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_FILE, sdmPathText.getText());
-		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_ARGS, sdmArgsText.getText());
-		//store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_HOST, sdmHostText.getText());
-		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_TYPE, sdmBackendCombo.getItem(sdmBackendCombo.getSelectionIndex()));
-		store.setValue(SDMPreferenceConstants.SDM_DEBUGGER_BACKEND_PATH, sdmBackendPathText.getText());
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/ui/SDMDebugUIPlugin.java b/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/ui/SDMDebugUIPlugin.java
deleted file mode 100644
index a7399e2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm.ui/src/org/eclipse/ptp/debug/sdm/ui/SDMDebugUIPlugin.java
+++ /dev/null

@@ -1,54 +0,0 @@
-package org.eclipse.ptp.debug.sdm.ui;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SDMDebugUIPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static SDMDebugUIPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public SDMDebugUIPlugin() {
-		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 SDMDebugUIPlugin 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.debug.sdm.ui", path);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/.cdtproject b/debug/org.eclipse.ptp.debug.sdm/.cdtproject
deleted file mode 100644
index 386aeb1..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/.cdtproject
+++ /dev/null

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.MachO">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-<extension point="org.eclipse.cdt.core.CIndexer" id="org.eclipse.cdt.core.domsourceindexer"/>
-<data>
-<item id="scannerConfiguration">
-<autodiscovery enabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile" problemReportingEnabled="true"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction useDefault="true" command="make" arguments="-f ${project_name}_scd.mk"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</item>
-<item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="inc" path="" include="/usr/local/ompi/include" system="true"/>
-<pathentry kind="inc" path="" include="/usr/local/ompi/include/openmpi/orte" system="true"/>
-<pathentry kind="inc" path="" include="/usr/local/ompi/include/openmpi/opal" system="true"/>
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</item>
-<item id="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="all" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>all</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-<target name="clean" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>clean</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-<target name="install" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-</buildTargets>
-</item>
-</data>
-</cdtproject>

diff --git a/debug/org.eclipse.ptp.debug.sdm/.cproject b/debug/org.eclipse.ptp.debug.sdm/.cproject
deleted file mode 100644
index 768369b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/.cproject
+++ /dev/null

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="converted.config.1234521807">
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</storageModule>
-
-
-<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1234521807" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-</extensions>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry include="/usr/local/openmpi-1.2.3/include" kind="inc" path="" system="true"/>
-<pathentry include="/usr/local/openmpi-1.2.3/include/openmpi/orte" kind="inc" path="" system="true"/>
-<pathentry include="/usr/local/openmpi-1.2.3/include/openmpi/opal" kind="inc" path="" system="true"/>
-<pathentry base-path="org.eclipse.ptp.debug.sdm" include="" kind="inc" path="" system="true"/>
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="all" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>all</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>true</runAllBuilders>
-</target>
-<target name="clean" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>clean</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>true</runAllBuilders>
-</target>
-<target name="install" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-<runAllBuilders>true</runAllBuilders>
-</target>
-</buildTargets>
-</storageModule>
-</cconfiguration>
-</storageModule>
-</cproject>

diff --git a/debug/org.eclipse.ptp.debug.sdm/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/.cvsignore
deleted file mode 100644
index 7aba163..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/.cvsignore
+++ /dev/null

@@ -1,18 +0,0 @@
-.libs
-.deps
-.dirstamp
-autom4te.cache
-*.o
-*.Po
-Makefile
-libtool
-stamp-h1
-*.la
-config.h
-*.a
-sdm
-.gdb_history
-test_*
-config.status
-a.out.dSYM
-sdm_master

diff --git a/debug/org.eclipse.ptp.debug.sdm/.project b/debug/org.eclipse.ptp.debug.sdm/.project
deleted file mode 100644
index 27a42c7..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/.project
+++ /dev/null

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.debug.sdm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.makeBuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.core.errorOutputParser</key>
-					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.environment</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.inc</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.location</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.clean</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.command</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.full</key>
-					<value>clean all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.auto</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>false</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</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.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.make.core.makeNature</nature>
-		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/debug/org.eclipse.ptp.debug.sdm/.settings/org.eclipse.cdt.core.prefs b/debug/org.eclipse.ptp.debug.sdm/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index e65a560..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Wed Feb 18 13:26:17 EST 2009
-eclipse.preferences.version=1
-indexer/filesToParseUpFront=
-indexer/indexAllFiles=false
-indexer/indexerId=org.eclipse.cdt.core.domsourceindexer
-indexer/skipReferences=false
-indexer/skipTypeReferences=false
-indexerId=org.eclipse.cdt.core.domsourceindexer

diff --git a/debug/org.eclipse.ptp.debug.sdm/AUTHORS b/debug/org.eclipse.ptp.debug.sdm/AUTHORS
deleted file mode 100644
index e5cbfbc..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/AUTHORS
+++ /dev/null

@@ -1 +0,0 @@
-Greg Watson <g.watson@computer.org>
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm/COPYING b/debug/org.eclipse.ptp.debug.sdm/COPYING
deleted file mode 100644
index 8b7e105..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/COPYING
+++ /dev/null

@@ -1,16 +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
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm/ChangeLog b/debug/org.eclipse.ptp.debug.sdm/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/ChangeLog
+++ /dev/null


diff --git a/debug/org.eclipse.ptp.debug.sdm/INSTALL b/debug/org.eclipse.ptp.debug.sdm/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/INSTALL
+++ /dev/null

@@ -1 +0,0 @@
-See README for build/install instructions.

diff --git a/debug/org.eclipse.ptp.debug.sdm/META-INF/MANIFEST.MF b/debug/org.eclipse.ptp.debug.sdm/META-INF/MANIFEST.MF
deleted file mode 100644
index e37f1bd..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.debug.sdm
-Bundle-Version: 2.1.4.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ptp.proxy,
- org.eclipse.ptp.utils

diff --git a/debug/org.eclipse.ptp.debug.sdm/Makefile.am b/debug/org.eclipse.ptp.debug.sdm/Makefile.am
deleted file mode 100644
index 62a7ec4..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/Makefile.am
+++ /dev/null

@@ -1,102 +0,0 @@
-SUBDIRS =					libaif
-
-bin_PROGRAMS =				sdm
-noinst_PROGRAMS =			test_proxy test_proxy_rev test_mi
-
-sdm_SOURCES =				src/client/startup.c\
-							src/client/client.c \
-							src/client/client_cmds.c \
-							src/server/server.c \
-							src/server/server_cmds.c \
-							src/server/backend.c \
-							src/server/gdbmi_backend.c \
-							src/server/test_backend.c \
-							src/impl/sdm.c \
-							src/impl/sdm_aggregate_hash.c \
-							src/impl/sdm_hello_proto.c \
-							src/impl/sdm_message_tcpip.c \
-							src/impl/sdm_route_tree.c \ \
-							src/impl/sdm_routing_table_file.c \
-							src/impl/sdm_set_bitset.c
-					
-sdm_CFLAGS =				-I./include -I./libaif -I./src/mi $(AM_CFLAGS)
-sdm_LDADD =					libdbgutils.a libmi.a libaif/libaif.a @SVR_LIBS@
-
-test_proxy_SOURCES =		src/test/test_proxy.c \
-							src/test/test_proxy_clnt.c
-test_proxy_CFLAGS =			-I./include -I./libaif $(AM_CFLAGS) -g
-test_proxy_LDFLAGS = 		-g
-test_proxy_LDADD =			libdbgclnt.a libdbgutils.a libaif/libaif.a @CLNT_LIBS@
-
-test_proxy_rev_SOURCES =	src/test/test_proxy_rev.c \
-							src/test/test_proxy_clnt.c
-test_proxy_rev_CFLAGS =		-I./include -I./libaif $(AM_CFLAGS) -g
-test_proxy_rev_LDFLAGS = 	-g
-test_proxy_rev_LDADD =		libdbgclnt.a libdbgutils.a libaif/libaif.a @CLNT_LIBS@
-
-test_mi_SOURCES =			src/mi/test_mi.c
-test_mi_CFLAGS =			-I./include -I./src/mi $(AM_CFLAGS) -g
-test_mi_LDFLAGS = 			-g
-test_mi_LDADD =				libmi.a
-
-noinst_HEADERS =			include/backend.h \
-							include/breakpoint.h \
-							include/dbg_client.h \
-							include/dbg_error.h \
-							include/dbg_event.h \
-							include/dbg_proxy.h \
-							include/dbg.h \
-							include/helloproto.h \
-							include/itimer.h \
-							include/location.h \
-							include/memoryinfo.h \
-							include/routing_table.h \
-							include/sdm.h \
-							include/session.h \
-							include/signalinfo.h \
-							include/stackframe.h
-
-noinst_LIBRARIES =			libdbgclnt.a libdbgutils.a libmi.a
-
-libdbgclnt_a_SOURCES =		src/client/client_interface.c 
-libdbgclnt_a_CFLAGS =		-I./include -I./libaif $(AM_CFLAGS) -g
-
-libdbgutils_a_SOURCES =		src/utils/error.c \
-							src/utils/breakpoint.c \
-							src/utils/stackframe.c \
-							src/utils/event.c \
-							src/utils/itimer.c \
-							src/utils/memoryinfo.c \
-							src/utils/signalinfo.c \
-							src/utils/debug.c
-						
-libdbgutils_a_CFLAGS =		-I./include -I./libaif $(AM_CFLAGS) -g
-
-libmi_a_SOURCES =			src/mi/MIParser.c \
-							src/mi/MIOOBRecord.c \
-							src/mi/MIOutput.c \
-							src/mi/MIResult.c \
-							src/mi/MIResultRecord.c \
-							src/mi/MIValue.c \
-							src/mi/MIString.c \
-							src/mi/MIBreakpoint.c \
-							src/mi/MIFrame.c \
-							src/mi/MIThread.c \
-							src/mi/MIArg.c \
-							src/mi/MIVar.c \
-							src/mi/MIEvent.c \
-							src/mi/MICommand.c \
-							src/mi/MIGDBCommand.c \
-							src/mi/MIExecCommand.c \
-							src/mi/MIBreakCommand.c \
-							src/mi/MIStackCommand.c \
-							src/mi/MIVarCommand.c \
-							src/mi/MIError.c \
-							src/mi/MISession.c \
-							src/mi/MIThreadCommand.c \
-							src/mi/MIMemory.c \
-							src/mi/MIMemoryCommand.c \
-							src/mi/CLICommand.c \
-							src/mi/CLIOutput.c
-						
-libmi_a_CFLAGS =			-I./include $(AM_CFLAGS) -g

diff --git a/debug/org.eclipse.ptp.debug.sdm/Makefile.in b/debug/org.eclipse.ptp.debug.sdm/Makefile.in
deleted file mode 100644
index d72e4eb..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/Makefile.in
+++ /dev/null

@@ -1,1925 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-bin_PROGRAMS = sdm$(EXEEXT)
-noinst_PROGRAMS = test_proxy$(EXEEXT) test_proxy_rev$(EXEEXT) \
-	test_mi$(EXEEXT)
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
-	install-sh ltmain.sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libdbgclnt_a_AR = $(AR) $(ARFLAGS)
-libdbgclnt_a_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
-am_libdbgclnt_a_OBJECTS =  \
-	src/client/libdbgclnt_a-client_interface.$(OBJEXT)
-libdbgclnt_a_OBJECTS = $(am_libdbgclnt_a_OBJECTS)
-libdbgutils_a_AR = $(AR) $(ARFLAGS)
-libdbgutils_a_LIBADD =
-am_libdbgutils_a_OBJECTS = src/utils/libdbgutils_a-error.$(OBJEXT) \
-	src/utils/libdbgutils_a-breakpoint.$(OBJEXT) \
-	src/utils/libdbgutils_a-stackframe.$(OBJEXT) \
-	src/utils/libdbgutils_a-event.$(OBJEXT) \
-	src/utils/libdbgutils_a-itimer.$(OBJEXT) \
-	src/utils/libdbgutils_a-memoryinfo.$(OBJEXT) \
-	src/utils/libdbgutils_a-signalinfo.$(OBJEXT) \
-	src/utils/libdbgutils_a-debug.$(OBJEXT)
-libdbgutils_a_OBJECTS = $(am_libdbgutils_a_OBJECTS)
-libmi_a_AR = $(AR) $(ARFLAGS)
-libmi_a_LIBADD =
-am_libmi_a_OBJECTS = src/mi/libmi_a-MIParser.$(OBJEXT) \
-	src/mi/libmi_a-MIOOBRecord.$(OBJEXT) \
-	src/mi/libmi_a-MIOutput.$(OBJEXT) \
-	src/mi/libmi_a-MIResult.$(OBJEXT) \
-	src/mi/libmi_a-MIResultRecord.$(OBJEXT) \
-	src/mi/libmi_a-MIValue.$(OBJEXT) \
-	src/mi/libmi_a-MIString.$(OBJEXT) \
-	src/mi/libmi_a-MIBreakpoint.$(OBJEXT) \
-	src/mi/libmi_a-MIFrame.$(OBJEXT) \
-	src/mi/libmi_a-MIThread.$(OBJEXT) \
-	src/mi/libmi_a-MIArg.$(OBJEXT) src/mi/libmi_a-MIVar.$(OBJEXT) \
-	src/mi/libmi_a-MIEvent.$(OBJEXT) \
-	src/mi/libmi_a-MICommand.$(OBJEXT) \
-	src/mi/libmi_a-MIGDBCommand.$(OBJEXT) \
-	src/mi/libmi_a-MIExecCommand.$(OBJEXT) \
-	src/mi/libmi_a-MIBreakCommand.$(OBJEXT) \
-	src/mi/libmi_a-MIStackCommand.$(OBJEXT) \
-	src/mi/libmi_a-MIVarCommand.$(OBJEXT) \
-	src/mi/libmi_a-MIError.$(OBJEXT) \
-	src/mi/libmi_a-MISession.$(OBJEXT) \
-	src/mi/libmi_a-MIThreadCommand.$(OBJEXT) \
-	src/mi/libmi_a-MIMemory.$(OBJEXT) \
-	src/mi/libmi_a-MIMemoryCommand.$(OBJEXT) \
-	src/mi/libmi_a-CLICommand.$(OBJEXT) \
-	src/mi/libmi_a-CLIOutput.$(OBJEXT)
-libmi_a_OBJECTS = $(am_libmi_a_OBJECTS)
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_sdm_OBJECTS = src/client/sdm-startup.$(OBJEXT) \
-	src/client/sdm-client.$(OBJEXT) \
-	src/client/sdm-client_cmds.$(OBJEXT) \
-	src/server/sdm-server.$(OBJEXT) \
-	src/server/sdm-server_cmds.$(OBJEXT) \
-	src/server/sdm-backend.$(OBJEXT) \
-	src/server/sdm-gdbmi_backend.$(OBJEXT) \
-	src/server/sdm-test_backend.$(OBJEXT) \
-	src/impl/sdm-sdm.$(OBJEXT) \
-	src/impl/sdm-sdm_aggregate_hash.$(OBJEXT) \
-	src/impl/sdm-sdm_hello_proto.$(OBJEXT) \
-	src/impl/sdm-sdm_message_tcpip.$(OBJEXT) \
-	src/impl/sdm-sdm_route_tree.$(OBJEXT) \
-	src/impl/sdm-sdm_routing_table_file.$(OBJEXT) \
-	src/impl/sdm-sdm_set_bitset.$(OBJEXT)
-sdm_OBJECTS = $(am_sdm_OBJECTS)
-sdm_DEPENDENCIES = libdbgutils.a libmi.a libaif/libaif.a
-sdm_LINK = $(CCLD) $(sdm_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_test_mi_OBJECTS = src/mi/test_mi-test_mi.$(OBJEXT)
-test_mi_OBJECTS = $(am_test_mi_OBJECTS)
-test_mi_DEPENDENCIES = libmi.a
-test_mi_LINK = $(CCLD) $(test_mi_CFLAGS) $(CFLAGS) $(test_mi_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_test_proxy_OBJECTS = src/test/test_proxy-test_proxy.$(OBJEXT) \
-	src/test/test_proxy-test_proxy_clnt.$(OBJEXT)
-test_proxy_OBJECTS = $(am_test_proxy_OBJECTS)
-test_proxy_DEPENDENCIES = libdbgclnt.a libdbgutils.a libaif/libaif.a
-test_proxy_LINK = $(CCLD) $(test_proxy_CFLAGS) $(CFLAGS) \
-	$(test_proxy_LDFLAGS) $(LDFLAGS) -o $@
-am_test_proxy_rev_OBJECTS =  \
-	src/test/test_proxy_rev-test_proxy_rev.$(OBJEXT) \
-	src/test/test_proxy_rev-test_proxy_clnt.$(OBJEXT)
-test_proxy_rev_OBJECTS = $(am_test_proxy_rev_OBJECTS)
-test_proxy_rev_DEPENDENCIES = libdbgclnt.a libdbgutils.a \
-	libaif/libaif.a
-test_proxy_rev_LINK = $(CCLD) $(test_proxy_rev_CFLAGS) $(CFLAGS) \
-	$(test_proxy_rev_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libdbgclnt_a_SOURCES) $(libdbgutils_a_SOURCES) \
-	$(libmi_a_SOURCES) $(sdm_SOURCES) $(test_mi_SOURCES) \
-	$(test_proxy_SOURCES) $(test_proxy_rev_SOURCES)
-DIST_SOURCES = $(libdbgclnt_a_SOURCES) $(libdbgutils_a_SOURCES) \
-	$(libmi_a_SOURCES) $(sdm_SOURCES) $(test_mi_SOURCES) \
-	$(test_proxy_SOURCES) $(test_proxy_rev_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-HEADERS = $(noinst_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CLNT_LIBS = @CLNT_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SVR_LIBS = @SVR_LIBS@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = libaif
-sdm_SOURCES = src/client/startup.c\
-							src/client/client.c \
-							src/client/client_cmds.c \
-							src/server/server.c \
-							src/server/server_cmds.c \
-							src/server/backend.c \
-							src/server/gdbmi_backend.c \
-							src/server/test_backend.c \
-							src/impl/sdm.c \
-							src/impl/sdm_aggregate_hash.c \
-							src/impl/sdm_hello_proto.c \
-							src/impl/sdm_message_tcpip.c \
-							src/impl/sdm_route_tree.c \ \
-							src/impl/sdm_routing_table_file.c \
-							src/impl/sdm_set_bitset.c
-
-sdm_CFLAGS = -I./include -I./libaif -I./src/mi $(AM_CFLAGS)
-sdm_LDADD = libdbgutils.a libmi.a libaif/libaif.a @SVR_LIBS@
-test_proxy_SOURCES = src/test/test_proxy.c \
-							src/test/test_proxy_clnt.c
-
-test_proxy_CFLAGS = -I./include -I./libaif $(AM_CFLAGS) -g
-test_proxy_LDFLAGS = -g
-test_proxy_LDADD = libdbgclnt.a libdbgutils.a libaif/libaif.a @CLNT_LIBS@
-test_proxy_rev_SOURCES = src/test/test_proxy_rev.c \
-							src/test/test_proxy_clnt.c
-
-test_proxy_rev_CFLAGS = -I./include -I./libaif $(AM_CFLAGS) -g
-test_proxy_rev_LDFLAGS = -g
-test_proxy_rev_LDADD = libdbgclnt.a libdbgutils.a libaif/libaif.a @CLNT_LIBS@
-test_mi_SOURCES = src/mi/test_mi.c
-test_mi_CFLAGS = -I./include -I./src/mi $(AM_CFLAGS) -g
-test_mi_LDFLAGS = -g
-test_mi_LDADD = libmi.a
-noinst_HEADERS = include/backend.h \
-							include/breakpoint.h \
-							include/dbg_client.h \
-							include/dbg_error.h \
-							include/dbg_event.h \
-							include/dbg_proxy.h \
-							include/dbg.h \
-							include/helloproto.h \
-							include/itimer.h \
-							include/location.h \
-							include/memoryinfo.h \
-							include/routing_table.h \
-							include/sdm.h \
-							include/session.h \
-							include/signalinfo.h \
-							include/stackframe.h
-
-noinst_LIBRARIES = libdbgclnt.a libdbgutils.a libmi.a
-libdbgclnt_a_SOURCES = src/client/client_interface.c 
-libdbgclnt_a_CFLAGS = -I./include -I./libaif $(AM_CFLAGS) -g
-libdbgutils_a_SOURCES = src/utils/error.c \
-							src/utils/breakpoint.c \
-							src/utils/stackframe.c \
-							src/utils/event.c \
-							src/utils/itimer.c \
-							src/utils/memoryinfo.c \
-							src/utils/signalinfo.c \
-							src/utils/debug.c
-
-libdbgutils_a_CFLAGS = -I./include -I./libaif $(AM_CFLAGS) -g
-libmi_a_SOURCES = src/mi/MIParser.c \
-							src/mi/MIOOBRecord.c \
-							src/mi/MIOutput.c \
-							src/mi/MIResult.c \
-							src/mi/MIResultRecord.c \
-							src/mi/MIValue.c \
-							src/mi/MIString.c \
-							src/mi/MIBreakpoint.c \
-							src/mi/MIFrame.c \
-							src/mi/MIThread.c \
-							src/mi/MIArg.c \
-							src/mi/MIVar.c \
-							src/mi/MIEvent.c \
-							src/mi/MICommand.c \
-							src/mi/MIGDBCommand.c \
-							src/mi/MIExecCommand.c \
-							src/mi/MIBreakCommand.c \
-							src/mi/MIStackCommand.c \
-							src/mi/MIVarCommand.c \
-							src/mi/MIError.c \
-							src/mi/MISession.c \
-							src/mi/MIThreadCommand.c \
-							src/mi/MIMemory.c \
-							src/mi/MIMemoryCommand.c \
-							src/mi/CLICommand.c \
-							src/mi/CLIOutput.c
-
-libmi_a_CFLAGS = -I./include $(AM_CFLAGS) -g
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-src/client/$(am__dirstamp):
-	@$(MKDIR_P) src/client
-	@: > src/client/$(am__dirstamp)
-src/client/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/client/$(DEPDIR)
-	@: > src/client/$(DEPDIR)/$(am__dirstamp)
-src/client/libdbgclnt_a-client_interface.$(OBJEXT):  \
-	src/client/$(am__dirstamp) \
-	src/client/$(DEPDIR)/$(am__dirstamp)
-libdbgclnt.a: $(libdbgclnt_a_OBJECTS) $(libdbgclnt_a_DEPENDENCIES) 
-	-rm -f libdbgclnt.a
-	$(libdbgclnt_a_AR) libdbgclnt.a $(libdbgclnt_a_OBJECTS) $(libdbgclnt_a_LIBADD)
-	$(RANLIB) libdbgclnt.a
-src/utils/$(am__dirstamp):
-	@$(MKDIR_P) src/utils
-	@: > src/utils/$(am__dirstamp)
-src/utils/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/utils/$(DEPDIR)
-	@: > src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-error.$(OBJEXT): src/utils/$(am__dirstamp) \
-	src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-breakpoint.$(OBJEXT):  \
-	src/utils/$(am__dirstamp) src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-stackframe.$(OBJEXT):  \
-	src/utils/$(am__dirstamp) src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-event.$(OBJEXT): src/utils/$(am__dirstamp) \
-	src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-itimer.$(OBJEXT): src/utils/$(am__dirstamp) \
-	src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-memoryinfo.$(OBJEXT):  \
-	src/utils/$(am__dirstamp) src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-signalinfo.$(OBJEXT):  \
-	src/utils/$(am__dirstamp) src/utils/$(DEPDIR)/$(am__dirstamp)
-src/utils/libdbgutils_a-debug.$(OBJEXT): src/utils/$(am__dirstamp) \
-	src/utils/$(DEPDIR)/$(am__dirstamp)
-libdbgutils.a: $(libdbgutils_a_OBJECTS) $(libdbgutils_a_DEPENDENCIES) 
-	-rm -f libdbgutils.a
-	$(libdbgutils_a_AR) libdbgutils.a $(libdbgutils_a_OBJECTS) $(libdbgutils_a_LIBADD)
-	$(RANLIB) libdbgutils.a
-src/mi/$(am__dirstamp):
-	@$(MKDIR_P) src/mi
-	@: > src/mi/$(am__dirstamp)
-src/mi/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/mi/$(DEPDIR)
-	@: > src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIParser.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIOOBRecord.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIOutput.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIResult.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIResultRecord.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIValue.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIString.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIBreakpoint.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIFrame.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIThread.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIArg.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIVar.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIEvent.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MICommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIGDBCommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIExecCommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIBreakCommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIStackCommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIVarCommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIError.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MISession.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIThreadCommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIMemory.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-MIMemoryCommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-CLICommand.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-src/mi/libmi_a-CLIOutput.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-libmi.a: $(libmi_a_OBJECTS) $(libmi_a_DEPENDENCIES) 
-	-rm -f libmi.a
-	$(libmi_a_AR) libmi.a $(libmi_a_OBJECTS) $(libmi_a_LIBADD)
-	$(RANLIB) libmi.a
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-src/client/sdm-startup.$(OBJEXT): src/client/$(am__dirstamp) \
-	src/client/$(DEPDIR)/$(am__dirstamp)
-src/client/sdm-client.$(OBJEXT): src/client/$(am__dirstamp) \
-	src/client/$(DEPDIR)/$(am__dirstamp)
-src/client/sdm-client_cmds.$(OBJEXT): src/client/$(am__dirstamp) \
-	src/client/$(DEPDIR)/$(am__dirstamp)
-src/server/$(am__dirstamp):
-	@$(MKDIR_P) src/server
-	@: > src/server/$(am__dirstamp)
-src/server/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/server/$(DEPDIR)
-	@: > src/server/$(DEPDIR)/$(am__dirstamp)
-src/server/sdm-server.$(OBJEXT): src/server/$(am__dirstamp) \
-	src/server/$(DEPDIR)/$(am__dirstamp)
-src/server/sdm-server_cmds.$(OBJEXT): src/server/$(am__dirstamp) \
-	src/server/$(DEPDIR)/$(am__dirstamp)
-src/server/sdm-backend.$(OBJEXT): src/server/$(am__dirstamp) \
-	src/server/$(DEPDIR)/$(am__dirstamp)
-src/server/sdm-gdbmi_backend.$(OBJEXT): src/server/$(am__dirstamp) \
-	src/server/$(DEPDIR)/$(am__dirstamp)
-src/server/sdm-test_backend.$(OBJEXT): src/server/$(am__dirstamp) \
-	src/server/$(DEPDIR)/$(am__dirstamp)
-src/impl/$(am__dirstamp):
-	@$(MKDIR_P) src/impl
-	@: > src/impl/$(am__dirstamp)
-src/impl/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/impl/$(DEPDIR)
-	@: > src/impl/$(DEPDIR)/$(am__dirstamp)
-src/impl/sdm-sdm.$(OBJEXT): src/impl/$(am__dirstamp) \
-	src/impl/$(DEPDIR)/$(am__dirstamp)
-src/impl/sdm-sdm_aggregate_hash.$(OBJEXT): src/impl/$(am__dirstamp) \
-	src/impl/$(DEPDIR)/$(am__dirstamp)
-src/impl/sdm-sdm_hello_proto.$(OBJEXT): src/impl/$(am__dirstamp) \
-	src/impl/$(DEPDIR)/$(am__dirstamp)
-src/impl/sdm-sdm_message_tcpip.$(OBJEXT): src/impl/$(am__dirstamp) \
-	src/impl/$(DEPDIR)/$(am__dirstamp)
-src/impl/sdm-sdm_route_tree.$(OBJEXT): src/impl/$(am__dirstamp) \
-	src/impl/$(DEPDIR)/$(am__dirstamp)
-src/impl/sdm-sdm_routing_table_file.$(OBJEXT):  \
-	src/impl/$(am__dirstamp) src/impl/$(DEPDIR)/$(am__dirstamp)
-src/impl/sdm-sdm_set_bitset.$(OBJEXT): src/impl/$(am__dirstamp) \
-	src/impl/$(DEPDIR)/$(am__dirstamp)
-sdm$(EXEEXT): $(sdm_OBJECTS) $(sdm_DEPENDENCIES) 
-	@rm -f sdm$(EXEEXT)
-	$(sdm_LINK) $(sdm_OBJECTS) $(sdm_LDADD) $(LIBS)
-src/mi/test_mi-test_mi.$(OBJEXT): src/mi/$(am__dirstamp) \
-	src/mi/$(DEPDIR)/$(am__dirstamp)
-test_mi$(EXEEXT): $(test_mi_OBJECTS) $(test_mi_DEPENDENCIES) 
-	@rm -f test_mi$(EXEEXT)
-	$(test_mi_LINK) $(test_mi_OBJECTS) $(test_mi_LDADD) $(LIBS)
-src/test/$(am__dirstamp):
-	@$(MKDIR_P) src/test
-	@: > src/test/$(am__dirstamp)
-src/test/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/test/$(DEPDIR)
-	@: > src/test/$(DEPDIR)/$(am__dirstamp)
-src/test/test_proxy-test_proxy.$(OBJEXT): src/test/$(am__dirstamp) \
-	src/test/$(DEPDIR)/$(am__dirstamp)
-src/test/test_proxy-test_proxy_clnt.$(OBJEXT):  \
-	src/test/$(am__dirstamp) src/test/$(DEPDIR)/$(am__dirstamp)
-test_proxy$(EXEEXT): $(test_proxy_OBJECTS) $(test_proxy_DEPENDENCIES) 
-	@rm -f test_proxy$(EXEEXT)
-	$(test_proxy_LINK) $(test_proxy_OBJECTS) $(test_proxy_LDADD) $(LIBS)
-src/test/test_proxy_rev-test_proxy_rev.$(OBJEXT):  \
-	src/test/$(am__dirstamp) src/test/$(DEPDIR)/$(am__dirstamp)
-src/test/test_proxy_rev-test_proxy_clnt.$(OBJEXT):  \
-	src/test/$(am__dirstamp) src/test/$(DEPDIR)/$(am__dirstamp)
-test_proxy_rev$(EXEEXT): $(test_proxy_rev_OBJECTS) $(test_proxy_rev_DEPENDENCIES) 
-	@rm -f test_proxy_rev$(EXEEXT)
-	$(test_proxy_rev_LINK) $(test_proxy_rev_OBJECTS) $(test_proxy_rev_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f src/client/libdbgclnt_a-client_interface.$(OBJEXT)
-	-rm -f src/client/sdm-client.$(OBJEXT)
-	-rm -f src/client/sdm-client_cmds.$(OBJEXT)
-	-rm -f src/client/sdm-startup.$(OBJEXT)
-	-rm -f src/impl/sdm-sdm.$(OBJEXT)
-	-rm -f src/impl/sdm-sdm_aggregate_hash.$(OBJEXT)
-	-rm -f src/impl/sdm-sdm_hello_proto.$(OBJEXT)
-	-rm -f src/impl/sdm-sdm_message_tcpip.$(OBJEXT)
-	-rm -f src/impl/sdm-sdm_route_tree.$(OBJEXT)
-	-rm -f src/impl/sdm-sdm_routing_table_file.$(OBJEXT)
-	-rm -f src/impl/sdm-sdm_set_bitset.$(OBJEXT)
-	-rm -f src/mi/libmi_a-CLICommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-CLIOutput.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIArg.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIBreakCommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIBreakpoint.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MICommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIError.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIEvent.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIExecCommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIFrame.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIGDBCommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIMemory.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIMemoryCommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIOOBRecord.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIOutput.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIParser.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIResult.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIResultRecord.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MISession.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIStackCommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIString.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIThread.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIThreadCommand.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIValue.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIVar.$(OBJEXT)
-	-rm -f src/mi/libmi_a-MIVarCommand.$(OBJEXT)
-	-rm -f src/mi/test_mi-test_mi.$(OBJEXT)
-	-rm -f src/server/sdm-backend.$(OBJEXT)
-	-rm -f src/server/sdm-gdbmi_backend.$(OBJEXT)
-	-rm -f src/server/sdm-server.$(OBJEXT)
-	-rm -f src/server/sdm-server_cmds.$(OBJEXT)
-	-rm -f src/server/sdm-test_backend.$(OBJEXT)
-	-rm -f src/test/test_proxy-test_proxy.$(OBJEXT)
-	-rm -f src/test/test_proxy-test_proxy_clnt.$(OBJEXT)
-	-rm -f src/test/test_proxy_rev-test_proxy_clnt.$(OBJEXT)
-	-rm -f src/test/test_proxy_rev-test_proxy_rev.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-breakpoint.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-debug.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-error.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-event.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-itimer.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-memoryinfo.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-signalinfo.$(OBJEXT)
-	-rm -f src/utils/libdbgutils_a-stackframe.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@src/client/$(DEPDIR)/libdbgclnt_a-client_interface.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/client/$(DEPDIR)/sdm-client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/client/$(DEPDIR)/sdm-client_cmds.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/client/$(DEPDIR)/sdm-startup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/impl/$(DEPDIR)/sdm-sdm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/impl/$(DEPDIR)/sdm-sdm_aggregate_hash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/impl/$(DEPDIR)/sdm-sdm_hello_proto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/impl/$(DEPDIR)/sdm-sdm_message_tcpip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/impl/$(DEPDIR)/sdm-sdm_route_tree.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/impl/$(DEPDIR)/sdm-sdm_routing_table_file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/impl/$(DEPDIR)/sdm-sdm_set_bitset.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-CLICommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-CLIOutput.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIArg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIBreakCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIBreakpoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MICommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIError.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIEvent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIExecCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIFrame.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIGDBCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIMemory.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIMemoryCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIOOBRecord.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIOutput.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIParser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIResult.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIResultRecord.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MISession.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIStackCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIString.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIThread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIThreadCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIValue.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIVar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/libmi_a-MIVarCommand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/mi/$(DEPDIR)/test_mi-test_mi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/server/$(DEPDIR)/sdm-backend.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/server/$(DEPDIR)/sdm-gdbmi_backend.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/server/$(DEPDIR)/sdm-server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/server/$(DEPDIR)/sdm-server_cmds.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/server/$(DEPDIR)/sdm-test_backend.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/test/$(DEPDIR)/test_proxy-test_proxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/test/$(DEPDIR)/test_proxy-test_proxy_clnt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/test/$(DEPDIR)/test_proxy_rev-test_proxy_clnt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/test/$(DEPDIR)/test_proxy_rev-test_proxy_rev.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-breakpoint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-error.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-event.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-itimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-memoryinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-signalinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/utils/$(DEPDIR)/libdbgutils_a-stackframe.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-src/client/libdbgclnt_a-client_interface.o: src/client/client_interface.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgclnt_a_CFLAGS) $(CFLAGS) -MT src/client/libdbgclnt_a-client_interface.o -MD -MP -MF src/client/$(DEPDIR)/libdbgclnt_a-client_interface.Tpo -c -o src/client/libdbgclnt_a-client_interface.o `test -f 'src/client/client_interface.c' || echo '$(srcdir)/'`src/client/client_interface.c
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/libdbgclnt_a-client_interface.Tpo src/client/$(DEPDIR)/libdbgclnt_a-client_interface.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/client_interface.c' object='src/client/libdbgclnt_a-client_interface.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgclnt_a_CFLAGS) $(CFLAGS) -c -o src/client/libdbgclnt_a-client_interface.o `test -f 'src/client/client_interface.c' || echo '$(srcdir)/'`src/client/client_interface.c
-
-src/client/libdbgclnt_a-client_interface.obj: src/client/client_interface.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgclnt_a_CFLAGS) $(CFLAGS) -MT src/client/libdbgclnt_a-client_interface.obj -MD -MP -MF src/client/$(DEPDIR)/libdbgclnt_a-client_interface.Tpo -c -o src/client/libdbgclnt_a-client_interface.obj `if test -f 'src/client/client_interface.c'; then $(CYGPATH_W) 'src/client/client_interface.c'; else $(CYGPATH_W) '$(srcdir)/src/client/client_interface.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/libdbgclnt_a-client_interface.Tpo src/client/$(DEPDIR)/libdbgclnt_a-client_interface.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/client_interface.c' object='src/client/libdbgclnt_a-client_interface.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgclnt_a_CFLAGS) $(CFLAGS) -c -o src/client/libdbgclnt_a-client_interface.obj `if test -f 'src/client/client_interface.c'; then $(CYGPATH_W) 'src/client/client_interface.c'; else $(CYGPATH_W) '$(srcdir)/src/client/client_interface.c'; fi`
-
-src/utils/libdbgutils_a-error.o: src/utils/error.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-error.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-error.Tpo -c -o src/utils/libdbgutils_a-error.o `test -f 'src/utils/error.c' || echo '$(srcdir)/'`src/utils/error.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-error.Tpo src/utils/$(DEPDIR)/libdbgutils_a-error.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/error.c' object='src/utils/libdbgutils_a-error.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-error.o `test -f 'src/utils/error.c' || echo '$(srcdir)/'`src/utils/error.c
-
-src/utils/libdbgutils_a-error.obj: src/utils/error.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-error.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-error.Tpo -c -o src/utils/libdbgutils_a-error.obj `if test -f 'src/utils/error.c'; then $(CYGPATH_W) 'src/utils/error.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/error.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-error.Tpo src/utils/$(DEPDIR)/libdbgutils_a-error.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/error.c' object='src/utils/libdbgutils_a-error.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-error.obj `if test -f 'src/utils/error.c'; then $(CYGPATH_W) 'src/utils/error.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/error.c'; fi`
-
-src/utils/libdbgutils_a-breakpoint.o: src/utils/breakpoint.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-breakpoint.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-breakpoint.Tpo -c -o src/utils/libdbgutils_a-breakpoint.o `test -f 'src/utils/breakpoint.c' || echo '$(srcdir)/'`src/utils/breakpoint.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-breakpoint.Tpo src/utils/$(DEPDIR)/libdbgutils_a-breakpoint.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/breakpoint.c' object='src/utils/libdbgutils_a-breakpoint.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-breakpoint.o `test -f 'src/utils/breakpoint.c' || echo '$(srcdir)/'`src/utils/breakpoint.c
-
-src/utils/libdbgutils_a-breakpoint.obj: src/utils/breakpoint.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-breakpoint.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-breakpoint.Tpo -c -o src/utils/libdbgutils_a-breakpoint.obj `if test -f 'src/utils/breakpoint.c'; then $(CYGPATH_W) 'src/utils/breakpoint.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/breakpoint.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-breakpoint.Tpo src/utils/$(DEPDIR)/libdbgutils_a-breakpoint.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/breakpoint.c' object='src/utils/libdbgutils_a-breakpoint.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-breakpoint.obj `if test -f 'src/utils/breakpoint.c'; then $(CYGPATH_W) 'src/utils/breakpoint.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/breakpoint.c'; fi`
-
-src/utils/libdbgutils_a-stackframe.o: src/utils/stackframe.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-stackframe.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-stackframe.Tpo -c -o src/utils/libdbgutils_a-stackframe.o `test -f 'src/utils/stackframe.c' || echo '$(srcdir)/'`src/utils/stackframe.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-stackframe.Tpo src/utils/$(DEPDIR)/libdbgutils_a-stackframe.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/stackframe.c' object='src/utils/libdbgutils_a-stackframe.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-stackframe.o `test -f 'src/utils/stackframe.c' || echo '$(srcdir)/'`src/utils/stackframe.c
-
-src/utils/libdbgutils_a-stackframe.obj: src/utils/stackframe.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-stackframe.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-stackframe.Tpo -c -o src/utils/libdbgutils_a-stackframe.obj `if test -f 'src/utils/stackframe.c'; then $(CYGPATH_W) 'src/utils/stackframe.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/stackframe.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-stackframe.Tpo src/utils/$(DEPDIR)/libdbgutils_a-stackframe.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/stackframe.c' object='src/utils/libdbgutils_a-stackframe.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-stackframe.obj `if test -f 'src/utils/stackframe.c'; then $(CYGPATH_W) 'src/utils/stackframe.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/stackframe.c'; fi`
-
-src/utils/libdbgutils_a-event.o: src/utils/event.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-event.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-event.Tpo -c -o src/utils/libdbgutils_a-event.o `test -f 'src/utils/event.c' || echo '$(srcdir)/'`src/utils/event.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-event.Tpo src/utils/$(DEPDIR)/libdbgutils_a-event.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/event.c' object='src/utils/libdbgutils_a-event.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-event.o `test -f 'src/utils/event.c' || echo '$(srcdir)/'`src/utils/event.c
-
-src/utils/libdbgutils_a-event.obj: src/utils/event.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-event.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-event.Tpo -c -o src/utils/libdbgutils_a-event.obj `if test -f 'src/utils/event.c'; then $(CYGPATH_W) 'src/utils/event.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/event.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-event.Tpo src/utils/$(DEPDIR)/libdbgutils_a-event.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/event.c' object='src/utils/libdbgutils_a-event.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-event.obj `if test -f 'src/utils/event.c'; then $(CYGPATH_W) 'src/utils/event.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/event.c'; fi`
-
-src/utils/libdbgutils_a-itimer.o: src/utils/itimer.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-itimer.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-itimer.Tpo -c -o src/utils/libdbgutils_a-itimer.o `test -f 'src/utils/itimer.c' || echo '$(srcdir)/'`src/utils/itimer.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-itimer.Tpo src/utils/$(DEPDIR)/libdbgutils_a-itimer.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/itimer.c' object='src/utils/libdbgutils_a-itimer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-itimer.o `test -f 'src/utils/itimer.c' || echo '$(srcdir)/'`src/utils/itimer.c
-
-src/utils/libdbgutils_a-itimer.obj: src/utils/itimer.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-itimer.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-itimer.Tpo -c -o src/utils/libdbgutils_a-itimer.obj `if test -f 'src/utils/itimer.c'; then $(CYGPATH_W) 'src/utils/itimer.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/itimer.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-itimer.Tpo src/utils/$(DEPDIR)/libdbgutils_a-itimer.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/itimer.c' object='src/utils/libdbgutils_a-itimer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-itimer.obj `if test -f 'src/utils/itimer.c'; then $(CYGPATH_W) 'src/utils/itimer.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/itimer.c'; fi`
-
-src/utils/libdbgutils_a-memoryinfo.o: src/utils/memoryinfo.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-memoryinfo.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-memoryinfo.Tpo -c -o src/utils/libdbgutils_a-memoryinfo.o `test -f 'src/utils/memoryinfo.c' || echo '$(srcdir)/'`src/utils/memoryinfo.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-memoryinfo.Tpo src/utils/$(DEPDIR)/libdbgutils_a-memoryinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/memoryinfo.c' object='src/utils/libdbgutils_a-memoryinfo.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-memoryinfo.o `test -f 'src/utils/memoryinfo.c' || echo '$(srcdir)/'`src/utils/memoryinfo.c
-
-src/utils/libdbgutils_a-memoryinfo.obj: src/utils/memoryinfo.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-memoryinfo.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-memoryinfo.Tpo -c -o src/utils/libdbgutils_a-memoryinfo.obj `if test -f 'src/utils/memoryinfo.c'; then $(CYGPATH_W) 'src/utils/memoryinfo.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/memoryinfo.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-memoryinfo.Tpo src/utils/$(DEPDIR)/libdbgutils_a-memoryinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/memoryinfo.c' object='src/utils/libdbgutils_a-memoryinfo.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-memoryinfo.obj `if test -f 'src/utils/memoryinfo.c'; then $(CYGPATH_W) 'src/utils/memoryinfo.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/memoryinfo.c'; fi`
-
-src/utils/libdbgutils_a-signalinfo.o: src/utils/signalinfo.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-signalinfo.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-signalinfo.Tpo -c -o src/utils/libdbgutils_a-signalinfo.o `test -f 'src/utils/signalinfo.c' || echo '$(srcdir)/'`src/utils/signalinfo.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-signalinfo.Tpo src/utils/$(DEPDIR)/libdbgutils_a-signalinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/signalinfo.c' object='src/utils/libdbgutils_a-signalinfo.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-signalinfo.o `test -f 'src/utils/signalinfo.c' || echo '$(srcdir)/'`src/utils/signalinfo.c
-
-src/utils/libdbgutils_a-signalinfo.obj: src/utils/signalinfo.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-signalinfo.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-signalinfo.Tpo -c -o src/utils/libdbgutils_a-signalinfo.obj `if test -f 'src/utils/signalinfo.c'; then $(CYGPATH_W) 'src/utils/signalinfo.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/signalinfo.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-signalinfo.Tpo src/utils/$(DEPDIR)/libdbgutils_a-signalinfo.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/signalinfo.c' object='src/utils/libdbgutils_a-signalinfo.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-signalinfo.obj `if test -f 'src/utils/signalinfo.c'; then $(CYGPATH_W) 'src/utils/signalinfo.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/signalinfo.c'; fi`
-
-src/utils/libdbgutils_a-debug.o: src/utils/debug.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-debug.o -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-debug.Tpo -c -o src/utils/libdbgutils_a-debug.o `test -f 'src/utils/debug.c' || echo '$(srcdir)/'`src/utils/debug.c
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-debug.Tpo src/utils/$(DEPDIR)/libdbgutils_a-debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/debug.c' object='src/utils/libdbgutils_a-debug.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-debug.o `test -f 'src/utils/debug.c' || echo '$(srcdir)/'`src/utils/debug.c
-
-src/utils/libdbgutils_a-debug.obj: src/utils/debug.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -MT src/utils/libdbgutils_a-debug.obj -MD -MP -MF src/utils/$(DEPDIR)/libdbgutils_a-debug.Tpo -c -o src/utils/libdbgutils_a-debug.obj `if test -f 'src/utils/debug.c'; then $(CYGPATH_W) 'src/utils/debug.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/debug.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/utils/$(DEPDIR)/libdbgutils_a-debug.Tpo src/utils/$(DEPDIR)/libdbgutils_a-debug.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/utils/debug.c' object='src/utils/libdbgutils_a-debug.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdbgutils_a_CFLAGS) $(CFLAGS) -c -o src/utils/libdbgutils_a-debug.obj `if test -f 'src/utils/debug.c'; then $(CYGPATH_W) 'src/utils/debug.c'; else $(CYGPATH_W) '$(srcdir)/src/utils/debug.c'; fi`
-
-src/mi/libmi_a-MIParser.o: src/mi/MIParser.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIParser.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIParser.Tpo -c -o src/mi/libmi_a-MIParser.o `test -f 'src/mi/MIParser.c' || echo '$(srcdir)/'`src/mi/MIParser.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIParser.Tpo src/mi/$(DEPDIR)/libmi_a-MIParser.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIParser.c' object='src/mi/libmi_a-MIParser.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIParser.o `test -f 'src/mi/MIParser.c' || echo '$(srcdir)/'`src/mi/MIParser.c
-
-src/mi/libmi_a-MIParser.obj: src/mi/MIParser.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIParser.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIParser.Tpo -c -o src/mi/libmi_a-MIParser.obj `if test -f 'src/mi/MIParser.c'; then $(CYGPATH_W) 'src/mi/MIParser.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIParser.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIParser.Tpo src/mi/$(DEPDIR)/libmi_a-MIParser.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIParser.c' object='src/mi/libmi_a-MIParser.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIParser.obj `if test -f 'src/mi/MIParser.c'; then $(CYGPATH_W) 'src/mi/MIParser.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIParser.c'; fi`
-
-src/mi/libmi_a-MIOOBRecord.o: src/mi/MIOOBRecord.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIOOBRecord.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIOOBRecord.Tpo -c -o src/mi/libmi_a-MIOOBRecord.o `test -f 'src/mi/MIOOBRecord.c' || echo '$(srcdir)/'`src/mi/MIOOBRecord.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIOOBRecord.Tpo src/mi/$(DEPDIR)/libmi_a-MIOOBRecord.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIOOBRecord.c' object='src/mi/libmi_a-MIOOBRecord.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIOOBRecord.o `test -f 'src/mi/MIOOBRecord.c' || echo '$(srcdir)/'`src/mi/MIOOBRecord.c
-
-src/mi/libmi_a-MIOOBRecord.obj: src/mi/MIOOBRecord.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIOOBRecord.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIOOBRecord.Tpo -c -o src/mi/libmi_a-MIOOBRecord.obj `if test -f 'src/mi/MIOOBRecord.c'; then $(CYGPATH_W) 'src/mi/MIOOBRecord.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIOOBRecord.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIOOBRecord.Tpo src/mi/$(DEPDIR)/libmi_a-MIOOBRecord.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIOOBRecord.c' object='src/mi/libmi_a-MIOOBRecord.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIOOBRecord.obj `if test -f 'src/mi/MIOOBRecord.c'; then $(CYGPATH_W) 'src/mi/MIOOBRecord.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIOOBRecord.c'; fi`
-
-src/mi/libmi_a-MIOutput.o: src/mi/MIOutput.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIOutput.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIOutput.Tpo -c -o src/mi/libmi_a-MIOutput.o `test -f 'src/mi/MIOutput.c' || echo '$(srcdir)/'`src/mi/MIOutput.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIOutput.Tpo src/mi/$(DEPDIR)/libmi_a-MIOutput.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIOutput.c' object='src/mi/libmi_a-MIOutput.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIOutput.o `test -f 'src/mi/MIOutput.c' || echo '$(srcdir)/'`src/mi/MIOutput.c
-
-src/mi/libmi_a-MIOutput.obj: src/mi/MIOutput.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIOutput.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIOutput.Tpo -c -o src/mi/libmi_a-MIOutput.obj `if test -f 'src/mi/MIOutput.c'; then $(CYGPATH_W) 'src/mi/MIOutput.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIOutput.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIOutput.Tpo src/mi/$(DEPDIR)/libmi_a-MIOutput.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIOutput.c' object='src/mi/libmi_a-MIOutput.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIOutput.obj `if test -f 'src/mi/MIOutput.c'; then $(CYGPATH_W) 'src/mi/MIOutput.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIOutput.c'; fi`
-
-src/mi/libmi_a-MIResult.o: src/mi/MIResult.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIResult.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIResult.Tpo -c -o src/mi/libmi_a-MIResult.o `test -f 'src/mi/MIResult.c' || echo '$(srcdir)/'`src/mi/MIResult.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIResult.Tpo src/mi/$(DEPDIR)/libmi_a-MIResult.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIResult.c' object='src/mi/libmi_a-MIResult.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIResult.o `test -f 'src/mi/MIResult.c' || echo '$(srcdir)/'`src/mi/MIResult.c
-
-src/mi/libmi_a-MIResult.obj: src/mi/MIResult.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIResult.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIResult.Tpo -c -o src/mi/libmi_a-MIResult.obj `if test -f 'src/mi/MIResult.c'; then $(CYGPATH_W) 'src/mi/MIResult.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIResult.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIResult.Tpo src/mi/$(DEPDIR)/libmi_a-MIResult.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIResult.c' object='src/mi/libmi_a-MIResult.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIResult.obj `if test -f 'src/mi/MIResult.c'; then $(CYGPATH_W) 'src/mi/MIResult.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIResult.c'; fi`
-
-src/mi/libmi_a-MIResultRecord.o: src/mi/MIResultRecord.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIResultRecord.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIResultRecord.Tpo -c -o src/mi/libmi_a-MIResultRecord.o `test -f 'src/mi/MIResultRecord.c' || echo '$(srcdir)/'`src/mi/MIResultRecord.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIResultRecord.Tpo src/mi/$(DEPDIR)/libmi_a-MIResultRecord.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIResultRecord.c' object='src/mi/libmi_a-MIResultRecord.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIResultRecord.o `test -f 'src/mi/MIResultRecord.c' || echo '$(srcdir)/'`src/mi/MIResultRecord.c
-
-src/mi/libmi_a-MIResultRecord.obj: src/mi/MIResultRecord.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIResultRecord.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIResultRecord.Tpo -c -o src/mi/libmi_a-MIResultRecord.obj `if test -f 'src/mi/MIResultRecord.c'; then $(CYGPATH_W) 'src/mi/MIResultRecord.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIResultRecord.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIResultRecord.Tpo src/mi/$(DEPDIR)/libmi_a-MIResultRecord.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIResultRecord.c' object='src/mi/libmi_a-MIResultRecord.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIResultRecord.obj `if test -f 'src/mi/MIResultRecord.c'; then $(CYGPATH_W) 'src/mi/MIResultRecord.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIResultRecord.c'; fi`
-
-src/mi/libmi_a-MIValue.o: src/mi/MIValue.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIValue.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIValue.Tpo -c -o src/mi/libmi_a-MIValue.o `test -f 'src/mi/MIValue.c' || echo '$(srcdir)/'`src/mi/MIValue.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIValue.Tpo src/mi/$(DEPDIR)/libmi_a-MIValue.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIValue.c' object='src/mi/libmi_a-MIValue.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIValue.o `test -f 'src/mi/MIValue.c' || echo '$(srcdir)/'`src/mi/MIValue.c
-
-src/mi/libmi_a-MIValue.obj: src/mi/MIValue.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIValue.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIValue.Tpo -c -o src/mi/libmi_a-MIValue.obj `if test -f 'src/mi/MIValue.c'; then $(CYGPATH_W) 'src/mi/MIValue.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIValue.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIValue.Tpo src/mi/$(DEPDIR)/libmi_a-MIValue.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIValue.c' object='src/mi/libmi_a-MIValue.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIValue.obj `if test -f 'src/mi/MIValue.c'; then $(CYGPATH_W) 'src/mi/MIValue.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIValue.c'; fi`
-
-src/mi/libmi_a-MIString.o: src/mi/MIString.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIString.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIString.Tpo -c -o src/mi/libmi_a-MIString.o `test -f 'src/mi/MIString.c' || echo '$(srcdir)/'`src/mi/MIString.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIString.Tpo src/mi/$(DEPDIR)/libmi_a-MIString.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIString.c' object='src/mi/libmi_a-MIString.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIString.o `test -f 'src/mi/MIString.c' || echo '$(srcdir)/'`src/mi/MIString.c
-
-src/mi/libmi_a-MIString.obj: src/mi/MIString.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIString.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIString.Tpo -c -o src/mi/libmi_a-MIString.obj `if test -f 'src/mi/MIString.c'; then $(CYGPATH_W) 'src/mi/MIString.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIString.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIString.Tpo src/mi/$(DEPDIR)/libmi_a-MIString.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIString.c' object='src/mi/libmi_a-MIString.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIString.obj `if test -f 'src/mi/MIString.c'; then $(CYGPATH_W) 'src/mi/MIString.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIString.c'; fi`
-
-src/mi/libmi_a-MIBreakpoint.o: src/mi/MIBreakpoint.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIBreakpoint.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIBreakpoint.Tpo -c -o src/mi/libmi_a-MIBreakpoint.o `test -f 'src/mi/MIBreakpoint.c' || echo '$(srcdir)/'`src/mi/MIBreakpoint.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIBreakpoint.Tpo src/mi/$(DEPDIR)/libmi_a-MIBreakpoint.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIBreakpoint.c' object='src/mi/libmi_a-MIBreakpoint.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIBreakpoint.o `test -f 'src/mi/MIBreakpoint.c' || echo '$(srcdir)/'`src/mi/MIBreakpoint.c
-
-src/mi/libmi_a-MIBreakpoint.obj: src/mi/MIBreakpoint.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIBreakpoint.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIBreakpoint.Tpo -c -o src/mi/libmi_a-MIBreakpoint.obj `if test -f 'src/mi/MIBreakpoint.c'; then $(CYGPATH_W) 'src/mi/MIBreakpoint.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIBreakpoint.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIBreakpoint.Tpo src/mi/$(DEPDIR)/libmi_a-MIBreakpoint.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIBreakpoint.c' object='src/mi/libmi_a-MIBreakpoint.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIBreakpoint.obj `if test -f 'src/mi/MIBreakpoint.c'; then $(CYGPATH_W) 'src/mi/MIBreakpoint.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIBreakpoint.c'; fi`
-
-src/mi/libmi_a-MIFrame.o: src/mi/MIFrame.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIFrame.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIFrame.Tpo -c -o src/mi/libmi_a-MIFrame.o `test -f 'src/mi/MIFrame.c' || echo '$(srcdir)/'`src/mi/MIFrame.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIFrame.Tpo src/mi/$(DEPDIR)/libmi_a-MIFrame.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIFrame.c' object='src/mi/libmi_a-MIFrame.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIFrame.o `test -f 'src/mi/MIFrame.c' || echo '$(srcdir)/'`src/mi/MIFrame.c
-
-src/mi/libmi_a-MIFrame.obj: src/mi/MIFrame.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIFrame.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIFrame.Tpo -c -o src/mi/libmi_a-MIFrame.obj `if test -f 'src/mi/MIFrame.c'; then $(CYGPATH_W) 'src/mi/MIFrame.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIFrame.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIFrame.Tpo src/mi/$(DEPDIR)/libmi_a-MIFrame.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIFrame.c' object='src/mi/libmi_a-MIFrame.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIFrame.obj `if test -f 'src/mi/MIFrame.c'; then $(CYGPATH_W) 'src/mi/MIFrame.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIFrame.c'; fi`
-
-src/mi/libmi_a-MIThread.o: src/mi/MIThread.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIThread.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIThread.Tpo -c -o src/mi/libmi_a-MIThread.o `test -f 'src/mi/MIThread.c' || echo '$(srcdir)/'`src/mi/MIThread.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIThread.Tpo src/mi/$(DEPDIR)/libmi_a-MIThread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIThread.c' object='src/mi/libmi_a-MIThread.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIThread.o `test -f 'src/mi/MIThread.c' || echo '$(srcdir)/'`src/mi/MIThread.c
-
-src/mi/libmi_a-MIThread.obj: src/mi/MIThread.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIThread.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIThread.Tpo -c -o src/mi/libmi_a-MIThread.obj `if test -f 'src/mi/MIThread.c'; then $(CYGPATH_W) 'src/mi/MIThread.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIThread.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIThread.Tpo src/mi/$(DEPDIR)/libmi_a-MIThread.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIThread.c' object='src/mi/libmi_a-MIThread.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIThread.obj `if test -f 'src/mi/MIThread.c'; then $(CYGPATH_W) 'src/mi/MIThread.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIThread.c'; fi`
-
-src/mi/libmi_a-MIArg.o: src/mi/MIArg.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIArg.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIArg.Tpo -c -o src/mi/libmi_a-MIArg.o `test -f 'src/mi/MIArg.c' || echo '$(srcdir)/'`src/mi/MIArg.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIArg.Tpo src/mi/$(DEPDIR)/libmi_a-MIArg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIArg.c' object='src/mi/libmi_a-MIArg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIArg.o `test -f 'src/mi/MIArg.c' || echo '$(srcdir)/'`src/mi/MIArg.c
-
-src/mi/libmi_a-MIArg.obj: src/mi/MIArg.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIArg.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIArg.Tpo -c -o src/mi/libmi_a-MIArg.obj `if test -f 'src/mi/MIArg.c'; then $(CYGPATH_W) 'src/mi/MIArg.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIArg.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIArg.Tpo src/mi/$(DEPDIR)/libmi_a-MIArg.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIArg.c' object='src/mi/libmi_a-MIArg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIArg.obj `if test -f 'src/mi/MIArg.c'; then $(CYGPATH_W) 'src/mi/MIArg.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIArg.c'; fi`
-
-src/mi/libmi_a-MIVar.o: src/mi/MIVar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIVar.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIVar.Tpo -c -o src/mi/libmi_a-MIVar.o `test -f 'src/mi/MIVar.c' || echo '$(srcdir)/'`src/mi/MIVar.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIVar.Tpo src/mi/$(DEPDIR)/libmi_a-MIVar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIVar.c' object='src/mi/libmi_a-MIVar.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIVar.o `test -f 'src/mi/MIVar.c' || echo '$(srcdir)/'`src/mi/MIVar.c
-
-src/mi/libmi_a-MIVar.obj: src/mi/MIVar.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIVar.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIVar.Tpo -c -o src/mi/libmi_a-MIVar.obj `if test -f 'src/mi/MIVar.c'; then $(CYGPATH_W) 'src/mi/MIVar.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIVar.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIVar.Tpo src/mi/$(DEPDIR)/libmi_a-MIVar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIVar.c' object='src/mi/libmi_a-MIVar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIVar.obj `if test -f 'src/mi/MIVar.c'; then $(CYGPATH_W) 'src/mi/MIVar.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIVar.c'; fi`
-
-src/mi/libmi_a-MIEvent.o: src/mi/MIEvent.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIEvent.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIEvent.Tpo -c -o src/mi/libmi_a-MIEvent.o `test -f 'src/mi/MIEvent.c' || echo '$(srcdir)/'`src/mi/MIEvent.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIEvent.Tpo src/mi/$(DEPDIR)/libmi_a-MIEvent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIEvent.c' object='src/mi/libmi_a-MIEvent.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIEvent.o `test -f 'src/mi/MIEvent.c' || echo '$(srcdir)/'`src/mi/MIEvent.c
-
-src/mi/libmi_a-MIEvent.obj: src/mi/MIEvent.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIEvent.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIEvent.Tpo -c -o src/mi/libmi_a-MIEvent.obj `if test -f 'src/mi/MIEvent.c'; then $(CYGPATH_W) 'src/mi/MIEvent.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIEvent.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIEvent.Tpo src/mi/$(DEPDIR)/libmi_a-MIEvent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIEvent.c' object='src/mi/libmi_a-MIEvent.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIEvent.obj `if test -f 'src/mi/MIEvent.c'; then $(CYGPATH_W) 'src/mi/MIEvent.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIEvent.c'; fi`
-
-src/mi/libmi_a-MICommand.o: src/mi/MICommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MICommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MICommand.Tpo -c -o src/mi/libmi_a-MICommand.o `test -f 'src/mi/MICommand.c' || echo '$(srcdir)/'`src/mi/MICommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MICommand.Tpo src/mi/$(DEPDIR)/libmi_a-MICommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MICommand.c' object='src/mi/libmi_a-MICommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MICommand.o `test -f 'src/mi/MICommand.c' || echo '$(srcdir)/'`src/mi/MICommand.c
-
-src/mi/libmi_a-MICommand.obj: src/mi/MICommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MICommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MICommand.Tpo -c -o src/mi/libmi_a-MICommand.obj `if test -f 'src/mi/MICommand.c'; then $(CYGPATH_W) 'src/mi/MICommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MICommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MICommand.Tpo src/mi/$(DEPDIR)/libmi_a-MICommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MICommand.c' object='src/mi/libmi_a-MICommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MICommand.obj `if test -f 'src/mi/MICommand.c'; then $(CYGPATH_W) 'src/mi/MICommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MICommand.c'; fi`
-
-src/mi/libmi_a-MIGDBCommand.o: src/mi/MIGDBCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIGDBCommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIGDBCommand.Tpo -c -o src/mi/libmi_a-MIGDBCommand.o `test -f 'src/mi/MIGDBCommand.c' || echo '$(srcdir)/'`src/mi/MIGDBCommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIGDBCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIGDBCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIGDBCommand.c' object='src/mi/libmi_a-MIGDBCommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIGDBCommand.o `test -f 'src/mi/MIGDBCommand.c' || echo '$(srcdir)/'`src/mi/MIGDBCommand.c
-
-src/mi/libmi_a-MIGDBCommand.obj: src/mi/MIGDBCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIGDBCommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIGDBCommand.Tpo -c -o src/mi/libmi_a-MIGDBCommand.obj `if test -f 'src/mi/MIGDBCommand.c'; then $(CYGPATH_W) 'src/mi/MIGDBCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIGDBCommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIGDBCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIGDBCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIGDBCommand.c' object='src/mi/libmi_a-MIGDBCommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIGDBCommand.obj `if test -f 'src/mi/MIGDBCommand.c'; then $(CYGPATH_W) 'src/mi/MIGDBCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIGDBCommand.c'; fi`
-
-src/mi/libmi_a-MIExecCommand.o: src/mi/MIExecCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIExecCommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIExecCommand.Tpo -c -o src/mi/libmi_a-MIExecCommand.o `test -f 'src/mi/MIExecCommand.c' || echo '$(srcdir)/'`src/mi/MIExecCommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIExecCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIExecCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIExecCommand.c' object='src/mi/libmi_a-MIExecCommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIExecCommand.o `test -f 'src/mi/MIExecCommand.c' || echo '$(srcdir)/'`src/mi/MIExecCommand.c
-
-src/mi/libmi_a-MIExecCommand.obj: src/mi/MIExecCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIExecCommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIExecCommand.Tpo -c -o src/mi/libmi_a-MIExecCommand.obj `if test -f 'src/mi/MIExecCommand.c'; then $(CYGPATH_W) 'src/mi/MIExecCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIExecCommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIExecCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIExecCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIExecCommand.c' object='src/mi/libmi_a-MIExecCommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIExecCommand.obj `if test -f 'src/mi/MIExecCommand.c'; then $(CYGPATH_W) 'src/mi/MIExecCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIExecCommand.c'; fi`
-
-src/mi/libmi_a-MIBreakCommand.o: src/mi/MIBreakCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIBreakCommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIBreakCommand.Tpo -c -o src/mi/libmi_a-MIBreakCommand.o `test -f 'src/mi/MIBreakCommand.c' || echo '$(srcdir)/'`src/mi/MIBreakCommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIBreakCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIBreakCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIBreakCommand.c' object='src/mi/libmi_a-MIBreakCommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIBreakCommand.o `test -f 'src/mi/MIBreakCommand.c' || echo '$(srcdir)/'`src/mi/MIBreakCommand.c
-
-src/mi/libmi_a-MIBreakCommand.obj: src/mi/MIBreakCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIBreakCommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIBreakCommand.Tpo -c -o src/mi/libmi_a-MIBreakCommand.obj `if test -f 'src/mi/MIBreakCommand.c'; then $(CYGPATH_W) 'src/mi/MIBreakCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIBreakCommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIBreakCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIBreakCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIBreakCommand.c' object='src/mi/libmi_a-MIBreakCommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIBreakCommand.obj `if test -f 'src/mi/MIBreakCommand.c'; then $(CYGPATH_W) 'src/mi/MIBreakCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIBreakCommand.c'; fi`
-
-src/mi/libmi_a-MIStackCommand.o: src/mi/MIStackCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIStackCommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIStackCommand.Tpo -c -o src/mi/libmi_a-MIStackCommand.o `test -f 'src/mi/MIStackCommand.c' || echo '$(srcdir)/'`src/mi/MIStackCommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIStackCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIStackCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIStackCommand.c' object='src/mi/libmi_a-MIStackCommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIStackCommand.o `test -f 'src/mi/MIStackCommand.c' || echo '$(srcdir)/'`src/mi/MIStackCommand.c
-
-src/mi/libmi_a-MIStackCommand.obj: src/mi/MIStackCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIStackCommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIStackCommand.Tpo -c -o src/mi/libmi_a-MIStackCommand.obj `if test -f 'src/mi/MIStackCommand.c'; then $(CYGPATH_W) 'src/mi/MIStackCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIStackCommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIStackCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIStackCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIStackCommand.c' object='src/mi/libmi_a-MIStackCommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIStackCommand.obj `if test -f 'src/mi/MIStackCommand.c'; then $(CYGPATH_W) 'src/mi/MIStackCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIStackCommand.c'; fi`
-
-src/mi/libmi_a-MIVarCommand.o: src/mi/MIVarCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIVarCommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIVarCommand.Tpo -c -o src/mi/libmi_a-MIVarCommand.o `test -f 'src/mi/MIVarCommand.c' || echo '$(srcdir)/'`src/mi/MIVarCommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIVarCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIVarCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIVarCommand.c' object='src/mi/libmi_a-MIVarCommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIVarCommand.o `test -f 'src/mi/MIVarCommand.c' || echo '$(srcdir)/'`src/mi/MIVarCommand.c
-
-src/mi/libmi_a-MIVarCommand.obj: src/mi/MIVarCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIVarCommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIVarCommand.Tpo -c -o src/mi/libmi_a-MIVarCommand.obj `if test -f 'src/mi/MIVarCommand.c'; then $(CYGPATH_W) 'src/mi/MIVarCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIVarCommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIVarCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIVarCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIVarCommand.c' object='src/mi/libmi_a-MIVarCommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIVarCommand.obj `if test -f 'src/mi/MIVarCommand.c'; then $(CYGPATH_W) 'src/mi/MIVarCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIVarCommand.c'; fi`
-
-src/mi/libmi_a-MIError.o: src/mi/MIError.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIError.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIError.Tpo -c -o src/mi/libmi_a-MIError.o `test -f 'src/mi/MIError.c' || echo '$(srcdir)/'`src/mi/MIError.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIError.Tpo src/mi/$(DEPDIR)/libmi_a-MIError.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIError.c' object='src/mi/libmi_a-MIError.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIError.o `test -f 'src/mi/MIError.c' || echo '$(srcdir)/'`src/mi/MIError.c
-
-src/mi/libmi_a-MIError.obj: src/mi/MIError.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIError.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIError.Tpo -c -o src/mi/libmi_a-MIError.obj `if test -f 'src/mi/MIError.c'; then $(CYGPATH_W) 'src/mi/MIError.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIError.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIError.Tpo src/mi/$(DEPDIR)/libmi_a-MIError.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIError.c' object='src/mi/libmi_a-MIError.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIError.obj `if test -f 'src/mi/MIError.c'; then $(CYGPATH_W) 'src/mi/MIError.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIError.c'; fi`
-
-src/mi/libmi_a-MISession.o: src/mi/MISession.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MISession.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MISession.Tpo -c -o src/mi/libmi_a-MISession.o `test -f 'src/mi/MISession.c' || echo '$(srcdir)/'`src/mi/MISession.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MISession.Tpo src/mi/$(DEPDIR)/libmi_a-MISession.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MISession.c' object='src/mi/libmi_a-MISession.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MISession.o `test -f 'src/mi/MISession.c' || echo '$(srcdir)/'`src/mi/MISession.c
-
-src/mi/libmi_a-MISession.obj: src/mi/MISession.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MISession.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MISession.Tpo -c -o src/mi/libmi_a-MISession.obj `if test -f 'src/mi/MISession.c'; then $(CYGPATH_W) 'src/mi/MISession.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MISession.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MISession.Tpo src/mi/$(DEPDIR)/libmi_a-MISession.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MISession.c' object='src/mi/libmi_a-MISession.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MISession.obj `if test -f 'src/mi/MISession.c'; then $(CYGPATH_W) 'src/mi/MISession.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MISession.c'; fi`
-
-src/mi/libmi_a-MIThreadCommand.o: src/mi/MIThreadCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIThreadCommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIThreadCommand.Tpo -c -o src/mi/libmi_a-MIThreadCommand.o `test -f 'src/mi/MIThreadCommand.c' || echo '$(srcdir)/'`src/mi/MIThreadCommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIThreadCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIThreadCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIThreadCommand.c' object='src/mi/libmi_a-MIThreadCommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIThreadCommand.o `test -f 'src/mi/MIThreadCommand.c' || echo '$(srcdir)/'`src/mi/MIThreadCommand.c
-
-src/mi/libmi_a-MIThreadCommand.obj: src/mi/MIThreadCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIThreadCommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIThreadCommand.Tpo -c -o src/mi/libmi_a-MIThreadCommand.obj `if test -f 'src/mi/MIThreadCommand.c'; then $(CYGPATH_W) 'src/mi/MIThreadCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIThreadCommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIThreadCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIThreadCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIThreadCommand.c' object='src/mi/libmi_a-MIThreadCommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIThreadCommand.obj `if test -f 'src/mi/MIThreadCommand.c'; then $(CYGPATH_W) 'src/mi/MIThreadCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIThreadCommand.c'; fi`
-
-src/mi/libmi_a-MIMemory.o: src/mi/MIMemory.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIMemory.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIMemory.Tpo -c -o src/mi/libmi_a-MIMemory.o `test -f 'src/mi/MIMemory.c' || echo '$(srcdir)/'`src/mi/MIMemory.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIMemory.Tpo src/mi/$(DEPDIR)/libmi_a-MIMemory.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIMemory.c' object='src/mi/libmi_a-MIMemory.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIMemory.o `test -f 'src/mi/MIMemory.c' || echo '$(srcdir)/'`src/mi/MIMemory.c
-
-src/mi/libmi_a-MIMemory.obj: src/mi/MIMemory.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIMemory.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIMemory.Tpo -c -o src/mi/libmi_a-MIMemory.obj `if test -f 'src/mi/MIMemory.c'; then $(CYGPATH_W) 'src/mi/MIMemory.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIMemory.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIMemory.Tpo src/mi/$(DEPDIR)/libmi_a-MIMemory.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIMemory.c' object='src/mi/libmi_a-MIMemory.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIMemory.obj `if test -f 'src/mi/MIMemory.c'; then $(CYGPATH_W) 'src/mi/MIMemory.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIMemory.c'; fi`
-
-src/mi/libmi_a-MIMemoryCommand.o: src/mi/MIMemoryCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIMemoryCommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIMemoryCommand.Tpo -c -o src/mi/libmi_a-MIMemoryCommand.o `test -f 'src/mi/MIMemoryCommand.c' || echo '$(srcdir)/'`src/mi/MIMemoryCommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIMemoryCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIMemoryCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIMemoryCommand.c' object='src/mi/libmi_a-MIMemoryCommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIMemoryCommand.o `test -f 'src/mi/MIMemoryCommand.c' || echo '$(srcdir)/'`src/mi/MIMemoryCommand.c
-
-src/mi/libmi_a-MIMemoryCommand.obj: src/mi/MIMemoryCommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-MIMemoryCommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-MIMemoryCommand.Tpo -c -o src/mi/libmi_a-MIMemoryCommand.obj `if test -f 'src/mi/MIMemoryCommand.c'; then $(CYGPATH_W) 'src/mi/MIMemoryCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIMemoryCommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-MIMemoryCommand.Tpo src/mi/$(DEPDIR)/libmi_a-MIMemoryCommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/MIMemoryCommand.c' object='src/mi/libmi_a-MIMemoryCommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-MIMemoryCommand.obj `if test -f 'src/mi/MIMemoryCommand.c'; then $(CYGPATH_W) 'src/mi/MIMemoryCommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/MIMemoryCommand.c'; fi`
-
-src/mi/libmi_a-CLICommand.o: src/mi/CLICommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-CLICommand.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-CLICommand.Tpo -c -o src/mi/libmi_a-CLICommand.o `test -f 'src/mi/CLICommand.c' || echo '$(srcdir)/'`src/mi/CLICommand.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-CLICommand.Tpo src/mi/$(DEPDIR)/libmi_a-CLICommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/CLICommand.c' object='src/mi/libmi_a-CLICommand.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-CLICommand.o `test -f 'src/mi/CLICommand.c' || echo '$(srcdir)/'`src/mi/CLICommand.c
-
-src/mi/libmi_a-CLICommand.obj: src/mi/CLICommand.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-CLICommand.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-CLICommand.Tpo -c -o src/mi/libmi_a-CLICommand.obj `if test -f 'src/mi/CLICommand.c'; then $(CYGPATH_W) 'src/mi/CLICommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/CLICommand.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-CLICommand.Tpo src/mi/$(DEPDIR)/libmi_a-CLICommand.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/CLICommand.c' object='src/mi/libmi_a-CLICommand.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-CLICommand.obj `if test -f 'src/mi/CLICommand.c'; then $(CYGPATH_W) 'src/mi/CLICommand.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/CLICommand.c'; fi`
-
-src/mi/libmi_a-CLIOutput.o: src/mi/CLIOutput.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-CLIOutput.o -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-CLIOutput.Tpo -c -o src/mi/libmi_a-CLIOutput.o `test -f 'src/mi/CLIOutput.c' || echo '$(srcdir)/'`src/mi/CLIOutput.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-CLIOutput.Tpo src/mi/$(DEPDIR)/libmi_a-CLIOutput.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/CLIOutput.c' object='src/mi/libmi_a-CLIOutput.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-CLIOutput.o `test -f 'src/mi/CLIOutput.c' || echo '$(srcdir)/'`src/mi/CLIOutput.c
-
-src/mi/libmi_a-CLIOutput.obj: src/mi/CLIOutput.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -MT src/mi/libmi_a-CLIOutput.obj -MD -MP -MF src/mi/$(DEPDIR)/libmi_a-CLIOutput.Tpo -c -o src/mi/libmi_a-CLIOutput.obj `if test -f 'src/mi/CLIOutput.c'; then $(CYGPATH_W) 'src/mi/CLIOutput.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/CLIOutput.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/libmi_a-CLIOutput.Tpo src/mi/$(DEPDIR)/libmi_a-CLIOutput.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/CLIOutput.c' object='src/mi/libmi_a-CLIOutput.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmi_a_CFLAGS) $(CFLAGS) -c -o src/mi/libmi_a-CLIOutput.obj `if test -f 'src/mi/CLIOutput.c'; then $(CYGPATH_W) 'src/mi/CLIOutput.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/CLIOutput.c'; fi`
-
-src/client/sdm-startup.o: src/client/startup.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/client/sdm-startup.o -MD -MP -MF src/client/$(DEPDIR)/sdm-startup.Tpo -c -o src/client/sdm-startup.o `test -f 'src/client/startup.c' || echo '$(srcdir)/'`src/client/startup.c
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/sdm-startup.Tpo src/client/$(DEPDIR)/sdm-startup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/startup.c' object='src/client/sdm-startup.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/client/sdm-startup.o `test -f 'src/client/startup.c' || echo '$(srcdir)/'`src/client/startup.c
-
-src/client/sdm-startup.obj: src/client/startup.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/client/sdm-startup.obj -MD -MP -MF src/client/$(DEPDIR)/sdm-startup.Tpo -c -o src/client/sdm-startup.obj `if test -f 'src/client/startup.c'; then $(CYGPATH_W) 'src/client/startup.c'; else $(CYGPATH_W) '$(srcdir)/src/client/startup.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/sdm-startup.Tpo src/client/$(DEPDIR)/sdm-startup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/startup.c' object='src/client/sdm-startup.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/client/sdm-startup.obj `if test -f 'src/client/startup.c'; then $(CYGPATH_W) 'src/client/startup.c'; else $(CYGPATH_W) '$(srcdir)/src/client/startup.c'; fi`
-
-src/client/sdm-client.o: src/client/client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/client/sdm-client.o -MD -MP -MF src/client/$(DEPDIR)/sdm-client.Tpo -c -o src/client/sdm-client.o `test -f 'src/client/client.c' || echo '$(srcdir)/'`src/client/client.c
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/sdm-client.Tpo src/client/$(DEPDIR)/sdm-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/client.c' object='src/client/sdm-client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/client/sdm-client.o `test -f 'src/client/client.c' || echo '$(srcdir)/'`src/client/client.c
-
-src/client/sdm-client.obj: src/client/client.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/client/sdm-client.obj -MD -MP -MF src/client/$(DEPDIR)/sdm-client.Tpo -c -o src/client/sdm-client.obj `if test -f 'src/client/client.c'; then $(CYGPATH_W) 'src/client/client.c'; else $(CYGPATH_W) '$(srcdir)/src/client/client.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/sdm-client.Tpo src/client/$(DEPDIR)/sdm-client.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/client.c' object='src/client/sdm-client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/client/sdm-client.obj `if test -f 'src/client/client.c'; then $(CYGPATH_W) 'src/client/client.c'; else $(CYGPATH_W) '$(srcdir)/src/client/client.c'; fi`
-
-src/client/sdm-client_cmds.o: src/client/client_cmds.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/client/sdm-client_cmds.o -MD -MP -MF src/client/$(DEPDIR)/sdm-client_cmds.Tpo -c -o src/client/sdm-client_cmds.o `test -f 'src/client/client_cmds.c' || echo '$(srcdir)/'`src/client/client_cmds.c
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/sdm-client_cmds.Tpo src/client/$(DEPDIR)/sdm-client_cmds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/client_cmds.c' object='src/client/sdm-client_cmds.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/client/sdm-client_cmds.o `test -f 'src/client/client_cmds.c' || echo '$(srcdir)/'`src/client/client_cmds.c
-
-src/client/sdm-client_cmds.obj: src/client/client_cmds.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/client/sdm-client_cmds.obj -MD -MP -MF src/client/$(DEPDIR)/sdm-client_cmds.Tpo -c -o src/client/sdm-client_cmds.obj `if test -f 'src/client/client_cmds.c'; then $(CYGPATH_W) 'src/client/client_cmds.c'; else $(CYGPATH_W) '$(srcdir)/src/client/client_cmds.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/client/$(DEPDIR)/sdm-client_cmds.Tpo src/client/$(DEPDIR)/sdm-client_cmds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/client/client_cmds.c' object='src/client/sdm-client_cmds.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/client/sdm-client_cmds.obj `if test -f 'src/client/client_cmds.c'; then $(CYGPATH_W) 'src/client/client_cmds.c'; else $(CYGPATH_W) '$(srcdir)/src/client/client_cmds.c'; fi`
-
-src/server/sdm-server.o: src/server/server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-server.o -MD -MP -MF src/server/$(DEPDIR)/sdm-server.Tpo -c -o src/server/sdm-server.o `test -f 'src/server/server.c' || echo '$(srcdir)/'`src/server/server.c
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-server.Tpo src/server/$(DEPDIR)/sdm-server.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/server.c' object='src/server/sdm-server.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-server.o `test -f 'src/server/server.c' || echo '$(srcdir)/'`src/server/server.c
-
-src/server/sdm-server.obj: src/server/server.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-server.obj -MD -MP -MF src/server/$(DEPDIR)/sdm-server.Tpo -c -o src/server/sdm-server.obj `if test -f 'src/server/server.c'; then $(CYGPATH_W) 'src/server/server.c'; else $(CYGPATH_W) '$(srcdir)/src/server/server.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-server.Tpo src/server/$(DEPDIR)/sdm-server.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/server.c' object='src/server/sdm-server.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-server.obj `if test -f 'src/server/server.c'; then $(CYGPATH_W) 'src/server/server.c'; else $(CYGPATH_W) '$(srcdir)/src/server/server.c'; fi`
-
-src/server/sdm-server_cmds.o: src/server/server_cmds.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-server_cmds.o -MD -MP -MF src/server/$(DEPDIR)/sdm-server_cmds.Tpo -c -o src/server/sdm-server_cmds.o `test -f 'src/server/server_cmds.c' || echo '$(srcdir)/'`src/server/server_cmds.c
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-server_cmds.Tpo src/server/$(DEPDIR)/sdm-server_cmds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/server_cmds.c' object='src/server/sdm-server_cmds.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-server_cmds.o `test -f 'src/server/server_cmds.c' || echo '$(srcdir)/'`src/server/server_cmds.c
-
-src/server/sdm-server_cmds.obj: src/server/server_cmds.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-server_cmds.obj -MD -MP -MF src/server/$(DEPDIR)/sdm-server_cmds.Tpo -c -o src/server/sdm-server_cmds.obj `if test -f 'src/server/server_cmds.c'; then $(CYGPATH_W) 'src/server/server_cmds.c'; else $(CYGPATH_W) '$(srcdir)/src/server/server_cmds.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-server_cmds.Tpo src/server/$(DEPDIR)/sdm-server_cmds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/server_cmds.c' object='src/server/sdm-server_cmds.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-server_cmds.obj `if test -f 'src/server/server_cmds.c'; then $(CYGPATH_W) 'src/server/server_cmds.c'; else $(CYGPATH_W) '$(srcdir)/src/server/server_cmds.c'; fi`
-
-src/server/sdm-backend.o: src/server/backend.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-backend.o -MD -MP -MF src/server/$(DEPDIR)/sdm-backend.Tpo -c -o src/server/sdm-backend.o `test -f 'src/server/backend.c' || echo '$(srcdir)/'`src/server/backend.c
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-backend.Tpo src/server/$(DEPDIR)/sdm-backend.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/backend.c' object='src/server/sdm-backend.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-backend.o `test -f 'src/server/backend.c' || echo '$(srcdir)/'`src/server/backend.c
-
-src/server/sdm-backend.obj: src/server/backend.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-backend.obj -MD -MP -MF src/server/$(DEPDIR)/sdm-backend.Tpo -c -o src/server/sdm-backend.obj `if test -f 'src/server/backend.c'; then $(CYGPATH_W) 'src/server/backend.c'; else $(CYGPATH_W) '$(srcdir)/src/server/backend.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-backend.Tpo src/server/$(DEPDIR)/sdm-backend.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/backend.c' object='src/server/sdm-backend.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-backend.obj `if test -f 'src/server/backend.c'; then $(CYGPATH_W) 'src/server/backend.c'; else $(CYGPATH_W) '$(srcdir)/src/server/backend.c'; fi`
-
-src/server/sdm-gdbmi_backend.o: src/server/gdbmi_backend.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-gdbmi_backend.o -MD -MP -MF src/server/$(DEPDIR)/sdm-gdbmi_backend.Tpo -c -o src/server/sdm-gdbmi_backend.o `test -f 'src/server/gdbmi_backend.c' || echo '$(srcdir)/'`src/server/gdbmi_backend.c
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-gdbmi_backend.Tpo src/server/$(DEPDIR)/sdm-gdbmi_backend.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/gdbmi_backend.c' object='src/server/sdm-gdbmi_backend.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-gdbmi_backend.o `test -f 'src/server/gdbmi_backend.c' || echo '$(srcdir)/'`src/server/gdbmi_backend.c
-
-src/server/sdm-gdbmi_backend.obj: src/server/gdbmi_backend.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-gdbmi_backend.obj -MD -MP -MF src/server/$(DEPDIR)/sdm-gdbmi_backend.Tpo -c -o src/server/sdm-gdbmi_backend.obj `if test -f 'src/server/gdbmi_backend.c'; then $(CYGPATH_W) 'src/server/gdbmi_backend.c'; else $(CYGPATH_W) '$(srcdir)/src/server/gdbmi_backend.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-gdbmi_backend.Tpo src/server/$(DEPDIR)/sdm-gdbmi_backend.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/gdbmi_backend.c' object='src/server/sdm-gdbmi_backend.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-gdbmi_backend.obj `if test -f 'src/server/gdbmi_backend.c'; then $(CYGPATH_W) 'src/server/gdbmi_backend.c'; else $(CYGPATH_W) '$(srcdir)/src/server/gdbmi_backend.c'; fi`
-
-src/server/sdm-test_backend.o: src/server/test_backend.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-test_backend.o -MD -MP -MF src/server/$(DEPDIR)/sdm-test_backend.Tpo -c -o src/server/sdm-test_backend.o `test -f 'src/server/test_backend.c' || echo '$(srcdir)/'`src/server/test_backend.c
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-test_backend.Tpo src/server/$(DEPDIR)/sdm-test_backend.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/test_backend.c' object='src/server/sdm-test_backend.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-test_backend.o `test -f 'src/server/test_backend.c' || echo '$(srcdir)/'`src/server/test_backend.c
-
-src/server/sdm-test_backend.obj: src/server/test_backend.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/server/sdm-test_backend.obj -MD -MP -MF src/server/$(DEPDIR)/sdm-test_backend.Tpo -c -o src/server/sdm-test_backend.obj `if test -f 'src/server/test_backend.c'; then $(CYGPATH_W) 'src/server/test_backend.c'; else $(CYGPATH_W) '$(srcdir)/src/server/test_backend.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/server/$(DEPDIR)/sdm-test_backend.Tpo src/server/$(DEPDIR)/sdm-test_backend.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/server/test_backend.c' object='src/server/sdm-test_backend.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/server/sdm-test_backend.obj `if test -f 'src/server/test_backend.c'; then $(CYGPATH_W) 'src/server/test_backend.c'; else $(CYGPATH_W) '$(srcdir)/src/server/test_backend.c'; fi`
-
-src/impl/sdm-sdm.o: src/impl/sdm.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm.o -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm.Tpo -c -o src/impl/sdm-sdm.o `test -f 'src/impl/sdm.c' || echo '$(srcdir)/'`src/impl/sdm.c
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm.Tpo src/impl/$(DEPDIR)/sdm-sdm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm.c' object='src/impl/sdm-sdm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm.o `test -f 'src/impl/sdm.c' || echo '$(srcdir)/'`src/impl/sdm.c
-
-src/impl/sdm-sdm.obj: src/impl/sdm.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm.obj -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm.Tpo -c -o src/impl/sdm-sdm.obj `if test -f 'src/impl/sdm.c'; then $(CYGPATH_W) 'src/impl/sdm.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm.Tpo src/impl/$(DEPDIR)/sdm-sdm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm.c' object='src/impl/sdm-sdm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm.obj `if test -f 'src/impl/sdm.c'; then $(CYGPATH_W) 'src/impl/sdm.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm.c'; fi`
-
-src/impl/sdm-sdm_aggregate_hash.o: src/impl/sdm_aggregate_hash.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_aggregate_hash.o -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_aggregate_hash.Tpo -c -o src/impl/sdm-sdm_aggregate_hash.o `test -f 'src/impl/sdm_aggregate_hash.c' || echo '$(srcdir)/'`src/impl/sdm_aggregate_hash.c
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_aggregate_hash.Tpo src/impl/$(DEPDIR)/sdm-sdm_aggregate_hash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_aggregate_hash.c' object='src/impl/sdm-sdm_aggregate_hash.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_aggregate_hash.o `test -f 'src/impl/sdm_aggregate_hash.c' || echo '$(srcdir)/'`src/impl/sdm_aggregate_hash.c
-
-src/impl/sdm-sdm_aggregate_hash.obj: src/impl/sdm_aggregate_hash.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_aggregate_hash.obj -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_aggregate_hash.Tpo -c -o src/impl/sdm-sdm_aggregate_hash.obj `if test -f 'src/impl/sdm_aggregate_hash.c'; then $(CYGPATH_W) 'src/impl/sdm_aggregate_hash.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_aggregate_hash.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_aggregate_hash.Tpo src/impl/$(DEPDIR)/sdm-sdm_aggregate_hash.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_aggregate_hash.c' object='src/impl/sdm-sdm_aggregate_hash.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_aggregate_hash.obj `if test -f 'src/impl/sdm_aggregate_hash.c'; then $(CYGPATH_W) 'src/impl/sdm_aggregate_hash.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_aggregate_hash.c'; fi`
-
-src/impl/sdm-sdm_hello_proto.o: src/impl/sdm_hello_proto.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_hello_proto.o -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_hello_proto.Tpo -c -o src/impl/sdm-sdm_hello_proto.o `test -f 'src/impl/sdm_hello_proto.c' || echo '$(srcdir)/'`src/impl/sdm_hello_proto.c
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_hello_proto.Tpo src/impl/$(DEPDIR)/sdm-sdm_hello_proto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_hello_proto.c' object='src/impl/sdm-sdm_hello_proto.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_hello_proto.o `test -f 'src/impl/sdm_hello_proto.c' || echo '$(srcdir)/'`src/impl/sdm_hello_proto.c
-
-src/impl/sdm-sdm_hello_proto.obj: src/impl/sdm_hello_proto.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_hello_proto.obj -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_hello_proto.Tpo -c -o src/impl/sdm-sdm_hello_proto.obj `if test -f 'src/impl/sdm_hello_proto.c'; then $(CYGPATH_W) 'src/impl/sdm_hello_proto.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_hello_proto.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_hello_proto.Tpo src/impl/$(DEPDIR)/sdm-sdm_hello_proto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_hello_proto.c' object='src/impl/sdm-sdm_hello_proto.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_hello_proto.obj `if test -f 'src/impl/sdm_hello_proto.c'; then $(CYGPATH_W) 'src/impl/sdm_hello_proto.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_hello_proto.c'; fi`
-
-src/impl/sdm-sdm_message_tcpip.o: src/impl/sdm_message_tcpip.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_message_tcpip.o -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_message_tcpip.Tpo -c -o src/impl/sdm-sdm_message_tcpip.o `test -f 'src/impl/sdm_message_tcpip.c' || echo '$(srcdir)/'`src/impl/sdm_message_tcpip.c
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_message_tcpip.Tpo src/impl/$(DEPDIR)/sdm-sdm_message_tcpip.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_message_tcpip.c' object='src/impl/sdm-sdm_message_tcpip.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_message_tcpip.o `test -f 'src/impl/sdm_message_tcpip.c' || echo '$(srcdir)/'`src/impl/sdm_message_tcpip.c
-
-src/impl/sdm-sdm_message_tcpip.obj: src/impl/sdm_message_tcpip.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_message_tcpip.obj -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_message_tcpip.Tpo -c -o src/impl/sdm-sdm_message_tcpip.obj `if test -f 'src/impl/sdm_message_tcpip.c'; then $(CYGPATH_W) 'src/impl/sdm_message_tcpip.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_message_tcpip.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_message_tcpip.Tpo src/impl/$(DEPDIR)/sdm-sdm_message_tcpip.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_message_tcpip.c' object='src/impl/sdm-sdm_message_tcpip.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_message_tcpip.obj `if test -f 'src/impl/sdm_message_tcpip.c'; then $(CYGPATH_W) 'src/impl/sdm_message_tcpip.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_message_tcpip.c'; fi`
-
-src/impl/sdm-sdm_route_tree.o: src/impl/sdm_route_tree.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_route_tree.o -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_route_tree.Tpo -c -o src/impl/sdm-sdm_route_tree.o `test -f 'src/impl/sdm_route_tree.c' || echo '$(srcdir)/'`src/impl/sdm_route_tree.c
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_route_tree.Tpo src/impl/$(DEPDIR)/sdm-sdm_route_tree.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_route_tree.c' object='src/impl/sdm-sdm_route_tree.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_route_tree.o `test -f 'src/impl/sdm_route_tree.c' || echo '$(srcdir)/'`src/impl/sdm_route_tree.c
-
-src/impl/sdm-sdm_route_tree.obj: src/impl/sdm_route_tree.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_route_tree.obj -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_route_tree.Tpo -c -o src/impl/sdm-sdm_route_tree.obj `if test -f 'src/impl/sdm_route_tree.c'; then $(CYGPATH_W) 'src/impl/sdm_route_tree.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_route_tree.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_route_tree.Tpo src/impl/$(DEPDIR)/sdm-sdm_route_tree.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_route_tree.c' object='src/impl/sdm-sdm_route_tree.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_route_tree.obj `if test -f 'src/impl/sdm_route_tree.c'; then $(CYGPATH_W) 'src/impl/sdm_route_tree.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_route_tree.c'; fi`
-
-src/impl/sdm-sdm_routing_table_file.o: src/impl/sdm_routing_table_file.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_routing_table_file.o -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_routing_table_file.Tpo -c -o src/impl/sdm-sdm_routing_table_file.o `test -f 'src/impl/sdm_routing_table_file.c' || echo '$(srcdir)/'`src/impl/sdm_routing_table_file.c
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_routing_table_file.Tpo src/impl/$(DEPDIR)/sdm-sdm_routing_table_file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_routing_table_file.c' object='src/impl/sdm-sdm_routing_table_file.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_routing_table_file.o `test -f 'src/impl/sdm_routing_table_file.c' || echo '$(srcdir)/'`src/impl/sdm_routing_table_file.c
-
-src/impl/sdm-sdm_routing_table_file.obj: src/impl/sdm_routing_table_file.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_routing_table_file.obj -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_routing_table_file.Tpo -c -o src/impl/sdm-sdm_routing_table_file.obj `if test -f 'src/impl/sdm_routing_table_file.c'; then $(CYGPATH_W) 'src/impl/sdm_routing_table_file.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_routing_table_file.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_routing_table_file.Tpo src/impl/$(DEPDIR)/sdm-sdm_routing_table_file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_routing_table_file.c' object='src/impl/sdm-sdm_routing_table_file.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_routing_table_file.obj `if test -f 'src/impl/sdm_routing_table_file.c'; then $(CYGPATH_W) 'src/impl/sdm_routing_table_file.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_routing_table_file.c'; fi`
-
-src/impl/sdm-sdm_set_bitset.o: src/impl/sdm_set_bitset.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_set_bitset.o -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_set_bitset.Tpo -c -o src/impl/sdm-sdm_set_bitset.o `test -f 'src/impl/sdm_set_bitset.c' || echo '$(srcdir)/'`src/impl/sdm_set_bitset.c
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_set_bitset.Tpo src/impl/$(DEPDIR)/sdm-sdm_set_bitset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_set_bitset.c' object='src/impl/sdm-sdm_set_bitset.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_set_bitset.o `test -f 'src/impl/sdm_set_bitset.c' || echo '$(srcdir)/'`src/impl/sdm_set_bitset.c
-
-src/impl/sdm-sdm_set_bitset.obj: src/impl/sdm_set_bitset.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -MT src/impl/sdm-sdm_set_bitset.obj -MD -MP -MF src/impl/$(DEPDIR)/sdm-sdm_set_bitset.Tpo -c -o src/impl/sdm-sdm_set_bitset.obj `if test -f 'src/impl/sdm_set_bitset.c'; then $(CYGPATH_W) 'src/impl/sdm_set_bitset.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_set_bitset.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/impl/$(DEPDIR)/sdm-sdm_set_bitset.Tpo src/impl/$(DEPDIR)/sdm-sdm_set_bitset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/impl/sdm_set_bitset.c' object='src/impl/sdm-sdm_set_bitset.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sdm_CFLAGS) $(CFLAGS) -c -o src/impl/sdm-sdm_set_bitset.obj `if test -f 'src/impl/sdm_set_bitset.c'; then $(CYGPATH_W) 'src/impl/sdm_set_bitset.c'; else $(CYGPATH_W) '$(srcdir)/src/impl/sdm_set_bitset.c'; fi`
-
-src/mi/test_mi-test_mi.o: src/mi/test_mi.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_mi_CFLAGS) $(CFLAGS) -MT src/mi/test_mi-test_mi.o -MD -MP -MF src/mi/$(DEPDIR)/test_mi-test_mi.Tpo -c -o src/mi/test_mi-test_mi.o `test -f 'src/mi/test_mi.c' || echo '$(srcdir)/'`src/mi/test_mi.c
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/test_mi-test_mi.Tpo src/mi/$(DEPDIR)/test_mi-test_mi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/test_mi.c' object='src/mi/test_mi-test_mi.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_mi_CFLAGS) $(CFLAGS) -c -o src/mi/test_mi-test_mi.o `test -f 'src/mi/test_mi.c' || echo '$(srcdir)/'`src/mi/test_mi.c
-
-src/mi/test_mi-test_mi.obj: src/mi/test_mi.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_mi_CFLAGS) $(CFLAGS) -MT src/mi/test_mi-test_mi.obj -MD -MP -MF src/mi/$(DEPDIR)/test_mi-test_mi.Tpo -c -o src/mi/test_mi-test_mi.obj `if test -f 'src/mi/test_mi.c'; then $(CYGPATH_W) 'src/mi/test_mi.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/test_mi.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/mi/$(DEPDIR)/test_mi-test_mi.Tpo src/mi/$(DEPDIR)/test_mi-test_mi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/mi/test_mi.c' object='src/mi/test_mi-test_mi.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_mi_CFLAGS) $(CFLAGS) -c -o src/mi/test_mi-test_mi.obj `if test -f 'src/mi/test_mi.c'; then $(CYGPATH_W) 'src/mi/test_mi.c'; else $(CYGPATH_W) '$(srcdir)/src/mi/test_mi.c'; fi`
-
-src/test/test_proxy-test_proxy.o: src/test/test_proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -MT src/test/test_proxy-test_proxy.o -MD -MP -MF src/test/$(DEPDIR)/test_proxy-test_proxy.Tpo -c -o src/test/test_proxy-test_proxy.o `test -f 'src/test/test_proxy.c' || echo '$(srcdir)/'`src/test/test_proxy.c
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy-test_proxy.Tpo src/test/$(DEPDIR)/test_proxy-test_proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy.c' object='src/test/test_proxy-test_proxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy-test_proxy.o `test -f 'src/test/test_proxy.c' || echo '$(srcdir)/'`src/test/test_proxy.c
-
-src/test/test_proxy-test_proxy.obj: src/test/test_proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -MT src/test/test_proxy-test_proxy.obj -MD -MP -MF src/test/$(DEPDIR)/test_proxy-test_proxy.Tpo -c -o src/test/test_proxy-test_proxy.obj `if test -f 'src/test/test_proxy.c'; then $(CYGPATH_W) 'src/test/test_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy-test_proxy.Tpo src/test/$(DEPDIR)/test_proxy-test_proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy.c' object='src/test/test_proxy-test_proxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy-test_proxy.obj `if test -f 'src/test/test_proxy.c'; then $(CYGPATH_W) 'src/test/test_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy.c'; fi`
-
-src/test/test_proxy-test_proxy_clnt.o: src/test/test_proxy_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -MT src/test/test_proxy-test_proxy_clnt.o -MD -MP -MF src/test/$(DEPDIR)/test_proxy-test_proxy_clnt.Tpo -c -o src/test/test_proxy-test_proxy_clnt.o `test -f 'src/test/test_proxy_clnt.c' || echo '$(srcdir)/'`src/test/test_proxy_clnt.c
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy-test_proxy_clnt.Tpo src/test/$(DEPDIR)/test_proxy-test_proxy_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy_clnt.c' object='src/test/test_proxy-test_proxy_clnt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy-test_proxy_clnt.o `test -f 'src/test/test_proxy_clnt.c' || echo '$(srcdir)/'`src/test/test_proxy_clnt.c
-
-src/test/test_proxy-test_proxy_clnt.obj: src/test/test_proxy_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -MT src/test/test_proxy-test_proxy_clnt.obj -MD -MP -MF src/test/$(DEPDIR)/test_proxy-test_proxy_clnt.Tpo -c -o src/test/test_proxy-test_proxy_clnt.obj `if test -f 'src/test/test_proxy_clnt.c'; then $(CYGPATH_W) 'src/test/test_proxy_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy_clnt.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy-test_proxy_clnt.Tpo src/test/$(DEPDIR)/test_proxy-test_proxy_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy_clnt.c' object='src/test/test_proxy-test_proxy_clnt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy-test_proxy_clnt.obj `if test -f 'src/test/test_proxy_clnt.c'; then $(CYGPATH_W) 'src/test/test_proxy_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy_clnt.c'; fi`
-
-src/test/test_proxy_rev-test_proxy_rev.o: src/test/test_proxy_rev.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -MT src/test/test_proxy_rev-test_proxy_rev.o -MD -MP -MF src/test/$(DEPDIR)/test_proxy_rev-test_proxy_rev.Tpo -c -o src/test/test_proxy_rev-test_proxy_rev.o `test -f 'src/test/test_proxy_rev.c' || echo '$(srcdir)/'`src/test/test_proxy_rev.c
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy_rev-test_proxy_rev.Tpo src/test/$(DEPDIR)/test_proxy_rev-test_proxy_rev.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy_rev.c' object='src/test/test_proxy_rev-test_proxy_rev.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy_rev-test_proxy_rev.o `test -f 'src/test/test_proxy_rev.c' || echo '$(srcdir)/'`src/test/test_proxy_rev.c
-
-src/test/test_proxy_rev-test_proxy_rev.obj: src/test/test_proxy_rev.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -MT src/test/test_proxy_rev-test_proxy_rev.obj -MD -MP -MF src/test/$(DEPDIR)/test_proxy_rev-test_proxy_rev.Tpo -c -o src/test/test_proxy_rev-test_proxy_rev.obj `if test -f 'src/test/test_proxy_rev.c'; then $(CYGPATH_W) 'src/test/test_proxy_rev.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy_rev.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy_rev-test_proxy_rev.Tpo src/test/$(DEPDIR)/test_proxy_rev-test_proxy_rev.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy_rev.c' object='src/test/test_proxy_rev-test_proxy_rev.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy_rev-test_proxy_rev.obj `if test -f 'src/test/test_proxy_rev.c'; then $(CYGPATH_W) 'src/test/test_proxy_rev.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy_rev.c'; fi`
-
-src/test/test_proxy_rev-test_proxy_clnt.o: src/test/test_proxy_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -MT src/test/test_proxy_rev-test_proxy_clnt.o -MD -MP -MF src/test/$(DEPDIR)/test_proxy_rev-test_proxy_clnt.Tpo -c -o src/test/test_proxy_rev-test_proxy_clnt.o `test -f 'src/test/test_proxy_clnt.c' || echo '$(srcdir)/'`src/test/test_proxy_clnt.c
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy_rev-test_proxy_clnt.Tpo src/test/$(DEPDIR)/test_proxy_rev-test_proxy_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy_clnt.c' object='src/test/test_proxy_rev-test_proxy_clnt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy_rev-test_proxy_clnt.o `test -f 'src/test/test_proxy_clnt.c' || echo '$(srcdir)/'`src/test/test_proxy_clnt.c
-
-src/test/test_proxy_rev-test_proxy_clnt.obj: src/test/test_proxy_clnt.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -MT src/test/test_proxy_rev-test_proxy_clnt.obj -MD -MP -MF src/test/$(DEPDIR)/test_proxy_rev-test_proxy_clnt.Tpo -c -o src/test/test_proxy_rev-test_proxy_clnt.obj `if test -f 'src/test/test_proxy_clnt.c'; then $(CYGPATH_W) 'src/test/test_proxy_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy_clnt.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/test/$(DEPDIR)/test_proxy_rev-test_proxy_clnt.Tpo src/test/$(DEPDIR)/test_proxy_rev-test_proxy_clnt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/test/test_proxy_clnt.c' object='src/test/test_proxy_rev-test_proxy_clnt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_proxy_rev_CFLAGS) $(CFLAGS) -c -o src/test/test_proxy_rev-test_proxy_clnt.obj `if test -f 'src/test/test_proxy_clnt.c'; then $(CYGPATH_W) 'src/test/test_proxy_clnt.c'; else $(CYGPATH_W) '$(srcdir)/src/test/test_proxy_clnt.c'; fi`
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f src/client/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/client/$(am__dirstamp)
-	-rm -f src/impl/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/impl/$(am__dirstamp)
-	-rm -f src/mi/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/mi/$(am__dirstamp)
-	-rm -f src/server/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/server/$(am__dirstamp)
-	-rm -f src/test/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/test/$(am__dirstamp)
-	-rm -f src/utils/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/utils/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf src/client/$(DEPDIR) src/impl/$(DEPDIR) src/mi/$(DEPDIR) src/server/$(DEPDIR) src/test/$(DEPDIR) src/utils/$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf src/client/$(DEPDIR) src/impl/$(DEPDIR) src/mi/$(DEPDIR) src/server/$(DEPDIR) src/test/$(DEPDIR) src/utils/$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-binPROGRAMS \
-	clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

diff --git a/debug/org.eclipse.ptp.debug.sdm/NEWS b/debug/org.eclipse.ptp.debug.sdm/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/NEWS
+++ /dev/null


diff --git a/debug/org.eclipse.ptp.debug.sdm/README b/debug/org.eclipse.ptp.debug.sdm/README
deleted file mode 100644
index 3fdc3ff..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/README
+++ /dev/null

@@ -1,30 +0,0 @@
-This is the initial release of the PTP Scalable Debug Manager (SDM). The SDM is an 
-MPI-based client/server framework for controlling multiple distributed processes. The 
-primary purpose of this framework is to attach backend debuggers to the processes being 
-debugged, and to provide a library interface to control the debugging of these processes.
-
-Basic Installation
-==================
-
-The following steps are used to set up your build environment so that the executable
- will be correctly built and installed. In order to use the server binary, it needs to 
-be installed in a fragment that corresponds to the architecture of the machine 
-it will be run on. 
-
-1. Make sure you have checked out the fragment corresponding to your architecture. 
-   For example, if you're on a Linux x86 machine, you should have the fragment:
-
-		org.eclipse.ptp.linux.x86
-
-2. Run the following command IN THE FRAGMENT DIRECTORY to configure, build and 
-   install the project:
-   
-   		sh BUILD
-
-3. You can also use 'make' and 'make install' from this directory, either from
-   the command line, or from the 'Make Targets' view in Eclipse to 
-   build and install the executable into the fragment directory.
-
-4. If any of the automake/autoconf files changes, you should just need to
-   run 'make' and it will automatically regenerate the appropriate files.
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/about.html b/debug/org.eclipse.ptp.debug.sdm/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/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/debug/org.eclipse.ptp.debug.sdm/acinclude.m4 b/debug/org.eclipse.ptp.debug.sdm/acinclude.m4
deleted file mode 100644
index 279f37b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/acinclude.m4
+++ /dev/null

@@ -1,108 +0,0 @@
-dnl $Id: aclocal.m4,v 1.1 2005/08/18 23:38:29 gwatson Exp $
-dnl
-dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
-
-AC_PREREQ(2.50)dnl 2.50
-AC_DEFUN([AC_TEST_PACKAGE],[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
-
-AC_DEFUN([AC_TEST_PACKAGE_NEW],[
-AC_ARG_WITH($1,
-[  --with-$1=dir                use $1 in dir])
-AC_ARG_WITH($1-lib,
-[  --with-$1-lib=dir            use $1 libraries in dir],
-[if test "$withval" = "yes" -o "$withval" = "no"; then
-  AC_MSG_ERROR([No argument for --with-$1-lib])
-elif test "X$with_$1" = "X"; then
-  with_$1=yes
-fi])
-AC_ARG_WITH($1-include,
-[  --with-$1-include=dir        use $1 headers in dir],
-[if test "$withval" = "yes" -o "$withval" = "no"; then
-  AC_MSG_ERROR([No argument for --with-$1-include])
-elif test "X$with_$1" = "X"; then
-  with_$1=yes
-fi])
-
-AC_MSG_CHECKING(for $1)
-
-case "$with_$1" in
-yes)	;;
-no)	;;
-"")	;;
-*)	if test "$with_$1_include" = ""; then
-		with_$1_include="$with_$1/include $with_$1"
-	fi
-	if test "$with_$1_lib" = ""; then
-		with_$1_lib="$with_$1/lib$abilibdirext $with_$1"
-	fi
-	;;
-esac
-header_dirs=
-lib_dirs=
-d='$5'
-for i in /usr $d; do
-	header_dirs="$header_dirs $i/include"
-	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-done
-header_dirs="$header_dirs "'$5'
-lib_dirs="$lib_dirs "'$5'
-
-case "$with_$1_include" in
-yes) ;;
-no)  ;;
-*)   header_dirs="$with_$1_include $header_dirs";;
-esac
-case "$with_$1_lib" in
-yes) ;;
-no)  ;;
-*)   lib_dirs="$with_$1_lib $lib_dirs";;
-esac
-
-save_CFLAGS="$CFLAGS"
-save_LIBS="$LIBS"
-ires= lres=
-
-for i in $header_dirs; do
-	CFLAGS="-I$i $save_CFLAGS"
-	CFLAGS=`echo $CFLAGS | sed 's/$(TOP)/./g'`
-	AC_TRY_COMPILE([$2],,ires=$i;break)
-done
-for i in $lib_dirs; do
-	LIBS="-L$i $3 $4 $save_LIBS"
-	LIBS=`echo $LIBS | sed 's/$(TOP)/./g'`
-	AC_TRY_LINK([$2],,lres=$i;break)
-done
-CFLAGS="$save_CFLAGS"
-LIBS="$save_LIBS"
-
-if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
-	$1_includedir="$ires"
-	$1_libdir="$lres"
-	DIR_$1=
-	if test "$$1_includedir" != "/usr/include"; then
-		INCLUDE_$1="-I$$1_includedir"
-	fi
-	if test "$$1_libdir" != "/usr/lib"; then
-		LIB_$1="-L$$1_libdir $3"
-	else
-		LIB_$1="$3"
-	fi
-	m4_ifval([$6],
-		AC_DEFINE_UNQUOTED($6,1,[Define if you have the $1 package.]),
-		AC_DEFINE_UNQUOTED(upcase($1),1,[Define if you have the $1 package.]))
-	with_$1=yes
-	AC_MSG_RESULT([headers $ires, libraries $lres])
-else
-	DIR_$1="$1"
-	INCLUDE_$1=
-	LIB_$1=
-	with_$1=no
-	AC_MSG_RESULT($with_$1)
-fi
-dnl m4_ifval([$6],
-dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
-dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
-AC_SUBST(DIR_$1)
-AC_SUBST(INCLUDE_$1)
-AC_SUBST(LIB_$1)
-])

diff --git a/debug/org.eclipse.ptp.debug.sdm/aclocal.m4 b/debug/org.eclipse.ptp.debug.sdm/aclocal.m4
deleted file mode 100644
index 5d6a272..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/aclocal.m4
+++ /dev/null

@@ -1,909 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
-
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([acinclude.m4])

diff --git a/debug/org.eclipse.ptp.debug.sdm/autogen.sh b/debug/org.eclipse.ptp.debug.sdm/autogen.sh
deleted file mode 100755
index 66f06a7..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/autogen.sh
+++ /dev/null

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-ACLOCAL=aclocal
-AUTOMAKE=automake
-AUTOCONF=autoconf
-
-autogen()
-{
-	echo "autogen in $1"
-	$ACLOCAL
-	$AUTOMAKE
-	$AUTOCONF
-}
-	
-DIRS="."
-
-for dir in $DIRS
-do
-	(cd $dir; autogen $dir)
-done
-
-exit 0

diff --git a/debug/org.eclipse.ptp.debug.sdm/build.properties b/debug/org.eclipse.ptp.debug.sdm/build.properties
deleted file mode 100644
index 0471410..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/build.properties
+++ /dev/null

@@ -1,126 +0,0 @@
-bin.includes = AUTHORS,\
-               COPYING,\
-               ChangeLog,\
-               INSTALL,\
-               Makefile.am,\
-               Makefile.in,\
-               NEWS,\
-               README,\
-               about.html,\
-               acinclude.m4,\
-               aclocal.m4,\
-               autogen.sh,\
-               compile,\
-               config.guess,\
-               config.h.in,\
-               config.status,\
-               config.sub,\
-               configure.in,\
-               configure,\
-               depcomp,\
-               include/,\
-               install-sh,\
-               libaif/,\
-               libtool,\
-               ltmain.sh,\
-               missing,\
-               META-INF/,\
-               src/client/client.c,\
-               src/client/client_cmds.c,\
-               src/client/client_interface.c,\
-               src/client/client_svr.c,\
-               src/client/startup.c,\
-               src/mi/CLICommand.c,\
-               src/mi/CLIOutput.c,\
-               src/mi/CLIOutput.h,\
-               src/mi/MI.h,\
-               src/mi/MIArg.c,\
-               src/mi/MIArg.h,\
-               src/mi/MIBreakCommand.c,\
-               src/mi/MIBreakpoint.c,\
-               src/mi/MIBreakpoint.h,\
-               src/mi/MICommand.c,\
-               src/mi/MICommand.h,\
-               src/mi/MIError.c,\
-               src/mi/MIError.h,\
-               src/mi/MIEvent.c,\
-               src/mi/MIEvent.h,\
-               src/mi/MIExecCommand.c,\
-               src/mi/MIFrame.c,\
-               src/mi/MIFrame.h,\
-               src/mi/MIGDBCommand.c,\
-               src/mi/MIMemory.c,\
-               src/mi/MIMemory.h,\
-               src/mi/MIMemoryCommand.c,\
-               src/mi/MIOOBRecord.c,\
-               src/mi/MIOutput.c,\
-               src/mi/MIOOBRecord.h,\
-               src/mi/MIOutput.h,\
-               src/mi/MIParser.c,\
-               src/mi/MIResult.c,\
-               src/mi/MIResult.h,\
-               src/mi/MIResultRecord.c,\
-               src/mi/MIResultRecord.h,\
-               src/mi/MISession.c,\
-               src/mi/MISession.h,\
-               src/mi/MIStackCommand.c,\
-               src/mi/MIString.c,\
-               src/mi/MIString.h,\
-               src/mi/MIThread.c,\
-               src/mi/MIThread.h,\
-               src/mi/MIThreadCommand.c,\
-               src/mi/MIValue.c,\
-               src/mi/MIValue.h,\
-               src/mi/MIVar.c,\
-               src/mi/MIVar.h,\
-               src/mi/MIVarCommand.c,\
-               src/mi/test_mi.c,\
-               src/mi/test.input,\
-               src/server/backend.c,\
-               src/server/gdbmi_backend.c,\
-               src/server/server.c,\
-               src/server/server_cmds.c,\
-               src/server/test_backend.c,\
-               src/test/test_proxy.c,\
-               src/test/test_proxy_clnt.c,\
-               src/test/test_proxy_rev.c,\
-               src/test/test_proxy_svr.c,\
-               src/utils/breakpoint.c,\
-               src/utils/debug.c,\
-               src/utils/error.c,\
-               src/utils/event.c,\
-               src/utils/itimer.c,\
-               src/utils/memoryinfo.c,\
-               src/utils/runtime.c,\
-               src/utils/signalinfo.c,\
-               src/utils/stackframe.c,\
-               src/impl/sdm.c,\
-               src/impl/sdm_aggregate_hash.c,\
-               src/impl/sdm_hello_proto.c,\
-               src/impl/sdm_message_ompi.c,\
-               src/impl/sdm_message_tcpip.c,\
-               src/impl/sdm_route_tree.c,\
-               src/impl/sdm_routing_table_file.c,\
-               src/impl/sdm_set_bitset.c,\
-               src/utils/serdes.c
-bin.excludes = libaif/.deps/,\
-               libaif/.cvsignore,\
-               libaif/doc/.cvsignore,\
-               libaif/libaif_a-util.o,\
-               libaif/libaif_a-struct.o,\
-               libaif/libaif_a-print.o,\
-               libaif/libaif_a-io.o,\
-               libaif/libaif_a-fds.o,\
-               libaif/libaif_a-error.o,\
-               libaif/libaif_a-conv.o,\
-               libaif/libaif_a-cmp.o,\
-               libaif/libaif_a-calc.o,\
-               libaif/libaif_a-array.o,\
-               libaif/libaif_a-aif.o,\
-               libaif/libaif.a,\
-               libaif/Makefile,\
-               libaif/config.log,\
-               libaif/config.h,\
-               libaif/stamp-h1,\
-               libaif/testaif,\
-               libaif/testaif-testaif.o

diff --git a/debug/org.eclipse.ptp.debug.sdm/compile b/debug/org.eclipse.ptp.debug.sdm/compile
deleted file mode 100755
index a81e000..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/compile
+++ /dev/null

@@ -1,136 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-	*.o | *.obj)
-	  ;;
-	*)
-	  args="$args -o $ofile"
-	  ofile=
-	  ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/config.guess b/debug/org.eclipse.ptp.debug.sdm/config.guess
deleted file mode 100755
index f4f7772..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/config.guess
+++ /dev/null

@@ -1,1321 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-04'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
-		fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-	CPU=mipsel 
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif 
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-		echo i386-${UNAME_MACHINE}-nto-qnx
-	else
-		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	fi
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/config.h.in b/debug/org.eclipse.ptp.debug.sdm/config.h.in
deleted file mode 100644
index 868f423..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/config.h.in
+++ /dev/null

@@ -1,136 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-#define DEBUG
-#ifdef DEBUG
-extern int debug_level;
-extern void debug_printf(int, char *, ...);
-#define DEBUG_LEVEL_NONE	0x00
-#define DEBUG_LEVEL_ALL		0xff
-#define DEBUG_LEVEL_STARTUP	0x01
-#define DEBUG_LEVEL_CLIENT	0x02
-#define DEBUG_LEVEL_SERVER	0x04
-#define DEBUG_LEVEL_BACKEND	0x08
-#define TEST_DEBUG_LEVEL(level)			((debug_level&(level))==(level))
-#define DEBUG_PRINTF(level,format,...)	debug_printf((level),(format),__VA_ARGS__)
-#define DEBUG_PRINTS(level,str)			debug_printf((level),"%s",(str))
-#else /* DEBUG */
-#define DEBUG_PRINTF(level,format,...)
-#define DEBUG_PRINTS(level,str)
-#endif /* DEBUG */
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* Define to 1 if you have the `gethostname' function. */
-#undef HAVE_GETHOSTNAME
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <jni.h> header file. */
-#undef HAVE_JNI_H
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define to 1 if you have the `posix4' library (-lposix4). */
-#undef HAVE_LIBPOSIX4
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#undef HAVE_LIBUTILS
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* System has openpty() function. */
-#undef HAVE_OPENPTY
-
-/* Define to 1 if you have the `select' function. */
-#undef HAVE_SELECT
-
-/* Define to 1 if you have the `sighold' function. */
-#undef HAVE_SIGHOLD
-
-/* Define to 1 if you have the `sigrelse' function. */
-#undef HAVE_SIGRELSE
-
-/* Define to 1 if you have the `sigset' function. */
-#undef HAVE_SIGSET
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtoul' function. */
-#undef HAVE_STRTOUL
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Enable POSIX support in Guard. */
-#undef POSIX
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Version number of package */
-#undef VERSION

diff --git a/debug/org.eclipse.ptp.debug.sdm/config.sub b/debug/org.eclipse.ptp.debug.sdm/config.sub
deleted file mode 100755
index f365797..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/config.sub
+++ /dev/null

@@ -1,1443 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-07'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 | mipsisa64 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-        sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/configure b/debug/org.eclipse.ptp.debug.sdm/configure
deleted file mode 100755
index 5616ec7..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/configure
+++ /dev/null

@@ -1,7252 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for org.eclipse.ptp.debug.sdm 2.1.4.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='org.eclipse.ptp.debug.sdm'
-PACKAGE_TARNAME='org-eclipse-ptp-debug-sdm'
-PACKAGE_VERSION='2.1.4'
-PACKAGE_STRING='org.eclipse.ptp.debug.sdm 2.1.4'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="src/client/client.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-SVR_LIBS
-CLNT_LIBS
-CPP
-GREP
-EGREP
-PTPDBGJNI_TRUE
-PTPDBGJNI_FALSE
-LIBOBJS
-subdirs
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-ac_subdirs_all='libaif'
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures org.eclipse.ptp.debug.sdm 2.1.4 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/org-eclipse-ptp-debug-sdm]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of org.eclipse.ptp.debug.sdm 2.1.4:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-org.eclipse.ptp.debug.sdm configure 2.1.4
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by org.eclipse.ptp.debug.sdm $as_me 2.1.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='org-eclipse-ptp-debug-sdm'
- VERSION='2.1.4'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		{ { echo "$as_me:$LINENO: error: utils directory not found" >&5
-echo "$as_me: error: utils directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		{ { echo "$as_me:$LINENO: error: proxy directory not found" >&5
-echo "$as_me: error: proxy directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-        CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-        CFLAGS="$CFLAGS -Wall"
-fi
-
-CFLAGS="$CFLAGS -I$UTILS/include -I$PROXY/include"
-LIBS="$LIBS -L$UTILS -L$PROXY"
-
-
-
-
-{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostbyname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char socket ();
-int
-main ()
-{
-return socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_socket_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_socket=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
-if test $ac_cv_lib_socket_socket = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
-  LIBS="-lsocket $LIBS"
-
-fi
-
-{ echo "$as_me:$LINENO: checking for library containing openpty" >&5
-echo $ECHO_N "checking for library containing openpty... $ECHO_C" >&6; }
-if test "${ac_cv_search_openpty+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char openpty ();
-int
-main ()
-{
-return openpty ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' util; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_openpty=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_openpty+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_openpty+set}" = set; then
-  :
-else
-  ac_cv_search_openpty=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_openpty" >&5
-echo "${ECHO_T}$ac_cv_search_openpty" >&6; }
-ac_res=$ac_cv_search_openpty
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OPENPTY 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for bitset_new in -lutils" >&5
-echo $ECHO_N "checking for bitset_new in -lutils... $ECHO_C" >&6; }
-if test "${ac_cv_lib_utils_bitset_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutils  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bitset_new ();
-int
-main ()
-{
-return bitset_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_utils_bitset_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_utils_bitset_new=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_utils_bitset_new" >&5
-echo "${ECHO_T}$ac_cv_lib_utils_bitset_new" >&6; }
-if test $ac_cv_lib_utils_bitset_new = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTILS 1
-_ACEOF
-
-  LIBS="-lutils $LIBS"
-
-fi
-
-{ echo "$as_me:$LINENO: checking for proxy_svr_init in -lproxysvr" >&5
-echo $ECHO_N "checking for proxy_svr_init in -lproxysvr... $ECHO_C" >&6; }
-if test "${ac_cv_lib_proxysvr_proxy_svr_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lproxysvr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char proxy_svr_init ();
-int
-main ()
-{
-return proxy_svr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_proxysvr_proxy_svr_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_proxysvr_proxy_svr_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_proxysvr_proxy_svr_init" >&5
-echo "${ECHO_T}$ac_cv_lib_proxysvr_proxy_svr_init" >&6; }
-if test $ac_cv_lib_proxysvr_proxy_svr_init = yes; then
-  SVR_LIBS="$SVR_LIBS -lproxysvr"
-fi
-
-
-{ echo "$as_me:$LINENO: checking for proxy_clnt_init in -lproxyclnt" >&5
-echo $ECHO_N "checking for proxy_clnt_init in -lproxyclnt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_proxyclnt_proxy_clnt_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lproxyclnt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char proxy_clnt_init ();
-int
-main ()
-{
-return proxy_clnt_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_proxyclnt_proxy_clnt_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_proxyclnt_proxy_clnt_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_proxyclnt_proxy_clnt_init" >&5
-echo "${ECHO_T}$ac_cv_lib_proxyclnt_proxy_clnt_init" >&6; }
-if test $ac_cv_lib_proxyclnt_proxy_clnt_init = yes; then
-  CLNT_LIBS="$CLNT_LIBS -lproxyclnt"
-fi
-
-
-
-
-{ echo "$as_me:$LINENO: checking for clock_gettime in -lposix4" >&5
-echo $ECHO_N "checking for clock_gettime in -lposix4... $ECHO_C" >&6; }
-if test "${ac_cv_lib_posix4_clock_gettime+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix4  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_posix4_clock_gettime=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_posix4_clock_gettime=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_clock_gettime" >&5
-echo "${ECHO_T}$ac_cv_lib_posix4_clock_gettime" >&6; }
-if test $ac_cv_lib_posix4_clock_gettime = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPOSIX4 1
-_ACEOF
-
-  LIBS="-lposix4 $LIBS"
-
-fi
-
-if test "$ac_cv_lib_posix4_clock_gettime" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define POSIX 1
-_ACEOF
-
-	LIBS="$LIBS -lposix4"
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-for ac_header in strings.h sys/time.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in jni.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
- if test "$ac_cv_header_jni_h" = yes; then
-  PTPDBGJNI_TRUE=
-  PTPDBGJNI_FALSE='#'
-else
-  PTPDBGJNI_TRUE='#'
-  PTPDBGJNI_FALSE=
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_time=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_time=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
-				     int *p = &tm.tm_sec;
- 				     return !p;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_struct_tm=time.h
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_struct_tm=sys/time.h
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
-
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_memcmp_working=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-  /* Some versions of memcmp are not 8-bit clean.  */
-  char c0 = '\100', c1 = '\200', c2 = '\201';
-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    return 1;
-
-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-     or more and with at least one buffer not starting on a 4-byte boundary.
-     William Lewis provided this test program.   */
-  {
-    char foo[21];
-    char bar[21];
-    int i;
-    for (i = 0; i < 4; i++)
-      {
-	char *a = foo + i;
-	char *b = bar + i;
-	strcpy (a, "--------01111111");
-	strcpy (b, "--------10000000");
-	if (memcmp (a, b, 16) >= 0)
-	  return 1;
-      }
-    return 0;
-  }
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_memcmp_working=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-  *" memcmp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
- ;;
-esac
-
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-
-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func__doprnt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
-
-fi
-
-fi
-done
-
-
-
-
-
-
-
-
-
-
-for ac_func in gethostname select strdup strstr strtoul sigset sighold sigrelse
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-ac_config_files="$ac_config_files Makefile"
-
-subdirs="$subdirs libaif"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${PTPDBGJNI_TRUE}" && test -z "${PTPDBGJNI_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"PTPDBGJNI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PTPDBGJNI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by org.eclipse.ptp.debug.sdm $as_me 2.1.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-org.eclipse.ptp.debug.sdm config.status 2.1.4
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-SVR_LIBS!$SVR_LIBS$ac_delim
-CLNT_LIBS!$CLNT_LIBS$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-PTPDBGJNI_TRUE!$PTPDBGJNI_TRUE$ac_delim
-PTPDBGJNI_FALSE!$PTPDBGJNI_FALSE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-subdirs!$subdirs$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    echo "$as_me:$LINENO: $ac_msg" >&5
-    echo "$ac_msg" >&6
-    { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-    cd "$ac_dir"
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
-    else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative name.
-	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-      esac
-
-      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd "$ac_popdir"
-  done
-fi
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/configure.in b/debug/org.eclipse.ptp.debug.sdm/configure.in
deleted file mode 100644
index 0b00503..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/configure.in
+++ /dev/null

@@ -1,122 +0,0 @@
-dnl
-dnl
-
-AC_PREREQ(2.50)
-
-AC_INIT(org.eclipse.ptp.debug.sdm, 2.1.4)
-AC_CONFIG_SRCDIR(src/client/client.c)
-
-AM_INIT_AUTOMAKE([subdir-objects])
-
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_BUILD
-
-dnl
-dnl Eclipse adds version number to end of package when deploying via update site
-dnl
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		AC_MSG_ERROR([utils directory not found])
-	fi
-fi
-
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		AC_MSG_ERROR([proxy directory not found])
-	fi
-fi
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-        CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-        CFLAGS="$CFLAGS -Wall"
-fi
-
-CFLAGS="$CFLAGS -I$UTILS/include -I$PROXY/include"
-LIBS="$LIBS -L$UTILS -L$PROXY"
-
-dnl
-dnl Check for libraries.
-dnl
-
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(socket, socket)
-AC_SEARCH_LIBS(openpty, [util],
-	[AC_DEFINE(HAVE_OPENPTY, 1, [System has openpty() function.])])dnl
-
-AC_CHECK_LIB(utils, bitset_new)
-AC_CHECK_LIB(proxysvr, proxy_svr_init, [SVR_LIBS="$SVR_LIBS -lproxysvr"])
-AC_SUBST([SVR_LIBS])
-AC_CHECK_LIB(proxyclnt, proxy_clnt_init, [CLNT_LIBS="$CLNT_LIBS -lproxyclnt"])
-AC_SUBST([CLNT_LIBS])
-
-dnl Check for posix4
-AC_CHECK_LIB(posix4, clock_gettime)
-if test "$ac_cv_lib_posix4_clock_gettime" = yes; then
-	AC_DEFINE(POSIX, 1, [Enable POSIX support in Guard.])
-	LIBS="$LIBS -lposix4"
-fi
-
-dnl
-dnl Check for header files.
-dnl
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS(strings.h sys/time.h unistd.h)
-AC_CHECK_HEADERS(jni.h)
-AM_CONDITIONAL(PTPDBGJNI, [test "$ac_cv_header_jni_h" = yes])
-
-dnl
-dnl Check for typedefs, structures, and compiler characteristics.
-dnl
-
-AC_HEADER_TIME
-AC_STRUCT_TM
-
-dnl
-dnl Check for library functions.
-dnl
-
-AC_FUNC_MEMCMP
-AC_TYPE_SIGNAL
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(gethostname select strdup strstr strtoul sigset sighold sigrelse)
-
-AH_VERBATIM([DEBUG],
-[#define DEBUG
-#ifdef DEBUG
-extern int debug_level;
-extern void debug_printf(int, char *, ...);
-#define DEBUG_LEVEL_NONE	0x00
-#define DEBUG_LEVEL_ALL		0xff
-#define DEBUG_LEVEL_STARTUP	0x01
-#define DEBUG_LEVEL_CLIENT	0x02
-#define DEBUG_LEVEL_SERVER	0x04
-#define DEBUG_LEVEL_BACKEND	0x08
-#define TEST_DEBUG_LEVEL(level)			((debug_level&(level))==(level))
-#define DEBUG_PRINTF(level,format,...)	debug_printf((level),(format),__VA_ARGS__)
-#define DEBUG_PRINTS(level,str)			debug_printf((level),"%s",(str))
-#else /* DEBUG */
-#define DEBUG_PRINTF(level,format,...)
-#define DEBUG_PRINTS(level,str)
-#endif /* DEBUG */])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_SUBDIRS([libaif])
-AC_OUTPUT

diff --git a/debug/org.eclipse.ptp.debug.sdm/depcomp b/debug/org.eclipse.ptp.debug.sdm/depcomp
deleted file mode 100755
index 11e2d3b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/depcomp
+++ /dev/null

@@ -1,522 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2004-05-31.23
-
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit 0
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/backend.h b/debug/org.eclipse.ptp.debug.sdm/include/backend.h
deleted file mode 100644
index 831cc1a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/backend.h
+++ /dev/null

@@ -1,81 +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
- ******************************************************************************/
- 
-#ifndef _BACKEND_H_
-#define _BACKEND_H_
-
-#include <stdarg.h>
- 
-#include "bitset.h"
-#include "breakpoint.h"
-#include "stackframe.h"
-#include "memoryinfo.h"
-#include "dbg_event.h"
-
-struct dbg_backend_funcs {
-	int (*init)(void (*)(dbg_event *));
-	int (*progress)(void);
-	int (*interrupt)(void);
-	int (*start_session)(char *, char *, char *, char *, char **, char **, long);
-	int (*setlinebreakpoint)(int, int, int, char *, int, char *, int, int);
-	int (*setfuncbreakpoint)(int, int, int, char *, char *, char *, int, int);
-	int (*deletebreakpoint)(int);
-	int (*enablebreakpoint)(int);
-	int (*disablebreakpoint)(int);
-	int (*conditionbreakpoint)(int, char *);
-	int (*breakpointafter)(int, int);
-	int (*setwatchpoint)(int, char *, int, int, char *, int);
-	int (*go)(void);
-	int (*step)(int, int);
-	int (*terminate)(void);
-	int (*liststackframes)(int, int);
-	int (*setcurrentstackframe)(int);
-	int (*evaluateexpression)(char *);
-	int (*gettype)(char *);
-	int (*listlocalvariables)(void);
-	int (*listarguments)(int, int);
-	int (*listglobalvariables)(void);
-	int (*listinfothreads)(void);
-	int (*setthreadselect)(int);
-	int (*stackinfodepth)(void);
-	int	(*datareadmemory)(long, char*, char*, int, int, int, char*);
-	int	(*datawritememory)(long, char*, char*, int, char*);
-	int (*listsignals)(char*);
-	int (*signalinfo)(char*); /* deprecated */
-	int (*clihandle)(char*);
-	int (*dataevaluateexpression)(char*); /* deprecated */
-	int (*getpartialaif)(char*, char*, int, int);
-	int (*variabledelete)(char*);
-	int (*quit)(void);
-};
-typedef struct dbg_backend_funcs	dbg_backend_funcs;
-
-struct dbg_backend {
-	char *						db_name;
-	struct dbg_backend_funcs *	db_funcs;
-	char *						db_exe_path;
-};
-typedef struct dbg_backend	dbg_backend;
-
-extern dbg_backend 	dbg_backends[];
-
-extern int	find_dbg_backend(char *, dbg_backend **);
-extern void	backend_set_path(dbg_backend *, char *);
-
-#endif /* _BACKEND_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/breakpoint.h b/debug/org.eclipse.ptp.debug.sdm/include/breakpoint.h
deleted file mode 100644
index 52fade9..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/breakpoint.h
+++ /dev/null

@@ -1,43 +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
- ******************************************************************************/
- 
-#ifndef _BREAKPOINT_H_
-#define _BREAKPOINT_H_
-
-#include "location.h"
-#include "list.h"
-
-struct breakpoint {
-	int			id;
-	int			ignore;
-	int			special;
-	int			deleted;
-	char *		type;
-	location		loc;
-	int			hits;
-};
-typedef struct breakpoint breakpoint;
-
-extern breakpoint *	NewBreakpoint(int);
-extern void			FreeBreakpoint(breakpoint *);
-extern breakpoint *	CopyBreakpoint(breakpoint *);
-extern void			AddBreakpoint(List *, breakpoint *);
-extern void			RemoveBreakpoint(List *, int);
-extern breakpoint *	FindBreakpoint(List *, int);
-#endif /* _BREAKPOINT_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/dbg.h b/debug/org.eclipse.ptp.debug.sdm/include/dbg.h
deleted file mode 100644
index 121fa72..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/dbg.h
+++ /dev/null

@@ -1,129 +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
- ******************************************************************************/
- 
-#ifndef _DBG_H_
-#define _DBG_H_
-
-#include <stdarg.h>
-
-#include "session.h"
-#include "bitset.h"
-#include "breakpoint.h"
-#include "stackframe.h"
-#include "memoryinfo.h"
-#include "dbg_error.h"
-#include "dbg_event.h"
-#include "list.h"
-#include "proxy.h"
-
-#define DBGRES_OK			PROXY_RES_OK
-#define DBGRES_ERR			PROXY_RES_ERR
-
-/*
- * Session control
- */
-int 	DbgInit(session **, char *, char *, ...);
-int		DbgConnect(session *);
-int		DbgCreate(session *);
-void 	DbgRegisterEventHandler(session *, void (*)(dbg_event *, void *), void *);
-int 	DbgStartSession(session *, char *, char *, char *);
-int 	DbgQuit(session *);
-
-/*
- * Breakpoint operations
- */
-int		DbgSetLineBreakpoint(session *s, bitset *set, int bpid, char *file, int line);
-int 	DbgSetFuncBreakpoint(session *s, bitset *set, int bpid, char *file, char *func);
-int 	DbgDeleteBreakpoint(session *s, bitset *set, int bpid);
-
-/*
- * Process control operations
- */
-int 	DbgGo(session *s, bitset *set);
-int 	DbgStep(session *s, bitset *set, int count, int type);
-int 	DbgTerminate(session *s, bitset *set);
-int 	DbgSuspend(session *s, bitset *set);
-
-/*
- * Stack frame operations
- */
-int 	DbgListStackframes(session *s, bitset *set, int low, int high);
-int 	DbgSetCurrentStackframe(session *s, bitset *set, int level);
-
-/*
- * Expression/variable operations
- */
-int 	DbgEvaluateExpression(session *s, bitset *set, char *exp);
-int 	DbgGetType(session *s, bitset *set, char *exp);
-int 	DbgListLocalVariables(session *s, bitset *set);
-int 	DbgListArguments(session *s, bitset *set, int, int);
-int 	DbgListGlobalVariables(session *s, bitset *set);
-
-/**
- * Thread operations
- */
-int 	DbgListInfoThreads(session *s, bitset *set);
-int 	DbgSetThreadSelect(session *s, bitset *set, int);
-int		DbgStackInfoDepth(session *s, bitset *set);
-
-/**
- * Memory operations
- */
-int 	DbgDataReadMemory(session *s, bitset *set, long, char*, char*, int, int, int, char*);
-int 	DbgDataWriteMemory(session *s, bitset *set, long, char*, char*, int, char*);
-
-/*
- * Event Handling
- */
-int 	DbgProgress(session *);
-void 	DbgRegisterReadFileHandler(session *s, int, int (*)(int, void *), void *);
-void 	DbgRegisterWriteFileHandler(session *s, int, int (*)(int, void *), void *);
-void 	DbgRegisterExceptFileHandler(session *s, int, int (*)(int, void *), void *);
-void	DbgUnregisterFileHandler(session *s, int);
-void 	DbgRegisterEventHandler(session *s, void (*)(dbg_event *, void *), void *);
-
-/*
- * Error Handling
- */
-void	DbgSetError(int, char *);
-int		DbgGetError(void);
-char *	DbgGetErrorStr(void);
-
-/*
- * CLI Handling
- */
-int 	DbgCLIHandle(session *s, bitset *set, char*);
-
-/*
- * Signal operations
- */
-int 	DbgListSignals(session *s, bitset *set, char*);
-int 	DbgSignalInfo(session *s, bitset *set, char*);
-
-/*
- * New functions
- */
-int 	DbgDataEvaluteExpression(session *s, bitset *set, char*);
-int 	DbgVariableCreate(session *s, bitset *set, char*);
-int 	DbgVariableDelete(session *s, bitset *set, char*);
-int 	DbgVariableUpdate(session *s, bitset *set, char*);
-int 	DbgGetPrtialAIF(session *s, bitset *set, char*, char *, int, int);
-int 	DbgGetAIFValue(session *s, bitset *set, char*);
-
-#endif /* _DBG_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/dbg_client.h b/debug/org.eclipse.ptp.debug.sdm/include/dbg_client.h
deleted file mode 100644
index 9b22fe1..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/dbg_client.h
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California.
- * This material was produced under U.S. Government contract W-7405-ENG-36
- * for Los Alamos National Laboratory, which is operated by the University
- * of California for the U.S. Department of Energy. The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified
- * to produce derivative works, such modified software should be clearly  
- * marked, so as not to confuse it with the version available from LANL.
- *
- * Additionally, this program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * LA-CC 04-115
- ******************************************************************************/
- 
-#ifndef _DBG_CLIENT_H_
-#define _DBG_CLIENT_H_
-
-#include "bitset.h"
-#include "breakpoint.h"
-#include "stackframe.h"
-#include "dbg_event.h"
-#include "proxy.h"
-
-/*
- * Session control
- */
-int 	DbgClntInit(int, int, char *, proxy_svr_helper_funcs *, proxy_commands *);
-int 	DbgClntCreateSession(int, char *, int);
-int 	DbgClntStartSession(int, int, char **);
-int 	DbgClntQuit(int, int, char **);
-int 	DbgClntIsShutdown(void);
-void 	DbgClntFinish(void);
-
-/*
- * Breakpoint operations
- */
-int 	DbgClntSetLineBreakpoint(int, int, char **);
-int 	DbgClntSetFuncBreakpoint(int, int, char **);
-int 	DbgClntDeleteBreakpoint(int, int, char **);
-int 	DbgClntEnableBreakpoint(int, int, char **);
-int 	DbgClntDisableBreakpoint(int, int, char **);
-int 	DbgClntConditionBreakpoint(int, int, char **);
-int 	DbgClntBreakpointAfter(int, int, char **);
-int 	DbgClntSetWatchpoint(int, int, char **);
-
-/*
- * Process control operations
- */
-int 	DbgClntGo(int, int, char **);
-int 	DbgClntStep(int, int, char **);
-int 	DbgClntTerminate(int, int, char **);
-int 	DbgClntSuspend(int, int, char **);
-
-/*
- * Stack frame operations
- */
-int 	DbgClntListStackframes(int, int, char **);
-int 	DbgClntSetCurrentStackframe(int, int, char **);
-
-/*
- * Expression/variable operations
- */
-int 	DbgClntEvaluateExpression(int, int, char **);
-int 	DbgClntGetType(int, int, char **);
-int 	DbgClntListLocalVariables(int, int, char **);
-int 	DbgClntListArguments(int, int, char **);
-int 	DbgClntListGlobalVariables(int, int, char **);
-
-/**
- * Thread operations
- */
-int 	DbgClntListInfoThreads(int, int, char **);
-int 	DbgClntSetThreadSelect(int, int, char **);
-
-int 	DbgClntStackInfoDepth(int, int, char **);
-
-/**
- * Thread operations
- */
-int 	DbgClntDataReadMemory(int, int, char **);
-int 	DbgClntDataWriteMemory(int, int, char **);
-
-/*
- * Event Handling
- */
-int 	DbgClntProgress(void);
-void 	DbgClntRegisterReadFileHandler(int, int (*)(int, void *), void *);
-void	DbgClntRegisterWriteFileHandler(int, int (*)(int, void *), void *);
-void 	DbgClntRegisterExceptFileHandler(int, int (*)(int, void *), void *);
-void 	DbgClntUnregisterFileHandler(int);
-void 	DbgClntRegisterEventHandler(void (*)(dbg_event *, void *), void *);
-
-/*
- * Error Handling
- */
-void	DbgClntSetError(int, char *);
-int		DbgClntGetError(void);
-char *	DbgClntGetErrorStr(void);
-
-/*
- * CLI Handling
- */
-int		DbgClntCLIHandle(int, int, char **);
-
-/**
- * Signal operations
- */
-int 	DbgClntListSignals(int, int, char **);
-int 	DbgClntSignalInfo(int, int, char **);
-
-int 	DbgClntDataEvaluateExpression(int, int, char **);
-int 	DbgClntGetPartialAIF(int, int, char **);
-int 	DbgClntVariableDelete(int, int, char **);
-
-#endif /* _DBG_CLIENT_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/dbg_error.h b/debug/org.eclipse.ptp.debug.sdm/include/dbg_error.h
deleted file mode 100644
index ab74274..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/dbg_error.h
+++ /dev/null

@@ -1,70 +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
- ******************************************************************************/
- 
-#ifndef _DBG_ERROR_H_
-#define _DBG_ERROR_H_
-
-#define DBGERR_NOTIMP			1
-#define DBGERR_PROXY_TERM		2
-#define DBGERR_PROXY_PROTO		3
-#define DBGERR_DEBUGGER			4
-#define DBGERR_NOBACKEND		5
-#define DBGERR_INPROGRESS		6
-#define DBGERR_CBCREATE			7
-#define DBGERR_NOSESSION		8
-#define DBGERR_SESSION			9
-#define DBGERR_NOLINE			10
-#define DBGERR_NOFUNC			11
-#define DBGERR_NOFILE			12
-#define DBGERR_NOBP				13
-#define DBGERR_NOSYM			14
-#define DBGERR_NOMEM			15
-#define DBGERR_CANTRUN			16
-#define DBGERR_INVOKE			17
-#define DBGERR_ISRUNNING		18
-#define DBGERR_NOTRUN			19
-#define DBGERR_FIRSTFRAME		20
-#define DBGERR_LASTFRAME		21
-#define DBGERR_BADBPARG			22
-#define DBGERR_REGEX			23
-#define DBGERR_NOSTACK			24
-#define DBGERR_OUTOFRANGE		25
-#define DBGERR_NOFILEDIR		26
-#define DBGERR_NOSYMS			27
-#define DBGERR_TEMP				28
-#define DBGERR_PIPE				29
-#define DBGERR_FORK				30
-#define DBGERR_SYSTEM			31
-#define DBGERR_NOTEXEC			32
-#define DBGERR_CHDIR			33
-#define DBGERR_SOURCE			34
-#define DBGERR_SETVAR			35
-#define DBGERR_PROCSET			36
-#define DBGERR_UNKNOWN			37
-#define DBGERR_UNKNOWN_TYPE		38
-#define DBGERR_UNKNOWN_VARIABLE	39
-/* REMEBER TO ADD NEW ERRORS TO utils/error.c! */
-/*
- * Error Handling
- */
-void	DbgSetError(int, char *);
-int		DbgGetError(void);
-char *	DbgGetErrorStr(void);
-
-#endif /* _DBG_ERROR_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/dbg_event.h b/debug/org.eclipse.ptp.debug.sdm/include/dbg_event.h
deleted file mode 100644
index 1171e4b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/dbg_event.h
+++ /dev/null

@@ -1,213 +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
- ******************************************************************************/
-
-#ifndef _DBG_EVENT_H_
-#define _DBG_EVENT_H_
-
-#include <aif.h>
-
-#include "breakpoint.h"
-#include "stackframe.h"
-#include "memoryinfo.h"
-#include "signalinfo.h"
-#include "bitset.h"
-#include "list.h"
-#include "proxy_msg.h"
-
-#define DBG_EV_WAITALL	0
-#define DBG_EV_WAITSOME	100000
-
-#define DBG_EV_OFFSET		100
-#define DBGEV_EXIT			DBG_EV_OFFSET + 2
-#define 	DBGEV_EXIT_NORMAL	0
-#define 	DBGEV_EXIT_SIGNAL	1
-#define DBGEV_BPSET			DBG_EV_OFFSET + 4
-#define DBGEV_FRAMES		DBG_EV_OFFSET + 5
-#define DBGEV_DATA			DBG_EV_OFFSET + 6
-#define DBGEV_TYPE			DBG_EV_OFFSET + 7
-#define DBGEV_VARS			DBG_EV_OFFSET + 8
-#define DBGEV_ARGS			DBG_EV_OFFSET + 9
-#define DBGEV_INIT			DBG_EV_OFFSET + 10 /* deprecated */
-#define DBGEV_OK			DBG_EV_OFFSET + 11
-#define DBGEV_ERROR			DBG_EV_OFFSET + 12
-#define DBGEV_SUSPEND		DBG_EV_OFFSET + 13
-#define 	DBGEV_SUSPEND_BPHIT		0
-#define 	DBGEV_SUSPEND_SIGNAL	1
-#define 	DBGEV_SUSPEND_STEP		2
-#define 	DBGEV_SUSPEND_INT		3
-#define DBGEV_THREADS		DBG_EV_OFFSET + 14
-#define DBGEV_THREAD_SELECT	DBG_EV_OFFSET + 15
-#define DBGEV_STACK_DEPTH	DBG_EV_OFFSET + 16
-#define DBGEV_DATAR_MEM		DBG_EV_OFFSET + 17
-#define DBGEV_DATAW_MEM		DBG_EV_OFFSET + 18
-#define DBGEV_SIGNALS		DBG_EV_OFFSET + 19
-
-#define DBGEV_DATA_EVA_EX	DBG_EV_OFFSET + 20 /* deprecated */
-#define DBGEV_PARTIAL_AIF	DBG_EV_OFFSET + 21
-
-
-struct dbg_suspend_event {
-	int	reason;
-
-	union {
-		int				bpid;	/* DBGEV_SUSPEND_BPHIT */
-		signalinfo *	sig;	/* DBGEV_SUSPEND_SIGNAL */
-	} ev_u;
-
-	int				thread_id;
-	stackframe *	frame;
-	int				depth;
-
-	List *			changed_vars;
-};
-typedef struct dbg_suspend_event	dbg_suspend_event;
-
-struct dbg_exit_event {
-	int	reason;
-
-	union {
-		int				exit_status;	/* DBGEV_EXIT_NORMAL */
-		signalinfo *	sig;			/* DBGEV_EXIT_SIGNAL */
-	} ev_u;
-};
-typedef struct dbg_exit_event	dbg_exit_event;
-
-struct dbg_error_event {
-	int		error_code;
-	char *	error_msg;
-};
-typedef struct dbg_error_event	dbg_error_event;
-
-struct dbg_bpset_event {
-	int				bpid;
-	breakpoint *	bp;
-};
-typedef struct dbg_bpset_event	dbg_bpset_event;
-
-struct dbg_data_event {
-	char *	type_desc;
-	AIF *	data;
-};
-typedef struct dbg_data_event	dbg_data_event;
-
-struct dbg_threads_event {
-	List *	list;
-	int		thread_id;
-};
-typedef struct dbg_threads_event	dbg_threads_event;
-
-struct dbg_thread_select_event {
-	stackframe *	frame;
-	int				thread_id;
-};
-typedef struct dbg_thread_select_event	dbg_thread_select_event;
-
-struct dbg_partial_aif_event {
-	AIF *	data;
-	char *	type_desc;
-	char *	name;
-};
-typedef struct dbg_partial_aif_event dbg_partial_aif_event;
-
-struct dbg_event {
-	int			event_id;
-	int			trans_id;
-	bitset *	procs;
-
-	union {
-		/*
-		 * DBGEV_INIT
-		 */
-		int					num_servers;
-
-		/*
-		 * DBGEV_BPSET
-		 */
-		dbg_bpset_event		bpset_event;
-
-		/*
-		 * DBGEV_FRAMES, DBGEV_VARS, DBGEV_ARGS, DBGEV_SIGNALS
-		 */
-		List *				list;
-
-		/*
-		 * DBGEV_TYPE
-		 */
-		char *				type_desc;
-
-		/*
-		 * DBGEV_DATA
-		 */
-		dbg_data_event		data_event;
-
-		/*
-		 * DBGEV_EXIT
-		 */
-		dbg_exit_event		exit_event;
-
-		/*
-		 * DBGEV_ERROR
-		 */
-		dbg_error_event		error_event;
-
-		/*
-		 * DBGEV_SUSPEND
-		 */
-		dbg_suspend_event	suspend_event;
-
-		/*
-		 * DBGEV_STACK_DEPTH
-		 */
-		int					stack_depth;
-
-		/*
-		 * DBGEV_DATAR_MEM
-		 */
-		memoryinfo *		meminfo;
-
-		/*
-		 * DBGEV_THREADS
-		 */
-		dbg_threads_event	threads_event;
-
-		/*
-		 * DBGEV_THREAD_SELECT
-		 */
-		dbg_thread_select_event	thread_select_event;
-
-		/*
-		 * DBGEV_DATA_EVA_EX
-		 */
-		char * data_expression;
-
-		/*
-		 * DBGEV_PARTIAL_AIF
-		 */
-		dbg_partial_aif_event partial_aif_event;
-
-	} dbg_event_u;
-};
-typedef struct dbg_event dbg_event;
-
-extern int 			DbgDeserializeEvent(int, int, char **, dbg_event **);
-extern int 			DbgSerializeEvent(dbg_event *, char **, int *);
-extern dbg_event *	NewDbgEvent(int);
-extern void			FreeDbgEvent(dbg_event *);
-extern dbg_event *	DbgErrorEvent(int, char *);
-#endif /* _DBG_EVENT_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/dbg_proxy.h b/debug/org.eclipse.ptp.debug.sdm/include/dbg_proxy.h
deleted file mode 100644
index dcb0a78..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/dbg_proxy.h
+++ /dev/null

@@ -1,58 +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
- ******************************************************************************/
- 
-#ifndef _DBG_PROXY_H_
-#define _DBG_PROXY_H_
-
-#define DBG_CMD_BASE					0
-
-#define DBG_QUIT_CMD					DBG_CMD_BASE+0
-#define DBG_STARTSESSION_CMD			DBG_CMD_BASE+1
-#define DBG_SETLINEBREAKPOINT_CMD		DBG_CMD_BASE+2
-#define DBG_SETFUNCBREAKPOINT_CMD		DBG_CMD_BASE+3
-#define DBG_DELETEBREAKPOINT_CMD		DBG_CMD_BASE+4
-#define DBG_ENABLEBREAKPOINT_CMD		DBG_CMD_BASE+5
-#define DBG_DISABLEBREAKPOINT_CMD		DBG_CMD_BASE+6
-#define DBG_CONDITIONBREAKPOINT_CMD		DBG_CMD_BASE+7
-#define DBG_BREAKPOINTAFTER_CMD			DBG_CMD_BASE+8
-#define DBG_SETWATCHPOINT_CMD			DBG_CMD_BASE+9
-#define DBG_GO_CMD						DBG_CMD_BASE+10
-#define DBG_STEP_CMD					DBG_CMD_BASE+11
-#define DBG_TERMINATE_CMD				DBG_CMD_BASE+12
-#define DBG_SUSPEND_CMD					DBG_CMD_BASE+13
-#define DBG_LISTSTACKFRAMES_CMD			DBG_CMD_BASE+14
-#define DBG_SETCURRENTSTACKFRAME_CMD	DBG_CMD_BASE+15
-#define DBG_EVALUATEEXPRESSION_CMD		DBG_CMD_BASE+16
-#define DBG_GETTYPE_CMD					DBG_CMD_BASE+17
-#define DBG_LISTLOCALVARIABLES_CMD		DBG_CMD_BASE+18
-#define DBG_LISTARGUMENTS_CMD			DBG_CMD_BASE+19
-#define DBG_LISTGLOBALVARIABLES_CMD		DBG_CMD_BASE+20
-#define DBG_LISTINFOTHREADS_CMD			DBG_CMD_BASE+21
-#define DBG_SETTHREADSELECT_CMD			DBG_CMD_BASE+22
-#define DBG_STACKINFODEPTH_CMD			DBG_CMD_BASE+23
-#define DBG_DATAREADMEMORY_CMD			DBG_CMD_BASE+24
-#define DBG_DATAWRITEMEMORY_CMD			DBG_CMD_BASE+25
-#define DBG_LISTSIGNALS_CMD				DBG_CMD_BASE+26
-#define DBG_SIGNALINFO_CMD				DBG_CMD_BASE+27 /* deprecated */
-#define DBG_CLIHANDLE_CMD				DBG_CMD_BASE+28
-#define DBG_DATAEVALUATEEXPRESSION_CMD	DBG_CMD_BASE+29 /* deprecated */
-#define DBG_GETPARTIALAIF_CMD			DBG_CMD_BASE+30
-#define DBG_VARIABLEDELETE_CMD			DBG_CMD_BASE+31
-
-#endif /* _DBG_PROXY_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/helloproto.h b/debug/org.eclipse.ptp.debug.sdm/include/helloproto.h
deleted file mode 100644
index 8ff62f5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/helloproto.h
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-#ifndef HELLOPROTO_H_
-#define HELLOPROTO_H_
-
-int is_server_peer_valid(int sockfd);
-int is_client_peer_valid(int sockfd);
-
-#endif /*HELLOPROTO_H_*/
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/itimer.h b/debug/org.eclipse.ptp.debug.sdm/include/itimer.h
deleted file mode 100644
index 5d69bb2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/itimer.h
+++ /dev/null

@@ -1,55 +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
- ******************************************************************************/
- 
-#ifndef _ITIMER_H_
-#define _ITIMER_H_
-
-#include <sys/time.h>
-
-#define MAX_MARKS	100
-
-struct it_mark {
-	long		elapsed;
-	char *	label;
-};
-typedef struct it_mark	it_mark;
-
-struct itimer {
-	int				running;
-	int				mark_cnt;
-	char *			label;
-	char *			mark_label;
-	long				elapsed;
-	long				total_elapsed;
-	struct timeval	start;
-	struct timeval	last_mark;
-	struct timeval	stop;
-	it_mark			marks[MAX_MARKS];
-};
-typedef struct itimer		itimer;
-
-extern itimer *	itimer_new(char *label);
-extern void		itimer_start(itimer *t);
-extern void		itimer_mark(itimer *t, char *msg);
-extern void		itimer_stop(itimer *t);
-extern void		itimer_reset(itimer *t);
-extern void		itimer_free(itimer *t);
-extern void		itimer_print(itimer *t);
-
-#endif /* _ITIMER_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/location.h b/debug/org.eclipse.ptp.debug.sdm/include/location.h
deleted file mode 100644
index a31e442..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/location.h
+++ /dev/null

@@ -1,32 +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
- ******************************************************************************/
- 
-#ifndef LOCATION_H_
-#define LOCATION_H_
-
-struct location
-{
-	char *	file;
-	char *	func;
-	char *	addr;
-	int		line;
-};
-typedef struct location location;
-
-#endif /*LOCATION_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/memoryinfo.h b/debug/org.eclipse.ptp.debug.sdm/include/memoryinfo.h
deleted file mode 100644
index 04adb40..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/memoryinfo.h
+++ /dev/null

@@ -1,55 +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
- *******************************************************************************/
- 
- /**
- * @author Clement chu
- * 
- */
-
-#ifndef _MEMORYINFO_H_
-#define _MEMORYINFO_H_
-
-#include "list.h"
-
-struct memoryinfo {
-	char *addr;
-	long nextRow;
-	long prevRow;
-	long nextPage;
-	long prevPage;
-	long numBytes;
-	long totalBytes;
-	List *memories;
-};
-typedef struct memoryinfo memoryinfo;
-
-struct memory {
-	char *addr;
-	char *ascii;
-	List *data;
-};
-typedef struct memory memory;
-
-extern memoryinfo *	NewMemoryInfo(void);
-extern void	FreeMemoryInfo(memoryinfo *);
-
-extern memory *	NewMemory(void);
-extern void	FreeMemory(memory *);
-
-#endif /*_MEMORYINFO_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/routing_table.h b/debug/org.eclipse.ptp.debug.sdm/include/routing_table.h
deleted file mode 100644
index 835ba08..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/routing_table.h
+++ /dev/null

@@ -1,26 +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
- *******************************************************************************/
-
-#ifndef ROUTING_TABLE_H_
-#define ROUTING_TABLE_H_
-
-struct routing_table_entry {
-	sdm_id 	nodeID;
-	char 	hostname[255]; // See RFC1034 for maximum size of a domain name
-	int		port;
-};
-typedef struct routing_table_entry	routing_table_entry;
-
-extern int						sdm_routing_table_init(int argc, char *argv[]);
-extern void						sdm_routing_table_set(void);
-extern routing_table_entry *	sdm_routing_table_next(void);
-
-#endif /* ROUTING_TABLE_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/sdm.h b/debug/org.eclipse.ptp.debug.sdm/include/sdm.h
deleted file mode 100644
index 97dce29..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/sdm.h
+++ /dev/null

@@ -1,125 +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
- *******************************************************************************/
-
-#ifndef SDM_H_
-#define SDM_H_
-
-#define SDM_AGGREGATE_UPSTREAM		0x00000001
-#define SDM_AGGREGATE_DOWNSTREAM	0x00000002
-#define SDM_AGGREGATE_INIT			0x00000004
-#define SDM_AGGREGATE_TIMEOUT		0x00000008
-
-struct sdm_idset;
-struct sdm_message;
-struct sdm_aggregate;
-
-typedef int						sdm_id;
-typedef struct sdm_idset *		sdm_idset;
-typedef struct sdm_message *	sdm_message;
-typedef struct sdm_aggregate *	sdm_aggregate;
-
-extern sdm_id	SDM_MASTER;
-
-#include "routing_table.h"
-
-/*
- * Startup/Initialization
- */
-extern int sdm_init(int argc, char *argv[]);
-extern int sdm_connect(const sdm_idset ids);
-extern void sdm_finalize(void);
-extern void sdm_progress(void);
-
-/*
- * Communication
- */
-extern int sdm_message_init(int argc, char *argv[]);
-extern void sdm_message_finalize(void);
-extern sdm_message sdm_message_new(char *buf, int len);
-extern void sdm_message_free(sdm_message msg);
-extern unsigned int sdm_message_get_id(const sdm_message msg);
-extern void sdm_message_set_id(const sdm_message msg, const unsigned int id);
-extern sdm_idset sdm_message_get_destination(const sdm_message msg);
-extern sdm_aggregate sdm_message_get_aggregate(const sdm_message msg);
-extern sdm_idset sdm_message_get_source(const sdm_message msg);
-extern void sdm_message_set_source(const sdm_message msg, const sdm_idset src);
-extern void sdm_message_get_payload(const sdm_message msg, char **buf, int *len);
-extern int sdm_message_send(const sdm_message msg);
-extern void sdm_message_set_send_callback(const sdm_message msg, void (*callback)(const sdm_message msg));
-extern void sdm_message_set_recv_callback(void (*callback)(const sdm_message msg));
-extern void sdm_message_set_deliver_callback(void (*callback)(const sdm_message msg));
-extern int sdm_message_progress(void);
-extern void	sdm_message_deliver(const sdm_message msg);
-
-/*
- * Set operations
- */
-extern sdm_idset sdm_set_new(void);
-extern void sdm_set_free(sdm_idset set);
-extern sdm_idset sdm_set_clear(sdm_idset set);
-extern int sdm_set_size(const sdm_idset set);
-extern sdm_idset sdm_set_add_element(const sdm_idset set, const sdm_id id);
-extern sdm_idset sdm_set_remove_element(const sdm_idset set, const sdm_id id);
-extern sdm_idset sdm_set_add_all(const sdm_idset set, const sdm_id id);
-extern int sdm_set_is_subset(const sdm_idset set1, const sdm_idset set2);
-extern int sdm_set_is_empty(const sdm_idset set);
-extern int sdm_set_compare(const sdm_idset set1, const sdm_idset set2);
-extern sdm_idset sdm_set_union(const sdm_idset set1, const sdm_idset set2);
-extern sdm_idset sdm_set_intersect(const sdm_idset set1, const sdm_idset set2);
-extern sdm_idset sdm_set_diff(const sdm_idset set1, const sdm_idset set2);
-extern int sdm_set_contains(const sdm_idset set, const sdm_id id);
-extern sdm_id sdm_set_max(const sdm_idset set);
-extern sdm_id sdm_set_first(const sdm_idset set);
-extern sdm_id sdm_set_next(const sdm_idset set);
-extern int sdm_set_done(const sdm_idset set);
-extern int sdm_set_serialize(const sdm_idset set, char *buf, char **end);
-extern int sdm_set_serialized_length(const sdm_idset set);
-extern int sdm_set_deserialize(sdm_idset set, char *str, char **end);
-extern char *_set_to_str(const sdm_idset set);
-
-/*
- * Routing
- */
-extern int sdm_route_init(int argc, char *argv[]);
-extern void sdm_route_finalize(void);
-extern sdm_id sdm_route_get_parent(void);
-extern sdm_id sdm_route_get_id(void);
-extern void sdm_route_set_id(sdm_id id);
-extern int sdm_route_get_size(void);
-extern void sdm_route_set_size(int s);
-extern sdm_idset sdm_route_get_route(const sdm_idset dest);
-extern sdm_idset sdm_route_reachable(const sdm_idset dest);
-
-/*
- * Aggregation
- */
-extern int sdm_aggregate_init(int argc, char *argv[]);
-extern void	sdm_aggregate_finalize(void);
-extern sdm_aggregate sdm_aggregate_new(void);
-extern void sdm_aggregate_free(sdm_aggregate a);
-extern int sdm_aggregate_serialize(const sdm_aggregate a, char *buf, char **end);
-extern int sdm_aggregate_serialized_length(const sdm_aggregate a);
-extern int sdm_aggregate_deserialize(sdm_aggregate a, char *str, char **end);
-extern void sdm_aggregate_copy(const sdm_aggregate a1, const sdm_aggregate a2);
-extern void sdm_aggregate_set_completion_callback(int (*callback)(const sdm_message msg));
-extern void sdm_aggregate_set_value(const sdm_aggregate a, int type, ...);
-extern void sdm_aggregate_message(const sdm_message msg, unsigned int flags);
-extern void	sdm_aggregate_progress(void);
-extern char * _aggregate_to_str(sdm_aggregate a);
-
-/*
- * I/O forwarding
- */
-extern int sdm_iof_set_stdin_handler(int fd_in, int fd_out, int (*stdin_handler)(int fd_in, int fd_out));
-extern int sdm_iof_set_stdout_handler(int fd_in, int fd_out, int (*stdout_handler)(int fd_in, int fd_out));
-extern int sdm_iof_set_stderr_handler(int fd_in, int fd_out, int (*stderr_handler)(int fd_in, int fd_out));
-
-#endif /* SDM_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/session.h b/debug/org.eclipse.ptp.debug.sdm/include/session.h
deleted file mode 100644
index a77ee3d..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/session.h
+++ /dev/null

@@ -1,33 +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
- ******************************************************************************/
- 
-#ifndef _SESSION_H_
-#define _SESSION_H_
-
-#include "dbg_event.h"
-
-struct session {
-	int					sess_procs;
-	struct proxy_clnt *	sess_proxy;
-	void				(*sess_event_handler)(dbg_event *, void *);
-	void *				sess_event_data;
-};
-typedef struct session	session;
-
-#endif /* _SESSION_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/signalinfo.h b/debug/org.eclipse.ptp.debug.sdm/include/signalinfo.h
deleted file mode 100644
index e5c7fee..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/signalinfo.h
+++ /dev/null

@@ -1,34 +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
- ******************************************************************************/
- 
-#ifndef SIGNALINFO_H_
-#define SIGNALINFO_H_
-
-struct signalinfo {
-	char *name;
-	int stop;
-	int print;
-	int pass;
-	char *desc;
-};
-typedef struct signalinfo signalinfo;
-
-extern signalinfo *NewSignalInfo(void);
-extern void FreeSignalInfo(signalinfo *);
-#endif /*SIGNALINFO_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/include/stackframe.h b/debug/org.eclipse.ptp.debug.sdm/include/stackframe.h
deleted file mode 100644
index bce12a7..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/include/stackframe.h
+++ /dev/null

@@ -1,34 +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
- ******************************************************************************/
- 
-#ifndef STACKFRAME_H_
-#define STACKFRAME_H_
-
-#include "location.h"
-
-struct stackframe {
-	int		level;
-	location	loc;
-};
-typedef struct stackframe stackframe;
-
-extern stackframe *	NewStackframe(int);
-extern void			FreeLocation(location *);
-extern void			FreeStackframe(stackframe *);
-#endif /*STACKFRAME_H_*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/install-sh b/debug/org.eclipse.ptp.debug.sdm/install-sh
deleted file mode 100755
index ebc6691..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/install-sh
+++ /dev/null

@@ -1,250 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

diff --git a/debug/org.eclipse.ptp.debug.sdm/jni/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/jni/.cvsignore
deleted file mode 100644
index 76b7f65..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/jni/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-.deps
-.libs
-*.lo
-.dirstamp

diff --git a/debug/org.eclipse.ptp.debug.sdm/jni/dbg_jni.c b/debug/org.eclipse.ptp.debug.sdm/jni/dbg_jni.c
deleted file mode 100644
index 9b8fddb..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/jni/dbg_jni.c
+++ /dev/null

@@ -1,103 +0,0 @@
-#include <jni.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <stdbool.h>
-
-/***********************************************************************
- * THE JNI FUNCTIONS THAT THE RUNTIME ENVIRONMENT WILL CALL - THESE ARE
- * JUST STUBS THAT WILL CALL ADDITIONAL FUNCTIONS TO DO THE 'REAL'
- * WORK
- **********************************************************************/
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DbgRun(JNIEnv *env, jintArray procs)
-{
-    	return DbgRun();
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DbgGo(JNIEnv *env, jintArray procs)
-{
-    	return DbgGo();
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DbgStep(JNIEnv *env, jintArray procs, jint count, jint type)
-{
-    	return DbgStep();
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DbgKill(JNIEnv *env, jintArray procs)
-{
-    	return DbgKill();
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DbgHalt(JNIEnv *env, jintArray procs)
-{
-    	return DbgHalt();
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DbgSetLineBreakpoint(JNIEnv *env, jintArray procs)
-{
-    	return DbgSetLineBreakpoint();
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DbgSetFuncBreakpoint(JNIEnv *env, jintArray procs)
-{
-    	return DbgSetFuncBreakpoint();
-
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_DeleteBreakpoints(JNIEnv *env, jintArray procs)
-{
-    	return DbgDeleteBreakpoints();
-
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_ListStackframes(JNIEnv *env, jintArray procs)
-{
-    	return DbgListStackframes();
-
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_SetCurrentStackframe(JNIEnv *env, jintArray procs)
-{
-    	return DbgSetCurrentStackframe();
-
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_ListLocalVariables(JNIEnv *env, jintArray procs)
-{
-    	return DbgListLocalVariables();
-
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_ListArguments(JNIEnv *env, jintArray procs)
-{
-    	return DbgListArguments();
-
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_ListGlobalVariables(JNIEnv *env, jintArray procs)
-{
-    	return DbgListGlobalVariables();
-
-}
-
-JNIEXPORT int JNICALL
-Java_org_eclipse_ptp_debug_external_debugger_ParallelDebugger_EvaluateExpression(JNIEnv *env, jintArray procs)
-{
-    	return DbgEvaluateExpression();
-
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/jni/make_macosx.mak b/debug/org.eclipse.ptp.debug.sdm/jni/make_macosx.mak
deleted file mode 100644
index 4338747..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/jni/make_macosx.mak
+++ /dev/null

@@ -1,44 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-# Makefile for OMPI libraries on Mac OS X
-
-PREFIX=dbg
-ARCH_PREFIX=macosx
-VERSION=1.0.0
-
-DBG_LIB=lib$(PREFIX)-$(ARCH_PREFIX)-$(VERSION).jnilib
-
-CC = gcc
-JAVAH = javah
-#DEBUG = -g
-CFLAGS = -c $(DEBUG) -I/System/Library/Frameworks/JavaVM.framework/Headers
-LFLAGS = -dynamiclib -single_module -framework JavaVM -flat_namespace -undefined suppress
-OBJECTS = dbg_jni.o
-SRCS = dbg_jni.c
-HDRS = dbg_jni.h
-
-all: $(DBG_LIB)
-
-.c.o:
-	$(CC) $(CFLAGS) $*.c
-
-$(DBG_LIB): $(OBJECTS)
-	$(CC) -o $(DBG_LIB) $(LFLAGS) $(OBJECTS)
-
-$(HDRS):
-	$(JAVAH) -o $(HDRS) -classpath ../../bin/org/eclipse/ptp/debug/external/debugger org.eclipse.ptp.debug.external.debugger.ParallelDebugger
-	
-install: all
-	cp *.jnilib $(OUTPUT_DIR)
-
-clean:
-	rm -f *.jnilib *.o

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/libaif/.cvsignore
deleted file mode 100644
index 75482a1..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/.cvsignore
+++ /dev/null

@@ -1,10 +0,0 @@
-testaif
-config.status
-Makefile
-aif_xdr.c
-config.h
-*.a
-autom4te.cache
-.deps
-stamp-h1
-a.out.dSYM

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/AUTHORS b/debug/org.eclipse.ptp.debug.sdm/libaif/AUTHORS
deleted file mode 100644
index e5cbfbc..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/AUTHORS
+++ /dev/null

@@ -1 +0,0 @@
-Greg Watson <g.watson@computer.org>
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/CHANGES b/debug/org.eclipse.ptp.debug.sdm/libaif/CHANGES
deleted file mode 100644
index 976f91c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/CHANGES
+++ /dev/null

@@ -1,159 +0,0 @@
-$Log: CHANGES,v $
-Revision 1.12  2002/08/29 17:57:08  greg
-Donny made the following changes:
-
-	More comment on FDSEnumConstByName
-	A new function : FDSEnumConstByValue (changes in fds.c and fds.h)
-	Now, printing an enum will print the string
-	New test files: testaif.c and testaif.h
-
-Revision 1.11  2002/07/22 22:32:03  greg
-Greg made the following changes:
-
-	Fixed some minor bugs.
-	Added applypatch and fixed createpatch scripts.
-	Updated patches to support GDB 5.2
-	Updated documentation.
-	Updated licence to GNU.
-
-Revision 1.10  2002/07/04 17:28:33  greg
-Greg/Donny made the following changes:
-
-	Fixed support for unsigned integers.
-
-Revision 1.9  2002/07/02 20:42:47  greg
-Greg made the following changes:
-
-	Added support for MacOS X.
-	Updated copyright notices in source files.
-
-Revision 1.8  2002/05/18 06:11:04  greg
-Donny made the following changes:
-	1. New test for AIFDiff() in testaif.c
-	2. A modification for the "non-null with null" comparison in calc.c
-	   and cmp.c
-	3. Some additions in aif-valprint.c, a partial support for
-	   TYPE_CODE_FUNC, and also a change in TYPE_CODE_VOID.
-	4. A change in AIF_FUNCTION and also a new function in fds.c
-	   that support the changes in aif-valprint.c
-CVe: ----------------------------------------------------------------------
-
-Revision 1.8  2002/05/18 06:11:04  greg
-Donny made the following changes:
-	1. New test for AIFDiff() in testaif.c
-	2. A modification for the "non-null with null" comparison in calc.c
-	   and cmp.c
-	3. Some additions in aif-valprint.c, a partial support for
-	   TYPE_CODE_FUNC, and also a change in TYPE_CODE_VOID.
-	4. A change in AIF_FUNCTION and also a new function in fds.c
-	   that support the changes in aif-valprint.c
-CVe: ----------------------------------------------------------------------
-
-Thu May 16 15:26:36 EST 2002 greg
-	Donny made some changes to struct/class code in conv.c.
-Mon Apr 29 11:16:26 EST 2002 greg
-	Donny added new functionality to support circular lists.
-	I fixed a bug in _aif_array_ref().
-Mon Apr 15 09:40:18 EST 2002 greg
-	Donny made the following changes:
-		fixed bugs in _aif_string_to_str - wrong arguments
-		fixed a bug in _aif_enum_to_str - must be advanced until the end
-		fixed bug in _aif_enum_to_str - wrong way of doing it
-		fixed a bug in AIF_STRUCT in _aif_unary_op - 
-			_aif_unary_op changes the fds
-		add AIF_ENUM in _fds_advance(), _fds_count_bytes(),
-			_aif_binary_op(), _aif_unary_op()
-		new tests in testaif.c
-Wed Apr 10 15:37:08 EST 2002 greg
-	Donny made the following changes:
-		fixed memset bug in BoolToAIF().
-		merged AIF*ToStr() and AIFPrint*() routines.
-Thu Mar 21 12:23:47 EST 2002 greg
-	Donny made the following changes:
-		updated INTERNAL
-		changed FDS_ID, so now:
-			{|aa=is4;;;} for anonymous struct
-			{id|aa=is4;;;} for non-anonymous struct
-		changed AIFPrint() so that it doesn't print the FDS_ID
-		clean up the _aif_diff() & _aif_binary_op()
-			note: there is still 'case AIF_BOOLEAN' in 
-			_aif_binary_op() for AND & OR operations
-		depth argument in AIFPrint(), AIFCompare() & AIFDiff()
-			( depth == 0 ---> all )
-		changed testaif.c to reflect the changes
-Mon Mar  4 13:49:45 EST 2002 greg
-	Donny fixed a number of bugs in fds.c:
-		call to START_STRUCT() in _data_len_public() incorrect
-		FDSAddFieldToClass() needs to check for named struct, also
-			pointers not handled properly
-		wrong argument used in AIFAddFieldToStruct()
-		strncmp() in FDSStructFieldByName()
-		FDSTypeCompare() returns wrong value
-		wrong argument to _field_attribute() in FDSStructFieldByName()
-	Donny fixed arguments to testAscii() in testaif.c
-
-Wed Feb 27 18:48:42 EST 2002 greg
-	Added Donny's changes to support new data types:
-		boolean
-		enumerated types
-		unions
-		classes
-	Fixed a bug in TypeToFDS() - missing va_start().
-	Removed log messages as they were getting too messy.
-
-Tue Aug 22 14:11:19 EST 2000 rfinkel
-	cleaned up code
-		added file internal.doc to explain the data structures
-		added file internal.h for prototypes of internal routines
-		removed unused variables
-		added "const" to many prototypes to enforce readonly status
-	fixed bugs
-		_aif_int_to_str invoked _aif_div_int with a bad parameters.
-		_aif_compare of two arrays called _aif_compare with bad params.
-	collapsed _field_type and _field_name into _field_attribute; changed
-		from static to dynamic allocation of type and name return
-		fields because types can be embedded within types.
-	added routines to the API for pointers
-		AIF *PointerToAIF(const AIF *);
-		AIF *AIFNull(); /* return null value */
-		void AIFPrintPointer(FILE *, AIF *);
-		enhanced routines in cmp.c to handle pointers
-	added routines to the API for structs
-		AIF *EmptyStructToAIF(const char *);
-		int  AIFAddFieldToStruct(AIF *, char*, AIF *);
-		void AIFPrintStruct(FILE *, AIF *);
-		enhanced routines in fds.c for nested structs
-		enhanced routines in cmp.c to handle structs
-	added routines to the API for names (for circular structures)
-		AIF *NameAIF(const AIF *, const char *);
-		AIF *ReferenceAIF(const char *);
-		AIF *CanonicalAIF(const AIF *);
-		enhanced routines in cmp.c to handle names
-
-Fri Feb  9 09:51:44 EST 2001 rfinkel
-	Reorganized the meaning of the fds and its associated data to conform with
-		the output of gdb with the new "set print aif on" option.
-		Added code for a string type.
-	added routines to API
-		AIF *FromAscii(const char *, const char *);
-	modified the comparison, arithmetic, and dump/print routines to advance
-		file and data pointers so that data length is no longer passed in.  In
-		this way we can handle data of indeterminate length, such as linked
-		lists.
-	precision
-		internal representation of integers is now long long int to increase
-			range.
-		_aif_to_double() can now handle f16 format; changed all callers to
-			understand that, although with possible loss of precision.
-	algorithm
-		_aif_add_int and the like now convert to native types, do arithmetic,
-			then convert back to AIF; they used to simulate arithmetic by
-			bit manipulation on the AIF_DATA.  If necessary, we can simulate
-			longer precision by splitting into short-precision chunks.
-		similarly, type conversions now go through native types.
-	cleaned up code
-		added "const" to more prototypes to enforce readonly status.
-		regularized the order of parameters and their formal names.
-		added some formal names to prototypes as external documention.
-		After I have modified/checked a routine, I put a comment
-			at the closing brace naming the routine.

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/COPYING b/debug/org.eclipse.ptp.debug.sdm/libaif/COPYING
deleted file mode 100644
index 8b7e105..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/COPYING
+++ /dev/null

@@ -1,16 +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
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/ChangeLog b/debug/org.eclipse.ptp.debug.sdm/libaif/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/ChangeLog
+++ /dev/null


diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/INSTALL b/debug/org.eclipse.ptp.debug.sdm/libaif/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/INSTALL
+++ /dev/null

@@ -1 +0,0 @@
-See README for build/install instructions.

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/INTERNAL b/debug/org.eclipse.ptp.debug.sdm/libaif/INTERNAL
deleted file mode 100644
index 9b19081..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/INTERNAL
+++ /dev/null

@@ -1,111 +0,0 @@
-Internal documentation for the aif library.
-
-AIF stands for "architecture-independent form".  Any data structure in any
-language should be convertable to an AIF.  The AIF may be safely shipped from
-machine to machine and converted back to an equivalent data structure.
-
-An AIF is a struct with fields for the format-descriptor string (fds) and the
-data (with explicit length).  The fds uses characters to indicate the type.
-All bytes are represented in the data by two hex characters, representing upper
-nibble then lower nibble.  The characters and formats have changed over time.
-This is the currently operative list:
-
-b: boolean
-	- the data size is the same as the size of a native integer
-	- the data for a true value is -1 and 0 for a false value
-
-c: character  
-	- uses 1 byte of data
-	- characters are always unsigned
-
-i: integer: i(s|u)N
-	- s means signed; u means unsigned
-	- N is a single digit specifying the number of bytes of data
-
-f: floating: fN
-	- N is a single digit specifying the number of bytes of data
-
-^: pointer: ^T
-	- T is a format string representing the target (possibly of > form)
-	- The first byte in the data is a marker, with value:
-		0 to indicate a null value
-		1 to indicate a normal value.  The target is found in the 
-		  subsequent bytes
-		2 to indicate a normal value that will be referred to later.  
-		  The next byte gives a name to this value.  Subsequent 
-		  bytes represent the value of the target
-		3 to indicate that the value is circular.  The next byte gives 
-		  the name by which this value is known
-		4 to indicate an invalid pointer value
-
-%: named component: %name/T
-	- where T is a format string representing the component
-	- uses 0 bytes of data
-
->: reference to named component: >name/
-	- used in circular linked types to make representation finite
-	- uses 0 bytes of data
-
-[: array: [R]T
-	- R is a range indicating low and high bounds
-	- T is a format string representing the base type (can be an array)
-	- itself uses 0 bytes of data, but the components may use data
-
-{: struct: {ID|N1=F1,N2=F2,...;;;}
-	- ID is the identifier for the struct, it is optional
-	- Nn is the name of the field
-	- Fn is a format string representing the field
-	- struct and class share the same format string since conceptually
-	  they are the same (except for the default member access specifiers)
-
-{: class: {ID|N1=F1,...; N2=F2,...; N3=F3,...; N4=F4,...}
-	- ID is the identifier for the class, it is optional
-	- Nn is the name of the field
-	- Fn is a format string representing the field
-	- The class format string is divided into four sections 
-	  (separated by a ;) :
-	  The first section is used to store public data (eg: N1)
-	  The second section is used to store protected data (eg: N2)
-	  The third section is used to store private data (eg: N3)
-	  The fourth section is used to store hidden data (eg: N3)
-
-(: union: (ID|N1=F1,N2=F2,...)
-	- ID is the identifier for the union, it is optional
-	- Nn is the name of the field
-	- Fn is a format string representing the field
-
-<: enumeration: <ID|S1=V1,S2=V2,...>is4
-	- ID is the identifier for the enum, it is optional
-	- consists of name/val pairs Sn=Vn where Sn is the name of the 
-	  enumerated value and Vn is the value of the enumeration. Values 
-	  are integers whose type is is4 (signed integer with 4 bytes)
-
-r: range: rL..UT
-	- a range from L to U, where L and U are integer types specified by T
-
-&: function: &A1,A2,.../T
-	- a function that returns type T and that has arguments of type 
-	  A1, A2, ... Data consists of a null-terminated string containing 
-	  the name of the function
-
-s: string: s
-	- the first 2 bytes of the data indicate the length (more significant 
-	  byte first) of the string in bytes.  These bytes follow immediately
-
-v: void: vN
-	- N is the number of bytes of data
-
-z: ZPL region: zNT
-	- a ZPL region of rank N. Type T is the type of the data describing
-	  the bounds of each rank and must be an integer type. The data 
-	  consists of pairs of integers describing the lower and upper
-	  bounds of each rank respectively
-
-?: invalid: ?n? 
-	- n is an integer code (currently only 0)
-	- 0 bytes of data
-
-The construction routines allow a client to build most reasonable AIFs, but in
-building data-circular AIFs requires using lower-level access.  For arrays, it
-is necessary to generate the data portion of the array using low-level
-mechanisms before using our constructors to make the final AIF.

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/LICENCE b/debug/org.eclipse.ptp.debug.sdm/libaif/LICENCE
deleted file mode 100644
index 4bd054b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/LICENCE
+++ /dev/null

@@ -1,170 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). 
-ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS 
-AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-	a) in the case of the initial Contributor, the initial code and documentation distributed under 
-	this Agreement, and
-	b) in the case of each subsequent Contributor:
-	i) changes to the Program, and
-	ii) additions to the Program;
-	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.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by 
-the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-	a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a 
-	non-exclusive, worldwide, royalty-free copyright license to 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.
-	b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a 
-	non-exclusive, worldwide, 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.
-	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.
-	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.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license 
-agreement, provided that:
-
-	a) it complies with the terms and conditions of this Agreement; and
-	b) its license agreement:
-	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;
-	ii) effectively excludes on behalf of all Contributors all liability for damages, including 
-	direct, indirect, special, incidental and consequential damages, such as lost profits;
-	iii) states that any provisions which differ from this Agreement are offered by that Contributor 
-	alone and not by any other party; and
-	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.
-
-When the Program is made available in source code form:
-
-	a) it must be made available under this Agreement; and
-	b) a copy of this Agreement must be included with each copy of the Program.
-	
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-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.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, 
-business partners and the like. While this license is intended to facilitate the commercial use of 
-the Program, the Contributor who includes the Program in a commercial product offering should do so 
-in a manner which does not create potential liability for other Contributors. Therefore, if a 
-Contributor includes the Program in a commercial product offering, such Contributor ("Commercial 
-Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified 
-Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, 
-lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the 
-extent caused by the acts or omissions of such Commercial Contributor in connection with its 
-distribution of the Program in a commercial product offering. The obligations in this section do not 
-apply to any claims or Losses relating to any actual or alleged intellectual property infringement. 
-In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor 
-in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the 
-Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified 
-Contributor may participate in any such claim at its own expense.
-
-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.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT 
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY 
-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR 
-PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and 
-distributing the Program and assumes all risks associated with its exercise of rights under this 
-Agreement , including but not limited to the risks and costs of program errors, compliance with 
-applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption 
-of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-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.
-
-7. GENERAL
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
-
- 
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.am b/debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.am
deleted file mode 100644
index cb8922f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.am
+++ /dev/null

@@ -1,22 +0,0 @@
-noinst_PROGRAMS =			testaif
-noinst_LIBRARIES =			libaif.a
-
-libaif_a_SOURCES =			aif.c \
-							calc.c \
-							fds.c \
-							array.c \
-							conv.c \
-							cmp.c \
-							print.c \
-							error.c \
-							io.c \
-							struct.c \
-							util.c \
-							aif.x
-					
-libaif_a_CFLAGS =			$(AM_CFLAGS) 
-
-testaif_SOURCES =			testaif.c
-testaif_CFLAGS =			-I. $(AM_CFLAGS) -g
-testaif_LDFLAGS = 			-g
-testaif_LDADD =				libaif.a

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.in b/debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.in
deleted file mode 100644
index 985c774..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/Makefile.in
+++ /dev/null

@@ -1,748 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-noinst_PROGRAMS = testaif$(EXEEXT)
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure $(top_srcdir)/doc/Makefile.in AUTHORS \
-	COPYING ChangeLog INSTALL NEWS compile depcomp install-sh \
-	missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = doc/Makefile
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libaif_a_AR = $(AR) $(ARFLAGS)
-libaif_a_LIBADD =
-am_libaif_a_OBJECTS = libaif_a-aif.$(OBJEXT) libaif_a-calc.$(OBJEXT) \
-	libaif_a-fds.$(OBJEXT) libaif_a-array.$(OBJEXT) \
-	libaif_a-conv.$(OBJEXT) libaif_a-cmp.$(OBJEXT) \
-	libaif_a-print.$(OBJEXT) libaif_a-error.$(OBJEXT) \
-	libaif_a-io.$(OBJEXT) libaif_a-struct.$(OBJEXT) \
-	libaif_a-util.$(OBJEXT)
-libaif_a_OBJECTS = $(am_libaif_a_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
-am_testaif_OBJECTS = testaif-testaif.$(OBJEXT)
-testaif_OBJECTS = $(am_testaif_OBJECTS)
-testaif_DEPENDENCIES = libaif.a
-testaif_LINK = $(CCLD) $(testaif_CFLAGS) $(CFLAGS) $(testaif_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libaif_a_SOURCES) $(testaif_SOURCES)
-DIST_SOURCES = $(libaif_a_SOURCES) $(testaif_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XMLTO = @XMLTO@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LIBRARIES = libaif.a
-libaif_a_SOURCES = aif.c \
-							calc.c \
-							fds.c \
-							array.c \
-							conv.c \
-							cmp.c \
-							print.c \
-							error.c \
-							io.c \
-							struct.c \
-							util.c \
-							aif.x
-
-libaif_a_CFLAGS = $(AM_CFLAGS) 
-testaif_SOURCES = testaif.c
-testaif_CFLAGS = -I. $(AM_CFLAGS) -g
-testaif_LDFLAGS = -g
-testaif_LDADD = libaif.a
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-doc/Makefile: $(top_builddir)/config.status $(top_srcdir)/doc/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libaif.a: $(libaif_a_OBJECTS) $(libaif_a_DEPENDENCIES) 
-	-rm -f libaif.a
-	$(libaif_a_AR) libaif.a $(libaif_a_OBJECTS) $(libaif_a_LIBADD)
-	$(RANLIB) libaif.a
-
-clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-testaif$(EXEEXT): $(testaif_OBJECTS) $(testaif_DEPENDENCIES) 
-	@rm -f testaif$(EXEEXT)
-	$(testaif_LINK) $(testaif_OBJECTS) $(testaif_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-aif.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-array.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-calc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-cmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-conv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-error.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-fds.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-print.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-struct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libaif_a-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testaif-testaif.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-libaif_a-aif.o: aif.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-aif.o -MD -MP -MF $(DEPDIR)/libaif_a-aif.Tpo -c -o libaif_a-aif.o `test -f 'aif.c' || echo '$(srcdir)/'`aif.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-aif.Tpo $(DEPDIR)/libaif_a-aif.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='aif.c' object='libaif_a-aif.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-aif.o `test -f 'aif.c' || echo '$(srcdir)/'`aif.c
-
-libaif_a-aif.obj: aif.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-aif.obj -MD -MP -MF $(DEPDIR)/libaif_a-aif.Tpo -c -o libaif_a-aif.obj `if test -f 'aif.c'; then $(CYGPATH_W) 'aif.c'; else $(CYGPATH_W) '$(srcdir)/aif.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-aif.Tpo $(DEPDIR)/libaif_a-aif.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='aif.c' object='libaif_a-aif.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-aif.obj `if test -f 'aif.c'; then $(CYGPATH_W) 'aif.c'; else $(CYGPATH_W) '$(srcdir)/aif.c'; fi`
-
-libaif_a-calc.o: calc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-calc.o -MD -MP -MF $(DEPDIR)/libaif_a-calc.Tpo -c -o libaif_a-calc.o `test -f 'calc.c' || echo '$(srcdir)/'`calc.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-calc.Tpo $(DEPDIR)/libaif_a-calc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='calc.c' object='libaif_a-calc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-calc.o `test -f 'calc.c' || echo '$(srcdir)/'`calc.c
-
-libaif_a-calc.obj: calc.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-calc.obj -MD -MP -MF $(DEPDIR)/libaif_a-calc.Tpo -c -o libaif_a-calc.obj `if test -f 'calc.c'; then $(CYGPATH_W) 'calc.c'; else $(CYGPATH_W) '$(srcdir)/calc.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-calc.Tpo $(DEPDIR)/libaif_a-calc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='calc.c' object='libaif_a-calc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-calc.obj `if test -f 'calc.c'; then $(CYGPATH_W) 'calc.c'; else $(CYGPATH_W) '$(srcdir)/calc.c'; fi`
-
-libaif_a-fds.o: fds.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-fds.o -MD -MP -MF $(DEPDIR)/libaif_a-fds.Tpo -c -o libaif_a-fds.o `test -f 'fds.c' || echo '$(srcdir)/'`fds.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-fds.Tpo $(DEPDIR)/libaif_a-fds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fds.c' object='libaif_a-fds.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-fds.o `test -f 'fds.c' || echo '$(srcdir)/'`fds.c
-
-libaif_a-fds.obj: fds.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-fds.obj -MD -MP -MF $(DEPDIR)/libaif_a-fds.Tpo -c -o libaif_a-fds.obj `if test -f 'fds.c'; then $(CYGPATH_W) 'fds.c'; else $(CYGPATH_W) '$(srcdir)/fds.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-fds.Tpo $(DEPDIR)/libaif_a-fds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fds.c' object='libaif_a-fds.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-fds.obj `if test -f 'fds.c'; then $(CYGPATH_W) 'fds.c'; else $(CYGPATH_W) '$(srcdir)/fds.c'; fi`
-
-libaif_a-array.o: array.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-array.o -MD -MP -MF $(DEPDIR)/libaif_a-array.Tpo -c -o libaif_a-array.o `test -f 'array.c' || echo '$(srcdir)/'`array.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-array.Tpo $(DEPDIR)/libaif_a-array.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='array.c' object='libaif_a-array.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-array.o `test -f 'array.c' || echo '$(srcdir)/'`array.c
-
-libaif_a-array.obj: array.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-array.obj -MD -MP -MF $(DEPDIR)/libaif_a-array.Tpo -c -o libaif_a-array.obj `if test -f 'array.c'; then $(CYGPATH_W) 'array.c'; else $(CYGPATH_W) '$(srcdir)/array.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-array.Tpo $(DEPDIR)/libaif_a-array.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='array.c' object='libaif_a-array.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-array.obj `if test -f 'array.c'; then $(CYGPATH_W) 'array.c'; else $(CYGPATH_W) '$(srcdir)/array.c'; fi`
-
-libaif_a-conv.o: conv.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-conv.o -MD -MP -MF $(DEPDIR)/libaif_a-conv.Tpo -c -o libaif_a-conv.o `test -f 'conv.c' || echo '$(srcdir)/'`conv.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-conv.Tpo $(DEPDIR)/libaif_a-conv.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conv.c' object='libaif_a-conv.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-conv.o `test -f 'conv.c' || echo '$(srcdir)/'`conv.c
-
-libaif_a-conv.obj: conv.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-conv.obj -MD -MP -MF $(DEPDIR)/libaif_a-conv.Tpo -c -o libaif_a-conv.obj `if test -f 'conv.c'; then $(CYGPATH_W) 'conv.c'; else $(CYGPATH_W) '$(srcdir)/conv.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-conv.Tpo $(DEPDIR)/libaif_a-conv.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='conv.c' object='libaif_a-conv.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-conv.obj `if test -f 'conv.c'; then $(CYGPATH_W) 'conv.c'; else $(CYGPATH_W) '$(srcdir)/conv.c'; fi`
-
-libaif_a-cmp.o: cmp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-cmp.o -MD -MP -MF $(DEPDIR)/libaif_a-cmp.Tpo -c -o libaif_a-cmp.o `test -f 'cmp.c' || echo '$(srcdir)/'`cmp.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-cmp.Tpo $(DEPDIR)/libaif_a-cmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cmp.c' object='libaif_a-cmp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-cmp.o `test -f 'cmp.c' || echo '$(srcdir)/'`cmp.c
-
-libaif_a-cmp.obj: cmp.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-cmp.obj -MD -MP -MF $(DEPDIR)/libaif_a-cmp.Tpo -c -o libaif_a-cmp.obj `if test -f 'cmp.c'; then $(CYGPATH_W) 'cmp.c'; else $(CYGPATH_W) '$(srcdir)/cmp.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-cmp.Tpo $(DEPDIR)/libaif_a-cmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cmp.c' object='libaif_a-cmp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-cmp.obj `if test -f 'cmp.c'; then $(CYGPATH_W) 'cmp.c'; else $(CYGPATH_W) '$(srcdir)/cmp.c'; fi`
-
-libaif_a-print.o: print.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-print.o -MD -MP -MF $(DEPDIR)/libaif_a-print.Tpo -c -o libaif_a-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-print.Tpo $(DEPDIR)/libaif_a-print.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print.c' object='libaif_a-print.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c
-
-libaif_a-print.obj: print.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-print.obj -MD -MP -MF $(DEPDIR)/libaif_a-print.Tpo -c -o libaif_a-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-print.Tpo $(DEPDIR)/libaif_a-print.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print.c' object='libaif_a-print.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`
-
-libaif_a-error.o: error.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-error.o -MD -MP -MF $(DEPDIR)/libaif_a-error.Tpo -c -o libaif_a-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-error.Tpo $(DEPDIR)/libaif_a-error.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error.c' object='libaif_a-error.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
-
-libaif_a-error.obj: error.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-error.obj -MD -MP -MF $(DEPDIR)/libaif_a-error.Tpo -c -o libaif_a-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-error.Tpo $(DEPDIR)/libaif_a-error.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error.c' object='libaif_a-error.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`
-
-libaif_a-io.o: io.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-io.o -MD -MP -MF $(DEPDIR)/libaif_a-io.Tpo -c -o libaif_a-io.o `test -f 'io.c' || echo '$(srcdir)/'`io.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-io.Tpo $(DEPDIR)/libaif_a-io.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='io.c' object='libaif_a-io.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-io.o `test -f 'io.c' || echo '$(srcdir)/'`io.c
-
-libaif_a-io.obj: io.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-io.obj -MD -MP -MF $(DEPDIR)/libaif_a-io.Tpo -c -o libaif_a-io.obj `if test -f 'io.c'; then $(CYGPATH_W) 'io.c'; else $(CYGPATH_W) '$(srcdir)/io.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-io.Tpo $(DEPDIR)/libaif_a-io.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='io.c' object='libaif_a-io.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-io.obj `if test -f 'io.c'; then $(CYGPATH_W) 'io.c'; else $(CYGPATH_W) '$(srcdir)/io.c'; fi`
-
-libaif_a-struct.o: struct.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-struct.o -MD -MP -MF $(DEPDIR)/libaif_a-struct.Tpo -c -o libaif_a-struct.o `test -f 'struct.c' || echo '$(srcdir)/'`struct.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-struct.Tpo $(DEPDIR)/libaif_a-struct.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='struct.c' object='libaif_a-struct.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-struct.o `test -f 'struct.c' || echo '$(srcdir)/'`struct.c
-
-libaif_a-struct.obj: struct.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-struct.obj -MD -MP -MF $(DEPDIR)/libaif_a-struct.Tpo -c -o libaif_a-struct.obj `if test -f 'struct.c'; then $(CYGPATH_W) 'struct.c'; else $(CYGPATH_W) '$(srcdir)/struct.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-struct.Tpo $(DEPDIR)/libaif_a-struct.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='struct.c' object='libaif_a-struct.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-struct.obj `if test -f 'struct.c'; then $(CYGPATH_W) 'struct.c'; else $(CYGPATH_W) '$(srcdir)/struct.c'; fi`
-
-libaif_a-util.o: util.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-util.o -MD -MP -MF $(DEPDIR)/libaif_a-util.Tpo -c -o libaif_a-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-util.Tpo $(DEPDIR)/libaif_a-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libaif_a-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-
-libaif_a-util.obj: util.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -MT libaif_a-util.obj -MD -MP -MF $(DEPDIR)/libaif_a-util.Tpo -c -o libaif_a-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libaif_a-util.Tpo $(DEPDIR)/libaif_a-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libaif_a-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libaif_a_CFLAGS) $(CFLAGS) -c -o libaif_a-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
-
-testaif-testaif.o: testaif.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testaif_CFLAGS) $(CFLAGS) -MT testaif-testaif.o -MD -MP -MF $(DEPDIR)/testaif-testaif.Tpo -c -o testaif-testaif.o `test -f 'testaif.c' || echo '$(srcdir)/'`testaif.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/testaif-testaif.Tpo $(DEPDIR)/testaif-testaif.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='testaif.c' object='testaif-testaif.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testaif_CFLAGS) $(CFLAGS) -c -o testaif-testaif.o `test -f 'testaif.c' || echo '$(srcdir)/'`testaif.c
-
-testaif-testaif.obj: testaif.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testaif_CFLAGS) $(CFLAGS) -MT testaif-testaif.obj -MD -MP -MF $(DEPDIR)/testaif-testaif.Tpo -c -o testaif-testaif.obj `if test -f 'testaif.c'; then $(CYGPATH_W) 'testaif.c'; else $(CYGPATH_W) '$(srcdir)/testaif.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/testaif-testaif.Tpo $(DEPDIR)/testaif-testaif.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='testaif.c' object='testaif-testaif.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testaif_CFLAGS) $(CFLAGS) -c -o testaif-testaif.obj `if test -f 'testaif.c'; then $(CYGPATH_W) 'testaif.c'; else $(CYGPATH_W) '$(srcdir)/testaif.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) config.h
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
-	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
-	dist-zip distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/NEWS b/debug/org.eclipse.ptp.debug.sdm/libaif/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/NEWS
+++ /dev/null


diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/README b/debug/org.eclipse.ptp.debug.sdm/libaif/README
deleted file mode 100644
index 05cd405..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/README
+++ /dev/null

@@ -1,2 +0,0 @@
-This is a library for managing data in an architecture independent format. It is included
-as part of the SDM debugger.

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/aclocal.m4 b/debug/org.eclipse.ptp.debug.sdm/libaif/aclocal.m4
deleted file mode 100644
index b6d1f15..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/aclocal.m4
+++ /dev/null

@@ -1,896 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
-
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/aif.c b/debug/org.eclipse.ptp.debug.sdm/libaif/aif.c
deleted file mode 100644
index 5b43dc5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/aif.c
+++ /dev/null

@@ -1,222 +0,0 @@
-/*
- * Generic AIF routines.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-
-#ifdef STDC_HEADERS
-#include	<stdlib.h> /* for atoi() */
-#include	<string.h> /* memset() */
-#endif /* STDC_HEADERS */
-
-#ifdef WIN32
-#include	<io.h>
-#endif /* WIN32 */
-
-#include	"aif.h"
-#include	"aiferr.h"
-#include	"aifint.h"
-
-char *	_aif_values_seen[MAX_VALUES_SEEN+1];
-char *	_aif_types_seen[MAX_TYPES_SEEN+1];
-
-static int	_aif_opt_cmp_depth = 0;
-static int	_aif_opt_cmp_method = 0;
-
-int
-AIFSetOption(aifopt opt, int arg)
-{
-	switch( opt )
-	{
-	case AIFOPT_CMP_DEPTH:
-		_aif_opt_cmp_depth = arg;
-		break;
-
-	case AIFOPT_CMP_METHOD:
-		if ( arg != AIF_CMP_BY_POSITION && arg != AIF_CMP_BY_NAME )
-			return -1;
-		_aif_opt_cmp_method = arg;
-		break;
-
-	default:
-		return -1;
-	}
-	return 0;
-}
-
-int
-AIFGetOption(aifopt opt)
-{
-	switch( opt )
-	{
-	case AIFOPT_CMP_DEPTH:
-		return _aif_opt_cmp_depth;
-
-	case AIFOPT_CMP_METHOD:
-		return _aif_opt_cmp_method;
-
-	default:
-		return -1;
-	}
-}
-
-void
-AIFFree(AIF *a)
-{
-	if ( AIF_FORMAT(a) != NULL )
-		_aif_free(AIF_FORMAT(a));
-
-	if ( AIF_DATA(a) != NULL )
-		_aif_free(AIF_DATA(a));
-
-	_aif_free(a);
-}
-
-int
-AIFType(AIF *a)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return AIF_INVALID;
-	}
-
-	return FDSType(AIF_FORMAT(a));
-}
-
-int
-AIFBaseType(AIF *a)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return AIF_INVALID;
-	}
-
-	return FDSType(FDSBaseType(AIF_FORMAT(a)));
-}
-
-long
-AIFTypeSize(AIF *a)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	return AIF_LEN(a);
-}
-
-/*
- * Create a new AIF object. 0 for either len means
- * provided later.
- */
-AIF *
-NewAIF(int fmt_len, int data_len)
-{
-	AIF *	a;
-
-	a = (AIF *)_aif_alloc(sizeof(AIF));
-
-	AIF_FORMAT(a) = (char *)NULL;
-	AIF_DATA(a) = (char *)NULL;
-
-	if ( fmt_len > 0 )
-	{
-		AIF_FORMAT(a) = (char *)_aif_alloc(fmt_len);
-		memset(AIF_FORMAT(a), 0, fmt_len);
-	}
-
-	if ( data_len > 0 )
-	{
-		AIF_DATA(a) = (char *)_aif_alloc(data_len);
-		memset(AIF_DATA(a), 0, data_len);
-	}
-
-	AIF_LEN(a) = data_len;
-
-	return a;
-}
-
-AIF *
-MakeAIF(char *fmt, char *data)
-{
-	AIF *	a;
-
-	if ( fmt == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( data == NULL )
-	{
-		a = NewAIF(0, FDSTypeSize(fmt));
-		AIF_FORMAT(a) = fmt;
-	}
-	else
-	{
-		char * tmp1;
-		char * tmp2;
-		tmp1 = fmt;
-		tmp2 = data;
-		_fds_skip_data(&tmp1, &tmp2);
-		a = NewAIF(0, 0);
-		AIF_FORMAT(a) = fmt;
-		AIF_LEN(a) = tmp2-data;
-		AIF_DATA(a) = data;
-	}
-
-	return a;
-}
-
-AIF *
-CopyAIF(AIF *a)
-{
-	int	l1;
-	AIF *	a1;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	l1 = strlen(AIF_FORMAT(a)) + 1;
-
-	a1 = NewAIF(l1, AIF_LEN(a));
-
-	memcpy(AIF_FORMAT(a1), AIF_FORMAT(a), l1);
-
-	if ( AIF_LEN(a) > 0 )
-		memcpy(AIF_DATA(a1), AIF_DATA(a), AIF_LEN(a));
-
-	return a1;
-}
-
-/*
- * Copy data into AIF structure.
- */
-void
-AIFSetData(AIF *a, char *data, int size)
-{
-	int	len;
-
-	len = size > (int)AIF_LEN(a) ? size : (int)AIF_LEN(a);
-
-	memcpy(AIF_DATA(a), data, len);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/aif.h b/debug/org.eclipse.ptp.debug.sdm/libaif/aif.h
deleted file mode 100644
index d1f38c1..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/aif.h
+++ /dev/null

@@ -1,397 +0,0 @@
-/*
- * Master header file for the AIF library.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifndef _AIF_H
-#define _AIF_H
-
-#ifdef WINNT
-#define WINDOWSNT
-#endif /* WINNT */
-
-#ifdef DEBUG
-#define DPRINT(s) s
-#else /* DEBUG */
-#define DPRINT(s) /**/
-#endif /*DEBUG */
-
-/*
- * Include for MIN & MAX
- */
-#if defined(sun)
-#include <sys/sysmacros.h>
-#elif defined(__sgi) || defined(__linux)
-#include <sys/param.h>
-#else
-#ifndef MAX
-#define MAX(a, b) ((a) < (b) ? (b) : (a))
-#endif /* MAX */
-
-#ifndef MIN
-#define MIN(a, b) ((a) > (b) ? (b) : (a))
-#endif /* MIN */
-#endif
-
-#ifndef AIFLONGEST
-#ifdef CC_HAS_LONG_LONG
-typedef long long int AIFLONGEST;
-#else
-typedef long int AIFLONGEST;
-#endif /* CC_HAS_LONG_LONG */
-#endif /* !LONGEST */
-
-#ifdef HAVE_LONG_DOUBLE
-typedef long double AIFDOUBLEST;
-#else
-typedef double AIFDOUBLEST;
-#endif /* HAVE_LONG_DOUBLE */
-
-#ifdef WIN32
-#define R_OK	4
-#define W_OK	2
-#define X_OK	1
-#define F_OK	0
-#define CLOSE_SOCKET(s)	closesocket(s)
-#define snprintf	_snprintf
-#define alloca		_alloca
-#define MAXHOSTNAMELEN	255
-#define MAXPATHLEN	1024
-#else /* WIN32 */
-#define SOCKET		int
-#define CLOSE_SOCKET(s)	(void)close(s)
-#define INVALID_SOCKET	-1
-#define SOCKET_ERROR	-1
-#endif /* WIN32 */
-
-#define AIF_INVALID		0
-#define AIF_INTEGER		1
-#define AIF_FLOATING		2
-#define AIF_POINTER		3
-#define AIF_ARRAY		4
-#define AIF_STRUCT		5
-#define AIF_UNION		6
-#define AIF_FUNCTION		7
-#define AIF_VOID		8
-#define AIF_REGION		9
-#define AIF_NAME		10
-#define AIF_REFERENCE		11
-#define AIF_STRING		12
-#define AIF_CHARACTER		13
-#define AIF_RANGE		14
-#define AIF_ENUM		15
-#define AIF_BOOLEAN		16
-#define AIF_ADDRESS		17
-#define AIF_CHAR_POINTER	18
-#define NUM_AIF_TYPES	19
-
-#define AIF_PTR_NIL			0
-#define AIF_PTR_NORMAL		1
-#define AIF_PTR_NAME		2
-#define AIF_PTR_REFERENCE	3
-#define AIF_PTR_INVALID		4
-
-/*
- * Structure used to index into a 
- * muli-dimensional array.
- */
-struct AIFIndex
-{
-	int		i_finished;
-	int		i_rank;
-	int		i_nel;
-	int *	i_min;
-	int *	i_max;
-	int *	i_index;
-	char *	i_btype;
-	int		i_bsize;
-};
-typedef struct AIFIndex	AIFIndex;
-
-/*
- * AIF Object
- */
-struct AIF
-{
-	char *	a_fds;
-
-	struct
-	{
-		unsigned		a_data_len;
-		char *		a_data_val;
-	} a_data;
-};
-typedef struct AIF AIF;
-
-#define AIF_FORMAT(a)	(a)->a_fds
-#define AIF_LEN(a)	(a)->a_data.a_data_len
-#define AIF_DATA(a)	(a)->a_data.a_data_val
-
-/*
- * Arithmetic/logical operations that can be 
- * performed on AIF objects.
- */
-enum aifop
-{
-	AIFOP_ADD,
-	AIFOP_SUB,
-	AIFOP_MUL,
-	AIFOP_DIV,
-	AIFOP_REM,
-	AIFOP_AND,
-	AIFOP_OR,
-	AIFOP_NEG,
-	AIFOP_NOT
-};
-typedef enum aifop	aifop;
-
-/*
- * AIF Object Access Specifiers
- */
-enum aifaccess
-{
-	AIFACC_PRIVATE,
-	AIFACC_PROTECTED,
-	AIFACC_PUBLIC
-};
-typedef enum aifaccess	aifaccess;
-
-/*
- * AIF error codes.
- */
-enum aiferr
-{
-	AIFERR_NOERR,
-	AIFERR_SIZE,
-	AIFERR_CONV,
-	AIFERR_TYPE,
-	AIFERR_BADARG,
-	AIFERR_NOTIMP,
-	AIFERR_OPEN,
-	AIFERR_READ,
-	AIFERR_WRITE,
-	AIFERR_SEEK,
-	AIFERR_BADHDR,
-	AIFERR_MODE,
-	AIFERR_FDS,
-	AIFERR_FIELD,
-	AIFERR_ARITH,
-	AIFERR_BASE,
-	AIFERR_INDEX,
-	AIFERR_STRING,
-	AIFERR_CANTHAPPEN
-};
-typedef enum aiferr	aiferr;
-extern aiferr		AIFErrno;
-
-/*
- * AIF option codes.
- */
-enum aifopt
-{
-	AIFOPT_CMP_DEPTH,
-	AIFOPT_CMP_METHOD
-};
-typedef enum aifopt	aifopt;
-
-#define AIF_CMP_BY_POSITION	0
-#define AIF_CMP_BY_NAME		1
-
-/*
- * Definitons for reading/writing AIF
- * data to a file.
- */
-
-#define AIFMODE_READ		0x001
-#define AIFMODE_CREATE	0x002
-#define AIFMODE_APPEND	0x004
-
-#include	<stdio.h>
-
-struct AIFFILE
-{
-	FILE *	af_fp;
-	int		af_mode;
-	int		af_cnt;
-};
-typedef struct AIFFILE	AIFFILE;
-
-#include	"fds.h"
-
-#define AIF_ARRAY_TYPE(range, base)		TypeToFDS(AIF_ARRAY, (range), (base))
-#define AIF_BOOLEAN_TYPE()				TypeToFDS(AIF_BOOLEAN)
-#define AIF_CHARACTER_TYPE()			TypeToFDS(AIF_CHARACTER)
-#define AIF_ENUM_TYPE(sign)				TypeToFDS(AIF_ENUM, (sign))
-#define AIF_FLOATING_TYPE(len)			TypeToFDS(AIF_FLOATING, (len))
-#define AIF_FUNCTION_TYPE(base)			TypeToFDS(AIF_FUNCTION, (base))
-#define AIF_INTEGER_TYPE(sign, len)		TypeToFDS(AIF_INTEGER, (sign), (len))
-#define AIF_NAME_TYPE(name, base)		TypeToFDS(AIF_NAME, (name), (base))
-#define AIF_POINTER_TYPE(addr, base)	TypeToFDS(AIF_POINTER, (addr), (base))
-#define AIF_RANGE_TYPE(lo, hi, base)	TypeToFDS(AIF_RANGE, (lo), (hi), (base))
-#define AIF_REFERENCE_TYPE(ref)			TypeToFDS(AIF_REFERENCE, (ref))
-#define AIF_REGION_TYPE(name, base)		TypeToFDS(AIF_REGION, (name), (base))
-#define AIF_STRING_TYPE()				TypeToFDS(AIF_STRING)
-#define AIF_STRUCT_TYPE()				TypeToFDS(AIF_STRUCT)
-#define AIF_UNION_TYPE()				TypeToFDS(AIF_UNION)
-#define AIF_VOID_TYPE(len)				TypeToFDS(AIF_VOID, (len))
-#define AIF_ADDRESS_TYPE(len)			TypeToFDS(AIF_ADDRESS, (len))
-#define AIF_CHAR_POINTER_TYPE(addr)		TypeToFDS(AIF_CHAR_POINTER, (addr))
-
-/*
- * AIF routines.
- */
-
-extern AIF *		AIFAdd(AIF *, AIF *);
-extern int		AIFAddConstToEnum(AIF *, char *, AIF *);
-extern int		AIFAddFieldToStruct(AIF *, char *, AIF *);
-extern int		AIFAddFieldToUnion(AIF *, char *, char *);
-extern void		AIFAddArrayElement(AIF *, int, AIF *);
-extern AIF *		AIFAnd(AIF *, AIF *);
-extern int		AIFArrayBounds(AIF *, int, int **, int **, int **);
-extern AIF *		AIFArrayElement(AIF *, AIFIndex *);
-extern int		AIFArrayElementToDouble(AIF *, AIFIndex *, double *);
-extern int		AIFArrayElementToDoublest(AIF *, AIFIndex *, AIFDOUBLEST *);
-extern int		AIFArrayElementToInt(AIF *, AIFIndex *, int *);
-extern int		AIFArrayElementToLongest(AIF *, AIFIndex *, AIFLONGEST *);
-extern void		AIFArrayIndexFree(AIFIndex *);
-extern int		AIFArrayIndexInc(AIFIndex *);
-extern AIFIndex *AIFArrayIndexInit(AIF *);
-extern int		AIFArrayIndexInRange(int, int *, int *, int *);
-extern int		AIFArrayIndexToStr(char **, AIFIndex *);
-extern char *	AIFArrayIndexType(AIF *);
-extern int		AIFArrayInfo(AIF *, int *, char **, int *);
-extern int		AIFArrayMaxIndex(AIF *, int);
-extern int		AIFArrayMinIndex(AIF *, int);
-extern AIF *		AIFArrayPerm(AIF *, int *);
-extern int		AIFArrayRank(AIF *);
-extern AIF *		AIFArrayRef(AIF *, int, int *);
-extern int		AIFArraySize(AIF *);
-extern AIF *		AIFArraySlice(AIF *, int, int *, int *);
-extern int		AIFArrayToStr(char **, int, AIF *);
-extern int		AIFBaseType(AIF *);
-extern int		AIFBoolToStr(char **, int, AIF *);
-extern int		AIFCloseSet(AIFFILE *);
-extern AIF *		AIFCoerce(AIF *, char *);
-extern int		AIFCompare(int, AIF *, AIF *, int *);
-extern AIF *		AIFDiff(int, AIF *, AIF *);
-extern AIF *		AIFDiv(AIF *, AIF *);
-extern int		AIFEPS(AIF *, AIF *, AIF *, int *);
-extern int		AIFEnumToStr(char **, int, AIF *);
-extern aiferr	AIFError(void);
-extern char *	AIFErrorStr(void);
-extern int		AIFFieldToDouble(AIF *, char *, double *);
-extern int		AIFFieldToDoublest(AIF *, char *, AIFDOUBLEST *);
-extern int		AIFFieldToInt(AIF *, char *, int *);
-extern int		AIFFieldToLongest(AIF *, char *, AIFLONGEST *);
-extern int		AIFFieldType(AIF *, char *);
-extern int		AIFFloatToStr(char **, int, AIF *);
-extern int		AIFFunctionToStr(char **, int, AIF *);
-extern void		AIFFree(AIF *);
-extern AIF *		AIFGetEnum(AIF *);
-extern char *	AIFGetIdentifier(AIF *);
-extern int		AIFGetOption(aifopt);
-extern AIF *		AIFGetStruct(AIF *, char *);
-extern AIF *		AIFGetUnion(AIF *, char *);
-extern int		AIFIndexInRange(int, int *, int *, int *);
-extern int		AIFIndexOffset(int, int *, int *, int *, int *);
-extern int		AIFIntToStr(char **, int, AIF *);
-extern int		AIFIsZero(AIF *, int *);
-extern AIF *		AIFMul(AIF *, AIF *);
-extern AIF *		AIFNeg(AIF *);
-extern void		AIFNormalise(char *, int, char *, int);
-extern AIF *		AIFNot(AIF *);
-extern AIF *		AIFNull(AIF *);
-extern int		AIFNumFields(AIF *);
-extern AIFFILE *	AIFOpenSet(char *, int);
-extern AIF *		AIFOr(AIF *, AIF *);
-extern int		AIFPointerToStr(char **, int, AIF *);
-extern int		AIFPrint(FILE *, int, AIF *);
-extern int		AIFPrintArray(FILE *, int, AIF *);
-extern int		AIFPrintBool(FILE *, int, AIF *);
-extern int		AIFPrintChar(FILE *, int, AIF *);
-extern int		AIFPrintEnum(FILE *, int, AIF *);
-extern int		AIFPrintFloat(FILE *, int, AIF *);
-extern int		AIFPrintFunction(FILE *, int, AIF *);
-extern int		AIFPrintInt(FILE *, int, AIF *);
-extern int		AIFPrintName(FILE *, int, AIF *);
-extern int		AIFPrintPointer(FILE *, int, AIF *);
-extern int		AIFPrintReference(FILE *, int, AIF *);
-extern int		AIFPrintRegion(FILE *, int, AIF *);
-extern int		AIFPrintString(FILE *, int, AIF *);
-extern int		AIFPrintStruct(FILE *, int, AIF *);
-extern int		AIFPrintUnion(FILE *, int, AIF *);
-extern int		AIFPrintVoid(FILE *, int, AIF *);
-extern int		AIFPrintArrayIndex(FILE *, AIFIndex *);
-extern int		AIFReferenceToStr(char **, int, AIF *);
-extern AIF *		AIFReadSet(AIFFILE *, char **);
-extern AIF *		AIFRem(AIF *, AIF *);
-extern int		AIFSetArrayData(AIF *, AIFIndex *, AIF *);
-extern void		AIFSetData(AIF *, char *, int);
-extern int		AIFSetEnum(AIF *, char *);
-extern int		AIFSetIdentifier(AIF *, char *);
-extern int		AIFSetOption(aifopt, int);
-extern int		AIFSetStruct(AIF *, char *, AIF *);
-extern int		AIFSetUnion(AIF *, char *, AIF *);
-extern int		AIFStructToStr(char **, int, AIF *);
-extern AIF *		AIFSub(AIF *, AIF *);
-extern int		AIFToChar(AIF *, char *);
-extern int		AIFToDouble(AIF *, double *);
-extern int		AIFToDoublest(AIF *, AIFDOUBLEST *);
-extern int		AIFToInt(AIF *, int *);
-extern int		AIFToLongest(AIF *, AIFLONGEST *);
-extern int		AIFToFloat(AIF *, float *);
-extern int		AIFToStr(char **, int, AIF *);
-extern int		AIFToVoid(AIF *, char *, int);
-extern int		AIFType(AIF *);
-extern int		AIFTypeCompare(AIF *, AIF *);
-extern long		AIFTypeSize(AIF *);
-extern int		AIFUnionToStr(char **, int, AIF *);
-extern int		AIFVoidToStr(char **, int, AIF *);
-extern int		AIFWriteSet(AIFFILE *, AIF *, char *);
-extern AIF *		ArrayToAIF(int, int *, int *, char *, int, char *);
-extern AIF *		AsciiToAIF(char *, char *);
-extern AIF * 	BoolToAIF(int);
-extern AIF *		CharToAIF(char);
-extern AIF *		CopyAIF(AIF *);
-extern AIF *		DoubleToAIF(double);
-extern AIF *		EmptyArrayToAIF(int, int, AIF *);
-extern AIF *		EmptyEnumToAIF(char *);
-extern AIF *		EmptyStructToAIF(char *);
-extern AIF *		EmptyUnionToAIF(char *);
-extern AIF *		FloatToAIF(float);
-extern AIF *		IntToAIF(int);
-extern AIF *		LongToAIF(long);
-#ifdef CC_HAS_LONG_LONG
-extern AIF *		LongLongToAIF(long long);
-#endif /* CC_HAS_LONG_LONG */
-extern AIF *		LongestToAIF(AIFLONGEST);
-extern AIF *		MakeAIF(char *, char *);
-extern AIF *		NameAIF(AIF *, int);
-extern AIF *		NewAIF(int, int);
-extern AIF *		PointerNameToAIF(AIF *);
-extern AIF *		PointerReferenceToAIF(AIF *);
-extern AIF *		PointerToAIF(AIF *, AIF *);
-extern AIF *		ReferenceAIF(int); 
-extern AIF *		ShortToAIF(short);
-extern AIF *		StringToAIF(char *);
-extern AIF *		UnsignedShortToAIF(unsigned short);
-extern AIF *		UnsignedIntToAIF(unsigned int);
-extern AIF *		UnsignedLongToAIF(unsigned long);
-#ifdef CC_HAS_LONG_LONG
-extern AIF *		UnsignedLongLongToAIF(unsigned long long);
-#endif /* CC_HAS_LONG_LONG */
-extern AIF *		VoidToAIF(char *, int);
-extern AIF *		AddressToAIF(char *, int);
-extern AIF *		CharPointerToAIF(AIF *, char *);
-extern AIF *		EmptyComplexArrayToAIF(int, int, AIF *);
-extern void			AIFAddComplexArrayElement(AIF *, AIF *);
-
-#endif /* !_AIF_H */
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/aif.x b/debug/org.eclipse.ptp.debug.sdm/libaif/aif.x
deleted file mode 100644
index 0486742..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/aif.x
+++ /dev/null

@@ -1,29 +0,0 @@
-/*
-** Architecure Independent Format (AIF) XDR definition.
-**
-** Copyright (c) 1996 by Monash University.
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA 02111-1307, USA.
-**
-*/
-
-%#include	<rpc/rpc.h>
-
-struct AIF
-{
-	string	a_fds<>;
-	opaque	a_data<>;
-};

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/aiferr.h b/debug/org.eclipse.ptp.debug.sdm/libaif/aiferr.h
deleted file mode 100644
index c50da32..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/aiferr.h
+++ /dev/null

@@ -1,19 +0,0 @@
-/*
- * Header file for AIF error routines.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifndef _AIF_ERROR_H
-#define _AIF_ERROR_H
-
-void	SetAIFError(aiferr, char *);
-void	ResetAIFError(void);
-
-#endif /* !__AIF_ERROR_H */

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/aifint.h b/debug/org.eclipse.ptp.debug.sdm/libaif/aifint.h
deleted file mode 100644
index 68b9e65..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/aifint.h
+++ /dev/null

@@ -1,131 +0,0 @@
-/*
- * Header file for internal AIF utility routines.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifndef _AIFINT_H
-#define _AIFINT_H
-
-#define MAX_VALUES_SEEN 1000
-#define MAX_TYPES_SEEN 100
-
-extern char *	_aif_values_seen[];
-extern char *	_aif_types_seen[];
-
-extern void	_aif_add_int(char *, char *, int, char *, int);
-extern void *	_aif_alloc(int);
-extern void	_aif_and_bool(char *, char *, int, char *, int);
-extern void	_aif_and_int(char *, char *, int, char *, int);
-extern AIF *	_aif_array_ref(AIF *, int, int *, int *, int *, char *, int);
-extern int 	_aif_array_slice_post(char **, char **, char **, char **);
-extern int 	_aif_array_slice_pre(char **, char **, char **);
-extern int	_aif_array_to_str(int, char **, char **);
-extern int	_aif_binary_op(aifop, char **, char **, char **, char **, char **, char **);
-extern int	_aif_binary_op_bool(aifop, char **, char *, int, char *, int);
-extern int	_aif_binary_op_float(aifop, char **, char *, int, char *, int);
-extern int	_aif_binary_op_int(aifop, char **, char *, int, char *, int);
-extern int	_aif_bool_to_str(int, char **, char **);
-extern int	_aif_char_to_str(int, char **, char **);
-extern int	_aif_compare(int, int *, char **, char **, char **, char **);
-extern int	_aif_cmp_int(int *, char *, int, char *, int);
-extern int	_aif_cmp_float(int *, char *, int, char *, int);
-extern int	_aif_diff(int, char **, char **, char **, char **, char **, char **);
-extern void	_aif_div_int(char *, char *, char *, int, char *, int);
-extern void	_aif_dump_int(char **, char **, FILE *);
-extern void	_aif_dump_float(char **, char **, FILE *);
-extern void	_aif_dump(char **, char **, FILE *);
-extern void	_aif_dump_array(char **, char **, FILE *);
-extern int	_aif_enum_to_str(int, char **, char **);
-extern int	_aif_eps(char *, char *, int, char *, char *, int, char *, char *, int, int *);
-extern void	_aif_free(void *);
-extern int	_aif_float_to_aif_int(char **, char *, int);
-extern int	_aif_float_to_str(int, char **, char **);
-extern int	_aif_function_to_str(int, char **, char **);
-extern int	_aif_int_is_zero(char *, int);
-extern int	_aif_int_to_aif_float(char **, char *, int);
-extern int	_aif_int_to_double(char *, int, double *);
-extern int	_aif_int_to_doublest(char *, int, AIFDOUBLEST *);
-extern int	_aif_int_to_str(int, char **, char **);
-extern int	_aif_is_zero(char **, char **, int, int *);
-extern void	_aif_mul_int(char *, char *, int, char *, int);
-extern int	_aif_name_to_str(int, char **, char **);
-extern void	_aif_neg_int(char *, char *, int);
-extern void	_aif_not_bool(char *, char *, int);
-extern void	_aif_not_int(char *, char *, int);
-extern void	_aif_or_bool(char *, char *, int, char *, int);
-extern void	_aif_or_int(char *, char *, int, char *, int);
-extern int	_aif_pointer_to_str(int, char **, char **);
-extern int	_aif_print(FILE *, int, char **, char **);
-extern int	_aif_print_array(FILE *, int, char **, char **);
-extern int	_aif_print_bool(FILE *, int, char **, char **);
-extern int	_aif_print_char(FILE *, int, char **, char **);
-extern int	_aif_print_enum(FILE *, int, char **, char **);
-extern int	_aif_print_float(FILE *, int, char **, char **);
-extern int	_aif_print_function(FILE *, int, char **, char **);
-extern int	_aif_print_int(FILE *, int, char **, char **);
-extern int	_aif_print_name(FILE *, int, char **, char **);
-extern int	_aif_print_pointer(FILE *, int, char **, char **);
-extern int	_aif_print_reference(FILE *, int, char **, char **);
-extern int	_aif_print_region(FILE *, int, char **, char **);
-extern int	_aif_print_string(FILE *, int, char **, char **);
-extern int	_aif_print_struct(FILE *, int, char **, char **);
-extern int	_aif_print_union(FILE *, int, char **, char **);
-extern int	_aif_print_void(FILE *, int, char **, char **);
-extern int	_aif_reference_to_str(int, char **, char **);
-extern int	_aif_region_to_str(int, char **, char **);
-extern void *	_aif_resize(void *, int);
-extern int	_aif_string_to_str(int, char **, char **);
-extern int	_aif_struct_to_str(int, char **, char **);
-extern void	_aif_sub_int(char *, char *, int, char *, int);
-extern int	_aif_to_char(char *, char *);
-extern int	_aif_to_longest(char *, int, AIFLONGEST *);
-extern int	_aif_to_doublest(char *, int, AIFDOUBLEST *);
-extern int	_aif_to_str(int, char **, char **);
-extern int	_aif_unary_op(aifop, char **, char **, char **, char **);
-extern int	_aif_unary_op_bool(aifop, char **, char *, int);
-extern int	_aif_unary_op_float(aifop, char **, char *, int);
-extern int	_aif_unary_op_int(aifop, char **, char *, int);
-extern int	_aif_union_to_str(int, char **, char **);
-extern int	_aif_void_to_str(int, char **, char **);
-extern int	_char_to_aif(char **, char);
-extern int	_doublest_to_aif(char **, int, AIFDOUBLEST);
-extern int 	_data_len_index(char *, int);
-extern int 	_data_len_public(char *);
-extern char * 	_fds_add_function_arg(char *, char *);
-extern char *	_fds_base_type(char *);
-extern int	_fds_count_bytes(char **);
-extern int	_fds_count_bytes_na(char **);
-extern void	_fds_advance(char **);
-extern int	_fds_array_min_index(char *);
-extern int	_fds_array_max_index(char *);
-extern int	_fds_getnum(char *);
-extern char *	_fds_lookup(char **);
-extern void	_fds_resolve(char **);
-extern void	_fds_skip_data(char **, char **);
-extern char *	_fds_skiptomatch(char *);
-extern char * 	_fds_skiptofield(char *fds, int n);
-extern char *	_fds_skipto(char *, char *);
-extern char *	_fds_skipnum(char *);
-extern void  	_fds_skipid(char **);
-extern int	_fds_struct_arrange(char *, char *, char *, char**, char**);
-extern char *	_field_attribute(char *, char *, char *);
-extern char *	_find_target(char **, int);
-extern int	_longest_to_aif(char **, int, AIFLONGEST);
-extern void	_str_init(void);
-extern void	_str_cat(char *);
-extern void	_str_add(char);
-extern char *	_str_get(void);
-extern void	_ptrname_to_int(char *, int *);
-extern void	_int_to_ptrname(int, char *);
-
-#endif /* _AIFINT_H */
-
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/array.c b/debug/org.eclipse.ptp.debug.sdm/libaif/array.c
deleted file mode 100644
index fd3bd69..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/array.c
+++ /dev/null

@@ -1,1084 +0,0 @@
-/*
- * AIF routines that operate specifically on arrays.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#include	<memory.h>
-#include	<string.h>
-
-#include	"aif.h"
-#include	"aiferr.h"
-#include	"aifint.h"
-
-int
-AIFArrayRank(AIF *a)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return FDSArrayRank(AIF_FORMAT(a));
-}
-
-int
-AIFArraySize(AIF *a)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return FDSArraySize(AIF_FORMAT(a));
-}
-
-/*
- * Parse array type descriptor and extract the minimum and maximum
- * array index values for each dimension. Also, if size is not NULL,
- * will return the size of dimension.
- */
-int
-AIFArrayBounds(AIF *a, int rank, int **min, int **max, int **size)
-{
-	if ( a == (AIF *)NULL || min == (int **)NULL || max == (int **)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	FDSArrayBounds(AIF_FORMAT(a), rank, min, max, size);
-
-	return 0;
-}
-
-/*
- * Extract info about an array. Returns the index type of the
- * first dimension (assumes all dimensions are the same type),
- * the element type of the array, and the number of dimensions
- * of the array.
- */
-int
-AIFArrayInfo(AIF *a, int *rank, char **type, int *idx)
-{
-	char *	itype;
-
-	if ( a == (AIF *)NULL || rank == (int *)NULL || type == (char **)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	FDSArrayInfo(AIF_FORMAT(a), rank, (char **)type, &itype);
-
-	if ( idx != (int *)NULL )
-		*idx = FDSType(itype);
-
-	return 0;
-}
-
-/* A post-processing routine that is called by AIFArraySlice().
- * This routine checks the fds and the data of an AIF object, and it creates
- * a new data for the object 'rdata' which is consistent. The function checks
- * all of the AIF_PTR_REFERENCEs and it changes the first occurence of a
- * particular AIF_PTR_REFERENCE to an appropriate AIF_PTR_NAME based on the
- * 'res' array. It modifies the 'fds' and the 'data'. 'rdata' will also
- * be advanced to the end.
- *
- * The routine gets 4 parameters:
- * fds - the fds of an AIF object
- * data - the original data of an AIF object
- * rdata - the new data for the object
- * res - a 'char *' array that stores the references
- */
-int
-_aif_array_slice_post(char **fds, char **data, char **rdata, char **res)
-{
-	int 	datalen;
-	int 	index;
-	char *	fmt;
-
-	_fds_resolve(fds);
-
-	switch ( FDSType(*fds) )
-	{
-	case AIF_REFERENCE:
-		fmt = _fds_lookup(fds);
-		_aif_array_slice_post(&fmt, data, rdata, res);
-		return 0;
-
-	case AIF_ARRAY:
-		{
-			AIFIndex * ix;
-			int i;
-			char * fbase;
-
-			ix = FDSArrayIndexInit(*fds);
-			_fds_advance(fds);
-
-			for ( i = 0; i < ix->i_nel; i++ )
-			{
-				fbase = ix->i_btype;
-				_aif_array_slice_post(&fbase, data, rdata, res);
-			}
-
-			return 0;
-		}
-
-	case AIF_STRUCT:
-		(*fds)++;
-		_fds_skipid(fds);
-
-		while ( **fds != FDS_STRUCT_ACCESS_SEP )
-		{
-			*fds = strchr(*fds, FDS_STRUCT_FIELD_NAME_END) + 1;
-			_aif_array_slice_post(fds, data, rdata, res);
-
-			if ( **fds == FDS_STRUCT_FIELD_SEP )
-				(*fds)++;
-		}
-
-		*fds = strchr(*fds, FDS_STRUCT_END) + 1;
-
-		return 0;
-
-	case AIF_POINTER:
-
-		(*fds)++;
-
-		switch ( (int)**data )
-		{
-		case AIF_PTR_NIL:
-			**rdata = **data;
-			(*data)++;
-			(*rdata)++;
-			_fds_advance(fds);
-			return 0;
-
-		case AIF_PTR_NORMAL:
-			**rdata = **data;
-			(*data)++;
-			(*rdata)++;
-			_aif_array_slice_post(fds, data, rdata, res);
-			return 0;
-
-		case AIF_PTR_NAME:
-			memcpy(*rdata, *data, 5); /* 1 + 4 (ptr name) */
-			(*data) += 5;
-			(*rdata) += 5;
-			_aif_array_slice_post(fds, data, rdata, res);
-			return 0;
-
-		case AIF_PTR_REFERENCE:
-			_ptrname_to_int(*data + 1, &index);
-			if ( res[index] != NULL )
-			{
-				*(*rdata)++ = AIF_PTR_NAME;
-				_int_to_ptrname(index, *rdata);
-				*rdata += 4;
-				datalen = FDSDataSize(*fds, res[index]);
-				memcpy(*rdata, res[index], datalen);
-				(*rdata) += datalen;
-				(*data) += 5;
-				_fds_advance(fds);
-				res[index]=NULL;
-			}
-			else
-			{
-				memcpy(*rdata, *data, 5);
-				(*data) += 5;
-				(*rdata) += 5;
-			}
-			return 0;
-		}
-
-	default:
-			datalen = FDSDataSize(*fds, *data);
-			_fds_advance(fds);
-			memcpy(*rdata, *data, datalen);
-			(*data) += datalen;
-			(*rdata) += datalen;
-			return 0;
-	}
-}
-
-/*
- * A pre-processing routine that is called by AIFArraySlice().
- * This routine checks the fds and the data, and it saves all of the
- * references that are pointed by AIF_PTR_NAMEs into 'res'.
- *
- * The function gets 3 parameters, the fds and the data of an AIF object
- * that is going to be scanned, and a 'char *' array (res) to store
- * the results. All of the elements of the 'res' array must be initialized
- * to NULL. It modifies 'fds' and 'data'.
- */
-int
-_aif_array_slice_pre(char **fds, char **data, char **res)
-{
-	int 	datalen;
-	char * 	fmt;
-
-	_fds_resolve(fds);
-
-	switch ( FDSType(*fds) )
-	{
-	case AIF_REFERENCE:
-		fmt = _fds_lookup(fds);
-		_aif_array_slice_pre(&fmt, data, res);
-		return 0;
-
-	case AIF_ARRAY:
-		{
-			AIFIndex * ix;
-			int i;
-			char * fbase;
-
-			ix = FDSArrayIndexInit(*fds);
-			_fds_advance(fds);
-
-			for ( i = 0; i < ix->i_nel; i++ )
-			{
-				fbase = ix->i_btype;
-				_aif_array_slice_pre(&fbase, data, res);
-			}
-
-			return 0;
-		}
-
-	case AIF_STRUCT:
-		(*fds)++;
-		_fds_skipid(fds);
-
-		while ( **fds != FDS_STRUCT_ACCESS_SEP )
-		{
-			*fds = strchr(*fds, FDS_STRUCT_FIELD_NAME_END) + 1;
-			_aif_array_slice_pre(fds, data, res);
-
-			if ( **fds == FDS_STRUCT_FIELD_SEP )
-				(*fds)++;
-		}
-
-		*fds = strchr(*fds, FDS_STRUCT_END) + 1;
-
-		return 0;
-
-	case AIF_POINTER:
-		{
-			int index;
-
-			(*fds)++;
-
-			switch ( (int)**data )
-			{
-			case AIF_PTR_NIL:
-				(*data)++;
-				_fds_advance(fds);
-				return 0;
-
-			case AIF_PTR_NORMAL:
-				(*data)++;
-				_aif_array_slice_pre(fds, data, res);
-				return 0;
-
-			case AIF_PTR_NAME:
-				(*data)++;
-				_ptrname_to_int(*data, &index);
-				*data += 4;
-				res[index] = *data;
-				_aif_array_slice_pre(fds, data, res);
-				return 0;
-
-			case AIF_PTR_REFERENCE:
-				(*data) += 5;
-				_fds_advance(fds);
-				return 0;
-			}
-		}
-
-	default:
-			datalen = FDSDataSize(*fds, *data);
-			_fds_advance(fds);
-			(*data) += datalen;
-			return 0;
-	}
-}
-
-/*
- * Evaluate array slice.
- * XXX: TOFIX
- */
-AIF *
-AIFArraySlice(AIF *a, int rank, int *mn, int *mx)
-{
-	int		i;
-	int		nrank = 0;
-	int *		rankp;
-	int		rl;
-	char *		rf;
-	char *		fds;
-	AIF *		ra;
-	AIFIndex *	ix1;
-	AIFIndex *	ix2 = (AIFIndex *)NULL;
-	char *		res_array[MAX_VALUES_SEEN+1] = {NULL};
-
-	if ( a == (AIF *)NULL || mn == (int *)NULL || mx == (int *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return (AIF *)NULL;
-	}
-
-	ix1 = FDSArrayIndexInit(AIF_FORMAT(a));
-
-	if ( rank != ix1->i_rank )
-	{
-		SetAIFError(AIFERR_INDEX, NULL);
-		AIFArrayIndexFree(ix1);
-		return (AIF *)NULL;
-	}
-
-	/*
-	** Create rankp array used by AIFIndexInRange().
-	*/
-	rankp = (int *)_aif_alloc(rank * sizeof(int *));
-
-	/*
-	** Construct a new fds.
-	*/
-	rl = strlen(AIF_FORMAT(a)) + 1;
-	rf = fds = (char *)_aif_alloc(rl);
-
-	/*
-	** Caluculate nrank, the number of dimensions of the (new) array.
-	** This corresponds to the number of elements where mn != mx
-	** (i.e. where an empty slice has not been specified.)
-	** When mn & mx == -1 we slice the whole dimension.
-	*/
-	for ( i = 0 ; i < rank ; i++ )
-	{
-		if ( mn[i] < 0 && mx[i] < 0 )
-		{
-			mn[i] = ix1->i_min[i];
-			mx[i] = ix1->i_max[i];
-		}
-		else if
-		(
-			mn[i] < ix1->i_min[i] 
-			||
-			mn[i] > ix1->i_max[i]
-			||
-			mx[i] < ix1->i_min[i] 
-			||
-			mx[i] > ix1->i_max[i]
-		)
-		{
-			SetAIFError(AIFERR_INDEX, NULL);
-			AIFArrayIndexFree(ix1);
-			_aif_free(fds);
-			_aif_free(rankp);
-			return (AIF *)NULL;
-		}
-		else if ( mn[i] == mx[i] )
-			continue;
-
-		rankp[nrank++] = i;
-
-		snprintf(rf, rl, "[r%d..%dis4]", mn[i], mx[i]);
-		rf += strlen(rf);
-		rl -= strlen(rf);
-	}
-
-	strcpy(rf, ix1->i_btype);
-
-	/*
-	** Create a new structure to hold the sliced array.
-	*/
-
-	/* In the old implementation, we use : ra = MakeAIF(fds, NULL); 
-	 * However, with complex data structures, we cannot use MakeAIF()
-	 * since the actual size of the ra (i.e. AIF_LEN(ra)) cannot be known 
-	 * only from the variable 'fds'.
-	 */
-
-	ra = NewAIF(0, BUFSIZ);
-	AIF_FORMAT(ra) = fds;
-
-	if ( nrank > 0 )
-		ix2 = FDSArrayIndexInit(AIF_FORMAT(ra));
-
-	/*
-	** Now build the data.
-	*/
-	for ( i = 0 ; i < ix1->i_nel ; i++ )
-	{
-		char *	data;
-		char *	ndata;
-		int counter, limit;
-		int size = 0;
-		int subsize = 0;
-		int len;
-
-		if ( !AIFIndexInRange(rank, ix1->i_index, mn, mx) )
-		{
-			AIFArrayIndexInc(ix1);
-			continue;
-		}
-
-		limit = AIFIndexOffset(ix1->i_rank, ix1->i_index, 
-					ix1->i_min, ix1->i_max, NULL);
-		for ( counter = 0; counter < limit; counter++ )
-		{
-			subsize = FDSDataSize(ix1->i_btype,AIF_DATA(a)+size);
-			size += subsize;
-		}
-
-		data = AIF_DATA(a) + size;
-		len = FDSDataSize(ix1->i_btype, data);
-
-		/* old code: data = AIF_DATA(a) + AIFIndexOffset(ix1->i_rank, ix1->i_index, ix1->i_min, ix1->i_max, NULL) * ix1->i_bsize; */
-
-		if ( nrank == 0 )
-		{
-			memcpy(AIF_DATA(ra), data, len);
-			break;
-		}
-
-		size = 0; subsize = 0;
-		limit = AIFIndexOffset(ix2->i_rank, ix2->i_index, 
-					ix2->i_min, ix2->i_max, NULL);
-		for ( counter = 0; counter < limit; counter++ )
-		{
-			subsize = FDSDataSize(ix2->i_btype,AIF_DATA(ra)+size);
-			size += subsize;
-		}
-
-		ndata = AIF_DATA(ra) + size;
-
-		/* old code: ndata = AIF_DATA(ra) + AIFIndexOffset(ix2->i_rank, ix2->i_index, ix2->i_min, ix2->i_max, NULL) * ix2->i_bsize; */
-
-		/* old code: memcpy(ndata, data, ix1->i_bsize); */
-		memcpy(ndata, data, len);
-
-		AIFArrayIndexInc(ix1);
-		AIFArrayIndexInc(ix2);
-	}
-
-	/* Do pre-processing and post-processing steps */
-	{
-		char * f = AIF_FORMAT(a);
-		char * d = AIF_DATA(a);
-		char * n;
-		char * tmp;
-
-		_aif_array_slice_pre(&f, &d, res_array);
-
-		f = AIF_FORMAT(ra);
-		d = _aif_alloc(BUFSIZ);
-		tmp = d;
-		memcpy(d, AIF_DATA(ra), BUFSIZ);
-		n = AIF_DATA(ra);
-
-		_aif_array_slice_post(&f, &d, &n, res_array);
-		/* we need to use 'tmp' because after the call of
-		 * _aif_array_slice_post(), d points to the end, thus
-		 * the memory cannot be freed by using _aif_free(d)
-		 */
-
-		_aif_free(tmp);
-	}
-
-	AIFArrayIndexFree(ix1);
-
-	if ( nrank > 0 )
-		AIFArrayIndexFree(ix2);
-
-	_aif_free(rankp);
-
-	return ra;
-}
-
-/*
- * XXX: TOFIX
- */
-/*
- * The old AIFArrayPerm() relied on the assumption that all elements of the
- * AIF array have the same size (i.e. it wrote the data for the 
- * resultant array in a "random access" way).
- * To solve this problem, we create dynamic arrays to hold the data and the
- * length, after that we iterate the arrays to copy the data to the resultant
- * AIF array.
- */
-AIF *
-AIFArrayPerm(AIF *a, int *index)
-{
-	int		i;
-	int		rl;
-	char *		rf;
-	AIF *		ra;
-	AIFIndex *	ix;
-	int 		len;
-
-	char **		data_array;
-	int *		len_array;
-
-	if ( a == (AIF *)NULL || index == (int *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return (AIF *)NULL;
-	}
-
-	/*
-	** Initialise the index arrays.
-	*/
-	ix = FDSArrayIndexInit(AIF_FORMAT(a));
-
-	/*
-	** Create a new structure to hold the permuted array.
-	*/
-	ra = NewAIF(strlen(AIF_FORMAT(a))+1, BUFSIZ);
-
-	/*
-	** Construct a new fds.
-	*/
-	memcpy(AIF_FORMAT(ra), AIF_FORMAT(a), strlen(AIF_FORMAT(a))+1);
-	rf = AIF_FORMAT(ra);
-	rl = strlen(rf) + 1;
-
-	for ( i = 0 ; i < ix->i_rank ; i++ )
-	{
-		snprintf(rf, rl, "[r%d..%dis4]", ix->i_min[index[i]], ix->i_max[index[i]]);
-		rf += strlen(rf);
-		rl -= strlen(rf);
-	}
-
-	strcat(AIF_FORMAT(ra), ix->i_btype);
-
-	len_array = _aif_alloc( ix->i_nel * sizeof(int) );
-	data_array = _aif_alloc( ix->i_nel * sizeof(char *) );
-
-	/*
-	** Now build the data.
-	*/
-	for ( i = 0 ; i < ix->i_nel ; i++ )
-	{
-		char *	d;
-		int 	counter, limit;
-		int	size = 0; 
-		int	subsize = 0;
-
-		limit = AIFIndexOffset(ix->i_rank, ix->i_index,
-				ix->i_min, ix->i_max, NULL);
-
-		for ( counter = 0; counter < limit; counter++ )
-		{
-			subsize = FDSDataSize(ix->i_btype, AIF_DATA(a)+size);
-			size += subsize;
-		}
-
-		d = AIF_DATA(a) + size;
-		len = FDSDataSize(ix->i_btype, d);
-
-		size = 0; subsize = 0;
-		limit = AIFIndexOffset(ix->i_rank, ix->i_index,
-				ix->i_min, ix->i_max, index);
-
-		data_array[limit] = d;
-		len_array[limit] = len;
-
-		AIFArrayIndexInc(ix);
-	}
-
-	len = 0;
-
-	/* Copy the data to the resultant AIF array */
-	for ( i = 0 ; i < ix->i_nel ; i++ )
-	{
-		char * rd;
-
-		rd = AIF_DATA(ra) + len;
-
-		memcpy(rd, data_array[i], len_array[i]);
-
-		len += len_array[i];
-	}
-
-	AIFArrayIndexFree(ix);
-
-	_aif_free(data_array);
-	_aif_free(len_array);
-
-	return ra;
-}
-
-char *
-AIFArrayIndexType(AIF *a)
-{
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return NULL;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return NULL;
-	}
-
-	return FDSArrayIndexType(AIF_FORMAT(a));
-}
-
-int
-AIFArrayMinIndex(AIF *a, int n)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return FDSArrayMinIndex(AIF_FORMAT(a), n);
-}
-
-int
-AIFArrayMaxIndex(AIF *a, int n)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return FDSArrayMaxIndex(AIF_FORMAT(a), n);
-}
-
-/*
- * The index array is used to compute the location of data in
- * a multi-dimensional array, and basically corresponds to a loop
- * counter in normal circumstances.
- */
-
-#define PERMUTE(p, d) ((p) != NULL ? (p)[d] : d)
-
-/*
- * Initialise an index array to the minimum index value for each 
- * dimension, given the number of dimensions (rank), and the minimum 
- * and maximum values of each dimension (min, max). Returns the number 
- * of elements in the array.
- */
-AIFIndex *
-AIFArrayIndexInit(AIF *a)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIFIndex *)NULL;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return (AIFIndex *)NULL;
-	}
-
-	return FDSArrayIndexInit(AIF_FORMAT(a));
-}
-
-/*
- * Check that the index value of each index in rankp is within the range
- * specified by min and max. Returns 1 if they are, otherwise 0.
- *
- * Note: rankp, index, min and max are guaranteed to have at least
- * rank elements.
- */
-int
-AIFIndexInRange(int rank, int *index, int *min, int *max)
-{
-	int	d;
-
-	for ( d = rank - 1 ; d >= 0 ; d-- )
-	{
-		if ( min[d] < 0 )
-			continue;
-
-		if ( index[d] < min[d] || index[d] > max[d] )
-			return 0;
-	}
-
-	return 1;
-}
-
-/*
- * Step through indexes in the order specified by the perm array.
- * Indexes cycle from min to max. Returns 1 on carry out.
- */
-int
-AIFArrayIndexInc(AIFIndex *ix)
-{
-	int	d;
-
-	for ( d = ix->i_rank - 1 ; d >= 0 ; d-- )
-	{
-		if ( ++(ix->i_index[d]) > ix->i_max[d] )
-		{
-			ix->i_index[d] = ix->i_min[d];
-			continue;
-		}
-
-		return 0;
-	}
-
-	ix->i_finished = 1;
-
-	return 1;
-}
-
-void
-AIFArrayIndexFree(AIFIndex *ix)
-{
-	_aif_free(ix->i_btype);
-	_aif_free(ix->i_index);
-	_aif_free(ix->i_min);
-	_aif_free(ix->i_max);
-	_aif_free(ix);
-}
-
-/*
- * Index array element and return as doublest
- * XXX: TOFIX
- */
-int
-AIFArrayElementToDoublest(AIF *a, AIFIndex *ix, AIFDOUBLEST *val)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	if ( AIFBaseType(a) != AIF_FLOATING )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return _aif_to_doublest(AIF_DATA(a) + AIFIndexOffset(ix->i_rank, ix->i_index, ix->i_min, ix->i_max, NULL) * ix->i_bsize, ix->i_bsize, val);
-}
-
-int
-AIFArrayElementToDouble(AIF *a, AIFIndex *ix, double *val)
-{
-	int		res;
-	AIFDOUBLEST	dd;
-
-	res = AIFArrayElementToDoublest(a, ix, &dd);
-	
-	if ( res >= 0 )
-		*val = (double)dd; /* maybe lose some precision */
-
-	return res;
-}
-
-/*
- * Index array element and return as longest
- * XXX: TOFIX
- */
-int
-AIFArrayElementToLongest(AIF *a, AIFIndex *ix, AIFLONGEST *val)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	if ( AIFBaseType(a) != AIF_INTEGER )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return _aif_to_longest(AIF_DATA(a) + AIFIndexOffset(ix->i_rank, ix->i_index, ix->i_min, ix->i_max, NULL) * ix->i_bsize, ix->i_bsize, val);
-}
-
-int
-AIFArrayElementToInt(AIF *a, AIFIndex *ix, int *val)
-{
-	int		res;
-	AIFLONGEST	l;
-
-	res = AIFArrayElementToLongest(a, ix, &l);
-
-	if ( res >= 0 )
-		*val = (int)l;
-	
-	return res;
-}
-
-AIF *
-_aif_array_ref(AIF *a, int rank, int *index, int *min, int *max, char *btype, int bsize)
-{
-	AIF *	ae;
-	int	counter;
-	int	offset;
-	char *	theFormat;
-	char *	dataStart;
-	char *	dataEnd;
-
-	ae = MakeAIF(strdup(btype), NULL);
-
-	offset = AIFIndexOffset(rank, index, min, max, (int *)NULL);
-	dataEnd = AIF_DATA(a);
-
-	for ( counter = 0 ; counter <= offset ; counter++ )
-	{
-		theFormat = btype;
-		dataStart = dataEnd;
-		_fds_skip_data(&theFormat, &dataEnd);
-	}
-
-	AIF_DATA(ae) = _aif_alloc(dataEnd - dataStart + 1);
-	memcpy(AIF_DATA(ae), dataStart, dataEnd - dataStart);
-
-	return ae;
-}
-
-/*
- * Compute size of array.
- */
-int
-_aif_array_size(char *fds, char *data)
-{
-	int		i;
-	int		n = 0;
-	char *		dstart;
-	char *		fmt;
-	char *		btype;
-	AIFIndex *	ix;
-
-	ix = FDSArrayIndexInit(fds);
-
-	btype = FDSBaseType(fds);
-
-	for ( i = 0 ; i <= ix->i_nel ; i++ )
-	{
-		fmt = btype;
-		dstart = data;
-		_fds_skip_data(&fmt, &data);
-		n += data - dstart;
-	}
-
-	AIFArrayIndexFree(ix);
-
-	return n;
-}
-
-/*
- * Return array element at index.
- */
-AIF *
-AIFArrayElement(AIF *a, AIFIndex *ix)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( ix->i_finished )
-		return (AIF *)NULL;
-
-	return _aif_array_ref(a, ix->i_rank, ix->i_index, ix->i_min, ix->i_max, ix->i_btype, ix->i_bsize);
-}
-
-/*
- * Return array element at location.
- */
-AIF *
-AIFArrayRef(AIF *a, int rank, int *loc)
-{
-	int		i;
-	AIF *		ae;
-	AIFIndex *	ix;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return (AIF *)NULL;
-	}
-
-	ix = AIFArrayIndexInit(a);
-
-	if ( rank != ix->i_rank )
-	{
-		AIFArrayIndexFree(ix);
-		SetAIFError(AIFERR_INDEX, NULL);
-		return (AIF *)NULL;
-	}
-
-	for ( i = 0 ; i < rank ; i++ )
-	{
-		if ( loc[i] < ix->i_min[i] || loc[i] > ix->i_max[i] )
-		{
-			AIFArrayIndexFree(ix);
-			SetAIFError(AIFERR_INDEX, NULL);
-			return (AIF *)NULL;
-		}
-	}
-
-	ae = _aif_array_ref(a, ix->i_rank, loc, ix->i_min, ix->i_max, ix->i_btype, ix->i_bsize);
-
-	AIFArrayIndexFree(ix);
-
-	return ae;
-}
-
-/*
- * Copy data into an array.
- * XXX: TOFIX
- */
-int
-AIFSetArrayData(AIF *dst, AIFIndex *ix, AIF *src)
-{
-	char *	dd;
-
-	if
-	(
-		dst == (AIF *)NULL
-		||
-		src == (AIF *)NULL
-		||
-		ix == (AIFIndex *)NULL
-	)
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}               
-
-	if
-	( 
-		AIFType(dst) != AIF_ARRAY
-		||
-		AIFBaseType(dst) != AIFType(src)
-	)
-	{       
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	dd = AIF_DATA(dst) + AIFIndexOffset(ix->i_rank, ix->i_index, ix->i_min, ix->i_max, NULL) * ix->i_bsize;
-
-	memcpy(dd, AIF_DATA(src), ix->i_bsize);
-
-	return 0;
-}
-
-/*
- * Calculate the data offset in the array given the current value
- * of the indexes, and the minimum and maximum indices of each dimension.
- */
-int
-AIFIndexOffset(int rank, int *index, int *min, int *max, int *perm)
-{
-	int	d;
-	int	p;
-	int	off = 0;
-	int	sz = 1;
-
-	for ( d = rank - 1 ; d >= 0 ; d-- )
-	{
-		p = PERMUTE(perm, d);
-		off += (index[p] - min[p]) * sz;
-		sz *= max[p] - min[p] + 1;
-	}
-
-	return off;
-}
-
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/calc.c b/debug/org.eclipse.ptp.debug.sdm/libaif/calc.c
deleted file mode 100644
index 250917f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/calc.c
+++ /dev/null

@@ -1,1745 +0,0 @@
-/*
- * Routines that support arithmetic/logical operations on
- * AIF objects.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The _aif_div_int() routine was derived from source under
- * the following copyright:
- *
- *   Use of this program, for any purpose, is granted the author,
- *   Ian Kaplan, as long as this copyright notice is included in
- *   the source code or any source code derived from this program.
- *   The user assumes all responsibility for using this code.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#include	<string.h>
-
-#include	"aif.h"
-#include	"aiferr.h"
-#include	"aifint.h"
-
-#if defined(WINDOWSNT) || defined(WIN32)
-#define BITSPERBYTE     8
-#elif defined(__APPLE__)
-#include        <sys/types.h>
-#define BITSPERBYTE     NBBY
-#else
-#include        <values.h>
-#endif /* WINDOWSNT || WIN32 */
-
-/*
- * Boolean bitwise and.
- */
-void
-_aif_and_bool(char *rd, char *d1, int l1, char *d2, int l2)
-{
-	_aif_and_int(rd, d1, l1, d2, l2);
-}
-
-/*
- * Boolean bitwise or.
- */
-void
-_aif_or_bool(char *rd, char *d1, int l1, char *d2, int l2)
-{
-	_aif_or_int(rd, d1, l1, d2, l2);
-}
-
-/*
- * Boolean 2's compliment.
- */
-void
-_aif_not_bool(char *rd, char *data, int len)
-{
-	_aif_not_int(rd, data, len);
-}
-
-/*
- * Integer 2's compliment.
- */
-void
-_aif_not_int(char *rd, char *data, int len)
-{
-	AIFLONGEST	val;
-
-	_aif_to_longest(data, len, &val);
-	val = ~val;
-	_longest_to_aif(&rd, len, val);
-}
-
-/*
- * Integer negation.
- */
-void
-_aif_neg_int(char *rd, char *data, int len)
-{
-	AIFLONGEST	val;
-
-	_aif_to_longest(data, len, &val);
-	val = -val;
-	_longest_to_aif(&rd, len, val);
-}
-
-/*
- * Integer addition.
- */
-void
-_aif_add_int(char *rd, char *d1, int l1, char *d2, int l2)
-{
-	AIFLONGEST	val1;
-	AIFLONGEST	val2;
-	AIFLONGEST	val;
-
-	_aif_to_longest(d1, l1, &val1);
-	_aif_to_longest(d2, l2, &val2);
-	val = val1 + val2;
-	_longest_to_aif(&rd, MAX(l1, l2), val);
-}
-
-/*
- * Integer bitwise and.
- */
-void
-_aif_and_int(char *rd, char *d1, int l1, char *d2, int l2)
-{
-	AIFLONGEST	val1;
-	AIFLONGEST	val2;
-	AIFLONGEST	val;
-
-	_aif_to_longest(d1, l1, &val1);
-	_aif_to_longest(d2, l2, &val2);
-	val = val1 & val2;
-	_longest_to_aif(&rd, MAX(l1, l2), val);
-}
-
-/*
- * Integer bitwise or.
- */
-void
-_aif_or_int(char *rd, char *d1, int l1, char *d2, int l2)
-{
-	AIFLONGEST	val1;
-	AIFLONGEST	val2;
-	AIFLONGEST	val;
-
-	_aif_to_longest(d1, l1, &val1);
-	_aif_to_longest(d2, l2, &val2);
-	val = val1 | val2;
-	_longest_to_aif(&rd, MAX(l1, l2), val);
-}
-
-/*
- * Integer subtraction.
- */
-void
-_aif_sub_int(char *rd, char *d1, int l1, char *d2, int l2)
-{
-	AIFLONGEST	val1;
-	AIFLONGEST	val2;
-	AIFLONGEST	val;
-
-	_aif_to_longest(d1, l1, &val1);
-	_aif_to_longest(d2, l2, &val2);
-	val = val1 - val2;
-	_longest_to_aif(&rd, MAX(l1, l2), val);
-}
-
-/*
- * Integer multiplication. Result is same size as the largest
- * argument. 
- */
-void
-_aif_mul_int(char *rd, char *d1, int l1, char *d2, int l2)
-{
-	AIFLONGEST	val1;
-	AIFLONGEST	val2;
-	AIFLONGEST	val;
-
-	_aif_to_longest(d1, l1, &val1);
-	_aif_to_longest(d2, l2, &val2);
-	val = val1 * val2;
-	_longest_to_aif(&rd, MAX(l1, l2), val);
-} 
-
-/*
- * Compare two integers. Returns:
- *	-1 if d1 < d2
- *	 0 if d1 == d2
- *	 1 if d1 > d2
- */
-int
-compare_int(char *d1, int l1, char *d2, int l2)
-{
-	int	s1 = 0;
-	int	s2 = 0;
-
-	if ( l2 > l1 )
-	{
-		for ( s2 = 0 ; s2 < l2-l1; s2++ )
-			if ( d2[s2] != 0x0 )
-				return -1;
-	}
-	else
-	{
-		for ( s1 = 0 ; s1 < l1-l2; s1++ )
-			if ( d1[s1] != 0x0 )
-				return 1;
-	}
-
-	for ( ; s1 < l1 ; s1++, s2++)
-	{
-		if ( d2[s2] > d1[s1] )
-			return -1;
-
-		if ( d2[s2] < d1[s1] )
-			return 1;
-	}
-
-	return 0;
-}
-
-/*
- * Shift d, s bits to the left. s < BITSPERBYTE. Result in r.
- * d and r can overlap, but must be the same size.
- */
-void
-lshift_int(unsigned char *r, unsigned char *d, int l, int s)
-{
-	int	i;
-	int	s2 = BITSPERBYTE - s;
-
-
-	for ( i = 0 ; i < l-1 ; i++ )
-		r[i] = (d[i] << s) | (d[i+1] >> s2);
-
-	r[i] = d[i] << s;
-}
-
-/*
- * Shift d, s bits to the right. s < BITSPERBYTE. Result in r.
- * d and r can overlap, but must be the same size.
- */
-void
-rshift_int(unsigned char *r, unsigned char *d, int l, int s)
-{
-	int	i;
-	int	s2 = BITSPERBYTE - s;
-
-
-	for ( i = l-1 ; i > 0 ; i-- )
-		r[i] = (d[i] >> s) | (d[i-1] << s2);
-
-	r[0] = d[0] >> s;
-}
-
-/*
- * Integer division d1/d2 = rq + rr/d2. Quotient is same size as the largest
- * argument. Note: d2 != 0.
- *
- * XXX need to check remainder for correct sign.
- */
-void
-_aif_div_int(char *rq, char *rr, char *d1, int l1, char *d2, int l2)
-{
-	AIFLONGEST	val1;
-	AIFLONGEST	val2;
-	AIFLONGEST	val;
-
-	_aif_to_longest(d1, l1, &val1);
-	_aif_to_longest(d2, l2, &val2);
-	val = val1 / val2;
-	_longest_to_aif(&rq, MAX(l1, l2), val);
-	val = val1 % val2;
-	_longest_to_aif(&rr, MAX(l1, l2), val);
-} 
-
-/*
- * Perform a binary integer operation.
- */
-int
-_aif_binary_op_int(aifop op, char **rd, char *d1, int l1, char *d2, int l2)
-{
-	char *	rt=NULL;
-
-
-	if ( l1 > sizeof(AIFLONGEST) )
-		fprintf(stderr, "binary int operation: arg1 exceeds precision\n");
-
-	if ( l2 > sizeof(AIFLONGEST) )
-		fprintf(stderr, "binary int operation: arg2 exceeds precision\n");
-
-	switch ( op )
-	{
-	case AIFOP_ADD:
-	case AIFOP_SUB:
-	case AIFOP_MUL:
-	case AIFOP_AND:
-	case AIFOP_OR:
-		if ( *rd == NULL )
-			*rd = (char *)_aif_alloc(MAX(l1, l2));
-		break;
-
-	case AIFOP_DIV:
-	case AIFOP_REM:
-		if ( *rd == NULL )
-			*rd = (char *)_aif_alloc(l1);
-
-		/*
-		** Temp for quotient.
-		*/
-		rt = (char *)_aif_alloc(l1);
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	switch ( op )
-	{
-	case AIFOP_ADD:
-		_aif_add_int(*rd, d1, l1, d2, l2);
-		break;
-
-	case AIFOP_SUB:
-		_aif_sub_int(*rd, d1, l1, d2, l2);
-		break;
-
-	case AIFOP_MUL:
-		_aif_mul_int(*rd, d1, l1, d2, l2);
-		break;
-
-	case AIFOP_AND:
-		_aif_and_int(*rd, d1, l1, d2, l2);
-		break;
-
-	case AIFOP_OR:
-		_aif_or_int(*rd, d1, l1, d2, l2);
-		break;
-
-	case AIFOP_DIV:
-		if ( _aif_int_is_zero(d2, l2) )
-		{
-			SetAIFError(AIFERR_ARITH, NULL);
-			return -1;
-		}
-
-		_aif_div_int(*rd, rt, d1, l1, d2, l2);
-
-		_aif_free(rt);
-		break;
-
-	case AIFOP_REM:
-		if ( _aif_int_is_zero(d2, l2) )
-		{
-			SetAIFError(AIFERR_ARITH, NULL);
-			return -1;
-		}
-
-		_aif_div_int(rt, *rd, d1, l1, d2, l2);
-
-		_aif_free(rt);
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
- * Perform a binary boolean operation.
- */
-int
-_aif_binary_op_bool(aifop op, char **rd, char *d1, int l1, char *d2, int l2)
-{
-	if ( *rd == NULL )
-		*rd = (char *)_aif_alloc(MAX(l1, l2));
-
-	switch ( op )
-	{
-	case AIFOP_AND:
-		_aif_and_bool(*rd, d1, l1, d2, l2);
-		break;
-
-	case AIFOP_OR:
-		_aif_or_bool(*rd, d1, l1, d2, l2);
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
- * Perform a unary boolean operation.
- */
-int
-_aif_unary_op_bool(aifop op, char **rd, char *d, int l)
-{
-	if ( *rd == NULL )
-		*rd = (char *)_aif_alloc(l);
-
-	switch ( op )
-	{
-	case AIFOP_NOT:
-		_aif_not_bool(*rd, d, l);
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
- * Perform a unary integer operation.
- */
-int
-_aif_unary_op_int(aifop op, char **rd, char *d, int l)
-{
-	if ( *rd == NULL )
-		*rd = (char *)_aif_alloc(l);
-
-	switch ( op )
-	{
-	case AIFOP_NEG:
-		_aif_neg_int(*rd, d, l);
-		break;
-
-	case AIFOP_NOT:
-		_aif_not_int(*rd, d, l);
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
- * Perform a binary floating point operation.
- */
-int
-_aif_binary_op_float(aifop op, char **rd, char *d1, int l1, char *d2, int l2)
-{
-	AIFDOUBLEST	v;
-	AIFDOUBLEST	v1;
-	AIFDOUBLEST	v2;
-
-	ResetAIFError();
-
-	if
-	(
-		_aif_to_doublest(d1, l1, &v1) < 0
-		||
-		_aif_to_doublest(d2, l2, &v2) < 0
-	)
-		return -1;
-
-	switch ( op )
-	{
-	case AIFOP_ADD:
-		v = v1 + v2;
-		break;
-
-	case AIFOP_SUB:
-		v = v1 - v2;
-		break;
-
-	case AIFOP_MUL:
-		v = v1 * v2;
-		break;
-
-	case AIFOP_DIV:
-		/*
-		** Let floating point / deal with v2 == 0.
-		*/
-		v = v1 / v2;
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	if ( MAX(l1, l2) > sizeof(float) )
-		return _doublest_to_aif(rd, MAX(l1, l2), v);
-	else
-		return _doublest_to_aif(rd, l1, v);
-}
-
-/*
- * Perform a unary floating point operation.
- */
-int
-_aif_unary_op_float(aifop op, char **rd, char *d1, int l1)
-{
-	AIFDOUBLEST	v;
-	AIFDOUBLEST	v1;
-
-	if ( _aif_to_doublest(d1, l1, &v1) < 0 )
-		return -1;
-
-	switch ( op )
-	{
-	case AIFOP_NEG:
-		v = -v1;
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return _doublest_to_aif(rd, l1, v);
-}
-
-/*
- * Perform a binary operation. Arguments can be integer or
- * floating point or structs or arrays resulting in such.
- * Advance the data and format pointers across the data.
- * Return 0 for success, -1 for failure.
- * Result in rd and rf.
- * If rd is null, we generate our own format and data strings.  It is
- * impossible to decide the proper length for the data for structured types; we
- * make wild guesses.  It's a bug.
- */
-int
-_aif_binary_op(aifop op, 
-	char **rf, char **rd, 
-	char **f1, char **d1,
-	char **f2, char **d2)
-{
-	int	i;
-	int	bytes1;
-	int	bytes2;
-	int	bytes3;
-	char *	d;
-	char *	fmt;
-	char *	d3 = NULL;
-	int res;
-
-	ResetAIFError();
-
-	_fds_resolve(f1);
-	_fds_resolve(f2);
-
-	if ( FDSType(*f1) == AIF_REFERENCE )
-	{
-		fmt = _fds_lookup(f1);
-		return _aif_binary_op(op, rf, rd, &fmt, d1, f2, d2);
-	}
-
-	if ( FDSType(*f2) == AIF_REFERENCE )
-	{
-		fmt = _fds_lookup(f2);
-		return _aif_binary_op(op, rf, rd, f1, d1, &fmt, d2);
-	}
-
-	switch ( FDSType(*f1) )
-	{
-	case AIF_ENUM:
-		bytes1 = _fds_count_bytes_na(f1);
-
-		switch ( FDSType(*f2) )
-		{
-		case AIF_ENUM:
-		case AIF_INTEGER:
-			bytes2 = _fds_count_bytes_na(f2);
-
-			if ( _aif_binary_op_int(op, rd, *d1, bytes1, *d2, bytes2) < 0 )
-				return -1;
-
-			(*d1) += bytes1;
-			(*d2) += bytes2;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(1, MAX(bytes1, bytes2)));
-			else
-			{
-				char *t1, *t2;
-				int len;
-
-				t1 = strstr(*rf, *f1);	
-
-				if ( t1 == NULL )
-				{
-					SetAIFError(AIFERR_CONV, NULL);
-					return -1;
-				}
-
-				t2 = _fds_base_type(t1);
-				len = strlen(t2);
-				memmove(t1, t2, len+1);
-			}
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		case AIF_FLOATING:
-			bytes2 = _fds_count_bytes_na(f2);
-
-			if ( (bytes3 = _aif_int_to_aif_float(&d3, *d1, bytes1)) < 0 )
-				return -1;
-
-			if ( _aif_binary_op_float(op, rd, d3, bytes3, *d2, bytes2) < 0 )
-			{
-				_aif_free(d3);
-				return -1;
-			}
-
-			(*d1) += bytes1;
-			(*d2) += bytes2;
-
-			if ( *rf == NULL ) 
-				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes2, bytes3)));
-			else
-			{
-				char *t1, *t2;
-				int len;
-
-				t1 = strstr(*rf, *f1);	
-
-				if ( t1 == NULL )
-				{
-					SetAIFError(AIFERR_CONV, NULL);
-					return -1;
-				}
-
-				t2 = t1;
-				_fds_advance(&t2);
-				len = strlen(t2);
-				*t1 = FDS_FLOATING;
-				*(t1+1) = (char) MAX(bytes2, bytes3);
-				memmove(t1+2, t2, len+1);
-			}
-
-			_aif_free(d3);
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			return -1;
-		}
-		break;
-		/* case AIF_ENUM */
-
-	case AIF_INTEGER:
-		bytes1 = _fds_count_bytes_na(f1);
-
-		switch ( FDSType(*f2) )
-		{
-		case AIF_CHARACTER:
-		case AIF_INTEGER:
-		case AIF_ENUM:
-			bytes2 = _fds_count_bytes_na(f2);
-
-			if ( _aif_binary_op_int(op, rd, *d1, bytes1, *d2, bytes2) < 0 )
-				return -1;
-
-			(*d1) += bytes1;
-			(*d2) += bytes2;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(
-					FDSIsSigned(*f1) || FDSIsSigned(*f2),
-					MAX(bytes1, bytes2)));
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		case AIF_FLOATING:
-			bytes2 = _fds_count_bytes_na(f2);
-
-			if ( (bytes3 = _aif_int_to_aif_float(&d3, *d1, bytes1)) < 0 )
-				return -1;
-
-			if ( _aif_binary_op_float(op, rd, d3, bytes3, *d2, bytes2) < 0 )
-			{
-				_aif_free(d3);
-				return -1;
-			}
-
-			(*d1) += bytes1;
-			(*d2) += bytes2;
-
-			if ( *rf == NULL ) 
-				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes2, bytes3)));
-
-			_aif_free(d3);
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		case AIF_VOID:
-			d = NULL;
-			res = 1;
-			if ( _longest_to_aif(&d, sizeof(int), (AIFLONGEST)res) < 0 )
-				return -1;
-
-			*rd = d;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-			return 0;
-
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			return -1;
-		}
-		break;
-		/* case AIF_INTEGER */
-
-	case AIF_FLOATING:
-		bytes1 = _fds_count_bytes_na(f1);
-
-		switch ( FDSType(*f2) )
-		{
-		case AIF_ENUM:
-		case AIF_INTEGER:
-			bytes2 = _fds_count_bytes_na(f2);
-
-			if ( (bytes3 = _aif_int_to_aif_float(&d3, *d2, bytes2)) < 0 )
-				return -1;
-
-			if ( _aif_binary_op_float(op, rd, *d1, bytes1, d3, bytes3) < 0 )
-			{
-				_aif_free(d3);
-				return -1;
-			}
-
-			(*d1) += bytes1;
-			(*d2) += bytes2;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes2, bytes3)));
-
-			_aif_free(d3);
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-			
-		case AIF_FLOATING:
-			bytes2 = _fds_count_bytes_na(f2);
-
-			if ( _aif_binary_op_float(op, rd, *d1, bytes1, *d2, bytes2) < 0 )
-				return -1;
-
-			(*d1) += bytes1;
-			(*d2) += bytes2;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_FLOATING_TYPE(MAX(bytes1, bytes2)));
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		case AIF_VOID:
-			d = NULL;
-			res = 1;
-			if ( _longest_to_aif(&d, sizeof(int), (AIFLONGEST)res) < 0 )
-				return -1;
-
-			*rd = d;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-			return 0;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			return -1;
-		}
-		break;
-
-	case AIF_BOOLEAN:
-		bytes1 = _fds_count_bytes_na(f1);
-		bytes2 = _fds_count_bytes_na(f2);
-
-		switch ( FDSType(*f2) )
-		{
-		case AIF_BOOLEAN:
-			if ( _aif_binary_op_bool(op, rd, *d1, bytes1, *d2, bytes2) < 0 )
-				return -1;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_BOOLEAN_TYPE());
-
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			return -1;
-		}
-		break;
-
-	case AIF_CHARACTER:
-		bytes1 = _fds_count_bytes_na(f1);
-		bytes2 = _fds_count_bytes_na(f2);
-
-		switch ( FDSType(*f2) )
-		{
-		case AIF_INTEGER:
-			if ( _aif_binary_op_int(op, rd, *d1, bytes1, *d2, bytes2) < 0 )
-				return -1;
-
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(
-						FDSIsSigned(*f2),
-						MAX(bytes1, bytes2)));
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		case AIF_CHARACTER:
-			if ( _aif_binary_op_int(op, rd, *d1, bytes1, *d2, bytes2) < 0 )
-				return -1;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_CHARACTER_TYPE());
-
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		case AIF_VOID:
-			d = NULL;
-			res = 1;
-			if ( _longest_to_aif(&d, sizeof(int), (AIFLONGEST)res) < 0 )
-				return -1;
-
-			*rd = d;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-			return 0;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			return -1;
-		}
-		break;
-
-	case AIF_ARRAY:
-		{
-			AIFIndex *	ix1;
-			AIFIndex *	ix2;
-			char *		fmt1;
-			char *		fmt2;
-			char *		fres = NULL;
-			char *		dres = NULL;
-
-			if ( FDSType(*f2) != AIF_ARRAY )
-			{
-				if ( FDSType(*f2) == AIF_VOID )
-				{
-					d = NULL;
-					res = 1;
-					if ( _longest_to_aif(&d, sizeof(int), (AIFLONGEST)res) < 0 )
-						return -1;
-
-					*rd = d;
-
-					if ( *rf == NULL )
-						*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-					return 0;
-				}
-
-				SetAIFError(AIFERR_TYPE, NULL);
-				return -1;
-			}
-
-			ix1 = FDSArrayIndexInit(*f1);
-			ix2 = FDSArrayIndexInit(*f2);
-
-			if ( ix1->i_nel != ix2->i_nel )
-			{
-				SetAIFError(AIFERR_SIZE, NULL);
-				AIFArrayIndexFree(ix1);
-				AIFArrayIndexFree(ix2);
-				return -1;
-			}
-
-			if ( *rd == NULL )
-				*rd = (char *)_aif_alloc(BUFSIZ); /* no way to know how big! */
-
-			if ( *rf == NULL )
-				*rf = strdup(*f1);
-
-			_fds_advance(f1); /* skip over the entire array fds */
-			_fds_advance(f2);
-
-			/*
-			** If nel[12] > MAX_ADDRESS then we are not going to be
-			** able to address all the data in the array. What should
-			** we do?
-			*/
-
-			d = *rd; /* start of our data result region */
-
-			for ( i = 0 ; i < ix1->i_nel ; i++ )
-			{
-				char * tmp1;
-				char * tmp2;
-
-				if ( dres != NULL) 
-				{
-					_aif_free(dres);
-					dres = NULL;
-				}
-
-				if ( fres != NULL) 
-				{
-					_aif_free(fres);
-					fres = NULL;
-				}
-
-				fmt1 = ix1->i_btype;
-				fmt2 = ix2->i_btype;
-
-				if ( _aif_binary_op(op, &fres, &dres, &fmt1, d1, &fmt2, d2 ) < 0 )
-				{
-					AIFArrayIndexFree(ix1);
-					AIFArrayIndexFree(ix2);
-					return -1;
-				}
-
-				AIFArrayIndexInc(ix1);
-				AIFArrayIndexInc(ix2);
-
-				tmp1 = fres;
-				tmp2 = dres;
-				_fds_skip_data(&tmp1, &tmp2);
-				memcpy(d, dres, tmp2-dres);
-				d += (tmp2-dres);
-			}
-
-			{
-				char *t1, *t2;
-				int len;
-
-				t1 = _fds_base_type(*rf);
-				t2 = t1;
-				_fds_advance(&t2);
-
-				len = strlen(fres);
-				memmove(t1, fres, len);
-				t1 += len;
-
-				if ( *t2 != '\0' )
-				{
-					len = strlen(t2);
-					memmove(t1, t2, len+1);
-				}
-				else
-					*t1 = '\0';
-			}
-
-			_aif_free(fres);
-			_aif_free(dres);
-
-			fmt = *rf;
-			_fds_advance(&fmt);
-			*fmt = '\0';
-
-			AIFArrayIndexFree(ix1);
-			AIFArrayIndexFree(ix2);
-		}
-
-		return 0;
-
-	/* only works with the public section in AIF_STRUCT */
-	case AIF_STRUCT:
-		if ( FDSType(*f2) != AIF_STRUCT )
-		{
-			if ( FDSType(*f2) == AIF_VOID )
-			{
-				d = NULL;
-				res = 1;
-				if ( _longest_to_aif(&d, sizeof(int), (AIFLONGEST)res) < 0 )
-					return -1;
-
-				*rd = d;
-
-				if ( *rf == NULL )
-					*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-				return 0;
-			}
-
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-
-		if ( *rd == NULL )
-			*rd = (char *)_aif_alloc(BUFSIZ); /* no way to know how big! */
-
-		if ( *rf == NULL )
-			*rf = strdup(*f1); /* includes trailing junk.  bug. */
-
-		d = *rd; /* start of our data result region */
-
-		(*f1)++; /* past open brace */
-		(*f2)++; /* past open brace */
-
-		_fds_skipid(f1);
-		_fds_skipid(f2);
-
-		while ( **f1 != ';' )
-		{ /* do one field */
-
-			char * dres = NULL;
-			char * fres = NULL;
-			char * tmp1;
-			char * tmp2;
-
-			if (**f2 == ';') { /* f1 has more fields */
-				SetAIFError(AIFERR_TYPE, NULL);
-				return -1;
-			}
-
-			*f1 = strchr(*f1, FDS_STRUCT_FIELD_NAME_END) + 1; /* to start of field*/
-			*f2 = strchr(*f2, FDS_STRUCT_FIELD_NAME_END) + 1; /* to start of field*/
-			
-			fmt = *f1;
-
-			if ( _aif_binary_op(op, &fres, &dres, f1, d1, f2, d2 ) < 0 )
-				return -1; /* non-zero res means no need to look further */
-
-			tmp1 = fres;
-			tmp2 = dres;
-			_fds_skip_data(&tmp1, &tmp2);
-			memcpy(d, dres, tmp2-dres);
-			d += (tmp2-dres);
-
-			{
-				char *t1, *t2;
-				int len;
-
-				t1 = strstr(*rf, fmt);
-				t2 = t1;
-				_fds_advance(&t2);
-
-				len = strlen(fres);
-				memmove(t1, fres, len);
-				t1 += len;
-
-				if ( t1 != t2 )
-				{
-					len = strlen(t2);
-					memmove(t1, t2, len+1);
-				}
-			}
-
-			_aif_free(fres);
-			_aif_free(dres);
-
-			if ( **f1 == ',' )
-				(*f1)++;
-
-			if ( **f2 == ',' )
-				(*f2)++;
-		} /* one field */
-
-		if ( **f2 != ';' )
-		{ /* f2 has more fields */
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-
-		fmt = *rf;
-		_fds_advance(&fmt);
-		*fmt = '\0';
-
-		*f1 = strchr(*f1, '}') + 1; /* to start of field*/
-		*f2 = strchr(*f2, '}') + 1; /* to start of field*/
-
-		return 0;
-
-	case AIF_POINTER:
-		if ( FDSType(*f2) != AIF_POINTER )
-		{
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-		else
-		{
-			int    ret;
-			int    len;
-			int    fds_type;
-			char * tmp1;
-			char * tmp2;
-			char * ptr_type_1 = *d1;
-			char * ptr_type_2 = *d2;
-
-			char * target1 = _find_target(d1, 0);
-			char * target2 = _find_target(d2, MAX_VALUES_SEEN/2);
-
-			char * fres;
-			char * dres;
-
-			if ( target1 == 0 && target2 == 0 ) /* if it is NULL */
-			{
-				if ( *rf == NULL )
-				{
-					tmp2 = *f1;
-					tmp1 = tmp2;
-					_fds_advance(&tmp1);
-					len = tmp1 - tmp2;
-					*rf = _aif_alloc(sizeof(char)*len + 1);
-					strncpy(*rf, tmp2, len);
-					(*rf)[len] = '\0';
-				}
-
-				if ( *rd != NULL )
-					_aif_free(*rd);
-				*rd = _aif_alloc(1);
-				**rd = (char) 0;
-
-				_fds_advance(f1);
-				_fds_advance(f2);
-
-				return 0;
-			}
-
-			if ( *ptr_type_1 == AIF_PTR_REFERENCE ||
-			     *ptr_type_2 == AIF_PTR_REFERENCE )
-			{
-				if ( *rf == NULL )
-				{
-					tmp2 = (*ptr_type_1==AIF_PTR_REFERENCE)?						 	*f1 : *f2;
-
-					tmp1 = tmp2;
-					_fds_advance(&tmp1);
-					len = tmp1 - tmp2;
-					*rf = _aif_alloc(sizeof(char)*len + 1);
-					strncpy(*rf, tmp2, len);
-					(*rf)[len] = '\0';
-				}
-
-				if ( *rd != NULL )
-					_aif_free(*rd);
-				*rd = _aif_alloc(5); /* 1 + 4 (ptr name) */
-				
-				if (*ptr_type_1 == AIF_PTR_REFERENCE)
-				{
-					int i;
-					for ( i = 0; i < 5; i++) (*rd)[i] = ptr_type_1[i];
-				}
-				else
-				{
-					int i;
-					for ( i = 0; i < 5; i++) (*rd)[i] = ptr_type_2[i];
-				}
-
-				_fds_advance(f1);
-				_fds_advance(f2);
-
-				return 0;
-			}
-
-                        if ( target1 == 0 )     /* target1 is null, make
-                                                target2 as the result */
-                        {
-                                if ( *rf == NULL )
-                                {
-                                        tmp2 = *f2;
-                                        tmp1 = tmp2;
-                                        _fds_advance(&tmp1);
-                                        len = tmp1 - tmp2;
-                                        *rf = _aif_alloc(sizeof(char)*len + 1);
-                                        strncpy(*rf, tmp2, len);
-                                        (*rf)[len] = '\0';
-                                }
-
-                                if ( *rd != NULL )
-                                        _aif_free(*rd);
-
-                                {
-                                        char * _d1;
-                                        char * _d2;
-
-                                        _d2 = ptr_type_2;
-                                        _d1 = _d2;
-                                        tmp2 = *f2;
-                                        tmp1 = tmp2;
-                                        _fds_skip_data(&tmp1, &_d1);
-                                        len = _d1 - _d2;
-                                        *rd = _aif_alloc(sizeof(char)*len);
-                                        memcpy(*rd, _d2, len);
-                                }
-
-                                _fds_advance(f1);
-                                (*f2)++;
-                                _fds_skip_data(f2, d2);
-
-                                return 0;
-                        }
-
-                        if ( target2 == 0 )     /* target2 is null, make
-                                                target1 as the result */
-                        {
-                                if ( *rf == NULL )
-                                {
-                                        tmp2 = *f1;
-                                        tmp1 = tmp2;
-                                        _fds_advance(&tmp1);
-                                        len = tmp1 - tmp2;
-                                        *rf = _aif_alloc(sizeof(char)*len + 1);
-                                        strncpy(*rf, tmp2, len);
-                                        (*rf)[len] = '\0';
-                                }
-
-                                if ( *rd != NULL )
-                                        _aif_free(*rd);
-
-                                {
-                                        char * _d1;
-                                        char * _d2;
-
-                                        _d2 = ptr_type_1;
-                                        _d1 = _d2;
-                                        _d1 = _d2;
-                                        tmp2 = *f1;
-                                        tmp1 = tmp2;
-                                        _fds_skip_data(&tmp1, &_d1);
-                                        len = _d1 - _d2;
-                                        *rd = _aif_alloc(sizeof(char)*len);
-                                        memcpy(*rd, _d2, len);
-                                }
-
-                                _fds_advance(f2);
-                                (*f1)++;
-                                _fds_skip_data(f1, d1);
-
-                                return 0;
-                        }
-
-			(*f1)++;
-			(*f2)++;
-
-			if ( *rf == NULL )
-			{
-				*rf = _aif_alloc(BUFSIZ);
-				**rf = '\0';
-				strcat(*rf, "^");
-			}
-
-			if ( *rd != NULL )
-				_aif_free(*rd);
-			*rd = (char *)_aif_alloc(BUFSIZ);
-
-			if ( *ptr_type_1 == AIF_PTR_NAME )
-			{
-				int i;
-				for ( i = 0; i < 5; i++) (*rd)[i] = ptr_type_1[i];
-			}
-			else
-				**rd = (char) AIF_PTR_NORMAL;
-
-			dres = NULL;
-			fres = NULL;
-
-			fds_type = FDSType(*f1);
-			tmp1 = *f1;
-
-			ret = _aif_binary_op(op, &fres, &dres, f1, d1, f2, d2);
-
-			{
-				char * ff = fres;
-				char * dd = dres;
-
-				_fds_skip_data(&ff, &dd);
-
-				if ( *ptr_type_1 == AIF_PTR_NAME )
-					memcpy((*rd)+5, dres, dd-dres);
-				else
-					memcpy((*rd)+1, dres, dd-dres);
-
-				if ( fds_type == AIF_REFERENCE )
-				{
-					memcpy((*rf)+1, tmp1, *f1-tmp1);
-					(*rf)[1 + *f1 - tmp1] = '\0';
-				}
-				else if ( fds_type == AIF_NAME )
-				{
-					tmp2 = tmp1;
-					tmp2++;
-					tmp2 = _fds_skipnum(tmp2);
-					tmp2++;
-
-					memcpy((*rf)+1, tmp1, tmp2-tmp1);
-					(*rf)[1 + tmp2 - tmp1] = '\0';
-
-					strncat((*rf), fres, ff-fres+1);
-				}
-				else
-					strncat((*rf), fres, ff-fres+1);
-			}
-
-			return ret;
-
-		}
-
-	case AIF_STRING:
-		if ( FDSType(*f2) != AIF_STRING || op != AIFOP_ADD )
-		{
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-
-		(*f1)++; /* past "s" */
-		(*f2)++; /* past "s" */
-
-		bytes1 = (*(*d1)++ & 0xff) << 8;
-		bytes1 += *(*d1)++ & 0xff;
-		bytes2 = (*(*d2)++ & 0xff) << 8;
-		bytes2 += *(*d2)++ & 0xff;
-
-                if ( *rd != NULL )
-                        _aif_free(*rd);
-
-		d = _aif_alloc(bytes1 + bytes2 + 2);
-
-		d[0] = ((bytes1 + bytes2) >> 8) & 0xff;
-		d[1] = (bytes1 + bytes2) & 0xff;
-
-		memcpy(d+2, *d1, bytes1);
-		memcpy(d+2+bytes1, *d2, bytes2);
-
-		*d1 += bytes1;
-		*d2 += bytes2;
-
-		*rd = d;
-
-		if ( *rf == NULL )
-			*rf = strdup(AIF_STRING_TYPE());
-
-		return 0;
-
-	case AIF_VOID:
-		if ( FDSType(*f2) == AIF_VOID )
-		{
-			d = NULL;
-			res = 0;
-			if ( _longest_to_aif(&d, sizeof(int), (AIFLONGEST)res) < 0 )
-				return -1;
-
-			*rd = d;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-			return 0;
-		}
-		else
-		{
-			d = NULL;
-			res = 1;
-			if ( _longest_to_aif(&d, sizeof(int), (AIFLONGEST)res) < 0 )
-				return -1;
-
-			*rd = d;
-
-			if ( *rf == NULL )
-				*rf = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-			return 0;
-		}
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-}
-
-/*
- * Perform a unary operation. Argument can be integer or
- * floating point or structs or arrays resulting in such.
- * Advance the data and format pointers across the data.
- * Return 0 for success, -1 for failure.
- * Result in rd and rf.
- * If rd is null, we generate our own format and data strings.  It is
- * impossible to decide the proper length for the data for structured types; we
- * make wild guesses.  It's a bug.
- */
-int
-_aif_unary_op(aifop op, char **rf, char **rd, char **fds, char **data)
-{
-	int	i;
-	int	bytes;
-	char *	dp;
-
-	switch ( FDSType(*fds) )
-	{
-	case AIF_BOOLEAN:
-		bytes = _fds_count_bytes(fds);
-
-		if ( *rf == NULL )
-			*rf = strdup(AIF_BOOLEAN_TYPE());
-
-		if ( _aif_unary_op_bool(op, rd, *data, bytes) < 0 )
-			return -1;
-
-		(*data) += bytes;
-		return 0;
-
-	case AIF_ENUM:
-		dp = *fds;
-		bytes = _fds_count_bytes(fds);
-
-		if ( *rf == NULL )
-			*rf = strdup(AIF_INTEGER_TYPE(1, bytes));
-		else
-		{
-			char *t1, *t2;
-			int len;
-
-			t1 = strstr(*rf, dp);	
-
-			if ( t1 == NULL )
-			{
-				SetAIFError(AIFERR_CONV, NULL);
-				return -1;
-			}
-
-			t2 = _fds_base_type(t1);
-			len = strlen(t2);
-			memmove(t1, t2, len+1);
-		}
-
-		if ( _aif_unary_op_int(op, rd, *data, bytes) < 0 )
-			return -1;
-
-		(*data) += bytes;
-
-		return 0;
-
-	case AIF_INTEGER:
-		bytes = _fds_count_bytes_na(fds);
-
-		if ( *rf == NULL )
-			*rf = strdup(AIF_INTEGER_TYPE(FDSIsSigned(*fds), bytes));
-		_fds_advance(fds);
-
-		if ( _aif_unary_op_int(op, rd, *data, bytes) < 0 )
-			return -1;
-
-		(*data) += bytes;
-
-		return 0;
-
-	case AIF_FLOATING:
-		bytes = _fds_count_bytes(fds);
-
-		if ( *rf == NULL )
-			*rf = strdup(AIF_FLOATING_TYPE(bytes));
-
-		if ( _aif_unary_op_float(op, rd, *data, bytes) < 0 )
-			return -1;
-
-		(*data) += bytes;
-
-		return 0;
-
-	case AIF_ARRAY:
-		{
-			AIFIndex *	ix;
-			char *		fmt;
-			char *		fres = NULL;
-
-			ix = FDSArrayIndexInit(*fds);
-
-			if ( *rd == NULL )
-			{
-				*rd = (char *)_aif_alloc(ix->i_nel * ix->i_bsize); /* works unless we have subordinate lists */
-				*rf = strdup(*fds);
-			}
-
-			if ( *rf == NULL )
-				*rf = strdup(*fds);
-
-			_fds_advance(fds); /* skip over the entire array fds */
-
-			dp = *rd; /* start of our data result region */
-
-			for ( i = 0 ; i < ix->i_nel ; i++ )
-			{
-				if ( fres != NULL )
-				{
-					_aif_free(fres);
-					fres = NULL;
-				}
-
-				fmt = ix->i_btype;
-
-				if ( _aif_unary_op(op, &fres, &dp, &fmt, data) < 0 )
-				{
-					AIFArrayIndexFree(ix);
-					return -1;
-				}
-
-				dp += ix->i_bsize;
-
-				AIFArrayIndexInc(ix);
-			}
-
-                        {
-                                char *t1, *t2;
-                                int len;
-
-                                t1 = _fds_base_type(*rf);
-                                t2 = t1;
-                                _fds_advance(&t2);
-
-                                len = strlen(fres);
-                                memmove(t1, fres, len);
-                                t1 += len;
-
-                                if ( *t2 != '\0' )
-                                {
-                                        len = strlen(t2);
-                                        memmove(t1, t2, len+1);
-                                }
-                                else
-                                        *t1 = '\0';
-                        }
-
-
-			_aif_free(fres);
-
-			AIFArrayIndexFree(ix);
-
-			return 0;
-		}
-
-	/* only works with the public section in AIF_STRUCT */
-	case AIF_STRUCT:
-		if ( *rd == NULL )
-		{
-			*rd = (char *)_aif_alloc(BUFSIZ); /* no way to know how big! */
-			*rf = strdup(*fds); /* will include trailing junk.  Bug */
-		}
-
-		if ( *rf == NULL )
-			*rf = strdup(*fds);
-
-		(*fds)++; /* past open brace */
-		_fds_skipid(fds);
-
-		dp = *rd;
-
-		while ( **fds != ';' )
-		{
-			char * fres = NULL;
-			char * fmt;
-
-			*fds = strchr(*fds, FDS_STRUCT_FIELD_NAME_END) + 1; /*to start of field*/
-			fmt = *fds;
-
-			i = _fds_count_bytes_na(fds);
-
-			if ( _aif_unary_op(op, &fres, &dp, fds, data) < 0 )
-				return -1; /* non-zero res means no need to look further */
-
-			dp += i;
-
-                        {
-                                char *t1, *t2;
-                                int len;
-
-                                t1 = strstr(*rf, fmt);
-                                t2 = strstr(*rf, *fds);
-
-                                len = strlen(fres);
-                                memmove(t1, fres, len);
-                                t1 += len;
-
-                                if ( t1 != t2 )
-                                {
-                                        len = strlen(t2);
-                                        memmove(t1, t2, len+1);
-                                }
-                        }
-
-			_aif_free(fres);
-
-			if (**fds == ',') (*fds)++;
-		}
-
-		return 0;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	/* NOT REACHED */
-}
-
-AIF *
-_aif_unary(AIF *a, aifop op)
-{
-	char *	rd;
-	char *	rf;
-	char *	f;
-	char *	d;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-	
-	f = AIF_FORMAT(a);
-	d = AIF_DATA(a);
-
-	rf = NULL;
-	rd = _aif_alloc(AIF_LEN(a));
-
-	if ( _aif_unary_op(op, &rf, &rd, &f, &d) < 0 )
-		return (AIF *)NULL;
-
-	return MakeAIF(rf, rd);
-}
-
-AIF *
-AIFNot(AIF *a)
-{
-	return _aif_unary(a, AIFOP_NOT);
-}
-
-AIF *
-AIFNeg(AIF *a)
-{
-	return _aif_unary(a, AIFOP_NEG);
-}
-
-AIF *
-_aif_binary(AIF *a1, AIF *a2, aifop op)
-{
-	char *	rd;
-	char *	rf;
-	char *	f1;
-	char *	f2;
-	char *	d1;
-	char *	d2;
-
-	if ( a1 == (AIF *)NULL || a2 == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return NULL;
-	}
-
-	f1 = AIF_FORMAT(a1);
-	f2 = AIF_FORMAT(a2);
-	d1 = AIF_DATA(a1);
-	d2 = AIF_DATA(a2);
-
-	rf = NULL; /* we don't know result so let _aif_binary_op work it out */
-	rd = NULL;
-
-	if ( _aif_binary_op(op, &rf, &rd, &f1, &d1, &f2, &d2) < 0 )
-		return (AIF *)NULL;
-
-	return MakeAIF(rf, rd);
-}
-AIF *
-AIFAdd(AIF *a1, AIF *a2)
-{
-	return _aif_binary(a1, a2, AIFOP_ADD);
-}
-
-AIF *
-AIFSub(AIF *a1, AIF *a2)
-{
-	return _aif_binary(a1, a2, AIFOP_SUB);
-}
-
-AIF *
-AIFMul(AIF *a1, AIF *a2)
-{
-	return _aif_binary(a1, a2, AIFOP_MUL);
-} 
-
-AIF *
-AIFDiv(AIF *a1, AIF *a2)
-{
-	return _aif_binary(a1, a2, AIFOP_DIV);
-} 
-
-AIF *
-AIFRem(AIF *a1, AIF *a2)
-{
-	return _aif_binary(a1, a2, AIFOP_REM);
-} 
-
-AIF *
-AIFAnd(AIF *a1, AIF *a2)
-{
-	return _aif_binary(a1, a2, AIFOP_AND);
-} 
-
-AIF *
-AIFOr(AIF *a1, AIF *a2)
-{
-	return _aif_binary(a1, a2, AIFOP_OR);
-} 
-
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/cf/misc.m4 b/debug/org.eclipse.ptp.debug.sdm/libaif/cf/misc.m4
deleted file mode 100644
index b49c69d..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/cf/misc.m4
+++ /dev/null

@@ -1,8 +0,0 @@
-dnl $Id: misc.m4,v 1.1 2001/08/08 06:53:08 bam Exp $
-dnl
-AC_DEFUN([upcase],[`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`])dnl
-AC_DEFUN([CONFIG_HEADER],[AH_TOP([#ifndef RCSID
-#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
-#endif
-])])

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/cmp.c b/debug/org.eclipse.ptp.debug.sdm/libaif/cmp.c
deleted file mode 100644
index a073056..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/cmp.c
+++ /dev/null

@@ -1,2227 +0,0 @@
-/*
- * Routines for comparing AIF objects.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#include	<string.h>
-#include	<math.h>
-
-#include	"aif.h"
-#include	"aiferr.h"
-#include	"aifint.h"
-
-int
-AIFIsZero(AIF *a, int *val)
-{
-	char *	f;
-	char *	d;
-
-	if ( a == (AIF *)NULL || val == (int *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	f = AIF_FORMAT(a);
-	d = AIF_DATA(a);
-
-	return _aif_is_zero(&f, &d, AIF_LEN(a), val);
-}
-
-int
-_aif_is_zero(char **fds, char **data, int len, int *val)
-{
-	int		i;
-	int		nv;
-	int		bytes;
-	int		reg;
-	int		success;
-	char		c;
-	char *		target;
-	AIFIndex *	ix;
-	char *		fmt;
-	AIFDOUBLEST	v;
-
-	if ( **fds == FDS_NAME )
-	{
-		*fds = _fds_skipto(*fds, "/");
-		(*fds)++;
-	}
-
-	switch ( FDSType(*fds) )
-	{
-	case AIF_UNION:
-		bytes = FDSTypeSize(*fds);
-		*val = 1; /* zero unless shown otherwise */
-
-		(*fds)++; /* past open brace */
-
-		_fds_skipid(fds);
-
-		while ( **fds != FDS_UNION_END )
-		{
-			*fds = strchr(*fds, FDS_UNION_FIELD_NAME_END) + 1; /* to start of field */
-
-                	if ( (i = FDSTypeSize(*fds)) < 0 )
-				return -1;
-                	fmt = _aif_alloc( sizeof(char) * i );
-                	target = fmt;
-                	memcpy(target, *data, i);
-
-			if ( _aif_is_zero(fds, &target, len, val) < 0 )
-			{
-				_aif_free(fmt);
-				return -1;
-			}
-
-			if ( *val == 0 )
-				return 0; /* zero res means no need to look further */
-			if ( **fds == FDS_UNION_FIELD_SEP )
-				(*fds)++;
-		}
-
-		*fds = strchr(*fds, FDS_STRUCT_END) + 1; /*past close brace*/
-		*data += bytes;
-
-		return 0;
-
-	case AIF_ENUM:
-		*fds = _fds_base_type(*fds);
-		bytes = _fds_count_bytes(fds);
-		*val = _aif_int_is_zero(*data, bytes);
-		(*data) += bytes;
-
-		return 0;
-
-	case AIF_POINTER:
-		reg = (**data < (char) AIF_PTR_REFERENCE); /* data not a reference */
-
-		(*fds)++; /* past ^ */
-
-		target = _find_target(data, 0);
-
-		if ( target == 0 )
-		{
-			/*
-			** null pointer.  We call it equivalent to 0
-			*/
-			*val = 1;
-			_fds_advance(fds); /* skip over the target fds */
-			return 0; /* but we fail to find it. */
-		}
-
-		success = _aif_is_zero(fds, &target, len, val);
-
-		if ( reg )
-			*data = target; /* otherwise _find_target advanced for us */
-		return success;
-
-	case AIF_CHARACTER:
-		bytes = _fds_count_bytes(fds);
-
-		if ( _aif_to_char(*data, &c) < 0 )
-			return -1;
-
-		*val = (c == '\0');
-		(*data) += bytes;
-
-		return 0;
-
-	case AIF_INTEGER:
-	case AIF_BOOLEAN: /* if it is FALSE, val = 1, if it is TRUE, val = 0 */
-		bytes = _fds_count_bytes(fds);
-		*val = _aif_int_is_zero(*data, bytes);
-		(*data) += bytes;
-
-		return 0;
-
-	case AIF_FLOATING:
-		bytes = _fds_count_bytes(fds);
-
-		if ( _aif_to_doublest(*data, bytes, &v) < 0 )
-			return -1;
-
-		*val = (v == (AIFDOUBLEST)0.0L);
-		(*data) += bytes;
-
-		return 0;
-
-	case AIF_ARRAY:
-		ix = FDSArrayIndexInit(*fds);
-
-		_fds_advance(fds); /* skip over the entire array fds */
-
-		for ( i = 0 ; i < ix->i_nel ; i++ )
-		{
-			fmt = ix->i_btype;
-
-			if ( _aif_is_zero(&fmt, data, ix->i_bsize, &nv) < 0 )
-				return -1;
-
-			if ( nv == 0 ) /* no need to look further */
-			{
-				*val = 0;
-				return 0;
-			}
-		}
-
-		AIFArrayIndexFree(ix);
-
-		*val = 1;
-
-		return 0;
-
-	/*
-	** only uses the public section in AIF_STRUCT 
-	*/
-	case AIF_STRUCT:
-		*val = 1; /* zero unless shown otherwise */
-
-		(*fds)++; /* past open brace */
-		_fds_skipid(fds);
-
-		while ( **fds != FDS_STRUCT_ACCESS_SEP )
-		{
-			*fds = strchr(*fds, FDS_STRUCT_FIELD_NAME_END) + 1; /* to start of field */
-
-			if ( _aif_is_zero(fds, data, len, val) < 0 )
-				return -1;
-
-			if ( *val == 0 )
-				return 0; /* zero res means no need to look further */
-			if ( **fds == FDS_STRUCT_FIELD_SEP )
-				(*fds)++;
-		}
-
-		*fds = strchr(*fds, FDS_STRUCT_END) + 1; /*past close brace*/
-
-		return 0;
-
-	case AIF_STRING:
-		(*fds)++; /* past "s" */
-		bytes = (*(*data)++ & 0xff) << 8;
-		bytes += *(*data)++ & 0xff;
-		
-		*data += bytes;
-
-		*val = (bytes == 0);
-
-		return 0;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-}
-
-int
-_aif_int_is_zero(char *data, int len)
-{
-	int	i;
-
-	for ( i = 0 ; i < len ; i++ )
-		if ( (int)*data++ != 0 )
-			return 0;
-
-	return 1;
-}
-
-/*
- * Compare types of two AIF values. Return true if they are equivalent,
- * false if not.
- */
-int
-AIFTypeCompare(AIF *a1, AIF *a2)
-{
-	return FDSTypeCompare(AIF_FORMAT(a1), AIF_FORMAT(a2));
-}
-
-int
-AIFCompare(int depth, AIF *a1, AIF *a2, int *res)
-{
-	char *	f1;
-	char *	f2;
-	char *	d1;
-	char *	d2;
-
-	if ( a1 == (AIF *)NULL || a2 == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	f1 = AIF_FORMAT(a1);
-	f2 = AIF_FORMAT(a2);
-	d1 = AIF_DATA(a1);
-	d2 = AIF_DATA(a2);
-
-	return _aif_compare(depth, res, &f1, &d1, &f2, &d2);
-}
-
-int
-_aif_cmp_int(int *res, char *d1, int l1, char *d2, int l2)
-{
-	int	i;
-	char *	r1;
-	char *	r2;
-
-	r1 = (char *)_aif_alloc(l2);
-
-	_aif_neg_int(r1, d2, l2);
-
-	r2 = (char *)_aif_alloc(MAX(l1, l2));
-
-	_aif_add_int(r2, d1, l1, r1, l2);
-
-	_aif_free(r1);
-
-	if ( *r2 & 0x80 )
-	{
-		/*
-		** negative result => a < b
-		*/
-		_aif_free(r2);
-		*res = -1;
-		return 0;
-	}
-
-	/*
-	** Check for zero
-	*/
-
-	for ( i = 0 ; i < MAX(l1, l2) ; i++ )
-	{
-		if ( r2[i] != 0x0 )
-		{
-			/*
-			** positive result => a > b
-			*/
-			_aif_free(r2);
-			*res = 1;
-			return 0;
-		}
-	}
-
-	/*
-	** zero result => a = b
-	*/
-	_aif_free(r2);
-	*res = 0;
-	return 0;
-}
-
-int
-_aif_cmp_float(int *res, char *d1, int l1, char *d2, int l2)
-{
-	AIFDOUBLEST	v1;
-	AIFDOUBLEST	v2;
-
-	if
-	(
-		_aif_to_doublest(d1, l1, &v1) < 0
-		||
-		_aif_to_doublest(d2, l2, &v2) < 0
-	)
-		return -1;
-
-	if ( v1 < v2 )
-		*res = -1;
-	else if ( v1 > v2 )
-		*res = 1;
-	else
-		*res = 0;
-
-	return 0;
-}
-
-int
-_aif_cmp_char(int *res, char *d1, char *d2)
-{
-	char	v1;
-	char	v2;
-
-	if
-	(
-		_aif_to_char(d1, &v1) < 0
-		||
-		_aif_to_char(d2, &v2) < 0
-	)
-		return -1;
-
-	if ( v1 < v2 )
-		*res = -1;
-	else if ( v1 > v2 )
-		*res = 1;
-	else
-		*res = 0;
-
-	return 0;
-}
-
-/*
- * data points to the data part of an AIF, starting at the format byte.
- *  0 means null
- *  1 means ordinary pointer
- *  2 means ordinary pointer, named
- *  3 means refer to existing name
- *
- * We save any names we see.  We offset the index for saving/retrieving 
- * values by "offset" in order to simultaneously maintain targets for multiple 
- * AIFs.  We return a pointer to the data region where the value actually 
- * starts, or 0 if null.  We also advance the data pointer past the initial 
- * code (and name if present).
- */
-
-char *
-_find_target(char **data, int offset)
-{
-	int	name;
-	char	code = **data;
-
-	(*data)++; /* past the code */
-
-	switch ( code )
-	{
-	case AIF_PTR_NIL:
-		return (char) 0;
-
-	case AIF_PTR_NORMAL: /* unadorned value */
-		return *data;
-
-	case AIF_PTR_NAME: /* named value */
-		_ptrname_to_int(*data, &name);
-		(*data) += 4; /* past the name */
-		_aif_values_seen[name+offset] = *data;
-
-		return *data;
-
-	case AIF_PTR_REFERENCE: /* reference to named value */
-		_ptrname_to_int(*data, &name);
-		(*data) += 4; /* past the name */
-
-		return _aif_values_seen[name+offset];
-	}
-
-	return 0; /* if we fall through, no target to be found */
-}
-
-/*
- * Compare two AIF values. 
- *
- * For numeric values, sets res to:
- *
- *      -1 if d1 < d2
- *       0 if d1 == d2
- *       1 if d1 > d2
- *
- * For other values, sets res to:
- *
- *       0 if d1 == d2
- *       1 if d1 != d2
- *
- * For array type, res is 0 if all elements are equal, 1 otherwise.
- * The parameters f1, d1, f2, d2 are advanced through their structures; on
- * return, they are in the position following the relevant parts.
- * The return value is negative if there is a type failure.
- */
-int
-_aif_compare(int depth, int *res, char **f1, char **d1, char **f2, char **d2)
-{
-	int		i;
-	int		l3;
-	int		success; /* value to return indicating type match */
-	int		bytes1;
-	int		bytes2; /* number of bytes in arithmetic data */
-	char *		fmt;
-	char *		d3 = NULL;
-	AIFIndex *	ix1;
-	AIFIndex *	ix2;
-	AIFLONGEST	val1;
-	AIFLONGEST	val2;
-
-	/* these cmp_by_name, f2_x* and d2_x* are used by 'case AIF_STRUCT' */
-	int	cmp_by_name = 0;
-	char *	f2_x1;
-	char *	f2_x2;
-	char *	d2_x1;
-	char *	d2_x2;
-
-	ResetAIFError();
-
-	/*
-	** resolve names and references first
-	*/
-	_fds_resolve(f1);
-	_fds_resolve(f2);
-
-	if ( FDSType(*f1) == AIF_REFERENCE )
-	{
-		fmt = _fds_lookup(f1);
-		return _aif_compare(depth, res, &fmt, d1, f2, d2);
-	}
-
-	if ( FDSType(*f2) == AIF_REFERENCE )
-	{
-		fmt = _fds_lookup(f2);
-		return _aif_compare(depth, res, f1, d1, &fmt, d2);
-	}
-
-	switch ( FDSType(*f1) )
-	{
-	case AIF_POINTER:
-		(*f1)++;
-
-		if ( FDSType(*f2) == AIF_POINTER )
-		{
-			int	reg1 = (**d1 < (char) 3);
-			int	reg2 = (**d2 < (char) 3);
-			char *	target1 = _find_target(d1, 0);
-			char *	target2 = _find_target(d2, MAX_VALUES_SEEN/2);
-
-			(*f2)++;
-
-			if ( depth == -1 )
-			{
-				*res = 0;
-
-				if ( target1 == 0 )
-					_fds_advance(f1);
-				else if ( !reg1 )
-					_fds_advance(f1);
-				else
-					_fds_skip_data(f1, d1);
-
-				if ( target2 == 0 )
-					_fds_advance(f2);
-				else if ( !reg2 )
-					_fds_advance(f2);
-				else
-					_fds_skip_data(f2, d2);
-				
-				return 0;
-			}
-			else if ( depth == 1 )
-				depth = -1;
-			else if ( depth > 1 )
-				depth--;
-
-			if ( !reg1 && !reg2 )
-			{
-				/*
-				** both parameters refer to elsewhere in the
-				** data.  To avoid infinite loop, we just call 
-				** them equal.
-				*/
-
-				_fds_advance(f1);
-				_fds_advance(f2);
-
-				*res = 0;
-
-				return 0;
-			}
-			else if ( reg1 ^ reg2 )
-			{
-				/*
-				** only one parameter refers elsewhere.
-				** Under our strict interpretation, the data 
-				** are different.
-				*/
-				_fds_advance(f1);
-				_fds_advance(f2);
-
-				*res = 0;
-
-				SetAIFError(AIFERR_CONV, NULL);
-
-				return -1;
-			}
-			else if ( !target1 && !target2 )
-			{
-				/*
-				** both d1 and d2 are null
-				*/
-				_fds_advance(f1);
-				_fds_advance(f2);
-
-				*res = 0;
-
-				return 0;
-			}
-			else if ( (target1 == 0) ^ (target2 == 0) )
-			{
-				/* 
-				** only one null l
-				*/
-				_fds_advance(f1);
-				_fds_advance(f2);
-
-				/*
-				** fudge an answer
-				*/
-				*res = (target1 == 0) ? -1 : 1;
-
-				/*
-				** but it is a type mismatch
-				*/
-				SetAIFError(AIFERR_CONV, NULL);
-
-				return -1;
-			}
-
-			/* 
-			** both point to something real. 
-			*/
-
-			success = _aif_compare(depth, res, f1, &target1, f2, &target2);
-
-			if ( reg1 )
-				*d1 = target1;
-
-			if ( reg2 )
-				*d2 = target2;
-
-			return success;
-		}
-		else
-		{
-			/*
-			** incompatible types
-			*/
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-
-	case AIF_UNION:
-		bytes1 = FDSTypeSize(*f1);
-		bytes2 = FDSTypeSize(*f2);
-
-		if ( FDSType(*f2) != AIF_UNION )
-		{
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-
-		(*f1)++; /* past open brace */
-		(*f2)++; /* past open brace */
-		_fds_skipid(f1);
-		_fds_skipid(f2);
-
-		*res = 0; /* first assumption, they are equal */
-
-		while ( **f1 != FDS_UNION_END )
-		{
-			int size1, size2;
-			char *temp1, *temp2, *data1, *data2;
-
-			if ( **f2 == FDS_UNION_END )
-			{ 
-				/* 
-				** f1 has more fields
-				*/
-				SetAIFError(AIFERR_CONV, NULL);
-
-				*res = 1; /* in a sense, d1 > d2 */
-
-				return -1;
-			}
-
-			*f1 = strchr(*f1, FDS_UNION_FIELD_NAME_END) + 1;
-			*f2 = strchr(*f2, FDS_UNION_FIELD_NAME_END) + 1;
-			
-			size1 = FDSTypeSize(*f1);
-			size2 = FDSTypeSize(*f2);
-			temp1 = _aif_alloc( sizeof(char) * size1 );
-			temp2 = _aif_alloc( sizeof(char) * size2 );
-			data1 = temp1;
-			data2 = temp2;
-			memcpy(data1, *d1, size1);
-			memcpy(data2, *d2, size2);
-
-			success = _aif_compare(depth, res, f1, &data1, f2, &data2);
-			_aif_free(temp1);
-			_aif_free(temp2);
-
-			/*
-			** non-zero res means no need to look further
-			*/
-			if ( *res )
-				return 0;
-
-			if ( **f1 == FDS_UNION_FIELD_SEP )
-				(*f1)++;
-
-			if ( **f2 == FDS_UNION_FIELD_SEP )
-				(*f2)++;
-		}
-
-		if ( **f2 != FDS_UNION_END )
-		{
-			/*
-			** f2 has more fields 
-			*/
-			SetAIFError(AIFERR_CONV, NULL);
-
-			*res = -1; /* in a sense, d1 < d2 */
-			
-			return -1;
-		}
-
-		*f1 = strchr(*f1, FDS_UNION_END) + 1; /*past close brace*/
-		*f2 = strchr(*f2, FDS_UNION_END) + 1; /*past close brace*/
-		*d1 += bytes1;
-		*d2 += bytes2;
-
-		return 0;
-
-	case AIF_ENUM:
-		switch ( FDSType(*f2) )
-		{
-		case AIF_ENUM:
-			*f1 = _fds_base_type(*f1);
-			*f2 = _fds_base_type(*f2);
-
-			bytes1 = _fds_count_bytes(f1);
-			bytes2 = _fds_count_bytes(f2);
-
-			success = _aif_cmp_int(res, *d1, bytes1, *d2, bytes2);
-
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			return success;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-		break;
-
-	case AIF_INTEGER:
-		switch ( FDSType(*f2) )
-		{
-		case AIF_INTEGER:
-			bytes1 = _fds_count_bytes(f1);
-			bytes2 = _fds_count_bytes(f2);
-
-			success = _aif_cmp_int(res, *d1, bytes1, *d2, bytes2);
-
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			return success;
-
-		case AIF_FLOATING:
-			bytes1 = _fds_count_bytes(f1);
-			l3 = _aif_int_to_aif_float(&d3, *d1, bytes1);
-			*d1 += bytes1;
-
-			if ( l3 < 0 )
-			{
-				*res = 1;
-				return -1;
-			}
-
-			bytes2 = _fds_count_bytes(f2);
-			success = _aif_cmp_float(res, d3, l3, *d2, bytes2);
-			*d2 += bytes2;
-
-			return success;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-		break;
-
-	case AIF_FLOATING:
-		switch ( FDSType(*f2) )
-		{
-		case AIF_INTEGER:
-			bytes2 = _fds_count_bytes(f2);
-			l3 = _aif_int_to_aif_float(&d3, *d2, bytes2);
-			*d2 += bytes2;
-
-			if ( l3 < 0 )
-			{
-				*res = 1;
-				return -1;
-			}
-
-			bytes1 = _fds_count_bytes(f1);
-			success = _aif_cmp_float(res, *d1, bytes1, d3, l3);
-			*d1 += bytes1;
-
-			return success;
-			
-		case AIF_FLOATING:
-			bytes1 = _fds_count_bytes(f1);
-			bytes2 = _fds_count_bytes(f2);
-
-			success = _aif_cmp_float(res, *d1, bytes1, *d2, bytes2);
-
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			return success;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-		break;
-
-	case AIF_CHARACTER:
-		switch ( FDSType(*f2) )
-		{
-		case AIF_CHARACTER:
-			bytes1 = _fds_count_bytes(f1);
-			bytes2 = _fds_count_bytes(f2);
-
-			success = _aif_cmp_char(res, *d1, *d2);
-
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			return success;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-		break;
-
-	case AIF_ARRAY:
-		switch ( FDSType(*f2) )
-		{
-		case AIF_ARRAY:
-			ix1 = FDSArrayIndexInit(*f1);
-			ix2 = FDSArrayIndexInit(*f2);
-
-			/* 
-			** skip over the entire array fds
-			*/
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			*res = 0; /* first assumption, they are equal */
-
-			if ( ix1->i_nel != ix2->i_nel )
-			{
-				SetAIFError(AIFERR_SIZE, NULL);
-				AIFArrayIndexFree(ix1);
-				AIFArrayIndexFree(ix2);
-
-				*res = 1;
-				return -1;
-			}
-
-			for ( i = 0 ; i < ix1->i_nel ; i++ )
-			{
-				char *	fmt1;
-				char *	fmt2;
-
-				fmt1 = ix1->i_btype;
-				fmt2 = ix2->i_btype;
-
-				success = _aif_compare(depth, res, &fmt1, d1, &fmt2, d2);
-				if ( success < 0 )
-				{
-					AIFArrayIndexFree(ix1);
-					AIFArrayIndexFree(ix2);
-					/* Do not need to set 'res' here,
-					 * It's already set from the call
-					 * to _aif_compare()
-					 */
-					return -1;
-				}
-
-				if ( *res != 0 )
-				{
-					/* 
-					** no need to continue
-					*/
-					AIFArrayIndexFree(ix1);
-					AIFArrayIndexFree(ix2);
-					return 0;
-				}
-			}
-
-			AIFArrayIndexFree(ix1);
-			AIFArrayIndexFree(ix2);
-
-			return 0;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-
-	/*
-	** only uses the public section in AIF_STRUCT
-	*/
-	case AIF_STRUCT:
-		/* 
-		** structure equivalence: we ignore field names
-		*/
-
-		if ( FDSType(*f2) != AIF_STRUCT )
-		{
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-
-		if ( AIFGetOption(AIFOPT_CMP_METHOD) == AIF_CMP_BY_NAME )
-		{	
-			cmp_by_name = 1;
-			f2_x1 = *f2;
-			d2_x1 = *d2;
-			f2_x2 = NULL;
-			d2_x2 = NULL;
-			_fds_skip_data(&f2_x1, &d2_x1);
-			if ( _fds_struct_arrange(*f1, *f2, *d2, &f2_x2, &d2_x2) < 0 )
-			{
-				SetAIFError(AIFERR_CONV, NULL);
-				*res = 1;
-				return -1;
-			}
-
-			*f2 = f2_x2; 
-			*d2 = d2_x2;
-			/* at the end, we assign f2_x1 to f2, d2_x1 to d2,
-			** and we free f2_x2 and d2_x2 */
-		}
-
-		(*f1)++; /* past open brace */
-		(*f2)++; /* past open brace */
-		_fds_skipid(f1);
-		_fds_skipid(f2);
-
-		*res = 0; /* first assumption, they are equal */
-
-		while ( **f1 != FDS_STRUCT_ACCESS_SEP )
-		{
-			if ( **f2 == FDS_STRUCT_ACCESS_SEP )
-			{ 
-				/* 
-				** f1 has more fields
-				*/
-				SetAIFError(AIFERR_CONV, NULL);
-
-				*res = 1; /* in a sense, d1 > d2 */
-
-				if (cmp_by_name == 1)
-				{
-					_aif_free(f2_x2);
-					_aif_free(d2_x2);
-					*f2 = f2_x1;
-					*d2 = d2_x1;
-				}
-				return -1;
-			}
-
-			*f1 = strchr(*f1, FDS_STRUCT_FIELD_NAME_END) + 1; /* to start of field */
-			*f2 = strchr(*f2, FDS_STRUCT_FIELD_NAME_END) + 1; /* to start of field */
-
-			success = _aif_compare(depth, res, f1, d1, f2, d2);
-
-			if ( success < 0 )
-			{
-				if (cmp_by_name == 1)
-				{
-					_aif_free(f2_x2);
-					_aif_free(d2_x2);
-					*f2 = f2_x1;
-					*d2 = d2_x1;
-				}
-				/* Do not need to set 'res' here,
-				 * It's already set from the call
-				 * to _aif_compare()
-				 */
-				return -1;
-			}
-
-			/*
-			** non-zero res means no need to look further
-			*/
-			if ( *res )
-			{
-				if (cmp_by_name == 1)
-				{
-					_aif_free(f2_x2);
-					_aif_free(d2_x2);
-					*f2 = f2_x1;
-					*d2 = d2_x1;
-				}
-				return 0;
-			}
-
-			if ( **f1 == FDS_STRUCT_FIELD_SEP )
-				(*f1)++;
-
-			if ( **f2 == FDS_STRUCT_FIELD_SEP )
-				(*f2)++;
-		}
-
-		if ( **f2 != FDS_STRUCT_ACCESS_SEP )
-		{
-			/*
-			** f2 has more fields 
-			*/
-			SetAIFError(AIFERR_CONV, NULL);
-
-			*res = -1; /* in a sense, d1 < d2 */
-			
-			if (cmp_by_name == 1)
-			{
-				_aif_free(f2_x2);
-				_aif_free(d2_x2);
-				*f2 = f2_x1;
-				*d2 = d2_x1;
-			}
-			return -1;
-		}
-
-		*f1 = strchr(*f1, FDS_STRUCT_END) + 1; /*past close brace*/
-		*f2 = strchr(*f2, FDS_STRUCT_END) + 1; /*past close brace*/
-
-		if (cmp_by_name == 1)
-		{
-			_aif_free(f2_x2);
-			_aif_free(d2_x2);
-			*f2 = f2_x1;
-			*d2 = d2_x1;
-		}
-		return 0;
-
-	case AIF_STRING:
-		if ( FDSType(*f2) != AIF_STRING )
-		{
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-
-		(*f1)++; /* past "s" */
-		(*f2)++; /* past "s" */
-
-		bytes1 = (*(*d1)++ & 0xff) << 8;
-		bytes1 += *(*d1)++ & 0xff;
-		bytes2 = (*(*d2)++ & 0xff) << 8;
-		bytes2 += *(*d2)++ & 0xff;
-
-		*res = strncmp(*d1, *d2, MIN(bytes1, bytes2));
-
-		*d1 += bytes1;
-		*d2 += bytes2;
-
-		if ( *res )
-			return 0;
-
-		if ( bytes1 == bytes2 )
-		{
-			/* 
-			** they are the same in length and contents
-			*/
-			return 0;
-		}
-		else
-		{
-			/*
-			** they start the same, but one is longer
-			*/
-			*res = (bytes1 < bytes2) ? -1 : 1;
-			return 0;
-		}
-
-	case AIF_BOOLEAN:
-		bytes1 = _fds_count_bytes_na(f1);
-		bytes2 = _fds_count_bytes_na(f2);
-
-		switch ( FDSType(*f2) )
-		{
-		case AIF_BOOLEAN:
-			_aif_to_longest(*d1, bytes1, &val1);
-			_aif_to_longest(*d2, bytes2, &val2);
-
-			if( val1 == val2)
-				*res = 0;
-			else
-				*res = 1;
-			
-			*d1 += bytes1;
-			*d2 += bytes2;
-
-			_fds_advance(f1);
-			_fds_advance(f2);
-
-			return 0;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			*res = 1;
-			return -1;
-		}
-
-	case AIF_VOID:
-		if ( FDSType(*f2) == AIF_VOID )
-			*res = 0;
-		else
-			*res = 1;
-
-		return 0;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		*res = 1;
-		return -1;
-	}
-}
-
-int
-_aif_eps(char *lo_fds, char *lo_data, int lo_len, char *hi_fds, char *hi_data, int hi_len, char *a_fds, char *a_data, int a_len, int *val)
-{
-	int		ft;
-	char *		fds_ref;	
-
-	int		lo_i, hi_i, a_i;
-	double		lo_d, hi_d, a_d;
-
-	AIFLONGEST	lo_ll, hi_ll, a_ll;
-	AIFDOUBLEST	lo_dd, hi_dd, a_dd;
-
-	ResetAIFError();
-
-	_fds_resolve(&a_fds);
-
-	if ( FDSType(a_fds) == AIF_REFERENCE )
-	{
-		fds_ref = _fds_lookup(&a_fds);
-		return _aif_eps(lo_fds, lo_data, lo_len, hi_fds, hi_data, hi_len, fds_ref, a_data, a_len, val);
-	}
-
-	switch ( ft = FDSType(a_fds) )
-	{
-	case AIF_BOOLEAN:
-
-		if ( FDSType(lo_fds) != AIF_BOOLEAN )
-		{	
-			SetAIFError(AIFERR_BADARG, NULL);
-		 	return -1;
-		}
-
-		if ( _aif_to_longest(lo_data, lo_len, &lo_ll) < 0 ||
-		     _aif_to_longest(a_data, a_len, &a_ll) < 0 )
-			return -1;
-
-		lo_i = (int) lo_ll;
-		hi_i = (int) hi_ll;
-		a_i = (int) a_ll;
-
-		if ( lo_i == 0 && a_i == 0 )
-			*val = -1;
-		else if ( lo_i == -1 && a_i == 0 )
-			*val = 0;
-		else if ( a_i == -1 )
-			*val = 1;
-
-		return 0;
-		
-	case AIF_INTEGER:
-	case AIF_CHARACTER:
-	case AIF_ENUM:
-		
-		if ( FDSType(lo_fds) != ft ||
-		     FDSType(hi_fds) != ft )
-		{	
-			SetAIFError(AIFERR_BADARG, NULL);
-	 		return -1;
-		}
-
-		if ( _aif_to_longest(lo_data, lo_len, &lo_ll) < 0 ||
-		     _aif_to_longest(a_data, a_len, &a_ll) < 0 ||
-		     _aif_to_longest(hi_data, hi_len, &hi_ll) < 0 )
-			return -1;
-
-		lo_i = (int) lo_ll;
-		hi_i = (int) hi_ll;
-		a_i = (int) a_ll;
-
-		if ( a_i < lo_i )
-			*val = -1;
-		else if ( lo_i <= a_i && a_i <= hi_i )
-			*val = 0;
-		else if (a_i > hi_i )
-			*val = 1;
-
-		return 0;
-
-	case AIF_STRING:
-
-		if ( FDSType(lo_fds) != AIF_STRING ||
-		     FDSType(hi_fds) != AIF_STRING )
-		{	
-			SetAIFError(AIFERR_BADARG, NULL);
-	 		return -1;
-		}
-
-		if ( _aif_to_longest(lo_data + 2, lo_len - 2, &lo_ll) < 0 ||
-		     _aif_to_longest(a_data + 2, a_len - 2, &a_ll) < 0 ||
-		     _aif_to_longest(hi_data + 2, hi_len - 2, &hi_ll) < 0 )
-			return -1;
-
-		lo_i = (int) lo_ll;
-		hi_i = (int) hi_ll;
-		a_i = (int) a_ll;
-
-		if ( a_i < lo_i )
-			*val = -1;
-		else if ( lo_i <= a_i && a_i <= hi_i )
-			*val = 0;
-		else if (a_i > hi_i )
-			*val = 1;
-
-		return 0;
-
-	case AIF_FLOATING:
-		
-		if ( FDSType(lo_fds) != AIF_FLOATING ||
-		     FDSType(hi_fds) != AIF_FLOATING )
-		{	
-			SetAIFError(AIFERR_BADARG, NULL);
-	 		return -1;
-		}
-
-		if ( _aif_to_doublest(lo_data, lo_len, &lo_dd) < 0 ||
-		     _aif_to_doublest(a_data, a_len, &a_dd) < 0 ||
-		     _aif_to_doublest(hi_data, hi_len, &hi_dd) < 0 )
-			return -1;
-
-		lo_d = (int) lo_dd;
-		hi_d = (int) hi_dd;
-		a_d = (int) a_dd;
-
-		if ( a_d < lo_d )
-			*val = -1;
-		else if ( lo_d <= a_d && a_d <= hi_d )
-			*val = 0;
-		else if (a_d > hi_d )
-			*val = 1;
-
-		return 0;
-
-	case AIF_ARRAY:
-		{
-			int 		tmp, i;
-			AIFIndex *	ix;
-
-			char *		t_fmt;
-			char *		t_dt1;
-			char *		t_dt2;
-			int		t_len;
-
-			ix = FDSArrayIndexInit(a_fds);
-
-			t_dt1 = a_data;
-
-			for ( i = 0 ; i < ix->i_nel ; i++ )
-			{
-	
-				t_fmt = ix->i_btype;
-				t_dt2 = t_dt1;
-
-				_fds_skip_data(&t_fmt, &t_dt1);
-				t_len = t_dt1 - t_dt2;
-
-				if ( _aif_eps(lo_fds, lo_data, lo_len, hi_fds, hi_data, hi_len, ix->i_btype, t_dt2, t_len, &tmp) < 0 )
-				{
-					AIFArrayIndexFree(ix);
-					return -1;
-				}
-
-				if ( tmp == 0 || tmp == 1 )
-				{
-					AIFArrayIndexFree(ix);
-					*val = tmp;
-					return 0;
-				}
-			}
-
-			AIFArrayIndexFree(ix);
-			*val = -1;
-			return 0;
-		}
-
-	/* only works with the public section in AIF_STRUCT */
-	case AIF_STRUCT:
-		{
-			int 		tmp;
-
-			char *		t_ft1;
-			char *		t_ft2;
-			char *		t_dt1;
-			char *		t_dt2;
-			int		t_len;
-
-			a_fds++;
-			_fds_skipid(&a_fds);
-
-			t_dt1 = a_data;
-			t_ft1 = a_fds;
-
-			while ( *t_ft1 != ';' )
-			{
-	
-				t_ft1 = strchr(t_ft1, FDS_STRUCT_FIELD_NAME_END) + 1;
-
-				t_dt2 = t_dt1;
-				t_ft2 = t_ft1;
-
-				_fds_skip_data(&t_ft1, &t_dt1);
-				t_len = t_dt1 - t_dt2;
-
-				if ( _aif_eps(lo_fds, lo_data, lo_len, hi_fds, hi_data, hi_len, t_ft2, t_dt2, t_len, &tmp) < 0 )
-				{
-					return -1;
-				}
-
-				if ( tmp == 0 || tmp == 1 )
-				{
-					*val = tmp;
-					return 0;
-				}
-			}
-
-			*val = -1;
-			return 0;
-		}
-
-	case AIF_POINTER:
-		{
-			char *	target = _find_target(&a_data, 0);
-			int	tmp;
-
-			a_fds++;
-			a_len--;
-
-			if ( _aif_eps(lo_fds, lo_data, lo_len, hi_fds, hi_data, hi_len, a_fds, target, a_len, &tmp) < 0 )
-			{
-				return -1;
-			}
-			
-			*val = tmp;
-			return 0;
-		}
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-}
-
-/* AIFEPS
- *
- * return_value is in val
- *
- * AIF_BOOLEAN (type of lo & hi is AIF_BOOLEAN)
- * val = -1		if	!lo & !a
- * val = 0		if	lo & !a
- * val = 1		if 	a
- *
- * AIF_INTEGER, AIF_CHAR, AIF_ENUM, AIF_STRING (type of lo & hi is AIF_INTEGER)
- * val = -1		if	a < lo
- * val = 0		if	lo <= a <= hi
- * val = 1		if	a > hi
- *
- * AIF_FLOATING (type of lo & hi is AIF_FLOATING)
- * val = -1		if	a < lo
- * val = 0		if	lo <= a <= hi
- * val = 1		if	a > hi
- *
- * AIF_ARRAY (type of lo & hi is the base of AIF_ARRAY)
- * val = -1		if	eps(a[i]) == -1 for ALL i
- * val = 0		if	eps(a[i]) == 0 for ANY i
- * val = 1		if	eps(a[i]) == 1 for ANY i
- *
- * AIF_STRUCT (type of lo & hi is AIF_STRUCT)
- * val = -1		if	eps(element[i]) == -1 for ALL i
- * val = 0		if	eps(element[i]) == 0 for ANY i
- * val = 1		if	eps(element[i]) == 1 for ANY i
- *
- * AIF_POINTER (type of lo & hi is the base of AIF_ARRAY)
- * val = eps(a)		if	a = *p
- *
- * Other types
- * ERROR
- */
-
-int
-AIFEPS(AIF *lo, AIF *hi, AIF *a, int *val)
-{
-	return _aif_eps(AIF_FORMAT(lo), AIF_DATA(lo), AIF_LEN(lo), AIF_FORMAT(hi), AIF_DATA(hi), AIF_LEN(hi), AIF_FORMAT(a), AIF_DATA(a), AIF_LEN(a), val);
-}
-
-
-AIF *
-AIFDiff(int depth, AIF *a1, AIF *a2)
-{
-        char *  rd;
-        char *  rf;
-        char *  f1;
-        char *  f2;
-        char *  d1;
-        char *  d2;
-
-        if ( a1 == (AIF *)NULL || a2 == (AIF *)NULL )
-        {
-                SetAIFError(AIFERR_BADARG, NULL);
-                return NULL;
-        }
-
-        f1 = AIF_FORMAT(a1);
-        f2 = AIF_FORMAT(a2);
-        d1 = AIF_DATA(a1);
-        d2 = AIF_DATA(a2);
-
-        rf = NULL; /* we don't know result so let _aif_binary_op work it out */
-        rd = NULL;
-        //rd = _aif_alloc(MAX(AIF_LEN(a1), AIF_LEN(a2)));
-
-        if ( _aif_diff(depth, &rf, &rd, &f1, &d1, &f2, &d2) < 0 )
-                return (AIF *)NULL;
-
-	return MakeAIF(rf, rd);
-}
-
-/*
- * Compare two AIF values. Returns an AIF value that represents the
- * 'difference' between the values.
- *
- * In the case of scalar values the difference is: val1 - val2
- * In the case of booleans it is TRUE if they are different
- * In the case of strings it is a string containing '1' in the positions
- *   where characters differ and '0' in positions where they are the same.
- * 
- * Complex objects can also be compared. In this case the above rules are
- * applied to each field or element in the object.
- */
-int
-_aif_diff(int depth, char **rf, char **rd,
-	  	     char **f1, char **d1,
-	  	     char **f2, char **d2)
-{
-	int	i;
-	int	bytes1;
-	int	bytes2;
-	char *	fmt;
-	int	datalen; /* to keep track of the length of the resultant data */
-	int	currentlen; /* current data length */
-
-	/* these cmp_by_name, f2_x* and d2_x* are used by 'case AIF_STRUCT' */
-	int	cmp_by_name = 0;
-	char *	f2_x1;
-	char *	f2_x2;
-	char *	d2_x1;
-	char *	d2_x2;
-
-	ResetAIFError();
-
-	_fds_resolve(f1);
-	_fds_resolve(f2);
-
-	if ( FDSType(*f1) == AIF_REFERENCE )
-	{
-		fmt = _fds_lookup(f1);
-		return _aif_diff(depth, rf, rd, &fmt, d1, f2, d2);
-	}
-
-	if ( FDSType(*f2) == AIF_REFERENCE )
-	{
-		fmt = _fds_lookup(f2);
-		return _aif_diff(depth, rf, rd, f1, d1, &fmt, d2);
-	}
-
-	switch ( FDSType(*f1) )
-	{
-	case AIF_INTEGER:
-	case AIF_FLOATING:
-	case AIF_CHARACTER:
-		return _aif_binary_op(AIFOP_SUB, rf, rd, f1, d1, f2, d2);
-
-	/* returns FALSE if they are the same */	
-	case AIF_BOOLEAN:
-		bytes1 = _fds_count_bytes_na(f1);
-		bytes2 = _fds_count_bytes_na(f2);
-
-		switch ( FDSType(*f2) )
-		{
-		case AIF_BOOLEAN:
-			{
-			
-				AIFLONGEST	val1;
-				AIFLONGEST	val2;
-				AIFLONGEST	val3;
-			
-				if ( *rd == NULL )
-					*rd = (char *)_aif_alloc(MAX(bytes1, bytes2));
-
-				_aif_to_longest(*d1, bytes1, &val1);
-				_aif_to_longest(*d2, bytes2, &val2);
-				val3 = val1 ^ val2;
-				_longest_to_aif(rd, MAX(bytes1, bytes2), val3);
-
-				if ( *rf == NULL )
-					*rf = strdup(AIF_BOOLEAN_TYPE());
-
-				*d1 += bytes1;
-				*d2 += bytes2;
-
-				_fds_advance(f1);
-				_fds_advance(f2);
-			}
-
-			return 0;
-
-		default:
-			SetAIFError(AIFERR_CONV, NULL);
-			return -1;
-		}
-		break;
-
-	case AIF_ARRAY:
-		{
-			AIFIndex *	ix1;
-			AIFIndex *	ix2;
-			char *		fmt1;
-			char *		fmt2;
-			char *		fres = NULL;
-			char *		dres = NULL;
-
-			if ( FDSType(*f2) != AIF_ARRAY )
-			{
-				SetAIFError(AIFERR_TYPE, NULL);
-				return -1;
-			}
-
-			ix1 = FDSArrayIndexInit(*f1);
-			ix2 = FDSArrayIndexInit(*f2);
-
-			if ( ix1->i_nel != ix2->i_nel )
-			{
-				SetAIFError(AIFERR_SIZE, NULL);
-				AIFArrayIndexFree(ix1);
-				AIFArrayIndexFree(ix2);
-				return -1;
-			}
-
-			if ( *rd == NULL )
-			{
-				/* We allocate rd as big as d1.
-				* Note: Since _aif_diff can produce result which
-				* is bigger than its arguments, (eg: _aif_diff
-				* with STRINGS and POINTERS), we also need to
-				* keep track of the length of rd, and resize it
-				* when it's not enough.
-				*/
-
-				char * temp1 = *f1;
-				char * temp2 = *d1;
-				int    temp3 = 0;
-
-				_fds_skip_data(&temp1, &temp2);
-				temp3 = temp2 - (*d1);
-				*rd = (char *)_aif_alloc(temp3);
-				datalen = temp3;
-			}
-
-			if ( *rf == NULL )
-				*rf = strdup(*f1);
-
-			_fds_advance(f1); /* skip over the entire array fds */
-			_fds_advance(f2);
-
-			/*
-			** If nel[12] > MAX_ADDRESS then we are not going to be
-			** able to address all the data in the array. What should
-			** we do?
-			*/
-
-			currentlen = 0; /* start of our data result region */
-
-			for ( i = 0 ; i < ix1->i_nel ; i++ )
-			{
-				char * tmp1;
-				char * tmp2;
-
-				if ( dres != NULL )
-				{
-					_aif_free(dres);
-					dres = NULL;
-				}
-
-				if ( fres != NULL )
-				{
-					_aif_free(fres);
-					fres = NULL;
-				}
-
-				fmt1 = ix1->i_btype;
-				fmt2 = ix2->i_btype;
-
-				if ( _aif_diff(depth, &fres, &dres, &fmt1, d1, &fmt2, d2) < 0 )
-				{
-					AIFArrayIndexFree(ix1);
-					AIFArrayIndexFree(ix2);
-					return -1;
-				}
-
-				AIFArrayIndexInc(ix1);
-				AIFArrayIndexInc(ix2);
-
-				tmp1 = fres;
-				tmp2 = dres;
-				_fds_skip_data(&tmp1, &tmp2);
-
-				/* Is the *rd large enough? */
-				if (datalen < (currentlen + (tmp2 - dres)))
-				{
-					*rd = _aif_resize(*rd, datalen + BUFSIZ);
-					datalen += BUFSIZ;
-				}
-
-				memcpy(*rd + currentlen, dres, tmp2-dres);
-				currentlen += (tmp2-dres);
-			}
-
-			{
-				/* we need to modify 'rf' because it is
-				 * possible that _aif_diff returns something
-				 * that has a different fds than the operands
-				 */
-
-				char *t1, *t2;
-				int len;
-
-				t1 = _fds_base_type(*rf);
-
-				/* if it is multi-dimensional array, move t1
-				 * to the base type
-				 */
-
-				while ( *t1 == FDS_ARRAY_START )
-					t1 = _fds_base_type(t1);
-
-				/* we want to keep the FDS_NAME */
-				while ( *t1 == FDS_NAME )
-				{
-					t1++;
-					t1 = (char *)_fds_skipnum(t1)+1;
-				}
-
-				t2 = t1;
-				_fds_advance(&t2);
-
-				len = strlen(fres);
-				memmove(t1, fres, len);
-				t1 += len;
-
-				/* this part is necessary because it
-				 * is possible that the array is part of a
-				 * larger structure (ie: we don't want to cut
-				 * the rest of the fds)
-				 */
-				if ( *t2 != '\0' )
-				{
-					len = strlen(t2);
-					memmove(t1, t2, len+1);
-				}
-				else
-					*t1 = '\0';
-			}
-
-			_aif_free(fres);
-			_aif_free(dres);
-
-			fmt = *rf;
-			_fds_advance(&fmt);
-			*fmt = '\0';
-
-			AIFArrayIndexFree(ix1);
-			AIFArrayIndexFree(ix2);
-		}
-
-		return 0;
-
-	/* only works with the public section in AIF_STRUCT */
-	case AIF_STRUCT:
-		if ( FDSType(*f2) != AIF_STRUCT )
-		{
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-
-		if ( AIFGetOption(AIFOPT_CMP_METHOD) == AIF_CMP_BY_NAME )
-		{	
-			cmp_by_name = 1;
-			f2_x1 = *f2;
-			d2_x1 = *d2;
-			f2_x2 = NULL;
-			d2_x2 = NULL;
-			_fds_skip_data(&f2_x1, &d2_x1);
-			if ( _fds_struct_arrange(*f1, *f2, *d2, &f2_x2, &d2_x2) < 0 )
-			{
-				SetAIFError(AIFERR_CONV, NULL);
-				return -1;
-			}
-			*f2 = f2_x2; 
-			*d2 = d2_x2;
-			/* at the end, we assign f2_x1 to f2, d2_x1 to d2,
-			** and we free f2_x2 and d2_x2 */
-		}
-
-		if ( *rd == NULL )
-		{
-			/* We allocate rd as big as d1.
-			* Note: Since _aif_diff can produce result which
-			* is bigger than its arguments, (eg: _aif_diff
-			* with STRINGS and POINTERS), we also need to
-			* keep track of the length of rd, and resize it
-			* when it's not enough.
-			*/
-
-			char * temp1 = *f1;
-			char * temp2 = *d1;
-			int    temp3 = 0;
-
-			_fds_skip_data(&temp1, &temp2);
-			temp3 = temp2 - (*d1);
-			*rd = (char *)_aif_alloc(temp3);
-			datalen = temp3;
-		}
-
-		if ( *rf == NULL )
-			*rf = strdup(*f1);
-
-		currentlen = 0; /* start of our data result region */
-
-		(*f1)++; /* past open brace */
-		(*f2)++; /* past open brace */
-		_fds_skipid(f1);
-		_fds_skipid(f2);
-
-		while ( **f1 != ';' )
-		{ /* do one field */
-
-			char * dres = NULL;
-			char * fres = NULL;
-			char * tmp1;
-			char * tmp2;
-
-			if (**f2 == ';') { /* f1 has more fields */
-				SetAIFError(AIFERR_TYPE, NULL);
-				if (cmp_by_name == 1)
-				{
-					_aif_free(f2_x2);
-					_aif_free(d2_x2);
-					*f2 = f2_x1;
-					*d2 = d2_x1;
-				}
-				return -1;
-			}
-
-			*f1 = strchr(*f1, FDS_STRUCT_FIELD_NAME_END) + 1; /* to start of field*/
-			*f2 = strchr(*f2, FDS_STRUCT_FIELD_NAME_END) + 1; /* to start of field*/
-
-			fmt = *f1;
-
-			if ( _aif_diff(depth, &fres, &dres, f1, d1, f2, d2) < 0 )
-			{
-				if (cmp_by_name == 1)
-				{
-					_aif_free(f2_x2);
-					_aif_free(d2_x2);
-					*f2 = f2_x1;
-					*d2 = d2_x1;
-				}
-				return -1; /* non-zero res means no need to look further */
-			}
-
-			tmp1 = fres;
-			tmp2 = dres;
-			_fds_skip_data(&tmp1, &tmp2);
-
-			/* Is the *rd large enough? */
-			if (datalen < (currentlen + (tmp2 - dres)))
-			{
-				*rd = _aif_resize(*rd, datalen + BUFSIZ);
-				datalen += BUFSIZ;
-			}
-
-			memcpy(*rd + currentlen, dres, tmp2-dres);
-			currentlen += (tmp2-dres);
-
-			{
-				char *t1, *t2;
-				int len;
-
-				t1 = strstr(*rf, fmt);
-				t2 = t1;
-				_fds_advance(&t2);
-
-				len = strlen(fres);
-				memmove(t1, fres, len);
-				t1 += len;
-
-				if ( t1 != t2 )
-				{
-					len = strlen(t2);
-					memmove(t1, t2, len+1);
-				}
-			}
-
-			_aif_free(fres);
-			_aif_free(dres);
-
-			if ( **f1 == ',' )
-				(*f1)++;
-
-			if ( **f2 == ',' )
-				(*f2)++;
-		} /* one field */
-
-		if ( **f2 != ';' )
-		{ /* f2 has more fields */
-			if (cmp_by_name == 1)
-			{
-				_aif_free(f2_x2);
-				_aif_free(d2_x2);
-				*f2 = f2_x1;
-				*d2 = d2_x1;
-			}
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-
-		fmt = *rf;
-		_fds_advance(&fmt);
-		*fmt = '\0';
-
-		*f1 = strchr(*f1, '}') + 1; /* to start of field*/
-		*f2 = strchr(*f2, '}') + 1; /* to start of field*/
-
-		if (cmp_by_name == 1)
-		{
-			_aif_free(f2_x2);
-			_aif_free(d2_x2);
-			*f2 = f2_x1;
-			*d2 = d2_x1;
-		}
-		return 0;
-
-	case AIF_POINTER:
-		if ( FDSType(*f2) != AIF_POINTER )
-		{
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-		else
-		{
-			int    ret;
-			int    len;
-			int    fds_type;
-			char * tmp1;
-			char * tmp2;
-			char * ptr_type_1 = *d1;
-			char * ptr_type_2 = *d2;
-
-			char * target1 = _find_target(d1, 0);
-			char * target2 = _find_target(d2, MAX_VALUES_SEEN/2);
-
-			char * fres;
-			char * dres;
-
-			if ( depth == -1 )
-			{
-				if ( *rf == NULL )
-				{
-					tmp2 = (target1 == 0) ? *f1 : *f2;
-
-					tmp1 = tmp2;
-					_fds_advance(&tmp1);
-					len = tmp1 - tmp2;
-					*rf = _aif_alloc(sizeof(char)*len + 1);
-					strncpy(*rf, tmp2, len);
-					(*rf)[len] = '\0';
-				}
-
-				if ( *rd != NULL )
-					_aif_free(*rd);
-				*rd = _aif_alloc(1);
-				**rd = (char) 0;
-
-				(*f1)++;
-				(*f2)++;
-
-				if ( target1 == 0 ||
-				     *ptr_type_1 == AIF_PTR_REFERENCE )
-					_fds_advance(f1);
-				else
-					_fds_skip_data(f1, d1);
-
-				if ( target2 == 0 ||
-				     *ptr_type_2 == AIF_PTR_REFERENCE )
-					_fds_advance(f2);
-				else
-					_fds_skip_data(f2, d2);
-
-				return 0;
-
-			}
-			else if ( depth == 1 )
-				depth = -1;
-			else if ( depth > 1 )
-				depth--;
-
-
-			if ( target1 == 0 && target2 == 0 ) /* if it is NULL */
-			{
-				if ( *rf == NULL )
-				{
-					tmp2 = *f1;
-					tmp1 = tmp2;
-					_fds_advance(&tmp1);
-					len = tmp1 - tmp2;
-					*rf = _aif_alloc(sizeof(char)*len + 1);
-					strncpy(*rf, tmp2, len);
-					(*rf)[len] = '\0';
-				}
-
-				if ( *rd != NULL )
-					_aif_free(*rd);
-				*rd = _aif_alloc(1);
-				**rd = (char) 0;
-
-				_fds_advance(f1);
-				_fds_advance(f2);
-
-				return 0;
-			}
-
-			if ( *ptr_type_1 == AIF_PTR_REFERENCE ||
-			     *ptr_type_2 == AIF_PTR_REFERENCE )
-			{
-				if ( *rf == NULL )
-				{
-					tmp2 = (*ptr_type_1==AIF_PTR_REFERENCE)?						 	*f1 : *f2;
-
-					tmp1 = tmp2;
-					_fds_advance(&tmp1);
-					len = tmp1 - tmp2;
-					*rf = _aif_alloc(sizeof(char)*len + 1);
-					strncpy(*rf, tmp2, len);
-					(*rf)[len] = '\0';
-				}
-
-				if ( *rd != NULL )
-					_aif_free(*rd);
-				*rd = _aif_alloc(5); /* 1 + 4 (ptr name) */
-
-				if (*ptr_type_1 == AIF_PTR_REFERENCE)
-				{
-					int i;
-					for ( i = 0; i < 5; i++) (*rd)[i] = ptr_type_1[i];
-
-					_fds_advance(f1);
-
-					/*
-					** if it is null or a PTR_REF, just
-					** advance the fds, since we've
-					** skipped the data with _find_target
-					*/
-					if ( target2 == 0 || *ptr_type_2 == AIF_PTR_REFERENCE)
-						_fds_advance(f2);
-					else
-					{
-						(*f2)++;
-						_fds_skip_data(f2, d2);
-					}
-
-				}
-				else
-				{
-					int i;
-					for ( i = 0; i < 5; i++) (*rd)[i] = ptr_type_2[i];
-
-					_fds_advance(f2);
-
-					/*
-					** if it is null or a PTR_REF, just
-					** advance the fds, since we've
-					** skipped the data with _find_target
-					*/
-					if ( target1 == 0 || *ptr_type_1 == AIF_PTR_REFERENCE)
-						_fds_advance(f1);
-					else
-					{
-						(*f1)++;
-						_fds_skip_data(f1, d1);
-					}
-				}
-
-				return 0;
-			}
-
-			if ( target1 == 0 )	/* target1 is null, make 
-						target2 as the result */
-			{
-				if ( *rf == NULL )
-				{
-					tmp2 = *f2;
-					tmp1 = tmp2;
-					_fds_advance(&tmp1);
-					len = tmp1 - tmp2;
-					*rf = _aif_alloc(sizeof(char)*len + 1);
-					strncpy(*rf, tmp2, len);
-					(*rf)[len] = '\0';
-				}
-
-				if ( *rd != NULL )
-					_aif_free(*rd);
-
-				{
-					char * _d1;
-					char * _d2;
-
-					_d2 = ptr_type_2;
-					_d1 = _d2;
-					tmp2 = *f2;
-					tmp1 = tmp2;
-					_fds_skip_data(&tmp1, &_d1);
-					len = _d1 - _d2;
-					*rd = _aif_alloc(sizeof(char)*len);
-					memcpy(*rd, _d2, len);
-				}
-
-				_fds_advance(f1);
-				(*f2)++;
-				_fds_skip_data(f2, d2);
-
-				return 0;
-			}
-
-			if ( target2 == 0 )	/* target2 is null, make
-						target1 as the result */
-			{
-				if ( *rf == NULL )
-				{
-					tmp2 = *f1;
-					tmp1 = tmp2;
-					_fds_advance(&tmp1);
-					len = tmp1 - tmp2;
-					*rf = _aif_alloc(sizeof(char)*len + 1);
-					strncpy(*rf, tmp2, len);
-					(*rf)[len] = '\0';
-				}
-
-				if ( *rd != NULL )
-					_aif_free(*rd);
-
-				{
-					char * _d1;
-					char * _d2;
-
-					_d2 = ptr_type_1;
-					_d1 = _d2;
-					tmp2 = *f1;
-					tmp1 = tmp2;
-					_fds_skip_data(&tmp1, &_d1);
-					len = _d1 - _d2;
-					*rd = _aif_alloc(sizeof(char)*len);
-					memcpy(*rd, _d2, len);
-				}
-
-				_fds_advance(f2);
-				(*f1)++;
-				_fds_skip_data(f1, d1);
-
-				return 0;
-			}
-
-			(*f1)++;
-			(*f2)++;
-
-			if ( *rf == NULL )
-			{
-				*rf = _aif_alloc(BUFSIZ);
-				**rf = '\0';
-				strcat(*rf, "^");
-			}
-
-			if ( *rd != NULL )
-				_aif_free(*rd);
-			*rd = (char *)_aif_alloc(BUFSIZ);
-
-			if ( *ptr_type_1 == AIF_PTR_NAME )
-			{
-				int i;
-				for ( i = 0; i < 5; i++) (*rd)[i] = ptr_type_1[i];
-			}
-			else
-				**rd = (char) AIF_PTR_NORMAL;
-
-			dres = NULL;
-			fres = NULL;
-
-			fds_type = FDSType(*f1);
-			tmp1 = *f1;
-
-			ret = _aif_diff(depth, &fres, &dres, f1, d1, f2, d2);
-
-			{
-				char * ff = fres;
-				char * dd = dres;
-
-				_fds_skip_data(&ff, &dd);
-
-				if ( *ptr_type_1 == AIF_PTR_NAME )
-					memcpy((*rd)+5, dres, dd-dres);
-				else
-					memcpy((*rd)+1, dres, dd-dres);
-
-				if ( fds_type == AIF_REFERENCE )
-				{
-					memcpy((*rf)+1, tmp1, *f1-tmp1);
-					(*rf)[1 + *f1 - tmp1] = '\0';
-				}
-				else if ( fds_type == AIF_NAME )
-				{
-					tmp2 = tmp1;
-					tmp2++;
-					tmp2 = _fds_skipnum(tmp2);
-					tmp2++;
-
-					memcpy((*rf)+1, tmp1, tmp2-tmp1);
-					(*rf)[1 + tmp2 - tmp1] = '\0';
-
-					strncat((*rf), fres, ff-fres+1);
-				}
-				else
-					strncat((*rf), fres, ff-fres+1);
-			}
-
-			return ret;
-
-		}
-
-	case AIF_STRING:
-		if ( FDSType(*f2) != AIF_STRING )
-		{
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-
-		(*f1)++; /* past "s" */
-		(*f2)++; /* past "s" */
-
-		bytes1 = (*(*d1)++ & 0xff) << 8;
-		bytes1 += *(*d1)++ & 0xff;
-		bytes2 = (*(*d2)++ & 0xff) << 8;
-		bytes2 += *(*d2)++ & 0xff;
-
-		if ( *rd != NULL )
-			_aif_free(*rd);
-
-		*rd = _aif_alloc(bytes1 + bytes2 + 2);
-
-		if ( bytes1 == bytes2 )
-		{
-			int i;
-			int is_equal = 1;
-			
-			(*rd)[0] = (bytes1 >> 8) & 0xff;
-                        (*rd)[1] = bytes1 & 0xff;
-
-                        for (i=0; i<bytes1; i++)
-			{
-				if ( strncmp((*d1)+i, (*d2)+i, 1) )
-				{
-					(*rd)[2+i] = '1';
-					is_equal = 0;
-				}
-				else
-					(*rd)[2+i] = '0';
-			}
-
-			if ( is_equal == 1 )
-			{
-				(*rd)[0] = (0 >> 8) & 0xff;
-                        	(*rd)[1] = 0 & 0xff;
-			}
-		}
-		else if ( bytes1 > bytes2 )
-		{
-                        int i;
-
-                        (*rd)[0] = (bytes1 >> 8) & 0xff;
-                        (*rd)[1] = bytes1 & 0xff;
-
-                        for ( i = 0 ; i < bytes2 ; i++ )
-                                (*rd)[2+i] = strncmp((*d1)+i, (*d2)+i, 1) ? '1' : '0';
-                        for ( i = 0 ; i < bytes1 - bytes2 ; i++ )
-                                (*rd)[bytes2+2+i] = '1';
-			
-		}
-                else if ( bytes1 < bytes2 )
-                {
-                        int i;
-
-                        (*rd)[0] = (bytes2 >> 8) & 0xff;
-                        (*rd)[1] = bytes2 & 0xff;
-
-                        for ( i = 0 ; i < bytes1 ; i++ )
-                                (*rd)[2+i] = strncmp((*d1)+i, (*d2)+i, 1) ? '1' : '0';
-                        for ( i = 0 ; i < bytes2 - bytes1 ; i++ )
-                                (*rd)[bytes1+2+i] = '1';
-
-                }
-
-		*d1 += bytes1;
-		*d2 += bytes2;
-
-		if ( *rf == NULL )
-			*rf = strdup(AIF_STRING_TYPE());
-
-		return 0;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-}
-
-
-
-
-
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/compile b/debug/org.eclipse.ptp.debug.sdm/libaif/compile
deleted file mode 100755
index a81e000..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/compile
+++ /dev/null

@@ -1,136 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-	*.o | *.obj)
-	  ;;
-	*)
-	  args="$args -o $ofile"
-	  ofile=
-	  ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/config.h.in b/debug/org.eclipse.ptp.debug.sdm/libaif/config.h.in
deleted file mode 100644
index d9e4b9e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/config.h.in
+++ /dev/null

@@ -1,92 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* define if system has long long type. */
-#undef CC_HAS_LONG_LONG
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* define if system has long double type. */
-#undef HAVE_LONG_DOUBLE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vprintf' function. */
-#undef HAVE_VPRINTF
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `double', as computed by sizeof. */
-#undef SIZEOF_DOUBLE
-
-/* The size of `long double', as computed by sizeof. */
-#undef SIZEOF_LONG_DOUBLE
-
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/configure b/debug/org.eclipse.ptp.debug.sdm/libaif/configure
deleted file mode 100755
index 8f3ce5f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/configure
+++ /dev/null

@@ -1,7932 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libaif 2.1.0.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='libaif'
-PACKAGE_TARNAME='libaif'
-PACKAGE_VERSION='2.1.0'
-PACKAGE_STRING='libaif 2.1.0'
-PACKAGE_BUGREPORT=''
-
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-CPP
-GREP
-EGREP
-LIBOBJS
-XMLTO
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures libaif 2.1.0 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/libaif]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of libaif 2.1.0:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-libaif configure 2.1.0
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by libaif $as_me 2.1.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libaif'
- VERSION='2.1.0'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_bigendian=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-int
-main ()
-{
- _ascii (); _ebcdic ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-
-
-
-{ echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-
-
-if test $ac_cv_sizeof_long_long -ne 0; then
-
-cat >>confdefs.h <<\_ACEOF
-#define CC_HAS_LONG_LONG 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for long double" >&5
-echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long double ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_double=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_double=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
-echo "${ECHO_T}$ac_cv_type_long_double" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of long double" >&5
-echo $ECHO_N "checking size of long double... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_double=$ac_lo;;
-'') if test "$ac_cv_type_long_double" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_double=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long double ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_double=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_double" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_double=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_double" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
-_ACEOF
-
-
-if test $ac_cv_sizeof_long_double -ne 0; then
-
-	{ echo "$as_me:$LINENO: checking for double" >&5
-echo $ECHO_N "checking for double... $ECHO_C" >&6; }
-if test "${ac_cv_type_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef double ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_double=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_double=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
-echo "${ECHO_T}$ac_cv_type_double" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of double" >&5
-echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef double ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_double=$ac_lo;;
-'') if test "$ac_cv_type_double" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_double=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef double ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_double=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_double" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (double)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_double=0
-   fi
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
-echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
-_ACEOF
-
-
-	if test $ac_cv_sizeof_long_double -gt $ac_cv_sizeof_double; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LONG_DOUBLE 1
-_ACEOF
-
-	fi
-fi
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-
-
-
-for ac_header in strings.h sys/time.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-        CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-        CFLAGS="$CFLAGS -Wall"
-fi
-
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_time=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_time=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
-				     int *p = &tm.tm_sec;
- 				     return !p;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_struct_tm=time.h
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_struct_tm=sys/time.h
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_memcmp_working=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-  /* Some versions of memcmp are not 8-bit clean.  */
-  char c0 = '\100', c1 = '\200', c2 = '\201';
-  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    return 1;
-
-  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-     or more and with at least one buffer not starting on a 4-byte boundary.
-     William Lewis provided this test program.   */
-  {
-    char foo[21];
-    char bar[21];
-    int i;
-    for (i = 0; i < 4; i++)
-      {
-	char *a = foo + i;
-	char *b = bar + i;
-	strcpy (a, "--------01111111");
-	strcpy (b, "--------10000000");
-	if (memcmp (a, b, 16) >= 0)
-	  return 1;
-      }
-    return 0;
-  }
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_memcmp_working=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-  *" memcmp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
- ;;
-esac
-
-
-
-for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func__doprnt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
-
-fi
-
-fi
-done
-
-
-
-for ac_func in strdup
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# Extract the first word of "xmlto", so it can be a program name with args.
-set dummy xmlto; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_XMLTO+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $XMLTO in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XMLTO=$ac_cv_path_XMLTO
-if test -n "$XMLTO"; then
-  { echo "$as_me:$LINENO: result: $XMLTO" >&5
-echo "${ECHO_T}$XMLTO" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-if test -z "$ac_cv_path_XMLTO"; then
-	{ echo "$as_me:$LINENO: WARNING: You must have XMLTO to compile the XML documentation for libaif." >&5
-echo "$as_me: WARNING: You must have XMLTO to compile the XML documentation for libaif." >&2;}
-	XMLTO=":"
-fi
-
-ac_config_files="$ac_config_files Makefile doc/Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by libaif $as_me 2.1.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-libaif config.status 2.1.0
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-XMLTO!$XMLTO$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/configure.in b/debug/org.eclipse.ptp.debug.sdm/libaif/configure.in
deleted file mode 100644
index 897f317..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/configure.in
+++ /dev/null

@@ -1,72 +0,0 @@
-dnl
-dnl Copyright (c) 1996-2001 by Guardsoft Pty Ltd.
-dnl
-dnl All rights reserved. This program and the accompanying materials
-dnl are made available under the terms of the Eclipse Public License v1.0
-dnl which accompanies this distribution, and is available at
-dnl http://www.eclipse.org/legal/epl-v10.html
-dnl
-
-AC_PREREQ(2.50)
-
-AC_INIT(libaif, 2.1.0)
-AM_INIT_AUTOMAKE
-AC_CONFIG_HEADER(config.h)
-
-dnl Checks for programs.
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-dnl Checks for libraries.
-
-dnl Check endianness
-AC_C_BIGENDIAN
-
-dnl See if compiler supports "long long" type.
-
-AC_CHECK_SIZEOF(long long)
-if test $ac_cv_sizeof_long_long -ne 0; then
-	AC_DEFINE(CC_HAS_LONG_LONG,1,[define if system has long long type.])
-fi
-
-dnl See if compiler supports "long double" type.
-
-AC_CHECK_SIZEOF(long double)
-if test $ac_cv_sizeof_long_double -ne 0; then
-	dnl See if "long double" is longer than "double".
-
-	AC_CHECK_SIZEOF(double)
-	if test $ac_cv_sizeof_long_double -gt $ac_cv_sizeof_double; then
-		AC_DEFINE(HAVE_LONG_DOUBLE,1,[define if system has long double type.])
-	fi
-fi
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(strings.h sys/time.h unistd.h)
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-        CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-        CFLAGS="$CFLAGS -Wall"
-fi
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_TIME
-AC_STRUCT_TM
-
-dnl Checks for library functions.
-AC_FUNC_MEMCMP
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(strdup)
-
-AC_PATH_PROG(XMLTO, xmlto)
-if test -z "$ac_cv_path_XMLTO"; then
-	AC_MSG_WARN([You must have XMLTO to compile the XML documentation for libaif.])
-	XMLTO=":"
-fi
-
-AC_OUTPUT([Makefile doc/Makefile])

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/conv.c b/debug/org.eclipse.ptp.debug.sdm/libaif/conv.c
deleted file mode 100644
index e04fabd..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/conv.c
+++ /dev/null

@@ -1,2863 +0,0 @@
-/*
- * Routines for converting between native data format and
- * AIF or for constructing AIF objects.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<assert.h>
-#include	<ctype.h>
-#include	<stdio.h>
-#include	<string.h>
-#include	<stdlib.h>
-#include	<stdarg.h>
-
-#include	"aif.h"
-#include	"aiferr.h"
-#include	"aifint.h"
-
-#if defined(WINDOWSNT) || defined(WIN32)
-#define BITSPERBYTE	8
-#elif defined(__APPLE__)
-#include	<sys/types.h>
-#define BITSPERBYTE	NBBY
-#else /* WINDOWSNT || WIN32 */
-#include	<values.h>
-#endif /* WINDOWSNT || WIN32 */
-
-union ieee
-{
-	char		c;
-	int		i;
-	AIFLONGEST	li;
-	float		f;
-	double		d;
-	AIFDOUBLEST	dd;
-	/*
-	** long enough for any conceivable precision
-	*/
-	char		bytes[256/BITSPERBYTE];
-};
-
-/*
- * For _aif_*_to_str() functions
- */
-static char *_str_buf = NULL;
-static char *_str_pos = NULL;
-static int _str_buf_len = 0;
-
-/*
- * Convert base type to standard byte ordering.
- */
-void
-_aif_normalise(char *dst, int dstlen, char *src, int srclen)
-{
-#ifndef WORDS_BIGENDIAN
-	int	i;
-#endif
-	int	len;
-	int	pad = 0;
-
-	ResetAIFError();
-
-	if ( srclen < dstlen )
-	{
-		len = srclen;
-		pad = dstlen - srclen;
-	} 
-	else if ( srclen >= dstlen )
-		len = dstlen;
-
-#ifdef WORDS_BIGENDIAN
-	memcpy(dst, src+srclen-len, len);
-
-	if ( pad > 0 )
-		memset(dst+len, '\0', pad);
-#else /* WORDS_BIGENDIAN */
-	for ( i = len - 1 ; i >= 0 ; i-- )
-		*dst++ = src[i];
-
-	if ( pad > 0 )
-		memset(dst, '\0', pad);
-#endif /* WORDS_BIGENDIAN */
-}
-
-/*
- * Normalise a value to the standard format
- */
-void
-AIFNormalise(char *dst, int dstlen, char *src, int srclen)
-{
-	_aif_normalise(dst, dstlen, src, srclen);
-}
-
-/*
- * Convert a pointer value to AIF data format. Result is rd.
- */
-int
-_pointer_to_aif(char **rd, const AIF *addr, const AIF *val)
-{
-	if ( rd == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-	if( *rd == NULL ) {
-		*rd = (char *)_aif_alloc(AIF_LEN(addr) + AIF_LEN(val) + 1);
-	}
-
-	**rd = (char) AIF_PTR_NORMAL; /* indicates normal pointer value */
-	
-	memcpy((*rd)+1, AIF_DATA(addr), AIF_LEN(addr));
-	memcpy((*rd)+1+AIF_LEN(addr), AIF_DATA(val), AIF_LEN(val));
-
-	return 0;
-}
-
-/*
- * Convert an integer value of any length to AIF data format.
- * Result is rd.
- */
-int
-_longest_to_aif(char **rd, int len, AIFLONGEST val)
-{
-	int		srclen;
-	union ieee	f;
-
-	if ( rd == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-	if( *rd == NULL )
-		*rd = (char *)_aif_alloc(len);
-
-	if ( len <= sizeof(int) )
-	{
-		f.i = (int)val;
-		srclen = sizeof(int);
-	}
-	else
-	{
-		f.li = val;
-		srclen = sizeof(AIFLONGEST);
-	}
-
-	_aif_normalise(*rd, len, f.bytes, srclen);
-
-	return 0;
-}
-
-/*
- * Convert a character value to AIF data format. Result is rd.
- */
-int
-_char_to_aif(char **rd, char val)
-{
-	union ieee	f;
-
-	if ( rd == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-	if( *rd == NULL )
-		*rd = (char *)_aif_alloc(sizeof(char));
-
-	f.c = val;
-
-	AIFNormalise(*rd, sizeof(char), f.bytes, sizeof(char));
-
-	return 0;
-}
-
-/*
- * Create an empty named AIF object.
- */
-AIF *
-NameAIF(AIF *oldAIF, int name)
-{
-	AIF *	a;
-
-	ResetAIFError();
-
-	a = NewAIF(0, 0);
-
-	AIF_FORMAT(a) = strdup(AIF_NAME_TYPE(name, AIF_FORMAT(oldAIF)));
-	AIF_DATA(a) = _aif_alloc(AIF_LEN(oldAIF));
-	memcpy(AIF_DATA(a), AIF_DATA(oldAIF), AIF_LEN(oldAIF));
-	AIF_LEN(a) = AIF_LEN(oldAIF);
-
-	return a;
-}
-
-int
-AIFSetIdentifier(AIF *a, char *id)
-{
-	return FDSSetIdentifier(&(AIF_FORMAT(a)), id);
-}
-
-char *
-AIFGetIdentifier(AIF *a)
-{
-	return FDSGetIdentifier(AIF_FORMAT(a));
-}
-
-/*
- * Create an empty reference to an AIF object
- */
-AIF *
-ReferenceAIF(int name)
-{
-	AIF *	a;
-
-	ResetAIFError();
-
-	a = NewAIF(0, 0);
-
-	AIF_FORMAT(a) = strdup(AIF_REFERENCE_TYPE(name));
-	AIF_LEN(a) = 0;
-	
-	return a;
-}
-
-/*
- * toWhat represents the sort of thing to which a null pointer needs to be
- * created.  If it is named, that name is used in the resulting AIF; otherwise,
- * the format of toWhat is used to generate the format of the new AIF.
- */
-AIF *
-AIFNull(AIF *toWhat)
-{
-	int	name;
-	AIF *	a;
-	char *	fmt;
-	char *	oldFormat = AIF_FORMAT(toWhat);
-
-	ResetAIFError();
-
-	a = NewAIF(0, 1);
-
-	if ( *oldFormat == '%' )
-	{
-		/*
-		** a reference
-		*/
-		sscanf(oldFormat, "%%%d/", &name);
-		fmt = strdup(AIF_REFERENCE_TYPE(name));
-		AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(NULL, fmt));
-		_aif_free(fmt);
-	}
-	else
-	{
-		/* 
-		** repeat the format
-		*/
-		AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(NULL, oldFormat));
-	}
-
-	AIF_DATA(a)[0] = AIF_PTR_NIL;
-	AIF_LEN(a) = 1;
-	
-	return a;
-}
-
-AIF *
-PointerNameToAIF(AIF *i)
-{
-	AIF *	a;
-	int	name;
-	char *	fmt = AIF_FORMAT(i);
-
-	a = NewAIF(0, AIF_LEN(i)+2);
-
-	sscanf(fmt, "%%%d/", &name);
-
-	AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(NULL, AIF_FORMAT(i)));
-
-	*(AIF_DATA(a)) = (char) AIF_PTR_NAME;
-	_int_to_ptrname( (int) name, AIF_DATA(a)+1);
-	
-	memcpy(AIF_DATA(a)+5, AIF_DATA(i), AIF_LEN(i));
-
-	ResetAIFError();
-
-	return a;
-}
-
-AIF *
-PointerReferenceToAIF(AIF *toWhat)
-{
-	int	name;
-	AIF *	a;
-	char *	fmt;
-	char *	oldFormat = AIF_FORMAT(toWhat);
-
-	ResetAIFError();
-
-	a = NewAIF(0, 2);
-
-	if ( *oldFormat == '%' )
-	{
-		/*
-		** a reference
-		*/
-		sscanf(oldFormat, "%%%d/", &name);
-		fmt = strdup(AIF_REFERENCE_TYPE(name));
-		AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(NULL, fmt));
-		_aif_free(fmt);
-	}
-
-	AIF_DATA(a)[0] = AIF_PTR_REFERENCE;
-	_int_to_ptrname( (int) name, AIF_DATA(a)+1);
-	AIF_LEN(a) = 5;
-	
-	return a;
-}
-
-/*
- * Create a pointer to an AIF object.
- */
-AIF *
-PointerToAIF(AIF *addr, AIF *i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, AIF_LEN(addr)+AIF_LEN(i)+1);
-	AIF_FORMAT(a) = strdup(AIF_POINTER_TYPE(AIF_FORMAT(addr), AIF_FORMAT(i)));
-
-	if ( _pointer_to_aif(&AIF_DATA(a), addr, i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	ResetAIFError();
-
-	return a;
-}
-
-AIF *
-CharPointerToAIF(AIF *addr, char *val)
-{
-	AIF *	a;
-	int	length = strlen(val);
-
-	if ( length > 1 << (2 * BITSPERBYTE) )
-	{
-		SetAIFError(AIFERR_STRING, NULL);
-		return (AIF *)NULL;
-	}
-
-	ResetAIFError();
-
-	a = NewAIF(0, AIF_LEN(addr)+length+2);
-	
-	AIF_FORMAT(a) = strdup(AIF_CHAR_POINTER_TYPE(AIF_FORMAT(addr)));
-
-	memcpy(AIF_DATA(a), AIF_DATA(addr), AIF_LEN(addr));
-
-	(AIF_DATA(a))[AIF_LEN(addr)] = (length >> 8) & 0xff;
-	(AIF_DATA(a))[AIF_LEN(addr)+1] = length & 0xff;
-
-	strncpy(AIF_DATA(a)+AIF_LEN(addr)+2, val, length);
-
-	return a;
-}
-
-/*
- * Convert a string (defined as a pointer to a null terminated array
- * of characters) to AIF format.
- */
-AIF *
-StringToAIF(char *i)
-{
-	AIF *	a;
-	int	length = strlen(i);
-
-	if ( length > 1 << (2 * BITSPERBYTE) )
-	{
-		SetAIFError(AIFERR_STRING, NULL);
-		return (AIF *)NULL;
-	}
-
-	ResetAIFError();
-
-	a = NewAIF(0, length+2);
-
-	AIF_FORMAT(a) = strdup(AIF_STRING_TYPE());
-
-	(AIF_DATA(a))[0] = (length >> 8) & 0xff;
-	(AIF_DATA(a))[1] = length & 0xff;
-
-	strncpy(AIF_DATA(a)+2, i, length);
-
-	return a;
-}
-
-/* Converts input buffer to hexadecimal display in output string.
- * String length is used since zero is legitimate.
- */
-static void 
-ByteToHex(char *out_string, char *in_string, int in_size)
-{
-	char hexchars[] = "0123456789ABCDEF";
-	char ch;
-	int i;
-
-	for (i=0; i<in_size; i++) {
-		ch = *in_string++;
-		*out_string++ = hexchars[(ch >> 4) & 0xf]; /* [c/16]; */
-		*out_string++ = hexchars[ ch & 0xf]; /* [c%16]; */
-	}
-}
-/* Get default address format with size
- * 
- */
-static char * 
-GetDefaultAddress(int size)
-{
-	int i;
-	const char *pattern = "00";
-	char *addr = (char *)malloc(size*2 + 1);
-	//char addr[size*2];
-	//addr[0] = '\0';
-
-	for (i=0; i<size; i++) {
-		memcpy(&addr[i*2], pattern, 2);
-		//strcat(addr, pattern);
-	}
-	addr[size*2] = '\0';
-	return strdup(addr);
-}
-/* Converts hexadecimal display to binary. String length is used
- * and only hexadecimal pairs are handled.
- */
-static void 
-HexToByte(char *out_string, char *in_string, int in_size)
-{
-	int i;
-	int h_value, c_value;
-	int byte_val = 0;
-	int in_len, def_len = 0;
-	char *input;
-	char *def_input;
-	
-	def_input = GetDefaultAddress(in_size);
-	if (in_size%2 != 0) {
-		out_string = strdup(def_input);
-		return;
-	}
-
-	in_len = strlen(in_string);
-	def_len = strlen(def_input);
-
-	if (in_len == def_len) {
-		strcpy(def_input, in_string);
-	}
-	else {
-		for (i=def_len-in_len; i<def_len; i++) {
-			def_input[i] = *in_string++;
-		}
-	}
-
-	input = strdup(def_input);
-	for (i=0; i<(in_size*2); i++) {
-		if ((h_value = *input++) >= '0' && h_value <= '9')
-			c_value = h_value - '0';
-		else
-			(c_value = 10 + (h_value & 0xf) - ('a' & 0xf));
-
-		if (!(i%2))
-			byte_val = c_value * 16;
-		else
-			*out_string++ = byte_val + c_value;
-	}
-}
-/*
- * Convert an address (defined as a pointer to a null terminated array
- * of characters) to AIF format.
- */
-AIF *
-AddressToAIF(char *addr, int len)
-{
-	AIF * a;
-	char * buf;
-	
-	if (addr == NULL) {
-		addr = GetDefaultAddress(len);
-	}
-
-	a = NewAIF(0, len);
-	AIF_FORMAT(a) = strdup(AIF_ADDRESS_TYPE(len));
-
-	//memcpy(AIF_DATA(a), &addr, in_size);
-	buf = _aif_alloc(len);
-	HexToByte(buf, addr, len);
-/*
-	char *hex;
-	hex = _aif_alloc(len);
-	ByteToHex(hex, buf, len);
-	printf("---- Address hex: %s, %i\n", hex, len);
-	free(hex);
-*/
-	memcpy(AIF_DATA(a), buf, len);
-	free(buf);
-	return a;
-}
-/*
- * Convert a boolean value to AIF.
- */
-AIF *
-BoolToAIF(int b)
-{
-	AIF  * a;
-	int    size;
-
-	size = sizeof(int);
-
-	a = NewAIF(0, size);
-
-	AIF_FORMAT(a) = strdup(AIF_BOOLEAN_TYPE());
-
-	if ( b )
-		memset(AIF_DATA(a), 0xff, size);
-	else
-		memset(AIF_DATA(a), 0, size);
-
-	return a;
-}
-
-/*
- * Convert a character to AIF.
- */
-AIF *
-CharToAIF(char c)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(char));
-
-	AIF_FORMAT(a) = strdup(AIF_CHARACTER_TYPE());
-
-	if ( _char_to_aif(&AIF_DATA(a), c) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert a short integer to AIF.
- */
-AIF *
-ShortToAIF(short i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(short));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(1, sizeof(short)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(short), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert an unsigned short to AIF.
- */
-AIF *
-UnsignedShortToAIF(unsigned short i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(unsigned short));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(0, sizeof(unsigned short)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(unsigned short), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert an integer to AIF.
- */
-AIF *
-IntToAIF(int i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(int));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(1, sizeof(int)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(int), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert an unsigned integer to AIF.
- */
-AIF *
-UnsignedIntToAIF(unsigned int i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(unsigned int));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(0, sizeof(unsigned int)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(unsigned int), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert a long integer to AIF.
- */
-AIF *
-LongToAIF(long i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(long));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(1, sizeof(long)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(long), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert an unsigned long to AIF.
- */
-AIF *
-UnsignedLongToAIF(unsigned long i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(unsigned long));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(0, sizeof(unsigned long)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(unsigned long), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-#ifdef CC_HAS_LONG_LONG
-/*
- * Convert a long long integer to AIF.
- */
-AIF *
-LongLongToAIF(long long i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(long long));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(1, sizeof(long long)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(long long), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert an unsigned long long to AIF.
- */
-AIF *
-UnsignedLongLongToAIF(unsigned long long i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(unsigned long long));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(0, sizeof(unsigned long long)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(unsigned long long), (AIFLONGEST)i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-#endif /* CC_HAS_LONG_LONG */
-
-/*
- * Convert an integer of any length to AIF.
- */
-AIF *
-LongestToAIF(AIFLONGEST i)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(AIFLONGEST));
-
-	AIF_FORMAT(a) = strdup(AIF_INTEGER_TYPE(1, sizeof(AIFLONGEST)));
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(AIFLONGEST), i) < 0 )
-	{
-		AIFFree(a);
-		return (AIF *)NULL;
-	}
-
-	return a;
-}
-
-/*
- * Convert a floating point value of any length to AIF data format.
- * Result in rd.
- */
-int
-_doublest_to_aif(char **rd, int len, AIFDOUBLEST val)
-{
-	union ieee	v;
-
-	if ( rd == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-	if( *rd == NULL )
-		*rd = (char *)_aif_alloc(len);
-
-	if ( len <= sizeof(float) )
-		v.f = (float)val;
-	else if ( len == sizeof(double) )
-		v.d = (double)val;
-	else
-		v.dd = val;
-
-	AIFNormalise(*rd, len, v.bytes, len);
-
-	return 0;
-}
-
-/*
- * Convert a single precision floating point value to AIF.
- */
-AIF *
-FloatToAIF(float f)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(float));
-
-	AIF_FORMAT(a) = strdup(AIF_FLOATING_TYPE(sizeof(float)));
-
-	if ( _doublest_to_aif(&AIF_DATA(a), sizeof(float), (AIFDOUBLEST)f) < 0 )
-		return (AIF *)NULL;
-
-	return a;
-}
-
-/*
- * Convert a double precision floating point value to AIF.
- */
-AIF *
-DoubleToAIF(double f)
-{
-	AIF *	a;
-
-	a = NewAIF(0, sizeof(double));
-
-	AIF_FORMAT(a) = strdup(AIF_FLOATING_TYPE(sizeof(double)));
-
-	if ( _doublest_to_aif(&AIF_DATA(a), sizeof(double), (AIFDOUBLEST)f) < 0 )
-		return (AIF *)NULL;
-
-	return a;
-}
-
-/*
- * Convert an array to AIF.
- *
- * AIF *ArrayToAIF(int rank, int *min, int *max, char *data, int len, char *btype)
- *
- * - rank is the rank of the array
- * - min is the index lower bound, or an array of lower bounds if rank > 1
- * - max is the index upper bound, or an array of upper bounds if rank > 1
- * - data is a pointer to the array data, or NULL, and must be normalised
- * - len is length in bytes of the entire array
- * - btype is the type of the array elements
- */
-AIF *
-ArrayToAIF(int rank, int *min, int *max, char *data, int len, char *btype)
-{
-	int	i;
-	int	bsize;
-	AIF *	a;
-	char *	itype; /* index type */
-	char *	rtype; /* range type */
-	char *	fds=NULL;
-
-	bsize = FDSTypeSize(btype);
-
-	a = NewAIF(0, len);
-
-	btype = strdup(btype);
-	itype = strdup(AIF_INTEGER_TYPE(0, sizeof(int)));
-
-	for ( i = rank - 1  ; i >= 0 ; i-- )
-	{
-		rtype = strdup(AIF_RANGE_TYPE(min[i], max[i], itype));
-		fds = strdup(AIF_ARRAY_TYPE(rtype, btype));
-
-		_aif_free(rtype);
-		_aif_free(btype);
-
-		btype = fds;
-	}
-
-	assert(fds!=NULL);
-	AIF_FORMAT(a) = fds;
-
-	if ( len > 0 && data != NULL )
-		memcpy(AIF_DATA(a), data, len);
-
-	_aif_free(itype);
-
-	ResetAIFError();
-
-	return a;
-}
-
-/*
- * Create an empty array containing elemenst min..max and
- * with a base type given by btype
- */
-AIF *
-EmptyArrayToAIF(int min, int max, AIF *btype)
-{
-	AIF *	a;
-	int len = 0;
-
-	if (AIF_FORMAT(btype)[0] != FDS_CHAR_POINTER) {
-		len = (max - min + 1) * AIFTypeSize(btype);
-	}
-
-	a = NewAIF(0, len);
-	
-	AIF_FORMAT(a) = FDSArrayInit(min, max, AIF_FORMAT(btype));
-	
-	ResetAIFError();
-	
-	return a;
-}
-/*
- * Add the element el to the array at the index given by idx.
- * This is used for array construction.
- */
-void
-AIFAddArrayElement(AIF *a, int idx, AIF *el)
-{
-	int	min;
-	int	max;
-	int len = AIFTypeSize(el);
-
-	//if (len == 0 || AIFTypeSize(a) == 0)
-		//return;
-
-	if (AIF_FORMAT(el)[0] == FDS_CHAR_POINTER) {
-		AIFAddComplexArrayElement(a, el);
-	}
-	else {
-		min = FDSArrayMinIndex(AIF_FORMAT(a), 0);
-		max = FDSArrayMaxIndex(AIF_FORMAT(a), 0);
-		
-		if (idx < min || idx > max)
-			return;
-					
-		memcpy(AIF_DATA(a) + len * (idx - min), AIF_DATA(el), len);
-	}
-}
-
-AIF *
-EmptyComplexArrayToAIF(int min, int max, AIF *btype)
-{
-	AIF *	a;
-	
-	a = NewAIF(0, 0);
-	
-	AIF_FORMAT(a) = FDSArrayInit(min, max, AIF_FORMAT(btype));
-	
-	ResetAIFError();
-	
-	return a;
-}
-void
-AIFAddComplexArrayElement(AIF *a, AIF *el)
-{
-	char *newData;
-	int len = AIFTypeSize(el);
-	int cap = AIFTypeSize(a);
-
-	AIF_LEN(a) += len;
-	newData = _aif_alloc(AIF_LEN(a));
-
-	memcpy(newData, AIF_DATA(a), cap);
-	memcpy(newData+cap, AIF_DATA(el), len);
-
-	if (AIF_DATA(a))
-		_aif_free(AIF_DATA(a));
-
-	AIF_DATA(a) = _aif_alloc(AIF_LEN(a));
-
-	memcpy(AIF_DATA(a), newData, AIF_LEN(a));
-
-	_aif_free(newData);
-}
-
-/*
- * Create an empty AIF enumerated type.
- */
-AIF *
-EmptyEnumToAIF(char *id) 
-{
-        AIF *   a;
-
-        a = NewAIF(0, sizeof(int));
-
-        AIF_FORMAT(a) = FDSEnumInit(id);
-
-        ResetAIFError();
-
-        return(a);
-}
-
-/*
- * Add a constant to enumerated type.
- */
-int
-AIFAddConstToEnum(AIF *a, char *id, AIF *content)
-{
-	char *nfmt;
-	int val;
-
-	if ( AIFToInt(content, &val) < 0 )
-		return -1;
-
-	nfmt = FDSAddConstToEnum(AIF_FORMAT(a), id, val);
-
-	if ( nfmt == NULL )
-	{
-		return -1;
-	}
-	else
-	{
-		_aif_free(AIF_FORMAT(a));
-		AIF_FORMAT(a) = nfmt;
-		return 0;
-	}
-}
-
-/*
- * Set AIF enum type to a particular value.
- */
-int
-AIFSetEnum(AIF *a, char *id)
-{
-	int v;
-
-	if ( FDSEnumConstByName(AIF_FORMAT(a), id, &v) < 0 )
-	{
-		SetAIFError(AIFERR_FIELD, NULL);
-		return -1;
-	}
-
-	if ( _longest_to_aif(&AIF_DATA(a), sizeof(int), (AIFLONGEST)v) < 0 )
-        {
-                AIFFree(a);
-                return -1;
-        }
-
-        return 0;
-}
-
-/*
- * Get current value of enum.
- */
-AIF *
-AIFGetEnum(AIF *a)
-{
-	AIF  * new;
-	char * btype;
-	int    len;
-
-
-	if ( (btype = FDSBaseType(AIF_FORMAT(a))) == NULL )
-		return NULL;
-
-	if ( (len = FDSTypeSize(AIF_FORMAT(a))) < 0 )
-		return NULL;
-
-	new = NewAIF(0, len);
-
-	AIF_FORMAT(new) = strdup(btype);
-	AIF_LEN(new) = len;
-	memcpy(AIF_DATA(new), AIF_DATA(a), len);
-
-	return new;
-
-}
-
-/*
- * Create an empty AIF union type.
- */
-AIF *
-EmptyUnionToAIF(char *id) 
-{
-        AIF *   a;
-
-        a = NewAIF(0, 0);
-
-        AIF_FORMAT(a) = FDSUnionInit(id);
-
-        ResetAIFError();
-
-        return(a);
-}
-
-/*
- * Add a filed to an AIF union.
- */
-int
-AIFAddFieldToUnion(AIF *a, char *field, char *fmt)
-{
-	char *nfmt;
-
-	nfmt = FDSAddFieldToUnion(AIF_FORMAT(a), field, fmt);
-
-	if ( nfmt == NULL )
-	{
-		return -1;
-	}
-	else
-	{
-		_aif_free(AIF_FORMAT(a));
-		AIF_FORMAT(a) = nfmt;
-		return 0;
-	}
-}
-
-/*
- * Set the value of a union.
- */
-int
-AIFSetUnion(AIF *a, char *field, AIF *data)
-{
-	char *type;
-	int   len;
-
-	if ( FDSUnionFieldByName(AIF_FORMAT(a), field, &type) < 0 )
-	{
-		SetAIFError(AIFERR_FIELD, NULL);
-		return -1;
-	}
-
-	if ( strcmp(type, AIF_FORMAT(data)) != 0 )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	len = FDSTypeSize(AIF_FORMAT(a));
-	AIF_LEN(a) = len;
-
-	if ( AIF_DATA(a) != NULL )
-		_aif_free(AIF_DATA(a));
-
-	AIF_DATA(a) = _aif_alloc(len);
-	memcpy(AIF_DATA(a), AIF_DATA(data), len);
-
-        return 0;
-
-}
-
-/*
- * Get the value of a union.
- */
-AIF *
-AIFGetUnion(AIF *a, char *field)
-{
-	AIF  * new;
-	char * type;
-	int    len;
-
-	if ( FDSUnionFieldByName(AIF_FORMAT(a), field, &type) < 0 )
-	{
-		SetAIFError(AIFERR_FIELD, NULL);
-		return NULL;
-	}
-
-	if ( (len = FDSTypeSize(type)) < 0 )
-		return NULL;
-
-	new = NewAIF(0, len);
-
-	AIF_FORMAT(new) = type;
-	AIF_LEN(new) = len;
-	memcpy(AIF_DATA(new), AIF_DATA(a), len);
-
-	return new;
-
-}
-
-/*
- * Create an empty AIF structure.
- */
-AIF *
-EmptyStructToAIF(char *id)
-{
-	AIF *	a;
-
-	a = NewAIF(0, 0);
-
-	AIF_FORMAT(a) = FDSStructInit(id);
-
-	ResetAIFError();
-
-	return a;
-}
-
-/* 
- * Add a field to the public section of a structure
- */
-int
-AIFAddFieldToStruct(AIF *a, char* field, AIF *content)
-{
-	int	pubLength;
-	int	oldLength;
-	int	newLength;
-	char *	newFormat;
-	char *	newData;
-	char *	dummyString;
-
-	if ( !FDSStructFieldByName(AIF_FORMAT(a), field, &dummyString) )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		_aif_free(dummyString);
-		return -1;
-	}
-
-	/* We use FDSDataSize() instead of:
-		pubLength = _data_len_public(AIF_FORMAT(a));
-	to calculate the data length, _data_len_public cannot handle the case
-	where a string is one of the members of the struct (since the length
-	of the string is encoded in the data section).
-	Currently FDSDataSize() can only handle public members of structs, so
-	it is safe to replace _data_len_public() with FDSDataSize().
-	*/
-	pubLength = FDSDataSize(AIF_FORMAT(a), AIF_DATA(a));
-	oldLength = AIF_LEN(a);
-	newLength = oldLength + AIF_LEN(content);
-
-	newData = _aif_alloc(newLength);
-
-	memcpy(newData, AIF_DATA(a), pubLength);
-	memcpy(newData+pubLength, AIF_DATA(content), AIF_LEN(content));
-	memcpy(newData+pubLength+AIF_LEN(content), AIF_DATA(a)+pubLength, oldLength-pubLength);
-
-	if ( AIF_DATA(a) )
-		_aif_free(AIF_DATA(a));
-
-	AIF_DATA(a) = _aif_alloc(newLength);
-	AIF_LEN(a) = newLength;
-
-	memcpy(AIF_DATA(a), newData, newLength);
-
-	newFormat = FDSAddFieldToStruct(AIF_FORMAT(a), field, AIF_FORMAT(content));
-
-	_aif_free(AIF_FORMAT(a));
-	AIF_FORMAT(a) = newFormat;
-
-	_aif_free(newData);
-
-	ResetAIFError();
-
-	return 0;
-}
-
-/* 
- * Set the value of a field in a structure
- */
-int
-AIFSetStruct(AIF *a, char* field, AIF *content)
-{
-	int	preLength;
-	char *	dummyString;
-	int	index;
-
-	if ( FDSStructFieldByName(AIF_FORMAT(a), field, &dummyString) )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	index = FDSStructFieldIndex(AIF_FORMAT(a), field);
-	preLength = _data_len_index(AIF_FORMAT(a), index);
-	preLength -= FDSTypeSize(dummyString);
-	_aif_free(dummyString);
-
-	memcpy(AIF_DATA(a)+preLength, AIF_DATA(content), AIF_LEN(content));
-
-	ResetAIFError();
-
-	return(0);
-}
-
-/*
- * Get the value of a field in a structure
- */
-AIF *
-AIFGetStruct(AIF *a, char *field)
-{
-	AIF  * new;
-	char * type;
-	int    len;
-	int    pre;
-	int    index;
-
-	if ( FDSStructFieldByName(AIF_FORMAT(a), field, &type) < 0 )
-	{
-		SetAIFError(AIFERR_FIELD, NULL);
-		return NULL;
-	}
-
-	if ( (len = FDSTypeSize(type)) < 0 )
-	{
-		_aif_free(type);
-		return NULL;
-	}
-
-	new = NewAIF(0, len);
-
-	index = FDSStructFieldIndex(AIF_FORMAT(a), field);
-	pre = _data_len_index(AIF_FORMAT(a), index);
-	pre -= len;
-
-	AIF_FORMAT(new) = type;
-	AIF_LEN(new) = len;
-	memcpy(AIF_DATA(new), AIF_DATA(a)+pre, len);
-
-	return new;
-}
-
-/*
- * Convert an AIF value to a native character.
- */
-int
-_aif_to_char(char *data, char *val)
-{
-	int		s;
-
-	if ( data == NULL || val == (char *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-	for ( s = 0 ; s < sizeof(char) ; s++ )
-		val[s] =  data[s];
-
-	return 0;
-}
-
-/*
- * Convert an AIF integer to the longest integer available.
- */
-int
-_aif_to_longest(char *data, int len, AIFLONGEST *val)
-{
-	int			s;
-	AIFLONGEST		i = 0;
-
-	if ( data == NULL || val == (AIFLONGEST *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( len > sizeof(AIFLONGEST) )
-	{
-		SetAIFError(AIFERR_CONV, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-	for ( s = 0 ; s < len ; s++ )
-		i = i * 0x100 + (data[s] & 0xff);
-
-	*val = i;
-
-	return 0;
-}
-
-/*
- * Convert AIF integer to native integer. If native integer
- * size is too small, return low order bytes.
- */
-int
-AIFToInt(AIF *a, int *val)
-{
-	AIFLONGEST	l;
-
-	if ( AIFToLongest(a, &l) < 0 )
-		return -1;
-
-	*val = l;
-
-	return 0;
-}
-
-/*
- * Convert AIF value to longest integer available. Implicitly converts
- * an floating value to an integer.
- */
-int
-AIFToLongest(AIF *a, AIFLONGEST *val)
-{
-	int		res = 0;
-	AIFDOUBLEST	d;
-
-	if ( a == (AIF *)NULL || val == (AIFLONGEST *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	switch ( FDSType(AIF_FORMAT(a)) )
-	{
-	case AIF_INTEGER:
-		res = _aif_to_longest(AIF_DATA(a), AIF_LEN(a), val);
-		break;
-
-	case AIF_FLOATING:
-		if ( _aif_to_doublest(AIF_DATA(a), AIF_LEN(a), &d) < 0 )
-			return -1;
-
-		*val = (AIFLONGEST)d;
-		res = 0;
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return res;
-}
-
-/*
- * Convert an AIF floating data type to the largest native
- * floating poing representation available.
- */
-int
-_aif_to_doublest(char *data, int len, AIFDOUBLEST *val)
-{
-	union ieee	f;
-
-	if ( data == NULL || val == (AIFDOUBLEST *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-        AIFNormalise(f.bytes, len, data, len);
-
-	if ( len == sizeof(float) )
-		*val = (AIFDOUBLEST)f.f;
-	else if ( len == sizeof(double) )
-		*val = (AIFDOUBLEST)f.d;
-	else if ( len == sizeof(AIFDOUBLEST) )
-		*val = f.dd;
-	else {
-		fprintf(stderr, "conversion to float: %d does not match any native precision\n", len);
-
-		*val = 0;
-		SetAIFError(AIFERR_CONV, NULL);
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
- * Convert an AIF float to a native single precision floating point value.
- */
-int
-AIFToFloat(AIF *a, float *val)
-{
-	int		res;
-	AIFDOUBLEST	dd;
-
-	if ( a == (AIF *)NULL || val == (float *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	switch ( FDSType(AIF_FORMAT(a)) )
-	{
-	case AIF_INTEGER:
-		res = _aif_int_to_doublest(AIF_DATA(a), AIF_LEN(a), &dd);
-		break;
-
-	case AIF_FLOATING:
-		res = _aif_to_doublest(AIF_DATA(a), AIF_LEN(a), &dd);
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	if ( res < 0 )
-		return -1;
-
-	*val = (float)dd; /* possible loss of precision */
-	return 0;
-}
-
-/*
- * Convert an AIF float to a native double precision floating point value.
- */
-int
-AIFToDouble(AIF *a, double *val)
-{
-	AIFDOUBLEST	d;
-
-	if ( a == (AIF *)NULL || val == (double *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if  ( AIFToDoublest(a, &d) < 0 )
-		return -1;
-
-	*val = (double)d; /* possible loss of precision */
-
-	return 0;
-}
-
-/*
- * Convert an AIF value to a native floating point value using the
- * largest precision available. Implicitly converts an integer to
- * a float.
- */
-int
-AIFToDoublest(AIF *a, AIFDOUBLEST *val)
-{
-	int	res;
-
-	if ( a == (AIF *)NULL || val == (AIFDOUBLEST *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	switch ( FDSType(AIF_FORMAT(a)) )
-	{
-	case AIF_INTEGER:
-		res = _aif_int_to_doublest(AIF_DATA(a), AIF_LEN(a), val);
-		break;
-
-	case AIF_FLOATING:
-		res = _aif_to_doublest(AIF_DATA(a), AIF_LEN(a), val);
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return res;
-}
-
-/*
- * Convert an AIF integer to and AIF float using largest precision
- * available.
- */
-int
-_aif_int_to_doublest(char *data, int len, AIFDOUBLEST *val)
-{
-	AIFLONGEST	l;
-
-	if ( _aif_to_longest(data, len, &l) < 0 )
-		return -1;
-
-	*val = (AIFDOUBLEST)l;
-
-	return 0;
-}
-
-/*
- * Convert AIF integer to AIF float. Result is always f8.
- */
-int
-_aif_int_to_aif_float(char **data, char *d, int l)
-{
-	AIFDOUBLEST	vd;
-
-	_aif_int_to_doublest(d, l, &vd);
-
-	if ( _doublest_to_aif(data, sizeof(double), vd) < 0 )
-		return -1;
-
-	return sizeof(double);
-}
-
-/*
- * Convert AIF float to AIF integer. Result is always is4 (for convenience).
- */
-int
-_aif_float_to_aif_int(char **f, char *d, int l)
-{
-	int		vi;
-	AIFDOUBLEST	vd;
-
-	_aif_to_doublest(d, l, &vd);
-
-	vi = (int)vd;
-
-	if ( _longest_to_aif(f, sizeof(int), vi) < 0 )
-		return -1;
-
-	return sizeof(int);
-}
-
-/*
- * Convert number to ascii.
- */
-char
-ToAscii(int n, int base)
-{
-	if ( base < 10 || n < 10 )
-		return (n & 0xf) + '0';
-
-	return (n & 0xf) - 10 + 'a';
-}
-
-/*
- * Create a void AIF object.
- */
-AIF *
-VoidToAIF(char *data, int len)
-{
-	AIF *	a;
-
-	a = NewAIF(0, len);
-
-	AIF_FORMAT(a) = strdup(AIF_VOID_TYPE(len));
-
-	if ( data != NULL && len > 0 )
-		memcpy(AIF_DATA(a), data, len);
-
-	return a;
-}
-
-/*
- * Convert an AIF void object to its native representation.
- */
-int
-AIFToVoid(AIF *a, char *data, int len)
-{
-	int	size;
-
-	if ( data == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	ResetAIFError();
-
-	if ( len > 0 )
-	{
-		size = FDSTypeSize(AIF_FORMAT(a));
-		memcpy(data, AIF_DATA(a), size > len ? size : len);
-	}
-
-	return 0;
-}
-
-/*
- * Coerce an AIF object into type t if possible.
- */
-AIF *
-AIFCoerce(AIF *a, char *t)
-{
-	int		tlen;
-	int		alen;
-	int		atype;
-	AIFDOUBLEST	dval;
-	char *		rd = NULL;
-	AIF *		na;
-
-	ResetAIFError();
-
-	tlen = FDSTypeSize(t);
-	alen = AIF_LEN(a);
-
-	switch ( FDSType(t) )
-	{
-	case AIF_INTEGER:
-		switch ( FDSType(AIF_FORMAT(a)) )
-		{
-		case AIF_INTEGER:
-			if ( tlen > alen )
-			{
-				rd = (char *)_aif_alloc(tlen);
-				memcpy(rd, AIF_DATA(a), tlen);
-				return MakeAIF(strdup(t), rd);
-			}
-			else if ( tlen < alen )
-			{
-				SetAIFError(AIFERR_TYPE, NULL);
-				return (AIF *)NULL;
-			}
-
-			return CopyAIF(a);
-
-		case AIF_FLOATING:
-			if ( _aif_float_to_aif_int(&rd, AIF_DATA(a), alen) < 0 )
-				return (AIF *)NULL;
-
-			return MakeAIF(strdup("is4"), rd);
-
-		default:
-			SetAIFError(AIFERR_TYPE, NULL);
-			return (AIF *)NULL;
-		}
-		break;
-
-	case AIF_FLOATING:
-		switch ( atype = AIFType(a) )
-		{
-		case AIF_INTEGER:
-		case AIF_FLOATING:
-			if ( atype == AIF_INTEGER )
-			{
-				/*
-				** Convert integer to double.
-				*/
-				if ( _aif_int_to_doublest(AIF_DATA(a), AIF_LEN(a), &dval) < 0 )
-					return (AIF *)NULL;
-
-				alen = sizeof(AIFDOUBLEST);
-			}
-			else
-			{
-				/*
-				** Convert AIF float to double
-				*/
-				if ( _aif_to_doublest(AIF_DATA(a), AIF_LEN(a), &dval) < 0 )
-					return (AIF *)NULL;
-			}
-
-			na = NewAIF(0, tlen);
-
-			AIF_FORMAT(na) = strdup(AIF_FLOATING_TYPE(tlen));
-
-			/*
-			** Now take care of floating precision
-			*/
-
-			if ( _doublest_to_aif(&AIF_DATA(na), tlen, dval) < 0 )
-				return (AIF *)NULL;
-
-			return na;
-
-		default:
-			SetAIFError(AIFERR_TYPE, NULL);
-			return (AIF *)NULL;
-		}
-		break;
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return (AIF *)NULL;
-	}
-
-	return na;
-}
-
-/* 
- * build an AIF from two ascii strings. 
- */
-AIF *
-AsciiToAIF(char *format, char *data)
-{
-	int	flen = strlen(format);
-	int	dlen = strlen(data);
-	long	acc;
-	AIF *	a;
-	char *	bdata;
-	char *	bdp;
-	char *	dp;
-	char	buf[2];
-
-	ResetAIFError();
-
-	if ( dlen % 2 != 0 )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	bdata = (char *) _aif_alloc(dlen/2);
-	bdp = bdata;
-
-	buf[1] = 0;
-
-	dp = data;
-
-	/*
-	** convert two chars of data to one byte of bdata
-	*/
-	while ( *dp )
-	{
-		buf[0] = *dp++;
-		acc = strtol(buf, 0, 16) << 4;
-		buf[0] = *dp++;
-		acc += strtol(buf, 0, 16);
-		*bdp++ = (char) (acc & 0xff);
-	}
-
-	a = NewAIF(flen + 1, dlen/2);
-
-	memcpy(AIF_DATA(a), bdata, AIF_LEN(a));
-	memcpy(AIF_FORMAT(a), format, flen);
-
-	_aif_free(bdata);
-
-	return a;
-}
-
-/************************************
- *                                  *
- *   AIFToStr()-related functions   *
- *                                  *
- ************************************/
-
-void
-_str_init()
-{
-	if ( _str_buf_len == 0 )
-	{
-		_str_buf = _aif_alloc(BUFSIZ);
-		_str_buf_len = BUFSIZ;
-	}
-
-	_str_pos = _str_buf;
-}
-
-void
-_str_cat(char *str)
-{
-	int	len = strlen(str);
-
-	while ( _str_pos + len + 1 > _str_buf + _str_buf_len )
-	{
-		int offset = _str_pos - _str_buf;
-		_str_buf_len += BUFSIZ;
-		_str_buf = _aif_resize(_str_buf, _str_buf_len);
-		_str_pos = _str_buf + offset;
-	}
-
-	memcpy(_str_pos, str, len);
-	_str_pos += len;
-	*_str_pos = '\0';
-}
-
-void
-_str_add(char ch)
-{
-	while ( _str_pos + 2 > _str_buf + _str_buf_len )
-	{
-		int offset = _str_pos - _str_buf;
-		_str_buf_len += BUFSIZ;
-		_str_buf = _aif_resize(_str_buf, _str_buf_len);
-		_str_pos = _str_buf + offset;
-	}
-
-	*_str_pos++ = ch;
-	*_str_pos = '\0';
-}
-
-char *
-_str_get(void)
-{
-	return strdup(_str_buf);
-}
-
-int
-_aif_bool_to_str(int depth, char **fds, char **data)
-{
-	int		bytes = sizeof(int);
-	int		i;
-	char		buf[BUFSIZ];
-	AIFLONGEST	lli;
-
-	(*fds)++;
-
-	if ( _aif_to_longest(*data, bytes, &lli) < 0 )
-		return -1;
-
-	i = (int)lli;
-
-	if ( i == -1 )
-		snprintf(buf, BUFSIZ-1, "true");
-	else if ( i == 0 )
-		snprintf(buf, BUFSIZ-1, "false");
-	else
-		snprintf(buf, BUFSIZ-1, "%d", i);
-
-	_str_cat(buf);
-	*data += bytes;
-
-	return 0;
-}
-
-int
-AIFBoolToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_bool_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_char_to_str(int depth, char **fds, char **data)
-{
-	char	c;
-	char	buf[BUFSIZ];
-
-	(*fds)++;
-
-	if ( _aif_to_char(*data, &c) < 0 )
-		return -1;
-
-	if ( c >= ' ' && c <= '~' )
-		snprintf(buf, BUFSIZ-1, "%d '%c'", c, c);
-	else
-		snprintf(buf, BUFSIZ-1, "%d '\\%03o'", c & 0xff, c & 0xff);
-
-	_str_cat(buf);
-	*data += sizeof(char);
-
-	return 0;
-}
-
-int
-_aif_int_to_str(int depth, char **fds, char **data)
-{
-	int		bytes = FDSTypeSize(*fds);
-	int		isSigned = FDSIsSigned(*fds);
-	int		i;
-	AIFLONGEST	lli;
-	char	buf[BUFSIZ];
-
-	*fds += 2;
-	*fds = _fds_skipnum(*fds);
-
-	if ( _aif_to_longest(*data, bytes, &lli) < 0 )
-		return -1;
-
-	if ( bytes <= sizeof(int) )
-	{
-		i = (int)lli;
-		snprintf(buf, BUFSIZ-1, isSigned ? "%d" : "%u", i);
-	}
-	else if ( bytes == sizeof(long) )
-	{
-#ifdef CC_HAS_LONG_LONG
-		long		li;
-
-		li = (long)lli;
-		snprintf(buf, BUFSIZ-1, isSigned ? "%ld" : "%lu" , li);
-#else /* CC_HAS_LONG_LONG */
-		snprintf(buf, BUFSIZ-1, isSigned ? "%ld" : "%lu" , lli);
-#endif /* CC_HAS_LONG_LONG */
-	}
-	else
-	{
-#ifdef CC_HAS_LONG_LONG
-	#ifdef WIN32
-		snprintf(buf, BUFSIZ-1, isSigned ? "%I64d" : "%I64u" , lli);
-	#else /* WIN32 */
-		snprintf(buf, BUFSIZ-1, isSigned ? "%lld" : "%llu" , lli);
-	#endif /* WIN32 */
-#else /* CC_HAS_LONG_LONG */
-		snprintf(buf, BUFSIZ-1, isSigned ? "%ld" : "%lu" , lli);
-#endif /* CC_HAS_LONG_LONG */
-	}
-
-	_str_cat(buf);
-
-	if ( bytes > sizeof(AIFLONGEST) )
-	{
-		snprintf(buf, BUFSIZ-1, "<truncated from %d bytes>", bytes);
-		_str_cat(buf);
-	}
-
-	*data += bytes;
-
-	return 0;
-}
-
-int
-AIFIntToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_int_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_float_to_str(int depth, char **fds, char **data)
-{
-	AIFDOUBLEST	d;
-	int		bytes = FDSTypeSize(*fds);
-	char		buf[BUFSIZ];
-
-	*fds += 1;
-	*fds = _fds_skipnum(*fds);
-
-	if ( _aif_to_doublest(*data, bytes, &d) < 0 )
-		return -1;
-
-	if ( bytes <= sizeof(float) )
-#ifdef HAVE_LONG_DOUBLE
-		snprintf(buf, BUFSIZ-1, "%.8Lg", d);
-#else /* HAVE_LONG_DOUBLE */
-		snprintf(buf, BUFSIZ-1, "%.8g", (float)d);
-#endif /* HAVE_LONG_DOUBLE */
-	else if ( bytes == sizeof(double) )
-#ifdef HAVE_LONG_DOUBLE
-		snprintf(buf, BUFSIZ-1, "%.16Lg", d);
-	else
-		snprintf(buf, BUFSIZ-1, "%.34Lg", d);
-#else /* HAVE_LONG_DOUBLE */
-		snprintf(buf, BUFSIZ-1, "%.16lg", (double)d);
-#endif /* HAVE_LONG_DOUBLE */
-
-	_str_cat(buf);
-	*data += bytes;
-
-	return 0;
-}
-
-int
-AIFFloatToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_float_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_pointer_to_str(int depth, char **fds, char **data)
-{
-	int 	index;
-	char 	buf[BUFSIZ];
-
-	(*fds)++; /* past "^" */
-	_str_cat("^");
-
-	switch ( (int)**data )
-	{
-	case AIF_PTR_NIL: /* nil value */
-		if ( depth == 1 )
-			depth = -1;
-		else if ( depth > 1 )
-			depth--;
-
-		(*data)++;
-		_str_cat("null");
-		_fds_advance(fds);
-		break;
-
-	case AIF_PTR_NORMAL: /* normal value */
-		(*data)++;
-
-		if ( depth == -1 )
-		{
-			_str_cat("<normal>");
-			_fds_skip_data(fds, data);
-			break;
-		}
-		else if ( depth == 1 )
-			depth = -1;
-		else if ( depth > 1 )
-			depth--;
-		
-		_aif_to_str(depth, fds, data);
-		break;
-
-	case AIF_PTR_NAME: /* normal value, but remember it */
-		(*data)++;
-		_ptrname_to_int(*data, &index);
-		*data += 4;
-		_aif_values_seen[index] = *data;
-		snprintf(buf, BUFSIZ-1, "<%d:>", index);
-		_str_cat(buf);
-
-		if ( depth == -1 )
-		{
-			_fds_skip_data(fds, data);
-			break;
-		}
-		else if ( depth == 1 )
-			depth = -1;
-		else if ( depth > 1 )
-			depth--;
-
-		_aif_to_str(depth, fds, data);
-		break;
-
-	case AIF_PTR_REFERENCE: /* reference to remembered value */
-		if ( depth == 1 )
-		{
-			char * target;
-
-			depth = -1;
-			target = _find_target(data, 0);
-			_aif_to_str(depth, fds, &target);
-		}
-		else if ( depth > 1 )
-		{
-			char * target;
-
-			depth--;
-			target = _find_target(data, 0);
-			_aif_to_str(depth, fds, &target);
-		}
-		else
-		{
-			(*data)++;
-			_ptrname_to_int(*data, &index);
-			*data += 4;
-			snprintf(buf, BUFSIZ-1, "<=%d>", index);
-			_str_cat(buf);
-			_fds_advance(fds);
-		}
-
-		break;
-
-	case AIF_PTR_INVALID: /* pointer is invalid */
-		(*data)++;
-		_str_cat("<invalid>");
-		_fds_advance(fds);
-		break;
-	}
-
-	return 0;
-}
-
-int
-AIFPointerToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_pointer_to_str(depth, &fmt, &data) )
-		return -1;
-	
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_region_to_str(int depth, char **fds, char **data)
-{
-	int		i;
-	int		rank;
-	int		size;
-	AIFLONGEST	min;
-	AIFLONGEST	max;
-	char		buf[BUFSIZ];
-
-	rank = _fds_getnum(*fds + 1);
-	size = FDSTypeSize(FDSBaseType(*fds));
-
-	_str_cat("[");
-
-	for ( i = 0 ; i < rank ; i++ )
-	{
-		if ( i != 0 && rank > 1 )
-			_str_cat(", ");
-
-		if
-		(
-			_aif_to_longest(*data + 2 * i * size, size, &min) < 0
-			||
-			_aif_to_longest(*data + (2 * i + 1) * size, size, &max) < 0
-		)
-			return -1;
-
-#ifdef CC_HAS_LONG_LONG
-		snprintf(buf, BUFSIZ-1, "%lld..%lld", min, max);
-#else /* CC_HAS_LONG_LONG */
-		snprintf(buf, BUFSIZ-1, "%ld..%ld", min, max);
-#endif /* CC_HAS_LONG_LONG */
-
-		_str_cat(buf);
-	}
-
-	_str_cat("]");
-
-	_fds_advance(fds);
-
-	return 0;
-}
-
-int
-_aif_array_to_str(int depth, char **fds, char **data)
-{
-	int		i;
-	AIFIndex *	ix;
-	char *		fmt;
-
-	ix = FDSArrayIndexInit(*fds);
-
-	_str_cat("[");
-
-	for ( i = 0 ; i < ix->i_nel ; i++ )
-	{
-		fmt = ix->i_btype;
-
-		/*
-                if ( ix->i_rank == 1 )
-			snprintf(_str_buf, BUFSIZ-1, "(%d)", i + ix->i_min[0]);
-		*/
-
-		_aif_to_str(depth, &fmt, data);
-
-		if ( i < ix->i_nel - 1 )
-			_str_cat(", ");
-
-	}
-
-	_str_cat("]");
-
-	AIFArrayIndexFree(ix);
-
-	_fds_advance(fds); /* skip over entire array descriptor */
-
-	return 0;
-}
-
-int
-AIFArrayToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_ARRAY )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_array_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-AIFArrayIndexToStr(char **str, AIFIndex *ix)
-{
-	int	i;
-	char	buf[BUFSIZ];
-
-	_str_init();
-
-	for ( i = 0 ; i < ix->i_rank ; i++ )
-	{
-		snprintf(buf, BUFSIZ-1, "[%d]", ix->i_index[i]);
-		_str_cat(buf);
-	}
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_struct_to_str(int depth, char **fds, char **data)
-{
-	char *	inFds;	
-	char	buf[BUFSIZ];
-	int	isStruct = 1;	/* assume it is a struct */
-				/* to avoid printing the semicolons if
-				   it is a struct */
-
-	_str_cat("{");
-
-	(*fds)++; /* past open brace */
-
-	/*
-	** past nnn=
-	*/
-
-	_fds_skipid(fds);
-
-	while ( **fds != FDS_STRUCT_END )
-	{
-		if ( isStruct 	&& (*fds)[0] == FDS_STRUCT_ACCESS_SEP
-				&& (*fds)[1] == FDS_STRUCT_ACCESS_SEP
-				&& (*fds)[2] == FDS_STRUCT_ACCESS_SEP )
-		{
-			(*fds) += 3;
-			break;
-		}
-		else if ( **fds == FDS_STRUCT_ACCESS_SEP )
-		{
-			isStruct = 0;	/* it is a class */
-			
-			(*fds)++;
-			_str_cat("; ");
-			continue;
-		}
-
-		if ( (inFds = strchr(*fds, FDS_STRUCT_FIELD_NAME_END)) == NULL )
-			break;
-
-		*inFds = 0; /* temporarily */
-
-		snprintf(buf, BUFSIZ-1, "%s = ", *fds);
-		_str_cat(buf);
-
-		*inFds++ = FDS_STRUCT_FIELD_NAME_END;
-
-		*fds = inFds; /* to start of field */
-
-		_aif_to_str(depth, fds, data);
-
-		if ( **fds == FDS_STRUCT_FIELD_SEP )
-		{
-			(*fds)++;
-			_str_cat(", ");
-		}
-	}
-
-	_str_cat("}");
-
-	(*fds)++; /* past close brace */
-
-	return 0;
-}
-
-int
-AIFStructToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_struct_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_reference_to_str(int depth, char **fds, char **data)
-{
-	int	index;
-	char *	effectiveFds;
-
-	(*fds)++; /* past ">" */
-	index = (int)strtol(*fds, NULL, 10);
-	*fds = _fds_skipnum(*fds); /* past name */
-	(*fds)++; /* past "/" */
-	effectiveFds = _aif_types_seen[index];
-
-	_aif_to_str(depth, &effectiveFds, data);
-
-	return 0;
-}
-
-int
-AIFReferenceToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_reference_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_string_to_str(int depth, char **fds, char **data)
-{
-	int	bytes;
-	char *	buf;
-
-	(*fds)++; /* past "s" */
-	bytes = (*(*data)++ & 0xff) << 8;
-	bytes += *(*data)++ & 0xff;
-
-	buf = _aif_alloc(bytes+3);
-
-	*buf = '"';
-	strncpy(&buf[1], *data, bytes);
-	*(buf + bytes + 1) = '"';
-	*(buf + bytes + 2) = 0; /* terminator */
-
-	_str_cat(buf);
-
-	*data += bytes;
-
-	_aif_free(buf);
-
-	return 0;
-}
-
-int
-_aif_void_to_str(int depth, char **fds, char **data)
-{
-	int bytes = FDSTypeSize(*fds);
-
-	*fds += 1; /* past "v" */
-	*fds = _fds_skipnum(*fds);
-
-	*data += bytes;
-
-	_str_cat("VOID");
-	return 0;
-}
-
-int
-AIFVoidToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_void_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_union_to_str(int depth, char **fds, char **data)
-{	
-	char *	inFds;	
-	char *	temp;
-	char *	dt;
-	int 	size;
-	int	union_size;
-	char	buf[BUFSIZ];
-
-	_str_cat("{");
-
-	union_size = FDSTypeSize(*fds);
-
-	(*fds)++; /* past open brace */
-
-	/*
-	** past nnn=
-	*/
-
-	_fds_skipid(fds);
-
-	while ( **fds != FDS_UNION_END )
-	{
-		if ( (inFds = strchr(*fds, FDS_UNION_FIELD_NAME_END)) == NULL )
-			break;
-
-		*inFds = 0; /* temporarily */
-
-		snprintf(buf, BUFSIZ-1, "%s = ", *fds);
-		_str_cat(buf);
-
-		*inFds++ = FDS_UNION_FIELD_NAME_END;
-
-		*fds = inFds; /* to start of field */
-
-		size = FDSTypeSize(*fds);
-		temp = _aif_alloc( sizeof(char) * size );
-		dt = temp;
-		memcpy(dt, *data, size);
-
-		_aif_to_str(depth, fds, &dt);
-		_aif_free(temp);
-
-		if ( **fds == FDS_UNION_FIELD_SEP )
-		{
-			(*fds)++;
-			_str_cat(", ");
-		}
-	}
-
-	_str_cat("}");
-	*data += union_size;
-
-	(*fds)++; /* past close brace */
-
-	return 0;
-}
-
-int
-AIFUnionToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_union_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_function_to_str(int depth, char **fds, char **data)
-{	
-	char *	p;
-	char	end[2] = {FDS_FUNCTION_ARG_END, 0};
-
-	(*fds)++; /* past "&" */
-
-	p = _fds_skipto(*fds, end);
-
-	_str_cat(++p);
-	_str_cat(" ");
-	_str_cat(*data);
-	_str_cat("(");
-
-	while ( **fds != FDS_FUNCTION_ARG_END )
-	{
-		if ( **fds == FDS_UNION_FIELD_SEP )
-			_str_cat(", ");
-		else
-			_str_add(**fds);
-
-		(*fds)++;
-	}
-
-	_str_cat(")");
-
-	(*fds)++; /* past arg end */
-
-	_fds_advance(fds);
-	_fds_skip_data(fds, data);
-
-	return 0;
-}
-
-int
-AIFFunctionToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_function_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_enum_to_str(int depth, char **fds, char **data)
-{	
-	int		bytes = FDSTypeSize(*fds);
-	AIFLONGEST	lli;
-	int		i;
-	char *		string = NULL;
-
-	/* check whether it is an empty enum or not */
-	char * 		f = *fds;
-
-	while ( *f != FDS_ID )
-		f++;
-
-	f++;
-	if ( *f == FDS_ENUM_END )
-	{	/* it is an empty enum */
-		_str_cat("0");	
-		*data += bytes;
-		_fds_advance(fds);
-		return 0;
-	}
-
-	if ( _aif_to_longest(*data, bytes, &lli) < 0 )
-		return -1;
-
-	i = (int) lli;
-
-	if ( FDSEnumConstByValue(*fds, &string, i) < 0)
-		return -1;
-	
-	_str_cat(string);
-	_aif_free(string);
-
-	*data += bytes;
-	_fds_advance(fds);
-
-	return 0;
-}
-
-int
-AIFEnumToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_enum_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-int
-_aif_name_to_str(int depth, char **fds, char **data)
-{	
-	int	index;
-
-	(*fds)++; /* past "%" */
-	index = (int)strtol(*fds, NULL, 10);
-	*fds = _fds_skipnum(*fds); /* past name */
-	(*fds)++; /* past "/" */
-	_aif_types_seen[index] = *fds;
-
-	return _aif_to_str(depth, fds, data);
-}
-
-/* 
- * Prints the object in human-readable form to fp, advances fds and data to
- * the first location after the part printed.  Arithmetic values are given at
- * least len bytes of significance, more if the fds indicates.
- */
-int
-_aif_to_str(int depth, char **fds, char **data)
-{
-	char * tmp;
-
-	_fds_resolve(fds);
-
-	switch ( FDSType(*fds) )
-	{
-	case AIF_BOOLEAN:
-		return _aif_bool_to_str(depth, fds, data); 
-
-	case AIF_CHARACTER:
-		return _aif_char_to_str(depth, fds, data);
-
-	case AIF_INTEGER:
-		return _aif_int_to_str(depth, fds, data);
-
-	case AIF_FLOATING:
-		return _aif_float_to_str(depth, fds, data);
-
-	case AIF_ARRAY:
-		return _aif_array_to_str(depth, fds, data);
-
-	case AIF_POINTER:
-		return _aif_pointer_to_str(depth, fds, data);
-
-	case AIF_REGION:
-		return _aif_region_to_str(depth, fds, data);
-
-	case AIF_STRUCT:
-		return _aif_struct_to_str(depth, fds, data);
-
-	case AIF_NAME:
-		return _aif_name_to_str(depth, fds, data);
-
-	case AIF_REFERENCE:
-		tmp = _fds_lookup(fds);
-		return _aif_to_str(depth, &tmp, data);
-
-	case AIF_STRING:
-		return _aif_string_to_str(depth, fds, data);
-
-	case AIF_ENUM:
-		return _aif_enum_to_str(depth, fds, data);
-
-	case AIF_UNION:
-		return _aif_union_to_str(depth, fds, data);
-
-	case AIF_VOID:
-		return _aif_void_to_str(depth, fds, data);
-
-	case AIF_FUNCTION:
-		return _aif_function_to_str(depth, fds, data);
-
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		break;
-	}
-
-	return -1;
-}
-
-int
-AIFToStr(char **str, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	_str_init();
-
-	if ( _aif_to_str(depth, &fmt, &data) < 0 )
-		return -1;
-
-	*str = _str_get();
-
-	return 0;
-}
-
-/* Convert a pointer name into an int (4 bytes) */
-void
-_ptrname_to_int(char *name, int *number)
-{
-	int	s;
-	int 	i = 0;
-
-	for ( s = 0 ; s < 4 ; s++ )
-		i = i * 0x100 + (name[s] & 0xff);
-
-	*number = i;
-}
-
-/* Convert an int (4 bytes) into a string for the pointer name */
-void
-_int_to_ptrname(int number, char *name)
-{
-	union ieee	f;
-	f.i = number;
-
-	_aif_normalise(name, 4, f.bytes, 4);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/depcomp b/debug/org.eclipse.ptp.debug.sdm/libaif/depcomp
deleted file mode 100755
index 11e2d3b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/depcomp
+++ /dev/null

@@ -1,522 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2004-05-31.23
-
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit 0
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/libaif/doc/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-Makefile

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/Makefile.in b/debug/org.eclipse.ptp.debug.sdm/libaif/doc/Makefile.in
deleted file mode 100644
index 60d07eb..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/Makefile.in
+++ /dev/null

@@ -1,49 +0,0 @@
-srcdir =	@srcdir@
-VPATH =		@srcdir@
-prefix =	@prefix@
-exec_prefix =	@exec_prefix@
-bindir =	@bindir@
-libdir =	@libdir@
-
-CC =		@CC@
-CPPFLAGS =	@CPPFLAGS@
-CFLAGS =	@CFLAGS@
-LDFLAGS =	@LDFLAGS@
-DEFS =		@DEFS@
-INSTALL =	@INSTALL@
-INSTALL_PROGRAM =	@INSTALL_PROGRAM@
-INSTALL_DATA =	@INSTALL_DATA@
-RANLIB =	@RANLIB@
-AR =		ar
-RPCGEN =	rpcgen
-REMOVE =	rm -f
-XMLTO =		@XMLTO@
-
-TOP =		$(srcdir)/../..
-COMPAT =	$(srcdir)/../compat
-DBGSRV =	$(srcdir)/../dbgsrv
-GC =		$(srcdir)/../gc
-UTIL =		$(srcdir)/../util
-LIBS =	
-INSPROGS =	
-
-SHELL =		/bin/sh
-
-all: html.stamp libaif.ps libaif.txt
-
-clean:
-	rm -f libaif.ps *.html html.stamp
-
-distclean: clean
-	rm -rf Makefile Makefile.bak
-
-html.stamp: libaif.xml
-	$(XMLTO) html libaif.xml
-
-libaif.ps: libaif.xml
-	$(XMLTO) ps libaif.xml
-
-libaif.txt: libaif.xml
-	$(XMLTO) txt libaif.xml
-
-# DO NOT REMOVE THIS LINE

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.txt b/debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.txt
deleted file mode 100644
index 46f17cc..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.txt
+++ /dev/null

@@ -1,104 +0,0 @@
-
-Libaif
-
-Greg Watson
-
-David Abramson
-
-Brian May
-
-Donny Kurniawan
-
-   Copyright © 2001 GuardSoft Pty. Ltd.
-     _________________________________________________________________
-
-   Table of Contents
-
-   1. [1]Quick Start
-
-        [2]Installing libaif
-        [3]Installing patched GDB
-
-Chapter 1. Quick Start
-
-   Table of Contents
-
-   [4]Installing libaif
-   [5]Installing patched GDB
-
-   This chapter describes how to start using libaif in the minimum amount
-   of time.
-
-Installing libaif
-
-     * Download and extract the source code:
-
-$ tar -xzf libaif-1.0.0.tar.gz
-
-     * Compile and install libaif by changing to the directory, and using
-       configure and make, followed by make install (as root).
-       For example:
-
-$ cd libaif-1.0.0
-$ configure
-
-...
-
-$ make
-
-...
-
-$ make install
-
-...
-
-Installing patched GDB
-
-     * AIF  is  currently  supported  in  versions  5.0  and  5.2 of GDB.
-       Download  the  source  code for the version of GDB that suits your
-       system.
-     * Extract  source  code,  and apply the patch from libaif, using the
-       supplied patch script applypatch.
-       For example:
-
-$ cd /tmp
-$ tar -xzf gdb_5.0.tar.gz
-$ cd $(libaif)/patches
-$ ./applypatch -install-all /tmp/gdb-5.0
-patching file gdb-5.0/gdb/aif-valprint.c
-patching file gdb-5.0/gdb/c-valprint.c
-patching file gdb-5.0/gdb/printcmd.c
-patching file gdb-5.0/gdb/typeprint.c
-patching file gdb-5.0/gdb/valprint.c
-patching file gdb-5.0/gdb/Makefile.in
-patching file gdb-5.0/gdb/libaif.mk
-
-     * Compile  and  install  GDB by changing to the directory, and using
-       configure and make, followed by make install (as root).
-
-Note
-       You  should  use  the  --with-aif=dir  (or  --with-aif-lib=dir and
-       --with-aif-include=dir)  options  in  order  to allow configure to
-       locate the libaif library and include files.
-       Example:
-
-$ cd /tmp/gdb-5.0
-$ ./configure --with-aif=$(libaif-insdir) alpha-redhat-linux
-
-...
-
-$ make
-
-...
-
-$ make install
-
-...
-
-References
-
-   1. file://localhost/tmp/xmlto.9iXGp0/libaif.proc#id2812815
-   2. file://localhost/tmp/xmlto.9iXGp0/libaif.proc#id2798796
-   3. file://localhost/tmp/xmlto.9iXGp0/libaif.proc#id2751035
-   4. file://localhost/tmp/xmlto.9iXGp0/libaif.proc#id2798796
-   5. file://localhost/tmp/xmlto.9iXGp0/libaif.proc#id2751035

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.xml b/debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.xml
deleted file mode 100644
index 425f4df..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/doc/libaif.xml
+++ /dev/null

@@ -1,168 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-          "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book><title>Libaif</title>
-  <bookinfo>
-    <authorgroup>
-      <author>
-	<firstname>Greg</firstname>
-	<surname>Watson</surname>
-      </author>
-      <author>
-	<firstname>David</firstname>
-	<surname>Abramson</surname>
-      </author>
-      <author>
-	<firstname>Brian</firstname>
-	<surname>May</surname>
-      </author>
-      <author>
-	<firstname>Donny</firstname>
-	<surname>Kurniawan</surname>
-      </author>
-    </authorgroup>
-    <copyright>
-      <year>2001</year>
-      <holder>GuardSoft Pty. Ltd.</holder>
-    </copyright>
-    <affiliation>
-      <orgname>Monash University</orgname>
-      <address>Clayton, Victoria, Melbourne</address>
-    </affiliation>
-  </bookinfo>
-
-<!-- ====================================================================== -->
-<chapter><title>Quick Start</title>
-<para>
-This chapter describes how to start using <emphasis>libaif</emphasis>
-in the minimum amount of time.
-</para>
-
-<section><title>Installing <emphasis>libaif</emphasis></title>
-
-<para>
-<itemizedlist>
-  <listitem>
-    <para>Download and extract the source code:</para>
-<para>
-<screen>
-
-$ tar -xzf libaif-1.0.0.tar.gz
-
-</screen>
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>Compile and install <emphasis>libaif</emphasis> by
-    changing to the
-    directory, and using <userinput>configure</userinput> and
-    <userinput>make</userinput>, followed by
-    <userinput>make install</userinput> (as root).</para>
-
-    <para>For example:
-<screen>
-
-$ cd libaif-1.0.0
-$ configure
-
-...
-
-$ make
-
-...
-
-$ make install
-
-...
-
-</screen></para>
-  </listitem>
-</itemizedlist>
-</para>
-
-</section>
-
-<!-- ...................................................................... -->
-
-<section><title>Installing patched <emphasis>GDB</emphasis></title>
-
-<para>
-<itemizedlist>
-  <listitem>
-    <para>AIF is currently supported in versions 5.0 and 5.2 of <emphasis>GDB</emphasis>. 
-    Download the source code for the version of <emphasis>GDB</emphasis> that suits your system.
-    </para>
-  </listitem>
-  <listitem>
-    <para>Extract source code, and apply the patch from
-    <emphasis>libaif</emphasis>, using
-    the supplied patch script <userinput>applypatch</userinput>.</para>
-
-    <para> For example:
-<screen>
-
-$ cd /tmp
-$ tar -xzf gdb_5.0.tar.gz 
-$ cd $(libaif)/patches
-$ ./applypatch -install-all /tmp/gdb-5.0
-patching file gdb-5.0/gdb/aif-valprint.c
-patching file gdb-5.0/gdb/c-valprint.c
-patching file gdb-5.0/gdb/printcmd.c
-patching file gdb-5.0/gdb/typeprint.c
-patching file gdb-5.0/gdb/valprint.c
-patching file gdb-5.0/gdb/Makefile.in
-patching file gdb-5.0/gdb/libaif.mk
-
-</screen>
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>Compile and install <emphasis>GDB</emphasis> by
-    changing to the
-    directory, and using <userinput>configure</userinput> and
-    <userinput>make</userinput>, followed by
-    <userinput>make install</userinput> (as root).
-    </para>
-
-    <note><para>You should use the
-      <userinput>--with-aif=<replaceable>dir</replaceable></userinput> (or 
-      <userinput>--with-aif-lib=<replaceable>dir</replaceable></userinput> and
-      <userinput>--with-aif-include=<replaceable>dir</replaceable></userinput>)
-      options in order to allow <userinput>configure</userinput> to locate the
-      libaif library and include files.
-    </para></note>
-
-    <para> Example:
-<screen>
-
-$ cd /tmp/gdb-5.0
-$ ./configure --with-aif=$(libaif-insdir) alpha-redhat-linux
-
-...
-
-$ make
-
-...
-
-$ make install
-
-...
-
-</screen>
-</para>
-  </listitem>
-
-</itemizedlist>
-</para>
-
-</section>
-
-<!-- ...................................................................... -->
-
-</chapter>
-
-<!-- ====================================================================== -->
-
-</book>

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/error.c b/debug/org.eclipse.ptp.debug.sdm/libaif/error.c
deleted file mode 100644
index fc91240..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/error.c
+++ /dev/null

@@ -1,98 +0,0 @@
-/*
- * Routines for handling AIF errors.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#include	<string.h>
-
-#include	"aif.h"
-#include	"aifint.h"
-#include	"aiferr.h"
-
-char *	aiferrstr[] =
-{
-	"No error",
-	"Arguments are different sizes",
-	"Can't convert arguments",
-	"Function not supported for this type",
-	"Bad argument",
-	"Function not implemented",
-	"Error opening file: %s",
-	"Error writing file: %s",
-	"Error reading file: %s",
-	"Error seeking file: %s",
-	"Bad file header",
-	"Invalid mode for operation",
-	"Bad descriptor",
-	"No such field",
-	"Invalid arithmetic operation",
-	"Invalid base for conversion",
-	"Index out of range",
-	"String too long",
-	"This error can't happen"
-};
-
-static aiferr	_aif_errno = AIFERR_NOERR;
-static char *	_aif_errstr = NULL;
-
-aiferr
-AIFError(void)
-{
-	return _aif_errno;
-}
-
-char *
-AIFErrorStr(void)
-{
-	static char	buf[BUFSIZ];
-
-	if ( _aif_errno >= AIFERR_CANTHAPPEN )
-		return "Unknown AIF error";
-
-	if ( _aif_errstr != NULL && *_aif_errstr != '\0' )
-	{
-		snprintf(buf, BUFSIZ, aiferrstr[_aif_errno], _aif_errstr);
-		return buf;
-	}
-
-	return aiferrstr[_aif_errno];
-}
-
-void
-SetAIFError(aiferr errno, char *errstr)
-{
-	_aif_errno = errno;
-
-	if ( _aif_errstr != NULL )
-	{
-		_aif_free(_aif_errstr);
-		_aif_errstr = NULL;
-	}
-
-	if ( errstr != NULL )
-		_aif_errstr = strdup(errstr);
-}
-
-void
-ResetAIFError(void)
-{
-	_aif_errno = AIFERR_NOERR;
-
-	if ( _aif_errstr != NULL )
-	{
-		_aif_free(_aif_errstr);
-		_aif_errstr = NULL;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/exclude b/debug/org.eclipse.ptp.debug.sdm/libaif/exclude
deleted file mode 100644
index 0e36492..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/exclude
+++ /dev/null

@@ -1,7 +0,0 @@
-*.bak
-*~
-CVS
-.#*
-.*.swp
-dist
-libaif.spec

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/fds.c b/debug/org.eclipse.ptp.debug.sdm/libaif/fds.c
deleted file mode 100644
index a62bcba..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/fds.c
+++ /dev/null

@@ -1,2536 +0,0 @@
-/*
- * Routines dealing with format descriptor strings (FDS).
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#include	<stdarg.h>
-#include	<string.h>
-
-#include	<ctype.h>
-#include	<stdlib.h>
-
-#include	"aif.h"
-#include	"aiferr.h"
-#include	"aifint.h"
-
-static char	_fds_type_str[NUM_AIF_TYPES][12] = 
-{
-	{ FDS_INVALID, '%', 'd', FDS_INVALID, '\0' },
-
-	{ FDS_INTEGER, '%', 'c', '%', 'd', '\0' },
-
-	{ FDS_FLOATING, '%', 'd', '\0' },
-
-	{ FDS_POINTER, '%', 's', '%', 's', '\0' },
-
-	{ FDS_ARRAY_START, '%', 's', FDS_ARRAY_END, '%', 's', '\0' },
-
-	{ FDS_STRUCT_START, '%', 's', FDS_ID, ';', ';', ';', FDS_STRUCT_END, '\0' },
-
-	{ FDS_UNION_START, '%', 's', FDS_ID, FDS_UNION_END, '\0' },
-
-	{ FDS_FUNCTION, FDS_FUNCTION_ARG_END, '%', 's', '\0' },
-
-	{ FDS_VOID, '%', 'd', '\0' },
-
-	{ FDS_REGION, '%', 'd', '%', 's', '\0' },
-
-	{ '%', FDS_NAME, '%', 'd', FDS_NAME_END, '%', 's', '\0' },
-
-	{ FDS_REFERENCE, '%', 'd', FDS_REFERENCE_END, '\0' },
-
-	{ FDS_STRING, '\0' },
-
-	{ FDS_CHARACTER, '\0' },
-
-	{ FDS_RANGE, '%', 'd', 
-	  FDS_RANGE_SEP, FDS_RANGE_SEP, 
-	  '%', 'd', '%', 's', '\0' },
-
-	{ FDS_ENUM_START, '%', 's', FDS_ID, FDS_ENUM_END, FDS_INTEGER, '%', 'c', '4', '\0' },
-
-	{ FDS_BOOLEAN, '\0' },
-	
-	{ FDS_ADDRESS, '%', 'd', '\0' },
-
-	{ FDS_CHAR_POINTER, '%', 's', '\0' }
-};
-
-static char _fds_array_end[] = {FDS_ARRAY_END, '\0'};
-static char _fds_function_arg_end[] = {FDS_FUNCTION_ARG_END, '\0'};
-static char _fds_name_end[] = {FDS_NAME_END, '\0'};
-static char _fds_enum_end[] = {FDS_ENUM_END, '\0'};
-static char _fds_enum_const_name_end[] = {FDS_ENUM_SEP, '\0' };
-static char _fds_enum_const_end[] = { FDS_ENUM_CONST_SEP, FDS_ENUM_END, '\0' };
-static char _fds_struct_access_sep[] = {FDS_STRUCT_ACCESS_SEP, '\0'};
-static char _fds_struct_field_name_end[] = {FDS_STRUCT_FIELD_NAME_END, '\0' };
-static char _fds_struct_field_end[] = { FDS_STRUCT_ACCESS_SEP, FDS_STRUCT_FIELD_SEP, FDS_STRUCT_END, '\0' };
-static char _fds_union_field_name_end[] = {FDS_UNION_FIELD_NAME_END, '\0' };
-static char _fds_union_field_end[] = { FDS_UNION_FIELD_SEP, FDS_UNION_END, '\0' };
-
-static char	_fds_buf[BUFSIZ];
-
-char *
-_fds_skipnum(char *str)
-{
-	if ( str == NULL )
-		return NULL;
-
-	while ( *str != '\0' && isdigit((int)*str) )
-		str++;
-
-	return str;
-}
-
-char *
-_fds_skipto(char *str, char *set)
-{
-	char *	s;
-
-	if ( str == NULL )
-		return NULL;
-
-	for ( ; *str != '\0' ; str++ )
-	{
-		if
-		(
-			*str == FDS_STRUCT_START 
-			|| 
-			*str == FDS_UNION_START 
-			|| 
-			*str == FDS_ARRAY_START 
-			|| 
-			*str == FDS_ENUM_START
-		)
-		{
-			str = _fds_skiptomatch(str);
-			str++;
-		}
-
-		for ( s = set ; *s != '\0' ; s++ )
-			if ( *s == *str )
-				return str;
-	}
-
-	return str;
-}
-
-/* 
- * Convert an ascii number to a number. NOTE: silently truncates
- * the number to fit in sizeof int.
- */
-
-int
-_fds_getnum(char *str)
-{
-	int	n;
-	char *	p;
-	char *	t;
-
-	p = _fds_skipnum(str);
-
-	if ( *p == '\0' )
-		return strtoul(str, NULL, 10);
-
-	n = p - str;
-	t = (char *)_aif_alloc(n + 1);
-	memcpy(t, str, n);
-	t[n] = '\0';
-
-	n = strtoul(t, NULL, 10);
-
-	_aif_free(t);
-
-	return n;
-}
-
-int
-FDSType(char *str)
-{
-	int	type;
-
-	if 
-	(
-		str == NULL 
-		|| 
-		*str == '\0'
-	)
-		return AIF_INVALID;
-
-	switch ( *str )
-	{
-	case FDS_BOOLEAN: /* boolean */
-		type = AIF_BOOLEAN; 	
-		break; 		
-
-	case FDS_CHARACTER: /* character */
-		type = AIF_CHARACTER;
-		break;
-
-	case FDS_INTEGER: /* integer */
-		type = AIF_INTEGER;
-		break;
-
-	case FDS_FLOATING: /* floating */
-		type = AIF_FLOATING;
-		break;
-
-	case FDS_POINTER: /* pointer */
-		type = AIF_POINTER;
-		break;
-
-	case FDS_ARRAY_START: /* array */
-		type = AIF_ARRAY;
-		break;
-
-	case FDS_STRUCT_START:  /* struct */
-		type = AIF_STRUCT;
-		break;
-
-	case FDS_UNION_START:  /* union */
-		type = AIF_UNION;
-		break;
-
-	case FDS_ENUM_START: /* enumeration */
-		type = AIF_ENUM;
-		break;
-
-	case FDS_RANGE: /* range */
-		type = AIF_INTEGER;
-		break;
-
-	case FDS_FUNCTION: /* function */
-		type = AIF_FUNCTION;
-		break;
-
-	case FDS_STRING: /* string */
-		type = AIF_STRING;
-		break;
-
-	case FDS_CHAR_POINTER: /* char pointer */
-		type = AIF_CHAR_POINTER;
-		break;
-
-	case FDS_ADDRESS: /* address */
-		type = AIF_ADDRESS;
-		break;
-
-	case FDS_VOID: /* void */
-		type = AIF_VOID;
-		break;
-
-	case FDS_REGION: /* ZPL region */
-		type = AIF_REGION;
-		break;
-
-	case FDS_NAME: /* named component */
-		type = AIF_NAME;
-		break;
-
-	case FDS_REFERENCE: /* reference to named component*/
-		type = AIF_REFERENCE;
-		break;
-
-	default:
-		type = AIF_INVALID;
-	}
-
-	return type;
-}
-
-/* extracts the base type of a pointer or array type, specified by the     */
-/* type descriptor.                                                        */
-
-char *
-FDSBaseType(char *type)
-{
-	do
-	{
-		if ( (type = _fds_base_type(type)) == NULL )
-			return NULL;
-	}
-	while ( FDSType(type) == AIF_ARRAY || FDSType(type) == AIF_POINTER );
-
-	return type;
-}
-
-char *
-_fds_base_type(char *type)
-{
-	char *	p;
-
-	if ( type == NULL || *type == '\0' )
-		return NULL;
-
-	switch ( *type )
-	{
-	case FDS_FUNCTION: /* function */
-		p = _fds_skipto(++type, _fds_function_arg_end);
-		p++;
-		break;
-
-	case FDS_POINTER: /* pointer */
-		p = ++type;
-		break;
-		
-	case FDS_ARRAY_START: /* array */
-		p = _fds_skipto(++type, _fds_array_end);
-		p++;
-		break;
-
-	case FDS_ENUM_START: /* enum */
-		p = _fds_skipto(++type, _fds_enum_end);
-		p++;
-		break;
-
-	case FDS_RANGE: /* range */
-		p = type + 1;   /* skip FDS_RANGE */
-		p = _fds_skipnum(p); /* skip MinValue */
-		p += 2;         /* skip '..' */
-		p = _fds_skipnum(p); /* skip MaxValue */
-		break;
-
-	case FDS_REGION: /* region */
-		p = type + 2;	/* skip FDS_REGION Rank */
-		break;
-
-	default:
-		return NULL;
-	}
-
-	return p;
-}
-
-/* In AIF, we can find out about the size of the AIF object by looking at the
- * AIF_LEN(), but this method cannot be used to find out about the size
- * of each individual element in a struct. To overcome this problem, we can use
- * FDSTypeSize() with the FDS for each element.
- * 
- * However, FDSTypeSize() cannot be used to know the real size if the struct
- * contains references or strings (since we also need to access the data to
- * know the size of these data types).
- * 
- * We use FDSDataSize() to overcome the limitation of FDSTypeSize(). It can 
- * access FDS and the data of an AIF object to calculate the (real) size of 
- * the data.
- */
-
-int
-FDSDataSize(char *fds, char *data)
-{
-        char * tmp1 = fds;
-        char * tmp2 = data;
-
-		ResetAIFError();
-
-        _fds_skip_data(&tmp1, &tmp2);
-
-        if ( AIFError() == AIFERR_NOERR )
-                return (tmp2-data);
-        else
-                return -1;
-}
-
-/*
- * Gets the size of a type in bytes, specified by the type descriptor.
- * If the size cannot fit in a int, then it is silently truncated.
- * returns size if successful, -1 otherwise.
- *
- * Note: we no longer know the size of structs or unions so these are
- * always -1.
- */
-int
-FDSTypeSize(char *type)
-{
-	int	s;
-	int	min;
-	int	max;
-	int	rank;
-	int	size;
-	int	subsize;
-
-	if ( type == NULL || *type == '\0' )
-		return -1;
-
-	switch ( *type )
-	{
-	case FDS_BOOLEAN: /* boolean */
-		return sizeof(int);		
-
-	case FDS_CHARACTER: /* character */
-		return 1;
-
-	case FDS_INTEGER: /* integer */
-		return _fds_getnum(type + 2);
-
-	case FDS_REFERENCE: /* reference use */
-		return 0;
-
-	case FDS_NAME: /* named component */
-		return FDSTypeSize(strchr(type, FDS_NAME_END) + 1);
-
-	case FDS_FUNCTION: /* function */
-		return FDSTypeSize(strchr(type, FDS_FUNCTION_ARG_END) + 1);
-
-	case FDS_POINTER: /* pointer */
-		return FDSTypeSize(type+1);
-
-	case FDS_FLOATING: /* floating */
-	case FDS_VOID: /* void */
-		return _fds_getnum(type + 1);
-
-	case FDS_STRUCT_START: /* struct */
-		type++; /* past open brace */
-		size = 0;
-		subsize = 0;
-
-		_fds_skipid(&type);
-		
-		while ( *type != FDS_STRUCT_END )
-		{
-			if ( *type == FDS_STRUCT_ACCESS_SEP )
-			{
-				type++;
-				continue;
-			}
-
-			type = strchr(type, FDS_STRUCT_FIELD_NAME_END) + 1;
-
-			/* to start of field */
-			if ( (subsize = FDSTypeSize(type)) < 0 )
-				return -1;
-
-			size += subsize;
-
-			_fds_advance(&type);
-
-			if ( *type == FDS_STRUCT_FIELD_SEP )
-				type++;
-		}
-		return size;
-
-	case FDS_UNION_START:
-		type++; /* past open brace */
-		size = 0;
-		subsize = 0;
-		
-		_fds_skipid(&type);
-		
-		while ( *type != FDS_UNION_END )
-		{
-			type = strchr(type, FDS_UNION_FIELD_NAME_END) + 1;
-
-			/* to start of field */
-			if ( (subsize = FDSTypeSize(type)) < 0 )
-				return -1;
-
-			if ( subsize > size )
-				size = subsize;
-
-			_fds_advance(&type);
-
-			if ( *type == FDS_UNION_FIELD_SEP )
-				type++;
-		}
-		return size;
-
-	case FDS_ARRAY_START: /* array */
-		if ( (s = FDSTypeSize(_fds_base_type(type))) < 0 )
-			return -1;
-
-		min = _fds_array_min_index(type);
-		max = _fds_array_max_index(type);
-		return s * (max - min + 1);
-
-	case FDS_ENUM_START: /* enumeration */
-		return 4; /* all enumerations are based on 4-byte integers */
-
-	case FDS_RANGE: /* range */
-		return FDSTypeSize(_fds_base_type(type));
-
-	case FDS_REGION: /* region */
-		rank = _fds_getnum(type + 1);
-		s = FDSTypeSize(_fds_base_type(type));
-		return rank * s * 2;
-
-	case FDS_CHAR_POINTER:
-	case FDS_STRING:
-	case FDS_ADDRESS:
-	default:
-		return -1;
-	}
-
-	/* NOT REACHED */
-}
-
-int
-FDSIsSigned(char *fds)
-{
-	if ( *fds++ == FDS_INTEGER )
-		return (int)(*fds == FDS_INTEGER_SIGNED);
-
-	return 0;
-}
-
-/*
- * We support nested calls to TypeToFDS() by making a copy of any 
- * string arguments before overwriting the static buffer. e.g.
- * 
- *    TypeToFDS(AIF_ARRAY, 
- *      TypeToFDS(AIF_RANGE, 0, 10, 
- *        TypeToFDS(AIF_INTEGER, 4)
- *      ),
- *      TypeToFDS(AIF_INTEGER, 10)
- *   );
- */
-char *
-TypeToFDS(int type, ...)
-{
-        va_list 	args;
-	int		v1;
-	int		v2;
-	char *		v3;
-	char *		v4;
-
-	if ( type < 0 || type >= NUM_AIF_TYPES )
-		type = AIF_INVALID;
-
-	va_start(args, type);
-
-	switch ( type )
-	{
-	case AIF_INTEGER:
-		v1 = va_arg(args, int);
-		v2 = va_arg(args, int);
-
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v1 ? FDS_INTEGER_SIGNED : FDS_INTEGER_UNSIGNED, v2);
-		break;
-
-	case AIF_FLOATING:
-	case AIF_VOID:
-	case AIF_REFERENCE:
-		v1 = va_arg(args, int);
-
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v1);
-		break;
-
-	case AIF_POINTER:
-		v3 = va_arg(args, char *);
-		if (v3 == NULL)
-			v3 = strdup("x");
-		else
-			v3 = strdup(v3);
-
-		v4 = strdup(va_arg(args, char *));		
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v3, v4);
-		_aif_free(v3);
-		_aif_free(v4);
-		break;
-
-	case AIF_FUNCTION:
-		v3 = strdup(va_arg(args, char *));
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v3);
-		_aif_free(v3);
-		break;
-
-	case AIF_ENUM:
-		v3 = va_arg(args, char *);
-		if (v3 == NULL)
-			v3 = strdup("");
-		else
-			v3 = strdup(v3);
-		v1 = va_arg(args, int);
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v3, v1 ? FDS_INTEGER_SIGNED : FDS_INTEGER_UNSIGNED);
-		_aif_free(v3);
-		break;
-
-	case AIF_CHAR_POINTER:
-		v3 = strdup(va_arg(args, char *));
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v3);
-		_aif_free(v3);
-		break;
-
-	case AIF_ADDRESS:
-		v1 = va_arg(args, int);
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v1);
-		break;
-
-	case AIF_STRING:
-	case AIF_CHARACTER:
-	case AIF_BOOLEAN:
-		strcpy(_fds_buf, _fds_type_str[type]);
-		break;
-
-	case AIF_STRUCT:
-	case AIF_UNION:
-		v3 = va_arg(args, char *);
-		if (v3 == NULL)
-			v3 = strdup("");
-		else
-			v3 = strdup(v3);
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v3);
-		_aif_free(v3);
-		break;
-
-	case AIF_RANGE:
-		v1 = va_arg(args, int);
-		v2 = va_arg(args, int);
-		v3 = strdup(va_arg(args, char *));
-
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v1, v2, v3);
-
-		_aif_free(v3);
-		break;
-
-	case AIF_ARRAY:
-		v3 = strdup(va_arg(args, char *));
-		v4 = strdup(va_arg(args, char *));
-
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v3, v4);
-
-		_aif_free(v3);
-		_aif_free(v4);
-		break;
-
-	case AIF_NAME:
-	case AIF_REGION:
-		v1 = va_arg(args, int);
-		v3 = va_arg(args, char *);
-
-		if ( v3 == NULL )
-			v3 = strdup("");
-		else
-			v3 = strdup(v3);
-
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[type], v1, v3);
-
-		_aif_free(v3);
-		break;
-
-	case AIF_INVALID:
-	default:
-		snprintf(_fds_buf, BUFSIZ-1, _fds_type_str[AIF_INVALID], 0);
-	}
-
-	va_end(args);
-
-	return _fds_buf;
-}
-
-int
-FDSTypeCompare(char *f1, char *f2)
-{
-	int		n;
-	int		res;
-	char *		n1;
-	char *		n2;
-	char *		t1;
-	char *		t2;
-	AIFIndex *	ix1;
-	AIFIndex *	ix2;
-
-	if ( *f1 == FDS_NAME )
-	{
-		f1 = _fds_skipto(f1, _fds_name_end);
-		f1++;
-	}
-
-	if ( *f2 == FDS_NAME )
-	{
-		f2 = _fds_skipto(f2, _fds_name_end);
-		f2++;
-	}
-
-	if ( FDSType(f1) != FDSType(f2) )
-		return 0;
-
-	switch ( FDSType(f1) )
-	{
-	case AIF_ENUM:
-		res = strcmp(f1, f2) == 0;
-		break;
-
-	case AIF_INTEGER:
-	case AIF_FLOATING:
-	case AIF_VOID:
-	case AIF_REGION:
-		res = FDSTypeSize(f1) == FDSTypeSize(f2);
-		break;
-
-	case AIF_POINTER:
-	case AIF_FUNCTION:
-		res = FDSTypeCompare(FDSBaseType(f1), FDSBaseType(f2));
-		break;
-
-        case AIF_REFERENCE:
-		res = FDSType(f2) == FDSType(f1);
-		break;
-
-	case AIF_ARRAY:
-		ix1 = FDSArrayIndexInit(f1);
-		ix2 = FDSArrayIndexInit(f1);
-
-		if ( ix1->i_rank != ix2->i_rank )
-		{
-			AIFArrayIndexFree(ix1);
-			AIFArrayIndexFree(ix2);
-			return 0;
-		}
-
-		for ( n = 0 ; n < ix1->i_rank ; n++ )
-		{
-			if ( ix1->i_max[n] - ix1->i_min[n] != ix2->i_max[n] - ix2->i_min[n] )
-			{
-				AIFArrayIndexFree(ix1);
-				AIFArrayIndexFree(ix2);
-				return 0;
-			}
-		}
-
-		res = FDSTypeSize(ix1->i_btype) == FDSTypeSize(ix2->i_btype);
-
-		AIFArrayIndexFree(ix1);
-		AIFArrayIndexFree(ix2);
-		break;
-
-	case AIF_UNION:
-	case AIF_STRUCT:
-		if ( FDSNumFields(f1) != FDSNumFields(f2) )
-		{
-			res = 0;
-			break;
-		}
-
-		for ( n = 0 ; n < FDSNumFields(f1) ; n++ )
-		{
-			if
-			(
-				FDSStructFieldByNumber(f1, n, &n1, &t1) < 0 
-				||
-				FDSStructFieldByNumber(f2, n, &n2, &t2) < 0 
-			)
-				return 0;
-
-			_aif_free(n1);
-			_aif_free(n2);
-
-			if ( !FDSTypeCompare(t1, t2) )
-			{
-				_aif_free(t1);
-				_aif_free(t2);
-				return 0;
-			}
-
-			_aif_free(t1);
-			_aif_free(t2);
-		}
-
-		res = 1;
-		break;
-
-	case AIF_CHAR_POINTER:
-	case AIF_STRING:
-	case AIF_CHARACTER:
-		res = 1;
-		break;
-
-	default:
-		res = 0;
-	}
-
-	return res;
-}
-
-/************************************************************
- ********************** ARRAY ROUTINES **********************
- ************************************************************/
-
-/* extracts the index type of an array type, specified by the              */
-/* type descriptor.                                                        */
-/* index type descriptor is returned if a valid (not a NULL) pointer to    */
-/* char is passed as parameter.                                            */
-/* returns 0 if successful, -1 otherwise.                                  */
-
-char *
-FDSArrayIndexType(char *type)
-{
-	char *	p;
-	char *	pi;
-	char *	index;
-
-	if
-	(
-		type == NULL 
-		||
-		*type == '\0'
-		||
-		*type != FDS_ARRAY_START
-		||
-		*++type != FDS_RANGE
-	)
-		return NULL;
-
-	p = _fds_skipnum(++type);   /* skip MinValue */
-	p += 2;                /* skip '..' */
-	p = _fds_skipnum(p);        /* skip MaxValue */
-
-	pi = p;
-	p = _fds_skipto(p, _fds_array_end);
-	*p = 0;
-
-	index = strdup(pi);
-
-	*p = FDS_ARRAY_END;
-
-	return index;
-}
-
-int
-_fds_array_min_index(char *type)
-{
-	if ( *++type != FDS_RANGE )
-		return -1;
-
-	return _fds_getnum(++type);
-}
-
-int
-FDSArrayMinIndex(char *fds, int n)
-{
-	while ( FDSType(fds) == AIF_ARRAY && n > 0 )
-	{
-		fds = _fds_base_type(fds);
-		n--;
-	}
-
-	return (n == 0) ? _fds_array_min_index(fds) : -1;
-}
-
-int
-_fds_array_max_index(char *type)
-{
-	char *	p;
-
-	if ( *++type != FDS_RANGE )
-		return -1;
-
-	p = _fds_skipnum(++type); /* skip MinValue */
-	p += 2;                /* skip '..' */
-
-	return _fds_getnum(p);
-}
-
-int
-FDSArrayMaxIndex(char *fds, int n)
-{
-	while ( FDSType(fds) == AIF_ARRAY && n > 0 )
-	{
-		fds = _fds_base_type(fds);
-		n--;
-	}
-
-	return (n == 0) ? _fds_array_max_index(fds) : -1;
-}
-
-/*
- * Calculate the number of dimensions of an array.
- */
-int
-FDSArrayRank(char *fds)
-{
-	int	d = 0;
-
-	while ( FDSType(fds) == AIF_ARRAY )
-	{
-		fds = _fds_base_type(fds);
-		d++;
-	}
-
-	return d;
-}
-
-/*
- * Calculate the total size of an array
- */
-int
-FDSArraySize(char *fds)
-{
-	int	min;
-	int	max;
-	int	size = 1;
-
-	while ( FDSType(fds) == AIF_ARRAY )
-	{
-		min = _fds_array_min_index(fds);
-		max = _fds_array_max_index(fds);
-		fds = _fds_base_type(fds);
-
-		size *= max - min + 1;
-	}
-
-	return size;
-}
-
-char *
-FDSRangeInit(int min, int max)
-{
-	return strdup(TypeToFDS(AIF_RANGE, min, max, "is4"));
-}
-
-char *
-FDSArrayInit(int min, int max, char *btype)
-{
-	char *	res;
-	char *	range = FDSRangeInit(min, max);
-	
-	res = strdup(TypeToFDS(AIF_ARRAY, range, btype));
-	_aif_free(range);
-	return res;
-}
-
-/*
- * Parse array type descriptor and extract the minimum and maximum
- * array index values for each dimension. Also, if size is not NULL,
- * will return the size of dimension.
- */
-void
-FDSArrayBounds(char *fds, int rank, int **min, int **max, int **size)
-{
-	int		i;
-	int *		mn;
-	int *		mx;
-	int *		s=NULL;
-
-	*min = (int *)_aif_alloc(rank*sizeof(int));
-
-	*max = (int *)_aif_alloc(rank*sizeof(int));
-
-	if( size != NULL )
-		*size = (int *)_aif_alloc(rank*sizeof(int));
-
-	mn = *min;
-	mx = *max;
-
-	if ( size != NULL )
-		s = *size;
-
-	for ( i = 0 ; i < rank ; i++)
-	{
-		*mn = _fds_array_min_index(fds);
-		*mx = _fds_array_max_index(fds);
-
-		if ( size != NULL )
-		{
-			*s = *mx - *mn + 1;
-			s++;
-		}
-
-		fds = _fds_base_type(fds);
-
-		mn++;
-		mx++;
-	}
-}
-
-/*
- * Extract info about an array. Returns the index type of the
- * first dimension (assumes all dimensions are the same type),
- * the element type of the array, and the number of dimensions
- * of the array. It is the responsibility of the caller to free
- * memory allocated to el.
- * 
- */
-void
-FDSArrayInfo(char *fds, int *rank, char **el, char **ix)
-{
-	int	d;
-
-	if ( ix != NULL )
-		*ix = FDSArrayIndexType(fds);
-
-	d = 0;
-
-	while ( FDSType(fds) == AIF_ARRAY )
-	{
-		fds = _fds_base_type(fds);
-		d++;
-	}
-
-	*el = strdup(fds);
-	*rank = d;
-}
-
-AIFIndex *
-FDSArrayIndexInit(char *fmt)
-{
-	int		d;
-	int		nel = 1;
-	int		rank;
-	char *		btype;
-	AIFIndex *	ix;
-
-	FDSArrayInfo(fmt, &rank, &btype, NULL);
-
-	if ( rank == 0 )
-		return (AIFIndex *)NULL;
-
-	ix = (AIFIndex *)_aif_alloc(sizeof(AIFIndex));
-	ix->i_finished = 0;
-	ix->i_rank = rank;
-	ix->i_btype = btype;
-	ix->i_bsize = FDSTypeSize(ix->i_btype);
-	ix->i_index = (int *)_aif_alloc(ix->i_rank * sizeof(int));
-
-	FDSArrayBounds(fmt, ix->i_rank, &(ix->i_min), &(ix->i_max), (int **)NULL);
-
-	for ( d = ix->i_rank - 1 ; d >= 0 ; d-- )
-	{
-		nel *= ix->i_max[d] - ix->i_min[d] + 1;
-		ix->i_index[d] = ix->i_min[d];
-	}
-
-	ix->i_nel = nel;
-
-	return ix;
-}
-
-/************************************************************
- ********************** STRUCT ROUTINES **********************
- ************************************************************/
-
-/*
- * The fds of a struct has this format:
- *
- *  {name|entry,...;entry,...;entry,...;entry,...}
- *
- *  name is the name of the structure, or empty for an unnamed type
- *  each entry has the format "name=type"
- *  a structure comprises 4 sections seperated by ';', corresponding
- *    to public, private, protected and hidden members 
- */
-
-#define STRUCT_START(fds, res) \
-	if (*(fds) == FDS_NAME) { \
-		(fds) = _fds_skipto((fds), _fds_name_end); \
-		(fds)++; \
-	} \
-	if ( *(fds++) != FDS_STRUCT_START ) \
-		return (res); \
-	while ( *(fds) != FDS_ID ) \
-		(fds)++; \
-	(fds)++; \
-	if ( *(fds) == '\0' ) \
-		return (res); \
-	while ( *(fds) == FDS_STRUCT_ACCESS_SEP ) \
-		(fds)++; \
-	if ( *(fds) == FDS_STRUCT_END ) \
-		return (res);
-
-char *
-_fds_skiptomatch(char *fds)
-{
-	char	ender;
-
-	/*
-	** assert *fds == '{' or '['; find the matching '}' or ']'
-	*/
-
-	switch ( *fds )
-	{
-	case FDS_STRUCT_START:
-		ender = FDS_STRUCT_END;
-		break;
-
-	case FDS_ARRAY_START:
-		ender = FDS_ARRAY_END;
-		break;
-
-	case FDS_ENUM_START:
-		ender = FDS_ENUM_END;
-		break;
-
-	case FDS_UNION_START:
-		ender = FDS_UNION_END;
-		break;
-	}
-
-	fds++;
-
-	for ( ;; )
-	{
-		if ( *fds == ender )
-			return fds;
-
-		if
-		(
-			*fds == FDS_STRUCT_START 
-			|| 
-			*fds == FDS_UNION_START 
-			|| 
-			*fds == FDS_ARRAY_START 
-			|| 
-			*fds == FDS_ENUM_START
-		)
-			fds = _fds_skiptomatch(fds);
-
-		fds++;
-	}
-}
-
-/*
- * The function ignores access specifiers
- */
-char *
-_fds_skiptofield(char *fds, int n)
-{
-	STRUCT_START(fds, NULL);
-
-	while ( *fds != '\0' && *fds != FDS_STRUCT_END && n > 0 )
-	{
-		if ( *fds == FDS_STRUCT_FIELD_SEP )
-			n--;
-		else if ( *fds == FDS_STRUCT_ACCESS_SEP )
-		{
-			if 
-			( 
-			 	*(fds+1) != FDS_STRUCT_ACCESS_SEP
-				&&
-				*(fds+1) != FDS_STRUCT_END
-			)
-				n--;
-		}
-		else if
-		(
-			*fds == FDS_STRUCT_START 
-			|| 
-			*fds == FDS_UNION_START 
-			|| 
-			*fds == FDS_ARRAY_START 
-			|| 
-			*fds == FDS_ENUM_START
-		)
-			fds = _fds_skiptomatch(fds);
-
-		fds++;
-
-	}
-
-	if ( *fds == '\0' || *fds == FDS_STRUCT_END )
-		return NULL;
-
-	return fds;
-}
-
-/*
- * The function ignores access specifiers, ie: total number of fields
- */
-int
-FDSNumFields(char *fds)
-{
-	int	n = 0;
-
-	if (*fds == FDS_NAME) 
-	{
-		fds = _fds_skipto(fds, _fds_name_end);
-		fds++;
-	}
-
-	if ( *(fds++) != FDS_STRUCT_START )
-		return -1;
-
-	while ( *(fds) != FDS_ID )
-		(fds)++;
-	(fds)++;
-
-	if ( *fds == '\0' )
-		return -1;
-
-	while ( *fds == FDS_STRUCT_ACCESS_SEP )
-		(fds)++;
-
-	if ( *fds == FDS_STRUCT_END )
-		return 0;
-
-	while ( *fds != '\0' && *fds != FDS_STRUCT_END )
-	{
-		if ( *fds == FDS_STRUCT_FIELD_SEP )
-			n++;
-		else if ( *fds == FDS_STRUCT_ACCESS_SEP )
-		{
-			if 
-			( 
-			 	*(fds+1) != FDS_STRUCT_ACCESS_SEP
-				&&
-				*(fds+1) != FDS_STRUCT_END
-			)
-				n++;
-		}
-		else if
-		(
-			*fds == FDS_STRUCT_START 
-			|| 
-			*fds == FDS_UNION_START 
-			|| 
-			*fds == FDS_ARRAY_START 
-			|| 
-			*fds == FDS_ENUM_START
-		)
-			fds = _fds_skiptomatch(fds);
-
-		fds++;
-	}
-
-	return n + 1;
-}
-
-/*
- * Returns a newly alloced string for name and type
- * The function ignores access specifiers
- */
-int
-FDSStructFieldByNumber(char *fds, int n, char **name, char **type)
-{
-	if ( (fds = _fds_skiptofield(fds, n)) == NULL )
-		return -1;
-
-        if ( (*name = _field_attribute(fds, NULL, _fds_struct_field_name_end)) == NULL )
-		return -1;
-
-        if ( (*type = _field_attribute(fds, _fds_struct_field_name_end, _fds_struct_field_end)) == NULL )
-		return -1;
-
-	return 0;
-}
-
-/*
- * Returns a newly alloced string for type
- * The function ignores access specifiers
- */
-int
-FDSStructFieldByName(char *fds, char *name, char **type)
-{
-	char *	nm;
-
-	STRUCT_START(fds, -1);
-
-	while ( *fds != '\0' && *fds != FDS_STRUCT_END )
-	{
-		nm = fds;
-
-		fds = _fds_skipto(fds, _fds_struct_field_name_end);
-
-		if ( *fds == '\0' )
-			return -1;
-
-		*fds = '\0'; /* temporarily */
-
-		if ( strcmp(nm, name) == 0 )
-		{
-			*fds = FDS_STRUCT_FIELD_NAME_END;
-
-                        if ( (*type = _field_attribute(
-						nm,
-						_fds_struct_field_name_end, 
-						_fds_struct_field_end
-						)) == NULL )
-				return -1;
-
-			return 0;
-		}
-		else
-			*fds = FDS_STRUCT_FIELD_NAME_END;
-
-		fds = _fds_skipto(fds, _fds_struct_field_end);
-		fds++;
-	}
-
-	return -1;
-}
-
-/*
- * Arrange the members of AIF struct defined by fds and data into a new_fds
- * and a new_data so that the FDS looks like fdsref
- *
- * If number_of_members of fdsref > number_of_members of fds 
- *	returns -1
- * Else
- * 	creates the new_fds and new_data accordingly and returns 0
- *
- * If fds got more members, the rest will be appended at the end, so
- * fdsref can be thought of as a prefix of fds.
- *
- * The function only works with the public section.
- * It does not change fdsref, fds and data.
- * It allocates the memory for new_fds and new_data
- */
-int
-_fds_struct_arrange(char *fdsref, char *fds, char *data, char **new_fds, char **new_data)
-{
-	char * ptr_fds = fds;
-	char * ptr_data = data;
-	int len_new_fds;
-	int len_new_data;
-	int number_fds = 0;	/* number_of_members of fds */
-	int number_fdsref = 0;	/* number_of_members of fdsref */
-
-	char * tmp;
-	int n;
-
-	char ** fds_members;
-	char ** data_members;
-	int * fds_members_len;
-	int * data_members_len;
-	int * fds_members_flag; /* to flag that the member has been copied */
-
-	/* calculate the number_of_members of fds and fdsref
-	** we do not use FDSNumFields() since we are only interested in the
-	** public section */
-	tmp = fds;
-	STRUCT_START(tmp, -1);
-	while ( *tmp != FDS_STRUCT_ACCESS_SEP )
-	{
-		tmp = strchr(tmp, FDS_STRUCT_FIELD_NAME_END) + 1;
-		if
-		(
-                        *tmp == FDS_STRUCT_START || *tmp == FDS_UNION_START ||
-                        *tmp == FDS_ARRAY_START || *tmp == FDS_ENUM_START
-                )
-                        tmp = _fds_skiptomatch(tmp) + 1;
-
-		tmp = _fds_skipto(tmp, _fds_struct_field_end);
-		number_fds++;
-	}
-
-	tmp = fdsref;
-	STRUCT_START(tmp, -1);
-	while ( *tmp != FDS_STRUCT_ACCESS_SEP )
-	{
-		tmp = strchr(tmp, FDS_STRUCT_FIELD_NAME_END) + 1;
-		if
-		(
-                        *tmp == FDS_STRUCT_START || *tmp == FDS_UNION_START ||
-                        *tmp == FDS_ARRAY_START || *tmp == FDS_ENUM_START
-                )
-                        tmp = _fds_skiptomatch(tmp) + 1;
-
-		tmp = _fds_skipto(tmp, _fds_struct_field_end);
-		number_fdsref++;
-	}
-
-	/* check for the number_of_member variables */
-	if ( number_fdsref > number_fds )
-		return -1;
-	
-	/* allocate new_fds and new_data */
-	_fds_skip_data(&ptr_fds, &ptr_data);
-	len_new_fds = ptr_fds - fds;
-	len_new_data = ptr_data - data;
-	if (*new_fds == NULL)
-		*new_fds = _aif_alloc(len_new_fds);
-	if (*new_data == NULL)
-		*new_data = _aif_alloc(len_new_data);
-
-	/* we divide fds and data into several fields/members
-	** we store the pointers for easy retrieval */
-	fds_members = (char **) _aif_alloc(sizeof(char *) * number_fds);
-	fds_members_len = (int *) _aif_alloc(sizeof(int) * number_fds);
-	data_members = (char **) _aif_alloc(sizeof(char *) * number_fds);
-	data_members_len = (int *) _aif_alloc(sizeof(int) * number_fds);
-	fds_members_flag = (int *) _aif_alloc(sizeof(int) * number_fds);
-
-	ptr_fds = fds;
-	ptr_data = data;
-	STRUCT_START(ptr_fds, -1);
-	for (n=0; n<number_fds; n++)
-	{
-		fds_members[n] = ptr_fds;
-		data_members[n] = ptr_data;
-
-		ptr_fds = strchr(ptr_fds, FDS_STRUCT_FIELD_NAME_END) + 1;
-		_fds_skip_data(&ptr_fds, &ptr_data);
-		fds_members_len[n] = ptr_fds - fds_members[n];
-		data_members_len[n] = ptr_data - data_members[n];
-
-		fds_members_flag[n] = 0;
-
-		ptr_fds++;	
-	}
-
-	/* we start building up the new_fds and new_data */
-	ptr_fds = fds;
-	STRUCT_START(ptr_fds, -1);
-	memcpy(*new_fds, fds, ptr_fds - fds); /* copy the id to the new_fds */
-
-	ptr_fds = *new_fds + (ptr_fds - fds);
-	ptr_data = *new_data;
-
-	tmp = fdsref;
-	STRUCT_START(tmp, -1);
-	while ( *tmp != FDS_STRUCT_ACCESS_SEP )
-	{
-		char endchar, *end;
-
-		if ( *tmp == FDS_STRUCT_FIELD_SEP ) tmp++;
-		end = tmp;
-		end = _fds_skipto(end, _fds_struct_field_end);
-		endchar = *end; /* we store *end since *end can be ',' or ';' */
-		*end = '\0'; /* temporarily */
-
-		for (n=0; n<number_fds; n++)
-		{
-			/* we check the fds_members_flag so the function can
-			** run faster for large data structures */
-			if ( fds_members_flag[n] == 0 )
-			{
-				/* tmp and fds_members[*] contain
-				** 'field_name=field_type', but we only want
-				** to compare field_name */
-				char * temp_a = strchr(tmp, FDS_STRUCT_FIELD_NAME_END);
-				char * temp_b = strchr(fds_members[n], FDS_STRUCT_FIELD_NAME_END);
-				int strcmp_res;
-				*temp_a = *temp_b = '\0'; /* temporarily */
-				strcmp_res = strcmp(tmp, fds_members[n]);
-				*temp_a = *temp_b = FDS_STRUCT_FIELD_NAME_END;
-				if (strcmp_res == 0)
-					break;
-			}
-		}
-
-		if (n == number_fds) /* not found, an error */
-		{
-			*end = endchar;
-			_aif_free(fds_members);
-			_aif_free(fds_members_len);
-			_aif_free(fds_members_flag);
-			_aif_free(data_members);
-			_aif_free(data_members_len);
-			_aif_free(*new_fds);
-			_aif_free(*new_data);
-			 return -1;
-		}
-
-		memcpy(ptr_data, data_members[n], data_members_len[n]);
-		memcpy(ptr_fds, fds_members[n], fds_members_len[n]);
-		fds_members_flag[n] = 1;
-		ptr_data += data_members_len[n];
-		ptr_fds += fds_members_len[n];
-		*end = endchar;
-		*(ptr_fds++) = FDS_STRUCT_FIELD_SEP;
-		tmp = end;
-	}
-
-	/* copy members which have not been copied */
-	if ( number_fds > number_fdsref )
-	{
-		for (n=0; n<number_fds; n++)
-		{
-			if ( fds_members_flag[n] == 0 )
-			{
-				memcpy(ptr_data, data_members[n], data_members_len[n]);
-				memcpy(ptr_fds, fds_members[n], fds_members_len[n]);
-				ptr_data += data_members_len[n];
-				ptr_fds += fds_members_len[n];
-				*(ptr_fds++) = FDS_STRUCT_FIELD_SEP;
-			}
-		}
-	}
-
-	/* copy the rest of the fds to the new_fds */
-	ptr_fds--;
-	memcpy(ptr_fds, fds_members[number_fds-1] + fds_members_len[number_fds-1], len_new_fds - (ptr_fds - *new_fds));
-
-	_aif_free(fds_members);
-	_aif_free(fds_members_len);
-	_aif_free(fds_members_flag);
-	_aif_free(data_members);
-	_aif_free(data_members_len);
-	return 0;
-}
-
-int
-FDSStructFieldSize(char *fds, char *name)
-{
-	char *type;
-	int   size;
-
-	if ( FDSStructFieldByName(fds, name, &type) )
-	{
-                SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	size = FDSTypeSize(type);
-	_aif_free(type);
-
-	return size;
-}
-
-/*
- * The function ignores access specifiers
- * return value indicates the position of the field
- * the counter starts at 0, ie: first element is at position 0
- * if the field cannot be found, it returns -1
- */
-int
-FDSStructFieldIndex(char *fds, char *name)
-{
-	int	counter = 0;
-	int	len;
-	char *	nm;
-
-	STRUCT_START(fds, -1);
-
-	while ( *fds != '\0' && *fds != FDS_STRUCT_END )
-	{
-		nm = fds;
-
-		fds = _fds_skipto(fds, _fds_struct_field_name_end);
-
-		if ( *fds == '\0' )
-			return -1;
-
-		len = fds - nm;
-
-		if ( strncmp(nm, name, len) == 0 )
-			return counter;
-
-		counter++;
-		fds = _fds_skipto(fds, _fds_struct_field_end);
-		fds++;
-	}
-
-	return -1;
-}
-
-char *
-FDSStructInit(char *id)
-{
-	return strdup(TypeToFDS(AIF_STRUCT, id));
-}
-
-/*
- * puts the new field in the public section 
- */
-char *
-FDSAddFieldToStruct(char *fds, char *name, char *type)
-{
-	return FDSAddFieldToClass(fds, AIFACC_PUBLIC, name, type);
-}
-
-int
-FDSStructAdd(char **fds, char *name, char *type)
-{
-	char * temp;
-
-	temp = FDSAddFieldToStruct(*fds, name, type);
-
-	if ( temp == NULL ) 
-		return -1;
-
-	_aif_free(*fds);
-	*fds = temp;
-
-	return 0;
-}
-
-/*
- * returns the data length from field 0 until field n (inclusive)
- */
-int
-_data_len_index(char *fds, int n)
-{
-	int size = 0;
-	int subsize = 0;
-
-	STRUCT_START(fds, -1);
-		
-	while ( *fds != '\0' && *fds != FDS_STRUCT_END && n >= 0 )
-	{
-		if ( *fds == FDS_STRUCT_ACCESS_SEP )
-		{
-			fds++;
-			continue;
-		}
-
-		fds = _fds_skipto(fds, _fds_struct_field_name_end);
-
-		if ( *fds++ == '\0' )
-			return 0;
-
-		/* to start of field */
-		if ( (subsize = FDSTypeSize(fds)) < 0 )
-			return -1;
-
-		size += subsize;
-
-		n--;
-
-		_fds_advance(&fds);
-
-		if ( *fds == FDS_STRUCT_FIELD_SEP )
-			fds++;
-	}
-
-	return size;
-}
-
-int
-_data_len_public(char *fds)
-{
-	int size = 0;
-	int subsize = 0;
-
-	if (*(fds) == FDS_NAME) { 
-        	(fds) = _fds_skipto((fds), _fds_name_end); 
-        	(fds)++; 
-	} 
-	if ( *(fds++) != FDS_STRUCT_START ) 
-        	return -1;
-
-        while ( *(fds) != FDS_ID ) 
-               	(fds)++; 
-        (fds)++; 
-
-	if ( *(fds) == '\0' ) 
-        	return -1;
-	if ( *(fds) == FDS_STRUCT_ACCESS_SEP )
-        	return 0;
-		
-	while ( *fds != FDS_STRUCT_END )
-	{
-		if ( *fds == FDS_STRUCT_ACCESS_SEP )
-			break;
-
-		fds = _fds_skipto(fds, _fds_struct_field_name_end);
-
-		if ( *fds++ == '\0' )
-			return 0;
-
-		/* to start of field */
-		if ( (subsize = FDSTypeSize(fds)) < 0 )
-			return -1;
-
-		size += subsize;
-
-		_fds_advance(&fds);
-
-		if ( *fds == FDS_STRUCT_FIELD_SEP )
-			fds++;
-	}
-
-	return size;
-}
-
-/*
- * returns a pointer to a newly allocated structure
- */
-char *
-_field_attribute(char *s, char *starter, char *ender)
-{
-	int	len;
-	char *	np;
-	char *	_fds_field_attr; /* we alloc as needed */
-
-	if ( starter != NULL )
-	{
-		s = _fds_skipto(s, starter);
-
-		if ( *s++ == '\0' )
-			return NULL;
-	}
-
-	np = s;
-	s = _fds_skipto(s, ender);
-
-	if ( *s == '\0' )
-		return NULL;
-
-	len = s - np;
-
-	_fds_field_attr = _aif_alloc(len+1);
-
-	memcpy(_fds_field_attr, np, len);
-	_fds_field_attr[len] = '\0';
-
-	return _fds_field_attr;
-}
-
-#define ENUM_START(fds, res) \
-	if (*(fds) == FDS_NAME) { \
-		(fds) = _fds_skipto((fds), _fds_name_end); \
-		(fds)++; \
-	} \
-	if ( *(fds++) != FDS_ENUM_START ) \
-		return (res); \
-	while ( *(fds) != FDS_ID ) \
-		(fds)++; \
-	(fds)++; \
-	if ( *(fds) == '\0' || *(fds) == FDS_ENUM_END ) \
-		return (res);
-
-/* based on the fds and the enum value,
- * the function gives the enum name (string),
- * it allocs the string for the caller */
-int
-FDSEnumConstByValue(char *fds, char **name, int val)
-{
-	int	len;
-	char *	nm;
-
-	ENUM_START(fds, -1);
-
-	while ( *fds != '\0' && *fds != FDS_ENUM_END )
-	{
-		nm = fds;
-
-		fds = _fds_skipto(fds, _fds_enum_const_name_end);
-
-		if ( *fds == '\0' )
-			return -1;
-
-		len = fds - nm;
-
-		fds++;
-		if ( val == _fds_getnum(fds) )
-		{
-			*name = _aif_alloc(len + 1);
-			**name = '\0';
-			strncat(*name, nm, len);
-			
-			return 0;
-		}
-
-		fds = _fds_skipto(fds, _fds_enum_const_end);
-		fds++;
-	}
-
-	return -1;
-}
-
-/* based on the fds and the enum name (string),
- * the function gives the enum value */
-int
-FDSEnumConstByName(char *fds, char *name, int *val)
-{
-	int	len;
-	char *	nm;
-
-	ENUM_START(fds, -1);
-
-	while ( *fds != '\0' && *fds != FDS_ENUM_END )
-	{
-		nm = fds;
-
-		fds = _fds_skipto(fds, _fds_enum_const_name_end);
-
-		if ( *fds == '\0' )
-			return -1;
-
-		len = fds - nm;
-
-		if ( strncmp(nm, name, len) == 0 )
-		{
-			fds++;
-                        *val = _fds_getnum(fds);
-
-			return 0;
-		}
-
-		fds = _fds_skipto(fds, _fds_enum_const_end);
-		fds++;
-	}
-
-	return -1;
-}
-
-char *
-FDSEnumInit(char *id)
-{
-	return strdup(TypeToFDS(AIF_ENUM, id, 1));
-}
-
-char *
-FDSAddConstToEnum(char *fds, char *name, int val)
-{
-	int	v;
-	char *	nfmt;
-	char *	end;
-	char	field[BUFSIZ];
-
-	if ( FDSEnumConstByName(fds, name, &v) == 0 )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return NULL;
-	}
-
-	/* XXX TODO
-	if ( FDSEnumFieldByValue(fds, name, &nfmt) == 0 )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		_aif_free(nfmt);
-		return NULL;
-	}
-	*/
-
-	snprintf(field, BUFSIZ, "%s%c%d", name, FDS_ENUM_SEP, val);
-
-	nfmt = (char *)_aif_alloc(strlen(fds) + strlen(field) + 2);
-	*nfmt = '\0';
-
-	strcpy(nfmt, fds);
-
-	if
-	(
-		(end = strrchr(nfmt, FDS_ENUM_END)) == NULL
-		||
-		end - nfmt < 1
-	)
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return NULL;
-	}
-
-	if ( *(end-1) != FDS_ID )
-		*end++ = FDS_ENUM_CONST_SEP;
-
-	sprintf(end, "%s%s", field, strrchr(fds, FDS_ENUM_END));
-
-	ResetAIFError();
-
-	return nfmt;
-}
-
-int
-FDSEnumAdd(char **fds, char *name, int val)
-{
-	char * temp;
-
-	temp = FDSAddConstToEnum(*fds, name, val);
-
-	if ( temp == NULL )
-		return -1;
-
-	_aif_free(*fds);
-	*fds = temp;
-
-	return 0;
-}
-
-#define UNION_START(fds, res) \
-	if (*(fds) == FDS_NAME) { \
-		(fds) = _fds_skipto((fds), _fds_name_end); \
-		(fds)++; \
-	} \
-	if ( *(fds++) != FDS_UNION_START ) \
-		return (res); \
-	while ( *(fds) != FDS_ID ) \
-		(fds)++; \
-	(fds)++; \
-	if ( *(fds) == '\0' || *(fds) == FDS_UNION_END ) \
-		return (res);
-
-int
-FDSUnionFieldByName(char *fds, char *name, char **type)
-{
-	int	len;
-	char *	nm;
-
-	UNION_START(fds, -1);
-
-	while ( *fds != '\0' && *fds != FDS_UNION_END )
-	{
-		nm = fds;
-
-		fds = _fds_skipto(fds, _fds_union_field_name_end);
-
-		if ( *fds == '\0' )
-			return -1;
-
-		len = fds - nm;
-
-		if ( strncmp(nm, name, len) == 0 )
-		{
-			fds++;
-			nm = fds;
-			fds = _fds_skipto(fds, _fds_union_field_end);
-
-			if ( *fds == '\0' )
-				return -1;
-
-			len = fds - nm;
-			*type = _aif_alloc(len+1);
-			strncpy(*type, nm, len);
-			(*type)[len] = '\0';
-
-			return 0;
-		}
-
-		fds = _fds_skipto(fds, _fds_union_field_end);
-		fds++;
-	}
-
-	return -1;
-}
-
-char *
-FDSUnionInit(char *id)
-{
-	return strdup(TypeToFDS(AIF_UNION, id));
-}
-
-char *
-FDSAddFieldToUnion(char *fds, char *name, char *type)
-{
-	char *	nfmt;
-	char *	end;
-	char	field[BUFSIZ];
-	char *  dummy;
-
-	if ( FDSUnionFieldByName(fds, name, &dummy) == 0 )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return NULL;
-	}
-
-	/* XXX TODO
-	if ( FDSEnumFieldByValue(fds, name, &nfmt) == 0 )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		_aif_free(nfmt);
-		return NULL;
-	}
-	*/
-
-	snprintf(field, BUFSIZ, "%s%c%s", name, FDS_UNION_FIELD_NAME_END, type);
-
-	nfmt = (char *)_aif_alloc(strlen(fds) + strlen(field) + 2);
-	*nfmt = '\0';
-
-	strcpy(nfmt, fds);
-
-	if
-	(
-		(end = strrchr(nfmt, FDS_UNION_END)) == NULL
-		||
-		end - nfmt < 1
-	)
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return NULL;
-	}
-
-	if ( *(end-1) != FDS_ID )
-		*end++ = FDS_UNION_FIELD_SEP;
-
-	sprintf(end, "%s%c", field, FDS_UNION_END);
-
-	ResetAIFError();
-
-	return nfmt;
-}
-
-int
-FDSUnionAdd(char **fds, char *name, char *type)
-{
-	char * temp;
-
-	temp = FDSAddFieldToUnion(*fds, name, type);
-
-	if ( temp == NULL ) 
-		return -1;
-
-	_aif_free(*fds);
-	*fds = temp;
-
-	return 0;
-}
-
-char *
-FDSClassInit(char *id)
-{
-	return FDSStructInit(id);
-}
-
-/*
- * returns a newly alloced string for name and type
- */
-int
-FDSClassFieldByName(char *fds, char *name, char **type)
-{
-	return FDSStructFieldByName(fds, name, type);
-}
-
-/*
- * returns a newly alloced string for name and type
- */
-int
-FDSClassFieldByNumber(char *fds, int n, char **name, char **type)
-{
-	return FDSStructFieldByNumber(fds, n, name, type);
-}
-
-/*
- * The function ignores access specifiers
- * return value indicates the position of the field
- * the counter starts at 0, ie: first element is at position 0
- * if the field cannot be found, it returns -1
- */
-int
-FDSClassFieldIndex(char *fds, char *name)
-{
-	return FDSStructFieldIndex(fds, name);
-}
-
-int
-FDSClassFieldSize(char *fds, char *name)
-{
-	return FDSStructFieldSize(fds, name);
-}
-
-char *
-FDSAddFieldToClass(char *fds, aifaccess acc, char *name, char *type)
-{
-	char * 	temp;
-	char *	nfmt;
-	char *	end;
-	char *  rest;
-
-	if ( FDSClassFieldByName(fds, name, &nfmt) == 0 )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		_aif_free(nfmt);
-		return NULL;
-	}
-
-	nfmt = (char *)_aif_alloc(strlen(fds) + strlen(name) + strlen(type) +3);
-	*nfmt = '\0';
-
-	strcpy(nfmt, fds);
-
-	temp = nfmt;
-
-	if (*(fds) == FDS_NAME) { 
-        	(fds) = _fds_skipto((fds), _fds_name_end); 
-        	(fds)++; 
-	} 
-
-	if (*(temp) == FDS_NAME) {
-        	(temp) = _fds_skipto((temp), _fds_name_end);
-        	(temp)++;
-	}
-
-	if
-	(
-		(end = _fds_skipto(temp+1, _fds_struct_access_sep)) == NULL
-		||
-		end - temp < 1
-	)
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		_aif_free(nfmt);
-		return NULL;
-	}
-
-	rest = _fds_skipto(fds+1, _fds_struct_access_sep);
-
-	switch ( acc )
-	{
-		case AIFACC_PRIVATE:
-			end = _fds_skipto(++end, _fds_struct_access_sep);
-			if ( end == NULL )
-			{
-				SetAIFError(AIFERR_BADARG, NULL);
-				_aif_free(nfmt);
-				return NULL;
-			}
-			rest = _fds_skipto(++rest, _fds_struct_access_sep);
-			/* fall through */
-
-		case AIFACC_PROTECTED:
-			end = _fds_skipto(++end, _fds_struct_access_sep);
-			if ( end == NULL )
-			{
-				SetAIFError(AIFERR_BADARG, NULL);
-				_aif_free(nfmt);
-				return NULL;
-			}
-			rest = _fds_skipto(++rest, _fds_struct_access_sep);
-			/* fall through */
-
-		case AIFACC_PUBLIC:
-			break;
-	}
-
-	if ( *(end-1) != FDS_ID && *(end-1) != FDS_STRUCT_ACCESS_SEP )
-		*end++ = FDS_STRUCT_FIELD_SEP;
-
-	sprintf(end, "%s%c%s%s",
-		name,
-		FDS_STRUCT_FIELD_NAME_END, 
-		type,
-		rest);
-
-	ResetAIFError();
-
-	return nfmt;
-}
-
-int
-FDSClassAdd(char **fds, aifaccess acc, char *name, char *type)
-{
-	char * temp;
-
-	temp = FDSAddFieldToClass(*fds, acc, name, type);
-
-	if ( temp == NULL )
-		return -1;
-
-	_aif_free(*fds);
-	*fds = temp;
-
-	return 0;
-}
-
-int
-FDSSetIdentifier(char **fds, char *id)
-{
-	int	id_len;
-	char  *	temp;
-	char  *	new;
-
-	temp = *fds;
-	id_len = strlen(id);
-
-	new = _aif_alloc( strlen(*fds) + strlen(id) + 1 );
-	*new = '\0';
-
-	if ( *temp == FDS_NAME ) 
-	{
-		temp = _fds_skipto(temp, _fds_name_end);
-		temp++;
-		strncat(new, *fds, temp - *fds);
-	}
-
-	if ( *temp == FDS_UNION_START || 
-	     *temp == FDS_STRUCT_START || 
-	     *temp == FDS_ENUM_START )
-	{
-		if ( *(temp+1) != FDS_ID )
-		{
-			_aif_free(new);
-                	SetAIFError(AIFERR_BADARG, NULL);
-			return -1;
-		}
-
-		strncat(new, temp, 1);
-		strncat(new, id, id_len);
-		strcat(new, temp+1);
-		_aif_free(*fds);
-		*fds = new;
-		return 0;
-	}
-	else
-	{
-		_aif_free(new);
-                SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-}
-
-char *
-FDSGetIdentifier(char *fds)
-{
-	char *temp;
-	char *id;
-	int   id_len;
-
-	if ( *fds == FDS_NAME ) 
-	{
-		fds = _fds_skipto(fds, _fds_name_end);
-		fds++;
-	}
-
-	if ( *fds == FDS_UNION_START || 
-	     *fds == FDS_STRUCT_START || 
-	     *fds == FDS_ENUM_START )
-	{
-		fds++;
-
-		if ( *fds == FDS_ID )
-		{
-                	SetAIFError(AIFERR_BADARG, NULL);
-			return NULL;
-		}
-
-		temp = fds;
-		fds = strchr(fds, FDS_ID);
-
-		id_len = fds - temp;
-		id = _aif_alloc( id_len + 1 );
-		*id = '\0';
-		strncat(id, temp, id_len);
-		return id;
-	}
-	else
-	{
-                SetAIFError(AIFERR_BADARG, NULL);
-		return NULL;
-	}
-}
-
-void
-_fds_advance(char **fds)
-{
-	switch ( FDSType((*fds)++) )
-	{
-	case AIF_BOOLEAN:
-	case AIF_CHARACTER:
-		/* already skipped all we should */
-		break;
-
-	case AIF_ENUM:
-		_fds_skipid(fds);
-
-		*fds = _fds_skipto(*fds, _fds_enum_end);
-		(*fds) += 2;
-		/* fall through */
-
-	case AIF_INTEGER:
-		*fds += 1; /* u or s */
-		*fds = _fds_skipnum(*fds);
-		break;
-
-	case AIF_FLOATING:
-	case AIF_VOID:
-		*fds = _fds_skipnum(*fds);
-		break;
-
-	case AIF_FUNCTION:
-		while ( *(*fds)++ != FDS_FUNCTION_ARG_END )
-			;
-
-		_fds_advance(fds);
-		break;
-
-	case AIF_ARRAY:
-		while ( *(*fds)++ != FDS_ARRAY_END )
-			; /* past the index type */
-
-		_fds_advance(fds); /* past the base type */
-		break;
-
-	case AIF_UNION:
-	case AIF_STRUCT:
-		_fds_skipid(fds);
-
-		for ( ;; ) {
-
-			if ( **fds == FDS_STRUCT_ACCESS_SEP )
-			{
-				(*fds)++;
-				continue;
-			}
-			
-			if ( **fds == FDS_STRUCT_END )
-				break;
-
-			while ( *(*fds)++ != FDS_STRUCT_FIELD_NAME_END )
-				; /* past the field name */
-
-			_fds_advance(fds); /* past the field type */
-
-			if ( **fds == FDS_STRUCT_FIELD_SEP ) 
-				(*fds)++;
-		}
-		(*fds)++; /* past closing brace */
-		break;
-
-	case AIF_NAME:
-		*fds = _fds_skipnum(*fds);
-		(*fds)++; /* past closing '/' */
-		_fds_advance(fds); /* past the named type */
-		break;
-
-	case AIF_POINTER:
-		_fds_advance(fds); /* past the pointed-to type */
-		break;
-
-	case AIF_REFERENCE:
-		*fds = _fds_skipnum(*fds);
-		(*fds)++; /* past closing '/' */
-		break;
-
-	case AIF_STRING:
-		break; /* already skipped all we should */
-
-	default:
-		fprintf(stderr, "no way to advance ... \"%s\"\n", *fds);
-		break;
-	}
-}
-
-/*
- * **fds is integer, float, or character.  Return how many bytes it
- * has and advance *fds to its end
- */
-int
-_fds_count_bytes(char **fds)
-{
-	int bytes;
-	
-	switch ( **fds )
-	{
-	case FDS_FLOATING:
-		(*fds)++; /* past f */
-		bytes = _fds_getnum(*fds);
-		*fds = _fds_skipnum(*fds); /* past size indicator */
-		break;
-
-	case FDS_ENUM_START:
-		*fds = _fds_skipto(++(*fds), _fds_enum_end);
-		(*fds)++;
-		/* fall through */	
-
-	case FDS_INTEGER:
-		*fds += 2; /* past iu or is */
-		bytes = _fds_getnum(*fds);
-		*fds = _fds_skipnum(*fds); /* past size indicator */
-		break;
-
-	case FDS_CHARACTER:
-		(*fds)++; /* past c */
-		bytes = 1;
-		break;
-
-	case FDS_BOOLEAN:
-		(*fds)++; /* past b */
-		bytes = sizeof(int);
-		break;
-
-	case FDS_VOID:
-		(*fds)++; /* past v */
-		bytes = _fds_getnum(*fds);
-		*fds = _fds_skipnum(*fds); /* past size indicator */
-		break;
-
-	default:
-		bytes = -1; /* internal error */
-	}
-
-	return bytes;
-}
-
-/*
- * Count bytes but don't advance pointer
- */
-int
-_fds_count_bytes_na(char **fds)
-{
-	char *	fmt = *fds;
-
-	return _fds_count_bytes(&fmt);
-}
-
-void
-_fds_resolve(char **fmt)
-{
-	int	index;
-
-	while ( **fmt == FDS_NAME )
-	{
-		(*fmt)++;
-		index = (int)strtol(*fmt, NULL, 10);
-		*fmt = (char *)_fds_skipnum(*fmt)+1; /* past name, trailing slash */
-		_aif_types_seen[index+MAX_TYPES_SEEN/2] = *fmt;
-	}
-}
-
-char *
-_fds_lookup(char **fmt)
-{
-	int	index;
-
-	(*fmt)++;
-	index = (int)strtol(*fmt, NULL, 10);
-	*fmt = (char *)_fds_skipnum(*fmt)+1; /* past name, trailing slash */
-
-	return _aif_types_seen[index+MAX_TYPES_SEEN/2];
-}
-
-/* 
- * Skip over one full data unit, specified by the fds,
- * At return, fds should be at its end, and data is advanced.
- */
-
-void
-_fds_skip_data(char **fds, char **data)
-{
-	int		i;
-	int		bytes;
-	int		reg;
-	char *		target;
-	AIFIndex *	ix;
-	char *		fmt;
-
-	_fds_resolve(fds);
-
-	switch ( FDSType(*fds) )
-	{
-	case AIF_REFERENCE:
-		fmt = _fds_lookup(fds); // need a temporary copy
-		_fds_skip_data(&fmt, data);
-		return;
-
-	case AIF_POINTER:
-		reg = (**data < (char) AIF_PTR_REFERENCE); /* data not a reference */
-
-		(*fds)++; /* past ^ */
-
-		if ( **data == AIF_PTR_REFERENCE)
-		{
-			(*data)+=5;
-			_fds_advance(fds);
-			return;
-		}
-		
-		if ( (target = _find_target(data, 0)) == 0 )
-		{
-			/*
-			** null pointer.  skip over the target fds
-			*/
-			_fds_advance(fds);
-			return;
-		}
-
-		_fds_skip_data(fds, &target);
-
-		if ( reg )
-			*data = target; /* otherwise _find_target advanced for us */
-		return;
-
-	case AIF_VOID:
-	case AIF_CHARACTER:
-	case AIF_INTEGER:
-	case AIF_BOOLEAN:
-	case AIF_FLOATING:
-	case AIF_ENUM:
-		(*data) += _fds_count_bytes(fds);
-		return;
-
-	case AIF_ARRAY:
-		ix = FDSArrayIndexInit(*fds);
-
-		_fds_advance(fds); /* skip over the entire array fds */
-
-		for ( i = 0 ; i < ix->i_nel ; i++ )
-		{
-			fmt = ix->i_btype;
-			_fds_skip_data(&fmt, data);
-		}
-
-		AIFArrayIndexFree(ix);
-		return;
-
-	case AIF_STRUCT:
-		(*fds)++; /* past open brace */
-		_fds_skipid(fds);
-
-		while ( **fds != FDS_STRUCT_END )
-		{
-			if ( **fds == FDS_STRUCT_ACCESS_SEP )
-			{
-				(*fds)++;
-				continue;
-			}
-
-			*fds = strchr(*fds, FDS_STRUCT_FIELD_NAME_END) + 1;
-				/* to start of field */
-			_fds_skip_data(fds, data);
-
-			if ( **fds == FDS_STRUCT_FIELD_SEP )
-				(*fds)++;
-		}
-
-		(*fds)++; /* past close brace */
-		return;
-
-	case AIF_STRING:
-		(*fds)++; /* past s */
-		bytes = (*(*data)++ & 0xff) << 8;
-		bytes += *(*data)++ & 0xff;
-		*data += bytes;
-		return;
-
-	case AIF_FUNCTION:
-		while ( **data != '\0' )
-			(*data)++;
-		(*data)++; /* past null */
-		return;
-			
-	default:
-		SetAIFError(AIFERR_TYPE, NULL);
-		return;
-	}
-}
-
-void
-_fds_skipid(char **fds)
-{
-	if (**fds != FDS_ID)
-		*fds = strchr(*fds, FDS_ID);
-	*fds += 1;
-}
-
-char *
-_fds_add_function_arg(char *fds, char *arg)
-{
-	char * nfmt;
-	char * temp;
-	char * rest;
-
-        if ( FDSType(fds) != AIF_FUNCTION )
-        {
-                SetAIFError(AIFERR_BADARG, NULL);
-                return NULL;
-        }
-
-        nfmt = (char *)_aif_alloc(strlen(fds) + strlen(arg) + 2);
-        *nfmt = '\0';
-
-        strcpy(nfmt, fds);
-
-        if ( (temp = _fds_skipto(nfmt, _fds_function_arg_end)) == NULL )
-        {
-                SetAIFError(AIFERR_BADARG, NULL);
-                _aif_free(nfmt);
-                return NULL;
-        }
-
-        rest = _fds_skipto(fds, _fds_function_arg_end);
-
-        if ( temp != (nfmt + 1) )
-                *temp++ = FDS_FUNCTION_ARG_SEP;
-
-        sprintf(temp, "%s%s",
-                arg,
-                rest);
-
-        ResetAIFError();
-
-        return nfmt;
-}
-
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/fds.h b/debug/org.eclipse.ptp.debug.sdm/libaif/fds.h
deleted file mode 100644
index cd2ee7d..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/fds.h
+++ /dev/null

@@ -1,102 +0,0 @@
-/*
- * Header file for FDS routines.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifndef _FDS_H
-#define _FDS_H
-
-#define FDS_ARRAY_END				']'
-#define FDS_ARRAY_START			'['
-#define FDS_BOOLEAN				'b'
-#define FDS_CHARACTER				'c'
-#define FDS_ENUM_END				'>'
-#define FDS_ENUM_CONST_SEP		','
-#define FDS_ENUM_SEP				'='
-#define FDS_ENUM_START			'<'
-#define FDS_FLOATING				'f'
-#define FDS_FUNCTION				'&'
-#define FDS_FUNCTION_ARG_END		'/'
-#define FDS_FUNCTION_ARG_SEP		','
-#define FDS_ID					'|'
-#define FDS_INTEGER				'i'
-#define FDS_INTEGER_SIGNED		's'
-#define FDS_INTEGER_UNSIGNED		'u'
-#define FDS_INVALID				'?'
-#define FDS_NAME					'%'
-#define FDS_NAME_END				'/'
-#define FDS_POINTER				'^'
-#define FDS_RANGE				'r'
-#define FDS_RANGE_SEP				'.'
-#define FDS_REFERENCE				'>'
-#define FDS_REFERENCE_END			'/'
-#define FDS_REGION				'z'
-#define FDS_STRING				's'
-#define FDS_ADDRESS				'a'
-#define FDS_STRUCT_ACCESS_SEP		';'
-#define FDS_STRUCT_END			'}'
-#define FDS_STRUCT_FIELD_NAME_END	'='
-#define FDS_STRUCT_FIELD_SEP		','
-#define FDS_STRUCT_START			'{'
-#define FDS_UNION_END				')'
-#define FDS_UNION_FIELD_NAME_END	'='
-#define FDS_UNION_FIELD_SEP		','
-#define FDS_UNION_START			'('
-#define FDS_VOID				'v'
-#define FDS_CHAR_POINTER		'p'
-
-
-extern char *		FDSAddFieldToClass(char *, aifaccess, char *, char *);
-extern char *		FDSAddConstToEnum(char *, char *, int);
-extern char *		FDSAddFieldToStruct(char *, char *, char *);
-extern char *		FDSAddFieldToUnion(char *, char *, char *);
-extern char *		FDSRangeInit(int, int);
-extern char *		FDSArrayInit(int, int, char *);
-extern int			FDSArrayRank(char *);
-extern int			FDSArraySize(char *);
-extern char *		FDSArrayIndexType(char *);
-extern int			FDSArrayMinIndex(char *, int);
-extern int			FDSArrayMaxIndex(char *, int);
-extern AIFIndex *	FDSArrayIndexInit(char *);
-extern void			FDSArrayInfo(char *, int *, char **, char **);
-extern void			FDSArrayBounds(char *, int , int **, int **, int **);
-extern char *		FDSBaseType(char *);
-extern int			FDSClassAdd(char **, aifaccess, char *, char *);
-extern int			FDSClassFieldByName(char *, char *, char **);
-extern int			FDSClassFieldByNumber(char *, int, char **, char **);
-extern int			FDSClassFieldIndex(char *, char *);
-extern int			FDSClassFieldSize(char *, char *);
-extern char *		FDSClassInit(char *);
-extern int			FDSDataSize(char *, char *);
-extern int			FDSEnumAdd(char **, char *, int);
-extern int			FDSEnumConstByName(char *, char *, int *);
-extern int			FDSEnumConstByValue(char *, char **, int val);
-extern char *		FDSEnumInit(char *);
-extern char *		FDSGetIdentifier(char *);
-extern int			FDSIsSigned(char *);
-extern int			FDSNumFields(char *);
-extern int			FDSSetIdentifier(char **, char *);
-extern int			FDSStructAdd(char **, char *, char *);
-extern int			FDSStructFieldByName(char *, char *, char **);
-extern int			FDSStructFieldByNumber(char *, int, char **, char **);
-extern int			FDSStructFieldIndex(char *, char *);
-extern int			FDSStructFieldSize(char *, char *);
-extern char *		FDSStructInit(char *);
-extern int			FDSType(char *);
-extern int			FDSTypeCompare(char *, char *);
-extern int			FDSTypeSize(char *);
-extern int			FDSUnionAdd(char **, char *, char *);
-extern int			FDSUnionFieldByName(char *, char *, char **);
-extern char *		FDSUnionInit(char *);
-extern char *		TypeToFDS(int, ...);
-
-#endif /* !_FDS_H */
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/install-sh b/debug/org.eclipse.ptp.debug.sdm/libaif/install-sh
deleted file mode 100755
index ebc6691..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/install-sh
+++ /dev/null

@@ -1,250 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/io.c b/debug/org.eclipse.ptp.debug.sdm/libaif/io.c
deleted file mode 100644
index 9348554..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/io.c
+++ /dev/null

@@ -1,394 +0,0 @@
-/*
- * Routines for managing file input/output for AIF objects.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<assert.h>
-#include	<stdio.h>
-#include	<errno.h>
-#include	<string.h>
-#include	<sys/types.h>
-#include	<sys/stat.h>
-#include	<fcntl.h>
-
-#ifdef WIN32
-#include	<io.h>
-#else /* WIN32 */
-#include	<unistd.h>
-#endif /* WIN32 */
-
-#include	"aif.h"
-#include	"aifint.h"
-#include	"aiferr.h"
-
-#define AIFFILE_MAGIC	"AIF1.0"
-
-#define AIFFILE_DATA	'D'
-#define AIFFILE_EOF	'E'
-
-struct aifhdr
-{
-	char	hdr_magic[6];
-	char	hdr_flag;
-	char	hdr_namelen[6];
-	char	hdr_fdslen[6];
-	char	hdr_datalen[11];
-};
-typedef struct aifhdr	aifhdr;
-
-extern int	errno;
-
-int	write_data(FILE *, char *, int);
-
-int
-ToNum(char *str, int len)
-{
-	int	i;
-	int	val = 0;
-
-	for ( i = 0 ; i < len ; i++ )
-		val = val * 10 + str[i] - '0';
-
-	return val;
-}
-
-int
-aif_write_set(AIFFILE *af, char *name, char *fds, char *data, int len)
-{
-	int	nlen;
-	int	flen;
-	aifhdr	hdr;
-	char	buf[BUFSIZ];
-	char	nbuf[BUFSIZ];
-
-	memcpy(hdr.hdr_magic, AIFFILE_MAGIC, sizeof(hdr.hdr_magic));
-
-	if ( fds == NULL )
-	{
-		hdr.hdr_flag = AIFFILE_EOF;
-		nlen = 0;
-		flen = 0;
-		len = 0;
-	}
-	else
-	{
-		hdr.hdr_flag = AIFFILE_DATA;
-
-		if ( name == NULL )
-			snprintf(nbuf, BUFSIZ, "_ar_%d", af->af_cnt++);
-		else
-			strcpy(nbuf, name);
-
-		nlen = strlen(nbuf) + 1;
-		flen = strlen(fds) + 1;
-	}
-
-	snprintf(buf, BUFSIZ, "%06d", nlen);
-	memcpy(hdr.hdr_namelen, buf, sizeof(hdr.hdr_namelen));
-
-	snprintf(buf, BUFSIZ, "%06d", flen);
-	memcpy(hdr.hdr_fdslen, buf, sizeof(hdr.hdr_fdslen));
-
-	snprintf(buf, BUFSIZ, "%011d", len);
-	memcpy(hdr.hdr_datalen, buf, sizeof(hdr.hdr_datalen));
-
-	if ( write_data(af->af_fp, (char *)&hdr, sizeof(aifhdr)) < 0 )
-		return -1;
-
-	if ( fds == NULL )
-		return 0;
-
-	if
-	(
-		write_data(af->af_fp, nbuf, nlen) < 0
-		||
-		write_data(af->af_fp, fds, flen) < 0
-		||
-		write_data(af->af_fp, data, len) < 0
-	)
-		return -1;
-
-	return 0;
-}
-
-int
-write_data(FILE *fp, char *buf, int len)
-{
-	int	n;
-
-	while ( (n = fwrite(buf, 1, len, fp)) < len )
-	{
-		if ( n < 0 )
-		{
-			SetAIFError(AIFERR_WRITE, strerror(errno));
-			return -1;
-		}
-
-		len -= n;
-		buf += n;
-	}
-
-	return 0;
-}
-
-int
-AIFWriteSet(AIFFILE *af, AIF *a, char *name)
-{
-	if ( a == (AIF *)NULL || af == (AIFFILE *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if
-	(
-		af->af_mode != AIFMODE_CREATE
-		&&
-		af->af_mode != AIFMODE_APPEND
-	)
-	{
-		SetAIFError(AIFERR_MODE, NULL);
-		return -1;
-	}
-
-	return aif_write_set(af, name, AIF_FORMAT(a), AIF_DATA(a), AIF_LEN(a));
-}
-
-int
-aif_read_set(AIFFILE *af, AIF **a, char **name)
-{
-	int		l;
-	int		flen;
-	int		nlen;
-	int		dlen;
-	aifhdr		hdr;
-	char *		fds;
-	char *		data;
-	static AIF *	_aif_read_aif = (AIF *)NULL;
-	static char *	_aif_read_name = NULL;
-
-	if ( (l = fread((char *)&hdr, sizeof(aifhdr), 1, af->af_fp)) < 0 )
-	{
-		SetAIFError(AIFERR_READ, strerror(errno));
-		return -1;
-	}
-
-	if
-	(
-		l < 1
-		||
-		strncmp(hdr.hdr_magic, AIFFILE_MAGIC, sizeof(hdr.hdr_magic)) != 0 )
-	{
-		SetAIFError(AIFERR_BADHDR, NULL);
-		return -1;
-	}
-
-	if ( hdr.hdr_flag == AIFFILE_EOF )
-		return 0;
-
-	nlen = ToNum(hdr.hdr_namelen, sizeof(hdr.hdr_namelen));
-	flen = ToNum(hdr.hdr_fdslen, sizeof(hdr.hdr_fdslen));
-	dlen = ToNum(hdr.hdr_datalen, sizeof(hdr.hdr_datalen));
-
-	if ( a == (AIF **)NULL )
-	{
-		/*
-		** Skip over data.
-		*/
-		if ( fseek(af->af_fp, nlen + flen + dlen, SEEK_CUR) < 0 )
-		{
-			SetAIFError(AIFERR_SEEK, strerror(errno));
-			return -1;
-		}
-
-		return 1;
-	}
-
-	if ( _aif_read_name != NULL )
-		_aif_free(_aif_read_name);
-
-	_aif_read_name = (char *)_aif_alloc(nlen);
-
-	fds = (char *)_aif_alloc(flen);
-	data = (char *)_aif_alloc(dlen);
-
-	if ( (l = fread(_aif_read_name, 1, nlen, af->af_fp)) < 0 || l < nlen )
-	{
-		SetAIFError(AIFERR_READ, strerror(errno));
-		return -1;
-	}
-
-	if ( (l = fread(fds, 1, flen, af->af_fp)) < 0 || l < flen )
-	{
-		SetAIFError(AIFERR_READ, strerror(errno));
-		return -1;
-	}
-
-	if ( (l = fread(data, 1, dlen, af->af_fp)) < 0 || l < dlen )
-	{
-		SetAIFError(AIFERR_READ, strerror(errno));
-		return -1;
-	}
-
-	if ( _aif_read_aif != (AIF *)NULL )
-		AIFFree(_aif_read_aif);
-
-	*a = _aif_read_aif = MakeAIF(fds, data);
-
-	if ( name != (char **)NULL )
-		*name = _aif_read_name;
-
-	return 1;
-}
-
-AIF *
-AIFReadSet(AIFFILE *af, char **name)
-{
-	AIF *	a;
-
-	if ( af == (AIFFILE *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( af->af_mode != AIFMODE_READ )
-	{
-		SetAIFError(AIFERR_MODE, NULL);
-		return (AIF *)NULL;
-	}
-
-	if ( aif_read_set(af, &a, name) <= 0 )
-		return (AIF *)NULL;
-
-	return a;
-}
-
-AIFFILE *
-AIFOpenSet(char *file, int mode)
-{
-	int		n;
-	int		cnt = 0;
-	int		fd;
-	int		created = 0;
-	char *		fmode;
-	FILE *		fp;
-	AIFFILE *	af;
-
-	switch ( mode )
-	{
-	case AIFMODE_READ:
-		fmode = "r";
-		break;
-
-	case AIFMODE_CREATE:
-		fmode = "w";
-		break;
-
-	case AIFMODE_APPEND:
-		fmode = "r+";
-
-		if ( access(file, R_OK) < 0 )
-		{
-			if ( (fd = creat(file, 0644)) < 0 )
-			{
-				SetAIFError(AIFERR_OPEN, strerror(errno));
-				return (AIFFILE *)NULL;
-			}
-
-			(void)close(fd);
-			created = 1;
-		}
-
-		break;
-
-	default:
-		/* should never happen */
-		fmode = "";
-		assert(0);
-	}
-
-	if ( (fp = fopen(file, fmode)) == (FILE *)NULL )
-	{
-		SetAIFError(AIFERR_OPEN, strerror(errno));
-		return (AIFFILE *)NULL;
-	}
-
-	af = (AIFFILE *)_aif_alloc(sizeof(AIFFILE));
-	af->af_fp = fp;
-	af->af_mode = mode;
-
-	if ( mode == AIFMODE_APPEND )
-	{
-		/*
-		** Count entries.
-		*/
-		while ( (n = aif_read_set(af, (AIF **)NULL, (char **)NULL)) > 0 )
-			cnt++;
-
-		if ( n < 0 && !created )
-		{
-			fclose(af->af_fp);
-			_aif_free(af);
-			return (AIFFILE *)NULL;
-		}
-
-		/*
-		** Back up over EOF header.
-		*/
-		if
-		(
-			cnt > 0
-			&&
-			fseek(af->af_fp, -((int)sizeof(aifhdr)), SEEK_CUR) < 0
-		)
-		{
-			SetAIFError(AIFERR_SEEK, strerror(errno));
-			fclose(af->af_fp);
-			_aif_free(af);
-			return (AIFFILE *)NULL;
-		}
-	}
-
-	af->af_cnt = cnt;
-
-	return af;
-}
-
-int
-AIFCloseSet(AIFFILE *af)
-{
-	if ( af == (AIFFILE *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if
-	(
-		(
-			af->af_mode == AIFMODE_CREATE
-			||
-			af->af_mode == AIFMODE_APPEND
-		)
-		&&
-		aif_write_set(af, NULL, NULL, NULL, 0) < 0
-	)
-		return -1;
-
-	fclose(af->af_fp);
-	_aif_free(af);
-
-	return 0;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/libaif.spec b/debug/org.eclipse.ptp.debug.sdm/libaif/libaif.spec
deleted file mode 100644
index 5cc092e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/libaif.spec
+++ /dev/null

@@ -1,53 +0,0 @@
-#
-# Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-
-Summary: libaif: Architecture Independent Format Library
-Name: libaif
-Version: 1.0.5
-Release: 1
-Copyright: GPL
-Group: System Environment/Libraries
-Source: libaif-%{version}.tar.gz
-Buildroot: /var/tmp/libaif
-
-Packager: Greg Watson <greg@guardsoft.net>
-
-%description
-libaif is a libarary of architecture independent format routines. It 
-is used primarily for transferring and manipulating data to/from 
-different architectures.
-
-This package contains a library and include files.
-
-#--------------------------------------------------------------------------
-%prep
-%setup -q
-
-%build
-rm -rf $RPM_BUILD_ROOT
-./configure --prefix=$RPM_BUILD_ROOT/usr
-make
-
-%install
-make install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-
-%files
-%defattr(-,root,root)
-/usr/lib/libaif.a
-/usr/include/aif.h
-/usr/include/fds.h
-
-%changelog
-* Fri Nov 08 2002 Greg Watson <greg@guardsoft.net>
-- Initial version

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/missing b/debug/org.eclipse.ptp.debug.sdm/libaif/missing
deleted file mode 100755
index e7ef83a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/missing
+++ /dev/null

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/mkinstalldirs b/debug/org.eclipse.ptp.debug.sdm/libaif/mkinstalldirs
deleted file mode 100755
index 324d93d..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/mkinstalldirs
+++ /dev/null

@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.1 2001/07/17 00:50:48 bam Exp $
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/applypatch b/debug/org.eclipse.ptp.debug.sdm/libaif/patches/applypatch
deleted file mode 100755
index acd86f2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/applypatch
+++ /dev/null

@@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# Apply patches to GDB.
-#
-# Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-
-COMMENT="# Support for AIF"
-INSAIF=no
-
-while [ $# -ne 0 ]
-do
-	case $1 in
-	-install-aif | --install-aif)
-		INSAIF=yes
-		;;
-
-	-install-all | --install-all)
-		INSAIF=yes
-		;;
-	*)
-		INSDIR=$1
-		SRCDIR=$1/gdb
-		;;
-	esac
-
-	shift
-done
-
-if [ $INSAIF = no -o "x$INSDIR" = x ]; then
-	echo usage: $0 '--install-aif|--install-all' gdb-dir
-	exit 1
-fi
-
-if [ ! -d $INSDIR -a ! -d $SRCDIR ]; then
-	echo $0: could not find gdb source
-	exit 1
-fi
-
-if [ ! -f $SRCDIR/Makefile.in ]; then
-	echo $0: could not find Makefile.in
-	exit 1
-fi
-
-VERSION=""
-
-if [ -f $SRCDIR/version.in ]; then
-	VERSION=`cat $SRCDIR/version.in`
-else
-	VERSION=`grep '^VERSION' $SRCDIR/Makefile.in | sed -e 's/VERSION = //'`
-fi
-
-if [ "x$VERSION" = x ]; then
-	echo $0: could not find version of new gdb
-	exit 1
-fi
-
-if grep "$COMMENT" $SRCDIR/Makefile.in > /dev/null ; then
-	echo $0: warning - gdb-$VERSION has already been patched
-	exit 0
-fi
-
-rhv=`expr "$VERSION" : 'Red Hat Linux (\([^)]*\))'`
-
-if [ "x$rhv" != x ]; then
-	VERSION="rh$rhv"
-fi
-
-case $VERSION in
-5.0)
-	sed -e "/^CLEANFILES =/a\\
-$COMMENT\\
-INCLUDE_aif = @INCLUDE_aif@\\
-LIB_aif = @LIB_aif@\\
--include libaif.mk\\
-" < $SRCDIR/Makefile.in > $SRCDIR/Makefile.in.x
-	mv $SRCDIR/Makefile.in.x $SRCDIR/Makefile.in
-
-	(cd $INSDIR/..; patch -p0) < gdb-$VERSION.patch
-	;;
-
-5.2|rh5.2.1-4|2002-08-11-cvs)
-	sed -e "/^DISTSTUFF = \$(YYFILES)/a\\
-$COMMENT\\
-INCLUDE_aif = @INCLUDE_aif@\\
-LIB_aif = @LIB_aif@\\
--include libaif.mk\\
-" < $SRCDIR/Makefile.in > $SRCDIR/Makefile.in.x
-	mv $SRCDIR/Makefile.in.x $SRCDIR/Makefile.in
-
-	(cd $INSDIR/..; patch -p0) < gdb-$VERSION.patch
-	;;
-
-*)
-	echo $0: version $VERSION not supported
-	exit 1
-	;;
-esac
-
-exit 0

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/createpatch b/debug/org.eclipse.ptp.debug.sdm/libaif/patches/createpatch
deleted file mode 100755
index 5fbfe2b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/createpatch
+++ /dev/null

@@ -1,112 +0,0 @@
-#!/bin/sh -e
-#
-# Create gdb patch files.
-#
-# Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-#
-
-FILES_50="aif-valprint.c c-valprint.c printcmd.c typeprint.c valprint.c libaif.mk configure.in aclocal.m4 configure"
-
-FILES_52="aif-valprint.c c-valprint.c printcmd.c typeprint.c valprint.c libaif.mk configure.in configure config.in"
-
-FILES_20020811CVS="aif-valprint.c c-valprint.c printcmd.c typeprint.c valprint.c libaif.mk configure.in configure config.in"
-
-if  [ $# -ne 1 ]; then
-	echo usage: $0 new-gdb-dir
-	exit 1
-fi
-
-NEWINSDIR=$1
-NEWSRCDIR=$1/gdb
-ORGINSDIR=$1-old
-ORGSRCDIR=$1-old/gdb
-
-if [ ! -d $NEWINSDIR -a ! -d $NEWSRCDIR ]; then
-	echo $0: could not find new gdb source
-	exit 1
-fi
-
-if [ ! -d $ORGINSDIR -a ! -d $ORGSRCDIR ]; then
-	echo $0: could not find original gdb source
-	exit 1
-fi
-
-if [ ! -f $NEWSRCDIR/Makefile.in -o ! -f $ORGSRCDIR/Makefile.in ]; then
-	echo $0: could not find Makefile.in
-	exit 1
-fi
-
-VERSION=""
-
-if [ -f $NEWSRCDIR/version.in ]; then
-	VERSION=`cat $NEWSRCDIR/version.in`
-else
-	VERSION=`grep '^VERSION' $NEWSRCDIR/Makefile.in | sed -e 's/VERSION = //'`
-fi
-
-if [ "x$VERSION" = x ]; then
-	echo $0: could not find version of new gdb
-	exit 1
-fi
-
-ORGVERSION=""
-
-if [ -f $ORGSRCDIR/version.in ]; then
-	ORGVERSION=`cat $ORGSRCDIR/version.in`
-else
-	ORGVERSION=`grep '^VERSION' $ORGSRCDIR/Makefile.in | sed -e 's/VERSION = //'`
-fi
-
-if [ "x$ORGVERSION" = x ]; then
-	echo $0: could not find version of original gdb
-	exit 1
-fi
-
-if [ $ORGVERSION != $VERSION ]; then
-	echo $0: original and new versions do not match
-	exit 1
-fi
-
-df=`echo $VERSION | sed -e 's/-//g' -e 's/\.//g' | tr 'a-z' 'A-Z'`
-FILES=`eval echo '$'"FILES_$df"`
-
-NEWDIR=`basename $NEWINSDIR`
-PARENT=`dirname $NEWINSDIR`
-ORGDIR=$NEWDIR-old
-
-case $VERSION in
-5.[02]|2002-08-11-cvs)
-	rm -f gdb-$VERSION.patch
-	for i in $FILES
-	do
-		ORG=$ORGDIR/gdb/$i
-		NEW=$NEWDIR/gdb/$i
-		if [ ! -f $ORGSRCDIR/$i ]; then ORG=/dev/null; fi
-		if [ ! -f $NEWSRCDIR/$i ]; then NEW=/dev/null; fi
-		(cd $PARENT; diff -uN $ORG $NEW || true) >> gdb-$VERSION.patch
-	done
-	;;
-
-*)
-	echo $0: version $VERSION of gdb not supported
-	exit 1
-	;;
-esac
-
-exit 0

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-2002-08-11-cvs.patch b/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-2002-08-11-cvs.patch
deleted file mode 100644
index e828c94..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-2002-08-11-cvs.patch
+++ /dev/null

@@ -1,14492 +0,0 @@
---- /dev/null	Sun Mar 30 18:07:30 2003
-+++ src/gdb/aif-valprint.c	Sun Mar 30 18:37:36 2003
-@@ -0,0 +1,1136 @@
-+/* Support for printing C and C++ types for GDB, the GNU debugger.
-+   Copyright 1986, 1988, 1989, 1991, 1993-1996, 1998-2000
-+   Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.  */
-+
-+#include "defs.h"
-+#include "obstack.h"
-+#include "bfd.h"		/* Binary File Description */
-+#include "symtab.h"
-+#include "gdbtypes.h"
-+#include "expression.h"
-+#include "value.h"
-+#include "valprint.h"
-+#include "gdbcore.h"
-+#include "target.h"
-+#include "command.h"
-+#include "gdbcmd.h"
-+#include "language.h"
-+#include "demangle.h"
-+#include "c-lang.h"
-+#include "typeprint.h"
-+#include "ui-file.h"
-+
-+#include "gdb_string.h"
-+#include "aif.h"
-+#include <errno.h>
-+#include <ctype.h>
-+void mem_file_delete (struct ui_file *file);
-+
-+int check_value(struct type *, CORE_ADDR, struct value **);
-+
-+/* defined in valprint.c: */
-+extern int partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr);
-+
-+
-+/* the following comes from the aif library, conv.c, written by Greg. */
-+
-+#if defined(WINDOWSNT)
-+#define BITSPERBYTE	8
-+#elif defined(__APPLE__)
-+#include <sys/types.h>
-+#define BITSPERBYTE     NBBY
-+#else /* !WINDOWSNT && !__APPLE_ */
-+#include <values.h>
-+#endif
-+
-+union ieee_double
-+{
-+	DOUBLEST	d;
-+	char		c[sizeof(DOUBLEST)];
-+};
-+
-+
-+/* For linked data structures, we check for circularity by recording the values
-+ * of all pointers and types we see.  In a later pass, we emit a name on those
-+ * types and an offset for those values
-+ * that appear more than once. */
-+struct value_info {
-+  CORE_ADDR addr;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: value has been
-+    emitted */
-+};
-+struct type_info {
-+  struct type *type;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: name has been
-+    emitted */
-+};
-+
-+#define MAX_VALUES_SEEN 1000
-+	/* hope that the structure doesn't have more distinct pointer values */
-+struct value_info valuesSeen[MAX_VALUES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numValuesSeen;
-+#define MAX_TYPES_SEEN 100
-+	/* hope that the structure doesn't have more distinct types values */
-+struct type_info typesSeen[MAX_TYPES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numTypesSeen;
-+
-+typedef enum {doType, doValue} doWhat;
-+
-+struct str_type
-+{
-+	int	blen;
-+	int	slen;
-+	int	end;
-+	char *	buf;
-+};
-+
-+typedef struct str_type *	str_ptr;
-+
-+str_ptr str_init(void);
-+void str_add(str_ptr, char *);
-+void str_free(str_ptr);
-+char *str_val(str_ptr);
-+str_ptr str_dup(char *);
-+
-+/* fill in the valuesSeen array with all the pointer values we see */
-+void
-+aif_discover(struct type *type, char *valaddr, doWhat what)
-+{
-+  int valuesSeenIndex;
-+  struct type *elttype;
-+  unsigned int eltlen, offset;
-+  CORE_ADDR addr;
-+  switch (TYPE_CODE (type))
-+    {
-+    case TYPE_CODE_TYPEDEF:
-+      aif_discover(TYPE_TARGET_TYPE (type), valaddr, what);
-+      break;
-+
-+    case TYPE_CODE_PTR:
-+    case TYPE_CODE_REF:
-+      if (what == doValue)
-+      { /* looking for values */
-+	struct value *deref_val;
-+	addr = unpack_pointer (type, valaddr);
-+	if (addr == 0) break;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (valuesSeenIndex = 0; valuesSeenIndex < numValuesSeen;
-+	valuesSeenIndex++)
-+	{
-+	  if (addr == valuesSeen[valuesSeenIndex].addr)
-+	  {
-+	    valuesSeen[valuesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numValuesSeen < MAX_VALUES_SEEN)
-+	  {
-+	    valuesSeen[numValuesSeen].addr = addr;
-+	    valuesSeen[numValuesSeen].used = 0;
-+	    numValuesSeen += 1;
-+	  }
-+	/*
-+	** Check addr is valid!
-+	*/
-+	if ( check_value(elttype, addr, &deref_val) )
-+		aif_discover(elttype, VALUE_CONTENTS (deref_val), what);
-+	break;
-+      } else {
-+	/* looking for types */
-+	int typesSeenIndex;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (typesSeenIndex = 0; typesSeenIndex < numTypesSeen;
-+	typesSeenIndex++)
-+	{
-+	  if (elttype == typesSeen[typesSeenIndex].type)
-+	  {
-+	    typesSeen[typesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numTypesSeen < MAX_TYPES_SEEN)
-+	  {
-+	    typesSeen[numTypesSeen].type = elttype;
-+	    typesSeen[numTypesSeen].used = 0;
-+	    numTypesSeen += 1;
-+	  }
-+	aif_discover(elttype, 0, what);
-+	break;
-+      } /* discover types */
-+
-+    case TYPE_CODE_STRUCT:
-+    case TYPE_CODE_UNION:
-+      { /* discover either values or types */
-+	int i;
-+      	struct field *thisField;
-+	struct type *ftype;
-+	struct value *v;
-+
-+	for ( i = 0; i < TYPE_NFIELDS(type); i++ )
-+	{
-+		if ( TYPE_FIELD_IGNORE(type, i) )
-+			continue;
-+
-+		if ( what == doType )
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), 0, what);
-+			continue;
-+		}
-+
-+		if 
-+		(
-+			!TYPE_FIELD_STATIC(type, i) 
-+			&& 
-+			TYPE_FIELD_PACKED(type, i)
-+		)
-+		{
-+			v = value_from_longest(TYPE_FIELD_TYPE(type, i),
-+				unpack_field_as_long (type, valaddr, i));
-+
-+			aif_discover(TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS(v), what);
-+		}
-+		else if ( TYPE_FIELD_STATIC (type, i) )
-+		{
-+			v = value_static_field (type, i);
-+
-+			if ( v == NULL )
-+				continue;
-+
-+			/*
-+			XXX
-+			cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+			stream, format, recurse + 1,
-+			pretty);
-+			*/
-+		}
-+		else
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / 8, what);
-+		}
-+	  }
-+      }
-+      break;
-+
-+    case TYPE_CODE_ARRAY:
-+      elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+      if (what == doValue)
-+      { /* looking for values */
-+	unsigned int temp_len, len;
-+	eltlen = TYPE_LENGTH (elttype);
-+	len = TYPE_LENGTH (type) / eltlen;
-+	offset = 0;
-+	for (temp_len = 0; temp_len < len; temp_len++)
-+	  {
-+	    aif_discover(elttype, valaddr+offset, what);
-+	    offset += eltlen;
-+	  }
-+      } else { /* looking for types */
-+	aif_discover(elttype, 0, what);
-+      } /* TYPE_CODE_ARRAY */
-+      break;
-+
-+    case TYPE_CODE_MEMBER:
-+    case TYPE_CODE_METHOD:
-+    case TYPE_CODE_FUNC:
-+    case TYPE_CODE_UNDEF:
-+    case TYPE_CODE_ENUM:
-+    case TYPE_CODE_BOOL:
-+    case TYPE_CODE_INT:
-+    case TYPE_CODE_FLT:
-+    case TYPE_CODE_VOID:
-+    case TYPE_CODE_ERROR:
-+    case TYPE_CODE_CHAR:
-+    case TYPE_CODE_SET:
-+    case TYPE_CODE_RANGE:
-+    case TYPE_CODE_STRING:
-+    case TYPE_CODE_BITSTRING:
-+    case TYPE_CODE_COMPLEX:
-+    case TYPE_CODE_TEMPLATE:
-+      break;
-+
-+    default:
-+      error ("type not handled in type_discover");
-+      break;
-+    } /* switch (TYPE_CODE (type)) */
-+} /* aif_discover */
-+
-+/* squash the valuesSeen and typesSeen arrays to remove unnecessary elements */
-+void 
-+aif_reduce(void)
-+{
-+  int front, back;
-+  front = back = 0;
-+  while (front < numValuesSeen)
-+    {
-+      /* move back to first unused entry */
-+      valuesSeen[numValuesSeen].used = 0; /* pseudo-data */
-+      while (valuesSeen[back].used) back += 1;
-+      if (back == numValuesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      valuesSeen[numValuesSeen].used = 1; /* pseudo-data */
-+      while (!valuesSeen[front].used) front += 1;
-+      if (front == numValuesSeen) break;
-+      /* copy from front to back */
-+      valuesSeen[back] = valuesSeen[front];
-+      valuesSeen[front].used = 0;
-+    }
-+  numValuesSeen = back;
-+  front = back = 0;
-+  while (front < numTypesSeen)
-+    {
-+      /* move back to first unused entry */
-+      typesSeen[numTypesSeen].used = 0; /* pseudo-data */
-+      while (typesSeen[back].used) back += 1;
-+      if (back == numTypesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      typesSeen[numTypesSeen].used = 1; /* pseudo-data */
-+      while (!typesSeen[front].used) front += 1;
-+      if (front == numTypesSeen) break;
-+      /* copy from front to back */
-+      typesSeen[back] = typesSeen[front];
-+      typesSeen[front].used = 0;
-+    }
-+    numTypesSeen = back;
-+} /* aif_reduce */
-+
-+int dataStreamPos;
-+
-+void 
-+emitData(char toEmit, struct ui_file *stream)
-+{
-+  fprintf_filtered(stream, "%02x", toEmit & 0xff);
-+  dataStreamPos += 1;
-+} /* emitData */
-+  
-+void
-+aif_emit_string(CORE_ADDR addr, struct ui_file *stream)
-+{ /* code modified from val_print_string () */
-+  int errcode;			/* Errno returned from bad reads. */
-+  unsigned int fetchlimit;	/* Maximum number of chars to print. */
-+  unsigned int nfetch;		/* Chars to fetch / chars fetched. */
-+  unsigned int chunksize;	/* Size of each fetch, in chars. */
-+  char *buffer = NULL;		/* Dynamically growable fetch buffer. */
-+  char *bufptr;			/* Pointer to next available byte in buffer. */
-+  char *limit;			/* First location past end of fetch buffer. */
-+  struct cleanup *old_chain = NULL;	/* Top of the old cleanup chain. */
-+  int found_nul;		/* Non-zero if we found the nul char */
-+  unsigned long bufsize = 0;
-+  int length;			/* how long the string turned out to be */
-+
-+  if (addr == 0)
-+  {
-+      emitData(0, stream);
-+      emitData(0, stream);
-+      return;
-+  }
-+
-+  fetchlimit = print_max;
-+  chunksize = min (8, fetchlimit);
-+  /* Loop until we either have all the characters to print, or we encounter
-+     some error, such as bumping into the end of the address space. */
-+  found_nul = 0;
-+  old_chain = make_cleanup (null_cleanup, 0);
-+  do
-+    {
-+      QUIT;
-+      nfetch = min (chunksize, fetchlimit - bufsize);
-+      if (buffer == NULL)
-+	buffer = (char *) xmalloc (nfetch);
-+      else
-+	{
-+	  discard_cleanups (old_chain);
-+	  buffer = (char *) xrealloc (buffer, nfetch + bufsize);
-+	}
-+      old_chain = make_cleanup (free, buffer);
-+      bufptr = buffer + bufsize;
-+      bufsize += nfetch;
-+      /* Read as much as we can. */
-+      nfetch = partial_memory_read (addr, bufptr, nfetch, &errcode);
-+      /* Scan this chunk for the null byte */
-+      limit = bufptr + nfetch;
-+      while (bufptr < limit)
-+	{
-+	  unsigned long c;
-+	  c = extract_unsigned_integer (bufptr, 1);
-+	  addr += 1;
-+	  bufptr += 1;
-+	  if (c == 0)
-+	    {
-+	      /* We don't care about any error which happened after
-+		  the NULL terminator.  */
-+	      errcode = 0;
-+	      found_nul = 1;
-+	      break;
-+	    }
-+	} /* while (bufptr < limit) */
-+    } /* do */
-+  while (errcode == 0	/* no error */
-+	  && bufptr - buffer < fetchlimit	/* no overrun */
-+	  && !found_nul);	/* haven't found nul yet */
-+  QUIT;
-+  length = 0;
-+  if (errcode == 0 || bufptr > buffer)
-+    {
-+      length = bufptr - buffer - 1; /* don't include null */
-+      emitData((length >> 8) & 077, stream);
-+      emitData(length & 077, stream);
-+      for (; length > 0; length--) {
-+	emitData(*buffer++, stream); 
-+      }
-+    }
-+  if (errcode != 0)
-+    {
-+      if (errcode == EIO)
-+	{
-+	  fprintf_filtered (stream, " <Address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, " out of bounds>");
-+	}
-+      else
-+	{
-+	  fprintf_filtered (stream, " <Error reading address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, ": %s>", safe_strerror (errcode));
-+	}
-+    }
-+  gdb_flush (stream);
-+  do_cleanups (old_chain);
-+  return;
-+} /* aif_emit_string */
-+
-+str_ptr
-+gdb_type_to_fds(struct type *type)
-+{
-+	int		len;
-+	int		elen;
-+	int		nfields;
-+	int		i;
-+	int		ix;
-+	str_ptr		s;
-+	str_ptr		type_ptr;
-+	str_ptr		type_str;
-+	struct type *	etype;
-+
-+	CHECK_TYPEDEF (type);
-+
-+	type_str = str_init();
-+
-+	for ( ix = 0; ix < numTypesSeen; ix++)
-+	{
-+		if 
-+		(
-+			typesSeen[ix].type != type
-+			||
-+			!typesSeen[ix].used
-+		)
-+			continue;
-+
-+		/*
-+		** Multiple use type
-+		*/
-+
-+		if ( typesSeen[ix].used != 1 )
-+		{
-+			/* 
-+			** referring to one already emitted 
-+			*/
-+
-+			str_add(type_str, TypeToFDS(AIF_REFERENCE, ix));
-+			return type_str;
-+		}
-+
-+		/*
-+		** first time; emit name
-+		*/
-+
-+		str_add(type_str, TypeToFDS(AIF_NAME, ix, NULL));
-+		typesSeen[ix].used = 2;
-+		break;
-+	}
-+
-+	len = TYPE_LENGTH(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		type_ptr = gdb_type_to_fds(TYPE_TARGET_TYPE(type));
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		return type_str;
-+
-+	case TYPE_CODE_ARRAY:
-+		if 
-+		(
-+			len > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			etype = check_typedef(TYPE_TARGET_TYPE (type));
-+			elen = TYPE_LENGTH(etype);
-+			len /= elen;
-+
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, TypeToFDS(AIF_ARRAY, 
-+				TypeToFDS(AIF_RANGE, 0, len-1, 
-+					TypeToFDS(AIF_INTEGER, 1, sizeof(int))),
-+				str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+
-+	case TYPE_CODE_PTR:
-+		etype = check_typedef(TYPE_TARGET_TYPE(type));
-+		elen = TYPE_LENGTH(etype);
-+
-+		if 
-+		(
-+			elen == 1
-+			&&
-+			TYPE_CODE(etype) == TYPE_CODE_INT
-+		)
-+		{
-+			str_add(type_str, TypeToFDS(AIF_STRING));
-+		}
-+		else
-+		{
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, 
-+				TypeToFDS(AIF_POINTER, str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+		}
-+
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		if
-+		(
-+			len != 1
-+			||
-+			strncmp(TYPE_NAME(type), "char", 5) != 0
-+		) 
-+		{
-+			str_add(type_str, 
-+				TypeToFDS(AIF_INTEGER, TYPE_UNSIGNED(type) ? 0 : 1, len));
-+			break;
-+		}
-+
-+		/*
-+		** Treat as char...
-+		*/
-+
-+	case TYPE_CODE_CHAR:
-+		str_add(type_str, TypeToFDS(AIF_CHARACTER));
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		str_add(type_str, TypeToFDS(AIF_FLOATING, len));
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		nfields = TYPE_NFIELDS(type);
-+		
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		/*
-+		** First need to calculate size of struct, since it
-+		** may not be packed.
-+		*/
-+
-+		for ( len = 0 ; i < nfields ; i++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+					TYPE_FIELD_BITSIZE(type, i) / 8 :
-+					TYPE_LENGTH(etype);
-+
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+			else if ( elen > len )
-+				len = elen;
-+		}
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_STRUCT));
-+
-+		/*
-+		** Need to calculate offset (len).
-+		*/
-+		len = 0;
-+
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		for (; i < nfields ; i++ )
-+		{
-+			char *t;
-+
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+				TYPE_FIELD_BITSIZE(type, i) :
-+				TYPE_LENGTH(etype) * 8;
-+
-+			s = gdb_type_to_fds(etype);
-+
-+			if ( HAVE_CPLUS_STRUCT(type) )
-+			{
-+				if ( TYPE_FIELD_PROTECTED(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val(type_ptr),
-+					    	AIFACC_PROTECTED, 
-+					    	TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else if ( TYPE_FIELD_PRIVATE(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PRIVATE, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PUBLIC, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+
-+			}
-+			else
-+				t = FDSAddFieldToStruct(str_val(type_ptr), 
-+					TYPE_FIELD_NAME(type, i), str_val(s));
-+
-+			str_free(type_ptr);
-+			
-+			type_ptr = str_dup(t);
-+
-+			str_free(s);
-+
-+			/*
-+			** Calc offset.
-+			*/
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		str_add(type_str, TypeToFDS(AIF_VOID, len));
-+		break;
-+
-+	case TYPE_CODE_ENUM:
-+		nfields = TYPE_NFIELDS (type);
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_ENUM));
-+
-+		for ( i = 0 ; i < nfields ; i++ )
-+		{
-+			char *	t;
-+
-+			t = FDSAddConstToEnum(str_val(type_ptr),
-+					TYPE_FIELD_NAME(type, i),
-+					TYPE_FIELD_BITPOS(type, i));
-+
-+			str_free(type_ptr);
-+
-+			type_ptr = str_dup(t);
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_FUNC:
-+		etype = check_typedef(TYPE_TARGET_TYPE (type));
-+
-+		type_ptr = gdb_type_to_fds(etype);
-+
-+		str_add(type_str, 
-+			TypeToFDS(AIF_FUNCTION, str_val(type_ptr)));
-+
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_STRING:
-+	case TYPE_CODE_SET:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_BITSTRING:
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_BOOL:
-+	case TYPE_CODE_COMPLEX:
-+		str_add(type_str, TypeToFDS(AIF_INVALID));
-+		break;
-+
-+	default:
-+		error("Invalid C/C++ type code %d in symbol table.", TYPE_CODE(type));
-+	}
-+
-+	return type_str;
-+}
-+
-+void
-+aif_val_print_recursive(struct type *type, char *valaddr, CORE_ADDR address, struct ui_file *stream)
-+{
-+	int			ix;
-+	int			res;
-+	int			valid;
-+	unsigned		len;
-+	unsigned		eltlen;
-+	LONGEST			val;
-+	float			fval;
-+	double			dval;
-+#ifdef HAVE_LONG_DOUBLE
-+	long double		ldval;
-+#endif /* HAVE_LONG_DOUBLE */
-+	CORE_ADDR		addr;
-+	struct value *		vptr;
-+	union ieee_double	v;
-+	struct type *		elttype;
-+	struct field *		thisField;
-+
-+	CHECK_TYPEDEF(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		aif_val_print_recursive(TYPE_TARGET_TYPE(type), valaddr, address, stream);
-+		break;
-+
-+	case TYPE_CODE_ARRAY:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if 
-+		(
-+			TYPE_LENGTH(type) > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			eltlen = TYPE_LENGTH(elttype);
-+			len = TYPE_LENGTH(type) / eltlen;
-+
-+			for ( ix = 0; ix < len; ix++ )
-+				aif_val_print_recursive(elttype, valaddr + ix * eltlen, address + ix * eltlen, stream);
-+
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+		addr = address;
-+		goto asPtr;
-+
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_PTR:
-+		addr = unpack_pointer(type, valaddr);
-+
-+	asPtr:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if
-+		(
-+			TYPE_LENGTH(elttype) == 1
-+			&& 
-+			TYPE_CODE(elttype) == TYPE_CODE_INT
-+		)
-+		{
-+			/*
-+			** call it a string
-+			*/
-+			(void)aif_emit_string(addr, stream);
-+			break;
-+		}
-+
-+		if ( addr == 0 )
-+		{
-+			emitData((char)AIF_PTR_NIL, stream); 
-+			break;
-+		}
-+
-+		for ( ix = 0 ; ix < numValuesSeen; ix++ )
-+		{
-+			if
-+			(
-+				valuesSeen[ix].addr == addr
-+				&&
-+				valuesSeen[ix].used
-+			)
-+			{
-+
-+				union 
-+				{
-+					int	i;
-+					char 	bytes[4];
-+				} ptrname;
-+
-+				if ( valuesSeen[ix].used == 1 )
-+				{
-+					/* 
-+					** first time; just emit as usual
-+					*/
-+
-+					emitData((char)AIF_PTR_NAME, stream); 
-+					valuesSeen[ix].used = 2;
-+
-+					{
-+						int i;
-+
-+						ptrname.i = ix;
-+
-+						if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
-+						{
-+							for ( i = 0 ; i < 4 ; i++ )
-+								emitData(ptrname.bytes[i], stream);
-+						}
-+						else
-+						{
-+							for ( i = 3 ; i >= 0 ; i-- )
-+								emitData(ptrname.bytes[i], stream);
-+						}
-+					}
-+
-+					break; /* no need to look at other seen values */
-+				}
-+
-+				/* 
-+				** referring to one already emitted
-+				*/
-+
-+				emitData((char)AIF_PTR_REFERENCE, stream); 
-+
-+				{
-+					int i;
-+
-+					ptrname.i = ix;
-+
-+					if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
-+					{
-+						for ( i = 0 ; i < 4 ; i++ )
-+							emitData(ptrname.bytes[i], stream);
-+					}
-+					else
-+					{
-+						for ( i = 3 ; i >= 0 ; i-- )
-+							emitData(ptrname.bytes[i], stream);
-+					}
-+				}
-+
-+				return; /* don't go any deeper */
-+			}
-+		}
-+
-+		res = check_value(elttype, addr, &vptr);
-+
-+		if ( ix == numValuesSeen )
-+		{
-+			/*
-+			** not special at all 
-+			*/
-+			if ( !res )
-+			{
-+				emitData((char)AIF_PTR_INVALID, stream); 
-+				break;
-+			}
-+
-+			emitData((char)AIF_PTR_NORMAL, stream); 
-+		}
-+
-+		aif_val_print_recursive (VALUE_TYPE(vptr),
-+					VALUE_CONTENTS(vptr),
-+					VALUE_ADDRESS(vptr),
-+					stream);
-+
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		/*
-+		** A union is treated just like a struct. That is
-+		** we attempt to traverse each field if possible.
-+		** It's then up to the receiver to decide what is
-+		** sensible information.
-+		**
-+		** XXX: What happens if a pointer points to random
-+		** data?
-+		*/
-+		for ( ix = 0 ; ix < TYPE_NFIELDS (type) ; ix++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, ix) )
-+				continue;
-+
-+			if 
-+			(
-+				!TYPE_FIELD_STATIC(type, ix) 
-+				&& 
-+				TYPE_FIELD_PACKED(type, ix)
-+			)
-+			{
-+				vptr = value_from_longest(TYPE_FIELD_TYPE(type, ix),
-+					unpack_field_as_long(type, valaddr, ix));
-+
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), VALUE_CONTENTS(vptr), 0, stream);
-+			}
-+			else if ( TYPE_FIELD_STATIC (type, ix) )
-+			{
-+				vptr = value_static_field (type, ix);
-+
-+				if ( vptr == NULL )
-+					continue;
-+
-+				/*
-+				XXX
-+				cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+				stream, format, recurse + 1,
-+				pretty);
-+				*/
-+			}
-+			else
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), 
-+					valaddr + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					address + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					stream);
-+		}
-+		break;
-+
-+	case TYPE_CODE_CHAR:
-+	asChar:
-+		val = unpack_long (type, valaddr);
-+		emitData((char) (val & 0xff), stream); 
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		len = TYPE_LENGTH (type);
-+
-+		if
-+		(
-+			len == 1 
-+			&&
-+			strncmp(TYPE_NAME(type), "char", 5) == 0
-+		) 
-+			goto asChar;
-+
-+		val = unpack_long(type, valaddr);
-+		AIFNormalise((char *) &v, len, (char *) &val, sizeof(LONGEST));
-+		
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char)(v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		len = TYPE_LENGTH (type);
-+
-+		switch ( len ) {
-+		case 4:
-+			fval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &fval), sizeof(DOUBLEST));
-+
-+		case 8:
-+			dval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &dval), sizeof(DOUBLEST));
-+			break;
-+
-+#ifdef HAVE_LONG_DOUBLE
-+		case 16:
-+			ldval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &ldval), sizeof(DOUBLEST));
-+			break;
-+#endif /* HAVE_LONG_DOUBLE */
-+		default:
-+			fprintf(stderr, "cannot handle float of length %d\n", len);
-+		}
-+
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char) (v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		break;
-+
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_ENUM:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_FUNC:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_UNDEF:
-+	case TYPE_CODE_ERROR:
-+		break;
-+
-+	default:
-+		error ("Invalid C/C++ type code %d in symbol table.", TYPE_CODE (type));
-+	}
-+}
-+
-+void 
-+aif_val_print(struct type *type, char *valaddr, int embedded_offset, CORE_ADDR address, struct ui_file *stream)
-+{
-+  str_ptr s;
-+
-+  // struct ui_file *typeStream=mem_fileopen();
-+  numValuesSeen = 0;
-+  aif_discover(type, valaddr+embedded_offset, doValue); /* values */
-+  aif_discover(type, 0, doType); /* types */
-+  aif_reduce();
-+  dataStreamPos = 0;
-+  // fputs_filtered("(", stream);
-+  s = gdb_type_to_fds(type);
-+  fputs_filtered(str_val(s), stream);
-+  str_free(s);
-+  // fputs_filtered(")", stream);
-+  fputs_filtered(" ", stream);
-+  aif_val_print_recursive(type, valaddr+embedded_offset, address, stream);
-+  // contents = ui_file_xstrdup(typeStream, &dummy);
-+  // fputs_filtered(contents, stream);
-+  // free(contents);
-+  // ui_file_delete(typeStream);
-+  gdb_flush(stream);
-+} /* aif_val_print */
-+
-+void
-+aif_type_print(struct type *type, struct ui_file *stream)
-+{
-+	str_ptr	s;
-+
-+	numValuesSeen = 0;
-+	aif_discover(type, 0, doType); /* types */
-+	aif_reduce();
-+	dataStreamPos = 0;
-+	s = gdb_type_to_fds(type);
-+	fputs_filtered(str_val(s), stream);
-+	str_free(s);
-+}
-+
-+#define STRSIZE 100
-+
-+str_ptr
-+str_init(void)
-+{
-+	str_ptr	s;
-+
-+	s = (str_ptr)xmalloc(sizeof(struct str_type));
-+	s->buf = (char *)xmalloc(STRSIZE);
-+	s->blen = STRSIZE;
-+	s->slen = 0;
-+	*(s->buf) = '\0';
-+
-+	return s;
-+}
-+
-+void
-+str_add(str_ptr s1, char *s2)
-+{
-+	int	l2 = strlen(s2);
-+
-+	if (s1->slen + l2 >= s1->blen)
-+	{
-+		s1->blen += max(STRSIZE, l2);
-+		s1->buf = (char *) xrealloc (s1->buf, s1->blen);
-+	}
-+
-+	memcpy(&(s1->buf[s1->slen]), s2, l2);
-+	s1->slen += l2;
-+	s1->buf[s1->slen] = '\0';
-+}
-+
-+void
-+str_free(str_ptr s)
-+{
-+	free(s->buf);
-+	free(s);
-+}
-+
-+char *
-+str_val(str_ptr s)
-+{
-+	return s->buf;
-+}
-+
-+str_ptr
-+str_dup(char *s1)
-+{
-+	str_ptr s = str_init();
-+	str_add(s, s1);
-+	return s;
-+}
-+
-+int
-+check_value(struct type *type, CORE_ADDR addr, struct value **res)
-+{
-+  int status;
-+  struct value *val;
-+  char buf[sizeof (ULONGEST)];
-+
-+  if (TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
-+  	return 0;
-+
-+  val = allocate_value (type);
-+
-+  status = target_read_memory (addr, VALUE_CONTENTS_ALL_RAW (val), TYPE_LENGTH (type));
-+
-+  if (status != 0)
-+	return 0;
-+
-+  VALUE_LVAL (val) = lval_memory;
-+  VALUE_ADDRESS (val) = addr;
-+  VALUE_BFD_SECTION (val) = NULL;
-+
-+  *res = val;
-+
-+  return 1;
-+}
-+
-+
---- src-old/gdb/c-valprint.c	Mon Apr  8 03:38:03 2002
-+++ src/gdb/c-valprint.c	Sat Mar 15 08:32:50 2003
-@@ -31,6 +31,10 @@
- #include "cp-abi.h"
- 
- 
-+extern int max_print_depth; /* set by "set print depth" */
-+extern int current_print_depth;
-+extern int typeprint; /* set by "set print type" (Boolean) */
-+
- /* Print function pointer with inferior address ADDRESS onto stdio
-    stream STREAM.  */
- 
-@@ -76,6 +80,13 @@
-   LONGEST val;
-   CORE_ADDR addr;
- 
-+  if (typeprint && format != 's')
-+  {
-+    fputs_filtered("(", stream);
-+    type_print (type, "", stream, -1);
-+    fputs_filtered(") ", stream);
-+  }
-+
-   CHECK_TYPEDEF (type);
-   switch (TYPE_CODE (type))
-     {
-@@ -154,6 +165,7 @@
- 	  break;
- 	}
-       elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+      if (!elttype) elttype = type;
-       if (TYPE_CODE (elttype) == TYPE_CODE_METHOD)
- 	{
- 	  cp_print_class_method (valaddr + embedded_offset, type, stream);
-@@ -182,6 +194,26 @@
- 	      print_address_numeric (addr, 1, stream);
- 	    }
- 
-+	  if (current_print_depth < max_print_depth
-+	     && TYPE_CODE (elttype) != TYPE_CODE_UNDEF
-+	     && (TYPE_LENGTH (elttype) != 1
-+	     || TYPE_CODE (elttype) != TYPE_CODE_INT)
-+	     && format != 's')
-+	  { /* print complex objected pointed to recursively */
-+	    if (addressprint) fprintf_filtered (stream, " => ");
-+	    if (addr == 0)
-+	    {
-+	      fprintf_filtered (stream, "nil");
-+	    }
-+	    else
-+	    { /* non nil */
-+	      struct value * deref_val = value_at(elttype, addr, NULL);
-+	      current_print_depth += 1;
-+	      val_print (VALUE_TYPE (deref_val), VALUE_CONTENTS (deref_val), 0, VALUE_ADDRESS (deref_val), stream, format, deref_ref, recurse, pretty);
-+	      current_print_depth -= 1;
-+	    }
-+	  } /* print recursively */
-+
- 	  /* For a pointer to char or unsigned char, also print the string
- 	     pointed to, unless pointer is null.  */
- 	  /* FIXME: need to handle wchar_t here... */
-@@ -356,9 +388,6 @@
- 	}
-       /* FIXME, we should consider, at least for ANSI C language, eliminating
-          the distinction made between FUNCs and POINTERs to FUNCs.  */
--      fprintf_filtered (stream, "{");
--      type_print (type, "", stream, -1);
--      fprintf_filtered (stream, "} ");
-       /* Try to print what function it points to, and its address.  */
-       print_address_demangle (address, stream, demangle);
-       break;
-@@ -559,9 +588,9 @@
-       else
- 	{
- 	  /* normal case */
--	  fprintf_filtered (stream, "(");
--	  type_print (type, "", stream, -1);
--	  fprintf_filtered (stream, ") ");
-+	  /* fprintf_filtered (stream, "("); */
-+	  /* type_print (type, "", stream, -1); */
-+	  /* fprintf_filtered (stream, ") "); */
- 	}
-     }
-   if (objectprint && (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_CLASS))
---- src-old/gdb/printcmd.c	Tue Aug 13 14:03:03 2002
-+++ src/gdb/printcmd.c	Sat Mar 15 08:36:48 2003
-@@ -273,6 +273,7 @@
-   return val;
- }
- 
-+extern int current_print_depth; /* from valprint.c */
- /* Print value VAL on stream according to FORMAT, a letter or 0.
-    Do not end with a newline.
-    0 means print VAL according to its own type.
-@@ -321,12 +322,15 @@
- 	  || TYPE_CODE (type) == TYPE_CODE_STRING
- 	  || TYPE_CODE (type) == TYPE_CODE_STRUCT
- 	  || TYPE_CODE (type) == TYPE_CODE_UNION)
-+      {
- 	/* If format is 0, use the 'natural' format for
- 	 * that type of value.  If the type is non-scalar,
- 	 * we have to use language rules to print it as
- 	 * a series of scalars.
- 	 */
-+	current_print_depth = 0;
- 	value_print (val, stream, format, Val_pretty_default);
-+      }
-       else
- 	/* User specified format, so don't look to the
- 	 * the type to tell us what to do.
---- src-old/gdb/typeprint.c	Tue Aug 13 14:04:15 2002
-+++ src/gdb/typeprint.c	Sat Mar 15 12:31:17 2003
-@@ -39,6 +39,8 @@
- /* For real-type printing in whatis_exp() */
- extern int objectprint;		/* Controls looking up an object's derived type
- 				   using what we find in its vtables.  */
-+extern int aifprint;   /* print type using AIF */
-+extern void aif_type_print PARAMS ((struct type *, struct ui_file *));
- 
- extern void _initialize_typeprint (void);
- 
-@@ -101,6 +103,17 @@
-       /* OBSOLETE   type_print (type, "", stream, 0); */
-       /* OBSOLETE   break; */
- #endif
-+#ifdef _LANG_zpl
-+    case language_zpl:
-+      fprintf_filtered(stream, "type ");
-+      if(!TYPE_NAME(SYMBOL_TYPE(new)) ||
-+         !STREQ (TYPE_NAME(SYMBOL_TYPE(new)), SYMBOL_NAME(new)))
-+      fprintf_filtered(stream, "%s = ", SYMBOL_SOURCE_NAME(new));
-+      else
-+        fprintf_filtered(stream, "<builtin> = ");
-+      type_print(type,"",stream,0);
-+      break;
-+#endif
-     default:
-       error ("Language not supported.");
-     }
-@@ -118,6 +131,12 @@
- type_print (struct type *type, char *varstring, struct ui_file *stream,
- 	    int show)
- {
-+  if (aifprint)
-+  {
-+    aif_type_print (type, stream);
-+    return;
-+  }
-+
-   LA_PRINT_TYPE (type, varstring, stream, show, 0);
- }
- 
---- src-old/gdb/valprint.c	Tue Aug 13 14:04:22 2002
-+++ src/gdb/valprint.c	Sat Mar 15 12:40:28 2003
-@@ -37,9 +37,12 @@
- 
- #include <errno.h>
- 
-+extern int aifprint; /* set by "set print aif" (Boolean) */
-+void aif_val_print(struct type *type, char *valaddr, int embedded_offset, CORE_ADDR address, struct ui_file *stream);
-+
- /* Prototypes for local functions */
- 
--static int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
-+int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
- 				int len, int *errnoptr);
- 
- static void print_hex_chars (struct ui_file *, unsigned char *,
-@@ -103,6 +106,17 @@
- /* If nonzero, causes machine addresses to be printed in certain contexts. */
- 
- int addressprint;		/* Controls printing of machine addresses */
-+
-+/* If positive, causes pointers to be followed in printing, to given depth */
-+int max_print_depth;  
-+int current_print_depth = 0; /* reset to 0 at each interrupt */
-+
-+/* If nonzero, causes types to be printed. */
-+int typeprint;       
-+
-+/* If nonzero, causes types to be printed, if at all, in AIF format. */
-+int aifprint;
-+
- 
- 
- /* Print data of type TYPE located at VALADDR (within GDB), which came from
-@@ -149,6 +163,12 @@
-       return (0);
-     }
- 
-+  if (aifprint)
-+    {
-+      aif_val_print(type, valaddr, embedded_offset, address, stream);
-+      return 0;     
-+    }
-+
-   return (LA_VAL_PRINT (type, valaddr, embedded_offset, address,
- 			stream, format, deref_ref, recurse, pretty));
- }
-@@ -969,7 +989,7 @@
- /* FIXME: cagney/1999-10-14: Only used by val_print_string.  Can this
-    function be eliminated.  */
- 
--static int
-+int
- partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr)
- {
-   int nread;			/* Number of bytes actually read. */
-@@ -1157,7 +1177,7 @@
-     {
-       if (addressprint)
- 	{
--	  fputs_filtered (" ", stream);
-+	  fputs_filtered (" => ", stream);
- 	}
-       LA_PRINT_STRING (stream, buffer, (bufptr - buffer) / width, width, force_ellipsis);
-     }
-@@ -1390,6 +1410,27 @@
- 		  &setprintlist),
-      &showprintlist);
- 
-+  add_show_from_set
-+    (add_set_cmd ("depth", class_support, var_uinteger,
-+		 (char *) &max_print_depth,
-+		 "Set depth of pointer recursion.",
-+		 &setprintlist),
-+     &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("type", class_support, var_boolean,
-+		 (char *) &typeprint,
-+		 "Set printing of types.",
-+		 &setprintlist),
-+     &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("aif", class_support, var_boolean,
-+		 (char *) &aifprint,
-+		 "Set printing of types to aif format.",
-+		 &setprintlist),
-+     &showprintlist);
-+
-   c = add_set_cmd ("input-radix", class_support, var_uinteger,
- 		   (char *) &input_radix,
- 		   "Set default input radix for entering numbers.",
-@@ -1424,5 +1465,8 @@
-   prettyprint_arrays = 0;
-   unionprint = 1;
-   addressprint = 1;
-+  max_print_depth = -1;
-+  typeprint = 0;
-+  aifprint = 0;      
-   print_max = PRINT_MAX_DEFAULT;
- }
---- /dev/null	Sun Mar 30 18:07:30 2003
-+++ src/gdb/libaif.mk	Fri Mar 14 17:28:48 2003
-@@ -0,0 +1,9 @@
-+INCLUDE_CFLAGS += $(INCLUDE_aif)
-+
-+CLIBS += $(LIB_aif)
-+
-+SFILES     += aif-valprint.c
-+COMMON_OBS += aif-valprint.o
-+
-+aif-valprint.o: aif-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-+	language.h $(symtab_h) valprint.h $(value_h)
---- src-old/gdb/configure.in	Wed Aug 28 12:07:59 2002
-+++ src/gdb/configure.in	Sun Mar 16 21:25:25 2003
-@@ -32,6 +32,95 @@
- 
- AM_PROG_CC_STDC
- 
-+AC_ARG_WITH(aif,
-+[  --with-aif=dir                use aif in dir])
-+AC_ARG_WITH(aif-lib,
-+[  --with-aif-lib=dir            use aif libraries in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-aif-lib])
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi])
-+AC_ARG_WITH(aif-include,
-+[  --with-aif-include=dir        use aif headers in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-aif-include])
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi])
-+
-+AC_MSG_CHECKING(for aif)
-+
-+case "$with_aif" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_aif_include" = ""; then
-+		with_aif_include="$with_aif/include"
-+	fi
-+	if test "$with_aif_lib" = ""; then
-+		with_aif_lib="$with_aif/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='/usr/local'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_aif_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_aif_include $header_dirs";;
-+esac
-+case "$with_aif_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_aif_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	AC_TRY_COMPILE([#include <aif.h>],,ires=$i;break)
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i -laif $save_LIBS"
-+	AC_TRY_LINK([#include <aif.h>],,lres=$i;break)
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_aif" != "no"; then
-+	aif_includedir="$ires"
-+	aif_libdir="$lres"
-+	DIR_aif=
-+	INCLUDE_aif="-I$aif_includedir"
-+	LIB_aif="-L$aif_libdir -laif"
-+	AC_DEFINE_UNQUOTED(HAVE_AIF,1,[Define if you have the aif package.])
-+	with_aif=yes
-+	AC_MSG_RESULT([headers $ires, libraries $lres])
-+else
-+	DIR_aif="aif"
-+	INCLUDE_aif=
-+	LIB_aif=
-+	with_aif=no
-+	AC_MSG_RESULT($with_aif)
-+fi
-+AC_SUBST(DIR_aif)
-+AC_SUBST(INCLUDE_aif)
-+AC_SUBST(LIB_aif)
-+
-+if test "$with_aif" = "no"; then
-+        AC_MSG_ERROR([You must have libaif to compile this version of GDB.])
-+fi
-+AC_DEFINE(HAVE_AIF, 1, [Enable AIF support in in GDB.])dnl
-+
- AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
- AC_CANONICAL_SYSTEM
- 
---- src-old/gdb/configure	Wed Aug 28 12:07:58 2002
-+++ src/gdb/configure	Sun Mar 16 21:25:40 2003
-@@ -1,24 +1,22 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.
-+# Generated by GNU Autoconf 2.53.
- #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
- # Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- 
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+  as_expr=expr
-+else
-+  as_expr=false
-+fi
- 
--# Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
- 
--# Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -28,8 +26,165 @@
-   set -o posix
- fi
- 
-+# NLS nuisances.
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-+    { $as_unset LANG || test "${LANG+set}" != set; } ||
-+      { LANG=C; export LANG; }
-+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-+      { LC_ALL=C; export LC_ALL; }
-+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-+      { LC_TIME=C; export LC_TIME; }
-+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-+      { LC_CTYPE=C; export LC_CTYPE; }
-+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-+      { LANGUAGE=C; export LANGUAGE; }
-+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-+      { LC_COLLATE=C; export LC_COLLATE; }
-+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-+      { LC_NUMERIC=C; export LC_NUMERIC; }
-+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-+      { LC_MESSAGES=C; export LC_MESSAGES; }
-+
-+
- # Name of the executable.
--as_me=`echo "$0" |sed 's,.*[\\/],,'`
-+as_me=`(basename "$0") 2>/dev/null ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)$' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\/\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conftest.sh
-+  echo  "exit 0"   >>conftest.sh
-+  chmod +x conftest.sh
-+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conftest.sh
-+fi
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-+  # Find who we are.  Look in the path if we contain no path at all
-+  # relative or not.
-+  case $0 in
-+    *[\\/]* ) as_myself=$0 ;;
-+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+       ;;
-+  esac
-+  # We did not find ourselves, most probably we were run as `sh COMMAND'
-+  # in which case we are not to be found in the path.
-+  if test "x$as_myself" = x; then
-+    as_myself=$0
-+  fi
-+  if test ! -f "$as_myself"; then
-+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-+   { (exit 1); exit 1; }; }
-+  fi
-+  case $CONFIG_SHELL in
-+  '')
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for as_base in sh bash ksh sh5; do
-+	 case $as_dir in
-+	 /*)
-+	   if ("$as_dir/$as_base" -c '
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-+	     CONFIG_SHELL=$as_dir/$as_base
-+	     export CONFIG_SHELL
-+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+	   fi;;
-+	 esac
-+       done
-+done
-+;;
-+  esac
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line before each line; the second 'sed' does the real
-+  # work.  The second script uses 'N' to pair each line-number line
-+  # with the numbered line, and appends trailing '-' during
-+  # substitution so that $LINENO is not a special case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-+  sed '=' <$as_myself |
-+    sed '
-+      N
-+      s,$,-,
-+      : loop
-+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      t loop
-+      s,-$,,
-+      s,^['$as_cr_digits']*\n,,
-+    ' >$as_me.lineno &&
-+  chmod +x $as_me.lineno ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensible to this).
-+  . ./$as_me.lineno
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+  *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T='	' ;;
-+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
- 
- if expr a : '\(a\)' >/dev/null 2>&1; then
-   as_expr=expr
-@@ -57,22 +212,12 @@
- 
- as_executable_p="test -f"
- 
--# Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
- 
--# NLS nuisances.
--$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
--$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
--$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
--$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
--$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
--$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
--$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
--$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
- 
- # IFS
- # We need space, tab and new line, in precisely that order.
-@@ -81,7 +226,8 @@
- IFS=" 	$as_nl"
- 
- # CDPATH.
--$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
-+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
-+
- 
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -96,7 +242,8 @@
- ac_default_prefix=/usr/local
- cross_compiling=no
- subdirs=
--MFLAGS= MAKEFLAGS=
-+MFLAGS=
-+MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
- # Maximum number of lines to put in a shell here document.
-@@ -104,6 +251,13 @@
- # only ac_max_sed_lines should be used.
- : ${ac_max_here_lines=38}
- 
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
- ac_unique_file="main.c"
- # Factoring default headers for most tests.
- ac_includes_default="\
-@@ -182,13 +336,6 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
--# Identity of this package.
--PACKAGE_NAME=
--PACKAGE_TARNAME=
--PACKAGE_VERSION=
--PACKAGE_STRING=
--PACKAGE_BUGREPORT=
--
- ac_prev=
- for ac_option
- do
-@@ -321,7 +468,7 @@
-     with_fp=no ;;
- 
-   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
--  | --no-cr | --no-c)
-+  | --no-cr | --no-c | -n)
-     no_create=yes ;;
- 
-   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-@@ -500,7 +647,7 @@
-   eval ac_val=$`echo $ac_var`
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
--    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
-+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-    { (exit 1); exit 1; }; };;
-   esac
- done
-@@ -512,18 +659,19 @@
-   eval ac_val=$`echo $ac_var`
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
-+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-    { (exit 1); exit 1; }; };;
-   esac
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
- # used to hold the argument of --host etc.
-+# FIXME: To remove some day.
- build=$build_alias
- host=$host_alias
- target=$target_alias
- 
--# FIXME: should be removed in autoconf 3.0.
-+# FIXME: To remove some day.
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
-@@ -539,13 +687,23 @@
- 
- test "$silent" = yes && exec 6>/dev/null
- 
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
-   # Try the directory containing this script, then its parent.
--  ac_prog=$0
--  ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
--  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-+  ac_confdir=`(dirname "$0") 2>/dev/null ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+         X"$0" : 'X\(//\)[^/]' \| \
-+         X"$0" : 'X\(//\)$' \| \
-+         X"$0" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
-+echo X"$0" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-   srcdir=$ac_confdir
-   if test ! -r $srcdir/$ac_unique_file; then
-     srcdir=..
-@@ -555,10 +713,10 @@
- fi
- if test ! -r $srcdir/$ac_unique_file; then
-   if test "$ac_srcdir_defaulted" = yes; then
--    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
-+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-    { (exit 1); exit 1; }; }
-   else
--    { echo "$as_me: error: cannot find sources in $srcdir" >&2
-+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -602,7 +760,7 @@
- if test "$ac_init_help" = "long"; then
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
--  cat <<EOF
-+  cat <<_ACEOF
- \`configure' configures this package to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
-@@ -623,9 +781,9 @@
-   -n, --no-create         do not create output files
-       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
- 
--EOF
-+_ACEOF
- 
--  cat <<EOF
-+  cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
-                           [$ac_default_prefix]
-@@ -652,9 +810,9 @@
-   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-   --infodir=DIR          info documentation [PREFIX/info]
-   --mandir=DIR           man documentation [PREFIX/man]
--EOF
-+_ACEOF
- 
--  cat <<\EOF
-+  cat <<\_ACEOF
- 
- Program names:
-   --program-prefix=PREFIX            prepend PREFIX to installed program names
-@@ -667,14 +825,14 @@
- 
- System types:
-   --build=BUILD     configure for building on BUILD [guessed]
--  --host=HOST       build programs to run on HOST [BUILD]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-   --target=TARGET   configure for building compilers for TARGET [HOST]
--EOF
-+_ACEOF
- fi
- 
- if test -n "$ac_init_help"; then
- 
--  cat <<\EOF
-+  cat <<\_ACEOF
- 
- Optional Features:
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-@@ -696,6 +854,9 @@
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-aif=dir                use aif in dir
-+  --with-aif-lib=dir            use aif libraries in dir
-+  --with-aif-include=dir        use aif headers in dir
-   --with-included-gettext use the GNU gettext library included here
-   --with-uiout          Use new uiout functions instead of *printf's
-   --with-mmalloc          Use memory mapped malloc package
-@@ -722,40 +883,60 @@
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
- 
--EOF
-+_ACEOF
- fi
- 
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
-   ac_popdir=`pwd`
--  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
--    cd $ac_subdir
--    # A "../" for each directory in /$ac_subdir.
--    ac_dots=`echo $ac_subdir |
--             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
--
--    case $srcdir in
--    .) # No --srcdir option.  We are building in place.
--      ac_sub_srcdir=$srcdir ;;
--    [\\/]* | ?:[\\/]* ) # Absolute path.
--      ac_sub_srcdir=$srcdir/$ac_subdir ;;
--    *) # Relative path.
--      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
--    esac
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    test -d $ac_dir || continue
-+    ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-+  *) # Relative path.
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
- 
-+    cd $ac_dir
-     # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_sub_srcdir/configure.gnu; then
-+    if test -f $ac_srcdir/configure.gnu; then
-       echo
--      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
--    elif test -f $ac_sub_srcdir/configure; then
-+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-+    elif test -f $ac_srcdir/configure; then
-       echo
--      $SHELL $ac_sub_srcdir/configure  --help=recursive
--    elif test -f $ac_sub_srcdir/configure.ac ||
--           test -f $ac_sub_srcdir/configure.in; then
-+      $SHELL $ac_srcdir/configure  --help=recursive
-+    elif test -f $ac_srcdir/configure.ac ||
-+           test -f $ac_srcdir/configure.in; then
-       echo
-       $ac_configure --help
-     else
--      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
-+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
-     cd $ac_popdir
-   done
-@@ -763,31 +944,31 @@
- 
- test -n "$ac_init_help" && exit 0
- if $ac_init_version; then
--  cat <<\EOF
-+  cat <<\_ACEOF
- 
--Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
- Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
--EOF
-+_ACEOF
-   exit 0
- fi
- exec 5>config.log
--cat >&5 <<EOF
-+cat >&5 <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.  Invocation command line was
-+generated by GNU Autoconf 2.53.  Invocation command line was
- 
-   $ $0 $@
- 
--EOF
-+_ACEOF
- {
- cat <<_ASUNAME
--## ---------- ##
--## Platform.  ##
--## ---------- ##
-+## --------- ##
-+## Platform. ##
-+## --------- ##
- 
- hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
- uname -m = `(uname -m) 2>/dev/null || echo unknown`
-@@ -806,17 +987,27 @@
- /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
- /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
- 
--PATH = $PATH
--
- _ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  echo "PATH: $as_dir"
-+done
-+
- } >&5
- 
--cat >&5 <<EOF
--## ------------ ##
--## Core tests.  ##
--## ------------ ##
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
- 
--EOF
- 
- # Keep a trace of the command line.
- # Strip out --no-create and --no-recursion so they do not pile up.
-@@ -827,15 +1018,17 @@
- do
-   case $ac_arg in
-   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
--  | --no-cr | --no-c) ;;
-+  | --no-cr | --no-c | -n ) continue ;;
-   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
--  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    continue ;;
-   *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
--    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--    ac_sep=" " ;;
--  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
--     ac_sep=" " ;;
-+    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+  esac
-+  case " $ac_configure_args " in
-+    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-+    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+       ac_sep=" " ;;
-   esac
-   # Get rid of the leading space.
- done
-@@ -843,14 +1036,19 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
-+# WARNING: Be sure not to use single quotes in there, as some shells,
-+# such as our DU 5.0 friend, will then `close' the trap.
- trap 'exit_status=$?
-   # Save into config.log some information that might help in debugging.
--  echo >&5
--  echo "## ----------------- ##" >&5
--  echo "## Cache variables.  ##" >&5
--  echo "## ----------------- ##" >&5
--  echo >&5
--  # The following way of writing the cache mishandles newlines in values,
-+  {
-+    echo
-+    cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
- {
-   (set) 2>&1 |
-     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-@@ -864,21 +1062,24 @@
-         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-       ;;
-     esac;
--} >&5
--  sed "/^$/d" confdefs.h >conftest.log
--  if test -s conftest.log; then
--    echo >&5
--    echo "## ------------ ##" >&5
--    echo "## confdefs.h.  ##" >&5
--    echo "## ------------ ##" >&5
--    echo >&5
--    cat conftest.log >&5
--  fi
--  (echo; echo) >&5
--  test "$ac_signal" != 0 &&
--    echo "$as_me: caught signal $ac_signal" >&5
--  echo "$as_me: exit $exit_status" >&5
--  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
-+}
-+    echo
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
-+      sed "/^$/d" confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      echo "$as_me: caught signal $ac_signal"
-+    echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core core.* *.core &&
-+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-     exit $exit_status
-      ' 0
- for ac_signal in 1 2 13 15; do
-@@ -891,6 +1092,33 @@
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
- echo >confdefs.h
- 
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
-@@ -902,9 +1130,9 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:905: loading site script $ac_site_file" >&5
-+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
--    cat "$ac_site_file" >&5
-+    sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
-   fi
- done
-@@ -913,7 +1141,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:916: loading cache $cache_file" >&5
-+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -921,7 +1149,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:924: creating cache $cache_file" >&5
-+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -937,42 +1165,42 @@
-   eval ac_new_val="\$ac_env_${ac_var}_value"
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:940: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:944: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
- echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--        { echo "$as_me:950: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--        { echo "$as_me:952:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:954:   current value: $ac_new_val" >&5
-+        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-   esac
--  # Pass precious variables to config.status.  It doesn't matter if
--  # we pass some twice (in addition to the command line arguments).
-+  # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
-     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
--      ac_configure_args="$ac_configure_args '$ac_arg'"
--      ;;
--    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
--       ;;
-+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *) ac_arg=$ac_var=$ac_new_val ;;
-+    esac
-+    case " $ac_configure_args " in
-+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-     esac
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:973: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:975: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -983,30 +1211,26 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
--esac
--echo "#! $SHELL" >conftest.sh
--echo  "exit 0"   >>conftest.sh
--chmod +x conftest.sh
--if { (echo "$as_me:995: PATH=\".;.\"; conftest.sh") >&5
--  (PATH=".;."; conftest.sh) 2>&5
--  ac_status=$?
--  echo "$as_me:998: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  ac_path_separator=';'
--else
--  ac_path_separator=:
--fi
--PATH_SEPARATOR="$ac_path_separator"
--rm -f conftest.sh
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- 
- ac_config_headers="$ac_config_headers config.h:config.in"
- 
--echo "$as_me:1009: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-@@ -1015,9 +1239,10 @@
- else
-   USE_MAINTAINER_MODE=no
- fi;
--  echo "$as_me:1018: result: $USE_MAINTAINER_MODE" >&5
-+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
- echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
- 
-+
- if test $USE_MAINTAINER_MODE = yes; then
-   MAINTAINER_MODE_TRUE=
-   MAINTAINER_MODE_FALSE='#'
-@@ -1028,6 +1253,8 @@
- 
-   MAINT=$MAINTAINER_MODE_TRUE
- 
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -1036,7 +1263,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:1039: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1044,25 +1271,28 @@
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_CC="${ac_tool_prefix}gcc"
--echo "$as_me:1054: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1062: result: $CC" >&5
-+  echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1065: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1071,7 +1301,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:1074: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1079,25 +1309,28 @@
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_CC="gcc"
--echo "$as_me:1089: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_CC="gcc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1097: result: $ac_ct_CC" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1100: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1110,7 +1343,7 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:1113: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1118,25 +1351,28 @@
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_CC="${ac_tool_prefix}cc"
--echo "$as_me:1128: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_CC="${ac_tool_prefix}cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1136: result: $CC" >&5
-+  echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1139: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1145,7 +1381,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:1148: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1153,25 +1389,28 @@
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_CC="cc"
--echo "$as_me:1163: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_CC="cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1171: result: $ac_ct_CC" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1174: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1184,7 +1423,7 @@
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:1187: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1193,19 +1432,22 @@
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-   ac_prog_rejected=no
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
--  ac_prog_rejected=yes
--  continue
--fi
--ac_cv_prog_CC="cc"
--echo "$as_me:1207: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+       ac_prog_rejected=yes
-+       continue
-+     fi
-+    ac_cv_prog_CC="cc"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- if test $ac_prog_rejected = yes; then
-@@ -1217,7 +1459,7 @@
-     # However, it has the same basename, so the bogon will be chosen
-     # first if we set CC to just the basename; use the full file name.
-     shift
--    set dummy "$ac_dir/$ac_word" ${1+"$@"}
-+    set dummy "$as_dir/$ac_word" ${1+"$@"}
-     shift
-     ac_cv_prog_CC="$@"
-   fi
-@@ -1226,10 +1468,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1229: result: $CC" >&5
-+  echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1232: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1240,7 +1482,7 @@
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:1243: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1248,25 +1490,28 @@
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--echo "$as_me:1258: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1266: result: $CC" >&5
-+  echo "$as_me:$LINENO: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1269: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1279,7 +1524,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:1282: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1287,25 +1532,28 @@
-   if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_CC="$ac_prog"
--echo "$as_me:1297: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_CC="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1305: result: $ac_ct_CC" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1308: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1317,34 +1565,41 @@
- 
- fi
- 
--test -z "$CC" && { { echo "$as_me:1320: error: no acceptable cc found in \$PATH" >&5
--echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-+
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1325:" \
-+echo "$as_me:$LINENO:" \
-      "checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:1328: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-   (eval $ac_compiler --version </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1331: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1333: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-   (eval $ac_compiler -v </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1336: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1338: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-   (eval $ac_compiler -V </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1341: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1345 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -1358,22 +1613,26 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:1361: checking for C compiler default output" >&5
-+echo "$as_me:$LINENO: checking for C compiler default output" >&5
- echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:1364: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1367: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Find the output, starting from the most likely.  This scheme is
- # not robust to junk in `.', hence go to wildcards (a.*) only as a last
- # resort.
--for ac_file in `ls a.exe conftest.exe 2>/dev/null;
-+
-+# Be careful to initialize this variable, since it used to be cached.
-+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-+ac_cv_exeext=
-+for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
-                 ls a.out conftest 2>/dev/null;
-                 ls a.* conftest.* 2>/dev/null`; do
-   case $ac_file in
--    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
-+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
-     a.out ) # We found the default executable, but exeext='' is most
-             # certainly right.
-             break;;
-@@ -1387,34 +1646,34 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1390: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1396: result: $ac_file" >&5
-+echo "$as_me:$LINENO: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1401: checking whether the C compiler works" >&5
-+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
- echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1407: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1410: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1417: error: cannot run C compiled programs.
-+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&5
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&2;}
-@@ -1422,24 +1681,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1425: result: yes" >&5
-+echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1432: checking whether we are cross compiling" >&5
-+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:1434: result: $cross_compiling" >&5
-+echo "$as_me:$LINENO: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1437: checking for executable suffix" >&5
--echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
--if { (eval echo "$as_me:1439: \"$ac_link\"") >&5
-+echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1442: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -1455,27 +1714,33 @@
-   esac
- done
- else
--  { { echo "$as_me:1458: error: cannot compute EXEEXT: cannot compile and link" >&5
--echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1464: result: $ac_cv_exeext" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1470: checking for object suffix" >&5
--echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1476 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -1485,10 +1750,10 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1488: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1491: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-   case $ac_file in
-@@ -1500,26 +1765,32 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1503: error: cannot compute OBJEXT: cannot compile" >&5
--echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1510: result: $ac_cv_objext" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:1514: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
- echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1520 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -1532,16 +1803,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1535: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1538: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1541: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1544: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -1553,21 +1824,27 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:1556: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
- echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- CFLAGS="-g"
--echo "$as_me:1562: checking whether $CC accepts -g" >&5
-+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
- echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1568 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -1577,16 +1854,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1580: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1583: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1586: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1589: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -1596,7 +1873,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:1599: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -1623,16 +1900,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1626: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1629: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1632: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1635: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -1644,10 +1921,16 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1647 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -1657,16 +1940,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1663: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1666: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1669: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -1676,9 +1959,15 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1679 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- $ac_declaration
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -1688,16 +1977,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1691: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1694: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1697: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1700: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -1724,12 +2013,14 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-+
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:1732: checking how to run the C preprocessor" >&5
-+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
- echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-@@ -1750,18 +2041,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1753 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1758: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1764: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1784,17 +2075,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1787 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:1791: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1797: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1831,7 +2122,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:1834: result: $CPP" >&5
-+echo "$as_me:$LINENO: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -1841,18 +2132,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1844 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:1849: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1855: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1875,17 +2166,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1878 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:1882: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:1888: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -1913,7 +2204,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:1916: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1924,10 +2215,12 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--echo "$as_me:1927: checking for AIX" >&5
-+
-+
-+echo "$as_me:$LINENO: checking for AIX" >&5
- echo $ECHO_N "checking for AIX... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 1930 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #ifdef _AIX
-   yes
-@@ -1936,46 +2229,135 @@
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   egrep "yes" >/dev/null 2>&1; then
--  echo "$as_me:1939: result: yes" >&5
-+  echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define _ALL_SOURCE 1
--EOF
-+_ACEOF
- 
- else
--  echo "$as_me:1946: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- rm -f conftest*
- 
--echo "$as_me:1951: checking for POSIXized ISC" >&5
--echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
--if test -d /etc/conf/kconfig.d &&
--   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
--then
--  echo "$as_me:1956: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--  ISC=yes # If later tests want to check for ISC.
- 
--cat >>confdefs.h <<\EOF
--#define _POSIX_SOURCE 1
--EOF
-+echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-+if test "${ac_cv_search_strerror+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+ac_cv_search_strerror=no
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
- 
--  if test "$GCC" = yes; then
--    CC="$CC -posix"
--  else
--    CC="$CC -Xp"
--  fi
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char strerror ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
-+int
-+main ()
-+{
-+strerror ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_search_strerror="none required"
- else
--  echo "$as_me:1970: result: no" >&5
--echo "${ECHO_T}no" >&6
--  ISC=
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
- fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+if test "$ac_cv_search_strerror" = no; then
-+  for ac_lib in cposix; do
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
- 
--echo "$as_me:1975: checking for ${CC-cc} option to accept ANSI C" >&5
--echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
--if test "${am_cv_prog_cc_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char strerror ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
-+int
-+main ()
-+{
-+strerror ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_search_strerror="-l$ac_lib"
-+break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+  done
-+fi
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6
-+if test "$ac_cv_search_strerror" != no; then
-+  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
-+
-+fi
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
-+if test "${am_cv_prog_cc_stdc+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   am_cv_prog_cc_stdc=no
- ac_save_CC="$CC"
-@@ -1990,7 +2372,7 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1993 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -2021,6 +2403,12 @@
- int argc;
- char **argv;
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2032,16 +2420,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2035: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2038: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2041: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2044: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_prog_cc_stdc="$ac_arg"; break
- else
-@@ -2055,10 +2443,10 @@
- fi
- 
- if test -z "$am_cv_prog_cc_stdc"; then
--  echo "$as_me:2058: result: none needed" >&5
-+  echo "$as_me:$LINENO: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6
- else
--  echo "$as_me:2061: result: $am_cv_prog_cc_stdc" >&5
-+  echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
- echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
- fi
- case "x$am_cv_prog_cc_stdc" in
-@@ -2066,6 +2454,192 @@
-   *) CC="$CC $am_cv_prog_cc_stdc" ;;
- esac
- 
-+
-+
-+# Check whether --with-aif or --without-aif was given.
-+if test "${with_aif+set}" = set; then
-+  withval="$with_aif"
-+
-+fi;
-+
-+# Check whether --with-aif-lib or --without-aif-lib was given.
-+if test "${with_aif_lib+set}" = set; then
-+  withval="$with_aif_lib"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { { echo "$as_me:$LINENO: error: No argument for --with-aif-lib" >&5
-+echo "$as_me: error: No argument for --with-aif-lib" >&2;}
-+   { (exit 1); exit 1; }; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi;
-+
-+# Check whether --with-aif-include or --without-aif-include was given.
-+if test "${with_aif_include+set}" = set; then
-+  withval="$with_aif_include"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { { echo "$as_me:$LINENO: error: No argument for --with-aif-include" >&5
-+echo "$as_me: error: No argument for --with-aif-include" >&2;}
-+   { (exit 1); exit 1; }; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi;
-+
-+echo "$as_me:$LINENO: checking for aif" >&5
-+echo $ECHO_N "checking for aif... $ECHO_C" >&6
-+
-+case "$with_aif" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_aif_include" = ""; then
-+		with_aif_include="$with_aif/include"
-+	fi
-+	if test "$with_aif_lib" = ""; then
-+		with_aif_lib="$with_aif/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='/usr/local'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_aif_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_aif_include $header_dirs";;
-+esac
-+case "$with_aif_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_aif_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ires=$i;break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i -laif $save_LIBS"
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  lres=$i;break
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_aif" != "no"; then
-+	aif_includedir="$ires"
-+	aif_libdir="$lres"
-+	DIR_aif=
-+	INCLUDE_aif="-I$aif_includedir"
-+	LIB_aif="-L$aif_libdir -laif"
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_AIF 1
-+_ACEOF
-+
-+	with_aif=yes
-+	echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
-+echo "${ECHO_T}headers $ires, libraries $lres" >&6
-+else
-+	DIR_aif="aif"
-+	INCLUDE_aif=
-+	LIB_aif=
-+	with_aif=no
-+	echo "$as_me:$LINENO: result: $with_aif" >&5
-+echo "${ECHO_T}$with_aif" >&6
-+fi
-+
-+
-+
-+
-+if test "$with_aif" = "no"; then
-+        { { echo "$as_me:$LINENO: error: You must have libaif to compile this version of GDB." >&5
-+echo "$as_me: error: You must have libaif to compile this version of GDB." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_AIF 1
-+_ACEOF
-+
- ac_aux_dir=
- for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
-   if test -f $ac_dir/install-sh; then
-@@ -2083,7 +2657,7 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:2086: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/.. $srcdir/\`cd $srcdir;pwd\`/.." >&5
-+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/.. $srcdir/\`cd $srcdir;pwd\`/.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/.. $srcdir/\`cd $srcdir;pwd\`/.." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -2093,11 +2667,11 @@
- 
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:2096: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:2100: checking build system type" >&5
-+echo "$as_me:$LINENO: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2106,23 +2680,24 @@
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:2109: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:2113: error: $ac_config_sub $ac_cv_build_alias failed." >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:2118: result: $ac_cv_build" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:2125: checking host system type" >&5
-+
-+echo "$as_me:$LINENO: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2131,19 +2706,20 @@
- test -z "$ac_cv_host_alias" &&
-   ac_cv_host_alias=$ac_cv_build_alias
- ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:2134: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:2139: result: $ac_cv_host" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
- host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:2146: checking target system type" >&5
-+
-+echo "$as_me:$LINENO: checking target system type" >&5
- echo $ECHO_N "checking target system type... $ECHO_C" >&6
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2152,18 +2728,19 @@
- test "x$ac_cv_target_alias" = "x" &&
-   ac_cv_target_alias=$ac_cv_host_alias
- ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:2155: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:2160: result: $ac_cv_target" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_target" >&5
- echo "${ECHO_T}$ac_cv_target" >&6
- target=$ac_cv_target
- target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
-+
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
- test -n "$target_alias" &&
-@@ -2172,16 +2749,16 @@
-   program_prefix=${target_alias}-
- 
- ALL_LINGUAS=
--echo "$as_me:2175: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
- echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
- if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.make <<\EOF
-+  cat >conftest.make <<\_ACEOF
- all:
- 	@echo 'ac_maketemp="${MAKE}"'
--EOF
-+_ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
- if test -n "$ac_maketemp"; then
-@@ -2192,11 +2769,11 @@
- rm -f conftest.make
- fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:2195: result: yes" >&5
-+  echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   SET_MAKE=
- else
--  echo "$as_me:2199: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -2204,7 +2781,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:2207: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2212,25 +2789,28 @@
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:2222: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:2230: result: $RANLIB" >&5
-+  echo "$as_me:$LINENO: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:2233: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2239,7 +2819,7 @@
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:2242: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2247,15 +2827,18 @@
-   if test -n "$ac_ct_RANLIB"; then
-   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:2257: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
-   test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-@@ -2263,10 +2846,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:2266: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:2269: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2275,13 +2858,13 @@
-   RANLIB="$ac_cv_prog_RANLIB"
- fi
- 
--echo "$as_me:2278: checking for ANSI C header files" >&5
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2284 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -2289,13 +2872,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:2292: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2298: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2317,7 +2900,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2320 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -2335,7 +2918,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2338 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -2356,7 +2939,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2359 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -2382,38 +2965,39 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:2385: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:2388: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:2390: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2393: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_header_stdc=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
--echo "$as_me:2406: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define STDC_HEADERS 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:2416: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2421,7 +3005,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 2424 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -2451,6 +3035,12 @@
- int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
- int argc;
- char **argv;
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2470,16 +3060,16 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2473: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2476: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2479: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2482: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -2496,23 +3086,29 @@
- 
- case "x$ac_cv_prog_cc_stdc" in
-   x|xno)
--    echo "$as_me:2499: result: none needed" >&5
-+    echo "$as_me:$LINENO: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6 ;;
-   *)
--    echo "$as_me:2502: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-     CC="$CC $ac_cv_prog_cc_stdc" ;;
- esac
- 
--echo "$as_me:2507: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2513 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2568,16 +3164,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2571: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2574: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2577: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2580: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -2587,17 +3183,17 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:2590: result: $ac_cv_c_const" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define const
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:2600: checking for inline" >&5
-+echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2605,7 +3201,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2608 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -2614,16 +3210,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2617: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2620: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2623: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2626: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -2634,49 +3230,58 @@
- done
- 
- fi
--echo "$as_me:2637: result: $ac_cv_c_inline" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-   no)
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define inline
--EOF
-+_ACEOF
-  ;;
--  *)  cat >>confdefs.h <<EOF
-+  *)  cat >>confdefs.h <<_ACEOF
- #define inline $ac_cv_c_inline
--EOF
-+_ACEOF
-  ;;
- esac
- 
- # On IRIX 5.3, sys/types and inttypes.h are conflicting.
- 
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:2658: checking for $ac_header" >&5
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2664 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2670: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2673: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2676: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2679: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -2686,25 +3291,33 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:2689: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
-+
- done
- 
--echo "$as_me:2699: checking for off_t" >&5
-+
-+echo "$as_me:$LINENO: checking for off_t" >&5
- echo $ECHO_N "checking for off_t... $ECHO_C" >&6
- if test "${ac_cv_type_off_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2705 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2717,16 +3330,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2720: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2723: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2726: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2729: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_off_t=yes
- else
-@@ -2736,27 +3349,33 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:2739: result: $ac_cv_type_off_t" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
- echo "${ECHO_T}$ac_cv_type_off_t" >&6
- if test $ac_cv_type_off_t = yes; then
-   :
- else
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define off_t long
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:2751: checking for size_t" >&5
-+echo "$as_me:$LINENO: checking for size_t" >&5
- echo $ECHO_N "checking for size_t... $ECHO_C" >&6
- if test "${ac_cv_type_size_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2757 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2769,16 +3388,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2772: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2775: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2778: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2781: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_size_t=yes
- else
-@@ -2788,29 +3407,35 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:2791: result: $ac_cv_type_size_t" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
- echo "${ECHO_T}$ac_cv_type_size_t" >&6
- if test $ac_cv_type_size_t = yes; then
-   :
- else
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define size_t unsigned
--EOF
-+_ACEOF
- 
- fi
- 
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
--echo "$as_me:2805: checking for working alloca.h" >&5
-+echo "$as_me:$LINENO: checking for working alloca.h" >&5
- echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
- if test "${ac_cv_working_alloca_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2811 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <alloca.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2820,16 +3445,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:2823: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:2826: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:2829: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2832: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_working_alloca_h=yes
- else
-@@ -2839,23 +3464,23 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:2842: result: $ac_cv_working_alloca_h" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
- echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
- if test $ac_cv_working_alloca_h = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_ALLOCA_H 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:2852: checking for alloca" >&5
-+echo "$as_me:$LINENO: checking for alloca" >&5
- echo $ECHO_N "checking for alloca... $ECHO_C" >&6
- if test "${ac_cv_func_alloca_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2858 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #ifdef __GNUC__
- # define alloca __builtin_alloca
-@@ -2878,6 +3503,12 @@
- # endif
- #endif
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2887,16 +3518,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:2890: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:2893: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:2896: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2899: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_alloca_works=yes
- else
-@@ -2906,14 +3537,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:2909: result: $ac_cv_func_alloca_works" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
- echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
- 
- if test $ac_cv_func_alloca_works = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_ALLOCA 1
--EOF
-+_ACEOF
- 
- else
-   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-@@ -2923,17 +3554,18 @@
- 
- ALLOCA=alloca.$ac_objext
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define C_ALLOCA 1
--EOF
-+_ACEOF
- 
--echo "$as_me:2930: checking whether \`alloca.c' needs Cray hooks" >&5
-+
-+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
- echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
- if test "${ac_cv_os_cray+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2936 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -2951,18 +3583,18 @@
- rm -f conftest*
- 
- fi
--echo "$as_me:2954: result: $ac_cv_os_cray" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
- echo "${ECHO_T}$ac_cv_os_cray" >&6
- if test $ac_cv_os_cray = yes; then
-   for ac_func in _getb67 GETB67 getb67; do
-     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:2959: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2965 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -2976,6 +3608,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -2993,16 +3631,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:2996: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:2999: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3002: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3005: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -3012,13 +3650,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3015: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define CRAY_STACKSEG_END $ac_func
--EOF
-+_ACEOF
- 
-     break
- fi
-@@ -3026,7 +3664,7 @@
-   done
- fi
- 
--echo "$as_me:3029: checking stack direction for C alloca" >&5
-+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
- echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
- if test "${ac_cv_c_stack_direction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3035,7 +3673,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3038 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- int
- find_stack_direction ()
-@@ -3058,55 +3696,97 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:3061: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3064: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:3066: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3069: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_stack_direction=1
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_c_stack_direction=-1
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:3081: result: $ac_cv_c_stack_direction" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
- echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define STACK_DIRECTION $ac_cv_c_stack_direction
--EOF
-+_ACEOF
-+
- 
- fi
- 
-+
-+
- for ac_header in stdlib.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:3093: checking for $ac_header" >&5
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 3099 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:3103: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:3109: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -3117,34 +3797,62 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  eval "$as_ac_Header=no"
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=$ac_header_preproc"
- fi
--echo "$as_me:3128: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
-+
- done
- 
-+
- for ac_func in getpagesize
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:3141: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3147 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -3158,6 +3866,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3175,16 +3889,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3178: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3181: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3184: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3187: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -3194,17 +3908,17 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3197: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
- 
--echo "$as_me:3207: checking for working mmap" >&5
-+echo "$as_me:$LINENO: checking for working mmap" >&5
- echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
- if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3213,9 +3927,12 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3216 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+/* malloc might have been renamed as rpl_malloc. */
-+#undef malloc
-+
- /* Thanks to Mike Haertel and Jim Avera for this test.
-    Here is a matrix of mmap possibilities:
- 	mmap private not fixed
-@@ -3231,7 +3948,7 @@
-    VM page cache was not coherent with the file system buffer cache
-    like early versions of FreeBSD and possibly contemporary NetBSD.)
-    For shared mappings, we should conversely verify that changes get
--   propogated back to all the places they're supposed to be.
-+   propagated back to all the places they're supposed to be.
- 
-    Grep wants private fixed already mapped.
-    The main things grep needs to know about mmap are:
-@@ -3340,97 +4057,183 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:3343: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3346: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:3348: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3351: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_func_mmap_fixed_mapped=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:3363: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
- echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_MMAP 1
--EOF
-+_ACEOF
- 
- fi
- rm -f conftest.mmap
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_header in argz.h limits.h locale.h nl_types.h malloc.h string.h \
- unistd.h values.h sys/param.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:3378: checking for $ac_header" >&5
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 3384 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
-+$ac_includes_default
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:3388: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-   ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:3394: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
- if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  eval "$as_ac_Header=no"
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=$ac_header_preproc"
- fi
--echo "$as_me:3413: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
-+
- done
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
- __argz_count __argz_stringify __argz_next
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:3427: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3433 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -3444,6 +4247,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3461,16 +4270,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3464: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3467: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3470: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3473: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -3480,28 +4289,29 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3483: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
- 
-+
-    if test "${ac_cv_func_stpcpy+set}" != "set"; then
- 
- for ac_func in stpcpy
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:3498: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3504 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -3515,6 +4325,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3532,16 +4348,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3535: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3538: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3541: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3544: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -3551,12 +4367,12 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3554: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
-@@ -3564,22 +4380,28 @@
-    fi
-    if test "${ac_cv_func_stpcpy}" = "yes"; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_STPCPY 1
--EOF
-+_ACEOF
- 
-    fi
- 
-    if test $ac_cv_header_locale_h = yes; then
--    echo "$as_me:3574: checking for LC_MESSAGES" >&5
-+    echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
- echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
- if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3580 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <locale.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3589,16 +4411,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3592: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3595: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3598: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3601: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_val_LC_MESSAGES=yes
- else
-@@ -3608,17 +4430,17 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3611: result: $am_cv_val_LC_MESSAGES" >&5
-+echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
- echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
-     if test $am_cv_val_LC_MESSAGES = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_LC_MESSAGES 1
--EOF
-+_ACEOF
- 
-     fi
-   fi
--   echo "$as_me:3621: checking whether NLS is requested" >&5
-+   echo "$as_me:$LINENO: checking whether NLS is requested" >&5
- echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-         # Check whether --enable-nls or --disable-nls was given.
- if test "${enable_nls+set}" = set; then
-@@ -3627,18 +4449,19 @@
- else
-   USE_NLS=yes
- fi;
--    echo "$as_me:3630: result: $USE_NLS" >&5
-+    echo "$as_me:$LINENO: result: $USE_NLS" >&5
- echo "${ECHO_T}$USE_NLS" >&6
- 
-+
-     USE_INCLUDED_LIBINTL=no
- 
-         if test "$USE_NLS" = "yes"; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define ENABLE_NLS 1
--EOF
-+_ACEOF
- 
--      echo "$as_me:3641: checking whether included gettext is requested" >&5
-+      echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
- echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
- 
- # Check whether --with-included-gettext or --without-included-gettext was given.
-@@ -3648,7 +4471,7 @@
- else
-   nls_cv_force_use_gnu_gettext=no
- fi;
--      echo "$as_me:3651: result: $nls_cv_force_use_gnu_gettext" >&5
-+      echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
- echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
- 
-       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-@@ -3657,23 +4480,61 @@
- 	nls_cv_header_libgt=
- 	CATOBJEXT=NONE
- 
--	echo "$as_me:3660: checking for libintl.h" >&5
-+	if test "${ac_cv_header_libintl_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for libintl.h" >&5
- echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
- if test "${ac_cv_header_libintl_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 3666 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking libintl.h usability" >&5
-+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <libintl.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking libintl.h presence" >&5
-+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <libintl.h>
- _ACEOF
--if { (eval echo "$as_me:3670: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:3676: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -3684,26 +4545,58 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  ac_cv_header_libintl_h=yes
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  ac_cv_header_libintl_h=no
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for libintl.h" >&5
-+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-+if test "${ac_cv_header_libintl_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_libintl_h=$ac_header_preproc
- fi
--echo "$as_me:3695: result: $ac_cv_header_libintl_h" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
- echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-+
-+fi
- if test $ac_cv_header_libintl_h = yes; then
--  echo "$as_me:3698: checking for gettext in libc" >&5
-+  echo "$as_me:$LINENO: checking for gettext in libc" >&5
- echo $ECHO_N "checking for gettext in libc... $ECHO_C" >&6
- if test "${gt_cv_func_gettext_libc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3704 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <libintl.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3713,16 +4606,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3716: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3719: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3722: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3725: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gt_cv_func_gettext_libc=yes
- else
-@@ -3732,11 +4625,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3735: result: $gt_cv_func_gettext_libc" >&5
-+echo "$as_me:$LINENO: result: $gt_cv_func_gettext_libc" >&5
- echo "${ECHO_T}$gt_cv_func_gettext_libc" >&6
- 
- 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
--	     echo "$as_me:3739: checking for bindtextdomain in -lintl" >&5
-+	     echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
- echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
- if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3744,7 +4637,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 3747 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -3754,6 +4647,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char bindtextdomain ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3763,16 +4662,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3766: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3769: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3772: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3775: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_intl_bindtextdomain=yes
- else
-@@ -3783,18 +4682,24 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:3786: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
- echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
- if test $ac_cv_lib_intl_bindtextdomain = yes; then
--  echo "$as_me:3789: checking for gettext in libintl" >&5
-+  echo "$as_me:$LINENO: checking for gettext in libintl" >&5
- echo $ECHO_N "checking for gettext in libintl... $ECHO_C" >&6
- if test "${gt_cv_func_gettext_libintl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3795 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3804,16 +4709,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3807: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3810: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3813: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3816: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gt_cv_func_gettext_libintl=yes
- else
-@@ -3823,7 +4728,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3826: result: $gt_cv_func_gettext_libintl" >&5
-+echo "$as_me:$LINENO: result: $gt_cv_func_gettext_libintl" >&5
- echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6
- fi
- 
-@@ -3832,13 +4737,13 @@
- 	   if test "$gt_cv_func_gettext_libc" = "yes" \
- 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_GETTEXT 1
--EOF
-+_ACEOF
- 
- 	      # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:3841: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_MSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3865,10 +4770,10 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test -n "$MSGFMT"; then
--  echo "$as_me:3868: result: $MSGFMT" >&5
-+  echo "$as_me:$LINENO: result: $MSGFMT" >&5
- echo "${ECHO_T}$MSGFMT" >&6
- else
--  echo "$as_me:3871: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 	      if test "$MSGFMT" != "no"; then
-@@ -3876,13 +4781,13 @@
- for ac_func in dcgettext
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:3879: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 3885 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -3896,6 +4801,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -3913,16 +4824,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:3916: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:3919: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:3922: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:3925: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -3932,19 +4843,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:3935: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
- 
- 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--echo "$as_me:3947: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3954,16 +4865,18 @@
-   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-   ;;
-   *)
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
--   echo "$as_me:3964: found $ac_dir/$ac_word" >&5
--   break
--fi
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
-   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -3973,16 +4886,16 @@
- GMSGFMT=$ac_cv_path_GMSGFMT
- 
- if test -n "$GMSGFMT"; then
--  echo "$as_me:3976: result: $GMSGFMT" >&5
-+  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
- echo "${ECHO_T}$GMSGFMT" >&6
- else
--  echo "$as_me:3979: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 		# Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--echo "$as_me:3985: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4009,17 +4922,23 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test -n "$XGETTEXT"; then
--  echo "$as_me:4012: result: $XGETTEXT" >&5
-+  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
- echo "${ECHO_T}$XGETTEXT" >&6
- else
--  echo "$as_me:4015: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 4020 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -4030,16 +4949,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4033: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4036: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4039: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4042: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   CATOBJEXT=.gmo
- 		   DATADIRNAME=share
-@@ -4056,6 +4975,9 @@
- 
- fi
- 
-+
-+
-+
-         if test "$CATOBJEXT" = "NONE"; then
- 	  	  	  nls_cv_use_gnu_gettext=yes
-         fi
-@@ -4065,7 +4987,7 @@
-                 INTLOBJS="\$(GETTOBJS)"
-         # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:4068: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_MSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4092,16 +5014,16 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test -n "$MSGFMT"; then
--  echo "$as_me:4095: result: $MSGFMT" >&5
-+  echo "$as_me:$LINENO: result: $MSGFMT" >&5
- echo "${ECHO_T}$MSGFMT" >&6
- else
--  echo "$as_me:4098: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-         # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--echo "$as_me:4104: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4111,16 +5033,18 @@
-   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-   ;;
-   *)
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  if $as_executable_p "$ac_dir/$ac_word"; then
--   ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
--   echo "$as_me:4121: found $ac_dir/$ac_word" >&5
--   break
--fi
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
-   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4130,16 +5054,16 @@
- GMSGFMT=$ac_cv_path_GMSGFMT
- 
- if test -n "$GMSGFMT"; then
--  echo "$as_me:4133: result: $GMSGFMT" >&5
-+  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
- echo "${ECHO_T}$GMSGFMT" >&6
- else
--  echo "$as_me:4136: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-         # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--echo "$as_me:4142: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4166,13 +5090,14 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test -n "$XGETTEXT"; then
--  echo "$as_me:4169: result: $XGETTEXT" >&5
-+  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
- echo "${ECHO_T}$XGETTEXT" >&6
- else
--  echo "$as_me:4172: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-+
- 	USE_INCLUDED_LIBINTL=yes
-         CATOBJEXT=.gmo
-         INSTOBJEXT=.mo
-@@ -4188,7 +5113,7 @@
- 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- 	  : ;
- 	else
--	  echo "$as_me:4191: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-+	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
- echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
- 	  XGETTEXT=":"
- 	fi
-@@ -4214,11 +5139,24 @@
-       POFILES="$POFILES $lang.po"
-     done
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-    if test "x$CATOBJEXT" != "x"; then
-      if test "x$ALL_LINGUAS" = "x"; then
-        LINGUAS=
-      else
--       echo "$as_me:4221: checking for catalogs to be installed" >&5
-+       echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
- echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
-        NEW_LINGUAS=
-        for lang in ${LINGUAS=$ALL_LINGUAS}; do
-@@ -4227,7 +5165,7 @@
-          esac
-        done
-        LINGUAS=$NEW_LINGUAS
--       echo "$as_me:4230: result: $LINGUAS" >&5
-+       echo "$as_me:$LINENO: result: $LINGUAS" >&5
- echo "${ECHO_T}$LINGUAS" >&6
-      fi
- 
-@@ -4243,25 +5181,64 @@
- /* The system does not provide the header <locale.h>.  Take care yourself.  */"
-    fi
- 
-+
-             if test -f $srcdir/po2tbl.sed.in; then
-       if test "$CATOBJEXT" = ".cat"; then
--	 echo "$as_me:4248: checking for linux/version.h" >&5
-+	 if test "${ac_cv_header_linux_version_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for linux/version.h" >&5
- echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6
- if test "${ac_cv_header_linux_version_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5
-+echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 4254 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking linux/version.h usability" >&5
-+echo $ECHO_N "checking linux/version.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <linux/version.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking linux/version.h presence" >&5
-+echo $ECHO_N "checking linux/version.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <linux/version.h>
- _ACEOF
--if { (eval echo "$as_me:4258: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4264: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4272,22 +5249,50 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  ac_cv_header_linux_version_h=yes
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  ac_cv_header_linux_version_h=no
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: linux/version.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: linux/version.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/version.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: linux/version.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for linux/version.h" >&5
-+echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6
-+if test "${ac_cv_header_linux_version_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_linux_version_h=$ac_header_preproc
- fi
--echo "$as_me:4283: result: $ac_cv_header_linux_version_h" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5
- echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6
-+
-+fi
- if test $ac_cv_header_linux_version_h = yes; then
-   msgformat=linux
- else
-   msgformat=xopen
- fi
- 
-+
-+
- 	          	 sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed
-       fi
-             sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-@@ -4302,10 +5307,14 @@
-      GT_YES="#YES#"
-    fi
- 
-+
-+
-    MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs"
- 
-+
-       l=
- 
-+
-             if test -f $srcdir/po/POTFILES.in; then
-       test -d po || mkdir po
-       if test "x$srcdir" != "x."; then
-@@ -4322,9 +5331,12 @@
- 	 < $srcdir/po/POTFILES.in > po/POTFILES
-    fi
- 
--cat >>confdefs.h <<\EOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define PACKAGE "gdb"
--EOF
-+_ACEOF
-+
-+
- 
- CONFIG_OBS=
- CONFIG_LIB_OBS=
-@@ -4345,7 +5357,7 @@
-   case "${enableval}" in
-     yes ) enable_multi_ice="yes" ;;
-     no)  enable_multi_ice="no" ;;
--    *) { { echo "$as_me:4348: error: Bad value for --enable-multi-ice: ${enableval}" >&5
-+    *) { { echo "$as_me:$LINENO: error: Bad value for --enable-multi-ice: ${enableval}" >&5
- echo "$as_me: error: Bad value for --enable-multi-ice: ${enableval}" >&2;}
-    { (exit 1); exit 1; }; } ;;
-   esac
-@@ -4356,10 +5368,13 @@
-   configdirs="${configdirs} multi-ice"
- fi
- 
-+
- . ${srcdir}/configure.host
- 
- . ${srcdir}/configure.tgt
- 
-+
-+
- targ=${target}
- . ${srcdir}/../bfd/config.bfd
- 
-@@ -4367,23 +5382,23 @@
- 
- if test x"${targ_archs}" != x ; then
-     targ_archs_c=`echo ${targ_archs} | sed -e 's/^  *//g' -e 's/  *$//' -e 's/  */, /g' -e 's/,.*//'`
--    cat >>confdefs.h <<EOF
-+    cat >>confdefs.h <<_ACEOF
- #define DEFAULT_BFD_ARCH ${targ_archs_c}
--EOF
-+_ACEOF
- 
- fi
- if test x"${targ_defvec}" != x ; then
--    cat >>confdefs.h <<EOF
-+    cat >>confdefs.h <<_ACEOF
- #define DEFAULT_BFD_VEC ${targ_defvec}
--EOF
-+_ACEOF
- 
- fi
- 
--for ac_prog in mawk gawk nawk awk
-+for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4386: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4391,25 +5406,28 @@
-   if test -n "$AWK"; then
-   ac_cv_prog_AWK="$AWK" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_AWK="$ac_prog"
--echo "$as_me:4401: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:4409: result: $AWK" >&5
-+  echo "$as_me:$LINENO: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:4412: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4428,43 +5446,48 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:4431: checking for a BSD compatible install" >&5
--echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--    ac_save_IFS=$IFS; IFS=$ac_path_separator
--  for ac_dir in $PATH; do
--    IFS=$ac_save_IFS
--    # Account for people who put trailing slashes in PATH elements.
--    case $ac_dir/ in
--    / | ./ | .// | /cC/* \
--    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
--    | /usr/ucb/* ) ;;
--    *)
--      # OSF1 and SCO ODT 3.0 have their own names for install.
--      # Don't use installbsd from OSF since it installs stuff as root
--      # by default.
--      for ac_prog in ginstall scoinst install; do
--        if $as_executable_p "$ac_dir/$ac_prog"; then
--	  if test $ac_prog = install &&
--            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
--	    # AIX install.  It has an incompatible calling convention.
--	    :
--	  elif test $ac_prog = install &&
--	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
--	    # program-specific install script used by HP pwplus--don't use.
--	    :
--	  else
--	    ac_cv_path_install="$ac_dir/$ac_prog -c"
--	    break 2
--	  fi
--	fi
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+  ./ | .// | /cC/* | \
-+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+  /usr/ucb/* ) ;;
-+  *)
-+    # OSF1 and SCO ODT 3.0 have their own names for install.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+          if test $ac_prog = install &&
-+            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+            # AIX install.  It has an incompatible calling convention.
-+            :
-+          elif test $ac_prog = install &&
-+            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+            # program-specific install script used by HP pwplus--don't use.
-+            :
-+          else
-+            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+            break 3
-+          fi
-+        fi
-       done
--      ;;
--    esac
--  done
-+    done
-+    ;;
-+esac
-+done
-+
- 
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-@@ -4477,7 +5500,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:4480: result: $INSTALL" >&5
-+echo "$as_me:$LINENO: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -4491,7 +5514,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:4494: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4499,25 +5522,28 @@
-   if test -n "$AR"; then
-   ac_cv_prog_AR="$AR" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:4509: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:4517: result: $AR" >&5
-+  echo "$as_me:$LINENO: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:4520: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4526,7 +5552,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:4529: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4534,25 +5560,28 @@
-   if test -n "$ac_ct_AR"; then
-   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:4544: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_AR="ar"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:4552: result: $ac_ct_AR" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:4555: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4564,7 +5593,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:4567: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4572,25 +5601,28 @@
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:4582: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:4590: result: $RANLIB" >&5
-+  echo "$as_me:$LINENO: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:4593: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4599,7 +5631,7 @@
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:4602: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4607,15 +5639,18 @@
-   if test -n "$ac_ct_RANLIB"; then
-   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:4617: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
-   test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-@@ -4623,10 +5658,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:4626: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:4629: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4638,7 +5673,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--echo "$as_me:4641: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4646,25 +5681,28 @@
-   if test -n "$DLLTOOL"; then
-   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
--echo "$as_me:4656: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
--  echo "$as_me:4664: result: $DLLTOOL" >&5
-+  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
- echo "${ECHO_T}$DLLTOOL" >&6
- else
--  echo "$as_me:4667: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4673,7 +5711,7 @@
-   ac_ct_DLLTOOL=$DLLTOOL
-   # Extract the first word of "dlltool", so it can be a program name with args.
- set dummy dlltool; ac_word=$2
--echo "$as_me:4676: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4681,25 +5719,28 @@
-   if test -n "$ac_ct_DLLTOOL"; then
-   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_DLLTOOL="dlltool"
--echo "$as_me:4691: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- if test -n "$ac_ct_DLLTOOL"; then
--  echo "$as_me:4699: result: $ac_ct_DLLTOOL" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
- echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
- else
--  echo "$as_me:4702: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4711,7 +5752,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
- set dummy ${ac_tool_prefix}windres; ac_word=$2
--echo "$as_me:4714: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_WINDRES+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4719,25 +5760,28 @@
-   if test -n "$WINDRES"; then
-   ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
--echo "$as_me:4729: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- WINDRES=$ac_cv_prog_WINDRES
- if test -n "$WINDRES"; then
--  echo "$as_me:4737: result: $WINDRES" >&5
-+  echo "$as_me:$LINENO: result: $WINDRES" >&5
- echo "${ECHO_T}$WINDRES" >&6
- else
--  echo "$as_me:4740: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4746,7 +5790,7 @@
-   ac_ct_WINDRES=$WINDRES
-   # Extract the first word of "windres", so it can be a program name with args.
- set dummy windres; ac_word=$2
--echo "$as_me:4749: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4754,25 +5798,28 @@
-   if test -n "$ac_ct_WINDRES"; then
-   ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_WINDRES="windres"
--echo "$as_me:4764: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_WINDRES="windres"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
- if test -n "$ac_ct_WINDRES"; then
--  echo "$as_me:4772: result: $ac_ct_WINDRES" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
- echo "${ECHO_T}$ac_ct_WINDRES" >&6
- else
--  echo "$as_me:4775: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4785,7 +5832,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:4788: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_YACC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4793,25 +5840,28 @@
-   if test -n "$YACC"; then
-   ac_cv_prog_YACC="$YACC" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_YACC="$ac_prog"
--echo "$as_me:4803: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_YACC="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- YACC=$ac_cv_prog_YACC
- if test -n "$YACC"; then
--  echo "$as_me:4811: result: $YACC" >&5
-+  echo "$as_me:$LINENO: result: $YACC" >&5
- echo "${ECHO_T}$YACC" >&6
- else
--  echo "$as_me:4814: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4819,10 +5869,11 @@
- done
- test -n "$YACC" || YACC="yacc"
- 
-+
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args.
- set dummy ${ac_tool_prefix}mig; ac_word=$2
--echo "$as_me:4825: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4830,25 +5881,28 @@
-   if test -n "$MIG"; then
-   ac_cv_prog_MIG="$MIG" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_MIG="${ac_tool_prefix}mig"
--echo "$as_me:4840: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_MIG="${ac_tool_prefix}mig"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- MIG=$ac_cv_prog_MIG
- if test -n "$MIG"; then
--  echo "$as_me:4848: result: $MIG" >&5
-+  echo "$as_me:$LINENO: result: $MIG" >&5
- echo "${ECHO_T}$MIG" >&6
- else
--  echo "$as_me:4851: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4857,7 +5911,7 @@
-   ac_ct_MIG=$MIG
-   # Extract the first word of "mig", so it can be a program name with args.
- set dummy mig; ac_word=$2
--echo "$as_me:4860: checking for $ac_word" >&5
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_MIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4865,25 +5919,28 @@
-   if test -n "$ac_ct_MIG"; then
-   ac_cv_prog_ac_ct_MIG="$ac_ct_MIG" # Let the user override the test.
- else
--  ac_save_IFS=$IFS; IFS=$ac_path_separator
--ac_dummy="$PATH"
--for ac_dir in $ac_dummy; do
--  IFS=$ac_save_IFS
--  test -z "$ac_dir" && ac_dir=.
--  $as_executable_p "$ac_dir/$ac_word" || continue
--ac_cv_prog_ac_ct_MIG="mig"
--echo "$as_me:4875: found $ac_dir/$ac_word" >&5
--break
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_MIG="mig"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
- done
- 
- fi
- fi
- ac_ct_MIG=$ac_cv_prog_ac_ct_MIG
- if test -n "$ac_ct_MIG"; then
--  echo "$as_me:4883: result: $ac_ct_MIG" >&5
-+  echo "$as_me:$LINENO: result: $ac_ct_MIG" >&5
- echo "${ECHO_T}$ac_ct_MIG" >&6
- else
--  echo "$as_me:4886: result: no" >&5
-+  echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -4892,6 +5949,7 @@
-   MIG="$ac_cv_prog_MIG"
- fi
- 
-+
- test "$program_prefix" != NONE &&
-   program_transform_name="s,^,$program_prefix,;$program_transform_name"
- # Use a double $ so make ignores it.
-@@ -4905,13 +5963,14 @@
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
- rm conftest.sed
- 
--echo "$as_me:4908: checking return type of signal handlers" >&5
-+
-+echo "$as_me:$LINENO: checking return type of signal handlers" >&5
- echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
- if test "${ac_cv_type_signal+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4914 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -4924,6 +5983,12 @@
- void (*signal ()) ();
- #endif
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -4933,16 +5998,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4936: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4939: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4942: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4945: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signal=void
- else
-@@ -4952,20 +6017,22 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:4955: result: $ac_cv_type_signal" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
- echo "${ECHO_T}$ac_cv_type_signal" >&6
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define RETSIGTYPE $ac_cv_type_signal
--EOF
-+_ACEOF
-+
-+
- 
--echo "$as_me:4962: checking for ANSI C header files" >&5
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4968 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -4973,13 +6040,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:4976: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4982: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5001,7 +6068,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5004 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -5019,7 +6086,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5022 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -5040,7 +6107,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5043 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -5066,44 +6133,90 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5069: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5072: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5074: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5077: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_header_stdc=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
--echo "$as_me:5090: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define STDC_HEADERS 1
--EOF
-+_ACEOF
- 
- fi
- 
-+
-+
- case $host_os in solaris2.7 | solaris2.8) case "$GCC" in yes)
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define _MSE_INT_H 1
--EOF
-+_ACEOF
- 
- esac; esac
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_header in ctype.h nlist.h link.h thread_db.h proc_service.h \
- 	memory.h objlist.h ptrace.h sgtty.h stddef.h stdlib.h \
- 	string.h sys/procfs.h sys/proc.h sys/ptrace.h sys/reg.h stdint.h \
-@@ -5115,23 +6228,61 @@
- 	poll.h sys/poll.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:5118: checking for $ac_header" >&5
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 5124 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:5128: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:5134: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5142,31 +6293,58 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  eval "$as_ac_Header=no"
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=$ac_header_preproc"
- fi
--echo "$as_me:5153: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
-+
- done
- 
--echo "$as_me:5163: checking whether stat file-mode macros are broken" >&5
-+echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
- echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
- if test "${ac_cv_header_stat_broken+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5169 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -5205,25 +6383,32 @@
- rm -f conftest*
- 
- fi
--echo "$as_me:5208: result: $ac_cv_header_stat_broken" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
- echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
- if test $ac_cv_header_stat_broken = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define STAT_MACROS_BROKEN 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:5218: checking for an ANSI C-conforming const" >&5
-+
-+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5224 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -5279,16 +6464,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5282: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5285: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5288: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5291: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -5298,17 +6483,17 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:5301: result: $ac_cv_c_const" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define const
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:5311: checking for inline" >&5
-+echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5316,7 +6501,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5319 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -5325,16 +6510,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5328: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5331: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5334: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5337: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -5345,32 +6530,46 @@
- done
- 
- fi
--echo "$as_me:5348: result: $ac_cv_c_inline" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-   no)
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define inline
--EOF
-+_ACEOF
-  ;;
--  *)  cat >>confdefs.h <<EOF
-+  *)  cat >>confdefs.h <<_ACEOF
- #define inline $ac_cv_c_inline
--EOF
-+_ACEOF
-  ;;
- esac
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_func in bcopy btowc bzero canonicalize_file_name isascii poll \
- 	realpath sbrk setpgid setpgrp sigaction sigprocmask sigsetmask
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:5367: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5373 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -5384,6 +6583,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -5401,16 +6606,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5404: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5407: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5410: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5413: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -5420,27 +6625,33 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5423: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
- 
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
--echo "$as_me:5435: checking for working alloca.h" >&5
-+echo "$as_me:$LINENO: checking for working alloca.h" >&5
- echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
- if test "${ac_cv_working_alloca_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5441 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <alloca.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -5450,16 +6661,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5453: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5456: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5459: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5462: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_working_alloca_h=yes
- else
-@@ -5469,23 +6680,23 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5472: result: $ac_cv_working_alloca_h" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
- echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
- if test $ac_cv_working_alloca_h = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_ALLOCA_H 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:5482: checking for alloca" >&5
-+echo "$as_me:$LINENO: checking for alloca" >&5
- echo $ECHO_N "checking for alloca... $ECHO_C" >&6
- if test "${ac_cv_func_alloca_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5488 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #ifdef __GNUC__
- # define alloca __builtin_alloca
-@@ -5508,6 +6719,12 @@
- # endif
- #endif
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -5517,16 +6734,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5520: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5523: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5526: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5529: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_alloca_works=yes
- else
-@@ -5536,14 +6753,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5539: result: $ac_cv_func_alloca_works" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
- echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
- 
- if test $ac_cv_func_alloca_works = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_ALLOCA 1
--EOF
-+_ACEOF
- 
- else
-   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-@@ -5553,17 +6770,18 @@
- 
- ALLOCA=alloca.$ac_objext
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define C_ALLOCA 1
--EOF
-+_ACEOF
- 
--echo "$as_me:5560: checking whether \`alloca.c' needs Cray hooks" >&5
-+
-+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
- echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
- if test "${ac_cv_os_cray+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5566 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -5581,18 +6799,18 @@
- rm -f conftest*
- 
- fi
--echo "$as_me:5584: result: $ac_cv_os_cray" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
- echo "${ECHO_T}$ac_cv_os_cray" >&6
- if test $ac_cv_os_cray = yes; then
-   for ac_func in _getb67 GETB67 getb67; do
-     as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:5589: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5595 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -5606,6 +6824,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -5623,16 +6847,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5626: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5629: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5632: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5635: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -5642,13 +6866,13 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5645: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define CRAY_STACKSEG_END $ac_func
--EOF
-+_ACEOF
- 
-     break
- fi
-@@ -5656,7 +6880,7 @@
-   done
- fi
- 
--echo "$as_me:5659: checking stack direction for C alloca" >&5
-+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
- echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
- if test "${ac_cv_c_stack_direction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5665,7 +6889,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5668 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- int
- find_stack_direction ()
-@@ -5688,44 +6912,52 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5691: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5694: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5696: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5699: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_stack_direction=1
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_c_stack_direction=-1
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:5711: result: $ac_cv_c_stack_direction" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
- echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define STACK_DIRECTION $ac_cv_c_stack_direction
--EOF
-+_ACEOF
-+
- 
- fi
- 
--echo "$as_me:5720: checking for pid_t" >&5
-+echo "$as_me:$LINENO: checking for pid_t" >&5
- echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
- if test "${ac_cv_type_pid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5726 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -5738,16 +6970,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:5741: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:5744: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:5747: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5750: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_pid_t=yes
- else
-@@ -5757,38 +6989,78 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:5760: result: $ac_cv_type_pid_t" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
- echo "${ECHO_T}$ac_cv_type_pid_t" >&6
- if test $ac_cv_type_pid_t = yes; then
-   :
- else
- 
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define pid_t int
--EOF
-+_ACEOF
- 
- fi
- 
-+
-+
- for ac_header in unistd.h vfork.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:5775: checking for $ac_header" >&5
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 5781 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:5785: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:5791: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -5799,34 +7071,63 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  eval "$as_ac_Header=no"
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=$ac_header_preproc"
- fi
--echo "$as_me:5810: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
-+
- done
- 
-+
-+
- for ac_func in fork vfork
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:5823: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5829 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -5840,6 +7141,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -5857,16 +7164,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5860: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5863: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5866: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5869: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -5876,19 +7183,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5879: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
- 
- ac_cv_func_fork_works=$ac_cv_func_fork
- if test "x$ac_cv_func_fork" = xyes; then
--  echo "$as_me:5891: checking for working fork" >&5
-+  echo "$as_me:$LINENO: checking for working fork" >&5
- echo $ECHO_N "checking for working fork... $ECHO_C" >&6
- if test "${ac_cv_func_fork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5897,7 +7204,7 @@
-   ac_cv_func_fork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--/* By Rüdiger Kuhlmann. */
-+/* By Ruediger Kuhlmann. */
-       #include <sys/types.h>
-       #if HAVE_UNISTD_H
-       # include <unistd.h>
-@@ -5911,27 +7218,28 @@
-       }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5914: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5917: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5919: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5922: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fork_works=yes
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_func_fork_works=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:5934: result: $ac_cv_func_fork_works" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
- echo "${ECHO_T}$ac_cv_func_fork_works" >&6
- 
- fi
-@@ -5945,12 +7253,12 @@
-       ac_cv_func_fork_works=yes
-       ;;
-   esac
--  { echo "$as_me:5948: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
--echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
-+  { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-+echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
- fi
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- if test "x$ac_cv_func_vfork" = xyes; then
--  echo "$as_me:5953: checking for working vfork" >&5
-+  echo "$as_me:$LINENO: checking for working vfork" >&5
- echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
- if test "${ac_cv_func_vfork_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5959,7 +7267,7 @@
-   ac_cv_func_vfork_works=cross
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5962 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -6056,128 +7364,143 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6059: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6062: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6064: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6067: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_vfork_works=yes
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_func_vfork_works=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:6079: result: $ac_cv_func_vfork_works" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
- echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
- 
- fi;
- if test "x$ac_cv_func_fork_works" = xcross; then
-   ac_cv_func_vfork_works=ac_cv_func_vfork
--  { echo "$as_me:6085: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
--echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
-+  { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-+echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
- fi
- 
- if test "x$ac_cv_func_vfork_works" = xyes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_WORKING_VFORK 1
--EOF
-+_ACEOF
- 
- else
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define vfork fork
--EOF
-+_ACEOF
- 
- fi
- if test "x$ac_cv_func_fork_works" = xyes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_WORKING_FORK 1
--EOF
-+_ACEOF
- 
- fi
- 
- if test "$cross_compiling" = no; then
--  echo "$as_me:6111: checking whether setpgrp takes no argument" >&5
-+  echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
- echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
- if test "${ac_cv_func_setpgrp_void+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:6117: error: cannot check setpgrp if cross compiling" >&5
--echo "$as_me: error: cannot check setpgrp if cross compiling" >&2;}
-+  { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
-+echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6122 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
--/* If this system has a BSD-style setpgrp, which takes arguments, exit
--   successfully.  */
--  exit (setpgrp (1,1) == -1);
-+/* If this system has a BSD-style setpgrp which takes arguments,
-+  setpgrp(1, 1) will fail with ESRCH and return -1, in that case
-+  exit successfully. */
-+  exit (setpgrp (1,1) == -1 ? 0 : 1);
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:6139: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6142: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:6144: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6147: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setpgrp_void=no
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_func_setpgrp_void=yes
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:6159: result: $ac_cv_func_setpgrp_void" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
- echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
- if test $ac_cv_func_setpgrp_void = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define SETPGRP_VOID 1
--EOF
-+_ACEOF
- 
- fi
- 
- else
--  echo "$as_me:6170: checking whether setpgrp takes no argument" >&5
-+  echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
- echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
- if test "${ac_cv_func_setpgrp_void+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6176 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <unistd.h>
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6192,16 +7515,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6195: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6198: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6201: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6204: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setpgrp_void=no
- else
-@@ -6211,29 +7534,35 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:6214: result: $ac_cv_func_setpgrp_void" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
- echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
- if test $ac_cv_func_setpgrp_void = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define SETPGRP_VOID 1
--EOF
-+_ACEOF
- 
- fi
- fi
- 
- # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do
- # since sigsetjmp might only be defined as a macro.
--echo "$as_me:6226: checking for sigsetjmp" >&5
-+echo "$as_me:$LINENO: checking for sigsetjmp" >&5
- echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6
- if test "${gdb_cv_func_sigsetjmp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6232 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <setjmp.h>
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6243,16 +7572,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6246: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6249: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6252: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6255: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_func_sigsetjmp=yes
- else
-@@ -6262,27 +7591,33 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:6265: result: $gdb_cv_func_sigsetjmp" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_func_sigsetjmp" >&5
- echo "${ECHO_T}$gdb_cv_func_sigsetjmp" >&6
- if test $gdb_cv_func_sigsetjmp = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_SIGSETJMP 1
--EOF
-+_ACEOF
- 
- fi
- 
- # See if <machine/reg.h> supports the %fs and %gs i386 segment registers.
- # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'.
--echo "$as_me:6277: checking for r_fs in struct reg" >&5
-+echo "$as_me:$LINENO: checking for r_fs in struct reg" >&5
- echo $ECHO_N "checking for r_fs in struct reg... $ECHO_C" >&6
- if test "${gdb_cv_struct_reg_r_fs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6283 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <machine/reg.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6292,16 +7627,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6295: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6298: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6301: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6304: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_struct_reg_r_fs=yes
- else
-@@ -6311,23 +7646,29 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:6314: result: $gdb_cv_struct_reg_r_fs" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_struct_reg_r_fs" >&5
- echo "${ECHO_T}$gdb_cv_struct_reg_r_fs" >&6
- if test $gdb_cv_struct_reg_r_fs = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_REG_R_FS 1
--EOF
-+_ACEOF
- 
- fi
--echo "$as_me:6322: checking for r_gs in struct reg" >&5
-+echo "$as_me:$LINENO: checking for r_gs in struct reg" >&5
- echo $ECHO_N "checking for r_gs in struct reg... $ECHO_C" >&6
- if test "${gdb_cv_struct_reg_r_gs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6328 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <machine/reg.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6337,16 +7678,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6340: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6343: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6346: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6349: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_struct_reg_r_gs=yes
- else
-@@ -6356,25 +7697,31 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:6359: result: $gdb_cv_struct_reg_r_gs" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_struct_reg_r_gs" >&5
- echo "${ECHO_T}$gdb_cv_struct_reg_r_gs" >&6
- if test $gdb_cv_struct_reg_r_gs = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_REG_R_GS 1
--EOF
-+_ACEOF
- 
- fi
- 
- # See if <sys/ptrace.h> provides the PTRACE_GETREGS request.
--echo "$as_me:6369: checking for PTRACE_GETREGS" >&5
-+echo "$as_me:$LINENO: checking for PTRACE_GETREGS" >&5
- echo $ECHO_N "checking for PTRACE_GETREGS... $ECHO_C" >&6
- if test "${gdb_cv_have_ptrace_getregs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6375 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6384,16 +7731,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6387: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6390: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6393: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6396: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_ptrace_getregs=yes
- else
-@@ -6404,25 +7751,31 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6407: result: $gdb_cv_have_ptrace_getregs" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_have_ptrace_getregs" >&5
- echo "${ECHO_T}$gdb_cv_have_ptrace_getregs" >&6
- if test $gdb_cv_have_ptrace_getregs = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_PTRACE_GETREGS 1
--EOF
-+_ACEOF
- 
- fi
- 
- # See if <sys/ptrace.h> provides the PTRACE_GETFPXREGS request.
--echo "$as_me:6417: checking for PTRACE_GETFPXREGS" >&5
-+echo "$as_me:$LINENO: checking for PTRACE_GETFPXREGS" >&5
- echo $ECHO_N "checking for PTRACE_GETFPXREGS... $ECHO_C" >&6
- if test "${gdb_cv_have_ptrace_getfpxregs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6423 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6432,16 +7785,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6435: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6438: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6441: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6444: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_ptrace_getfpxregs=yes
- else
-@@ -6452,26 +7805,32 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6455: result: $gdb_cv_have_ptrace_getfpxregs" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_have_ptrace_getfpxregs" >&5
- echo "${ECHO_T}$gdb_cv_have_ptrace_getfpxregs" >&6
- if test $gdb_cv_have_ptrace_getfpxregs = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_PTRACE_GETFPXREGS 1
--EOF
-+_ACEOF
- 
- fi
- 
- # See if <sys/ptrace.h> provides the PT_GETDBREGS request.
--echo "$as_me:6465: checking for PT_GETDBREGS" >&5
-+echo "$as_me:$LINENO: checking for PT_GETDBREGS" >&5
- echo $ECHO_N "checking for PT_GETDBREGS... $ECHO_C" >&6
- if test "${gdb_cv_have_pt_getdbregs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6471 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/ptrace.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6481,16 +7840,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6484: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6487: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6490: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6493: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_pt_getdbregs=yes
- else
-@@ -6501,26 +7860,32 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6504: result: $gdb_cv_have_pt_getdbregs" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_have_pt_getdbregs" >&5
- echo "${ECHO_T}$gdb_cv_have_pt_getdbregs" >&6
- if test $gdb_cv_have_pt_getdbregs = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_PT_GETDBREGS 1
--EOF
-+_ACEOF
- 
- fi
- 
- # See if <sys/ptrace.h> provides the PT_GETXMMREGS request.
--echo "$as_me:6514: checking for PT_GETXMMREGS" >&5
-+echo "$as_me:$LINENO: checking for PT_GETXMMREGS" >&5
- echo $ECHO_N "checking for PT_GETXMMREGS... $ECHO_C" >&6
- if test "${gdb_cv_have_pt_getxmmregs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6520 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/ptrace.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6530,16 +7895,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6533: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6536: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6539: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6542: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_pt_getxmmregs=yes
- else
-@@ -6550,16 +7915,18 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6553: result: $gdb_cv_have_pt_getxmmregs" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_have_pt_getxmmregs" >&5
- echo "${ECHO_T}$gdb_cv_have_pt_getxmmregs" >&6
- if test $gdb_cv_have_pt_getxmmregs = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_PT_GETXMMREGS 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:6562: checking for socketpair in -lsocket" >&5
-+
-+
-+echo "$as_me:$LINENO: checking for socketpair in -lsocket" >&5
- echo $ECHO_N "checking for socketpair in -lsocket... $ECHO_C" >&6
- if test "${ac_cv_lib_socket_socketpair+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6567,7 +7934,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6570 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -6577,6 +7944,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char socketpair ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6586,16 +7959,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6589: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6592: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6595: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6598: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_socket_socketpair=yes
- else
-@@ -6606,27 +7979,28 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:6609: result: $ac_cv_lib_socket_socketpair" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socketpair" >&5
- echo "${ECHO_T}$ac_cv_lib_socket_socketpair" >&6
- if test $ac_cv_lib_socket_socketpair = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSOCKET 1
--EOF
-+_ACEOF
- 
-   LIBS="-lsocket $LIBS"
- 
- fi
- 
-+
- for ac_func in socketpair
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:6623: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6629 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -6640,6 +8014,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6657,16 +8037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6660: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6663: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6666: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6669: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -6676,23 +8056,25 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:6679: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
- 
--echo "$as_me:6689: checking whether malloc must be declared" >&5
-+
-+
-+echo "$as_me:$LINENO: checking whether malloc must be declared" >&5
- echo $ECHO_N "checking whether malloc must be declared... $ECHO_C" >&6
- if test "${bfd_cv_decl_needed_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6695 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -6709,6 +8091,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6718,16 +8106,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6721: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6724: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6727: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6730: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_decl_needed_malloc=no
- else
-@@ -6738,23 +8126,23 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6741: result: $bfd_cv_decl_needed_malloc" >&5
-+echo "$as_me:$LINENO: result: $bfd_cv_decl_needed_malloc" >&5
- echo "${ECHO_T}$bfd_cv_decl_needed_malloc" >&6
- if test $bfd_cv_decl_needed_malloc = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_DECLARATION_MALLOC 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:6751: checking whether realloc must be declared" >&5
-+echo "$as_me:$LINENO: checking whether realloc must be declared" >&5
- echo $ECHO_N "checking whether realloc must be declared... $ECHO_C" >&6
- if test "${bfd_cv_decl_needed_realloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6757 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -6771,6 +8159,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6780,16 +8174,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6783: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6786: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6789: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6792: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_decl_needed_realloc=no
- else
-@@ -6800,23 +8194,23 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6803: result: $bfd_cv_decl_needed_realloc" >&5
-+echo "$as_me:$LINENO: result: $bfd_cv_decl_needed_realloc" >&5
- echo "${ECHO_T}$bfd_cv_decl_needed_realloc" >&6
- if test $bfd_cv_decl_needed_realloc = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_DECLARATION_REALLOC 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:6813: checking whether free must be declared" >&5
-+echo "$as_me:$LINENO: checking whether free must be declared" >&5
- echo $ECHO_N "checking whether free must be declared... $ECHO_C" >&6
- if test "${bfd_cv_decl_needed_free+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6819 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -6833,6 +8227,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6842,16 +8242,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6845: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6848: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6851: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6854: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_decl_needed_free=no
- else
-@@ -6862,23 +8262,23 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6865: result: $bfd_cv_decl_needed_free" >&5
-+echo "$as_me:$LINENO: result: $bfd_cv_decl_needed_free" >&5
- echo "${ECHO_T}$bfd_cv_decl_needed_free" >&6
- if test $bfd_cv_decl_needed_free = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_DECLARATION_FREE 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:6875: checking whether strerror must be declared" >&5
-+echo "$as_me:$LINENO: checking whether strerror must be declared" >&5
- echo $ECHO_N "checking whether strerror must be declared... $ECHO_C" >&6
- if test "${bfd_cv_decl_needed_strerror+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6881 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -6895,6 +8295,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6904,16 +8310,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6907: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6910: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6913: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6916: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_decl_needed_strerror=no
- else
-@@ -6924,23 +8330,23 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6927: result: $bfd_cv_decl_needed_strerror" >&5
-+echo "$as_me:$LINENO: result: $bfd_cv_decl_needed_strerror" >&5
- echo "${ECHO_T}$bfd_cv_decl_needed_strerror" >&6
- if test $bfd_cv_decl_needed_strerror = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_DECLARATION_STRERROR 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:6937: checking whether strdup must be declared" >&5
-+echo "$as_me:$LINENO: checking whether strdup must be declared" >&5
- echo $ECHO_N "checking whether strdup must be declared... $ECHO_C" >&6
- if test "${bfd_cv_decl_needed_strdup+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6943 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -6957,6 +8363,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -6966,16 +8378,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6969: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6972: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6975: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6978: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_decl_needed_strdup=no
- else
-@@ -6986,23 +8398,23 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:6989: result: $bfd_cv_decl_needed_strdup" >&5
-+echo "$as_me:$LINENO: result: $bfd_cv_decl_needed_strdup" >&5
- echo "${ECHO_T}$bfd_cv_decl_needed_strdup" >&6
- if test $bfd_cv_decl_needed_strdup = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_DECLARATION_STRDUP 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:6999: checking whether strstr must be declared" >&5
-+echo "$as_me:$LINENO: checking whether strstr must be declared" >&5
- echo $ECHO_N "checking whether strstr must be declared... $ECHO_C" >&6
- if test "${bfd_cv_decl_needed_strstr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7005 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -7019,6 +8431,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7028,16 +8446,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7031: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7034: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7037: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7040: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_decl_needed_strstr=no
- else
-@@ -7048,23 +8466,23 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:7051: result: $bfd_cv_decl_needed_strstr" >&5
-+echo "$as_me:$LINENO: result: $bfd_cv_decl_needed_strstr" >&5
- echo "${ECHO_T}$bfd_cv_decl_needed_strstr" >&6
- if test $bfd_cv_decl_needed_strstr = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_DECLARATION_STRSTR 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:7061: checking whether canonicalize_file_name must be declared" >&5
-+echo "$as_me:$LINENO: checking whether canonicalize_file_name must be declared" >&5
- echo $ECHO_N "checking whether canonicalize_file_name must be declared... $ECHO_C" >&6
- if test "${bfd_cv_decl_needed_canonicalize_file_name+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7067 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -7081,6 +8499,12 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7090,16 +8514,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7093: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7096: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7099: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7102: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_decl_needed_canonicalize_file_name=no
- else
-@@ -7110,24 +8534,25 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:7113: result: $bfd_cv_decl_needed_canonicalize_file_name" >&5
-+echo "$as_me:$LINENO: result: $bfd_cv_decl_needed_canonicalize_file_name" >&5
- echo "${ECHO_T}$bfd_cv_decl_needed_canonicalize_file_name" >&6
- if test $bfd_cv_decl_needed_canonicalize_file_name = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1
--EOF
-+_ACEOF
- 
- fi
- 
-+
- # The following save_state_t checkery is only necessary for HPUX
- # versions earlier than 10.20.  When those fade from memory, this
- # could be expunged. --jsm 1999-03-22
- 
--echo "$as_me:7127: checking for HPUX save_state structure" >&5
-+echo "$as_me:$LINENO: checking for HPUX save_state structure" >&5
- echo $ECHO_N "checking for HPUX save_state structure... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 7130 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- 
-@@ -7141,7 +8566,7 @@
- rm -f conftest*
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7144 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- 
-@@ -7156,21 +8581,22 @@
- 
- if test $gdb_cv_hpux_savestate = yes
- then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_SAVE_STATE_T 1
--EOF
-+_ACEOF
- 
- fi
- if test $gdb_cv_hpux_sswide = yes
- then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_MEMBER_SS_WIDE 1
--EOF
-+_ACEOF
- 
- fi
--echo "$as_me:7171: result: $gdb_cv_hpux_sswide" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_hpux_sswide" >&5
- echo "${ECHO_T}$gdb_cv_hpux_sswide" >&6
- 
-+
- # If we are configured native on GNU/Linux, work around problems with
- # sys/procfs.h
- # Also detect which type of /proc is in use, such as for Unixware or Solaris.
-@@ -7178,48 +8604,54 @@
- if test "${target}" = "${host}"; then
-   case "${host}" in
-   i[3456]86-*-linux*)
--	cat >>confdefs.h <<\EOF
-+	cat >>confdefs.h <<\_ACEOF
- #define START_INFERIOR_TRAPS_EXPECTED 2
--EOF
-+_ACEOF
- 
--	cat >>confdefs.h <<\EOF
-+	cat >>confdefs.h <<\_ACEOF
- #define sys_quotactl 1
--EOF
-+_ACEOF
- 
- 	;;
-   ia64-*-aix*)
--      cat >>confdefs.h <<\EOF
-+      cat >>confdefs.h <<\_ACEOF
- #define NEW_PROC_API 1
--EOF
-+_ACEOF
- 
-       ;;
-   *-*-unixware* | *-*-sysv4.2* | *-*-sysv5*)
--      cat >>confdefs.h <<\EOF
-+      cat >>confdefs.h <<\_ACEOF
- #define NEW_PROC_API 1
--EOF
-+_ACEOF
- 
-       ;;
-   *-*-solaris2.[678])
--      cat >>confdefs.h <<\EOF
-+      cat >>confdefs.h <<\_ACEOF
- #define NEW_PROC_API 1
--EOF
-+_ACEOF
- 
-       ;;
-   esac
- fi
- 
- if test "$ac_cv_header_sys_procfs_h" = yes; then
--  echo "$as_me:7212: checking for pstatus_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for pstatus_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for pstatus_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_pstatus_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7218 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7229,16 +8661,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7232: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7235: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7238: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7241: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_pstatus_t=yes
- else
-@@ -7252,25 +8684,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_pstatus_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PSTATUS_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7260: result: $bfd_cv_have_sys_procfs_type_pstatus_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_pstatus_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_pstatus_t" >&6
- 
--  echo "$as_me:7263: checking for prrun_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for prrun_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for prrun_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_prrun_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7269 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7280,16 +8718,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7283: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7286: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7289: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7292: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_prrun_t=yes
- else
-@@ -7303,25 +8741,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_prrun_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRRUN_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7311: result: $bfd_cv_have_sys_procfs_type_prrun_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_prrun_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_prrun_t" >&6
- 
--  echo "$as_me:7314: checking for gregset_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for gregset_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for gregset_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_gregset_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7320 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7331,16 +8775,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7334: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7337: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7340: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7343: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_gregset_t=yes
- else
-@@ -7354,25 +8798,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_gregset_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_GREGSET_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7362: result: $bfd_cv_have_sys_procfs_type_gregset_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_gregset_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_gregset_t" >&6
- 
--  echo "$as_me:7365: checking for fpregset_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for fpregset_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for fpregset_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_fpregset_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7371 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7382,16 +8832,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7385: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7388: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7391: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7394: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_fpregset_t=yes
- else
-@@ -7405,25 +8855,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_fpregset_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_FPREGSET_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7413: result: $bfd_cv_have_sys_procfs_type_fpregset_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_fpregset_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_fpregset_t" >&6
- 
--  echo "$as_me:7416: checking for prgregset_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for prgregset_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for prgregset_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_prgregset_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7422 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7433,16 +8889,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7436: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7439: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7442: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7445: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_prgregset_t=yes
- else
-@@ -7456,25 +8912,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_prgregset_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRGREGSET_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7464: result: $bfd_cv_have_sys_procfs_type_prgregset_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_prgregset_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_prgregset_t" >&6
- 
--  echo "$as_me:7467: checking for prfpregset_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for prfpregset_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for prfpregset_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_prfpregset_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7473 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7484,16 +8946,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7490: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7496: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_prfpregset_t=yes
- else
-@@ -7507,25 +8969,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRFPREGSET_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7515: result: $bfd_cv_have_sys_procfs_type_prfpregset_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_prfpregset_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_prfpregset_t" >&6
- 
--  echo "$as_me:7518: checking for prgregset32_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for prgregset32_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for prgregset32_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_prgregset32_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7524 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7535,16 +9003,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7538: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7541: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7544: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7547: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_prgregset32_t=yes
- else
-@@ -7558,25 +9026,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_prgregset32_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRGREGSET32_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7566: result: $bfd_cv_have_sys_procfs_type_prgregset32_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_prgregset32_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_prgregset32_t" >&6
- 
--  echo "$as_me:7569: checking for prfpregset32_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for prfpregset32_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for prfpregset32_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_prfpregset32_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7575 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7586,16 +9060,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7589: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7592: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7595: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7598: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_prfpregset32_t=yes
- else
-@@ -7609,25 +9083,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_prfpregset32_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRFPREGSET32_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7617: result: $bfd_cv_have_sys_procfs_type_prfpregset32_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_prfpregset32_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_prfpregset32_t" >&6
- 
--  echo "$as_me:7620: checking for lwpid_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for lwpid_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for lwpid_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_lwpid_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7626 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7637,16 +9117,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7640: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7643: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7646: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7649: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_lwpid_t=yes
- else
-@@ -7660,25 +9140,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_lwpid_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_LWPID_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7668: result: $bfd_cv_have_sys_procfs_type_lwpid_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_lwpid_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_lwpid_t" >&6
- 
--  echo "$as_me:7671: checking for psaddr_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for psaddr_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for psaddr_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_psaddr_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7677 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7688,16 +9174,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7691: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7694: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7697: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7700: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_psaddr_t=yes
- else
-@@ -7711,25 +9197,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_psaddr_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PSADDR_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7719: result: $bfd_cv_have_sys_procfs_type_psaddr_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_psaddr_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_psaddr_t" >&6
- 
--  echo "$as_me:7722: checking for prsysent_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for prsysent_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for prsysent_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_prsysent_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7728 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7739,16 +9231,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7742: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7745: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7748: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7751: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_prsysent_t=yes
- else
-@@ -7762,25 +9254,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_prsysent_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PRSYSENT_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7770: result: $bfd_cv_have_sys_procfs_type_prsysent_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_prsysent_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_prsysent_t" >&6
- 
--  echo "$as_me:7773: checking for pr_sigset_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for pr_sigset_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for pr_sigset_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_pr_sigset_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7779 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7790,16 +9288,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7793: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7796: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7799: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7802: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_pr_sigset_t=yes
- else
-@@ -7813,25 +9311,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_pr_sigset_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PR_SIGSET_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7821: result: $bfd_cv_have_sys_procfs_type_pr_sigset_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_pr_sigset_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_pr_sigset_t" >&6
- 
--  echo "$as_me:7824: checking for pr_sigaction64_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for pr_sigaction64_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for pr_sigaction64_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_pr_sigaction64_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7830 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7841,16 +9345,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7844: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7847: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7850: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7853: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes
- else
-@@ -7864,25 +9368,31 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_pr_sigaction64_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PR_SIGACTION64_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7872: result: $bfd_cv_have_sys_procfs_type_pr_sigaction64_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_pr_sigaction64_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" >&6
- 
--  echo "$as_me:7875: checking for pr_siginfo64_t in sys/procfs.h" >&5
-+  echo "$as_me:$LINENO: checking for pr_siginfo64_t in sys/procfs.h" >&5
- echo $ECHO_N "checking for pr_siginfo64_t in sys/procfs.h... $ECHO_C" >&6
-  if test "${bfd_cv_have_sys_procfs_type_pr_siginfo64_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7881 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
- #include <sys/procfs.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7892,16 +9402,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7895: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7898: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7901: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7904: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes
- else
-@@ -7915,24 +9425,32 @@
- 
-  if test $bfd_cv_have_sys_procfs_type_pr_siginfo64_t = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_PR_SIGINFO64_T 1
--EOF
-+_ACEOF
- 
-  fi
-- echo "$as_me:7923: result: $bfd_cv_have_sys_procfs_type_pr_siginfo64_t" >&5
-+ echo "$as_me:$LINENO: result: $bfd_cv_have_sys_procfs_type_pr_siginfo64_t" >&5
- echo "${ECHO_T}$bfd_cv_have_sys_procfs_type_pr_siginfo64_t" >&6
- 
--  echo "$as_me:7926: checking for struct link_map32 in sys/link.h" >&5
-+
-+
-+  echo "$as_me:$LINENO: checking for struct link_map32 in sys/link.h" >&5
- echo $ECHO_N "checking for struct link_map32 in sys/link.h... $ECHO_C" >&6
-   if test "${gdb_cv_have_struct_link_map32+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7932 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #define _SYSCALL32
- #include <sys/link.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -7942,16 +9460,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7945: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7948: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7954: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_struct_link_map32=yes
- else
-@@ -7962,17 +9480,19 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--  echo "$as_me:7965: result: $gdb_cv_have_struct_link_map32" >&5
-+  echo "$as_me:$LINENO: result: $gdb_cv_have_struct_link_map32" >&5
- echo "${ECHO_T}$gdb_cv_have_struct_link_map32" >&6
-   if test $gdb_cv_have_struct_link_map32 = yes; then
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_LINK_MAP32 1
--EOF
-+_ACEOF
- 
-   fi
- 
-+
-+
-   if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
--    echo "$as_me:7975: checking whether prfpregset_t type is broken" >&5
-+    echo "$as_me:$LINENO: checking whether prfpregset_t type is broken" >&5
- echo $ECHO_N "checking whether prfpregset_t type is broken... $ECHO_C" >&6
-     if test "${gdb_cv_prfpregset_t_broken+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7981,7 +9501,7 @@
-   gdb_cv_prfpregset_t_broken=yes
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7984 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
-        int main ()
-@@ -7992,49 +9512,57 @@
-        }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:7995: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7998: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8000: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8003: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_prfpregset_t_broken=no
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- gdb_cv_prfpregset_t_broken=yes
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- 
--    echo "$as_me:8016: result: $gdb_cv_prfpregset_t_broken" >&5
-+    echo "$as_me:$LINENO: result: $gdb_cv_prfpregset_t_broken" >&5
- echo "${ECHO_T}$gdb_cv_prfpregset_t_broken" >&6
-     if test $gdb_cv_prfpregset_t_broken = yes; then
--      cat >>confdefs.h <<\EOF
-+      cat >>confdefs.h <<\_ACEOF
- #define PRFPREGSET_T_BROKEN 1
--EOF
-+_ACEOF
- 
-     fi
-   fi
- 
--  echo "$as_me:8026: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
-+
-+  echo "$as_me:$LINENO: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
- echo $ECHO_N "checking for PIOCSET ioctl entry in sys/procfs.h... $ECHO_C" >&6
-   if test "${gdb_cv_have_procfs_piocset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8032 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/procfs.h>
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8047,16 +9575,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8050: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8053: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8056: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8059: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_procfs_piocset=yes
- else
-@@ -8067,12 +9595,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--  echo "$as_me:8070: result: $gdb_cv_have_procfs_piocset" >&5
-+  echo "$as_me:$LINENO: result: $gdb_cv_have_procfs_piocset" >&5
- echo "${ECHO_T}$gdb_cv_have_procfs_piocset" >&6
-   if test $gdb_cv_have_procfs_piocset = yes; then
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define HAVE_PROCFS_PIOCSET 1
--EOF
-+_ACEOF
- 
-   fi
- fi
-@@ -8083,7 +9611,7 @@
- 	;;
- *)
- 
--echo "$as_me:8086: checking for main in -lm" >&5
-+echo "$as_me:$LINENO: checking for main in -lm" >&5
- echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
- if test "${ac_cv_lib_m_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8091,9 +9619,16 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8094 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8103,16 +9638,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8106: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8109: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8112: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8115: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_m_main=yes
- else
-@@ -8123,12 +9658,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8126: result: $ac_cv_lib_m_main" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
- echo "${ECHO_T}$ac_cv_lib_m_main" >&6
- if test $ac_cv_lib_m_main = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBM 1
--EOF
-+_ACEOF
- 
-   LIBS="-lm $LIBS"
- 
-@@ -8139,15 +9674,21 @@
- 
- if test ${host} = ${target} ; then
- 
--  echo "$as_me:8142: checking for member l_addr in struct link_map" >&5
-+  echo "$as_me:$LINENO: checking for member l_addr in struct link_map" >&5
- echo $ECHO_N "checking for member l_addr in struct link_map... $ECHO_C" >&6
-   if test "${gdb_cv_have_struct_link_map_with_l_members+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8148 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <link.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8157,16 +9698,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8160: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8163: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8166: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8169: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_struct_link_map_with_l_members=yes
- else
-@@ -8177,25 +9718,32 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--  echo "$as_me:8180: result: $gdb_cv_have_struct_link_map_with_l_members" >&5
-+  echo "$as_me:$LINENO: result: $gdb_cv_have_struct_link_map_with_l_members" >&5
- echo "${ECHO_T}$gdb_cv_have_struct_link_map_with_l_members" >&6
-   if test $gdb_cv_have_struct_link_map_with_l_members = yes; then
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS 1
--EOF
-+_ACEOF
- 
-   fi
- 
--  echo "$as_me:8189: checking for member lm_addr in struct link_map" >&5
-+
-+  echo "$as_me:$LINENO: checking for member lm_addr in struct link_map" >&5
- echo $ECHO_N "checking for member lm_addr in struct link_map... $ECHO_C" >&6
-   if test "${gdb_cv_have_struct_link_map_with_lm_members+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8195 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <link.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8205,16 +9753,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8208: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8211: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8214: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8217: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_struct_link_map_with_lm_members=yes
- else
-@@ -8225,28 +9773,35 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--  echo "$as_me:8228: result: $gdb_cv_have_struct_link_map_with_lm_members" >&5
-+  echo "$as_me:$LINENO: result: $gdb_cv_have_struct_link_map_with_lm_members" >&5
- echo "${ECHO_T}$gdb_cv_have_struct_link_map_with_lm_members" >&6
-   if test $gdb_cv_have_struct_link_map_with_lm_members = yes; then
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS 1
--EOF
-+_ACEOF
- 
-   fi
- 
--  echo "$as_me:8237: checking for member som_addr in struct so_map" >&5
-+
-+  echo "$as_me:$LINENO: checking for member som_addr in struct so_map" >&5
- echo $ECHO_N "checking for member som_addr in struct so_map... $ECHO_C" >&6
-   if test "${gdb_cv_have_struct_so_map_with_som_members+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8243 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_NLIST_H
- #include <nlist.h>
- #endif
- #include <link.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8256,16 +9811,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8259: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8262: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8265: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8268: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_struct_so_map_with_som_members=yes
- else
-@@ -8276,25 +9831,32 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--  echo "$as_me:8279: result: $gdb_cv_have_struct_so_map_with_som_members" >&5
-+  echo "$as_me:$LINENO: result: $gdb_cv_have_struct_so_map_with_som_members" >&5
- echo "${ECHO_T}$gdb_cv_have_struct_so_map_with_som_members" >&6
-   if test $gdb_cv_have_struct_so_map_with_som_members = yes; then
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS 1
--EOF
-+_ACEOF
- 
-   fi
- 
--  echo "$as_me:8288: checking for struct link_map32 in sys/link.h" >&5
-+
-+  echo "$as_me:$LINENO: checking for struct link_map32 in sys/link.h" >&5
- echo $ECHO_N "checking for struct link_map32 in sys/link.h... $ECHO_C" >&6
-   if test "${gdb_cv_have_struct_link_map32+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8294 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #define _SYSCALL32
- #include <sys/link.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8304,16 +9866,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8307: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8310: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8313: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8316: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_struct_link_map32=yes
- else
-@@ -8324,21 +9886,21 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--  echo "$as_me:8327: result: $gdb_cv_have_struct_link_map32" >&5
-+  echo "$as_me:$LINENO: result: $gdb_cv_have_struct_link_map32" >&5
- echo "${ECHO_T}$gdb_cv_have_struct_link_map32" >&6
-   if test $gdb_cv_have_struct_link_map32 = yes; then
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define HAVE_STRUCT_LINK_MAP32 1
--EOF
-+_ACEOF
- 
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define _SYSCALL32 1
--EOF
-+_ACEOF
- 
-   fi
- fi
- 
--echo "$as_me:8341: checking for wctype in -lc" >&5
-+echo "$as_me:$LINENO: checking for wctype in -lc" >&5
- echo $ECHO_N "checking for wctype in -lc... $ECHO_C" >&6
- if test "${ac_cv_lib_c_wctype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8346,7 +9908,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8349 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8356,6 +9918,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char wctype ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8365,16 +9933,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8368: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8371: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8374: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8377: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_c_wctype=yes
- else
-@@ -8385,13 +9953,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8388: result: $ac_cv_lib_c_wctype" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_c_wctype" >&5
- echo "${ECHO_T}$ac_cv_lib_c_wctype" >&6
- if test $ac_cv_lib_c_wctype = yes; then
-   :
- else
- 
--echo "$as_me:8394: checking for wctype in -lw" >&5
-+echo "$as_me:$LINENO: checking for wctype in -lw" >&5
- echo $ECHO_N "checking for wctype in -lw... $ECHO_C" >&6
- if test "${ac_cv_lib_w_wctype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8399,7 +9967,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lw  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 8402 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -8409,6 +9977,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char wctype ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8418,16 +9992,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8421: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8424: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8427: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8430: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_w_wctype=yes
- else
-@@ -8438,12 +10012,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:8441: result: $ac_cv_lib_w_wctype" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_w_wctype" >&5
- echo "${ECHO_T}$ac_cv_lib_w_wctype" >&6
- if test $ac_cv_lib_w_wctype = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBW 1
--EOF
-+_ACEOF
- 
-   LIBS="-lw $LIBS"
- 
-@@ -8451,15 +10025,23 @@
- 
- fi
- 
--echo "$as_me:8454: checking for long long support in compiler" >&5
-+
-+
-+echo "$as_me:$LINENO: checking for long long support in compiler" >&5
- echo $ECHO_N "checking for long long support in compiler... $ECHO_C" >&6
- if test "${gdb_cv_c_long_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8460 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8472,16 +10054,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8475: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8478: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8481: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8484: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_c_long_long=yes
- else
-@@ -8492,16 +10074,17 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:8495: result: $gdb_cv_c_long_long" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_c_long_long" >&5
- echo "${ECHO_T}$gdb_cv_c_long_long" >&6
- if test $gdb_cv_c_long_long = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define CC_HAS_LONG_LONG 1
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:8504: checking for long long support in printf" >&5
-+
-+echo "$as_me:$LINENO: checking for long long support in printf" >&5
- echo $ECHO_N "checking for long long support in printf... $ECHO_C" >&6
- if test "${gdb_cv_printf_has_long_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8510,7 +10093,7 @@
-   gdb_cv_printf_has_long_long=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8513 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -8525,21 +10108,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8528: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8531: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8533: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8536: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_printf_has_long_long=yes
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- gdb_cv_printf_has_long_long=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-@@ -8547,12 +10131,12 @@
- fi
- 
- if test $gdb_cv_printf_has_long_long = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define PRINTF_HAS_LONG_LONG 1
--EOF
-+_ACEOF
- 
- fi
--echo "$as_me:8555: result: $gdb_cv_printf_has_long_long" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_printf_has_long_long" >&5
- echo "${ECHO_T}$gdb_cv_printf_has_long_long" >&6
- 
- # APPLE LOCAL: Hard code long double to 'no' because gcc likes to complain
-@@ -8574,7 +10158,8 @@
- #  AC_DEFINE(HAVE_LONG_DOUBLE)
- #fi
- 
--echo "$as_me:8577: checking for long double support in printf" >&5
-+
-+echo "$as_me:$LINENO: checking for long double support in printf" >&5
- echo $ECHO_N "checking for long double support in printf... $ECHO_C" >&6
- if test "${gdb_cv_printf_has_long_double+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8583,7 +10168,7 @@
-   gdb_cv_printf_has_long_double=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8586 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -8594,21 +10179,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8597: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8600: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8602: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8605: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_printf_has_long_double=yes
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- gdb_cv_printf_has_long_double=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-@@ -8617,15 +10203,16 @@
- 
- gdb_cv_printf_has_long_double=no
- if test $gdb_cv_printf_has_long_double = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define PRINTF_HAS_LONG_DOUBLE 1
--EOF
-+_ACEOF
- 
- fi
--echo "$as_me:8625: result: $gdb_cv_printf_has_long_double" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_printf_has_long_double" >&5
- echo "${ECHO_T}$gdb_cv_printf_has_long_double" >&6
- 
--echo "$as_me:8628: checking for long double support in scanf" >&5
-+
-+echo "$as_me:$LINENO: checking for long double support in scanf" >&5
- echo $ECHO_N "checking for long double support in scanf... $ECHO_C" >&6
- if test "${gdb_cv_scanf_has_long_double+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8634,7 +10221,7 @@
-   gdb_cv_scanf_has_long_double=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8637 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -8645,21 +10232,22 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8648: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8651: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8653: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8656: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_scanf_has_long_double=yes
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- gdb_cv_scanf_has_long_double=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-@@ -8668,34 +10256,74 @@
- 
- gdb_cv_scanf_has_long_double=no
- if test $gdb_cv_scanf_has_long_double = yes; then
--  cat >>confdefs.h <<\EOF
-+  cat >>confdefs.h <<\_ACEOF
- #define SCANF_HAS_LONG_DOUBLE 1
--EOF
-+_ACEOF
- 
- fi
--echo "$as_me:8676: result: $gdb_cv_scanf_has_long_double" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_scanf_has_long_double" >&5
- echo "${ECHO_T}$gdb_cv_scanf_has_long_double" >&6
- 
-+
-+
- for ac_header in stdlib.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:8682: checking for $ac_header" >&5
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 8688 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:8692: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:8698: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -8706,34 +10334,62 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  eval "$as_ac_Header=no"
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=$ac_header_preproc"
- fi
--echo "$as_me:8717: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
-+
- done
- 
-+
- for ac_func in getpagesize
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:8730: checking for $ac_func" >&5
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8736 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -8747,6 +10403,12 @@
- char $ac_func ();
- char (*f) ();
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8764,16 +10426,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8767: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8770: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8773: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8776: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -8783,17 +10445,17 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:8786: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--EOF
-+_ACEOF
- 
- fi
- done
- 
--echo "$as_me:8796: checking for working mmap" >&5
-+echo "$as_me:$LINENO: checking for working mmap" >&5
- echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
- if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8802,9 +10464,12 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8805 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- $ac_includes_default
-+/* malloc might have been renamed as rpl_malloc. */
-+#undef malloc
-+
- /* Thanks to Mike Haertel and Jim Avera for this test.
-    Here is a matrix of mmap possibilities:
- 	mmap private not fixed
-@@ -8820,7 +10485,7 @@
-    VM page cache was not coherent with the file system buffer cache
-    like early versions of FreeBSD and possibly contemporary NetBSD.)
-    For shared mappings, we should conversely verify that changes get
--   propogated back to all the places they're supposed to be.
-+   propagated back to all the places they're supposed to be.
- 
-    Grep wants private fixed already mapped.
-    The main things grep needs to know about mmap are:
-@@ -8929,40 +10594,42 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8932: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8935: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8937: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8940: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-+( exit $ac_status )
- ac_cv_func_mmap_fixed_mapped=no
- fi
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:8952: result: $ac_cv_func_mmap_fixed_mapped" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
- echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
- if test $ac_cv_func_mmap_fixed_mapped = yes; then
- 
--cat >>confdefs.h <<\EOF
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_MMAP 1
--EOF
-+_ACEOF
- 
- fi
- rm -f conftest.mmap
- 
-+
- case ${host_os} in
- aix*)
--  echo "$as_me:8965: checking for -bbigtoc option" >&5
-+  echo "$as_me:$LINENO: checking for -bbigtoc option" >&5
- echo $ECHO_N "checking for -bbigtoc option... $ECHO_C" >&6
- if test "${gdb_cv_bigtoc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8977,9 +10644,15 @@
- 
-     LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
-     cat >conftest.$ac_ext <<_ACEOF
--#line 8980 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -8989,16 +10662,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:8992: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8995: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:8998: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9001: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -9009,51 +10682,53 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:9012: result: $gdb_cv_bigtoc" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_bigtoc" >&5
- echo "${ECHO_T}$gdb_cv_bigtoc" >&6
-   CONFIG_LDFLAGS="${CONFIG_LDFLAGS} ${gdb_cv_bigtoc}"
-   ;;
- esac
- 
-+
-+
- if test ${build} = ${host} && test ${host} = ${target} ; then
-    case ${host_os} in
-    hpux*)
--      echo "$as_me:9021: checking for HPUX/OSF thread support" >&5
-+      echo "$as_me:$LINENO: checking for HPUX/OSF thread support" >&5
- echo $ECHO_N "checking for HPUX/OSF thread support... $ECHO_C" >&6
-       if test -f /usr/include/dce/cma_config.h ; then
-          if test "$GCC" = "yes" ; then
--            echo "$as_me:9025: result: yes" >&5
-+            echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--            cat >>confdefs.h <<\EOF
-+            cat >>confdefs.h <<\_ACEOF
- #define HAVE_HPUX_THREAD_SUPPORT 1
--EOF
-+_ACEOF
- 
-             CONFIG_LIB_OBS="${CONFIG_LIB_OBS} hpux-thread.o"
-             CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c"
- 	    CONFIG_INITS="${CONFIG_INITS} hpux-thread.c"
-          else
--            echo "$as_me:9035: result: no (suppressed because you are not using GCC)" >&5
-+            echo "$as_me:$LINENO: result: no (suppressed because you are not using GCC)" >&5
- echo "${ECHO_T}no (suppressed because you are not using GCC)" >&6
-          fi
-       else
--         echo "$as_me:9039: result: no" >&5
-+         echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-       fi
-       ;;
-    solaris*)
--      echo "$as_me:9044: checking for Solaris thread debugging library" >&5
-+      echo "$as_me:$LINENO: checking for Solaris thread debugging library" >&5
- echo $ECHO_N "checking for Solaris thread debugging library... $ECHO_C" >&6
-       if test -f /usr/lib/libthread_db.so.1 ; then
--         echo "$as_me:9047: result: yes" >&5
-+         echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--         cat >>confdefs.h <<\EOF
-+         cat >>confdefs.h <<\_ACEOF
- #define HAVE_THREAD_DB_LIB 1
--EOF
-+_ACEOF
- 
-          CONFIG_LIB_OBS="${CONFIG_LIB_OBS} sol-thread.o"
-          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
- 
--echo "$as_me:9056: checking for dlopen in -ldl" >&5
-+echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
- echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9061,7 +10736,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9064 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9071,6 +10746,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char dlopen ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9080,16 +10761,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9083: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9086: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9089: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9092: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlopen=yes
- else
-@@ -9100,12 +10781,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9103: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  cat >>confdefs.h <<EOF
-+  cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDL 1
--EOF
-+_ACEOF
- 
-   LIBS="-ldl $LIBS"
- 
-@@ -9115,13 +10796,19 @@
-             # The GNU linker requires the -export-dynamic option to make
-             # all symbols visible in the dynamic symbol table.
-             hold_ldflags=$LDFLAGS
--            echo "$as_me:9118: checking for the ld -export-dynamic flag" >&5
-+            echo "$as_me:$LINENO: checking for the ld -export-dynamic flag" >&5
- echo $ECHO_N "checking for the ld -export-dynamic flag... $ECHO_C" >&6
-             LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
-             cat >conftest.$ac_ext <<_ACEOF
--#line 9122 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9131,16 +10818,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9134: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9137: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9140: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9143: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   found=yes
- else
-@@ -9150,7 +10837,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-             LDFLAGS=$hold_ldflags
--            echo "$as_me:9153: result: $found" >&5
-+            echo "$as_me:$LINENO: result: $found" >&5
- echo "${ECHO_T}$found" >&6
-             if test $found = yes; then
-                CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -Wl,-export-dynamic"
-@@ -9158,20 +10845,26 @@
-          fi
- 	 # Sun randomly tweaked the prototypes in <proc_service.h>
- 	 # at one point.
--	 echo "$as_me:9161: checking if <proc_service.h> is old" >&5
-+	 echo "$as_me:$LINENO: checking if <proc_service.h> is old" >&5
- echo $ECHO_N "checking if <proc_service.h> is old... $ECHO_C" >&6
- 	 if test "${gdb_cv_proc_service_is_old+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 9168 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- 		#include <proc_service.h>
- 		ps_err_e ps_pdwrite
- 		    (struct ps_prochandle*, psaddr_t, const void*, size_t);
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9181,16 +10874,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9184: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9187: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9190: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9193: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_proc_service_is_old=no
- else
-@@ -9202,16 +10895,16 @@
- 
- fi
- 
--	 echo "$as_me:9205: result: $gdb_cv_proc_service_is_old" >&5
-+	 echo "$as_me:$LINENO: result: $gdb_cv_proc_service_is_old" >&5
- echo "${ECHO_T}$gdb_cv_proc_service_is_old" >&6
- 	 if test $gdb_cv_proc_service_is_old = yes; then
--	    cat >>confdefs.h <<\EOF
-+	    cat >>confdefs.h <<\_ACEOF
- #define PROC_SERVICE_IS_OLD 1
--EOF
-+_ACEOF
- 
- 	 fi
-       else
--         echo "$as_me:9214: result: no" >&5
-+         echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-       fi
-       ;;
-@@ -9219,6 +10912,7 @@
- 
- fi
- 
-+
- # Check whether --enable-gdbcli or --disable-gdbcli was given.
- if test "${enable_gdbcli+set}" = set; then
-   enableval="$enable_gdbcli"
-@@ -9227,12 +10921,12 @@
-     yes) enable_gdbcli=yes ;;
-     "") enable_gdbcli=yes ;;
-     no)
--      { { echo "$as_me:9230: error: The CLI cannot be disabled yet" >&5
-+      { { echo "$as_me:$LINENO: error: The CLI cannot be disabled yet" >&5
- echo "$as_me: error: The CLI cannot be disabled yet" >&2;}
-    { (exit 1); exit 1; }; }
-     ;;
-     *)
--      { { echo "$as_me:9235: error: Bad value for --enable-gdbcli: ${enableval}" >&5
-+      { { echo "$as_me:$LINENO: error: Bad value for --enable-gdbcli: ${enableval}" >&5
- echo "$as_me: error: Bad value for --enable-gdbcli: ${enableval}" >&2;}
-    { (exit 1); exit 1; }; }
-     ;;
-@@ -9257,6 +10951,7 @@
-     ;;
- esac
- 
-+
- # Check whether --enable-gdbmi or --disable-gdbmi was given.
- if test "${enable_gdbmi+set}" = set; then
-   enableval="$enable_gdbmi"
-@@ -9265,7 +10960,7 @@
-     yes | no) ;;
-     "")  enable_gdbmi=yes ;;
-     *)
--      { { echo "$as_me:9268: error: Bad value for --enable-gdbmi: ${enableval}" >&5
-+      { { echo "$as_me:$LINENO: error: Bad value for --enable-gdbmi: ${enableval}" >&5
- echo "$as_me: error: Bad value for --enable-gdbmi: ${enableval}" >&2;}
-    { (exit 1); exit 1; }; }
-     ;;
-@@ -9295,19 +10990,21 @@
- 
- UIOUT_CFLAGS=
- 
-+
-+
- # Check whether --with-uiout or --without-uiout was given.
- if test "${with_uiout+set}" = set; then
-   withval="$with_uiout"
-   case "${withval}" in
-   yes)  want_uiout=true ;;
-   no)   if test $enable_gdbmi = yes; then
--          { { echo "$as_me:9304: error: uiout is needed for MI and cannot be disabled" >&5
-+          { { echo "$as_me:$LINENO: error: uiout is needed for MI and cannot be disabled" >&5
- echo "$as_me: error: uiout is needed for MI and cannot be disabled" >&2;}
-    { (exit 1); exit 1; }; }
-         else
-            want_uiout=false
-         fi ;;
--  *)    { { echo "$as_me:9310: error: bad value ${withval} for GDB with-uiout option" >&5
-+  *)    { { echo "$as_me:$LINENO: error: bad value ${withval} for GDB with-uiout option" >&5
- echo "$as_me: error: bad value ${withval} for GDB with-uiout option" >&2;}
-    { (exit 1); exit 1; }; } ;;
- esac
-@@ -9326,7 +11023,7 @@
-     yes | no) ;;
-     "")  enable_tui=yes ;;
-     *)
--      { { echo "$as_me:9329: error: Bad value for --enable-tui: ${enableval}" >&5
-+      { { echo "$as_me:$LINENO: error: Bad value for --enable-tui: ${enableval}" >&5
- echo "$as_me: error: Bad value for --enable-tui: ${enableval}" >&2;}
-    { (exit 1); exit 1; }; }
-     ;;
-@@ -9355,7 +11052,7 @@
-   case "${enableval}" in
- yes)	enable_netrom=yes ;;
- no)	enable_netrom=no ;;
--*)	{ { echo "$as_me:9358: error: bad value ${enableval} given for netrom option" >&5
-+*)	{ { echo "$as_me:$LINENO: error: bad value ${enableval} given for netrom option" >&5
- echo "$as_me: error: bad value ${enableval} given for netrom option" >&2;}
-    { (exit 1); exit 1; }; } ;;
- esac
-@@ -9367,6 +11064,7 @@
- 	CONFIG_INITS="${CONFIG_INITS} remote-nrom.c"
- fi
- 
-+
- # NOTE: Don't add -Wall or -Wunused, they both include
- # -Wunused-parameter which reports bogus warnings.
- # NOTE: If you add to this list, remember to update
-@@ -9413,7 +11111,7 @@
- WERROR_CFLAGS=""
- if test "x${build_warnings}" != x -a "x$GCC" = xyes
- then
--    echo "$as_me:9416: checking compiler warning flags" >&5
-+    echo "$as_me:$LINENO: checking compiler warning flags" >&5
- echo $ECHO_N "checking compiler warning flags... $ECHO_C" >&6
-     # Separate out the -Werror flag as some files just cannot be
-     # compiled with it enabled.
-@@ -9424,9 +11122,15 @@
- 	    saved_CFLAGS="$CFLAGS"
- 	    CFLAGS="$CFLAGS $w"
- 	    cat >conftest.$ac_ext <<_ACEOF
--#line 9427 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9436,16 +11140,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9439: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9442: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9445: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9448: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   WARN_CFLAGS="${WARN_CFLAGS} $w"
- else
-@@ -9456,20 +11160,25 @@
- 	    CFLAGS="$saved_CFLAGS"
- 	esac
-     done
--    echo "$as_me:9459: result: ${WARN_CFLAGS}${WERROR_CFLAGS}" >&5
-+    echo "$as_me:$LINENO: result: ${WARN_CFLAGS}${WERROR_CFLAGS}" >&5
- echo "${ECHO_T}${WARN_CFLAGS}${WERROR_CFLAGS}" >&6
- fi
- 
-+
-+
- MMALLOC_CFLAGS=
- MMALLOC=
- 
-+
-+
-+
- # Check whether --with-mmalloc or --without-mmalloc was given.
- if test "${with_mmalloc+set}" = set; then
-   withval="$with_mmalloc"
-   case "${withval}" in
-   yes)  want_mmalloc=true ;;
-   no)   want_mmalloc=false;;
--  *)    { { echo "$as_me:9472: error: bad value ${withval} for GDB with-mmalloc option" >&5
-+  *)    { { echo "$as_me:$LINENO: error: bad value ${withval} for GDB with-mmalloc option" >&5
- echo "$as_me: error: bad value ${withval} for GDB with-mmalloc option" >&2;}
-    { (exit 1); exit 1; }; } ;;
- esac
-@@ -9477,25 +11186,26 @@
-   want_mmalloc=true
- fi;
- if test x$want_mmalloc = xtrue; then
--   cat >>confdefs.h <<\EOF
-+   cat >>confdefs.h <<\_ACEOF
- #define USE_MMALLOC 1
--EOF
-+_ACEOF
- 
--   cat >>confdefs.h <<\EOF
-+   cat >>confdefs.h <<\_ACEOF
- #define MMCHECK_FORCE 1
--EOF
-+_ACEOF
- 
-    MMALLOC_CFLAGS="-I$srcdir/../mmalloc"
-    MMALLOC='../mmalloc/libmmalloc.a'
- fi
- 
-+
- # Check whether --with-included-regex or --without-included-regex was given.
- if test "${with_included_regex+set}" = set; then
-   withval="$with_included_regex"
-   case "${withval}" in
-   yes)  want_included_regex=true ;;
-   no)   want_included_regex=false;;
--  *)    { { echo "$as_me:9498: error: bad value ${withval} for GDB with-included-regex option" >&5
-+  *)    { { echo "$as_me:$LINENO: error: bad value ${withval} for GDB with-included-regex option" >&5
- echo "$as_me: error: bad value ${withval} for GDB with-included-regex option" >&2;}
-    { (exit 1); exit 1; }; } ;;
- esac
-@@ -9503,17 +11213,23 @@
-   want_included_regex=true
- fi;
- if test $want_included_regex = false; then
--  echo "$as_me:9506: checking for GNU regex" >&5
-+  echo "$as_me:$LINENO: checking for GNU regex" >&5
- echo $ECHO_N "checking for GNU regex... $ECHO_C" >&6
-   if test "${gdb_cv_have_gnu_regex+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9512 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <gnu-versions.h>
- #include <sys/types.h>
- #include <regex.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9526,16 +11242,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9529: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9532: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9535: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9538: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   gdb_cv_have_gnu_regex=yes
- else
-@@ -9546,7 +11262,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--  echo "$as_me:9549: result: $gdb_cv_have_gnu_regex" >&5
-+  echo "$as_me:$LINENO: result: $gdb_cv_have_gnu_regex" >&5
- echo "${ECHO_T}$gdb_cv_have_gnu_regex" >&6
-   if test $gdb_cv_have_gnu_regex = no; then
- 	want_included_regex=true
-@@ -9555,20 +11271,21 @@
- 
- if test x${want_included_regex} = xtrue; then
-     REGEX="gnu-regex.o"
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define USE_INCLUDED_REGEX 1
--EOF
-+_ACEOF
- 
- fi
- 
-+
- # In the Cygwin environment, we need some additional flags.
--echo "$as_me:9565: checking for cygwin" >&5
-+echo "$as_me:$LINENO: checking for cygwin" >&5
- echo $ECHO_N "checking for cygwin... $ECHO_C" >&6
- if test "${gdb_cv_os_cygwin+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9571 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- #if defined (__CYGWIN__) || defined (__CYGWIN32__)
-@@ -9584,15 +11301,18 @@
- rm -f conftest*
- 
- fi
--echo "$as_me:9587: result: $gdb_cv_os_cygwin" >&5
-+echo "$as_me:$LINENO: result: $gdb_cv_os_cygwin" >&5
- echo "${ECHO_T}$gdb_cv_os_cygwin" >&6
- 
-+
- SER_HARDWIRE="ser-unix.o ser-pipe.o ser-tcp.o"
- case ${host} in
-   *go32* ) SER_HARDWIRE=ser-go32.o ;;
-   *djgpp* ) SER_HARDWIRE=ser-go32.o ;;
- esac
- 
-+
-+
- case "$gdb_host" in
- "go32") TERM_LIB= ;;
- "rhapsody") TERM_LIB= ;;
-@@ -9602,7 +11322,7 @@
-     TERM_LIB='`if test -r ../libtermcap/libtermcap.a; then echo ../libtermcap/libtermcap.a; else echo -ltermcap; fi`'
-   else
-     TERM_LIB=
--    echo "$as_me:9605: checking for tgetent in -lncurses" >&5
-+    echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
- echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
- if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9610,7 +11330,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lncurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9613 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9620,6 +11340,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char tgetent ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9629,16 +11355,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9632: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9635: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9638: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9641: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_ncurses_tgetent=yes
- else
-@@ -9649,12 +11375,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9652: result: $ac_cv_lib_ncurses_tgetent" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
- echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
- if test $ac_cv_lib_ncurses_tgetent = yes; then
-   TERM_LIB=-lncurses
- else
--  echo "$as_me:9657: checking for tgetent in -lHcurses" >&5
-+  echo "$as_me:$LINENO: checking for tgetent in -lHcurses" >&5
- echo $ECHO_N "checking for tgetent in -lHcurses... $ECHO_C" >&6
- if test "${ac_cv_lib_Hcurses_tgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9662,7 +11388,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lHcurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9665 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9672,6 +11398,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char tgetent ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9681,16 +11413,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9684: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9687: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9690: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9693: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_Hcurses_tgetent=yes
- else
-@@ -9701,12 +11433,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9704: result: $ac_cv_lib_Hcurses_tgetent" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Hcurses_tgetent" >&5
- echo "${ECHO_T}$ac_cv_lib_Hcurses_tgetent" >&6
- if test $ac_cv_lib_Hcurses_tgetent = yes; then
-   TERM_LIB=-lHcurses
- else
--  echo "$as_me:9709: checking for tgetent in -ltermlib" >&5
-+  echo "$as_me:$LINENO: checking for tgetent in -ltermlib" >&5
- echo $ECHO_N "checking for tgetent in -ltermlib... $ECHO_C" >&6
- if test "${ac_cv_lib_termlib_tgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9714,7 +11446,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ltermlib  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9717 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9724,6 +11456,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char tgetent ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9733,16 +11471,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9736: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9739: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9742: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9745: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_termlib_tgetent=yes
- else
-@@ -9753,12 +11491,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9756: result: $ac_cv_lib_termlib_tgetent" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_tgetent" >&5
- echo "${ECHO_T}$ac_cv_lib_termlib_tgetent" >&6
- if test $ac_cv_lib_termlib_tgetent = yes; then
-   TERM_LIB=-ltermlib
- else
--  echo "$as_me:9761: checking for tgetent in -ltermcap" >&5
-+  echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
- echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
- if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9766,7 +11504,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ltermcap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9769 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9776,6 +11514,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char tgetent ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9785,16 +11529,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9788: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9791: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9794: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9797: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_termcap_tgetent=yes
- else
-@@ -9805,12 +11549,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9808: result: $ac_cv_lib_termcap_tgetent" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
- echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
- if test $ac_cv_lib_termcap_tgetent = yes; then
-   TERM_LIB=-ltermcap
- else
--  echo "$as_me:9813: checking for tgetent in -lcurses" >&5
-+  echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
- echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
- if test "${ac_cv_lib_curses_tgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9818,7 +11562,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcurses  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9821 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9828,6 +11572,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char tgetent ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9837,16 +11587,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9840: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9843: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9846: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9849: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_curses_tgetent=yes
- else
-@@ -9857,12 +11607,12 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9860: result: $ac_cv_lib_curses_tgetent" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
- echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
- if test $ac_cv_lib_curses_tgetent = yes; then
-   TERM_LIB=-lcurses
- else
--  echo "$as_me:9865: checking for tgetent in -lterminfo" >&5
-+  echo "$as_me:$LINENO: checking for tgetent in -lterminfo" >&5
- echo $ECHO_N "checking for tgetent in -lterminfo... $ECHO_C" >&6
- if test "${ac_cv_lib_terminfo_tgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9870,7 +11620,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lterminfo  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9873 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9880,6 +11630,12 @@
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char tgetent ();
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -9889,16 +11645,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9892: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9895: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9898: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9901: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_terminfo_tgetent=yes
- else
-@@ -9909,7 +11665,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9912: result: $ac_cv_lib_terminfo_tgetent" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_lib_terminfo_tgetent" >&5
- echo "${ECHO_T}$ac_cv_lib_terminfo_tgetent" >&6
- if test $ac_cv_lib_terminfo_tgetent = yes; then
-   TERM_LIB=-lterminfo
-@@ -9926,7 +11682,7 @@
- fi
- 
-     if test "x$TERM_LIB" = x; then
--      { { echo "$as_me:9929: error: Could not find a term library" >&5
-+      { { echo "$as_me:$LINENO: error: Could not find a term library" >&5
- echo "$as_me: error: Could not find a term library" >&2;}
-    { (exit e.g. termcap or termlib!); exit e.g. termcap or termlib!; }; }
-     fi
-@@ -9934,6 +11690,7 @@
-   ;;
- esac
- 
-+
- # libreadline needs libuser32.a in a cygwin environment
- WIN32LIBS=
- if test x$gdb_cv_os_cygwin = xyes; then
-@@ -9944,9 +11701,13 @@
-     esac
- fi
- 
-+
- LIBGUI="../libgui/src/libgui.a"
- GUI_CFLAGS_X="-I${srcdir}/../libgui/src"
- 
-+
-+
-+
- # Check whether --with-cpu or --without-cpu was given.
- if test "${with_cpu+set}" = set; then
-   withval="$with_cpu"
-@@ -9970,23 +11731,25 @@
- 	with_cpu=604
-       ;;
-       * )
--        { echo "$as_me:9973: WARNING: GDB: unknown --with-cpu value: \`${with_cpu}'; using \`ppc-uisa'." >&5
-+        { echo "$as_me:$LINENO: WARNING: GDB: unknown --with-cpu value: \`${with_cpu}'; using \`ppc-uisa'." >&5
- echo "$as_me: WARNING: GDB: unknown --with-cpu value: \`${with_cpu}'; using \`ppc-uisa'." >&2;}
- 	with_cpu=ppc-uisa
-       ;;
-     esac
-   ;;
-   * )
--    { echo "$as_me:9980: WARNING: GDB may ignore the --with-cpu flag for ${target} targets" >&5
-+    { echo "$as_me:$LINENO: WARNING: GDB may ignore the --with-cpu flag for ${target} targets" >&5
- echo "$as_me: WARNING: GDB may ignore the --with-cpu flag for ${target} targets" >&2;}
-   ;;
- esac
--cat >>confdefs.h <<EOF
-+cat >>confdefs.h <<_ACEOF
- #define TARGET_CPU_DEFAULT "${with_cpu}"
--EOF
-+_ACEOF
-+
- 
- fi;
- 
-+
- # Check whether --enable-gdbtk or --disable-gdbtk was given.
- if test "${enable_gdbtk+set}" = set; then
-   enableval="$enable_gdbtk"
-@@ -9994,11 +11757,11 @@
-     yes)
- 	case "$host" in
- 	*go32*)
--	    { echo "$as_me:9997: WARNING: GDB does not support GDBtk on host ${host}.  GDBtk will be disabled." >&5
-+	    { echo "$as_me:$LINENO: WARNING: GDB does not support GDBtk on host ${host}.  GDBtk will be disabled." >&5
- echo "$as_me: WARNING: GDB does not support GDBtk on host ${host}.  GDBtk will be disabled." >&2;}
- 	    enable_gdbtk=no ;;
- 	*windows*)
--	    { echo "$as_me:10001: WARNING: GDB does not support GDBtk on host ${host}.  GDBtk will be disabled." >&5
-+	    { echo "$as_me:$LINENO: WARNING: GDB does not support GDBtk on host ${host}.  GDBtk will be disabled." >&5
- echo "$as_me: WARNING: GDB does not support GDBtk on host ${host}.  GDBtk will be disabled." >&2;}
- 	    enable_gdbtk=no ;;
- 	*)
-@@ -10007,7 +11770,7 @@
-     no)
- 	enable_gdbtk=no  ;;
-     *)
--	{ { echo "$as_me:10010: error: bad value ${enableval} given for gdbtk option" >&5
-+	{ { echo "$as_me:$LINENO: error: bad value ${enableval} given for gdbtk option" >&5
- echo "$as_me: error: bad value ${enableval} given for gdbtk option" >&2;}
-    { (exit 1); exit 1; }; } ;;
- esac
-@@ -10028,6 +11791,8 @@
- 
- WIN32LDAPP=
- 
-+
-+
- configdir="unix"
- 
- GDBTKLIBS=
-@@ -10040,6 +11805,7 @@
-     GDBTK_SRC_DIR=`pwd`
-     cd $here
- 
-+
- #
- # Ok, lets find the tcl configuration
- # First, look for one uninstalled.
-@@ -10055,18 +11821,19 @@
-   withval="$with_tclconfig"
-   with_tclconfig=${withval}
- fi;
--  echo "$as_me:10058: checking for Tcl configuration" >&5
-+  echo "$as_me:$LINENO: checking for Tcl configuration" >&5
- echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
-   if test "${ac_cv_c_tclconfig+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-+
-   # First check to see if --with-tclconfig was specified.
-   if test x"${with_tclconfig}" != x ; then
-     if test -f "${with_tclconfig}/tclConfig.sh" ; then
-       ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
-     else
--      { { echo "$as_me:10069: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
-+      { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
- echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-@@ -10112,12 +11879,12 @@
- 
-   if test x"${ac_cv_c_tclconfig}" = x ; then
-     TCLCONFIG="# no Tcl configs found"
--    { echo "$as_me:10115: WARNING: Can't find Tcl configuration definitions" >&5
-+    { echo "$as_me:$LINENO: WARNING: Can't find Tcl configuration definitions" >&5
- echo "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;}
-   else
-     no_tcl=
-     TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh
--    echo "$as_me:10120: result: found $TCLCONFIG" >&5
-+    echo "$as_me:$LINENO: result: found $TCLCONFIG" >&5
- echo "${ECHO_T}found $TCLCONFIG" >&6
-   fi
- fi
-@@ -10126,6 +11893,31 @@
- 
-     . $TCLCONFIG
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- #
- # Ok, lets find the tk configuration
- # First, look for one uninstalled.
-@@ -10141,18 +11933,19 @@
-   withval="$with_tkconfig"
-   with_tkconfig=${withval}
- fi;
--  echo "$as_me:10144: checking for Tk configuration" >&5
-+  echo "$as_me:$LINENO: checking for Tk configuration" >&5
- echo $ECHO_N "checking for Tk configuration... $ECHO_C" >&6
-   if test "${ac_cv_c_tkconfig+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-+
-   # First check to see if --with-tkconfig was specified.
-   if test x"${with_tkconfig}" != x ; then
-     if test -f "${with_tkconfig}/tkConfig.sh" ; then
-       ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
-     else
--      { { echo "$as_me:10155: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&5
-+      { { echo "$as_me:$LINENO: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&5
- echo "$as_me: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-@@ -10198,16 +11991,18 @@
- 
-   if test x"${ac_cv_c_tkconfig}" = x ; then
-     TKCONFIG="# no Tk configs found"
--    { echo "$as_me:10201: WARNING: Can't find Tk configuration definitions" >&5
-+    { echo "$as_me:$LINENO: WARNING: Can't find Tk configuration definitions" >&5
- echo "$as_me: WARNING: Can't find Tk configuration definitions" >&2;}
-   else
-     no_tk=
-     TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh
--    echo "$as_me:10206: result: found $TKCONFIG" >&5
-+    echo "$as_me:$LINENO: result: found $TKCONFIG" >&5
- echo "${ECHO_T}found $TKCONFIG" >&6
-   fi
- fi
- 
-+
-+
- 	# now look for Tcl library stuff
- 
- 	case "${host}" in
-@@ -10229,6 +12024,19 @@
-       . $TKCONFIG
-     fi
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- #
- # Ok, lets find the tcl source trees so we can use the headers
- # Warning: transition of version 9 to 10 will break this algorithm
-@@ -10238,7 +12046,7 @@
- #
- 
- no_tcl=true
--echo "$as_me:10241: checking for Tcl private headers. dir=${configdir}" >&5
-+echo "$as_me:$LINENO: checking for Tcl private headers. dir=${configdir}" >&5
- echo $ECHO_N "checking for Tcl private headers. dir=${configdir}... $ECHO_C" >&6
- 
- # Check whether --with-tclinclude or --without-tclinclude was given.
-@@ -10257,7 +12065,7 @@
-   elif test -f ${with_tclinclude}/generic/tclInt.h ; then
-     ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)`
-   else
--    { { echo "$as_me:10260: error: ${with_tclinclude} directory doesn't contain private headers" >&5
-+    { { echo "$as_me:$LINENO: error: ${with_tclinclude} directory doesn't contain private headers" >&5
- echo "$as_me: error: ${with_tclinclude} directory doesn't contain private headers" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-@@ -10305,23 +12113,61 @@
- fi
- # see if one is installed
- if test x"${ac_cv_c_tclh}" = x ; then
--   echo "$as_me:10308: checking for tclInt.h" >&5
-+   if test "${ac_cv_header_tclInt_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for tclInt.h" >&5
- echo $ECHO_N "checking for tclInt.h... $ECHO_C" >&6
- if test "${ac_cv_header_tclInt_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_tclInt_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tclInt_h" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 10314 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking tclInt.h usability" >&5
-+echo $ECHO_N "checking tclInt.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <tclInt.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking tclInt.h presence" >&5
-+echo $ECHO_N "checking tclInt.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <tclInt.h>
- _ACEOF
--if { (eval echo "$as_me:10318: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10324: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10332,46 +12178,76 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  ac_cv_header_tclInt_h=yes
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  ac_cv_header_tclInt_h=no
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: tclInt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: tclInt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tclInt.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: tclInt.h: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: tclInt.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: tclInt.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tclInt.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: tclInt.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tclInt.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: tclInt.h: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for tclInt.h" >&5
-+echo $ECHO_N "checking for tclInt.h... $ECHO_C" >&6
-+if test "${ac_cv_header_tclInt_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_tclInt_h=$ac_header_preproc
- fi
--echo "$as_me:10343: result: $ac_cv_header_tclInt_h" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_header_tclInt_h" >&5
- echo "${ECHO_T}$ac_cv_header_tclInt_h" >&6
-+
-+fi
- if test $ac_cv_header_tclInt_h = yes; then
-   ac_cv_c_tclh=installed
- else
-   ac_cv_c_tclh=""
- fi
- 
-+
- fi
- 
- fi
- 
- if test x"${ac_cv_c_tclh}" = x ; then
-   TCLHDIR="# no Tcl private headers found"
--  { { echo "$as_me:10357: error: Can't find Tcl private headers" >&5
-+  { { echo "$as_me:$LINENO: error: Can't find Tcl private headers" >&5
- echo "$as_me: error: Can't find Tcl private headers" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test x"${ac_cv_c_tclh}" != x ; then
-   no_tcl=""
-   if test x"${ac_cv_c_tclh}" = x"installed" ; then
--    echo "$as_me:10364: result: is installed" >&5
-+    echo "$as_me:$LINENO: result: is installed" >&5
- echo "${ECHO_T}is installed" >&6
-     TCLHDIR=""
-   else
--    echo "$as_me:10368: result: found in ${ac_cv_c_tclh}" >&5
-+    echo "$as_me:$LINENO: result: found in ${ac_cv_c_tclh}" >&5
- echo "${ECHO_T}found in ${ac_cv_c_tclh}" >&6
-     # this hack is cause the TCLHDIR won't print if there is a "-I" in it.
-     TCLHDIR="-I${ac_cv_c_tclh}"
-   fi
- fi
- 
-+
-+
-+
- #
- # Ok, lets find the tk source trees so we can use the headers
- # If the directory (presumably symlink) named "tk" exists, use that one
-@@ -10386,7 +12262,7 @@
- # the alternative search directory is involked by --with-tkinclude
- #
- no_tk=true
--echo "$as_me:10389: checking for Tk private headers" >&5
-+echo "$as_me:$LINENO: checking for Tk private headers" >&5
- echo $ECHO_N "checking for Tk private headers... $ECHO_C" >&6
- 
- # Check whether --with-tkinclude or --without-tkinclude was given.
-@@ -10405,7 +12281,7 @@
-   elif test -f ${with_tkinclude}/generic/tk.h ; then
-     ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)`
-   else
--    { { echo "$as_me:10408: error: ${with_tkinclude} directory doesn't contain private headers" >&5
-+    { { echo "$as_me:$LINENO: error: ${with_tkinclude} directory doesn't contain private headers" >&5
- echo "$as_me: error: ${with_tkinclude} directory doesn't contain private headers" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-@@ -10453,23 +12329,61 @@
- fi
- # see if one is installed
- if test x"${ac_cv_c_tkh}" = x ; then
--   echo "$as_me:10456: checking for tk.h" >&5
-+   if test "${ac_cv_header_tk_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for tk.h" >&5
- echo $ECHO_N "checking for tk.h... $ECHO_C" >&6
- if test "${ac_cv_header_tk_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_tk_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tk_h" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 10462 "configure"
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking tk.h usability" >&5
-+echo $ECHO_N "checking tk.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+#include "confdefs.h"
-+$ac_includes_default
-+#include <tk.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking tk.h presence" >&5
-+echo $ECHO_N "checking tk.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <tk.h>
- _ACEOF
--if { (eval echo "$as_me:10466: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10472: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10480,22 +12394,49 @@
-   ac_cpp_err=yes
- fi
- if test -z "$ac_cpp_err"; then
--  ac_cv_header_tk_h=yes
-+  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
-   cat conftest.$ac_ext >&5
--  ac_cv_header_tk_h=no
-+  ac_header_preproc=no
- fi
- rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: tk.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: tk.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tk.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: tk.h: proceeding with the preprocessor's result" >&2;};;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: tk.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: tk.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tk.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: tk.h: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: tk.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: tk.h: proceeding with the preprocessor's result" >&2;};;
-+esac
-+echo "$as_me:$LINENO: checking for tk.h" >&5
-+echo $ECHO_N "checking for tk.h... $ECHO_C" >&6
-+if test "${ac_cv_header_tk_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_tk_h=$ac_header_preproc
- fi
--echo "$as_me:10491: result: $ac_cv_header_tk_h" >&5
-+echo "$as_me:$LINENO: result: $ac_cv_header_tk_h" >&5
- echo "${ECHO_T}$ac_cv_header_tk_h" >&6
-+
-+fi
- if test $ac_cv_header_tk_h = yes; then
-   ac_cv_c_tkh=installed
- else
-   ac_cv_c_tkh=""
- fi
- 
-+
- fi
- 
- fi
-@@ -10503,23 +12444,26 @@
- if test x"${ac_cv_c_tkh}" != x ; then
-   no_tk=""
-   if test x"${ac_cv_c_tkh}" = x"installed" ; then
--    echo "$as_me:10506: result: is installed" >&5
-+    echo "$as_me:$LINENO: result: is installed" >&5
- echo "${ECHO_T}is installed" >&6
-     TKHDIR=""
-   else
--    echo "$as_me:10510: result: found in ${ac_cv_c_tkh}" >&5
-+    echo "$as_me:$LINENO: result: found in ${ac_cv_c_tkh}" >&5
- echo "${ECHO_T}found in ${ac_cv_c_tkh}" >&6
-     # this hack is cause the TKHDIR won't print if there is a "-I" in it.
-     TKHDIR="-I${ac_cv_c_tkh}"
-   fi
- else
-   TKHDIR="# no Tk directory found"
--  { echo "$as_me:10517: WARNING: Can't find Tk private headers" >&5
-+  { echo "$as_me:$LINENO: WARNING: Can't find Tk private headers" >&5
- echo "$as_me: WARNING: Can't find Tk private headers" >&2;}
-   no_tk=true
- fi
- 
--echo "$as_me:10522: checking for Itcl private headers. srcdir=${srcdir}" >&5
-+
-+
-+
-+echo "$as_me:$LINENO: checking for Itcl private headers. srcdir=${srcdir}" >&5
- echo $ECHO_N "checking for Itcl private headers. srcdir=${srcdir}... $ECHO_C" >&6
- if test x"${ac_cv_c_itclh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
-@@ -10531,7 +12475,7 @@
- fi
- if test x"${ac_cv_c_itclh}" = x ; then
-   ITCLHDIR="# no Itcl private headers found"
--  { { echo "$as_me:10534: error: Can't find Itcl private headers" >&5
-+  { { echo "$as_me:$LINENO: error: Can't find Itcl private headers" >&5
- echo "$as_me: error: Can't find Itcl private headers" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -10543,7 +12487,8 @@
- 
- #AC_SUBST(ITCLLIB)
- 
--echo "$as_me:10546: checking for Itk private headers. srcdir=${srcdir}" >&5
-+
-+echo "$as_me:$LINENO: checking for Itk private headers. srcdir=${srcdir}" >&5
- echo $ECHO_N "checking for Itk private headers. srcdir=${srcdir}... $ECHO_C" >&6
- if test x"${ac_cv_c_itkh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do
-@@ -10555,7 +12500,7 @@
- fi
- if test x"${ac_cv_c_itkh}" = x ; then
-   ITKHDIR="# no Itk private headers found"
--  { { echo "$as_me:10558: error: Can't find Itk private headers" >&5
-+  { { echo "$as_me:$LINENO: error: Can't find Itk private headers" >&5
- echo "$as_me: error: Can't find Itk private headers" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -10567,7 +12512,8 @@
- 
- #AC_SUBST(ITKLIB)
- 
--echo "$as_me:10570: checking for Tix private headers. srcdir=${srcdir}" >&5
-+
-+echo "$as_me:$LINENO: checking for Tix private headers. srcdir=${srcdir}" >&5
- echo $ECHO_N "checking for Tix private headers. srcdir=${srcdir}... $ECHO_C" >&6
- if test x"${ac_cv_c_tixh}" = x ; then
-   for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do
-@@ -10579,7 +12525,7 @@
- fi
- if test x"${ac_cv_c_tixh}" = x ; then
-   TIXHDIR="# no Tix private headers found"
--  { { echo "$as_me:10582: error: Can't find Tix private headers" >&5
-+  { { echo "$as_me:$LINENO: error: Can't find Tix private headers" >&5
- echo "$as_me: error: Can't find Tix private headers" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -10587,6 +12533,9 @@
-      TIXHDIR="-I${ac_cv_c_tixh}"
- fi
- 
-+
-+
-+
- 	   # now look for Tk library stuff
- 
- 	   case "${host}" in
-@@ -10602,6 +12551,7 @@
- 
- 	   # now look for Itcl library stuff
- 
-+
- #
- # Ok, lets find the itcl configuration
- # First, look for one uninstalled.
-@@ -10617,18 +12567,19 @@
-   withval="$with_itclconfig"
-   with_itclconfig=${withval}
- fi;
--  echo "$as_me:10620: checking for Itcl configuration" >&5
-+  echo "$as_me:$LINENO: checking for Itcl configuration" >&5
- echo $ECHO_N "checking for Itcl configuration... $ECHO_C" >&6
-   if test "${ac_cv_c_itclconfig+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-+
-   # First check to see if --with-itclconfig was specified.
-   if test x"${with_itclconfig}" != x ; then
-     if test -f "${with_itclconfig}/itclConfig.sh" ; then
-       ac_cv_c_itclconfig=`(cd ${with_itclconfig}; pwd)`
-     else
--      { { echo "$as_me:10631: error: ${with_itclconfig} directory doesn't contain itclConfig.sh" >&5
-+      { { echo "$as_me:$LINENO: error: ${with_itclconfig} directory doesn't contain itclConfig.sh" >&5
- echo "$as_me: error: ${with_itclconfig} directory doesn't contain itclConfig.sh" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-@@ -10674,12 +12625,12 @@
- 
-   if test x"${ac_cv_c_itclconfig}" = x ; then
-     ITCLCONFIG="# no Itcl configs found"
--    { echo "$as_me:10677: WARNING: Can't find Itcl configuration definitions" >&5
-+    { echo "$as_me:$LINENO: WARNING: Can't find Itcl configuration definitions" >&5
- echo "$as_me: WARNING: Can't find Itcl configuration definitions" >&2;}
-   else
-     no_itcl=
-     ITCLCONFIG=${ac_cv_c_itclconfig}/itclConfig.sh
--    echo "$as_me:10682: result: found $ITCLCONFIG" >&5
-+    echo "$as_me:$LINENO: result: found $ITCLCONFIG" >&5
- echo "${ECHO_T}found $ITCLCONFIG" >&6
-   fi
- fi
-@@ -10690,10 +12641,22 @@
-       . $ITCLCONFIG
-     fi
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- 	     ITCLLIB="${ITCL_BUILD_LIB_SPEC}"
- 	     ITCL_DEPS="${ITCL_LIB_FULL_PATH}"
-            fi
- 
-+
- 	   # now look for Itk library stuff
- 
- #
-@@ -10711,18 +12674,19 @@
-   withval="$with_itkconfig"
-   with_itkconfig=${withval}
- fi;
--  echo "$as_me:10714: checking for Itk configuration" >&5
-+  echo "$as_me:$LINENO: checking for Itk configuration" >&5
- echo $ECHO_N "checking for Itk configuration... $ECHO_C" >&6
-   if test "${ac_cv_c_itkconfig+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-+
-   # First check to see if --with-itkconfig was specified.
-   if test x"${with_itkconfig}" != x ; then
-     if test -f "${with_itkconfig}/itkConfig.sh" ; then
-       ac_cv_c_itkconfig=`(cd ${with_itkconfig}; pwd)`
-     else
--      { { echo "$as_me:10725: error: ${with_itkconfig} directory doesn't contain itkConfig.sh" >&5
-+      { { echo "$as_me:$LINENO: error: ${with_itkconfig} directory doesn't contain itkConfig.sh" >&5
- echo "$as_me: error: ${with_itkconfig} directory doesn't contain itkConfig.sh" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-@@ -10768,22 +12732,34 @@
- 
-   if test x"${ac_cv_c_itkconfig}" = x ; then
-     ITKCONFIG="# no Itk configs found"
--    { echo "$as_me:10771: WARNING: Can't find Itk configuration definitions" >&5
-+    { echo "$as_me:$LINENO: WARNING: Can't find Itk configuration definitions" >&5
- echo "$as_me: WARNING: Can't find Itk configuration definitions" >&2;}
-   else
-     no_itk=
-     ITKCONFIG=${ac_cv_c_itkconfig}/itkConfig.sh
--    echo "$as_me:10776: result: found $ITKCONFIG" >&5
-+    echo "$as_me:$LINENO: result: found $ITKCONFIG" >&5
- echo "${ECHO_T}found $ITKCONFIG" >&6
-   fi
- fi
- 
-+
-            if test -z "${no_itcl}"; then
- 
-     if test -f "$ITKCONFIG" ; then
-       . $ITKCONFIG
-     fi
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- 	     ITKLIB="${ITK_BUILD_LIB_SPEC}"
- 	     ITK_DEPS="${ITK_LIB_FULL_PATH}"
-            fi
-@@ -10805,18 +12781,19 @@
-   withval="$with_tixconfig"
-   with_tixconfig=${withval}
- fi;
--  echo "$as_me:10808: checking for Tix configuration" >&5
-+  echo "$as_me:$LINENO: checking for Tix configuration" >&5
- echo $ECHO_N "checking for Tix configuration... $ECHO_C" >&6
-   if test "${ac_cv_c_tixconfig+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-+
-   # First check to see if --with-tixconfig was specified.
-   if test x"${with_tixconfig}" != x ; then
-     if test -f "${with_tixconfig}/tixConfig.sh" ; then
-       ac_cv_c_tixconfig=`(cd ${with_tixconfig}; pwd)`
-     else
--      { { echo "$as_me:10819: error: ${with_tixconfig} directory doesn't contain tixConfig.sh" >&5
-+      { { echo "$as_me:$LINENO: error: ${with_tixconfig} directory doesn't contain tixConfig.sh" >&5
- echo "$as_me: error: ${with_tixconfig} directory doesn't contain tixConfig.sh" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-@@ -10866,21 +12843,29 @@
- 
-   if test x"${ac_cv_c_tixconfig}" = x ; then
-     TIXCONFIG="# no Tix configs found"
--    { echo "$as_me:10869: WARNING: Can't find Tix configuration definitions" >&5
-+    { echo "$as_me:$LINENO: WARNING: Can't find Tix configuration definitions" >&5
- echo "$as_me: WARNING: Can't find Tix configuration definitions" >&2;}
-   else
-     no_tix=
-     TIXCONFIG=${ac_cv_c_tixconfig}/tixConfig.sh
--    echo "$as_me:10874: result: found $TIXCONFIG" >&5
-+    echo "$as_me:$LINENO: result: found $TIXCONFIG" >&5
- echo "${ECHO_T}found $TIXCONFIG" >&6
-   fi
- fi
- 
--           if test -z "${no_tix}"; then
- 
--    if test -f "$TIXCONFIG" ; then
--      . $TIXCONFIG
--    fi
-+           if test -z "${no_tix}"; then
-+
-+    if test -f "$TIXCONFIG" ; then
-+      . $TIXCONFIG
-+    fi
-+
-+
-+
-+
-+
-+
-+
- 
- 	     TIXLIB="${TIX_BUILD_LIB_SPEC}"
- 	     TIX_DEPS="${TIX_BUILD_LOCATION}/${TIX_LIB_FILE}"
-@@ -10924,9 +12909,25 @@
-     fi
- fi
- 
--echo "$as_me:10927: checking for X" >&5
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+echo "$as_me:$LINENO: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6
- 
-+
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-   withval="$with_x"
-@@ -10950,10 +12951,10 @@
- if mkdir conftest.dir; then
-   cd conftest.dir
-   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
--  cat >Imakefile <<'EOF'
-+  cat >Imakefile <<'_ACEOF'
- acfindx:
- 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
--EOF
-+_ACEOF
-   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-     eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-@@ -11021,17 +13022,17 @@
-   # Guess where to find include files, by looking for Intrinsic.h.
-   # First, try using that file with no special directory specified.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11024 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <X11/Intrinsic.h>
- _ACEOF
--if { (eval echo "$as_me:11028: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:11034: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -11064,9 +13065,15 @@
-   ac_save_LIBS=$LIBS
-   LIBS="-lXt $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11067 "configure"
-+#line $LINENO "configure"
- #include "confdefs.h"
- #include <X11/Intrinsic.h>
-+#ifdef F77_DUMMY_MAIN
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int F77_DUMMY_MAIN() { return 1; }
-+#endif
- int
- main ()
- {
-@@ -11076,16 +13083,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11079: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11082: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11085: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11088: \$? = $ac_status" >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
-@@ -11123,7 +13130,7 @@
- fi # $with_x != no
- 
- if test "$have_x" != yes; then
--  echo "$as_me:11126: result: $have_x" >&5
-+  echo "$as_me:$LINENO: result: $have_x" >&5
- echo "${ECHO_T}$have_x" >&6
-   no_x=yes
- else
-@@ -11133,10 +13140,12 @@
-   # Update the cache value to reflect the command line values.
-   ac_cv_have_x="have_x=yes \
- 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
--  echo "$as_me:11136: result: libraries $x_libraries, headers $x_includes" >&5
-+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
- echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
- fi
- 
-+
-+
- # Unlike the sim directory, whether a simulator is linked is controlled by
- # presence of a SIM= and a SIM_OBS= definition in the target '.mt' file.
- # This code just checks for a few cases where we'd like to ignore those
-@@ -11168,12 +13177,26 @@
- else
-     IGNORE_SIM=""
-     IGNORE_SIM_OBS=""
--    cat >>confdefs.h <<\EOF
-+    cat >>confdefs.h <<\_ACEOF
- #define WITH_SIM 1
--EOF
-+_ACEOF
- 
- fi
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- # Begin stuff to support --enable-shared
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
-@@ -11233,6 +13256,7 @@
-     ;;
- esac
- 
-+
- # End stuff to support --enable-shared
- 
- # target_subdir is used by the testsuite to find the target libraries.
-@@ -11241,6 +13265,7 @@
-     target_subdir="${target_alias}/"
- fi
- 
-+
- frags=
- 
- host_makefile_frag="${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh"
-@@ -11256,7 +13281,7 @@
-     # like NATDEPFILES is needed.  Cross debuggers don't need .mh
-     # since it no longer contains anything useful.
-     if test "${target}" = "${host}"; then
--	{ { echo "$as_me:11259: error: unable to locate host configuration file ${host_makefile_frag}" >&5
-+	{ { echo "$as_me:$LINENO: error: unable to locate host configuration file ${host_makefile_frag}" >&5
- echo "$as_me: error: unable to locate host configuration file ${host_makefile_frag}" >&2;}
-    { (exit 1); exit 1; }; }
-     else
-@@ -11266,14 +13291,14 @@
- frags="$frags $host_makefile_frag"
- 
- if test ! -f "${target_makefile_frag}"; then
--{ { echo "$as_me:11269: error: unable to locate target configuration file ${target_makefile_frag}" >&5
-+{ { echo "$as_me:$LINENO: error: unable to locate target configuration file ${target_makefile_frag}" >&5
- echo "$as_me: error: unable to locate target configuration file ${target_makefile_frag}" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- frags="$frags $target_makefile_frag"
- 
- if test ! -z "${native_makefile_frag}" && test ! -f "${native_makefile_frag}"; then
--{ { echo "$as_me:11276: error: unable to locate native target configuration file ${native_makefile_frag}" >&5
-+{ { echo "$as_me:$LINENO: error: unable to locate native target configuration file ${native_makefile_frag}" >&5
- echo "$as_me: error: unable to locate native target configuration file ${native_makefile_frag}" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -11284,6 +13309,7 @@
- configdirs=`echo $configdirs | sed 's/gdbserver//'`
- fi
- 
-+
- hostfile=`sed -n '
- s/XM_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
- ' ${host_makefile_frag}`
-@@ -11302,6 +13328,7 @@
- ' ${native_makefile_frag}`
- fi
- 
-+
- # AC_SUBST_FILE will crash if native_makefile_frag is null
- if test "${native_makefile_frag}" = ""; then
- native_makefile_subst_frag=/dev/null
-@@ -11309,6 +13336,11 @@
- native_makefile_subst_frag="${native_makefile_frag}"
- fi
- 
-+
-+
-+
-+
-+
- # New targets should just set gdb_multi_arch=yes in configure.tgt.
- # Old targets being converted can either do that or set GDB_MULTI_ARCH
- # in the target specific makefile frag.  Eventually gdb_multi_arch=yes
-@@ -11321,24 +13353,24 @@
-     esac
- fi
- if test x"${GDB_MULTI_ARCH}" != x ; then
--    cat >>confdefs.h <<EOF
-+    cat >>confdefs.h <<_ACEOF
- #define GDB_MULTI_ARCH ${GDB_MULTI_ARCH}
--EOF
-+_ACEOF
- 
- fi
- # Warn the user when they use an old practice
- case "${GDB_MULTI_ARCH}" in
-     "" ) ;;
-     0 | GDB_MULTI_ARCH_PARTIAL | 1 | GDB_MULTI_ARCH_TM | 2 )
--	{ echo "$as_me:11333: WARNING: \"GDB: Target is not pure multi-arch\"" >&5
-+	{ echo "$as_me:$LINENO: WARNING: \"GDB: Target is not pure multi-arch\"" >&5
- echo "$as_me: WARNING: \"GDB: Target is not pure multi-arch\"" >&2;} ;;
-     GDB_MULTI_ARCH_PURE )
- 	if test x"${targetfile}" != x ; then
--	    { echo "$as_me:11337: WARNING: \"GDB: Ignoring TM_FILE in ${target_makefile_frag}\"" >&5
-+	    { echo "$as_me:$LINENO: WARNING: \"GDB: Ignoring TM_FILE in ${target_makefile_frag}\"" >&5
- echo "$as_me: WARNING: \"GDB: Ignoring TM_FILE in ${target_makefile_frag}\"" >&2;}
- 	    targetfile=""
- 	fi ;;
--    *)  { { echo "$as_me:11341: error: \"GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}\"" >&5
-+    *)  { { echo "$as_me:$LINENO: error: \"GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}\"" >&5
- echo "$as_me: error: \"GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}\"" >&2;}
-    { (exit 1); exit 1; }; };;
- esac
-@@ -11350,19 +13382,21 @@
- 
- # ``gdbserver'' can only be built in a native configuration.
- if test x"${target}" = x"${host}"; then
--    echo "$as_me:11353: checking whether gdbserver is supported on this host" >&5
-+    echo "$as_me:$LINENO: checking whether gdbserver is supported on this host" >&5
- echo $ECHO_N "checking whether gdbserver is supported on this host... $ECHO_C" >&6
-     if test x"${build_gdbserver}" = xyes ; then
- 	configdirs="${configdirs} gdbserver"
- 	SUBDIRS="${SUBDIRS} gdbserver"
--	echo "$as_me:11358: result: yes" >&5
-+	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-     else
--	echo "$as_me:11361: result: no" >&5
-+	echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-     fi
- fi
- 
-+
-+
- # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
- # (NAT_FILE) is not set in config/*/*.m[ht] files, we link to an empty
- # version.
-@@ -11377,12 +13411,13 @@
-     GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}"
-     files="${files} ${GDB_XM_FILE}"
-     links="${links} xm.h"
--    cat >>confdefs.h <<EOF
-+    cat >>confdefs.h <<_ACEOF
- #define GDB_XM_FILE ${GDB_XM_FILE}
--EOF
-+_ACEOF
- 
- fi
- 
-+
- rm -f tm.h
- tm_h=""
- if test "${targetfile}" != ""; then
-@@ -11390,12 +13425,13 @@
-     GDB_TM_FILE="config/${gdb_target_cpu}/${targetfile}"
-     files="${files} ${GDB_TM_FILE}"
-     links="${links} tm.h"
--    cat >>confdefs.h <<EOF
-+    cat >>confdefs.h <<_ACEOF
- #define GDB_TM_FILE ${GDB_TM_FILE}
--EOF
-+_ACEOF
- 
- fi
- 
-+
- rm -f nm.h
- nm_h=""
- if test "${nativefile}" != ""; then
-@@ -11403,23 +13439,25 @@
-     GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}"
-     files="${files} ${GDB_NM_FILE}"
-     links="${links} nm.h"
--    cat >>confdefs.h <<EOF
-+    cat >>confdefs.h <<_ACEOF
- #define GDB_NM_FILE ${GDB_NM_FILE}
--EOF
-+_ACEOF
- 
- fi
- 
--echo "$as_me:11412: checking whether ln -s works" >&5
-+
-+echo "$as_me:$LINENO: checking whether ln -s works" >&5
- echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:11416: result: yes" >&5
-+  echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:11419: result: no, using $LN_S" >&5
-+  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6
- fi
- 
-+
- ac_sources="$files"
- ac_dests="$links"
- while test -n "$ac_sources"; do
-@@ -11429,6 +13467,11 @@
- done
- ac_config_links="$ac_config_links $ac_config_links_1"
- 
-+
-+
-+
-+
-+
- subdirs="$subdirs $configdirs"
- 
- ac_config_files="$ac_config_files Makefile .gdbinit:gdbinit.in"
-@@ -11510,7 +13553,7 @@
- DEFS=-DHAVE_CONFIG_H
- 
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--  { { echo "$as_me:11513: error: conditional \"MAINTAINER_MODE\" was never defined.
-+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
- echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-@@ -11520,22 +13563,25 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:11523: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
--# Generated automatically by configure.
-+# Generated by $as_me.
- # Run this file to recreate the current configuration.
- # Compiler output produced by configure, useful for debugging
- # configure, is in config.log if it exists.
- 
- debug=false
- SHELL=\${CONFIG_SHELL-$SHELL}
--ac_cs_invocation="\$0 \$@"
--
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+## --------------------- ##
-+## M4sh Initialization.  ##
-+## --------------------- ##
-+
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-@@ -11544,8 +13590,167 @@
-   set -o posix
- fi
- 
-+# NLS nuisances.
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+  as_unset=unset
-+else
-+  as_unset=false
-+fi
-+
-+(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-+    { $as_unset LANG || test "${LANG+set}" != set; } ||
-+      { LANG=C; export LANG; }
-+(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-+    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-+      { LC_ALL=C; export LC_ALL; }
-+(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-+    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-+      { LC_TIME=C; export LC_TIME; }
-+(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-+    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-+      { LC_CTYPE=C; export LC_CTYPE; }
-+(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-+    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-+      { LANGUAGE=C; export LANGUAGE; }
-+(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-+    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-+      { LC_COLLATE=C; export LC_COLLATE; }
-+(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-+    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-+      { LC_NUMERIC=C; export LC_NUMERIC; }
-+(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-+    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-+      { LC_MESSAGES=C; export LC_MESSAGES; }
-+
-+
- # Name of the executable.
--as_me=`echo "$0" |sed 's,.*[\\/],,'`
-+as_me=`(basename "$0") 2>/dev/null ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)$' \| \
-+	 .     : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\/\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conftest.sh
-+  echo  "exit 0"   >>conftest.sh
-+  chmod +x conftest.sh
-+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conftest.sh
-+fi
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-+  # Find who we are.  Look in the path if we contain no path at all
-+  # relative or not.
-+  case $0 in
-+    *[\\/]* ) as_myself=$0 ;;
-+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+       ;;
-+  esac
-+  # We did not find ourselves, most probably we were run as `sh COMMAND'
-+  # in which case we are not to be found in the path.
-+  if test "x$as_myself" = x; then
-+    as_myself=$0
-+  fi
-+  if test ! -f "$as_myself"; then
-+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-+   { (exit 1); exit 1; }; }
-+  fi
-+  case $CONFIG_SHELL in
-+  '')
-+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for as_base in sh bash ksh sh5; do
-+	 case $as_dir in
-+	 /*)
-+	   if ("$as_dir/$as_base" -c '
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-+	     CONFIG_SHELL=$as_dir/$as_base
-+	     export CONFIG_SHELL
-+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+	   fi;;
-+	 esac
-+       done
-+done
-+;;
-+  esac
-+
-+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+  # uniformly replaced by the line number.  The first 'sed' inserts a
-+  # line-number line before each line; the second 'sed' does the real
-+  # work.  The second script uses 'N' to pair each line-number line
-+  # with the numbered line, and appends trailing '-' during
-+  # substitution so that $LINENO is not a special case at line end.
-+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-+  sed '=' <$as_myself |
-+    sed '
-+      N
-+      s,$,-,
-+      : loop
-+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      t loop
-+      s,-$,,
-+      s,^['$as_cr_digits']*\n,,
-+    ' >$as_me.lineno &&
-+  chmod +x $as_me.lineno ||
-+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+  # Don't try to exec as it changes $[0], causing all sort of problems
-+  # (the dirname of $[0] is not the place where we might find the
-+  # original and so on.  Autoconf is especially sensible to this).
-+  . ./$as_me.lineno
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+  *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T='	' ;;
-+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
- 
- if expr a : '\(a\)' >/dev/null 2>&1; then
-   as_expr=expr
-@@ -11573,22 +13778,12 @@
- 
- as_executable_p="test -f"
- 
--# Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
- 
--# NLS nuisances.
--$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
--$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
--$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
--$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
--$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
--$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
--$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
--$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
- 
- # IFS
- # We need space, tab and new line, in precisely that order.
-@@ -11597,10 +13792,34 @@
- IFS=" 	$as_nl"
- 
- # CDPATH.
--$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
-+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
- 
- exec 6>&1
- 
-+# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling.  Logging --version etc. is OK.
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+} >&5
-+cat >&5 <<_CSEOF
-+
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.53.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+_CSEOF
-+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-+echo >&5
- _ACEOF
- 
- # Files that config.status was made for.
-@@ -11620,7 +13839,7 @@
-   echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
- fi
- 
--cat >>$CONFIG_STATUS <<\EOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
-@@ -11650,12 +13869,12 @@
- $config_commands
- 
- Report bugs to <bug-autoconf@gnu.org>."
--EOF
-+_ACEOF
- 
--cat >>$CONFIG_STATUS <<EOF
-+cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.52,
-+configured by $0, generated by GNU Autoconf 2.53,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -11664,9 +13883,9 @@
- gives unlimited permission to copy, distribute and modify it."
- srcdir=$srcdir
- INSTALL="$INSTALL"
--EOF
-+_ACEOF
- 
--cat >>$CONFIG_STATUS <<\EOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- # If no file are specified by the user, then we need to provide default
- # value.  By we need to know if files were specified by the user.
- ac_need_defaults=:
-@@ -11688,18 +13907,18 @@
- 
-   case $1 in
-   # Handling of the options.
--EOF
--cat >>$CONFIG_STATUS <<EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
--EOF
--cat >>$CONFIG_STATUS <<\EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-   --version | --vers* | -V )
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:11702: error: ambiguous option: $1
-+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -11718,7 +13937,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:11721: error: unrecognized option: $1
-+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -11730,36 +13949,24 @@
-   shift
- done
- 
--exec 5>>config.log
--cat >&5 << _ACEOF
--
--## ----------------------- ##
--## Running config.status.  ##
--## ----------------------- ##
--
--This file was extended by $as_me 2.52, executed with
--  CONFIG_FILES    = $CONFIG_FILES
--  CONFIG_HEADERS  = $CONFIG_HEADERS
--  CONFIG_LINKS    = $CONFIG_LINKS
--  CONFIG_COMMANDS = $CONFIG_COMMANDS
--  > $ac_cs_invocation
--on `(hostname || uname -n) 2>/dev/null | sed 1q`
--
- _ACEOF
--EOF
- 
--cat >>$CONFIG_STATUS <<EOF
-+cat >>$CONFIG_STATUS <<_ACEOF
- #
- # INIT-COMMANDS section.
- #
- 
-+
- gdb_host_cpu=$gdb_host_cpu
- gdb_target_cpu=$gdb_target_cpu
- nativefile=$nativefile
- 
--EOF
- 
--cat >>$CONFIG_STATUS <<\EOF
-+_ACEOF
-+
-+
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
- for ac_config_target in $ac_config_targets
- do
-   case "$ac_config_target" in
-@@ -11769,7 +13976,7 @@
-   "$ac_config_links_1" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
--  *) { { echo "$as_me:11772: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -11808,9 +14015,9 @@
-    { (exit 1); exit 1; }
- }
- 
--EOF
-+_ACEOF
- 
--cat >>$CONFIG_STATUS <<EOF
-+cat >>$CONFIG_STATUS <<_ACEOF
- 
- #
- # CONFIG_FILES section.
-@@ -11823,6 +14030,12 @@
-   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
- s,@SHELL@,$SHELL,;t t
-+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
- s,@exec_prefix@,$exec_prefix,;t t
- s,@prefix@,$prefix,;t t
- s,@program_transform_name@,$program_transform_name,;t t
-@@ -11838,19 +14051,13 @@
- s,@oldincludedir@,$oldincludedir,;t t
- s,@infodir@,$infodir,;t t
- s,@mandir@,$mandir,;t t
--s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
- s,@build_alias@,$build_alias,;t t
- s,@host_alias@,$host_alias,;t t
- s,@target_alias@,$target_alias,;t t
-+s,@DEFS@,$DEFS,;t t
- s,@ECHO_C@,$ECHO_C,;t t
- s,@ECHO_N@,$ECHO_N,;t t
- s,@ECHO_T@,$ECHO_T,;t t
--s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s,@DEFS@,$DEFS,;t t
- s,@LIBS@,$LIBS,;t t
- s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
- s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-@@ -11863,6 +14070,9 @@
- s,@EXEEXT@,$EXEEXT,;t t
- s,@OBJEXT@,$OBJEXT,;t t
- s,@CPP@,$CPP,;t t
-+s,@DIR_aif@,$DIR_aif,;t t
-+s,@INCLUDE_aif@,$INCLUDE_aif,;t t
-+s,@LIB_aif@,$LIB_aif,;t t
- s,@build@,$build,;t t
- s,@build_cpu@,$build_cpu,;t t
- s,@build_vendor@,$build_vendor,;t t
-@@ -12010,9 +14220,9 @@
- s,@subdirs@,$subdirs,;t t
- CEOF
- 
--EOF
-+_ACEOF
- 
--  cat >>$CONFIG_STATUS <<\EOF
-+  cat >>$CONFIG_STATUS <<\_ACEOF
-   # Split the substitutions into bite-sized pieces for seds with
-   # small command number limits, like on Digital OSF/1 and HP-UX.
-   ac_max_sed_lines=48
-@@ -12051,8 +14261,8 @@
-   fi
- fi # test -n "$CONFIG_FILES"
- 
--EOF
--cat >>$CONFIG_STATUS <<\EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case $ac_file in
-@@ -12066,7 +14276,8 @@
-   esac
- 
-   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-          X"$ac_file" : 'X\(//\)[^/]' \| \
-          X"$ac_file" : 'X\(//\)$' \| \
-          X"$ac_file" : 'X\(/\)' \| \
-@@ -12077,8 +14288,7 @@
-   	  /^X\(\/\/\)$/{ s//\1/; q; }
-   	  /^X\(\/\).*/{ s//\1/; q; }
-   	  s/.*/./; q'`
--  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
--    { case "$ac_dir" in
-+  { case "$ac_dir" in
-   [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-   *)                      as_incr_dir=.;;
- esac
-@@ -12089,48 +14299,68 @@
-     ?:) as_incr_dir=$as_mkdir_dir ;;
-     *)
-       as_incr_dir=$as_incr_dir/$as_mkdir_dir
--      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-+      test -d "$as_incr_dir" ||
-+        mkdir "$as_incr_dir" ||
-+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }
-     ;;
-   esac
- done; }
- 
--    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
--    # A "../" for each directory in $ac_dir_suffix.
--    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
--  else
--    ac_dir_suffix= ac_dots=
--  fi
-+  ac_builddir=.
- 
--  case $srcdir in
--  .)  ac_srcdir=.
--      if test -z "$ac_dots"; then
--         ac_top_srcdir=.
--      else
--         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
--      fi ;;
--  [\\/]* | ?:[\\/]* )
--      ac_srcdir=$srcdir$ac_dir_suffix;
--      ac_top_srcdir=$srcdir ;;
-+if test "$ac_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-   *) # Relative path.
--    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_dots$srcdir ;;
--  esac
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
- 
-   case $INSTALL in
-   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
--  *) ac_INSTALL=$ac_dots$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:12125: creating $ac_file" >&5
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated automatically by config.status.  */
--  configure_input="Generated automatically from `echo $ac_file_in |
--                                                 sed 's,.*/,,'` by configure."
-+  #    /* config.h.  Generated by config.status.  */
-+  if test x"$ac_file" = x-; then
-+    configure_input=
-+  else
-+    configure_input="$ac_file.  "
-+  fi
-+  configure_input=$configure_input"Generated from `echo $ac_file_in |
-+                                     sed 's,.*/,,'` by configure."
- 
-   # First look for the input files in the build tree, otherwise in the
-   # src tree.
-@@ -12140,7 +14370,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:12143: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -12153,23 +14383,29 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:12156: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-       esac
-     done` || { (exit 1); exit 1; }
--EOF
--cat >>$CONFIG_STATUS <<EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
- $extrasub
--EOF
--cat >>$CONFIG_STATUS <<\EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
- s,@configure_input@,$configure_input,;t t
- s,@srcdir@,$ac_srcdir,;t t
-+s,@abs_srcdir@,$ac_abs_srcdir,;t t
- s,@top_srcdir@,$ac_top_srcdir,;t t
-+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-+s,@builddir@,$ac_builddir,;t t
-+s,@abs_builddir@,$ac_abs_builddir,;t t
-+s,@top_builddir@,$ac_top_builddir,;t t
-+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
- s,@INSTALL@,$ac_INSTALL,;t t
- " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-   rm -f $tmp/stdin
-@@ -12181,8 +14417,8 @@
-   fi
- 
- done
--EOF
--cat >>$CONFIG_STATUS <<\EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
- #
- # CONFIG_HEADER section.
-@@ -12214,7 +14450,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:12217: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -12225,7 +14461,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:12228: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -12238,7 +14474,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:12241: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -12247,7 +14483,7 @@
-   # Remove the trailing spaces.
-   sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
- 
--EOF
-+_ACEOF
- 
- # Transform confdefs.h into two sed scripts, `conftest.defines' and
- # `conftest.undefs', that substitutes the proper values into
-@@ -12263,16 +14499,16 @@
- # `end' is used to avoid that the second main sed command (meant for
- # 0-ary CPP macros) applies to n-ary macro definitions.
- # See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\EOF
-+cat >confdef2sed.sed <<\_ACEOF
- s/[\\&,]/\\&/g
- s,[\\$`],\\&,g
- t clear
- : clear
--s,^[ 	]*#[ 	]*define[ 	][ 	]*\(\([^ 	(][^ 	(]*\)([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
-+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
- t end
- s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
- : end
--EOF
-+_ACEOF
- # If some macros were called several times there might be several times
- # the same #defines, which is useless.  Nevertheless, we may not want to
- # sort them, since we want the *last* AC-DEFINE to be honored.
-@@ -12283,9 +14519,9 @@
- # This sed command replaces #undef with comments.  This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\EOF
-+cat >>conftest.undefs <<\_ACEOF
- s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--EOF
-+_ACEOF
- 
- # Break up conftest.defines because some shells have a limit on the size
- # of here documents, and old seds have small limits too (100 cmds).
-@@ -12342,23 +14578,24 @@
- done
- rm -f conftest.undefs
- 
--cat >>$CONFIG_STATUS <<\EOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated automatically by config.status.  */
-+  #    /* config.h.  Generated by config.status.  */
-   if test x"$ac_file" = x-; then
--    echo "/* Generated automatically by configure.  */" >$tmp/config.h
-+    echo "/* Generated by configure.  */" >$tmp/config.h
-   else
--    echo "/* $ac_file.  Generated automatically by configure.  */" >$tmp/config.h
-+    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-   fi
-   cat $tmp/in >>$tmp/config.h
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:12358: $ac_file is unchanged" >&5
-+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
--      ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-          X"$ac_file" : 'X\(//\)[^/]' \| \
-          X"$ac_file" : 'X\(//\)$' \| \
-          X"$ac_file" : 'X\(/\)' \| \
-@@ -12369,8 +14606,7 @@
-   	  /^X\(\/\/\)$/{ s//\1/; q; }
-   	  /^X\(\/\).*/{ s//\1/; q; }
-   	  s/.*/./; q'`
--      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
--        { case "$ac_dir" in
-+      { case "$ac_dir" in
-   [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-   *)                      as_incr_dir=.;;
- esac
-@@ -12381,12 +14617,15 @@
-     ?:) as_incr_dir=$as_mkdir_dir ;;
-     *)
-       as_incr_dir=$as_incr_dir/$as_mkdir_dir
--      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-+      test -d "$as_incr_dir" ||
-+        mkdir "$as_incr_dir" ||
-+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }
-     ;;
-   esac
- done; }
- 
--      fi
-       rm -f $ac_file
-       mv $tmp/config.h $ac_file
-     fi
-@@ -12395,8 +14634,8 @@
-     rm -f $tmp/config.h
-   fi
- done
--EOF
--cat >>$CONFIG_STATUS <<\EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
- #
- # CONFIG_LINKS section.
-@@ -12406,18 +14645,19 @@
-   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
- 
--  { echo "$as_me:12409: linking $srcdir/$ac_source to $ac_dest" >&5
-+  { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
- echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
- 
-   if test ! -r $srcdir/$ac_source; then
--    { { echo "$as_me:12413: error: $srcdir/$ac_source: File not found" >&5
--echo "$as_me: error: $srcdir/$ac_source: File not found" >&2;}
-+    { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
-+echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-   rm -f $ac_dest
- 
-   # Make relative symlinks.
--  ac_dest_dir=`$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+  ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
-+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-          X"$ac_dest" : 'X\(//\)[^/]' \| \
-          X"$ac_dest" : 'X\(//\)$' \| \
-          X"$ac_dest" : 'X\(/\)' \| \
-@@ -12428,8 +14668,7 @@
-   	  /^X\(\/\/\)$/{ s//\1/; q; }
-   	  /^X\(\/\).*/{ s//\1/; q; }
-   	  s/.*/./; q'`
--  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
--    { case "$ac_dest_dir" in
-+  { case "$ac_dest_dir" in
-   [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-   *)                      as_incr_dir=.;;
- esac
-@@ -12440,32 +14679,62 @@
-     ?:) as_incr_dir=$as_mkdir_dir ;;
-     *)
-       as_incr_dir=$as_incr_dir/$as_mkdir_dir
--      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-+      test -d "$as_incr_dir" ||
-+        mkdir "$as_incr_dir" ||
-+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dest_dir\"" >&5
-+echo "$as_me: error: cannot create \"$ac_dest_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }
-     ;;
-   esac
- done; }
- 
--    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's,^\./,,'`"
--    # A "../" for each directory in $ac_dest_dir_suffix.
--    ac_dots=`echo $ac_dest_dir_suffix|sed 's,/[^/]*,../,g'`
--  else
--    ac_dest_dir_suffix= ac_dots=
--  fi
-+  ac_builddir=.
-+
-+if test "$ac_dest_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-+  *) # Relative path.
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dest_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dest_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dest_dir" && cd $ac_top_builddir && pwd`
-+ac_abs_srcdir=`cd "$ac_dest_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dest_dir" && cd $ac_top_srcdir && pwd`
-+
- 
-   case $srcdir in
-   [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
--      *) ac_rel_source=$ac_dots$srcdir/$ac_source ;;
-+      *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
-   esac
- 
-   # Make a symlink if possible; otherwise try a hard link.
-   ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-     ln $srcdir/$ac_source $ac_dest ||
--    { { echo "$as_me:12463: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
-+    { { echo "$as_me:$LINENO: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
- echo "$as_me: error: cannot link $ac_dest to $srcdir/$ac_source" >&2;}
-    { (exit 1); exit 1; }; }
- done
--EOF
--cat >>$CONFIG_STATUS <<\EOF
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
- #
- # CONFIG_COMMANDS section.
-@@ -12473,7 +14742,53 @@
- for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+         X"$ac_dest" : 'X\(//\)[^/]' \| \
-+         X"$ac_dest" : 'X\(//\)$' \| \
-+         X"$ac_dest" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
-+echo X"$ac_dest" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+  	  /^X\(\/\/\)$/{ s//\1/; q; }
-+  	  /^X\(\/\).*/{ s//\1/; q; }
-+  	  s/.*/./; q'`
-+  ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-+  *) # Relative path.
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
- 
-+
-+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-+echo "$as_me: executing $ac_dest commands" >&6;}
-   case $ac_dest in
-     default )
- if test "${nativefile}" = ""; then
-@@ -12492,6 +14807,7 @@
- ' < Makefile > Makefile.tmp
- mv -f Makefile.tmp Makefile
- 
-+
- case x$CONFIG_HEADERS in
- xconfig.h:config.in)
- echo > stamp-h ;;
-@@ -12499,15 +14815,16 @@
-  ;;
-   esac
- done
--EOF
-+_ACEOF
- 
--cat >>$CONFIG_STATUS <<\EOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
- 
- { (exit 0); exit 0; }
--EOF
-+_ACEOF
- chmod +x $CONFIG_STATUS
- ac_clean_files=$ac_clean_files_save
- 
-+
- # configure is writing to config.log, and then calls config.status.
- # config.status does its own redirection, appending to config.log.
- # Unfortunately, on DOS this fails, as config.log is still kept open
-@@ -12553,71 +14870,92 @@
-       ac_prev=srcdir ;;
-     -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-       ;;
-+    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+      ac_prev=prefix ;;
-+    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+      ;;
-     *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-     esac
-   done
- 
--  for ac_subdir in : $subdirs; do test "x$ac_subdir" = x: && continue
-+  # Always prepend --prefix to ensure using the same prefix
-+  # in subdir configurations.
-+  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-+
-+  ac_popdir=`pwd`
-+  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
- 
-     # Do not complain, so a configure script can configure whichever
-     # parts of a large source tree are present.
--    test -d $srcdir/$ac_subdir || continue
-+    test -d $srcdir/$ac_dir || continue
- 
--    { echo "$as_me:12566: configuring in $ac_subdir" >&5
--echo "$as_me: configuring in $ac_subdir" >&6;}
--    case $srcdir in
--    .) ;;
--    *) { case "./$ac_subdir" in
-+    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-+echo "$as_me: configuring in $ac_dir" >&6;}
-+    { case "$ac_dir" in
-   [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-   *)                      as_incr_dir=.;;
- esac
--as_dummy="./$ac_subdir"
-+as_dummy="$ac_dir"
- for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-   case $as_mkdir_dir in
-     # Skip DOS drivespec
-     ?:) as_incr_dir=$as_mkdir_dir ;;
-     *)
-       as_incr_dir=$as_incr_dir/$as_mkdir_dir
--      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
-+      test -d "$as_incr_dir" ||
-+        mkdir "$as_incr_dir" ||
-+	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
-+   { (exit 1); exit 1; }; }
-     ;;
-   esac
- done; }
- 
--       if test -d ./$ac_subdir; then :;
--       else
--         { { echo "$as_me:12588: error: cannot create \`pwd\`/$ac_subdir" >&5
--echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;}
--   { (exit 1); exit 1; }; }
--       fi
--       ;;
--    esac
-+    ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  # A "../" for each directory in $ac_dir_suffix.
-+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+  ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+  .)  # No --srcdir option.  We are building in place.
-+    ac_srcdir=.
-+    if test -z "$ac_top_builddir"; then
-+       ac_top_srcdir=.
-+    else
-+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+    fi ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir ;;
-+  *) # Relative path.
-+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
- 
--    ac_popdir=`pwd`
--    cd $ac_subdir
- 
--    # A "../" for each directory in /$ac_subdir.
--    ac_dots=`echo $ac_subdir |
--             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
--
--    case $srcdir in
--    .) # No --srcdir option.  We are building in place.
--      ac_sub_srcdir=$srcdir ;;
--    [\\/]* | ?:[\\/]* ) # Absolute path.
--      ac_sub_srcdir=$srcdir/$ac_subdir ;;
--    *) # Relative path.
--      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
--    esac
-+    cd $ac_dir
- 
-     # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_sub_srcdir/configure.gnu; then
--      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'"
--    elif test -f $ac_sub_srcdir/configure; then
--      ac_sub_configure="$SHELL '$ac_sub_srcdir/configure'"
--    elif test -f $ac_sub_srcdir/configure.in; then
-+    if test -f $ac_srcdir/configure.gnu; then
-+      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-+    elif test -f $ac_srcdir/configure; then
-+      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-+    elif test -f $ac_srcdir/configure.in; then
-       ac_sub_configure=$ac_configure
-     else
--      { echo "$as_me:12619: WARNING: no configuration information is in $ac_subdir" >&5
--echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
-+      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-       ac_sub_configure=
-     fi
- 
-@@ -12627,21 +14965,22 @@
-       case $cache_file in
-       [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-       *) # Relative path.
--        ac_sub_cache_file=$ac_dots$cache_file ;;
-+        ac_sub_cache_file=$ac_top_builddir$cache_file ;;
-       esac
- 
--      { echo "$as_me:12633: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5
--echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;}
-+      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-       # The eval makes quoting arguments work.
-       eval $ac_sub_configure $ac_sub_configure_args \
--           --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
--        { { echo "$as_me:12638: error: $ac_sub_configure failed for $ac_subdir" >&5
--echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;}
-+           --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-+        { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
- 
-     cd $ac_popdir
-   done
- fi
-+
- 
- exit 0
---- src-old/gdb/config.in	Wed Aug 28 12:07:57 2002
-+++ src/gdb/config.in	Sun Mar 16 21:20:19 2003
-@@ -593,3 +593,6 @@
- 
- /* Define as `fork' if `vfork' does not work. */
- #undef vfork
-+
-+/* Define for AIF support. */
-+#undef HAVE_AIF

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.0.patch b/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.0.patch
deleted file mode 100644
index 3ffce09..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.0.patch
+++ /dev/null

@@ -1,4394 +0,0 @@
---- /dev/null	Tue Mar 25 17:08:18 2003
-+++ gdb-5.0/gdb/aif-valprint.c	Tue Mar 25 17:15:29 2003
-@@ -0,0 +1,1135 @@
-+/* Support for printing C and C++ types for GDB, the GNU debugger.
-+   Copyright 1986, 1988, 1989, 1991, 1993-1996, 1998-2000
-+   Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.  */
-+
-+#include "defs.h"
-+#include "obstack.h"
-+#include "bfd.h"		/* Binary File Description */
-+#include "symtab.h"
-+#include "gdbtypes.h"
-+#include "expression.h"
-+#include "value.h"
-+#include "valprint.h"
-+#include "gdbcore.h"
-+#include "target.h"
-+#include "command.h"
-+#include "gdbcmd.h"
-+#include "language.h"
-+#include "demangle.h"
-+#include "c-lang.h"
-+#include "typeprint.h"
-+#include "ui-file.h"
-+
-+#include "gdb_string.h"
-+#include "aif.h"
-+#include <errno.h>
-+#include <ctype.h>
-+void mem_file_delete (struct ui_file *file);
-+
-+
-+/* the following comes from the aif library, conv.c, written by Greg. */
-+
-+#ifdef WINDOWSNT
-+#define BITSPERBYTE	8
-+#else /* WINDOWSNT */
-+#include	<values.h>
-+#endif /* WINDOWSNT */
-+
-+union ieee_double
-+{
-+	float		f;
-+	double		d;
-+#ifdef HAVE_LONG_DOUBLE
-+	long double	l;
-+#endif /* HAVE_LONG_DOUBLE */
-+	char		c[sizeof(DOUBLEST)];
-+};
-+
-+
-+/* For linked data structures, we check for circularity by recording the values
-+ * of all pointers and types we see.  In a later pass, we emit a name on those
-+ * types and an offset for those values
-+ * that appear more than once. */
-+struct value_info {
-+  CORE_ADDR addr;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: value has been
-+    emitted */
-+};
-+struct type_info {
-+  struct type *type;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: name has been
-+    emitted */
-+};
-+
-+#define MAX_VALUES_SEEN 1000
-+	/* hope that the structure doesn't have more distinct pointer values */
-+struct value_info valuesSeen[MAX_VALUES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numValuesSeen;
-+#define MAX_TYPES_SEEN 100
-+	/* hope that the structure doesn't have more distinct types values */
-+struct type_info typesSeen[MAX_TYPES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numTypesSeen;
-+
-+typedef enum {doType, doValue} doWhat;
-+
-+struct str_type
-+{
-+	int	blen;
-+	int	slen;
-+	int	end;
-+	char *	buf;
-+};
-+
-+typedef struct str_type *	str_ptr;
-+
-+str_ptr str_init(void);
-+void str_add(str_ptr, char *);
-+void str_free(str_ptr);
-+char *str_val(str_ptr);
-+str_ptr str_dup(char *);
-+
-+/* fill in the valuesSeen array with all the pointer values we see */
-+void aif_discover(type, valaddr, what)
-+  struct type *type;
-+  char *valaddr;
-+  doWhat what;
-+{
-+  int valuesSeenIndex;
-+  struct type *elttype;
-+  unsigned int eltlen, offset;
-+  CORE_ADDR addr;
-+  switch (TYPE_CODE (type))
-+    {
-+    case TYPE_CODE_TYPEDEF:
-+      aif_discover(TYPE_TARGET_TYPE (type), valaddr, what);
-+      break;
-+
-+    case TYPE_CODE_PTR:
-+    case TYPE_CODE_REF:
-+      if (what == doValue)
-+      { /* looking for values */
-+	value_ptr deref_val;
-+	addr = unpack_pointer (type, valaddr);
-+	if (addr == 0) break;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (valuesSeenIndex = 0; valuesSeenIndex < numValuesSeen;
-+	valuesSeenIndex++)
-+	{
-+	  if (addr == valuesSeen[valuesSeenIndex].addr)
-+	  {
-+	    valuesSeen[valuesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numValuesSeen < MAX_VALUES_SEEN)
-+	  {
-+	    valuesSeen[numValuesSeen].addr = addr;
-+	    valuesSeen[numValuesSeen].used = 0;
-+	    numValuesSeen += 1;
-+	  }
-+	/*
-+	** Check addr is valid!
-+	*/
-+	if ( check_value(elttype, addr, &deref_val) )
-+		aif_discover(elttype, VALUE_CONTENTS (deref_val), what);
-+	break;
-+      } else {
-+	/* looking for types */
-+	int typesSeenIndex;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (typesSeenIndex = 0; typesSeenIndex < numTypesSeen;
-+	typesSeenIndex++)
-+	{
-+	  if (elttype == typesSeen[typesSeenIndex].type)
-+	  {
-+	    typesSeen[typesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numTypesSeen < MAX_TYPES_SEEN)
-+	  {
-+	    typesSeen[numTypesSeen].type = elttype;
-+	    typesSeen[numTypesSeen].used = 0;
-+	    numTypesSeen += 1;
-+	  }
-+	aif_discover(elttype, 0, what);
-+	break;
-+      } /* discover types */
-+
-+    case TYPE_CODE_STRUCT:
-+    case TYPE_CODE_UNION:
-+      { /* discover either values or types */
-+	int i;
-+      	struct field *thisField;
-+	struct type *ftype;
-+	value_ptr v;
-+
-+	for ( i = 0; i < TYPE_NFIELDS(type); i++ )
-+	{
-+		if ( TYPE_FIELD_IGNORE(type, i) )
-+			continue;
-+
-+		if ( what == doType )
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), 0, what);
-+			continue;
-+		}
-+
-+		if 
-+		(
-+			!TYPE_FIELD_STATIC(type, i) 
-+			&& 
-+			TYPE_FIELD_PACKED(type, i)
-+		)
-+		{
-+			v = value_from_longest(TYPE_FIELD_TYPE(type, i),
-+				unpack_field_as_long (type, valaddr, i));
-+
-+			aif_discover(TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS(v), what);
-+		}
-+		else if ( TYPE_FIELD_STATIC (type, i) )
-+		{
-+			v = value_static_field (type, i);
-+
-+			if ( v == NULL )
-+				continue;
-+
-+			/*
-+			XXX
-+			cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+			stream, format, recurse + 1,
-+			pretty);
-+			*/
-+		}
-+		else
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / 8, what);
-+		}
-+	  }
-+      }
-+      break;
-+
-+    case TYPE_CODE_ARRAY:
-+      elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+      if (what == doValue)
-+      { /* looking for values */
-+	unsigned int temp_len, len;
-+	eltlen = TYPE_LENGTH (elttype);
-+	len = TYPE_LENGTH (type) / eltlen;
-+	offset = 0;
-+	for (temp_len = 0; temp_len < len; temp_len++)
-+	  {
-+	    aif_discover(elttype, valaddr+offset, what);
-+	    offset += eltlen;
-+	  }
-+      } else { /* looking for types */
-+	aif_discover(elttype, 0, what);
-+      } /* TYPE_CODE_ARRAY */
-+      break;
-+
-+    case TYPE_CODE_MEMBER:
-+    case TYPE_CODE_METHOD:
-+    case TYPE_CODE_FUNC:
-+    case TYPE_CODE_UNDEF:
-+    case TYPE_CODE_ENUM:
-+    case TYPE_CODE_BOOL:
-+    case TYPE_CODE_INT:
-+    case TYPE_CODE_FLT:
-+    case TYPE_CODE_VOID:
-+    case TYPE_CODE_ERROR:
-+    case TYPE_CODE_CHAR:
-+    case TYPE_CODE_SET:
-+    case TYPE_CODE_RANGE:
-+    case TYPE_CODE_STRING:
-+    case TYPE_CODE_BITSTRING:
-+    case TYPE_CODE_COMPLEX:
-+    case TYPE_CODE_TEMPLATE:
-+      break;
-+
-+    default:
-+      error ("type not handled in type_discover");
-+      break;
-+    } /* switch (TYPE_CODE (type)) */
-+} /* aif_discover */
-+
-+/* squash the valuesSeen and typesSeen arrays to remove unnecessary elements */
-+void aif_reduce()
-+{
-+  int front, back;
-+  front = back = 0;
-+  while (front < numValuesSeen)
-+    {
-+      /* move back to first unused entry */
-+      valuesSeen[numValuesSeen].used = 0; /* pseudo-data */
-+      while (valuesSeen[back].used) back += 1;
-+      if (back == numValuesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      valuesSeen[numValuesSeen].used = 1; /* pseudo-data */
-+      while (!valuesSeen[front].used) front += 1;
-+      if (front == numValuesSeen) break;
-+      /* copy from front to back */
-+      valuesSeen[back] = valuesSeen[front];
-+      valuesSeen[front].used = 0;
-+    }
-+  numValuesSeen = back;
-+  front = back = 0;
-+  while (front < numTypesSeen)
-+    {
-+      /* move back to first unused entry */
-+      typesSeen[numTypesSeen].used = 0; /* pseudo-data */
-+      while (typesSeen[back].used) back += 1;
-+      if (back == numTypesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      typesSeen[numTypesSeen].used = 1; /* pseudo-data */
-+      while (!typesSeen[front].used) front += 1;
-+      if (front == numTypesSeen) break;
-+      /* copy from front to back */
-+      typesSeen[back] = typesSeen[front];
-+      typesSeen[front].used = 0;
-+    }
-+    numTypesSeen = back;
-+} /* aif_reduce */
-+
-+int dataStreamPos;
-+
-+void emitData(toEmit, stream)
-+  char toEmit;
-+  struct ui_file *stream;
-+{
-+  fprintf_filtered(stream, "%02x", toEmit & 0xff);
-+  dataStreamPos += 1;
-+} /* emitData */
-+  
-+/* defined in valprint.c: */
-+int
-+partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr);
-+
-+void
-+aif_emit_string (addr, stream)
-+     CORE_ADDR addr;
-+     struct ui_file *stream;
-+{ /* code modified from val_print_string () */
-+  int errcode;			/* Errno returned from bad reads. */
-+  unsigned int fetchlimit;	/* Maximum number of chars to print. */
-+  unsigned int nfetch;		/* Chars to fetch / chars fetched. */
-+  unsigned int chunksize;	/* Size of each fetch, in chars. */
-+  char *buffer = NULL;		/* Dynamically growable fetch buffer. */
-+  char *bufptr;			/* Pointer to next available byte in buffer. */
-+  char *limit;			/* First location past end of fetch buffer. */
-+  struct cleanup *old_chain = NULL;	/* Top of the old cleanup chain. */
-+  int found_nul;		/* Non-zero if we found the nul char */
-+  unsigned long bufsize = 0;
-+  int length;			/* how long the string turned out to be */
-+
-+  if (addr == 0)
-+  {
-+      emitData(0, stream);
-+      emitData(0, stream);
-+      return;
-+  }
-+
-+  fetchlimit = print_max;
-+  chunksize = min (8, fetchlimit);
-+  /* Loop until we either have all the characters to print, or we encounter
-+     some error, such as bumping into the end of the address space. */
-+  found_nul = 0;
-+  old_chain = make_cleanup (null_cleanup, 0);
-+  do
-+    {
-+      QUIT;
-+      nfetch = min (chunksize, fetchlimit - bufsize);
-+      if (buffer == NULL)
-+	buffer = (char *) xmalloc (nfetch);
-+      else
-+	{
-+	  discard_cleanups (old_chain);
-+	  buffer = (char *) xrealloc (buffer, nfetch + bufsize);
-+	}
-+      old_chain = make_cleanup (free, buffer);
-+      bufptr = buffer + bufsize;
-+      bufsize += nfetch;
-+      /* Read as much as we can. */
-+      nfetch = partial_memory_read (addr, bufptr, nfetch, &errcode);
-+      /* Scan this chunk for the null byte */
-+      limit = bufptr + nfetch;
-+      while (bufptr < limit)
-+	{
-+	  unsigned long c;
-+	  c = extract_unsigned_integer (bufptr, 1);
-+	  addr += 1;
-+	  bufptr += 1;
-+	  if (c == 0)
-+	    {
-+	      /* We don't care about any error which happened after
-+		  the NULL terminator.  */
-+	      errcode = 0;
-+	      found_nul = 1;
-+	      break;
-+	    }
-+	} /* while (bufptr < limit) */
-+    } /* do */
-+  while (errcode == 0	/* no error */
-+	  && bufptr - buffer < fetchlimit	/* no overrun */
-+	  && !found_nul);	/* haven't found nul yet */
-+  QUIT;
-+  length = 0;
-+  if (errcode == 0 || bufptr > buffer)
-+    {
-+      length = bufptr - buffer - 1; /* don't include null */
-+      emitData((length >> 8) & 077, stream);
-+      emitData(length & 077, stream);
-+      for (; length > 0; length--) {
-+	emitData(*buffer++, stream); 
-+      }
-+    }
-+  if (errcode != 0)
-+    {
-+      if (errcode == EIO)
-+	{
-+	  fprintf_filtered (stream, " <Address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, " out of bounds>");
-+	}
-+      else
-+	{
-+	  fprintf_filtered (stream, " <Error reading address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, ": %s>", safe_strerror (errcode));
-+	}
-+    }
-+  gdb_flush (stream);
-+  do_cleanups (old_chain);
-+  return;
-+} /* aif_emit_string */
-+
-+str_ptr
-+gdb_type_to_fds(type)
-+	struct type *	type;
-+{
-+	int		len;
-+	int		elen;
-+	int		nfields;
-+	int		i;
-+	int		ix;
-+	str_ptr		s;
-+	str_ptr		type_ptr;
-+	str_ptr		type_str;
-+	struct type *	etype;
-+
-+	CHECK_TYPEDEF (type);
-+
-+	type_str = str_init();
-+
-+	for ( ix = 0; ix < numTypesSeen; ix++)
-+	{
-+		if 
-+		(
-+			typesSeen[ix].type != type
-+			||
-+			!typesSeen[ix].used
-+		)
-+			continue;
-+
-+		/*
-+		** Multiple use type
-+		*/
-+
-+		if ( typesSeen[ix].used != 1 )
-+		{
-+			/* 
-+			** referring to one already emitted 
-+			*/
-+
-+			str_add(type_str, TypeToFDS(AIF_REFERENCE, ix));
-+			return type_str;
-+		}
-+
-+		/*
-+		** first time; emit name
-+		*/
-+
-+		str_add(type_str, TypeToFDS(AIF_NAME, ix, NULL));
-+		typesSeen[ix].used = 2;
-+		break;
-+	}
-+
-+	len = TYPE_LENGTH(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		type_ptr = gdb_type_to_fds(TYPE_TARGET_TYPE(type));
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		return type_str;
-+
-+	case TYPE_CODE_ARRAY:
-+		if 
-+		(
-+			len > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			etype = check_typedef(TYPE_TARGET_TYPE (type));
-+			elen = TYPE_LENGTH(etype);
-+			len /= elen;
-+
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, TypeToFDS(AIF_ARRAY, 
-+				TypeToFDS(AIF_RANGE, 0, len-1, 
-+					TypeToFDS(AIF_INTEGER, 1, sizeof(int))),
-+				str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+
-+	case TYPE_CODE_PTR:
-+		etype = check_typedef(TYPE_TARGET_TYPE(type));
-+		elen = TYPE_LENGTH(etype);
-+
-+		if 
-+		(
-+			elen == 1
-+			&&
-+			TYPE_CODE(etype) == TYPE_CODE_INT
-+		)
-+		{
-+			str_add(type_str, TypeToFDS(AIF_STRING));
-+		}
-+		else
-+		{
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, 
-+				TypeToFDS(AIF_POINTER, str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+		}
-+
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		if
-+		(
-+			len != 1
-+			||
-+			strncmp(TYPE_NAME(type), "char", 5) != 0
-+		) 
-+		{
-+			str_add(type_str, 
-+				TypeToFDS(AIF_INTEGER, TYPE_UNSIGNED(type) ? 0 : 1, len));
-+			break;
-+		}
-+
-+		/*
-+		** Treat as char...
-+		*/
-+
-+	case TYPE_CODE_CHAR:
-+		str_add(type_str, TypeToFDS(AIF_CHARACTER));
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		str_add(type_str, TypeToFDS(AIF_FLOATING, len));
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		nfields = TYPE_NFIELDS(type);
-+		
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		/*
-+		** First need to calculate size of struct, since it
-+		** may not be packed.
-+		*/
-+
-+		for ( len = 0 ; i < nfields ; i++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+					TYPE_FIELD_BITSIZE(type, i) / 8 :
-+					TYPE_LENGTH(etype);
-+
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+			else if ( elen > len )
-+				len = elen;
-+		}
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_STRUCT));
-+
-+		/*
-+		** Need to calculate offset (len).
-+		*/
-+		len = 0;
-+
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		for (; i < nfields ; i++ )
-+		{
-+			char *t;
-+
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+				TYPE_FIELD_BITSIZE(type, i) :
-+				TYPE_LENGTH(etype) * 8;
-+
-+			s = gdb_type_to_fds(etype);
-+
-+			if ( HAVE_CPLUS_STRUCT(type) )
-+			{
-+				if ( TYPE_FIELD_PROTECTED(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val(type_ptr),
-+					    	AIFACC_PROTECTED, 
-+					    	TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else if ( TYPE_FIELD_PRIVATE(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PRIVATE, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PUBLIC, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+
-+			}
-+			else
-+				t = FDSAddFieldToStruct(str_val(type_ptr), 
-+					TYPE_FIELD_NAME(type, i), str_val(s));
-+
-+			str_free(type_ptr);
-+			
-+			type_ptr = str_dup(t);
-+
-+			str_free(s);
-+
-+			/*
-+			** Calc offset.
-+			*/
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		str_add(type_str, TypeToFDS(AIF_VOID, len));
-+		break;
-+
-+	case TYPE_CODE_ENUM:
-+		nfields = TYPE_NFIELDS (type);
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_ENUM));
-+
-+		for ( i = 0 ; i < nfields ; i++ )
-+		{
-+			char *	t;
-+
-+			t = FDSAddConstToEnum(str_val(type_ptr),
-+					TYPE_FIELD_NAME(type, i),
-+					TYPE_FIELD_BITPOS(type, i));
-+
-+			str_free(type_ptr);
-+
-+			type_ptr = str_dup(t);
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_FUNC:
-+		etype = check_typedef(TYPE_TARGET_TYPE (type));
-+
-+		type_ptr = gdb_type_to_fds(etype);
-+
-+		str_add(type_str, 
-+			TypeToFDS(AIF_FUNCTION, str_val(type_ptr)));
-+
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_STRING:
-+	case TYPE_CODE_SET:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_BITSTRING:
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_BOOL:
-+	case TYPE_CODE_COMPLEX:
-+		str_add(type_str, TypeToFDS(AIF_INVALID));
-+		break;
-+
-+	default:
-+		error("Invalid C/C++ type code %d in symbol table.", TYPE_CODE(type));
-+	}
-+
-+	return type_str;
-+}
-+
-+void
-+aif_val_print_recursive(type, valaddr, address, stream)
-+	struct type *	type;
-+	char *		valaddr;
-+	CORE_ADDR	address;
-+	struct ui_file *stream;
-+{
-+	int			ix;
-+	int			res;
-+	int			valid;
-+	unsigned		len;
-+	unsigned		eltlen;
-+	LONGEST			val;
-+	CORE_ADDR		addr;
-+	value_ptr		vptr;
-+	union ieee_double	v;
-+	struct type *		elttype;
-+	struct field *		thisField;
-+
-+	CHECK_TYPEDEF(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		aif_val_print_recursive(TYPE_TARGET_TYPE(type), valaddr, address, stream);
-+		break;
-+
-+	case TYPE_CODE_ARRAY:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if 
-+		(
-+			TYPE_LENGTH(type) > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			eltlen = TYPE_LENGTH(elttype);
-+			len = TYPE_LENGTH(type) / eltlen;
-+
-+			for ( ix = 0; ix < len; ix++ )
-+				aif_val_print_recursive(elttype, valaddr + ix * eltlen, address + ix * eltlen, stream);
-+
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+		addr = address;
-+		goto asPtr;
-+
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_PTR:
-+		addr = unpack_pointer(type, valaddr);
-+
-+	asPtr:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if
-+		(
-+			TYPE_LENGTH(elttype) == 1
-+			&& 
-+			TYPE_CODE(elttype) == TYPE_CODE_INT
-+		)
-+		{
-+			/*
-+			** call it a string
-+			*/
-+			(void)aif_emit_string(addr, stream);
-+			break;
-+		}
-+
-+		if ( addr == 0 )
-+		{
-+			emitData((char)AIF_PTR_NIL, stream); 
-+			break;
-+		}
-+
-+		for ( ix = 0 ; ix < numValuesSeen; ix++ )
-+		{
-+			if
-+			(
-+				valuesSeen[ix].addr == addr
-+				&&
-+				valuesSeen[ix].used
-+			)
-+			{
-+				if ( valuesSeen[ix].used == 1 )
-+				{
-+					/* 
-+					** first time; just emit as usual
-+					*/
-+
-+					emitData((char)AIF_PTR_NAME, stream); 
-+					valuesSeen[ix].used = 2;
-+					emitData((char)ix, stream);
-+
-+					break; /* no need to look at other seen values */
-+				}
-+
-+				/* 
-+				** referring to one already emitted
-+				*/
-+
-+				emitData((char)AIF_PTR_REFERENCE, stream); 
-+				emitData((char)ix, stream);
-+
-+				return; /* don't go any deeper */
-+			}
-+		}
-+
-+		res = check_value(elttype, addr, &vptr);
-+
-+		if ( ix == numValuesSeen )
-+		{
-+			/*
-+			** not special at all 
-+			*/
-+			if ( !res )
-+			{
-+				emitData((char)AIF_PTR_INVALID, stream); 
-+				break;
-+			}
-+
-+			emitData((char)AIF_PTR_NORMAL, stream); 
-+		}
-+
-+		aif_val_print_recursive (VALUE_TYPE(vptr),
-+					VALUE_CONTENTS(vptr),
-+					VALUE_ADDRESS(vptr),
-+					stream);
-+
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		/*
-+		** A union is treated just like a struct. That is
-+		** we attempt to traverse each field if possible.
-+		** It's then up to the receiver to decide what is
-+		** sensible information.
-+		**
-+		** XXX: What happens if a pointer points to random
-+		** data?
-+		*/
-+		for ( ix = 0 ; ix < TYPE_NFIELDS (type) ; ix++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, ix) )
-+				continue;
-+
-+			if 
-+			(
-+				!TYPE_FIELD_STATIC(type, ix) 
-+				&& 
-+				TYPE_FIELD_PACKED(type, ix)
-+			)
-+			{
-+				vptr = value_from_longest(TYPE_FIELD_TYPE(type, ix),
-+					unpack_field_as_long(type, valaddr, ix));
-+
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), VALUE_CONTENTS(vptr), 0, stream);
-+			}
-+			else if ( TYPE_FIELD_STATIC (type, ix) )
-+			{
-+				vptr = value_static_field (type, ix);
-+
-+				if ( vptr == NULL )
-+					continue;
-+
-+				/*
-+				XXX
-+				cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+				stream, format, recurse + 1,
-+				pretty);
-+				*/
-+			}
-+			else
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), 
-+					valaddr + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					address + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					stream);
-+		}
-+		break;
-+
-+	case TYPE_CODE_CHAR:
-+	asChar:
-+		val = unpack_long (type, valaddr);
-+		emitData((char) (val & 0xff), stream); 
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		len = TYPE_LENGTH (type);
-+
-+		if
-+		(
-+			len == 1 
-+			&&
-+			strncmp(TYPE_NAME(type), "char", 5) == 0
-+		) 
-+			goto asChar;
-+
-+		val = unpack_long(type, valaddr);
-+		AIFNormalise((char *) &v, len, (char *) &val, sizeof(LONGEST));
-+		
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char)(v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		len = TYPE_LENGTH (type);
-+
-+		switch ( len ) {
-+		case 4:
-+			v.f = unpack_double (type, valaddr, &valid);
-+			break;
-+
-+		case 8:
-+			v.d = unpack_double (type, valaddr, &valid);
-+			break;
-+
-+#ifdef HAVE_LONG_DOUBLE
-+		case 16:
-+			v.l = unpack_double (type, valaddr, &valid);
-+			break;
-+#endif /* HAVE_LONG_DOUBLE */
-+		default:
-+			fprintf(stderr, "cannot handle float of length %d\n", len);
-+		}
-+
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char) (v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		break;
-+
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_ENUM:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_FUNC:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_UNDEF:
-+	case TYPE_CODE_ERROR:
-+		break;
-+
-+	default:
-+		error ("Invalid C/C++ type code %d in symbol table.", TYPE_CODE (type));
-+	}
-+}
-+
-+void aif_val_print(type, valaddr, embedded_offset, address, stream)
-+     struct type *type;
-+     char *valaddr;
-+     int embedded_offset;
-+     CORE_ADDR address;
-+     struct ui_file *stream;
-+{
-+  str_ptr s;
-+
-+  // struct ui_file *typeStream=mem_fileopen();
-+  numValuesSeen = 0;
-+  aif_discover(type, valaddr+embedded_offset, doValue); /* values */
-+  aif_discover(type, 0, doType); /* types */
-+  aif_reduce();
-+  dataStreamPos = 0;
-+  // fputs_filtered("(", stream);
-+  s = gdb_type_to_fds(type);
-+  fputs_filtered(str_val(s), stream);
-+  str_free(s);
-+  // fputs_filtered(")", stream);
-+  fputs_filtered(" ", stream);
-+  aif_val_print_recursive(type, valaddr+embedded_offset, address, stream);
-+  // contents = ui_file_xstrdup(typeStream, &dummy);
-+  // fputs_filtered(contents, stream);
-+  // free(contents);
-+  // ui_file_delete(typeStream);
-+  gdb_flush(stream);
-+} /* aif_val_print */
-+
-+void
-+aif_type_print(type, stream)
-+	struct type *type;
-+	struct ui_file *stream;
-+{
-+	str_ptr	s;
-+
-+	numValuesSeen = 0;
-+	aif_discover(type, 0, doType); /* types */
-+	aif_reduce();
-+	dataStreamPos = 0;
-+	s = gdb_type_to_fds(type);
-+	fputs_filtered(str_val(s), stream);
-+	str_free(s);
-+}
-+
-+#define STRSIZE 100
-+
-+str_ptr
-+str_init(void)
-+{
-+	str_ptr	s;
-+
-+	s = (str_ptr)xmalloc(sizeof(struct str_type));
-+	s->buf = (char *)xmalloc(STRSIZE);
-+	s->blen = STRSIZE;
-+	s->slen = 0;
-+	*(s->buf) = '\0';
-+
-+	return s;
-+}
-+
-+void
-+str_add(str_ptr s1, char *s2)
-+{
-+	int	l2 = strlen(s2);
-+
-+	if (s1->slen + l2 >= s1->blen)
-+	{
-+		s1->blen += max(STRSIZE, l2);
-+		s1->buf = (char *) xrealloc (s1->buf, s1->blen);
-+	}
-+
-+	memcpy(&(s1->buf[s1->slen]), s2, l2);
-+	s1->slen += l2;
-+	s1->buf[s1->slen] = '\0';
-+}
-+
-+void
-+str_free(str_ptr s)
-+{
-+	free(s->buf);
-+	free(s);
-+}
-+
-+char *
-+str_val(str_ptr s)
-+{
-+	return s->buf;
-+}
-+
-+str_ptr
-+str_dup(char *s1)
-+{
-+	str_ptr s = str_init();
-+	str_add(s, s1);
-+	return s;
-+}
-+
-+int
-+check_value(type, addr, res)
-+     struct type *type;
-+     CORE_ADDR addr;
-+     value_ptr *res;
-+{
-+  value_ptr val;
-+  char buf[sizeof (ULONGEST)];
-+
-+  if (TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
-+  	return 0;
-+
-+  val = allocate_value (type);
-+
-+  if (GDB_TARGET_IS_D10V
-+      && TYPE_CODE (type) == TYPE_CODE_PTR
-+      && TYPE_TARGET_TYPE (type)
-+      && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC))
-+    {
-+      /* pointer to function */
-+      unsigned long num;
-+      unsigned short snum;
-+
-+      if ( target_read_memory(addr, buf, 2) != 0 )
-+      	return 0;
-+
-+      snum = extract_unsigned_integer (buf, 2);
-+      num = D10V_MAKE_IADDR (snum);
-+      store_address (VALUE_CONTENTS_RAW (val), 4, num);
-+    }
-+  else if (GDB_TARGET_IS_D10V
-+	   && TYPE_CODE (type) == TYPE_CODE_PTR)
-+    {
-+      /* pointer to data */
-+      unsigned long num;
-+      unsigned short snum;
-+
-+      if ( target_read_memory(addr, buf, 2) != 0 )
-+      	return 0;
-+
-+      snum = extract_unsigned_integer (buf, 2);
-+      num = D10V_MAKE_DADDR (snum);
-+      store_address (VALUE_CONTENTS_RAW (val), 4, num);
-+    }
-+  else
-+    if ( target_read_memory_section (addr, VALUE_CONTENTS_ALL_RAW(val), TYPE_LENGTH(type), NULL) != 0 )
-+    	return 0;
-+
-+  VALUE_LVAL(val) = lval_memory;
-+  VALUE_ADDRESS(val) = addr;
-+  VALUE_BFD_SECTION(val) = NULL;
-+
-+  *res = val;
-+
-+  return 1;
-+}
-+
---- gdb-5.0-old/gdb/c-valprint.c	Mon Apr  3 22:53:50 2000
-+++ gdb-5.0/gdb/c-valprint.c	Fri Jul 19 19:59:44 2002
-@@ -30,6 +30,11 @@
- #include "c-lang.h"
- 
- 
-+// raphael:
-+extern int max_print_depth; /* set by "set print depth" */
-+extern int current_print_depth;
-+extern int typeprint; /* set by "set print type" (Boolean) */
-+
- /* Print data of type TYPE located at VALADDR (within GDB), which came from
-    the inferior at address ADDRESS, onto stdio stream STREAM according to
-    FORMAT (a letter or 0 for natural format).  The data at VALADDR is in
-@@ -44,8 +49,8 @@
-    The PRETTY parameter controls prettyprinting.  */
- 
- int
--c_val_print (type, valaddr, embedded_offset, address, stream, format, deref_ref, recurse,
--	     pretty)
-+c_val_print (type, valaddr, embedded_offset, address, stream, format,
-+  deref_ref, recurse, pretty)
-      struct type *type;
-      char *valaddr;
-      int embedded_offset;
-@@ -63,6 +68,13 @@
-   LONGEST val;
-   CORE_ADDR addr;
- 
-+  if (typeprint && format != 's')
-+    {
-+      fputs_filtered("(", stream);
-+      type_print (type, "", stream, -1);
-+      fputs_filtered(") ", stream);
-+    }
-+
-   CHECK_TYPEDEF (type);
-   switch (TYPE_CODE (type))
-     {
-@@ -140,6 +152,7 @@
- 	  break;
- 	}
-       elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+      if (!elttype) elttype = type;
-       if (TYPE_CODE (elttype) == TYPE_CODE_METHOD)
- 	{
- 	  cp_print_class_method (valaddr + embedded_offset, type, stream);
-@@ -169,6 +182,34 @@
- 	      print_address_numeric (addr, 1, stream);
- 	    }
- 
-+	  if (current_print_depth < max_print_depth
-+	      && TYPE_CODE (elttype) != TYPE_CODE_UNDEF
-+	      && (TYPE_LENGTH (elttype) != 1
-+	         || TYPE_CODE (elttype) != TYPE_CODE_INT)
-+	      && format != 's')
-+	    { /* print complex objected pointed to recursively */
-+	      if (addressprint) fprintf_filtered (stream, " => ");
-+	      if (addr == 0)
-+		{
-+		  fprintf_filtered (stream, "nil");
-+		}
-+	      else
-+		{ /* non nil */
-+		  value_ptr deref_val = value_at(elttype, addr, NULL);
-+		  current_print_depth += 1;
-+		  val_print (VALUE_TYPE (deref_val),
-+			    VALUE_CONTENTS (deref_val),
-+			    0,
-+			    VALUE_ADDRESS (deref_val),
-+			    stream,
-+			    format,
-+			    deref_ref,
-+			    recurse,
-+			    pretty);
-+		  current_print_depth -= 1;
-+		}
-+	    } /* print recursively */
-+
- 	  /* For a pointer to char or unsigned char, also print the string
- 	     pointed to, unless pointer is null.  */
- 	  /* FIXME: need to handle wchar_t here... */
-@@ -340,9 +381,6 @@
- 	}
-       /* FIXME, we should consider, at least for ANSI C language, eliminating
-          the distinction made between FUNCs and POINTERs to FUNCs.  */
--      fprintf_filtered (stream, "{");
--      type_print (type, "", stream, -1);
--      fprintf_filtered (stream, "} ");
-       /* Try to print what function it points to, and its address.  */
-       print_address_demangle (address, stream, demangle);
-       break;
-@@ -520,9 +558,9 @@
-       else
- 	{
- 	  /* normal case */
--	  fprintf_filtered (stream, "(");
--	  type_print (type, "", stream, -1);
--	  fprintf_filtered (stream, ") ");
-+	  // fprintf_filtered (stream, "(");
-+	  // type_print (type, "", stream, -1);
-+	  // fprintf_filtered (stream, ") ");
- 	}
-     }
-   if (objectprint && (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_CLASS))
---- gdb-5.0-old/gdb/printcmd.c	Thu Apr 20 22:10:46 2000
-+++ gdb-5.0/gdb/printcmd.c	Fri Jul 19 19:59:44 2002
-@@ -272,6 +272,7 @@
-   return val;
- }
- 
-+extern int current_print_depth; /* from valprint.c */
- /* Print value VAL on stream according to FORMAT, a letter or 0.
-    Do not end with a newline.
-    0 means print VAL according to its own type.
-@@ -323,12 +324,14 @@
- 	  || TYPE_CODE (type) == TYPE_CODE_STRING
- 	  || TYPE_CODE (type) == TYPE_CODE_STRUCT
- 	  || TYPE_CODE (type) == TYPE_CODE_UNION)
--	/* If format is 0, use the 'natural' format for
--	 * that type of value.  If the type is non-scalar,
--	 * we have to use language rules to print it as
--	 * a series of scalars.
--	 */
--	value_print (val, stream, format, Val_pretty_default);
-+    	{ /* If format is 0, use the 'natural' format for
-+	  * that type of value.  If the type is non-scalar,
-+	  * we have to use language rules to print it as
-+	  * a series of scalars.
-+	  */
-+	  current_print_depth = 0;
-+	  value_print (val, stream, format, Val_pretty_default);
-+	}
-       else
- 	/* User specified format, so don't look to the
- 	 * the type to tell us what to do.
---- gdb-5.0-old/gdb/typeprint.c	Mon Apr  3 22:53:50 2000
-+++ gdb-5.0/gdb/typeprint.c	Fri Jul 19 19:59:44 2002
-@@ -39,6 +39,9 @@
- extern int objectprint;		/* Controls looking up an object's derived type
- 				   using what we find in its vtables.  */
- 
-+extern int aifprint;	/* print type using AIF */
-+extern void aif_type_print PARAMS ((struct type *, struct ui_file *));
-+
- extern void _initialize_typeprint PARAMS ((void));
- 
- static void
-@@ -67,6 +70,12 @@
-      struct ui_file *stream;
-      int show;
- {
-+  if (aifprint)
-+    {
-+	aif_type_print (type, stream);
-+    	return;
-+    }
-+      
-   LA_PRINT_TYPE (type, varstring, stream, show, 0);
- }
- 
---- gdb-5.0-old/gdb/valprint.c	Mon Feb  7 21:39:02 2000
-+++ gdb-5.0/gdb/valprint.c	Fri Jul 19 19:59:44 2002
-@@ -35,9 +35,13 @@
- 
- #include <errno.h>
- 
-+extern int aifprint; /* set by "set print aif" (Boolean) */
-+void aif_val_print(struct type *type, char *valaddr, int embedded_offset,
-+  CORE_ADDR address, struct ui_file *stream);
-+
- /* Prototypes for local functions */
- 
--static int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
-+int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
- 				int len, int *errnoptr);
- 
- static void print_hex_chars (struct ui_file *, unsigned char *,
-@@ -101,6 +105,16 @@
- /* If nonzero, causes machine addresses to be printed in certain contexts. */
- 
- int addressprint;		/* Controls printing of machine addresses */
-+
-+/* If positive, causes pointers to be followed in printing, to given depth */
-+int max_print_depth;
-+int current_print_depth = 0; /* reset to 0 at each interrupt */
-+
-+/* If nonzero, causes types to be printed. */
-+int typeprint;
-+
-+/* If nonzero, causes types to be printed, if at all, in AIF format. */
-+int aifprint;
- 
- 
- /* Print data of type TYPE located at VALADDR (within GDB), which came from
-@@ -155,6 +169,11 @@
-       return (0);
-     }
- 
-+  if (aifprint)
-+    {
-+      aif_val_print(type, valaddr, embedded_offset, address, stream);
-+      return 0;
-+    }
-   return (LA_VAL_PRINT (type, valaddr, embedded_offset, address,
- 			stream, format, deref_ref, recurse, pretty));
- }
-@@ -1160,8 +1179,9 @@
- 
- /* FIXME: cagney/1999-10-14: Only used by val_print_string.  Can this
-    function be eliminated.  */
-+/* It is now used by aif_print_string as well. raphael/2000-02-20 */
- 
--static int
-+int
- partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr)
- {
-   int nread;			/* Number of bytes actually read. */
-@@ -1353,7 +1373,7 @@
-     {
-       if (addressprint)
- 	{
--	  fputs_filtered (" ", stream);
-+	  fputs_filtered (" => ", stream);
- 	}
-       LA_PRINT_STRING (stream, buffer, (bufptr - buffer) / width, width, force_ellipsis);
-     }
-@@ -1596,6 +1616,27 @@
- 		  &setprintlist),
-      &showprintlist);
- 
-+  add_show_from_set
-+    (add_set_cmd ("depth", class_support, var_uinteger,
-+    		  (char *) &max_print_depth,
-+		  "Set depth of pointer recursion.",
-+		  &setprintlist),
-+     &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("type", class_support, var_boolean,
-+    		  (char *) &typeprint,
-+		  "Set printing of types.",
-+		  &setprintlist),
-+     &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("aif", class_support, var_boolean,
-+    		  (char *) &aifprint,
-+		  "Set printing of types to aif format.",
-+		  &setprintlist),
-+     &showprintlist);
-+
-   c = add_set_cmd ("input-radix", class_support, var_uinteger,
- 		   (char *) &input_radix,
- 		   "Set default input radix for entering numbers.",
-@@ -1630,5 +1671,8 @@
-   prettyprint_arrays = 0;
-   unionprint = 1;
-   addressprint = 1;
-+  max_print_depth = -1;
-+  typeprint = 0;
-+  aifprint = 0;
-   print_max = PRINT_MAX_DEFAULT;
- }
---- /dev/null	Tue Mar 25 17:08:18 2003
-+++ gdb-5.0/gdb/libaif.mk	Fri Jul 19 19:59:44 2002
-@@ -0,0 +1,9 @@
-+INCLUDE_CFLAGS += $(INCLUDE_aif)
-+
-+CLIBS += $(LIB_aif)
-+
-+SFILES     += aif-valprint.c
-+COMMON_OBS += aif-valprint.o
-+
-+aif-valprint.o: aif-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-+	language.h $(symtab_h) valprint.h $(value_h)
---- gdb-5.0-old/gdb/configure.in	Wed May 10 18:32:18 2000
-+++ gdb-5.0/gdb/configure.in	Fri Jul 19 19:59:44 2002
-@@ -29,6 +29,12 @@
- AC_ISC_POSIX
- AM_PROG_CC_STDC
- 
-+AC_TEST_PACKAGE_NEW(aif,[#include <aif.h>],-laif,,/usr/local,AIF)
-+if test "$with_aif" = "no"; then
-+	AC_MSG_ERROR([You must have libaif to compile this version of GDB.])
-+fi
-+AC_DEFINE(AIF, 1, [Enable AIF support in in GDB.])dnl
-+
- AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
- AC_CANONICAL_SYSTEM
- 
---- gdb-5.0-old/gdb/aclocal.m4	Wed Apr 12 23:29:42 2000
-+++ gdb-5.0/gdb/aclocal.m4	Wed Jun 19 15:12:12 2002
-@@ -1,3 +1,114 @@
-+dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
-+
-+AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
-+
-+AC_DEFUN(AC_TEST_PACKAGE_NEW,[
-+AC_ARG_WITH($1,
-+[  --with-$1=dir                use $1 in dir])
-+AC_ARG_WITH($1-lib,
-+[  --with-$1-lib=dir            use $1 libraries in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-$1-lib])
-+elif test "X$with_$1" = "X"; then
-+  with_$1=yes
-+fi])
-+AC_ARG_WITH($1-include,
-+[  --with-$1-include=dir        use $1 headers in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-$1-include])
-+elif test "X$with_$1" = "X"; then
-+  with_$1=yes
-+fi])
-+
-+AC_MSG_CHECKING(for $1)
-+
-+case "$with_$1" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_$1_include" = ""; then
-+		with_$1_include="$with_$1/include"
-+	fi
-+	if test "$with_$1_lib" = ""; then
-+		with_$1_lib="$with_$1/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='$5'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_$1_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_$1_include $header_dirs";;
-+esac
-+case "$with_$1_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_$1_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	AC_TRY_COMPILE([$2],,ires=$i;break)
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i $3 $4 $save_LIBS"
-+	AC_TRY_LINK([$2],,lres=$i;break)
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
-+	$1_includedir="$ires"
-+	$1_libdir="$lres"
-+	DIR_$1=
-+	INCLUDE_$1="-I$$1_includedir"
-+	LIB_$1="-L$$1_libdir $3"
-+	dnl m4_ifval([$6],
-+		AC_DEFINE_UNQUOTED($6,1,[Define if you have the $1 package.])
-+	dnl	,
-+	dnl 	AC_DEFINE_UNQUOTED(upcase($1),1,[Define if you have the $1 package.]))
-+	with_$1=yes
-+	AC_MSG_RESULT([headers $ires, libraries $lres])
-+else
-+	DIR_$1="$1"
-+	INCLUDE_$1=
-+	LIB_$1=
-+	with_$1=no
-+	AC_MSG_RESULT($with_$1)
-+fi
-+dnl m4_ifval([$6],
-+dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
-+dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
-+AC_SUBST(DIR_$1)
-+AC_SUBST(INCLUDE_$1)
-+AC_SUBST(LIB_$1)
-+])
-+
-+# Define a conditional.
-+
-+AC_DEFUN(AM_CONDITIONAL,
-+[AC_SUBST($1_TRUE)
-+AC_SUBST($1_FALSE)
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi])
-+
-+dnl ===========================================================================
-+
- dnl aclocal.m4 generated automatically by aclocal 1.4
- 
- dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
---- gdb-5.0-old/gdb/configure	Wed May 10 18:32:18 2000
-+++ gdb-5.0/gdb/configure	Fri Jul 19 19:59:55 2002
-@@ -1,5 +1,68 @@
- #! /bin/sh
- 
-+
-+
-+
-+# serial 1
-+
-+# @defmac AC_PROG_CC_STDC
-+# @maindex PROG_CC_STDC
-+# @ovindex CC
-+# If the C compiler in not in ANSI C mode by default, try to add an option
-+# to output variable @code{CC} to make it so.  This macro tries various
-+# options that select ANSI C on some system or another.  It considers the
-+# compiler to be in ANSI C mode if it handles function prototypes correctly.
-+#
-+# If you use this macro, you should check after calling it whether the C
-+# compiler has been set to accept ANSI C; if not, the shell variable
-+# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-+# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-+# program @code{ansi2knr}, which comes with Ghostscript.
-+# @end defmac
-+
-+
-+
-+# This file is derived from `gettext.m4'.  The difference is that the
-+# included macros assume Cygnus-style source and build trees.
-+
-+# Macro to add for using GNU gettext.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995.
-+#
-+# This file file be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+
-+# serial 3
-+
-+
-+
-+
-+
-+# Search path for a program which passes the given test.
-+# Ulrich Drepper <drepper@cygnus.com>, 1996.
-+#
-+# This file file be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+
-+# serial 1
-+
-+
-+
-+# Check whether LC_MESSAGES is available in <locale.h>.
-+# Ulrich Drepper <drepper@cygnus.com>, 1995.
-+#
-+# This file file be copied and used freely without restrictions.  It can
-+# be used in projects which are not available under the GNU Public License
-+# but which still want to provide support for the GNU gettext functionality.
-+# Please note that the actual code is *not* freely available.
-+
-+# serial 1
-+
-+
-+
- # Guess values for system-dependent variables and create Makefiles.
- # Generated automatically using autoconf version 2.13 
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-@@ -15,6 +78,12 @@
-   --enable-maintainer-mode enable make rules and dependencies not useful
-                           (and sometimes confusing) to the casual installer"
- ac_help="$ac_help
-+  --with-aif=dir                use aif in dir"
-+ac_help="$ac_help
-+  --with-aif-lib=dir            use aif libraries in dir"
-+ac_help="$ac_help
-+  --with-aif-include=dir        use aif headers in dir"
-+ac_help="$ac_help
-   --disable-nls           do not use Native Language Support"
- ac_help="$ac_help
-   --with-included-gettext use the GNU gettext library included here"
-@@ -73,7 +142,6 @@
- program_transform_name=s,x,x,
- silent=
- site=
--sitefile=
- srcdir=
- target=NONE
- verbose=
-@@ -188,7 +256,6 @@
-   --help                  print this message
-   --no-create             do not create output files
-   --quiet, --silent       do not print \`checking...' messages
--  --site-file=FILE        use FILE as the site file
-   --version               print the version of autoconf that created configure
- Directory and file names:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
-@@ -359,11 +426,6 @@
-   -site=* | --site=* | --sit=*)
-     site="$ac_optarg" ;;
- 
--  -site-file | --site-file | --site-fil | --site-fi | --site-f)
--    ac_prev=sitefile ;;
--  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
--    sitefile="$ac_optarg" ;;
--
-   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-     ac_prev=srcdir ;;
-   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-@@ -529,16 +591,12 @@
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
- 
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$sitefile"; then
--  if test -z "$CONFIG_SITE"; then
--    if test "x$prefix" != xNONE; then
--      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--    else
--      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--    fi
-+if test -z "$CONFIG_SITE"; then
-+  if test "x$prefix" != xNONE; then
-+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+  else
-+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-   fi
--else
--  CONFIG_SITE="$sitefile"
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
-@@ -579,7 +637,7 @@
- 
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
--echo "configure:583: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo "configure:641: checking whether to enable maintainer-specific portions of Makefiles" >&5
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-   enableval="$enable_maintainer_mode"
-@@ -605,7 +663,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:609: checking for $ac_word" >&5
-+echo "configure:667: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -635,7 +693,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:639: checking for $ac_word" >&5
-+echo "configure:697: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -686,7 +744,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:690: checking for $ac_word" >&5
-+echo "configure:748: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -718,7 +776,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:780: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -729,12 +787,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 733 "configure"
-+#line 791 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -760,12 +818,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:822: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:769: checking whether we are using GNU C" >&5
-+echo "configure:827: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -774,7 +832,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -793,7 +851,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:797: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:855: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -825,7 +883,7 @@
- fi
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:829: checking how to run the C preprocessor" >&5
-+echo "configure:887: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -840,13 +898,13 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 844 "configure"
-+#line 902 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -857,13 +915,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 861 "configure"
-+#line 919 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -874,13 +932,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 878 "configure"
-+#line 936 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -905,9 +963,9 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
--echo "configure:909: checking for AIX" >&5
-+echo "configure:967: checking for AIX" >&5
- cat > conftest.$ac_ext <<EOF
--#line 911 "configure"
-+#line 969 "configure"
- #include "confdefs.h"
- #ifdef _AIX
-   yes
-@@ -929,7 +987,7 @@
- 
- 
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:933: checking for POSIXized ISC" >&5
-+echo "configure:991: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -953,7 +1011,7 @@
- 
- 
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:957: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "configure:1015: checking for ${CC-cc} option to accept ANSI C" >&5
- if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -969,7 +1027,7 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   cat > conftest.$ac_ext <<EOF
--#line 973 "configure"
-+#line 1031 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -1006,7 +1064,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   am_cv_prog_cc_stdc="$ac_arg"; break
- else
-@@ -1030,6 +1088,142 @@
- esac
- 
- 
-+
-+# Check whether --with-aif or --without-aif was given.
-+if test "${with_aif+set}" = set; then
-+  withval="$with_aif"
-+  :
-+fi
-+
-+# Check whether --with-aif-lib or --without-aif-lib was given.
-+if test "${with_aif_lib+set}" = set; then
-+  withval="$with_aif_lib"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { echo "configure: error: No argument for --with-aif-lib" 1>&2; exit 1; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi
-+
-+# Check whether --with-aif-include or --without-aif-include was given.
-+if test "${with_aif_include+set}" = set; then
-+  withval="$with_aif_include"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { echo "configure: error: No argument for --with-aif-include" 1>&2; exit 1; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi
-+
-+
-+echo $ac_n "checking for aif""... $ac_c" 1>&6
-+echo "configure:1121: checking for aif" >&5
-+
-+case "$with_aif" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_aif_include" = ""; then
-+		with_aif_include="$with_aif/include"
-+	fi
-+	if test "$with_aif_lib" = ""; then
-+		with_aif_lib="$with_aif/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='/usr/local'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_aif_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_aif_include $header_dirs";;
-+esac
-+case "$with_aif_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_aif_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	cat > conftest.$ac_ext <<EOF
-+#line 1160 "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ires=$i;break
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i -laif  $save_LIBS"
-+	cat > conftest.$ac_ext <<EOF
-+#line 1179 "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lres=$i;break
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_aif" != "no"; then
-+	aif_includedir="$ires"
-+	aif_libdir="$lres"
-+	DIR_aif=
-+	INCLUDE_aif="-I$aif_includedir"
-+	LIB_aif="-L$aif_libdir -laif"
-+			cat >> confdefs.h <<EOF
-+#define AIF 1
-+EOF
-+
-+			with_aif=yes
-+	echo "$ac_t""headers $ires, libraries $lres" 1>&6
-+else
-+	DIR_aif="aif"
-+	INCLUDE_aif=
-+	LIB_aif=
-+	with_aif=no
-+	echo "$ac_t""$with_aif" 1>&6
-+fi
-+
-+
-+
-+
-+if test "$with_aif" = "no"; then
-+	{ echo "configure: error: You must have libaif to compile this version of GDB." 1>&2; exit 1; }
-+fi
-+cat >> confdefs.h <<\EOF
-+#define AIF 1
-+EOF
-+
- ac_aux_dir=
- for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
-   if test -f $ac_dir/install-sh; then
-@@ -1077,7 +1271,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:1081: checking host system type" >&5
-+echo "configure:1275: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -1098,7 +1292,7 @@
- echo "$ac_t""$host" 1>&6
- 
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:1102: checking target system type" >&5
-+echo "configure:1296: checking target system type" >&5
- 
- target_alias=$target
- case "$target_alias" in
-@@ -1116,7 +1310,7 @@
- echo "$ac_t""$target" 1>&6
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:1120: checking build system type" >&5
-+echo "configure:1314: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -1141,7 +1335,7 @@
- 
- ALL_LINGUAS=
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:1145: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:1339: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1170,7 +1364,7 @@
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1174: checking for $ac_word" >&5
-+echo "configure:1368: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1198,12 +1392,12 @@
- fi
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1202: checking for ANSI C header files" >&5
-+echo "configure:1396: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1207 "configure"
-+#line 1401 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1211,7 +1405,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1228,7 +1422,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1232 "configure"
-+#line 1426 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1246,7 +1440,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1250 "configure"
-+#line 1444 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1267,7 +1461,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1271 "configure"
-+#line 1465 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1278,7 +1472,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:1282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -1302,12 +1496,12 @@
- fi
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1306: checking for working const" >&5
-+echo "configure:1500: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1311 "configure"
-+#line 1505 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -1356,7 +1550,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -1377,21 +1571,21 @@
- fi
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:1381: checking for inline" >&5
-+echo "configure:1575: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 1388 "configure"
-+#line 1582 "configure"
- #include "confdefs.h"
- 
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:1395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -1417,12 +1611,12 @@
- esac
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:1421: checking for off_t" >&5
-+echo "configure:1615: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1426 "configure"
-+#line 1620 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1450,12 +1644,12 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1454: checking for size_t" >&5
-+echo "configure:1648: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1459 "configure"
-+#line 1653 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1485,19 +1679,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:1489: checking for working alloca.h" >&5
-+echo "configure:1683: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1494 "configure"
-+#line 1688 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:1501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -1518,12 +1712,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:1522: checking for alloca" >&5
-+echo "configure:1716: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1527 "configure"
-+#line 1721 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -1551,7 +1745,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:1555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -1583,12 +1777,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:1587: checking whether alloca needs Cray hooks" >&5
-+echo "configure:1781: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1592 "configure"
-+#line 1786 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -1613,12 +1807,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1617: checking for $ac_func" >&5
-+echo "configure:1811: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1622 "configure"
-+#line 1816 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1641,7 +1835,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1668,7 +1862,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:1672: checking stack direction for C alloca" >&5
-+echo "configure:1866: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1676,7 +1870,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1680 "configure"
-+#line 1874 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -1695,7 +1889,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -1720,17 +1914,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1724: checking for $ac_hdr" >&5
-+echo "configure:1918: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1729 "configure"
-+#line 1923 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1759,12 +1953,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1763: checking for $ac_func" >&5
-+echo "configure:1957: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1768 "configure"
-+#line 1962 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1787,7 +1981,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1812,7 +2006,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:1816: checking for working mmap" >&5
-+echo "configure:2010: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1820,7 +2014,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1824 "configure"
-+#line 2018 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -1960,7 +2154,7 @@
- }
- 
- EOF
--if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -1988,17 +2182,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1992: checking for $ac_hdr" >&5
-+echo "configure:2186: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1997 "configure"
-+#line 2191 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2028,12 +2222,12 @@
- __argz_count __argz_stringify __argz_next
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2032: checking for $ac_func" >&5
-+echo "configure:2226: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2037 "configure"
-+#line 2231 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2056,7 +2250,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2085,12 +2279,12 @@
-      for ac_func in stpcpy
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2089: checking for $ac_func" >&5
-+echo "configure:2283: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2094 "configure"
-+#line 2288 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2113,7 +2307,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2147,19 +2341,19 @@
- 
-    if test $ac_cv_header_locale_h = yes; then
-     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
--echo "configure:2151: checking for LC_MESSAGES" >&5
-+echo "configure:2345: checking for LC_MESSAGES" >&5
- if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2156 "configure"
-+#line 2350 "configure"
- #include "confdefs.h"
- #include <locale.h>
- int main() {
- return LC_MESSAGES
- ; return 0; }
- EOF
--if { (eval echo configure:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   am_cv_val_LC_MESSAGES=yes
- else
-@@ -2180,7 +2374,7 @@
-     fi
-   fi
-    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
--echo "configure:2184: checking whether NLS is requested" >&5
-+echo "configure:2378: checking whether NLS is requested" >&5
-         # Check whether --enable-nls or --disable-nls was given.
- if test "${enable_nls+set}" = set; then
-   enableval="$enable_nls"
-@@ -2200,7 +2394,7 @@
- EOF
- 
-       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
--echo "configure:2204: checking whether included gettext is requested" >&5
-+echo "configure:2398: checking whether included gettext is requested" >&5
-       # Check whether --with-included-gettext or --without-included-gettext was given.
- if test "${with_included_gettext+set}" = set; then
-   withval="$with_included_gettext"
-@@ -2219,17 +2413,17 @@
- 
- 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
--echo "configure:2223: checking for libintl.h" >&5
-+echo "configure:2417: checking for libintl.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2228 "configure"
-+#line 2422 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2246,19 +2440,19 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
--echo "configure:2250: checking for gettext in libc" >&5
-+echo "configure:2444: checking for gettext in libc" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2255 "configure"
-+#line 2449 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- int main() {
- return (int) gettext ("")
- ; return 0; }
- EOF
--if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gt_cv_func_gettext_libc=yes
- else
-@@ -2274,7 +2468,7 @@
- 
- 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
- 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
--echo "configure:2278: checking for bindtextdomain in -lintl" >&5
-+echo "configure:2472: checking for bindtextdomain in -lintl" >&5
- ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2282,7 +2476,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lintl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2286 "configure"
-+#line 2480 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2293,7 +2487,7 @@
- bindtextdomain()
- ; return 0; }
- EOF
--if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2309,19 +2503,19 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
--echo "configure:2313: checking for gettext in libintl" >&5
-+echo "configure:2507: checking for gettext in libintl" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2318 "configure"
-+#line 2512 "configure"
- #include "confdefs.h"
- 
- int main() {
- return (int) gettext ("")
- ; return 0; }
- EOF
--if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gt_cv_func_gettext_libintl=yes
- else
-@@ -2349,7 +2543,7 @@
- 	      # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2353: checking for $ac_word" >&5
-+echo "configure:2547: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2383,12 +2577,12 @@
- 		for ac_func in dcgettext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2387: checking for $ac_func" >&5
-+echo "configure:2581: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2392 "configure"
-+#line 2586 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2411,7 +2605,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2438,7 +2632,7 @@
- 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2442: checking for $ac_word" >&5
-+echo "configure:2636: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2474,7 +2668,7 @@
- 		# Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2478: checking for $ac_word" >&5
-+echo "configure:2672: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2506,7 +2700,7 @@
- fi
- 
- 		cat > conftest.$ac_ext <<EOF
--#line 2510 "configure"
-+#line 2704 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -2514,7 +2708,7 @@
- 			       return _nl_msg_cat_cntr
- ; return 0; }
- EOF
--if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   CATOBJEXT=.gmo
- 		   DATADIRNAME=share
-@@ -2546,7 +2740,7 @@
-         # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2550: checking for $ac_word" >&5
-+echo "configure:2744: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2580,7 +2774,7 @@
-         # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2584: checking for $ac_word" >&5
-+echo "configure:2778: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2616,7 +2810,7 @@
-         # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2620: checking for $ac_word" >&5
-+echo "configure:2814: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2706,7 +2900,7 @@
-        LINGUAS=
-      else
-        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
--echo "configure:2710: checking for catalogs to be installed" >&5
-+echo "configure:2904: checking for catalogs to be installed" >&5
-        NEW_LINGUAS=
-        for lang in ${LINGUAS=$ALL_LINGUAS}; do
-          case "$ALL_LINGUAS" in
-@@ -2734,17 +2928,17 @@
-       if test "$CATOBJEXT" = ".cat"; then
- 	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
--echo "configure:2738: checking for linux/version.h" >&5
-+echo "configure:2932: checking for linux/version.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2743 "configure"
-+#line 2937 "configure"
- #include "confdefs.h"
- #include <linux/version.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2846,7 +3040,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2850: checking for $ac_word" >&5
-+echo "configure:3044: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2887,7 +3081,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:2891: checking for a BSD compatible install" >&5
-+echo "configure:3085: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2948,7 +3142,7 @@
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2952: checking for $ac_word" >&5
-+echo "configure:3146: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2980,7 +3174,7 @@
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2984: checking for $ac_word" >&5
-+echo "configure:3178: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3012,7 +3206,7 @@
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3016: checking for $ac_word" >&5
-+echo "configure:3210: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3049,7 +3243,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3053: checking for $ac_word" >&5
-+echo "configure:3247: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3083,7 +3277,7 @@
- # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args.
- set dummy ${ac_tool_prefix}mig; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3087: checking for $ac_word" >&5
-+echo "configure:3281: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3134,12 +3328,12 @@
- 
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:3138: checking return type of signal handlers" >&5
-+echo "configure:3332: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3143 "configure"
-+#line 3337 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -3156,7 +3350,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:3160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -3176,12 +3370,12 @@
- 
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:3180: checking for ANSI C header files" >&5
-+echo "configure:3374: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3185 "configure"
-+#line 3379 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -3189,7 +3383,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3206,7 +3400,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3210 "configure"
-+#line 3404 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -3224,7 +3418,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3228 "configure"
-+#line 3422 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3245,7 +3439,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3249 "configure"
-+#line 3443 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -3256,7 +3450,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -3297,17 +3491,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3301: checking for $ac_hdr" >&5
-+echo "configure:3495: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3306 "configure"
-+#line 3500 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3334,12 +3528,12 @@
- done
- 
- echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
--echo "configure:3338: checking whether stat file-mode macros are broken" >&5
-+echo "configure:3532: checking whether stat file-mode macros are broken" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3343 "configure"
-+#line 3537 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -3391,12 +3585,12 @@
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:3395: checking for working const" >&5
-+echo "configure:3589: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3400 "configure"
-+#line 3594 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3445,7 +3639,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -3469,12 +3663,12 @@
- for ac_func in setpgid sbrk sigaction isascii bzero bcopy btowc poll sigprocmask
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3473: checking for $ac_func" >&5
-+echo "configure:3667: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3478 "configure"
-+#line 3672 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3497,7 +3691,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3524,19 +3718,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:3528: checking for working alloca.h" >&5
-+echo "configure:3722: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3533 "configure"
-+#line 3727 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:3540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -3557,12 +3751,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:3561: checking for alloca" >&5
-+echo "configure:3755: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3566 "configure"
-+#line 3760 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -3590,7 +3784,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -3622,12 +3816,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:3626: checking whether alloca needs Cray hooks" >&5
-+echo "configure:3820: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3631 "configure"
-+#line 3825 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -3652,12 +3846,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3656: checking for $ac_func" >&5
-+echo "configure:3850: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3661 "configure"
-+#line 3855 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3680,7 +3874,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3707,7 +3901,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:3711: checking stack direction for C alloca" >&5
-+echo "configure:3905: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3715,7 +3909,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3719 "configure"
-+#line 3913 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -3734,7 +3928,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:3738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -3757,19 +3951,19 @@
- 
- 
- echo $ac_n "checking for PTRACE_GETREGS""... $ac_c" 1>&6
--echo "configure:3761: checking for PTRACE_GETREGS" >&5
-+echo "configure:3955: checking for PTRACE_GETREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3766 "configure"
-+#line 3960 "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
- int main() {
- PTRACE_GETREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:3773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_ptrace_getregs=yes
- else
-@@ -3790,19 +3984,19 @@
- fi
- 
- echo $ac_n "checking for PTRACE_GETXFPREGS""... $ac_c" 1>&6
--echo "configure:3794: checking for PTRACE_GETXFPREGS" >&5
-+echo "configure:3988: checking for PTRACE_GETXFPREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getxfpregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3799 "configure"
-+#line 3993 "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
- int main() {
- PTRACE_GETXFPREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:3806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_ptrace_getxfpregs=yes
- else
-@@ -3823,7 +4017,7 @@
- fi
- 
- echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
--echo "configure:3827: checking for socketpair in -lsocket" >&5
-+echo "configure:4021: checking for socketpair in -lsocket" >&5
- ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3831,7 +4025,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3835 "configure"
-+#line 4029 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3842,7 +4036,7 @@
- socketpair()
- ; return 0; }
- EOF
--if { (eval echo configure:3846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3872,12 +4066,12 @@
- for ac_func in socketpair
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3876: checking for $ac_func" >&5
-+echo "configure:4070: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3881 "configure"
-+#line 4075 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3900,7 +4094,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3927,12 +4121,12 @@
- 
- 
- echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6
--echo "configure:3931: checking whether malloc must be declared" >&5
-+echo "configure:4125: checking whether malloc must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3936 "configure"
-+#line 4130 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -3953,7 +4147,7 @@
- char *(*pfn) = (char *(*)) malloc
- ; return 0; }
- EOF
--if { (eval echo configure:3957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_malloc=no
- else
-@@ -3974,12 +4168,12 @@
- fi
- 
- echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6
--echo "configure:3978: checking whether realloc must be declared" >&5
-+echo "configure:4172: checking whether realloc must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3983 "configure"
-+#line 4177 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4000,7 +4194,7 @@
- char *(*pfn) = (char *(*)) realloc
- ; return 0; }
- EOF
--if { (eval echo configure:4004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_realloc=no
- else
-@@ -4021,12 +4215,12 @@
- fi
- 
- echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6
--echo "configure:4025: checking whether free must be declared" >&5
-+echo "configure:4219: checking whether free must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4030 "configure"
-+#line 4224 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4047,7 +4241,7 @@
- char *(*pfn) = (char *(*)) free
- ; return 0; }
- EOF
--if { (eval echo configure:4051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_free=no
- else
-@@ -4068,12 +4262,12 @@
- fi
- 
- echo $ac_n "checking whether strerror must be declared""... $ac_c" 1>&6
--echo "configure:4072: checking whether strerror must be declared" >&5
-+echo "configure:4266: checking whether strerror must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strerror'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4077 "configure"
-+#line 4271 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4094,7 +4288,7 @@
- char *(*pfn) = (char *(*)) strerror
- ; return 0; }
- EOF
--if { (eval echo configure:4098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strerror=no
- else
-@@ -4115,12 +4309,12 @@
- fi
- 
- echo $ac_n "checking whether strdup must be declared""... $ac_c" 1>&6
--echo "configure:4119: checking whether strdup must be declared" >&5
-+echo "configure:4313: checking whether strdup must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strdup'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4124 "configure"
-+#line 4318 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4141,7 +4335,7 @@
- char *(*pfn) = (char *(*)) strdup
- ; return 0; }
- EOF
--if { (eval echo configure:4145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strdup=no
- else
-@@ -4162,12 +4356,12 @@
- fi
- 
- echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6
--echo "configure:4166: checking whether strstr must be declared" >&5
-+echo "configure:4360: checking whether strstr must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4171 "configure"
-+#line 4365 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4188,7 +4382,7 @@
- char *(*pfn) = (char *(*)) strstr
- ; return 0; }
- EOF
--if { (eval echo configure:4192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strstr=no
- else
-@@ -4215,9 +4409,9 @@
- # could be expunged. --jsm 1999-03-22
- 
- echo $ac_n "checking for HPUX save_state structure""... $ac_c" 1>&6
--echo "configure:4219: checking for HPUX save_state structure" >&5
-+echo "configure:4413: checking for HPUX save_state structure" >&5
- cat > conftest.$ac_ext <<EOF
--#line 4221 "configure"
-+#line 4415 "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- EOF
-@@ -4232,7 +4426,7 @@
- rm -f conftest*
- 
- cat > conftest.$ac_ext <<EOF
--#line 4236 "configure"
-+#line 4430 "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- EOF
-@@ -4296,19 +4490,19 @@
- 
- if test "$ac_cv_header_sys_procfs_h" = yes; then
-   echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4300: checking for pstatus_t in sys/procfs.h" >&5
-+echo "configure:4494: checking for pstatus_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4305 "configure"
-+#line 4499 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- pstatus_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pstatus_t=yes
- else
-@@ -4330,19 +4524,19 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6
- 
-   echo $ac_n "checking for prrun_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4334: checking for prrun_t in sys/procfs.h" >&5
-+echo "configure:4528: checking for prrun_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prrun_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4339 "configure"
-+#line 4533 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- prrun_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prrun_t=yes
- else
-@@ -4364,19 +4558,19 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prrun_t" 1>&6
- 
-   echo $ac_n "checking for gregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4368: checking for gregset_t in sys/procfs.h" >&5
-+echo "configure:4562: checking for gregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_gregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4373 "configure"
-+#line 4567 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- gregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_gregset_t=yes
- else
-@@ -4398,19 +4592,19 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_gregset_t" 1>&6
- 
-   echo $ac_n "checking for fpregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4402: checking for fpregset_t in sys/procfs.h" >&5
-+echo "configure:4596: checking for fpregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_fpregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4407 "configure"
-+#line 4601 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- fpregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_fpregset_t=yes
- else
-@@ -4432,19 +4626,19 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_fpregset_t" 1>&6
- 
-   echo $ac_n "checking for prgregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4436: checking for prgregset_t in sys/procfs.h" >&5
-+echo "configure:4630: checking for prgregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4441 "configure"
-+#line 4635 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- prgregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prgregset_t=yes
- else
-@@ -4466,19 +4660,19 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset_t" 1>&6
- 
-   echo $ac_n "checking for prfpregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4470: checking for prfpregset_t in sys/procfs.h" >&5
-+echo "configure:4664: checking for prfpregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4475 "configure"
-+#line 4669 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- prfpregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prfpregset_t=yes
- else
-@@ -4500,19 +4694,19 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset_t" 1>&6
- 
-   echo $ac_n "checking for lwpid_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4504: checking for lwpid_t in sys/procfs.h" >&5
-+echo "configure:4698: checking for lwpid_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4509 "configure"
-+#line 4703 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- lwpid_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_lwpid_t=yes
- else
-@@ -4534,19 +4728,19 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpid_t" 1>&6
- 
-   echo $ac_n "checking for psaddr_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4538: checking for psaddr_t in sys/procfs.h" >&5
-+echo "configure:4732: checking for psaddr_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psaddr_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4543 "configure"
-+#line 4737 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
- int main() {
- psaddr_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_psaddr_t=yes
- else
-@@ -4572,7 +4766,7 @@
-         
-   if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
-     echo $ac_n "checking whether prfpregset_t type is broken""... $ac_c" 1>&6
--echo "configure:4576: checking whether prfpregset_t type is broken" >&5
-+echo "configure:4770: checking whether prfpregset_t type is broken" >&5
-     if eval "test \"`echo '$''{'gdb_cv_prfpregset_t_broken'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4580,7 +4774,7 @@
-   gdb_cv_prfpregset_t_broken=yes
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4584 "configure"
-+#line 4778 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
-        int main ()
-@@ -4590,7 +4784,7 @@
-          return 0;
-        }
- EOF
--if { (eval echo configure:4594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_prfpregset_t_broken=no
- else
-@@ -4615,12 +4809,12 @@
- 
-   
-   echo $ac_n "checking for PIOCSET ioctl entry in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4619: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
-+echo "configure:4813: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_procfs_piocset'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4624 "configure"
-+#line 4818 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- #include <sys/types.h>
-@@ -4633,7 +4827,7 @@
-   
- ; return 0; }
- EOF
--if { (eval echo configure:4637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_procfs_piocset=yes
- else
-@@ -4655,7 +4849,7 @@
- fi
- 
- echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
--echo "configure:4659: checking for main in -lm" >&5
-+echo "configure:4853: checking for main in -lm" >&5
- ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4663,14 +4857,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4667 "configure"
-+#line 4861 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4699,7 +4893,7 @@
- 
- 
- echo $ac_n "checking for wctype in -lc""... $ac_c" 1>&6
--echo "configure:4703: checking for wctype in -lc" >&5
-+echo "configure:4897: checking for wctype in -lc" >&5
- ac_lib_var=`echo c'_'wctype | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4707,7 +4901,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4711 "configure"
-+#line 4905 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4718,7 +4912,7 @@
- wctype()
- ; return 0; }
- EOF
--if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4737,7 +4931,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6
--echo "configure:4741: checking for wctype in -lw" >&5
-+echo "configure:4935: checking for wctype in -lw" >&5
- ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4745,7 +4939,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lw  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4749 "configure"
-+#line 4943 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4756,7 +4950,7 @@
- wctype()
- ; return 0; }
- EOF
--if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4788,12 +4982,12 @@
- 
- 
- echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6
--echo "configure:4792: checking for long long support in compiler" >&5
-+echo "configure:4986: checking for long long support in compiler" >&5
- if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4797 "configure"
-+#line 4991 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -4803,7 +4997,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_c_long_long=yes
- else
-@@ -4825,7 +5019,7 @@
- 
- 
- echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6
--echo "configure:4829: checking for long long support in printf" >&5
-+echo "configure:5023: checking for long long support in printf" >&5
- if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4833,7 +5027,7 @@
-   gdb_cv_printf_has_long_long=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4837 "configure"
-+#line 5031 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -4847,7 +5041,7 @@
-   return (strcmp ("0x0123456789abcdef", buf));
- }
- EOF
--if { (eval echo configure:4851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_printf_has_long_long=yes
- else
-@@ -4871,19 +5065,19 @@
- 
- 
- echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6
--echo "configure:4875: checking for long double support in compiler" >&5
-+echo "configure:5069: checking for long double support in compiler" >&5
- if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4880 "configure"
-+#line 5074 "configure"
- #include "confdefs.h"
- 
- int main() {
- long double foo;
- ; return 0; }
- EOF
--if { (eval echo configure:4887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_long_double=yes
- else
-@@ -4905,7 +5099,7 @@
- 
- 
- echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6
--echo "configure:4909: checking for long double support in printf" >&5
-+echo "configure:5103: checking for long double support in printf" >&5
- if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4913,7 +5107,7 @@
-   gdb_cv_printf_has_long_double=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4917 "configure"
-+#line 5111 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -4923,7 +5117,7 @@
-   return (strncmp ("3.14159", buf, 7));
- }
- EOF
--if { (eval echo configure:4927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_printf_has_long_double=yes
- else
-@@ -4947,7 +5141,7 @@
- 
- 
- echo $ac_n "checking for long double support in scanf""... $ac_c" 1>&6
--echo "configure:4951: checking for long double support in scanf" >&5
-+echo "configure:5145: checking for long double support in scanf" >&5
- if eval "test \"`echo '$''{'gdb_cv_scanf_has_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4955,7 +5149,7 @@
-   gdb_cv_scanf_has_long_double=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4959 "configure"
-+#line 5153 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -4965,7 +5159,7 @@
-   return !(f > 3.14159 && f < 3.14160);
- }
- EOF
--if { (eval echo configure:4969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_scanf_has_long_double=yes
- else
-@@ -4991,17 +5185,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4995: checking for $ac_hdr" >&5
-+echo "configure:5189: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5000 "configure"
-+#line 5194 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -5030,12 +5224,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5034: checking for $ac_func" >&5
-+echo "configure:5228: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5039 "configure"
-+#line 5233 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -5058,7 +5252,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5083,7 +5277,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:5087: checking for working mmap" >&5
-+echo "configure:5281: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5091,7 +5285,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5095 "configure"
-+#line 5289 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -5231,7 +5425,7 @@
- }
- 
- EOF
--if { (eval echo configure:5235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -5260,7 +5454,7 @@
-    case ${host_os} in
-    hpux*)
-       echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6
--echo "configure:5264: checking for HPUX/OSF thread support" >&5
-+echo "configure:5458: checking for HPUX/OSF thread support" >&5
-       if test -f /usr/include/dce/cma_config.h ; then
-          if test "$GCC" = "yes" ; then
-             echo "$ac_t""yes" 1>&6
-@@ -5279,7 +5473,7 @@
-       ;;
-    solaris*)
-       echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6
--echo "configure:5283: checking for Solaris thread debugging library" >&5
-+echo "configure:5477: checking for Solaris thread debugging library" >&5
-       if test -f /usr/lib/libthread_db.so.1 ; then
-          echo "$ac_t""yes" 1>&6
-          cat >> confdefs.h <<\EOF
-@@ -5289,7 +5483,7 @@
-          CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
-          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
-          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:5293: checking for dlopen in -ldl" >&5
-+echo "configure:5487: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5297,7 +5491,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5301 "configure"
-+#line 5495 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5308,7 +5502,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:5312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5340,17 +5534,17 @@
-             # all symbols visible in the dynamic symbol table.
-             hold_ldflags=$LDFLAGS
-             echo $ac_n "checking for the ld -export-dynamic flag""... $ac_c" 1>&6
--echo "configure:5344: checking for the ld -export-dynamic flag" >&5
-+echo "configure:5538: checking for the ld -export-dynamic flag" >&5
-             LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
-             cat > conftest.$ac_ext <<EOF
--#line 5347 "configure"
-+#line 5541 "configure"
- #include "confdefs.h"
- 
- int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   found=yes
- else
-@@ -5369,13 +5563,13 @@
- 	 # Sun randomly tweaked the prototypes in <proc_service.h>
- 	 # at one point.
- 	 echo $ac_n "checking if <proc_service.h> is old""... $ac_c" 1>&6
--echo "configure:5373: checking if <proc_service.h> is old" >&5
-+echo "configure:5567: checking if <proc_service.h> is old" >&5
- 	 if eval "test \"`echo '$''{'gdb_cv_proc_service_is_old'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 	    cat > conftest.$ac_ext <<EOF
--#line 5379 "configure"
-+#line 5573 "configure"
- #include "confdefs.h"
- 
- 		#include <proc_service.h>
-@@ -5386,7 +5580,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_proc_service_is_old=no
- else
-@@ -5576,12 +5770,12 @@
- REGEX_CFLAGS="-DUSE_INCLUDED_REGEX"
- if test $want_included_regex = false; then
-   echo $ac_n "checking for GNU regex""... $ac_c" 1>&6
--echo "configure:5580: checking for GNU regex" >&5
-+echo "configure:5774: checking for GNU regex" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5585 "configure"
-+#line 5779 "configure"
- #include "confdefs.h"
- #include <gnu-versions.h>
- #include <sys/types.h>
-@@ -5593,7 +5787,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_gnu_regex=yes
- else
-@@ -5616,12 +5810,12 @@
- 
- # In the Cygwin environment, we need some additional flags.
- echo $ac_n "checking for cygwin""... $ac_c" 1>&6
--echo "configure:5620: checking for cygwin" >&5
-+echo "configure:5814: checking for cygwin" >&5
- if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5625 "configure"
-+#line 5819 "configure"
- #include "confdefs.h"
- 
- #if defined (__CYGWIN__) || defined (__CYGWIN32__)
-@@ -5655,7 +5849,7 @@
- else
-   TERM_LIB=
-   echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
--echo "configure:5659: checking for tgetent in -lncurses" >&5
-+echo "configure:5853: checking for tgetent in -lncurses" >&5
- ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5663,7 +5857,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lncurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5667 "configure"
-+#line 5861 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5674,7 +5868,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:5678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5693,7 +5887,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lHcurses""... $ac_c" 1>&6
--echo "configure:5697: checking for tgetent in -lHcurses" >&5
-+echo "configure:5891: checking for tgetent in -lHcurses" >&5
- ac_lib_var=`echo Hcurses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5701,7 +5895,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lHcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5705 "configure"
-+#line 5899 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5712,7 +5906,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:5716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5731,7 +5925,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6
--echo "configure:5735: checking for tgetent in -ltermlib" >&5
-+echo "configure:5929: checking for tgetent in -ltermlib" >&5
- ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5739,7 +5933,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ltermlib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5743 "configure"
-+#line 5937 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5750,7 +5944,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:5754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5769,7 +5963,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
--echo "configure:5773: checking for tgetent in -ltermcap" >&5
-+echo "configure:5967: checking for tgetent in -ltermcap" >&5
- ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5777,7 +5971,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ltermcap  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5781 "configure"
-+#line 5975 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5788,7 +5982,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:5792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5807,7 +6001,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
--echo "configure:5811: checking for tgetent in -lcurses" >&5
-+echo "configure:6005: checking for tgetent in -lcurses" >&5
- ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5815,7 +6009,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5819 "configure"
-+#line 6013 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5826,7 +6020,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:5830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5845,7 +6039,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lterminfo""... $ac_c" 1>&6
--echo "configure:5849: checking for tgetent in -lterminfo" >&5
-+echo "configure:6043: checking for tgetent in -lterminfo" >&5
- ac_lib_var=`echo terminfo'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5853,7 +6047,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lterminfo  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5857 "configure"
-+#line 6051 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5864,7 +6058,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6022,7 +6216,7 @@
- fi
- 
-   echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
--echo "configure:6026: checking for Tcl configuration" >&5
-+echo "configure:6220: checking for Tcl configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6130,7 +6324,7 @@
- fi
- 
-   echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
--echo "configure:6134: checking for Tk configuration" >&5
-+echo "configure:6328: checking for Tk configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6226,7 +6420,7 @@
- 
- no_tcl=true
- echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6
--echo "configure:6230: checking for Tcl private headers. dir=${configdir}" >&5
-+echo "configure:6424: checking for Tcl private headers. dir=${configdir}" >&5
- # Check whether --with-tclinclude or --without-tclinclude was given.
- if test "${with_tclinclude+set}" = set; then
-   withval="$with_tclinclude"
-@@ -6292,17 +6486,17 @@
- if test x"${ac_cv_c_tclh}" = x ; then
-    ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
--echo "configure:6296: checking for tclInt.h" >&5
-+echo "configure:6490: checking for tclInt.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6301 "configure"
-+#line 6495 "configure"
- #include "confdefs.h"
- #include <tclInt.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6362,7 +6556,7 @@
- #
- no_tk=true
- echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6
--echo "configure:6366: checking for Tk private headers" >&5
-+echo "configure:6560: checking for Tk private headers" >&5
- # Check whether --with-tkinclude or --without-tkinclude was given.
- if test "${with_tkinclude+set}" = set; then
-   withval="$with_tkinclude"
-@@ -6428,17 +6622,17 @@
- if test x"${ac_cv_c_tkh}" = x ; then
-    ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for tk.h""... $ac_c" 1>&6
--echo "configure:6432: checking for tk.h" >&5
-+echo "configure:6626: checking for tk.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6437 "configure"
-+#line 6631 "configure"
- #include "confdefs.h"
- #include <tk.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6484,7 +6678,7 @@
- 
- 	   
- echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:6488: checking for Itcl private headers. srcdir=${srcdir}" >&5
-+echo "configure:6682: checking for Itcl private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_itclh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
-     if test -f $i/generic/itcl.h ; then
-@@ -6507,7 +6701,7 @@
- 
- 	   
- echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:6511: checking for Itk private headers. srcdir=${srcdir}" >&5
-+echo "configure:6705: checking for Itk private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_itkh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do
-     if test -f $i/generic/itk.h ; then
-@@ -6530,7 +6724,7 @@
- 
- 	   
- echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:6534: checking for Tix private headers. srcdir=${srcdir}" >&5
-+echo "configure:6728: checking for Tix private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_tixh}" = x ; then
-   for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do
-     if test -f $i/generic/tix.h ; then
-@@ -6568,7 +6762,7 @@
- fi
- 
-   echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6
--echo "configure:6572: checking for Itcl configuration" >&5
-+echo "configure:6766: checking for Itcl configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6680,7 +6874,7 @@
- fi
- 
-   echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6
--echo "configure:6684: checking for Itk configuration" >&5
-+echo "configure:6878: checking for Itk configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6792,7 +6986,7 @@
- fi
- 
-   echo $ac_n "checking for Tix configuration""... $ac_c" 1>&6
--echo "configure:6796: checking for Tix configuration" >&5
-+echo "configure:6990: checking for Tix configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tixconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6931,7 +7125,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:6935: checking for X" >&5
-+echo "configure:7129: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -6993,12 +7187,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 6997 "configure"
-+#line 7191 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7067,14 +7261,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7071 "configure"
-+#line 7265 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:7078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -7356,7 +7550,7 @@
- links="${links} nm.h"
- fi
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:7360: checking whether ln -s works" >&5
-+echo "configure:7554: checking whether ln -s works" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7380,12 +7574,12 @@
- 
- 
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
--echo "configure:7384: checking for Cygwin environment" >&5
-+echo "configure:7578: checking for Cygwin environment" >&5
- if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7389 "configure"
-+#line 7583 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -7396,7 +7590,7 @@
- return __CYGWIN__;
- ; return 0; }
- EOF
--if { (eval echo configure:7400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_cygwin=yes
- else
-@@ -7413,19 +7607,19 @@
- CYGWIN=
- test "$ac_cv_cygwin" = yes && CYGWIN=yes
- echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:7417: checking for mingw32 environment" >&5
-+echo "configure:7611: checking for mingw32 environment" >&5
- if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7422 "configure"
-+#line 7616 "configure"
- #include "confdefs.h"
- 
- int main() {
- return __MINGW32__;
- ; return 0; }
- EOF
--if { (eval echo configure:7429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_mingw32=yes
- else
-@@ -7444,7 +7638,7 @@
- 
- 
- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:7448: checking for executable suffix" >&5
-+echo "configure:7642: checking for executable suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7454,10 +7648,10 @@
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_exeext=
--  if { (eval echo configure:7458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+  if { (eval echo configure:7652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-     for file in conftest.*; do
-       case $file in
--      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+      *.c | *.o | *.obj) ;;
-       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-       esac
-     done
-@@ -7615,6 +7809,9 @@
- s%@MAINT@%$MAINT%g
- s%@CC@%$CC%g
- s%@CPP@%$CPP%g
-+s%@DIR_aif@%$DIR_aif%g
-+s%@INCLUDE_aif@%$INCLUDE_aif%g
-+s%@LIB_aif@%$LIB_aif%g
- s%@host@%$host%g
- s%@host_alias@%$host_alias%g
- s%@host_cpu@%$host_cpu%g

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.2.patch b/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.2.patch
deleted file mode 100644
index 87a96b6..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-5.2.patch
+++ /dev/null

@@ -1,4929 +0,0 @@
---- /dev/null	Wed Apr  2 20:34:28 2003
-+++ gdb-5.2/gdb/aif-valprint.c	Wed Apr  2 21:02:51 2003
-@@ -0,0 +1,1135 @@
-+/* Support for printing C and C++ types for GDB, the GNU debugger.
-+   Copyright 1986, 1988, 1989, 1991, 1993-1996, 1998-2000
-+   Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.  */
-+
-+#include "defs.h"
-+#include "obstack.h"
-+#include "bfd.h"		/* Binary File Description */
-+#include "symtab.h"
-+#include "gdbtypes.h"
-+#include "expression.h"
-+#include "value.h"
-+#include "valprint.h"
-+#include "gdbcore.h"
-+#include "target.h"
-+#include "command.h"
-+#include "gdbcmd.h"
-+#include "language.h"
-+#include "demangle.h"
-+#include "c-lang.h"
-+#include "typeprint.h"
-+#include "ui-file.h"
-+
-+#include "gdb_string.h"
-+#include "aif.h"
-+#include <errno.h>
-+#include <ctype.h>
-+void mem_file_delete (struct ui_file *file);
-+
-+int check_value(struct type *, CORE_ADDR, struct value **);
-+
-+/* defined in valprint.c: */
-+extern int partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr);
-+
-+
-+/* the following comes from the aif library, conv.c, written by Greg. */
-+
-+#if defined(WINDOWSNT)
-+#define BITSPERBYTE	8
-+#elif defined(__APPLE__)
-+#include <sys/types.h>
-+#define BITSPERBYTE     NBBY
-+#else /* !WINDOWSNT && !__APPLE_ */
-+#include <values.h>
-+#endif
-+
-+union ieee_double
-+{
-+	DOUBLEST	d;
-+	char		c[sizeof(DOUBLEST)];
-+};
-+
-+
-+/* For linked data structures, we check for circularity by recording the values
-+ * of all pointers and types we see.  In a later pass, we emit a name on those
-+ * types and an offset for those values
-+ * that appear more than once. */
-+struct value_info {
-+  CORE_ADDR addr;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: value has been
-+    emitted */
-+};
-+struct type_info {
-+  struct type *type;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: name has been
-+    emitted */
-+};
-+
-+#define MAX_VALUES_SEEN 1000
-+	/* hope that the structure doesn't have more distinct pointer values */
-+struct value_info valuesSeen[MAX_VALUES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numValuesSeen;
-+#define MAX_TYPES_SEEN 100
-+	/* hope that the structure doesn't have more distinct types values */
-+struct type_info typesSeen[MAX_TYPES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numTypesSeen;
-+
-+typedef enum {doType, doValue} doWhat;
-+
-+struct str_type
-+{
-+	int	blen;
-+	int	slen;
-+	int	end;
-+	char *	buf;
-+};
-+
-+typedef struct str_type *	str_ptr;
-+
-+str_ptr str_init(void);
-+void str_add(str_ptr, char *);
-+void str_free(str_ptr);
-+char *str_val(str_ptr);
-+str_ptr str_dup(char *);
-+
-+/* fill in the valuesSeen array with all the pointer values we see */
-+void
-+aif_discover(struct type *type, char *valaddr, doWhat what)
-+{
-+  int valuesSeenIndex;
-+  struct type *elttype;
-+  unsigned int eltlen, offset;
-+  CORE_ADDR addr;
-+  switch (TYPE_CODE (type))
-+    {
-+    case TYPE_CODE_TYPEDEF:
-+      aif_discover(TYPE_TARGET_TYPE (type), valaddr, what);
-+      break;
-+
-+    case TYPE_CODE_PTR:
-+    case TYPE_CODE_REF:
-+      if (what == doValue)
-+      { /* looking for values */
-+	struct value *deref_val;
-+	addr = unpack_pointer (type, valaddr);
-+	if (addr == 0) break;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (valuesSeenIndex = 0; valuesSeenIndex < numValuesSeen;
-+	valuesSeenIndex++)
-+	{
-+	  if (addr == valuesSeen[valuesSeenIndex].addr)
-+	  {
-+	    valuesSeen[valuesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numValuesSeen < MAX_VALUES_SEEN)
-+	  {
-+	    valuesSeen[numValuesSeen].addr = addr;
-+	    valuesSeen[numValuesSeen].used = 0;
-+	    numValuesSeen += 1;
-+	  }
-+	/*
-+	** Check addr is valid!
-+	*/
-+	if ( check_value(elttype, addr, &deref_val) )
-+		aif_discover(elttype, VALUE_CONTENTS (deref_val), what);
-+	break;
-+      } else {
-+	/* looking for types */
-+	int typesSeenIndex;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (typesSeenIndex = 0; typesSeenIndex < numTypesSeen;
-+	typesSeenIndex++)
-+	{
-+	  if (elttype == typesSeen[typesSeenIndex].type)
-+	  {
-+	    typesSeen[typesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numTypesSeen < MAX_TYPES_SEEN)
-+	  {
-+	    typesSeen[numTypesSeen].type = elttype;
-+	    typesSeen[numTypesSeen].used = 0;
-+	    numTypesSeen += 1;
-+	  }
-+	aif_discover(elttype, 0, what);
-+	break;
-+      } /* discover types */
-+
-+    case TYPE_CODE_STRUCT:
-+    case TYPE_CODE_UNION:
-+      { /* discover either values or types */
-+	int i;
-+      	struct field *thisField;
-+	struct type *ftype;
-+	struct value *v;
-+
-+	for ( i = 0; i < TYPE_NFIELDS(type); i++ )
-+	{
-+		if ( TYPE_FIELD_IGNORE(type, i) )
-+			continue;
-+
-+		if ( what == doType )
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), 0, what);
-+			continue;
-+		}
-+
-+		if 
-+		(
-+			!TYPE_FIELD_STATIC(type, i) 
-+			&& 
-+			TYPE_FIELD_PACKED(type, i)
-+		)
-+		{
-+			v = value_from_longest(TYPE_FIELD_TYPE(type, i),
-+				unpack_field_as_long (type, valaddr, i));
-+
-+			aif_discover(TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS(v), what);
-+		}
-+		else if ( TYPE_FIELD_STATIC (type, i) )
-+		{
-+			v = value_static_field (type, i);
-+
-+			if ( v == NULL )
-+				continue;
-+
-+			/*
-+			XXX
-+			cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+			stream, format, recurse + 1,
-+			pretty);
-+			*/
-+		}
-+		else
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / 8, what);
-+		}
-+	  }
-+      }
-+      break;
-+
-+    case TYPE_CODE_ARRAY:
-+      elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+      if (what == doValue)
-+      { /* looking for values */
-+	unsigned int temp_len, len;
-+	eltlen = TYPE_LENGTH (elttype);
-+	len = TYPE_LENGTH (type) / eltlen;
-+	offset = 0;
-+	for (temp_len = 0; temp_len < len; temp_len++)
-+	  {
-+	    aif_discover(elttype, valaddr+offset, what);
-+	    offset += eltlen;
-+	  }
-+      } else { /* looking for types */
-+	aif_discover(elttype, 0, what);
-+      } /* TYPE_CODE_ARRAY */
-+      break;
-+
-+    case TYPE_CODE_MEMBER:
-+    case TYPE_CODE_METHOD:
-+    case TYPE_CODE_FUNC:
-+    case TYPE_CODE_UNDEF:
-+    case TYPE_CODE_ENUM:
-+    case TYPE_CODE_BOOL:
-+    case TYPE_CODE_INT:
-+    case TYPE_CODE_FLT:
-+    case TYPE_CODE_VOID:
-+    case TYPE_CODE_ERROR:
-+    case TYPE_CODE_CHAR:
-+    case TYPE_CODE_SET:
-+    case TYPE_CODE_RANGE:
-+    case TYPE_CODE_STRING:
-+    case TYPE_CODE_BITSTRING:
-+    case TYPE_CODE_COMPLEX:
-+    case TYPE_CODE_TEMPLATE:
-+      break;
-+
-+    default:
-+      error ("type not handled in type_discover");
-+      break;
-+    } /* switch (TYPE_CODE (type)) */
-+} /* aif_discover */
-+
-+/* squash the valuesSeen and typesSeen arrays to remove unnecessary elements */
-+void 
-+aif_reduce(void)
-+{
-+  int front, back;
-+  front = back = 0;
-+  while (front < numValuesSeen)
-+    {
-+      /* move back to first unused entry */
-+      valuesSeen[numValuesSeen].used = 0; /* pseudo-data */
-+      while (valuesSeen[back].used) back += 1;
-+      if (back == numValuesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      valuesSeen[numValuesSeen].used = 1; /* pseudo-data */
-+      while (!valuesSeen[front].used) front += 1;
-+      if (front == numValuesSeen) break;
-+      /* copy from front to back */
-+      valuesSeen[back] = valuesSeen[front];
-+      valuesSeen[front].used = 0;
-+    }
-+  numValuesSeen = back;
-+  front = back = 0;
-+  while (front < numTypesSeen)
-+    {
-+      /* move back to first unused entry */
-+      typesSeen[numTypesSeen].used = 0; /* pseudo-data */
-+      while (typesSeen[back].used) back += 1;
-+      if (back == numTypesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      typesSeen[numTypesSeen].used = 1; /* pseudo-data */
-+      while (!typesSeen[front].used) front += 1;
-+      if (front == numTypesSeen) break;
-+      /* copy from front to back */
-+      typesSeen[back] = typesSeen[front];
-+      typesSeen[front].used = 0;
-+    }
-+    numTypesSeen = back;
-+} /* aif_reduce */
-+
-+int dataStreamPos;
-+
-+void 
-+emitData(char toEmit, struct ui_file *stream)
-+{
-+  fprintf_filtered(stream, "%02x", toEmit & 0xff);
-+  dataStreamPos += 1;
-+} /* emitData */
-+  
-+void
-+aif_emit_string(CORE_ADDR addr, struct ui_file *stream)
-+{ /* code modified from val_print_string () */
-+  int errcode;			/* Errno returned from bad reads. */
-+  unsigned int fetchlimit;	/* Maximum number of chars to print. */
-+  unsigned int nfetch;		/* Chars to fetch / chars fetched. */
-+  unsigned int chunksize;	/* Size of each fetch, in chars. */
-+  char *buffer = NULL;		/* Dynamically growable fetch buffer. */
-+  char *bufptr;			/* Pointer to next available byte in buffer. */
-+  char *limit;			/* First location past end of fetch buffer. */
-+  struct cleanup *old_chain = NULL;	/* Top of the old cleanup chain. */
-+  int found_nul;		/* Non-zero if we found the nul char */
-+  unsigned long bufsize = 0;
-+  int length;			/* how long the string turned out to be */
-+
-+  if (addr == 0)
-+  {
-+      emitData(0, stream);
-+      emitData(0, stream);
-+      return;
-+  }
-+
-+  fetchlimit = print_max;
-+  chunksize = min (8, fetchlimit);
-+  /* Loop until we either have all the characters to print, or we encounter
-+     some error, such as bumping into the end of the address space. */
-+  found_nul = 0;
-+  old_chain = make_cleanup (null_cleanup, 0);
-+  do
-+    {
-+      QUIT;
-+      nfetch = min (chunksize, fetchlimit - bufsize);
-+      if (buffer == NULL)
-+	buffer = (char *) xmalloc (nfetch);
-+      else
-+	{
-+	  discard_cleanups (old_chain);
-+	  buffer = (char *) xrealloc (buffer, nfetch + bufsize);
-+	}
-+      old_chain = make_cleanup (free, buffer);
-+      bufptr = buffer + bufsize;
-+      bufsize += nfetch;
-+      /* Read as much as we can. */
-+      nfetch = partial_memory_read (addr, bufptr, nfetch, &errcode);
-+      /* Scan this chunk for the null byte */
-+      limit = bufptr + nfetch;
-+      while (bufptr < limit)
-+	{
-+	  unsigned long c;
-+	  c = extract_unsigned_integer (bufptr, 1);
-+	  addr += 1;
-+	  bufptr += 1;
-+	  if (c == 0)
-+	    {
-+	      /* We don't care about any error which happened after
-+		  the NULL terminator.  */
-+	      errcode = 0;
-+	      found_nul = 1;
-+	      break;
-+	    }
-+	} /* while (bufptr < limit) */
-+    } /* do */
-+  while (errcode == 0	/* no error */
-+	  && bufptr - buffer < fetchlimit	/* no overrun */
-+	  && !found_nul);	/* haven't found nul yet */
-+  QUIT;
-+  length = 0;
-+  if (errcode == 0 || bufptr > buffer)
-+    {
-+      length = bufptr - buffer - 1; /* don't include null */
-+      emitData((length >> 8) & 077, stream);
-+      emitData(length & 077, stream);
-+      for (; length > 0; length--) {
-+	emitData(*buffer++, stream); 
-+      }
-+    }
-+  if (errcode != 0)
-+    {
-+      if (errcode == EIO)
-+	{
-+	  fprintf_filtered (stream, " <Address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, " out of bounds>");
-+	}
-+      else
-+	{
-+	  fprintf_filtered (stream, " <Error reading address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, ": %s>", safe_strerror (errcode));
-+	}
-+    }
-+  gdb_flush (stream);
-+  do_cleanups (old_chain);
-+  return;
-+} /* aif_emit_string */
-+
-+str_ptr
-+gdb_type_to_fds(struct type *type)
-+{
-+	int		len;
-+	int		elen;
-+	int		nfields;
-+	int		i;
-+	int		ix;
-+	str_ptr		s;
-+	str_ptr		type_ptr;
-+	str_ptr		type_str;
-+	struct type *	etype;
-+
-+	CHECK_TYPEDEF (type);
-+
-+	type_str = str_init();
-+
-+	for ( ix = 0; ix < numTypesSeen; ix++)
-+	{
-+		if 
-+		(
-+			typesSeen[ix].type != type
-+			||
-+			!typesSeen[ix].used
-+		)
-+			continue;
-+
-+		/*
-+		** Multiple use type
-+		*/
-+
-+		if ( typesSeen[ix].used != 1 )
-+		{
-+			/* 
-+			** referring to one already emitted 
-+			*/
-+
-+			str_add(type_str, TypeToFDS(AIF_REFERENCE, ix));
-+			return type_str;
-+		}
-+
-+		/*
-+		** first time; emit name
-+		*/
-+
-+		str_add(type_str, TypeToFDS(AIF_NAME, ix, NULL));
-+		typesSeen[ix].used = 2;
-+		break;
-+	}
-+
-+	len = TYPE_LENGTH(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		type_ptr = gdb_type_to_fds(TYPE_TARGET_TYPE(type));
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		return type_str;
-+
-+	case TYPE_CODE_ARRAY:
-+		if 
-+		(
-+			len > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			etype = check_typedef(TYPE_TARGET_TYPE (type));
-+			elen = TYPE_LENGTH(etype);
-+			len /= elen;
-+
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, TypeToFDS(AIF_ARRAY, 
-+				TypeToFDS(AIF_RANGE, 0, len-1, 
-+					TypeToFDS(AIF_INTEGER, 1, sizeof(int))),
-+				str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+
-+	case TYPE_CODE_PTR:
-+		etype = check_typedef(TYPE_TARGET_TYPE(type));
-+		elen = TYPE_LENGTH(etype);
-+
-+		if 
-+		(
-+			elen == 1
-+			&&
-+			TYPE_CODE(etype) == TYPE_CODE_INT
-+		)
-+		{
-+			str_add(type_str, TypeToFDS(AIF_STRING));
-+		}
-+		else
-+		{
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, 
-+				TypeToFDS(AIF_POINTER, str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+		}
-+
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		if
-+		(
-+			len != 1
-+			||
-+			strncmp(TYPE_NAME(type), "char", 5) != 0
-+		) 
-+		{
-+			str_add(type_str, 
-+				TypeToFDS(AIF_INTEGER, TYPE_UNSIGNED(type) ? 0 : 1, len));
-+			break;
-+		}
-+
-+		/*
-+		** Treat as char...
-+		*/
-+
-+	case TYPE_CODE_CHAR:
-+		str_add(type_str, TypeToFDS(AIF_CHARACTER));
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		str_add(type_str, TypeToFDS(AIF_FLOATING, len));
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		nfields = TYPE_NFIELDS(type);
-+		
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		/*
-+		** First need to calculate size of struct, since it
-+		** may not be packed.
-+		*/
-+
-+		for ( len = 0 ; i < nfields ; i++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+					TYPE_FIELD_BITSIZE(type, i) / 8 :
-+					TYPE_LENGTH(etype);
-+
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+			else if ( elen > len )
-+				len = elen;
-+		}
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_STRUCT));
-+
-+		/*
-+		** Need to calculate offset (len).
-+		*/
-+		len = 0;
-+
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		for (; i < nfields ; i++ )
-+		{
-+			char *t;
-+
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+				TYPE_FIELD_BITSIZE(type, i) :
-+				TYPE_LENGTH(etype) * 8;
-+
-+			s = gdb_type_to_fds(etype);
-+
-+			if ( HAVE_CPLUS_STRUCT(type) )
-+			{
-+				if ( TYPE_FIELD_PROTECTED(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val(type_ptr),
-+					    	AIFACC_PROTECTED, 
-+					    	TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else if ( TYPE_FIELD_PRIVATE(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PRIVATE, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PUBLIC, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+
-+			}
-+			else
-+				t = FDSAddFieldToStruct(str_val(type_ptr), 
-+					TYPE_FIELD_NAME(type, i), str_val(s));
-+
-+			str_free(type_ptr);
-+			
-+			type_ptr = str_dup(t);
-+
-+			str_free(s);
-+
-+			/*
-+			** Calc offset.
-+			*/
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		str_add(type_str, TypeToFDS(AIF_VOID, len));
-+		break;
-+
-+	case TYPE_CODE_ENUM:
-+		nfields = TYPE_NFIELDS (type);
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_ENUM));
-+
-+		for ( i = 0 ; i < nfields ; i++ )
-+		{
-+			char *	t;
-+
-+			t = FDSAddConstToEnum(str_val(type_ptr),
-+					TYPE_FIELD_NAME(type, i),
-+					TYPE_FIELD_BITPOS(type, i));
-+
-+			str_free(type_ptr);
-+
-+			type_ptr = str_dup(t);
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_FUNC:
-+		etype = check_typedef(TYPE_TARGET_TYPE (type));
-+
-+		type_ptr = gdb_type_to_fds(etype);
-+
-+		str_add(type_str, 
-+			TypeToFDS(AIF_FUNCTION, str_val(type_ptr)));
-+
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_STRING:
-+	case TYPE_CODE_SET:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_BITSTRING:
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_BOOL:
-+	case TYPE_CODE_COMPLEX:
-+		str_add(type_str, TypeToFDS(AIF_INVALID));
-+		break;
-+
-+	default:
-+		error("Invalid C/C++ type code %d in symbol table.", TYPE_CODE(type));
-+	}
-+
-+	return type_str;
-+}
-+
-+void
-+aif_val_print_recursive(struct type *type, char *valaddr, CORE_ADDR address, struct ui_file *stream)
-+{
-+	int			ix;
-+	int			res;
-+	int			valid;
-+	unsigned		len;
-+	unsigned		eltlen;
-+	LONGEST			val;
-+	float			fval;
-+	double			dval;
-+#ifdef HAVE_LONG_DOUBLE
-+	long double		ldval;
-+#endif /* HAVE_LONG_DOUBLE */
-+	CORE_ADDR		addr;
-+	struct value *		vptr;
-+	union ieee_double	v;
-+	struct type *		elttype;
-+	struct field *		thisField;
-+
-+	CHECK_TYPEDEF(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		aif_val_print_recursive(TYPE_TARGET_TYPE(type), valaddr, address, stream);
-+		break;
-+
-+	case TYPE_CODE_ARRAY:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if 
-+		(
-+			TYPE_LENGTH(type) > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			eltlen = TYPE_LENGTH(elttype);
-+			len = TYPE_LENGTH(type) / eltlen;
-+
-+			for ( ix = 0; ix < len; ix++ )
-+				aif_val_print_recursive(elttype, valaddr + ix * eltlen, address + ix * eltlen, stream);
-+
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+		addr = address;
-+		goto asPtr;
-+
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_PTR:
-+		addr = unpack_pointer(type, valaddr);
-+
-+	asPtr:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if
-+		(
-+			TYPE_LENGTH(elttype) == 1
-+			&& 
-+			TYPE_CODE(elttype) == TYPE_CODE_INT
-+		)
-+		{
-+			/*
-+			** call it a string
-+			*/
-+			(void)aif_emit_string(addr, stream);
-+			break;
-+		}
-+
-+		if ( addr == 0 )
-+		{
-+			emitData((char)AIF_PTR_NIL, stream); 
-+			break;
-+		}
-+
-+		for ( ix = 0 ; ix < numValuesSeen; ix++ )
-+		{
-+			if
-+			(
-+				valuesSeen[ix].addr == addr
-+				&&
-+				valuesSeen[ix].used
-+			)
-+			{
-+
-+				union 
-+				{
-+					int	i;
-+					char 	bytes[4];
-+				} ptrname;
-+
-+				if ( valuesSeen[ix].used == 1 )
-+				{
-+					/* 
-+					** first time; just emit as usual
-+					*/
-+
-+					emitData((char)AIF_PTR_NAME, stream); 
-+					valuesSeen[ix].used = 2;
-+
-+					{
-+						int i;
-+
-+						ptrname.i = ix;
-+
-+						if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
-+						{
-+							for ( i = 0 ; i < 4 ; i++ )
-+								emitData(ptrname.bytes[i], stream);
-+						}
-+						else
-+						{
-+							for ( i = 3 ; i >= 0 ; i-- )
-+								emitData(ptrname.bytes[i], stream);
-+						}
-+					}
-+
-+					break; /* no need to look at other seen values */
-+				}
-+
-+				/* 
-+				** referring to one already emitted
-+				*/
-+
-+				emitData((char)AIF_PTR_REFERENCE, stream); 
-+
-+				{
-+					int i;
-+
-+					ptrname.i = ix;
-+
-+					if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
-+					{
-+						for ( i = 0 ; i < 4 ; i++ )
-+							emitData(ptrname.bytes[i], stream);
-+					}
-+					else
-+					{
-+						for ( i = 3 ; i >= 0 ; i-- )
-+							emitData(ptrname.bytes[i], stream);
-+					}
-+				}
-+
-+				return; /* don't go any deeper */
-+			}
-+		}
-+
-+		res = check_value(elttype, addr, &vptr);
-+
-+		if ( ix == numValuesSeen )
-+		{
-+			/*
-+			** not special at all 
-+			*/
-+			if ( !res )
-+			{
-+				emitData((char)AIF_PTR_INVALID, stream); 
-+				break;
-+			}
-+
-+			emitData((char)AIF_PTR_NORMAL, stream); 
-+		}
-+
-+		aif_val_print_recursive (VALUE_TYPE(vptr),
-+					VALUE_CONTENTS(vptr),
-+					VALUE_ADDRESS(vptr),
-+					stream);
-+
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		/*
-+		** A union is treated just like a struct. That is
-+		** we attempt to traverse each field if possible.
-+		** It's then up to the receiver to decide what is
-+		** sensible information.
-+		**
-+		** XXX: What happens if a pointer points to random
-+		** data?
-+		*/
-+		for ( ix = 0 ; ix < TYPE_NFIELDS (type) ; ix++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, ix) )
-+				continue;
-+
-+			if 
-+			(
-+				!TYPE_FIELD_STATIC(type, ix) 
-+				&& 
-+				TYPE_FIELD_PACKED(type, ix)
-+			)
-+			{
-+				vptr = value_from_longest(TYPE_FIELD_TYPE(type, ix),
-+					unpack_field_as_long(type, valaddr, ix));
-+
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), VALUE_CONTENTS(vptr), 0, stream);
-+			}
-+			else if ( TYPE_FIELD_STATIC (type, ix) )
-+			{
-+				vptr = value_static_field (type, ix);
-+
-+				if ( vptr == NULL )
-+					continue;
-+
-+				/*
-+				XXX
-+				cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+				stream, format, recurse + 1,
-+				pretty);
-+				*/
-+			}
-+			else
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), 
-+					valaddr + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					address + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					stream);
-+		}
-+		break;
-+
-+	case TYPE_CODE_CHAR:
-+	asChar:
-+		val = unpack_long (type, valaddr);
-+		emitData((char) (val & 0xff), stream); 
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		len = TYPE_LENGTH (type);
-+
-+		if
-+		(
-+			len == 1 
-+			&&
-+			strncmp(TYPE_NAME(type), "char", 5) == 0
-+		) 
-+			goto asChar;
-+
-+		val = unpack_long(type, valaddr);
-+		AIFNormalise((char *) &v, len, (char *) &val, sizeof(LONGEST));
-+		
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char)(v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		len = TYPE_LENGTH (type);
-+
-+		switch ( len ) {
-+		case 4:
-+			fval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &fval), sizeof(DOUBLEST));
-+			break;
-+
-+		case 8:
-+			dval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &dval), sizeof(DOUBLEST));
-+			break;
-+
-+#ifdef HAVE_LONG_DOUBLE
-+		case 16:
-+			ldval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &ldval), sizeof(DOUBLEST));
-+			break;
-+#endif /* HAVE_LONG_DOUBLE */
-+		default:
-+			fprintf(stderr, "cannot handle float of length %d\n", len);
-+		}
-+
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char) (v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		break;
-+
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_ENUM:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_FUNC:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_UNDEF:
-+	case TYPE_CODE_ERROR:
-+		break;
-+
-+	default:
-+		error ("Invalid C/C++ type code %d in symbol table.", TYPE_CODE (type));
-+	}
-+}
-+
-+void 
-+aif_val_print(struct type *type, char *valaddr, int embedded_offset, CORE_ADDR address, struct ui_file *stream)
-+{
-+  str_ptr s;
-+
-+  // struct ui_file *typeStream=mem_fileopen();
-+  numValuesSeen = 0;
-+  aif_discover(type, valaddr+embedded_offset, doValue); /* values */
-+  aif_discover(type, 0, doType); /* types */
-+  aif_reduce();
-+  dataStreamPos = 0;
-+  // fputs_filtered("(", stream);
-+  s = gdb_type_to_fds(type);
-+  fputs_filtered(str_val(s), stream);
-+  str_free(s);
-+  // fputs_filtered(")", stream);
-+  fputs_filtered(" ", stream);
-+  aif_val_print_recursive(type, valaddr+embedded_offset, address, stream);
-+  // contents = ui_file_xstrdup(typeStream, &dummy);
-+  // fputs_filtered(contents, stream);
-+  // free(contents);
-+  // ui_file_delete(typeStream);
-+  gdb_flush(stream);
-+} /* aif_val_print */
-+
-+void
-+aif_type_print(struct type *type, struct ui_file *stream)
-+{
-+	str_ptr	s;
-+
-+	numValuesSeen = 0;
-+	aif_discover(type, 0, doType); /* types */
-+	aif_reduce();
-+	dataStreamPos = 0;
-+	s = gdb_type_to_fds(type);
-+	fputs_filtered(str_val(s), stream);
-+	str_free(s);
-+}
-+
-+#define STRSIZE 100
-+
-+str_ptr
-+str_init(void)
-+{
-+	str_ptr	s;
-+
-+	s = (str_ptr)xmalloc(sizeof(struct str_type));
-+	s->buf = (char *)xmalloc(STRSIZE);
-+	s->blen = STRSIZE;
-+	s->slen = 0;
-+	*(s->buf) = '\0';
-+
-+	return s;
-+}
-+
-+void
-+str_add(str_ptr s1, char *s2)
-+{
-+	int	l2 = strlen(s2);
-+
-+	if (s1->slen + l2 >= s1->blen)
-+	{
-+		s1->blen += max(STRSIZE, l2);
-+		s1->buf = (char *) xrealloc (s1->buf, s1->blen);
-+	}
-+
-+	memcpy(&(s1->buf[s1->slen]), s2, l2);
-+	s1->slen += l2;
-+	s1->buf[s1->slen] = '\0';
-+}
-+
-+void
-+str_free(str_ptr s)
-+{
-+	free(s->buf);
-+	free(s);
-+}
-+
-+char *
-+str_val(str_ptr s)
-+{
-+	return s->buf;
-+}
-+
-+str_ptr
-+str_dup(char *s1)
-+{
-+	str_ptr s = str_init();
-+	str_add(s, s1);
-+	return s;
-+}
-+
-+int
-+check_value(struct type *type, CORE_ADDR addr, struct value **res)
-+{
-+  int status;
-+  struct value *val;
-+  char buf[sizeof (ULONGEST)]; 
-+
-+  if (TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
-+    return 0;
-+
-+  val = allocate_value (type);
-+
-+  status = target_read_memory (addr, VALUE_CONTENTS_ALL_RAW (val), TYPE_LENGTH (type));
-+
-+  if (status != 0)
-+    return 0;
-+
-+  VALUE_LVAL (val) = lval_memory;
-+  VALUE_ADDRESS (val) = addr;
-+  VALUE_BFD_SECTION (val) = NULL;
-+
-+  *res = val;
-+
-+  return 1;
-+}
---- gdb-5.2-old/gdb/c-valprint.c	Tue Feb  5 14:41:29 2002
-+++ gdb-5.2/gdb/c-valprint.c	Sun Mar 16 21:09:24 2003
-@@ -31,6 +31,12 @@
- #include "cp-abi.h"
- 
- 
-+#ifdef HAVE_AIF
-+extern int max_print_depth; /* set by "set print depth" */
-+extern int current_print_depth;
-+extern int typeprint; /* set by "set print type" (Boolean) */
-+#endif /* HAVE_AIF */
-+
- /* Print function pointer with inferior address ADDRESS onto stdio
-    stream STREAM.  */
- 
-@@ -76,6 +82,15 @@
-   LONGEST val;
-   CORE_ADDR addr;
- 
-+#ifdef HAVE_AIF
-+  if (typeprint && format != 's') 
-+    {
-+      fputs_filtered("(", stream);
-+      type_print (type, "", stream, -1);
-+      fputs_filtered(") ", stream);
-+    }
-+#endif /* HAVE_AIF */
-+
-   CHECK_TYPEDEF (type);
-   switch (TYPE_CODE (type))
-     {
-@@ -154,6 +169,9 @@
- 	  break;
- 	}
-       elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+#ifdef HAVE_AIF
-+      if (!elttype) elttype = type;
-+#endif /* HAVE_AIF */
-       if (TYPE_CODE (elttype) == TYPE_CODE_METHOD)
- 	{
- 	  cp_print_class_method (valaddr + embedded_offset, type, stream);
-@@ -182,6 +200,36 @@
- 	      print_address_numeric (addr, 1, stream);
- 	    }
- 
-+#ifdef HAVE_AIF
-+	  if (current_print_depth < max_print_depth
-+	      && TYPE_CODE (elttype) != TYPE_CODE_UNDEF
-+	      && (TYPE_LENGTH (elttype) != 1
-+	      || TYPE_CODE (elttype) != TYPE_CODE_INT)
-+	      && format != 's')
-+	    { /* print complex objected pointed to recursively */
-+	      if (addressprint) fprintf_filtered (stream, " => ");
-+	      if (addr == 0)
-+		{
-+		  fprintf_filtered (stream, "nil");
-+		}
-+	      else
-+	      { /* non nil */
-+		struct value *deref_val = value_at(elttype, addr, NULL);
-+		current_print_depth += 1;
-+		val_print (VALUE_TYPE (deref_val),
-+			    VALUE_CONTENTS (deref_val),
-+			    0,
-+			    VALUE_ADDRESS (deref_val),
-+			    stream,
-+			    format,
-+			    deref_ref,
-+			    recurse,
-+			    pretty);
-+		current_print_depth -= 1;
-+	      }
-+	    } /* print recursively */
-+#endif /* HAVE_AIF */
-+
- 	  /* For a pointer to char or unsigned char, also print the string
- 	     pointed to, unless pointer is null.  */
- 	  /* FIXME: need to handle wchar_t here... */
-@@ -356,9 +404,11 @@
- 	}
-       /* FIXME, we should consider, at least for ANSI C language, eliminating
-          the distinction made between FUNCs and POINTERs to FUNCs.  */
-+#ifndef HAVE_AIF
-       fprintf_filtered (stream, "{");
-       type_print (type, "", stream, -1);
-       fprintf_filtered (stream, "} ");
-+#endif /* HAVE_AIF */
-       /* Try to print what function it points to, and its address.  */
-       print_address_demangle (address, stream, demangle);
-       break;
-@@ -559,9 +609,11 @@
-       else
- 	{
- 	  /* normal case */
-+#ifndef HAVE_AIF
- 	  fprintf_filtered (stream, "(");
- 	  type_print (type, "", stream, -1);
- 	  fprintf_filtered (stream, ") ");
-+#endif /* HAVE_AIF */
- 	}
-     }
-   if (objectprint && (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_CLASS))
---- gdb-5.2-old/gdb/printcmd.c	Thu Jan 31 18:49:54 2002
-+++ gdb-5.2/gdb/printcmd.c	Sun Mar 16 21:09:24 2003
-@@ -43,6 +43,7 @@
- 
- extern int asm_demangle;	/* Whether to demangle syms in asm printouts */
- extern int addressprint;	/* Whether to print hex addresses in HLL " */
-+extern int current_print_depth; /* from valprint.c */
- 
- struct format_data
-   {
-@@ -320,12 +321,21 @@
- 	  || TYPE_CODE (type) == TYPE_CODE_STRING
- 	  || TYPE_CODE (type) == TYPE_CODE_STRUCT
- 	  || TYPE_CODE (type) == TYPE_CODE_UNION)
-+#ifdef HAVE_AIF
-+	{
-+#endif /* HAVE_AIF */
- 	/* If format is 0, use the 'natural' format for
- 	 * that type of value.  If the type is non-scalar,
- 	 * we have to use language rules to print it as
- 	 * a series of scalars.
- 	 */
-+#ifdef HAVE_AIF
-+	current_print_depth = 0;
-+#endif /* HAVE_AIF */
- 	value_print (val, stream, format, Val_pretty_default);
-+#ifdef HAVE_AIF
-+	}
-+#endif /* HAVE_AIF */
-       else
- 	/* User specified format, so don't look to the
- 	 * the type to tell us what to do.
---- gdb-5.2-old/gdb/typeprint.c	Sat Nov 10 14:34:56 2001
-+++ gdb-5.2/gdb/typeprint.c	Sun Mar 16 21:09:24 2003
-@@ -42,6 +42,11 @@
- 
- extern void _initialize_typeprint (void);
- 
-+#ifdef HAVE_AIF
-+extern int aifprint; /* print type using AIF */
-+extern void aif_type_print (struct type *, struct ui_file *);
-+#endif /* HAVE_AIF */
-+
- static void ptype_command (char *, int);
- 
- static struct type *ptype_eval (struct expression *);
-@@ -116,6 +121,13 @@
- type_print (struct type *type, char *varstring, struct ui_file *stream,
- 	    int show)
- {
-+#ifdef HAVE_AIF
-+  if (aifprint)
-+    {
-+        aif_type_print (type, stream);
-+        return;
-+    }
-+#endif /* HAVE_AIF */
-   LA_PRINT_TYPE (type, varstring, stream, show, 0);
- }
- 
---- gdb-5.2-old/gdb/valprint.c	Mon Feb  4 21:37:22 2002
-+++ gdb-5.2/gdb/valprint.c	Sun Mar 16 21:09:24 2003
-@@ -37,10 +37,21 @@
- 
- #include <errno.h>
- 
-+#ifdef HAVE_AIF
-+extern int aifprint; /* set by "set print aif" (Boolean) */
-+void aif_val_print (struct type *type, char *valaddr, int embedded_offset,
-+			CORE_ADDR address, struct ui_file *stream);
-+#endif /* HAVE_AIF */
-+
- /* Prototypes for local functions */
- 
-+#ifdef HAVE_AIF
-+int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
-+				int len, int *errnoptr);
-+#else /* HAVE_AIF */
- static int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
- 				int len, int *errnoptr);
-+#endif /* HAVE_AIF */
- 
- static void print_hex_chars (struct ui_file *, unsigned char *,
- 			     unsigned int);
-@@ -103,6 +114,18 @@
- /* If nonzero, causes machine addresses to be printed in certain contexts. */
- 
- int addressprint;		/* Controls printing of machine addresses */
-+
-+#ifdef HAVE_AIF
-+/* If positive, causes pointers to be followed in printing, to given depth */
-+int max_print_depth;
-+int current_print_depth = 0; /* reset to 0 at each interrupt */
-+ 
-+/* If nonzero, causes types to be printed. */
-+int typeprint;
-+ 
-+/* If nonzero, causes types to be printed, if at all, in AIF format. */
-+int aifprint;
-+#endif /* HAVE_AIF */
- 
- 
- /* Print data of type TYPE located at VALADDR (within GDB), which came from
-@@ -149,6 +172,14 @@
-       return (0);
-     }
- 
-+#ifdef HAVE_AIF
-+  if (aifprint)
-+  {
-+    aif_val_print (type, valaddr, embedded_offset, address, stream);
-+    return 0; 
-+  }
-+#endif /* HAVE_AIF */
-+
-   return (LA_VAL_PRINT (type, valaddr, embedded_offset, address,
- 			stream, format, deref_ref, recurse, pretty));
- }
-@@ -1072,7 +1103,12 @@
- /* FIXME: cagney/1999-10-14: Only used by val_print_string.  Can this
-    function be eliminated.  */
- 
-+#ifdef HAVE_AIF
-+/* It is now used by aif_print_string as well. */
-+int
-+#else /* HAVE_AIF */
- static int
-+#endif /* HAVE_AIF */
- partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr)
- {
-   int nread;			/* Number of bytes actually read. */
-@@ -1260,7 +1296,11 @@
-     {
-       if (addressprint)
- 	{
-+#ifdef HAVE_AIF
-+	  fputs_filtered ("=>", stream);
-+#else /* HAVE_AIF */
- 	  fputs_filtered (" ", stream);
-+#endif /* HAVE_AIF */
- 	}
-       LA_PRINT_STRING (stream, buffer, (bufptr - buffer) / width, width, force_ellipsis);
-     }
-@@ -1485,6 +1525,29 @@
- 		  &setprintlist),
-      &showprintlist);
- 
-+#ifdef HAVE_AIF
-+  add_show_from_set
-+    (add_set_cmd ("depth", class_support, var_uinteger,
-+		  (char *) &max_print_depth,
-+		  "Set depth of pointer recursion.",
-+		  &setprintlist),
-+      &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("type", class_support, var_boolean,
-+		  (char *) &typeprint,
-+		  "Set printing of types.",
-+		  &setprintlist),
-+      &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("aif", class_support, var_boolean,
-+		  (char *) &aifprint,
-+		  "Set printing of types to aif format.",
-+		  &setprintlist),
-+      &showprintlist);
-+#endif /* HAVE_AIF */
-+
-   c = add_set_cmd ("input-radix", class_support, var_uinteger,
- 		   (char *) &input_radix,
- 		   "Set default input radix for entering numbers.",
-@@ -1520,4 +1583,9 @@
-   unionprint = 1;
-   addressprint = 1;
-   print_max = PRINT_MAX_DEFAULT;
-+#ifdef HAVE_AIF
-+  max_print_depth = -1;
-+  typeprint = 0;
-+  aifprint = 0;
-+#endif /* HAVE_AIF */
- }
---- /dev/null	Wed Apr  2 20:34:28 2003
-+++ gdb-5.2/gdb/libaif.mk	Sun Mar 16 21:09:24 2003
-@@ -0,0 +1,9 @@
-+INCLUDE_CFLAGS += $(INCLUDE_aif)
-+
-+CLIBS += $(LIB_aif)
-+
-+SFILES     += aif-valprint.c
-+COMMON_OBS += aif-valprint.o
-+
-+aif-valprint.o: aif-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-+	language.h $(symtab_h) valprint.h $(value_h)
---- gdb-5.2-old/gdb/configure.in	Wed Mar 27 21:28:00 2002
-+++ gdb-5.2/gdb/configure.in	Sun Mar 16 21:09:24 2003
-@@ -30,6 +30,95 @@
- AC_ISC_POSIX
- AM_PROG_CC_STDC
- 
-+AC_ARG_WITH(aif,
-+[  --with-aif=dir                use aif in dir])
-+AC_ARG_WITH(aif-lib,
-+[  --with-aif-lib=dir            use aif libraries in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-aif-lib])
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi])
-+AC_ARG_WITH(aif-include,
-+[  --with-aif-include=dir        use aif headers in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-aif-include])
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi])
-+
-+AC_MSG_CHECKING(for aif)
-+
-+case "$with_aif" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_aif_include" = ""; then
-+		with_aif_include="$with_aif/include"
-+	fi
-+	if test "$with_aif_lib" = ""; then
-+		with_aif_lib="$with_aif/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='/usr/local'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_aif_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_aif_include $header_dirs";;
-+esac
-+case "$with_aif_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_aif_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	AC_TRY_COMPILE([#include <aif.h>],,ires=$i;break)
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i -laif $save_LIBS"
-+	AC_TRY_LINK([#include <aif.h>],,lres=$i;break)
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_aif" != "no"; then
-+	aif_includedir="$ires"
-+	aif_libdir="$lres"
-+	DIR_aif=
-+	INCLUDE_aif="-I$aif_includedir"
-+	LIB_aif="-L$aif_libdir -laif"
-+	AC_DEFINE_UNQUOTED(HAVE_AIF,1,[Define if you have the aif package.])
-+	with_aif=yes
-+	AC_MSG_RESULT([headers $ires, libraries $lres])
-+else
-+	DIR_aif="aif"
-+	INCLUDE_aif=
-+	LIB_aif=
-+	with_aif=no
-+	AC_MSG_RESULT($with_aif)
-+fi
-+AC_SUBST(DIR_aif)
-+AC_SUBST(INCLUDE_aif)
-+AC_SUBST(LIB_aif)
-+
-+if test "$with_aif" = "no"; then
-+        AC_MSG_ERROR([You must have libaif to compile this version of GDB.])
-+fi
-+AC_DEFINE(HAVE_AIF, 1, [Enable AIF support in in GDB.])dnl
-+
- AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
- AC_CANONICAL_SYSTEM
- 
---- gdb-5.2-old/gdb/configure	Sun Apr 14 22:28:49 2002
-+++ gdb-5.2/gdb/configure	Sun Mar 16 21:09:24 2003
-@@ -15,6 +15,12 @@
-   --enable-maintainer-mode enable make rules and dependencies not useful
-                           (and sometimes confusing) to the casual installer"
- ac_help="$ac_help
-+  --with-aif=dir                use aif in dir"
-+ac_help="$ac_help
-+  --with-aif-lib=dir            use aif libraries in dir"
-+ac_help="$ac_help
-+  --with-aif-include=dir        use aif headers in dir"
-+ac_help="$ac_help
-   --disable-nls           do not use Native Language Support"
- ac_help="$ac_help
-   --with-included-gettext use the GNU gettext library included here"
-@@ -79,7 +85,6 @@
- program_transform_name=s,x,x,
- silent=
- site=
--sitefile=
- srcdir=
- target=NONE
- verbose=
-@@ -194,7 +199,6 @@
-   --help                  print this message
-   --no-create             do not create output files
-   --quiet, --silent       do not print \`checking...' messages
--  --site-file=FILE        use FILE as the site file
-   --version               print the version of autoconf that created configure
- Directory and file names:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
-@@ -365,11 +369,6 @@
-   -site=* | --site=* | --sit=*)
-     site="$ac_optarg" ;;
- 
--  -site-file | --site-file | --site-fil | --site-fi | --site-f)
--    ac_prev=sitefile ;;
--  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
--    sitefile="$ac_optarg" ;;
--
-   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-     ac_prev=srcdir ;;
-   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-@@ -535,16 +534,12 @@
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
- 
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$sitefile"; then
--  if test -z "$CONFIG_SITE"; then
--    if test "x$prefix" != xNONE; then
--      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--    else
--      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--    fi
-+if test -z "$CONFIG_SITE"; then
-+  if test "x$prefix" != xNONE; then
-+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+  else
-+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-   fi
--else
--  CONFIG_SITE="$sitefile"
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
-@@ -585,7 +580,7 @@
- 
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
--echo "configure:589: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo "configure:584: checking whether to enable maintainer-specific portions of Makefiles" >&5
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-   enableval="$enable_maintainer_mode"
-@@ -611,7 +606,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:615: checking for $ac_word" >&5
-+echo "configure:610: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -641,7 +636,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:645: checking for $ac_word" >&5
-+echo "configure:640: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -692,7 +687,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:696: checking for $ac_word" >&5
-+echo "configure:691: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -724,7 +719,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -735,12 +730,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 739 "configure"
-+#line 734 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -766,12 +761,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:765: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:775: checking whether we are using GNU C" >&5
-+echo "configure:770: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -780,7 +775,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -799,7 +794,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:803: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:798: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -831,7 +826,7 @@
- fi
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:835: checking how to run the C preprocessor" >&5
-+echo "configure:830: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -846,13 +841,13 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 850 "configure"
-+#line 845 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -863,13 +858,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 867 "configure"
-+#line 862 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -880,13 +875,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 884 "configure"
-+#line 879 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -911,9 +906,9 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
--echo "configure:915: checking for AIX" >&5
-+echo "configure:910: checking for AIX" >&5
- cat > conftest.$ac_ext <<EOF
--#line 917 "configure"
-+#line 912 "configure"
- #include "confdefs.h"
- #ifdef _AIX
-   yes
-@@ -935,7 +930,7 @@
- 
- 
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:939: checking for POSIXized ISC" >&5
-+echo "configure:934: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -959,7 +954,7 @@
- 
- 
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:963: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "configure:958: checking for ${CC-cc} option to accept ANSI C" >&5
- if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -976,7 +971,7 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   cat > conftest.$ac_ext <<EOF
--#line 980 "configure"
-+#line 975 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -1013,7 +1008,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   am_cv_prog_cc_stdc="$ac_arg"; break
- else
-@@ -1037,6 +1032,141 @@
- esac
- 
- 
-+# Check whether --with-aif or --without-aif was given.
-+if test "${with_aif+set}" = set; then
-+  withval="$with_aif"
-+  :
-+fi
-+
-+# Check whether --with-aif-lib or --without-aif-lib was given.
-+if test "${with_aif_lib+set}" = set; then
-+  withval="$with_aif_lib"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { echo "configure: error: No argument for --with-aif-lib" 1>&2; exit 1; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi
-+
-+# Check whether --with-aif-include or --without-aif-include was given.
-+if test "${with_aif_include+set}" = set; then
-+  withval="$with_aif_include"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { echo "configure: error: No argument for --with-aif-include" 1>&2; exit 1; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi
-+
-+
-+echo $ac_n "checking for aif""... $ac_c" 1>&6
-+echo "configure:1064: checking for aif" >&5
-+
-+case "$with_aif" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_aif_include" = ""; then
-+		with_aif_include="$with_aif/include"
-+	fi
-+	if test "$with_aif_lib" = ""; then
-+		with_aif_lib="$with_aif/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='/usr/local'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_aif_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_aif_include $header_dirs";;
-+esac
-+case "$with_aif_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_aif_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	cat > conftest.$ac_ext <<EOF
-+#line 1103 "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ires=$i;break
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i -laif $save_LIBS"
-+	cat > conftest.$ac_ext <<EOF
-+#line 1122 "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lres=$i;break
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_aif" != "no"; then
-+	aif_includedir="$ires"
-+	aif_libdir="$lres"
-+	DIR_aif=
-+	INCLUDE_aif="-I$aif_includedir"
-+	LIB_aif="-L$aif_libdir -laif"
-+	cat >> confdefs.h <<EOF
-+#define HAVE_AIF 1
-+EOF
-+
-+	with_aif=yes
-+	echo "$ac_t""headers $ires, libraries $lres" 1>&6
-+else
-+	DIR_aif="aif"
-+	INCLUDE_aif=
-+	LIB_aif=
-+	with_aif=no
-+	echo "$ac_t""$with_aif" 1>&6
-+fi
-+
-+
-+
-+
-+if test "$with_aif" = "no"; then
-+        { echo "configure: error: You must have libaif to compile this version of GDB." 1>&2; exit 1; }
-+fi
-+cat >> confdefs.h <<\EOF
-+#define HAVE_AIF 1
-+EOF
-+
- ac_aux_dir=
- for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
-   if test -f $ac_dir/install-sh; then
-@@ -1084,7 +1214,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:1088: checking host system type" >&5
-+echo "configure:1218: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -1105,7 +1235,7 @@
- echo "$ac_t""$host" 1>&6
- 
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:1109: checking target system type" >&5
-+echo "configure:1239: checking target system type" >&5
- 
- target_alias=$target
- case "$target_alias" in
-@@ -1123,7 +1253,7 @@
- echo "$ac_t""$target" 1>&6
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:1127: checking build system type" >&5
-+echo "configure:1257: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -1148,7 +1278,7 @@
- 
- ALL_LINGUAS=
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:1152: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:1282: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1177,7 +1307,7 @@
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1181: checking for $ac_word" >&5
-+echo "configure:1311: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1205,12 +1335,12 @@
- fi
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1209: checking for ANSI C header files" >&5
-+echo "configure:1339: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1214 "configure"
-+#line 1344 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1218,7 +1348,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1235,7 +1365,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1239 "configure"
-+#line 1369 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1253,7 +1383,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1257 "configure"
-+#line 1387 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1274,7 +1404,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1278 "configure"
-+#line 1408 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1285,7 +1415,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:1289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -1309,12 +1439,12 @@
- fi
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1313: checking for working const" >&5
-+echo "configure:1443: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1318 "configure"
-+#line 1448 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -1363,7 +1493,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -1384,21 +1514,21 @@
- fi
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:1388: checking for inline" >&5
-+echo "configure:1518: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 1395 "configure"
-+#line 1525 "configure"
- #include "confdefs.h"
- 
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:1402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -1424,12 +1554,12 @@
- esac
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:1428: checking for off_t" >&5
-+echo "configure:1558: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1433 "configure"
-+#line 1563 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1457,12 +1587,12 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1461: checking for size_t" >&5
-+echo "configure:1591: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1466 "configure"
-+#line 1596 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1492,19 +1622,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:1496: checking for working alloca.h" >&5
-+echo "configure:1626: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1501 "configure"
-+#line 1631 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -1525,12 +1655,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:1529: checking for alloca" >&5
-+echo "configure:1659: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1534 "configure"
-+#line 1664 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -1558,7 +1688,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:1562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -1590,12 +1720,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:1594: checking whether alloca needs Cray hooks" >&5
-+echo "configure:1724: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1599 "configure"
-+#line 1729 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -1620,12 +1750,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1624: checking for $ac_func" >&5
-+echo "configure:1754: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1629 "configure"
-+#line 1759 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1648,7 +1778,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1675,7 +1805,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:1679: checking stack direction for C alloca" >&5
-+echo "configure:1809: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1683,7 +1813,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1687 "configure"
-+#line 1817 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -1702,7 +1832,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -1727,17 +1857,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1731: checking for $ac_hdr" >&5
-+echo "configure:1861: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1736 "configure"
-+#line 1866 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1766,12 +1896,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1770: checking for $ac_func" >&5
-+echo "configure:1900: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1775 "configure"
-+#line 1905 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1794,7 +1924,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1819,7 +1949,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:1823: checking for working mmap" >&5
-+echo "configure:1953: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1827,7 +1957,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1831 "configure"
-+#line 1961 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -1967,7 +2097,7 @@
- }
- 
- EOF
--if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -1995,17 +2125,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1999: checking for $ac_hdr" >&5
-+echo "configure:2129: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2004 "configure"
-+#line 2134 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2035,12 +2165,12 @@
- __argz_count __argz_stringify __argz_next
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2039: checking for $ac_func" >&5
-+echo "configure:2169: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2044 "configure"
-+#line 2174 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2063,7 +2193,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2092,12 +2222,12 @@
-      for ac_func in stpcpy
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2096: checking for $ac_func" >&5
-+echo "configure:2226: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2101 "configure"
-+#line 2231 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2120,7 +2250,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2154,19 +2284,19 @@
- 
-    if test $ac_cv_header_locale_h = yes; then
-     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
--echo "configure:2158: checking for LC_MESSAGES" >&5
-+echo "configure:2288: checking for LC_MESSAGES" >&5
- if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2163 "configure"
-+#line 2293 "configure"
- #include "confdefs.h"
- #include <locale.h>
- int main() {
- return LC_MESSAGES
- ; return 0; }
- EOF
--if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   am_cv_val_LC_MESSAGES=yes
- else
-@@ -2187,7 +2317,7 @@
-     fi
-   fi
-    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
--echo "configure:2191: checking whether NLS is requested" >&5
-+echo "configure:2321: checking whether NLS is requested" >&5
-         # Check whether --enable-nls or --disable-nls was given.
- if test "${enable_nls+set}" = set; then
-   enableval="$enable_nls"
-@@ -2207,7 +2337,7 @@
- EOF
- 
-       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
--echo "configure:2211: checking whether included gettext is requested" >&5
-+echo "configure:2341: checking whether included gettext is requested" >&5
-       # Check whether --with-included-gettext or --without-included-gettext was given.
- if test "${with_included_gettext+set}" = set; then
-   withval="$with_included_gettext"
-@@ -2226,17 +2356,17 @@
- 
- 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
--echo "configure:2230: checking for libintl.h" >&5
-+echo "configure:2360: checking for libintl.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2235 "configure"
-+#line 2365 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2253,19 +2383,19 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
--echo "configure:2257: checking for gettext in libc" >&5
-+echo "configure:2387: checking for gettext in libc" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2262 "configure"
-+#line 2392 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- int main() {
- return (int) gettext ("")
- ; return 0; }
- EOF
--if { (eval echo configure:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gt_cv_func_gettext_libc=yes
- else
-@@ -2281,7 +2411,7 @@
- 
- 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
- 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
--echo "configure:2285: checking for bindtextdomain in -lintl" >&5
-+echo "configure:2415: checking for bindtextdomain in -lintl" >&5
- ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2289,7 +2419,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lintl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2293 "configure"
-+#line 2423 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2300,7 +2430,7 @@
- bindtextdomain()
- ; return 0; }
- EOF
--if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2316,19 +2446,19 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
--echo "configure:2320: checking for gettext in libintl" >&5
-+echo "configure:2450: checking for gettext in libintl" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2325 "configure"
-+#line 2455 "configure"
- #include "confdefs.h"
- 
- int main() {
- return (int) gettext ("")
- ; return 0; }
- EOF
--if { (eval echo configure:2332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gt_cv_func_gettext_libintl=yes
- else
-@@ -2356,7 +2486,7 @@
- 	      # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2360: checking for $ac_word" >&5
-+echo "configure:2490: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2390,12 +2520,12 @@
- 		for ac_func in dcgettext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2394: checking for $ac_func" >&5
-+echo "configure:2524: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2399 "configure"
-+#line 2529 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2418,7 +2548,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2445,7 +2575,7 @@
- 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2449: checking for $ac_word" >&5
-+echo "configure:2579: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2481,7 +2611,7 @@
- 		# Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2485: checking for $ac_word" >&5
-+echo "configure:2615: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2513,7 +2643,7 @@
- fi
- 
- 		cat > conftest.$ac_ext <<EOF
--#line 2517 "configure"
-+#line 2647 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -2521,7 +2651,7 @@
- 			       return _nl_msg_cat_cntr
- ; return 0; }
- EOF
--if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   CATOBJEXT=.gmo
- 		   DATADIRNAME=share
-@@ -2553,7 +2683,7 @@
-         # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2557: checking for $ac_word" >&5
-+echo "configure:2687: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2587,7 +2717,7 @@
-         # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2591: checking for $ac_word" >&5
-+echo "configure:2721: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2623,7 +2753,7 @@
-         # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2627: checking for $ac_word" >&5
-+echo "configure:2757: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2713,7 +2843,7 @@
-        LINGUAS=
-      else
-        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
--echo "configure:2717: checking for catalogs to be installed" >&5
-+echo "configure:2847: checking for catalogs to be installed" >&5
-        NEW_LINGUAS=
-        for lang in ${LINGUAS=$ALL_LINGUAS}; do
-          case "$ALL_LINGUAS" in
-@@ -2741,17 +2871,17 @@
-       if test "$CATOBJEXT" = ".cat"; then
- 	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
--echo "configure:2745: checking for linux/version.h" >&5
-+echo "configure:2875: checking for linux/version.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2750 "configure"
-+#line 2880 "configure"
- #include "confdefs.h"
- #include <linux/version.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2869,12 +2999,12 @@
- 
- fi
- 
--for ac_prog in mawk gawk nawk awk
-+for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2878: checking for $ac_word" >&5
-+echo "configure:3008: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2915,7 +3045,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:2919: checking for a BSD compatible install" >&5
-+echo "configure:3049: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2976,7 +3106,7 @@
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2980: checking for $ac_word" >&5
-+echo "configure:3110: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3008,7 +3138,7 @@
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3012: checking for $ac_word" >&5
-+echo "configure:3142: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3040,7 +3170,7 @@
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3044: checking for $ac_word" >&5
-+echo "configure:3174: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3075,7 +3205,7 @@
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3079: checking for $ac_word" >&5
-+echo "configure:3209: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3107,7 +3237,7 @@
- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
- set dummy ${ac_tool_prefix}windres; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3111: checking for $ac_word" >&5
-+echo "configure:3241: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3141,7 +3271,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3145: checking for $ac_word" >&5
-+echo "configure:3275: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3175,7 +3305,7 @@
- # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args.
- set dummy ${ac_tool_prefix}mig; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3179: checking for $ac_word" >&5
-+echo "configure:3309: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3226,12 +3356,12 @@
- 
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:3230: checking return type of signal handlers" >&5
-+echo "configure:3360: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3235 "configure"
-+#line 3365 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -3248,7 +3378,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -3268,12 +3398,12 @@
- 
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:3272: checking for ANSI C header files" >&5
-+echo "configure:3402: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3277 "configure"
-+#line 3407 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -3281,7 +3411,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3298,7 +3428,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3302 "configure"
-+#line 3432 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -3316,7 +3446,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3320 "configure"
-+#line 3450 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3337,7 +3467,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3341 "configure"
-+#line 3471 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -3348,7 +3478,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:3352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -3392,17 +3522,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3396: checking for $ac_hdr" >&5
-+echo "configure:3526: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3401 "configure"
-+#line 3531 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3429,12 +3559,12 @@
- done
- 
- echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
--echo "configure:3433: checking whether stat file-mode macros are broken" >&5
-+echo "configure:3563: checking whether stat file-mode macros are broken" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3438 "configure"
-+#line 3568 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -3486,12 +3616,12 @@
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:3490: checking for working const" >&5
-+echo "configure:3620: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3495 "configure"
-+#line 3625 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3540,7 +3670,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -3565,12 +3695,12 @@
- 	realpath sbrk setpgid setpgrp sigaction sigprocmask sigsetmask 
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3569: checking for $ac_func" >&5
-+echo "configure:3699: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3574 "configure"
-+#line 3704 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3593,7 +3723,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3620,19 +3750,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:3624: checking for working alloca.h" >&5
-+echo "configure:3754: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3629 "configure"
-+#line 3759 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -3653,12 +3783,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:3657: checking for alloca" >&5
-+echo "configure:3787: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3662 "configure"
-+#line 3792 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -3686,7 +3816,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -3718,12 +3848,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:3722: checking whether alloca needs Cray hooks" >&5
-+echo "configure:3852: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3727 "configure"
-+#line 3857 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -3748,12 +3878,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3752: checking for $ac_func" >&5
-+echo "configure:3882: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3757 "configure"
-+#line 3887 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3776,7 +3906,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3803,7 +3933,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:3807: checking stack direction for C alloca" >&5
-+echo "configure:3937: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3811,7 +3941,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3815 "configure"
-+#line 3945 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -3830,7 +3960,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -3852,12 +3982,12 @@
- fi
- 
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:3856: checking for pid_t" >&5
-+echo "configure:3986: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3861 "configure"
-+#line 3991 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3886,17 +4016,17 @@
- 
- ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
--echo "configure:3890: checking for vfork.h" >&5
-+echo "configure:4020: checking for vfork.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3895 "configure"
-+#line 4025 "configure"
- #include "confdefs.h"
- #include <vfork.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3921,18 +4051,18 @@
- fi
- 
- echo $ac_n "checking for working vfork""... $ac_c" 1>&6
--echo "configure:3925: checking for working vfork" >&5
-+echo "configure:4055: checking for working vfork" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
-   echo $ac_n "checking for vfork""... $ac_c" 1>&6
--echo "configure:3931: checking for vfork" >&5
-+echo "configure:4061: checking for vfork" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3936 "configure"
-+#line 4066 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char vfork(); below.  */
-@@ -3955,7 +4085,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_vfork=yes"
- else
-@@ -3977,7 +4107,7 @@
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3981 "configure"
-+#line 4111 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -4072,7 +4202,7 @@
-   }
- }
- EOF
--if { (eval echo configure:4076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_vfork_works=yes
- else
-@@ -4096,7 +4226,7 @@
- 
- if test "$cross_compiling" = no; then
-   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
--echo "configure:4100: checking whether setpgrp takes no argument" >&5
-+echo "configure:4230: checking whether setpgrp takes no argument" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4104,7 +4234,7 @@
-   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4108 "configure"
-+#line 4238 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_UNISTD_H
-@@ -4124,7 +4254,7 @@
- }
- 
- EOF
--if { (eval echo configure:4128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_setpgrp_void=no
- else
-@@ -4149,12 +4279,12 @@
- 
- else
-   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
--echo "configure:4153: checking whether setpgrp takes no argument" >&5
-+echo "configure:4283: checking whether setpgrp takes no argument" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4158 "configure"
-+#line 4288 "configure"
- #include "confdefs.h"
- 
- #include <unistd.h>
-@@ -4168,7 +4298,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_func_setpgrp_void=no
- else
-@@ -4192,12 +4322,12 @@
- # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do
- # since sigsetjmp might only be defined as a macro.
- echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
--echo "configure:4196: checking for sigsetjmp" >&5
-+echo "configure:4326: checking for sigsetjmp" >&5
- if eval "test \"`echo '$''{'gdb_cv_func_sigsetjmp'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4201 "configure"
-+#line 4331 "configure"
- #include "confdefs.h"
- 
- #include <setjmp.h>
-@@ -4206,7 +4336,7 @@
- sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);
- ; return 0; }
- EOF
--if { (eval echo configure:4210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_func_sigsetjmp=yes
- else
-@@ -4229,19 +4359,19 @@
- # See if <machine/reg.h> supports the %fs and %gs i386 segment registers.
- # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'.
- echo $ac_n "checking for r_fs in struct reg""... $ac_c" 1>&6
--echo "configure:4233: checking for r_fs in struct reg" >&5
-+echo "configure:4363: checking for r_fs in struct reg" >&5
- if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_fs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4238 "configure"
-+#line 4368 "configure"
- #include "confdefs.h"
- #include <machine/reg.h>
- int main() {
- struct reg r; r.r_fs;
- ; return 0; }
- EOF
--if { (eval echo configure:4245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_struct_reg_r_fs=yes
- else
-@@ -4261,19 +4391,19 @@
- 
- fi
- echo $ac_n "checking for r_gs in struct reg""... $ac_c" 1>&6
--echo "configure:4265: checking for r_gs in struct reg" >&5
-+echo "configure:4395: checking for r_gs in struct reg" >&5
- if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_gs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4270 "configure"
-+#line 4400 "configure"
- #include "confdefs.h"
- #include <machine/reg.h>
- int main() {
- struct reg r; r.r_gs;
- ; return 0; }
- EOF
--if { (eval echo configure:4277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_struct_reg_r_gs=yes
- else
-@@ -4295,19 +4425,19 @@
- 
- # See if <sys/ptrace.h> provides the PTRACE_GETREGS request.
- echo $ac_n "checking for PTRACE_GETREGS""... $ac_c" 1>&6
--echo "configure:4299: checking for PTRACE_GETREGS" >&5
-+echo "configure:4429: checking for PTRACE_GETREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4304 "configure"
-+#line 4434 "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
- int main() {
- PTRACE_GETREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_ptrace_getregs=yes
- else
-@@ -4329,19 +4459,19 @@
- 
- # See if <sys/ptrace.h> provides the PTRACE_GETFPXREGS request.
- echo $ac_n "checking for PTRACE_GETFPXREGS""... $ac_c" 1>&6
--echo "configure:4333: checking for PTRACE_GETFPXREGS" >&5
-+echo "configure:4463: checking for PTRACE_GETFPXREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getfpxregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4338 "configure"
-+#line 4468 "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
- int main() {
- PTRACE_GETFPXREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_ptrace_getfpxregs=yes
- else
-@@ -4363,12 +4493,12 @@
- 
- # See if <sys/ptrace.h> provides the PT_GETDBREGS request.
- echo $ac_n "checking for PT_GETDBREGS""... $ac_c" 1>&6
--echo "configure:4367: checking for PT_GETDBREGS" >&5
-+echo "configure:4497: checking for PT_GETDBREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_pt_getdbregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4372 "configure"
-+#line 4502 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/ptrace.h>
-@@ -4376,7 +4506,7 @@
- PT_GETDBREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_pt_getdbregs=yes
- else
-@@ -4398,12 +4528,12 @@
- 
- # See if <sys/ptrace.h> provides the PT_GETXMMREGS request.
- echo $ac_n "checking for PT_GETXMMREGS""... $ac_c" 1>&6
--echo "configure:4402: checking for PT_GETXMMREGS" >&5
-+echo "configure:4532: checking for PT_GETXMMREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_pt_getxmmregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4407 "configure"
-+#line 4537 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/ptrace.h>
-@@ -4411,7 +4541,7 @@
- PT_GETXMMREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_pt_getxmmregs=yes
- else
-@@ -4433,7 +4563,7 @@
- 
- 
- echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
--echo "configure:4437: checking for socketpair in -lsocket" >&5
-+echo "configure:4567: checking for socketpair in -lsocket" >&5
- ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4441,7 +4571,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4445 "configure"
-+#line 4575 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4452,7 +4582,7 @@
- socketpair()
- ; return 0; }
- EOF
--if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4482,12 +4612,12 @@
- for ac_func in socketpair
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4486: checking for $ac_func" >&5
-+echo "configure:4616: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4491 "configure"
-+#line 4621 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -4510,7 +4640,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4537,12 +4667,12 @@
- 
- 
- echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6
--echo "configure:4541: checking whether malloc must be declared" >&5
-+echo "configure:4671: checking whether malloc must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4546 "configure"
-+#line 4676 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4563,7 +4693,7 @@
- char *(*pfn) = (char *(*)) malloc
- ; return 0; }
- EOF
--if { (eval echo configure:4567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_malloc=no
- else
-@@ -4584,12 +4714,12 @@
- fi
- 
- echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6
--echo "configure:4588: checking whether realloc must be declared" >&5
-+echo "configure:4718: checking whether realloc must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4593 "configure"
-+#line 4723 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4610,7 +4740,7 @@
- char *(*pfn) = (char *(*)) realloc
- ; return 0; }
- EOF
--if { (eval echo configure:4614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_realloc=no
- else
-@@ -4631,12 +4761,12 @@
- fi
- 
- echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6
--echo "configure:4635: checking whether free must be declared" >&5
-+echo "configure:4765: checking whether free must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4640 "configure"
-+#line 4770 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4657,7 +4787,7 @@
- char *(*pfn) = (char *(*)) free
- ; return 0; }
- EOF
--if { (eval echo configure:4661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_free=no
- else
-@@ -4678,12 +4808,12 @@
- fi
- 
- echo $ac_n "checking whether strerror must be declared""... $ac_c" 1>&6
--echo "configure:4682: checking whether strerror must be declared" >&5
-+echo "configure:4812: checking whether strerror must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strerror'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4687 "configure"
-+#line 4817 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4704,7 +4834,7 @@
- char *(*pfn) = (char *(*)) strerror
- ; return 0; }
- EOF
--if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strerror=no
- else
-@@ -4725,12 +4855,12 @@
- fi
- 
- echo $ac_n "checking whether strdup must be declared""... $ac_c" 1>&6
--echo "configure:4729: checking whether strdup must be declared" >&5
-+echo "configure:4859: checking whether strdup must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strdup'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4734 "configure"
-+#line 4864 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4751,7 +4881,7 @@
- char *(*pfn) = (char *(*)) strdup
- ; return 0; }
- EOF
--if { (eval echo configure:4755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strdup=no
- else
-@@ -4772,12 +4902,12 @@
- fi
- 
- echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6
--echo "configure:4776: checking whether strstr must be declared" >&5
-+echo "configure:4906: checking whether strstr must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4781 "configure"
-+#line 4911 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4798,7 +4928,7 @@
- char *(*pfn) = (char *(*)) strstr
- ; return 0; }
- EOF
--if { (eval echo configure:4802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strstr=no
- else
-@@ -4819,12 +4949,12 @@
- fi
- 
- echo $ac_n "checking whether canonicalize_file_name must be declared""... $ac_c" 1>&6
--echo "configure:4823: checking whether canonicalize_file_name must be declared" >&5
-+echo "configure:4953: checking whether canonicalize_file_name must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_canonicalize_file_name'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4828 "configure"
-+#line 4958 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4845,7 +4975,7 @@
- char *(*pfn) = (char *(*)) canonicalize_file_name
- ; return 0; }
- EOF
--if { (eval echo configure:4849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_canonicalize_file_name=no
- else
-@@ -4872,9 +5002,9 @@
- # could be expunged. --jsm 1999-03-22
- 
- echo $ac_n "checking for HPUX save_state structure""... $ac_c" 1>&6
--echo "configure:4876: checking for HPUX save_state structure" >&5
-+echo "configure:5006: checking for HPUX save_state structure" >&5
- cat > conftest.$ac_ext <<EOF
--#line 4878 "configure"
-+#line 5008 "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- EOF
-@@ -4889,7 +5019,7 @@
- rm -f conftest*
- 
- cat > conftest.$ac_ext <<EOF
--#line 4893 "configure"
-+#line 5023 "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- EOF
-@@ -4959,12 +5089,12 @@
- 
- if test "$ac_cv_header_sys_procfs_h" = yes; then
-   echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4963: checking for pstatus_t in sys/procfs.h" >&5
-+echo "configure:5093: checking for pstatus_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4968 "configure"
-+#line 5098 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -4973,7 +5103,7 @@
- pstatus_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pstatus_t=yes
- else
-@@ -4995,12 +5125,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6
- 
-   echo $ac_n "checking for prrun_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4999: checking for prrun_t in sys/procfs.h" >&5
-+echo "configure:5129: checking for prrun_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prrun_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5004 "configure"
-+#line 5134 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5009,7 +5139,7 @@
- prrun_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prrun_t=yes
- else
-@@ -5031,12 +5161,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prrun_t" 1>&6
- 
-   echo $ac_n "checking for gregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5035: checking for gregset_t in sys/procfs.h" >&5
-+echo "configure:5165: checking for gregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_gregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5040 "configure"
-+#line 5170 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5045,7 +5175,7 @@
- gregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_gregset_t=yes
- else
-@@ -5067,12 +5197,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_gregset_t" 1>&6
- 
-   echo $ac_n "checking for fpregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5071: checking for fpregset_t in sys/procfs.h" >&5
-+echo "configure:5201: checking for fpregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_fpregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5076 "configure"
-+#line 5206 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5081,7 +5211,7 @@
- fpregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_fpregset_t=yes
- else
-@@ -5103,12 +5233,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_fpregset_t" 1>&6
- 
-   echo $ac_n "checking for prgregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5107: checking for prgregset_t in sys/procfs.h" >&5
-+echo "configure:5237: checking for prgregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5112 "configure"
-+#line 5242 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5117,7 +5247,7 @@
- prgregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prgregset_t=yes
- else
-@@ -5139,12 +5269,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset_t" 1>&6
- 
-   echo $ac_n "checking for prfpregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5143: checking for prfpregset_t in sys/procfs.h" >&5
-+echo "configure:5273: checking for prfpregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5148 "configure"
-+#line 5278 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5153,7 +5283,7 @@
- prfpregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prfpregset_t=yes
- else
-@@ -5175,12 +5305,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset_t" 1>&6
- 
-   echo $ac_n "checking for prgregset32_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5179: checking for prgregset32_t in sys/procfs.h" >&5
-+echo "configure:5309: checking for prgregset32_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset32_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5184 "configure"
-+#line 5314 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5189,7 +5319,7 @@
- prgregset32_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prgregset32_t=yes
- else
-@@ -5211,12 +5341,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset32_t" 1>&6
- 
-   echo $ac_n "checking for prfpregset32_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5215: checking for prfpregset32_t in sys/procfs.h" >&5
-+echo "configure:5345: checking for prfpregset32_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset32_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5220 "configure"
-+#line 5350 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5225,7 +5355,7 @@
- prfpregset32_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prfpregset32_t=yes
- else
-@@ -5247,12 +5377,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset32_t" 1>&6
- 
-   echo $ac_n "checking for lwpid_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5251: checking for lwpid_t in sys/procfs.h" >&5
-+echo "configure:5381: checking for lwpid_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5256 "configure"
-+#line 5386 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5261,7 +5391,7 @@
- lwpid_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_lwpid_t=yes
- else
-@@ -5283,12 +5413,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpid_t" 1>&6
- 
-   echo $ac_n "checking for psaddr_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5287: checking for psaddr_t in sys/procfs.h" >&5
-+echo "configure:5417: checking for psaddr_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psaddr_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5292 "configure"
-+#line 5422 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5297,7 +5427,7 @@
- psaddr_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_psaddr_t=yes
- else
-@@ -5319,12 +5449,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_psaddr_t" 1>&6
- 
-   echo $ac_n "checking for prsysent_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5323: checking for prsysent_t in sys/procfs.h" >&5
-+echo "configure:5453: checking for prsysent_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prsysent_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5328 "configure"
-+#line 5458 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5333,7 +5463,7 @@
- prsysent_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prsysent_t=yes
- else
-@@ -5355,12 +5485,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prsysent_t" 1>&6
- 
-   echo $ac_n "checking for pr_sigset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5359: checking for pr_sigset_t in sys/procfs.h" >&5
-+echo "configure:5489: checking for pr_sigset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5364 "configure"
-+#line 5494 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5369,7 +5499,7 @@
- pr_sigset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pr_sigset_t=yes
- else
-@@ -5391,12 +5521,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigset_t" 1>&6
- 
-   echo $ac_n "checking for pr_sigaction64_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5395: checking for pr_sigaction64_t in sys/procfs.h" >&5
-+echo "configure:5525: checking for pr_sigaction64_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigaction64_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5400 "configure"
-+#line 5530 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5405,7 +5535,7 @@
- pr_sigaction64_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes
- else
-@@ -5427,12 +5557,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" 1>&6
- 
-   echo $ac_n "checking for pr_siginfo64_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5431: checking for pr_siginfo64_t in sys/procfs.h" >&5
-+echo "configure:5561: checking for pr_siginfo64_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_siginfo64_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5436 "configure"
-+#line 5566 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5441,7 +5571,7 @@
- pr_siginfo64_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes
- else
-@@ -5468,7 +5598,7 @@
-         
-   if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
-     echo $ac_n "checking whether prfpregset_t type is broken""... $ac_c" 1>&6
--echo "configure:5472: checking whether prfpregset_t type is broken" >&5
-+echo "configure:5602: checking whether prfpregset_t type is broken" >&5
-     if eval "test \"`echo '$''{'gdb_cv_prfpregset_t_broken'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5476,7 +5606,7 @@
-   gdb_cv_prfpregset_t_broken=yes
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5480 "configure"
-+#line 5610 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
-        int main ()
-@@ -5486,7 +5616,7 @@
-          return 0;
-        }
- EOF
--if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_prfpregset_t_broken=no
- else
-@@ -5511,12 +5641,12 @@
- 
-   
-   echo $ac_n "checking for PIOCSET ioctl entry in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5515: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
-+echo "configure:5645: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_procfs_piocset'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5520 "configure"
-+#line 5650 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- #include <sys/types.h>
-@@ -5529,7 +5659,7 @@
-   
- ; return 0; }
- EOF
--if { (eval echo configure:5533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_procfs_piocset=yes
- else
-@@ -5553,19 +5683,19 @@
- if test ${host} = ${target} ; then
-     
-   echo $ac_n "checking for member l_addr in struct link_map""... $ac_c" 1>&6
--echo "configure:5557: checking for member l_addr in struct link_map" >&5
-+echo "configure:5687: checking for member l_addr in struct link_map" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_l_members'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5562 "configure"
-+#line 5692 "configure"
- #include "confdefs.h"
- #include <link.h>
- int main() {
- struct link_map lm; (void) lm.l_addr;
- ; return 0; }
- EOF
--if { (eval echo configure:5569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_link_map_with_l_members=yes
- else
-@@ -5587,12 +5717,12 @@
- 
-     
-   echo $ac_n "checking for member lm_addr in struct link_map""... $ac_c" 1>&6
--echo "configure:5591: checking for member lm_addr in struct link_map" >&5
-+echo "configure:5721: checking for member lm_addr in struct link_map" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_lm_members'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5596 "configure"
-+#line 5726 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <link.h>
-@@ -5600,7 +5730,7 @@
- struct link_map lm; (void) lm.lm_addr;
- ; return 0; }
- EOF
--if { (eval echo configure:5604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_link_map_with_lm_members=yes
- else
-@@ -5622,12 +5752,12 @@
- 
-     
-   echo $ac_n "checking for member som_addr in struct so_map""... $ac_c" 1>&6
--echo "configure:5626: checking for member som_addr in struct so_map" >&5
-+echo "configure:5756: checking for member som_addr in struct so_map" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_so_map_with_som_members'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5631 "configure"
-+#line 5761 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_NLIST_H
-@@ -5638,7 +5768,7 @@
- struct so_map lm; (void) lm.som_addr;
- ; return 0; }
- EOF
--if { (eval echo configure:5642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_so_map_with_som_members=yes
- else
-@@ -5660,12 +5790,12 @@
- 
-     
-   echo $ac_n "checking for struct link_map32 in sys/link.h""... $ac_c" 1>&6
--echo "configure:5664: checking for struct link_map32 in sys/link.h" >&5
-+echo "configure:5794: checking for struct link_map32 in sys/link.h" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map32'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5669 "configure"
-+#line 5799 "configure"
- #include "confdefs.h"
- #define _SYSCALL32
- #include <sys/link.h>
-@@ -5673,7 +5803,7 @@
- struct link_map32 l;
- ; return 0; }
- EOF
--if { (eval echo configure:5677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_link_map32=yes
- else
-@@ -5695,7 +5825,7 @@
- fi
- 
- echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
--echo "configure:5699: checking for main in -lm" >&5
-+echo "configure:5829: checking for main in -lm" >&5
- ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5703,14 +5833,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5707 "configure"
-+#line 5837 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:5714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5739,7 +5869,7 @@
- 
- 
- echo $ac_n "checking for wctype in -lc""... $ac_c" 1>&6
--echo "configure:5743: checking for wctype in -lc" >&5
-+echo "configure:5873: checking for wctype in -lc" >&5
- ac_lib_var=`echo c'_'wctype | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5747,7 +5877,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5751 "configure"
-+#line 5881 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5758,7 +5888,7 @@
- wctype()
- ; return 0; }
- EOF
--if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5777,7 +5907,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6
--echo "configure:5781: checking for wctype in -lw" >&5
-+echo "configure:5911: checking for wctype in -lw" >&5
- ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5785,7 +5915,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lw  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5789 "configure"
-+#line 5919 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5796,7 +5926,7 @@
- wctype()
- ; return 0; }
- EOF
--if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5828,12 +5958,12 @@
- 
- 
- echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6
--echo "configure:5832: checking for long long support in compiler" >&5
-+echo "configure:5962: checking for long long support in compiler" >&5
- if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5837 "configure"
-+#line 5967 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -5843,7 +5973,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_c_long_long=yes
- else
-@@ -5865,7 +5995,7 @@
- 
- 
- echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6
--echo "configure:5869: checking for long long support in printf" >&5
-+echo "configure:5999: checking for long long support in printf" >&5
- if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5873,7 +6003,7 @@
-   gdb_cv_printf_has_long_long=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5877 "configure"
-+#line 6007 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -5887,7 +6017,7 @@
-   return (strcmp ("0x0123456789abcdef", buf));
- }
- EOF
--if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_printf_has_long_long=yes
- else
-@@ -5911,19 +6041,19 @@
- 
- 
- echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6
--echo "configure:5915: checking for long double support in compiler" >&5
-+echo "configure:6045: checking for long double support in compiler" >&5
- if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5920 "configure"
-+#line 6050 "configure"
- #include "confdefs.h"
- 
- int main() {
- long double foo;
- ; return 0; }
- EOF
--if { (eval echo configure:5927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_long_double=yes
- else
-@@ -5945,7 +6075,7 @@
- 
- 
- echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6
--echo "configure:5949: checking for long double support in printf" >&5
-+echo "configure:6079: checking for long double support in printf" >&5
- if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5953,7 +6083,7 @@
-   gdb_cv_printf_has_long_double=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5957 "configure"
-+#line 6087 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -5963,7 +6093,7 @@
-   return (strncmp ("3.14159", buf, 7));
- }
- EOF
--if { (eval echo configure:5967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_printf_has_long_double=yes
- else
-@@ -5987,7 +6117,7 @@
- 
- 
- echo $ac_n "checking for long double support in scanf""... $ac_c" 1>&6
--echo "configure:5991: checking for long double support in scanf" >&5
-+echo "configure:6121: checking for long double support in scanf" >&5
- if eval "test \"`echo '$''{'gdb_cv_scanf_has_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5995,7 +6125,7 @@
-   gdb_cv_scanf_has_long_double=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5999 "configure"
-+#line 6129 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -6005,7 +6135,7 @@
-   return !(f > 3.14159 && f < 3.14160);
- }
- EOF
--if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_scanf_has_long_double=yes
- else
-@@ -6031,17 +6161,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6035: checking for $ac_hdr" >&5
-+echo "configure:6165: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6040 "configure"
-+#line 6170 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6070,12 +6200,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6074: checking for $ac_func" >&5
-+echo "configure:6204: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6079 "configure"
-+#line 6209 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6098,7 +6228,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6123,7 +6253,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:6127: checking for working mmap" >&5
-+echo "configure:6257: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6131,7 +6261,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6135 "configure"
-+#line 6265 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -6271,7 +6401,7 @@
- }
- 
- EOF
--if { (eval echo configure:6275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -6297,7 +6427,7 @@
- case ${host_os} in
- aix*)
-   echo $ac_n "checking for -bbigtoc option""... $ac_c" 1>&6
--echo "configure:6301: checking for -bbigtoc option" >&5
-+echo "configure:6431: checking for -bbigtoc option" >&5
- if eval "test \"`echo '$''{'gdb_cv_bigtoc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6311,14 +6441,14 @@
- 
-     LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
-     cat > conftest.$ac_ext <<EOF
--#line 6315 "configure"
-+#line 6445 "configure"
- #include "confdefs.h"
- 
- int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:6322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -6341,7 +6471,7 @@
-    case ${host_os} in
-    hpux*)
-       echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6
--echo "configure:6345: checking for HPUX/OSF thread support" >&5
-+echo "configure:6475: checking for HPUX/OSF thread support" >&5
-       if test -f /usr/include/dce/cma_config.h ; then
-          if test "$GCC" = "yes" ; then
-             echo "$ac_t""yes" 1>&6
-@@ -6360,7 +6490,7 @@
-       ;;
-    solaris*)
-       echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6
--echo "configure:6364: checking for Solaris thread debugging library" >&5
-+echo "configure:6494: checking for Solaris thread debugging library" >&5
-       if test -f /usr/lib/libthread_db.so.1 ; then
-          echo "$ac_t""yes" 1>&6
-          cat >> confdefs.h <<\EOF
-@@ -6370,7 +6500,7 @@
-          CONFIG_LIB_OBS="${CONFIG_LIB_OBS} sol-thread.o"
-          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
-          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:6374: checking for dlopen in -ldl" >&5
-+echo "configure:6504: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6378,7 +6508,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6382 "configure"
-+#line 6512 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6389,7 +6519,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:6393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6421,17 +6551,17 @@
-             # all symbols visible in the dynamic symbol table.
-             hold_ldflags=$LDFLAGS
-             echo $ac_n "checking for the ld -export-dynamic flag""... $ac_c" 1>&6
--echo "configure:6425: checking for the ld -export-dynamic flag" >&5
-+echo "configure:6555: checking for the ld -export-dynamic flag" >&5
-             LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
-             cat > conftest.$ac_ext <<EOF
--#line 6428 "configure"
-+#line 6558 "configure"
- #include "confdefs.h"
- 
- int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:6435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   found=yes
- else
-@@ -6450,13 +6580,13 @@
- 	 # Sun randomly tweaked the prototypes in <proc_service.h>
- 	 # at one point.
- 	 echo $ac_n "checking if <proc_service.h> is old""... $ac_c" 1>&6
--echo "configure:6454: checking if <proc_service.h> is old" >&5
-+echo "configure:6584: checking if <proc_service.h> is old" >&5
- 	 if eval "test \"`echo '$''{'gdb_cv_proc_service_is_old'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 	    cat > conftest.$ac_ext <<EOF
--#line 6460 "configure"
-+#line 6590 "configure"
- #include "confdefs.h"
- 
- 		#include <proc_service.h>
-@@ -6467,7 +6597,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_proc_service_is_old=no
- else
-@@ -6686,7 +6816,7 @@
- if test "x${build_warnings}" != x -a "x$GCC" = xyes
- then
-     echo $ac_n "checking compiler warning flags""... $ac_c" 1>&6
--echo "configure:6690: checking compiler warning flags" >&5
-+echo "configure:6820: checking compiler warning flags" >&5
-     # Separate out the -Werror flag as some files just cannot be
-     # compiled with it enabled.
-     for w in ${build_warnings}; do
-@@ -6696,14 +6826,14 @@
- 	    saved_CFLAGS="$CFLAGS"
- 	    CFLAGS="$CFLAGS $w"
- 	    cat > conftest.$ac_ext <<EOF
--#line 6700 "configure"
-+#line 6830 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   WARN_CFLAGS="${WARN_CFLAGS} $w"
- else
-@@ -6763,12 +6893,12 @@
- 
- if test $want_included_regex = false; then
-   echo $ac_n "checking for GNU regex""... $ac_c" 1>&6
--echo "configure:6767: checking for GNU regex" >&5
-+echo "configure:6897: checking for GNU regex" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6772 "configure"
-+#line 6902 "configure"
- #include "confdefs.h"
- #include <gnu-versions.h>
- #include <sys/types.h>
-@@ -6780,7 +6910,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_gnu_regex=yes
- else
-@@ -6809,12 +6939,12 @@
- 
- # In the Cygwin environment, we need some additional flags.
- echo $ac_n "checking for cygwin""... $ac_c" 1>&6
--echo "configure:6813: checking for cygwin" >&5
-+echo "configure:6943: checking for cygwin" >&5
- if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6818 "configure"
-+#line 6948 "configure"
- #include "confdefs.h"
- 
- #if defined (__CYGWIN__) || defined (__CYGWIN32__)
-@@ -6852,7 +6982,7 @@
- else
-   TERM_LIB=
-   echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
--echo "configure:6856: checking for tgetent in -lncurses" >&5
-+echo "configure:6986: checking for tgetent in -lncurses" >&5
- ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6860,7 +6990,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lncurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6864 "configure"
-+#line 6994 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6871,7 +7001,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6890,7 +7020,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lHcurses""... $ac_c" 1>&6
--echo "configure:6894: checking for tgetent in -lHcurses" >&5
-+echo "configure:7024: checking for tgetent in -lHcurses" >&5
- ac_lib_var=`echo Hcurses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6898,7 +7028,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lHcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6902 "configure"
-+#line 7032 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6909,7 +7039,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6928,7 +7058,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6
--echo "configure:6932: checking for tgetent in -ltermlib" >&5
-+echo "configure:7062: checking for tgetent in -ltermlib" >&5
- ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6936,7 +7066,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ltermlib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6940 "configure"
-+#line 7070 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6947,7 +7077,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6966,7 +7096,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
--echo "configure:6970: checking for tgetent in -ltermcap" >&5
-+echo "configure:7100: checking for tgetent in -ltermcap" >&5
- ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6974,7 +7104,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ltermcap  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6978 "configure"
-+#line 7108 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6985,7 +7115,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7004,7 +7134,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
--echo "configure:7008: checking for tgetent in -lcurses" >&5
-+echo "configure:7138: checking for tgetent in -lcurses" >&5
- ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7012,7 +7142,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7016 "configure"
-+#line 7146 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7023,7 +7153,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:7027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7042,7 +7172,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lterminfo""... $ac_c" 1>&6
--echo "configure:7046: checking for tgetent in -lterminfo" >&5
-+echo "configure:7176: checking for tgetent in -lterminfo" >&5
- ac_lib_var=`echo terminfo'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7050,7 +7180,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lterminfo  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7054 "configure"
-+#line 7184 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7061,7 +7191,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7226,7 +7356,7 @@
- fi
- 
-   echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
--echo "configure:7230: checking for Tcl configuration" >&5
-+echo "configure:7360: checking for Tcl configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7334,7 +7464,7 @@
- fi
- 
-   echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
--echo "configure:7338: checking for Tk configuration" >&5
-+echo "configure:7468: checking for Tk configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7443,7 +7573,7 @@
- 
- no_tcl=true
- echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6
--echo "configure:7447: checking for Tcl private headers. dir=${configdir}" >&5
-+echo "configure:7577: checking for Tcl private headers. dir=${configdir}" >&5
- # Check whether --with-tclinclude or --without-tclinclude was given.
- if test "${with_tclinclude+set}" = set; then
-   withval="$with_tclinclude"
-@@ -7509,17 +7639,17 @@
- if test x"${ac_cv_c_tclh}" = x ; then
-    ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
--echo "configure:7513: checking for tclInt.h" >&5
-+echo "configure:7643: checking for tclInt.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7518 "configure"
-+#line 7648 "configure"
- #include "confdefs.h"
- #include <tclInt.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7579,7 +7709,7 @@
- #
- no_tk=true
- echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6
--echo "configure:7583: checking for Tk private headers" >&5
-+echo "configure:7713: checking for Tk private headers" >&5
- # Check whether --with-tkinclude or --without-tkinclude was given.
- if test "${with_tkinclude+set}" = set; then
-   withval="$with_tkinclude"
-@@ -7645,17 +7775,17 @@
- if test x"${ac_cv_c_tkh}" = x ; then
-    ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for tk.h""... $ac_c" 1>&6
--echo "configure:7649: checking for tk.h" >&5
-+echo "configure:7779: checking for tk.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7654 "configure"
-+#line 7784 "configure"
- #include "confdefs.h"
- #include <tk.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7701,7 +7831,7 @@
- 
- 	   
- echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:7705: checking for Itcl private headers. srcdir=${srcdir}" >&5
-+echo "configure:7835: checking for Itcl private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_itclh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
-     if test -f $i/generic/itcl.h ; then
-@@ -7724,7 +7854,7 @@
- 
- 	   
- echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:7728: checking for Itk private headers. srcdir=${srcdir}" >&5
-+echo "configure:7858: checking for Itk private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_itkh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do
-     if test -f $i/generic/itk.h ; then
-@@ -7747,7 +7877,7 @@
- 
- 	   
- echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:7751: checking for Tix private headers. srcdir=${srcdir}" >&5
-+echo "configure:7881: checking for Tix private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_tixh}" = x ; then
-   for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do
-     if test -f $i/generic/tix.h ; then
-@@ -7799,7 +7929,7 @@
- fi
- 
-   echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6
--echo "configure:7803: checking for Itcl configuration" >&5
-+echo "configure:7933: checking for Itcl configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7902,7 +8032,7 @@
- fi
- 
-   echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6
--echo "configure:7906: checking for Itk configuration" >&5
-+echo "configure:8036: checking for Itk configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8005,7 +8135,7 @@
- fi
- 
-   echo $ac_n "checking for Tix configuration""... $ac_c" 1>&6
--echo "configure:8009: checking for Tix configuration" >&5
-+echo "configure:8139: checking for Tix configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tixconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8148,7 +8278,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:8152: checking for X" >&5
-+echo "configure:8282: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -8210,12 +8340,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 8214 "configure"
-+#line 8344 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -8284,14 +8414,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8288 "configure"
-+#line 8418 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -8584,7 +8714,7 @@
- # ``gdbserver'' can only be built in a native configuration.
- if test x"${target}" = x"${host}"; then
-     echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6
--echo "configure:8588: checking whether gdbserver is supported on this host" >&5
-+echo "configure:8718: checking whether gdbserver is supported on this host" >&5
-     if test x"${build_gdbserver}" = xyes ; then
- 	configdirs="${configdirs} gdbserver"
- 	SUBDIRS="${SUBDIRS} gdbserver"
-@@ -8646,7 +8776,7 @@
- 
- 
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:8650: checking whether ln -s works" >&5
-+echo "configure:8780: checking whether ln -s works" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8670,12 +8800,12 @@
- 
- 
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
--echo "configure:8674: checking for Cygwin environment" >&5
-+echo "configure:8804: checking for Cygwin environment" >&5
- if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8679 "configure"
-+#line 8809 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -8686,7 +8816,7 @@
- return __CYGWIN__;
- ; return 0; }
- EOF
--if { (eval echo configure:8690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_cygwin=yes
- else
-@@ -8703,19 +8833,19 @@
- CYGWIN=
- test "$ac_cv_cygwin" = yes && CYGWIN=yes
- echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:8707: checking for mingw32 environment" >&5
-+echo "configure:8837: checking for mingw32 environment" >&5
- if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8712 "configure"
-+#line 8842 "configure"
- #include "confdefs.h"
- 
- int main() {
- return __MINGW32__;
- ; return 0; }
- EOF
--if { (eval echo configure:8719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_mingw32=yes
- else
-@@ -8734,7 +8864,7 @@
- 
- 
- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:8738: checking for executable suffix" >&5
-+echo "configure:8868: checking for executable suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8744,10 +8874,10 @@
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_exeext=
--  if { (eval echo configure:8748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+  if { (eval echo configure:8878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-     for file in conftest.*; do
-       case $file in
--      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+      *.c | *.o | *.obj) ;;
-       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-       esac
-     done
-@@ -8905,6 +9035,9 @@
- s%@MAINT@%$MAINT%g
- s%@CC@%$CC%g
- s%@CPP@%$CPP%g
-+s%@DIR_aif@%$DIR_aif%g
-+s%@INCLUDE_aif@%$INCLUDE_aif%g
-+s%@LIB_aif@%$LIB_aif%g
- s%@host@%$host%g
- s%@host_alias@%$host_alias%g
- s%@host_cpu@%$host_cpu%g
---- gdb-5.2-old/gdb/config.in	Sat Feb 23 14:54:25 2002
-+++ gdb-5.2/gdb/config.in	Sun Mar 16 21:09:24 2003
-@@ -499,3 +499,5 @@
- /* Define if <sys/procfs.h> has pr_siginfo64_t. */
- #undef HAVE_PR_SIGINFO64_T
- 
-+/* Define for AIF support. */
-+#undef HAVE_AIF

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-rh5.2.1-4.patch b/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-rh5.2.1-4.patch
deleted file mode 100644
index c2e08a0..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/patches/gdb-rh5.2.1-4.patch
+++ /dev/null

@@ -1,4876 +0,0 @@
---- /dev/null	Fri Mar 23 22:00:33 2001
-+++ gdb-5.2/gdb/aif-valprint.c	Mon Jul 22 09:58:31 2002
-@@ -0,0 +1,1082 @@
-+/* Support for printing C and C++ types for GDB, the GNU debugger.
-+   Copyright 1986, 1988, 1989, 1991, 1993-1996, 1998-2000
-+   Free Software Foundation, Inc.
-+
-+   This file is part of GDB.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License, or
-+   (at your option) any later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.  */
-+
-+#include "defs.h"
-+#include "obstack.h"
-+#include "bfd.h"		/* Binary File Description */
-+#include "symtab.h"
-+#include "gdbtypes.h"
-+#include "expression.h"
-+#include "value.h"
-+#include "valprint.h"
-+#include "gdbcore.h"
-+#include "target.h"
-+#include "command.h"
-+#include "gdbcmd.h"
-+#include "language.h"
-+#include "demangle.h"
-+#include "c-lang.h"
-+#include "typeprint.h"
-+#include "ui-file.h"
-+
-+#include "gdb_string.h"
-+#include "aif.h"
-+#include <errno.h>
-+#include <ctype.h>
-+void mem_file_delete (struct ui_file *file);
-+
-+int check_value(struct type *, CORE_ADDR, struct value **);
-+
-+/* defined in valprint.c: */
-+extern int partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr);
-+
-+
-+/* the following comes from the aif library, conv.c, written by Greg. */
-+
-+#ifdef WINDOWSNT
-+#define BITSPERBYTE	8
-+#else /* WINDOWSNT */
-+#include	<values.h>
-+#endif /* WINDOWSNT */
-+
-+union ieee_double
-+{
-+	DOUBLEST	d;
-+	char		c[sizeof(DOUBLEST)];
-+};
-+
-+
-+/* For linked data structures, we check for circularity by recording the values
-+ * of all pointers and types we see.  In a later pass, we emit a name on those
-+ * types and an offset for those values
-+ * that appear more than once. */
-+struct value_info {
-+  CORE_ADDR addr;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: value has been
-+    emitted */
-+};
-+struct type_info {
-+  struct type *type;
-+  int used; /* 0: appears, not pointed to.  1: is pointed to.  2: name has been
-+    emitted */
-+};
-+
-+#define MAX_VALUES_SEEN 1000
-+	/* hope that the structure doesn't have more distinct pointer values */
-+struct value_info valuesSeen[MAX_VALUES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numValuesSeen;
-+#define MAX_TYPES_SEEN 100
-+	/* hope that the structure doesn't have more distinct types values */
-+struct type_info typesSeen[MAX_TYPES_SEEN+1]; /* extra space for
-+  pseudo-data */
-+int numTypesSeen;
-+
-+typedef enum {doType, doValue} doWhat;
-+
-+struct str_type
-+{
-+	int	blen;
-+	int	slen;
-+	int	end;
-+	char *	buf;
-+};
-+
-+typedef struct str_type *	str_ptr;
-+
-+str_ptr str_init(void);
-+void str_add(str_ptr, char *);
-+void str_free(str_ptr);
-+char *str_val(str_ptr);
-+str_ptr str_dup(char *);
-+
-+/* fill in the valuesSeen array with all the pointer values we see */
-+void
-+ aif_discover(struct type *type, char *valaddr, doWhat what)
-+{
-+  int valuesSeenIndex;
-+  struct type *elttype;
-+  unsigned int eltlen, offset;
-+  CORE_ADDR addr;
-+  switch (TYPE_CODE (type))
-+    {
-+    case TYPE_CODE_TYPEDEF:
-+      aif_discover(TYPE_TARGET_TYPE (type), valaddr, what);
-+      break;
-+
-+    case TYPE_CODE_PTR:
-+    case TYPE_CODE_REF:
-+      if (what == doValue)
-+      { /* looking for values */
-+	struct value *deref_val;
-+	addr = unpack_pointer (type, valaddr);
-+	if (addr == 0) break;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (valuesSeenIndex = 0; valuesSeenIndex < numValuesSeen;
-+	valuesSeenIndex++)
-+	{
-+	  if (addr == valuesSeen[valuesSeenIndex].addr)
-+	  {
-+	    valuesSeen[valuesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numValuesSeen < MAX_VALUES_SEEN)
-+	  {
-+	    valuesSeen[numValuesSeen].addr = addr;
-+	    valuesSeen[numValuesSeen].used = 0;
-+	    numValuesSeen += 1;
-+	  }
-+	/*
-+	** Check addr is valid!
-+	*/
-+	if ( check_value(elttype, addr, &deref_val) )
-+		aif_discover(elttype, VALUE_CONTENTS (deref_val), what);
-+	break;
-+      } else {
-+	/* looking for types */
-+	int typesSeenIndex;
-+	elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+	if (TYPE_CODE(elttype) != TYPE_CODE_PTR &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_REF &&
-+	  TYPE_CODE(elttype) != TYPE_CODE_STRUCT)
-+	  break; /* no need to remember pointers not leading to cycles */
-+	for (typesSeenIndex = 0; typesSeenIndex < numTypesSeen;
-+	typesSeenIndex++)
-+	{
-+	  if (elttype == typesSeen[typesSeenIndex].type)
-+	  {
-+	    typesSeen[typesSeenIndex].used = 1; /* found a circularity */
-+	    return;
-+	  }
-+	}
-+	if (numTypesSeen < MAX_TYPES_SEEN)
-+	  {
-+	    typesSeen[numTypesSeen].type = elttype;
-+	    typesSeen[numTypesSeen].used = 0;
-+	    numTypesSeen += 1;
-+	  }
-+	aif_discover(elttype, 0, what);
-+	break;
-+      } /* discover types */
-+
-+    case TYPE_CODE_STRUCT:
-+    case TYPE_CODE_UNION:
-+      { /* discover either values or types */
-+	int i;
-+      	struct field *thisField;
-+	struct type *ftype;
-+	struct value *v;
-+
-+	for ( i = 0; i < TYPE_NFIELDS(type); i++ )
-+	{
-+		if ( TYPE_FIELD_IGNORE(type, i) )
-+			continue;
-+
-+		if ( what == doType )
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), 0, what);
-+			continue;
-+		}
-+
-+		if 
-+		(
-+			!TYPE_FIELD_STATIC(type, i) 
-+			&& 
-+			TYPE_FIELD_PACKED(type, i)
-+		)
-+		{
-+			v = value_from_longest(TYPE_FIELD_TYPE(type, i),
-+				unpack_field_as_long (type, valaddr, i));
-+
-+			aif_discover(TYPE_FIELD_TYPE (type, i), VALUE_CONTENTS(v), what);
-+		}
-+		else if ( TYPE_FIELD_STATIC (type, i) )
-+		{
-+			v = value_static_field (type, i);
-+
-+			if ( v == NULL )
-+				continue;
-+
-+			/*
-+			XXX
-+			cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+			stream, format, recurse + 1,
-+			pretty);
-+			*/
-+		}
-+		else
-+		{
-+			aif_discover(TYPE_FIELD_TYPE(type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / 8, what);
-+		}
-+	  }
-+      }
-+      break;
-+
-+    case TYPE_CODE_ARRAY:
-+      elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+      if (what == doValue)
-+      { /* looking for values */
-+	unsigned int temp_len, len;
-+	eltlen = TYPE_LENGTH (elttype);
-+	len = TYPE_LENGTH (type) / eltlen;
-+	offset = 0;
-+	for (temp_len = 0; temp_len < len; temp_len++)
-+	  {
-+	    aif_discover(elttype, valaddr+offset, what);
-+	    offset += eltlen;
-+	  }
-+      } else { /* looking for types */
-+	aif_discover(elttype, 0, what);
-+      } /* TYPE_CODE_ARRAY */
-+      break;
-+
-+    case TYPE_CODE_MEMBER:
-+    case TYPE_CODE_METHOD:
-+    case TYPE_CODE_FUNC:
-+    case TYPE_CODE_UNDEF:
-+    case TYPE_CODE_ENUM:
-+    case TYPE_CODE_BOOL:
-+    case TYPE_CODE_INT:
-+    case TYPE_CODE_FLT:
-+    case TYPE_CODE_VOID:
-+    case TYPE_CODE_ERROR:
-+    case TYPE_CODE_CHAR:
-+    case TYPE_CODE_SET:
-+    case TYPE_CODE_RANGE:
-+    case TYPE_CODE_STRING:
-+    case TYPE_CODE_BITSTRING:
-+    case TYPE_CODE_COMPLEX:
-+    case TYPE_CODE_TEMPLATE:
-+      break;
-+
-+    default:
-+      error ("type not handled in type_discover");
-+      break;
-+    } /* switch (TYPE_CODE (type)) */
-+} /* aif_discover */
-+
-+/* squash the valuesSeen and typesSeen arrays to remove unnecessary elements */
-+void 
-+aif_reduce(void)
-+{
-+  int front, back;
-+  front = back = 0;
-+  while (front < numValuesSeen)
-+    {
-+      /* move back to first unused entry */
-+      valuesSeen[numValuesSeen].used = 0; /* pseudo-data */
-+      while (valuesSeen[back].used) back += 1;
-+      if (back == numValuesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      valuesSeen[numValuesSeen].used = 1; /* pseudo-data */
-+      while (!valuesSeen[front].used) front += 1;
-+      if (front == numValuesSeen) break;
-+      /* copy from front to back */
-+      valuesSeen[back] = valuesSeen[front];
-+      valuesSeen[front].used = 0;
-+    }
-+  numValuesSeen = back;
-+  front = back = 0;
-+  while (front < numTypesSeen)
-+    {
-+      /* move back to first unused entry */
-+      typesSeen[numTypesSeen].used = 0; /* pseudo-data */
-+      while (typesSeen[back].used) back += 1;
-+      if (back == numTypesSeen) break;
-+      /* move front to first used entry beyond back */
-+      if (front <= back) front = back+1;
-+      typesSeen[numTypesSeen].used = 1; /* pseudo-data */
-+      while (!typesSeen[front].used) front += 1;
-+      if (front == numTypesSeen) break;
-+      /* copy from front to back */
-+      typesSeen[back] = typesSeen[front];
-+      typesSeen[front].used = 0;
-+    }
-+    numTypesSeen = back;
-+} /* aif_reduce */
-+
-+int dataStreamPos;
-+
-+void 
-+emitData(char toEmit, struct ui_file *stream)
-+{
-+  fprintf_filtered(stream, "%02x", toEmit & 0xff);
-+  dataStreamPos += 1;
-+} /* emitData */
-+  
-+void
-+aif_emit_string (CORE_ADDR addr, struct ui_file *stream)
-+{ /* code modified from val_print_string () */
-+  int errcode;			/* Errno returned from bad reads. */
-+  unsigned int fetchlimit;	/* Maximum number of chars to print. */
-+  unsigned int nfetch;		/* Chars to fetch / chars fetched. */
-+  unsigned int chunksize;	/* Size of each fetch, in chars. */
-+  char *buffer = NULL;		/* Dynamically growable fetch buffer. */
-+  char *bufptr;			/* Pointer to next available byte in buffer. */
-+  char *limit;			/* First location past end of fetch buffer. */
-+  struct cleanup *old_chain = NULL;	/* Top of the old cleanup chain. */
-+  int found_nul;		/* Non-zero if we found the nul char */
-+  unsigned long bufsize = 0;
-+  int length;			/* how long the string turned out to be */
-+
-+  if (addr == 0)
-+  {
-+      emitData(0, stream);
-+      emitData(0, stream);
-+      return;
-+  }
-+
-+  fetchlimit = print_max;
-+  chunksize = min (8, fetchlimit);
-+  /* Loop until we either have all the characters to print, or we encounter
-+     some error, such as bumping into the end of the address space. */
-+  found_nul = 0;
-+  old_chain = make_cleanup (null_cleanup, 0);
-+  do
-+    {
-+      QUIT;
-+      nfetch = min (chunksize, fetchlimit - bufsize);
-+      if (buffer == NULL)
-+	buffer = (char *) xmalloc (nfetch);
-+      else
-+	{
-+	  discard_cleanups (old_chain);
-+	  buffer = (char *) xrealloc (buffer, nfetch + bufsize);
-+	}
-+      old_chain = make_cleanup (free, buffer);
-+      bufptr = buffer + bufsize;
-+      bufsize += nfetch;
-+      /* Read as much as we can. */
-+      nfetch = partial_memory_read (addr, bufptr, nfetch, &errcode);
-+      /* Scan this chunk for the null byte */
-+      limit = bufptr + nfetch;
-+      while (bufptr < limit)
-+	{
-+	  unsigned long c;
-+	  c = extract_unsigned_integer (bufptr, 1);
-+	  addr += 1;
-+	  bufptr += 1;
-+	  if (c == 0)
-+	    {
-+	      /* We don't care about any error which happened after
-+		  the NULL terminator.  */
-+	      errcode = 0;
-+	      found_nul = 1;
-+	      break;
-+	    }
-+	} /* while (bufptr < limit) */
-+    } /* do */
-+  while (errcode == 0	/* no error */
-+	  && bufptr - buffer < fetchlimit	/* no overrun */
-+	  && !found_nul);	/* haven't found nul yet */
-+  QUIT;
-+  length = 0;
-+  if (errcode == 0 || bufptr > buffer)
-+    {
-+      length = bufptr - buffer - 1; /* don't include null */
-+      emitData((length >> 8) & 077, stream);
-+      emitData(length & 077, stream);
-+      for (; length > 0; length--) {
-+	emitData(*buffer++, stream); 
-+      }
-+    }
-+  if (errcode != 0)
-+    {
-+      if (errcode == EIO)
-+	{
-+	  fprintf_filtered (stream, " <Address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, " out of bounds>");
-+	}
-+      else
-+	{
-+	  fprintf_filtered (stream, " <Error reading address ");
-+	  print_address_numeric (addr, 1, stream);
-+	  fprintf_filtered (stream, ": %s>", safe_strerror (errcode));
-+	}
-+    }
-+  gdb_flush (stream);
-+  do_cleanups (old_chain);
-+  return;
-+} /* aif_emit_string */
-+
-+str_ptr
-+gdb_type_to_fds(struct type *type)
-+{
-+	int		len;
-+	int		elen;
-+	int		nfields;
-+	int		i;
-+	int		ix;
-+	str_ptr		s;
-+	str_ptr		type_ptr;
-+	str_ptr		type_str;
-+	struct type *	etype;
-+
-+	CHECK_TYPEDEF (type);
-+
-+	type_str = str_init();
-+
-+	for ( ix = 0; ix < numTypesSeen; ix++)
-+	{
-+		if 
-+		(
-+			typesSeen[ix].type != type
-+			||
-+			!typesSeen[ix].used
-+		)
-+			continue;
-+
-+		/*
-+		** Multiple use type
-+		*/
-+
-+		if ( typesSeen[ix].used != 1 )
-+		{
-+			/* 
-+			** referring to one already emitted 
-+			*/
-+
-+			str_add(type_str, TypeToFDS(AIF_REFERENCE, ix));
-+			return type_str;
-+		}
-+
-+		/*
-+		** first time; emit name
-+		*/
-+
-+		str_add(type_str, TypeToFDS(AIF_NAME, ix, NULL));
-+		typesSeen[ix].used = 2;
-+		break;
-+	}
-+
-+	len = TYPE_LENGTH(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		type_ptr = gdb_type_to_fds(TYPE_TARGET_TYPE(type));
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		return type_str;
-+
-+	case TYPE_CODE_ARRAY:
-+		if 
-+		(
-+			len > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			etype = check_typedef(TYPE_TARGET_TYPE (type));
-+			elen = TYPE_LENGTH(etype);
-+			len /= elen;
-+
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, TypeToFDS(AIF_ARRAY, 
-+				TypeToFDS(AIF_RANGE, 0, len-1, 
-+					TypeToFDS(AIF_INTEGER, 1, sizeof(int))),
-+				str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+
-+	case TYPE_CODE_PTR:
-+		etype = check_typedef(TYPE_TARGET_TYPE(type));
-+		elen = TYPE_LENGTH(etype);
-+
-+		if 
-+		(
-+			elen == 1
-+			&&
-+			TYPE_CODE(etype) == TYPE_CODE_INT
-+		)
-+		{
-+			str_add(type_str, TypeToFDS(AIF_STRING));
-+		}
-+		else
-+		{
-+			type_ptr = gdb_type_to_fds(etype);
-+
-+			str_add(type_str, 
-+				TypeToFDS(AIF_POINTER, str_val(type_ptr)));
-+
-+			str_free(type_ptr);
-+		}
-+
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		if
-+		(
-+			len != 1
-+			||
-+			strncmp(TYPE_NAME(type), "char", 5) != 0
-+		) 
-+		{
-+			str_add(type_str, 
-+				TypeToFDS(AIF_INTEGER, TYPE_UNSIGNED(type) ? 0 : 1, len));
-+			break;
-+		}
-+
-+		/*
-+		** Treat as char...
-+		*/
-+
-+	case TYPE_CODE_CHAR:
-+		str_add(type_str, TypeToFDS(AIF_CHARACTER));
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		str_add(type_str, TypeToFDS(AIF_FLOATING, len));
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		nfields = TYPE_NFIELDS(type);
-+		
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		/*
-+		** First need to calculate size of struct, since it
-+		** may not be packed.
-+		*/
-+
-+		for ( len = 0 ; i < nfields ; i++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+					TYPE_FIELD_BITSIZE(type, i) / 8 :
-+					TYPE_LENGTH(etype);
-+
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+			else if ( elen > len )
-+				len = elen;
-+		}
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_STRUCT));
-+
-+		/*
-+		** Need to calculate offset (len).
-+		*/
-+		len = 0;
-+
-+		if ( HAVE_CPLUS_STRUCT(type) )
-+			i = TYPE_N_BASECLASSES(type);
-+		else
-+			i = 0;
-+
-+		for (; i < nfields ; i++ )
-+		{
-+			char *t;
-+
-+			if ( TYPE_FIELD_IGNORE(type, i) )
-+				continue;
-+
-+			etype = check_typedef(TYPE_FIELD_TYPE(type, i));
-+
-+			elen = TYPE_FIELD_PACKED(type, i) ?
-+				TYPE_FIELD_BITSIZE(type, i) :
-+				TYPE_LENGTH(etype) * 8;
-+
-+			s = gdb_type_to_fds(etype);
-+
-+			if ( HAVE_CPLUS_STRUCT(type) )
-+			{
-+				if ( TYPE_FIELD_PROTECTED(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val(type_ptr),
-+					    	AIFACC_PROTECTED, 
-+					    	TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else if ( TYPE_FIELD_PRIVATE(type, i) )
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PRIVATE, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+				else
-+					t = FDSAddFieldToClass(
-+						str_val (type_ptr), 
-+						AIFACC_PUBLIC, 
-+						TYPE_FIELD_NAME(type, i), 
-+						str_val(s));
-+
-+			}
-+			else
-+				t = FDSAddFieldToStruct(str_val(type_ptr), 
-+					TYPE_FIELD_NAME(type, i), str_val(s));
-+
-+			str_free(type_ptr);
-+			
-+			type_ptr = str_dup(t);
-+
-+			str_free(s);
-+
-+			/*
-+			** Calc offset.
-+			*/
-+			if ( TYPE_CODE(type) == TYPE_CODE_STRUCT )
-+				len += elen;
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		str_add(type_str, TypeToFDS(AIF_VOID, len));
-+		break;
-+
-+	case TYPE_CODE_ENUM:
-+		nfields = TYPE_NFIELDS (type);
-+
-+		type_ptr = str_dup(TypeToFDS(AIF_ENUM));
-+
-+		for ( i = 0 ; i < nfields ; i++ )
-+		{
-+			char *	t;
-+
-+			t = FDSAddConstToEnum(str_val(type_ptr),
-+					TYPE_FIELD_NAME(type, i),
-+					TYPE_FIELD_BITPOS(type, i));
-+
-+			str_free(type_ptr);
-+
-+			type_ptr = str_dup(t);
-+		}
-+
-+		str_add(type_str, str_val(type_ptr));
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_FUNC:
-+		etype = check_typedef(TYPE_TARGET_TYPE (type));
-+
-+		type_ptr = gdb_type_to_fds(etype);
-+
-+		str_add(type_str, 
-+			TypeToFDS(AIF_FUNCTION, str_val(type_ptr)));
-+
-+		str_free(type_ptr);
-+		break;
-+
-+	case TYPE_CODE_STRING:
-+	case TYPE_CODE_SET:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_BITSTRING:
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_BOOL:
-+	case TYPE_CODE_COMPLEX:
-+		str_add(type_str, TypeToFDS(AIF_INVALID));
-+		break;
-+
-+	default:
-+		error("Invalid C/C++ type code %d in symbol table.", TYPE_CODE(type));
-+	}
-+
-+	return type_str;
-+}
-+
-+void
-+aif_val_print_recursive(struct type *type, char *valaddr, CORE_ADDR address, struct ui_file *stream)
-+{
-+	int			ix;
-+	int			res;
-+	int			valid;
-+	unsigned		len;
-+	unsigned		eltlen;
-+	LONGEST			val;
-+	double			dval;
-+	float			fval;
-+#ifdef HAVE_LONG_DOUBLE
-+	long double		ldval;
-+#endif /* HAVE_LONG_DOUBLE */
-+	CORE_ADDR		addr;
-+	struct value *		vptr;
-+	union ieee_double	v;
-+	struct type *		elttype;
-+	struct field *		thisField;
-+
-+	CHECK_TYPEDEF(type);
-+
-+	switch ( TYPE_CODE(type) )
-+	{
-+	case TYPE_CODE_TYPEDEF:
-+		aif_val_print_recursive(TYPE_TARGET_TYPE(type), valaddr, address, stream);
-+		break;
-+
-+	case TYPE_CODE_ARRAY:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if 
-+		(
-+			TYPE_LENGTH(type) > 0
-+			&&
-+			TYPE_LENGTH(TYPE_TARGET_TYPE(type)) > 0
-+		)
-+		{
-+			eltlen = TYPE_LENGTH(elttype);
-+			len = TYPE_LENGTH(type) / eltlen;
-+
-+			for ( ix = 0; ix < len; ix++ )
-+				aif_val_print_recursive(elttype, valaddr + ix * eltlen, address + ix * eltlen, stream);
-+
-+			break;
-+		}
-+
-+		/*
-+		** Treat as a pointer...
-+		*/
-+		addr = address;
-+		goto asPtr;
-+
-+	case TYPE_CODE_REF:
-+	case TYPE_CODE_PTR:
-+		addr = unpack_pointer(type, valaddr);
-+
-+	asPtr:
-+		elttype = check_typedef(TYPE_TARGET_TYPE(type));
-+
-+		if
-+		(
-+			TYPE_LENGTH(elttype) == 1
-+			&& 
-+			TYPE_CODE(elttype) == TYPE_CODE_INT
-+		)
-+		{
-+			/*
-+			** call it a string
-+			*/
-+			(void)aif_emit_string(addr, stream);
-+			break;
-+		}
-+
-+		if ( addr == 0 )
-+		{
-+			emitData((char)AIF_PTR_NIL, stream); 
-+			break;
-+		}
-+
-+		for ( ix = 0 ; ix < numValuesSeen; ix++ )
-+		{
-+			if
-+			(
-+				valuesSeen[ix].addr == addr
-+				&&
-+				valuesSeen[ix].used
-+			)
-+			{
-+				if ( valuesSeen[ix].used == 1 )
-+				{
-+					/* 
-+					** first time; just emit as usual
-+					*/
-+
-+					emitData((char)AIF_PTR_NAME, stream); 
-+					valuesSeen[ix].used = 2;
-+					emitData((char)ix, stream);
-+
-+					break; /* no need to look at other seen values */
-+				}
-+
-+				/* 
-+				** referring to one already emitted
-+				*/
-+
-+				emitData((char)AIF_PTR_REFERENCE, stream); 
-+				emitData((char)ix, stream);
-+
-+				return; /* don't go any deeper */
-+			}
-+		}
-+
-+		res = check_value(elttype, addr, &vptr);
-+
-+		if ( ix == numValuesSeen )
-+		{
-+			/*
-+			** not special at all 
-+			*/
-+			if ( !res )
-+			{
-+				emitData((char)AIF_PTR_INVALID, stream); 
-+				break;
-+			}
-+
-+			emitData((char)AIF_PTR_NORMAL, stream); 
-+		}
-+
-+		aif_val_print_recursive (VALUE_TYPE(vptr),
-+					VALUE_CONTENTS(vptr),
-+					VALUE_ADDRESS(vptr),
-+					stream);
-+
-+		break;
-+
-+	case TYPE_CODE_STRUCT:
-+	case TYPE_CODE_UNION:
-+		/*
-+		** A union is treated just like a struct. That is
-+		** we attempt to traverse each field if possible.
-+		** It's then up to the receiver to decide what is
-+		** sensible information.
-+		**
-+		** XXX: What happens if a pointer points to random
-+		** data?
-+		*/
-+		for ( ix = 0 ; ix < TYPE_NFIELDS (type) ; ix++ )
-+		{
-+			if ( TYPE_FIELD_IGNORE(type, ix) )
-+				continue;
-+
-+			if 
-+			(
-+				!TYPE_FIELD_STATIC(type, ix) 
-+				&& 
-+				TYPE_FIELD_PACKED(type, ix)
-+			)
-+			{
-+				vptr = value_from_longest(TYPE_FIELD_TYPE(type, ix),
-+					unpack_field_as_long(type, valaddr, ix));
-+
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), VALUE_CONTENTS(vptr), 0, stream);
-+			}
-+			else if ( TYPE_FIELD_STATIC (type, ix) )
-+			{
-+				vptr = value_static_field (type, ix);
-+
-+				if ( vptr == NULL )
-+					continue;
-+
-+				/*
-+				XXX
-+				cp_print_static_field (TYPE_FIELD_TYPE (type, i), v,
-+				stream, format, recurse + 1,
-+				pretty);
-+				*/
-+			}
-+			else
-+				aif_val_print_recursive(TYPE_FIELD_TYPE(type, ix), 
-+					valaddr + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					address + TYPE_FIELD_BITPOS (type, ix) / 8,
-+					stream);
-+		}
-+		break;
-+
-+	case TYPE_CODE_CHAR:
-+	asChar:
-+		val = unpack_long (type, valaddr);
-+		emitData((char) (val & 0xff), stream); 
-+		break;
-+
-+	case TYPE_CODE_INT:
-+		len = TYPE_LENGTH (type);
-+
-+		if
-+		(
-+			len == 1 
-+			&&
-+			strncmp(TYPE_NAME(type), "char", 5) == 0
-+		) 
-+			goto asChar;
-+
-+		val = unpack_long(type, valaddr);
-+		AIFNormalise((char *) &v, len, (char *) &val, sizeof(LONGEST));
-+		
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char)(v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_FLT:
-+		len = TYPE_LENGTH (type);
-+
-+		switch ( len ) {
-+		case 4:
-+			fval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &fval), sizeof(DOUBLEST));
-+			break;
-+
-+		case 8:
-+			dval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &dval), sizeof(DOUBLEST));
-+			break;
-+
-+#ifdef HAVE_LONG_DOUBLE
-+		case 16:
-+			ldval = unpack_double (type, valaddr, &valid);
-+			AIFNormalise((char *) &v, len, ((char *) &ldval), sizeof(DOUBLEST));
-+			break;
-+#endif /* HAVE_LONG_DOUBLE */
-+		default:
-+			fprintf(stderr, "cannot handle float of length %d\n", len);
-+		}
-+
-+		for ( ix = 0 ; ix < len ; ix++ )
-+			emitData((char) (v.c[ix] & 0xff), stream); 
-+
-+		break;
-+
-+	case TYPE_CODE_VOID:
-+		break;
-+
-+	case TYPE_CODE_MEMBER:
-+	case TYPE_CODE_ENUM:
-+	case TYPE_CODE_RANGE:
-+	case TYPE_CODE_FUNC:
-+	case TYPE_CODE_METHOD:
-+	case TYPE_CODE_UNDEF:
-+	case TYPE_CODE_ERROR:
-+		break;
-+
-+	default:
-+		error ("Invalid C/C++ type code %d in symbol table.", TYPE_CODE (type));
-+	}
-+}
-+
-+void 
-+aif_val_print(struct type *type, char *valaddr, int embedded_offset, CORE_ADDR address, struct ui_file *stream)
-+{
-+  str_ptr s;
-+
-+  // struct ui_file *typeStream=mem_fileopen();
-+  numValuesSeen = 0;
-+  aif_discover(type, valaddr+embedded_offset, doValue); /* values */
-+  aif_discover(type, 0, doType); /* types */
-+  aif_reduce();
-+  dataStreamPos = 0;
-+  // fputs_filtered("(", stream);
-+  s = gdb_type_to_fds(type);
-+  fputs_filtered(str_val(s), stream);
-+  str_free(s);
-+  // fputs_filtered(")", stream);
-+  fputs_filtered(" ", stream);
-+  aif_val_print_recursive(type, valaddr+embedded_offset, address, stream);
-+  // contents = ui_file_xstrdup(typeStream, &dummy);
-+  // fputs_filtered(contents, stream);
-+  // free(contents);
-+  // ui_file_delete(typeStream);
-+  gdb_flush(stream);
-+} /* aif_val_print */
-+
-+void
-+aif_type_print(struct type *type, struct ui_file *stream)
-+{
-+	str_ptr	s;
-+
-+	numValuesSeen = 0;
-+	aif_discover(type, 0, doType); /* types */
-+	aif_reduce();
-+	dataStreamPos = 0;
-+	s = gdb_type_to_fds(type);
-+	fputs_filtered(str_val(s), stream);
-+	str_free(s);
-+}
-+
-+#define STRSIZE 100
-+
-+str_ptr
-+str_init(void)
-+{
-+	str_ptr	s;
-+
-+	s = (str_ptr)xmalloc(sizeof(struct str_type));
-+	s->buf = (char *)xmalloc(STRSIZE);
-+	s->blen = STRSIZE;
-+	s->slen = 0;
-+	*(s->buf) = '\0';
-+
-+	return s;
-+}
-+
-+void
-+str_add(str_ptr s1, char *s2)
-+{
-+	int	l2 = strlen(s2);
-+
-+	if (s1->slen + l2 >= s1->blen)
-+	{
-+		s1->blen += max(STRSIZE, l2);
-+		s1->buf = (char *) xrealloc (s1->buf, s1->blen);
-+	}
-+
-+	memcpy(&(s1->buf[s1->slen]), s2, l2);
-+	s1->slen += l2;
-+	s1->buf[s1->slen] = '\0';
-+}
-+
-+void
-+str_free(str_ptr s)
-+{
-+	free(s->buf);
-+	free(s);
-+}
-+
-+char *
-+str_val(str_ptr s)
-+{
-+	return s->buf;
-+}
-+
-+str_ptr
-+str_dup(char *s1)
-+{
-+	str_ptr s = str_init();
-+	str_add(s, s1);
-+	return s;
-+}
-+
-+int
-+check_value(struct type *type, CORE_ADDR addr, struct value **res)
-+{
-+  struct value *val;
-+  char buf[sizeof (ULONGEST)];
-+
-+  if (TYPE_CODE (check_typedef (type)) == TYPE_CODE_VOID)
-+  	return 0;
-+
-+  *res = value_at(type, addr, NULL);
-+
-+  return 1;
-+}
-+
---- gdb-5.2-old/gdb/c-valprint.c	Wed Jul 10 12:46:35 2002
-+++ gdb-5.2/gdb/c-valprint.c	Mon Jul 22 09:58:31 2002
-@@ -31,6 +31,12 @@
- #include "cp-abi.h"
- 
- 
-+#ifdef HAVE_AIF
-+extern int max_print_depth; /* set by "set print depth" */
-+extern int current_print_depth;
-+extern int typeprint; /* set by "set print type" (Boolean) */
-+#endif /* HAVE_AIF */
-+
- /* Print function pointer with inferior address ADDRESS onto stdio
-    stream STREAM.  */
- 
-@@ -76,6 +82,15 @@
-   LONGEST val;
-   CORE_ADDR addr;
- 
-+#ifdef HAVE_AIF
-+  if (typeprint && format != 's') 
-+    {
-+      fputs_filtered("(", stream);
-+      type_print (type, "", stream, -1);
-+      fputs_filtered(") ", stream);
-+    }
-+#endif /* HAVE_AIF */
-+
-   CHECK_TYPEDEF (type);
-   switch (TYPE_CODE (type))
-     {
-@@ -154,6 +169,9 @@
- 	  break;
- 	}
-       elttype = check_typedef (TYPE_TARGET_TYPE (type));
-+#ifdef HAVE_AIF
-+      if (!elttype) elttype = type;
-+#endif /* HAVE_AIF */
-       if (TYPE_CODE (elttype) == TYPE_CODE_METHOD)
- 	{
- 	  cp_print_class_method (valaddr + embedded_offset, type, stream);
-@@ -182,6 +200,36 @@
- 	      print_address_numeric (addr, 1, stream);
- 	    }
- 
-+#ifdef HAVE_AIF
-+	  if (current_print_depth < max_print_depth
-+	      && TYPE_CODE (elttype) != TYPE_CODE_UNDEF
-+	      && (TYPE_LENGTH (elttype) != 1
-+	      || TYPE_CODE (elttype) != TYPE_CODE_INT)
-+	      && format != 's')
-+	    { /* print complex objected pointed to recursively */
-+	      if (addressprint) fprintf_filtered (stream, " => ");
-+	      if (addr == 0)
-+		{
-+		  fprintf_filtered (stream, "nil");
-+		}
-+	      else
-+	      { /* non nil */
-+		struct value *deref_val = value_at(elttype, addr, NULL);
-+		current_print_depth += 1;
-+		val_print (VALUE_TYPE (deref_val),
-+			    VALUE_CONTENTS (deref_val),
-+			    0,
-+			    VALUE_ADDRESS (deref_val),
-+			    stream,
-+			    format,
-+			    deref_ref,
-+			    recurse,
-+			    pretty);
-+		current_print_depth -= 1;
-+	      }
-+	    } /* print recursively */
-+#endif /* HAVE_AIF */
-+
- 	  /* For a pointer to char or unsigned char, also print the string
- 	     pointed to, unless pointer is null.  */
- 	  /* FIXME: need to handle wchar_t here... */
-@@ -356,9 +404,11 @@
- 	}
-       /* FIXME, we should consider, at least for ANSI C language, eliminating
-          the distinction made between FUNCs and POINTERs to FUNCs.  */
-+#ifndef HAVE_AIF
-       fprintf_filtered (stream, "{");
-       type_print (type, "", stream, -1);
-       fprintf_filtered (stream, "} ");
-+#endif /* HAVE_AIF */
-       /* Try to print what function it points to, and its address.  */
-       print_address_demangle (address, stream, demangle);
-       break;
-@@ -559,9 +609,11 @@
-       else
- 	{
- 	  /* normal case */
-+#ifndef HAVE_AIF
- 	  fprintf_filtered (stream, "(");
- 	  type_print (type, "", stream, -1);
- 	  fprintf_filtered (stream, ") ");
-+#endif /* HAVE_AIF */
- 	}
-     }
-   if (objectprint && (TYPE_CODE (VALUE_TYPE (val)) == TYPE_CODE_CLASS))
---- gdb-5.2-old/gdb/printcmd.c	Wed Jul 10 12:46:37 2002
-+++ gdb-5.2/gdb/printcmd.c	Mon Jul 22 09:58:31 2002
-@@ -43,6 +43,7 @@
- 
- extern int asm_demangle;	/* Whether to demangle syms in asm printouts */
- extern int addressprint;	/* Whether to print hex addresses in HLL " */
-+extern int current_print_depth; /* from valprint.c */
- 
- struct format_data
-   {
-@@ -320,12 +321,21 @@
- 	  || TYPE_CODE (type) == TYPE_CODE_STRING
- 	  || TYPE_CODE (type) == TYPE_CODE_STRUCT
- 	  || TYPE_CODE (type) == TYPE_CODE_UNION)
-+#ifdef HAVE_AIF
-+	{
-+#endif /* HAVE_AIF */
- 	/* If format is 0, use the 'natural' format for
- 	 * that type of value.  If the type is non-scalar,
- 	 * we have to use language rules to print it as
- 	 * a series of scalars.
- 	 */
-+#ifdef HAVE_AIF
-+	current_print_depth = 0;
-+#endif /* HAVE_AIF */
- 	value_print (val, stream, format, Val_pretty_default);
-+#ifdef HAVE_AIF
-+	}
-+#endif /* HAVE_AIF */
-       else
- 	/* User specified format, so don't look to the
- 	 * the type to tell us what to do.
---- gdb-5.2-old/gdb/typeprint.c	Wed Jul 10 12:46:37 2002
-+++ gdb-5.2/gdb/typeprint.c	Wed Sep 18 18:26:08 2002
-@@ -42,6 +42,11 @@
- 
- extern void _initialize_typeprint (void);
- 
-+#ifdef HAVE_AIF
-+extern int aifprint; /* print type using AIF */
-+extern void aif_type_print (struct type *, struct ui_file *);
-+#endif /* HAVE_AIF */
-+
- static void ptype_command (char *, int);
- 
- static struct type *ptype_eval (struct expression *);
-@@ -116,6 +121,13 @@
- type_print (struct type *type, char *varstring, struct ui_file *stream,
- 	    int show)
- {
-+#ifdef HAVE_AIF
-+  if (aifprint)
-+    {
-+        aif_type_print (type, stream);
-+        return;
-+    }
-+#endif /* HAVE_AIF */
-   LA_PRINT_TYPE (type, varstring, stream, show, 0);
- }
- 
---- gdb-5.2-old/gdb/valprint.c	Wed Jul 10 12:46:37 2002
-+++ gdb-5.2/gdb/valprint.c	Mon Jul 22 09:58:31 2002
-@@ -37,10 +37,21 @@
- 
- #include <errno.h>
- 
-+#ifdef HAVE_AIF
-+extern int aifprint; /* set by "set print aif" (Boolean) */
-+void aif_val_print (struct type *type, char *valaddr, int embedded_offset,
-+			CORE_ADDR address, struct ui_file *stream);
-+#endif /* HAVE_AIF */
-+
- /* Prototypes for local functions */
- 
-+#ifdef HAVE_AIF
-+int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
-+				int len, int *errnoptr);
-+#else /* HAVE_AIF */
- static int partial_memory_read (CORE_ADDR memaddr, char *myaddr,
- 				int len, int *errnoptr);
-+#endif /* HAVE_AIF */
- 
- static void print_hex_chars (struct ui_file *, unsigned char *,
- 			     unsigned int);
-@@ -103,6 +114,18 @@
- /* If nonzero, causes machine addresses to be printed in certain contexts. */
- 
- int addressprint;		/* Controls printing of machine addresses */
-+
-+#ifdef HAVE_AIF
-+/* If positive, causes pointers to be followed in printing, to given depth */
-+int max_print_depth;
-+int current_print_depth = 0; /* reset to 0 at each interrupt */
-+ 
-+/* If nonzero, causes types to be printed. */
-+int typeprint;
-+ 
-+/* If nonzero, causes types to be printed, if at all, in AIF format. */
-+int aifprint;
-+#endif /* HAVE_AIF */
- 
- 
- /* Print data of type TYPE located at VALADDR (within GDB), which came from
-@@ -149,6 +172,14 @@
-       return (0);
-     }
- 
-+#ifdef HAVE_AIF
-+  if (aifprint)
-+  {
-+    aif_val_print (type, valaddr, embedded_offset, address, stream);
-+    return 0; 
-+  }
-+#endif /* HAVE_AIF */
-+
-   return (LA_VAL_PRINT (type, valaddr, embedded_offset, address,
- 			stream, format, deref_ref, recurse, pretty));
- }
-@@ -1072,7 +1103,12 @@
- /* FIXME: cagney/1999-10-14: Only used by val_print_string.  Can this
-    function be eliminated.  */
- 
-+#ifdef HAVE_AIF
-+/* It is now used by aif_print_string as well. */
-+int
-+#else /* HAVE_AIF */
- static int
-+#endif /* HAVE_AIF */
- partial_memory_read (CORE_ADDR memaddr, char *myaddr, int len, int *errnoptr)
- {
-   int nread;			/* Number of bytes actually read. */
-@@ -1260,7 +1296,11 @@
-     {
-       if (addressprint)
- 	{
-+#ifdef HAVE_AIF
-+	  fputs_filtered ("=>", stream);
-+#else /* HAVE_AIF */
- 	  fputs_filtered (" ", stream);
-+#endif /* HAVE_AIF */
- 	}
-       LA_PRINT_STRING (stream, buffer, (bufptr - buffer) / width, width, force_ellipsis);
-     }
-@@ -1485,6 +1525,29 @@
- 		  &setprintlist),
-      &showprintlist);
- 
-+#ifdef HAVE_AIF
-+  add_show_from_set
-+    (add_set_cmd ("depth", class_support, var_uinteger,
-+		  (char *) &max_print_depth,
-+		  "Set depth of pointer recursion.",
-+		  &setprintlist),
-+      &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("type", class_support, var_boolean,
-+		  (char *) &typeprint,
-+		  "Set printing of types.",
-+		  &setprintlist),
-+      &showprintlist);
-+
-+  add_show_from_set
-+    (add_set_cmd ("aif", class_support, var_boolean,
-+		  (char *) &aifprint,
-+		  "Set printing of types to aif format.",
-+		  &setprintlist),
-+      &showprintlist);
-+#endif /* HAVE_AIF */
-+
-   c = add_set_cmd ("input-radix", class_support, var_uinteger,
- 		   (char *) &input_radix,
- 		   "Set default input radix for entering numbers.",
-@@ -1520,4 +1583,9 @@
-   unionprint = 1;
-   addressprint = 1;
-   print_max = PRINT_MAX_DEFAULT;
-+#ifdef HAVE_AIF
-+  max_print_depth = -1;
-+  typeprint = 0;
-+  aifprint = 0;
-+#endif /* HAVE_AIF */
- }
---- /dev/null	Fri Mar 23 22:00:33 2001
-+++ gdb-5.2/gdb/libaif.mk	Mon Jul 22 09:58:31 2002
-@@ -0,0 +1,9 @@
-+INCLUDE_CFLAGS += $(INCLUDE_aif)
-+
-+CLIBS += $(LIB_aif)
-+
-+SFILES     += aif-valprint.c
-+COMMON_OBS += aif-valprint.o
-+
-+aif-valprint.o: aif-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
-+	language.h $(symtab_h) valprint.h $(value_h)
---- gdb-5.2-old/gdb/configure.in	Wed Jul 10 12:46:35 2002
-+++ gdb-5.2/gdb/configure.in	Mon Jul 22 09:58:31 2002
-@@ -30,6 +30,95 @@
- AC_ISC_POSIX
- AM_PROG_CC_STDC
- 
-+AC_ARG_WITH(aif,
-+[  --with-aif=dir                use aif in dir])
-+AC_ARG_WITH(aif-lib,
-+[  --with-aif-lib=dir            use aif libraries in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-aif-lib])
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi])
-+AC_ARG_WITH(aif-include,
-+[  --with-aif-include=dir        use aif headers in dir],
-+[if test "$withval" = "yes" -o "$withval" = "no"; then
-+  AC_MSG_ERROR([No argument for --with-aif-include])
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi])
-+
-+AC_MSG_CHECKING(for aif)
-+
-+case "$with_aif" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_aif_include" = ""; then
-+		with_aif_include="$with_aif/include"
-+	fi
-+	if test "$with_aif_lib" = ""; then
-+		with_aif_lib="$with_aif/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='/usr/local'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_aif_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_aif_include $header_dirs";;
-+esac
-+case "$with_aif_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_aif_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	AC_TRY_COMPILE([#include <aif.h>],,ires=$i;break)
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i -laif $save_LIBS"
-+	AC_TRY_LINK([#include <aif.h>],,lres=$i;break)
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_aif" != "no"; then
-+	aif_includedir="$ires"
-+	aif_libdir="$lres"
-+	DIR_aif=
-+	INCLUDE_aif="-I$aif_includedir"
-+	LIB_aif="-L$aif_libdir -laif"
-+	AC_DEFINE_UNQUOTED(HAVE_AIF,1,[Define if you have the aif package.])
-+	with_aif=yes
-+	AC_MSG_RESULT([headers $ires, libraries $lres])
-+else
-+	DIR_aif="aif"
-+	INCLUDE_aif=
-+	LIB_aif=
-+	with_aif=no
-+	AC_MSG_RESULT($with_aif)
-+fi
-+AC_SUBST(DIR_aif)
-+AC_SUBST(INCLUDE_aif)
-+AC_SUBST(LIB_aif)
-+
-+if test "$with_aif" = "no"; then
-+        AC_MSG_ERROR([You must have libaif to compile this version of GDB.])
-+fi
-+AC_DEFINE(HAVE_AIF, 1, [Enable AIF support in in GDB.])dnl
-+
- AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
- AC_CANONICAL_SYSTEM
- 
---- gdb-5.2-old/gdb/configure	Wed Jul 10 12:46:35 2002
-+++ gdb-5.2/gdb/configure	Mon Jul 22 09:58:31 2002
-@@ -15,6 +15,12 @@
-   --enable-maintainer-mode enable make rules and dependencies not useful
-                           (and sometimes confusing) to the casual installer"
- ac_help="$ac_help
-+  --with-aif=dir                use aif in dir"
-+ac_help="$ac_help
-+  --with-aif-lib=dir            use aif libraries in dir"
-+ac_help="$ac_help
-+  --with-aif-include=dir        use aif headers in dir"
-+ac_help="$ac_help
-   --disable-nls           do not use Native Language Support"
- ac_help="$ac_help
-   --with-included-gettext use the GNU gettext library included here"
-@@ -79,7 +85,6 @@
- program_transform_name=s,x,x,
- silent=
- site=
--sitefile=
- srcdir=
- target=NONE
- verbose=
-@@ -194,7 +199,6 @@
-   --help                  print this message
-   --no-create             do not create output files
-   --quiet, --silent       do not print \`checking...' messages
--  --site-file=FILE        use FILE as the site file
-   --version               print the version of autoconf that created configure
- Directory and file names:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
-@@ -365,11 +369,6 @@
-   -site=* | --site=* | --sit=*)
-     site="$ac_optarg" ;;
- 
--  -site-file | --site-file | --site-fil | --site-fi | --site-f)
--    ac_prev=sitefile ;;
--  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
--    sitefile="$ac_optarg" ;;
--
-   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-     ac_prev=srcdir ;;
-   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-@@ -535,16 +534,12 @@
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
- 
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$sitefile"; then
--  if test -z "$CONFIG_SITE"; then
--    if test "x$prefix" != xNONE; then
--      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--    else
--      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--    fi
-+if test -z "$CONFIG_SITE"; then
-+  if test "x$prefix" != xNONE; then
-+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+  else
-+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-   fi
--else
--  CONFIG_SITE="$sitefile"
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
-@@ -585,7 +580,7 @@
- 
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
--echo "configure:589: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo "configure:584: checking whether to enable maintainer-specific portions of Makefiles" >&5
-     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-   enableval="$enable_maintainer_mode"
-@@ -611,7 +606,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:615: checking for $ac_word" >&5
-+echo "configure:610: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -641,7 +636,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:645: checking for $ac_word" >&5
-+echo "configure:640: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -692,7 +687,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:696: checking for $ac_word" >&5
-+echo "configure:691: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -724,7 +719,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -735,12 +730,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 739 "configure"
-+#line 734 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -766,12 +761,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:765: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:775: checking whether we are using GNU C" >&5
-+echo "configure:770: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -780,7 +775,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -799,7 +794,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:803: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:798: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -831,7 +826,7 @@
- fi
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:835: checking how to run the C preprocessor" >&5
-+echo "configure:830: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -846,13 +841,13 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 850 "configure"
-+#line 845 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -863,13 +858,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 867 "configure"
-+#line 862 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -880,13 +875,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 884 "configure"
-+#line 879 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -911,9 +906,9 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
--echo "configure:915: checking for AIX" >&5
-+echo "configure:910: checking for AIX" >&5
- cat > conftest.$ac_ext <<EOF
--#line 917 "configure"
-+#line 912 "configure"
- #include "confdefs.h"
- #ifdef _AIX
-   yes
-@@ -935,7 +930,7 @@
- 
- 
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:939: checking for POSIXized ISC" >&5
-+echo "configure:934: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
-   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -959,7 +954,7 @@
- 
- 
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:963: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "configure:958: checking for ${CC-cc} option to accept ANSI C" >&5
- if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -976,7 +971,7 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   cat > conftest.$ac_ext <<EOF
--#line 980 "configure"
-+#line 975 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -1013,7 +1008,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   am_cv_prog_cc_stdc="$ac_arg"; break
- else
-@@ -1037,6 +1032,141 @@
- esac
- 
- 
-+# Check whether --with-aif or --without-aif was given.
-+if test "${with_aif+set}" = set; then
-+  withval="$with_aif"
-+  :
-+fi
-+
-+# Check whether --with-aif-lib or --without-aif-lib was given.
-+if test "${with_aif_lib+set}" = set; then
-+  withval="$with_aif_lib"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { echo "configure: error: No argument for --with-aif-lib" 1>&2; exit 1; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi
-+
-+# Check whether --with-aif-include or --without-aif-include was given.
-+if test "${with_aif_include+set}" = set; then
-+  withval="$with_aif_include"
-+  if test "$withval" = "yes" -o "$withval" = "no"; then
-+  { echo "configure: error: No argument for --with-aif-include" 1>&2; exit 1; }
-+elif test "X$with_aif" = "X"; then
-+  with_aif=yes
-+fi
-+fi
-+
-+
-+echo $ac_n "checking for aif""... $ac_c" 1>&6
-+echo "configure:1064: checking for aif" >&5
-+
-+case "$with_aif" in
-+yes)	;;
-+no)	;;
-+"")	;;
-+*)	if test "$with_aif_include" = ""; then
-+		with_aif_include="$with_aif/include"
-+	fi
-+	if test "$with_aif_lib" = ""; then
-+		with_aif_lib="$with_aif/lib$abilibdirext"
-+	fi
-+	;;
-+esac
-+header_dirs=
-+lib_dirs=
-+d='/usr/local'
-+for i in $d /usr; do
-+	header_dirs="$header_dirs $i/include"
-+	lib_dirs="$lib_dirs $i/lib$abilibdirext"
-+done
-+
-+case "$with_aif_include" in
-+yes) ;;
-+no)  ;;
-+*)   header_dirs="$with_aif_include $header_dirs";;
-+esac
-+case "$with_aif_lib" in
-+yes) ;;
-+no)  ;;
-+*)   lib_dirs="$with_aif_lib $lib_dirs";;
-+esac
-+
-+save_CFLAGS="$CFLAGS"
-+save_LIBS="$LIBS"
-+ires= lres=
-+for i in $header_dirs; do
-+	CFLAGS="-I$i $save_CFLAGS"
-+	cat > conftest.$ac_ext <<EOF
-+#line 1103 "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ires=$i;break
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+done
-+for i in $lib_dirs; do
-+	LIBS="-L$i -laif $save_LIBS"
-+	cat > conftest.$ac_ext <<EOF
-+#line 1122 "configure"
-+#include "confdefs.h"
-+#include <aif.h>
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  lres=$i;break
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+done
-+CFLAGS="$save_CFLAGS"
-+LIBS="$save_LIBS"
-+
-+if test "$ires" -a "$lres" -a "$with_aif" != "no"; then
-+	aif_includedir="$ires"
-+	aif_libdir="$lres"
-+	DIR_aif=
-+	INCLUDE_aif="-I$aif_includedir"
-+	LIB_aif="-L$aif_libdir -laif"
-+	cat >> confdefs.h <<EOF
-+#define HAVE_AIF 1
-+EOF
-+
-+	with_aif=yes
-+	echo "$ac_t""headers $ires, libraries $lres" 1>&6
-+else
-+	DIR_aif="aif"
-+	INCLUDE_aif=
-+	LIB_aif=
-+	with_aif=no
-+	echo "$ac_t""$with_aif" 1>&6
-+fi
-+
-+
-+
-+
-+if test "$with_aif" = "no"; then
-+        { echo "configure: error: You must have libaif to compile this version of GDB." 1>&2; exit 1; }
-+fi
-+cat >> confdefs.h <<\EOF
-+#define HAVE_AIF 1
-+EOF
-+
- ac_aux_dir=
- for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
-   if test -f $ac_dir/install-sh; then
-@@ -1084,7 +1214,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:1088: checking host system type" >&5
-+echo "configure:1218: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -1105,7 +1235,7 @@
- echo "$ac_t""$host" 1>&6
- 
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:1109: checking target system type" >&5
-+echo "configure:1239: checking target system type" >&5
- 
- target_alias=$target
- case "$target_alias" in
-@@ -1123,7 +1253,7 @@
- echo "$ac_t""$target" 1>&6
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:1127: checking build system type" >&5
-+echo "configure:1257: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -1148,7 +1278,7 @@
- 
- ALL_LINGUAS=
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:1152: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:1282: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1177,7 +1307,7 @@
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1181: checking for $ac_word" >&5
-+echo "configure:1311: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1205,12 +1335,12 @@
- fi
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1209: checking for ANSI C header files" >&5
-+echo "configure:1339: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1214 "configure"
-+#line 1344 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1218,7 +1348,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1235,7 +1365,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1239 "configure"
-+#line 1369 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1253,7 +1383,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1257 "configure"
-+#line 1387 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1274,7 +1404,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1278 "configure"
-+#line 1408 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1285,7 +1415,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:1289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -1309,12 +1439,12 @@
- fi
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1313: checking for working const" >&5
-+echo "configure:1443: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1318 "configure"
-+#line 1448 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -1363,7 +1493,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -1384,21 +1514,21 @@
- fi
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:1388: checking for inline" >&5
-+echo "configure:1518: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 1395 "configure"
-+#line 1525 "configure"
- #include "confdefs.h"
- 
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:1402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -1424,12 +1554,12 @@
- esac
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:1428: checking for off_t" >&5
-+echo "configure:1558: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1433 "configure"
-+#line 1563 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1457,12 +1587,12 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1461: checking for size_t" >&5
-+echo "configure:1591: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1466 "configure"
-+#line 1596 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1492,19 +1622,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:1496: checking for working alloca.h" >&5
-+echo "configure:1626: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1501 "configure"
-+#line 1631 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -1525,12 +1655,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:1529: checking for alloca" >&5
-+echo "configure:1659: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1534 "configure"
-+#line 1664 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -1558,7 +1688,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:1562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -1590,12 +1720,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:1594: checking whether alloca needs Cray hooks" >&5
-+echo "configure:1724: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1599 "configure"
-+#line 1729 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -1620,12 +1750,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1624: checking for $ac_func" >&5
-+echo "configure:1754: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1629 "configure"
-+#line 1759 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1648,7 +1778,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1675,7 +1805,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:1679: checking stack direction for C alloca" >&5
-+echo "configure:1809: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1683,7 +1813,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1687 "configure"
-+#line 1817 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -1702,7 +1832,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -1727,17 +1857,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1731: checking for $ac_hdr" >&5
-+echo "configure:1861: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1736 "configure"
-+#line 1866 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -1766,12 +1896,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1770: checking for $ac_func" >&5
-+echo "configure:1900: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1775 "configure"
-+#line 1905 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -1794,7 +1924,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1819,7 +1949,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:1823: checking for working mmap" >&5
-+echo "configure:1953: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1827,7 +1957,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1831 "configure"
-+#line 1961 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -1967,7 +2097,7 @@
- }
- 
- EOF
--if { (eval echo configure:1971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -1995,17 +2125,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1999: checking for $ac_hdr" >&5
-+echo "configure:2129: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2004 "configure"
-+#line 2134 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2035,12 +2165,12 @@
- __argz_count __argz_stringify __argz_next
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2039: checking for $ac_func" >&5
-+echo "configure:2169: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2044 "configure"
-+#line 2174 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2063,7 +2193,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2092,12 +2222,12 @@
-      for ac_func in stpcpy
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2096: checking for $ac_func" >&5
-+echo "configure:2226: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2101 "configure"
-+#line 2231 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2120,7 +2250,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2154,19 +2284,19 @@
- 
-    if test $ac_cv_header_locale_h = yes; then
-     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
--echo "configure:2158: checking for LC_MESSAGES" >&5
-+echo "configure:2288: checking for LC_MESSAGES" >&5
- if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2163 "configure"
-+#line 2293 "configure"
- #include "confdefs.h"
- #include <locale.h>
- int main() {
- return LC_MESSAGES
- ; return 0; }
- EOF
--if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   am_cv_val_LC_MESSAGES=yes
- else
-@@ -2187,7 +2317,7 @@
-     fi
-   fi
-    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
--echo "configure:2191: checking whether NLS is requested" >&5
-+echo "configure:2321: checking whether NLS is requested" >&5
-         # Check whether --enable-nls or --disable-nls was given.
- if test "${enable_nls+set}" = set; then
-   enableval="$enable_nls"
-@@ -2207,7 +2337,7 @@
- EOF
- 
-       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
--echo "configure:2211: checking whether included gettext is requested" >&5
-+echo "configure:2341: checking whether included gettext is requested" >&5
-       # Check whether --with-included-gettext or --without-included-gettext was given.
- if test "${with_included_gettext+set}" = set; then
-   withval="$with_included_gettext"
-@@ -2226,17 +2356,17 @@
- 
- 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
--echo "configure:2230: checking for libintl.h" >&5
-+echo "configure:2360: checking for libintl.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2235 "configure"
-+#line 2365 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2253,19 +2383,19 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
--echo "configure:2257: checking for gettext in libc" >&5
-+echo "configure:2387: checking for gettext in libc" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2262 "configure"
-+#line 2392 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- int main() {
- return (int) gettext ("")
- ; return 0; }
- EOF
--if { (eval echo configure:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gt_cv_func_gettext_libc=yes
- else
-@@ -2281,7 +2411,7 @@
- 
- 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
- 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
--echo "configure:2285: checking for bindtextdomain in -lintl" >&5
-+echo "configure:2415: checking for bindtextdomain in -lintl" >&5
- ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2289,7 +2419,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lintl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2293 "configure"
-+#line 2423 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2300,7 +2430,7 @@
- bindtextdomain()
- ; return 0; }
- EOF
--if { (eval echo configure:2304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2316,19 +2446,19 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
--echo "configure:2320: checking for gettext in libintl" >&5
-+echo "configure:2450: checking for gettext in libintl" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2325 "configure"
-+#line 2455 "configure"
- #include "confdefs.h"
- 
- int main() {
- return (int) gettext ("")
- ; return 0; }
- EOF
--if { (eval echo configure:2332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   gt_cv_func_gettext_libintl=yes
- else
-@@ -2356,7 +2486,7 @@
- 	      # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2360: checking for $ac_word" >&5
-+echo "configure:2490: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2390,12 +2520,12 @@
- 		for ac_func in dcgettext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2394: checking for $ac_func" >&5
-+echo "configure:2524: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2399 "configure"
-+#line 2529 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2418,7 +2548,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2445,7 +2575,7 @@
- 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2449: checking for $ac_word" >&5
-+echo "configure:2579: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2481,7 +2611,7 @@
- 		# Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2485: checking for $ac_word" >&5
-+echo "configure:2615: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2513,7 +2643,7 @@
- fi
- 
- 		cat > conftest.$ac_ext <<EOF
--#line 2517 "configure"
-+#line 2647 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -2521,7 +2651,7 @@
- 			       return _nl_msg_cat_cntr
- ; return 0; }
- EOF
--if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   CATOBJEXT=.gmo
- 		   DATADIRNAME=share
-@@ -2553,7 +2683,7 @@
-         # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2557: checking for $ac_word" >&5
-+echo "configure:2687: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2587,7 +2717,7 @@
-         # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2591: checking for $ac_word" >&5
-+echo "configure:2721: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2623,7 +2753,7 @@
-         # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2627: checking for $ac_word" >&5
-+echo "configure:2757: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2713,7 +2843,7 @@
-        LINGUAS=
-      else
-        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
--echo "configure:2717: checking for catalogs to be installed" >&5
-+echo "configure:2847: checking for catalogs to be installed" >&5
-        NEW_LINGUAS=
-        for lang in ${LINGUAS=$ALL_LINGUAS}; do
-          case "$ALL_LINGUAS" in
-@@ -2741,17 +2871,17 @@
-       if test "$CATOBJEXT" = ".cat"; then
- 	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
--echo "configure:2745: checking for linux/version.h" >&5
-+echo "configure:2875: checking for linux/version.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2750 "configure"
-+#line 2880 "configure"
- #include "confdefs.h"
- #include <linux/version.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2869,12 +2999,12 @@
- 
- fi
- 
--for ac_prog in mawk gawk nawk awk
-+for ac_prog in gawk mawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2878: checking for $ac_word" >&5
-+echo "configure:3008: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2915,7 +3045,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:2919: checking for a BSD compatible install" >&5
-+echo "configure:3049: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2976,7 +3106,7 @@
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2980: checking for $ac_word" >&5
-+echo "configure:3110: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3008,7 +3138,7 @@
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3012: checking for $ac_word" >&5
-+echo "configure:3142: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3040,7 +3170,7 @@
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3044: checking for $ac_word" >&5
-+echo "configure:3174: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3075,7 +3205,7 @@
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3079: checking for $ac_word" >&5
-+echo "configure:3209: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3107,7 +3237,7 @@
- # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
- set dummy ${ac_tool_prefix}windres; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3111: checking for $ac_word" >&5
-+echo "configure:3241: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3141,7 +3271,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3145: checking for $ac_word" >&5
-+echo "configure:3275: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3175,7 +3305,7 @@
- # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args.
- set dummy ${ac_tool_prefix}mig; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3179: checking for $ac_word" >&5
-+echo "configure:3309: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3226,12 +3356,12 @@
- 
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:3230: checking return type of signal handlers" >&5
-+echo "configure:3360: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3235 "configure"
-+#line 3365 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -3248,7 +3378,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -3268,12 +3398,12 @@
- 
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:3272: checking for ANSI C header files" >&5
-+echo "configure:3402: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3277 "configure"
-+#line 3407 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -3281,7 +3411,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3298,7 +3428,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3302 "configure"
-+#line 3432 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -3316,7 +3446,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3320 "configure"
-+#line 3450 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3337,7 +3467,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3341 "configure"
-+#line 3471 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -3348,7 +3478,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:3352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -3392,17 +3522,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3396: checking for $ac_hdr" >&5
-+echo "configure:3526: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3401 "configure"
-+#line 3531 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3429,12 +3559,12 @@
- done
- 
- echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
--echo "configure:3433: checking whether stat file-mode macros are broken" >&5
-+echo "configure:3563: checking whether stat file-mode macros are broken" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3438 "configure"
-+#line 3568 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -3486,12 +3616,12 @@
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:3490: checking for working const" >&5
-+echo "configure:3620: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3495 "configure"
-+#line 3625 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3540,7 +3670,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -3565,12 +3695,12 @@
- 	realpath sbrk setpgid setpgrp sigaction sigprocmask sigsetmask 
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3569: checking for $ac_func" >&5
-+echo "configure:3699: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3574 "configure"
-+#line 3704 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3593,7 +3723,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3620,19 +3750,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:3624: checking for working alloca.h" >&5
-+echo "configure:3754: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3629 "configure"
-+#line 3759 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -3653,12 +3783,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:3657: checking for alloca" >&5
-+echo "configure:3787: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3662 "configure"
-+#line 3792 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -3686,7 +3816,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:3690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -3718,12 +3848,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:3722: checking whether alloca needs Cray hooks" >&5
-+echo "configure:3852: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3727 "configure"
-+#line 3857 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -3748,12 +3878,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3752: checking for $ac_func" >&5
-+echo "configure:3882: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3757 "configure"
-+#line 3887 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3776,7 +3906,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3803,7 +3933,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:3807: checking stack direction for C alloca" >&5
-+echo "configure:3937: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3811,7 +3941,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3815 "configure"
-+#line 3945 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -3830,7 +3960,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -3852,12 +3982,12 @@
- fi
- 
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:3856: checking for pid_t" >&5
-+echo "configure:3986: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3861 "configure"
-+#line 3991 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3886,17 +4016,17 @@
- 
- ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
--echo "configure:3890: checking for vfork.h" >&5
-+echo "configure:4020: checking for vfork.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3895 "configure"
-+#line 4025 "configure"
- #include "confdefs.h"
- #include <vfork.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3921,18 +4051,18 @@
- fi
- 
- echo $ac_n "checking for working vfork""... $ac_c" 1>&6
--echo "configure:3925: checking for working vfork" >&5
-+echo "configure:4055: checking for working vfork" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test "$cross_compiling" = yes; then
-   echo $ac_n "checking for vfork""... $ac_c" 1>&6
--echo "configure:3931: checking for vfork" >&5
-+echo "configure:4061: checking for vfork" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3936 "configure"
-+#line 4066 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char vfork(); below.  */
-@@ -3955,7 +4085,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_vfork=yes"
- else
-@@ -3977,7 +4107,7 @@
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3981 "configure"
-+#line 4111 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -4072,7 +4202,7 @@
-   }
- }
- EOF
--if { (eval echo configure:4076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_vfork_works=yes
- else
-@@ -4096,7 +4226,7 @@
- 
- if test "$cross_compiling" = no; then
-   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
--echo "configure:4100: checking whether setpgrp takes no argument" >&5
-+echo "configure:4230: checking whether setpgrp takes no argument" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4104,7 +4234,7 @@
-   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4108 "configure"
-+#line 4238 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_UNISTD_H
-@@ -4124,7 +4254,7 @@
- }
- 
- EOF
--if { (eval echo configure:4128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_setpgrp_void=no
- else
-@@ -4149,12 +4279,12 @@
- 
- else
-   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
--echo "configure:4153: checking whether setpgrp takes no argument" >&5
-+echo "configure:4283: checking whether setpgrp takes no argument" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4158 "configure"
-+#line 4288 "configure"
- #include "confdefs.h"
- 
- #include <unistd.h>
-@@ -4168,7 +4298,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_func_setpgrp_void=no
- else
-@@ -4192,12 +4322,12 @@
- # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do
- # since sigsetjmp might only be defined as a macro.
- echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
--echo "configure:4196: checking for sigsetjmp" >&5
-+echo "configure:4326: checking for sigsetjmp" >&5
- if eval "test \"`echo '$''{'gdb_cv_func_sigsetjmp'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4201 "configure"
-+#line 4331 "configure"
- #include "confdefs.h"
- 
- #include <setjmp.h>
-@@ -4206,7 +4336,7 @@
- sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);
- ; return 0; }
- EOF
--if { (eval echo configure:4210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_func_sigsetjmp=yes
- else
-@@ -4229,19 +4359,19 @@
- # See if <machine/reg.h> supports the %fs and %gs i386 segment registers.
- # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'.
- echo $ac_n "checking for r_fs in struct reg""... $ac_c" 1>&6
--echo "configure:4233: checking for r_fs in struct reg" >&5
-+echo "configure:4363: checking for r_fs in struct reg" >&5
- if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_fs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4238 "configure"
-+#line 4368 "configure"
- #include "confdefs.h"
- #include <machine/reg.h>
- int main() {
- struct reg r; r.r_fs;
- ; return 0; }
- EOF
--if { (eval echo configure:4245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_struct_reg_r_fs=yes
- else
-@@ -4261,19 +4391,19 @@
- 
- fi
- echo $ac_n "checking for r_gs in struct reg""... $ac_c" 1>&6
--echo "configure:4265: checking for r_gs in struct reg" >&5
-+echo "configure:4395: checking for r_gs in struct reg" >&5
- if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_gs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4270 "configure"
-+#line 4400 "configure"
- #include "confdefs.h"
- #include <machine/reg.h>
- int main() {
- struct reg r; r.r_gs;
- ; return 0; }
- EOF
--if { (eval echo configure:4277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_struct_reg_r_gs=yes
- else
-@@ -4295,19 +4425,19 @@
- 
- # See if <sys/ptrace.h> provides the PTRACE_GETREGS request.
- echo $ac_n "checking for PTRACE_GETREGS""... $ac_c" 1>&6
--echo "configure:4299: checking for PTRACE_GETREGS" >&5
-+echo "configure:4429: checking for PTRACE_GETREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4304 "configure"
-+#line 4434 "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
- int main() {
- PTRACE_GETREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_ptrace_getregs=yes
- else
-@@ -4329,19 +4459,19 @@
- 
- # See if <sys/ptrace.h> provides the PTRACE_GETFPXREGS request.
- echo $ac_n "checking for PTRACE_GETFPXREGS""... $ac_c" 1>&6
--echo "configure:4333: checking for PTRACE_GETFPXREGS" >&5
-+echo "configure:4463: checking for PTRACE_GETFPXREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getfpxregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4338 "configure"
-+#line 4468 "configure"
- #include "confdefs.h"
- #include <sys/ptrace.h>
- int main() {
- PTRACE_GETFPXREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_ptrace_getfpxregs=yes
- else
-@@ -4363,12 +4493,12 @@
- 
- # See if <sys/ptrace.h> provides the PT_GETDBREGS request.
- echo $ac_n "checking for PT_GETDBREGS""... $ac_c" 1>&6
--echo "configure:4367: checking for PT_GETDBREGS" >&5
-+echo "configure:4497: checking for PT_GETDBREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_pt_getdbregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4372 "configure"
-+#line 4502 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/ptrace.h>
-@@ -4376,7 +4506,7 @@
- PT_GETDBREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_pt_getdbregs=yes
- else
-@@ -4398,12 +4528,12 @@
- 
- # See if <sys/ptrace.h> provides the PT_GETXMMREGS request.
- echo $ac_n "checking for PT_GETXMMREGS""... $ac_c" 1>&6
--echo "configure:4402: checking for PT_GETXMMREGS" >&5
-+echo "configure:4532: checking for PT_GETXMMREGS" >&5
- if eval "test \"`echo '$''{'gdb_cv_have_pt_getxmmregs'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4407 "configure"
-+#line 4537 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/ptrace.h>
-@@ -4411,7 +4541,7 @@
- PT_GETXMMREGS;
- ; return 0; }
- EOF
--if { (eval echo configure:4415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_pt_getxmmregs=yes
- else
-@@ -4433,7 +4563,7 @@
- 
- 
- echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
--echo "configure:4437: checking for socketpair in -lsocket" >&5
-+echo "configure:4567: checking for socketpair in -lsocket" >&5
- ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4441,7 +4571,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4445 "configure"
-+#line 4575 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4452,7 +4582,7 @@
- socketpair()
- ; return 0; }
- EOF
--if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4482,12 +4612,12 @@
- for ac_func in socketpair
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4486: checking for $ac_func" >&5
-+echo "configure:4616: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4491 "configure"
-+#line 4621 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -4510,7 +4640,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4537,12 +4667,12 @@
- 
- 
- echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6
--echo "configure:4541: checking whether malloc must be declared" >&5
-+echo "configure:4671: checking whether malloc must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4546 "configure"
-+#line 4676 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4563,7 +4693,7 @@
- char *(*pfn) = (char *(*)) malloc
- ; return 0; }
- EOF
--if { (eval echo configure:4567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_malloc=no
- else
-@@ -4584,12 +4714,12 @@
- fi
- 
- echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6
--echo "configure:4588: checking whether realloc must be declared" >&5
-+echo "configure:4718: checking whether realloc must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4593 "configure"
-+#line 4723 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4610,7 +4740,7 @@
- char *(*pfn) = (char *(*)) realloc
- ; return 0; }
- EOF
--if { (eval echo configure:4614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_realloc=no
- else
-@@ -4631,12 +4761,12 @@
- fi
- 
- echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6
--echo "configure:4635: checking whether free must be declared" >&5
-+echo "configure:4765: checking whether free must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4640 "configure"
-+#line 4770 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4657,7 +4787,7 @@
- char *(*pfn) = (char *(*)) free
- ; return 0; }
- EOF
--if { (eval echo configure:4661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_free=no
- else
-@@ -4678,12 +4808,12 @@
- fi
- 
- echo $ac_n "checking whether strerror must be declared""... $ac_c" 1>&6
--echo "configure:4682: checking whether strerror must be declared" >&5
-+echo "configure:4812: checking whether strerror must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strerror'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4687 "configure"
-+#line 4817 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4704,7 +4834,7 @@
- char *(*pfn) = (char *(*)) strerror
- ; return 0; }
- EOF
--if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strerror=no
- else
-@@ -4725,12 +4855,12 @@
- fi
- 
- echo $ac_n "checking whether strdup must be declared""... $ac_c" 1>&6
--echo "configure:4729: checking whether strdup must be declared" >&5
-+echo "configure:4859: checking whether strdup must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strdup'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4734 "configure"
-+#line 4864 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4751,7 +4881,7 @@
- char *(*pfn) = (char *(*)) strdup
- ; return 0; }
- EOF
--if { (eval echo configure:4755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strdup=no
- else
-@@ -4772,12 +4902,12 @@
- fi
- 
- echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6
--echo "configure:4776: checking whether strstr must be declared" >&5
-+echo "configure:4906: checking whether strstr must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4781 "configure"
-+#line 4911 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4798,7 +4928,7 @@
- char *(*pfn) = (char *(*)) strstr
- ; return 0; }
- EOF
--if { (eval echo configure:4802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_strstr=no
- else
-@@ -4819,12 +4949,12 @@
- fi
- 
- echo $ac_n "checking whether canonicalize_file_name must be declared""... $ac_c" 1>&6
--echo "configure:4823: checking whether canonicalize_file_name must be declared" >&5
-+echo "configure:4953: checking whether canonicalize_file_name must be declared" >&5
- if eval "test \"`echo '$''{'bfd_cv_decl_needed_canonicalize_file_name'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4828 "configure"
-+#line 4958 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -4845,7 +4975,7 @@
- char *(*pfn) = (char *(*)) canonicalize_file_name
- ; return 0; }
- EOF
--if { (eval echo configure:4849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_decl_needed_canonicalize_file_name=no
- else
-@@ -4872,9 +5002,9 @@
- # could be expunged. --jsm 1999-03-22
- 
- echo $ac_n "checking for HPUX save_state structure""... $ac_c" 1>&6
--echo "configure:4876: checking for HPUX save_state structure" >&5
-+echo "configure:5006: checking for HPUX save_state structure" >&5
- cat > conftest.$ac_ext <<EOF
--#line 4878 "configure"
-+#line 5008 "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- EOF
-@@ -4889,7 +5019,7 @@
- rm -f conftest*
- 
- cat > conftest.$ac_ext <<EOF
--#line 4893 "configure"
-+#line 5023 "configure"
- #include "confdefs.h"
- #include <machine/save_state.h>
- EOF
-@@ -4959,12 +5089,12 @@
- 
- if test "$ac_cv_header_sys_procfs_h" = yes; then
-   echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4963: checking for pstatus_t in sys/procfs.h" >&5
-+echo "configure:5093: checking for pstatus_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4968 "configure"
-+#line 5098 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -4973,7 +5103,7 @@
- pstatus_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:4977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pstatus_t=yes
- else
-@@ -4995,12 +5125,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6
- 
-   echo $ac_n "checking for prrun_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:4999: checking for prrun_t in sys/procfs.h" >&5
-+echo "configure:5129: checking for prrun_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prrun_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5004 "configure"
-+#line 5134 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5009,7 +5139,7 @@
- prrun_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prrun_t=yes
- else
-@@ -5031,12 +5161,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prrun_t" 1>&6
- 
-   echo $ac_n "checking for gregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5035: checking for gregset_t in sys/procfs.h" >&5
-+echo "configure:5165: checking for gregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_gregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5040 "configure"
-+#line 5170 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5045,7 +5175,7 @@
- gregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_gregset_t=yes
- else
-@@ -5067,12 +5197,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_gregset_t" 1>&6
- 
-   echo $ac_n "checking for fpregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5071: checking for fpregset_t in sys/procfs.h" >&5
-+echo "configure:5201: checking for fpregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_fpregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5076 "configure"
-+#line 5206 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5081,7 +5211,7 @@
- fpregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_fpregset_t=yes
- else
-@@ -5103,12 +5233,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_fpregset_t" 1>&6
- 
-   echo $ac_n "checking for prgregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5107: checking for prgregset_t in sys/procfs.h" >&5
-+echo "configure:5237: checking for prgregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5112 "configure"
-+#line 5242 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5117,7 +5247,7 @@
- prgregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prgregset_t=yes
- else
-@@ -5139,12 +5269,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset_t" 1>&6
- 
-   echo $ac_n "checking for prfpregset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5143: checking for prfpregset_t in sys/procfs.h" >&5
-+echo "configure:5273: checking for prfpregset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5148 "configure"
-+#line 5278 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5153,7 +5283,7 @@
- prfpregset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prfpregset_t=yes
- else
-@@ -5175,12 +5305,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset_t" 1>&6
- 
-   echo $ac_n "checking for prgregset32_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5179: checking for prgregset32_t in sys/procfs.h" >&5
-+echo "configure:5309: checking for prgregset32_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset32_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5184 "configure"
-+#line 5314 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5189,7 +5319,7 @@
- prgregset32_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prgregset32_t=yes
- else
-@@ -5211,12 +5341,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset32_t" 1>&6
- 
-   echo $ac_n "checking for prfpregset32_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5215: checking for prfpregset32_t in sys/procfs.h" >&5
-+echo "configure:5345: checking for prfpregset32_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset32_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5220 "configure"
-+#line 5350 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5225,7 +5355,7 @@
- prfpregset32_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prfpregset32_t=yes
- else
-@@ -5247,12 +5377,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset32_t" 1>&6
- 
-   echo $ac_n "checking for lwpid_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5251: checking for lwpid_t in sys/procfs.h" >&5
-+echo "configure:5381: checking for lwpid_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpid_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5256 "configure"
-+#line 5386 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5261,7 +5391,7 @@
- lwpid_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_lwpid_t=yes
- else
-@@ -5283,12 +5413,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpid_t" 1>&6
- 
-   echo $ac_n "checking for psaddr_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5287: checking for psaddr_t in sys/procfs.h" >&5
-+echo "configure:5417: checking for psaddr_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psaddr_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5292 "configure"
-+#line 5422 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5297,7 +5427,7 @@
- psaddr_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_psaddr_t=yes
- else
-@@ -5319,12 +5449,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_psaddr_t" 1>&6
- 
-   echo $ac_n "checking for prsysent_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5323: checking for prsysent_t in sys/procfs.h" >&5
-+echo "configure:5453: checking for prsysent_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prsysent_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5328 "configure"
-+#line 5458 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5333,7 +5463,7 @@
- prsysent_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_prsysent_t=yes
- else
-@@ -5355,12 +5485,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prsysent_t" 1>&6
- 
-   echo $ac_n "checking for pr_sigset_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5359: checking for pr_sigset_t in sys/procfs.h" >&5
-+echo "configure:5489: checking for pr_sigset_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigset_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5364 "configure"
-+#line 5494 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5369,7 +5499,7 @@
- pr_sigset_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pr_sigset_t=yes
- else
-@@ -5391,12 +5521,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigset_t" 1>&6
- 
-   echo $ac_n "checking for pr_sigaction64_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5395: checking for pr_sigaction64_t in sys/procfs.h" >&5
-+echo "configure:5525: checking for pr_sigaction64_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigaction64_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5400 "configure"
-+#line 5530 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5405,7 +5535,7 @@
- pr_sigaction64_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes
- else
-@@ -5427,12 +5557,12 @@
-  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" 1>&6
- 
-   echo $ac_n "checking for pr_siginfo64_t in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5431: checking for pr_siginfo64_t in sys/procfs.h" >&5
-+echo "configure:5561: checking for pr_siginfo64_t in sys/procfs.h" >&5
-  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_siginfo64_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5436 "configure"
-+#line 5566 "configure"
- #include "confdefs.h"
- 
- #define _SYSCALL32
-@@ -5441,7 +5571,7 @@
- pr_siginfo64_t avar
- ; return 0; }
- EOF
--if { (eval echo configure:5445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes
- else
-@@ -5468,7 +5598,7 @@
-         
-   if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
-     echo $ac_n "checking whether prfpregset_t type is broken""... $ac_c" 1>&6
--echo "configure:5472: checking whether prfpregset_t type is broken" >&5
-+echo "configure:5602: checking whether prfpregset_t type is broken" >&5
-     if eval "test \"`echo '$''{'gdb_cv_prfpregset_t_broken'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5476,7 +5606,7 @@
-   gdb_cv_prfpregset_t_broken=yes
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5480 "configure"
-+#line 5610 "configure"
- #include "confdefs.h"
- #include <sys/procfs.h>
-        int main ()
-@@ -5486,7 +5616,7 @@
-          return 0;
-        }
- EOF
--if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_prfpregset_t_broken=no
- else
-@@ -5511,12 +5641,12 @@
- 
-   
-   echo $ac_n "checking for PIOCSET ioctl entry in sys/procfs.h""... $ac_c" 1>&6
--echo "configure:5515: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
-+echo "configure:5645: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_procfs_piocset'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5520 "configure"
-+#line 5650 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- #include <sys/types.h>
-@@ -5529,7 +5659,7 @@
-   
- ; return 0; }
- EOF
--if { (eval echo configure:5533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_procfs_piocset=yes
- else
-@@ -5553,19 +5683,19 @@
- if test ${host} = ${target} ; then
-     
-   echo $ac_n "checking for member l_addr in struct link_map""... $ac_c" 1>&6
--echo "configure:5557: checking for member l_addr in struct link_map" >&5
-+echo "configure:5687: checking for member l_addr in struct link_map" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_l_members'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5562 "configure"
-+#line 5692 "configure"
- #include "confdefs.h"
- #include <link.h>
- int main() {
- struct link_map lm; (void) lm.l_addr;
- ; return 0; }
- EOF
--if { (eval echo configure:5569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_link_map_with_l_members=yes
- else
-@@ -5587,12 +5717,12 @@
- 
-     
-   echo $ac_n "checking for member lm_addr in struct link_map""... $ac_c" 1>&6
--echo "configure:5591: checking for member lm_addr in struct link_map" >&5
-+echo "configure:5721: checking for member lm_addr in struct link_map" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_lm_members'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5596 "configure"
-+#line 5726 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <link.h>
-@@ -5600,7 +5730,7 @@
- struct link_map lm; (void) lm.lm_addr;
- ; return 0; }
- EOF
--if { (eval echo configure:5604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_link_map_with_lm_members=yes
- else
-@@ -5622,12 +5752,12 @@
- 
-     
-   echo $ac_n "checking for member som_addr in struct so_map""... $ac_c" 1>&6
--echo "configure:5626: checking for member som_addr in struct so_map" >&5
-+echo "configure:5756: checking for member som_addr in struct so_map" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_so_map_with_som_members'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5631 "configure"
-+#line 5761 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_NLIST_H
-@@ -5638,7 +5768,7 @@
- struct so_map lm; (void) lm.som_addr;
- ; return 0; }
- EOF
--if { (eval echo configure:5642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_so_map_with_som_members=yes
- else
-@@ -5660,12 +5790,12 @@
- 
-     
-   echo $ac_n "checking for struct link_map32 in sys/link.h""... $ac_c" 1>&6
--echo "configure:5664: checking for struct link_map32 in sys/link.h" >&5
-+echo "configure:5794: checking for struct link_map32 in sys/link.h" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map32'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5669 "configure"
-+#line 5799 "configure"
- #include "confdefs.h"
- #define _SYSCALL32
- #include <sys/link.h>
-@@ -5673,7 +5803,7 @@
- struct link_map32 l;
- ; return 0; }
- EOF
--if { (eval echo configure:5677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_struct_link_map32=yes
- else
-@@ -5695,7 +5825,7 @@
- fi
- 
- echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
--echo "configure:5699: checking for main in -lm" >&5
-+echo "configure:5829: checking for main in -lm" >&5
- ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5703,14 +5833,14 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5707 "configure"
-+#line 5837 "configure"
- #include "confdefs.h"
- 
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:5714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5739,7 +5869,7 @@
- 
- 
- echo $ac_n "checking for wctype in -lc""... $ac_c" 1>&6
--echo "configure:5743: checking for wctype in -lc" >&5
-+echo "configure:5873: checking for wctype in -lc" >&5
- ac_lib_var=`echo c'_'wctype | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5747,7 +5877,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5751 "configure"
-+#line 5881 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5758,7 +5888,7 @@
- wctype()
- ; return 0; }
- EOF
--if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5777,7 +5907,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6
--echo "configure:5781: checking for wctype in -lw" >&5
-+echo "configure:5911: checking for wctype in -lw" >&5
- ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5785,7 +5915,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lw  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5789 "configure"
-+#line 5919 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5796,7 +5926,7 @@
- wctype()
- ; return 0; }
- EOF
--if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5828,12 +5958,12 @@
- 
- 
- echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6
--echo "configure:5832: checking for long long support in compiler" >&5
-+echo "configure:5962: checking for long long support in compiler" >&5
- if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5837 "configure"
-+#line 5967 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -5843,7 +5973,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_c_long_long=yes
- else
-@@ -5865,7 +5995,7 @@
- 
- 
- echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6
--echo "configure:5869: checking for long long support in printf" >&5
-+echo "configure:5999: checking for long long support in printf" >&5
- if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5873,7 +6003,7 @@
-   gdb_cv_printf_has_long_long=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5877 "configure"
-+#line 6007 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -5887,7 +6017,7 @@
-   return (strcmp ("0x0123456789abcdef", buf));
- }
- EOF
--if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_printf_has_long_long=yes
- else
-@@ -5911,19 +6041,19 @@
- 
- 
- echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6
--echo "configure:5915: checking for long double support in compiler" >&5
-+echo "configure:6045: checking for long double support in compiler" >&5
- if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5920 "configure"
-+#line 6050 "configure"
- #include "confdefs.h"
- 
- int main() {
- long double foo;
- ; return 0; }
- EOF
--if { (eval echo configure:5927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_long_double=yes
- else
-@@ -5945,7 +6075,7 @@
- 
- 
- echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6
--echo "configure:5949: checking for long double support in printf" >&5
-+echo "configure:6079: checking for long double support in printf" >&5
- if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5953,7 +6083,7 @@
-   gdb_cv_printf_has_long_double=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5957 "configure"
-+#line 6087 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -5963,7 +6093,7 @@
-   return (strncmp ("3.14159", buf, 7));
- }
- EOF
--if { (eval echo configure:5967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_printf_has_long_double=yes
- else
-@@ -5987,7 +6117,7 @@
- 
- 
- echo $ac_n "checking for long double support in scanf""... $ac_c" 1>&6
--echo "configure:5991: checking for long double support in scanf" >&5
-+echo "configure:6121: checking for long double support in scanf" >&5
- if eval "test \"`echo '$''{'gdb_cv_scanf_has_long_double'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5995,7 +6125,7 @@
-   gdb_cv_scanf_has_long_double=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5999 "configure"
-+#line 6129 "configure"
- #include "confdefs.h"
- 
- int main () {
-@@ -6005,7 +6135,7 @@
-   return !(f > 3.14159 && f < 3.14160);
- }
- EOF
--if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   gdb_cv_scanf_has_long_double=yes
- else
-@@ -6031,17 +6161,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6035: checking for $ac_hdr" >&5
-+echo "configure:6165: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6040 "configure"
-+#line 6170 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6070,12 +6200,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6074: checking for $ac_func" >&5
-+echo "configure:6204: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6079 "configure"
-+#line 6209 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6098,7 +6228,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6123,7 +6253,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:6127: checking for working mmap" >&5
-+echo "configure:6257: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6131,7 +6261,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6135 "configure"
-+#line 6265 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -6271,7 +6401,7 @@
- }
- 
- EOF
--if { (eval echo configure:6275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -6297,7 +6427,7 @@
- case ${host_os} in
- aix*)
-   echo $ac_n "checking for -bbigtoc option""... $ac_c" 1>&6
--echo "configure:6301: checking for -bbigtoc option" >&5
-+echo "configure:6431: checking for -bbigtoc option" >&5
- if eval "test \"`echo '$''{'gdb_cv_bigtoc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6311,14 +6441,14 @@
- 
-     LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
-     cat > conftest.$ac_ext <<EOF
--#line 6315 "configure"
-+#line 6445 "configure"
- #include "confdefs.h"
- 
- int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:6322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -6341,7 +6471,7 @@
-    case ${host_os} in
-    hpux*)
-       echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6
--echo "configure:6345: checking for HPUX/OSF thread support" >&5
-+echo "configure:6475: checking for HPUX/OSF thread support" >&5
-       if test -f /usr/include/dce/cma_config.h ; then
-          if test "$GCC" = "yes" ; then
-             echo "$ac_t""yes" 1>&6
-@@ -6360,7 +6490,7 @@
-       ;;
-    solaris*)
-       echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6
--echo "configure:6364: checking for Solaris thread debugging library" >&5
-+echo "configure:6494: checking for Solaris thread debugging library" >&5
-       if test -f /usr/lib/libthread_db.so.1 ; then
-          echo "$ac_t""yes" 1>&6
-          cat >> confdefs.h <<\EOF
-@@ -6370,7 +6500,7 @@
-          CONFIG_LIB_OBS="${CONFIG_LIB_OBS} sol-thread.o"
-          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
-          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:6374: checking for dlopen in -ldl" >&5
-+echo "configure:6504: checking for dlopen in -ldl" >&5
- ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6378,7 +6508,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6382 "configure"
-+#line 6512 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6389,7 +6519,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:6393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6421,17 +6551,17 @@
-             # all symbols visible in the dynamic symbol table.
-             hold_ldflags=$LDFLAGS
-             echo $ac_n "checking for the ld -export-dynamic flag""... $ac_c" 1>&6
--echo "configure:6425: checking for the ld -export-dynamic flag" >&5
-+echo "configure:6555: checking for the ld -export-dynamic flag" >&5
-             LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
-             cat > conftest.$ac_ext <<EOF
--#line 6428 "configure"
-+#line 6558 "configure"
- #include "confdefs.h"
- 
- int main() {
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:6435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   found=yes
- else
-@@ -6450,13 +6580,13 @@
- 	 # Sun randomly tweaked the prototypes in <proc_service.h>
- 	 # at one point.
- 	 echo $ac_n "checking if <proc_service.h> is old""... $ac_c" 1>&6
--echo "configure:6454: checking if <proc_service.h> is old" >&5
-+echo "configure:6584: checking if <proc_service.h> is old" >&5
- 	 if eval "test \"`echo '$''{'gdb_cv_proc_service_is_old'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 	    cat > conftest.$ac_ext <<EOF
--#line 6460 "configure"
-+#line 6590 "configure"
- #include "confdefs.h"
- 
- 		#include <proc_service.h>
-@@ -6467,7 +6597,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_proc_service_is_old=no
- else
-@@ -6686,7 +6816,7 @@
- if test "x${build_warnings}" != x -a "x$GCC" = xyes
- then
-     echo $ac_n "checking compiler warning flags""... $ac_c" 1>&6
--echo "configure:6690: checking compiler warning flags" >&5
-+echo "configure:6820: checking compiler warning flags" >&5
-     # Separate out the -Werror flag as some files just cannot be
-     # compiled with it enabled.
-     for w in ${build_warnings}; do
-@@ -6696,14 +6826,14 @@
- 	    saved_CFLAGS="$CFLAGS"
- 	    CFLAGS="$CFLAGS $w"
- 	    cat > conftest.$ac_ext <<EOF
--#line 6700 "configure"
-+#line 6830 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   WARN_CFLAGS="${WARN_CFLAGS} $w"
- else
-@@ -6763,12 +6893,12 @@
- 
- if test $want_included_regex = false; then
-   echo $ac_n "checking for GNU regex""... $ac_c" 1>&6
--echo "configure:6767: checking for GNU regex" >&5
-+echo "configure:6897: checking for GNU regex" >&5
-   if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6772 "configure"
-+#line 6902 "configure"
- #include "confdefs.h"
- #include <gnu-versions.h>
- #include <sys/types.h>
-@@ -6780,7 +6910,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gdb_cv_have_gnu_regex=yes
- else
-@@ -6809,12 +6939,12 @@
- 
- # In the Cygwin environment, we need some additional flags.
- echo $ac_n "checking for cygwin""... $ac_c" 1>&6
--echo "configure:6813: checking for cygwin" >&5
-+echo "configure:6943: checking for cygwin" >&5
- if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6818 "configure"
-+#line 6948 "configure"
- #include "confdefs.h"
- 
- #if defined (__CYGWIN__) || defined (__CYGWIN32__)
-@@ -6852,7 +6982,7 @@
- else
-   TERM_LIB=
-   echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
--echo "configure:6856: checking for tgetent in -lncurses" >&5
-+echo "configure:6986: checking for tgetent in -lncurses" >&5
- ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6860,7 +6990,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lncurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6864 "configure"
-+#line 6994 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6871,7 +7001,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6890,7 +7020,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lHcurses""... $ac_c" 1>&6
--echo "configure:6894: checking for tgetent in -lHcurses" >&5
-+echo "configure:7024: checking for tgetent in -lHcurses" >&5
- ac_lib_var=`echo Hcurses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6898,7 +7028,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lHcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6902 "configure"
-+#line 7032 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6909,7 +7039,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6928,7 +7058,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6
--echo "configure:6932: checking for tgetent in -ltermlib" >&5
-+echo "configure:7062: checking for tgetent in -ltermlib" >&5
- ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6936,7 +7066,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ltermlib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6940 "configure"
-+#line 7070 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6947,7 +7077,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6966,7 +7096,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
--echo "configure:6970: checking for tgetent in -ltermcap" >&5
-+echo "configure:7100: checking for tgetent in -ltermcap" >&5
- ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6974,7 +7104,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ltermcap  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6978 "configure"
-+#line 7108 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6985,7 +7115,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:6989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7004,7 +7134,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
--echo "configure:7008: checking for tgetent in -lcurses" >&5
-+echo "configure:7138: checking for tgetent in -lcurses" >&5
- ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7012,7 +7142,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7016 "configure"
-+#line 7146 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7023,7 +7153,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:7027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7042,7 +7172,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetent in -lterminfo""... $ac_c" 1>&6
--echo "configure:7046: checking for tgetent in -lterminfo" >&5
-+echo "configure:7176: checking for tgetent in -lterminfo" >&5
- ac_lib_var=`echo terminfo'_'tgetent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7050,7 +7180,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lterminfo  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 7054 "configure"
-+#line 7184 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -7061,7 +7191,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -7226,7 +7356,7 @@
- fi
- 
-   echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
--echo "configure:7230: checking for Tcl configuration" >&5
-+echo "configure:7360: checking for Tcl configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7334,7 +7464,7 @@
- fi
- 
-   echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
--echo "configure:7338: checking for Tk configuration" >&5
-+echo "configure:7468: checking for Tk configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7443,7 +7573,7 @@
- 
- no_tcl=true
- echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6
--echo "configure:7447: checking for Tcl private headers. dir=${configdir}" >&5
-+echo "configure:7577: checking for Tcl private headers. dir=${configdir}" >&5
- # Check whether --with-tclinclude or --without-tclinclude was given.
- if test "${with_tclinclude+set}" = set; then
-   withval="$with_tclinclude"
-@@ -7509,17 +7639,17 @@
- if test x"${ac_cv_c_tclh}" = x ; then
-    ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
--echo "configure:7513: checking for tclInt.h" >&5
-+echo "configure:7643: checking for tclInt.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7518 "configure"
-+#line 7648 "configure"
- #include "confdefs.h"
- #include <tclInt.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7579,7 +7709,7 @@
- #
- no_tk=true
- echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6
--echo "configure:7583: checking for Tk private headers" >&5
-+echo "configure:7713: checking for Tk private headers" >&5
- # Check whether --with-tkinclude or --without-tkinclude was given.
- if test "${with_tkinclude+set}" = set; then
-   withval="$with_tkinclude"
-@@ -7645,17 +7775,17 @@
- if test x"${ac_cv_c_tkh}" = x ; then
-    ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for tk.h""... $ac_c" 1>&6
--echo "configure:7649: checking for tk.h" >&5
-+echo "configure:7779: checking for tk.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 7654 "configure"
-+#line 7784 "configure"
- #include "confdefs.h"
- #include <tk.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -7701,7 +7831,7 @@
- 
- 	   
- echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:7705: checking for Itcl private headers. srcdir=${srcdir}" >&5
-+echo "configure:7835: checking for Itcl private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_itclh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
-     if test -f $i/generic/itcl.h ; then
-@@ -7724,7 +7854,7 @@
- 
- 	   
- echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:7728: checking for Itk private headers. srcdir=${srcdir}" >&5
-+echo "configure:7858: checking for Itk private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_itkh}" = x ; then
-   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do
-     if test -f $i/generic/itk.h ; then
-@@ -7747,7 +7877,7 @@
- 
- 	   
- echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6
--echo "configure:7751: checking for Tix private headers. srcdir=${srcdir}" >&5
-+echo "configure:7881: checking for Tix private headers. srcdir=${srcdir}" >&5
- if test x"${ac_cv_c_tixh}" = x ; then
-   for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do
-     if test -f $i/generic/tix.h ; then
-@@ -7799,7 +7929,7 @@
- fi
- 
-   echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6
--echo "configure:7803: checking for Itcl configuration" >&5
-+echo "configure:7933: checking for Itcl configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -7902,7 +8032,7 @@
- fi
- 
-   echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6
--echo "configure:7906: checking for Itk configuration" >&5
-+echo "configure:8036: checking for Itk configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8005,7 +8135,7 @@
- fi
- 
-   echo $ac_n "checking for Tix configuration""... $ac_c" 1>&6
--echo "configure:8009: checking for Tix configuration" >&5
-+echo "configure:8139: checking for Tix configuration" >&5
-   if eval "test \"`echo '$''{'ac_cv_c_tixconfig'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8148,7 +8278,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:8152: checking for X" >&5
-+echo "configure:8282: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
- if test "${with_x+set}" = set; then
-@@ -8210,12 +8340,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 8214 "configure"
-+#line 8344 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:8219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:8349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -8284,14 +8414,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 8288 "configure"
-+#line 8418 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:8425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -8584,7 +8714,7 @@
- # ``gdbserver'' can only be built in a native configuration.
- if test x"${target}" = x"${host}"; then
-     echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6
--echo "configure:8588: checking whether gdbserver is supported on this host" >&5
-+echo "configure:8718: checking whether gdbserver is supported on this host" >&5
-     if test x"${build_gdbserver}" = xyes ; then
- 	configdirs="${configdirs} gdbserver"
- 	SUBDIRS="${SUBDIRS} gdbserver"
-@@ -8646,7 +8776,7 @@
- 
- 
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:8650: checking whether ln -s works" >&5
-+echo "configure:8780: checking whether ln -s works" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8670,12 +8800,12 @@
- 
- 
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
--echo "configure:8674: checking for Cygwin environment" >&5
-+echo "configure:8804: checking for Cygwin environment" >&5
- if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8679 "configure"
-+#line 8809 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -8686,7 +8816,7 @@
- return __CYGWIN__;
- ; return 0; }
- EOF
--if { (eval echo configure:8690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_cygwin=yes
- else
-@@ -8703,19 +8833,19 @@
- CYGWIN=
- test "$ac_cv_cygwin" = yes && CYGWIN=yes
- echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:8707: checking for mingw32 environment" >&5
-+echo "configure:8837: checking for mingw32 environment" >&5
- if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 8712 "configure"
-+#line 8842 "configure"
- #include "confdefs.h"
- 
- int main() {
- return __MINGW32__;
- ; return 0; }
- EOF
--if { (eval echo configure:8719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_mingw32=yes
- else
-@@ -8734,7 +8864,7 @@
- 
- 
- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:8738: checking for executable suffix" >&5
-+echo "configure:8868: checking for executable suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -8744,10 +8874,10 @@
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_exeext=
--  if { (eval echo configure:8748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+  if { (eval echo configure:8878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-     for file in conftest.*; do
-       case $file in
--      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+      *.c | *.o | *.obj) ;;
-       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-       esac
-     done
-@@ -8905,6 +9035,9 @@
- s%@MAINT@%$MAINT%g
- s%@CC@%$CC%g
- s%@CPP@%$CPP%g
-+s%@DIR_aif@%$DIR_aif%g
-+s%@INCLUDE_aif@%$INCLUDE_aif%g
-+s%@LIB_aif@%$LIB_aif%g
- s%@host@%$host%g
- s%@host_alias@%$host_alias%g
- s%@host_cpu@%$host_cpu%g
---- gdb-5.2-old/gdb/config.in	Wed Jul 10 12:46:35 2002
-+++ gdb-5.2/gdb/config.in	Mon Jul 22 09:58:31 2002
-@@ -499,3 +499,5 @@
- /* Define if <sys/procfs.h> has pr_siginfo64_t. */
- #undef HAVE_PR_SIGINFO64_T
- 
-+/* Define for AIF support. */
-+#undef HAVE_AIF

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/print.c b/debug/org.eclipse.ptp.debug.sdm/libaif/print.c
deleted file mode 100644
index 330fa72..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/print.c
+++ /dev/null

@@ -1,686 +0,0 @@
-/*
- * Routines to print AIF objects.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<string.h>
-
-#include	"aif.h"
-#include	"aifint.h"
-#include	"aiferr.h"
-
-int
-AIFPrint(FILE *fp, int depth, AIF *a)
-{
-        char *  fmt;
-        char *  data;
-
-        if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-        fmt = AIF_FORMAT(a);
-        data = AIF_DATA(a);
-
-        return _aif_print(fp, depth, &fmt, &data);
-}
-
-/* 
- * Prints the object in human-readable form to fp, advances fds and data to
- * the first location after the part printed.  Arithmetic values are given at
- * least len bytes of significance, more if the fds indicates.
- */
-int
-_aif_print(FILE *fp, int depth, char **fds, char **data)
-{
-        char * tmp;
-
-        _fds_resolve(fds);
-
-        switch ( FDSType(*fds) )
-        {
-        case AIF_BOOLEAN:
-                return _aif_print_bool(fp, depth, fds, data);
-
-        case AIF_CHARACTER:
-                return _aif_print_char(fp, depth, fds, data);
-
-        case AIF_INTEGER:
-                return _aif_print_int(fp, depth, fds, data);
-
-        case AIF_FLOATING:
-                return _aif_print_float(fp, depth, fds, data);
-
-        case AIF_ARRAY:
-                return _aif_print_array(fp, depth, fds, data);
-
-        case AIF_POINTER:
-                return _aif_print_pointer(fp, depth, fds, data);
-
-        case AIF_REGION:
-                return _aif_print_region(fp, depth, fds, data);
-
-        case AIF_STRUCT:
-                return _aif_print_struct(fp, depth, fds, data);
-
-        case AIF_NAME:
-                return _aif_print_name(fp, depth, fds, data);
-
-        case AIF_REFERENCE:
-                tmp = _fds_lookup(fds);
-                return _aif_print(fp, depth, &tmp, data);
-
-        case AIF_STRING:
-                return _aif_print_string(fp, depth, fds, data);
-
-        case AIF_ENUM:
-                return _aif_print_enum(fp, depth, fds, data);
-
-        case AIF_UNION:
-                return _aif_print_union(fp, depth, fds, data);
-
-        case AIF_VOID:
-                return _aif_print_void(fp, depth, fds, data);
-
-        case AIF_FUNCTION:
-                return _aif_print_function(fp, depth, fds, data);
-
-        default:
-		SetAIFError(AIFERR_TYPE, NULL);
-                break;
-        }
-
-	return -1;
-}
-
-int
-_aif_print_bool(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_bool_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_char(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_char_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_int(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_int_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_float(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_float_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_array(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_array_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_pointer(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_pointer_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_region(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_region_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_struct(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_struct_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_name(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_name_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_reference(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_reference_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_string(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_string_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_enum(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_enum_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_union(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_union_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_void(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_void_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-_aif_print_function(FILE *fp, int depth, char **fds, char **data)
-{
-	char *	str;
-	
-	_str_init();
-
-	if ( _aif_function_to_str(depth, fds, data) < 0 )
-		return -1;
-
-	str = _str_get();
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-
-int
-AIFPrintBool(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_bool(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintChar(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_char(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintInt(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_int(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintFloat(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_float(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintArray(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_array(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintPointer(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_pointer(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintRegion(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_region(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintStruct(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_struct(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintName(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_name(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintReference(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_reference(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintString(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_string(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintEnum(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_enum(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintUnion(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_union(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintVoid(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_void(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintFunction(FILE *fp, int depth, AIF *a)
-{
-	char *	fmt;
-	char *	data;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	fmt = AIF_FORMAT(a);
-	data = AIF_DATA(a);
-
-	return _aif_print_function(fp, depth, &fmt, &data);
-}
-
-int
-AIFPrintArrayIndex(FILE *fp, AIFIndex *ix)
-{
-	char *	str;
-
-	if ( ix == (AIFIndex *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-                return -1;
-	}
-
-	if ( AIFArrayIndexToStr(&str, ix) < 0 )
-		return -1;
-
-	fprintf(fp, "%s", str);
-
-	_aif_free(str);
-
-	return 0;
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/struct.c b/debug/org.eclipse.ptp.debug.sdm/libaif/struct.c
deleted file mode 100644
index 25fe113..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/struct.c
+++ /dev/null

@@ -1,175 +0,0 @@
-/*
- * Routines specific to AIF structure objects.
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#ifndef WIN32
-#include	<unistd.h>
-#endif /* !WIN32 */
-
-#include	"aif.h"
-#include	"aifint.h"
-#include	"aiferr.h"
-
-int
-AIFNumFields(AIF *a)
-{
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_STRUCT )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	return FDSNumFields(AIF_FORMAT(a));
-}
-
-int
-AIFFieldType(AIF *a, char *name)
-{
-	int	ret;
-	char *	type;
-
-	if ( a == (AIF *)NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return AIF_INVALID;
-	}
-
-	if ( AIFType(a) != AIF_STRUCT )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return AIF_INVALID;
-	}
-
-	if ( FDSStructFieldByName(AIF_FORMAT(a), name, &type) < 0 )
-	{
-		SetAIFError(AIFERR_FDS, NULL);
-		return AIF_INVALID;
-	}
-
-	ret = FDSType(type);
-	_aif_free(type);
-
-	return ret;
-}
-
-int
-AIFFieldToInt(AIF *a, char *name, int *val)
-{
-	AIFLONGEST	l;
-
-	if ( AIFFieldToLongest(a, name, &l) < 0 )
-		return -1;
-
-	*val = (int)l; /* potential loss of precision */
-
-	return 0;
-}
-
-/*XXX
- * AIFFieldToLongest() and AIFFieldToDoublest() are broken because of the
- * new structure format. We need to add AIFField().
- */
-int
-AIFFieldToLongest(AIF *a, char *name, AIFLONGEST *val)
-{
-	char *	type;
-
-	if ( a == (AIF *)NULL || name == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_STRUCT )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	if ( name != NULL )
-	{
-		if ( FDSStructFieldByName(AIF_FORMAT(a), name, &type) < 0 )
-		{
-			SetAIFError(AIFERR_FDS, NULL);
-			return -1;
-		}
-
-		if ( FDSType(type) != AIF_INTEGER )
-		{
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-	}
-
-/*	return _aif_to_longest(AIF_DATA(a) + off, size, val);*/
-	return 0;
-}
-
-int
-AIFFieldToDouble(AIF *a, char *name, double *val)
-{
-	AIFDOUBLEST	d;
-
-	if ( AIFFieldToDoublest(a, name, &d) < 0 )
-		return -1;
-
-	*val = (double)d; /* possible loss of precision */
-
-	return 0;
-}
-
-/*XXX*/
-int
-AIFFieldToDoublest(AIF *a, char *name, AIFDOUBLEST *val)
-{
-	char *	type;
-
-	if ( a == (AIF *)NULL || name == NULL )
-	{
-		SetAIFError(AIFERR_BADARG, NULL);
-		return -1;
-	}
-
-	if ( AIFType(a) != AIF_STRUCT )
-	{
-		SetAIFError(AIFERR_TYPE, NULL);
-		return -1;
-	}
-
-	if ( name != NULL )
-	{
-		if ( FDSStructFieldByName(AIF_FORMAT(a), name, &type) < 0  )
-		{
-			SetAIFError(AIFERR_FDS, NULL);
-			return -1;
-		}
-
-		if ( FDSType(type) != AIF_FLOATING )
-		{
-			SetAIFError(AIFERR_TYPE, NULL);
-			return -1;
-		}
-	}
-
-/*	return _aif_to_doublest(AIF_DATA(a) + off, size, val);*/
-	return 0;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/testaif.c b/debug/org.eclipse.ptp.debug.sdm/libaif/testaif.c
deleted file mode 100644
index f0d8025..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/testaif.c
+++ /dev/null

@@ -1,1820 +0,0 @@
-/*
- * Test harness for the aif library.
- *
- * Originally written by Raphael Finkel 8/2000 raphael@cs.uky.edu
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h> /* memcpy */
-#include <unistd.h> /* getopt */
-#ifdef __alpha
-#include <string.h> /* memcpy */
-#endif
-#include "aif.h"
-#include "aifint.h"
-#include "testaif.h"
-
-#define TEST_SERIES_1 0x01
-#define TEST_SERIES_2 0x02
-#define TEST_SERIES_3 0x04
-#define TEST_SERIES_4 0x08
-#define TEST_SERIES_5 0x10
-#define TEST_SERIES_6 0x20
-
-
-
-TestFlags all = {
-	1,1,1,
-	1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-	1,1,
-	(AIF*)SELF, (AIF*)NULL, (AIF*)NULL,
-	(AIF*)NULL, (AIF*)NULL, (AIF*)NULL, (AIF*)NULL, (AIF*)NULL,
-	NULL,
-	0};
-
-TestFlags none = {
-	0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,
-	NULL,NULL,
-	NULL,NULL,NULL,NULL,NULL,
-	NULL,
-	0};
-
-
-
-
-/*****************************************
- ***        Function Prototypes        ***
- *****************************************/
-
-void 	TestAllConstructors();
-void 	TestAllAscii();
-void 	TestAllArithmetic();
-void 	TestAllCircularData();
-void 	TestAllEPS();
-void 	TestAllCompareByName();
-void 	_testAscii(char *, char *, char *, char *, TestFlags);
-void 	_testArithmetic(char *, AIF *, char *, TestFlags, AIF *);
-void 	_testCircularData(char *, AIF *, AIF *, TestFlags);
-void 	_testEPS(AIF *, AIF *, AIF *);
-void 	_testCompareByName(int, AIF *, AIF *, char *);
-
-int 	AIFTest(char *, AIF *, char *, TestFlags);
-int 	AIFTestInt(char *, AIF *, char *, TestFlags);
-int 	_aif_test(AIF *, TestFlags);
-int 	_aif_test_general(AIF *, TestFlags);
-int 	_aif_test_bool(AIF *, TestFlags);
-int 	_aif_test_char(AIF *, TestFlags);
-int 	_aif_test_int(AIF *, TestFlags);
-int 	_aif_test_float(AIF *, TestFlags);
-int 	_aif_test_array(AIF *, TestFlags);
-int 	_aif_test_pointer(AIF *, TestFlags);
-int 	_aif_test_region(AIF *, TestFlags);
-int 	_aif_test_struct(AIF *, TestFlags);
-int 	_aif_test_name(AIF *, TestFlags);
-int 	_aif_test_reference(AIF *, TestFlags);
-int 	_aif_test_string(AIF *, TestFlags);
-int 	_aif_test_enum(AIF *, TestFlags);
-int 	_aif_test_union(AIF *, TestFlags);
-
-
-
-/*****************************************
- ***           Main Function           ***
- *****************************************/
-
-int 
-main(int argc, char *argv[])
-{
-	int	c;
-	int	tests = 0;
-
-	while ( (c = getopt(argc, argv, "123456")) != EOF )
-	{
-		switch ( c )
-		{
-		case '1':
-			tests |= TEST_SERIES_1;
-			break;
-
-		case '2':
-			tests |= TEST_SERIES_2;
-			break;
-
-		case '3':
-			tests |= TEST_SERIES_3;
-			break;
-		
-		case '4':
-			tests |= TEST_SERIES_4;
-			break;
-		
-		case '5':
-			tests |= TEST_SERIES_5;
-			break;
-		
-		case '6':
-			tests |= TEST_SERIES_6;
-			break;
-		
-		default:
-			fprintf(stderr, "usage: testaif [-1] [-2] [-3] [-4] [-5] [-6]\n");
-			exit(0);
-		}
-	}
-
-	if ( tests == 0 || tests & TEST_SERIES_1 )
-		TestAllConstructors();
-
-	if ( tests == 0 || tests & TEST_SERIES_2 )
-		TestAllAscii();
-
-	if ( tests == 0 || tests & TEST_SERIES_3 )
-		TestAllArithmetic();
-
-	if ( tests == 0 || tests & TEST_SERIES_4 )
-		TestAllCircularData();
-
-	if ( tests == 0 || tests & TEST_SERIES_5 )
-		TestAllEPS();
-
-	if ( tests == 0 || tests & TEST_SERIES_6 )
-		TestAllCompareByName();
-
-        fprintf(stdout, "\n****** END OF TEST ******\n");
-
-	return 0;
-
-}
-
-
-
-/*****************************************
- ***       Function Definitions        ***
- *****************************************/
-
-void 
-TestAllConstructors()
-{
-	AIF *aString, *aFloat, *aDouble, *anInt, *aPointer, *aStruct;
-	AIF *anArray, *anEnum, *aUnion;
-	TestFlags flag = all;
-	int min, max;
-
-
-        fprintf(stdout, "*********************************** \n");
-        fprintf(stdout, "*** TEST SERIES 1: constructors *** \n");
-        fprintf(stdout, "*********************************** \n\n");
-
-
-	aString = StringToAIF("hello, world!");
-	AIFTest("subtest1", aString, "string: hello, world!", flag);
-
-	aFloat = FloatToAIF(2);
-	AIFTest("subtest2", aFloat, "float: 2", flag);
-
-	aDouble = DoubleToAIF(0);
-	AIFTest("subtest3", aDouble, "double: 0", flag);
-
-	anInt = IntToAIF(16);
-	AIFTest("subtest4", anInt, "integer: 16", flag);
-
-	aPointer = PointerToAIF(NULL, anInt);
-	AIFTest("subtest5", aPointer, "a pointer", flag);
-
-	aPointer = PointerToAIF(NULL, aPointer);
-	AIFTest("subtest6", aPointer, "a double pointer", flag);
-
-	aStruct = EmptyStructToAIF("test_struct");
-	AIFTest("subtest7", aStruct, "empty struct", flag);
-
-        AIFAddFieldToStruct(aStruct, "field1", aFloat);
-        AIFTest("subtest8", aStruct, "with one field", flag);
-
-        AIFAddFieldToStruct(aStruct, "field2", IntToAIF(16));
-        AIFTest("subtest9", aStruct, "with two fields", flag);
-
-        AIFAddFieldToStruct(aStruct, "field3", aStruct);
-	AIFTest("subtest10", aStruct, "with three fields", flag);
-
-        min = 0; max = 9;
-        anArray = ArrayToAIF(1, &min, &max, "abcdefghij", 10, "c");
-        AIFTest("subtest11", anArray, "array of 10 chars", flag);
-
-        AIFAddFieldToStruct(aStruct, "field4", anArray);
-        AIFTest("subtest12", aStruct, "after the array is field 4", flag);
-
-        /* test a linked list: 1 -> 2 -> nil */
-        aStruct = EmptyStructToAIF("test_struct");
-        aStruct = NameAIF(aStruct, 0);
-        AIFAddFieldToStruct(aStruct, "value", IntToAIF(2));
-        AIFAddFieldToStruct(aStruct, "next", AIFNull(aStruct));
-        aPointer = PointerToAIF(NULL, aStruct);
-        aStruct = EmptyStructToAIF("test_struct");
-        AIFAddFieldToStruct(aStruct, "value", IntToAIF(1));
-        AIFAddFieldToStruct(aStruct, "next", aPointer);
-        aPointer = PointerToAIF(NULL, aStruct);
-        AIFTest("subtest13", aPointer, "linked list 1 -> 2 ", flag);
-
-	/* test an array of structs. */
-	{
-		char data[BUFSIZ], *dest;
-		int min=1, max=9, subMin = 1, subMax = 2;
-		int index;
-		int smallArray[2] = {1,2};
-
-		aStruct = EmptyStructToAIF("test_struct");
-		AIFAddFieldToStruct(aStruct, "a", FloatToAIF(2.1));
-		dest = data;
-		for (index = 0; index < 2; index++) 
-		{
-			AIFNormalise(dest, sizeof(int), (char *)(smallArray+index), sizeof(int));
-			dest += sizeof(int);
-		}
-		anArray = ArrayToAIF(1, &subMin, &subMax, data, 2*sizeof(int),
-			AIF_FORMAT(IntToAIF(0)));
-		AIFAddFieldToStruct(aStruct, "b", anArray);
-		AIFTest("subtest14", aStruct, "underlying struct: {a=2.1 b=[1 2]}", flag);
-
-
-		dest = data;
-		for (index = min; index <= max; index++) 
-		{
-			memcpy(dest, AIF_DATA(aStruct), AIF_LEN(aStruct));
-			dest += AIF_LEN(aStruct);
-		}
-		anArray = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(aStruct), AIF_FORMAT(aStruct));
-		AIFTest("subtest15", anArray, "array of 9 underlying structs", flag);
-	}
-
-
-	anEnum = EmptyEnumToAIF("test_enum");
-	AIFTest("subtest16", anEnum, "empty enum", flag);
-
-	AIFAddConstToEnum(anEnum, "const1", IntToAIF(10));
-	AIFAddConstToEnum(anEnum, "const2", IntToAIF(20));
-	AIFAddConstToEnum(anEnum, "const3", IntToAIF(0));
-	AIFSetEnum(anEnum, "const1");
-	AIFTest("subtest17", anEnum, "enum: 10", flag);
-
-	aStruct = EmptyStructToAIF("test_enum");
-	AIFAddFieldToStruct(aStruct, "field1", anEnum);
-	AIFTest("subtest18", aStruct, "an enum in a struct", flag);
-
-	AIFSetEnum(anEnum, "const3");
-	aStruct = EmptyStructToAIF("test_enum");
-	AIFAddFieldToStruct(aStruct, "field1", anEnum);
-	AIFTest("subtest19", aStruct, "same struct but the enum is set to another value", flag);
-
-	AIFSetEnum(anEnum, "const2");
-	aPointer = PointerToAIF(NULL, anEnum);
-	aPointer = PointerToAIF(NULL, aPointer);
-	AIFAddFieldToStruct(aStruct, "field2", aPointer);
-	AIFTest("subtest20", aStruct, "field2 is a pointer to a pointer to an enum", flag);
-
-
-	/* test an array of enums. */
-	{
-		char data[BUFSIZ], *dest;
-		int min=1, max=15, index, val;
-                dest = data;
-                for (index = min; index <= max; index++)
-                {
-			val = rand() % 3;
-			switch (val)
-			{
-				case 0:
-					AIFSetEnum(anEnum, "const1");
-					break;
-				case 1:
-					AIFSetEnum(anEnum, "const2");
-					break;
-				case 2:
-					AIFSetEnum(anEnum, "const3");
-					break;
-			}
-                        memcpy(dest, AIF_DATA(anEnum), AIF_LEN(anEnum));
-                        dest += AIF_LEN(anEnum);
-                }
-
-                anArray = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(anEnum), AIF_FORMAT(anEnum));
-                AIFTest("subtest21", anArray, "array of 15 underlying enums (random)", flag);
-        }
-
-
-	aUnion = EmptyUnionToAIF("test_union");
-	AIFTest("subtest22", aUnion, "empty union", flag);
-
-	AIFAddFieldToUnion(aUnion, "const1", "is4");
-	AIFAddFieldToUnion(aUnion, "const2", "is4");
-	AIFSetUnion(aUnion, "const1", IntToAIF(10));
-	AIFTest("subtest23", aUnion, "union: 10", flag);
-
-	aStruct = EmptyStructToAIF("test_struct");
-        AIFAddFieldToStruct(aStruct, "field1", IntToAIF(1));
-        AIFAddFieldToStruct(aStruct, "field2", StringToAIF("Hello World"));
-        AIFAddFieldToStruct(aStruct, "field3", IntToAIF(2));
-	AIFTest("subtest24", aStruct, "a struct: 1, Hello World, 2", flag);
-
-	/* Testing for a long string */
-	aString = StringToAIF("AIF0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789AIF");
-	AIFTest("subtest25", aString, "string: AIF100digitsAIF", flag);
-
-	fprintf(stdout, "\n");
-}
-
-
-
-
-void
-_testAscii(char *tst, char *fds, char *data, char *msg, TestFlags flag)
-{
-        AIF *toTest;
-        toTest = AsciiToAIF(fds, data);
-	AIFTest(tst, toTest, msg, flag);
-	AIFFree(toTest);
-}
-
-void 
-TestAllAscii()
-{
-	TestFlags flag = all;
-
-
-        fprintf(stdout, "********************************** \n");
-        fprintf(stdout, "*** TEST SERIES 2: ascii input *** \n");
-        fprintf(stdout, "********************************** \n\n");
-
-
-
-	_testAscii("subtest1", "is4", "00000004", "4", flag);
-
-	_testAscii("subtest2", "f4", "3f8ccccd", "1.1", flag);
-
-	_testAscii("subtest3", "f8", "4005bf0a8b145769", "2.718281828459045235360287471352 (f8)", flag);
-
-	_testAscii("subtest4", "f16", "40005bf0a8b1457695355fb8ac404e7a", "2.718281828459045235360287471352662497 (f16)", flag);
-
-	_testAscii("subtest5", "{|a=is4,b=is4;;;}", "0000000200000003", "{a=2, b=3}", flag);
-
-	_testAscii("subtest6", "[r0..1is4]is4", "0000000200000003", "[2, 3]", flag);
-
-	_testAscii("subtest7", "%0/{|val=is4,next=^>0/,msg=^c;;;}", "00000003000163", "{val=3, next=nil, msg=^c}", flag);
-
-	_testAscii("subtest8", "%0/{|val=is4,next=^>0/,msg=^c;;;}", "0000000101000000020200000000000000030300000000016301620161", "a->b->c->self", flag);
-
-	_testAscii("subtest9", "[r0..1is4]%0/{|val=is4,next=^>0/,msg=^c;;;}", "00000001010000000202000000000000000303000000000163016201610000000203000000000162", "array of two lists of pointers", flag);
-
-	_testAscii("subtest10", "%0/{|val=is4,next=^>0/,msg=^c;;;}", "00000003020000000000000003030000000001630163", "{val=3, next=self, msg=^c}", flag);
-
-	_testAscii("subtest11", "s", "000b613a20686f20686f20686f", "a: ho ho ho", flag);
-
-	_testAscii("subtest12", "[r0..1is4]%0/{|val=is4,next=^>0/,msg=s;;;}", "0000000101000000020200000000000000030300000000000b633a20686f20686f20686f000b623a20686f20686f20686f000b613a20686f20686f20686f000000020300000000000b623a20686f20686f20686f", "d[,]", flag);
-
-	_testAscii("subtest13", "[r0..99is4]^%0/{|name=s,data=is4,next=^>0/}", "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "empty hash table", flag);
-
-	_testAscii("subtest14", "[r0..99is4]^%0/{|name=s,data=is4,next=^>0/;;;}", "00000000000000000000000000000000000100057468657265000000010000000000010005746865726500000001000000000000000000010002686900000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "hash table containing hi, there, there", flag);
-
-	_testAscii("subtest15", "[r0..1is4]%0/{|val=is4,next=^>0/,msg=s;;;}", "0011111101000000020200000111000000030300000111000b633a20686f20686f20686f000b623a20686f20686f20616f000b613a20686f20686f20686f000000020300000111000b623a20686f20686f20686f", "d[,]", flag);
-
-	_testAscii("subtest16", "%0/{|val=is4,next=^>0/,msg=^c;;;}", "0000000101000000020200000133000000030300000133016301620161", "a->b->c->self", flag);
-
-	_testAscii("subtest17", "[r0..1is4]%0/{|val=is4,next=^>0/,msg=^c;;;}", "00000001010000000202000001330000000303000001330163016201610000000203000001330162", "array of two lists of pointers", flag);
-
-	_testAscii("subtest18", "[r0..2is4][r0..1is4]is4", "000000060000000700000002000000030000000400000005", "array of two lists of pointers", flag);
-
-	_testAscii("subtest19", "v4", "00000006", "void", flag);
-
-	_testAscii("subtest20", "&is4,^^c/is4", "6D61696E00", "function with args (int, char **) returning int", flag);
-
-	fprintf(stdout, "\n");
-
-}
-
-
-
-
-void
-_testArithmetic(char *msg1, AIF *a, char *msg2, TestFlags flag, AIF *b)
-{
-	flag.AIFAdd = b;
-	flag.AIFSub = flag.AIFMul = flag.AIFDiv = flag.AIFRem = flag.AIFAdd;
-	flag.AIFAnd = flag.AIFOr = flag.AIFAdd;
-	AIFTestInt(msg1, a, msg2, flag);
-}
-
-void 
-TestAllArithmetic()
-{
-	AIF *anEnum1, *anEnum2, *aStruct1, *aStruct2;
-	TestFlags flag = none;
-
-	flag.AIFNeg = 1;
-	flag.AIFNot = 1;
-
-
-        fprintf(stdout, "********************************* \n");
-        fprintf(stdout, "*** TEST SERIES 3: arithmetic *** \n");
-        fprintf(stdout, "********************************* \n\n");
-
-
-
-	_testArithmetic("subtest1", IntToAIF(16), "16 and 17", flag, IntToAIF(17));
-
-	_testArithmetic("subtest2", IntToAIF(18), "18 and 17", flag, IntToAIF(17));
-
-	_testArithmetic("subtest3", IntToAIF(0), "0 and -1", flag, IntToAIF(-1));
-
-	_testArithmetic("subtest4", IntToAIF(-1), "-1 and -1", flag, IntToAIF(-1));
-
-	_testArithmetic("subtest5", IntToAIF(1073741824L), "1073741824L and 1073741825L", flag, IntToAIF(1073741825L));
-
-	_testArithmetic("subtest6", LongestToAIF(1073741824L), "1073741824L and 1073741825L", flag, LongestToAIF(1073741825L));
-
-	_testArithmetic("subtest7", LongestToAIF(7L), "7L and 3", flag, IntToAIF(3));
-
-	_testArithmetic("subtest8", FloatToAIF(3.0), "3.0 and 1.5", flag, FloatToAIF(1.5));
-
-	_testArithmetic("subtest9", FloatToAIF(7.0), "7.0 and 3", flag, IntToAIF(3));
-
-	_testArithmetic("subtest10", IntToAIF(3), "3 and 7.0", flag, FloatToAIF(7.0));
-
-
-        anEnum1 = EmptyEnumToAIF("test_enum1");
-        anEnum2 = EmptyEnumToAIF("test_enum2");
-        AIFAddConstToEnum(anEnum1, "const1", IntToAIF(16));
-        AIFAddConstToEnum(anEnum1, "const2", IntToAIF(18));
-        AIFAddConstToEnum(anEnum2, "const1", IntToAIF(17));
-        AIFAddConstToEnum(anEnum2, "const2", IntToAIF(17));
-        AIFSetEnum(anEnum1, "const1");
-        AIFSetEnum(anEnum2, "const1");
-	_testArithmetic("subtest11", anEnum1, "anEnum1 and anEnum2", flag, anEnum2);
-
-        aStruct1 = EmptyStructToAIF("test_struct1");
-        aStruct2 = EmptyStructToAIF("test_struct2");
-        AIFAddFieldToStruct(aStruct1, "field1", IntToAIF(16));
-        AIFAddFieldToStruct(aStruct1, "field2", IntToAIF(18));
-        AIFAddFieldToStruct(aStruct2, "field1", IntToAIF(17));
-        AIFAddFieldToStruct(aStruct2, "field2", IntToAIF(17));
-	_testArithmetic("subtest12", aStruct1, "aStruct1 and aStruct2", flag, aStruct2);
-
-	aStruct1 = EmptyStructToAIF("test_struct1");
-        aStruct2 = EmptyStructToAIF("test_struct2");
-        AIFAddFieldToStruct(aStruct1, "field1", IntToAIF(18));
-        AIFAddFieldToStruct(aStruct1, "field2", anEnum1);
-        AIFAddFieldToStruct(aStruct2, "field1", IntToAIF(17));
-        AIFAddFieldToStruct(aStruct2, "field2", anEnum2);
-	_testArithmetic("subtest13", aStruct1, "aStruct1 and aStruct2", flag, aStruct2);
-
-	_testArithmetic("subtest14", anEnum1, "anEnum1 and 17", flag, IntToAIF(17));
-
-	_testArithmetic("subtest15", anEnum1, "anEnum1 and 17", flag, FloatToAIF(17));
-
-	_testArithmetic("subtest16", IntToAIF(17), "17 and anEnum1", flag, anEnum1);
-
-	_testArithmetic("subtest17", FloatToAIF(17), "17 and anEnum1", flag, anEnum1);
-
-
-	{
-		char data[BUFSIZ], *dest;
-		int min=1, max=2;
-		AIF *anArray1, *anArray2;
-		AIF *anInt1 = IntToAIF(10);
-		AIF *anInt2 = IntToAIF(20);
-
-                dest = data;
-                memcpy(dest, AIF_DATA(anInt1), AIF_LEN(anInt1));
-                dest += AIF_LEN(anInt1);
-                memcpy(dest, AIF_DATA(anInt1), AIF_LEN(anInt1));
-                dest += AIF_LEN(anInt1);
-                anArray1 = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(anInt1), AIF_FORMAT(anInt1));
-
-                dest = data;
-                memcpy(dest, AIF_DATA(anInt2), AIF_LEN(anInt2));
-                dest += AIF_LEN(anInt2);
-                memcpy(dest, AIF_DATA(anInt2), AIF_LEN(anInt2));
-                dest += AIF_LEN(anInt2);
-                anArray2 = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(anInt2), AIF_FORMAT(anInt2));
-
-		_testArithmetic("subtest18", anArray1, "anArray1 and anArray2", flag, anArray2);
-        }
-
-	{
-		char data[BUFSIZ], *dest;
-		int min=1, max=2;
-		AIF *anArray1, *anArray2;
-
-                dest = data;
-		AIFSetEnum(anEnum1, "const1");
-                memcpy(dest, AIF_DATA(anEnum1), AIF_LEN(anEnum1));
-                dest += AIF_LEN(anEnum1);
-		AIFSetEnum(anEnum1, "const2");
-                memcpy(dest, AIF_DATA(anEnum1), AIF_LEN(anEnum1));
-                dest += AIF_LEN(anEnum1);
-                anArray1 = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(anEnum1), AIF_FORMAT(anEnum1));
-
-                dest = data;
-		AIFSetEnum(anEnum2, "const1");
-                memcpy(dest, AIF_DATA(anEnum2), AIF_LEN(anEnum2));
-                dest += AIF_LEN(anEnum2);
-		AIFSetEnum(anEnum2, "const2");
-                memcpy(dest, AIF_DATA(anEnum2), AIF_LEN(anEnum2));
-                dest += AIF_LEN(anEnum2);
-                anArray2 = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(anEnum2), AIF_FORMAT(anEnum2));
-
-		_testArithmetic("subtest19", anArray1, "anArray1 and anArray2", flag, anArray2);
-        }
-
-	{
-		char data[BUFSIZ], *dest;
-		int min=1, max=2;
-		AIF *anArray1, *anArray2;
-		AIF *anInt = IntToAIF(3);
-		AIF *aFloat = FloatToAIF(7);
-
-                dest = data;
-                memcpy(dest, AIF_DATA(anInt), AIF_LEN(anInt));
-                dest += AIF_LEN(anInt);
-                memcpy(dest, AIF_DATA(anInt), AIF_LEN(anInt));
-                dest += AIF_LEN(anInt);
-                anArray1 = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(anInt), AIF_FORMAT(anInt));
-
-                dest = data;
-                memcpy(dest, AIF_DATA(aFloat), AIF_LEN(aFloat));
-                dest += AIF_LEN(aFloat);
-                memcpy(dest, AIF_DATA(aFloat), AIF_LEN(aFloat));
-                dest += AIF_LEN(aFloat);
-                anArray2 = ArrayToAIF(1, &min, &max, data, (max-min+1)*AIF_LEN(aFloat), AIF_FORMAT(aFloat));
-
-		_testArithmetic("subtest20", anArray1, "anArray1 and anArray2", flag, anArray2);
-        }
-
-	aStruct1 = EmptyStructToAIF("test_struct1");
-	aStruct2 = EmptyStructToAIF("test_struct2");
-	AIFAddFieldToStruct(aStruct1, "field1", IntToAIF(10));
-	AIFAddFieldToStruct(aStruct1, "field2", IntToAIF(10));
-	AIFAddFieldToStruct(aStruct2, "field1", FloatToAIF(7));
-	AIFAddFieldToStruct(aStruct2, "field2", FloatToAIF(7));
-	_testArithmetic("subtest21", aStruct1, "aStruct1 and aStruct2", flag, aStruct2);
-
-
-	_testArithmetic("subtest22", UnsignedIntToAIF(16), "unsigned 16 and unsigned 17", flag, UnsignedIntToAIF(17));
-
-	_testArithmetic("subtest23", UnsignedIntToAIF(18), "unsigned 18 and unsigned 17", flag, UnsignedIntToAIF(17));
-
-	_testArithmetic("subtest24", UnsignedIntToAIF(0), "unsigned 0 and unsigned -1", flag, UnsignedIntToAIF(-1));
-
-	_testArithmetic("subtest25", UnsignedIntToAIF(-1), "unsigned -1 and unsigned -1", flag, UnsignedIntToAIF(-1));
-
-	_testArithmetic("subtest26", UnsignedIntToAIF(1073741824L), "unsigned 1073741824L and unsigned 1073741825L", flag, UnsignedIntToAIF(1073741825L));
-
-	fprintf(stdout, "\n");
-
-}
-
-
-
-
-void
-_testCircularData(char * msg, AIF *a, AIF *b, TestFlags flag)
-{
-	TestFlags f = flag;
-	char txt[BUFSIZ];
-
-	AIFTest(msg, a, "(a) with depth = 0", f);
-	AIFTest(msg, b, "(b) with depth = 0", f);
-
-	for (f.D_AIFPrint = -2; f.D_AIFPrint <= flag.D_AIFPrint; f.D_AIFPrint++)
-	{
-		if (f.D_AIFPrint == 0) continue;
-
-		sprintf(txt, "(a) with depth = %d", f.D_AIFPrint);
-		AIFTest(">>>>>>>>", a, txt, f);
-
-		sprintf(txt, "(b) with depth = %d", f.D_AIFPrint);
-		AIFTest(">>>>>>>>", b, txt, f);
-	}
-
-	_testArithmetic("\n\narithmetic", a, "(a) and (b)", flag, b);
-
-	f = none;
-	f.AIFDiff = b;
-	AIFTest("\n\nAIFDiff", a, "AIFDiff(a, b)", f);
-
-	printf("\n----------------------------------\n\n");
-}
-
-void 
-TestAllCircularData()
-{
-	AIF *a, *b;
-
-	TestFlags flag = none;
-
-        fprintf(stdout, "************************************ \n");
-        fprintf(stdout, "*** TEST SERIES 4: circular data *** \n");
-        fprintf(stdout, "************************************ \n\n");
-
-	a = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=is4;;;}"), (char *)strdup("02000000000000000a03000000000000000a"));
-        b = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=is4;;;}"), (char *)strdup("02000000000000000b03000000000000000c"));
-	flag.D_AIFPrint = 3;
-        _testCircularData("subtest1", a, b, flag);
-
-
-        a = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=is4;;;}"), (char *)strdup("02000000000000000a01000000140300000000000000150000000b"));
-        b = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=is4;;;}"), (char *)strdup("02000000000000000b01000000160300000000000000180000000f"));
-	flag.D_AIFPrint = 4;
-        _testCircularData("subtest2", a, b, flag);
-
-
-        a = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=^%1/{|a=is4,b=^>0/,c=^>1/,d=is4;;;},d=is4;;;}"), (char *)strdup("02000000000000000a010000001400010000001e0300000000000000001e00000014000000000a"));
-        b = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=^%1/{|a=is4,b=^>0/,c=^>1/,d=is4;;;},d=is4;;;}"), (char *)strdup("02000000000000000b01000000170001000000230300000000000000002400000018000000000c"));
-	flag.D_AIFPrint = 5;
-        _testCircularData("subtest3", a, b, flag);
-
-
-        a = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=^%1/{|a=is4,b=^>0/,c=^>1/,d=is4;;;},d=is4;;;}"), (char *)strdup("02000000000000000a0100000014010000001e00010000002800010000003200010000003c0300000000000000003c00000032000000280000001e0000000014000000000a"));
-        b = AsciiToAIF((char *)strdup("^%0/{|a=is4,b=^>0/,c=^%1/{|a=is4,b=^>0/,c=^>1/,d=is4;;;},d=is4;;;}"), (char *)strdup("02000000000000000a0100000014010000001e00010000002800010000003200010000003c0300000000000000003c00000032000000280000001e0000000014000000000a"));
-	flag.D_AIFPrint = 7;
-        _testCircularData("subtest4", a, b, flag);
-
-
-}
-
-
-
-
-void
-_testEPS(AIF *lo, AIF *hi, AIF *a)
-{
-	int val;
-        int ret;
-
-        ret = AIFEPS(lo, hi, a, &val);
-        if (ret == 0)
-        {
-                printf("AIFEPS(lo = ");
-                AIFPrint(stdout, 0, lo);
-                printf(", hi = ");
-                AIFPrint(stdout, 0, hi);
-                printf(", a = ");
-                AIFPrint(stdout, 0, a);
-                printf("): val = %d\n", val);
-        }
-        else
-                printf("*** ERROR *** : %s\n", AIFErrorStr());
-}
-
-void 
-TestAllEPS()
-{
-	AIF * a;
-	AIF * lo;
-	AIF * hi;
-
-        fprintf(stdout, "********************************** \n");
-        fprintf(stdout, "*** TEST SERIES 5: AIFEPS      *** \n");
-        fprintf(stdout, "********************************** \n\n");
-
-	//AIF_BOOLEAN
-	printf("\n>>>>>>> BOOLEAN\n");
-	a = BoolToAIF(0); lo = BoolToAIF(0); hi = BoolToAIF(1);
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-
-	//AIF_INTEGER
-	printf("\n>>>>>>> INTEGER\n");
-	a = IntToAIF(5); lo = IntToAIF(3); hi = IntToAIF(8);
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-
-	//AIF_CHARACTER
-	printf("\n>>>>>>> CHARACTER\n");
-	a = CharToAIF('c'); lo = CharToAIF('b'); hi = CharToAIF('d');
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-
-	//AIF_ENUM
-	printf("\n>>>>>>> ENUM\n");
-        a = EmptyEnumToAIF("test_enum");
-        AIFAddConstToEnum(a, "const1", IntToAIF(10));
-        AIFAddConstToEnum(a, "const2", IntToAIF(20));
-        AIFAddConstToEnum(a, "const3", IntToAIF(15));
-        AIFSetEnum(a, "const3");
-        lo = EmptyEnumToAIF(NULL);
-        AIFAddConstToEnum(lo, "const1", IntToAIF(10));
-        AIFAddConstToEnum(lo, "const2", IntToAIF(20));
-        AIFAddConstToEnum(lo, "const3", IntToAIF(15));
-        AIFSetEnum(lo, "const1");
-        hi = EmptyEnumToAIF(NULL);
-        AIFAddConstToEnum(hi, "const1", IntToAIF(10));
-        AIFAddConstToEnum(hi, "const2", IntToAIF(20));
-        AIFAddConstToEnum(hi, "const3", IntToAIF(15));
-        AIFSetEnum(hi, "const2");
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-
-        a = EmptyEnumToAIF("test_enum");
-        AIFAddConstToEnum(a, "const1a", IntToAIF(10));
-        AIFAddConstToEnum(a, "const2a", IntToAIF(20));
-        AIFAddConstToEnum(a, "const3a", IntToAIF(15));
-        AIFSetEnum(a, "const3a");
-        lo = EmptyEnumToAIF(NULL);
-        AIFAddConstToEnum(lo, "const1lo", IntToAIF(10));
-        AIFAddConstToEnum(lo, "const2lo", IntToAIF(20));
-        AIFAddConstToEnum(lo, "const3lo", IntToAIF(15));
-        AIFSetEnum(lo, "const1lo");
-        hi = EmptyEnumToAIF(NULL);
-        AIFAddConstToEnum(hi, "const1hi", IntToAIF(10));
-        AIFAddConstToEnum(hi, "const2hi", IntToAIF(20));
-        AIFAddConstToEnum(hi, "const3hi", IntToAIF(15));
-        AIFSetEnum(hi, "const2hi");
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-
-	//AIF_STRING
-	printf("\n>>>>>>> STRING\n");
-        a = StringToAIF("b");
-        lo = StringToAIF("a");
-        hi = StringToAIF("c");
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-
-	//AIF_FLOATING
-	printf("\n>>>>>>> FLOAT\n");
-	a = FloatToAIF(5); lo = FloatToAIF(3); hi = FloatToAIF(8);
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-	a = DoubleToAIF(5); lo = DoubleToAIF(3); hi = DoubleToAIF(8);
-	_testEPS(lo, hi, a);
-	_testEPS(a, lo, hi);
-	_testEPS(hi, a, lo);
-	AIFFree(a); AIFFree(lo); AIFFree(hi);
-
-	//AIF_ARRAY
-	printf("\n>>>>>>> ARRAY\n");
-	{
-		char data[BUFSIZ], *dest;
-		int index, submin, submax;
-		int smallArray[5] = {3,4,5,6,7};
-		dest = data;
-		submin = 1;
-		submax = 5;
-		for (index = 0; index < 5; index++)
-		{
-			AIFNormalise(dest, sizeof(int), (char *) (smallArray+index), sizeof(int));
-			dest += sizeof(int);
-		}
-		a = ArrayToAIF(1, &submin, &submax, data, 5*sizeof(int), AIF_FORMAT(IntToAIF(0)));
-
-	}
-	lo = IntToAIF(10);
-	hi = IntToAIF(20);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-
-	lo = IntToAIF(1);
-	hi = IntToAIF(20);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-
-	lo = IntToAIF(1);
-	hi = IntToAIF(2);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-	AIFFree(a);
-
-	//AIF_STRUCT
-	printf("\n>>>>>>> STRUCT\n");
-	{
-		a = EmptyStructToAIF("test_struct");
-		AIFAddFieldToStruct(a, "val1", IntToAIF(11));
-		AIFAddFieldToStruct(a, "val2", IntToAIF(12));
-		AIFAddFieldToStruct(a, "val3", IntToAIF(13));
-	}
-	lo = IntToAIF(18);
-	hi = IntToAIF(20);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-
-	lo = IntToAIF(1);
-	hi = IntToAIF(20);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-
-	lo = IntToAIF(1);
-	hi = IntToAIF(2);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-	AIFFree(a);
-
-	//AIF_POINTER
-	printf("\n>>>>>>> POINTER\n");
-	a = IntToAIF(5); lo = IntToAIF(3); hi = IntToAIF(8);
-	a = PointerToAIF(NULL, a);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-
-	lo = IntToAIF(1);
-	hi = IntToAIF(2);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-
-	lo = IntToAIF(6);
-	hi = IntToAIF(7);
-	_testEPS(lo, hi, a);
-	AIFFree(lo); AIFFree(hi);
-	AIFFree(a);
-
-}
-
-
-
-
-void
-_testCompareByName(int dep, AIF *a, AIF *b, char *method)
-{
-	AIF * c;
-	int res;
-
-	if (strcmp(method, "AIFDiff") == 0)
-	{
-		c = AIFDiff(dep, a, b);
-		if (c == NULL)
-			printf("*** ERROR *** : %s\n", AIFErrorStr());
-		else
-		{
-			printf("a = ");
-			AIFPrint(stdout, 0, a);
-			printf("\nb = ");
-			AIFPrint(stdout, 0, b);
-			printf("\nAIFDiff(depth = %d, a, b) = c = ", dep);
-			AIFPrint(stdout, 0, c);
-			printf("\n\n");
-
-			AIFFree(c);
-		}
-	}
-	else if (strcmp(method, "AIFCompare") == 0)
-	{
-		if (AIFCompare(dep, a, b, &res) < 0)
-			printf("*** ERROR *** : %s\n", AIFErrorStr());
-		else
-		{
-			printf("a = ");
-			AIFPrint(stdout, 0, a);
-			printf("\nb = ");
-			AIFPrint(stdout, 0, b);
-			printf("\nAIFCompare(depth = %d, a, b) = ", dep);
-			printf("%d\n\n", res);
-		}
-	}
-	else
-		return;
-}
-
-void 
-TestAllCompareByName()
-{
-	AIF * a;
-	AIF * b;
-
-	AIFSetOption(AIFOPT_CMP_METHOD, AIF_CMP_BY_NAME);
-
-        fprintf(stdout, "************************************** \n");
-        fprintf(stdout, "*** TEST SERIES 6: compare by name *** \n");
-        fprintf(stdout, "************************************** \n\n");
-
-	a = AsciiToAIF("{|a=is4,b=s;;;}", "0000000400026363");
-        b = AsciiToAIF("{|b=s,a=is4;;;}", "0002646400000002");
-	_testCompareByName(0, a, b, "AIFDiff");
-	AIFFree(a); AIFFree(b);
-
-        a = AsciiToAIF("^%0/{|c=is4,b=^>0/,a=is4;;;}", "02000000000000000a01000000140300000000000000150000000b");
-        b = AsciiToAIF("^%2/{|a=is4,b=^>2/,c=is4;;;}", "02000000000000000b01000000160300000000000000180000000f");
-	_testCompareByName(0, a, b, "AIFDiff");
-	_testCompareByName(1, a, b, "AIFDiff");
-	_testCompareByName(2, a, b, "AIFDiff");
-	_testCompareByName(3, a, b, "AIFDiff");
-	AIFFree(a); AIFFree(b);
-
-        a = AsciiToAIF("^%0/{|a=is4,b=^>0/,c=^%1/{|a=is4,b=^>0/,c=^>1/,d=is4;;;},d=is4;;;}", "02000000000000000a010000001400010000001e0300000000000000001e00000014000000000a");
-        b = AsciiToAIF("^%2/{|d=is4,b=^>2/,c=^%3/{|d=is4,b=^>2/,c=^>3/,a=is4;;;},a=is4;;;}", "02000000000000000b01000000170001000000230300000000000000002400000018000000000c");
-	_testCompareByName(0, a, b, "AIFDiff");
-	_testCompareByName(1, a, b, "AIFDiff");
-	_testCompareByName(2, a, b, "AIFDiff");
-	_testCompareByName(3, a, b, "AIFDiff");
-	AIFFree(a); AIFFree(b);
-
-	/* This one works even though b will be rearranged to
-        ** "{|a=is4,c=>0/,b=%0/is4;;;}" since
-	** _fds_resolve() in _fds_skip_data() is called before the
-	** rearrangement
-	*/
-
-        a = AsciiToAIF("{|a=is4,c=is4,b=is4;;;}", "0000000b0000001500000016");
-        b = AsciiToAIF("{|a=is4,b=%0/is4,c=>0/;;;}", "0000000a0000001400000015");
-	_testCompareByName(0, a, b, "AIFDiff");
-	AIFFree(a); AIFFree(b);
-
-	a = AsciiToAIF("{|a=is4,b=s;;;}", "0000000400026363");
-	b = AsciiToAIF("{|b=s,a=is4;;;}", "0002636300000004");
-	_testCompareByName(0, a, b, "AIFCompare");
-	AIFFree(a); AIFFree(b);
-
-        a = AsciiToAIF("{|a=is4,c=is4,b=is4;;;}", "0000000b0000001500000016");
-        b = AsciiToAIF("{|a=is4,b=%0/is4,c=>0/;;;}", "0000000b0000001600000015");
-	_testCompareByName(0, a, b, "AIFCompare");
-	AIFFree(a); AIFFree(b);
-
-        a = AsciiToAIF("^%0/{|a=is4,b=^>0/,c=^%1/{|a=is4,b=^>0/,c=^>1/,d=is4;;;},d=is4;;;}", "02000000000000000b010000001400010000001e0300000000000000001e00000014000000000a");
-        b = AsciiToAIF("^%2/{|d=is4,b=^>2/,c=^%3/{|d=is4,b=^>2/,c=^>3/,a=is4;;;},a=is4;;;}", "02000000000000000a01000000170001000000230300000000000000002400000018000000000b");
-	_testCompareByName(0, a, b, "AIFCompare");
-	_testCompareByName(1, a, b, "AIFCompare");
-	AIFFree(a); AIFFree(b);
-
-	AIFSetOption(AIFOPT_CMP_METHOD, AIF_CMP_BY_POSITION);
-}
-
-
-
-
-/*
- * There are some test codes that share the same code in this file,
- * thus probably we can replace the similarities with C macros. However,
- * macros can make the code hard to read whereas we want a simple
- * test functions (to avoid the testing of the test functions)
- */
-
-
-int
-AIFTest(char *title, AIF *a, char *msg, TestFlags f)
-{
-	int ret;
-
-       	if ( title != NULL )
-		fprintf(stdout, "%s > ", title);
-
-       	if ( msg != NULL )
-        	fprintf(stdout, "%s:", msg);
-
-        fprintf(stdout, "\n\tAIFPrint: ");
-        if (AIFPrint(stdout, f.D_AIFPrint, a) != 0)
-		fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-        fprintf(stdout, " (%s)", AIF_FORMAT(a));
-
-	ret = _aif_test(a, f);
-
-        fprintf(stdout, "\n");
-
-	return ret;
-}
-
-int
-_aif_test(AIF *a, TestFlags f)
-{
-        //char * tmp;
-        //_fds_resolve(fds);
-
-	_aif_test_general(a, f);
-
-        switch ( AIFType(a) )
-        {
-        case AIF_BOOLEAN:
-                return _aif_test_bool(a, f);
-
-        case AIF_CHARACTER:
-                return _aif_test_char(a, f);
-
-        case AIF_INTEGER:
-                return _aif_test_int(a, f);
-
-        case AIF_FLOATING:
-                return _aif_test_float(a, f);
-
-        case AIF_ARRAY:
-                return _aif_test_array(a, f);
-
-        case AIF_POINTER:
-                return _aif_test_pointer(a, f);
-
-        case AIF_REGION:
-                return _aif_test_region(a, f);
-
-        case AIF_STRUCT:
-                return _aif_test_struct(a, f);
-
-        case AIF_NAME:
-                return _aif_test_name(a, f);
-
-        case AIF_REFERENCE:
-                //tmp = (char *) _fds_lookup(fds);
-                //return _aif_test(fp, depth, &tmp, data);
-
-        case AIF_STRING:
-                return _aif_test_string(a, f);
-
-        case AIF_ENUM:
-                return _aif_test_enum(a, f);
-
-        case AIF_UNION:
-                return _aif_test_union(a, f);
-
-        case AIF_FUNCTION:
-        case AIF_VOID:
-        default:
-		fprintf(stdout, "Unsupported Type\n");
-                break;
-        }
-
-	return -1;
-}
-
-int
-_aif_test_general(AIF *a, TestFlags f)
-{
-	int zeroVal, compareVal;
-	AIF * result;
-
-	// Test AIFIsZero
-	if (f.AIFIsZero == 1){
-
-	if (AIFIsZero(a, &zeroVal)) 
-		fprintf(stdout, "\n\tAIFIsZero ERROR: trouble checking against zero: %s", AIFErrorStr());
-	else
-		fprintf(stdout, "\n\tAIFIsZero: %sequal to zero", zeroVal ? "" : "not ");
-
-	}
-
-	// Test AIFCompare
-	if (f.AIFCompare == 1){
-
-	if (AIFCompare(0, a, a, &compareVal))  
-		fprintf(stdout, "\n\tAIFCompare (a,a) ERROR: trouble comparing against self: %s", AIFErrorStr());
-	else if (compareVal) 
-		fprintf(stdout, "\n\tAIFCompare (a,a) ERROR: not equal to itself");
-	else
-		fprintf(stdout, "\n\tAIFCompare (a,a): OK");
-
-	}
-
-	// Test AIFTypeCompare
-	if (f.AIFTypeCompare == 1){
-
-	if (!AIFTypeCompare(a, a)) 
-		fprintf(stdout, "\n\tAIFTypeCompare (a,a) ERROR: not the same type as itself");
-	else
-		fprintf(stdout, "\n\tAIFTypeCompare (a,a): OK");
-
-	}
-
-	// Test AIFDiff
-	if (f.AIFDiff != NULL){
-
-	if ( f.AIFDiff == (AIF*)SELF ) 
-		result = AIFDiff(0, a, a); 
-	else  
-		result = AIFDiff(0, a, f.AIFDiff);
-	if ( result != NULL ) 
-	{
-		fprintf(stdout, "\n\tAIFDiff (a,a or f.AIFDiff): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-	}
-	else
-		fprintf(stdout, "\n\tAIFDiff (a,a or f.AIFDiff) ERROR: %s", AIFErrorStr());
-
-	}
-
-	return 0;
-}
-
-int
-_aif_test_bool(AIF *a, TestFlags f)
-{
-	AIF * result;
-
-	// Test AIFAnd
-	if (f.AIFAnd != NULL){
-
-	if ( f.AIFAnd == (AIF*)SELF ) 
-		result = AIFAnd(a,a); 
-	else
-		result = AIFAnd(a, f.AIFAnd);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFAnd (a, a or f.AIFAnd): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFAnd (a, a or f.AIFAnd) ERROR: %s", AIFErrorStr());
-
-        }
-
-	// Test AIFOr
-	if (f.AIFOr != NULL){
-
-	if ( f.AIFOr == (AIF*)SELF )
-		result = AIFOr(a,a);
-        else
-		result = AIFOr(a, f.AIFOr);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFOr (a, a or f.AIFOr): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFOr (a, a or f.AIFOr) ERROR: %s", AIFErrorStr());
-
-        }
-
-	// Test AIFNeg
-	if (f.AIFNeg == 1){
-
-	result = AIFNeg(a);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFNeg: ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFNeg ERROR: %s", AIFErrorStr());
-
-        }
-
-	// Test AIFNot
-	if (f.AIFNot == 1){
-
-	result = AIFNot(a);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFNot: ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFNot ERROR: %s", AIFErrorStr());
-
-        }
-
-	return 0;
-}
-
-int
-_aif_test_char(AIF *a, TestFlags f)
-{
-	_aif_test_bool(a, f);
-
-	return 0;
-}
-
-int
-_aif_test_int(AIF *a, TestFlags f)
-{
-	AIF * result;
-
-	_aif_test_bool(a, f);
-
-	// Test AIFAdd
-	if (f.AIFAdd != NULL){
-
-	if ( f.AIFAdd == (AIF*)SELF ) 
-		result = AIFAdd(a,a);
-        else
-		result = AIFAdd(a, f.AIFAdd);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFAdd (a, a or f.AIFAdd): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFAdd (a, a or f.AIFAdd) ERROR: %s", AIFErrorStr());
-
-        }
-
-	// Test AIFSub
-	if (f.AIFSub != NULL){
-
-	if (f.AIFSub == (AIF*)SELF) 
-		result = AIFSub(a,a); 
-	else
-		result = AIFSub(a, f.AIFSub);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFSub (a, a or f.AIFSub): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFSub (a, a or f.AIFSub) ERROR: %s", AIFErrorStr());
-
-        }
-
-	// Test AIFMul
-	if (f.AIFMul != NULL){
-
-	if ( f.AIFMul == (AIF*)SELF) 
-		result = AIFMul(a,a); 
-	else
-		result = AIFMul(a, f.AIFMul);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFMul (a, a or f.AIFMul): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFMul (a, a or f.AIFMul) ERROR: %s", AIFErrorStr());
-
-        }
-
-	// Test AIFDiv
-	if (f.AIFDiv != NULL){
-
-	if (f.AIFDiv == (AIF*)SELF) 
-		result = AIFDiv(a,a);
-	else 
-		result = AIFDiv(a, f.AIFDiv);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFDiv (a, a or f.AIFDiv): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFDiv (a, a or f.AIFDiv) ERROR: %s", AIFErrorStr());
-
-        }
-
-	// Test AIFRem
-	if (f.AIFRem != NULL){
-
-	if (f.AIFRem == (AIF*)SELF) 
-		result = AIFRem(a,a);
-	else 
-		result = AIFRem(a, f.AIFRem);
-        if ( result != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFRem (a, a or f.AIFRem): ");
-        	if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(result));
-                AIFFree(result);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFRem (a, a or f.AIFRem) ERROR: %s", AIFErrorStr());
-
-        }
-
-	return 0;
-}
-
-int
-_aif_test_float(AIF *a, TestFlags f)
-{
-	_aif_test_int(a, f);
-
-	return 0;
-}
-
-int
-_aif_test_array(AIF *a, TestFlags f)
-{
-	int 		tmp1;
-	char * 		tmp2;
-	int		tmp3;
-	AIFIndex * 	tmp4;
-
-	AIFIndex * ix;
-	AIF * ax;
-
-	ix = AIFArrayIndexInit(a);
-        if (ix == NULL)
-	{
-		fprintf(stdout, "\n\tAIFArrayIndexInit FATAL ERROR: %s", AIFErrorStr());
-		exit(100);
-	}
-
-
-	// Test AIFArrayRank
-	if (f.AIFArrayRank == 1){
-
-	if ( (tmp1 = AIFArrayRank(a)) < 0) 
-		fprintf(stdout, "\n\tAIFArrayRank ERROR: %s", AIFErrorStr());
-	else
-		fprintf(stdout, "\n\tAIFArrayRank: %d", tmp1);
-
-	}
-
-	// Test AIFArrayInfo
-	if (f.AIFArrayInfo == 1){
-
-	if ( AIFArrayInfo(a, &tmp1, &tmp2, &tmp3) ) 
-		fprintf(stdout, "\n\tAIFArrayInfo ERROR: %s", AIFErrorStr());
-	else
-	{
-		fprintf(stdout, "\n\tAIFArrayInfo: rank (%d), type (%s), type_id (%d)", tmp1, tmp2, tmp3);
-		_aif_free(tmp2);
-	}
-
-	}
-
-	// Test AIFArrayBounds
-	if (f.AIFArrayBounds == 1){
-
-	int *min, *max, *size;
-
-	if ( AIFArrayBounds(a, ix->i_rank, &min, &max, &size) < 0 )
-		fprintf(stdout, "\n\tAIFArrayBounds ERROR: %s", AIFErrorStr());
-	else
-	{
-		fprintf(stdout, "\n\tAIFArrayBounds: ");
-
-		for ( tmp3 = 0; tmp3 < ix->i_rank; tmp3++)
-			fprintf(stdout, "[rank:%d min:%d max:%d size:%d] ", 
-					tmp3, min[tmp3], max[tmp3], size[tmp3]);
-
-		_aif_free(min);
-		_aif_free(max);
-		_aif_free(size);
-	}
-
-	}
-
-	// Test AIFArrayIndexType
-	if (f.AIFArrayIndexType == 1){
-
-	if ( (tmp2 = AIFArrayIndexType(a)) == NULL )
-		fprintf(stdout, "\n\tAIFArrayIndexType ERROR: %s", AIFErrorStr());
-	else
-	{
-		fprintf(stdout, "\n\tAIFArrayIndexType: %s", tmp2);
-		_aif_free(tmp2);
-	}
-
-	}
-
-	// Test AIFArrayMinIndex
-	if (f.AIFArrayMinIndex == 1){
-
-	for ( tmp1 = 0 ; tmp1 < ix->i_rank ; tmp1++ )
-	{
-		if ( (tmp3 = AIFArrayMinIndex(a, tmp1)) < 0 )
-			fprintf(stdout, "\n\tAIFArrayMinIndex ERROR: %s", 
-					AIFErrorStr());
-		else
-			fprintf(stdout, "\n\tAIFArrayMinIndex: [rank %d: %d]", tmp1, tmp3);
-	}
-
-	}
-
-	// Test AIFArrayMaxIndex
-	if (f.AIFArrayMaxIndex == 1){
-
-	for ( tmp1 = 0 ; tmp1 < ix->i_rank ; tmp1++ )
-	{
-		if ( (tmp3 = AIFArrayMaxIndex(a, tmp1)) < 0 )
-			fprintf(stdout, "\n\tAIFArrayMaxIndex ERROR: %s", 
-					AIFErrorStr());
-		else
-			fprintf(stdout, "\n\tAIFArrayMaxIndex: [rank %d: %d]", tmp1, tmp3);
-	}
-
-	}
-
-
-	// Test AIFArraySize
-	if (f.AIFArraySize == 1){
-
-	if ( (tmp1 = AIFArraySize(a)) < 0) 
-		fprintf(stdout, "\n\tAIFArraySize ERROR: %s", AIFErrorStr());
-	else
-		fprintf(stdout, "\n\tAIFArraySize: %d", tmp1);
-
-	}
-
-	// Test AIFArraySlice
-	if (f.AIFArraySlice == 1){
-	
-	int * mn; 
-	int * mx;
-
-	mn = (int *)_aif_alloc(sizeof(int) * ix->i_rank);
-	mx = (int *)_aif_alloc(sizeof(int) * ix->i_rank);
-
-	// AIFArraySlice (first element)
-	for (tmp3 = 0; tmp3 < ix->i_rank; tmp3++)
-	{
-		mn[tmp3] = ix->i_min[tmp3];
-		mx[tmp3] = ix->i_min[tmp3];
-	}
-	ax = AIFArraySlice(a, ix->i_rank, mn, mx);
-        if ( ax != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFArraySlice (first): ");
-        	if (AIFPrint(stdout, 0, ax) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(ax));
-                AIFFree(ax);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFArraySlice (first) ERROR: %s", AIFErrorStr());
-
-	// AIFArraySlice (last element)
-	for (tmp3 = 0; tmp3 < ix->i_rank; tmp3++)
-	{
-		mn[tmp3] = ix->i_max[tmp3];
-		mx[tmp3] = ix->i_max[tmp3];
-	}
-	ax = AIFArraySlice(a, ix->i_rank, mn, mx);
-        if ( ax != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFArraySlice (last): ");
-        	if (AIFPrint(stdout, 0, ax) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(ax));
-                AIFFree(ax);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFArraySlice (last) ERROR: %s", AIFErrorStr());
-
-	// AIFArraySlice (2nd to 2nd last or all)
-	for (tmp3 = 0; tmp3 < ix->i_rank; tmp3++)
-	{
-		if (ix->i_min[tmp3] < ix->i_max[tmp3] - 1)
-		{
-			mn[tmp3] = ix->i_min[tmp3] + 1;
-			mx[tmp3] = ix->i_max[tmp3] - 1;
-		}
-		else
-		{
-			mn[tmp3] = ix->i_min[tmp3];
-			mx[tmp3] = ix->i_max[tmp3];
-		}
-	}
-	ax = AIFArraySlice(a, ix->i_rank, mn, mx);
-        if ( ax != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFArraySlice (2nd to 2nd last or all): ");
-        	if (AIFPrint(stdout, 0, ax) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(ax));
-                AIFFree(ax);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFArraySlice (2nd to 2nd last or all) ERROR: %s", AIFErrorStr());
-
-
-	_aif_free(mn);
-	_aif_free(mx);
-
-	}
-
-
-	// Test AIFArrayPerm (the rank must be > 1)
-	if (f.AIFArrayPerm == 1 && ix->i_rank > 1){
-
-	int *perm;
-
-	perm = (int *) _aif_alloc(sizeof(int) * ix->i_rank);
-
-	for ( tmp3 = ix->i_rank-1; tmp3 >= 0; tmp3-- )
-		perm[tmp3] = ix->i_rank - tmp3 - 1;
-
-	if ( (ax = AIFArrayPerm(a, perm)) == NULL )
-		fprintf(stdout, "\n\tAIFArrayPerm ERROR: %s", AIFErrorStr());
-	else
-	{
-		fprintf(stdout, "\n\tAIFArrayPerm: "); 
-        	if (AIFPrint(stdout, 0, ax) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(ax));
-                AIFFree(ax);
-	}
-
-	_aif_free(perm);
-
-	}
-
-	// Test AIFArrayElementToInt
-	tmp4 = AIFArrayIndexInit(a);
-        if (tmp4 == NULL)
-		fprintf(stdout, "\n\tAIFArrayIndexInit ERROR: %s", AIFErrorStr());
-
-	if (f.AIFArrayElementToInt == 1 && AIFBaseType(a) == AIF_INTEGER ){
-
-	while (tmp4->i_finished != 1)
-	{
-		int x;
-		if (AIFArrayElementToInt(a, tmp4, &x) < 0)
-			fprintf(stdout, "\n\tAIFArrayElementToInt ERROR: %s", AIFErrorStr());
-		else
-			printf("\n\tAIFArrayElementToInt: %d (int)", x);
-
-		AIFArrayIndexInc(tmp4);
-	}
-
-        AIFArrayIndexFree(tmp4);
-
-	}
-
-	// Test AIFArrayElementToLongest
-	tmp4 = AIFArrayIndexInit(a);
-        if (tmp4 == NULL)
-		fprintf(stdout, "\n\tAIFArrayIndexInit ERROR: %s", AIFErrorStr());
-
-	if (f.AIFArrayElementToLongest == 1 && AIFBaseType(a) == AIF_INTEGER ){
-
-	while (tmp4->i_finished != 1)
-	{
-		AIFLONGEST x;
-		if (AIFArrayElementToLongest(a, tmp4, &x) < 0)
-			fprintf(stdout, "\n\tAIFArrayElementToLongest ERROR: %s", AIFErrorStr());
-		else
-			printf("\n\tAIFArrayElementToLongest: %lld (AIFLONGEST)", x);
-
-		AIFArrayIndexInc(tmp4);
-	}
-
-        AIFArrayIndexFree(tmp4);
-
-	}
-
-	// Test AIFArrayElementToDouble
-	tmp4 = AIFArrayIndexInit(a);
-        if (tmp4 == NULL)
-		fprintf(stdout, "\n\tAIFArrayIndexInit ERROR: %s", AIFErrorStr());
-
-	if (f.AIFArrayElementToDouble == 1 && AIFBaseType(a) == AIF_FLOATING ){
-
-	while (tmp4->i_finished != 1)
-	{
-		double x;
-		if (AIFArrayElementToDouble(a, tmp4, &x) < 0)
-			fprintf(stdout, "\n\tAIFArrayElementToDouble ERROR: %s", AIFErrorStr());
-		else
-			printf("\n\tAIFArrayElementToDouble: %f (double)", x);
-
-		AIFArrayIndexInc(tmp4);
-	}
-
-        AIFArrayIndexFree(tmp4);
-
-	}
-
-	// Test AIFArrayElementToDoublest
-	tmp4 = AIFArrayIndexInit(a);
-        if (tmp4 == NULL)
-		fprintf(stdout, "\n\tAIFArrayIndexInit ERROR: %s", AIFErrorStr());
-
-	if (f.AIFArrayElementToDoublest == 1 && AIFBaseType(a) == AIF_FLOATING ){
-
-	while (tmp4->i_finished != 1)
-	{
-		AIFDOUBLEST x;
-		if (AIFArrayElementToDoublest(a, tmp4, &x) < 0)
-			fprintf(stdout, "\n\tAIFArrayElementToDoublest ERROR: %s", AIFErrorStr());
-		else
-		{
-#ifdef HAVE_LONG_DOUBLE
-			printf("\n\tAIFArrayElementToDoublest: %Lf (AIFDOUBLEST)", x);
-#else
-			printf("\n\tAIFArrayElementToDoublest: %f (AIFDOUBLEST)", x);
-#endif
-		}
-
-		AIFArrayIndexInc(tmp4);
-	}
-
-        AIFArrayIndexFree(tmp4);
-
-	}
-
-
-	// Test AIFArrayRef
-	if (f.AIFArrayRef == 1){
-
-	int * loc;
-
-	loc = (int *)_aif_alloc(sizeof(int) * ix->i_rank);
-
-	for (tmp1 = 0; tmp1 < ix->i_rank; tmp1++)
-		loc[tmp1] = ix->i_min[tmp1];
-
-	ax = AIFArrayRef(a, ix->i_rank, loc);
-        if ( ax != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFArrayRef (first): ");
-        	if (AIFPrint(stdout, 0, ax) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(ax));
-                AIFFree(ax);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFArrayRef (first) ERROR: %s", AIFErrorStr());
-
-	for (tmp1 = 0; tmp1 < ix->i_rank; tmp1++)
-		loc[tmp1] = ix->i_max[tmp1];
-
-	ax = AIFArrayRef(a, ix->i_rank, loc);
-        if ( ax != (AIF *)NULL )
-	{
-                fprintf(stdout, "\n\tAIFArrayRef (last): ");
-        	if (AIFPrint(stdout, 0, ax) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-                fprintf(stdout, " (%s)", AIF_FORMAT(ax));
-                AIFFree(ax);
-        }
-	else 
-		fprintf(stdout, "\n\tAIFArrayRef (last) ERROR: %s", AIFErrorStr());
-
-	_aif_free(loc);
-	}
-
-
-	// Test AIFSetArrayData
-	if (f.AIFSetArrayData != NULL) {
-
-	AIF * result;
-
-	tmp4 = AIFArrayIndexInit(a);
-       	if (tmp4 == NULL)
-		fprintf(stdout, "\n\tAIFArrayIndexInit ERROR: %s", AIFErrorStr());
-
-	if ( (result = CopyAIF(a)) == NULL) 
-		fprintf(stdout, "\n\tCopyAIF ERROR: %s", AIFErrorStr());
-
-	if ( f.AIFSetArrayData == (AIF *) SELF )
-		tmp1 = AIFSetArrayData(result, tmp4, result );
-	else
-		tmp1 = AIFSetArrayData(result, tmp4, f.AIFSetArrayData );
-
-	if ( tmp1 < 0) 
-		fprintf(stdout, "\n\tAIFSetArrayData ERROR: %s", AIFErrorStr());
-	else
-	{
-		fprintf(stdout, "\n\tAIFSetArrayData: Set [0] to ");
-		if (AIFPrint(stdout, 0, f.AIFSetArrayData) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-               	fprintf(stdout, " (%s): ", AIF_FORMAT((AIF *)f.AIFSetArrayData));
-
-		if (AIFPrint(stdout, 0, result) != 0)
-			fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-               	fprintf(stdout, " (%s)", AIF_FORMAT(result));
-	}
-
-       	AIFArrayIndexFree(tmp4);
-	}
-
-
-	// Test each of the array elements
-	printf("\n");
-	tmp1 = 0;
-	tmp2 = (char *) _aif_alloc(sizeof(char) * 100);
-	tmp4 = AIFArrayIndexInit(a);
-        if (tmp4 == NULL)
-		fprintf(stdout, "\n\tAIFArrayIndexInit ERROR: %s", AIFErrorStr());
-	while ( (ax = AIFArrayElement(a, tmp4)) != NULL )
-        {
-		sprintf(tmp2, "\t --> Element %d", tmp1);
-		AIFTest(NULL, ax, tmp2, f);
-	        AIFFree(ax);
-		tmp1++;
-		AIFArrayIndexInc(tmp4);
-	}  
-
-	if ( ax == NULL && AIFError() != AIFERR_NOERR )
-		fprintf(stdout, "\n\tAIFArrayElement ERROR: %s", AIFErrorStr());
-
-	_aif_free(tmp2);
-        AIFArrayIndexFree(tmp4);
-
-
-
-        AIFArrayIndexFree(ix);
-	return 0;
-}
-
-int
-_aif_test_pointer(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-int
-_aif_test_region(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-int
-_aif_test_struct(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-int
-_aif_test_name(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-int
-_aif_test_reference(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-int
-_aif_test_string(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-int
-_aif_test_enum(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-int
-_aif_test_union(AIF *a, TestFlags f)
-{
-	return 0;
-}
-
-
-int
-AIFTestInt(char *title, AIF *a, char *msg, TestFlags f)
-{
-	int ret;
-
-       	if ( title != NULL )
-		fprintf(stdout, "%s > ", title);
-
-       	if ( msg != NULL )
-        	fprintf(stdout, "%s:", msg);
-
-        fprintf(stdout, "\n\tAIFPrint: ");
-        if (AIFPrint(stdout, 0, a) != 0)
-		fprintf(stdout, "\n\tAIFPrint ERROR: %s", AIFErrorStr());
-        fprintf(stdout, " (%s)", AIF_FORMAT(a));
-
-	ret = _aif_test_int(a, f);
-
-        fprintf(stdout, "\n");
-
-	return ret;
-}
-
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/testaif.h b/debug/org.eclipse.ptp.debug.sdm/libaif/testaif.h
deleted file mode 100644
index e59e20c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/testaif.h
+++ /dev/null

@@ -1,75 +0,0 @@
-/*
- * TestFlags are used so that each particular test can be tailored
- * to be tested only with some AIF functions.
- *
- * These are the list of functions that cannot be "turned off" by TestFlags
- * since they are very essential to test other functions.
- *
- * AIFPrint
- * CopyAIF
- * AIFArrayIndexInit
- * AIFArrayElement
- * AIFArrayIndexInc
- * AIFArrayIndexFree
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- */
-
-
-#define SELF	0x01 	/* see the note below */
-
-typedef struct
-{
-	/* Flags
-	 * If it is 1, the test for the function will be executed */
-
-	int 	AIFIsZero;
-	int 	AIFCompare;
-	int 	AIFTypeCompare;
-
-	int 	AIFArrayRank;
-	int 	AIFArrayInfo;
-	int 	AIFArrayBounds;
-	int 	AIFArrayIndexType;
-	int 	AIFArrayMinIndex;
-	int 	AIFArrayMaxIndex;
-	int 	AIFArraySize;
-	int 	AIFArraySlice;
-	int 	AIFArrayPerm;
-	int 	AIFArrayElementToInt;
-	int 	AIFArrayElementToLongest;
-	int 	AIFArrayElementToDouble;
-	int 	AIFArrayElementToDoublest;
-	int 	AIFArrayRef;
-
-	int 	AIFNeg;
-	int 	AIFNot;
-
-	/* For some functions, we can pass a second AIF to be tested with.
-	 * If it is NULL, the test for the function will not be executed
-	 * If it is SELF, the first AIF is the same with the second AIF */
-
-	AIF * 	AIFDiff;
-	AIF * 	AIFAnd;
-	AIF * 	AIFOr;
-
-	AIF * 	AIFAdd;
-	AIF * 	AIFSub;
-	AIF * 	AIFMul;
-	AIF * 	AIFDiv;
-	AIF * 	AIFRem;
-
-	AIF * 	AIFSetArrayData;
-
-	/* For some functions, we can also specify the 'depth'
-	 * of the traversal */
-
-	int	D_AIFPrint;
-
-} TestFlags;
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/util.c b/debug/org.eclipse.ptp.debug.sdm/libaif/util.c
deleted file mode 100644
index 654d782..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/util.c
+++ /dev/null

@@ -1,55 +0,0 @@
-/*
- * Utility routines
- *
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include	<config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include	<stdio.h>
-#include	<stdlib.h>
-
-void *
-_aif_alloc(int size)
-{
-	void *	m = malloc(size);
-
-	if ( m == (void *)NULL )
-		perror("malloc error");
-
-	return m;
-}
-
-void *
-_aif_resize(void *m, int s)
-{
-	if ( m == (void *)NULL )
-		return _aif_alloc(s);
-
-	m = realloc(m, s);
-
-	if ( m == (void *)NULL )
-		perror("realloc error");
-
-	return m;
-}
-
-void
-_aif_free(void *m)
-{
-	if ( m == (void *)NULL )
-	{
-		fprintf(stderr, "Warning: freeing NULL pointer.\n");
-		return;
-	}
-
-	(void)free(m);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/libaif/version.h b/debug/org.eclipse.ptp.debug.sdm/libaif/version.h
deleted file mode 100644
index 97be908..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/libaif/version.h
+++ /dev/null

@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 1996-2002 by Guardsoft Pty Ltd.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- */
-
-#define LIBAIF_VERSION	"1.0.5"

diff --git a/debug/org.eclipse.ptp.debug.sdm/ltmain.sh b/debug/org.eclipse.ptp.debug.sdm/ltmain.sh
deleted file mode 100644
index 9e71d27..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/ltmain.sh
+++ /dev/null

@@ -1,6530 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.20
-TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
-  setopt NO_GLOB_SUBST
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-        darwin_framework)
-	  compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch)
-        prev=darwin_framework
-        compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-        continue
-        ;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char *
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/missing b/debug/org.eclipse.ptp.debug.sdm/missing
deleted file mode 100755
index e7ef83a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/missing
+++ /dev/null

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/debug/org.eclipse.ptp.debug.sdm/plugin.properties b/debug/org.eclipse.ptp.debug.sdm/plugin.properties
deleted file mode 100644
index 5f888bf..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Scalable Debug Manager (SDM)
-pluginProvider=Eclipse.org

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/client/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/src/client/.cvsignore
deleted file mode 100644
index 1a3d1a5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/client/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-.dirstamp
-.deps

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/client/client.c b/debug/org.eclipse.ptp.debug.sdm/src/client/client.c
deleted file mode 100644
index 2b45f86..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/client/client.c
+++ /dev/null

@@ -1,132 +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
- ******************************************************************************/
-
-/*
- * Client runs as task id num_procs, where num_procs are the number of processes
- * in the job being debugged, and is responsible for coordinating protocol
- * messages between the debug client interface (whatever that may be)
- * and the debug servers.
- *
- * Note that there will be num_procs+1 [0..num_procs] processes in our
- * communicator, where num_procs is the number of processes in the parallel
- * job being debugged. To simplify the accounting, we use the task id of
- * num_procs as the client task id and [0..num_procs-1] for the server
- * task ids.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "dbg.h"
-#include "dbg_client.h"
-#include "dbg_proxy.h"
-#include "list.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "handler.h"
-#include "sdm.h"
-
-/*
- * Called by proxy when a new connection
- * is establised.
- */
-static int
-new_connection(void)
-{
-	return 0;
-}
-
-static int
-server_count(void)
-{
-	return sdm_route_get_size();
-}
-
-static proxy_svr_helper_funcs helper_funcs = {
-	new_connection,
-	server_count
-};
-
-static proxy_cmd cmds[] = {
-	/* DBG_QUIT_CMD */						DbgClntQuit,
-	/* DBG_STARTSESSION_CMD */				DbgClntStartSession,
-	/* DBG_SETLINEBREAKPOINT_CMD */			DbgClntSetLineBreakpoint,
-	/* DBG_SETFUNCBREAKPOINT_CMD */			DbgClntSetFuncBreakpoint,
-	/* DBG_DELETEBREAKPOINT_CMD */			DbgClntDeleteBreakpoint,
-	/* DBG_ENABLEBREAKPOINT_CMD */			DbgClntEnableBreakpoint,
-	/* DBG_DISABLEBREAKPOINT_CMD */			DbgClntDisableBreakpoint,
-	/* DBG_CONDITIONBREAKPOINT_CMD */		DbgClntConditionBreakpoint,
-	/* DBG_BREAKPOINTAFTER_CMD */			DbgClntBreakpointAfter,
-	/* DBG_SETWATCHPOINT_CMD */				DbgClntSetWatchpoint,
-	/* DBG_GO_CMD */						DbgClntGo,
-	/* DBG_STEP_CMD */						DbgClntStep,
-	/* DBG_TERMINATE_CMD */					DbgClntTerminate,
-	/* DBG_SUSPEND_CMD */					DbgClntSuspend,
-	/* DBG_LISTSTACKFRAMES_CMD */			DbgClntListStackframes,
-	/* DBG_SETCURRENTSTACKFRAME_CMD */		DbgClntSetCurrentStackframe,
-	/* DBG_EVALUATEEXPRESSION_CMD */		DbgClntEvaluateExpression,
-	/* DBG_GETTYPE_CMD */					DbgClntGetType,
-	/* DBG_LISTLOCALVARIABLES_CMD */		DbgClntListLocalVariables,
-	/* DBG_LISTARGUMENTS_CMD */				DbgClntListArguments,
-	/* DBG_LISTGLOBALVARIABLES_CMD */		DbgClntListGlobalVariables,
-	/* DBG_LISTINFOTHREADS_CMD */			DbgClntListInfoThreads,
-	/* DBG_SETTHREADSELECT_CMD */			DbgClntSetThreadSelect,
-	/* DBG_STACKINFODEPTH_CMD */			DbgClntStackInfoDepth,
-	/* DBG_DATAREADMEMORY_CMD */			DbgClntDataReadMemory,
-	/* DBG_DATAWRITEMEMORY_CMD */			DbgClntDataWriteMemory,
-	/* DBG_LISTSIGNALS_CMD */				DbgClntListSignals,
-	/* DBG_SIGNALINFO_CMD */				DbgClntSignalInfo,
-	/* DBG_CLIHANDLE_CMD */					DbgClntCLIHandle,
-	/* DBG_DATAEVALUATEEXPRESSION_CMD */	DbgClntDataEvaluateExpression,
-	/* DBG_GETPARTIALAIF_CMD */				DbgClntGetPartialAIF,
-	/* DBG_VARIABLEDELETE_CMD */			DbgClntVariableDelete
-};
-
-static proxy_commands	command_tab = {
-	DBG_CMD_BASE,
-	sizeof(cmds) / sizeof(proxy_cmd),
-	cmds
-};
-
-void
-client(char *proxy, char *host, int port)
-{
-	/*
-	 * FIXME: size is the number of processes being debugged *not* the number of debugger
-	 * processes (which includes the master). This should be supplied by the frontend or on
-	 * the command line. At the moment, we just exclude the master.
-	 */
-	int size = sdm_route_get_size() - 1;
-
-	if (DbgClntInit(size, sdm_route_get_id(), proxy, &helper_funcs, &command_tab) != DBGRES_OK ||
-			DbgClntCreateSession(size, host, port) != DBGRES_OK) {
-		fprintf(stderr, "%s\n", DbgGetErrorStr()); fflush(stderr);
-		DbgClntQuit(0, 0, NULL); //TODO fixme!
-		DbgClntProgress();
-		return;
-	}
-
-	while (!DbgClntIsShutdown()) {
-		if (DbgClntProgress() != DBGRES_OK)
-			break;
-	}
-
-	DbgClntFinish();
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/client/client_cmds.c b/debug/org.eclipse.ptp.debug.sdm/src/client/client_cmds.c
deleted file mode 100644
index 79824c2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/client/client_cmds.c
+++ /dev/null

@@ -1,1149 +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
- ******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include "compat.h"
-#include "dbg.h"
-#include "dbg_proxy.h"
-#include "dbg_client.h"
-#include "proxy_msg.h"
-#include "bitset.h"
-#include "handler.h"
-#include "list.h"
-#include "sdm.h"
-
-#define RUNNING				0
-#define SHUTDOWN_STARTED	1
-#define SHUTDOWN_COMPLETED	2
-
-static int				dbg_state;
-static sdm_idset		dbg_procs;
-static sdm_idset		tmp_idset;
-static bitset *			tmp_bitset;
-static proxy_svr *		dbg_proxy;
-
-/*
- * The CLIENT_TIMEOUT determines how often the debugger polls for
- * communication with the front-end. The SERVER_TIMEOUT determines
- * how often the debug servers are polled.
- *
- * Too often and it uses too much CPU, too few and things will slow down...
- *
- * Values are in microseconds.
- */
-#define CLIENT_TIMEOUT	10000
-#define SERVER_TIMEOUT	10000
-
-sdm_idset
-bitset_to_idset(bitset *b)
-{
-	int bit;
-
-	sdm_set_clear(tmp_idset);
-
-	for (bit = 0; bit < bitset_size(b); bit++) {
-		if (bitset_test(b, bit)) {
-			sdm_set_add_element(tmp_idset, bit);
-		}
-	}
-
-	return tmp_idset;
-}
-
-bitset *
-idset_to_bitset(sdm_idset ids)
-{
-	sdm_id		id;
-
-	bitset_clear(tmp_bitset);
-
-	for (id = sdm_set_first(ids); !sdm_set_done(ids); id = sdm_set_next(ids)) {
-		bitset_set(tmp_bitset, id);
-	}
-
-	return tmp_bitset;
-}
-
-/**
- * A send command is completed. Process the result and
- * call all registered event handlers.
- */
-static int
-dbg_clnt_cmd_completed(sdm_message msg)
-{
-	int			len;
-	char *		buf;
-	proxy_msg *	m;
-
-	sdm_message_get_payload(msg, &buf, &len);
-
- 	if (proxy_deserialize_msg(buf, len, &m) < 0)
- 		fprintf(stderr, "bad conversion to proxy event");
- 	else {
- 		/*
- 		 * Insert actual bitset as first arg. The debug events sent internally
- 		 * don't include the bitset, it is only added prior to sending back
- 		 * to the client.
- 		 */
- 		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] dbg_clnt_cmd_completed src=%s\n", sdm_route_get_id(),
- 				_set_to_str(sdm_message_get_source(msg)));
-		proxy_msg_insert_bitset(m, idset_to_bitset(sdm_message_get_source(msg)), 0);
- 		proxy_svr_queue_msg(dbg_proxy, m);
-	}
-
- 	sdm_message_free(msg);
-
- 	return 0;
-}
-
-static int
-send_command(sdm_idset dest, int timeout, char *cmd, int len, void *cbdata)
-{
-	sdm_message 	msg;
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] send_command dest=%s cmd=%s\n", sdm_route_get_id(), _set_to_str(dest), cmd);
-
-	msg = sdm_message_new(cmd, len);
-	sdm_aggregate_set_value(sdm_message_get_aggregate(msg), SDM_AGGREGATE_TIMEOUT, timeout);
-	sdm_set_union(sdm_message_get_destination(msg), dest);
-
-	sdm_aggregate_message(msg, SDM_AGGREGATE_DOWNSTREAM);
-
-	sdm_message_set_send_callback(msg, sdm_message_free);
-	sdm_message_send(msg);
-
-	return 0;
-}
-
-int
-DbgClntInit(int num_svrs, int my_id, char *name, proxy_svr_helper_funcs *funcs, proxy_commands *cmds)
-{
-	struct timeval	tv = { 0, CLIENT_TIMEOUT };
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] DbgClntInit num_svrs=%d\n", sdm_route_get_id(), num_svrs);
-
-	tmp_idset = sdm_set_new();
-	tmp_bitset = bitset_new(num_svrs);
-
-	/*
-	 * Register callback
-	 */
-	sdm_aggregate_set_completion_callback(dbg_clnt_cmd_completed);
-
-	/*
-	 * Create a bitset containing all processes
-	 */
-	dbg_procs = sdm_set_new();
-	sdm_set_add_all(dbg_procs, num_svrs-1);
-
-	/*
-	 * Reset state
-	 */
-	dbg_state = RUNNING;
-
-	/*
-	 * Initialize proxy
-	 */
-	if (proxy_svr_init(name, &tv, funcs, cmds, &dbg_proxy) != PROXY_RES_OK) {
-		DbgSetError(DBGERR_DEBUGGER, proxy_get_error_str());
-		return DBGRES_ERR;
-	}
-
-	return DBGRES_OK;
-}
-
-int
-DbgClntCreateSession(int num, char *host, int port)
-{
-	int			res;
-
-	if (host != NULL)
-		res = proxy_svr_connect(dbg_proxy, host, port);
-	else
-		res = proxy_svr_create(dbg_proxy, port);
-
-	if (res == PROXY_RES_ERR) {
-		DbgSetError(DBGERR_DEBUGGER, proxy_get_error_str());
-		return DBGRES_ERR;
-	}
-
-	return DBGRES_OK;
-}
-
-void
-DbgClntFinish(void)
-{
-	proxy_svr_finish(dbg_proxy);
-}
-
-int
-DbgClntIsShutdown(void)
-{
-
-	/*
-	 * The next event received after a quit command
-	 * must be the server shutting down.
-	 */
-	if (dbg_state == SHUTDOWN_STARTED) {
-		printf("sdm: shutdown completed\n"); fflush(stdout);//TODO
-		dbg_state = SHUTDOWN_COMPLETED;
-		return 0;
-	}
-
-	return (dbg_state == SHUTDOWN_COMPLETED) ? 1 : 0;
-}
-
-int
-DbgClntStartSession(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg = new_proxy_msg(DBG_STARTSESSION_CMD, tid);
-
-	proxy_msg_add_int(msg, SERVER_TIMEOUT);
-	proxy_msg_add_args_nocopy(msg, nargs, args);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(dbg_procs, DBG_EV_WAITALL, buf, len, NULL);
-
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-/*
- * Breakpoint operations
- */
-int
-DbgClntSetLineBreakpoint(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	bitset *	set;
-	char *		buf;
-	proxy_msg *	msg;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_SETLINEBREAKPOINT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntSetFuncBreakpoint(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_SETFUNCBREAKPOINT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntDeleteBreakpoint(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_DELETEBREAKPOINT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntEnableBreakpoint(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_ENABLEBREAKPOINT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntDisableBreakpoint(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_DISABLEBREAKPOINT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntConditionBreakpoint(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_CONDITIONBREAKPOINT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntBreakpointAfter(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_BREAKPOINTAFTER_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntSetWatchpoint(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_SETWATCHPOINT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-/*
- * Process control operations
- */
-int
-DbgClntGo(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_GO_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITSOME, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntStep(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_STEP_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITSOME, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntTerminate(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_TERMINATE_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntSuspend(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_SUSPEND_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	bitset_free(set);
-
-	return res;
-}
-
-/*
- * Stack frame operations
- */
-int
-DbgClntListStackframes(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_LISTSTACKFRAMES_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntSetCurrentStackframe(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_SETCURRENTSTACKFRAME_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-/*
- * Expression/variable operations
- */
-int
-DbgClntEvaluateExpression(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_EVALUATEEXPRESSION_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntGetType(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_GETTYPE_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntListLocalVariables(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_LISTLOCALVARIABLES_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntListArguments(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_LISTARGUMENTS_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntListGlobalVariables(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_LISTGLOBALVARIABLES_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntListInfoThreads(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_LISTINFOTHREADS_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntSetThreadSelect(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_SETTHREADSELECT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntStackInfoDepth(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_STACKINFODEPTH_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntDataReadMemory(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_DATAREADMEMORY_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntDataWriteMemory(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_DATAWRITEMEMORY_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntListSignals(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_LISTSIGNALS_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntSignalInfo(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_SIGNALINFO_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntCLIHandle(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_CLIHANDLE_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-int
-DbgClntQuit(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-
-	dbg_state = SHUTDOWN_STARTED;
-
-	msg = new_proxy_msg(DBG_QUIT_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, nargs, args);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(dbg_procs, DBG_EV_WAITALL, buf, len, NULL);
-
-	free_proxy_msg(msg);
-
-	return res;
-}
-
-/*
- * Event handling
- */
-int
-DbgClntProgress(void)
-{
-	/*************************************
-	 * Check for any server events
-	 */
-
-	sdm_progress();
-
-	/**************************************
-	 * Check for proxy events
-	 */
-
-	return proxy_svr_progress(dbg_proxy) == PROXY_RES_OK ? DBGRES_OK : DBGRES_ERR;
-}
-
-#if 0
-void
-DbgClntRegisterEventHandler(void (*event_callback)(dbg_event *, void *), void *data)
-{
-	RegisterEventHandler(event_callback, data);
-}
-
-/**
- * Unregister file descriptor handler
- */
-void
-DbgClntUnregisterEventHandler(void (*event_callback)(dbg_event *, void *))
-{
-	UnregisterEventHandler(event_callback);
-}
-#endif
-
-/**
- * Register a handler for file descriptor events.
- *
- * TODO: Should the handler return a value?
- */
-void
-DbgClntRegisterReadFileHandler(int fd, int (*file_handler)(int, void *), void *data)
-{
-	RegisterFileHandler(fd, READ_FILE_HANDLER, file_handler, data);
-}
-
-void
-DbgClntRegisterWriteFileHandler(int fd, int (*file_handler)(int, void *), void *data)
-{
-	RegisterFileHandler(fd, WRITE_FILE_HANDLER, file_handler, data);
-}
-
-void
-DbgClntRegisterExceptFileHandler(int fd, int (*file_handler)(int, void *), void *data)
-{
-	RegisterFileHandler(fd, EXCEPT_FILE_HANDLER, file_handler, data);
-}
-
-/**
- * Unregister file descriptor handler
- */
-void
-DbgClntUnregisterFileHandler(int fd)
-{
-	UnregisterFileHandler(fd);
-}
-
-int
-DbgClntDataEvaluateExpression(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_EVALUATEEXPRESSION_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-int
-DbgClntGetPartialAIF(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_GETPARTIALAIF_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}
-int
-DbgClntVariableDelete(int tid, int nargs, char **args)
-{
-	int			res;
-	int			len;
-	char *		buf;
-	proxy_msg *	msg;
-	bitset *	set;
-
-	set = str_to_bitset(args[0], NULL);
-	if (set == NULL) {
-		DbgSetError(DBGERR_PROCSET, NULL);
-		return DBGRES_ERR;
-	}
-
-	msg = new_proxy_msg(DBG_VARIABLEDELETE_CMD, tid);
-	proxy_msg_add_args_nocopy(msg, --nargs, &args[1]);
-	proxy_serialize_msg(msg, &buf, &len);
-
-	res = send_command(bitset_to_idset(set), DBG_EV_WAITALL, buf, len, NULL);
-
-	bitset_free(set);
-	free_proxy_msg(msg);
-
-	return res;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/client/client_interface.c b/debug/org.eclipse.ptp.debug.sdm/src/client/client_interface.c
deleted file mode 100644
index 0b47e58..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/client/client_interface.c
+++ /dev/null

@@ -1,667 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "dbg.h"
-#include "dbg_proxy.h"
-#include "session.h"
-#include "proxy.h"
-#include "proxy_event.h"
-#include "bitset.h"
-#include "handler.h"
-
-/*
- * The TIMEOUT determines how often the debugger polls progress routines.
- * Too often and it uses too much CPU, too few and things will slow down...
- */
-#define CLIENT_TIMEOUT	50000
-#define SERVER_TIMEOUT	50000
-
-static void session_event_handler(void *, void *);
-
-static proxy_clnt_helper_funcs clnt_helper_funcs = {
-	session_event_handler,
-	NULL
-};
-
-static void
-session_event_handler(void *event, void *data)
-{
-	dbg_event *	ev;
-	proxy_msg *	msg = (proxy_msg *)event;
-	session *	s = (session *)data;
-	
-	if (DbgDeserializeEvent(msg->msg_id, msg->num_args, msg->args, &ev) < 0)
-		return;
-	
-	if (s->sess_event_handler != NULL)
-		s->sess_event_handler(ev, s->sess_event_data);
-}
-
-/*
- * Session initialization
- */
-int
-DbgInit(session **sess, char *name, char *attr, ...)
-{
-	va_list			ap;
-	int				res;
-	session *		s;
-	struct timeval	tv = {0, CLIENT_TIMEOUT};
-	
-	s = (session *)malloc(sizeof(session));
-	
-	clnt_helper_funcs.eventdata = (void *)s;
-	
-	va_start(ap, attr);
-	res = proxy_clnt_init(name, &tv, &clnt_helper_funcs, &s->sess_proxy, attr, ap);
-	va_end(ap);
-	
-	if (res < 0) {
-		free(s);
-		return -1;
-	}
-	
-	s->sess_event_handler = NULL;
-	*sess = s;
-	
-	return 0;
-}
-
-int
-DbgConnect(session *s)
-{
-	return proxy_clnt_connect(s->sess_proxy);
-}
-
-int
-DbgCreate(session *s)
-{
-	return proxy_clnt_create(s->sess_proxy);
-}
-
-int
-DbgStartSession(session *s, char *dir, char *prog, char *args)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_STARTSESSION_CMD, 0);
-	
-	proxy_msg_add_string(msg, dir);
-	proxy_msg_add_string(msg, prog);
-	proxy_msg_add_string(msg, args);
-	
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-/*
- * Breakpoint operations
- */
-int 
-DbgSetLineBreakpoint(session *s, bitset *set, int bpid, char *file, int line)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_SETLINEBREAKPOINT_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-	proxy_msg_add_string(msg, file);
-	proxy_msg_add_int(msg, line);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgSetFuncBreakpoint(session *s, bitset *set, int bpid, char *file, char *func)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_SETFUNCBREAKPOINT_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-	proxy_msg_add_string(msg, file);
-	proxy_msg_add_string(msg, func);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgDeleteBreakpoint(session *s, bitset *set, int bpid)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_DELETEBREAKPOINT_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-	
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgEnableBreakpoint(session *s, bitset *set, int bpid)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_ENABLEBREAKPOINT_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgDisableBreakpoint(session *s, bitset *set, int bpid)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_DISABLEBREAKPOINT_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgConditionBreakpoint(session *s, bitset *set, int bpid, char *expr)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_CONDITIONBREAKPOINT_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-	proxy_msg_add_string(msg, expr);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgBreakpointAfter(session *s, bitset *set, int bpid, int icount)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_BREAKPOINTAFTER_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-	proxy_msg_add_int(msg, icount);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgSetWatchpoint(session *s, bitset *set, int bpid, char *expr, int access, int read, char *condition, int icount)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_SETWATCHPOINT_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, bpid);
-	proxy_msg_add_string(msg, expr);
-	proxy_msg_add_int(msg, access);
-	proxy_msg_add_int(msg, read);
-	proxy_msg_add_string(msg, condition);
-	proxy_msg_add_int(msg, icount);
-	
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-/*
- * Process control operations
- */
-int 
-DbgGo(session *s, bitset *set)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_GO_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgStep(session *s, bitset *set, int count, int type)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_STEP_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, count);
-	proxy_msg_add_int(msg, type);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgTerminate(session *s, bitset *set)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_TERMINATE_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgSuspend(session *s, bitset *set)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_SUSPEND_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-/*
- * Stack frame operations
- */
-int 
-DbgListStackframes(session *s, bitset *set, int low, int depth)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_LISTSTACKFRAMES_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, low);
-	proxy_msg_add_int(msg, depth);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgSetCurrentStackframe(session *s, bitset *set, int level)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_SETCURRENTSTACKFRAME_CMD, 0);
-	
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, level);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-/*
- * Expression/variable operations
- */
-int 
-DbgEvaluateExpression(session *s, bitset *set, char *exp)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_EVALUATEEXPRESSION_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, exp);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgGetType(session *s, bitset *set, char *exp)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_GETTYPE_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, exp);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgListLocalVariables(session *s, bitset *set)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_LISTLOCALVARIABLES_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgListArguments(session *s, bitset *set, int low, int high)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_LISTARGUMENTS_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, low);
-	proxy_msg_add_int(msg, high);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgListGlobalVariables(session *s, bitset *set)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_LISTGLOBALVARIABLES_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int
-DbgListInfoThreads(session *s, bitset *set) 
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_LISTINFOTHREADS_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgSetThreadSelect(session *s, bitset *set, int threadNum) 
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_SETTHREADSELECT_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, threadNum);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgStackInfoDepth(session *s, bitset *set) 
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_STACKINFODEPTH_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgDataReadMemory(session *s, bitset *set, long offset, char *address, char *format, int wordSize, int rows, int cols, char *asChar) 
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_DATAREADMEMORY_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, offset);
-	proxy_msg_add_string(msg, address);
-	proxy_msg_add_string(msg, format);
-	proxy_msg_add_int(msg, wordSize);
-	proxy_msg_add_int(msg, rows);
-	proxy_msg_add_int(msg, cols);
-	proxy_msg_add_string(msg, asChar);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int 
-DbgDataWriteMemory(session *s, bitset *set, long offset, char *address, char *format, int wordSize, char *value) 
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_DATAWRITEMEMORY_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_int(msg, offset);
-	proxy_msg_add_string(msg, address);
-	proxy_msg_add_string(msg, format);
-	proxy_msg_add_int(msg, wordSize);
-	proxy_msg_add_string(msg, value);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int
-DbgListSignals(session *s, bitset *set, char *name)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_LISTSIGNALS_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, name);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int
-DbgSignalInfo(session *s, bitset *set, char *arg)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_SIGNALINFO_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, arg);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int
-DbgCLIHandle(session *s, bitset *set, char *arg)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_CLIHANDLE_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, arg);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-int
-DbgQuit(session *s)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_QUIT_CMD, 0);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-
-}
-
-int
-DbgDataEvaluateExpression(session *s, bitset *set, char *arg)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_DATAEVALUATEEXPRESSION_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, arg);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-int
-DbgGetPartialAIF(session *s, bitset *set, char *name, char *key, int listChildren, int express)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_GETPARTIALAIF_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, name);
-	proxy_msg_add_string(msg, key);
-	proxy_msg_add_int(msg, listChildren);
-	proxy_msg_add_int(msg, express);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-int
-DbgVariableDelete(session *s, bitset *set, char *arg)
-{
-	proxy_msg *	msg = new_proxy_msg(DBG_VARIABLEDELETE_CMD, 0);
-
-	proxy_msg_add_bitset(msg, set);
-	proxy_msg_add_string(msg, arg);
-
-	proxy_clnt_queue_msg(s->sess_proxy, msg);
-	
-	free_proxy_msg(msg);
-	
-	return 0;
-}
-
-/*
- * Event handling
- */
-int
-DbgProgress(session *s)
-{
-	return proxy_clnt_progress(s->sess_proxy);
-}
-
-void
-DbgRegisterEventHandler(session *s, void (*event_callback)(dbg_event *, void *), void *data)
-{
-	s->sess_event_handler = event_callback;
-	s->sess_event_data = data;
-	RegisterEventHandler(PROXY_EVENT_HANDLER, session_event_handler, (void *)s);
-	//s->sess_proxy->clnt_funcs->regeventhandler(s->sess_proxy_data, session_event_handler, (void *)s);
-}
-
-/**
- * Unregister file descriptor handler
- */
-void
-DbgUnregisterEventHandler(session *s, void (*event_callback)(dbg_event *, void *))
-{
-	s->sess_event_handler = NULL;
-	UnregisterEventHandler(PROXY_EVENT_HANDLER, session_event_handler);
-}
-
-/**
- * Register a handler for file descriptor events.
- */
-void
-DbgRegisterReadFileHandler(session *s, int fd, int (*file_handler)(int, void *), void *data)
-{
-	RegisterFileHandler(fd, READ_FILE_HANDLER, file_handler, data);
-}
-
-void
-DbgRegisterWriteFileHandler(session *s, int fd, int (*file_handler)(int, void *), void *data)
-{
-	RegisterFileHandler(fd, WRITE_FILE_HANDLER, file_handler, data);
-}
-
-void
-DbgRegisterExceptFileHandler(session *s, int fd, int (*file_handler)(int, void *), void *data)
-{
-	RegisterFileHandler(fd, EXCEPT_FILE_HANDLER, file_handler, data);
-}
-
-/**
- * Unregister file descriptor handler
- */
-void
-DbgUnregisterFileHandler(session *s, int fd)
-{
-	UnregisterFileHandler(fd);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/client/startup.c b/debug/org.eclipse.ptp.debug.sdm/src/client/startup.c
deleted file mode 100644
index 2c18b5f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/client/startup.c
+++ /dev/null

@@ -1,250 +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
- ******************************************************************************/
-
-#include "config.h"
-#ifndef _AIX
-#include <getopt.h>
-#endif
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "backend.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "sdm.h"
-
-#define DEFAULT_BACKEND	"gdb-mi"
-#define DEFAULT_PROXY	"tcp"
-
-extern void client(char *proxy, char *host, int port);
-extern void server(dbg_backend *dbgr);
-
-#ifndef _AIX
-static struct option longopts[] = {
-	{"debugger",		required_argument,	NULL,	'b'},
-	{"debugger_path",	required_argument,	NULL, 	'e'},
-	{"proxy",			required_argument,	NULL, 	'P'},
-	{"port",			required_argument,	NULL, 	'p'},
-	{"host",			required_argument,	NULL, 	'h'},
-	{"master",			no_argument,	 	NULL,	'm'},
-#ifdef DEBUG
-	{"debug",			optional_argument,	NULL, 	'd'},
-#endif /* DEBUG */
-	{NULL,				0,					NULL,	0}
-};
-#endif
-
-#ifdef DEBUG
-static char * shortopts = "b:e:P:p:h:d:m";
-#else /* DEBUG */
-static char * shortopts = "b:e:P:p:h:m";
-#endif /* DEBUG */
-
-static int	fatal_error = 0;
-static char *error_str = NULL;
-
-void
-error_msg(char *fmt, ...)
-{
-	va_list	ap;
-
-	va_start(ap, fmt);
-	vasprintf(&error_str, fmt, ap);
-	va_end(ap);
-
-	fatal_error = 1;
-}
-
-void
-print_error_msg()
-{
-	if (error_str != NULL) {
-		fprintf(stderr, "%s", error_str);
-		fflush(stderr);
-	}
-}
-
-/*
- * Main entry point for MPI parallel debugger.
- *
- * @arg	-b debugger	select backend debugger
- * @arg	-e path		set backend debugger path
- * @arg	-p port		port number to listen on/connect to
- * @arg	-h host		host to connect to
- * @arg	-P proxy		type of proxy connection to use
- * @arg	-j jobid		jobid of application being debugged
- */
-int
-main(int argc, char *argv[])
-{
-	int 			ch;
-	int				port = PROXY_TCP_PORT;
-	char *			host = NULL;
-	char *			debugger_str = DEFAULT_BACKEND;
-	char *			proxy_str = DEFAULT_PROXY;
-	char *			path = NULL;
-	proxy *			p;
-	dbg_backend *	d;
-#ifdef _AIX
-	int				n;
-	char *			cp;
-#endif
-
-#ifndef _AIX
-	while ((ch = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
-		switch (ch) {
-		case 'b':
-			debugger_str = optarg;
-			break;
-		case 'e':
-			path = optarg;
-			break;
-		case 'P':
-			proxy_str = optarg;
-			break;
-		case 'p':
-			port = (int)strtol(optarg, NULL, 10);
-			break;
-		case 'h':
-			host = optarg;
-			break;
-		case 'm':
-			break;
-	#ifdef DEBUG
-		case 'd':
-			if (optarg == NULL)
-				debug_level = DEBUG_LEVEL_ALL;
-			else
-				debug_level = (int)strtol(optarg, NULL, 10);
-			break;
-	#endif /* DEBUG */
-		default:
-			fprintf(stderr,
-				"sdm [--debugger=value] [--debugger_path=path]\n"
-				"    [--proxy=proxy]\n"
-				"    [--host=host_name] [--port=port]\n"
-				"	 [--master]\n"
-	#ifdef DEBUG
-				"    [--debug[=level]]\n"
-	#endif /* DEBUG */
-			);
-			return 1;
-		}
-	}
-#else
-		/*
-		 * AIX does not support GNU style getopt with long options.
-		 * Parse options by string comparison instead.
-		 */
-	n = 1;
-	while (n < argc) {
-		cp = strchr(argv[n], '=');
-		if (cp == NULL) {
-			if (strcmp(argv[n], "--master") == 0) {
-				/* No action required */
-#ifdef DEBUG
-			} else if (strcmp(argv[n], "--debug") == 0) {
-				debug_level = DEBUG_LEVEL_ALL;
-#endif
-			}
-			else {
-				fprintf(stderr,
-					"sdm [--debugger=value] [--debugger_path=path]\n"
-					"    [--proxy=proxy]\n"
-					"    [--host=host_name] [--port=port]\n"
-					"	 [--master]\n"
-#ifdef DEBUG
-					"    [--debug[=level]]\n"
-#endif /* DEBUG */
-				);
-				return 1;
-			}
-		}
-		else {
-			*cp = '\0';
-			if (strcmp(argv[n], "--debugger") == 0) {
-				debugger_str = strdup(cp + 1);
-			}
-			else if (strcmp(argv[n], "--debugger_path") == 0) {
-				path = strdup(cp + 1);
-			}
-			else if (strcmp(argv[n], "--proxy") == 0) {
-				proxy_str = strdup(cp + 1);
-			}
-			else if (strcmp(argv[n], "--port") == 0) {
-				port = (int) strtol(cp + 1, NULL, 10);
-			}
-			else if (strcmp(argv[n], "--host") == 0) {
-				host = strdup(cp + 1);
-			}
-#ifdef DEBUG
-			else if (strcmp(argv[n], "--debug") == 0) {
-				debug_level = (int) strtol(cp + 1, NULL, 10);
-			}
-#endif
-			else {
-				fprintf(stderr,
-					"sdm [--debugger=value] [--debugger_path=path]\n"
-					"    [--proxy=proxy]\n"
-					"    [--host=host_name] [--port=port]\n"
-					"	 [--master]\n"
-#ifdef DEBUG
-					"    [--debug[=level]]\n"
-#endif /* DEBUG */
-				);
-				return 1;
-			}
-		}
-		n = n + 1;
-	}
-#endif
-
-	if (find_dbg_backend(debugger_str, &d) < 0) {
-		fprintf(stderr, "No such backend: \"%s\"\n", debugger_str);
-		return 1;
-	}
-
-	if (path != NULL) {
-		backend_set_path(d, path);
-	}
-
-	if (find_proxy(proxy_str, &p) < 0) {
-		fprintf(stderr,"No such proxy: \"%s\"\n", proxy_str);
-		return 1;
-	}
-
-	if (sdm_init(argc, argv) < 0) {
-		DEBUG_PRINTS(DEBUG_LEVEL_STARTUP, "sdm_init failed\n");
-		return 1;
-	}
-
-	if (sdm_route_get_id() == SDM_MASTER) {
-		DEBUG_PRINTS(DEBUG_LEVEL_STARTUP, "starting client\n");
-		client(proxy_str, host, port);
-	} else {
-		DEBUG_PRINTF(DEBUG_LEVEL_STARTUP, "starting task %d\n", sdm_route_get_id());
-		server(d);
-	}
-
-	DEBUG_PRINTS(DEBUG_LEVEL_STARTUP, "all finished\n");
-
-	sdm_finalize();
-
-	return 0;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/src/impl/.cvsignore
deleted file mode 100644
index 1a3d1a5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-.dirstamp
-.deps

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c
deleted file mode 100644
index 7ba51ca..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c
+++ /dev/null

@@ -1,131 +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
- *******************************************************************************/
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "sdm.h"
-
-static int	shutting_down = 0;
-
-static void	recv_callback(sdm_message msg);
-
-/*
- * Initialize the abstraction layers. ORDER IS IMPORTANT!
- */
-int
-sdm_init(int argc, char *argv[])
-{
-	if (sdm_routing_table_init(argc, argv) < 0) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_routing_table_init failed\n", sdm_route_get_id());
-		return -1;
-	}
-
-	if (sdm_message_init(argc, argv) < 0) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_init failed\n", sdm_route_get_id());
-		return -1;
-	}
-
-	if (sdm_aggregate_init(argc, argv) < 0) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_aggregate_init failed\n", sdm_route_get_id());
-		return -1;
-	}
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Initialization successful\n", sdm_route_get_id());
-
-	sdm_message_set_recv_callback(recv_callback);
-
-	return 0;
-}
-
-/**
- * Finalize the abstraction layers
- */
-void
-sdm_finalize(void)
-{
-	shutting_down = 1;
-
-	sdm_aggregate_finalize();
-	sdm_route_finalize();
-	sdm_message_finalize();
-}
-
-/*
- * Progress messages and the aggregation layer
- */
-void
-sdm_progress(void)
-{
-	sdm_message_progress();
-	sdm_aggregate_progress();
-}
-
-/*
- * Process a received message. This implements the main communication engine
- * message processing algorithm.
- */
-static void
-recv_callback(sdm_message msg)
-{
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Enter recv_callback\n", sdm_route_get_id());
-
-	if (sdm_set_contains(sdm_message_get_source(msg), SDM_MASTER)) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] got downstream message src=%s, dest=%s\n",
-				sdm_route_get_id(),
-				_set_to_str(sdm_message_get_source(msg)),
-				_set_to_str(sdm_message_get_destination(msg)));
-
-		if (shutting_down) {
-			/*
-			 * Stop processing downstream messages
-			 */
-			return;
-		}
-
-		/*
-		 * Start aggregating messages
-		 */
-		sdm_aggregate_message(msg, SDM_AGGREGATE_DOWNSTREAM);
-
-		/*
-		 * If we are the destination, then deliver the payload
-		 */
-		if (sdm_set_contains(sdm_message_get_destination(msg), sdm_route_get_id())) {
-			sdm_message_deliver(msg);
-		}
-
-		/*
-		 * Free the message once it's been forwarded
-		 */
-		sdm_message_set_send_callback(msg, sdm_message_free);
-
-		/*
-		 * Now forward the message
-		 */
-		sdm_message_send(msg);
-	} else {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] got upstream message src=%s, dest=%s\n",
-				sdm_route_get_id(),
-				_set_to_str(sdm_message_get_source(msg)),
-				_set_to_str(sdm_message_get_destination(msg)));
-
-		/*
-		 * Upstream messages are always aggregated
-		 */
-		sdm_aggregate_message(msg, SDM_AGGREGATE_UPSTREAM);
-	}
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Leaving recv_callback\n", sdm_route_get_id());
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_aggregate_hash.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_aggregate_hash.c
deleted file mode 100644
index 42e1ce3..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_aggregate_hash.c
+++ /dev/null

@@ -1,415 +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
- *******************************************************************************/
-
-/*
- * Message aggregation based on hashing the message contents.
- */
-
-#include <sys/time.h>
-
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "compat.h"
-#include "list.h"
-#include "hash.h"
-#include "serdes.h"
-#include "sdm.h"
-
-#define SDM_EVENT_WAIT_TIME 100000
-#define AGGREGATE_VALUE_LEN	8
-
-struct sdm_aggregate {
-	unsigned int	value;	/* Timeout or hash value */
-};
-
-/*
- * A request represents an asynchronous send/receive transaction between the client
- * and all servers. The completion_callback() is called once all replies have been received
- * for a particular request.
- */
-struct request {
-	int				id;				/* request ID (same as message ID) */
-	sdm_idset		outstanding;	/* controllers remaining to send replies */
-	int				timeout;		/* wait timeout for this request (microseconds) */
-	Hash *			replys;			/* hash of replies we've received */
-	struct timeval	start_time;		/* time that timer was started */
-	int				timer_state;	/* state of timer */
-};
-typedef struct request	request;
-
-static List *			all_requests;
-static struct request *	current_request;
-static sdm_idset		empty_set;
-
-static request *	new_request(sdm_idset dest, int id, int timeout);
-static void			free_request(request *);
-static void			update_reply(request *req, sdm_message msg, int hash);
-static void			start_timer(request *r);
-static int			check_timer(request *r);
-static void			disable_timer(request *r);
-static void			request_completed(request *req);
-static int	 		(*completion_callback)(const sdm_message msg);
-
-#define ELAPSED_TIME(t1, t2)	(((t1.tv_sec - t2.tv_sec) * 1000000) + (t1.tv_usec - t2.tv_usec))
-#define TIMER_RUNNING			0
-#define TIMER_EXPIRED			1
-#define TIMER_DISABLED			2
-
-int
-sdm_aggregate_init(int argc, char *argv[])
-{
-	all_requests = NewList();
-	current_request = NULL;
-	completion_callback = NULL;
-	empty_set = sdm_set_new();
-	return 0;
-}
-
-int
-sdm_aggregate_serialize(const sdm_aggregate a, char *buf, char **end)
-{
-	char *	e;
-
-	int_to_hex_str(a->value, buf, AGGREGATE_VALUE_LEN, &e);
-	if (end != NULL) {
-		*end = e;
-	}
-	return e - buf;
-}
-
-int
-sdm_aggregate_serialized_length(const sdm_aggregate a)
-{
-	return AGGREGATE_VALUE_LEN;
-}
-
-int
-sdm_aggregate_deserialize(sdm_aggregate a, char *str, char **end)
-{
-	char *	e;
-
-	a->value = hex_str_to_int(str, AGGREGATE_VALUE_LEN, &e);
-	if (end != NULL) {
-		*end = e;
-	}
-	return e - str;
-}
-
-void
-sdm_aggregate_set_completion_callback(int (*callback)(const sdm_message msg))
-{
-	completion_callback = callback;
-}
-
-/*
- * Aggregate a received message
- */
-void
-sdm_aggregate_message(sdm_message msg, unsigned int flags)
-{
-	int 			id;
-	sdm_aggregate	a;
-
-	a = sdm_message_get_aggregate(msg);
-
-	if (flags & SDM_AGGREGATE_UPSTREAM) {
-		request *		req;
-
-		if (flags & SDM_AGGREGATE_INIT) {
-			int		len;
-			char *	buf;
-
-			sdm_message_get_payload(msg, &buf, &len);
-			a->value = HashCompute(buf, len);
-		}
-
-		id = sdm_message_get_id(msg);
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_aggregate_message: upstream message #%d from %s\n",
-				sdm_route_get_id(), id, _set_to_str(sdm_message_get_source(msg)));
-
-		/*
-		 * Find the request this reply is for.
-		 * Check if the request is completed.
-		 */
-		for (SetList(all_requests); (req = (request *)GetListElement(all_requests)) != NULL; ) {
-			if (req->id == id) {
-				break;
-			}
-		}
-
-		if (req != NULL && sdm_set_compare(req->outstanding, sdm_message_get_source(msg))) {
-			update_reply(req, msg, a->value);
-		} else {
-			/*
-			 * This must be an unsolicited event. Create a new fake request that will just
-			 * wait for a pre-determined timeout, then forward whatever it has. An
-			 * alternative to this would be to peek into the payload to see what the
-			 * command is, then make a decision about expected replies.
-			 *
-			 * This request can have the same ID as the original request, since we're
-			 * guaranteed to receive events in order from a particular source.
-			 *
-			 * It also depends on only processing requests in order, since it's possible
-			 * for this event to be received before we have aggregated replies for
-			 * the original request.
-			 *
-			 */
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_aggregate_message: message is unsolicited\n", sdm_route_get_id());
-
-			req = new_request(sdm_route_reachable(empty_set), id, SDM_EVENT_WAIT_TIME);
-			update_reply(req, msg, a->value);
-		}
-	} else if (flags & SDM_AGGREGATE_DOWNSTREAM) {
-		new_request(sdm_message_get_destination(msg), sdm_message_get_id(msg), a->value);
-	}
-}
-
-/*
- * Check for completed or timed out commands
- */
-void
-sdm_aggregate_progress(void)
-{
-	request *	req;
-
-	/*
-	 * Process command requests. Only process requests in the order that they were
-	 * received. This is to preserve the order of replies. Note: this could cause
-	 * a backlog of requests.
-	 */
-	if ((req = (request *)GetFirstElement(all_requests)) != NULL) {
-		if (sdm_set_is_empty(req->outstanding) ||
-				(req->timeout > 0 && check_timer(req) == TIMER_EXPIRED)) {
-			request_completed(req);
-			free_request(req);
-		}
-	}
-}
-
-void
-sdm_aggregate_finalize(void)
-{
-	/*
-	 * Process remaining requests.
-	 */
-	while (!EmptyList(all_requests)) {
-		if (sdm_message_progress() < 0) {
-			break;
-		}
-		sdm_aggregate_progress();
-	}
-}
-
-sdm_aggregate
-sdm_aggregate_new(void)
-{
-	sdm_aggregate	a = (sdm_aggregate)malloc(sizeof(struct sdm_aggregate));
-
-	a->value = 0;
-
-	return a;
-}
-
-void
-sdm_aggregate_set_value(sdm_aggregate a, int type, ...)
-{
-    va_list	ap;
-
-    va_start(ap, type);
-
-    switch (type) {
-    case SDM_AGGREGATE_TIMEOUT:
-    	a->value = va_arg(ap, int);
-    	break;
-    }
-
-    va_end(ap);
-}
-
-void
-sdm_aggregate_free(const sdm_aggregate a)
-{
-	free(a);
-}
-
-void
-sdm_aggregate_copy(const sdm_aggregate a1, const sdm_aggregate a2)
-{
-	a1->value = a2->value;
-}
-
-/********************************************/
-/********************************************/
-
-char *
-_aggregate_to_str(sdm_aggregate a)
-{
-	static char res[AGGREGATE_VALUE_LEN+1];
-
-	int_to_hex_str(a->value, res, AGGREGATE_VALUE_LEN, NULL);
-	return res;
-}
-
-/*
- * Create a new aggregration request.
- *
- * @param dest is the destination of the message
- * @param timeout is the time to wait before forwarding any replies. 0 means infinite.
- *
- * The outstanding set is all controllers that will respond to this request and once
- * we have received replies from all controllers in this set, the request is complete.
- */
-static request *
-new_request(sdm_idset dest, int id, int timeout)
-{
-	request *	r;
-
-	r = (request *)malloc(sizeof(request));
-	r->id = id;
-	r->timeout = timeout;
-	r->timer_state = TIMER_DISABLED;
-	r->replys = HashCreate(sdm_route_get_size());
-	r->outstanding = sdm_set_new();
-	sdm_set_union(r->outstanding, sdm_route_reachable(dest));
-
-	AddToList(all_requests, (void *)r);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Creating new request #%d expected replies %s\n",
-			sdm_route_get_id(), r->id, _set_to_str(r->outstanding));
-
-	return r;
-}
-
-/*
- * Free the request.
- */
-static void
-free_request(request *r)
-{
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Enter free_request\n", sdm_route_get_id());
-
-	RemoveFromList(all_requests, (void *)r);
-	sdm_set_free(r->outstanding);
-	HashDestroy(r->replys, NULL);
-	free(r);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Leaving free_request\n", sdm_route_get_id());
-
-}
-
-/*
- * Callback when a request is completed.
- */
-static void
-request_completed(request *req)
-{
-	HashEntry *	he;
-	sdm_message msg;
-
-	for (HashSet(req->replys); (he = HashGet(req->replys)) != NULL; ) {
-		msg = (sdm_message)he->h_data;
-
-		if (completion_callback != NULL) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] request %d completed for #%x\n", sdm_route_get_id(),
-					req->id,
-					he->h_hval);
-			completion_callback(msg);
-		}
-
-		HashRemove(req->replys, he->h_hval);
-	}
-}
-
-/*
- * Start a timer
- */
-static void
-start_timer(request *r)
-{
-	(void)gettimeofday(&r->start_time, NULL);
-	r->timer_state = TIMER_RUNNING;
-}
-
-/*
- * Check if the timer has expired.
- */
-static int
-check_timer(request *r)
-{
-	struct timeval	time;
-
-	if (r->timer_state == TIMER_RUNNING) {
-		(void)gettimeofday(&time, NULL);
-
-		if (ELAPSED_TIME(time, r->start_time) >= r->timeout) {
-			r->timer_state = TIMER_EXPIRED;
-		}
-	}
-
-	return r->timer_state;
-}
-
-/*
- * Disable the timer
- */
-static void
-disable_timer(request *r)
-{
-	r->timer_state = TIMER_DISABLED;
-}
-
-/*
- * Given a new message, try to aggregate it with any outstanding messages.
- */
-static void
-update_reply(request *req, sdm_message msg, int hash)
-{
-	sdm_message		reply_msg;
-	sdm_aggregate	na = sdm_message_get_aggregate(msg);
-
-	/*
-	 * Remove sources we have received replies from:
-	 */
-	sdm_set_diff(req->outstanding, sdm_message_get_source(msg));
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] reply updated: src=%s replies outstanding: %s\n",
-			sdm_route_get_id(),
-			_set_to_str(sdm_message_get_source(msg)),
-			_set_to_str(req->outstanding));
-
-	/*
-	 * Save reply if it is new, otherwise just update the reply set
-	 */
-	if ((reply_msg = (sdm_message)HashSearch(req->replys, na->value)) == NULL) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] creating new reply #%x for request %d\n",
-				sdm_route_get_id(), na->value, req->id);
-		HashInsert(req->replys, na->value, (void *)msg);
-	} else {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] updating reply #%x with src %s for request %d\n",
-				sdm_route_get_id(),
-				na->value,
-				_set_to_str(sdm_message_get_source(msg)),
-				req->id);
-		sdm_set_union(sdm_message_get_source(reply_msg), sdm_message_get_source(msg));
-		sdm_message_free(msg);
-	}
-
-	/*
-	 * Start timer if necessary
-	 */
-	if (req->timeout > 0 && check_timer(req) != TIMER_RUNNING && !sdm_set_is_empty(req->outstanding)) {
-		start_timer(req);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_hello_proto.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_hello_proto.c
deleted file mode 100644
index 7c7a27e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_hello_proto.c
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-#include <unistd.h>
-
-#include "helloproto.h"
-
-/**
- * Send and receive a message
- */
-int
-is_server_peer_valid(int sockfd)
-{
-	return 1;
-}
-
-int
-is_client_peer_valid(int sockfd)
-{
-	return 1;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_ompi.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_ompi.c
deleted file mode 100644
index 11174a4..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_ompi.c
+++ /dev/null

@@ -1,390 +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
- *******************************************************************************/
-
-/*
- * Message transport implementation. This provides an implementation of
- * SDM messages using MPI.
- */
-
-#include "config.h"
-
-#include <mpi.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "compat.h"
-#include "list.h"
-#include "serdes.h"
-#include "sdm.h"
-
-struct sdm_message {
-	unsigned int	id;				/* ID of the message */
-	sdm_idset		dest; 			/* Destinations of the message */
-	sdm_idset		src; 			/* Sources of the message */
-	sdm_aggregate	aggregate;		/* Message aggregation */
-	char *			payload;		/* Payload */
-	int				payload_len;	/* Payload length */
-	char *			buf;			/* Receive buffer */
-	int				buf_len;		/* Receive buffer length */
-	void 			(*send_complete)(sdm_message msg);
-};
-
-static void (*sdm_recv_callback)(const sdm_message msg) = NULL;
-static void	(*deliver_callback)(const sdm_message msg) = NULL;
-
-static void	setenviron(char *str, int val);
-
-/**
- * Initialize the runtime abstraction. The jobid is the job ID
- * that was allocated by the OpenMPI runtime system. This is used
- * to set an environment variable that will enable MPI_Init to
- * establish communication.
- *
- * @return 0 on success, -1 on failure
- */
-int
-sdm_message_init(int argc, char *argv[])
-{
-	int		ch;
-	int		size;
-	int		rank;
-	int		jobid = -1;
-
-	for (ch = 0; ch < argc; ch++) {
-		char * arg = argv[ch];
-		if (strncmp(arg, "--jobid", 7) == 0) {
-			jobid = (int)strtol(arg+8, NULL, 10);
-			break;
-		}
-	}
-
-	MPI_Init(&argc, (char ***)&argv);
-	MPI_Comm_size(MPI_COMM_WORLD, &size);
-	MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-
-	sdm_route_set_size(size);
-	sdm_route_set_id(rank);
-
-	SDM_MASTER = size - 1;
-
-#ifdef OMPI
-	if (rank != SDM_MASTER) {
-		setenviron("OMPI_MCA_ns_nds_jobid", jobid);
-		setenviron("OMPI_MCA_ns_nds_vpid", rank);
-		setenviron("OMPI_MCA_ns_nds_num_procs", size-1);
-	}
-#else /* OMPI */
-#warning Debugging is not supported on this architecture
-#endif /* OMPI */
-
-	return 0;
-}
-
-/**
- * Finalize the message abstraction.
- */
-void
-sdm_message_finalize()
-{
-	MPI_Finalize();
-}
-
-/**
- * Send a message to the destinations.
- *
- * @return 0 on success, -1 on failure
- */
-int
-sdm_message_send(const sdm_message msg)
-{
-	int			len;
-	char *		p;
-	char *		buf;
-	sdm_id		dest_id;
-	sdm_idset	route;
-
-	/*
-	 * Remove our id from the destination of the message before forwarding.
-	 */
-	if (sdm_set_contains(msg->dest, sdm_route_get_id())) {
-		sdm_set_remove_element(msg->dest, sdm_route_get_id());
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_send removing me from dest\n", sdm_route_get_id());
-	}
-
-	/*
-	 * Compute the immediate destinations for the message
-	 */
-	route = sdm_route_get_route(msg->dest);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_send src %s dest %s route %s\n", sdm_route_get_id(),
-		_set_to_str(msg->src),
-		_set_to_str(msg->dest),
-		_set_to_str(route));
-
-	if (!sdm_set_is_empty(route)) {
-		/*
-		 * Create a serialized version of the message
-		 */
-
-		len = HEX_LEN /* sizeof(id) */
-			+ sdm_aggregate_serialized_length(msg->aggregate)
-			+ sdm_set_serialized_length(msg->src)
-			+ sdm_set_serialized_length(msg->dest)
-			+ msg->payload_len;
-
-		p = buf = (char *)malloc(len);
-
-		/*
-		 * Note: len was the maximum length of the serialized buffer, we
-		 * now calculate the actual length for the send.
-		 */
-
-		len = HEX_LEN;
-		int_to_hex_str(msg->id, p, &p);
-		len += sdm_aggregate_serialize(msg->aggregate, p, &p);
-		len += sdm_set_serialize(msg->src, p, &p);
-		len += sdm_set_serialize(msg->dest, p, &p);
-		memcpy(p, msg->payload, msg->payload_len);
-		len += msg->payload_len;
-
-		/*
-		 * Send the message to each destination. This could be replaced with ISend to parallelize the
-		 * sends, but since we're phasing out MPI we don't worry.
-		 */
-
-		for (dest_id = sdm_set_first(route); !sdm_set_done(route); dest_id = sdm_set_next(route)) {
-			int err;
-
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Sending len %d to %d\n", sdm_route_get_id(), len, dest_id);
-
-			err = MPI_Send(buf, len, MPI_CHAR, dest_id, 0, MPI_COMM_WORLD);
-			if (err != MPI_SUCCESS) {
-				DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "MPI_Send failed!\n");
-				return -1;
-			}
-		}
-
-		/*
-		 * Free resources.
-		 */
-		free(buf);
-	}
-
-	/*
-	 * Notify that the send is complete.
-	 */
-	if (msg->send_complete != NULL) {
-		msg->send_complete(msg);
-	}
-
-	return 0;
-}
-
-/**
- * Message progress. Caller is responsible for freeing allocated message resources.
- *
- * @return 0 on success, -1 on failure
- */
-int
-sdm_message_progress(void)
-{
-	int				err;
-	int				avail;
-	int				n;
-	int				len;
-	char *			buf;
-	MPI_Status		stat;
-
-	err = MPI_Iprobe(MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &avail, &stat);
-
-	if (err != MPI_SUCCESS) {
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "MPI_Iprobe failed!\n");
-		return -1;
-	}
-
-	if (avail) {
-		MPI_Get_count(&stat, MPI_CHAR, &len);
-
-		buf = (char *)malloc(len);
-
-		sdm_message msg = sdm_message_new(buf, len);
-
-		err = MPI_Recv(buf, len, MPI_CHAR, stat.MPI_SOURCE, 0, MPI_COMM_WORLD, &stat);
-
-		if (err != MPI_SUCCESS) {
-			DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "MPI_Recv failed!\n");
-			return -1;
-		}
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_progress received len %d from %d\n", sdm_route_get_id(), len, stat.MPI_SOURCE);
-
-		msg->id = hex_str_to_int(buf, &buf);
-		len -= HEX_LEN;
-
-		if ((n = sdm_aggregate_deserialize(msg->aggregate, buf, &buf)) < 0) {
-			DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "MPI_Recv invalid header\n");
-			return -1;
-		}
-		len -= n;
-
-		if ((n = sdm_set_deserialize(msg->src, buf, &buf)) < 0) {
-			DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "MPI_Recv invalid header\n");
-			return -1;
-		}
-		len -= n;
-
-		if ((n = sdm_set_deserialize(msg->dest, buf, &buf)) < 0) {
-			DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "MPI_Recv invalid header\n");
-			return -1;
-		}
-		len -= n;
-
-		msg->payload = buf;
-		msg->payload_len = len;
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_progress agg=%s src=%s dest=%s\n", sdm_route_get_id(),
-				_aggregate_to_str(msg->aggregate),
-				_set_to_str(msg->src),
-				_set_to_str(msg->dest));
-
-		if (sdm_recv_callback  != NULL) {
-			sdm_recv_callback(msg);
-		}
-	}
-
-	return 0;
-}
-
-void
-sdm_message_set_send_callback(sdm_message msg, void (*callback)(sdm_message msg))
-{
-	msg->send_complete = callback;
-}
-
-void
-sdm_message_set_recv_callback(void (*callback)(sdm_message msg))
-{
-	sdm_recv_callback = callback;
-}
-
-sdm_message
-sdm_message_new(char *buf, int len)
-{
-	static unsigned int ids = 0;
-	sdm_message	msg = (sdm_message)malloc(sizeof(struct sdm_message));
-
-	msg->id = ids++;
-	msg->dest = sdm_set_new();
-	msg->src = sdm_set_new();
-	sdm_set_add_element(msg->src, sdm_route_get_id());
-	msg->buf = buf;
-	msg->buf_len = len;
-	msg->payload = msg->buf;
-	msg->payload_len = msg->buf_len;
-	msg->aggregate = sdm_aggregate_new();
-	msg->send_complete = NULL;
-
-	return msg;
-}
-
-void
-sdm_message_free(sdm_message msg)
-{
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Enter sdm_message_free\n", sdm_route_get_id());
-
-	free(msg->buf);
-	sdm_set_free(msg->src);
-	sdm_set_free(msg->dest);
-	sdm_aggregate_free(msg->aggregate);
-	free(msg);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Leaving sdm_message_free\n", sdm_route_get_id());
-}
-
-unsigned int
-sdm_message_get_id(const sdm_message msg)
-{
-	return msg->id;
-}
-
-void
-sdm_message_set_id(const sdm_message msg, unsigned int id)
-{
-	msg->id = id;
-}
-
-void
-sdm_message_set_destination(const sdm_message msg, const sdm_idset dest_ids)
-{
-	sdm_set_union(msg->dest, dest_ids);
-}
-
-sdm_idset
-sdm_message_get_destination(const sdm_message msg)
-{
-	return msg->dest;
-}
-
-void
-sdm_message_set_source(const sdm_message msg, const sdm_idset source)
-{
-	sdm_set_union(msg->src, source);
-}
-
-sdm_idset
-sdm_message_get_source(const sdm_message msg)
-{
-	return msg->src;
-}
-
-void
-sdm_message_get_payload(const sdm_message msg, char **buf, int *len)
-{
-	*buf = msg->payload;
-	*len = msg->payload_len;
-}
-
-sdm_aggregate
-sdm_message_get_aggregate(const sdm_message msg)
-{
-	return msg->aggregate;
-}
-
-void
-sdm_message_set_aggregate(const sdm_message msg, const sdm_aggregate a)
-{
-	sdm_aggregate_copy(msg->aggregate, a);
-}
-
-void
-sdm_message_set_deliver_callback(void (*callback)(const sdm_message msg))
-{
-	deliver_callback = callback;
-}
-
-void
-sdm_message_deliver(const sdm_message msg)
-{
-	if (deliver_callback != NULL) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_deliver \n", sdm_route_get_id());
-		deliver_callback(msg);
-	}
-}
-
-static void
-setenviron(char *str, int val)
-{
-	char *	buf;
-
-	asprintf(&buf, "%d", val);
-	setenv(str, buf, 1);
-	free(buf);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_tcpip.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_tcpip.c
deleted file mode 100644
index 4ff733c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_message_tcpip.c
+++ /dev/null

@@ -1,937 +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
- *******************************************************************************/
-
-/*
- * Message transport implementation. This provides an implementation of
- * SDM messages using TCP/IP.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <netdb.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "compat.h"
-#include "list.h"
-#include "serdes.h"
-#include "sdm.h"
-#include "helloproto.h"
-
-#define MESSAGE_LENGTH_SIZE	8
-#define MESSAGE_ID_SIZE		8
-
-struct sdm_message {
-	unsigned int	id;				/* ID of the message */
-	sdm_idset		dest; 			/* Destinations of the message */
-	sdm_idset		src; 			/* Sources of the message */
-	sdm_aggregate	aggregate;		/* Message aggregation */
-	char *			payload;		/* Payload */
-	int				payload_len;	/* Payload length */
-	char *			buf;			/* Receive buffer */
-	int				buf_len;		/* Receive buffer length */
-	void 			(*send_complete)(sdm_message msg);
-};
-
-/**
- * Base type for a linked list of ids and respective
- * socket descriptors
- */
-typedef struct id_sockd_map {
-	sdm_id id;
-	int sockd;
-	struct id_sockd_map *next;
-} sdm_id_sockd_map, *sdm_id_sockd_map_p;
-
-static void (*sdm_recv_callback)(sdm_message msg) = NULL;
-static void	(*deliver_callback)(const sdm_message msg) = NULL;
-
-#define MAX_PORT_INCREMENT	1000	/* Max port increment before failing */
-#define CHILD_CONNECT_TRIES	5		/* Number of times to try each port */
-#define CHILD_CONNECT_SLEEP	1		/* Seconds to sleep between each connection attempt */
-
-sdm_id_sockd_map_p children_sockd_map, parent_sockd_map; /* Leaf case, children = NULL
-									 						Root case, parent = NULL */
-/** Begin of functions created by Richard **/
-
-/**
- * Create the maps and fill with the ids of the children and parent
- */
-void
-sdm_create_sockd_map()
-{
-	sdm_idset all_nodes;
-	sdm_idset adjacent_nodes;
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] in sdm_create_sockd_map\n",
-			sdm_route_get_id());
-
-	// Set parent map
-	if (sdm_route_get_id() == SDM_MASTER) {
-		parent_sockd_map = NULL; // Root
-	} else {
-		parent_sockd_map = (sdm_id_sockd_map_p)malloc(sizeof(sdm_id_sockd_map));
-		parent_sockd_map->id = sdm_route_get_parent();
-	}
-
-	// Get all adjacent nodes
-	all_nodes = sdm_set_new();
-	all_nodes = sdm_set_add_all(all_nodes, sdm_route_get_size()-1);
-
-	// Filter the parent node and master
-	if (parent_sockd_map != NULL) {
-		sdm_set_remove_element(all_nodes, parent_sockd_map->id);
-		sdm_set_remove_element(all_nodes, SDM_MASTER);
-	}
-
-	adjacent_nodes = sdm_route_get_route(all_nodes);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] adjacent nodes: %s\n",
-			sdm_route_get_id(), _set_to_str(adjacent_nodes));
-
-	children_sockd_map = NULL;
-
-	if (!sdm_set_is_empty(adjacent_nodes)) {
-		// Traverse adjacent nodes adding them to the children linked list
-		sdm_id child;
-		sdm_id_sockd_map_p p;
-
-		for (child = sdm_set_first(adjacent_nodes); !sdm_set_done(adjacent_nodes);
-		 child = sdm_set_next(adjacent_nodes)) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] adding %d to my map\n",
-					sdm_route_get_id(), child);
-			p = (sdm_id_sockd_map_p)malloc(sizeof(sdm_id_sockd_map));
-			p->next = children_sockd_map;
-			p->id = child;
-			children_sockd_map = p;
-		}
-	}
-	sdm_set_free(all_nodes);
-}
-
-/**
- * Binds and listen to a port. After accepting connection, updates the
- *
- * @return socket descriptor if successful, -1 if error
- */
-int
-sdm_parent_port_bind(int parentbaseport)
-{
-	int sockfd, peersockfd;
-	int parentport = parentbaseport;
-
-	struct sockaddr_in sockaddr_info;
-	struct sockaddr_in peersockaddr_info;
-	struct in_addr addr = {INADDR_ANY};
-	unsigned peeraddr_len = sizeof(struct in_addr);
-
-	//.Create a socket and bind to the port
-	sockfd = socket(PF_INET, SOCK_STREAM, 0);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] [ACCEPT] sockfd: %d\n", sdm_route_get_id(), sockfd);
-
-	memset(&sockaddr_info, 0, sizeof(struct sockaddr_in));
-	sockaddr_info.sin_family = AF_INET;
-	sockaddr_info.sin_port = htons(parentport);
-	sockaddr_info.sin_addr = addr;
-
-	// Try to bind port until MAX_PORT_INCREMENT, except if bind error is not EADDRINUSE
-	for(;parentport < parentbaseport + MAX_PORT_INCREMENT; parentport++) {
-		if(bind(sockfd, (struct sockaddr *)&(sockaddr_info), sizeof(struct sockaddr_in)) < 0) {
-			if(errno != EADDRINUSE) {
-				// Error!
-				DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Error binding to the port! - errno %d\n",
-						sdm_route_get_id(), errno);
-				return -1;
-			}
-		} else { // Bound successfully
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] port bound: %d\n", sdm_route_get_id(), parentport);
-			break;
-		}
-		// Increment port number and try again
-	}
-
-	if (parentport < parentbaseport + MAX_PORT_INCREMENT) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] bound to port %d\n", sdm_route_get_id(), parentport);
-	} else {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] could not find port to bind to\n", sdm_route_get_id());
-		close(sockfd);
-		return -1;
-	}
-
-	if(listen(sockfd, 5) < 0) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Error listening to the port %d!\n", sdm_route_get_id(), parentport);
-		return -1;
-	}
-
-	// Wait for a valid client to connect
-	while(1) {
-		memset(&peersockaddr_info, 0, sizeof(struct sockaddr_in));
-		peersockfd = accept(sockfd, (struct sockaddr *)&(peersockaddr_info), &peeraddr_len);
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] peersockfd: %d\n", sdm_route_get_id(), peersockfd);
-
-		if(peersockfd < 0) {
-			perror("Status of accepting data from parent");
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Could not accept port connection on port %d - errno %d!\n",
-					sdm_route_get_id(), parentport, errno);
-			return -1;
-		}
-
-		// Check if it is connected to another sdm process before returning sockfd
-		if(is_client_peer_valid(peersockfd)) {
-			break;
-		}
-		close(peersockfd);
-	}
-
-	// We don't need to wait for connections anymore
-	close(sockfd);
-
-	return peersockfd;
-}
-
-/**
- * Connect to the child node using hostname. Port is the first that connects between
- * childbaseport and childbaseport + MAX_PORT_INCREMENT
- *
- * Try CHILD_CONNECT_TRIES to connect to each port, delaying CHILD_CONNECT_SLEEP between each attempt.
- *
- * This function also checks if the protocol is the sdm one.
- */
-int
-sdm_connect_to_child(char *hostname, int childbaseport)
-{
-	struct addrinfo hints, *result;
-	int sockfd;
-	int childport;
-	int num_tries;
-
-	memset(&hints, 0, sizeof(struct addrinfo));
-	hints.ai_family = PF_INET;
-	hints.ai_socktype = SOCK_STREAM;
-
-	for(childport = childbaseport;childport < childbaseport + MAX_PORT_INCREMENT; childport++) {
-		char port_str[10];
-
-		// Get first result from the linked list
-		sockfd = socket(PF_INET, SOCK_STREAM, 0);
-		if(sockfd < 0) {
-			perror("Socket");
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] socket syscall error\n", sdm_route_get_id());
-			return -1;
-		}
-
-		// Connect to the provided address & port
-		sprintf(port_str, "%d", childport);
-		if(getaddrinfo(hostname, port_str, &hints, &result)) {
-			perror("getaddrinfo");
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] getaddrinfo error. hostname: %s, port: %s\n",
-					sdm_route_get_id(), hostname, port_str);
-			return -1;
-		}
-
-		for (num_tries = 0; num_tries < CHILD_CONNECT_TRIES; num_tries++) {
-			if (connect(sockfd, result->ai_addr, result->ai_addrlen) >= 0) {
-				break;
-			}
-
-			if( (errno != ECONNREFUSED) && (errno != ENETUNREACH) &&
-				(errno != ETIMEDOUT) ) {
-				perror("connect");
-				freeaddrinfo(result);
-				DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] connect error. hostname: %s, port: %s\n",
-						sdm_route_get_id(), hostname, port_str);
-				return -1;
-			}
-
-			sleep(CHILD_CONNECT_SLEEP);
-		}
-
-		if (num_tries < CHILD_CONNECT_TRIES){
-			freeaddrinfo(result);
-
-			// Check if it is connected to another sdm process before returning sockfd
-			if (is_server_peer_valid(sockfd)) {
-				return sockfd;
-			}
-
-			close(sockfd);
-		}
-	}
-	// No valid peer found!
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] No port found for the sdm child. hostname: %s\n",
-			sdm_route_get_id(), hostname);
-	return -1;
-}
-
-/**
- * Initializes the message layer using tcp/ip to transport data
- */
-int
-sdm_tcpip_init()
-{
-	routing_table_entry *	entry;
-	sdm_id_sockd_map_p		mapp;
-
-	sdm_create_sockd_map();
-
-	// If it isn't the master node bind to the port provided
-	if(sdm_route_get_id() != SDM_MASTER) {
-		int parentsockd = -1;
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] This node is a server!\n", sdm_route_get_id());
-
-		for (sdm_routing_table_set(); (entry = sdm_routing_table_next()) != NULL; ) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] found entry for node %d\n", sdm_route_get_id(), entry->nodeID);
-			if(entry->nodeID == sdm_route_get_id()) {
-				DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] found my entry\n", sdm_route_get_id());
-				parentsockd = sdm_parent_port_bind(entry->port);
-				break;
-			}
-		}
-
-		if(parentsockd < 0) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] failed to bind to port\n", sdm_route_get_id());
-			return -1;
-		}
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Parent %d successfully connected\n", sdm_route_get_id(), parent_sockd_map->id);
-
-		// Update the parent socket descriptor
-		parent_sockd_map->sockd = parentsockd;
-	}
-
-	// If node is leaf, initialization is done
-	if(children_sockd_map == NULL) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] This node is a leaf\n", sdm_route_get_id());
-		return 0;
-	}
-
-	// Otherwise, open connections to the children
-
-	for (sdm_routing_table_set(); (entry = sdm_routing_table_next()) != NULL; ) {
-		int childsockd;
-
-		mapp = children_sockd_map;
-		while(mapp != NULL) {
-			if(mapp->id == entry->nodeID) {
-				// ID found! Connect to the children and generate a socket descriptor
-				childsockd = sdm_connect_to_child(entry->hostname, entry->port);
-
-				if(childsockd < 0) {
-					DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] failed to bind to connect to child %s:%d\n", sdm_route_get_id(), entry->hostname, entry->port);
-					return -1;
-				}
-				DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Connection to child %d successful\n", sdm_route_get_id(), mapp->id);
-
-				// Set the children socket descriptor
-				mapp->sockd = childsockd;
-				break;
-			}
-			mapp = mapp->next;
-		}
-	}
-
-	return 0;
-}
-
-/**
- * Close sockets and free all map structures
- */
-void
-sdm_clean_maps()
-{
-	if(parent_sockd_map != NULL) {
-		close(parent_sockd_map->sockd);
-		free(parent_sockd_map);
-	}
-
-	while(children_sockd_map != NULL) {
-		sdm_id_sockd_map_p p = children_sockd_map->next;
-		close(children_sockd_map->sockd);
-		free(children_sockd_map);
-		children_sockd_map = p;
-	}
-}
-
-/**
- * Given a nodeid, return an associated socket descriptor
- *
- * @return socket descriptor on success, -1 on error
- */
-int
-sdm_fetch_sockd(int nodeid)
-{
-	sdm_id_sockd_map_p p;
-
-	// Look for nodeid on the children list first
-	p = children_sockd_map;
-	while(p != NULL) {
-		if(p->id == nodeid) {
-			return p->sockd;
-		}
-		p = p->next;
-	}
-
-	// Then, must be the parent
-	p = parent_sockd_map;
-	if(p->id == nodeid) {
-		return p->sockd;
-	}
-
-	// Not mapped! Return an error code!
-	return -1;
-}
-
-/**
- * Given a sockid, return an associated id
- *
- * @return id on success, -1 on error
- */
-int
-sdm_fetch_nodeid(int sockd)
-{
-	sdm_id_sockd_map_p p;
-
-	// Look for nodeid on the children list first
-	p = children_sockd_map;
-	while(p != NULL) {
-		if(p->sockd == sockd) {
-			return p->id;
-		}
-		p = p->next;
-	}
-
-	// Then, must be the parent
-	p = parent_sockd_map;
-	if(p->sockd == sockd) {
-		return p->id;
-	}
-
-	// Not mapped! Return an error code!
-	return -1;
-}
-
-/**
- * Inspect all node's sockets for data, returning the socket descriptor
- * of a socket which contains data.
- *
- * @return socket descriptor on success, -1 on error, -2 if no socket has data
- */
-int
-sdm_get_active_sock_desc()
-{
-	fd_set rfdset;
-	int fdmax = -1;
-	int selrv;
-	sdm_id_sockd_map_p p;
-
-	struct timeval time = {0, 0};
-
-	// Add all valid sockets to the FD_SET
-	FD_ZERO(&rfdset);
-	if(parent_sockd_map != NULL) {
-		FD_SET(parent_sockd_map->sockd, &rfdset);
-		fdmax = parent_sockd_map->sockd;
-	}
-	p = children_sockd_map;
-	while(p != NULL) {
-		FD_SET(p->sockd, &rfdset);
-
-		if(p->sockd > fdmax) {
-			fdmax = p->sockd;
-		}
-
-		p = p->next;
-	}
-
-	if(fdmax < 0) {
-		// No children socket opened
-		return -2;
-	}
-
-	// Check if any of the sockets connected
-	// but don't block
-	selrv = select(fdmax + 1, &rfdset, NULL, NULL, &time);
-
-	if(selrv < 0) {
-		perror("select syscall status");
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "select syscall failed!\n");
-		return -1;
-	} else if(selrv == 0) { // No socket has data. Return appropriated code
-//		printf("The sockets listened dont have data!\n");
-		return -2;
-	}
-
-	// return the first active socket descriptor
-	p = children_sockd_map;
-	while(p != NULL) {
-		if(FD_ISSET(p->sockd, &rfdset)) {
-			return p->sockd;
-		}
-
-		p = p->next;
-	}
-	if(parent_sockd_map != NULL) {
-		if(FD_ISSET(parent_sockd_map->sockd, &rfdset)) {
-			return parent_sockd_map->sockd;
-		}
-	}
-
-	// Should not reach this point
-	return -1;
-}
-
-/**
- * Provides the number of bytes to be read of the message
- * (the size of the header is already subtracted)
- */
-int
-sdm_tcpip_msgheader_receive(int sockfd, int *length)
-{
-	int		n;
-	int		len;
-	char *	p;
-	char	length_str[MESSAGE_LENGTH_SIZE];
-
-	p = length_str;
-	len = MESSAGE_LENGTH_SIZE;
-
-	while ((n = read(sockfd, p, len)) < len) {
-		if (n <= 0) {
-			if (n < 0) {
-				if (errno == EINTR) {
-					continue;
-				}
-				perror("Status on read syscall");
-			}
-			return -1;
-		}
-
-		p += n;
-		len -= n;
-	}
-
-	*length = hex_str_to_int(length_str, MESSAGE_LENGTH_SIZE, NULL) - MESSAGE_LENGTH_SIZE;
-
-	return 0;
-}
-
-int
-sdm_tcpip_msgbody_receive(int sockfd, char *buf, int length)
-{
-	int n;
-
-	while ((n = read(sockfd, buf, length)) < length) {
-		if (n <= 0) {
-			if (n < 0) {
-				if (errno == EINTR) {
-					continue;
-				}
-				perror("Status on read syscall");
-			}
-			return -1;
-		}
-		buf += n;
-		length -= n;
-	}
-
-	return 0;
-}
-
-int
-sdm_tcpip_send(int sockd, char *buf, int length)
-{
-	int wcount;
-
-	// Write all message to the socket
-	do {
-		wcount = write(sockd, (void *)buf, length);
-
-		if (wcount <= 0) {
-			if (wcount < 0) {
-				perror("write syscall status");
-			}
-			DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Could not send message data - write syscall failed!\n");
-			return -1;
-		}
-
-		buf += wcount;
-		length -= wcount;
-	} while(length > 0);
-
-	return 0;
-}
-
-/** End of functions created by Richard **/
-
-/**
- * Initialize the runtime abstraction. The jobid is the job ID
- * that was allocated by the OpenMPI runtime system. This is used
- * to set an environment variable that will enable MPI_Init to
- * establish communication.
- *
- * @return 0 on success, -1 on failure
- */
-int
-sdm_message_init(int argc, char *argv[])
-{
-	/*
-	 * Initializes the communication layer
-	 */
-	if (sdm_tcpip_init() < 0) {
-		return -1;
-	}
-
-	return 0;
-}
-
-/**
- * Finalize the message abstraction.
- */
-void
-sdm_message_finalize()
-{
-	// Clean the maps
-	sdm_clean_maps();
-}
-
-
-/**
- * Send a message to the destinations.
- *
- * @return 0 on success, -1 on failure
- */
-int
-sdm_message_send(const sdm_message msg)
-{
-	int			len;
-	int			maxlen; // effective and maximum length of the message
-							 // these two vars must have the same size!
-	char *		p;
-	char *		header_addr; // Pointer to the header of the message
-	char *		buf;
-	sdm_id		dest_id;
-	sdm_idset	route;
-
-	/*
-	 * Remove our id from the destination of the message before forwarding.
-	 */
-	if (sdm_set_contains(msg->dest, sdm_route_get_id())) {
-		sdm_set_remove_element(msg->dest, sdm_route_get_id());
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_send removing me from dest\n", sdm_route_get_id());
-	}
-
-	/*
-	 * Compute the immediate destinations for the message
-	 */
-	route = sdm_route_get_route(msg->dest);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_send src %s dest %s route %s\n", sdm_route_get_id(),
-		_set_to_str(msg->src),
-		_set_to_str(msg->dest),
-		_set_to_str(route));
-
-	if (!sdm_set_is_empty(route)) {
-		/*
-		 * Create a serialized version of the message
-		 * This includes the length of the message at the beginning
-		 */
-
-		maxlen = MESSAGE_LENGTH_SIZE
-			+ MESSAGE_ID_SIZE
-			+ sdm_aggregate_serialized_length(msg->aggregate)
-			+ sdm_set_serialized_length(msg->src)
-			+ sdm_set_serialized_length(msg->dest)
-			+ msg->payload_len;
-
-		p = buf = (char *)malloc(maxlen);
-
-		// Saves the address of the header
-		header_addr = p;
-
-		p += MESSAGE_LENGTH_SIZE; // Points to the body of the message
-
-		/*
-		 * Note: maxlen was the maximum length of the serialized buffer, we
-		 * now calculate the actual length for the send.
-		 */
-		len = MESSAGE_LENGTH_SIZE;
-		len += MESSAGE_ID_SIZE;
-		int_to_hex_str(msg->id, p, MESSAGE_ID_SIZE, &p);
-		len += sdm_aggregate_serialize(msg->aggregate, p, &p);
-		len += sdm_set_serialize(msg->src, p, &p);
-		len += sdm_set_serialize(msg->dest, p, &p);
-		memcpy(p, msg->payload, msg->payload_len);
-		len += msg->payload_len;
-
-		// Copies the actual length to the header of the message
-		int_to_hex_str(len, header_addr, MESSAGE_LENGTH_SIZE, NULL);
-
-		/*
-		 * Send the message to each destination, converting the
-		 * node ID to a proper address before the transmission
-		 */
-
-		for (dest_id = sdm_set_first(route); !sdm_set_done(route); dest_id = sdm_set_next(route)) {
-			int sockd;
-
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Sending len %d to %d\n", sdm_route_get_id(), len, dest_id);
-
-			// Get socket descriptor corresponding to the node where the message will be sent
-			sockd = sdm_fetch_sockd(dest_id);
-			if (sockd < 0) {
-				DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Socket descriptor not found!\n");
-				return -1;
-			}
-
-			// Write all message to the socket
-			if (sdm_tcpip_send(sockd, buf, len) < 0) {
-				DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Error sending message!\n");
-				return -1;
-			}
-		}
-
-		/*
-		 * Free resources.
-		 */
-		free(buf);
-	}
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] About to call send_complete\n", sdm_route_get_id());
-
-	/*
-	 * Notify that the send is complete.
-	 */
-	if (msg->send_complete != NULL) {
-		msg->send_complete(msg);
-	}
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Leaving sdm_message_send\n", sdm_route_get_id());
-
-	return 0;
-}
-
-/**
- * Return one socket description related to a socket that is
- * ready to read.
- *
- * @return the socket descriptor, -2 if no socket available for reading, -1 on failure
- *
- * Get the size of the message in bytes
- * @return 0 if successful, -1 if socket closed or error
- *
- * Get a message from a socket. Since message length comes
- * before the message, the sdm_get_count function must
- * be executed first
- *
- * @return 0 if successful, -1 if error
- *
- * Message progress. Caller is responsible for freeing allocated message resources.
- *
- * @return 0 on success, -1 on failure
- */
-int
-sdm_message_progress(void)
-{
-	int		n;
-	int		err;
-	int		len;
-	char *	buf;
-
-	// Retrieve the active socket descriptor
-	int sockfd = sdm_get_active_sock_desc();
-
-	if(sockfd == -1) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Error retrieving socket descriptor\n", sdm_route_get_id());
-		return -1;
-	}
-
-	if (sockfd >= 0) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] receiving header\n", sdm_route_get_id());
-
-		err = sdm_tcpip_msgheader_receive(sockfd, &len);
-
-		if(err != 0) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Error retrieving message size!\n", sdm_route_get_id());
-			return -1;
-		}
-
-		buf = (char *)malloc(len);
-
-		sdm_message msg = sdm_message_new(buf, len);
-
-		if(sdm_tcpip_msgbody_receive(sockfd, buf, len) < 0) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Error retrieving message!\n", sdm_route_get_id());
-			return -1;
-		}
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_progress received len %d from %d\n",
-				sdm_route_get_id(), len, sdm_fetch_nodeid(sockfd));
-
-		msg->id = hex_str_to_int(buf, MESSAGE_ID_SIZE, &buf);
-		len -= MESSAGE_ID_SIZE;
-
-		if ((n = sdm_aggregate_deserialize(msg->aggregate, buf, &buf)) < 0) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] invalid header\n", sdm_route_get_id());
-			return -1;
-		}
-		len -= n;
-
-		if ((n = sdm_set_deserialize(msg->src, buf, &buf)) < 0) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] invalid header\n", sdm_route_get_id());
-			return -1;
-		}
-		len -= n;
-
-		if ((n = sdm_set_deserialize(msg->dest, buf, &buf)) < 0) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] invalid header\n", sdm_route_get_id());
-			return -1;
-		}
-		len -= n;
-
-		msg->payload = buf;
-		msg->payload_len = len;
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_progress agg=%s src=%s dest=%s\n",
-				sdm_route_get_id(),
-				_aggregate_to_str(msg->aggregate),
-				_set_to_str(msg->src),
-				_set_to_str(msg->dest));
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] About to call recv_callback\n", sdm_route_get_id());
-
-		if (sdm_recv_callback  != NULL) {
-			sdm_recv_callback(msg);
-		}
-
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Finished recv_callback\n", sdm_route_get_id());
-	}
-
-	return 0;
-}
-
-void
-sdm_message_set_send_callback(sdm_message msg, void (*callback)(sdm_message msg))
-{
-	msg->send_complete = callback;
-}
-
-void
-sdm_message_set_recv_callback(void (*callback)(sdm_message msg))
-{
-	sdm_recv_callback = callback;
-}
-
-sdm_message
-sdm_message_new(char *buf, int len)
-{
-	static unsigned int ids = 0;
-	sdm_message	msg = (sdm_message)malloc(sizeof(struct sdm_message));
-
-	msg->id = ids++;
-	msg->dest = sdm_set_new();
-	msg->src = sdm_set_new();
-	sdm_set_add_element(msg->src, sdm_route_get_id());
-	msg->buf = buf;
-	msg->buf_len = len;
-	msg->payload = msg->buf;
-	msg->payload_len = msg->buf_len;
-	msg->aggregate = sdm_aggregate_new();
-	msg->send_complete = NULL;
-
-	return msg;
-}
-
-void
-sdm_message_free(sdm_message msg)
-{
-	free(msg->buf);
-	sdm_set_free(msg->src);
-	sdm_set_free(msg->dest);
-	sdm_aggregate_free(msg->aggregate);
-	free(msg);
-}
-
-unsigned int
-sdm_message_get_id(const sdm_message msg)
-{
-	return msg->id;
-}
-
-void
-sdm_message_set_id(const sdm_message msg, unsigned int id)
-{
-	msg->id = id;
-}
-
-void
-sdm_message_set_destination(const sdm_message msg, const sdm_idset dest_ids)
-{
-	sdm_set_union(msg->dest, dest_ids);
-}
-
-sdm_idset
-sdm_message_get_destination(const sdm_message msg)
-{
-	return msg->dest;
-}
-
-void
-sdm_message_set_source(const sdm_message msg, const sdm_idset source)
-{
-	sdm_set_union(msg->src, source);
-}
-
-sdm_idset
-sdm_message_get_source(const sdm_message msg)
-{
-	return msg->src;
-}
-
-void
-sdm_message_get_payload(const sdm_message msg, char **buf, int *len)
-{
-	*buf = msg->payload;
-	*len = msg->payload_len;
-}
-
-sdm_aggregate
-sdm_message_get_aggregate(const sdm_message msg)
-{
-	return msg->aggregate;
-}
-
-void
-sdm_message_set_aggregate(const sdm_message msg, const sdm_aggregate a)
-{
-	sdm_aggregate_copy(msg->aggregate, a);
-}
-
-void
-sdm_message_set_deliver_callback(void (*callback)(const sdm_message msg))
-{
-	deliver_callback = callback;
-}
-
-void
-sdm_message_deliver(const sdm_message msg)
-{
-	if (deliver_callback != NULL) {
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_message_deliver \n", sdm_route_get_id());
-		deliver_callback(msg);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_route_tree.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_route_tree.c
deleted file mode 100644
index 420b3ea..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_route_tree.c
+++ /dev/null

@@ -1,231 +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
- *******************************************************************************/
-
-/*
- * Routing layer implementation. These routines implement a tree-based router. The tree can
- * be either binomial or balanced.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-
-#include "compat.h"
-#include "hash.h"
-#include "sdm.h"
-
-#define ROUTE_BINOMIAL	0
-#define ROUTE_BALANCED	1
-
-static int			size;				/* number of servers */
-static sdm_id		my_id;				/* our ID */
-static sdm_id		parent;				/* ID of our parent */
-static Hash *		child_descendants;	/* hash containing all descendants of each of our children */
-static sdm_idset	children;			/* contains all immediate children of the current location */
-static sdm_idset	descendants;		/* contains all children of the current location */
-static sdm_idset	route;				/* last computed route */
-static sdm_idset	reachable;			/* last set of reachable servers */
-
-int SDM_MASTER;
-
-extern char *	_set_to_str(sdm_idset);
-
-static int	high_bit(int value);
-static void	find_descendents(sdm_idset set, int id_p, int root, int size, int p2, int descend);
-
-#define NORMALIZE(this, size, root) (this + size - root) % size
-
-/*
- * Initialize the routing layer.
- */
-int
-sdm_route_init(int argc, char *argv[]) {
-	int		p2;
-	int	 	this_p;
-	int		high;
-	int 	size;
-	int		this;
-	int		root;
-	sdm_id	child;
-
-	children = sdm_set_new();
-	descendants = sdm_set_new();
-	route = sdm_set_new();
-	reachable = sdm_set_new();
-
-	size = sdm_route_get_size();
-	this = sdm_route_get_id();
-	root = SDM_MASTER;
-	p2 = high_bit(size) << 1;
-	this_p = NORMALIZE(this, size, root);
-	high = high_bit(this_p);
-
-	if (this != root)
-        parent = ((this_p & ~(1 << high)) + root) % size;
-    else
-    	parent = SDM_MASTER;
-
-    find_descendents(children, this_p, root, size, p2, 0);
-    find_descendents(descendants, this_p, root, size, p2, 1);
-
-    child_descendants = HashCreate(sdm_set_size(children)+1);
-
-	for (child = sdm_set_first(children); !sdm_set_done(children); child = sdm_set_next(children)) {
-		sdm_idset desc = sdm_set_new();
-		find_descendents(desc, NORMALIZE(child, size, root), root, size, p2, 1);
-		HashInsert(child_descendants, child, (void *)desc);
-		DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] route for %d is %s \n", sdm_route_get_id(), child, _set_to_str(desc));
-	}
-
-    return 0;
-}
-
-static void
-set_free(void *val)
-{
-	sdm_set_free((sdm_idset)val);
-}
-
-void
-sdm_route_finalize(void)
-{
-	sdm_set_free(children);
-	sdm_set_free(descendants);
-	sdm_set_free(route);
-	sdm_set_free(reachable);
-	HashDestroy(child_descendants, set_free);
-}
-
-/*
- * Given a destination set, compute the route for the message.
- */
-sdm_idset
-sdm_route_get_route(const sdm_idset dest)
-{
-	sdm_id child;
-
-	sdm_set_clear(route);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] sdm_route_get_route dest %s, parent %d\n",
-			sdm_route_get_id(),
-			_set_to_str(dest),
-			parent);
-
-	if (my_id != SDM_MASTER &&
-			(sdm_set_contains(dest, parent) ||
-					sdm_set_contains(dest, SDM_MASTER))) {
-		sdm_set_add_element(route, parent);
-		return route;
-	}
-
-	for (child = sdm_set_first(children); !sdm_set_done(children); child = sdm_set_next(children)) {
-		sdm_idset desc = (sdm_idset)HashSearch(child_descendants, child);
-		if (sdm_set_contains(dest, child) || sdm_set_compare(dest, desc)) {
-			sdm_set_add_element(route, child);
-		}
-	}
-	return route;
-}
-
-/*
- * Given a destination set, compute the set of all destinations
- * reachable from the current location. If the destination is empty,
- * the result is all possible destinations.
- */
-sdm_idset
-sdm_route_reachable(const sdm_idset dest)
-{
-	sdm_set_clear(reachable);
-	sdm_set_union(reachable, descendants);
-	if (my_id != SDM_MASTER) {
-		sdm_set_add_element(reachable, my_id);
-	}
-	sdm_set_intersect(reachable, dest);
-	return reachable;
-}
-
-sdm_id
-sdm_route_get_id(void)
-{
-	return my_id;
-}
-
-void
-sdm_route_set_id(sdm_id id)
-{
-	my_id = id;
-}
-
-sdm_id
-sdm_route_get_parent(void)
-{
-	return parent;
-}
-
-int
-sdm_route_get_size(void)
-{
-	return size;
-}
-
-void
-sdm_route_set_size(int s)
-{
-	size = s;
-}
-
-/*
- * Create a set containing our descendants. If descend is 0, only find immediate
- * children. Assumes that the size of the set will fit into an integer.
- */
-static void
-find_descendents(sdm_idset set, int id_p, int root, int size, int p2, int descend)
-{
-	int				i;
-	int 			high;
-	int 			child;
-	int 			child_p;
-	unsigned int	mask;
-
-	high = high_bit(id_p);
-
-	for (i = high + 1, mask = 1 << i; i <= p2; ++i, mask <<= 1) {
-        child_p = id_p | mask;
-        if (child_p < size) {
-            child = (child_p + root) % size;
-            sdm_set_add_element(set, child);
-            if (descend) {
-            	find_descendents(set, child_p, root, size, p2, descend);
-            }
-        }
-    }
-}
-
-/*
- * Find MSB of value.
- */
-static int
-high_bit(int value)
-{
-	int 			pos = (sizeof(int) << 3) - 1;
-	unsigned int	mask;
-
-	mask = 1 << pos;
-
-	for (; pos >= 0; pos--) {
-		if (value & mask) {
-			break;
-		}
-		mask >>= 1;
-	}
-
-	return pos;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_routing_table_file.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_routing_table_file.c
deleted file mode 100644
index c1d0fcd..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_routing_table_file.c
+++ /dev/null

@@ -1,376 +0,0 @@
-#include "config.h"
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <dirent.h>
-#include <string.h>
-
-#include "sdm.h"
-
-static char * MPIRankVars[] = {
-	"OMPI_MCA_orte_ess_vpid", 		/* Open MPI 1.3 */
-	"OMPI_MCA_ns_nds_vpid", 		/* Open MPI 1.2 */
-	"PMI_RANK", 					/* MPICH2 */
-	"MP_CHILD",						/* IBM PE */
-	NULL
-};
-
-#define BUFFER_SIZE				255
-#define ROUTING_TABLE_TIMEOUT	1000 /* number of tries */
-#define ROUTING_TABLE_WAIT		1000*1000 /* usec */
-
-static int wait_for_routing_file(char *filename, FILE **routing_file, int *route_size, unsigned sec);
-static int read_routing_table_entry(FILE *routing_file, routing_table_entry *entry);
-static int close_routing_file(FILE *routing_file);
-
-static FILE *	routing_file = NULL;
-
-/**
- * Initialize the routetable abstraction. The routetable will provide
- * the total number of processes and the ID to hostname mapping.
- *
- * @return 0 on success, -1 on failure
- */
-int
-sdm_routing_table_init(int argc, char *argv[])
-{
-	FILE *				rt_file;
-	int					rv;
-	int					tbl_size;
-	int					master = 0;
-	int					ch;
-	char *				envval = NULL;
-	char **				var;
-
-	for (ch = 0; ch < argc; ch++) {
-		char * arg = argv[ch];
-		if (strncmp(arg, "--master", 8) == 0) {
-			master = 1;
-			break;
-		}
-	}
-
-	/*
-	 * Master and servers wait for the routing file to appear
-	 */
-	rv = wait_for_routing_file("routing_file", &rt_file, &tbl_size, ROUTING_TABLE_TIMEOUT); //TODO: Get filename from the environment
-	if(rv == -1) { // No need to close, since wait_for_routing_file does it when error
-		// Error!
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Error opening the routing file\n");
-		return -1;
-	} else if(rv == -2){
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Timeout while waiting for routing file\n");
-		return -1;
-	}
-	close_routing_file(rt_file);
-
-	if (tbl_size == 0) {
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Invalid routing file size\n");
-		return -1;
-	}
-
-	sdm_route_set_size(tbl_size+1);
-	SDM_MASTER = tbl_size;
-
-	/*
-	 * Since the SDM servers will be started by the mpirun, get
-	 * the ID from the environment.
-	 * Important! If the variable is not declared, then
-	 * this sdm is the master.
-	 */
-
-	for (var = MPIRankVars; *var != NULL; var++) {
-		envval = getenv(*var);
-		if (envval != NULL) {
-			break;
-		}
-	}
-
-	if (!master && envval == NULL) {
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Could not find my ID!\n");
-		return -1;
-	}
-
-	if (envval != NULL) {
-		int id = strtol(envval, NULL, 10);
-		sdm_route_set_id(id);
-	} else {
-		sdm_route_set_id(SDM_MASTER);
-	}
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] size %d\n", sdm_route_get_id(), sdm_route_get_size());
-
-	/*
-	 * Once we have size and ID we can initialize child/parent relationships. This may need
-	 * to happen at a different time if we are receiving the routing table from a parent.
-	 */
-	if (sdm_route_init(argc, argv) < 0) {
-		return -1;
-	}
-
-	return 0;
-}
-
-void
-sdm_routing_table_set(void)
-{
-	int	rv;
-	int	tbl_size;
-
-	if (routing_file != NULL) {
-		close_routing_file(routing_file);
-		routing_file = NULL;
-	}
-
-	rv = wait_for_routing_file("routing_file", &routing_file, &tbl_size, ROUTING_TABLE_TIMEOUT); //TODO: Get filename from the environment
-	if (rv == -1) { // No need to close, since wait_for_routing_file does it when error
-		// Error!
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Error opening the routing file\n");
-	} else if (rv == -2) {
-		DEBUG_PRINTS(DEBUG_LEVEL_CLIENT, "Timeout while waiting for routing file\n");
-	}
-}
-
-routing_table_entry *
-sdm_routing_table_next(void)
-{
-	int	rv;
-	static routing_table_entry	entry;
-
-	if (routing_file == NULL) {
-		return NULL;
-	}
-
-	rv = read_routing_table_entry(routing_file, &entry);
-
-	if (rv < 0) {
-		if (rv == -1) {
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] Error reading routing table entry\n", sdm_route_get_id());
-		}
-		close_routing_file(routing_file);
-		routing_file = NULL;
-		return NULL;
-	}
-
-	return &entry;
-}
-
-/*
- * Get the number of lines in a file.
- * File pointer is set to the beginning of the file
- *
- * @return number of lines
- *
- */
-static int
-line_count(FILE *file)
-{
-	int num_lines = 0;
-
-	int ret_val;
-	char ret_char;
-
-	fseek(file, 0, SEEK_SET);
-
-	while(1) {
-		ret_val = fgetc(file);
-
-		if(ret_val == EOF) {
-			if(ferror(file))
-				return -1;
-			break;
-		}
-
-		ret_char = (char)ret_val;
-
-		if(ret_char == '\n')
-			num_lines++;
-	}
-	fseek(file, 0, SEEK_SET);
-
-	return num_lines;
-}
-
-/**
- * Read an entry of an opened routing_file on the table pointer.
- * Assumes file pointer must be at the beginning of a line after the header
- *
- * @return 0 if successful, -2 if EOF, -1 if error
- */
-static int
-read_routing_table_entry(FILE *routing_file, routing_table_entry *entry)
-{
-	int rv;
-	rv = fscanf(routing_file, "%d %255s %d\n",
-			&(entry->nodeID), entry->hostname,
-			&(entry->port));
-
-	DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] nodeID: %d, hostname: %s, port: %d\n", sdm_route_get_id(),
-			entry->nodeID, entry->hostname, entry->port);
-
-	if (rv == EOF)
-		return -2;
-	// Error reading file
-	if(ferror(routing_file)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-/*
- * Read the routing table to the passed structure.
- */
-/*int read_routing_table(FILE *routing_file, int num_entries, struct routing_tbl_struct *table)
-{
-	int i, rv;
-
-	// Get the file size from the beginning of the file
-
-
-	for(i=0; i < num_entries; i++) {
-		rv = fscanf(routing_file, "%255s;%255s;%d\n",
-				table[i].nodeID, table[i].hostname,
-				&(table[i].port));
-
-		// Error reading file
-		if(ferror(routing_file))
-			return -1;
-	}
-
-}*/
-
-/**
- * Get the number of lines from the header of the file
- * It will set the file pointer to just after the header of the file
- *
- * @return -2 if file at EOF, -1 if error, 0 if successful
- */
-static int
-read_routing_table_size(FILE *routing_file, int *size)
-{
-	int rv;
-
-	fseek(routing_file, 0, SEEK_SET);
-	rv = fscanf(routing_file, "%d\n", size);
-
-	if(ferror(routing_file) != 0)
-		return -1;
-	if(rv != 1)
-		return -2; // Just EOF
-
-	return 0;
-}
-
-/**
- * Close a routing table pointed by th routing_file parameter
- *
- * @return 0 on success, -1 on failure
- */
-static int
-close_routing_file(FILE *routing_file)
-{
-	return fclose(routing_file);
-}
-
-/**
- * Wait for sec seconds for a routing file filename, returning its file pointer in
- * the routing_file parameter.
- *
- * @return 0 if successful, -1 if error, -2 if file not ready in sec seconds
- */
-static int
-wait_for_routing_file(char *filename, FILE **routing_file, int *route_size, unsigned sec)
-{
-	FILE *	fp;
-	char	wd[MAXPATHLEN];
-
-	getcwd(wd, MAXPATHLEN);
-
-	// Wait for file to be created
-	while (sec-- > 0) {
-		/*
-		 * List files to force an updated view of the working directory before
-		 * opening the rounting_file. On NFS file systems, fopen never sees
-		 * recently created files without the update.
-		 */
-		DIR * dir = opendir(wd);
-		closedir(dir);
-
-		fp = fopen(filename, "r");
-
-		if (fp == NULL) {
-			if (errno != ENOENT) {
-				perror("fopen");
-				return -1;
-			}
-			// File not created yet. Wait...
-		} else {
-			int eff_size, size;
-			int rv;
-
-			// Compare the filesize with the size on the header of the file
-			eff_size = line_count(fp); // Returns FILE pointer to 0
-			rv = read_routing_table_size(fp, &size); // Returns FILE pointer to
-															// the after the header
-
-			DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] effsize: %d, size: %d, rv: %d\n", sdm_route_get_id(),
-					eff_size, size, rv);
-
-			switch (rv) {
-			case -1:
-				// error
-				return -1;
-				break;
-			case -2:
-				// Size not available yet. Close file and wait
-				fclose(fp);
-				break;
-			default:
-				// We have file size. Now wait until effective file size equals
-				// file size
-				if ((eff_size - 1) == size) {
-					*routing_file = fp;
-					*route_size = size;
-					return 0;
-				}
-
-				fclose(fp);
-			}
-		}
-
-		usleep(ROUTING_TABLE_WAIT);
-	}
-
-	return -2;
-}
-
-
-/*int main(int argc, char *argv[])
-{
-	int rv, i;
-
-	FILE * routing_file = fopen("routing_file", "r");
-
-	struct routing_tbl_struct * route_tbl;
-	int num_lines;
-
-	// Allocs structure size based on the file size
-	if((num_lines = line_count(routing_file)) <= 0)
-		return -1;
-
-	route_tbl = (struct routing_tbl_struct *)malloc(sizeof(struct routing_tbl_struct) * num_lines);
-
-	// Read entries to the structure
-	rv = read_routing_table(routing_file, num_lines, route_tbl);
-
-	if(rv <= 0)
-		return -1;
-
-	//
-
-}*/

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_set_bitset.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_set_bitset.c
deleted file mode 100644
index 1b4b4a0..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm_set_bitset.c
+++ /dev/null

@@ -1,204 +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
- *******************************************************************************/
-
-/*
- * ID set implementation. These routines implement a set abstraction using bitsets.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "compat.h"
-#include "bitset.h"
-#include "sdm.h"
-
-struct sdm_idset {
-	bitset *	set;
-	int			iterator;
-};
-
-sdm_idset
-sdm_set_new(void)
-{
-	sdm_idset set = (sdm_idset)malloc(sizeof(struct sdm_idset));
-	set->set = bitset_new(sdm_route_get_size());
-	set->iterator = 0;
-	return set;
-}
-
-void
-sdm_set_free(sdm_idset set)
-{
-	bitset_free(set->set);
-	free(set);
-}
-
-sdm_idset
-sdm_set_clear(sdm_idset set)
-{
-	bitset_clear(set->set);
-	return set;
-}
-
-int
-sdm_set_size(const sdm_idset set)
-{
-	return bitset_count(set->set);
-}
-
-int
-sdm_set_is_subset(const sdm_idset set1, const sdm_idset set2)
-{
-	return bitset_eq(set1->set, set2->set);
-}
-
-int
-sdm_set_compare(const sdm_idset set1, const sdm_idset set2)
-{
-	return bitset_compare(set1->set, set2->set);
-}
-
-int
-sdm_set_contains(const sdm_idset set, const sdm_id id)
-{
-	return bitset_test(set->set, id) == 1;
-}
-
-sdm_id
-sdm_set_first(const sdm_idset set)
-{
-	set->iterator = bitset_firstset(set->set);
-	return set->iterator;
-}
-
-sdm_id
-sdm_set_next(const sdm_idset set)
-{
-	while (set->iterator < bitset_size(set->set)) {
-		set->iterator++;
-		if (bitset_test(set->set, set->iterator)) {
-			break;
-		}
-	}
-
-	return set->iterator;
-}
-
-int
-sdm_set_done(const sdm_idset set)
-{
-	return set->iterator < 0 || set->iterator >= bitset_size(set->set);
-}
-
-int
-sdm_set_is_empty(const sdm_idset set)
-{
-	return bitset_isempty(set->set);
-}
-
-sdm_idset
-sdm_set_add_element(const sdm_idset set, const sdm_id id)
-{
-	bitset_set(set->set, id);
-	return set;
-}
-
-sdm_idset
-sdm_set_remove_element(const sdm_idset set, const sdm_id id)
-{
-	bitset_unset(set->set, id);
-	return set;
-}
-
-sdm_idset
-sdm_set_add_all(const sdm_idset set, const sdm_id id)
-{
-	bitset *b = bitset_new(id+1);
-	bitset_invert(b);
-	bitset_oreq(set->set, b);
-	bitset_free(b);
-	return set;
-}
-
-sdm_idset
-sdm_set_union(const sdm_idset set1, const sdm_idset set2)
-{
-	bitset_oreq(set1->set, set2->set);
-	return set1;
-}
-
-sdm_idset
-sdm_set_intersect(const sdm_idset set1, const sdm_idset set2)
-{
-	/*
-	 * If either set is empty, the result is U (the universe)
-	 */
-	if (bitset_isempty(set1->set) || bitset_isempty(set2->set)) {
-		bitset_clear(set1->set);
-		bitset_invert(set1->set);
-	} else {
-		bitset_andeq(set1->set, set2->set);
-	}
-	return set1;
-}
-
-sdm_idset
-sdm_set_diff(const sdm_idset set1, const sdm_idset set2)
-{
-	bitset_andeqnot(set1->set, set2->set);
-	return set1;
-}
-
-sdm_id
-sdm_set_max(const sdm_idset set)
-{
-	return bitset_size(set->set) - 1;
-}
-
-int
-sdm_set_serialize(const sdm_idset set, char *buf, char **end)
-{
-	char *	str = bitset_to_str(set->set);
-	int		len = strlen(str);
-
-	memcpy(buf, str, len);
-	free(str);
-	if (end != NULL) {
-		*end = buf + len;
-	}
-	return len;
-}
-
-int
-sdm_set_serialized_length(const sdm_idset set)
-{
-	return sizeof(int) * 2 + 1 + bitset_size(set->set) / 4;
-}
-
-int
-sdm_set_deserialize(sdm_idset set, char *buf, char **end)
-{
-	char *		e;
-	bitset *	b = str_to_bitset(buf, &e);
-
-	bitset_copy(set->set, b);
-	bitset_free(b);
-	if (end != NULL) {
-		*end = e;
-	}
-	return e - buf;
-}
-
-char *
-_set_to_str(sdm_idset set)
-{
-	return bitset_to_set(set->set);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/src/mi/.cvsignore
deleted file mode 100644
index 1a3d1a5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-.dirstamp
-.deps

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/CLICommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/CLICommand.c
deleted file mode 100644
index 19892d6..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/CLICommand.c
+++ /dev/null

@@ -1,80 +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
- ******************************************************************************/
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "MICommand.h"
-
-MICommand *
-MIGDBVersion(void)
-{
-	MICommand * cmd;
-	cmd = MICommandNew("-gdb-version", MIResultRecordDONE);
-	return cmd;
-}
-
-MICommand *
-CLIHandle(char *arg) {
-	MICommand * cmd;
-	cmd = MICommandNew("handle", MIResultRecordDONE);
-	MICommandAddOption(cmd, arg, NULL);
-	return cmd;
-}
-
-MICommand *
-CLIInfoThreads(void) {
-	MICommand * cmd;
-	cmd = MICommandNew("info threads", MIResultRecordDONE);
-	return cmd;
-}
-
-MICommand *
-CLIPType(char *name) {
-	MICommand * cmd;
-	cmd = MICommandNew("ptype", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}
-
-MICommand * 
-CLIListSignals(char *name) {
-	MICommand * cmd;
-	cmd = MICommandNew("info signals", MIResultRecordDONE);
-	if (name != NULL) {
-		MICommandAddOption(cmd, name, NULL);
-	}	
-	return cmd;
-}
-	
-MICommand * 
-CLISignalInfo(char *arg) {
-	MICommand * cmd;
-	cmd = MICommandNew("signal", MIResultRecordDONE);
-	MICommandAddOption(cmd, arg, NULL);
-	return cmd;
-}	
-
-MICommand * 
-CLIFrame(void) {
-	MICommand * cmd;
-	cmd = MICommandNew("frame", MIResultRecordDONE);
-	return cmd;
-}	

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.c
deleted file mode 100644
index 6e0ef1d..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.c
+++ /dev/null

@@ -1,262 +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
- *******************************************************************************/
- 
- /**
- * @author Clement chu
- * 
- */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "MIOOBRecord.h"
-#include "CLIOutput.h"
-
-#include "signalinfo.h"
-
-static int 
-getBoolean(char* value) 
-{
-	if (value != NULL && strncmp(value, "Yes", 3) == 0) {
-		return 1;
-	}
-	return 0;
-}
-
-void 
-CLIGetSigHandleList(MICommand *cmd, List** signals) 
-{
-	List *oobs;
-	MIOOBRecord *oob;
-	char *text = NULL;
-	
-	const char* delims[] = { " ", "\\" };
-	char *token, *pch;
-	int i;
-	
-	signalinfo *sig;
-	*signals = NewList();
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->oobs == NULL)
-		return;
-
-	oobs = cmd->output->oobs;
-	for (SetList(oobs); (oob = (MIOOBRecord *)GetListElement(oobs)) != NULL; ) {
-		text = oob->cstring;
-		if (*text == '\0' || *text == '\\') {
-			continue;
-		}
-		
-		if (strncmp(text, "Signal", 6) != 0 && strncmp(text, "Use", 3) != 0 && strncmp(text, "info", 4) != 0) {
-			token = strdup(text);
-			pch = strstr(token, delims[0]);
-			if (pch == NULL) {
-				continue;
-			}
-			sig = NewSignalInfo();
-			for (i=0; pch != NULL; i++,pch=strstr(token, delims[1])) {
-				if (*pch == '\0') {
-					break;
-				}
-				
-				*pch = '\0';
-				pch++;
-				while (*pch == ' ' || *pch =='t') { //remove whitespace or t character
-					pch++;
-				}
-				if (*pch == '\\') { //ignore '\\t' again
-					pch += 2;
-				}
-
-//printf("---token(%d): %s\n", i, strdup(token));
-				switch(i) {
-					case 0:
-						sig->name = strdup(token);
-						break;
-					case 1:
-						sig->stop = getBoolean(token);
-						break;
-					case 2:
-						sig->print = getBoolean(token);
-						break;
-					case 3:
-						sig->pass = getBoolean(token);
-						break;
-					case 4:
-						sig->desc = strdup(token);
-						break;
-				}
-				token = strdup(pch);
-			}
-			free(token);
-			free(pch);
-			AddToList(*signals, (void *)sig);			
-		}
-	}
-}
-
-double 
-CLIGetGDBVersion(MICommand *cmd)
-{
-	List *			oobs;
-	MIOOBRecord *	oob;
-	char *			text;
-	
-	if (!cmd->completed || cmd->output == NULL || cmd->output->oobs == NULL) {
-		return -1.0;
-	}
-
-	if (cmd->output->rr != NULL && cmd->output->rr->resultClass == MIResultRecordERROR) {
-		return -1.0;
-	}
-
-	oobs = cmd->output->oobs;
-	for (SetList(oobs); (oob = (MIOOBRecord *)GetListElement(oobs)) != NULL; ) {
-		text = oob->cstring;
-		if (*text == '\0') {
-			continue;
-		}
-		while (*text == ' ') {
-			text++;
-		}
-		
-		/*
-		 * linux self: GUN gdb 6.5.0
-		 * fedore: GNU gdb Red Hat Linux (6.5-8.fc6rh)
-		 * Mac OS X: GNU gdb 6.1-20040303 (Apple version gdb-384) (Mon Mar 21 00:05:26 GMT 2005)
-		 */
-		if (strncmp(text, "GNU gdb", 7) == 0) {
-			/*
-			 * bypass "GNU gdb"
-			 */
-			text += 8;
-			
-			/*
-			 * find first digit
-			 */
-			while (*text != '\0' && !isdigit(*text))
-				text++;
-				
-			/*
-			 * Convert whatever is here to a double
-			 */
-			if (*text != '\0')
-				return strtod(text, NULL);
-		}
-	}
-	return -1.0;
-}
-
-char *
-CLIGetPTypeInfo(MICommand *cmd) {
-	List *oobs;
-	MIOOBRecord *oob;
-	char *text = NULL;
-	char *p = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->oobs == NULL)
-		return NULL;
-
-	oobs = cmd->output->oobs;
-	for (SetList(oobs); (oob = (MIOOBRecord *)GetListElement(oobs)) != NULL; ) {
-		text = oob->cstring;
-		if (*text == '\0') {
-			continue;
-		}
-		while (*text == ' ') {
-			text++;
-		}
-
-		if (strncmp(text, "type", 4) == 0) {
-			text += 7; //bypass " = "
-			p = strchr(text, '{');
-			if (p != NULL) {
-				*(--p) = '\0';//remove the whitespace before {
-				return strdup(text);
-			}
-			p = strchr(text, '\\');
-			if (p != NULL) {
-				*p = '\0';
-				return strdup(text);
-			}
-		}
-	}
-	return NULL;
-}
-
-CLIInfoThreadsInfo *
-CLIInfoThreadsInfoNew(void) 
-{
-	CLIInfoThreadsInfo * info;
-	info = (CLIInfoThreadsInfo *)malloc(sizeof(CLIInfoThreadsInfo));
-	info->current_thread_id = 1;
-	info->thread_ids = NULL;
-	return info;
-}
-
-CLIInfoThreadsInfo *
-CLIGetInfoThreadsInfo(MICommand *cmd) 
-{
-	List *oobs;
-	MIOOBRecord *oob;
-	CLIInfoThreadsInfo * info = CLIInfoThreadsInfoNew();
-	char * text = NULL;
-	char * id = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->oobs == NULL) {
-		return info;
-	}
-
-	if (cmd->output->rr != NULL && cmd->output->rr->resultClass == MIResultRecordERROR) {
-		return info;
-	}
-
-	oobs = cmd->output->oobs;
-	info->thread_ids = NewList();
-	for (SetList(oobs); (oob = (MIOOBRecord *)GetListElement(oobs)) != NULL; ) {
-		text = oob->cstring;
-		
-		if (*text == '\0') {
-			continue;
-		}
-		while (*text == ' ') {
-			text++;
-		}
-		if (strncmp(text, "*", 1) == 0) {
-			text += 2;//escape "* ";
-			if (isdigit(*text)) {
-				info->current_thread_id = strtol(text, &text, 10);
-			}
-			continue;
-		}
-		if (isdigit(*text)) {
-			if (info->thread_ids == NULL)
-				info->thread_ids = NewList();
-
-			id = strchr(text, ' ');
-			if (id != NULL) {
-				*id = '\0';
-				AddToList(info->thread_ids, (void *)strdup(text));
-			}
-		}
-	}
-	return info;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.h
deleted file mode 100644
index cfb748f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/CLIOutput.h
+++ /dev/null

@@ -1,43 +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
- *******************************************************************************/
- 
- /**
- * @author Clement chu
- * 
- */
- 
-#ifndef _CLISIGHANDLE_H_
-#define _CLISIGHANDLE_H_
-
-#include "list.h"
-#include "MICommand.h"
-
-struct CLIInfoThreadsInfo {
-	int current_thread_id;
-	List * thread_ids;
-};
-typedef struct CLIInfoThreadsInfo CLIInfoThreadsInfo;
-
-extern void CLIGetSigHandleList(MICommand *cmd, List **signals);
-extern double CLIGetGDBVersion(MICommand *cmd);
-extern char *CLIGetPTypeInfo(MICommand *cmd);
-extern CLIInfoThreadsInfo *CLIInfoThreadsInfoNew(void);
-extern CLIInfoThreadsInfo *CLIGetInfoThreadsInfo(MICommand *cmd);
-
-#endif /* _CLISIGHANDLE_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MI.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MI.h
deleted file mode 100644
index d0f2175..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MI.h
+++ /dev/null

@@ -1,36 +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
- ******************************************************************************/
- 
-#ifndef _MI_H_
-#define _MI_H_
-
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MISession.h"
-#include "MICommand.h"
-#include "MIBreakpoint.h"
-#include "MIFrame.h"
-#include "MIThread.h"
-#include "MIVar.h"
-#include "MIArg.h"
-#include "MIError.h"
-#include "MIMemory.h"
-#include "CLIOutput.h"
-
-#endif /* _MI_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.c
deleted file mode 100644
index ff62c65..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.c
+++ /dev/null

@@ -1,132 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIArg.h"
-
-MIArg *
-MIArgNew(void)
-{
-	MIArg *	arg = (MIArg *)malloc(sizeof(MIArg));
-	arg->name = NULL;
-	arg->value = NULL;
-	return arg;
-}
-
-void
-MIArgFree(MIArg *arg)
-{
-	if (arg->name != NULL)
-		free(arg->name);
-	if (arg->value != NULL)
-		free(arg->value);
-	free(arg);
-}
-
-/**
- * Parsing a MIList of the form:
- * [{name="xxx",value="yyy"},{name="xxx",value="yyy"},..]
- * [name="xxx",name="xxx",..]
- * [{name="xxx"},{name="xxx"}]
- * 
- * Parsing a MITuple of the form:
- * {{name="xxx",value="yyy"},{name="xxx",value="yyy"},..}
- * {name="xxx",name="xxx",..}
- * {{name="xxx"},{name="xxx"}}
- */
-List *
-MIArgsParse(MIValue *miValue) 
-{
-	List *		aList = NewList();
-	List *		values = miValue->values;
-	List *		results = miValue->results;
-	MIValue *	value;
-	MIResult *	result;
-	
-	if (values != NULL) {
-		for (SetList(values); (value = (MIValue *)GetListElement(values)) != NULL; ) {
-			if (value->type == MIValueTypeTuple) {
-				MIArg *arg = MIArgParse(value);
-				if (arg != NULL) {
-					AddToList(aList, (void *)arg);
-				}
-			}
-		}
-	}
-	
-	if (results != NULL) {
-		for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL; ) {
-			value = result->value;
-			if (value->type == MIValueTypeConst) {
-				MIArg *arg = MIArgNew();
-				arg->name = strdup(value->cstring);
-				AddToList(aList, (void *)arg);
-			}
-		}
-	}
-	
-	return aList;
-}
-
-/**
- * Parsing a MITuple of the form:
- * {name="xxx",value="yyy"}
- * {name="xxx"}
- */
-MIArg *
-MIArgParse(MIValue *tuple)
-{
-	MIValue *	value;
-	MIResult *	result;
-	char *		str;
-	MIArg *		arg = MIArgNew();
-	
-	for (SetList(tuple->results); (result = (MIResult *)GetListElement(tuple->results)) != NULL; ) {
-		value = result->value;
-		if (value != NULL && value->type == MIValueTypeConst) {
-			str = value->cstring;
-		} else {
-			str = "";
-		}
-
-		if (strcmp(result->variable, "name") == 0) {
-			arg->name = strdup(str);
-		} else if (strcmp(result->variable, "value") == 0) {
-			arg->value = strdup(str);
-		}
-	}
-	
-	return arg;
-}
-
-MIString *
-MIArgToString(MIArg *arg)
-{
-	return MIStringNew("%s=%s", arg->name, arg->value);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.h
deleted file mode 100644
index 53f6385..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIArg.h
+++ /dev/null

@@ -1,44 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#ifndef _MIARG_H_
-#define _MIARG_H_
-
-#include "list.h"
-#include "MIString.h"
-
-/**
- * Represents a set name=value.
- */
-struct MIArg {
-	char * name;
-	char * value;
-};
-typedef struct MIArg	MIArg;
-
-extern MIArg *MIArgNew(void);
-extern void MIArgFree(MIArg *arg);
-extern List *MIArgsParse(MIValue *miValue);
-extern MIArg *MIArgParse(MIValue *tuple);
-extern MIString *MIArgToString(MIArg *arg);
-#endif /* _MIARG_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakCommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakCommand.c
deleted file mode 100644
index ba009b6..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakCommand.c
+++ /dev/null

@@ -1,152 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIBreakpoint.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIString.h"
-
-MICommand *
-MIBreakInsert(int isTemporary, int isHardware, char *condition, int ignoreCount, char *where, int tid)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-break-insert", MIResultRecordDONE);
-
-	if (isTemporary) {
-		MICommandAddOption(cmd, "-t", NULL);
-	} else if (isHardware) {
-		MICommandAddOption(cmd, "-h", NULL);
-	}
-	if (condition != NULL) {
-		MICommandAddOption(cmd, "-c", condition);
-	}
-	if (ignoreCount > 0) {
-		MICommandAddOption(cmd, "-i", MIIntToCString(ignoreCount));
-	}
-	if (tid > 0) {
-		MICommandAddOption(cmd, "-p", MIIntToCString(tid));
-	}
-	
-	MICommandAddOption(cmd, where, NULL);
-	
-	return cmd;
-}
-
-MICommand *
-MIBreakDelete(int nbps, int *bpids)
-{
-	int 			i;
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-break-delete", MIResultRecordDONE);
-	
-	for (i = 0; i < nbps; i++) {
-		MICommandAddOption(cmd, MIIntToCString(bpids[i]), NULL);
-	}
-	
-	return cmd;
-}
-
-MICommand *
-MIBreakDisable(int nbps, int *bpids)
-{
-	int 		i;
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-break-disable", MIResultRecordDONE);
-	
-	for (i = 0; i < nbps; i++) {
-		MICommandAddOption(cmd, MIIntToCString(bpids[i]), NULL);
-	}
-	
-	return cmd;
-}
-
-MICommand *
-MIBreakEnable(int nbps, int *bpids)
-{
-	int 		i;
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-break-enable", MIResultRecordDONE);
-	
-	for (i = 0; i < nbps; i++) {
-		MICommandAddOption(cmd, MIIntToCString(bpids[i]), NULL);
-	}
-	
-	return cmd;
-}
-
-//-break-condition NUMBER EXPR
-MICommand *
-MIBreakCondition(int nbps, int *bpids, char *expr)
-{
-	int 		i;
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-break-condition", MIResultRecordDONE);
-	
-	for (i = 0; i < nbps; i++) {
-		MICommandAddOption(cmd, MIIntToCString(bpids[i]), expr);
-	}	
-	return cmd;
-}
-
-//-break-watch [ -a | -r ]
-MICommand *
-MIBreakWatch(char *expr, int access, int read)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-break-watch", MIResultRecordDONE);
-
-	if (access) {
-		MICommandAddOption(cmd, "-a", NULL);
-	} else if (read) {
-		MICommandAddOption(cmd, "-r", NULL);
-	}
-
-	MICommandAddOption(cmd, expr, NULL);
-	return cmd;
-}
-
-//-break-after NUMBER COUNT
-MICommand *
-MIBreakAfter(int nbps, int *bpids, int ignoreCount)
-{
-	int i;
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-break-after", MIResultRecordDONE);
-
-	for (i = 0; i < nbps; i++) {
-		MICommandAddOption(cmd, MIIntToCString(bpids[i]), MIIntToCString(ignoreCount));
-	}	
-	return cmd;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.c
deleted file mode 100644
index 281af45..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.c
+++ /dev/null

@@ -1,212 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIBreakpoint.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIString.h"
-
-MIBreakpoint *
-MIBreakpointNew(void)
-{
-	MIBreakpoint *	bp;
-	
-	bp = (MIBreakpoint *)malloc(sizeof(MIBreakpoint));
-	bp->number = 0;
-	bp->enabled = 0;
-	bp->line = 0;
-	bp->times = 0;
-	bp->ignore = 0;
-	bp->isWpt = 0;
-	bp->isAWpt = 0;
-	bp->isRWpt = 0;
-	bp->isWWpt = 0;
-	bp->isHdw = 0;
-	bp->type = NULL;
-	bp->disp = NULL;
-	bp->address = NULL;
-	bp->func = NULL;
-	bp->file = NULL;
-	bp->cond = NULL;
-	bp->what = NULL;
-	bp->threadId = NULL;
-	return bp;
-}
-
-void
-MIBreakpointFree(MIBreakpoint *bp)
-{
-	if (bp->type != NULL)
-		free(bp->type);
-	if (bp->disp != NULL)
-		free(bp->disp);
-	if (bp->address != NULL)
-		free(bp->address);
-	if (bp->func != NULL)
-		free(bp->func);
-	if (bp->file != NULL)
-		free(bp->file);
-	if (bp->cond != NULL)
-		free(bp->cond);
-	if (bp->what != NULL)
-		free(bp->what);
-	if (bp->threadId != NULL)
-		free(bp->threadId);
-	free(bp);
-}
-
-MIBreakpoint *
-MIBreakpointParse(MIValue *tuple) 
-{
-	char *			str;
-	char *			var;
-	MIValue *		value;
-	MIResult *		result;
-	List *			results = tuple->results;
-	MIBreakpoint *	bp = MIBreakpointNew();
-	
-	for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL;) {
-		var = result->variable;
-		value = result->value;
-
-		if (value == NULL || value->type != MIValueTypeConst)
-			continue;
-
-		str = value->cstring;
-		
-		if (strcmp(var, "number") == 0) {
-			bp->number = (int)strtol(str, NULL, 10);
-		} else if (strcmp(var, "type") == 0) {
-			bp->type = strdup(str);
-			//type="hw watchpoint"
-			if (strncmp(str, "hw", 2) == 0) {
-				bp->isHdw = 1;
-				bp->isWWpt = 1;
-				bp->isWpt = 1;
-			}
-			//type="acc watchpoint"
-			if (strncmp(str, "acc", 3) == 0) {
-				bp->isWWpt = 1;
-				bp->isRWpt = 1;
-				bp->isWpt = 1;
-			}
-			//type="read watchpoint"
-			if (strncmp(str, "read", 4) == 0) {
-				bp->isRWpt = 1;
-				bp->isWpt = 1;
-			}
-			// ??
-			if (strcmp(str, "watchpoint") == 0) {
-				bp->isWpt = 1;
-			}
-			// type="breakpoint"
-			// default ok.
-		} else if (strcmp(var, "disp") == 0) {
-			bp->disp = strdup(str);
-		} else if (strcmp(var, "enabled") == 0) {
-			bp->enabled = strcmp(str, "y") == 0;
-		} else if (strcmp(var, "addr") == 0) {
-			bp->address = strdup(str);
-		} else if (strcmp(var, "func") == 0) {
-			bp->func = strdup(str);
-		} else if (strcmp(var, "file") == 0) {
-			bp->file = strdup(str);
-		} else if (strcmp(var, "thread") == 0) {
-			bp->threadId = strdup(str);
-		} else if (strcmp(var, "line") == 0) {
-			bp->line = (int)strtol(str, NULL, 10);
-		} else if (strcmp(var, "times") == 0) {
-			bp->times = (int)strtol(str, NULL, 10);
-		} else if (strcmp(var, "what") == 0 || strcmp(var, "exp") == 0) { //$NON-NLS-2$
-			bp->what = strdup(str);
-		} else if (strcmp(var, "ignore") == 0) {
-			bp->ignore = (int)strtol(str, NULL, 10);
-		} else if (strcmp(var, "cond") == 0) {
-			bp->cond = strdup(str);
-		}
-	}
-	
-	return bp;
-}
-
-List *
-MIBreakpointGetBreakInsertInfo(MICommand *cmd)
-{
-	char *			var;
-	MIValue *		val;
-	MIResult *		result;
-	MIBreakpoint *	bpt;
-	MIResultRecord *	rr;
-	List *			breakpoints = NULL;
-	
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-		
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		var = result->variable;
-		val = result->value;
-		
-		bpt = NULL;
-		if (strcmp(var, "wpt") == 0) {
-			if (val->type == MIValueTypeTuple) {
-				bpt = MIBreakpointParse(val);
-				bpt->enabled = 1;
-				bpt->isWpt = 1;
-				bpt->isWWpt = 1;
-			}
-		} else if (strcmp(var, "bkpt") == 0) {
-			if (val->type == MIValueTypeTuple) {
-				bpt = MIBreakpointParse(val);
-				bpt->enabled = 1;
-			}
-		} else if (strcmp(var, "hw-awpt") == 0) {
-			if (val->type == MIValueTypeTuple) {
-				bpt = MIBreakpointParse(val);
-				bpt->enabled = 1;
-				bpt->isWpt = 1;
-				bpt->isAWpt = 1;
-			}
-		} else if (strcmp(var, "hw-rwpt") == 0) {
-			if (val->type == MIValueTypeTuple) {
-				bpt = MIBreakpointParse(val);
-				bpt->enabled = 1;
-				bpt->isWpt = 1;
-				bpt->isRWpt = 1;
-			}
-		}
-		if (bpt != NULL) {
-			if (breakpoints == NULL)
-				breakpoints = NewList();
-
-			AddToList(breakpoints, (void *)bpt);
-		}
-	}
-		
-	return breakpoints;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.h
deleted file mode 100644
index 3c5da15..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIBreakpoint.h
+++ /dev/null

@@ -1,95 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-  
-/**
- * Contain info about the GDB/MI breakpoint info.
- *<ul>
- * <li>
- * -break-insert main
- * ^done,bkpt={number="1",type="breakpoint",disp="keep",enabled="y",addr="0x0804846b",func="main",file="hello.c",line="4",times="0"}
- * (gdb)
- * </li>
- * <li>
- * -break-insert -t main
- * ^done,bkpt={number="2",type="breakpoint",disp="del",enabled="y",addr="0x0804846b",func="main",file="hello.c",line="4",times="0"}
- * </li>
- * <li>
- * -break-insert -c 1 main
-^done,bkpt={number="3",type="breakpoint",disp="keep",enabled="y",addr="0x0804846b",func="main",file="hello.c",line="4",cond="1",times="0"}
- * </li>
- * <li>
- * -break-insert -h main
- * ^done,bkpt={number="4",type="hw breakpoint",disp="keep",enabled="y",addr="0x0804846b",func="main",file="hello.c",line="4",times="0"}
- * <li>
- * -break-insert -p 0 main
- * ^done,bkpt={number="5",type="breakpoint",disp="keep",enabled="y",addr="0x0804846b",func="main",file="hello.c",line="4",thread="0",thread="0",times="0"}
- * </li>
- * <li>
- * -break-insert -a p
- * ^done,hw-awpt={number="2",exp="p"}
- * </li>
- * <li>
- * -break-watch -r p
- * ^done,hw-rwpt={number="4",exp="p"}
- * </li>
- * <li>
- * -break-watch p
- * ^done,wpt={number="6",exp="p"}
- * </li>
- *</ul>
- */
-#ifndef _MIBREAKPOINT_H_
-#define _MIBREAKPOINT_H_
-
-#include "MICommand.h"
-#include "MIValue.h"
-
-struct MIBreakpoint {
-	int		number;
-	char *	type;
-	char *	disp;
-	int		enabled;
-	char *	address;
-	char *	func;
-	char *	file;
-	int		line;
-	char *	cond;
-	int		times;
-	char *	what;
-	char *	threadId;
-	int		ignore;
-
-	int		isWpt;
-	int		isAWpt;
-	int		isRWpt;
-	int		isWWpt;
-	int		isHdw;
-};
-typedef struct MIBreakpoint	MIBreakpoint;
-
-extern MIBreakpoint *MIBreakpointNew(void);
-extern void MIBreakpointFree(MIBreakpoint *bp);
-extern MIBreakpoint *MIBreakpointParse(MIValue *tuple);
-extern List *MIBreakpointGetBreakInsertInfo(MICommand *cmd);
-#endif /* _MIBREAKPOINT_H_ */
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.c
deleted file mode 100644
index d190ef4..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.c
+++ /dev/null

@@ -1,185 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define MICOMMAND_OPT_SIZE	10
-
-#include "MICommand.h"
-#include "MIResult.h"
-
-MICommand *
-MICommandNew(char *command, int class)
-{
-	MICommand *	cmd;
-
-	cmd = (MICommand *)malloc(sizeof(MICommand));
-	cmd->command = strdup(command);
-	cmd->options = (char **)malloc(MICOMMAND_OPT_SIZE * sizeof(char *));
-	cmd->opt_size = MICOMMAND_OPT_SIZE;
-	cmd->num_options = 0;
-	cmd->completed = 0;
-	cmd->expected_class = class;
-	cmd->output = NULL;
-	cmd->callback = NULL;
-	return cmd;
-}
-
-void
-MICommandFree(MICommand *cmd)
-{
-	int i;
-
-	if (cmd->command != NULL)
-		free(cmd->command);
-	if (cmd->num_options > 0) {
-		for (i = 0; i < cmd->num_options; i++)
-			free(cmd->options[i]);
-		free(cmd->options);
-	}
-	if (cmd->output != NULL)
-		MIOutputFree(cmd->output);
-	free(cmd);
-}
-
-void
-MICommandAddOption(MICommand *cmd, char *opt, char *arg)
-{
-	int add = 1;
-
-	if (arg != NULL)
-		add++;
-
-	if (cmd->num_options + add > cmd->opt_size) {
-		cmd->opt_size += MICOMMAND_OPT_SIZE;
-		cmd->options = (char **)realloc(cmd->options, cmd->opt_size * sizeof(char *));
-	}
-
-	cmd->options[cmd->num_options++] = strdup(opt);
-
-	if (arg != NULL)
-		cmd->options[cmd->num_options++] = strdup(arg);
-}
-
-void
-MICommandRegisterCallback(MICommand *cmd, void (*callback)(MIResultRecord *, void *), void *data)
-{
-	cmd->callback = callback;
-	cmd->cb_data = data;
-}
-
-int
-MICommandCompleted(MICommand *cmd)
-{
-	return cmd->completed;
-}
-
-MIResultRecord *
-MICommandResult(MICommand *cmd)
-{
-	if (cmd->output == NULL)
-		return NULL;
-	return cmd->output->rr;
-}
-
-int
-MICommandResultOK(MICommand *cmd)
-{
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return 0;
-
-	return cmd->output->rr->resultClass == cmd->expected_class;
-}
-
-int
-MICommandResultClass(MICommand *cmd)
-{
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return MIResultRecordINVALID;
-
-	return cmd->output->rr->resultClass;
-}
-
-char *
-MICommandResultErrorMessage(MICommand *cmd)
-{
-	MIResult *	r;
-	MIString *	s;
-	char *		res = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	if (MICommandResultClass(cmd) != MIResultRecordERROR)
-		return NULL;
-
-	for (SetList(cmd->output->rr->results); (r = (MIResult *)GetListElement(cmd->output->rr->results)) != NULL;) {
-		if (r->value != NULL) {
-			s = MIValueToString(r->value);
-			res = strdup(MIStringToCString(s));
-			break;
-		}
-	}
-
-	return res;
-}
-
-char *
-MICommandToString(MICommand *cmd)
-{
-	int				i;
-	int				cmd_len = strlen(cmd->command);
-	int				size;
-	char *			s;
-	static int		str_size = 0;
-	static char *	str_res = NULL;
-
-	size = cmd_len + 3;
-
-	for (i = 0; i < cmd->num_options; i++)
-		size += strlen(cmd->options[i]) + 1;
-
-	if (size > str_size) {
-		if (str_res != NULL)
-			free(str_res);
-		str_res = (char *)malloc(size);
-		str_size = size;
-
-	}
-
-
-	s = str_res;
-	memcpy(s, cmd->command, cmd_len);
-	s += cmd_len;
-
-	for (i = 0; i < cmd->num_options; i++) {
-		int len = strlen(cmd->options[i]);
-		*s++ = ' ';
-		memcpy(s, cmd->options[i], len);
-		s += len;
-	}
-
-	*s++ = '\n';
-	*s++ = '\0';
-
-	return str_res;
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.h
deleted file mode 100644
index e550656..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MICommand.h
+++ /dev/null

@@ -1,136 +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
- ******************************************************************************/
- 
-#ifndef _MICOMMAND_H_
-#define _MICOMMAND_H_
-
-#include "MIResultRecord.h"
-#include "MIOutput.h"
-
-struct MISession;
-
-struct MICommand {
-	char *			command;								/* command to execute */
-	char **			options;								/* command options */
-	int				num_options;							/* number of options for command */
-	int				opt_size;								/* allocated size of options */
-	int				completed;								/* command has been completed */
-	int				expected_class;
-	MIOutput *		output;									/* result from completed command */
-	void			(*callback)(MIResultRecord *, void *);	/* command completed callback */
-	void *			cb_data;								/* callback data */
-};
-typedef struct MICommand	MICommand;
-
-extern MICommand *MICommandNew(char *, int);
-extern void MICommandFree(MICommand *cmd);
-extern void MICommandAddOption(MICommand *cmd, char *opt, char *arg);
-extern int MICommandCompleted(MICommand *cmd);
-extern int MICommandResultOK(MICommand *cmd);
-extern MIResultRecord *MICommandResult(MICommand *cmd);
-extern int MICommandResultClass(MICommand *cmd);
-extern char *MICommandResultErrorMessage(MICommand *cmd);
-extern void MICommandRegisterCallback(MICommand *cmd, void (*callback)(MIResultRecord *, void *), void *data);
-extern char *MICommandToString(MICommand *cmd);
-
-/*
- * -gdb-* commands
- */
-extern MICommand *MIGDBSet(char *, char *);
-extern MICommand *MIGDBExit(void);
-extern MICommand *MIGDBShowEndian(void);
-extern MICommand *MIGDBVersion(void);
-
-/*
- * -exec-* commands
- */
-extern MICommand *MIExecArguments(char **);
-extern MICommand *MIExecContinue(void);
-extern MICommand *MIExecRun(void);
-extern MICommand *MIExecStep(int);
-extern MICommand *MIExecNext(int);
-extern MICommand *MIExecFinish(void);
-extern MICommand *MIExecInterrupt(void);
-extern MICommand *MIExecUtil(char*);
-
-/*
- * -break-* commands
- */
-extern MICommand *MIBreakInsert(int isTemporary, int isHardware, char *condition, int ignoreCount, char *line, int tid);
-extern MICommand *MIBreakDelete(int nbps, int *bpids);
-extern MICommand *MIBreakDisable(int nbps, int *bpids);
-extern MICommand *MIBreakEnable(int nbps, int *bpids);
-extern MICommand *MIBreakCondition(int nbps, int *bpids, char *expr);
-extern MICommand *MIBreakWatch(char *expr, int access, int read);
-extern MICommand *MIBreakAfter(int nbps, int *bpids, int ignoreCount);
-
-/*
- * -stack-* commands
- */
-extern MICommand *MIStackSelectFrame(int level);
-extern MICommand *MIStackListFrames(int low, int high);
-extern MICommand *MIStackListAllFrames(void);
-extern MICommand *MIStackListLocals(int vals);
-extern MICommand *MIStackListArguments(int vals, int low, int high);
-extern MICommand *MIStackListAllArguments(int vals);
-extern MICommand *MIStackInfoFrame(void);
-extern MICommand *MIStackInfoDepth(void);
-extern MICommand *CLIFrame(void);
-
-/*
- * -var-* commands
- */
-extern MICommand *MIVarCreate(char *name, char *frame, char *expr);
-extern MICommand *MIVarDelete(char *name);
-extern MICommand *MIVarListChildren(char *name);
-extern MICommand *MIVarEvaluateExpression(char *name);
-extern MICommand *MIDataEvaluateExpression(char *name);
-extern MICommand *MIVarUpdate(char *name);
-extern MICommand *MIVarInfoType(char *name);
-extern MICommand *MIVarInfoNumChildren(char *name);
-
-/*
- * -thread-* commands
- */
-extern MICommand *CLIInfoThreads(void);
-extern MICommand *MIThreadSelect(int threadNum);
-
-/*
- * -data-* commands
- */
-extern MICommand *MIDataReadMemory(long, char *, char *, int, int, int, char *);
-extern MICommand *MIDataWriteMemory(long offset, char * address, char * format, int wordSize, char * value);
-
-#ifdef __APPLE__
-extern MICommand *MIPidInfo(void);
-#endif /* __APPLE__ */
-
-/*
- * Non-MI commands
- */
-extern MICommand *CLIPType(char *name);
-
-/*
- * signal commands
- */
-extern MICommand *CLIListSignals(char *);
-extern MICommand *CLISignalInfo(char *);
-extern MICommand *CLIHandle(char *);
-
-#endif /* _MICOMMAND_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.c
deleted file mode 100644
index 10a3cb1..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.c
+++ /dev/null

@@ -1,79 +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
- ******************************************************************************/
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "MIError.h"
-
-static int 		MIErrorNum = 0;
-static char *	MIErrorStr = NULL;
-
-static char * MIErrorTab[] =
-{
-	"NO_ERROR",
-	"System error: %s",
-	"GDB session does not exist or was terminated",
-};
-
-/*
- * Error handling
- */
-void
-MISetError(int errnum, char *msg)
-{
-	MIErrorNum = errnum;
-	
-	if (MIErrorStr != NULL) {
-		free(MIErrorStr);
-		MIErrorStr = NULL;
-	}
-	
-	if (MIErrorNum >= sizeof(MIErrorTab)/sizeof(char *)) {
-		if (msg != NULL) {
-			MIErrorStr = strdup(msg);
-		} else {
-			asprintf(&MIErrorStr, "Error %d occurred.", MIErrorNum);
-		}
-	} else {
-		if (msg == NULL)
-			msg = "<null>";
-			
-		asprintf(&MIErrorStr, MIErrorTab[MIErrorNum], msg);
-	}
-}
-
-int
-MIGetError(void)
-{
-	return MIErrorNum;
-}
-
-char *
-MIGetErrorStr(void)
-{
-	if (MIErrorStr == NULL)
-		return "";
-		
-	return MIErrorStr;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.h
deleted file mode 100644
index afe3477..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIError.h
+++ /dev/null

@@ -1,30 +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
- ******************************************************************************/
-#ifndef _MIERROR_H_
-#define _MIERROR_H_
-
-#define MI_ERROR_SYSTEM	1
-#define MI_ERROR_SESSION	2
-
-extern void MISetError(int errnum, char *msg);
-extern int MIGetError(void);
-extern char *MIGetErrorStr(void);
-#endif /* _MIERROR_H_ */
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.c
deleted file mode 100644
index dc3df48..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.c
+++ /dev/null

@@ -1,209 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIEvent.h"
-#include "MIResult.h"
-#include "MIValue.h"
-
-static void MIEventParseStopped(MIEvent *event, List *results);
-static void MIEventParseValue(MIEvent *event, List *results);
-static void MIEventParseWPT(MIEvent *event, List *results);
-
-MIEvent *
-MIEventNew(int class, int type)
-{
-	MIEvent * event = (MIEvent *)malloc(sizeof(MIEvent));
-	event->class = class;
-	event->type = type;
-	
-	event->threadId = 0;
-	event->bkptno = 0;
-	event->number = 0;
-	event->code = 0;
-	event->frame = NULL;
-	event->sigName = NULL;
-	event->sigMeaning = NULL;
-	event->gdbResult = NULL;
-	event->returnValue = NULL;
-	event->returnType = NULL;
-	event->exp = NULL;
-	event->oldValue = NULL;
-	event->newValue = NULL;
-	
-	return event;
-}
-
-void
-MIEventFree(MIEvent *event)
-{
-	if (event->frame != NULL)
-		MIFrameFree(event->frame);
-	if (event->sigName != NULL)
-		free(event->sigName);
-	if (event->sigMeaning != NULL)
-		free(event->sigMeaning);
-	if (event->gdbResult != NULL)
-		free(event->gdbResult);
-	if (event->returnValue != NULL)
-		free(event->returnValue);
-	if (event->returnType != NULL)
-		free(event->returnType);
-	if (event->exp != NULL)
-		free(event->exp);
-	if (event->oldValue != NULL)
-		free(event->oldValue);
-	if (event->newValue != NULL)
-		free(event->newValue);
-	free(event);
-}
-
-MIEvent *
-MIEventCreateStoppedEvent(char *reason, List *results)
-{
-	MIEvent *	event = NULL;
-	
-	if (strcmp(reason, "breakpoint-hit") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeBreakpointHit);
-	} else if (
-		strcmp(reason, "watchpoint-trigger") == 0
-			|| strcmp(reason, "read-watchpoint-trigger") == 0
-			|| strcmp(reason, "access-watchpoint-trigger") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeWatchpointTrigger);
-	} else if (strcmp(reason, "watchpoint-scope") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeWatchpointScope);
-	} else if (strcmp(reason, "end-stepping-range") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeSteppingRange);
-	} else if (strcmp(reason, "signal-received") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeSignal);
-	} else if (strcmp(reason, "location-reached") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeLocationReached);
-	} else if (strcmp(reason, "function-finished") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeFunctionFinished);
-	} else if (strcmp(reason, "exited-normally") == 0 || strcmp(reason, "exited") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeInferiorExit);
-	} else if (strcmp(reason, "exited-signalled") == 0) {
-		event = MIEventNew(MIEventClassStopped, MIEventTypeInferiorSignalExit);
-	} else if (strcmp(reason, "temporary-breakpoint-hit") == 0) {
-		/*
-		 * temporary-breakpoint-hit is a fake reason we use because Linux
-		 * support for temporary breakpoints is broken.
-		 */ 
-		event = MIEventNew(MIEventClassStopped, MIEventTypeSuspended);
-	}
-	
-	MIEventParseStopped(event, results);
-	return event;
-}
-
-static void
-MIEventParseStopped(MIEvent *event, List *results)
-{
-	char *		str = "";
-	MIResult *	res;
-	MIValue *	value;
-	
-	if (results != NULL) {
-		for (SetList(results); (res = (MIResult *)GetListElement(results)) != NULL; ) {
-			value = res->value;
-			if (value != NULL && value->type == MIValueTypeConst) {
-				str = value->cstring;
-			}
-	
-			if (strcmp(res->variable, "bkptno") == 0) {
-				event->bkptno = (int)strtol(str, NULL, 10);
-			} else if (strcmp(res->variable, "wpt") == 0 || strcmp(res->variable, "hw-awpt") == 0|| strcmp(res->variable, "hw-rwpt") == 0) {
-				if (value->type == MIValueTypeTuple) {
-					MIEventParseWPT(event, value->results);
-				}
-			} else if (strcmp(res->variable, "value") == 0) {
-				if (value->type == MIValueTypeTuple) {
-					MIEventParseValue(event, value->results);
-				}
-			} else if (strcmp(res->variable, "wpnum") == 0) {
-				event->number = (int)strtol(str, NULL, 10);
-			} else if (strcmp(res->variable, "signal-name") == 0) {
-				event->sigName = strdup(str);
-			} else if (strcmp(res->variable, "signal-meaning") == 0) {
-				event->sigMeaning = strdup(str);
-			} else if (strcmp(res->variable, "gdb-result-var") == 0) {
-				event->gdbResult = strdup(str);
-			} else if (strcmp(res->variable, "return-value") == 0) {
-				event->returnValue = strdup(str);
-			} else if (strcmp(res->variable, "return-type") == 0) {
-				event->returnType = strdup(str);
-			} else if (strcmp(res->variable, "exit-code") == 0) {
-				event->code = (int)strtol(str, NULL, 10);
-			} else if (strcmp(res->variable, "thread-id") == 0) {
-				event->threadId = (int)strtol(str, NULL, 10);
-			} else if (strcmp(res->variable, "frame") == 0) {
-				if (value->type == MIValueTypeTuple) {
-					event->frame = MIFrameParse(value);
-				}
-			}
-		}
-	}
-}
-
-static void
-MIEventParseWPT(MIEvent *event, List *results)
-{
-	char *		str = "";
-	MIResult *	res;
-	MIValue *	value;
-	
-	for (SetList(results); (res = (MIResult *)GetListElement(results)) != NULL; ) {
-		value = res->value;
-		if (value->type == MIValueTypeConst) {
-			str = value->cstring;
-		}
-		if (strcmp(res->variable, "number") == 0) {
-			event->number = (int)strtol(str, NULL, 10);
-		} else if (strcmp(res->variable, "exp") == 0) { 
-			event->exp = strdup(value->cstring);
-		}
-	}
-}
-
-static void
-MIEventParseValue(MIEvent *event, List *results)
-{
-	char *		str = "";
-	MIResult *	res;
-	MIValue *	value;
-	
-	for (SetList(results); (res = (MIResult *)GetListElement(results)) != NULL; ) {
-		value = res->value;
-		if (value->type == MIValueTypeConst) {
-			str = value->cstring;
-		}
-		if (strcmp(res->variable, "old") == 0) {
-			event->oldValue = strdup(str);
-		} else if (strcmp(res->variable, "new") == 0) { 
-			event->newValue = strdup(str);
-		} else if (strcmp(res->variable, "value") == 0) { 
-			event->oldValue = strdup(str);
-			event->newValue = strdup(str);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.h
deleted file mode 100644
index 8b966a9..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIEvent.h
+++ /dev/null

@@ -1,67 +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
- ******************************************************************************/
-
-#ifndef _MIEVENT_H_
-#define _MIEVENT_H_
-
-#include "list.h"
-#include "MIFrame.h"
-
-#define MIEventClassStopped			1
-#define MIEventClassRunning			2
-
-#define MIEventTypeBreakpointHit		1
-#define MIEventTypeWatchpointTrigger	2
-#define MIEventTypeWatchpointScope		3
-#define MIEventTypeSteppingRange		4
-#define MIEventTypeSignal				5
-#define MIEventTypeLocationReached		6
-#define MIEventTypeFunctionFinished		7
-#define MIEventTypeInferiorExit			8
-#define MIEventTypeInferiorSignalExit	9
-#define MIEventTypeSuspended			10
-
-/**
- * Represents an asynchronous event.
- */
-struct MIEvent {
-	int			class;
-	int			type;
-	int 			threadId;
-	MIFrame *	frame;
-	int			bkptno;
-	int			number;
-	char *		sigName;
-	char *		sigMeaning;
-	char *		gdbResult;
-	char *		returnValue;
-	char *		returnType;
-	int			code;
-	char *		exp;
-	char *		oldValue;
-	char *		newValue;
-};
-typedef struct MIEvent	MIEvent;
-
-extern MIEvent *MIEventNew(int, int);
-extern void MIEventFree(MIEvent *var);
-extern MIEvent *MIEventCreateStoppedEvent(char *reason, List *results);
-#endif /* _MIEVENT_H_ */
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIExecCommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIExecCommand.c
deleted file mode 100644
index 108d586..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIExecCommand.c
+++ /dev/null

@@ -1,111 +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
- ******************************************************************************/
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "MICommand.h"
-#include "MIString.h"
-
-MICommand *
-MIExecArguments(char **argv)
-{
-	int			i;
-	int 		len = 0;
-	char *		arg_str;
-	MICommand *	cmd;
-	
-	for (i = 0; argv[i] != NULL; i++) {
-		if (i > 0) {
-			len += 1;
-		}
-		len += strlen(argv[i]);
-	}
-	
-	arg_str = (char *)malloc(len * sizeof(char));
-	*arg_str = '\0';
-	
-	for (i = 0; argv[i] != NULL; i++) {
-		if (i > 0) {
-			strcat(arg_str, " ");
-		}
-		strcat(arg_str, argv[i]);
-	}
-	
-	cmd = MICommandNew("-exec-arguments", MIResultRecordRUNNING);
-	MICommandAddOption(cmd, arg_str, NULL);
-	return cmd;
-}
-
-MICommand *
-MIExecContinue(void)
-{
-	return MICommandNew("-exec-continue", MIResultRecordRUNNING);
-}
-
-MICommand *
-MIExecRun(void)
-{
-	return MICommandNew("-exec-run", MIResultRecordRUNNING);
-}
-
-MICommand *
-MIExecStep(int count)
-{
-	MICommand *	cmd = MICommandNew("-exec-step", MIResultRecordRUNNING);
-	MICommandAddOption(cmd, MIIntToCString(count), NULL);
-	return cmd;
-}
-
-MICommand *
-MIExecNext(int count)
-{
-	MICommand *	cmd = MICommandNew("-exec-next", MIResultRecordRUNNING);
-	MICommandAddOption(cmd, MIIntToCString(count), NULL);
-	return cmd;
-}
-
-MICommand *
-MIExecFinish(void)
-{
-	return MICommandNew("-exec-finish", MIResultRecordRUNNING);
-}
-
-MICommand *
-MIExecUtil(char* loc)
-{
-	MICommand *	cmd = MICommandNew("-exec-util", MIResultRecordRUNNING);
-	MICommandAddOption(cmd, loc, NULL);
-	return cmd;
-}
-
-MICommand *
-MIExecInterrupt(void)
-{
-	return MICommandNew("-exec-interrupt", MIResultRecordDONE);
-}
-
-#ifdef __APPLE__
-MICommand *
-MIPidInfo(void)
-{
-	return MICommandNew("-pid-info", MIResultRecordDONE);
-}
-#endif /* __APPLE__ */
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.c
deleted file mode 100644
index 0e53c9f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.c
+++ /dev/null

@@ -1,280 +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
- ******************************************************************************/
-
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "list.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIArg.h"
-#include "MIFrame.h"
-#include "MIOOBRecord.h"
-
-static List *MIFrameInfoParse(List *results);
-
-MIFrame *
-MIFrameNew(void)
-{
-	MIFrame *	frame;
-
-	frame = (MIFrame *)malloc(sizeof(MIFrame));
-	frame->level = 0;
-	frame->line = 0;
-	frame->addr = NULL;
-	frame->func = NULL;
-	frame->file = NULL;
-	frame->args = NULL;
-	return frame;
-}
-
-void
-MIFrameFree(MIFrame *frame)
-{
-	if (frame->addr != NULL)
-		free(frame->addr);
-	if (frame->func != NULL)
-		free(frame->func);
-	if (frame->file != NULL)
-		free(frame->file);
-	if (frame->args != NULL)
-		DestroyList(frame->args, MIArgFree);
-	free(frame);
-}
-
-MIFrame *
-MIFrameParse(MIValue *tuple)
-{
-	char *		str = NULL;
-	char *		var;
-	MIValue *	value;
-	MIResult *	result;
-	List *		results = tuple->results;
-	MIFrame *	frame = MIFrameNew();
-
-	for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL; ) {
-		var = result->variable;
-		value = result->value;
-
-		if (value != NULL || value->type == MIValueTypeConst) {
-			str = value->cstring;
-		}
-
-		if (strcmp(var, "level") == 0 && str != NULL) { //$NON-NLS-1$
-			frame->level = (int)strtol(str, NULL, 10);
-		} else if (strcmp(var, "addr") == 0 && str != NULL) { //$NON-NLS-1$
-			frame->addr = strdup(str);
-		} else if (strcmp(var, "func") == 0) { //$NON-NLS-1$
-			frame->func = NULL;
-			if ( str != NULL ) {
-				if (strcmp(str, "??") == 0) //$NON-NLS-1$
-					frame->func = strdup(""); //$NON-NLS-1$
-				else
-				{
-					// In some situations gdb returns the function names that include parameter types.
-					// To make the presentation consistent truncate the parameters. PR 46592
-					char * s = strchr(str, '(');
-					if (s != NULL)
-						*s = '\0';
-					frame->func = strdup(str);
-				}
-			}
-		} else if (strcmp(var, "file") == 0 && str != NULL) { //$NON-NLS-1$
-			frame->file = strdup(str);
-		} else if (strcmp(var, "line") == 0 && str != NULL) { //$NON-NLS-1$
-			frame->line = (int)strtol(str, NULL, 10);
-		} else if (strcmp(var, "args") == 0) { //$NON-NLS-1$
-			frame->args = MIArgsParse(value);
-		}
-	}
-
-	return frame;
-}
-
-List *
-MIGetStackListFramesInfo(MICommand *cmd)
-{
-	MIValue *		val;
-	MIResultRecord *	rr;
-	MIResult *		result;
-	List *			frames = NULL;
-	MIValue * frameVal;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		if (strcmp(result->variable, "stack") == 0) {
-			val = result->value;
-			if (val->type == MIValueTypeList || val->type == MIValueTypeTuple) {//TODO correct???
-				for (SetList(val->results); (result = (MIResult *)GetListElement(val->results)) != NULL; ) {
-					if (strcmp(result->variable, "frame") == 0) {
-						//val = result->value; /* error: overwrite prior MIValue
-						frameVal = result->value;
-						if (frameVal->type == MIValueTypeTuple) {
-							if (frames == NULL)
-								frames = NewList();
-							AddToList(frames, MIFrameParse(frameVal));
-						}
-					}
-				}
-			}
-		}
-	}
-	if (frames == NULL)
-		frames = NewList();
-	return frames;
-}
-
-static List *
-MIFrameInfoParse(List *results)
-{
-	MIValue *	val;
-	MIResult *	result;
-	List *		frames = NULL;
-
-	//SetList(results);
-	//if ((result = (MIResult *)GetListElement(results)) != NULL) {
-	for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL;) {
-		if (strcmp(result->variable, "frame") == 0) {
-			val = result->value;
-			if (val->type == MIValueTypeTuple) {
-				if (frames == NULL)
-					frames = NewList();
-				AddToList(frames, (void *)MIFrameParse(val));
-			}
-		}
-	}
-	if (frames == NULL)
-		frames = NewList();
-	return frames;
-}
-
-List *
-MIGetFrameInfo(MICommand *cmd)
-{
-	MIResultRecord *	rr;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	rr = cmd->output->rr;
-	return MIFrameInfoParse(rr->results);
-}
-
-List *
-MIGetStackListLocalsInfo(MICommand *cmd)
-{
-	MIValue *		val;
-	MIResultRecord *	rr;
-	MIResult *		result;
-	List *			locals = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		if (strcmp(result->variable, "locals") == 0) {
-			val = result->value;
-			if (val->type == MIValueTypeList || val->type == MIValueTypeTuple) {
-				locals = MIArgsParse(val);
-			}
-		}
-	}
-	return locals;
-}
-
-List *
-MIGetStackListArgumentsInfo(MICommand *cmd)
-{
-	MIValue *		val;
-	MIResultRecord *	rr;
-	MIResult *		result;
-	List *			frames = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	rr = cmd->output->rr;
-	SetList(rr->results);
-	if ((result = (MIResult *)GetListElement(rr->results)) != NULL) {
-		if (strcmp(result->variable, "stack-args") == 0) {
-			val = result->value;
-			if (val->type == MIValueTypeList || val->type == MIValueTypeTuple) {
-				frames = MIFrameInfoParse(val->results);
-			}
-		}
-	}
-	return frames;
-}
-
-MIString *
-MIFrameToString(MIFrame *f)
-{
-	int			first = 1;
-	MIArg *		arg;
-	MIString *	str = MIStringNew("level=\"%d\"", f->level);
-
-	MIStringAppend(str, MIStringNew(",addr=\"%s\"", f->addr));
-	MIStringAppend(str, MIStringNew(",func=\"%s\"", f->func));
-	MIStringAppend(str, MIStringNew(",file=\"%s\"", f->file));
-	MIStringAppend(str, MIStringNew(",line=\"%d\"", f->line));
-	MIStringAppend(str, MIStringNew(",args=["));
-
-	for (SetList(f->args); (arg = (MIArg *)GetListElement(f->args)) != NULL; ) {
-		if (!first) {
-			MIStringAppend(str, MIStringNew(","));
-		}
-		first = 0;
-		MIStringAppend(str, MIStringNew("{name=\"%s\"", arg->name));
-		MIStringAppend(str, MIStringNew(",value=\"%s\"", arg->value));
-	}
-	MIStringAppend(str, MIStringNew("]"));
-
-	return str;
-}
-
-int
-MIGetStackInfoDepth(MICommand *cmd)
-{
-	MIValue * val;
-	MIResultRecord * rr;
-	MIResult * result;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return -1;
-
-	rr = cmd->output->rr;
-	SetList(rr->results);
-	if ((result = (MIResult *)GetListElement(rr->results)) != NULL) {
-		if (strcmp(result->variable, "depth") == 0) {
-			val = result->value;
-			return (int)strtol(val->cstring, NULL, 10);
-		}
-	}
-	return -1;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.h
deleted file mode 100644
index d28d915..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIFrame.h
+++ /dev/null

@@ -1,52 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#ifndef _MIFRAME_H_
-#define _MIFRAME_H_
-
-#include "MICommand.h"
-#include "MIValue.h"
-
-
-struct MIFrame {
-	int		level;
-	char *	addr;
-	char *	func;
-	char *	file;
-	int		line;
-	List *	args;
-};
-typedef struct MIFrame	MIFrame;
-
-extern MIFrame *MIFrameNew(void);
-extern void MIFrameFree(MIFrame *f);
-extern MIFrame *MIFrameParse(MIValue *tuple);
-extern List *MIGetStackListFramesInfo(MICommand *cmd);
-extern List *MIGetFrameInfo(MICommand *cmd);
-extern List *MIGetStackListLocalsInfo(MICommand *cmd);
-extern List *MIGetStackListArgumentsInfo(MICommand *cmd);
-extern MIString *MIFrameToString(MIFrame *f);
-extern int MIGetStackInfoDepth(MICommand *cmd);
-
-#endif /* _MIFRAME_H_ */
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIGDBCommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIGDBCommand.c
deleted file mode 100644
index 5942165..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIGDBCommand.c
+++ /dev/null

@@ -1,49 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include	"list.h"
-#include "MICommand.h"
-
-MICommand *
-MIGDBSet(char *var, char *val)
-{
-	MICommand *	cmd = MICommandNew("-gdb-set", MIResultRecordDONE);
-	
-	MICommandAddOption(cmd, var, val);
-	
-	return cmd;
-}
-
-MICommand *
-MIGDBExit(void)
-{
-	return MICommandNew("-gdb-exit", MIResultRecordEXIT);
-}
-
-MICommand *
-MIGDBShowEndian(void)
-{
-	MICommand * cmd = MICommandNew("-gdb-show", MIResultRecordDONE);
-	MICommandAddOption(cmd, "endian", NULL);
-	return cmd;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.c
deleted file mode 100644
index 3526b7a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.c
+++ /dev/null

@@ -1,185 +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
- *******************************************************************************/
- 
- /**
- * @author Clement chu
- * 
- */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIMemory.h"
-
-MIMemory * 
-MIMemoryNew(void)
-{
-	MIMemory *	memory;
-	memory = (MIMemory *)malloc(sizeof(MIMemory));
-	memory->addr = NULL;
-	memory->ascii = NULL;
-	memory->data = NULL;
-	return memory;	
-}
-
-void 
-MIMemoryFree(MIMemory *memory)
-{
-	if (memory->addr != NULL)
-		free(memory->addr);
-	if (memory->ascii != NULL)
-		free(memory->ascii);
-	if (memory->data != NULL)
-		DestroyList(memory->data, free);
-	free(memory);
-}
-
-MIMemory *
-MIMemoryParse(MIValue *tuple)
-{
-	char *		str;
-	char *		var;
-	MIValue *	value;
-	MIResult *	result;
-	List *		results = tuple->results;
-	MIMemory *	memory = MIMemoryNew();
-	
-	for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL;) {
-		var = result->variable;
-		value = result->value;
-	
-		if (value != NULL && value->type == MIValueTypeConst) {
-			str = value->cstring;
-		}
-	
-		if (strcmp(var, "addr") == 0) {
-			memory->addr = strdup(str);
-		} else if (strcmp(var, "ascii") == 0) {
-			memory->ascii = strdup(str);
-		} else if (strcmp(var, "data") == 0) {
-			if (value != NULL) {
-				memory->data = MIMemoryDataParse(value);
-			}
-		}
-	}
-	return memory;
-}
-
-List *
-MIMemoryDataParse(MIValue* miValue)
-{
-	List * data = NewList();
-	List * values = miValue->values;
-	MIValue * value;
-	
-	if (values != NULL) {
-		for (SetList(values); (value = (MIValue *)GetListElement(values)) != NULL; ) {
-			if (value->type == MIValueTypeConst) {
-				AddToList(data, (void *) strdup(value->cstring));
-			}
-		}
-	}
-	return data;
-}
-
-MIDataReadMemoryInfo *
-MIDataReadMemoryInfoNew(void)
-{
-	MIDataReadMemoryInfo *	memoryInfo;
-	memoryInfo = (MIDataReadMemoryInfo *)malloc(sizeof(MIDataReadMemoryInfo));
-	memoryInfo->addr = NULL;
-	memoryInfo->memories = NULL;
-	return memoryInfo;	
-}
-
-void
-MIDataReadMemoryInfoFree(MIDataReadMemoryInfo *memoryInfo)
-{
-	if (memoryInfo->addr != NULL)
-		free(memoryInfo->addr);
-	if (memoryInfo->memories != NULL)
-		DestroyList(memoryInfo->memories, MIMemoryFree);
-	free(memoryInfo);
-}
-
-MIDataReadMemoryInfo *
-MIGetDataReadMemoryInfo(MICommand *cmd)
-{
-	char * var;
-	char * str;
-	MIValue * value;
-	MIResultRecord * rr;
-	MIResult * result;
-	MIDataReadMemoryInfo * info = MIDataReadMemoryInfoNew();
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL) {
-		return NULL;
-	}
-	
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		var = result->variable;
-		value = result->value;
-
-		if (value != NULL || value->type == MIValueTypeConst) {
-			str = value->cstring;
-		}
-
-		if (strcmp(var, "addr") == 0) {
-			info->addr = strdup(str);
-		} else if (strcmp(var, "nr-bytes") == 0) {
-			info->numBytes = strtol(str, NULL, 10);
-		} else if (strcmp(var, "total-bytes") == 0) {
-			info->totalBytes = strtol(str, NULL, 10);
-		} else if (strcmp(var, "next-row") == 0) {
-			info->nextRow = strtol(str, NULL, 10);
-		} else if (strcmp(var, "prev-row") == 0) {
-			info->prevRow = strtol(str, NULL, 10);
-		} else if (strcmp(var, "next-page") == 0) {
-			info->nextPage = strtol(str, NULL, 10);
-		} else if (strcmp(var, "prev-page") == 0) {
-			info->prevPage = strtol(str, NULL, 10);
-		} else if (strcmp(var, "memory") == 0) {
-			if (value->type == MIValueTypeList) {
-				info->memories = MIGetMemoryList(value);
-			}
-		}
-	}	
-	return info;
-}
-
-List *
-MIGetMemoryList(MIValue *miValue)
-{
-	List *memories = NewList();
-	List *values = miValue->values;
-	MIValue *value;
-	
-	if (values != NULL) {
-		for (SetList(values); (value = (MIValue *)GetListElement(values)) != NULL;) {
-			if (value->type == MIValueTypeTuple) {
-				AddToList(memories, (void *)MIMemoryParse(value));
-			}
-		}
-	}
-	return memories;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.h
deleted file mode 100644
index 6669a31..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemory.h
+++ /dev/null

@@ -1,62 +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
- *******************************************************************************/
- 
- /**
- * @author Clement chu
- * 
- */
- 
-#ifndef _MIMEMORY_H_
-#define _MIMEMORY_H_
-
-#include "list.h"
-#include "MICommand.h"
-#include "MIValue.h"
-
-struct MIMemory {
-	char *addr;
-	char *ascii;
-	List *data;
-};
-typedef struct MIMemory	MIMemory;
-
-struct MIDataReadMemoryInfo {
-	char *addr;
-	long nextRow;
-	long prevRow;
-	long nextPage;
-	long prevPage;
-	long numBytes;
-	long totalBytes;
-	List *memories;
-};
-typedef struct MIDataReadMemoryInfo	MIDataReadMemoryInfo;
-
-extern MIMemory *MIMemoryNew(void);
-extern MIDataReadMemoryInfo *MIDataReadMemoryInfoNew(void);
-
-extern void MIMemoryFree(MIMemory *memory);
-extern void MIDataReadMemoryInfoFree(MIDataReadMemoryInfo *memoryInfo);
-
-extern MIMemory *MIMemoryParse(MIValue *tuple);
-extern List *MIMemoryDataParse(MIValue *miValue);
-
-extern MIDataReadMemoryInfo * MIGetDataReadMemoryInfo(MICommand *cmd);
-extern List * MIGetMemoryList(MIValue *miValue);
-#endif /* _MIMEMORY_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemoryCommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemoryCommand.c
deleted file mode 100644
index b3580ba..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIMemoryCommand.c
+++ /dev/null

@@ -1,66 +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
- *******************************************************************************/
- 
- /**
- * @author Clement chu
- * 
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "MIString.h"
-#include "MICommand.h"
-
-MICommand *
-MIDataReadMemory(long offset, char* address, char* format, int wordSize, int rows, int cols, char* asChar)
-{
-	MICommand * cmd;
-	cmd = MICommandNew("-data-read-memory", MIResultRecordDONE);
-	
-	if (offset != 0) {
-		MICommandAddOption(cmd, "-o", MIIntToCString(offset));
-	}
-	MICommandAddOption(cmd, address, NULL);
-	MICommandAddOption(cmd, format, NULL);
-	MICommandAddOption(cmd, MIIntToCString(wordSize), NULL);
-	MICommandAddOption(cmd, MIIntToCString(rows), NULL);
-	MICommandAddOption(cmd, MIIntToCString(cols), NULL);
-	if (asChar != NULL) {
-		MICommandAddOption(cmd, asChar, NULL);
-	}
-	return cmd;
-}
-
-MICommand *
-MIDataWriteMemory(long offset, char* address, char* format, int wordSize, char* value)
-{
-	MICommand * cmd;
-	cmd = MICommandNew("-data-write-memory", MIResultRecordDONE);
-	
-	if (offset != 0) {
-		MICommandAddOption(cmd, "-o", MIIntToCString(offset));
-	}
-	MICommandAddOption(cmd, address, NULL);
-	MICommandAddOption(cmd, format, NULL);
-	MICommandAddOption(cmd, MIIntToCString(wordSize), NULL);
-	MICommandAddOption(cmd, value, NULL);
-	return cmd;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.c
deleted file mode 100644
index ce4eda9..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.c
+++ /dev/null

@@ -1,108 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdlib.h>
-
-#include "list.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIOOBRecord.h"
-
-MIOOBRecord * 
-NewMIMIOOBRecord(void)
-{
-	MIOOBRecord *	oob;
-	
-	oob = (MIOOBRecord *)malloc(sizeof(MIOOBRecord));
-	oob->token = -1;
-	oob->results = NULL;
-	oob->class = NULL;
-	oob->cstring = NULL;
-	return oob;
-}
-
-MIOOBRecord * 
-NewMIExecAsyncOutput(void)
-{
-	MIOOBRecord *	oob = NewMIMIOOBRecord();
-	oob->type = MIOOBRecordTypeAsync;
-	oob->sub_type = MIOOBRecordExecAsync;
-	return oob;
-}
-
-MIOOBRecord *
-NewMIStatusAsyncOutput(void)
-{
-	MIOOBRecord *	oob = NewMIMIOOBRecord();
-	oob->type = MIOOBRecordTypeAsync;
-	oob->sub_type = MIOOBRecordStatusAsync;
-	return oob;
-}
-
-MIOOBRecord *
-NewMINotifyAsyncOutput(void)
-{
-	MIOOBRecord *	oob = NewMIMIOOBRecord();
-	oob->type = MIOOBRecordTypeAsync;
-	oob->sub_type = MIOOBRecordNotifyAsync;
-	return oob;
-}
-
-MIOOBRecord *
-NewMIConsoleStreamOutput(void)
-{
-	MIOOBRecord *	oob = NewMIMIOOBRecord();
-	oob->type = MIOOBRecordTypeStream;
-	oob->sub_type = MIOOBRecordConsoleStream;
-	return oob;
-}
-
-MIOOBRecord *
-NewMITargetStreamOutput(void)
-{
-	MIOOBRecord *	oob = NewMIMIOOBRecord();
-	oob->type = MIOOBRecordTypeStream;
-	oob->sub_type = MIOOBRecordTargetStream;
-	return oob;
-}
-
-MIOOBRecord *
-NewMILogStreamOutput(void)
-{
-	MIOOBRecord *	oob = NewMIMIOOBRecord();
-	oob->type = MIOOBRecordTypeStream;
-	oob->sub_type = MIOOBRecordLogStream;
-	return oob;
-}
-
-void 
-MIOOBRecordFree(MIOOBRecord *oob)
-{
-	if (oob->results != NULL)
-		DestroyList(oob->results, MIResultFree);
-	if (oob->class != NULL)
-		free(oob->class);
-	if (oob->cstring != NULL)
-		free(oob->cstring);
-	free(oob);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.h
deleted file mode 100644
index 5ed1859..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOOBRecord.h
+++ /dev/null

@@ -1,59 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-  
-#ifndef _MIOOBRECORD_H_
-#define _MIOOBRECORD_H_
-#include "list.h"
-
-#define MIOOBRecordTypeAsync	1
-#define MIOOBRecordTypeStream	2
-
-#define MIOOBRecordExecAsync		1
-#define MIOOBRecordStatusAsync	2
-#define MIOOBRecordNotifyAsync	3
-
-#define MIOOBRecordConsoleStream	1
-#define MIOOBRecordLogStream		2
-#define MIOOBRecordTargetStream	3
-
-/**
- * @see MIOOBRecord
- */
-struct MIOOBRecord {
-	int type;
-	int sub_type;
-	List *results;
-	char *class;
-	int token;
-	char *cstring;
-};
-typedef struct MIOOBRecord MIOOBRecord;
-
-extern MIOOBRecord *NewMIExecAsyncOutput(void);
-extern MIOOBRecord *NewMIStatusAsyncOutput(void);
-extern MIOOBRecord *NewMINotifyAsyncOutput(void);
-extern MIOOBRecord *NewMIConsoleStreamOutput(void);
-extern MIOOBRecord *NewMITargetStreamOutput(void);
-extern MIOOBRecord *NewMILogStreamOutput(void);
-extern void MIOOBRecordFree(MIOOBRecord *);
-#endif /* _MIOOBRECORD_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.c
deleted file mode 100644
index a86c324..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.c
+++ /dev/null

@@ -1,50 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdlib.h>
-
-#include "list.h"
-#include "MIOOBRecord.h"
-#include "MIResultRecord.h"
-#include "MIOutput.h"
-
-MIOutput *
-MIOutputNew(void)
-{
-	MIOutput *	op;
-	
-	op = (MIOutput *)malloc(sizeof(MIOutput));
-	op->rr = NULL;
-	op->oobs = NULL;
-	return op;
-}
-
-void
-MIOutputFree(MIOutput *op)
-{
-	if (op->rr != NULL)
-		MIResultRecordFree(op->rr);
-	if (op->oobs != NULL)
-		DestroyList(op->oobs, MIOOBRecordFree);
-	free(op);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.h
deleted file mode 100644
index 46e4cac..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIOutput.h
+++ /dev/null

@@ -1,42 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#ifndef _MIOUTPUT_H_
-#define _MIOUTPUT_H_
-
-#include "list.h"
-#include "MIResultRecord.h"
-
-/**
- * GDB/MI response.
- */
-struct MIOutput {
-	MIResultRecord *	rr;
-	List *			oobs;
-};
-typedef struct MIOutput MIOutput;
-
-extern MIOutput *MIOutputNew(void);
-extern void MIParse(char *buffer, MIOutput *op);
-extern void MIOutputFree(MIOutput *op);
-#endif /* _MIOUTPUT_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIParser.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIParser.c
deleted file mode 100644
index eca58f2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIParser.c
+++ /dev/null

@@ -1,476 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-/**
-<pre>
-`OUTPUT :'
-     `( OUT-OF-BAND-RECORD )* [ RESULT-RECORD ] "(gdb)" NL'
-
-`RESULT-RECORD :'
-     ` [ TOKEN ] "^" RESULT-CLASS ( "," RESULT )* NL'
-
-`OUT-OF-BAND-RECORD :'
-     `ASYNC-RECORD | STREAM-RECORD'
-
-`ASYNC-RECORD :'
-     `EXEC-ASYNC-OUTPUT | STATUS-ASYNC-OUTPUT | NOTIFY-ASYNC-OUTPUT'
-
-`EXEC-ASYNC-OUTPUT :'
-     `[ TOKEN ] "*" ASYNC-OUTPUT'
-
-`STATUS-ASYNC-OUTPUT :'
-     `[ TOKEN ] "+" ASYNC-OUTPUT'
-
-`NOTIFY-ASYNC-OUTPUT :'
-     `[ TOKEN ] "=" ASYNC-OUTPUT'
-
-`ASYNC-OUTPUT :'
-     `ASYNC-CLASS ( "," RESULT )* NL'
-
-`RESULT-CLASS :'
-     `"done" | "running" | "connected" | "error" | "exit"'
-
-`ASYNC-CLASS :'
-     `"stopped" | OTHERS' (where OTHERS will be added depending on the
-     needs--this is still in development).
-
-`RESULT :'
-     ` VARIABLE "=" VALUE'
-
-`VARIABLE :'
-     ` STRING '
-
-`VALUE :'
-     ` CONST | TUPLE | LIST '
-
-`CONST :'
-     `C-STRING'
-
-`TUPLE :'
-     ` "{}" | "{" RESULT ( "," RESULT )* "}" '
-
-`LIST :'
-     ` "[]" | "[" VALUE ( "," VALUE )* "]" | "[" RESULT ( "," RESULT )*
-     "]" '
-
-`STREAM-RECORD :'
-     `CONSOLE-STREAM-OUTPUT | TARGET-STREAM-OUTPUT | LOG-STREAM-OUTPUT'
-
-`CONSOLE-STREAM-OUTPUT :'
-     `"~" C-STRING'
-
-`TARGET-STREAM-OUTPUT :'
-     `"@" C-STRING'
-
-`LOG-STREAM-OUTPUT :'
-     `"&" C-STRING'
-
-`NL :'
-     `CR | CR-LF'
-
-`TOKEN :'
-     _any sequence of digits_.
-
-`C-STRING :'
-     `""" SEVEN-BIT-ISO-C-STRING-CONTENT """'
-</pre>
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "list.h"
-#include "MIOOBRecord.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIResultRecord.h"
-#include "MIOutput.h"
-
-static MIResultRecord *processMIResultRecord(char *buffer, int id);
-static MIOOBRecord *processMIOOBRecord(char *buffer, int id);
-static List *processMIResults(char **buffer);
-static MIResult *processMIResult(char **buffer);
-static MIValue *processMIValue(char **buffer);
-static MIValue *processMITuple(char **buffer);
-static MIValue *processMIList(char **buffer);
-static char *translateCString(char **buffer);
-
-char *primaryPrompt = "(gdb)"; //$NON-NLS-1$
-char *secondaryPrompt = ">"; //$NON-NLS-1$
-
-/**
- * Point of entry to create an AST for MI.
- *
- * @param buffer Output from MI Channel.
- * @param mi MIOutput
- * @see MIOutput
- */
- void
- MIParse(char *buffer, MIOutput *mi) 
- {
-	int id = -1;
-	char *s;
-	char *token;
-
-	while (buffer != NULL && *buffer != '\0') {
-		s = strchr(buffer, '\n');
-		if (s != NULL)
-			*s++ = '\0';
-
-		token = buffer;
-		buffer = s;
-		
-		// Fetch the Token/Id
-		if (*token != '\0' && isdigit(*token)) {
-			id = strtol(token, &token, 10);
-		}
-
-		// ResultRecord ||| Out-Of-Band Records
-		if (*token != '\0') {
-			if (*token == '^') {
-				token++;
-				mi->rr = processMIResultRecord(token, id);
-			} else if (strncmp(token, primaryPrompt, strlen(primaryPrompt)) == 0) {
-				//break; // Do nothing.
-			} else {
-				MIOOBRecord *band = processMIOOBRecord(token, id);
-				if (band != NULL) {
-					if (mi->oobs == NULL)
-						mi->oobs = NewList();
-					AddToList(mi->oobs, (void *)band);
-				}
-			}
-		}
-	}
-}
-
-/**
- * Assuming '^' was deleted from the Result Record.
- */
-static MIResultRecord *
-processMIResultRecord(char *buffer, int id)
-{
-	MIResultRecord *rr = MIResultRecordNew();
-	rr->token = id;
-	if (strncmp(buffer, "done", 4) == 0) {
-		rr->resultClass = MIResultRecordDONE;
-		buffer += 4;
-	} else if (strncmp(buffer, "error", 5) == 0) {
-		rr->resultClass = MIResultRecordERROR;
-		buffer += 5;
-	} else if (strncmp(buffer, "exit", 4) == 0) {
-		rr->resultClass = MIResultRecordEXIT;
-		buffer += 4;
-	} else if (strncmp(buffer, "running", 7) == 0) {
-		rr->resultClass = MIResultRecordRUNNING;
-		buffer += 7;
-	} else if (strncmp(buffer, "connected", 9) == 0) {
-		rr->resultClass = MIResultRecordCONNECTED;
-		buffer += 9;
-	} else {
-		// FIXME:
-		// Error throw an exception?
-	}
-
-	// Results are separated by commas.
-	if (*buffer != '\0' && *buffer == ',') {
-		buffer++;
-		List *res = processMIResults(&buffer);
-		rr->results = res;
-	}
-	return rr;
-}
-
-/**
- * Find OutOfBand Records depending on the starting token.
- */
-static MIOOBRecord *
-processMIOOBRecord(char *buffer, int id)
-{
-	MIOOBRecord *oob = NULL;
-	char c = *buffer;
-	if (c == '*' || c == '+' || c == '=') {
-		// Consume the first char
-		buffer++;
-		switch (c) {
-			case '*' :
-				oob = NewMIExecAsyncOutput();
-				break;
-
-			case '+' :
-				oob = NewMIStatusAsyncOutput();
-				break;
-
-			case '=' :
-				oob = NewMINotifyAsyncOutput();
-				break;
-		}
-		oob->token = id;
-		// Extract the Async-Class
-		char *s = strchr(buffer, ',');
-		if (s != NULL) {
-			*s++ = '\0';
-			oob->class = strdup(buffer);
-			// Consume the async-class and the comma
-			buffer = s;
-		} else {
-			oob->class = strdup(buffer);
-			buffer += strlen(buffer);
-		}
-		List *res = processMIResults(&buffer);
-		oob->results = res;
-	} else if (c == '~' || c == '@' || c == '&') {
-		// Consume the first char
-		buffer++;
-		switch (c) {
-			case '~' :
-				oob = NewMIConsoleStreamOutput();
-				break;
-
-			case '@' :
-				oob = NewMITargetStreamOutput();
-				break;
-
-			case '&' :
-				oob = NewMILogStreamOutput();
-				break;
-		}
-		// translateCString() assumes that the leading " is deleted
-		if (*buffer != '\0' && *buffer == '"') {
-			buffer++;
-		}
-		oob->cstring = translateCString(&buffer);
-	} else {
-		// Badly format MI line, just pass it to the user as target stream
-		oob = NewMITargetStreamOutput();
-		oob->cstring = strdup(buffer); //$NON-NLS-1$
-	}
-	return oob;
-}
-
-/**
- * Assuming that the usual leading comma was consumed.
- * Extract the MI Result comma seperated responses.
- */
-static List * 
-processMIResults(char **buffer)
-{
-	List *aList = NewList();
-	MIResult *result = processMIResult(buffer);
-	if (result != NULL) {
-		AddToList(aList, (void *)result);
-	}
-	while (*(*buffer) != '\0' && *(*buffer) == ',') {
-		(*buffer)++;
-		result = processMIResult(buffer);
-		if (result != NULL) {
-			AddToList(aList, (void *)result);
-		}
-	}
-	return aList;
-}
-
-/**
- * Construct the MIResult.  Characters will be consume/delete
- * moving forward constructing the AST.
- */
-static MIResult *
-processMIResult(char **buffer)
-{
-	MIResult *result = MIResultNew();
-	MIValue *value;
-	char *equal;
-	if (*(*buffer) != '\0' && isalpha(*(*buffer)) && (equal = strchr(*buffer, '=')) != NULL) {
-		char *variable = *buffer;
-		*equal++ = '\0';
-		
-		result->variable = strdup(variable); // TODO strdup?
-		*buffer = equal;
-		value = processMIValue(buffer);
-		result->value = value;
-	} else if(*(*buffer) != '\0' && *(*buffer) == '"') {
-		// This an error but we just swallow it and move on.
-		value = processMIValue(buffer);
-		result->value = value;
-	} else {
-		result->variable = strdup(*buffer);
-		result->value = NewMIConst(); // Empty string:???
-		*(*buffer) = '\0';
-	}
-	return result;
-}
-
-/**
- * Find a MIValue implementation or return null.
- */
-static MIValue *
-processMIValue(char **buffer)
-{
-	MIValue *value = NULL;
-	if (*(*buffer) != '\0') {
-		if (*(*buffer) == '{') {
-			(*buffer)++;
-			value = processMITuple(buffer);
-		} else if (*(*buffer) == '[') {
-			(*buffer)++;
-			value = processMIList(buffer);
-		} else if (*(*buffer) == '"') {
-			(*buffer)++;
-			value = NewMIConst();
-			value->cstring = translateCString(buffer);
-		}
-	}
-	return value;
-}
-
-/**
- * Assuming the starting '{' was deleted form the StringBuffer,
- * go to the closing '}' consuming/deleting all the characters.
- * This is usually call by processMIvalue();
- */
-static MIValue *
-processMITuple(char **buffer)
-{
-	MIValue *tuple = NewMITuple();
-#ifdef __APPLE__
-	List *values = NewList();
-	MIValue *value;
-	MIResult *result;
-#endif /* __APPLE__ */
-	List *results = NULL;
-	// Catch closing '}'
-	while (*(*buffer) != '\0' && *(*buffer) != '}') {
-#ifdef __APPLE__
-		// Try for the MIValue first
-		value = processMIValue(buffer);
-		if (value != NULL) {
-			AddToList(values, (void *)value);
-		} else {
-			result = processMIResult(buffer);
-			if (result != NULL) {
-				if (results == NULL) {
-					results = NewList();
-				}				
-				AddToList(results, (void *)result);
-			}
-		}
-		if (*(*buffer) != '\0' && *(*buffer) == ',') {
-			(*buffer)++;
-		}
-#else /* __APPLE__ */
-		results = processMIResults(buffer);
-#endif /* __APPLE__ */
-	}
-	if (*(*buffer) != '\0' && *(*buffer) == '}') {
-		(*buffer)++;
-	}
-	tuple->results = results;
-#ifdef __APPLE__
-	tuple->values = values;
-#endif /* __APPLE__ */
-	return tuple;
-}
-
-/**
- * Assuming the leading '[' was deleted, find the closing
- * ']' consuming/delete chars from the StringBuffer.
- */
-static MIValue *
-processMIList(char **buffer)
-{
-	MIValue *list = NewMIList();
-	List *valueList = NewList();
-	List *resultList = NewList();
-	MIValue *value;
-	MIResult *result;
-	// catch closing ']'
-	while (*(*buffer) != '\0' && *(*buffer) != ']') {
-		// Try for the MIValue first
-		value = processMIValue(buffer);
-		if (value != NULL) {
-			AddToList(valueList, (void *)value);
-		} else {
-			result = processMIResult(buffer);
-			if (result != NULL) {
-				AddToList(resultList, (void *)result);
-			}
-		}
-		if (*(*buffer) != '\0' && *(*buffer) == ',') {
-			(*buffer)++;
-		}
-	}
-	if (*(*buffer) != '\0' && *(*buffer) == ']') {
-		(*buffer)++;
-	}
-	list->values = valueList;
-	list->results = resultList;
-	return list;
-}
-
-/*
- * MI C-String rather MICOnst values are enclose in double quotes
- * and any double quotes or backslash in the string are escaped.
- * Assuming the starting double quote was removed.
- * This method will stop at the closing double quote remove the extra
- * backslach escaping and return the string __without__ the enclosing double quotes
- * The orignal StringBuffer will move forward.
- */
-static char *
-translateCString(char **buffer)
-{
-	int escape = 0;
-	int closingQuotes = 0;
-	char *s = *buffer;
-	char *sb = strdup(s);
-	char *p = sb;
-
-	for (; *s != '\0' && !closingQuotes; s++) {
-		if (*s == '\\') {
-			if (escape) {
-				*p++ = *s;
-				escape = 0;
-			} else {
-				escape = 1;
-			}
-		} else if (*s == '"') {
-			if (escape) {
-				*p++ = *s;
-				escape = 0;
-			} else {
-				// Bail out.
-				closingQuotes = 1;
-			}
-		} else {
-			if (escape) {
-				*p++ = '\\';
-			}
-			*p++ = *s;
-			escape = 0;
-		}
-	}
-	*buffer = s;
-	*p++ = '\0';
-	return sb;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.c
deleted file mode 100644
index 58d1081..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.c
+++ /dev/null

@@ -1,67 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdlib.h>
-
-#include "MIValue.h"
-#include "MIResult.h"
-
-MIResult *
-MIResultNew(void)
-{
-	MIResult *	res;
-	
-	res = (MIResult *)malloc(sizeof(MIResult));
-	return res;
-}
-
-MIString *
-MIResultToString(MIResult *r)
-{
-	MIString *	str = MIStringNew(r->variable);
-	MIString *	str2;
-	char *		p;
-	
-	if (r->value != NULL) {
-		MIStringAppend(str, MIStringNew("="));
-		str2 = MIValueToString(r->value);
-		p = MIStringToCString(str2);
-		if (*p == '[' || *p =='{') {
-			MIStringAppend(str, str2);
-		} else {
-			MIStringAppend(str, MIStringNew("\"%s\"", p));
-			MIStringFree(str2);
-		}
-	}
-	return str;
-}
-
-void
-MIResultFree(MIResult *r)
-{
-	if (r->variable != NULL)
-		free(r->variable);
-	if (r->value != NULL)
-		MIValueFree(r->value);
-	free(r);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.h
deleted file mode 100644
index f2e2b12..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResult.h
+++ /dev/null

@@ -1,42 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-  
-#ifndef _MIRESULT_H_
-#define _MIRESULT_H_
-
-#include "MIString.h"
-#include "MIValue.h"
-
-/**
- * GDB/MI result sematic (Variable=Value)
- */
-struct MIResult {
-	char *variable;
-	MIValue *value;
-};
-typedef struct MIResult MIResult;
-
-extern MIResult *MIResultNew(void);
-extern MIString *MIResultToString(MIResult *r);
-extern void MIResultFree(MIResult *r);
-#endif /* _MIRESULT_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.c
deleted file mode 100644
index 3a52c9f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.c
+++ /dev/null

@@ -1,91 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIResultRecord.h"
-
-MIResultRecord *
-MIResultRecordNew(void)
-{
-	MIResultRecord *	rr;
-	
-	rr = (MIResultRecord *)malloc(sizeof(MIResultRecord));
-	rr->results = NewList();
-	rr->resultClass = MIResultRecordINVALID;
-	rr->token = -1;
-	return rr;
-}
-
-MIString *
-MIResultRecordToString(MIResultRecord *rr)
-{
-	char *		class;
-	MIString *	str;
-	MIResult *	r;
-	
-	switch (rr->resultClass) {
-	case MIResultRecordDONE:
-		class = "done";
-		break;
-	case MIResultRecordRUNNING:
-		class = "running";
-		break;
-	case MIResultRecordCONNECTED:
-		class = "connected";
-		break;
-	case MIResultRecordERROR:
-		class = "error";
-		break;
-	case MIResultRecordEXIT:
-		class = "exit";
-		break;
-	default:
-		class = "<invalid>";
-		break;
-	}
-	
-	if (rr->token != -1)
-		str = MIStringNew("%d^%s", rr->token, class);
-	else
-		str = MIStringNew("^%s", class);
-	
-	for (SetList(rr->results); (r = (MIResult *)GetListElement(rr->results)) != NULL;) {
-			MIStringAppend(str, MIStringNew(","));
-			MIStringAppend(str, MIResultToString(r));
-	}
-	
-	return str;
-}
-
-void
-MIResultRecordFree(MIResultRecord *rr)
-{
-	if (rr->results != NULL)
-		DestroyList(rr->results, MIResultFree);
-	free(rr);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.h
deleted file mode 100644
index 5428e24..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIResultRecord.h
+++ /dev/null

@@ -1,50 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-  
-#ifndef _MIRESULTRECORD_H_
-#define _MIRESULTRECORD_H_
-
-#include "list.h"
-#include "MIString.h"
-
-#define MIResultRecordINVALID	0
-#define MIResultRecordDONE		1
-#define MIResultRecordRUNNING	2
-#define MIResultRecordCONNECTED	3
-#define MIResultRecordERROR		4
-#define MIResultRecordEXIT		5
-
-/**
- * GDB/MI ResultRecord.
- */
-struct MIResultRecord {
-	List *	results;
-	int		resultClass;
-	int		token;
-};
-typedef struct MIResultRecord MIResultRecord;
-
-extern MIResultRecord *MIResultRecordNew(void);
-extern MIString *MIResultRecordToString(MIResultRecord *rr);
-extern void MIResultRecordFree(MIResultRecord *rr);
-#endif /* _MIRESULTRECORD_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.c
deleted file mode 100644
index 26a1565..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.c
+++ /dev/null

@@ -1,650 +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
- ******************************************************************************/
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/errno.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "list.h"
-#include "MISession.h"
-#include "MICommand.h"
-#include "MIError.h"
-#include "MIOOBRecord.h"
-#include "MIValue.h"
-#include "MIResult.h"
-
-static List *			MISessionList = NULL;
-static struct timeval	MISessionDefaultSelectTimeout = {0, 1000};
-static int				MISessionDebug = 0;
-
-static void DoOOBAsyncCallbacks(MISession *sess, List *oobs);
-static void DoOOBStreamCallbacks(MISession *sess, List *oobs);
-static void HandleChild(int sig);
-static int WriteCommand(int fd, char *cmd);
-static char *ReadResponse(int fd);
-
-MISession *
-MISessionNew(void)
-{
-	MISession *	sess = (MISession *)malloc(sizeof(MISession));
-	
-	sess->in_fd = -1;
-	sess->out_fd = -1;
-	sess->pid = -1;
-	sess->exited = 1;
-	sess->exit_status = 0;
-	sess->command = NULL;
-	sess->send_queue = NewList();
-	sess->gdb_path = strdup("gdb");
-	sess->event_callback = NULL;
-	sess->cmd_callback = NULL;
-	sess->exec_callback = NULL;
-	sess->status_callback = NULL;
-	sess->notify_callback = NULL;
-	sess->console_callback = NULL;
-	sess->log_callback = NULL;
-	sess->target_callback = NULL;
-	sess->select_timeout = MISessionDefaultSelectTimeout;
-
-	if (MISessionList == NULL)
-		MISessionList = NewList();
-	AddToList(MISessionList, (void *)sess);
-	
-	return sess;
-}
-
-void
-MISessionFree(MISession *sess)
-{
-	RemoveFromList(MISessionList, (void *)sess);
-	free(sess);
-}
-
-static void
-HandleChild(int sig)
-{
-	int			stat;
-	pid_t		pid;
-	MISession *	sess;
-	
-	pid = wait(&stat);
-	
-	if (MISessionList != NULL) {
-		for (SetList(MISessionList); (sess = (MISession *)GetListElement(MISessionList)) != NULL; ) {
-			if (sess->pid == pid) {
-				fprintf(stderr, "gdb pid %d has exited\n", pid);
-				sess->exited = 1;
-				sess->exit_status = stat;
-			}
-		}
-	}
-}
-
-void
-MISessionSetTimeout(MISession *sess, long sec, long usec)
-{
-	sess->select_timeout.tv_sec = sec;
-	sess->select_timeout.tv_usec = usec;
-}
-
-void
-MISessionSetDebug(int debug)
-{
-	MISessionDebug = debug;
-//	MISessionDebug = 1;
-}
-
-int
-MISessionStartLocal(MISession *sess, char *prog)
-{
-	int			p1[2];
-	int			p2[2];
-	
-	if (pipe(p1) < 0 || pipe(p2) < 0) {
-		MISetError(MI_ERROR_SYSTEM, strerror(errno));
-		return -1;
-	}
-	
-	sess->in_fd = p2[1];
-	sess->out_fd = p1[0];
-	sess->exited = 0;
-	
-	signal(SIGCHLD, HandleChild);
-	signal(SIGPIPE, SIG_IGN);
-	
-	switch (sess->pid = fork())
-	{
-	case 0:
-		dup2(p2[0], 0);
-		dup2(p1[1], 1);
-		close(p1[0]);
-		close(p1[1]);
-		close(p2[0]);
-		close(p2[1]);
-		
-		if (prog == NULL)
-			execlp(sess->gdb_path, "gdb", "-q", "-tty", "/dev/null", "-i", "mi", NULL);
-		else
-			execlp(sess->gdb_path, "gdb", "-q", "-tty", "/dev/null", "-i", "mi", prog, NULL);
-		
-		exit(1);
-	
-	case -1:
-		MISetError(MI_ERROR_SYSTEM, strerror(errno));
-		return -1;
-	        
-	default:
-	    break;
-	}
-
-	close(p1[1]);
-	close(p2[0]);
-	
-	return 0;
-}
-
-void
-MISessionRegisterEventCallback(MISession *sess, void (*callback)(MIEvent *))
-{
-	sess->event_callback = callback;
-}
-
-void
-MISessionRegisterCommandCallback(MISession *sess, void (*callback)(MIResultRecord *))
-{
-	sess->cmd_callback = callback;
-}
-
-void
-MISessionRegisterExecCallback(MISession *sess, void (*callback)(char *, List *))
-{
-	sess->exec_callback = callback;
-}
-
-void
-MISessionRegisterStatusCallback(MISession *sess, void (*callback)(char *, List *))
-{
-	sess->status_callback = callback;
-}
-
-void
-MISessionRegisterNotifyCallback(MISession *sess, void (*callback)(char *, List *))
-{
-	sess->notify_callback = callback;
-}
-
-void
-MISessionRegisterConsoleCallback(MISession *sess, void (*callback)(char *))
-{
-	sess->console_callback = callback;
-}
-
-void
-MISessionRegisterLogCallback(MISession *sess, void (*callback)(char *))
-{
-	sess->log_callback = callback;
-}
-
-void
-MISessionRegisterTargetCallback(MISession *sess, void (*callback)(char *))
-{
-	sess->target_callback = callback;
-}
-
-void
-MISessionSetGDBPath(MISession *sess, char *path)
-{
-	if (sess->gdb_path != NULL)
-		free(sess->gdb_path);
-	sess->gdb_path = strdup(path);
-}
-
-int
-MISessionSendCommand(MISession *sess, MICommand *cmd)
-{
-	if (sess->pid == -1) {
-		MISetError(MI_ERROR_SESSION, "");
-		return -1;
-	}
-
-	AddToList(sess->send_queue, (void *)cmd);
-	
-	return 0;
-}
-
-/*
- * Send command to GDB. We keep writing
- * until the whole command has been sent.
- * 
- * There is a chance this could block.
- */
-static int
-WriteCommand(int fd, char *cmd)
-{
-	int	n;
-	int	len = strlen(cmd);
-
-	if (MISessionDebug) {
-		printf("MI: SEND %s", cmd);
-		if (cmd[len-1] != '\n')
-			printf("\n");
-		fflush(stdout);
-	}
-		
-	while (len > 0) {
-		n = write(fd, cmd, len);
-		if (n <= 0) {
-			if (n < 0) {
-				if (errno == EINTR)
-					continue;
-				MISetError(MI_ERROR_SYSTEM, strerror(errno));
-			}
-			return -1;
-		}
-		
-		cmd += n;
-		len -= n;
-	}
-		
-	return 0;
-}
-
-/*
- * Read BUFSIZ chunks of data until we have read
- * everything available.
- * 
- * Everything has been read if:
- * 1) the read returns less than BUFSIZ
- * 2) the read would block (errno == EAGAIN)
- * 
- * The assumption is that O_NONBLOCK has been set 
- * of the file descriptor.
- * 
- * The buffer is static, so we just reuse it for each
- * call and increase the size if necessary.
- */
-#define MI_BUFSIZ 1024 //BUFSIZ
-static char *
-ReadResponse(int fd)
-{
-	int				n;
-	int				len = 0;
-	char *			p;
-	static int		res_buf_len = MI_BUFSIZ;
-	static char *	res_buf = NULL;
-	
-	//if (res_buf != NULL) {
-		//free(res_buf);
-	//}
-	
-	if (res_buf == NULL)
-		res_buf = (char *)malloc(MI_BUFSIZ);
-
-	p = res_buf;
-	for (;;) {
-		n = read(fd, p, MI_BUFSIZ);
-		if (n <= 0) {
-			if (n < 0) {
-				if (errno == EAGAIN)
-					break;
-				if (errno == EINTR)
-					continue;
-				MISetError(MI_ERROR_SYSTEM, strerror(errno));
-			}
-			return NULL;
-		}
-
-		if (n < MI_BUFSIZ)
-			break;
-			
-		len += MI_BUFSIZ;
-
-		if (len == res_buf_len) {
-			res_buf_len += MI_BUFSIZ;
-			res_buf = (char *)realloc(res_buf, res_buf_len);
-		}
-		
-		p = &res_buf[len];
-	}
-	
-	if (n > 0)
-		p[n] = '\0';
-
-	if (MISessionDebug) {
-		printf("MI: RECV %s", res_buf); 
-		if (res_buf[strlen(res_buf)-1] != '\n')
-			printf("\n");
-		fflush(stdout);
-	}
-
-	return res_buf;
-}
-
-/*
- * Send first pending command to GDB for each session.
- * 
- * For each session, read response from GDB and 
- * parse the result.
- * 
- * Assumes that fds contains file descriptors ready
- * for writing.
- */
-void
-MISessionProcessCommandsAndResponses(MISession *sess, fd_set *rfds, fd_set *wfds, MIOutput *output)
-{
-	char *		str;
-	
-	if (sess->pid == -1)
-		return;
-		
-	if (sess->in_fd != -1
-		&& !EmptyList(sess->send_queue)
-		&& sess->command == NULL
-		&& (wfds == NULL || FD_ISSET(sess->in_fd, wfds))
-	)
-	{	
-		sess->command = (MICommand *)RemoveFirst(sess->send_queue);
-
-#ifdef __gnu_linux__
-		/*
-		 * NOTE: this hack only works if gdb is started with the '-tty' argument (or
-		 * presumably if the 'tty' command is issued.) Without this, the only way to
-		 * interrupt a running process seems to be from the command line.
-		 */
-		if (strcmp(sess->command->command, "-exec-interrupt") == 0) {
-			if (MISessionDebug) {
-				printf("MI: sending SIGINT to %d\n", sess->pid); 
-				fflush(stdout);
-			}		
-			kill(sess->pid, SIGINT);
-		} else if (WriteCommand(sess->in_fd, MICommandToString(sess->command)) < 0) {
-			sess->in_fd = -1;
-		}
-#else /* __gnu_linux__ */
-		if (WriteCommand(sess->in_fd, MICommandToString(sess->command)) < 0) {
-			sess->in_fd = -1;
-		}
-#endif /* __gnu_linux */
-	}
-
-	if (sess->out_fd != -1 && FD_ISSET(sess->out_fd, rfds)) {
-		if ((str = ReadResponse(sess->out_fd)) == NULL) {
-			sess->out_fd = -1;
-			return;
-		}
-		
-		MIParse(str, output);
-			
-		/*
-		 * The output can consist of:
-		 * 	async oob records that are not necessarily the result of a command
-		 * 	stream oob records that always result from a command
-		 *	result records from a command
-		 * 
-		 * Async oob records are processed immediately and removed.
-		 * 
-		 * Stream oob records are processed immediately but a retained with the
-		 * command in case they are needed for later processing.
-		 * 
-		 * If there are result records, then the output *should* have resulted
-		 * from the execution of a command. Mark the command as completed an
-		 * invoke its callback.
-		 * 
-		 * The stream oob and result records are freed when the command is freed.
-		 */
-		 
-		if (output->oobs != NULL) {
-#ifdef __gnu_linux__
-			if (sess->command != NULL && strcmp(sess->command->command, "-exec-interrupt") == 0) {
-				sess->command->completed = 1;
-			}
-#endif /* __gnu_linux__ */	
-			DoOOBAsyncCallbacks(sess, output->oobs);
-			DoOOBStreamCallbacks(sess, output->oobs);
-		}
-
-		if (output->rr != NULL && sess->command != NULL) {
-			sess->command->completed = 1;
-			sess->command->output = output;
-			if (sess->command->callback != NULL)
-				sess->command->callback(output->rr, sess->command->cb_data);
-		} else {
-			if (sess->command == NULL) {
-				MIOutputFree(output);
-			}
-		}
-
-		if (sess->command != NULL && sess->command->completed)
-			sess->command = NULL;
-	}
-}
-
-int
-MISessionCommandCompleted(MISession *sess)
-{
-	return sess->command == NULL;
-}
-
-/*
- * Used to process a result record after a CLI command has been
- * issued if an MIEvent needs to be generated. 
- * 
- * In MI mode, GDB CLI commands append result information (after
- * the "done" result class) to the result record. This function can be 
- * passed to MICommandRegisterCallback() in order to automatically generate 
- * an MIEvent when the CLI command completes.
- * 
- * NOTE: CLI commands DO NOT operate asychronously, so some commands will 
- * block until the command is complete (e.g. "run"). This may cause a user
- * interface to block.
- */
-void 
-ProcessCLIResultRecord(MIResultRecord *rr, void *data)
-{
-	MISession *sess = (MISession *)data;
-	MIResult *res;
-	MIValue *val;
-
-	if (rr->resultClass == MIResultRecordDONE) {
-		for (SetList(rr->results); (res = (MIResult *)GetListElement(rr->results)); ) {
-			if (strcmp(res->variable, "reason") == 0) {
-				val = res->value;
-				if (val->type == MIValueTypeConst) {
-					if (sess->event_callback) {
-						sess->event_callback(MIEventCreateStoppedEvent(val->cstring, rr->results));
-					}
-				}
-			}
-		}
-	} 
-}
-
-/*
- * Process async callbacks. Removes records from oobs list.
- */
-static void
-DoOOBAsyncCallbacks(MISession *sess, List *oobs)
-{
-	MIOOBRecord *	oob;
-	MIResult *		res;
-	MIValue *		val;
-	
-	for (SetList(oobs); (oob = (MIOOBRecord *)GetListElement(oobs)) != NULL; ) {
-		if (oob->type == MIOOBRecordTypeAsync) {
-			switch (oob->sub_type) {
-			case MIOOBRecordExecAsync:
-				if (sess->exec_callback != NULL)
-					sess->exec_callback(oob->class, oob->results);
-					
-				if (strcmp(oob->class, "stopped") == 0) {
-					int seen_reason = 0;
-					for (SetList(oob->results); (res = (MIResult *)GetListElement(oob->results)); ) {
-						if (strcmp(res->variable, "reason") == 0) {
-							seen_reason = 1;
-							val = res->value;
-							if (val->type == MIValueTypeConst) {
-								if (sess->event_callback) {
-									sess->event_callback(MIEventCreateStoppedEvent(val->cstring, oob->results));
-								}
-							}
-						}
-					}
-					
-					/*
-					 * Temporary breakpoints under Linux don't have a "reason". If we receive
-					 * a stopped event with no reason, then we created a StoppedEvent anyway
-					 */
-					if (seen_reason == 0) {
-						if (sess->event_callback) {
-							sess->event_callback(MIEventCreateStoppedEvent("temporary-breakpoint-hit", oob->results));
-						}
-					}
-				}
-				break;
-				
-			case MIOOBRecordStatusAsync:
-				if (sess->status_callback != NULL)
-					sess->status_callback(oob->class, oob->results);
-				break;
-				
-			case MIOOBRecordNotifyAsync:
-				if (sess->notify_callback != NULL)
-					sess->notify_callback(oob->class, oob->results);
-				break;
-			}
-			
-			RemoveFromList(oobs, (void *)oob);
-			MIOOBRecordFree(oob);
-		}
-	}
-}
-
-/*
- * Process stream callbacks. We leave the records on the oobs list
- * because they may be needed by later command processing.
- */
-static void
-DoOOBStreamCallbacks(MISession *sess, List *oobs)
-{
-	MIOOBRecord *	oob;
-	
-	for (SetList(oobs); (oob = (MIOOBRecord *)GetListElement(oobs)) != NULL; ) {
-		if (oob->type == MIOOBRecordTypeStream) {
-			switch (oob->sub_type) {
-			case MIOOBRecordConsoleStream:
-				if (sess->console_callback != NULL) {
-					sess->console_callback(oob->cstring);
-				}
-				break;
-				
-			case MIOOBRecordLogStream:
-				if (sess->log_callback != NULL)
-					sess->log_callback(oob->cstring);
-				break;
-				
-			case MIOOBRecordTargetStream:
-				if (sess->target_callback != NULL)
-					sess->target_callback(oob->cstring);
-				break;
-			}
-		}
-	}
-}
-
-void
-MISessionGetFds(MISession *sess, int *nfds, fd_set *rfds, fd_set *wfds, fd_set *efds)
-{
-	int			n = 0;
-	
-	if (rfds != NULL)
-		FD_ZERO(rfds);
-		
-	if (wfds != NULL)
-		FD_ZERO(wfds);
-	
-	if (efds != NULL)
-		FD_ZERO(efds);
-	
-	if (sess->pid != -1) {
-		if (wfds != NULL && sess->in_fd != -1) {
-			FD_SET(sess->in_fd, wfds);
-			if (sess->in_fd > n)
-				n = sess->in_fd;
-		}
-		if (rfds != NULL && sess->out_fd != -1) {
-			FD_SET(sess->out_fd, rfds);
-			if (sess->out_fd > n)
-				n = sess->out_fd;
-		}
-	}
-	
-	if (nfds != NULL)
-		*nfds = n + 1;
-}
-
-/*
- * Default progress command if none supplied.
- * 
- * Don't select on write fds. This will almost always return immediately,
- * so the timeout is never used. The end result is a busy wait that
- * consumes gobs of CPU.
- * 
- * Also, we make a copy of sess->select_timeout as some select()
- * functions will modify it.
- */
-int
-MISessionProgress(MISession *sess, MIOutput *output)
-{
-	int				n;
-	int				nfds;
-	fd_set			rfds;
-	struct timeval	tv = sess->select_timeout;
-	
-	MISessionGetFds(sess, &nfds, &rfds, NULL, NULL);
-
-	for ( ;; ) {
-		n = select(nfds, &rfds, NULL, NULL, &tv);
-		
-		if (n < 0) {
-			if (errno == EINTR)
-				continue;
-				
-			MISetError(MI_ERROR_SYSTEM, strerror(errno));
-			return -1;
-		}		
-		break;
-	}
-
-	/*
-	 * Return if there is nothing to do
-	 */
-	if (n == 0 && EmptyList(sess->send_queue)) {
-		return 0;
-	}
-	MISessionProcessCommandsAndResponses(sess, &rfds, NULL, output);
-	
-	return n;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.h
deleted file mode 100644
index bc0af46..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MISession.h
+++ /dev/null

@@ -1,72 +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
- ******************************************************************************/
-#ifndef _MISESSION_H_
-#define _MISESSION_H_
-
-#include <sys/select.h>
-
-#include "list.h"
-#include "MIOutput.h"
-#include "MICommand.h"
-#include "MIEvent.h"
-
-struct MISession {
-	int				in_fd; /* GDB input */
-	int				out_fd; /* GDB output */
-	int				pid;
-	int				exited;
-	int				exit_status;
-	MICommand *		command;
-	List *			send_queue;
-	char *			gdb_path;
-	struct timeval	select_timeout;
-	void			(*event_callback)(MIEvent *);
-	void			(*cmd_callback)(MIResultRecord *);
-	void			(*exec_callback)(char *, List *);
-	void			(*status_callback)(char *, List *);
-	void			(*notify_callback)(char *, List *);
-	void			(*console_callback)(char *);
-	void			(*log_callback)(char *);
-	void			(*target_callback)(char *);	
-};
-typedef struct MISession	MISession;
-
-extern MISession *MISessionNew(void);
-extern void MISessionFree(MISession *sess);
-extern void MISessionSetTimeout(MISession *sess, long sec, long usec);
-extern void MISessionSetDebug(int debug);
-extern int MISessionStartLocal(MISession *sess, char *);
-extern void MISessionRegisterEventCallback(MISession *sess, void (*callback)(MIEvent *));
-extern void MISessionRegisterCommandCallback(MISession *sess, void (*callback)(MIResultRecord *));
-extern void MISessionRegisterExecCallback(MISession *sess, void (*callback)(char *, List *));
-extern void MISessionRegisterStatusCallback(MISession *sess, void (*callback)(char *, List *));
-extern void MISessionRegisterNotifyCallback(MISession *sess, void (*callback)(char *, List *));
-extern void MISessionRegisterConsoleCallback(MISession *sess, void (*callback)(char *));
-extern void MISessionRegisterLogCallback(MISession *sess, void (*callback)(char *));
-extern void MISessionRegisterTargetCallback(MISession *sess, void (*callback)(char *));
-extern void MISessionSetGDBPath(MISession *sess, char *path);
-extern int MISessionSendCommand(MISession *sess, MICommand *cmd);
-extern int MISessionCommandCompleted(MISession *sess);
-//extern void MISessionProcessCommandsAndResponses(MISession *sess, fd_set *rfds, fd_set *wfds);
-extern void MISessionProcessCommandsAndResponses(MISession *sess, fd_set *rfds, fd_set *wfds, MIOutput *output);
-extern void MISessionGetFds(MISession *sess, int *nfds, fd_set *rfds, fd_set *wfds, fd_set *efds);
-//extern int MISessionProgress(MISession *sess);
-extern int MISessionProgress(MISession *sess, MIOutput *output);
-extern void ProcessCLIResultRecord(MIResultRecord *, void *);
-#endif /* _MISESSION_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIStackCommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIStackCommand.c
deleted file mode 100644
index 4d99679..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIStackCommand.c
+++ /dev/null

@@ -1,101 +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
- ******************************************************************************/
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIString.h"
-#include "MICommand.h"
-
-MICommand *
-MIStackSelectFrame(int level)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-stack-select-frame", MIResultRecordDONE);
-	MICommandAddOption(cmd, MIIntToCString(level), NULL);
-	return cmd;
-}
-
-MICommand *
-MIStackListFrames(int low, int high)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-stack-list-frames", MIResultRecordDONE);
-	//MICommandAddOption(cmd, MIIntToCString(low), MIIntToCString(high));
-	MICommandAddOption(cmd, MIIntToCString(low), NULL);
-	MICommandAddOption(cmd, MIIntToCString(high), NULL);
-	return cmd;
-}
-
-MICommand *
-MIStackListAllFrames(void)
-{
-	return MICommandNew("-stack-list-frames", MIResultRecordDONE);
-}
-
-MICommand *
-MIStackListLocals(int vals)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-stack-list-locals", MIResultRecordDONE);
-	MICommandAddOption(cmd, MIIntToCString(vals), NULL);
-	return cmd;
-}
-
-MICommand *
-MIStackListArguments(int vals, int low, int high)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-stack-list-arguments", MIResultRecordDONE);
-	MICommandAddOption(cmd, MIIntToCString(vals), NULL);
-	MICommandAddOption(cmd, MIIntToCString(low), MIIntToCString(high));
-	return cmd;
-}
-
-MICommand *
-MIStackListAllArguments(int vals)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-stack-list-arguments", MIResultRecordDONE);
-	MICommandAddOption(cmd, MIIntToCString(vals), NULL);
-	return cmd;
-}
-
-MICommand *
-MIStackInfoFrame(void)
-{
-	MICommand * cmd;
-	cmd = MICommandNew("-stack-info-frame", MIResultRecordDONE);
-	return cmd;
-}
-
-MICommand *
-MIStackInfoDepth(void)
-{
-	MICommand * cmd;
-	cmd = MICommandNew("-stack-info-depth", MIResultRecordDONE);
-	return cmd;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.c
deleted file mode 100644
index 6eccda2..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.c
+++ /dev/null

@@ -1,109 +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
- ******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "MIString.h"
-
-/*
- * Number of strings to keep before recycling. This allows
- * MIIntToCString to be called multiple times in an argument
- * list.
- */
-#define NUM_STRINGS		5
-
-static int		str_ptr = -1;
-static char *	strings[NUM_STRINGS];
-
-MIString *
-MIStringNew(char *fmt, ...)
-{
-	va_list ap;
-	MIString *s;
-
-	s = (MIString *)malloc(sizeof(MIString));
-	va_start(ap, fmt);
-	vasprintf(&s->buf, fmt, ap);
-	va_end(ap);
-	s->slen = strlen(s->buf);
-
-	return s;
-}
-
-void
-MIStringFree(MIString *str)
-{
-	free(str->buf);
-	free(str);
-}
-
-void
-MIStringAppend(MIString *str, MIString *str2)
-{
-	int len = str->slen + str2->slen;
-	char *buf = (char *)malloc(len + 1);
-
-	memcpy(buf, str->buf, str->slen);
-	memcpy(&buf[str->slen], str2->buf, str2->slen);
-	buf[len] = '\0';
-
-	free(str->buf);
-
-	str->buf = buf;
-	str->slen = len;
-
-	MIStringFree(str2);
-}
-
-char *
-MIStringToCString(MIString *str)
-{
-	return str->buf;
-}
-
-char *
-MIIntToCString(int val)
-{
-	char **	s;
-
-	if (str_ptr < 0) {
-		memset(strings, 0, NUM_STRINGS);
-		str_ptr = 0;
-	}
-
-	if (++str_ptr == NUM_STRINGS) {
-		str_ptr = 0;
-	}
-
-	s = &strings[str_ptr];
-
-	if (*s != NULL) {
-		free(*s);
-	}
-
-	asprintf(s, "%d", val);
-
-	return *s;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.h
deleted file mode 100644
index 666ac72..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIString.h
+++ /dev/null

@@ -1,35 +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
- ******************************************************************************/
- 
-#ifndef _MISTRING_H_
-#define _MISTRING_H_
-#include <stdarg.h>
-
-struct MIString {
-	int     slen;
-	char *  buf;
-};
-typedef struct MIString MIString;
-
-extern MIString *MIStringNew(char *fmt, ...);
-extern void MIStringFree(MIString *str);
-extern void MIStringAppend(MIString *str, MIString *str2);
-extern char *MIStringToCString(MIString *str);
-extern char *MIIntToCString(int val);
-#endif /* _MISTRING_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.c
deleted file mode 100644
index 0ffcd3f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.c
+++ /dev/null

@@ -1,71 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "list.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIArg.h"
-#include "MIThread.h"
-#include "MIOOBRecord.h"
-
-MIThreadSelectInfo *
-MIThreadSelectInfoNew(void) 
-{
-	MIThreadSelectInfo * info;
-	info = (MIThreadSelectInfo *)malloc(sizeof(MIThreadSelectInfo));
-	info->current_thread_id = 0;
-	info->frame = NULL;
-	return info;
-}
-
-MIThreadSelectInfo *
-MISetThreadSelectInfo(MICommand *cmd) 
-{
-	MIThreadSelectInfo * info = MIThreadSelectInfoNew();
-	MIValue * val;
-	MIResultRecord * rr;
-	MIResult * result;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		if (strcmp(result->variable, "new-thread-id") == 0) {
-			val = result->value;
-			info->current_thread_id = (int)strtol(val->cstring, NULL, 10);
-		}
-		else if (strcmp(result->variable, "frame") == 0) {
-			val = result->value;
-			if (val->type == MIValueTypeTuple) {
-				info->frame = MIFrameParse(val);
-			}
-		}
-	}	
-	return info;	
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.h
deleted file mode 100644
index 432c87f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThread.h
+++ /dev/null

@@ -1,41 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#ifndef _MITHREAD_H_
-#define _MITHREAD_H_
-
-#include "MICommand.h"
-#include "MIValue.h"
-#include "MIFrame.h"
-
-struct MIThreadSelectInfo {
-	int current_thread_id;
-	MIFrame * frame;
-};
-typedef struct MIThreadSelectInfo MIThreadSelectInfo;
-
-extern MIThreadSelectInfo *MIThreadSelectInfoNew(void);
-extern MIThreadSelectInfo *MISetThreadSelectInfo(MICommand *cmd);
-
-#endif /* _MITHREAD_H_ */
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThreadCommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThreadCommand.c
deleted file mode 100644
index 8634861..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIThreadCommand.c
+++ /dev/null

@@ -1,43 +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
- ******************************************************************************/
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "MICommand.h"
-
-/*
-MICommand *
-MIInfoThreads(void)
-{
-	MICommand * cmd;
-	cmd = MICommandNew("info threads", MIResultRecordDONE);
-	return cmd;
-}
-*/
-
-MICommand *
-MIThreadSelect(int threadNum)
-{
-	MICommand * cmd;
-	cmd = MICommandNew("-thread-select", MIResultRecordDONE);
-	MICommandAddOption(cmd, MIIntToCString(threadNum), NULL);
-	return cmd;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.c
deleted file mode 100644
index acc667d..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.c
+++ /dev/null

@@ -1,159 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdlib.h>
-
-#include "list.h"
-#include "MIValue.h"
-#include "MIResult.h"
-
-MIValue *
-MIValueNew(void)
-{
-	MIValue *	val;
-	
-	val = (MIValue *)malloc(sizeof(MIValue));
-	val->type = MIValueTypeInvalid;
-	val->cstring = NULL;
-	val->values = NULL;
-	val->results = NULL;
-	return val;	
-}
-
-MIValue *
-NewMIConst(void)
-{
-	MIValue *	val = MIValueNew();
-	val->type = MIValueTypeConst;
-	return val;
-}
-
-MIValue *
-NewMITuple(void)
-{
-	MIValue *	val = MIValueNew();
-	val->type = MIValueTypeTuple;
-	return val;
-}
-
-MIValue *
-NewMIList(void)
-{
-	MIValue *	val = MIValueNew();
-	val->type = MIValueTypeList;
-	return val;
-}
-
-MIString *
-MIConstToString(MIValue *v)
-{
-	return MIStringNew(v->cstring);
-}
-
-MIString *
-MIListToString(MIValue *v)
-{
-	int			first = 1;
-	MIString *	str = MIStringNew("[");
-	MIResult *	r;
-	MIValue *	val;
-
-	for (SetList(v->results); (r = (MIResult *)GetListElement(v->results)) != NULL;) {
-		if (!first)
-			MIStringAppend(str, MIStringNew(","));
-		first = 0;
-		MIStringAppend(str, MIResultToString(r));
-	}
-	first = 1;
-	for (SetList(v->values); (val = (MIValue *)GetListElement(v->values)) != NULL;) {
-		if (!first)
-			MIStringAppend(str, MIStringNew(","));
-		first = 0;
-		MIStringAppend(str, MIValueToString(val));
-	}
-	MIStringAppend(str, MIStringNew("]"));
-	return str;
-}
-
-MIString *
-MITupleToString(MIValue *v)
-{
-	int			first = 1;
-	MIString *	str = MIStringNew("{");
-	MIResult *	r;
-#ifdef __APPLE__
-	MIValue *	val;
-#endif /* __APPLE__ */
-
-	for (SetList(v->results); (r = (MIResult *)GetListElement(v->results)) != NULL;) {
-		if (!first)
-			MIStringAppend(str, MIStringNew(","));
-		first = 0;
-		MIStringAppend(str, MIResultToString(r));
-	}
-#ifdef __APPLE__
-	first = 1;
-	for (SetList(v->values); (val = (MIValue *)GetListElement(v->values)) != NULL;) {
-		if (!first)
-			MIStringAppend(str, MIStringNew(","));
-		first = 0;
-		MIStringAppend(str, MIValueToString(val));
-	}
-#endif /* __APPLE__ */
-	MIStringAppend(str, MIStringNew("}"));
-	return str;
-}
-
-MIString *
-MIValueToString(MIValue *v)
-{
-	MIString *	str = NULL;
-	
-	switch (v->type) {
-	case MIValueTypeConst:
-		str = MIConstToString(v);
-		break;
-		
-	case MIValueTypeList:
-		str = MIListToString(v);
-		break;
-		
-	case MIValueTypeTuple:
-		str = MITupleToString(v);
-		break;
-	}
-	
-	return str;
-}
-
-void
-MIValueFree(MIValue *v)
-{
-	if (v->cstring != NULL)
-		free(v->cstring);
-	if (v->results != NULL)
-		DestroyList(v->results, MIResultFree);
-	if (v->values != NULL)
-		DestroyList(v->values, MIValueFree);
-	free(v);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.h
deleted file mode 100644
index aeaf067..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIValue.h
+++ /dev/null

@@ -1,54 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-  
-#ifndef _MIVALUE_H_
-#define _MIVALUE_H_
-
-#include "list.h"
-#include "MIString.h"
-
-#define MIValueTypeInvalid	0
-#define MIValueTypeConst		1
-#define MIValueTypeList		2
-#define MIValueTypeTuple		3
-
-/**
- * GDB/MI value.
- */
-struct MIValue {
-	int type;
-	char *cstring;
-	List *values;
-	List *results;
-};
-typedef struct MIValue MIValue;
-
-extern MIValue *NewMIConst(void);
-extern MIValue *NewMITuple(void);
-extern MIValue *NewMIList(void);
-extern MIString *MIConstToString(MIValue *);
-extern MIString *MIListToString(MIValue *);
-extern MIString *MITupleToString(MIValue *);
-extern MIString *MIValueToString(MIValue *);
-extern void MIValueFree(MIValue *v);
-#endif /* _MIVALUE_H_ */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.c
deleted file mode 100644
index 69c1c1d..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.c
+++ /dev/null

@@ -1,350 +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
- ******************************************************************************/
-
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIValue.h"
-#include "MIResult.h"
-#include "MIVar.h"
-#include "MIOOBRecord.h"
-
-MIVar *
-MIVarNew(void)
-{
-	MIVar *	var = (MIVar *)malloc(sizeof(MIVar));
-	var->name = NULL;
-	var->type = NULL;
-	var->exp = NULL;
-	var->numchild = 0;
-	var->children = NULL;
-	return var;
-}
-
-void
-MIVarFree(MIVar *var)
-{
-	int i;
-
-	if (var->name != NULL)
-		free(var->name);
-	if (var->type != NULL)
-		free(var->type);
-	if (var->exp != NULL)
-		free(var->exp);
-	if (var->children != NULL) {
-		for (i = 0; i < var->numchild; i++)
-			MIVarFree(var->children[i]);
-		free(var->children);
-	}
-	free(var);
-}
-
-MIVarChange *
-MIVarChangeNew(void) {
-	MIVarChange *varchange = (MIVarChange *)malloc(sizeof(MIVarChange));
-
-	varchange->name = NULL;
-	varchange->in_scope = 0;
-	varchange->type_changed = 0;
-	return varchange;
-}
-
-void
-MIVarChangeFree(MIVarChange *varchange) {
-	if (varchange->name != NULL)
-		free(varchange->name);
-	free(varchange);
-}
-
-MIVar *
-MIVarParse(List *results)
-{
-	MIValue *	value;
-	MIResult *	result;
-	MIVar *		var = MIVarNew();
-	char *		str;
-
-	for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL; ) {
-		value = result->value;
-		if (value != NULL && value->type == MIValueTypeConst) {
-			str = value->cstring;
-		} else {
-			str = "";
-		}
-
-		if (strcmp(result->variable, "numchild") == 0) {
-			var->numchild = (int)strtol(str, NULL, 10);
-		} else if (strcmp(result->variable, "name") == 0) {
-			var->name = strdup(str);
-		} else if (strcmp(result->variable, "type") == 0) {
-			var->type = strdup(str);
-		} else if (strcmp(result->variable, "exp") == 0) {
-			var->exp = strdup(str);
-		}
-	}
-
-	return var;
-}
-
-MIVar *
-MIGetVarCreateInfo(MICommand *cmd)
-{
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	return MIVarParse(cmd->output->rr->results);
-}
-
-/*
- * Some gdb MacOSX do not return a MITuple so we have
- * to check for different format.
- * See PR 81019
- */
-void
-parseChildren(MIValue *val, List **res)
-{
-	MIValue *	value;
-	MIResult *	result;
-	List *		children = NULL;
-	List * 		results = val->results;
-
-	if (results != NULL) {
-		for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL; ) {
-			if (strcmp(result->variable, "child") == 0) { //$NON-NLS-1$
-				value = result->value;
-				if (value->type == MIValueTypeTuple) {
-					if (children == NULL)
-						children = NewList();
-					AddToList(children, MIVarParse(value->results));
-				}
-			}
-		}
-	}
-	*res = children;
-}
-
-void
-MIGetVarListChildrenInfo(MIVar *var, MICommand *cmd)
-{
-	int				num;
-	MIVar *			child;
-	MIValue *		value;
-	MIResult *		result;
-	MIResultRecord *	rr;
-	List *			children = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return;
-
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		value = result->value;
-
-		if (strcmp(result->variable, "numchild") == 0) {
-			if (value->type == MIValueTypeConst) {
-				var->numchild = (int)strtol(value->cstring, NULL, 10);
-			}
-		} else if (strcmp(result->variable, "children") == 0) {
-			parseChildren(value, &children);
-		}
-	}
-
-	if (children != NULL) {
-		num = SizeOfList(children);
-		if (var->numchild != num)
-			var->numchild = num;
-		var->children = (MIVar **)malloc(sizeof(MIVar *) * var->numchild);
-		for (num = 0, SetList(children); (child = (MIVar *)GetListElement(children)) != NULL; )
-			var->children[num++] = child;
-	}
-}
-
-char *
-MIGetVarEvaluateExpressionInfo(MICommand *cmd)
-{
-	MIValue *		value;
-	MIResult *		result;
-	MIResultRecord *	rr;
-	char *			expr = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		value = result->value;
-		if (strcmp(result->variable, "value") == 0) {
-			if (value->type == MIValueTypeConst) {
-				expr = strdup(value->cstring);
-			}
-		}
-	}
-	return expr;
-}
-
-char *
-MIGetDataEvaluateExpressionInfo(MICommand *cmd)
-{
-	MIValue *		value;
-	MIResult *		result;
-	MIResultRecord *	rr;
-	char *			expr = NULL;
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL; ) {
-		value = result->value;
-		if (strcmp(result->variable, "value") == 0) {
-			if (value->type == MIValueTypeConst) {
-				expr = strdup(value->cstring);
-			}
-		}
-	}
-	return expr;
-}
-
-void
-MIGetVarUpdateParseValue(MIValue* tuple, List* varchanges)
-{
-	MIResult * result;
-	char * str = NULL;
-	char * var;
-	MIValue * value;
-	MIVarChange * varchange = NULL;
-	List * results = tuple->results;
-
-	if (results != NULL) {
-		for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL;) {
-			var = result->variable;
-			value = result->value;
-
-			//this code is for mac
-			if (value->type == MIValueTypeTuple) {
-				MIGetVarUpdateParseValue(value, varchanges);
-				continue;
-			}
-
-			if (value->type == MIValueTypeConst) {
-				str = value->cstring;
-			}
-
-			if (strcmp(var, "name") == 0 && str != NULL) {
-				varchange = MIVarChangeNew();
-				varchange->name = strdup(str);
-				AddToList(varchanges, (void *)varchange);
-			} else if (strcmp(var, "in_scope") == 0) {
-				if (varchange != NULL) {
-					varchange->in_scope = (strcmp(str, "true")==0)?1:0;
-				}
-			} else if (strcmp(var, "type_changed") == 0) {
-				if (varchange != NULL) {
-					varchange->type_changed = (strcmp(str, "true")==0)?1:0;
-				}
-			}
-		}
-	}
-}
-
-void
-MIGetVarUpdateParser(MIValue* miVal, List *varchanges)
-{
-	MIValue* value;
-	MIResult* result;
-
-	if (miVal->type == MIValueTypeTuple) {
-		MIGetVarUpdateParseValue(miVal, varchanges);
-	}
-	else if (miVal->type == MIValueTypeList) {
-		if (EmptyList(miVal->values)) {
-			for (SetList(miVal->results); (result = (MIResult *)GetListElement(miVal->results)) != NULL;) {
-				MIGetVarUpdateParser(result->value, varchanges);
-			}
-		}
-		else {
-			for (SetList(miVal->values); (value = (MIValue *)GetListElement(miVal->values)) != NULL;) {
-				MIGetVarUpdateParser(value, varchanges);
-			}
-		}
-	}
-}
-
-void
-MIGetVarUpdateInfo(MICommand *cmd, List** varchanges)
-{
-	MIResult *		result;
-	MIResultRecord *	rr;
-	*varchanges = NewList();
-
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return;
-
-	rr = cmd->output->rr;
-	for (SetList(rr->results); (result = (MIResult *)GetListElement(rr->results)) != NULL;) {
-		if (strcmp(result->variable, "changelist") == 0) {
-			MIGetVarUpdateParser(result->value, *varchanges);
-		}
-	}
-}
-
-MIVar *
-MIGetVarInfoType(MICommand *cmd)
-{
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return NULL;
-
-	return MIVarParse(cmd->output->rr->results);
-}
-
-void
-MIGetVarInfoNumChildren(MICommand *cmd, MIVar *var)
-{
-	if (!cmd->completed || cmd->output == NULL || cmd->output->rr == NULL)
-		return;
-
-	List *results;
-	MIValue *	value;
-	MIResult *	result;
-	char *		str;
-
-	if (var == NULL)
-		var = MIVarNew();
-
-	results = cmd->output->rr->results;
-	for (SetList(results); (result = (MIResult *)GetListElement(results)) != NULL; ) {
-		value = result->value;
-		if (value != NULL && value->type == MIValueTypeConst) {
-			str = value->cstring;
-		} else {
-			str = "";
-		}
-
-		if (strcmp(result->variable, "numchild") == 0) {
-			var->numchild = (int)strtol(str, NULL, 10);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.h b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.h
deleted file mode 100644
index 6214e7a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVar.h
+++ /dev/null

@@ -1,71 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
-
-#ifndef _MIVAR_H_
-#define _MIVAR_H_
-
-#include "list.h"
-#include "MIString.h"
-#include "MIResultRecord.h"
-#include "MICommand.h"
-
-/**
- * Represents a set variable object.
- */
-struct MIVar {
-	char *			name;
-	char *			type;
-	char *			exp;
-	int				numchild;
-	struct MIVar **	children;
-};
-typedef struct MIVar	MIVar;
-
-/**
- * Represents a set variable object.
- */
-struct MIVarChange {
-	char *	name;
-	int		in_scope;
-	int		type_changed;
-};
-typedef struct MIVarChange	MIVarChange;
-
-extern MIVar *MIVarNew(void);
-extern void MIVarFree(MIVar *var);
-
-extern MIVarChange *MIVarChangeNew(void);
-extern void MIVarChangeFree(MIVarChange *var);
-
-extern MIVar *MIVarParse(List *results);
-extern MIVar *MIGetVarCreateInfo(MICommand *cmd);
-extern void MIGetVarListChildrenInfo(MIVar *var, MICommand *cmd);
-extern char *MIGetVarEvaluateExpressionInfo(MICommand *cmd);
-extern char *MIGetDataEvaluateExpressionInfo(MICommand *cmd);
-
-extern void MIGetVarUpdateInfo(MICommand *cmd, List **varchanges);
-extern MIVar *MIGetVarInfoType(MICommand *cmd);
-extern void MIGetVarInfoNumChildren(MICommand *cmd, MIVar *var);
-#endif /* _MIVAR_H_ */
-
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVarCommand.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVarCommand.c
deleted file mode 100644
index 51936ac..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/MIVarCommand.c
+++ /dev/null

@@ -1,111 +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
- ******************************************************************************/
- 
- /*
-  * Based on the QNX Java implementation of the MI interface
-  */
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIString.h"
-#include "MICommand.h"
-
-MICommand *
-MIVarCreate(char *name, char *frame, char *expr)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-var-create", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, frame);
-	MICommandAddOption(cmd, expr, NULL);
-	return cmd;
-}
-
-MICommand *
-MIVarDelete(char *name)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-var-delete", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}
-
-MICommand *
-MIVarListChildren(char *name)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-var-list-children", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}
-
-MICommand *
-MIVarEvaluateExpression(char *name)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-var-evaluate-expression", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}
-
-MICommand *
-MIVarUpdate(char *name)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-var-update", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}
-
-MICommand *
-MIDataEvaluateExpression(char *name)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-data-evaluate-expression", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}
-
-MICommand *
-MIVarInfoType(char *name)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-var-info-type", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}
-
-MICommand *
-MIVarInfoNumChildren(char *name)
-{
-	MICommand *	cmd;
-	
-	cmd = MICommandNew("-var-info-num-children", MIResultRecordDONE);
-	MICommandAddOption(cmd, name, NULL);
-	return cmd;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/test.input b/debug/org.eclipse.ptp.debug.sdm/src/mi/test.input
deleted file mode 100644
index a0137ee..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/test.input
+++ /dev/null

@@ -1,23 +0,0 @@
-^done,bkpt={number="1",addr="0x000100d0",file="hello.c",line="5"}
-(gdb)
-^done,BreakpointTable={nr_rows="1",nr_cols="6",hdr=[{width="3",alignment="-1",col_name="number",colhdr="Num"},{width="14",alignment="-1",col_name="type",colhdr="Type"},{width="4",alignment="-1",col_name="disp",colhdr="Disp"},{width="3",alignment="-1",col_name="enabled",colhdr="Enb"},{width="10",alignment="-1",col_name="addr",colhdr="Address"},{width="40",alignment="2",col_name="what",colhdr="What"}],body=[bkpt={number="1",type="breakpoint",disp="keep",enabled="y",addr="0x000100d0",func="main",file="hello.c",line="5",times="0",ignore="3"}]}
-(gdb)
-^running
-^done,reason="watchpoint-trigger",wpt={number="2",exp="x"},value={old="-268439212",new="55"},frame={func="main",args=[],file="recursive2.c",fullname="/home/foo/bar/devo/myproject/recursive2.c",line="5"}
-(gdb)
-^done,asm_insns=[{address="0x000107c0",func-name="main",offset="4",inst="mov  2, %o0"},{address="0x000107c4",func-name="main",offset="8",inst="sethi  %hi(0x11800), %o2"},{address="0x000107c8",func-name="main",offset="12",inst="or  %o2, 0x140, %o1\t! 0x11940 <_lib_version+8>"},{address="0x000107cc",func-name="main",offset="16",inst="sethi  %hi(0x11800), %o2"},{address="0x000107d0",func-name="main",offset="20",inst="or  %o2, 0x168, %o4\t! 0x11968 <_lib_version+48>"}]
-(gdb)
-^done,register-names=["r0","r1","r2","r3","r4","r5","r6","r7","r8","r9","r10","r11","r12","r13","r14","r15","r16","r17","r18","r19","r20","r21","r22","r23","r24","r25","r26","r27","r28","r29","r30","r31","f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","f10","f11","f12","f13","f14","f15","f16","f17","f18","f19","f20","f21","f22","f23","f24","f25","f26","f27","f28","f29","f30","f31","","pc","ps","cr","lr","ctr","xer"]
-(gdb)
-^running
-(gdb)
-@Hello world
-*stopped,reason="breakpoint-hit",bkptno="2",frame={func="foo",args=[],file="hello.c",fullname="/home/foo/bar/devo/myproject/hello.c",line="13"}
-(gdb)
-222^done
-(gdb)
-111*stopped,signal-name="SIGINT",signal-meaning="Interrupt",frame={addr="0x00010140",func="foo",args=[],file="try.c",fullname="/home/foo/bar/devo/myproject/try.c",line="13"}
-(gdb)
-^done,stack=[frame={level="0",addr="0x00010734",func="callee4",file="../../../devo/gdb/testsuite/gdb.mi/basics.c",fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="8"},frame={level="1",addr="0x0001076c",func="callee3",file="../../../devo/gdb/testsuite/gdb.mi/basics.c",fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="17"},frame={level="2",addr="0x0001078c",func="callee2",file="../../../devo/gdb/testsuite/gdb.mi/basics.c",fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="22"},frame={level="3",addr="0x000107b4",func="callee1",file="../../../devo/gdb/testsuite/gdb.mi/basics.c",fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="27"},frame={level="4",addr="0x000107e0",func="main",file="../../../devo/gdb/testsuite/gdb.mi/basics.c",fullname="/home/foo/bar/devo/gdb/testsuite/gdb.mi/basics.c",line="32"}]
-(gdb)
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/mi/test_mi.c b/debug/org.eclipse.ptp.debug.sdm/src/mi/test_mi.c
deleted file mode 100644
index fc04312..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/mi/test_mi.c
+++ /dev/null

@@ -1,92 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "list.h"
-#include "MIString.h"
-#include "MISession.h"
-#include "MIError.h"
-#include "MIResultRecord.h"
-#include "MIBreakpoint.h"
-
-void
-cmd_callback(MIResultRecord *rr, void *sess)
-{
-	MIString *str = MIResultRecordToString(rr);
-	printf("res> %s\n", MIStringToCString(str));
-	MIStringFree(str);
-}
-
-void
-console_callback(char *str)
-{
-	printf("cons> %s\n", str);
-}
-
-void
-log_callback(char *str)
-{
-	printf("log> %s\n", str);
-}
-
-void
-sendcmd_wait(MISession *sess, MICommand *cmd)
-{
-	MISessionSendCommand(sess, cmd);
-	MIOutput *output = MIOutputNew();
-	do {
-		MISessionProgress(sess, output);
-	} while (!MISessionCommandCompleted(sess));
-}
-
-int main(int argc, char *argv[])
-{
-	MISession *sess;
-	MICommand *cmd;
-	List *bpts;
-	MIBreakpoint *bpt;
-	
-	sess = MISessionNew();
-	if (MISessionStartLocal(sess, "/Volumes/Home/greg/x") < 0) {
-		fprintf(stderr, "%s", MIGetErrorStr());
-		return 1;
-	}
-	
-	MISessionRegisterConsoleCallback(sess, console_callback);
-	MISessionRegisterLogCallback(sess, log_callback);
-
-printf("help command\n");
-	cmd = MICommandNew("help", MIResultRecordDONE);
-	MICommandRegisterCallback(cmd, cmd_callback, sess);
-	sendcmd_wait(sess, cmd);
-	if (!MICommandResultOK(cmd))
-		fprintf(stderr, "command failed\n");
-	MICommandFree(cmd);
-printf("set command\n");	
-	cmd = MIGDBSet("confirm", "off");
-	MICommandRegisterCallback(cmd, cmd_callback, sess);
-	sendcmd_wait(sess, cmd);
-	if (!MICommandResultOK(cmd))
-		fprintf(stderr, "command failed\n");
-	MICommandFree(cmd);
-printf("break command\n");	
-	cmd = MIBreakInsert(0, 0, NULL, 0, "4", 0);
-	MICommandRegisterCallback(cmd, cmd_callback, sess);
-	sendcmd_wait(sess, cmd);
-	if (!MICommandResultOK(cmd))
-		fprintf(stderr, "command failed\n");
-	bpts = MIBreakpointGetBreakInsertInfo(cmd);
-	if (bpts != NULL)
-		for (SetList(bpts); (bpt = (MIBreakpoint *)GetListElement(bpts)) != NULL; )
-			printf("bpt id = %d\n", bpt->number);
-	MICommandFree(cmd);
-printf("quit command\n");		
-	cmd = MIGDBExit();
-	MICommandRegisterCallback(cmd, cmd_callback, sess);
-	sendcmd_wait(sess, cmd);
-	if (!MICommandResultOK(cmd))
-		fprintf(stderr, "command failed\n");
-	MICommandFree(cmd);
-
-	return 0;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/server/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/src/server/.cvsignore
deleted file mode 100644
index 1a3d1a5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/server/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-.dirstamp
-.deps

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/server/backend.c b/debug/org.eclipse.ptp.debug.sdm/src/server/backend.c
deleted file mode 100644
index f375020..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/server/backend.c
+++ /dev/null

@@ -1,53 +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
- ******************************************************************************/
-
-#include <string.h>
-
-#include "backend.h"
-
-extern dbg_backend_funcs	GDBMIBackend;
-extern dbg_backend_funcs	TestBackend;
-
-dbg_backend	dbg_backends[] = {
-	{"gdb-mi", &GDBMIBackend, "gdb"},
-	{"test", &TestBackend, NULL}
-};
-
-int
-find_dbg_backend(char *name, dbg_backend **dp)
-{
-	int				i;
-	dbg_backend *	d;
-	
-	for (i = 0; i < sizeof(dbg_backends) / sizeof(dbg_backend); i++) {
-		d = &dbg_backends[i];
-		if (strcmp(name, d->db_name) == 0) {
-			*dp = d;
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
-void
-backend_set_path(dbg_backend *d, char *path)
-{
-	d->db_exe_path = path;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/server/gdbmi_backend.c b/debug/org.eclipse.ptp.debug.sdm/src/server/gdbmi_backend.c
deleted file mode 100644
index 29a207c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/server/gdbmi_backend.c
+++ /dev/null

@@ -1,2940 +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
- ******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include <aif.h>
-
-#include "dbg.h"
-#include "dbg_event.h"
-#include "backend.h"
-#include "list.h"
-
-#include "MI.h"
-
-struct bpentry {
-	int local;
-	int remote;
-	int temp;
-};
-typedef struct bpentry	bpentry;
-
-struct bpmap {
-	int				nels; // number of elements currently in map
-	int				size; // total size of map
-	struct bpentry *	maps;
-};
-
-struct varinfo {
-	char * name; //variable name
-	MIVar *mivar;
-};
-typedef struct varinfo	varinfo;
-
-struct varmap {
-	int nels; // number of elements currently in map
-	int size; // total size of map
-	struct varinfo * maps;
-};
-
-static double		GDB_Version;
-static int			ADDRESS_LENGTH = 0;
-static MISession *	DebugSession;
-static dbg_event *	LastEvent;
-static void			(*EventCallback)(dbg_event *);
-static int			ServerExit;
-static int			Started;
-static struct bpmap	BPMap = { 0, 0, NULL };
-#if 0
-static struct varmap VARMap = { 0, 0, NULL };
-#endif
-static int			(*AsyncFunc)(void *) = NULL;
-static void *		AsyncFuncData;
-
-static int	GDBMIInit(void (*)(dbg_event *));
-static int	GDBMIProgress(void);
-static int	GDBMIInterrupt(void);
-static int	GDBMIStartSession(char *, char *, char *, char *, char **, char **, long);
-static int	GDBMISetLineBreakpoint(int, int, int, char *, int, char*, int, int);
-static int	GDBMISetFuncBreakpoint(int, int, int, char *, char *, char*, int, int);
-static int	GDBMIDeleteBreakpoint(int);
-static int	GDBMIEnableBreakpoint(int);
-static int	GDBMIDisableBreakpoint(int);
-static int	GDBMIConditionBreakpoint(int, char *expr);
-static int	GDBMIBreakpointAfter(int, int icount);
-static int	GDBMIWatchpoint(int, char *, int, int, char *, int);
-static int	GDBMIGo(void);
-static int	GDBMIStep(int, int);
-static int	GDBMITerminate(void);
-static int	GDBMIListStackframes(int, int);
-static int	GDBMISetCurrentStackframe(int);
-static int	GDBMIEvaluateExpression(char *);
-static int	GDBMIGetNativeType(char *);
-static int	GDBMIGetLocalVariables(void);
-static int	GDBMIListArguments(int, int);
-static int	GDBMIGetInfoThread(void);
-static int	GDBMISetThreadSelect(int);
-static int	GDBMIStackInfoDepth(void);
-static int	GDBMIDataReadMemory(long, char*, char*, int, int, int, char*);
-static int	GDBMIDataWriteMemory(long, char*, char*, int, char*);
-static int	GDBMIGetGlobalVariables(void);
-static int	GDBCLIListSignals(char*);
-static int	GDBCLISignalInfo(char*);
-static int	GDBCLIHandle(char*);
-static int	GDBMIQuit(void);
-static int	GDBMIDataEvaluateExpression(char*);
-static int	GDBGetPartialAIF(char *, char *, int, int);
-static int	GDBMIVarDelete(char*);
-
-static void SendCommandWait(MISession *, MICommand *);
-static int	SetAndCheckBreak(int, int, int, char *, char *, int, int);
-static int	GetStackframes(int, int, int, List **);
-static int	GetAIFVar(char *, AIF **, char **);
-
-static AIF * GetAIF(MIVar *, char *, int);
-static AIF * GetPartialAIF(MIVar *, char *);
-static void RemoveAllMaps();
-
-dbg_backend_funcs	GDBMIBackend =
-{
-	GDBMIInit,
-	GDBMIProgress,
-	GDBMIInterrupt,
-	GDBMIStartSession,
-	GDBMISetLineBreakpoint,
-	GDBMISetFuncBreakpoint,
-	GDBMIDeleteBreakpoint,
-	GDBMIEnableBreakpoint,
-	GDBMIDisableBreakpoint,
-	GDBMIConditionBreakpoint,
-	GDBMIBreakpointAfter,
-	GDBMIWatchpoint,
-	GDBMIGo,
-	GDBMIStep,
-	GDBMITerminate,
-	GDBMIListStackframes,
-	GDBMISetCurrentStackframe,
-	GDBMIEvaluateExpression,
-	GDBMIGetNativeType,
-	GDBMIGetLocalVariables,
-	GDBMIListArguments,
-	GDBMIGetGlobalVariables,
-	GDBMIGetInfoThread,
-	GDBMISetThreadSelect,
-	GDBMIStackInfoDepth,
-	GDBMIDataReadMemory,
-	GDBMIDataWriteMemory,
-	GDBCLIListSignals,
-	GDBCLISignalInfo,
-	GDBCLIHandle,
-	GDBMIDataEvaluateExpression,
-	GDBGetPartialAIF,
-	GDBMIVarDelete,
-	GDBMIQuit
-};
-
-#define CHECK_SESSION() \
-	if (DebugSession == NULL) { \
-		DbgSetError(DBGERR_NOSESSION, NULL); \
-		return DBGRES_ERR; \
-	}
-
-#define ERROR_TO_EVENT(e) \
-	e = NewDbgEvent(DBGEV_ERROR); \
-	e->dbg_event_u.error_event.error_code = DbgGetError(); \
-	e->dbg_event_u.error_event.error_msg = strdup(DbgGetErrorStr())
-
-static char *
-GetLastErrorStr(void)
-{
-	return MIGetErrorStr();
-}
-
-static void
-SaveEvent(dbg_event *e)
-{
-	if (LastEvent != NULL)
-		FreeDbgEvent(LastEvent);
-
-	LastEvent = e;
-}
-
-/**** Variable ****/
-static MIVar*
-CreateMIVar(char *name)
-{
-	MICommand *cmd;
-	MIVar *mivar;
-
-	cmd = MIVarCreate("-", "*", name);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		//DbgSetError(DBGERR_UNKNOWN_VARIABLE, GetLastErrorStr());
-		MICommandFree(cmd);
-		return NULL;
-	}
-	mivar = MIGetVarCreateInfo(cmd);
-	MICommandFree(cmd);
-	return mivar;
-}
-
-static void
-DeleteMIVar(char *mi_name)
-{
-	MICommand *cmd;
-	cmd = MIVarDelete(mi_name);
-	SendCommandWait(DebugSession, cmd);
-	MICommandFree(cmd);
-}
-
-static void
-AddBPMap(int local, int remote, int temp)
-{
-	int				i;
-	struct bpentry *	map;
-
-	if (BPMap.size == 0) {
-		BPMap.maps = (struct bpentry *)malloc(sizeof(struct bpentry) * 100);
-		BPMap.size = 100;
-
-		for (i = 0; i < BPMap.size; i++) {
-			map = &BPMap.maps[i];
-			map->remote = map->local = -1;
-			map->temp = 0;
-		}
-	}
-
-	if (BPMap.nels == BPMap.size) {
-		i = BPMap.size;
-		BPMap.size *= 2;
-		BPMap.maps = (struct bpentry *)realloc(BPMap.maps, sizeof(struct bpentry) * BPMap.size);
-
-		for (; i < BPMap.size; i++) {
-			map = &BPMap.maps[i];
-			map->remote = map->local = -1;
-			map->temp = 0;
-		}
-	}
-
-	for (i = 0; i < BPMap.size; i++) {
-		map = &BPMap.maps[i];
-		if (map->remote == -1) {
-			map->remote = remote;
-			map->local = local;
-			map->temp = temp;
-			BPMap.nels++;
-			break;
-		}
-	}
-}
-
-static void
-RemoveBPMap(bpentry *bp)
-{
-	int				i;
-	struct bpentry *	map;
-	for (i = 0; i < BPMap.size; i++) {
-		map = &BPMap.maps[i];
-		if (map == bp) {
-			map->remote = -1;
-			map->local = -1;
-			map->temp = 0;
-			BPMap.nels--;
-			break;
-		}
-	}
-}
-
-static bpentry *
-FindLocalBP(int local)
-{
-	int				i;
-	struct bpentry *	map;
-	for (i = 0; i < BPMap.size; i++) {
-		map = &BPMap.maps[i];
-		if (map->local == local) {
-			return map;
-		}
-	}
-	return NULL;
-}
-
-static bpentry *
-FindRemoteBP(int remote)
-{
-	int				i;
-	struct bpentry *	map;
-	for (i = 0; i < BPMap.size; i++) {
-		map = &BPMap.maps[i];
-		if (map->remote == remote) {
-			return map;
-		}
-	}
-	return NULL;
-}
-
-static void
-RemoveAllBPMap()
-{
-	int				i;
-	struct bpentry *	map;
-	int length = BPMap.size;
-	for (i = 0; i < length; i++) {
-		map = &BPMap.maps[i];
-		if (map == NULL)
-			return;
-
-		map->remote = -1;
-		map->local = -1;
-		map->temp = 0;
-		BPMap.nels--;
-	}
-}
-
-static stackframe *
-get_current_frame()
-{
-	stackframe *f;
-	List *	frames;
-
-	if (GetStackframes(1, 0, 0, &frames) != DBGRES_OK)
-		return NULL;
-
-	if (EmptyList(frames)) {
-		DbgSetError(DBGERR_DEBUGGER, "Could not get current stack frame");
-		return NULL;
-	}
-
-	SetList(frames);
-	f = (stackframe *)GetListElement(frames);
-	DestroyList(frames, NULL);
-	return f;
-}
-
-static stackframe *
-ConvertMIFrameToStackframe(MIFrame *f)
-{
-	stackframe *	s;
-	if (f == NULL) {//by default return current frame
-		return get_current_frame();
-	}
-	s = NewStackframe(f->level);
-	if ( f->addr != NULL )
-		s->loc.addr = strdup(f->addr);
-	if ( f->func != NULL )
-		s->loc.func = strdup(f->func);
-	if ( f->file != NULL )
-		s->loc.file = strdup(f->file);
-	s->loc.line = f->line;
-	return s;
-}
-
-
-#if 0
-static void
-AddVARMap(char *name, MIVar *mivar)
-{
-	int i;
-	struct varinfo *map;
-
-	if (VARMap.size == 0) {
-		VARMap.maps = (struct varinfo *)malloc(sizeof(struct varinfo) * 100);
-		VARMap.size = 100;
-
-		for (i=0; i<VARMap.size; i++) {
-			map = &VARMap.maps[i];
-			map->name = NULL;
-			map->mivar = NULL;
-		}
-	}
-	if (VARMap.nels == VARMap.size) {
-		i = VARMap.size;
-		VARMap.size *= 2;
-		VARMap.maps = (struct varinfo *)realloc(VARMap.maps, sizeof(struct varinfo) * VARMap.size);
-
-		for (; i<VARMap.size; i++) {
-			map = &VARMap.maps[i];
-			map->name = NULL;
-			map->mivar = NULL;
-		}
-	}
-	for (i=0; i<VARMap.size; i++) {
-		map = &VARMap.maps[i];
-		if (map->name == NULL) {
-			map->name = strdup(name);
-			map->mivar = mivar;
-			VARMap.nels++;
-			break;
-		}
-	}
-}
-
-static varinfo *
-FindVARByName(char *name)
-{
-	int	i;
-	struct varinfo *map;
-	for (i=0; i<VARMap.size; i++) {
-		map = &VARMap.maps[i];
-		if (map != NULL && strcmp(map->name, name) == 0) {
-			return map;
-		}
-	}
-	return NULL;
-}
-
-static varinfo *
-FindVARByMIName(char *mi_name)
-{
-	int i;
-	struct varinfo *map;
-	for (i=0; i<VARMap.size; i++) {
-		map = &VARMap.maps[i];
-		if (map != NULL && strcmp(map->mivar->name, mi_name) == 0) {
-			return map;
-		}
-	}
-	return NULL;
-}
-
-static void
-RemoveVARMap(varinfo *map)
-{
-	if (map != NULL) {
-		if (map->name != NULL) {
-			free(map->name);
-			map->name = NULL;
-		}
-		if (map->mivar != NULL) {
-			DeleteMIVar(map->mivar->name);
-			MIVarFree(map->mivar);
-			map->mivar = NULL;
-		}
-		VARMap.nels--;
-	}
-}
-
-static void
-RemoveVARMapByName(char *name)
-{
-	struct varinfo *map;
-	map = FindVARByName(name);
-	RemoveVARMap(map);
-}
-
-static void
-RemoveVARMapByMIName(char *mi_name)
-{
-	struct varinfo *map;
-	map = FindVARByMIName(mi_name);
-	RemoveVARMap(map);
-}
-
-static void
-RemoveAllVARMap()
-{
-	int				i;
-	struct varinfo *map;
-	int length = VARMap.size;
-	for (i = 0; i < length; i++) {
-		map = &VARMap.maps[i];
-		if (map == NULL)
-			return;
-
-		RemoveVARMap(map);
-	}
-}
-#endif
-
-static void
-RemoveAllMaps()
-{
-	RemoveAllBPMap();
-#if 0
-	RemoveAllVARMap();
-#endif
-}
-
-static void
-SetDebugError(MICommand * cmd)
-{
-	if (MICommandResultClass(cmd) == MIResultRecordERROR) {
-		char *err = MICommandResultErrorMessage(cmd);
-		if (err != NULL) {
-			DbgSetError(DBGERR_DEBUGGER, err);
-			free(err);
-		} else {
-			DbgSetError(DBGERR_DEBUGGER, "got error from gdb, but no message");
-		}
-	} else {
-		DbgSetError(DBGERR_DEBUGGER, "bad response from gdb");
-	}
-}
-static List *
-GetChangedVariables()
-{
-	MICommand *cmd;
-	List *changes;
-	List *changedVars;
-	MIVarChange *var;
-
-	cmd = MIVarUpdate("*");
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		DEBUG_PRINTS(DEBUG_LEVEL_BACKEND, "------------------- GetChangedVariables error\n");
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return NULL;
-	}
-	MIGetVarUpdateInfo(cmd, &changes);
-	MICommandFree(cmd);
-
-	changedVars = NewList();
-	for (SetList(changes); (var = (MIVarChange *)GetListElement(changes)) != NULL;) {
-		if (var->in_scope == 1) {
-			AddToList(changedVars, (void *)strdup(var->name));
-		}
-		else {
-			DeleteMIVar(var->name);
-		}
-	}
-	DestroyList(changes, MIVarChangeFree);
-	return changedVars;
-}
-
-static int
-get_info_depth()
-{
-	MICommand *cmd;
-	int depth;
-
-	cmd = MIStackInfoDepth();
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		DEBUG_PRINTS(DEBUG_LEVEL_BACKEND, "------------------- GDBMIStackInfoDepth error\n");
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return -1;
-	}
-	depth = MIGetStackInfoDepth(cmd);
-	MICommandFree(cmd);
-	return depth;
-}
-/**
- * not used
- *
-static void
-set_frame_with_line(stackframe *current_f, int depth)
-{
-	stackframe *f;
-	List * frames;
-
-	if (GetStackframes(0, 1, depth, &frames) != DBGRES_OK) {
-		return NULL;
-	}
-
-	for (SetList(frames); (f = (stackframe *)GetListElement(frames)) != NULL;) {
-		if (f->loc.line > 0) {
-			current_f->level = f->level;
-			current_f->loc.file = strdup(f->loc.file);
-			current_f->loc.func = strdup(f->loc.func);
-			current_f->loc.addr = strdup(f->loc.addr);
-			current_f->loc.line = f->loc.line;
-			break;
-		}
-	}
-	DestroyList(frames, FreeStackframe);
-}
-*/
-
-/**** aysn stop ****/
-static int
-AsyncStop(void *data)
-{
-	dbg_event *	e;
-	stackframe *	frame;
-	bpentry * bpmap;
-	MIEvent *	evt = (MIEvent *)data;
-
-	switch (evt->type)
-	{
-	case MIEventTypeBreakpointHit:
-		bpmap = FindLocalBP(evt->bkptno);
-		if (!bpmap->temp) {
-			e = NewDbgEvent(DBGEV_SUSPEND);
-			e->dbg_event_u.suspend_event.reason = DBGEV_SUSPEND_BPHIT;
-			e->dbg_event_u.suspend_event.ev_u.bpid = bpmap->remote;
-			e->dbg_event_u.suspend_event.thread_id = evt->threadId;
-			e->dbg_event_u.suspend_event.frame = NULL;
-			e->dbg_event_u.suspend_event.depth = get_info_depth();
-			e->dbg_event_u.suspend_event.changed_vars = GetChangedVariables();
-			break;
-		}
-		/* else must be a temporary breakpoint drop through... */
-		RemoveBPMap(bpmap);
-
-	case MIEventTypeSuspended:
-		frame = ConvertMIFrameToStackframe(evt->frame);
-		if (frame == NULL) {
-			ERROR_TO_EVENT(e);
-		}
-		else {
-			e = NewDbgEvent(DBGEV_SUSPEND);
-			e->dbg_event_u.suspend_event.reason = DBGEV_SUSPEND_INT;
-			e->dbg_event_u.suspend_event.thread_id = evt->threadId;
-			e->dbg_event_u.suspend_event.frame = frame;
-			e->dbg_event_u.suspend_event.depth = get_info_depth();
-			e->dbg_event_u.suspend_event.changed_vars = GetChangedVariables();
-		}
-		break;
-
-	case MIEventTypeFunctionFinished:
-	case MIEventTypeSteppingRange:
-		frame = ConvertMIFrameToStackframe(evt->frame);
-		if (frame == NULL) {
-			ERROR_TO_EVENT(e);
-		}
-		else {
-			e = NewDbgEvent(DBGEV_SUSPEND);
-			e->dbg_event_u.suspend_event.reason = DBGEV_SUSPEND_STEP;
-			e->dbg_event_u.suspend_event.thread_id = evt->threadId;
-			e->dbg_event_u.suspend_event.frame = frame;
-			e->dbg_event_u.suspend_event.depth = get_info_depth();
-			e->dbg_event_u.suspend_event.changed_vars = GetChangedVariables();
-		}
-		break;
-
-	case MIEventTypeSignal:
-		frame = ConvertMIFrameToStackframe(evt->frame);
-		if (frame == NULL) {
-			ERROR_TO_EVENT(e);
-		}
-		else {
-			e = NewDbgEvent(DBGEV_SUSPEND);
-			e->dbg_event_u.suspend_event.reason = DBGEV_SUSPEND_SIGNAL;
-			e->dbg_event_u.suspend_event.ev_u.sig = NewSignalInfo();
-			e->dbg_event_u.suspend_event.ev_u.sig->name = strdup(evt->sigName);
-			e->dbg_event_u.suspend_event.ev_u.sig->desc = strdup(evt->sigMeaning);
-			e->dbg_event_u.suspend_event.thread_id = evt->threadId;
-			e->dbg_event_u.suspend_event.frame = frame;
-			e->dbg_event_u.suspend_event.depth = get_info_depth();
-			e->dbg_event_u.suspend_event.changed_vars = GetChangedVariables();
-		}
-		break;
-
-	case MIEventTypeInferiorSignalExit:
-		e = NewDbgEvent(DBGEV_EXIT);
-		e->dbg_event_u.exit_event.reason = DBGEV_EXIT_SIGNAL;
-		e->dbg_event_u.exit_event.ev_u.sig = NewSignalInfo();
-		e->dbg_event_u.exit_event.ev_u.sig->name = strdup(evt->sigName);
-		e->dbg_event_u.exit_event.ev_u.sig->desc = strdup(evt->sigMeaning);
-		//RemoveAllMaps();
-		break;
-
-	case MIEventTypeInferiorExit:
-		e = NewDbgEvent(DBGEV_EXIT);
-		e->dbg_event_u.exit_event.reason = DBGEV_EXIT_NORMAL;
-		e->dbg_event_u.exit_event.ev_u.exit_status = evt->code;
-		//RemoveAllMaps();
-		break;
-
-	default:
-		DbgSetError(DBGERR_DEBUGGER, "Unknown reason for stopping");
-		return DBGRES_ERR;
-	}
-	MIEventFree(evt);
-
-	if (EventCallback != NULL)
-		EventCallback(e);
-
-	FreeDbgEvent(e);
-	return DBGRES_OK;
-}
-
-/*
-** AsyncCallback is called by mi_get_response() when an async response is
-** detected. It can't issue any gdb commands or there's a potential
-** for deadlock. If commands need to be issues (e.g. to obtain
-** current stack frame, they must be called from the main select
-** loop using the AsyncFunc() mechanism.
-*/
-static void
-AsyncCallback(MIEvent *evt)
-{
-	AsyncFunc = AsyncStop;
-	AsyncFuncData = (void *)evt;
-}
-
-/*
- * Initialize GDB
- */
-static int
-GDBMIInit(void (*event_callback)(dbg_event *))
-{
-	EventCallback = event_callback;
-	DebugSession = NULL;
-	LastEvent = NULL;
-	GDB_Version = -1.0;
-	ServerExit = 0;
-
-	signal(SIGTERM, SIG_IGN);
-	signal(SIGHUP, SIG_IGN);
-	signal(SIGINT, SIG_IGN);
-
-	return DBGRES_OK;
-}
-
-#if 0
-static int
-timeout_cb(void *data)
-{
-	return 0;
-}
-#endif
-
-/*
- * Send command and wait for immediate response.
- */
-static void
-SendCommandWait(MISession *sess, MICommand *cmd)
-{
-	MISessionSendCommand(sess, cmd);
-	MIOutput *output = MIOutputNew();
-	do {
-		MISessionProgress(sess, output);
-		if (sess->out_fd == -1) {
-			DEBUG_PRINTS(DEBUG_LEVEL_BACKEND, "------------------- SendCommandWait sess->out_fd = -1\n");
-			break;
-		}
-	} while (!MISessionCommandCompleted(sess));
-}
-
-/*
- * Start GDB session
- */
-static int
-GDBMIStartSession(char *gdb_path, char *prog, char *path, char *work_dir, char **args, char **env, long timeout)
-{
-	char *		prog_path;
-	char **		e;
-	struct stat	st;
-	MICommand *	cmd;
-	MISession *	sess;
-
-	if (DebugSession != NULL) {
-		DbgSetError(DBGERR_SESSION, NULL);
-		return DBGRES_ERR;
-	}
-
-	/*
-	 * see if we can find the gdb executable
-	 */
-	if (*gdb_path == '/') {
-	 	if (stat(gdb_path, &st) < 0 || !S_ISREG(st.st_mode)) {
-	 		DbgSetError(DBGERR_NOBACKEND, gdb_path);
-	 		return DBGRES_ERR;
-	 	}
-	}
-
-	if (*work_dir != '\0' && chdir(work_dir) < 0) {
-		DbgSetError(DBGERR_CHDIR, work_dir);
-		return DBGRES_ERR;
-	}
-
-	if (path != NULL)
-		asprintf(&prog_path, "%s/%s", path, prog);
-	else
-		prog_path = strdup(prog);
-
-	if (access(prog_path, R_OK) < 0) {
-		DbgSetError(DBGERR_NOFILEDIR, prog_path);
-		free(prog_path);
-		return DBGRES_ERR;
-	}
-
-	sess = MISessionNew();
-
-#ifdef DEBUG
-	MISessionSetDebug(TEST_DEBUG_LEVEL(DEBUG_LEVEL_BACKEND));
-#endif /* DEBUG */
-
-	MISessionSetTimeout(sess, 0, timeout);
-
-	MISessionSetGDBPath(sess, gdb_path);
-
-	if (MISessionStartLocal(sess, prog_path) < 0) {
-		DbgSetError(DBGERR_DEBUGGER, GetLastErrorStr());
-		MISessionFree(sess);
-		free(prog_path);
-		return DBGRES_ERR;
-	}
-
-	free(prog_path);
-
-	if (*args != NULL) {
-		cmd = MIExecArguments(args);
-		SendCommandWait(sess, cmd);
-		MICommandFree(cmd);
-	}
-
-	for (e = env; e != NULL && *e != NULL; e++) {
-		cmd = MIGDBSet("environment", *e);
-		SendCommandWait(sess, cmd);
-		MICommandFree(cmd);
-	}
-
-	cmd = MIGDBSet("confirm", "off");
-	SendCommandWait(sess, cmd);
-	MICommandFree(cmd);
-
-	MISessionRegisterEventCallback(sess, AsyncCallback);
-
-	DebugSession = sess;
-
-	cmd = MIGDBVersion();
-	SendCommandWait(sess, cmd);
-	if (MICommandResultOK(cmd)) {
-		GDB_Version = CLIGetGDBVersion(cmd);
-		DEBUG_PRINTF(DEBUG_LEVEL_BACKEND, "------------------- gdb version: %f\n", GDB_Version);
-	}
-	MICommandFree(cmd);
-
-	Started = 0;
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-
-	return DBGRES_OK;
-}
-
-/*
- * Progress gdb commands.
- */
-static int
-GDBMIProgress(void)
-{
-	dbg_event *	e;
-
-	/*
-	 * Check for existing events
-	 */
-	if (LastEvent != NULL) {
-		if (EventCallback != NULL) {
-			EventCallback(LastEvent);
-		}
-
-		if (ServerExit && LastEvent->event_id == DBGEV_OK) {
-			if (DebugSession != NULL) {
-				MISessionFree(DebugSession);
-				DebugSession = NULL;
-			}
-		}
-
-		FreeDbgEvent(LastEvent);
-		LastEvent = NULL;
-		return 0;
-	}
-
-	if (DebugSession != NULL) {
-		if (MISessionProgress(DebugSession, MIOutputNew()) < 0) {
-			MISessionFree(DebugSession);
-			DebugSession = NULL;
-			DbgSetError(DBGERR_DEBUGGER, GetLastErrorStr());
-			ERROR_TO_EVENT(e);
-			SaveEvent(e);
-			return 0;
-		}
-
-		/*
-		 * Do any extra async functions. We can call gdbmi safely here
-		 */
-		if (AsyncFunc != NULL) {
-			AsyncFunc(AsyncFuncData);
-			AsyncFunc = NULL;
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-/*
-** Set breakpoint at specified line.
-*/
-static int
-GDBMISetLineBreakpoint(int bpid, int isTemp, int isHard, char *file, int line, char *condition, int ignoreCount, int tid)
-{
-	int		res;
-	char *	where;
-
-	CHECK_SESSION();
-
-	if (file == NULL || *file == '\0')
-		asprintf(&where, "%d", line);
-	else
-		asprintf(&where, "%s:%d", file, line);
-
-	res = SetAndCheckBreak(bpid, isTemp, isHard, where, condition, ignoreCount, tid);
-
-	free(where);
-
-	return res;
-}
-
-/*
-** Set breakpoint at start of specified function.
-*/
-static int
-GDBMISetFuncBreakpoint(int bpid, int isTemp, int isHard, char *file, char *func, char *condition, int ignoreCount, int tid)
-{
-	int		res;
-	char *	where;
-
-	CHECK_SESSION();
-
-	if (file == NULL || *file == '\0')
-		asprintf(&where, "%s", func);
-	else
-		asprintf(&where, "%s:%s", file, func);
-
-	res = SetAndCheckBreak(bpid, isTemp, isHard, where, condition, ignoreCount, tid);
-
-	free(where);
-
-	return res;
-}
-
-/*
-** Check that breakpoint command has succeded and
-** extract appropriate information. Returns breakpoint
-** id in bid. Adds to breakpoint list if necessary.
-*/
-static int
-SetAndCheckBreak(int bpid, int isTemp, int isHard, char *where, char *condition, int ignoreCount, int tid)
-{
-	dbg_event *		e;
-	MIBreakpoint *	bpt;
-	MICommand *		cmd;
-	List *			bpts;
-	breakpoint *	bp;
-
-	if (condition != NULL && strlen(condition) == 0)
-		condition = NULL;
-
-	cmd = MIBreakInsert(isTemp, isHard, condition, ignoreCount, where, tid);
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		DbgSetError(DBGERR_NOFILE, GetLastErrorStr());
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	bpts = MIBreakpointGetBreakInsertInfo(cmd);
-	MICommandFree(cmd);
-
-	if (bpts == NULL) {
-		DbgSetError(DBGERR_NOFILE, where);
-		//DbgSetError(DBGERR_NOFILE, "error getting breakpoint information");
-		return DBGRES_ERR;
-	}
-
-	SetList(bpts);
-	bpt = (MIBreakpoint *)GetListElement(bpts);
-
-	AddBPMap(bpt->number, bpid, isTemp);
-
-	//if the type is temporary, no need to send bpt set event
-	if (isTemp) {
-		SaveEvent(NewDbgEvent(DBGEV_OK));
-		DestroyList(bpts, MIBreakpointFree);
-		return DBGRES_OK;
-	}
-
-	bp = NewBreakpoint(bpt->number);
-
-	bp->ignore = bpt->ignore;
-	bp->type = strdup(bpt->type);
-	bp->hits = bpt->times;
-
-	if ( bpt->file != NULL )
-		bp->loc.file = strdup(bpt->file);
-	if ( bpt->func != NULL )
-		bp->loc.func = strdup(bpt->func);
-	if ( bpt->address != NULL )
-		bp->loc.addr = strdup(bpt->address);
-	bp->loc.line = bpt->line;
-
-	e = NewDbgEvent(DBGEV_BPSET);
-	e->dbg_event_u.bpset_event.bpid = bpid;
-	e->dbg_event_u.bpset_event.bp = bp;
-	SaveEvent(e);
-
-	DestroyList(bpts, MIBreakpointFree);
-	return DBGRES_OK;
-}
-
-/*
-** Delete a breakpoint.
-*/
-static int
-GDBMIDeleteBreakpoint(int bpid)
-{
-	bpentry *	bp;
-	char *		bpstr;
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	if ((bp = FindRemoteBP(bpid)) == NULL) {
-		asprintf(&bpstr, "%d", bpid);
-		DbgSetError(DBGERR_NOBP, bpstr);
-		free(bpstr);
-		return DBGRES_ERR;
-	}
-
-	cmd = MIBreakDelete(1, &bp->local);
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	RemoveBPMap(bp);
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-
-	return DBGRES_OK;
-}
-
-/*
-** Enable a breakpoint.
-*/
-static int
-GDBMIEnableBreakpoint(int bpid)
-{
-	bpentry *	bp;
-	char *		bpstr;
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	if ((bp = FindRemoteBP(bpid)) == NULL) {
-		asprintf(&bpstr, "%d", bpid);
-		DbgSetError(DBGERR_NOBP, bpstr);
-		free(bpstr);
-		return DBGRES_ERR;
-	}
-
-	cmd = MIBreakEnable(1, &bp->local);
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Disable a breakpoint.
-*/
-static int
-GDBMIDisableBreakpoint(int bpid)
-{
-	bpentry *	bp;
-	char *		bpstr;
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	if ((bp = FindRemoteBP(bpid)) == NULL) {
-		asprintf(&bpstr, "%d", bpid);
-		DbgSetError(DBGERR_NOBP, bpstr);
-		free(bpstr);
-		return DBGRES_ERR;
-	}
-
-	cmd = MIBreakDisable(1, &bp->local);
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Condition a breakpoint.
-*/
-static int
-GDBMIConditionBreakpoint(int bpid, char *expr)
-{
-	bpentry *	bp;
-	char *		bpstr;
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	if ((bp = FindRemoteBP(bpid)) == NULL) {
-		asprintf(&bpstr, "%d", bpid);
-		DbgSetError(DBGERR_NOBP, bpstr);
-		free(bpstr);
-		return DBGRES_ERR;
-	}
-
-	cmd = MIBreakCondition(1, &bp->local, expr);
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** breakpoint after.
-*/
-static int
-GDBMIBreakpointAfter(int bpid, int icount)
-{
-	bpentry *	bp;
-	char *		bpstr;
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	if ((bp = FindRemoteBP(bpid)) == NULL) {
-		asprintf(&bpstr, "%d", bpid);
-		DbgSetError(DBGERR_NOBP, bpstr);
-		free(bpstr);
-		return DBGRES_ERR;
-	}
-
-	cmd = MIBreakAfter(1, &bp->local, icount);
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
- * Set watch point
- */
-static int
-GDBMIWatchpoint(int bpid, char *expr, int isAccess, int isRead, char *condition, int ignoreCount)
-{
-	dbg_event *		e;
-	MIBreakpoint *	bpt;
-	MICommand *		cmd;
-	List *			bpts;
-	breakpoint *	bp;
-
-	if (condition != NULL && strlen(condition) == 0)
-		condition = NULL;
-
-	cmd = MIBreakWatch(expr, isAccess, isRead);
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	bpts = MIBreakpointGetBreakInsertInfo(cmd);
-	MICommandFree(cmd);
-
-	if (bpts == NULL) {
-		DbgSetError(DBGERR_DEBUGGER, "error getting breakpoint information");
-		return DBGRES_ERR;
-	}
-
-	SetList(bpts);
-	bpt = (MIBreakpoint *)GetListElement(bpts);
-
-	AddBPMap(bpt->number, bpid, 0); //0 is not temp??
-
-	bp = NewBreakpoint(bpt->number);
-
-	bp->ignore = bpt->ignore;
-	bp->type = strdup(bpt->type);
-	bp->hits = bpt->times;
-
-	if (condition != NULL) {
-		GDBMIConditionBreakpoint(bpid, condition);
-	}
-	if (ignoreCount > 0) {
-		GDBMIBreakpointAfter(bpid, ignoreCount);
-	}
-
-	e = NewDbgEvent(DBGEV_BPSET);
-	e->dbg_event_u.bpset_event.bpid = bpid;
-	e->dbg_event_u.bpset_event.bp = bp;
-	SaveEvent(e);
-
-	DestroyList(bpts, MIBreakpointFree);
-
-	return DBGRES_OK;
-}
-
-/*
-** Start/continue executing program.
-*/
-static int
-GDBMIGo(void)
-{
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	if (Started)
-		cmd = MIExecContinue();
-	else {
-		cmd = MIExecRun();
-		Started = 1;
-	}
-
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	MICommandFree(cmd);
-
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-
-	return DBGRES_OK;
-}
-
-/*
- * Execute count statements.
- *
- * type	step kind
- * 0		enter function calls
- * 1		do not enter function calls
- * 2		step out of function (count ignored)
- */
-static int
-GDBMIStep(int count, int type)
-{
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	switch ( type ) {
-	case 0:
-		cmd = MIExecStep(count);
-		break;
-
-	case 1:
-		cmd = MIExecNext(count);
-		break;
-
-	case 2:
-		cmd = MIExecFinish();
-		break;
-
-	default:
-		DbgSetError(DBGERR_DEBUGGER, "Unknown step type");
-		return DBGRES_ERR;
-	}
-
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	MICommandFree(cmd);
-
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-
-	return DBGRES_OK;
-}
-
-/*
-** Terminate program execution.
-*/
-static int
-GDBMITerminate(void)
-{
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	cmd = MICommandNew("kill", MIResultRecordDONE);
-
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	MICommandFree(cmd);
-
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-
-	return DBGRES_OK;
-}
-
-/*
-** Interrupt an executing program.
-*/
-static int
-GDBMIInterrupt(void)
-{
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	/*
-	 * Don't do anything if there's an event pending or the
-	 * target is not running.
-	 *
-	if (LastEvent != NULL || !gmi_exec_interrupt(MIHandle))
-		return DBGRES_OK;*/
-
-	/*
-	 * Must check async here due to broken MI implementation. AsyncCallback will
-	 * be called inside gmi_exec_interrupt().
-	 *
-	if (AsyncFunc != NULL) {
-		AsyncFunc(AsyncFuncData);
-		AsyncFunc = NULL;
-	}*/
-
-	/*
-	 * Ignore error if target is not running
-	 */
-
-	cmd = MIExecInterrupt();
-
-	SendCommandWait(DebugSession, cmd);
-
-	MICommandFree(cmd);
-
-	return DBGRES_OK;
-}
-
-/*
-** Move up or down count stack frames.
-*/
-static int
-GDBMISetCurrentStackframe(int level)
-{
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	cmd = MIStackSelectFrame(level);
-
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	MICommandFree(cmd);
-
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-
-	return DBGRES_OK;
-}
-
-static int
-GetStackframes(int current, int low, int high, List **flist)
-{
-	List *		frames;
-	MIFrame *	f;
-	MICommand *	cmd;
-	stackframe *	s;
-
-	//checking gdb version
-	if (current) {
-		if (GDB_Version > 6.3) {
-			cmd = MIStackInfoFrame();
-		}
-		else {
-			cmd = CLIFrame();
-		}
-	}
-	else {
-		if (low == 0 && high == 0) {
-			cmd = MIStackListAllFrames();
-		}
-		else {
-			cmd = MIStackListFrames(low, high);
-		}
-	}
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		DEBUG_PRINTS(DEBUG_LEVEL_BACKEND, "------------------- GetStackframes error\n");
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	if (current)
-		frames = MIGetFrameInfo(cmd);
-	else
-		frames = MIGetStackListFramesInfo(cmd);
-
-	MICommandFree(cmd);
-
-	if ( frames == NULL )
-	{
-		DbgSetError(DBGERR_DEBUGGER, "Failed to get stack frames from backend");
-		return DBGRES_ERR;
-	}
-
-	*flist = NewList();
-	for (SetList(frames); (f = (MIFrame *)GetListElement(frames)) != NULL; ) {
-		s = ConvertMIFrameToStackframe(f);
-		AddToList(*flist, (void *)s);
-	}
-	DestroyList(frames, MIFrameFree);
-	return DBGRES_OK;
-}
-
-/*
-** List current or all stack frames.
-*/
-static int
-GDBMIListStackframes(int low, int high)
-{
-	dbg_event *	e;
-	List *		frames;
-
-	CHECK_SESSION();
-
-	if (GetStackframes(0, low, high, &frames) != DBGRES_OK)
-		return DBGRES_ERR;
-
-	e = NewDbgEvent(DBGEV_FRAMES);
-	e->dbg_event_u.list = frames;
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-#ifdef notdef
-struct mi_aif_struct
-{
-	char *fds;
-	char *data;
-};
-typedef struct mi_aif_struct mi_aif;
-
-mi_aif *
-mi_alloc_aif(void)
-{
-	return (mi_aif *)mi_calloc1(sizeof(mi_aif));
-}
-
-mi_aif *
-mi_parse_aif(mi_results *c)
-{
-	mi_aif *res = mi_alloc_aif();
-
-	if ( res )
-	{
-		while ( c )
-		{
-			if ( c->type == t_const )
-			{
-				if ( strcmp(c->var, "fds") == 0 )
-					res->fds = c->v.cstr;
-				else if ( strcmp(c->var, "data") == 0 )
-					res->data = c->v.cstr;
-			}
-			c = c->next;
-		}
-	}
-
-	return res;
-}
-
-mi_aif *
-mi_res_aif(mi_h *h)
-{
-	mi_results *r = mi_res_done_var(MIHandle, "aif");
-	mi_aif *a = NULL;
-
-	if (r && r->type == t_tuple)
-		a = mi_parse_aif(r->v.rs);
-	mi_free_results(r);
-	return a;
-}
-
-mi_aif *
-gmi_aif_evaluate_expression(mi_h *h, char *exp)
-{
-	mi_send(h, "-aif-evaluate-expression \"%s\"\n", exp);
-	return mi_res_aif(h);
-}
-
-int
-DumpBinaryValue(MISession *sess, char *exp, char *file)
-{
-	MICommand *	cmd;
-
-	cmd = MICommandNew("dump binary value", MIResultRecordDONE);
-	MICommandAddOption(cmd, file, exp);
-
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return -1;
-	}
-	MICommandFree(cmd);
-	return 0;
-}
-#endif
-
-/*
-** List local variables.
-*/
-static int
-GDBMIGetLocalVariables(void)
-{
-	dbg_event *	e;
-	MICommand *	cmd;
-	MIArg *		arg;
-	List *		args;
-
-	CHECK_SESSION();
-
-	cmd = MIStackListLocals(0);
-
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	args = MIGetStackListLocalsInfo(cmd);
-
-	MICommandFree(cmd);
-
-	e = NewDbgEvent(DBGEV_VARS);
-	e->dbg_event_u.list = NewList();
-
-	for (SetList(args); (arg = (MIArg *)GetListElement(args)) != NULL; ) {
-		AddToList(e->dbg_event_u.list, (void *)strdup(arg->name));
-	}
-
-	DestroyList(args, MIArgFree);
-
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-/*
- * This is needed to check for a bug in the Linux x86 GCC 4.1 compiler
- * that causes gdb 6.4 and 6.5 to crash under certain conditions.
- */
-#define GDB_BUG_2188	__gnu_linux__ && __i386__ && __GNUC__ == 4 && __GNUC_MINOR__ == 1
-
-#if GDB_BUG_2188
-static int
-CurrentFrame(int level, char *name)
-{
-	MICommand *	cmd;
-	MIFrame *	frame;
-	List *		frames;
-	int val = 0;
-
-	if (GDB_Version > 6.3 && GDB_Version < 6.7) {
-		cmd = MIStackListFrames(level, level);
-		SendCommandWait(DebugSession, cmd);
-		if (!MICommandResultOK(cmd)) {
-			MICommandFree(cmd);
-			return val;
-		}
-		frames = MIGetStackListFramesInfo(cmd);
-
-		//only one frame
-		SetList(frames);
-		if ((frame = (MIFrame *)GetListElement(frames)) != NULL) {
-			if (frame->func != NULL && strncmp(frame->func, name, 4) == 0) {
-				val = 1;
-			}
-		}
-		DestroyList(frames, MIFrameFree);
-	}
-
-	return val;
-}
-#endif /* GDB_BUG_2188 */
-
-/*
-** List arguments.
-*/
-static int
-GDBMIListArguments(int low, int high)
-{
-	dbg_event *	e;
-	MICommand *	cmd;
-	MIArg *		arg;
-	MIFrame *	frame;
-	List *		frames;
-
-	CHECK_SESSION();
-
-	cmd = MIStackListArguments(0, low, high);
-
-	SendCommandWait(DebugSession, cmd);
-
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-
-	frames = MIGetStackListArgumentsInfo(cmd);
-
-	MICommandFree(cmd);
-
-	e = NewDbgEvent(DBGEV_ARGS);
-	e->dbg_event_u.list = NewList();
-
-	/*
- 	 * Just look at first frame - we should only get
- 	 * one anyway...
- 	 * ****** If frame is more than one, no arg needs *****
- 	 */
-	SetList(frames);
-	if ((frame = (MIFrame *)GetListElement(frames)) != NULL) {
-#if GDB_BUG_2188
-		if (!CurrentFrame(frame->level, "main")) {
-#endif /* GDB_BUG_2188 */
-			for (SetList(frame->args); (arg = (MIArg *)GetListElement(frame->args)) != NULL; )
-				AddToList(e->dbg_event_u.list, (void *)strdup(arg->name));
-#if GDB_BUG_2188
-		}
-#endif /* GDB_BUG_2188 */
-	}
-	DestroyList(frames, MIFrameFree);
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-/*
-** List global variables.
-*/
-static int
-GDBMIGetGlobalVariables(void)
-{
-	CHECK_SESSION();
-
-	DbgSetError(DBGERR_NOTIMP, NULL);
-	return DBGRES_ERR;
-}
-
-/*
-** Quit debugger.
-*/
-static int
-GDBMIQuit(void)
-{
-	MICommand *	cmd;
-
-	if (DebugSession != NULL) {
-		cmd = MIGDBExit();
-		SendCommandWait(DebugSession, cmd);
-		MICommandFree(cmd);
-	}
-	RemoveAllMaps();
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	ServerExit++;
-
-	return DBGRES_OK;
-}
-
-static int
-GDBMIGetInfoThread(void)
-{
-	MICommand *	cmd;
-	dbg_event *	e;
-	char *		tid;
-	CLIInfoThreadsInfo *	info;
-
-	CHECK_SESSION();
-
-	cmd = CLIInfoThreads();
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		DEBUG_PRINTS(DEBUG_LEVEL_BACKEND, "------------------- GDBMIGetInfoThread error\n");
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	info = CLIGetInfoThreadsInfo(cmd);
-	MICommandFree(cmd);
-
-	e = NewDbgEvent(DBGEV_THREADS);
-	e->dbg_event_u.threads_event.thread_id = info->current_thread_id;
-	e->dbg_event_u.threads_event.list = NewList();
-	for (SetList(info->thread_ids); (tid = (char *)GetListElement(info->thread_ids)) != NULL;) {
-		AddToList(e->dbg_event_u.threads_event.list, (void *)strdup(tid));
-	}
-
-	DestroyList(info->thread_ids, free);
-	free(info);
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-static int
-GDBMISetThreadSelect(int threadNum)
-{
-	MICommand *	cmd;
-	dbg_event *	e;
-	MIThreadSelectInfo * info;
-	//MIFrame *f;
-	stackframe *s = NULL;
-
-	CHECK_SESSION();
-
-	cmd = MIThreadSelect(threadNum);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	info = MISetThreadSelectInfo(cmd);
-	MICommandFree(cmd);
-
-	if (info->frame != NULL) {
-		s = ConvertMIFrameToStackframe(info->frame);
-	}
-	e = NewDbgEvent(DBGEV_THREAD_SELECT);
-	e->dbg_event_u.thread_select_event.thread_id = info->current_thread_id;
-	e->dbg_event_u.thread_select_event.frame = s;
-
-	MIFrameFree(info->frame);
-	free(info);
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-static int
-GDBMIStackInfoDepth()
-{
-	int depth;
-	dbg_event *	e;
-
-	CHECK_SESSION();
-
-	if ((depth = get_info_depth()) == -1) {
-		return DBGRES_ERR;
-	}
-	e = NewDbgEvent(DBGEV_STACK_DEPTH);
-	e->dbg_event_u.stack_depth = depth;
-	SaveEvent(e);
-	return DBGRES_OK;
-}
-
-static int
-GDBMIDataReadMemory(long offset, char* address, char* format, int wordSize, int rows, int cols, char* asChar)
-{
-	MICommand *	cmd;
-	dbg_event *	e;
-	MIDataReadMemoryInfo * info;
-	MIMemory * mem;
-	memoryinfo *meminfo = NULL;
-	memory * m;
-
-	CHECK_SESSION();
-
-	cmd = MIDataReadMemory(offset, address, format, wordSize, rows, cols, asChar);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	info = MIGetDataReadMemoryInfo(cmd);
-	MICommandFree(cmd);
-
-	e = NewDbgEvent(DBGEV_DATAR_MEM);
-	if (info != NULL) {
-		meminfo = NewMemoryInfo();
-		if (info->addr != NULL) {
-			meminfo->addr = strdup(info->addr);
-		}
-		meminfo->nextRow = info->nextRow;
-		meminfo->prevRow = info->prevRow;
-		meminfo->nextPage = info->nextPage;
-		meminfo->prevPage = info->prevPage;
-		meminfo->numBytes = info->numBytes;
-		meminfo->totalBytes = info->totalBytes;
-		if (info->memories != NULL ) {
-			meminfo->memories = NewList();
-			for (SetList(info->memories); (mem = (MIMemory *)GetListElement(info->memories)) != NULL;) {
-				m = NewMemory();
-				if (mem->addr != NULL) {
-					m->addr = strdup(mem->addr);
-				}
-				if (mem->ascii != NULL) {
-					m->ascii = strdup(mem->ascii);
-				}
-				if (mem->data != NULL) {
-					char* d;
-					m->data = NewList();
-					for (SetList(mem->data); (d = (char *)GetListElement(mem->data)) != NULL;) {
-						AddToList(m->data, (void *) strdup(d));
-					}
-				}
-				AddToList(meminfo->memories, (void *)m);
-			}
-		}
-	}
-	e->dbg_event_u.meminfo = meminfo;
-	MIDataReadMemoryInfoFree(info);
-
-	SaveEvent(e);
-	return DBGRES_OK;
-}
-
-static int
-GDBMIDataWriteMemory(long offset, char* address, char* format, int wordSize, char* value)
-{
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	//DEBUG_PRINTS(DEBUG_LEVEL_BACKEND, "----- gdbmi_sevrer: GDBMIDataWriteMemory called ---------\n");
-	cmd = MIDataWriteMemory(offset, address, format, wordSize, value);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	MICommandFree(cmd);
-//TODO
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-
-	return DBGRES_OK;
-}
-
-static int
-GDBCLIListSignals(char* name)
-{
-	MICommand *	cmd;
-	List *signals;
-	dbg_event *	e;
-
-	CHECK_SESSION();
-
-	cmd = CLIListSignals(name);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	CLIGetSigHandleList(cmd, &signals);
-	MICommandFree(cmd);
-
-	e = NewDbgEvent(DBGEV_SIGNALS);
-	e->dbg_event_u.list = signals;
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-static int
-GDBCLISignalInfo(char* arg)
-{
-	MICommand *	cmd;
-
-	CHECK_SESSION();
-
-	cmd = CLISignalInfo(arg);
-	MICommandRegisterCallback(cmd, ProcessCLIResultRecord, DebugSession);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	MICommandFree(cmd);
-	return DBGRES_OK;
-}
-
-static int
-GDBCLIHandle(char *arg)
-{
-	MICommand *cmd;
-
-	CHECK_SESSION();
-
-	cmd = CLIHandle(arg);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return DBGRES_ERR;
-	}
-	MICommandFree(cmd);
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int
-GDBMIDataEvaluateExpression(char *arg)
-{
-	MICommand *cmd;
-	dbg_event *	e;
-	char *res = NULL;
-
-	CHECK_SESSION();
-
-	cmd = MIDataEvaluateExpression(arg);
-	SendCommandWait(DebugSession, cmd);
-
-	if (MICommandResultOK(cmd)) {
-		res = MIGetDataEvaluateExpressionInfo(cmd);
-	}
-	if (res == NULL) {
-		res = strdup("No value found.");
-	}
-	MICommandFree(cmd);
-
-	e = NewDbgEvent(DBGEV_DATA_EVA_EX);
-	e->dbg_event_u.data_expression = res;
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-/*
-** Evaluate the expression exp.
-*/
-static int
-GDBMIEvaluateExpression(char *exp)
-{
-	char *		type;
-	AIF *		a;
-	dbg_event *	e;
-
-	if (GetAIFVar(exp, &a, &type) != DBGRES_OK)
-		return DBGRES_ERR;
-
-	e = NewDbgEvent(DBGEV_DATA);
-	e->dbg_event_u.data_event.data = a;
-	e->dbg_event_u.data_event.type_desc = type;
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-/*
-** Find native type of variable.
-*/
-static int
-GDBMIGetNativeType(char *var)
-{
-	dbg_event *	e;
-	AIF *		a;
-	char *		type;
-
-	CHECK_SESSION();
-
-	if (GetAIFVar(var, &a, &type) != DBGRES_OK)
-		return DBGRES_ERR;
-
-	e = NewDbgEvent(DBGEV_TYPE);
-	e->dbg_event_u.type_desc = type;
-
-	SaveEvent(e);
-	AIFFree(a);
-	return DBGRES_OK;
-}
-
-static int
-GetAIFVar(char *var, AIF **val, char **type)
-{
-	AIF * res;
-	MIVar *mivar;
-
-	mivar = CreateMIVar(var);
-	if (mivar == NULL) {
-		DbgSetError(DBGERR_UNKNOWN_VARIABLE, var);
-		return DBGRES_ERR;
-	}
-
-	if ((res = GetAIF(mivar, var, 0)) == NULL) {
-		DbgSetError(DBGERR_UNKNOWN_TYPE, mivar->type);
-		DeleteMIVar(mivar->name);
-		MIVarFree(mivar);
-		return DBGRES_ERR;
-	}
-	*type = strdup(mivar->type);
-	*val = res;
-
-	DeleteMIVar(mivar->name);
-	MIVarFree(mivar);
-
-	return DBGRES_OK;
-}
-
-static char *
-GetVarValue(char *var)
-{
-	char *		res;
-	MICommand *	cmd = MIVarEvaluateExpression(var);
-
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return "";
-	}
-	res = MIGetVarEvaluateExpressionInfo(cmd);
-	MICommandFree(cmd);
-	return res;
-}
-
-static int
-GetAddressLength()
-{
-	if (ADDRESS_LENGTH != 0) {
-		return ADDRESS_LENGTH;
-	}
-	char * res;
-	MICommand * cmd = MIDataEvaluateExpression("\"sizeof(char *)\"");
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		SetDebugError(cmd);
-		MICommandFree(cmd);
-		return 0;
-	}
-	res = MIGetDataEvaluateExpressionInfo(cmd);
-	MICommandFree(cmd);
-
-	ADDRESS_LENGTH = (int)strtol(res, NULL, 10);
-	return ADDRESS_LENGTH;
-}
-
-static char *
-GetPtypeValue(char *exp)
-{
-	char * type = NULL;
-	MICommand* cmd = CLIPType(exp);
-	SendCommandWait(DebugSession, cmd);
-	type = CLIGetPTypeInfo(cmd);
-	MICommandFree(cmd);
-	return type;
-}
-
-/********************************************************
- * TYPE CONVERSION
- ********************************************************/
-#define T_OTHER			0
-#define T_CHAR			1
-#define T_SHORT			2
-#define T_USHORT		3
-#define T_INT			4
-#define T_UINT			5
-#define T_LONG			6
-#define T_ULONG			7
-#define T_LONGLONG		8
-#define T_ULONGLONG		9
-#define T_FLOAT			10
-#define T_DOUBLE		11
-#define T_STRING		12
-#define T_BOOLEAN		13
-
-#define T_CHAR_PTR		14
-#define T_FUNCTION		15
-#define T_VOID_PTR		16
-#define T_UNION			17
-#define T_ENUM			18
-#define T_ARRAY			19
-#define T_STRUCT		20
-#define T_POINTER		21
-
-static int
-get_simple_type(char *type)
-{
-	char *t = NULL;
-	int id;
-	int len = strlen(type);
-
-	if (type[len - 1] == ')') { // function
-		return T_FUNCTION;
-	}
-	if (strncmp(type, "void *", 6) == 0) { // void pointer
-		return T_VOID_PTR;
-	}
-	if (strncmp(type, "enum", 4) == 0) { // enum
-		return T_ENUM;
-	}
-
-	//check modifiers
-	if (strncmp(type, "const volatile", 14) == 0)
-		t = strdup(&type[15]); //+ 1 remove whitespeace
-	else if (strncmp(type, "volatile", 8) == 0)
-		t = strdup(&type[9]); //+ 1 remove whitespeace
-	else if (strncmp(type, "const", 5) == 0)
-		t = strdup(&type[6]); //+ 1 remove whitespeace
-	else
-		t = strdup(type);
-
-	if (strncmp(t, "char *", 6) == 0)
-		id = T_CHAR_PTR;
-	else if (strncmp(t, "char", 4) == 0)
-		id = T_CHAR;
-	else if (strncmp(t, "unsigned char", 13) == 0)
-		id = T_CHAR;
-	else if (strncmp(t, "short int", 9) == 0 || strncmp(t, "int2", 4) == 0)
-		id = T_SHORT;
-	else if (strncmp(t, "short unsigned int", 18) == 0)
-		id = T_USHORT;
-	else if (strncmp(t, "int", 3) == 0 || strncmp(t, "int4", 4) == 0)
-		id = T_INT;
-	else if (strncmp(t, "unsigned int", 12) == 0)
-		id = T_UINT;
-	else if (strncmp(t, "long int", 8) == 0 || strncmp(t, "int8", 4) == 0)
-		id = T_LONG;
-	else if (strncmp(t, "long unsigned int", 17) == 0)
-		id = T_ULONG;
-#ifdef CC_HAS_LONG_LONG
-	else if (strncmp(t, "long long int", 13) == 0 || strncmp(t, "real*16", 7) == 0)
-		id = T_LONGLONG;
-	else if (strncmp(t, "long long unsigned int", 22) == 0)
-		id = T_ULONGLONG;
-#endif /* CC_HAS_LONG_LONG */
-	else if (strncmp(t, "long", 4) == 0 || strncmp(t, "real*4", 6) == 0)
-		id = T_LONG;
-	else if (strncmp(t, "float", 5) == 0 || strncmp(t, "real*8", 6) == 0)
-		id = T_FLOAT;
-	else if (strncmp(t, "double", 6) == 0)
-		id = T_DOUBLE;
-	else if (strncmp(t, "string", 6) == 0)
-		id = T_STRING;
- 	else if (strncmp(t, "logical4", 8) == 0)
- 		id = T_BOOLEAN;
-	else
-		id =  T_OTHER;
-
-	free(t);
-	return id;
-}
-
-static int
-get_complex_type(char *type)
-{
-	int len = strlen(type);
-	switch (type[len - 1]) {
-	case ']':
-		return T_ARRAY;
-	case '*':
-		if (type[len - 2] == '*') //pointer pointer
-			return T_POINTER;
-		if (strncmp(type, "char", 4) == 0) //char pointer
-			return T_CHAR_PTR;
-		return T_POINTER; //normal pointer
-	default:
-		if (strncmp(type, "union", 5) == 0)
-			return T_UNION;
-
-		if (strncmp(type, "struct", 6) == 0)
-			return T_STRUCT;
-
-		return T_OTHER;
-	}
-}
-
-static AIF*
-GetPrimitiveAIF(int id, char *res)
-{
-	char *pch;
-
-	if (res == NULL) {
-		return NULL;
-	}
-	switch (id) {
-		case T_STRING:
-		case T_CHAR:
-			if ((pch = strchr(res, ' ')) != NULL) {
-				pch++;
-				if (*pch == '\'') { //character
-					pch--;
-					*pch = '\0';
-					return CharToAIF((char)strtol(res, NULL, 10));
-				}
-				else { //string
-					return StringToAIF(pch);
-				}
-			}
-			else {
-				return CharToAIF((char)strtol(res, NULL, 10));
-			}
-			break;
-		case T_SHORT:
-			return ShortToAIF((short)strtol(res, NULL, 10));
-		case T_USHORT:
-			return UnsignedShortToAIF((unsigned short)strtoul(res, NULL, 10));
-		case T_INT:
-			return IntToAIF((int)strtol(res, NULL, 10));
-		case T_UINT:
-			return UnsignedIntToAIF((unsigned int)strtoul(res, NULL, 10));
-		case T_LONG:
-			return LongToAIF(strtol(res, NULL, 10));
-		case T_ULONG:
-			return UnsignedLongToAIF((unsigned long)strtoul(res, NULL, 10));
-		#ifdef CC_HAS_LONG_LONG
-			case T_LONGLONG:
-				return LongLongToAIF(strtoll(res, NULL));
-			case T_ULONGLONG:
-				return UnsignedLongLongToAIF((unsigned long long)strtoull(res, NULL));
-		#endif /* CC_HAS_LONG_LONG */
-		case T_FLOAT:
-			return FloatToAIF((float)strtod(res, NULL));
-		case T_DOUBLE:
-			return DoubleToAIF(strtod(res, NULL));
-		default://other type
-			return VoidToAIF(0, 0);
-	}
-}
-
-static AIF *
-GetAIFPointer(char *addr, AIF *i)
-{
-	AIF *ac;
-	AIF *a;
-	char *pch;
-
-	if (addr == NULL) {
-		ac = VoidToAIF(0, 0);
-	}
-	else {
-		if ((pch = strchr(addr, ' ')) != NULL) {
-			*pch = '\0';
-		}
-		addr += 2; //skip 0x
-		ac = AddressToAIF(addr, GetAddressLength());
-	}
-	a = PointerToAIF(ac, i);
-	AIFFree(ac);
-	return a;
-}
-
-static AIF *
-GetCharPointerAIF(char *res)
-{
-	char *pch;
-	char *val;
-	AIF *a;
-	AIF *ac;
-
-	if ((pch = strchr(res, ' ')) != NULL) {
-		val = strdup(pch+1);
-		*pch = '\0';
-
-		res += 2;  //skip 0x
-		ac = AddressToAIF(res, GetAddressLength());
-		a = CharPointerToAIF(ac, val);
-		free(val);
-		AIFFree(ac);
-		return a;
-	}
-	return VoidToAIF(0, 0);
-}
-
-static AIF *
-GetSimpleAIF(MIVar *var, char *exp)
-{
-	AIF		*a = NULL;
-	AIF		*ac;
-	char	*pt;
-
-	int id = get_simple_type(var->type);
-	if (id == T_OTHER) {
-		pt = GetPtypeValue(var->type);
-		if (pt != NULL) {
-			var->type = strdup(pt);
-			id = get_simple_type(var->type);
-			free(pt);
-		}
-	}
-	switch (id) {
-	case T_FUNCTION:
-		return MakeAIF("&/is4", exp);
-	case T_VOID_PTR:
-		ac = VoidToAIF(0, 0);
-		a = GetAIFPointer(GetVarValue(var->name), ac);
-		AIFFree(ac);
-		return a;
-	case T_ENUM:
-		return (var->type[4] == ' ') ? EmptyEnumToAIF(&var->type[5]) : EmptyEnumToAIF(NULL);
-	case T_OTHER:
-		if (exp == NULL)
-			return NULL;
-
-		return GetSimpleAIF(var, NULL);
-	default:
-		return GetPrimitiveAIF(id, GetVarValue(var->name));
-	}
-}
-
-static AIF*
-GetNamedAIF(AIF *a, int named)
-{
-	if (FDSType(AIF_FORMAT(a)) != AIF_NAME) {
-		return NameAIF(a, named);
-	}
-	return a;
-}
-
-static AIF *
-GetStructAIF(MIVar *var, int named)
-{
-	int		i;
-	MIVar *	v;
-	AIF *	a;
-	AIF *	ac;
-	char *pch;
-	char *struct_name = strdup(var->type);
-	named++;
-
-	if ((pch = strchr(struct_name, ' ')) != NULL) {
-		pch++;
-		a = EmptyStructToAIF(pch);
-	}
-	else {
-		a = EmptyStructToAIF(struct_name);
-	}
-	free(struct_name);
-
-	for (i=0; i<var->numchild; i++) {
-		v = var->children[i];
-		//check whether child contains parent
-		if (strcmp(var->type, v->type) == 0 && strcmp(var->name, v->name)) {
-			a = GetNamedAIF(a, named);
-			ac = AIFNull(a);
-		}
-		else {
-			if ((ac = GetAIF(v, v->exp, named)) == NULL) {
-				AIFFree(a);
-				return NULL;
-			}
-		}
-		AIFAddFieldToStruct(a, v->exp, ac);
-	}
-	return a;
-}
-
-static AIF *
-GetUnionAIF(MIVar *var, int named)
-{
-	int		i;
-	MIVar *	v;
-	AIF *	a;
-	AIF *	ac;
-	char *union_name = NULL;
-	named++;
-
-	if (var->type[5] == ' ') {
-		union_name = strdup(&var->type[6]);
-	}
-	a = EmptyUnionToAIF(union_name);
-	if (union_name != NULL)
-		free(union_name);
-
-	for (i=0; i<var->numchild; i++) {
-		v = var->children[i];
-		//check whether child contains parent
-		if (strcmp(var->type, v->type) == 0 && strcmp(var->name, v->name)) {
-			a = GetNamedAIF(a, named);
-			ac = AIFNull(a);
-		}
-		else {
-			if ((ac = GetAIF(v, v->exp, named)) == NULL) {
-				AIFFree(a);
-				return NULL;
-			}
-		}
-		AIFAddFieldToUnion(a, v->exp, AIF_FORMAT(ac));
-
-		//Set the union value
-		if (i == var->numchild - 1)
-			AIFSetUnion(a, v->exp, ac);
-
-		AIFFree(ac);
-	}
-	return a;
-}
-
-static AIF *
-GetArrayAIF(MIVar *var, int named)
-{
-	int		i;
-	MIVar *	v;
-	AIF *	a = NULL;
-	AIF *	ac;
-
-	for (i = 0; i < var->numchild; i++) {
-		v = var->children[i];
-		if ((ac = GetAIF(v, v->exp, named)) == NULL) {
-			return NULL;
-		}
-		if (a == NULL)
-			a = EmptyArrayToAIF(0, var->numchild-1, ac);
-		AIFAddArrayElement(a, i, ac);
-		AIFFree(ac);
-	}
-	return a;
-}
-
-static AIF *
-GetPointerAIF(MIVar *var, int named)
-{
-	AIF *ac;
-	AIF *a;
-	int id;
-
-	var->type[strlen(var->type) - 1] = '\0'; //remove pointer
-	while (var->type[strlen(var->type) - 1] == ' ') {//remove whilespace
-		var->type[strlen(var->type) - 1] = '\0';
-	}
-
-	id = get_complex_type(var->type);
-	switch (id) {
-		case T_POINTER:
-			ac = GetAIF(var->children[0], var->children[0]->exp, named);
-			break;
-		case T_CHAR_PTR:
-			return GetCharPointerAIF(GetVarValue(var->children[0]->name));
-		case T_UNION:
-			ac = GetUnionAIF(var, named);
-			break;
-		default:
-			if (var->numchild == 1) {
-				ac = GetAIF(var->children[0], var->children[0]->exp, named);
-			}
-			else {
-				ac = GetStructAIF(var, named);
-			}
-			break;
-	}
-
-	if (ac == NULL) {
-		ac = VoidToAIF(0, 0);
-	}
-	a = GetAIFPointer(GetVarValue(var->name), ac);
-	AIFFree(ac);
-	return a;
-}
-
-static AIF *
-GetComplexAIF(MIVar *var, char *exp, int named)
-{
-	int id = get_complex_type(var->type);
-	switch (id) {
-	case T_ARRAY:
-		return GetArrayAIF(var, named);
-	case T_CHAR_PTR:
-		return GetCharPointerAIF(GetVarValue(var->name));
-	case T_POINTER:
-		return GetPointerAIF(var, named);
-	case T_UNION:
-		return GetUnionAIF(var, named);
-	default://struct
-		return GetStructAIF(var, named);
-	}
-}
-
-static AIF *
-GetAIF(MIVar *var, char *exp, int named)
-{
-	MICommand	*cmd;
-
-	if (strcmp(var->type, "<text variable, no debug info>") == 0) {
-		DbgSetError(DBGERR_NOSYMS, "");
-		return NULL;
-	}
-	if (var->numchild == 0) { //simple type
-		return GetSimpleAIF(var, exp);
-	}
-	//complex type
-	cmd = MIVarListChildren(var->name);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		if (MICommandResultClass(cmd) == MIResultRecordERROR) {
-			char *err = MICommandResultErrorMessage(cmd);
-			if (err != NULL) {
-				DbgSetError(DBGERR_DEBUGGER, err);
-				free(err);
-			} else {
-				DbgSetError(DBGERR_DEBUGGER, "got error from gdb, but no message");
-			}
-		} else {
-			DbgSetError(DBGERR_DEBUGGER, "bad response from gdb");
-		}
-		MICommandFree(cmd);
-		return NULL;
-	}
-	MIGetVarListChildrenInfo(var, cmd);
-	MICommandFree(cmd);
-
-	return GetComplexAIF(var, exp, named);
-}
-
-/*************************** PARTIAL AIF ***************************/
-static AIF *
-GetPartialArrayAIF(MIVar *var)
-{
-	AIF *a = NULL;
-	AIF *ac;
-	int i;
-	char *pch;
-	char *pt;
-	int id;
-
-	if (var->children == NULL) {
-		pch = strchr(var->type, '[');
-		*pch = '\0';
-		while (var->type[strlen(var->type) - 1] == ' ') {//remove whilespace
-			var->type[strlen(var->type) - 1] = '\0';
-		}
-		id = get_simple_type(var->type);
-		if (id == T_OTHER) {
-			pt = GetPtypeValue(var->type);
-			if (pt != NULL) {
-				var->type = strdup(pt);
-				id = get_simple_type(var->type);
-				free(pt);
-			}
-		}
-		ac = GetPrimitiveAIF(id, "");
-		a = EmptyArrayToAIF(0, var->numchild-1, ac);
-		AIFFree(ac);
-	}
-	else {
-		for (i=0; i<var->numchild; i++) {
-			ac = GetPartialAIF(var->children[i], NULL);
-			if (a == NULL) {
-				a = EmptyArrayToAIF(0, var->numchild-1, ac);
-			}
-			AIFAddArrayElement(a, i, ac);
-			AIFFree(ac);
-		}
-	}
-	return a;
-}
-
-static AIF *
-GetPartialStructAIF(MIVar *var)
-{
-	AIF *ac;
-	AIF *a;
-	int i;
-	char *pch;
-	char *struct_name = strdup(var->type);
-
-	if ((pch = strchr(struct_name, ' ')) != NULL) {
-		pch++;
-		a = EmptyStructToAIF(pch);
-	}
-	else {
-		a = EmptyStructToAIF(struct_name);
-	}
-	free(struct_name);
-
-	if (var->children != NULL) {
-		for (i=0; i<var->numchild; i++) {
-			ac = GetPartialAIF(var->children[i], var->children[i]->exp);
-			AIFAddFieldToStruct(a, var->children[i]->exp, ac);
-			AIFFree(ac);
-		}
-	}
-	return a;
-}
-
-static AIF *
-GetPartialUnionAIF(MIVar *var)
-{
-	AIF *ac;
-	AIF *a;
-	int i;
-	char *union_name = NULL;
-
-	if (var->type[5] == ' ') {
-		union_name = strdup(&var->type[6]);
-	}
-	a = EmptyUnionToAIF(union_name);
-	if (union_name != NULL)
-		free(union_name);
-
-	if (var->children != NULL) {
-		for (i=0; i<var->numchild; i++) {
-			ac = GetPartialAIF(var->children[i], var->children[i]->exp);
-			AIFAddFieldToUnion(a, var->children[i]->exp, AIF_FORMAT(ac));
-			if (i == var->numchild - 1) {
-				AIFSetUnion(a, var->children[i]->exp, ac);
-			}
-			AIFFree(ac);
-		}
-	}
-	return a;
-}
-
-static AIF *
-GetPartialPointerAIF(MIVar *var)
-{
-	AIF *ac;
-	AIF *a;
-	int id;
-
-	if (var->children != NULL) {
-		var->type[strlen(var->type) - 1] = '\0'; //remove pointer
-		while (var->type[strlen(var->type) - 1] == ' ') {//remove whilespace
-			var->type[strlen(var->type) - 1] = '\0';
-		}
-
-		id = get_complex_type(var->type);
-		switch (id) {
-			case T_CHAR_PTR:
-				//replace miname
-				var->name = strdup(var->children[0]->exp);
-				a = GetCharPointerAIF(GetVarValue(var->children[0]->name));
-				break;
-			case T_POINTER:
-				//replace miname
-				var->name = strdup(var->children[0]->exp);
-				ac = VoidToAIF(0, 0);
-				a = GetAIFPointer(GetVarValue(var->children[0]->name), ac);
-				AIFFree(ac);
-				break;
-			case T_UNION:
-				a = GetPartialUnionAIF(var);
-				break;
-			default:
-				if (var->numchild == 1) {
-					//replace miname
-					var->name = strdup(var->children[0]->exp);
-					a = GetPartialAIF(var->children[0], var->children[0]->exp);
-				}
-				else {
-					a = GetPartialStructAIF(var);
-				}
-				break;
-		}
-	}
-	else {
-		id = get_complex_type(var->type);
-		switch (id) {
-			case T_CHAR_PTR:
-				a = GetCharPointerAIF(GetVarValue(var->name));
-				break;
-			default:
-				ac = VoidToAIF(0, 0);
-				a = GetAIFPointer(GetVarValue(var->name), ac);
-				AIFFree(ac);
-				break;
-		}
-	}
-	return a;
-}
-
-static AIF *
-GetPartialComplexAIF(MIVar *var, char *exp)
-{
-	char *pt;
-	int id = get_complex_type(var->type);
-	if (id == T_OTHER) {
-		pt = GetPtypeValue(var->type);
-		if (pt != NULL) {
-			var->type = pt;
-			id = get_complex_type(var->type);
-		}
-	}
-	switch (id) {
-	case T_ARRAY:
-		return GetPartialArrayAIF(var);
-	case T_CHAR_PTR:
-		return GetCharPointerAIF(GetVarValue(var->name));
-	case T_POINTER:
-		return GetPartialPointerAIF(var);
-	case T_UNION:
-		return GetPartialUnionAIF(var);
-	default://struct
-		return GetPartialStructAIF(var);
-	}
-}
-
-static AIF *
-GetPartialAIF(MIVar *var, char *exp)
-{
-	if (strcmp(var->type, "<text variable, no debug info>") == 0) {
-		DbgSetError(DBGERR_NOSYMS, "");
-		return NULL;
-	}
-	if (var->numchild == 0) {
-		return GetSimpleAIF(var, exp);
-	}
-	return GetPartialComplexAIF(var, exp);
-}
-
-static MIVar *
-GetChildrenMIVar(char *mivar_name, MIVar *mivar, int showParentType)
-{
-	MICommand *cmd;
-
-	if (showParentType || mivar == NULL) {
-		cmd = MIVarInfoType(mivar_name);
-		SendCommandWait(DebugSession, cmd);
-		if (!MICommandResultOK(cmd)) {
-			MICommandFree(cmd);
-			return NULL;
-		}
-		mivar = MIGetVarInfoType(cmd);
-		mivar->name = strdup(mivar_name);
-		MICommandFree(cmd);
-	}
-	cmd = MIVarListChildren(mivar_name);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		MICommandFree(cmd);
-		return NULL;
-	}
-	MIGetVarListChildrenInfo(mivar, cmd);
-	MICommandFree(cmd);
-	return mivar;
-}
-
-static MIVar *
-GetMIVarDetails(char *name)
-{
-	MICommand *cmd;
-	MIVar *mivar;
-
-	cmd = MIVarInfoType(name);
-	SendCommandWait(DebugSession, cmd);
-	if (!MICommandResultOK(cmd)) {
-		MICommandFree(cmd);
-		return NULL;
-	}
-	mivar = MIGetVarInfoType(cmd);
-	mivar->name = strdup(name);
-	MICommandFree(cmd);
-
-	cmd = MIVarInfoNumChildren(name);
-	SendCommandWait(DebugSession, cmd);
-	MIGetVarInfoNumChildren(cmd, mivar);
-	MICommandFree(cmd);
-	return mivar;
-}
-
-static int
-GDBGetPartialAIF(char* name, char* key, int listChildren, int express)
-{
-	MIVar *mivar;
-	AIF *a;
-	dbg_event *	e;
-	char* var_name;
-
-	CHECK_SESSION();
-
-	//key is first perference if it exists
-	var_name = (key == NULL || strlen(key) == 0)?name:key;
-
-	if (express) {
-		mivar = GetMIVarDetails(var_name);
-	}
-	else {
-		//@ - for partial array
-		if (!listChildren || strchr(var_name, '@') != NULL) {
-			mivar = CreateMIVar(var_name);
-			if (listChildren) {
-				mivar = GetChildrenMIVar(mivar->name, mivar, 0);
-			}
-		}
-		else {
-			mivar = GetChildrenMIVar(var_name, NULL, 1);
-		}
-	}
-
-	if (mivar == NULL) {
-		//try again with original variable name
-		var_name = name;
-		if ((mivar = CreateMIVar(var_name)) == NULL) {
-			DbgSetError(DBGERR_UNKNOWN_VARIABLE, var_name);
-			return DBGRES_ERR;
-		}
-	}
-	if ((a = GetPartialAIF(mivar, var_name)) == NULL) {
-		DbgSetError(DBGERR_UNKNOWN_TYPE, mivar->type);
-		MIVarFree(mivar);
-		return DBGRES_ERR;
-	}
-
-	DEBUG_PRINTF(DEBUG_LEVEL_BACKEND, "---------------------- GDBGetPartialAIF found key: %s, format: %s\n", mivar->name, AIF_FORMAT(a));
-
-	e = NewDbgEvent(DBGEV_PARTIAL_AIF);
-	e->dbg_event_u.partial_aif_event.data = a;
-	e->dbg_event_u.partial_aif_event.type_desc = strdup(mivar->type);
-	e->dbg_event_u.partial_aif_event.name = strdup(mivar->name);
-
-	MIVarFree(mivar);
-	SaveEvent(e);
-
-	return DBGRES_OK;
-}
-
-static int
-GDBMIVarDelete(char *name)
-{
-	CHECK_SESSION();
-	DeleteMIVar(name);
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-#if 0
-char tohex[] =	{'0', '1', '2', '3', '4', '5', '6', '7',
-				 '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
-static int
-GDBMIBuildAIFVar(char *var, char *type, char *file, AIF **aif)
-{
-	int			n;
-	int			fd;
-	char *		data;
-	char *		ap;
-	char *		bp;
-	char			buf[BUFSIZ];
-	struct stat	sb;
-
-	if ( stat(file, &sb) < 0 )
-	{
-		DbgSetError(DBGERR_DEBUGGER, (char *)strerror(errno));
-		return DBGRES_ERR;
-	}
-
-	if ( FDSType(type) == AIF_FUNCTION )
-	{
-		/*
-		** Data is function name
-		*/
-		ap = data = malloc(strlen(var) * 2 + 1);
-
-		for ( bp = var ; *bp != '\0' ; bp++ )
-		{
-			*ap++ = tohex[(*bp >> 4) & 0xf];
-			*ap++ = tohex[*bp & 0xf];
-		}
-
-		*ap++ = '\0';
-	}
-	else
-	{
-		if ( (fd = open(file, O_RDONLY)) < 0 )
-		{
-			DbgSetError(DBGERR_DEBUGGER, (char *)strerror(errno));
-			return DBGRES_ERR;
-		}
-
-		ap = data = malloc(sb.st_size * 2 + 1);
-
-		while ((n = read(fd, buf, BUFSIZ)) > 0)
-		{
-			bp = buf;
-
-			while ( n-- > 0 )
-			{
-				*ap++ = tohex[(*bp >> 4) & 0xf];
-				*ap++ = tohex[*bp++ & 0xf];
-			}
-		}
-
-		*ap++ = '\0';
-
-		(void)close(fd);
-	}
-
-	if ( FDSType(type) == AIF_POINTER )
-	{
-		/*
-		 * Need to add marker to data
-		 */
-		ap = malloc(sb.st_size * 2 + 3);
-		*ap++ = '0';
-		*ap++ = '1'; // normal pointer
-		memcpy(ap, data, sb.st_size * 2 + 1);
-		data = ap;
-	}
-
-	if ( (*aif = AsciiToAIF(type, data)) == NULL )
-	{
-		DbgSetError(DBGERR_DEBUGGER, AIFErrorStr());
-		return DBGRES_ERR;
-	}
-
-	return DBGRES_OK;
-}
-#endif

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/server/server.c b/debug/org.eclipse.ptp.debug.sdm/src/server/server.c
deleted file mode 100644
index 827ed7f..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/server/server.c
+++ /dev/null

@@ -1,170 +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
- ******************************************************************************/
-
-/*
- * server() has two roles. The first is to launch the process being debugged
- * (debuggee) under the control of a debugger (us). The second is to manage
- * communication with the client process.
- *
- * Note that there will be num_procs+1 [0..num_procs] processes in our
- * communicator, where num_procs is the number of processes in the parallel
- * job being debugged. To simplify the accounting, we use the task id of
- * num_procs as the client task id and [0..num_procs-1] for the server
- * task ids.
- */
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "hash.h"
-#include "backend.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "sdm.h"
-
-extern int	svr_init(dbg_backend *, void (*)(dbg_event *, int));
-extern int	svr_dispatch(dbg_backend *, char *, int, int);
-extern int	svr_progress(dbg_backend *);
-extern int	svr_isshutdown(void);
-
-static dbg_backend *	backend;
-
-char *
-stringify(char *buf, int len)
-{
-	static char *	str_buf = NULL;
-
-	if (str_buf != NULL) {
-		free(str_buf);
-	}
-
-	str_buf = (char *)malloc(len + 1);
-
-	memcpy(str_buf, buf, len);
-	str_buf[len] = '\0';
-
-	return str_buf;
-}
-
-/*
- * Aggregate debugger response.
- */
-static void
-event_callback(dbg_event *e, int data)
-{
-	int			len;
-	char *		buf;
-	sdm_message	msg;
-
-	if (DbgSerializeEvent(e, &buf, &len) < 0) {
-		return;
-	}
-
-	DEBUG_PRINTF(DEBUG_LEVEL_SERVER, "[%d] server event_callback '%s'\n", sdm_route_get_id(), stringify(buf, len));
-
-	msg = sdm_message_new(buf, len);
-	sdm_message_set_id(msg, data);
-	sdm_set_add_element(sdm_message_get_destination(msg), SDM_MASTER);
-	sdm_aggregate_message(msg, SDM_AGGREGATE_UPSTREAM | SDM_AGGREGATE_INIT);
-}
-
-/*
- * Dispatch payload to debugger.
- */
-static void
-deliver_callback(const sdm_message msg)
-{
-	int		id;
-	int		len;
-	char *	buf;
-
-	DEBUG_PRINTF(DEBUG_LEVEL_SERVER, "[%d] Enter deliver_callback\n", sdm_route_get_id());
-
-	sdm_message_get_payload(msg, &buf, &len);
-	id = sdm_message_get_id(msg);
-	(void)svr_dispatch(backend, buf, len, id);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_SERVER, "[%d] Leaving deliver_callback\n", sdm_route_get_id());
-}
-
-/*
- * Just forward aggregated message to parent.
- */
-static int
-aggregate_callback(sdm_message msg) {
-	DEBUG_PRINTF(DEBUG_LEVEL_SERVER, "[%d] Enter aggregate_callback\n", sdm_route_get_id());
-
-	sdm_message_set_send_callback(msg, sdm_message_free);
-	sdm_message_send(msg);
-
-	DEBUG_PRINTF(DEBUG_LEVEL_SERVER, "[%d] Leaving aggregate_callback\n", sdm_route_get_id());
-	return 0;
-}
-
-/*
- * Debug server implementation
- *
- * NOTE: currently the debug server does not support multiple simulutaneous command execution. That is, it
- * will only process one command at at time, and will not accept another command until a reply
- * has been sent. The client may send multiple commands, but it is the underlying transport
- * that is providing the command buffering.
- *
- * This approach should be sufficient for all debugging tasks if we assume that the debugger operates
- * in one of two states: ACCEPTING_COMMANDS and PROCESSING_COMMAND and will only accept additional commands
- * when it is in the ACCEPTING_COMMANDS state. E.g.
- *
- * Command		Debugger State		GDB State
- *
- * --SLB-->		ACCEPTING_COMMANDS	SUSPENDED
- * 				PROCESSING_COMMAND	SUSPENDED
- * <--OK---		ACCEPTING_COMMANDS	SUSPENDED
- *
- * --GOP-->		ACCEPTING_COMMANDS	SUSPENDED
- * 				PROCESSING_COMMAND	RUNNING
- * 				PROCESSING_COMMAND	SUSPENDED
- * <--OK---		ACCEPTING_COMMANDS	SUSPENDED
- *
- * The exception to this is the INT command which can be sent at any time. This works by sending
- * with a special MPI tag used of OOB communication. It will be implemented later...
- *
- */
-void
-server(dbg_backend *dbgr)
-{
-	DEBUG_PRINTF(DEBUG_LEVEL_SERVER, "starting server on %d, size=%d\n", sdm_route_get_id(), sdm_route_get_size());
-
-	backend = dbgr;
-
-	sdm_message_set_deliver_callback(deliver_callback);
-	sdm_aggregate_set_completion_callback(aggregate_callback);
-
-	svr_init(dbgr, event_callback);
-
-	while (!svr_isshutdown()) {
-		sdm_progress();
-		svr_progress(dbgr);
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/server/server_cmds.c b/debug/org.eclipse.ptp.debug.sdm/src/server/server_cmds.c
deleted file mode 100644
index fb64ba1..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/server/server_cmds.c
+++ /dev/null

@@ -1,498 +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
- ******************************************************************************/
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include "compat.h"
-#include "args.h"
-#include "dbg.h"
-#include "dbg_event.h"
-#include "dbg_proxy.h"
-#include "backend.h"
-
-#define SVR_RUNNING				0
-#define SVR_SHUTDOWN_STARTED	1
-#define SVR_SHUTDOWN_COMPLETED	2
-
-typedef int (*svr_cmd)(dbg_backend *, int, char **);
-
-static int svr_start_session(dbg_backend *, int, char **);
-static int svr_setlinebreakpoint(dbg_backend *, int, char **);
-static int svr_setfuncbreakpoint(dbg_backend *, int, char **);
-static int svr_deletebreakpoint(dbg_backend *, int, char **);
-static int svr_enablebreakpoint(dbg_backend *, int, char **);
-static int svr_disablebreakpoint(dbg_backend *, int, char **);
-static int svr_conditionbreakpoint(dbg_backend *, int, char **);
-static int svr_breakpointafter(dbg_backend *, int, char **);
-static int svr_setwatchpoint(dbg_backend *, int, char **);
-static int svr_go(dbg_backend *, int, char **);
-static int svr_step(dbg_backend *, int, char **);
-static int svr_terminate(dbg_backend *, int, char **);
-static int svr_suspend(dbg_backend *, int, char **);
-static int svr_liststackframes(dbg_backend *, int, char **);
-static int svr_setcurrentstackframe(dbg_backend *, int, char **);
-static int svr_evaluateexpression(dbg_backend *, int, char **);
-static int svr_gettype(dbg_backend *, int, char **);
-static int svr_listlocalvariables(dbg_backend *, int, char **);
-static int svr_listarguments(dbg_backend *, int, char **);
-static int svr_listglobalvariables(dbg_backend *, int, char **);
-static int svr_listinfothreads(dbg_backend *, int, char **);
-static int svr_setthreadselect(dbg_backend *, int, char **);
-static int svr_stackinfodepth(dbg_backend *, int, char **);
-static int svr_datareadmemory(dbg_backend *, int, char **);
-static int svr_datawritememory(dbg_backend *, int, char **);
-static int svr_listsignals(dbg_backend *, int, char **);
-static int svr_signalinfo(dbg_backend *, int, char **);
-static int svr_clihandle(dbg_backend *, int, char **);
-static int svr_quit(dbg_backend *, int, char **);
-static int svr_dataevaluateexpression(dbg_backend *, int, char **);
-static int svr_getpartialaif(dbg_backend *, int, char **);
-static int svr_variabledelete(dbg_backend *, int, char **);
-
-static svr_cmd svr_cmd_tab[] =
-{
-	/* DBG_QUIT_CMD */					svr_quit,
-	/* DBG_STARTSESSION_CMD */			svr_start_session,
-	/* DBG_SETLINEBREAKPOINT_CMD */		svr_setlinebreakpoint,
-	/* DBG_SETFUNCBREAKPOINT_CMD */		svr_setfuncbreakpoint,
-	/* DBG_DELETEBREAKPOINT_CMD */		svr_deletebreakpoint,
-	/* DBG_ENABLEBREAKPOINT_CMD */		svr_enablebreakpoint,
-	/* DBG_DISABLEBREAKPOINT_CMD */		svr_disablebreakpoint,
-	/* DBG_CONDITIONBREAKPOINT_CMD */	svr_conditionbreakpoint,
-	/* DBG_BREAKPOINTAFTER_CMD */		svr_breakpointafter,
-	/* DBG_SETWATCHPOINT_CMD */			svr_setwatchpoint,
-	/* DBG_GO_CMD */					svr_go,
-	/* DBG_STEP_CMD */					svr_step,
-	/* DBG_TERMINATE_CMD */				svr_terminate,
-	/* DBG_SUSPEND_CMD */				svr_suspend,
-	/* DBG_LISTSTACKFRAMES_CMD */		svr_liststackframes,
-	/* DBG_SETCURRENTSTACKFRAME_CMD */	svr_setcurrentstackframe,
-	/* DBG_EVALUATEEXPRESSION_CMD */	svr_evaluateexpression,
-	/* DBG_GETTYPE_CMD */				svr_gettype,
-	/* DBG_LISTLOCALVARIABLES_CMD */	svr_listlocalvariables,
-	/* DBG_LISTARGUMENTS_CMD */			svr_listarguments,
-	/* DBG_LISTGLOBALVARIABLES_CMD */	svr_listglobalvariables,
-	/* DBG_LISTINFOTHREADS_CMD */		svr_listinfothreads,
-	/* DBG_SETTHREADSELECT_CMD */		svr_setthreadselect,
-	/* DBG_STACKINFODEPTH_CMD */		svr_stackinfodepth,
-	/* DBG_DATAREADMEMORY_CMD */		svr_datareadmemory,
-	/* DBG_DATAWRITEMEMORY_CMD */		svr_datawritememory,
-	/* DBG_LISTSIGNALS_CMD */			svr_listsignals,
-	/* DBG_SIGNALINFO_CMD */			svr_signalinfo,
-	/* DBG_CLIHANDLE_CMD */				svr_clihandle,
-	/* DBG_DATAEVALUATEEXPRESSION_CMD */svr_dataevaluateexpression,
-	/* DBG_GETPARTIALAIF_CMD */			svr_getpartialaif,
-	/* DBG_VARIABLEDELETE_CMD */		svr_variabledelete,
-};
-
-static int			svr_res;
-static void			(*event_callback)(dbg_event *, int);
-static int			event_data;
-static char **		svr_env;
-static int			svr_last_tid;
-static int			svr_state;
-
-static void
-svr_event_callback(dbg_event *e)
-{
-	e->trans_id = svr_last_tid;
-	event_callback(e, event_data);
-}
-
-int
-svr_isshutdown(void)
-{
-	if (svr_state == SVR_SHUTDOWN_STARTED) {
-		svr_state = SVR_SHUTDOWN_COMPLETED;
-		return 0;
-	}
-
-	return (svr_state == SVR_SHUTDOWN_COMPLETED) ? 1 : 0;
-}
-
-int
-svr_init(dbg_backend *db, void (*cb)(dbg_event *, int))
-{
-	event_callback = cb;
-	svr_env = NULL;
-	svr_last_tid = 0;
-	svr_state = SVR_RUNNING;
-	return db->db_funcs->init(svr_event_callback);
-}
-
-int
-svr_dispatch(dbg_backend *db, char *cmd_str, int len, int data)
-{
-	int			idx;
-	proxy_msg *	msg;
-	svr_cmd		cmd;
-
-	event_data = data;
-
-	if (proxy_deserialize_msg(cmd_str, len, &msg) < 0) {
-		svr_res = DBGRES_ERR;
-		DbgSetError(DBGERR_DEBUGGER, "bad debug message format");
-		return 0;
-	}
-
-	idx = msg->msg_id - DBG_CMD_BASE;
-
-	if (idx >= 0 && idx < sizeof(svr_cmd_tab)/sizeof(svr_cmd)) {
-		svr_last_tid = msg->trans_id;
-		cmd = svr_cmd_tab[idx];
-		if (cmd != NULL) {
-			svr_res = cmd(db, msg->num_args, msg->args);
-		}
-	} else {
-		svr_res = DBGRES_ERR;
-		DbgSetError(DBGERR_DEBUGGER, "Unknown command");
-	}
-
-	free_proxy_msg(msg);
-
-	return 0;
-}
-
-int
-svr_progress(dbg_backend *db)
-{
-	dbg_event *	e;
-
-	if (svr_res != DBGRES_OK) {
-		e = NewDbgEvent(DBGEV_ERROR);
-		e->dbg_event_u.error_event.error_code = DbgGetError();
-		e->dbg_event_u.error_event.error_msg = strdup(DbgGetErrorStr());
-		svr_event_callback(e);
-		FreeDbgEvent(e);
-		svr_res = DBGRES_OK;
-		return 0;
-	}
-
-	db->db_funcs->progress();
-
-	return 0;
-}
-
-int
-svr_suspend(dbg_backend *db, int nargs, char **args)
-{
-	return db->db_funcs->interrupt();
-}
-
-static int
-svr_start_session(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 4) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->start_session(db->db_exe_path, args[1], args[2], args[3], &args[4], svr_env, strtol(args[0], NULL, 10));
-}
-
-static int
-svr_setlinebreakpoint(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 8) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->setlinebreakpoint((int)strtol(args[0], NULL, 10), (int)strtol(args[1], NULL, 10), (int)strtol(args[2], NULL, 10), args[3], (int)strtol(args[4], NULL, 10), args[5], (int)strtol(args[6], NULL, 10), (int)strtol(args[7], NULL, 10));
-}
-
-static int
-svr_setfuncbreakpoint(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 8) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->setfuncbreakpoint((int)strtol(args[0], NULL, 10), (int)strtol(args[1], NULL, 10), (int)strtol(args[2], NULL, 10), args[3], args[4], args[5], (int)strtol(args[6], NULL, 10), (int)strtol(args[7], NULL, 10));
-}
-
-static int
-svr_deletebreakpoint(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->deletebreakpoint((int)strtol(args[0], NULL, 10));
-}
-
-static int
-svr_enablebreakpoint(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->enablebreakpoint((int)strtol(args[0], NULL, 10));
-}
-
-static int
-svr_disablebreakpoint(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->disablebreakpoint((int)strtol(args[0], NULL, 10));
-}
-
-static int
-svr_conditionbreakpoint(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 2) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->conditionbreakpoint((int)strtol(args[0], NULL, 10), args[1]);
-}
-
-static int
-svr_breakpointafter(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 2) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->breakpointafter((int)strtol(args[0], NULL, 10), (int)strtol(args[1], NULL, 10));
-}
-
-static int
-svr_setwatchpoint(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 6) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->setwatchpoint((int)strtol(args[0], NULL, 10), args[1], (int)strtol(args[2], NULL, 10), (int)strtol(args[3], NULL, 10), args[4], (int)strtol(args[5], NULL, 10));
-}
-
-static int
-svr_go(dbg_backend *db, int nargs, char **args)
-{
-	return db->db_funcs->go();
-}
-
-static int
-svr_step(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 2) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->step((int)strtol(args[0], NULL, 10), (int)strtol(args[1], NULL, 10));
-}
-
-static int
-svr_terminate(dbg_backend *db, int nargs, char **args)
-{
-	return db->db_funcs->terminate();
-}
-
-static int
-svr_liststackframes(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 2) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->liststackframes((int)strtol(args[0], NULL, 10), (int)strtol(args[1], NULL, 10));
-}
-
-static int
-svr_setcurrentstackframe(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->setcurrentstackframe((int)strtol(args[0], NULL, 10));
-}
-
-static int
-svr_evaluateexpression(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->evaluateexpression(args[0]);
-}
-
-static int
-svr_gettype(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->gettype(args[0]);
-}
-
-static int
-svr_listlocalvariables(dbg_backend *db, int nargs, char **args)
-{
-	return db->db_funcs->listlocalvariables();
-}
-
-static int
-svr_listarguments(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 2) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->listarguments((int)strtol(args[0], NULL, 10), (int)strtol(args[1], NULL, 10));
-}
-
-static int
-svr_listglobalvariables(dbg_backend *db, int nargs, char **args)
-{
-	return db->db_funcs->listglobalvariables();
-}
-
-static int
-svr_listinfothreads(dbg_backend *db, int nargs, char **args)
-{
-	return db->db_funcs->listinfothreads();
-}
-
-static int
-svr_setthreadselect(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->setthreadselect((int)strtol(args[0], NULL, 10));
-}
-
-static int
-svr_stackinfodepth(dbg_backend *db, int nargs, char **args) {
-	return db->db_funcs->stackinfodepth();
-}
-
-static int
-svr_datareadmemory(dbg_backend *db, int nargs, char **args)  {
-	if (nargs < 7) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->datareadmemory(strtol(args[0], NULL, 10), args[1], args[2], (int)strtol(args[3], NULL, 10), (int)strtol(args[4], NULL, 10), (int)strtol(args[5], NULL, 10), args[6]);
-}
-
-static int
-svr_datawritememory(dbg_backend *db, int nargs, char **args) {
-	if (nargs < 5) {
-	}
-
-	return db->db_funcs->datawritememory(strtol(args[0], NULL, 10), args[1], args[2], (int)strtol(args[3], NULL, 10), args[4]);
-}
-
-static int
-svr_listsignals(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-	}
-
-	return db->db_funcs->listsignals(args[0]);
-}
-static int
-svr_signalinfo(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->signalinfo(args[0]);
-}
-
-static int
-svr_clihandle(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->clihandle(args[0]);
-}
-
-static int
-svr_quit(dbg_backend *db, int nargs, char **args)
-{
-	svr_state = SVR_SHUTDOWN_STARTED;
-	return db->db_funcs->quit();
-}
-
-static int
-svr_dataevaluateexpression(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->dataevaluateexpression(args[0]);
-}
-static int
-svr_getpartialaif(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 4) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->getpartialaif(args[0], args[1], (int)strtol(args[2], NULL, 10), (int)strtol(args[3], NULL, 10));
-}
-
-static int
-svr_variabledelete(dbg_backend *db, int nargs, char **args)
-{
-	if (nargs < 1) {
-		DbgSetError(DBGERR_DEBUGGER, "not enough arguments for debug cmd");
-		return DBGRES_ERR;
-	}
-
-	return db->db_funcs->variabledelete(args[0]);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/server/test_backend.c b/debug/org.eclipse.ptp.debug.sdm/src/server/test_backend.c
deleted file mode 100644
index b169954..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/server/test_backend.c
+++ /dev/null

@@ -1,628 +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
- ******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "dbg.h"
-#include "dbg_event.h"
-#include "backend.h"
-#include "list.h"
-
-static dbg_event *	LastEvent;
-static void			(*EventCallback)(dbg_event *);
-static int			ServerExit;
-static int			Started;
-
-static int	TestInit(void (*)(dbg_event *));
-static int	TestProgress(void);
-static int	TestInterrupt(void);
-static int	TestStartSession(char *, char *, char *, char *, char **, char **, long);
-static int	TestSetLineBreakpoint(int, int, int, char *, int, char*, int, int);
-static int	TestSetFuncBreakpoint(int, int, int, char *, char *, char*, int, int);
-static int	TestDeleteBreakpoint(int);
-static int	TestEnableBreakpoint(int);
-static int	TestDisableBreakpoint(int);
-static int	TestConditionBreakpoint(int, char *expr);
-static int	TestBreakpointAfter(int, int icount);
-static int	TestWatchpoint(int, char *, int, int, char *, int);
-static int	TestGo(void);
-static int	TestStep(int, int);
-static int	TestTerminate(void);
-static int	TestListStackframes(int, int);
-static int	TestSetCurrentStackframe(int);
-static int	TestEvaluateExpression(char *);
-static int	TestGetNativeType(char *);
-static int	TestGetLocalVariables(void);
-static int	TestListArguments(int, int);
-static int	TestGetInfoThread(void);
-static int	TestSetThreadSelect(int);
-static int	TestStackInfoDepth(void);
-static int	TestDataReadMemory(long, char*, char*, int, int, int, char*);
-static int	TestDataWriteMemory(long, char*, char*, int, char*);
-static int	TestGetGlobalVariables(void);
-static int	TestListSignals(char*);
-static int	TestSignalInfo(char*);
-static int	TestHandle(char*);
-static int	TestQuit(void);
-static int	TestDataEvaluateExpression(char*);
-static int	TestGetPartialAIF(char *, char *, int, int);
-static int	TestVarDelete(char*);
-
-static int	SetAndCheckBreak(int, int, int, char *, char *, int, int);
-
-dbg_backend_funcs	TestBackend =
-{
-	TestInit,
-	TestProgress,
-	TestInterrupt,
-	TestStartSession,
-	TestSetLineBreakpoint,
-	TestSetFuncBreakpoint,
-	TestDeleteBreakpoint,
-	TestEnableBreakpoint,
-	TestDisableBreakpoint,
-	TestConditionBreakpoint,
-	TestBreakpointAfter,
-	TestWatchpoint,
-	TestGo,
-	TestStep,
-	TestTerminate,
-	TestListStackframes,
-	TestSetCurrentStackframe,
-	TestEvaluateExpression,
-	TestGetNativeType,
-	TestGetLocalVariables,
-	TestListArguments,
-	TestGetGlobalVariables,
-	TestGetInfoThread,
-	TestSetThreadSelect,
-	TestStackInfoDepth,
-	TestDataReadMemory,
-	TestDataWriteMemory,
-	TestListSignals,
-	TestSignalInfo,
-	TestHandle,
-	TestDataEvaluateExpression,
-	TestGetPartialAIF,
-	TestVarDelete,
-	TestQuit
-};
-
-static void
-SaveEvent(dbg_event *e)
-{
-	if (LastEvent != NULL)
-		FreeDbgEvent(LastEvent);
-		
-	LastEvent = e;
-}
-
-/*
- * Initialize Test
- */
-static int
-TestInit(void (*event_callback)(dbg_event *))
-{
-	EventCallback = event_callback;
-	LastEvent = NULL;
-	ServerExit = 0;
-		
-	signal(SIGTERM, SIG_IGN);
-	signal(SIGHUP, SIG_IGN);
-	signal(SIGINT, SIG_IGN);
-
-	return DBGRES_OK;
-}
-
-/*
- * Start Test session
- */	
-static int
-TestStartSession(char *test_path, char *prog, char *path, char *work_dir, char **args, char **env, long timeout)
-{
-	Started = 0;
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
- * Progress test commands.
- * 
- * TODO: Deal with errors
- * 
- * @return	-1	server shutdown
- * 			1	event callback
- * 			0	completed operation
- */
-static int	
-TestProgress(void)
-{
-	int				res = 0;
-	
-	/*
-	 * Check for existing events
-	 */
-	if (LastEvent != NULL) {
-		if (EventCallback != NULL) {
-			EventCallback(LastEvent);
-			res = 1;
-		}
-			
-		if (ServerExit && LastEvent->event_id == DBGEV_OK) {
-			res = -1;
-		}
-			
-		FreeDbgEvent(LastEvent);
-		LastEvent = NULL;
-		return res;
-	}
-	
-	return 0;
-}
-
-/*
-** Set breakpoint at specified line.
-*/
-static int
-TestSetLineBreakpoint(int bpid, int isTemp, int isHard, char *file, int line, char *condition, int ignoreCount, int tid)
-{
-	int		res;
-	char*	where;
-	res = SetAndCheckBreak(bpid, isTemp, isHard, where, condition, ignoreCount, tid);
-	return res;
-}
-
-/*
-** Set breakpoint at start of specified function.
-*/
-static int
-TestSetFuncBreakpoint(int bpid, int isTemp, int isHard, char *file, char *func, char *condition, int ignoreCount, int tid)
-{
-	int		res;
-	char*	where;
-	res = SetAndCheckBreak(bpid, isTemp, isHard, where, condition, ignoreCount, tid);
-	return res;
-}
-
-/*
-** Check that breakpoint command has succeded and
-** extract appropriate information. Returns breakpoint
-** id in bid. Adds to breakpoint list if necessary.
-*/
-static int
-SetAndCheckBreak(int bpid, int isTemp, int isHard, char *where, char *condition, int ignoreCount, int tid)
-{
-	/*
-	dbg_event *		e;
-	e = NewDbgEvent(DBGEV_BPSET);
-	e->dbg_event_u.bpset_event.bpid = bpid;
-	e->dbg_event_u.bpset_event.bp = MIBreakpointNew();
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Delete a breakpoint.
-*/
-static int
-TestDeleteBreakpoint(int bpid)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Enable a breakpoint.
-*/
-static int
-TestEnableBreakpoint(int bpid)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Disable a breakpoint.
-*/
-static int
-TestDisableBreakpoint(int bpid)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Condition a breakpoint.
-*/
-static int
-TestConditionBreakpoint(int bpid, char *expr)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** breakpoint after.
-*/
-static int
-TestBreakpointAfter(int bpid, int icount)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
- * Set watch point
- */
-static int 
-TestWatchpoint(int bpid, char *expr, int isAccess, int isRead, char *condition, int ignoreCount) 
-{
-	/*
-	dbg_event *		e;
-	e = NewDbgEvent(DBGEV_BPSET);
-	e->dbg_event_u.bpset_event.bpid = bpid;
-	e->dbg_event_u.bpset_event.bp = MIBreakpointNew();
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Start/continue executing program. 
-*/
-static int
-TestGo(void)
-{
-	//SendCommandWait(DebugSession, cmd);
-	return DBGRES_OK;
-}
-
-/*
- * Execute count statements. 
- * 
- * type	step kind
- * 0		enter function calls
- * 1		do not enter function calls
- * 2		step out of function (count ignored)
- */
-static int
-TestStep(int count, int type)
-{
-	//SendCommandWait(DebugSession, cmd);
-	return DBGRES_OK;
-}
-
-/*
-** Terminate program execution.
-*/
-static int
-TestTerminate(void)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Interrupt an executing program.
-*/
-static int
-TestInterrupt(void)
-{
-	//SendCommandWait(DebugSession, cmd);
-	return DBGRES_OK;
-}
-
-/*
-** Move up or down count stack frames.
-*/
-static int
-TestSetCurrentStackframe(int level)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int
-GetStackframes(int current, int low, int high, List **flist)
-{
-	//pass flist pointer
-	//SendCommandWait(DebugSession, cmd);
-	return DBGRES_OK;
-}
-
-/*
-** List current or all stack frames.
-*/
-static int
-TestListStackframes(int low, int high)
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_FRAMES);
-	e->dbg_event_u.list = frames;	
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** List local variables.
-*/
-static int
-TestGetLocalVariables(void)
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_VARS);
-	e->dbg_event_u.list = NewList();
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** List arguments.
-*/
-static int
-TestListArguments(int low, int high)
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_ARGS);
-	e->dbg_event_u.list = NewList();
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** List global variables.
-*/
-static int
-TestGetGlobalVariables(void)
-{
-	DbgSetError(DBGERR_NOTIMP, NULL);
-	return DBGRES_ERR;
-}
-
-/*
-** Quit debugger.
-*/
-static int
-TestQuit(void)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	ServerExit++;
-	return DBGRES_OK;
-}
-
-static int
-TestGetInfoThread(void) 
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_THREADS);
-	e->dbg_event_u.threads_event.thread_id = info->current_thread_id;
-	e->dbg_event_u.threads_event.list = NewList();
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int 
-TestSetThreadSelect(int threadNum) 
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_THREAD_SELECT);
-	e->dbg_event_u.thread_select_event.thread_id = info->current_thread_id;
-	e->dbg_event_u.thread_select_event.frame = s;
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int 
-TestStackInfoDepth() 
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_STACK_DEPTH);
-	e->dbg_event_u.stack_depth = depth;
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int 
-TestDataReadMemory(long offset, char* address, char* format, int wordSize, int rows, int cols, char* asChar) 
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_DATAR_MEM);
-	e->dbg_event_u.meminfo = meminfo;
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));	
-	return DBGRES_OK;
-}
-
-static int 
-TestDataWriteMemory(long offset, char* address, char* format, int wordSize, char* value) 
-{
-//TODO
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int 
-TestListSignals(char* name) 
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_SIGNALS);
-	e->dbg_event_u.list = signals;
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int 
-TestSignalInfo(char* arg) 
-{
-	//SendCommandWait(DebugSession, cmd);
-	return DBGRES_OK;
-}
-
-static int
-TestHandle(char *arg)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-} 
-
-static int
-TestDataEvaluateExpression(char *arg)
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_DATA_EVA_EX);
-	e->dbg_event_u.data_expression = res;
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*
-** Evaluate the expression exp.
-*/
-static int
-TestEvaluateExpression(char *exp)
-{
-	AIF *a;
-	if (strcmp(exp, "long_string") == 0) {
-		a = StringToAIF("testing start from 01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 end 200");
-		dbg_event *	e;
-		e = NewDbgEvent(DBGEV_DATA);
-		e->dbg_event_u.data_event.data = a;
-		e->dbg_event_u.data_event.type_desc = "string";
-		SaveEvent(e);
-	}
-	else if (strcmp(exp, "long_long_string") == 0) {
-		a = StringToAIF("testing start from \
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789\
-		end 5000");
-		dbg_event *	e;
-		e = NewDbgEvent(DBGEV_DATA);
-		e->dbg_event_u.data_event.data = a;
-		e->dbg_event_u.data_event.type_desc = "string";
-		SaveEvent(e);
-	}
-	else { 
-		SaveEvent(NewDbgEvent(DBGEV_OK));
-	}
-	return DBGRES_OK;
-}
-/*
-** Find native type of variable.
-*/
-static int
-TestGetNativeType(char *var)
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_TYPE);
-	e->dbg_event_u.type_desc = type;
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-/*************************** PARTIAL AIF ***************************/
-static int
-TestGetPartialAIF(char* name, char* key, int listChildren, int express)
-{
-	/*
-	dbg_event *	e;
-	e = NewDbgEvent(DBGEV_PARTIAL_AIF);
-	e->dbg_event_u.partial_aif_event.data = a;
-	e->dbg_event_u.partial_aif_event.type_desc = strdup(mivar->type);
-	e->dbg_event_u.partial_aif_event.name = strdup(mivar->name);
-	SaveEvent(e);
-	*/
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-}
-
-static int
-TestVarDelete(char *name)
-{
-	SaveEvent(NewDbgEvent(DBGEV_OK));
-	return DBGRES_OK;
-} 

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/test/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/src/test/.cvsignore
deleted file mode 100644
index 1a3d1a5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/test/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-.dirstamp
-.deps

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy.c b/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy.c
deleted file mode 100644
index 353d77b..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy.c
+++ /dev/null

@@ -1,68 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "dbg.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "bitset.h"
-
-extern int do_test(session *, char *, char *);
-extern void	event_callback(dbg_event *, void *);
-extern int	wait_for_event(session *, bitset *);
-
-int
-main(int argc, char *argv[])
-{
-	session *	s;
-	char *		dir;
-	char *		exe;
-	char *		host = "localhost";
-	
-	if (argc < 2) {
-		fprintf(stderr, "usage: test_proxy_clnt exe [host]\n");
-		return 1;
-	}
-	
-	dir = getcwd(NULL, 0);
-	exe = argv[1];
-	
-	if (argc > 2)
-		host = argv[2];
-		
-	if (DbgInit(&s, "tcp", "host", host, "port", PROXY_TCP_PORT, NULL) < 0) {
-		fprintf(stderr, "DbgInit failed\n");
-		exit(1);
-	}
-	
-	DbgRegisterEventHandler(s, event_callback, NULL);
-
-	if (DbgConnect(s) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-
-	wait_for_event(s, NULL);
-
-	return do_test(s, dir, exe);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_clnt.c b/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_clnt.c
deleted file mode 100644
index a2a9fcc..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_clnt.c
+++ /dev/null

@@ -1,256 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "dbg.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "bitset.h"
-#include "itimer.h"
-
-int 			completed;
-int			fatal;
-bitset *		procs_outstanding = NULL;
-bitset *		sess_procs = NULL;
-
-void
-event_callback(dbg_event *e, void *data)
-{
-	stackframe *	f;
-	char *		s;
-	
-	printf("in event callback\n");
-	
-	if (e == NULL) {
-		printf("got null event!\n");
-		return;
-	}
-	
-	if (e->procs != NULL) {
-		if (sess_procs == NULL)
-			sess_procs = bitset_dup(e->procs);
-		s = bitset_to_set(e->procs);
-		printf("%s ", s);
-		free(s);
-	}
-		
-	printf("-> ");
-	
-	switch (e->event_id) {
-	case DBGEV_ERROR:
-		printf("error: %s\n", e->dbg_event_u.error_event.error_msg);
-		switch (e->dbg_event_u.error_event.error_code) {
-		case DBGERR_NOBACKEND:
-			fatal++;
-			break;
-		default:
-			break;
-		}
-		break;
-	case DBGEV_OK:
-		printf("command ok\n");
-		break;
-	case DBGEV_INIT:
-		printf("debugger initilized\n");
-		break;
-	case DBGEV_SUSPEND:
-		switch (e->dbg_event_u.suspend_event.reason) {
-		case DBGEV_SUSPEND_BPHIT:
-			printf("hit breakpoint %d\n", e->dbg_event_u.suspend_event.ev_u.bpid);
-			break;
-		case DBGEV_SUSPEND_INT:
-			printf("suspend completed\n");
-			break;
-		case DBGEV_SUSPEND_STEP:
-			printf("step completed\n");
-			break;
-		case DBGEV_SUSPEND_SIGNAL:
-			printf("received signal %s\n", e->dbg_event_u.suspend_event.ev_u.sig->name);
-			break;
-		}
-		break;
-	case DBGEV_BPSET:
-		printf("breakpoint set\n");
-		break;
-	case DBGEV_EXIT:
-		switch (e->dbg_event_u.suspend_event.reason) {
-		case DBGEV_EXIT_NORMAL:
-			printf("exited with status %d\n", e->dbg_event_u.exit_event.ev_u.exit_status);
-			break;
-		case DBGEV_EXIT_SIGNAL:
-			printf("exited with signal %s\n", e->dbg_event_u.exit_event.ev_u.sig->name);
-			break;
-		}
-	case DBGEV_DATA:
-		printf("data is "); AIFPrint(stdout, 0, e->dbg_event_u.data_event.data); printf("\n");
-		break;
-	case DBGEV_FRAMES:
-		printf("got frames:\n");
-		for (SetList(e->dbg_event_u.list); (f = (stackframe *)GetListElement(e->dbg_event_u.list)) != NULL; ) {
-			printf(" #%d %s() at %s:%d\n", f->level, f->loc.func, f->loc.file, f->loc.line);
-		}
-		break;
-	default:
-		printf("got event %d\n", e->event_id);
-		break;
-	}
-
-	if (e->procs != NULL && procs_outstanding != NULL) {
-		bitset_invert(e->procs);
-		bitset_andeq(procs_outstanding, e->procs);
-		if (!bitset_isempty(procs_outstanding))
-			return;
-	}
-	
-	completed++;
-}
-
-int
-wait_for_event(session *s, bitset *p)
-{
-	completed = 0;
-	fatal = 0;
-
-	printf("entering wait_for_event...\n");
-	
-	if (p != NULL)
-		procs_outstanding = bitset_dup(p);
-		
-	while (!completed) {
-		if (DbgProgress(s) < 0) {
-			fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-			exit(1);
-		}
-	}
-	
-	if (p != NULL) {
-		bitset_free(procs_outstanding);
-		procs_outstanding = NULL;
-	}
-		
-	/*
-	 * Check a fatal error hasn't ocurred
-	 */
-	return fatal ? -1 : 0;
-}
-
-/*
- * Tell server to quit
- */
-void
-cleanup_and_exit(session *s, bitset *p)
-{
-	DbgQuit(s);
-	wait_for_event(s, p);
-	exit(0);
-}
-
-int
-do_test(session *s, char *dir, char *exe)
-{
-	bitset *		p1;
-	int			bpid = 54;
-	itimer *		t;
-	
-	t = itimer_new("debug");
-	itimer_start(t);
-	
-	if (DbgStartSession(s, dir, exe, NULL) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	if (wait_for_event(s, NULL) < 0) {
-		cleanup_and_exit(s, NULL);
-	}
-	
-	itimer_mark(t, "launch");
-	
-	p1 = sess_procs;
-		
-	if (DbgSetLineBreakpoint(s, p1, bpid++, "xxx.c", 17) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-	
-	itimer_mark(t, "breakpoint");
-	
-	if (DbgGo(s, p1) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-	
-	itimer_mark(t, "suspend");
-		
-	if (DbgListStackframes(s, p1, 0, 1) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-
-	itimer_mark(t, "where");
-	
-	if (DbgStep(s, p1, 1, 0) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-	
-	itimer_mark(t, "step");
-
-	if (DbgStep(s, p1, 1, 0) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-	
-	itimer_mark(t, "step");
-
-	if (DbgEvaluateExpression(s, p1, "a") < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-	
-	itimer_mark(t, "evaluate");
-
-	if (DbgListStackframes(s, p1, 1, 1) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-	
-	itimer_mark(t, "where");
-
-	if (DbgQuit(s) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-	wait_for_event(s, p1);
-
-	itimer_stop(t);
-	itimer_print(t);
-	itimer_free(t);
-	
-	exit(0);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_rev.c b/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_rev.c
deleted file mode 100644
index 75c13de..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_rev.c
+++ /dev/null

@@ -1,69 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "dbg.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "bitset.h"
-
-extern int	do_test(session *, char *, char *);
-extern void	event_callback(dbg_event *, void *);
-extern int	wait_for_event(session *, bitset *);
-
-int
-main(int argc, char *argv[])
-{
-	session *	s;
-	char *		dir;
-	char *		exe;
-	
-	if (argc < 2) {
-		fprintf(stderr, "usage: test_proxy_clnt [dir] exe\n");
-		return 1;
-	}
-	
-	if (argc > 2) {
-		dir = argv[1];
-		exe = argv[2];
-	} else {
-		dir = getcwd(NULL, 0);
-		exe = argv[1];
-	}
-	
-	if (DbgInit(&s, "tcp", "port", PROXY_TCP_PORT, NULL) < 0) {
-		fprintf(stderr, "DbgInit failed\n");
-		exit(1);
-	}
-	
-	DbgRegisterEventHandler(s, event_callback, NULL);
-
-	if (DbgCreate(s) < 0) {
-		fprintf(stderr, "error: %s\n", DbgGetErrorStr());
-		return 1;
-	}
-
-	wait_for_event(s, NULL);
-
-	return do_test(s, dir, exe);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_svr.c b/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_svr.c
deleted file mode 100644
index 939ac0a..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/test/test_proxy_svr.c
+++ /dev/null

@@ -1,59 +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
- ******************************************************************************/
-
-#include <stdio.h>
-
-#include "session.h"
-#include "proxy.h"
-#include "proxy_tcp.h"
-
-int shutdown;
-
-void
-shutdown_server(void)
-{
-	shutdown++;
-}
-
-int
-main(int argc, char *argv[])
-{
-	int stat;
-	void *conn;
-	
-	shutdown = 0;
-	
-	if (proxy_tcp_svr_funcs.create(&conn, shutdown_server) < 0) {
-		fprintf(stderr, "proxy_tcp_svr_create failed\n");
-		exit(1);
-	}
-	
-	while (!shutdown) {
-		if ((stat = proxy_tcp_svr_funcs.progress(conn)) < 0)
-			break;
-	}
-		
-	if (!shutdown && stat < 0)
-		fprintf(stderr, "progress failed\n");
-	
-	proxy_tcp_svr_funcs.finish(conn);
-	
-	printf("proxy server shutting down\n");
-	exit(0);
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/.cvsignore b/debug/org.eclipse.ptp.debug.sdm/src/utils/.cvsignore
deleted file mode 100644
index 1a3d1a5..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-.dirstamp
-.deps

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/breakpoint.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/breakpoint.c
deleted file mode 100644
index d9a3ced..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/breakpoint.c
+++ /dev/null

@@ -1,102 +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
- ******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "breakpoint.h"
-#include "list.h"
-
-breakpoint *	
-NewBreakpoint(int bpid) {
-	breakpoint *	bp = (breakpoint *)malloc(sizeof(breakpoint));
-	
-	bp->id = bpid;
-	bp->ignore = 0;
-	bp->special = 0;
-	bp->deleted = 0;
-	bp->type = NULL;
-	bp->loc.file = NULL;
-	bp->loc.func = NULL;
-	bp->loc.addr = NULL;
-	bp->loc.line = 0;
-	bp->hits = 0;
-	
-	return bp;
-}
-
-void	
-FreeBreakpoint(breakpoint *bp) {
-	if (bp->type != NULL)
-		free(bp->type);
-	if (bp->loc.file != NULL)
-		free(bp->loc.file);
-	if (bp->loc.func != NULL)
-		free(bp->loc.func);
-	if (bp->loc.addr != NULL)
-		free(bp->loc.addr);
-		
-	free(bp);
-}
-
-breakpoint *	
-CopyBreakpoint(breakpoint *bp) {
-	breakpoint *	nb = NewBreakpoint(bp->id);
-
-	nb->ignore = bp->ignore;
-	nb->special = bp->special;
-	nb->deleted = bp->deleted;
-	nb->type = strdup(bp->type);
-	nb->loc.file = strdup(bp->loc.file);
-	nb->loc.func = strdup(bp->loc.func);
-	nb->loc.addr = strdup(bp->loc.addr);
-	nb->loc.line = bp->loc.line;
-	nb->hits = bp->hits;
-
-	return nb;
-}
-
-void	
-AddBreakpoint(List *l, breakpoint *bp) {
-	AddToList(l, (void *)bp);
-}
-
-void	
-RemoveBreakpoint(List *l, int bpid) {
-	breakpoint *	bp = FindBreakpoint(l, bpid);
-	
-	if (bp != NULL)
-		RemoveFromList(l, (void *)bp);
-}
-
-breakpoint *
-FindBreakpoint(List *l, int bpid) {
-	breakpoint *	bp;
-	
-	SetList(l);
-	
-	while ((bp = (breakpoint *)GetListElement(l)) != NULL) {
-		if (bp->id == bpid)
-			return bp;
-	}
-		
-	return NULL;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/debug.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/debug.c
deleted file mode 100644
index db2577e..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/debug.c
+++ /dev/null

@@ -1,49 +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
- ******************************************************************************/
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-
-#ifdef DEBUG
-#include <stdio.h>
-#include <stdarg.h>
-
-int		debug_level = DEBUG_LEVEL_NONE;
-
-#define debug_out	stdout
-
-void
-debug_printf(int level, char *fmt, ...)
-{
-	va_list	ap;
-
-	va_start(ap, fmt);
-
-	if ((level & debug_level) == level) {
-		fprintf(debug_out, "SDM[%d]: ", level);
-		vfprintf(debug_out, fmt, ap);
-		fflush(debug_out);
-	}
-
-	va_end(ap);
-}
-#endif /* DEBUG */

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/error.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/error.c
deleted file mode 100644
index ad418cc..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/error.c
+++ /dev/null

@@ -1,116 +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
- ******************************************************************************/
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "dbg.h"
-
-static int 			dbg_errno = DBGRES_OK;
-static char *		dbg_errstr = NULL;
-
-static char * dbg_error_tab[] =
-{
-	/* 0 */						"NO_ERROR",
-	/* DBGERR_NOTIMP */			"Protocol not implemented",
-	/* DBGERR_PROXY_TERM */		"Proxy connection unexpectedly terminated",
-	/* DBGERR_PROXY_PROTO */	"Bad message received by proxy",
-	/* DBGERR_DEBUGGER */ 		"Debugger error: %s",
-	/* DBGERR_NOBACKEND */ 		"Backend debugger executable \"%s\" not found",
-	/* DBGERR_INPROGRESS */		"Callback in progress",
-	/* DBGERR_CBCREATE */		"No server to register callback",
-	/* DBGERR_NOSESSION */		"Must start session first",
-	/* DBGERR_SESSION */		"Session already established",
-	/* DBGERR_NOLINE */			"No line %s in file ",
-	/* DBGERR_NOFUNC */			"Function \"%s\" not defined",
-	/* DBGERR_NOFILE */			"No source file named \"%s\"",
-	/* DBGERR_NOBP */			"No breakpoint number %s",
-	/* DBGERR_NOSYM */			"No symbol \"%s\" in current context",
-	/* DBGERR_NOMEM */			"Can't access memory",
-	/* DBGERR_CANTRUN */		"Can't run the program",
-	/* DBGERR_INVOKE */			"Could not invoke the program",
-	/* DBGERR_ISRUNNING */		"Program is running",
-	/* DBGERR_NOTRUN */			"The program is not being run",
-	/* DBGERR_FIRSTFRAME */		"Initial frame selected; you cannot go up",
-	/* DBGERR_LASTFRAME */		"Bottom (i.e., innermost) frame selected; you cannot go down",
-	/* DBGERR_BADBPARG */		"Argument required (breakpoint number)",
-	/* DBGERR_REGEX */			"Error in regular expression",
-	/* DBGERR_NOSTACK */		"No stack.",
-	/* DBGERR_OUTOFRANGE */		"Line number %s is out of range for ",
-	/* DBGERR_NOFILEDIR */		"%s: No such file or directory",
-	/* DBGERR_NOSYMS */			"No debugging symbols",
-	/* DBGERR_TEMP */			"Could not create temporary file",
-	/* DBGERR_PIPE */			"pipe: %s",
-	/* DBGERR_FORK */			"fork: %s",
-	/* DBGERR_SYSTEM */			"system error: %s",
-	/* DBGERR_NOTEXEC */		"%s: not in executable format",
-	/* DBGERR_CHDIR */			"%s",
-	/* DBGERR_SOURCE */			"Source file is more recent than executable",
-	/* DBGERR_SETVAR */			"Can't set variable.",
-	/* DBGERR_PROCSET */		"Invalid process set",
-	/* DBGERR_UNKNOWN */		"Unknown error: \"%s\"",
-	/* DBGERR_UNKNOWN_TYPE */	"Unknown type: \"%s\"",
-	/* DBGERR_UNKNOWN_VARIABLE */"Unknown variable: \"%s\""
-};
-
-/*
- * Error handling
- */
-void
-DbgSetError(int errnum, char *msg)
-{
-	dbg_errno = errnum;
-	
-	if (dbg_errstr != NULL) {
-		free(dbg_errstr);
-		dbg_errstr = NULL;
-	}
-	
-	if (dbg_errno >= sizeof(dbg_error_tab)/sizeof(char *)) {
-		if (msg != NULL) {
-			dbg_errstr = strdup(msg);
-		} else {
-			asprintf(&dbg_errstr, "Error %d occurred.", dbg_errno);
-		}
-	} else {
-		if (msg == NULL)
-			msg = "<null>";
-			
-		asprintf(&dbg_errstr, dbg_error_tab[dbg_errno], msg);
-	}
-}
-
-int
-DbgGetError(void)
-{
-	return dbg_errno;
-}
-
-char *
-DbgGetErrorStr(void)
-{
-	if (dbg_errstr == NULL)
-		return "";
-		
-	return dbg_errstr;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/event.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/event.c
deleted file mode 100644
index bd2204c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/event.c
+++ /dev/null

@@ -1,907 +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
- ******************************************************************************/
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "dbg_event.h"
-#include "args.h"
-#include "proxy_msg.h"
-
-#define EMPTY	"*"
-
-static void
-dbg_add_location(proxy_msg *m, location *loc)
-{
-	proxy_msg_add_string(m, loc->file);
-	proxy_msg_add_string(m, loc->func);
-	proxy_msg_add_string(m, loc->addr);
-	proxy_msg_add_int(m, loc->line);
-}
-
-static void
-dbg_add_breakpoint(proxy_msg *m, breakpoint *bp)
-{
-	proxy_msg_add_int(m, bp->id);
-	proxy_msg_add_int(m, bp->ignore);
-	proxy_msg_add_int(m, bp->special);
-	proxy_msg_add_int(m, bp->deleted);
-	proxy_msg_add_string(m, bp->type);
-	dbg_add_location(m, &bp->loc);
-	proxy_msg_add_int(m, bp->hits);
-}
-
-static void
-dbg_add_signalinfo(proxy_msg *m, signalinfo *sig)
-{
-	if (sig == NULL) {
-		proxy_msg_add_string(m, EMPTY);
-		return;
-	}
-
-	proxy_msg_add_string(m, sig->name);
-	proxy_msg_add_int(m, sig->stop);
-	proxy_msg_add_int(m, sig->print);
-	proxy_msg_add_int(m, sig->pass);
-	proxy_msg_add_string(m, sig->desc);
-}
-
-static void
-dbg_add_stackframe(proxy_msg *m, stackframe *sf)
-{
-	if (sf == NULL) {
-		proxy_msg_add_string(m, EMPTY);
-		return;
-	}
-
-	proxy_msg_add_int(m, sf->level);
-	dbg_add_location(m, &sf->loc);
-}
-
-static void
-dbg_add_strings(proxy_msg *m, List *lst)
-{
-	char *	s;
-
-	proxy_msg_add_int(m, SizeOfList(lst));
-
-	for (SetList(lst); (s = (char *)GetListElement(lst)) != NULL; ) {
-		proxy_msg_add_string(m, s);
-	}
-}
-
-static void
-dbg_add_stackframes(proxy_msg *m, List *lst)
-{
-	stackframe *	s;
-
-	proxy_msg_add_int(m, SizeOfList(lst));
-
-	for (SetList(lst); (s = (stackframe *)GetListElement(lst)) != NULL; ) {
-		dbg_add_stackframe(m, s);
-	}
-}
-
-static void
-dbg_add_signals(proxy_msg *m, List *lst)
-{
-	signalinfo *	s;
-
-	proxy_msg_add_int(m, SizeOfList(lst));
-
-	for (SetList(lst); (s = (signalinfo *)GetListElement(lst)) != NULL; ) {
-		dbg_add_signalinfo(m, s);
-	}
-}
-
-static void
-dbg_add_memory(proxy_msg *m, memory *mem)
-{
-	if (mem == NULL) {
-		proxy_msg_add_string(m, EMPTY);
-		return;
-	}
-
-	proxy_msg_add_string(m, mem->addr);
-	proxy_msg_add_string(m, mem->ascii);
-	dbg_add_strings(m, mem->data);
-}
-
-static void
-dbg_add_memories(proxy_msg *m, List *lst)
-{
-	memory *	mem;
-
-	proxy_msg_add_int(m, SizeOfList(lst));
-
-	for (SetList(lst); (mem = (memory *)GetListElement(lst)) != NULL; ) {
-		dbg_add_memory(m, mem);
-	}
-}
-
-static void
-dbg_add_memoryinfo(proxy_msg *m, memoryinfo *meninfo)
-{
-	if (meninfo == NULL) {
-		proxy_msg_add_string(m, EMPTY);
-		return;
-	}
-
-	proxy_msg_add_string(m, meninfo->addr);
-	proxy_msg_add_int(m, meninfo->nextRow);
-	proxy_msg_add_int(m, meninfo->prevRow);
-	proxy_msg_add_int(m, meninfo->nextPage);
-	proxy_msg_add_int(m, meninfo->prevPage);
-	proxy_msg_add_int(m, meninfo->numBytes);
-	proxy_msg_add_int(m, meninfo->totalBytes);
-	dbg_add_memories(m, meninfo->memories);
-}
-
-static void
-dbg_add_aif(proxy_msg *m, AIF *a)
-{
-	proxy_msg_add_string(m, AIF_FORMAT(a));
-	proxy_msg_add_data(m, AIF_DATA(a), AIF_LEN(a));
-}
-
-/*
- * Serialize a debug event for sending between debug servers.
- *
- * Note that the serialized event does not include the bitset, since it is
- * only relevant to communication with the client. The bitset is
- * added just prior to sending back to the client.
- */
-int
-DbgSerializeEvent(dbg_event *e, char **result, int *len)
-{
-	int			res = 0;
-	proxy_msg *	p = NULL;
-
-	if (e == NULL)
-		return -1;
-
-	p = new_proxy_msg(e->event_id, e->trans_id);
-
-	switch (e->event_id)
-	{
-	case DBGEV_OK:
-		break;
-
-	case DBGEV_ERROR:
-		proxy_msg_add_int(p, e->dbg_event_u.error_event.error_code);
-		proxy_msg_add_string(p, e->dbg_event_u.error_event.error_msg);
-		break;
-
-	case DBGEV_INIT:
-		proxy_msg_add_int(p, e->dbg_event_u.num_servers);
-		break;
-
-	case DBGEV_SUSPEND:
-		proxy_msg_add_int(p, e->dbg_event_u.suspend_event.reason);
-
-		switch (e->dbg_event_u.suspend_event.reason) {
-		case DBGEV_SUSPEND_BPHIT:
-			proxy_msg_add_int(p, e->dbg_event_u.suspend_event.ev_u.bpid);
-			proxy_msg_add_int(p, e->dbg_event_u.suspend_event.thread_id);
-			proxy_msg_add_int(p, e->dbg_event_u.suspend_event.depth);
-			dbg_add_strings(p, e->dbg_event_u.suspend_event.changed_vars);
-			break;
-
-		case DBGEV_SUSPEND_SIGNAL:
-			dbg_add_signalinfo(p, e->dbg_event_u.suspend_event.ev_u.sig);
-			dbg_add_stackframe(p, e->dbg_event_u.suspend_event.frame);
-			proxy_msg_add_int(p, e->dbg_event_u.suspend_event.thread_id);
-			proxy_msg_add_int(p, e->dbg_event_u.suspend_event.depth);
-			dbg_add_strings(p, e->dbg_event_u.suspend_event.changed_vars);
-			break;
-
-		case DBGEV_SUSPEND_STEP:
-		case DBGEV_SUSPEND_INT:
-			dbg_add_stackframe(p, e->dbg_event_u.suspend_event.frame);
-			proxy_msg_add_int(p, e->dbg_event_u.suspend_event.thread_id);
-			proxy_msg_add_int(p, e->dbg_event_u.suspend_event.depth);
-			dbg_add_strings(p, e->dbg_event_u.suspend_event.changed_vars);
-			break;
-		}
-		break;
-
-	case DBGEV_BPSET:
- 		proxy_msg_add_int(p, e->dbg_event_u.bpset_event.bpid);
-		dbg_add_breakpoint(p, e->dbg_event_u.bpset_event.bp);
-		break;
-
-	case DBGEV_SIGNALS:
- 		dbg_add_signals(p, e->dbg_event_u.list);
-		break;
-
-	case DBGEV_EXIT:
-		proxy_msg_add_int(p, e->dbg_event_u.exit_event.reason);
-
-		switch (e->dbg_event_u.exit_event.reason) {
-		case DBGEV_EXIT_NORMAL:
-			proxy_msg_add_int(p, e->dbg_event_u.exit_event.ev_u.exit_status);
-			break;
-
-		case DBGEV_EXIT_SIGNAL:
-			dbg_add_signalinfo(p, e->dbg_event_u.exit_event.ev_u.sig);
-			break;
-		}
-		break;
-
-	case DBGEV_FRAMES:
- 		dbg_add_stackframes(p, e->dbg_event_u.list);
-		break;
-
-	case DBGEV_THREAD_SELECT:
- 		proxy_msg_add_int(p, e->dbg_event_u.thread_select_event.thread_id);
-		dbg_add_stackframe(p, e->dbg_event_u.thread_select_event.frame);
-		break;
-
-	case DBGEV_THREADS:
- 		proxy_msg_add_int(p, e->dbg_event_u.threads_event.thread_id);
-		dbg_add_strings(p, e->dbg_event_u.threads_event.list);
-		break;
-
-	case DBGEV_STACK_DEPTH:
- 		proxy_msg_add_int(p, e->dbg_event_u.stack_depth);
-		break;
-
-	case DBGEV_DATAR_MEM:
- 		dbg_add_memoryinfo(p, e->dbg_event_u.meminfo);
-		break;
-
-	case DBGEV_VARS:
- 		dbg_add_strings(p, e->dbg_event_u.list);
-		break;
-
-	case DBGEV_ARGS:
-		dbg_add_strings(p, e->dbg_event_u.list);
-		break;
-
-	case DBGEV_TYPE:
-		proxy_msg_add_string(p, e->dbg_event_u.type_desc);
-		break;
-
-	case DBGEV_DATA:
- 		dbg_add_aif(p, e->dbg_event_u.data_event.data);
-		proxy_msg_add_string(p, e->dbg_event_u.data_event.type_desc);
-		break;
-
-	case DBGEV_DATA_EVA_EX:
- 		proxy_msg_add_string(p, e->dbg_event_u.data_expression);
-		break;
-
-	case DBGEV_PARTIAL_AIF:
- 		dbg_add_aif(p, e->dbg_event_u.partial_aif_event.data);
-		proxy_msg_add_string(p, e->dbg_event_u.partial_aif_event.type_desc);
-		proxy_msg_add_string(p, e->dbg_event_u.partial_aif_event.name);
-		break;
-
-	default:
-		res = -1;
-		break;
-	}
-
-	return proxy_serialize_msg(p, result, len);
-}
-
-static int
-dbg_str_to_int(char ***args, int *nargs, int *val)
-{
-	if (*nargs < 1)
-		return -1;
-
-	proxy_get_int(*(*args)++, val);
-	*nargs--;
-
-	return 0;
-}
-
-static int
-dbg_copy_str(char ***args, int *nargs, char **str)
-{
-	if (*nargs < 1)
-		return -1;
-
-	*str = strdup(*(*args)++);
-	*nargs--;
-
-	return 0;
-}
-
-static int
-dbg_str_to_data(char ***args, int *nargs, char **data, int *len)
-{
-	if (*nargs < 1)
-		return -1;
-
-	proxy_get_data(*(*args)++, data, len);
-	*nargs--;
-
-	return 0;
-}
-
-static int
-dbg_str_to_location(char ***args, int *nargs, location *loc)
-{
-	if (dbg_copy_str(args, nargs, &loc->file) < 0 ||
-		dbg_copy_str(args, nargs, &loc->func) < 0 ||
-		dbg_copy_str(args, nargs, &loc->addr) < 0 ||
-		dbg_str_to_int(args, nargs, &loc->line) < 0) {
-			FreeLocation(loc);
-			return -1;
-	}
-
-	return 0;
-}
-
-static int
-dbg_str_to_breakpoint(char ***args, int *nargs, breakpoint **bp)
-{
-	int				id;
-	breakpoint *	b;
-
-	if (dbg_str_to_int(args, nargs, &id) < 0) {
-		return -1;
-	}
-
-	b = NewBreakpoint(id);
-
-	if (dbg_str_to_int(args, nargs, &b->ignore) < 0 ||
-		dbg_str_to_int(args, nargs, &b->special) < 0 ||
-		dbg_str_to_int(args, nargs, &b->deleted) < 0 ||
-		dbg_copy_str(args, nargs, &b->type) < 0 ||
-		dbg_str_to_location(args, nargs, &b->loc) < 0 ||
-		dbg_str_to_int(args, nargs, &b->hits) < 0) {
-			FreeBreakpoint(b);
-			return -1;
-	}
-
-	*bp = b;
-
-	return 0;
-}
-
-static int
-dbg_str_to_stackframe(char ***args, int *nargs, stackframe **frame)
-{
-	int				level;
-	stackframe *	sf;
-
-	if (strcmp(*(*args), EMPTY) == 0) {
-		(*args)++;
-		*nargs--;
-		*frame = NULL;
-		return 0;
-	}
-
-	if (dbg_str_to_int(args, nargs, &level) < 0) {
-		return -1;
-	}
-
-	sf = NewStackframe(level);
-
-	if (dbg_str_to_location(args, nargs, &sf->loc) < 0) {
-		FreeStackframe(sf);
-		return -1;
-	}
-
-	*frame = sf;
-
-	return 0;
-}
-
-static int
-dbg_str_to_signalinfo(char ***args, int *nargs, signalinfo **sig)
-{
-	signalinfo *s;
-
-	if (strcmp(*(*args), EMPTY) == 0) {
-		(*args)++;
-		*nargs--;
-		*sig = NULL;
-		return 0;
-	}
-
-	s = NewSignalInfo();
-
-	if (dbg_copy_str(args, nargs, &s->name) < 0 ||
-		dbg_str_to_int(args, nargs, &s->stop) < 0 ||
-		dbg_str_to_int(args, nargs, &s->print) < 0 ||
-		dbg_str_to_int(args, nargs, &s->pass) < 0 ||
-		dbg_copy_str(args, nargs, &s->desc) < 0) {
-			FreeSignalInfo(s);
-			return -1;
-	}
-
-	*sig = s;
-
-	return 0;
-}
-
-static int
-dbg_str_to_stackframes(char ***args, int *nargs, List **lst)
-{
-	int				i;
-	int				count;
-	stackframe *	sf;
-
-	if (dbg_str_to_int(args, nargs, &count) < 0) {
-		return -1;
-	}
-
-	*lst = NewList();
-
-	for (i = 0; i < count; i++) {
-		if (dbg_str_to_stackframe(args, nargs, &sf) < 0) {
-			DestroyList(*lst, FreeStackframe);
-			return -1;
-		}
-		AddToList(*lst, (void *)sf);
-	}
-
-	return 0;
-}
-
-static int
-dbg_str_to_signals(char ***args, int *nargs, List **lst)
-{
-	int				i;
-	int				count;
-	signalinfo *	sig;
-
-	if (dbg_str_to_int(args, nargs, &count) < 0) {
-	}
-
-	*lst = NewList();
-
-	for (i = 0; i < count; i++) {
-		if (dbg_str_to_signalinfo(args, nargs, &sig) < 0) {
-			DestroyList(*lst, FreeMemory);
-			return -1;
-		}
-		AddToList(*lst, (void *)sig);
-	}
-
-	return 0;
-}
-
-static int
-dbg_str_to_list(char ***args, int *nargs, List **lst)
-{
-	int		i;
-	int		count;
-	char *	str;
-
-	if (dbg_str_to_int(args, nargs, &count) < 0) {
-		return -1;
-	}
-
-	*lst = NewList();
-
-	for (i = 0; i < count; i++) {
-		if (dbg_copy_str(args, nargs, &str) < 0) {
-			DestroyList(*lst, free);
-			return -1;
-		}
-		AddToList(*lst, (void *)str);
-	}
-
-	return 0;
-}
-
-static int
-dbg_str_to_aif(char ***args, int *nargs, AIF **res)
-{
-	int		data_len;
-	AIF *	a;
-	char *	fmt;
-	char *	data;
-
-	if (dbg_copy_str(args, nargs, &fmt) < 0 ||
-		dbg_str_to_data(args, nargs, &data, &data_len) < 0) {
-			return -1;
-	}
-
-	a = NewAIF(0, 0);
-	AIF_FORMAT(a) = fmt;
-	AIF_DATA(a) = data;
-	AIF_LEN(a) = data_len;
-
-	*res = a;
-
-	return 0;
-}
-
-static int
-dbg_str_to_memory_data(char ***args, int *nargs, List **lst)
-{
-	int		i;
-	int		count;
-	char *	str;
-
-	if (dbg_str_to_int(args, nargs, &count) < 0) {
-		return -1;
-	}
-
-	*lst = NewList();
-
-	for (i = 0; i < count; i++) {
-		if (dbg_copy_str(args, nargs, &str) < 0) {
-			DestroyList(*lst, free);
-			return -1;
-		}
-		AddToList(*lst, (void *)str);
-	}
-
-	return 0;
-}
-
-
-static int
-dbg_str_to_memory(char ***args, int *nargs, List **lst)
-{
-	int			i;
-	int			count;
-	memory *	m;
-
-	if (dbg_str_to_int(args, nargs, &count) < 0) {
-	}
-
-	*lst = NewList();
-
-	for (i = 0; i < count; i++) {
-		m = NewMemory();
-		if (dbg_copy_str(args, nargs, &m->addr) < 0 ||
-			dbg_copy_str(args, nargs, &m->ascii) < 0 ||
-			dbg_str_to_memory_data(args, nargs, &m->data) < 0) {
-				DestroyList(*lst, FreeMemory);
-				return -1;
-		}
-		AddToList(*lst, (void *)m);
-	}
-
-	return 0;
-}
-
-static int
-dbg_str_to_memoryinfo(char ***args, int *nargs, memoryinfo **info)
-{
-	memoryinfo * meminfo;
-
-	if (*nargs < 1)
-		return -1;
-
-	if (strcmp(*(*args), EMPTY) == 0) {
-		(*args)++;
-		*nargs--;
-		*info = NULL;
-	}
-
-	meminfo = NewMemoryInfo();
-
-	if (dbg_copy_str(args, nargs, &meminfo->addr) < 0 ||
-		dbg_str_to_int(args, nargs, (int *)&meminfo->nextRow) < 0 ||
-		dbg_str_to_int(args, nargs, (int *)&meminfo->prevRow) < 0 ||
-		dbg_str_to_int(args, nargs, (int *)&meminfo->nextPage) < 0 ||
-		dbg_str_to_int(args, nargs, (int *)&meminfo->prevPage) < 0 ||
-		dbg_str_to_int(args, nargs, (int *)&meminfo->numBytes) < 0 ||
-		dbg_str_to_int(args, nargs, (int *)&meminfo->totalBytes) < 0 ||
-		dbg_str_to_memory(args, nargs, &meminfo->memories) < 0) {
-			FreeMemoryInfo(meminfo);
-			return -1;
-	}
-
-	*info = meminfo;
-
-	return 0;
-}
-
-/*
- * Convert an array of strings (as a result of deserializing a proxy message)
- * into a debug event. This is used on the client end, so the event will include
- * a bitset.
- */
-int
-DbgDeserializeEvent(int id, int nargs, char **args, dbg_event **ev)
-{
-	dbg_event *	e = NULL;
-	bitset *	procs = NULL;
-
-	proxy_get_bitset(*args++, &procs);
-	nargs--;
-
-	e = NewDbgEvent(id);
-
-	switch (id)
-	{
-	case DBGEV_OK:
-		break;
-
-	case DBGEV_ERROR:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.error_event.error_code);
-		dbg_copy_str(&args, &nargs, &e->dbg_event_u.error_event.error_msg);
-		break;
-
-	case DBGEV_INIT:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.num_servers);
-		break;
-
-	case DBGEV_SUSPEND:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.reason);
-
-		switch (e->dbg_event_u.suspend_event.reason) {
-		case DBGEV_SUSPEND_BPHIT:
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.ev_u.bpid);
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.thread_id);
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.depth);
-			dbg_str_to_list(&args, &nargs, &e->dbg_event_u.suspend_event.changed_vars);
-			break;
-
-		case DBGEV_SUSPEND_SIGNAL:
-			dbg_str_to_signalinfo(&args, &nargs, &e->dbg_event_u.suspend_event.ev_u.sig);
-			dbg_str_to_stackframe(&args, &nargs, &e->dbg_event_u.suspend_event.frame);
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.thread_id);
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.depth);
-			dbg_str_to_list(&args, &nargs, &e->dbg_event_u.suspend_event.changed_vars);
-			break;
-
-		case DBGEV_SUSPEND_STEP:
-		case DBGEV_SUSPEND_INT:
-			dbg_str_to_stackframe(&args, &nargs, &e->dbg_event_u.suspend_event.frame);
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.thread_id);
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.suspend_event.depth);
-			dbg_str_to_list(&args, &nargs, &e->dbg_event_u.suspend_event.changed_vars);
-			break;
-
-		default:
-			goto error_out;
-		}
-
-		break;
-
-	case DBGEV_BPSET:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.bpset_event.bpid);
-		dbg_str_to_breakpoint(&args, &nargs, &e->dbg_event_u.bpset_event.bp);
-		break;
-
-	case DBGEV_SIGNALS:
-		dbg_str_to_signals(&args, &nargs, &e->dbg_event_u.list);
-		break;
-
-	case DBGEV_EXIT:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.exit_event.reason);
-
-		switch (e->dbg_event_u.exit_event.reason) {
-		case DBGEV_EXIT_NORMAL:
-			dbg_str_to_int(&args, &nargs, &e->dbg_event_u.exit_event.ev_u.exit_status);
-			break;
-
-		case DBGEV_EXIT_SIGNAL:
-			dbg_str_to_signalinfo(&args, &nargs, &e->dbg_event_u.exit_event.ev_u.sig);
-			break;
-
-		default:
-			goto error_out;
-		}
-
-		break;
-
-	case DBGEV_FRAMES:
-		dbg_str_to_stackframes(&args, &nargs, &e->dbg_event_u.list);
-		break;
-
-	case DBGEV_THREAD_SELECT:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.thread_select_event.thread_id);
-		dbg_str_to_stackframe(&args, &nargs, &e->dbg_event_u.thread_select_event.frame);
-		break;
-
-	case DBGEV_THREADS:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.threads_event.thread_id);
-		dbg_str_to_list(&args, &nargs, &e->dbg_event_u.threads_event.list);
-		break;
-
-	case DBGEV_STACK_DEPTH:
-		dbg_str_to_int(&args, &nargs, &e->dbg_event_u.stack_depth);
-		break;
-
-	case DBGEV_DATAR_MEM:
-		dbg_str_to_memoryinfo(&args, &nargs, &e->dbg_event_u.meminfo);
-		break;
-
-	case DBGEV_VARS:
-		dbg_str_to_list(&args, &nargs, &e->dbg_event_u.list);
-		break;
-
-	case DBGEV_ARGS:
-		dbg_str_to_list(&args,&nargs,  &e->dbg_event_u.list);
-		break;
-
-	case DBGEV_TYPE:
-		dbg_copy_str(&args, &nargs, &e->dbg_event_u.type_desc);
-		break;
-
-	case DBGEV_DATA:
-		dbg_str_to_aif(&args, &nargs, &e->dbg_event_u.data_event.data);
-		dbg_copy_str(&args, &nargs, &e->dbg_event_u.data_event.type_desc);
-		break;
-
-	case DBGEV_DATA_EVA_EX:
-		dbg_copy_str(&args, &nargs, &e->dbg_event_u.data_expression);
-		break;
-
-	case DBGEV_PARTIAL_AIF:
-		dbg_str_to_aif(&args, &nargs, &e->dbg_event_u.partial_aif_event.data);
-		dbg_copy_str(&args, &nargs, &e->dbg_event_u.partial_aif_event.type_desc);
-		dbg_copy_str(&args, &nargs, &e->dbg_event_u.partial_aif_event.name);
-		break;
-
-	default:
-		goto error_out;
-	}
-
-	e->procs = procs;
-	*ev = e;
-
-	return 0;
-
-error_out:
-
-	if (procs != NULL)
-		bitset_free(procs);
-
-	if (e != NULL)
-		FreeDbgEvent(e);
-
-	return -1;
-}
-
-dbg_event *
-NewDbgEvent(int event) {
-	dbg_event *	e = (dbg_event *)malloc(sizeof(dbg_event));
-
-	memset((void *)e, 0, sizeof(dbg_event));
-
-	e->event_id = event;
-
-	return e;
-}
-
-void
-FreeDbgEvent(dbg_event *e) {
-	switch (e->event_id) {
-	case DBGEV_OK:
-	case DBGEV_INIT:
-		break;
-
-	case DBGEV_SUSPEND:
-		switch (e->dbg_event_u.suspend_event.reason) {
-		case DBGEV_SUSPEND_SIGNAL:
-			if (e->dbg_event_u.suspend_event.ev_u.sig != NULL)
-				FreeSignalInfo(e->dbg_event_u.suspend_event.ev_u.sig);
-			break;
-		case DBGEV_SUSPEND_INT:
-		case DBGEV_SUSPEND_STEP:
-			break;
-
-		case DBGEV_SUSPEND_BPHIT:
-			break;
-		}
-
-		if (e->dbg_event_u.suspend_event.frame != NULL)
-			FreeStackframe(e->dbg_event_u.suspend_event.frame);
-		if (e->dbg_event_u.suspend_event.changed_vars != NULL)
-			DestroyList(e->dbg_event_u.suspend_event.changed_vars, free);
-
-		break;
-
-	case DBGEV_EXIT:
-		switch (e->dbg_event_u.suspend_event.reason) {
-			case DBGEV_EXIT_SIGNAL:
-				if (e->dbg_event_u.suspend_event.ev_u.sig != NULL)
-					FreeSignalInfo(e->dbg_event_u.suspend_event.ev_u.sig);
-				break;
-			case DBGEV_EXIT_NORMAL:
-				break;
-		}
-		break;
-
-	case DBGEV_FRAMES:
-		if (e->dbg_event_u.list != NULL)
-			DestroyList(e->dbg_event_u.list, FreeStackframe);
-		break;
-
-	case DBGEV_DATA:
-		if (e->dbg_event_u.data_event.data != NULL)
-			AIFFree(e->dbg_event_u.data_event.data);
-		if (e->dbg_event_u.data_event.type_desc != NULL)
-			free(e->dbg_event_u.data_event.type_desc);
-		break;
-
-	case DBGEV_TYPE:
-		if (e->dbg_event_u.type_desc != NULL)
-			free(e->dbg_event_u.type_desc);
-		break;
-
-	case DBGEV_THREAD_SELECT:
-		if (e->dbg_event_u.thread_select_event.frame != NULL)
-			FreeStackframe(e->dbg_event_u.thread_select_event.frame);
-		break;
-
-	case DBGEV_THREADS:
-		if (e->dbg_event_u.threads_event.list != NULL)
-			DestroyList(e->dbg_event_u.threads_event.list, free);
-		break;
-
-	case DBGEV_DATAR_MEM:
-		if (e->dbg_event_u.meminfo != NULL)
-			FreeMemoryInfo(e->dbg_event_u.meminfo);
-		break;
-
-	case DBGEV_ARGS:
-	case DBGEV_VARS:
-		if (e->dbg_event_u.list != NULL)
-			DestroyList(e->dbg_event_u.list, free);
-		break;
-
-	case DBGEV_SIGNALS:
-		if (e->dbg_event_u.list != NULL)
-			DestroyList(e->dbg_event_u.list, FreeSignalInfo);
-		break;
-
-	case DBGEV_BPSET:
-		if (e->dbg_event_u.bpset_event.bp != NULL)
-			FreeBreakpoint(e->dbg_event_u.bpset_event.bp);
-		break;
-
-	case DBGEV_DATA_EVA_EX:
-		if (e->dbg_event_u.data_expression != NULL)
-			free(e->dbg_event_u.data_expression);
-		break;
-
-	case DBGEV_PARTIAL_AIF:
-		if (e->dbg_event_u.partial_aif_event.data != NULL)
-			AIFFree(e->dbg_event_u.partial_aif_event.data);
-		if (e->dbg_event_u.partial_aif_event.type_desc != NULL)
-			free(e->dbg_event_u.partial_aif_event.type_desc);
-		if (e->dbg_event_u.partial_aif_event.name != NULL)
-			free(e->dbg_event_u.partial_aif_event.name);
-		break;
-	}
-
-	if (e->procs != NULL)
-		bitset_free(e->procs);
-
-	free(e);
-}
-
-dbg_event *
-DbgErrorEvent(int err, char *msg)
-{
-	dbg_event *	e = NewDbgEvent(DBGEV_ERROR);
-
-	e->dbg_event_u.error_event.error_code = err;
-	if (msg != NULL)
-		e->dbg_event_u.error_event.error_msg = strdup(msg);
-
-	return e;
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/itimer.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/itimer.c
deleted file mode 100644
index baa17df..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/itimer.c
+++ /dev/null

@@ -1,129 +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
- ******************************************************************************/
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "itimer.h"
-
-itimer *	
-itimer_new(char *label) 
-{
-	static int	id = 0;
-	itimer *		t = (itimer *)malloc(sizeof(itimer));
-	
-	if (label != NULL)
-		t->label = strdup(label);
-	else
-		asprintf(&t->label, "timer_%d\n", id++);
-
-	t->running = 0;
-	t->total_elapsed = 0;
-	t->mark_cnt = 0;
-	return t;
-}
-
-void
-itimer_start(itimer *t)
-{
-	if (t->running) {
-		printf("warning: attempt to start a running timer\n"); fflush(stdout);
-		return;
-	}
-		
-	(void)gettimeofday(&t->start, NULL);
-
-	t->last_mark.tv_sec = t->start.tv_sec;
-	t->last_mark.tv_usec = t->start.tv_usec;
-	t->running = 1;
-	t->elapsed = 0;
-}
-
-void
-itimer_reset(itimer *t)
-{
-	t->running = 0;
-	t->elapsed = 0;
-	t->total_elapsed = 0;
-}
-
-void
-itimer_print(itimer *t)
-{
-	int i;
-	
-	printf("++++ %s: started at %ld+%ld\n", t->label, (long)t->start.tv_sec, (long)t->start.tv_usec); fflush(stdout);
-	for (i = 0; i < t->mark_cnt; i++)
-		printf("++++ %s: \"%s\" mark time is %ld ms\n", t->label, t->marks[i].label, t->marks[i].elapsed); fflush(stdout);	
-	if (t->elapsed > 0)
-		printf("++++ %s: last elapsed time is %ld ms\n", t->label, t->elapsed); fflush(stdout);
-	if (t->total_elapsed > 0)
-		printf("++++ %s: total elapsed time is %ld ms\n", t->label, t->total_elapsed); fflush(stdout);
-}
-
-void	
-itimer_mark(itimer *t, char *msg) 
-{
-	struct timeval	mark;
-	
-	if (t->mark_cnt == MAX_MARKS)
-		return;
-		
-	(void)gettimeofday(&mark, NULL);
-	
-	t->marks[t->mark_cnt].elapsed = ((long)mark.tv_sec * 1000 + (long)mark.tv_usec / 1000) 
-		- ((long)t->last_mark.tv_sec * 1000 + (long)t->last_mark.tv_usec / 1000);
-	
-	t->marks[t->mark_cnt].label = strdup(msg);
-	
-	t->last_mark.tv_sec = mark.tv_sec;
-	t->last_mark.tv_usec = mark.tv_usec;
-	t->mark_cnt++;
-}
-
-void
-itimer_stop(itimer *t)
-{
-	if (!t->running) {
-		printf("warning: attempt to stop a stopped timer\n"); fflush(stdout);
-		return;
-	}
-		
-	(void)gettimeofday(&t->stop, NULL);
-	
-	t->elapsed = ((long)t->stop.tv_sec * 1000 + (long)t->stop.tv_usec / 1000) 
-		- ((long)t->start.tv_sec * 1000 + (long)t->start.tv_usec / 1000);
-	t->total_elapsed += t->elapsed;
-	t->running = 0;
-}
-
-void
-itimer_free(itimer *t) 
-{
-	int i;
-	if (t->label != NULL)
-		free(t->label);
-	for (i = 0; i < t->mark_cnt; i++)
-		free(t->marks[i].label);	
-	free(t);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/memoryinfo.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/memoryinfo.c
deleted file mode 100644
index 14e6348..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/memoryinfo.c
+++ /dev/null

@@ -1,62 +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
- *******************************************************************************/
- 
- /**
- * @author Clement chu
- * 
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "memoryinfo.h"
-
-memoryinfo * NewMemoryInfo(void) {
-	memoryinfo * meminfo = (memoryinfo *)malloc(sizeof(memoryinfo));	
-	meminfo->addr = NULL;
-	meminfo->memories = NULL;
-	return meminfo;
-}
-
-memory * NewMemory(void) {
-	memory * mem = (memory *)malloc(sizeof(memory));	
-	mem->addr = NULL;
-	mem->data = NULL;
-	mem->ascii = NULL;
-	return mem;
-}
-
-void FreeMemoryInfo(memoryinfo *meminfo)  {
-	if (meminfo->addr != NULL)
-		free(meminfo->addr);
-	if (meminfo->memories != NULL)
-		DestroyList(meminfo->memories, FreeMemory);
-	free(meminfo);
-}
-
-void FreeMemory(memory *mem) {
-	if (mem->addr != NULL)
-		free(mem->addr);
-	if (mem->ascii != NULL)
-		free(mem->ascii);
-	if (mem->data != NULL)
-		DestroyList(mem->data, free);
-	free(mem);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/signalinfo.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/signalinfo.c
deleted file mode 100644
index de1e9be..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/signalinfo.c
+++ /dev/null

@@ -1,42 +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
- ******************************************************************************/
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "signalinfo.h"
-
-signalinfo * NewSignalInfo(void) {
-	signalinfo *sig = (signalinfo *)malloc(sizeof(signalinfo));
-	
-	sig->name = NULL;
-	sig->stop = 0;
-	sig->print = 0;
-	sig->pass = 0;
-	sig->desc = NULL;
-	return sig;
-}
-
-void FreeSignalInfo(signalinfo *sig) {
-	if (sig->name != NULL)
-		free(sig->name);
-	if (sig->desc != NULL)
-		free(sig->desc);
-	free(sig);
-}

diff --git a/debug/org.eclipse.ptp.debug.sdm/src/utils/stackframe.c b/debug/org.eclipse.ptp.debug.sdm/src/utils/stackframe.c
deleted file mode 100644
index 18b769c..0000000
--- a/debug/org.eclipse.ptp.debug.sdm/src/utils/stackframe.c
+++ /dev/null

@@ -1,61 +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
- ******************************************************************************/
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "stackframe.h"
-
-stackframe *	
-NewStackframe(int level)
-{
-	stackframe *	sf = (stackframe *)malloc(sizeof(stackframe));
-	
-	sf->level = level;
-	sf->loc.file = NULL;
-	sf->loc.func = NULL;
-	sf->loc.addr = NULL;
-	sf->loc.line = 0;
-	
-	return sf;
-}
-
-void
-FreeLocation(location *loc) 
-{
-	if (loc->file != NULL) {
-		free(loc->file);
-		loc->file = NULL;
-	}
-	if (loc->func != NULL) {
-		free(loc->func);
-		loc->func = NULL;
-	}
-	if (loc->addr != NULL) {
-		free(loc->addr);
-		loc->addr = NULL;
-	}
-}
-
-void	
-FreeStackframe(stackframe *sf)
-{
-	FreeLocation(&sf->loc);	
-	free(sf);
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/.classpath b/debug/org.eclipse.ptp.debug.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/.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/debug/org.eclipse.ptp.debug.ui/.cvsignore b/debug/org.eclipse.ptp.debug.ui/.cvsignore
deleted file mode 100644
index f0a691e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-doc
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.ui/.project b/debug/org.eclipse.ptp.debug.ui/.project
deleted file mode 100644
index 9332e07..0000000
--- a/debug/org.eclipse.ptp.debug.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.debug.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/debug/org.eclipse.ptp.debug.ui/.settings/org.eclipse.jdt.ui.prefs b/debug/org.eclipse.ptp.debug.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index b86a591..0000000
--- a/debug/org.eclipse.ptp.debug.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Tue Aug 09 11:46:46 MDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\n<templates/>

diff --git a/debug/org.eclipse.ptp.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.ptp.debug.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 816e3e2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.debug.ui; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.debug.ui.PTPDebugUIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.console,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.runtime,
- org.eclipse.search,
- org.eclipse.debug.ui,
- org.eclipse.cdt.ui,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.core,
- org.eclipse.ptp.debug.core,
- org.eclipse.ptp.core,
- org.eclipse.ptp.proxy.protocol,
- org.eclipse.ptp.ui
-Eclipse-LazyStart: true
-Bundle-Vendor: %pluginProvider
-Export-Package: org.eclipse.ptp.debug.ui,
- org.eclipse.ptp.debug.ui.events,
- org.eclipse.ptp.debug.ui.listeners,
- org.eclipse.ptp.debug.ui.views

diff --git a/debug/org.eclipse.ptp.debug.ui/about.html b/debug/org.eclipse.ptp.debug.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/debug/org.eclipse.ptp.debug.ui/about.html
+++ /dev/null

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

diff --git a/debug/org.eclipse.ptp.debug.ui/build.properties b/debug/org.eclipse.ptp.debug.ui/build.properties
deleted file mode 100644
index 671f1ca..0000000
--- a/debug/org.eclipse.ptp.debug.ui/build.properties
+++ /dev/null

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

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr.gif
deleted file mode 100644
index daf6d1a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr_disabled.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr_disabled.gif
deleted file mode 100644
index 0d46651..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/address_ovr_disabled.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt.gif
deleted file mode 100644
index 828a539..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.gif
deleted file mode 100644
index 21d7799..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.png b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.png
deleted file mode 100644
index ad725c6..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_disable.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.gif
deleted file mode 100644
index dc9fe33..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.png b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.png
deleted file mode 100644
index 5d20a74..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_curr_set_enable.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.gif
deleted file mode 100644
index 04bfca2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.png b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.png
deleted file mode 100644
index 408488d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_disable.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.gif
deleted file mode 100644
index 5bdb227..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.png b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.png
deleted file mode 100644
index a1113c2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_multi_set_enable.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.gif
deleted file mode 100644
index c53b91c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.png b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.png
deleted file mode 100644
index 2deceae..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_disable.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.gif
deleted file mode 100644
index babc62d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.png b/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.png
deleted file mode 100644
index 09836fa..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/bpt_no_set_enable.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr.gif
deleted file mode 100644
index 91749a5..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr_disabled.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr_disabled.gif
deleted file mode 100644
index 9475a12..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/conditional_ovr_disabled.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/cur_set_ip.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/cur_set_ip.gif
deleted file mode 100644
index 961873e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/cur_set_ip.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr.gif
deleted file mode 100644
index d3dd249..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr_disabled.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr_disabled.gif
deleted file mode 100644
index b35d73a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/function_ovr_disabled.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr.gif
deleted file mode 100644
index a1af2bf..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr_disabled.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr_disabled.gif
deleted file mode 100644
index a1af2bf..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/global_ovr_disabled.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr.gif
deleted file mode 100644
index 899610a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr_disabled.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr_disabled.gif
deleted file mode 100644
index 15cf84f..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/installed_ovr_disabled.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.gif
deleted file mode 100644
index b663a54..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.png b/debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.png
deleted file mode 100644
index 466451a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/ptp_bpt_set.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/reg_cur_ip.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/reg_cur_ip.gif
deleted file mode 100644
index 34ac8ac..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/reg_cur_ip.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/reg_sec_ip.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/reg_sec_ip.gif
deleted file mode 100644
index d58bf89..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/reg_sec_ip.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/debug/set_ip.gif b/debug/org.eclipse.ptp.debug.ui/icons/debug/set_ip.gif
deleted file mode 100644
index 9831329..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/debug/set_ip.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/error.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/error.gif
deleted file mode 100644
index d00cc04..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/error.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/error_sel.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/error_sel.gif
deleted file mode 100644
index d233dbc..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/error_sel.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/running.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/running.gif
deleted file mode 100644
index 30749b2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/running.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/running_sel.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/running_sel.gif
deleted file mode 100644
index 5261fbf..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/running_sel.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/started.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/started.gif
deleted file mode 100644
index a1361f1..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/started.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/started_sel.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/started_sel.gif
deleted file mode 100644
index ed782a7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/started_sel.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/stopped.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/stopped.gif
deleted file mode 100644
index e0af6b9..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/stopped.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/stopped_sel.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/stopped_sel.gif
deleted file mode 100644
index 5c4f0fa..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/stopped_sel.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/suspended.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/suspended.gif
deleted file mode 100644
index a1361f1..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/suspended.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/process/suspended_sel.gif b/debug/org.eclipse.ptp.debug.ui/icons/process/suspended_sel.gif
deleted file mode 100644
index ed782a7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/process/suspended_sel.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/ptparrayview.gif b/debug/org.eclipse.ptp.debug.ui/icons/ptparrayview.gif
deleted file mode 100644
index ada8606..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/ptparrayview.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.gif b/debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.gif
deleted file mode 100644
index ada8606..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.png b/debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.png
deleted file mode 100644
index 8a4afd8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/ptpdebug.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/ptpvariableview.gif b/debug/org.eclipse.ptp.debug.ui/icons/ptpvariableview.gif
deleted file mode 100644
index 8d1a82d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/ptpvariableview.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/signals_view.gif b/debug/org.eclipse.ptp.debug.ui/icons/signals_view.gif
deleted file mode 100644
index ada8606..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/signals_view.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/add_variable_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/add_variable_normal.gif
deleted file mode 100755
index a321874..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/add_variable_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_disable.gif
deleted file mode 100644
index c030614..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_normal.gif
deleted file mode 100644
index b453f19..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/jump_co_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.gif
deleted file mode 100644
index 7925ea8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.png b/debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.png
deleted file mode 100644
index a3707fb..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/register_normal.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/restart_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/restart_disable.gif
deleted file mode 100644
index fe2b2c3..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/restart_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/restart_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/restart_normal.gif
deleted file mode 100644
index 0ca0683..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/restart_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/resume_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/resume_disable.gif
deleted file mode 100644
index 8652797..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/resume_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/resume_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/resume_normal.gif
deleted file mode 100644
index 16f4e25..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/resume_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_disable.gif
deleted file mode 100644
index 47c0b12..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_normal.gif
deleted file mode 100644
index 5425505..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/signal0_co_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_disable.gif
deleted file mode 100644
index 61c5ad7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_normal.gif
deleted file mode 100644
index 75d165b..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepinto_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_disable.gif
deleted file mode 100644
index c194def..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_normal.gif
deleted file mode 100644
index 1ec36ae..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepover_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_disable.gif
deleted file mode 100644
index 67fa335..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_normal.gif
deleted file mode 100644
index 4c2f219..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/stepreturn_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_disable.gif
deleted file mode 100644
index e47777b..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_normal.gif
deleted file mode 100644
index 161e3f5..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/suspend_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_disable.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_disable.gif
deleted file mode 100644
index 1a33ac8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_disable.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_normal.gif
deleted file mode 100644
index 6d47276..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/terminate_all_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.gif
deleted file mode 100644
index 7aa7030..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.png b/debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.png
deleted file mode 100644
index cc07e5d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/unregister_normal.png
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_add_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/var_add_normal.gif
deleted file mode 100644
index b8fde0c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_add_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_compare_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/var_compare_normal.gif
deleted file mode 100644
index b8fde0c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_compare_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_delete_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/var_delete_normal.gif
deleted file mode 100644
index 207fb7a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_delete_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_edit_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/var_edit_normal.gif
deleted file mode 100644
index 8a9a149..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_edit_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_refresh_normal.gif b/debug/org.eclipse.ptp.debug.ui/icons/tool/var_refresh_normal.gif
deleted file mode 100644
index 7d1c50b..0000000
--- a/debug/org.eclipse.ptp.debug.ui/icons/tool/var_refresh_normal.gif
+++ /dev/null
Binary files differ

diff --git a/debug/org.eclipse.ptp.debug.ui/plugin.properties b/debug/org.eclipse.ptp.debug.ui/plugin.properties
deleted file mode 100644
index 67ee03c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/plugin.properties
+++ /dev/null

@@ -1,111 +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
-#
-# Contributors:
-#     Clement Chu
-#################################################################################
-
-pluginName=PTP Debug UI
-pluginProvider=Eclipse.org
-
-ParallelDebugPerspective.name=PTP Debug
-ParallelDebugPerspective.description=This Debug perspective is designed to support application debugging.  It incorporates views for displaying the debug stack, variables and breakpoint management.
-ParallelDebugViewCategory.name=PTP Debug
-ParallelDebugView.name=Parallel Debug
-
-ArrayView.name=Array
-
-PVariableView.name=PTP Variable
-
-PDebuggerPage.name=PTP Debugger UI Page
-PDebugPreferencePage.name=Debug
-
-DefaultSourceLocator.name=Default PTP Source Locator
-
-ShowFullPathsAction.label=Show Full &Paths
-ShowFullPathsAction.tooltip=Show Full Paths
-
-PBreakpointSet.label=Parallel Breakpoint Set
-PBreakpointSet.others=Unknown Set
-
-PBreakpointAnnotation.label=Parallel Breakpoint
-CurrentRegIPAnnotation.label=Current Registered Instruction Pointer
-RegIPAnnotation.label=Registered Instruction Pointer
-CurrentSetIPAnnotation.label=Current Set Instruction Pointer
-SetIPAnnotation.label=Set Instruction Pointer
-
-EditorRulerAction.label=Parallel Breakpoint
-PBreakpointProperties.label=Breakpoint properties
-EnableDisableBreakpoint.label=Enable Disable breakpoint
-ToggleBreakpoint.label=Toggle breakpoint
-
-CommonBreakpointPage.label=Common
-CommonSignalPage.label=Common
-BreakpointPropertiesAction.label=P&roperties...
-
-GotoSet.label=Goto set
-
-DebugTextHover.label=Debugger
-DebugTextHover.description=Shows the value of the expression selected in the ptp debug perspective.
-
-
-PVariableMenu.label=PTP Variable
-AddPVariableAction.label=Add PTP variable
-AddPVariableAction.tooltip=Add PTP variable
-RemoveAllPVariableAction.label=Remove all PTP variables
-RemoveAllPVariableAction.tooltip=Remove all PTP variables
-OpenPVariableDialogAction.label=Open PTP Variable Dialog
-OpenPVariableDialogAction.tooltip=Open PTP Variable Dialog
-UpdateAllPVariableAction.label=Refresh all PTP variables
-UpdateAllPVariableAction.tooltip=Refresh all PTP variables
-
-
-SignalsView.name=Signals
-SignalAction.label=Resume With Signal
-SignalAction.tooltip=Resume With Signal
-SignalZeroAction.label=Resume Without Signal
-SignalZeroAction.tooltip=Resume Ignoring Signal
-SignalPropertiesAction.label=Signal Properties...
-SignalPropertiesAction.tooltip=Open Signal Properties Dialog
-
-
-RunMenu.label=&Run
-DebugActionSet.label=PTP Debug
-
-RestartAction.label=Restart
-RestartAction.tooltip=Restart
-
-JumpToLineAction.label=Resume At Li&ne
-GlobalJumpToLineAction.label=Resume At Li&ne PTP
-AddWatchpoint.label=Add Watchpoint PTP...
-AddWatchpoint.tooltip=Add Watchpoint PTP
-AddExpressionAction.label=Add Watch Expression...
-RunToLineAction.label=Run To &Line
-
-ToggleInstructionStepModeAction.label=Instruction Stepping Mode
-ToggleInstructionStepModeAction.tooltip=Instruction Stepping Mode
-
-EnableVariablesAction.label=Enable
-EnableVariablesAction.tooltip=Enable Selected Variables
-
-DisableVariablesAction.label=Disable
-DisableVariablesAction.tooltip=Disable Selected Variables
-
-DebuggingPContext.name=Debugging Parallel
-DebuggingPContext.description=Debugging Parallel Programs
-

diff --git a/debug/org.eclipse.ptp.debug.ui/plugin.xml b/debug/org.eclipse.ptp.debug.ui/plugin.xml
deleted file mode 100644
index 83eb6d3..0000000
--- a/debug/org.eclipse.ptp.debug.ui/plugin.xml
+++ /dev/null

@@ -1,866 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension-point id="debuggerConfigurations" name="Parallel Debugger Configurations" schema="schema/debuggerConfigurations.exsd"/>
-	
-	<!-- debug model presentation //-->
-	<extension
-		point="org.eclipse.debug.ui.debugModelPresentations">
-		<debugModelPresentation
-			class="org.eclipse.ptp.debug.internal.ui.PDebugModelPresentation"
-			id="org.eclipse.ptp.debug.core">
-		</debugModelPresentation>
-	</extension>
-	<!-- view //-->
-	<extension
-		point="org.eclipse.ui.views">
-		<category
-			name="%ParallelDebugViewCategory.name"
-			id="org.eclipse.ptp.debug.ui.views">
-		</category>
-		<view
-			name="%SignalsView.name"
-			icon="icons/signals_view.gif"
-			category="org.eclipse.ptp.debug.ui.views"
-			class="org.eclipse.ptp.debug.internal.ui.views.signals.SignalsView"
-			id="org.eclipse.ptp.debug.ui.views.SignalsView">
-		</view>
-		<view
-			name="%ParallelDebugView.name"
-			icon="icons/ptpdebug.gif"
-			category="org.eclipse.ptp.debug.ui.views"
-			class="org.eclipse.ptp.debug.ui.views.ParallelDebugView"
-			id="org.eclipse.ptp.debug.ui.views.parallelDebugView">
-		</view>
-		<view
-			name="%ArrayView.name"
-			icon="icons/ptparrayview.gif"
-			category="org.eclipse.debug.ui"
-			class="org.eclipse.ptp.debug.internal.ui.views.array.ArrayView"
-			id="org.eclipse.ptp.debug.ui.views.ArrayView">
-		</view>
-		<view
-			name="%PVariableView.name"
-			icon="icons/ptpvariableview.gif"
-			category="org.eclipse.debug.ui"
-			class="org.eclipse.ptp.debug.internal.ui.views.variable.PVariableView"
-			id="org.eclipse.ptp.debug.ui.views.PVariableView">
-		</view>
-	</extension>
-	<!-- perspective extensions //-->
-	<extension
-		point="org.eclipse.ui.perspectiveExtensions">
-		<perspectiveExtension
-			targetID="org.eclipse.ui.resourcePerspective">
-			<perspectiveShortcut
-				id="org.eclipse.ptp.debug.ui.PTPDebugPerspective">
-			</perspectiveShortcut>
-		</perspectiveExtension>
-		<perspectiveExtension
-			targetID="org.eclipse.debug.ui.DebugPerspective">
-			<perspectiveShortcut
-				id="org.eclipse.ptp.debug.ui.PTPDebugPerspective">
-			</perspectiveShortcut>
-		</perspectiveExtension>
-		<perspectiveExtension
-			targetID="org.eclipse.ptp.debug.ui.PTPDebugPerspective">
-			<perspectiveShortcut
-				id="org.eclipse.ptp.ui.PTPRunPerspective">
-			</perspectiveShortcut>
-			<perspectiveShortcut
-				id="org.eclipse.debug.ui.DebugPerspective">
-			</perspectiveShortcut>
-			<view
-				visible="true"
-				relative="org.eclipse.ui.console.ConsoleView"
-				relationship="stack"
-				id="org.eclipse.ui.views.ProblemView">
-			</view>      
-			<viewShortcut
-				id="org.eclipse.ui.views.ProblemView">
-			</viewShortcut>
-			<actionSet
-				id="org.eclipse.debug.ui.launchActionSet">
-			</actionSet>
-			<actionSet
-				id="org.eclipse.ptp.ui.actionSets">
-			</actionSet>
-			<actionSet
-				id="org.eclipse.cdt.debug.ui.debugActionSet">
-			</actionSet>
-		</perspectiveExtension>
-	</extension>   	
-	<!-- preferences //-->
-	<extension
-		point="org.eclipse.ui.preferencePages">
-		<page
-			name="%PDebugPreferencePage.name"
-			category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage"
-			class="org.eclipse.ptp.debug.internal.ui.preferences.PDebugPreferencePage"
-			id="org.eclipse.ptp.debug.ui.PDebugPreferencePage">
-		</page>
-	</extension>
-
-   	<!-- perspective //-->
-	<extension
-		point="org.eclipse.ui.perspectives">
-		<perspective
-			name="%ParallelDebugPerspective.name"
-			icon="icons/ptpdebug.gif"
-			class="org.eclipse.ptp.debug.internal.ui.PTPDebugPerspectiveFactory"
-			id="org.eclipse.ptp.debug.ui.PTPDebugPerspective">
-			<description>
-				%ParallelDebugPerspective.description
-			</description>
-		</perspective>
-	</extension>   
-
-	<!-- annotation //-->		      
-	<extension
-		point="org.eclipse.debug.ui.breakpointOrganizers">
-		<breakpointOrganizer
-			othersLabel="%PBreakpointSet.others"
-			label="%PBreakpointSet.label"
-			icon="icons/debug/ptp_bpt_set.gif"
-			class="org.eclipse.ptp.debug.internal.ui.views.breakpoints.PBreakpointSetOrganizer"
-			id="org.eclipse.ptp.debug.ui.pBreakpointSetOrganizer"/>
-	</extension>
-
-	<!-- Extension //-->
-	<extension
-		point="org.eclipse.ui.perspectiveExtensions">
-		<perspectiveExtension
-			targetID="org.eclipse.ptp.debug.ui.PTPDebugPerspective">
-			<view
-				relative="org.eclipse.debug.ui.VariableView"
-				visible="false"
-				relationship="stack"
-				id="org.eclipse.ptp.debug.ui.SignalsView">
-			</view>
-			<viewShortcut
-				id="org.eclipse.ptp.debug.ui.SignalsView">
-			</viewShortcut>
-			<viewShortcut
-				id="org.eclipse.debug.ui.MemoryView">
-			</viewShortcut>
-			<viewShortcut
-				id="org.eclipse.debug.ui.ExpressionView">
-			</viewShortcut>
-		</perspectiveExtension>
-	</extension>
-
-	<!-- Action sets //-->
-	<extension
-		point="org.eclipse.ui.actionSets">
-		<actionSet
-        id="org.eclipse.ptp.debug.ui.debugActionSet"
-        label="%DebugActionSet.label"
-        visible="true">
-			<menu
-				label="%RunMenu.label"
-				path="additions"
-				id="org.eclipse.ui.run">
-			</menu>
-			<action
-				id="org.eclipse.ptp.debug.ui.actions.ResumeAtLine"
-				class="org.eclipse.ptp.debug.internal.ui.actions.RetargetResumeAtLineAction"
-				disabledIcon="icons/tool/jump_co_disable.gif"
-				enablesFor="1"
-				icon="icons/tool/jump_co_normal.gif"
-				helpContextId="jump_to_line_action_context"
-				label="%GlobalJumpToLineAction.label"
-				menubarPath="org.eclipse.ui.run/stepGroup">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui">
-					</pluginState>
-				</enablement>
-			</action>
-			<action
-				id="org.eclipse.ptp.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate"
-				class="org.eclipse.ptp.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate"
-				disabledIcon="icons/tool/signal0_co_disable.gif"
-				enablesFor="1"
-				icon="icons/tool/signal0_co_normal.gif"
-				helpContextId="resume_without_signal_action_context"
-				label="%SignalZeroAction.label"
-				menubarPath="org.eclipse.ui.run/stepGroup"
-				tooltip="%SignalZeroAction.tooltip">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui">
-					</pluginState>
-				</enablement>
-			</action>
-			<action
-				id="org.eclipse.ptp.debug.ui.internal.actions.RestartActionDelegate"
-				class="org.eclipse.ptp.debug.internal.ui.actions.RestartActionDelegate"
-				disabledIcon="icons/tool/restart_disable.gif"
-				enablesFor="1"
-				icon="icons/tool/restart_normal.gif"
-				helpContextId="restart_action_context"
-				label="%RestartAction.label"
-				menubarPath="org.eclipse.ui.run/stepGroup">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui">
-					</pluginState>
-				</enablement>
-			</action>
-		</actionSet>
-	</extension>
-	<!-- poupup menus //-->
-	<extension
-		point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="#CEditorRulerContext"
-			id="org.eclipse.ptp.debug.ui.CEditorRulerActions">
-			<menu
-				label="%EditorRulerAction.label"
-				path="debug"
-				id="org.eclipse.ptp.debug.ui.popupmenu.submenu">
-				<groupMarker
-					name="ptpGroup">
-				</groupMarker>
-			</menu>
-			<action
-				label="%PBreakpointProperties.label"
-				class="org.eclipse.ptp.debug.internal.ui.actions.PBreakpointPropertiesRulerActionDelegate"
-				menubarPath="org.eclipse.ptp.debug.ui.popupmenu.submenu/ptpGroup"
-				id="org.eclipse.ptp.debug.internal.ui.actions.PBreakpointPropertiesRulerActionDelegate">
-			</action>
-			<action
-				label="%EnableDisableBreakpoint.label"
-				class="org.eclipse.ptp.debug.internal.ui.actions.EnableDisableBreakpointRulerActionDelegate"
-				menubarPath="org.eclipse.ptp.debug.ui.popupmenu.submenu/ptpGroup"
-				id="org.eclipse.ptp.debug.internal.ui.actions.EnableDisableBreakpointRulerActionDelegate">
-			</action>
-			<action
-				label="%ToggleBreakpoint.label"
-				class="org.eclipse.ptp.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
-				menubarPath="org.eclipse.ptp.debug.ui.popupmenu.submenu/ptpGroup"
-				id="org.eclipse.ptp.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate">
-			</action>
-		</viewerContribution>
-		<!--//
-		<viewerContribution
-			targetID="#CEditorContext"
-			id="org.eclipse.cdt.debug.ui.CEditorPopupActions">
-			<visibility>
-				<and>
-					<systemProperty
-						value="true"
-						name="org.eclipse.ptp.debug.ui.debuggerActive"/>
-					<objectClass name="org.eclipse.jface.text.ITextSelection"/>
-				</and>
-			</visibility>
-			<action
-				label="%AddExpressionAction.label"
-				icon="icons/debug/ptp_bpt_set.gif"
-				helpContextId="add_expression_action_context"
-				class="org.eclipse.ptp.debug.internal.ui.actions.AddExpressionEditorActionDelegate"
-				menubarPath="additions"
-				id="org.eclipse.ptp.debug.internal.ui.actions.AddExpressionActionDelegate">
-			</action>
-			<action
-				label="%JumpToLineAction.label"
-				icon="icons/debug/ptp_bpt_set.gif"
-				helpContextId="jump_to_line_action_context"
-				class="org.eclipse.ptp.debug.internal.ui.actions.ResumeAtLineActionDelegate"
-				menubarPath="additions"
-				enablesFor="1"
-				id="org.eclipse.ptp.debug.internal.ui.actions.JumpToLineActionDelegate">
-			</action>
-			<action
-				helpContextId="run_to_line_action_context"
-				label="%RunToLineAction.label"
-				definitionId="org.eclipse.debug.ui.commands.RunToLine"
-				class="org.eclipse.debug.ui.actions.RunToLineActionDelegate"
-				menubarPath="additions"
-				id="org.eclipse.ptp.debug.ui.actions.popup.RunToLine">
-			</action>
-		</viewerContribution>
-		//-->
-		<viewerContribution
-			targetID="org.eclipse.debug.ui.BreakpointView"
-			id="org.eclipse.ptp.debug.ui.breakpointview.popupMenu">
-			<action
-				label="%GotoSet.label"
-				icon="icons/debug/ptp_bpt_set.gif"
-				class="org.eclipse.ptp.debug.internal.ui.actions.GotoSet"
-				menubarPath="navigationGroup"
-				enablesFor="1+"
-				id="org.eclipse.ptp.debug.internal.ui.actions.GotoSet">
-			</action>
-		</viewerContribution>
-		<objectContribution
-			objectClass="org.eclipse.ptp.debug.core.model.IPBreakpoint"
-			id="org.eclipse.ptp.debug.ui.PBreakpointActions">
-			<action
-				label="%BreakpointPropertiesAction.label"
-				class="org.eclipse.ptp.debug.internal.ui.actions.PBreakpointPropertiesAction"
-				menubarPath="additions"
-				enablesFor="1"
-				id="org.eclipse.ptp.debug.internal.ui.actions.PBreakpointPropertiesAction">
-			</action>
-		</objectContribution>      
-		<!-- variable start -->
-		<!--
-		<objectContribution
-			objectClass="org.eclipse.ptp.debug.core.model.IPVariable"
-			id="org.eclipse.ptp.debug.ui.PVariableActions">
-			<menu
-				label="PVariableMenu"
-				id="org.eclipse.ptp.debug.ui.PVariableMenu">
-				<separator
-					name="pVarGroup">
-				</separator>
-			</menu>
-			<action
-				helpContextId="ptp_add_variable_action_context"
-				label="%AddPVariableAction.label"
-				tooltip="%AddPVariableAction.tooltip"
-				icon="icons/debug/ptp_bpt_set.gif"
-				menubarPath="pVarGroup"
-				enablesFor="1"
-				class="org.eclipse.ptp.debug.internal.ui.actions.AddPVariableActionDelegate"
-				id="org.eclipse.ptp.debug.internal.ui.actions.AddPVariableActionDelegate">
-			</action>
-		</objectContribution>
-		//-->
-		<!-- variable end -->
-		<!-- signal start -->
-		<objectContribution
-			objectClass="org.eclipse.ptp.debug.core.model.IPSignal"
-			id="org.eclipse.ptp.debug.ui.SignalActions">
-			<action
-				label="%SignalAction.label"
-				class="org.eclipse.ptp.debug.internal.ui.actions.SignalActionDelegate"
-				tooltip="%SignalAction.tooltip"
-				menubarPath="additions"
-				enablesFor="1"
-				id="org.eclipse.ptp.debug.internal.ui.actions.SignalActionDelegate">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui">
-					</pluginState>
-				</enablement>
-			</action>
-			<action
-				label="%SignalPropertiesAction.label"
-				style="pulldown"
-				helpContextId="signal_properties_action_context"
-				class="org.eclipse.ptp.debug.internal.ui.actions.SignalPropertiesActionDelegate"
-				tooltip="%SignalPropertiesAction.tooltip"
-				enablesFor="1"
-				id="org.eclipse.ptp.debug.ui.SignalPropertiesAction">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui">
-					</pluginState>
-				</enablement>
-			</action>
-		</objectContribution>
-		<objectContribution
-			objectClass="org.eclipse.ptp.debug.core.model.IResumeWithoutSignal"
-			id="org.eclipse.ptp.debug.ui.DebugTargetActions">
-		</objectContribution>
-		<!-- signal end -->
-		<!-- debug view start -->
-		<viewerContribution
-			targetID="org.eclipse.debug.ui.DebugView"
-			id="org.eclipse.ptp.debug.ui.debugview.popupMenu">
-			<action
-				label="%RestartAction.label"
-				icon="icons/tool/restart_normal.gif"
-				helpContextId="restart_action_context"
-				class="org.eclipse.ptp.debug.internal.ui.actions.RestartActionDelegate"
-				menubarPath="stepGroup"
-				enablesFor="1"
-				id="org.eclipse.ptp.debug.internal.ui.actions.RestartActionDelegate">
-				<selection class="org.eclipse.ptp.debug.core.model.IRestart"/>
-			</action>
-			<action
-				state="false"
-				style="toggle"
-				id="org.eclipse.ptp.debug.internal.ui.actions.ToggleInstructionStepModeActionDelegate"
-				class="org.eclipse.ptp.debug.internal.ui.actions.ToggleInstructionStepModeActionDelegate"
-				enablesFor="1"
-				icon="icons/tool/stepinto_normal.gif"
-				helpContextId="toggle_instruction_step_mode_action_context"
-				label="%ToggleInstructionStepModeAction.label"
-				menubarPath="renderGroup"
-				tooltip="%ToggleInstructionStepModeAction.tooltip">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui">
-					</pluginState>
-				</enablement>
-			</action>
-			<action
-				helpContextId="signal_zero_action_context"
-				enablesFor="1"
-				label="%SignalZeroAction.label"
-				tooltip="%SignalZeroAction.tooltip"
-				class="org.eclipse.ptp.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate"
-				menubarPath="threadGroup"
-				id="org.eclipse.ptp.debug.internal.ui.actions.SignalZeroWorkbenchActionDelegate">
-				<selection class="org.eclipse.ptp.debug.core.model.IResumeWithoutSignal"/>
-			</action>
-		</viewerContribution>
-		<!-- debug view end -->
-		<!-- variable view start -->
-		<!--//
-		<viewerContribution
-			targetID="org.eclipse.debug.ui.VariableView"
-			id="org.eclipse.ptp.debug.ui.variablesView.popupMenu">
-			<action
-				helpContextId="remove_all_globals_action_context"
-				enablesFor="*"
-				label="%RemoveAllGlobalsAction.label"
-				tooltip="%RemoveAllGlobalsAction.tooltip"
-				icon="icons/rem_all_co.gif"
-				class="org.eclipse.ptp.debug.internal.ui.actions.RemoveAllGlobalsActionDelegate"
-				menubarPath="additions"org.eclipse.cdt.debug.core.model.ICastToType
-				id="org.eclipse.ptp.debug.internal.ui.actions.RemoveAllGlobalsActionDelegate">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui"/>
-				</enablement>
-			</action>
-			<action
-				helpContextId="remove_globals_action_context"
-				enablesFor="+"
-				label="%RemoveGlobalsAction.label"
-				tooltip="%RemoveGlobalsAction.tooltip"
-				icon="icons/rem_co.gif"
-				class="org.eclipse.ptp.debug.internal.ui.actions.RemoveGlobalsActionDelegate"
-				menubarPath="additions"
-				id="org.eclipse.ptp.debug.internal.ui.actions.RemoveGlobalsActionDelegate">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui"/>
-				</enablement>
-			</action>
-			<action
-				helpContextId="add_globals_action_context"
-				enablesFor="1"
-				label="%AddGlobalsAction.label"
-				class="org.eclipse.ptp.debug.internal.ui.actions.AddGlobalsActionDelegate"
-				icon="icons/watch_globals.gif"
-				menubarPath="additions"
-				id="org.eclipse.ptp.debug.internal.ui.actions.AddGlobalsActionDelegate">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui"/>
-				</enablement>
-			</action>
-			<action
-				label="%DisableVariablesAction.label"
-				helpContextId="disable_variables_action_context"
-				tooltip="%DisableVariablesAction.tooltip"
-				class="org.eclipse.ptp.debug.internal.ui.actions.DisableVariablesActionDelegate"
-				menubarPath="variableGroup"
-				enablesFor="2+"
-				id="org.eclipse.ptp.debug.internal.ui.actions.DisableVariablesActionDelegate">
-				<selection
-					class="org.eclipse.ptp.debug.core.model.IPVariable">
-				</selection>
-			</action>
-			<action
-				label="%EnableVariablesAction.label"
-				helpContextId="enable_variables_action_context"
-				tooltip="%EnableVariablesAction.tooltip"
-				class="org.eclipse.ptp.debug.internal.ui.actions.EnableVariablesActionDelegate"
-				menubarPath="variableGroup"
-				enablesFor="2+"
-				id="org.eclipse.ptp.debug.internal.ui.actions.EnableVariablesActionDelegate">
-				<selection
-					class="org.eclipse.ptp.debug.core.model.IPVariable">
-				</selection>
-			</action>
-		</viewerContribution>
-		//-->
-		<!-- variable view end -->      
-	</extension>
-	
-	<!--
-	<extension
-		point="org.eclipse.ui.viewActions">
-	//-->
-		<!-- variable toolbar start //-->
-		<!--
-		<viewContribution
-			targetID="org.eclipse.debug.ui.VariableView"
-			id="org.eclipse.debug.ui.variablesView.toolbar">
-			<menu
-				label="PVariableMenu"
-				id="org.eclipse.ptp.debug.ui.PVariableMenu"
-				path="additions">
-				<separator name="pVarGroup" />
-			</menu>
-			<action
-				helpContextId="ptp_variables_dialog_action_context"
-				label="%OpenPVariableDialogAction.label"
-				tooltip="%OpenPVariableDialogAction.tooltip"
-				icon="icons/debug/ptp_bpt_set.gif"
-				toolbarPath="Normal/pVarGroup"
-				state="true"
-				class="org.eclipse.ptp.debug.internal.ui.actions.OpenPVariableDialogActionDelegate"
-				id="org.eclipse.ptp.debug.internal.ui.actions.OpenPVariableDialogActionDelegate">
-				<enablement>
-					<pluginState
-						value="activated"
-						id="org.eclipse.ptp.debug.ui"/>
-				</enablement>
-			</action>
-			<action
-				helpContextId="ptp_update_all_variables_action_context"
-				label="%UpdateAllPVariableAction.label"
-				tooltip="%UpdateAllPVariableAction.tooltip"
-				icon="icons/debug/ptp_bpt_set.gif"
-				toolbarPath="Normal/pVarGroup"
-				class="org.eclipse.ptp.debug.internal.ui.actions.UpdateVariablesActionDelegate"
-				id="org.eclipse.ptp.debug.internal.ui.actions.UpdateVariablesActionDelegate">
-			</action>
-			<action
-				helpContextId="ptp_remove_all_variables_action_context"
-				label="%RemoveAllPVariableAction.label"
-				tooltip="%RemoveAllPVariableAction.tooltip"
-				icon="icons/debug/ptp_bpt_set.gif"
-				toolbarPath="Normal/pVarGroup"
-				class="org.eclipse.ptp.debug.internal.ui.actions.RemoveAllPVariableActionDelegate"
-				id="org.eclipse.ptp.debug.internal.ui.actions.RemoveAllPVariableActionDelegate">
-			</action>
-			<action
-				helpContextId="ptp_add_variable_action_context"
-				label="%AddPVariableAction.label"
-				tooltip="%AddPVariableAction.tooltip"
-				icon="icons/debug/ptp_bpt_set.gif"
-				toolbarPath="Normal/pVarGroup"
-				enablesFor="1"
-				class="org.eclipse.ptp.debug.internal.ui.actions.AddPVariableActionDelegate"
-				id="org.eclipse.ptp.debug.internal.ui.actions.AddPVariableActionDelegate">
-			</action>
-		</viewContribution>
-		//-->
-		<!-- variable toolbar end //-->
-		<!--
-		<viewContribution
-			targetID="org.eclipse.debug.ui.BreakpointView"
-			id="org.eclipse.ptp.debug.ui.breakpointView.menu">
-			<action
-				label="%ShowFullPathsAction.label"
-				icon="icons/tool/show_paths.gif"
-				style="toggle"
-				tooltip="%ShowFullPathsAction.tooltip"
-				class="org.eclipse.ptp.debug.internal.ui.actions.ShowFullPathsAction"
-				menubarPath="pDebugActions"
-				id="org.eclipse.ptp.debug.internal.ui.actions.ShowFullPathsAction">
-			</action>
-		</viewContribution>
-		//-->
-	<!--
-	</extension>
-	//-->
-	
-	<!-- editor actions //-->
-	<!--
-	<extension
-		point="org.eclipse.ui.editorActions">
-		<editorContribution
-			targetID="org.eclipse.cdt.ui.editor.CEditor"
-			id="org.eclipse.ptp.debug.ui.CEditor.BreakpointRulerActions">
-			<action
-				label="%ToggleBreakpoint.label"
-				class="org.eclipse.ptp.debug.internal.ui.actions.ManageBreakpointRulerActionDelegate"
-				actionID="RulerDoubleClick"
-				id="org.eclipse.ptp.debug.ui.CEditor.ManageBreakpointRulerAction">
-			</action>
-		</editorContribution>
-	</extension>
-	//-->
-	<!-- text hovers //-->
-	<extension
-		point="org.eclipse.cdt.ui.textHovers">
-		<hover
-			label="%DebugTextHover.label"
-			description="%DebugTextHover.description"
-			class="org.eclipse.ptp.debug.internal.ui.editors.PDebugTextHover"
-			id="org.eclipse.ptp.debug.internal.ui.editors.PDebugTextHover">
-		</hover>
-	</extension>		
-	
-	<!-- property pages //-->
-	<extension
-		point="org.eclipse.ui.propertyPages">
-		<page
-			class="org.eclipse.ptp.debug.internal.ui.propertypages.PBreakpointPropertyPage"
-			name="%CommonBreakpointPage.label"
-			id="org.eclipse.ptp.debug.ui.propertypages.breakpoint.common">
-			<enabledWhen>
-				<adapt
-					type="org.eclipse.ptp.debug.core.model.IPBreakpoint">
-				</adapt>
-			</enabledWhen>
-		</page>
-		<!--
-		<page
-			adaptable="true"
-			objectClass="org.eclipse.ptp.debug.core.model.IPBreakpoint"
-			class="org.eclipse.ptp.debug.internal.ui.propertypages.PBreakpointFilteringPage"
-			name="%FilteringBreakpointPage.label"
-			id="org.eclipse.ptp.debug.ui.propertypages.breakpoint.filtering"/>
-		//-->
-		<page
-			class="org.eclipse.ptp.debug.internal.ui.propertypages.SignalPropertyPage"
-			name="%CommonSignalPage.label"
-			id="org.eclipse.ptp.debug.ui.propertypages.signal.common">
-			<enabledWhen>
-				<adapt
-					type="org.eclipse.ptp.debug.core.model.IPSignal">
-				</adapt>
-			</enabledWhen>
-		</page>
-	</extension>
-	
-	<!-- source locators //-->
-	<extension
-		point="org.eclipse.debug.core.sourceLocators">
-		<sourceLocator
-			name="%DefaultSourceLocator.name"
-			class="org.eclipse.ptp.debug.ui.sourcelookup.DefaultSourceLocator"
-			id="org.eclipse.ptp.debug.ui.DefaultSourceLocator">
-		</sourceLocator>
-	</extension>
-
-	<!-- new //-->
-	<extension
-		point="org.eclipse.ui.contexts">
-		<context
-			name="%DebuggingPContext.name"
-			description="%DebuggingPContext.description"
-			parentId="org.eclipse.debug.ui.debugging"
-			id="org.eclipse.ptp.debug.ui.debugging">
-		</context>
-	</extension>
-	<extension
-		point="org.eclipse.debug.ui.debugModelContextBindings">
-		<modelContextBinding
-			debugModelId="org.eclipse.ptp.debug.core"
-			contextId="org.eclipse.ptp.debug.ui.debugging">
-		</modelContextBinding>
-	</extension>
-	<extension
-		point="org.eclipse.debug.ui.contextViewBindings">
-		<contextViewBinding
-			viewId="org.eclipse.debug.ui.MemoryView"
-			contextId="org.eclipse.ptp.debug.ui.debugging">
-		</contextViewBinding>
-		<contextViewBinding
-			autoOpen="false"
-			contextId="org.eclipse.ptp.debug.ui.debugging"
-			viewId="org.eclipse.ptp.debug.ui.SignalsView">
-		</contextViewBinding>
-		<contextViewBinding
-			viewId="org.eclipse.debug.ui.RegisterView"
-			contextId="org.eclipse.ptp.debug.ui.debugging">
-		</contextViewBinding>
-	</extension>
-
-	<!-- annotation //-->
-	<extension
-		point="org.eclipse.ui.editors.annotationTypes">
-		<type
-			markerType="org.eclipse.ptp.debug.core.pBreakpointMarker"
-			super="org.eclipse.debug.core.breakpoint"
-			name="org.eclipse.ptp.debug.core.breakpoint">
-		</type>
-		<type
-			markerType="org.eclipse.ptp.debug.ui.regCurrentIP"
-			name="org.eclipse.ptp.debug.ui.regCurrentIP">
-		</type>
-		<type
-			markerType="org.eclipse.ptp.debug.ui.regSecondaryIP"
-			name="org.eclipse.ptp.debug.ui.regSecondaryIP">
-		</type>      
-		<type
-			markerType="org.eclipse.ptp.debug.ui.currentSetIP"
-			name="org.eclipse.ptp.debug.ui.currentSetIP">
-		</type>      
-		<type
-			markerType="org.eclipse.ptp.debug.ui.setIP"
-			name="org.eclipse.ptp.debug.ui.setIP">
-		</type>      
-	</extension>
-	<extension
-		point="org.eclipse.ui.editors.markerAnnotationSpecification">
-		<specification
-        annotationImageProvider="org.eclipse.ptp.debug.internal.ui.BreakpointImageProvider"
-        annotationType="org.eclipse.ptp.debug.core.breakpoint"
-        label="%PBreakpointAnnotation.label"
-        presentationLayer="4">
-		</specification>
-		<specification
-        annotationType="org.eclipse.ptp.debug.ui.regCurrentIP"
-        colorPreferenceKey="ptpRegCurrentIPColor"
-        colorPreferenceValue="102,204,255"
-        highlightPreferenceKey="ptpRegCurrentIPHighlight"
-        highlightPreferenceValue="true"
-        icon="icons/debug/reg_cur_ip.gif"
-        label="%CurrentRegIPAnnotation.label"
-        overviewRulerPreferenceKey="ptpRegCucurrentIPOverviewRuler"
-        overviewRulerPreferenceValue="true"
-        presentationLayer="7"
-        textPreferenceKey="ptpRegCurrentIPIndication"
-        textPreferenceValue="false"
-        verticalRulerPreferenceKey="ptpRegCurrentIPVerticalRuler"
-        verticalRulerPreferenceValue="true">
-		</specification>
-		<specification
-        annotationType="org.eclipse.ptp.debug.ui.regSecondaryIP"
-        colorPreferenceKey="ptpRegSecondaryIPColor"
-        colorPreferenceValue="204,255,102"
-        highlightPreferenceKey="ptpRegSecondaryIPHighlight"
-        highlightPreferenceValue="true"
-        icon="icons/debug/reg_sec_ip.gif"
-        label="%RegIPAnnotation.label"
-        overviewRulerPreferenceKey="ptpRegSecondaryIPOverviewRuler"
-        overviewRulerPreferenceValue="true"
-        presentationLayer="7"
-        textPreferenceKey="ptpRegSecondaryIPIndication"
-        textPreferenceValue="false"
-        verticalRulerPreferenceKey="ptpRegSecondaryIPVerticalRuler"
-        verticalRulerPreferenceValue="true">
-		</specification>
-		<specification
-        annotationType="org.eclipse.ptp.debug.ui.currentSetIP"
-        colorPreferenceKey="ptpCurrentIPColor"
-        colorPreferenceValue="255,204,102"
-        highlightPreferenceKey="ptpCurrentSetIPHighlight"
-        highlightPreferenceValue="true"
-        icon="icons/debug/cur_set_ip.gif"
-        label="%CurrentSetIPAnnotation.label"
-        overviewRulerPreferenceKey="ptpCurrentSetIPOverviewRuler"
-        overviewRulerPreferenceValue="true"
-        presentationLayer="6"
-        textPreferenceKey="ptpCurrentSetIPIndication"
-        textPreferenceValue="false"
-        verticalRulerPreferenceKey="ptpCurrentSetIPVerticalRuler"
-        verticalRulerPreferenceValue="true">
-		</specification>
-		<specification
-        annotationType="org.eclipse.ptp.debug.ui.setIP"
-        colorPreferenceKey="ptpSecondaryIPColor"
-        colorPreferenceValue="204,255,102"
-        highlightPreferenceKey="ptpSetIPHighlight"
-        highlightPreferenceValue="true"
-        icon="icons/debug/set_ip.gif"
-        label="%SetIPAnnotation.label"
-        overviewRulerPreferenceKey="ptpSetIPOverviewRuler"
-        overviewRulerPreferenceValue="true"
-        presentationLayer="6"
-        textPreferenceKey="ptpSetIPIndication"
-        textPreferenceValue="false"
-        verticalRulerPreferenceKey="ptpSetIPVerticalRuler"
-        verticalRulerPreferenceValue="true">
-		</specification>
-	</extension>
-
-	<!-- runtime adapters //-->
-	<extension point="org.eclipse.core.runtime.adapters">
-		<factory 
-			class="org.eclipse.ptp.debug.internal.ui.actions.RetargettableActionAdapterFactory" 
-			adaptableType="org.eclipse.cdt.internal.ui.editor.CEditor">
-			<adapter
-				type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget">
-			</adapter>
-			<adapter
-				type="org.eclipse.debug.ui.actions.IRunToLineTarget">
-			</adapter>
-		</factory>
-		<factory
-			class="org.eclipse.ptp.debug.internal.ui.actions.RetargettableActionAdapterFactory"
-			adaptableType="org.eclipse.ui.views.contentoutline.ContentOutline">
-			<adapter
-				type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget">
-			</adapter>
-		</factory>
-		<factory
-			class="org.eclipse.ptp.debug.internal.ui.PBreakpointWorkbenchAdapterFactory"
-			adaptableType="org.eclipse.ptp.debug.core.model.IPBreakpoint">
-			<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-		</factory>
-		<factory
-			adaptableType="org.eclipse.cdt.debug.core.sourcelookup.MappingSourceContainer"
-			class="org.eclipse.ptp.debug.internal.ui.sourcelookup.SourceContainerAdapterFactory">
-			<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-		</factory>
-		<factory
-			adaptableType="org.eclipse.cdt.debug.internal.core.sourcelookup.MapEntrySourceContainer"
-			class="org.eclipse.ptp.debug.internal.ui.sourcelookup.SourceContainerAdapterFactory">
-			<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-		</factory>
-		<factory
-			adaptableType="org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer"
-			class="org.eclipse.ptp.debug.internal.ui.sourcelookup.SourceContainerAdapterFactory">
-			<adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-		</factory>
-	</extension>
-
-	<!-- Watch Expression //-->
-	<extension
-		point="org.eclipse.debug.core.watchExpressionDelegates">
-		<watchExpressionDelegate
-			debugModel="org.eclipse.ptp.debug.core"
-			delegateClass="org.eclipse.ptp.debug.internal.ui.PWatchExpressionDelegate"/>
-	</extension>
-	<!-- Memory //-->
-	<extension
-		point="org.eclipse.debug.ui.memoryRenderings">
-		<renderingBindings
-			defaultIds="org.eclipse.debug.ui.rendering.raw_memory"
-			primaryId="org.eclipse.debug.ui.rendering.raw_memory"
-			renderingIds="org.eclipse.debug.ui.rendering.raw_memory,org.eclipse.debug.ui.rendering.ascii,org.eclipse.debug.ui.rendering.signedint,org.eclipse.debug.ui.rendering.unsignedint">
-			<enablement>
-				<instanceof value="org.eclipse.ptp.debug.internal.core.model.PMemoryBlockExtension"/>
-			</enablement>
-		</renderingBindings>
-	</extension>
-	<!-- source container //-->
-	<extension
-		point="org.eclipse.debug.ui.sourceContainerPresentations">
-		<sourceContainerPresentation
-			browserClass="org.eclipse.ptp.debug.internal.ui.sourcelookup.MappingSourceContainerBrowser"
-			containerTypeID="org.eclipse.ptp.debug.core.containerType.mapping"
-			icon="icons/obj16/mapping_obj.gif"
-			id="org.eclipse.ptp.debug.ui.sourceContainerPresentation.mapping"/>
-		<sourceContainerPresentation
-			containerTypeID="org.eclipse.ptp.debug.core.containerType.mapEntry"
-			icon="icons/obj16/mapentry_obj.gif"
-			id="org.eclipse.ppt.debug.ui.sourceContainerPresentation.mapEntry"/>
-		<sourceContainerPresentation
-			containerTypeID="org.eclipse.ptp.debug.core.containerType.absolutePath"
-			icon="icons/obj16/abspath_obj.gif"
-			id="org.eclipse.ptp.debug.ui.sourceContainerPresentation.absolutePath"/>
-	</extension>
-
-	<!-- testing
-	<extension
-		point="org.eclipse.core.filebuffers.annotationModelCreation">
-		<factory
-			class="org.eclipse.ptp.debug.internal.ui.DebugMarkerAnnotationModelFactory"
-			contentTypeId="org.eclipse.ptt.core.pSource"/>
-	</extension>
-	//-->
-</plugin>

diff --git a/debug/org.eclipse.ptp.debug.ui/schema/debuggerConfigurations.exsd b/debug/org.eclipse.ptp.debug.ui/schema/debuggerConfigurations.exsd
deleted file mode 100644
index 2a542e4..0000000
--- a/debug/org.eclipse.ptp.debug.ui/schema/debuggerConfigurations.exsd
+++ /dev/null

@@ -1,130 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.debug.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.debug.ui" id="debuggerConfigurations" name="Debugger Configuration Pages"/>
-      </appInfo>
-      <documentation>
-         This extension point provides a mechanism for contributing UI for org.eclipse.ptp.debug.ui.IPDebuggerConfigurationPage extensions.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="debuggerConfiguration" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="debuggerConfiguration">
-      <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  specifies a unique identifier for this debugger page.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="debuggerID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  specifies the identifier of the debugger this page is associated with.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  specifies a fully qualified name of a Java class that implements &amp;lt;code&amp;gt;IPDebuggerConfigurationPage&amp;lt;/code&amp;gt;
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.debug.ui.ILaunchConfigurationTab"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;extension point=&quot;org.eclipse.ptp.debug.ui.PDebuggerPage&quot;&gt;
-      &lt;debugPage
-            class=&quot;org.eclipse.ptp.debug.external.ui.SDMPage&quot;
-            debuggerID=&quot;org.eclipse.ptp.debug.external.sdm&quot;
-            id=&quot;org.eclipse.ptp.debug.external.ui.SDMPage&quot;&gt;
-      &lt;/debugPage&gt;
-&lt;/extension&gt;
-In the above example, the contributed UI component (org.eclipse.ptp.debug.external.ui.SDMPage) will be used for the debuggers with the &quot;org.eclipse.ptp.debug.external.sdm&quot; debugger id.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Value of the attribute class must be a fully qualified name of a Java class that implements the interface org.eclipse.ptp.debug.ui.IPDebuggerPage.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006 QNX Software Systems 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
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/AnnotationGroup.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/AnnotationGroup.java
deleted file mode 100644
index 97b5c10..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/AnnotationGroup.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-
-/**
- * @author Clement chu
- * 
- */
-public class AnnotationGroup {
-	private List<PInstructionPointerAnnotation2> annotationList = Collections.synchronizedList(new ArrayList<PInstructionPointerAnnotation2>());
-
-	/** Check the annotation whether it contains in the list
-	 * @param annotation
-	 * @return true if contains
-	 */
-	public boolean contains(PInstructionPointerAnnotation2 annotation) {
-		synchronized (annotationList) {
-			return annotationList.contains(annotation);
-		}
-	}
-	/** Add a new annotation to the list
-	 * @param annotation
-	 */
-	public void addAnnotation(PInstructionPointerAnnotation2 annotation) {
-		synchronized (annotationList) {
-			if (!contains(annotation))
-				annotationList.add(annotation);
-		}
-	}
-	/** Remove annotations from the list
-	 * @param removedAnnotations list of annotations
-	 */
-	public void removeAnnotations(Collection<PInstructionPointerAnnotation2> removedAnnotations) {
-		synchronized (annotationList) {
-			annotationList.removeAll(removedAnnotations);
-		}
-	}
-	/** Remove annotation from the list
-	 * @param annotation
-	 */
-	public void removeAnnotation(PInstructionPointerAnnotation2 annotation) {
-		synchronized (annotationList) {
-			if (contains(annotation))
-				annotationList.remove(annotation);
-		}
-	}
-	public PInstructionPointerAnnotation2[] getAnnotations() {
-		synchronized (annotationList) {
-			return annotationList.toArray(new PInstructionPointerAnnotation2[0]);
-		}
-	}
-	/** Remove all annotations
-	 * 
-	 */
-	public void removeAnnotations() {
-		synchronized (annotationList) {
-			throwAllAnnotations();
-			annotationList.clear();
-		}
-	}
-	/** Total annotations
-	 * @return total annotations
-	 */
-	public int size() {
-		return annotationList.size();
-	}
-	/** Is annotation list empty
-	 * @return true if there is no annotation stored
-	 */
-	public boolean isEmpty() {
-		return annotationList.isEmpty();
-	}
-	/** Remove all annotation markers
-	 * 
-	 */
-	public void throwAllAnnotations() {
-		synchronized (annotationList) {
-			for (PInstructionPointerAnnotation2 annotation : getAnnotations()) {
-				annotation.removeAnnotation();
-			}
-		}
-	}
-	/** Retrieve all markers
-	 * 
-	 */
-	public void retrieveAllAnnontations() {
-		synchronized (annotationList) {
-			for (PInstructionPointerAnnotation2 annotation : getAnnotations()) {
-				String type = annotation.getType();
-				if (type.equals(IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT))
-					type = IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT;
-				
-				if (annotation.isMarkDeleted()) {
-					annotation.addAnnotationToModel();
-					annotation.setMessage(!type.equals(IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT));
-				}
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/BreakpointImageProvider.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/BreakpointImageProvider.java
deleted file mode 100644
index 30f117c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/BreakpointImageProvider.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.texteditor.IAnnotationImageProvider;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
-/**
- * @author Clement chu
- *
- */
-public class BreakpointImageProvider implements IAnnotationImageProvider {
-	private IDebugModelPresentation debugModelPresentation = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation)
-	 */
-	public Image getManagedImage(Annotation annotation) {
-		if (annotation instanceof MarkerAnnotation) {
-			MarkerAnnotation markerAnnotation = (MarkerAnnotation)annotation;
-			IMarker marker = markerAnnotation.getMarker();
-			if (marker != null && marker.exists())
-				return getPresentation().getImage(marker);
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation)
-	 */
-	public String getImageDescriptorId(Annotation annotation) {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String)
-	 */
-	public ImageDescriptor getImageDescriptor(String imageDescritporId) {
-		return null;
-	}
-	
-	/** Get IDebugModelPresentation
-	 * @return
-	 */
-	private IDebugModelPresentation getPresentation() {
-		if (debugModelPresentation == null)
-			debugModelPresentation = DebugUITools.newDebugModelPresentation();
-		
-		return debugModelPresentation;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageCache.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageCache.java
deleted file mode 100644
index 3b01ab8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageCache.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Clement chu
- *
- */
-public class OverlayImageCache {
-	private Map<OverlayImageDescriptor, Image> cache = new HashMap<OverlayImageDescriptor, Image>();
-
-	/** Get image 
-	 * @param imageDescriptor
-	 * @return
-	 */
-	public Image getImageFor(OverlayImageDescriptor imageDescriptor) {
-		Image image = (Image)getCache().get(imageDescriptor);
-		if (image == null) {
-			image = imageDescriptor.createImage();
-			getCache().put(imageDescriptor, image);
-		}
-		return image;
-	}
-
-	/** Dispose all stored images
-	 * 
-	 */
-	public void disposeAll() {
-		for (Iterator<Image> it = getCache().values().iterator(); it.hasNext();) {
-			Image image = it.next();
-			image.dispose();
-		}
-		getCache().clear();
-	}
-
-	/** Get stored images
-	 * @return
-	 */
-	private Map<OverlayImageDescriptor, Image> getCache() {
-		return cache;
-	}
-}
-
-

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageDescriptor.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageDescriptor.java
deleted file mode 100644
index 3add002..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/OverlayImageDescriptor.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.util.Arrays;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @author Clement chu
- * 
- */
-public class OverlayImageDescriptor extends CompositeImageDescriptor {
-	private static final int DEFAULT_WIDTH = 16;
-	private static final int DEFAULT_HEIGHT = 16;
-	public static final int TOP_LEFT = 0;
-	public static final int TOP_RIGHT = 1;
-	public static final int BOTTOM_LEFT = 2;
-	public static final int BOTTOM_RIGHT = 3;
-	// the base image
-	private Image base;
-	// the overlay images
-	private ImageDescriptor[] overlays;
-	// the size
-	private Point size;
-
-	/** Constructor
-	 * @param base
-	 * @param overlays
-	 */
-	public OverlayImageDescriptor(Image base, ImageDescriptor[] overlays) {
-		this(base, overlays, new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT));
-	}
-	/** Constructor
-	 * @param base
-	 * @param overlays
-	 * @param size
-	 */
-	public OverlayImageDescriptor(Image base, ImageDescriptor[] overlays, Point size) {
-		setBase(base);
-		setOverlays(overlays);
-		setSize(size);
-	}
-	/** Draw overlays
-	 * @param overlays
-	 */
-	protected void drawOverlays(ImageDescriptor[] overlays) {
-		Point size = getSize();
-		for (int i = 0; i < overlays.length; i++) {
-			ImageDescriptor overlay = overlays[i];
-			if (overlay == null)
-				continue;
-			ImageData overlayData = overlay.getImageData();
-			// Use the missing descriptor if it is not there.
-			if (overlayData == null)
-				overlayData = ImageDescriptor.getMissingImageDescriptor().getImageData();
-			switch (i) {
-			case TOP_LEFT:
-				drawImage(overlayData, 0, 0);
-				break;
-			case TOP_RIGHT:
-				drawImage(overlayData, size.x - overlayData.width, 0);
-				break;
-			case BOTTOM_LEFT:
-				drawImage(overlayData, 0, size.y - overlayData.height);
-				break;
-			case BOTTOM_RIGHT:
-				drawImage(overlayData, size.x - overlayData.width, size.y - overlayData.height);
-				break;
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object o) {
-		if (!(o instanceof OverlayImageDescriptor))
-			return false;
-		OverlayImageDescriptor other = (OverlayImageDescriptor) o;
-		return getBase().equals(other.getBase()) && Arrays.equals(getOverlays(), other.getOverlays());
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		int code = getBase().hashCode();
-		for (int i = 0; i < getOverlays().length; i++) {
-			if (getOverlays()[i] != null)
-				code ^= getOverlays()[i].hashCode();
-		}
-		return code;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
-	 */
-	protected void drawCompositeImage(int width, int height) {
-		drawImage(getBase().getImageData(), 0, 0);
-		drawOverlays(getOverlays());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-	 */
-	protected Point getSize() {
-		return size;
-	}
-	/** Get base image
-	 * @return
-	 */
-	private Image getBase() {
-		return base;
-	}
-	/** Set base image
-	 * @param base
-	 */
-	private void setBase(Image base) {
-		this.base = base;
-	}
-	/** Get overlays images
-	 * @return
-	 */
-	private ImageDescriptor[] getOverlays() {
-		return this.overlays;
-	}
-	/** Set overlays images
-	 * @param overlays
-	 */
-	private void setOverlays(ImageDescriptor[] overlays) {
-		this.overlays = overlays;
-	}
-	/** Set size
-	 * @param size
-	 */
-	private void setSize(Point size) {
-		this.size = size;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PAnnotationManager.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PAnnotationManager.java
deleted file mode 100644
index 06cf3e4..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PAnnotationManager.java
+++ /dev/null

@@ -1,953 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.sourcelookup.ISourceLookupResult;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.resources.FileStorage;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPDebugEventListener;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.core.event.IPDebugInfo;
-import org.eclipse.ptp.debug.core.event.IPDebugSuspendInfo;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPThread;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIListStackFramesRequest;
-import org.eclipse.ptp.debug.core.sourcelookup.PSourceLookupDirector;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugLocator;
-import org.eclipse.ptp.proxy.debug.client.ProxyDebugStackFrame;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.listeners.IJobChangedListener;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.progress.WorkbenchJob;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/*
- * @author Clement chu
- * 
- */
-public class PAnnotationManager implements IJobChangedListener, IPDebugEventListener {
-	private static PAnnotationManager instance = null;
-	private final Object LOCK = new Object();
-	protected Map<String, AnnotationGroup> annotationMap = Collections.synchronizedMap(new HashMap<String, AnnotationGroup>());
-	protected UIDebugManager uiDebugManager = null;
-
-	/* Constructor
-	 * @param uiDebugManager
-	 */
-	public PAnnotationManager(UIDebugManager uiDebugManager) {
-		this.uiDebugManager = uiDebugManager;
-		// make sure every time created the same object reference
-		if (instance == null) {
-			uiDebugManager.addJobChangedListener(this);
-			PTPDebugCorePlugin.getDefault().addDebugEventListener(this);
-			instance = this;
-		}
-	}
-	/* Get instance of PAnnotationManager
-	 * @return
-	 */
-	public static PAnnotationManager getDefault() {
-		if (instance == null)
-			instance = new PAnnotationManager(PTPDebugUIPlugin.getUIDebugManager());
-		return instance;
-	}
-	/* Clean all settings and listeners
-	 * 
-	 */
-	public void shutdown() {
-		clearAllAnnotations();
-		PTPDebugCorePlugin.getDefault().removeDebugEventListener(this);
-		uiDebugManager.removeJobChangedListener(this);
-		annotationMap = null;
-	}
-	/* Clean all stored annotations
-	 * 
-	 */
-	protected void clearAllAnnotations() {
-		synchronized (LOCK) {
-			for (Iterator<AnnotationGroup> i = annotationMap.values().iterator(); i.hasNext();) {
-				i.next().removeAnnotations();
-			}
-			annotationMap.clear();
-		}
-	}
-	/* Remove annotation group by given job
-	 * @param job_id job ID
-	 */
-	protected void removeAnnotationGroup(String job_id) {
-		synchronized (LOCK) {
-			AnnotationGroup annotationGroup = (AnnotationGroup) annotationMap.remove(job_id);
-			if (annotationGroup != null) {
-				annotationGroup.removeAnnotations();
-			}
-		}
-	}
-	/* Add annotation to given job
-	 * @param job_id Job ID
-	 * @param annotationGroup
-	 */
-	protected void putAnnotationGroup(String job_id, AnnotationGroup annotationGroup) {
-		synchronized (LOCK) {
-			annotationMap.put(job_id, annotationGroup);
-		}
-	}
-	/* Get annotation by given hob ID
-	 * @param job_id job ID
-	 * @return
-	 */
-	protected AnnotationGroup getAnnotationGroup(String job_id) {
-		synchronized (LOCK) {
-			return (AnnotationGroup) annotationMap.get(job_id);
-		}
-	}
-
-	/* Get editor and open editor if it is not opened or focus on it if it is already opened
-	 * @param page
-	 * @param input
-	 * @param id
-	 * @return
-	 */
-	protected IEditorPart openEditor(final IWorkbenchPage page, final IEditorInput input, final String id) {
-		final IEditorPart[] editor = new IEditorPart[] { null };
-		Runnable r = new Runnable() {
-			public void run() {
-				try {
-					editor[0] = page.openEditor(input, id, false);
-				} catch (PartInitException e) {
-					PTPDebugUIPlugin.errorDialog(PTPDebugUIPlugin.getActiveWorkbenchShell(), "Error", "Cannot open editor", e);
-				}
-			}
-		};
-		BusyIndicator.showWhile(Display.getDefault(), r);
-		return editor[0];
-	}
-	/* Get editor part
-	 * @param file
-	 * @return
-	 */
-	protected IEditorPart getEditorPart(final IFile file) {
-		final IEditorPart[] editor = new IEditorPart[] { null };
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-				IWorkbenchPage page = PTPDebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editorPart = page.getActiveEditor();
-				if (editorPart != null) {
-					IEditorInput editorInput = editorPart.getEditorInput();
-					if (editorInput instanceof IFileEditorInput) {
-						if (((IFileEditorInput) editorInput).getFile().equals(file)) {
-							page.bringToTop(editorPart);
-							editor[0] = editorPart;
-							return;
-						}
-					}
-				}
-				if (editor[0] == null) {
-					for (IEditorReference refs : page.getEditorReferences()) {
-						IEditorPart refEditor = refs.getEditor(false);
-						if (refEditor == null)
-							continue;
-						IEditorInput editorInput = refEditor.getEditorInput();
-						if (editorInput instanceof IFileEditorInput) {
-							if (((IFileEditorInput) editorInput).getFile().equals(file)) {
-								page.bringToTop(refEditor);
-								editor[0] = refEditor;
-								return;
-							}
-						}
-					}
-				}
-				try {
-					editor[0] = page.openEditor(PDebugUIUtils.getEditorInput(file), PDebugUIUtils.getEditorId(file), false);
-				} catch (PartInitException e) {
-					//PTPDebugUIPlugin.errorDialog(PTPDebugUIPlugin.getActiveWorkbenchShell(), "Error", "Cannot open editor", e);
-				}
-			}
-		});
-		return editor[0];
-	}
-	protected void displaySource(final ISourceLookupResult result) {
-		UIJob uiJob = new UIJob("Display source editor...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				IWorkbenchPage page = PTPDebugUIPlugin.getActiveWorkbenchWindow().getActivePage();
-				if (!monitor.isCanceled() && result != null && page != null) {
-					DebugUITools.displaySource(result, page);
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		uiJob.schedule();
-	}
-	/* Find file
-	 * @param fileName
-	 * @return
-	 */
-	protected IFile findFile(String filename) {
-		return findFile(new Path(filename));
-	}
-	protected IFile findFile(IPath location) {
-		IPath normalized = FileBuffers.normalizeLocation(location);
-		if (normalized.segmentCount() >= 2) {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(normalized);
-		}
-		return null;
-		/*
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IFile file= workspaceRoot.getFileForLocation(path);
-		if (file != null && file.exists())
-			return file;
-		
-		if (path.segmentCount() > 2)
-			return workspaceRoot.getFile(path.makeAbsolute());
-		return null;
-		*/
-	}
-	/* Get text editor
-	 * @param editorPart
-	 * @return
-	 */
-	protected ITextEditor getTextEditor(IEditorPart editorPart) {
-		if (editorPart instanceof ITextEditor)
-			return (ITextEditor) editorPart;
-		return (ITextEditor) editorPart.getAdapter(ITextEditor.class);
-	}
-	/* Get file
-	 * @param editorInput
-	 * @return
-	 */
-	protected IFile getFile(IEditorInput editorInput) {
-		if (editorInput instanceof IFileEditorInput)
-			return ((IFileEditorInput) editorInput).getFile();
-		if (editorInput instanceof IStorageEditorInput) {
-			try {
-				return findFile(((IStorageEditorInput)editorInput).getStorage().getFullPath());
-			} catch (CoreException e) {
-				return null;
-			}
-		}
-		if (editorInput instanceof IStorage) {
-			return findFile(((IStorage)editorInput).getName());
-		}
-		return null;
-	}
-	/* Create position in the source file
-	 * @param lineNumber
-	 * @param doc
-	 * @return
-	 */
-	protected Position createPosition(int lineNumber, IDocument doc) {
-		if (doc == null)
-			return null;
-		try {
-			IRegion region = doc.getLineInformation(lineNumber - 1);
-			int charStart = region.getOffset();
-			int length = region.getLength();
-			if (charStart < 0)
-				return null;
-			return new Position(charStart, length);
-		} catch (BadLocationException ble) {
-			return null;
-		}
-	}
-	/* Get tasks from debug target
-	 * @param debugTarget
-	 * @return
-	 */
-	protected BitList getTasks(IDebugTarget debugTarget) {
-		if (debugTarget instanceof IPDebugTarget) {
-			return ((IPDebugTarget) debugTarget).getTasks();
-		}
-		return null;
-	}
-	/* Get tasks from thread
-	 * @param thread
-	 * @return
-	 */
-	protected BitList getTasks(IThread thread) {
-		return getTasks(thread.getDebugTarget());
-	}
-	/* Is given type register type
-	 * @param type
-	 * @return
-	 */
-	protected boolean isRegisterType(String type) {
-		return (type.equals(IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_CURRENT) || type.equals(IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_SECONDARY));
-	}
-	/* Focus to annotation in source editor
-	 * @param editorPart
-	 * @param stackFrame
-	 * @throws CoreException
-	 */
-	protected void focusAnnotation(IEditorPart editorPart, IStackFrame stackFrame) throws CoreException {
-		ITextEditor textEditor = getTextEditor(editorPart);
-		int charStart = stackFrame.getCharStart();
-		if (charStart > 0) {
-			textEditor.selectAndReveal(charStart, 0);
-			return;
-		}
-		int lineNumber = stackFrame.getLineNumber();
-		lineNumber--;
-		IRegion region= getLineInformation(textEditor, lineNumber);
-		if (region != null) {
-			textEditor.selectAndReveal(region.getOffset(), 0);
-		}
-	}
-	/* Get line region in source editor
-	 * @param editor
-	 * @param lineNumber
-	 * @return
-	 */
-	protected IRegion getLineInformation(ITextEditor editor, int lineNumber) {
-		IDocumentProvider provider= editor.getDocumentProvider();
-		IEditorInput input= editor.getEditorInput();
-		try {
-			provider.connect(input);
-		} catch (CoreException e) {
-			return null;
-		}
-		try {
-			IDocument document= provider.getDocument(input);
-			if (document != null)
-				return document.getLineInformation(lineNumber);
-		} catch (BadLocationException e) {
-		} finally {
-			provider.disconnect(input);
-		}
-		return null;
-	}
-	// called by debug view - PDebugModelPresentation
-	/* Add annotation called from Debug View
-	 * @param editorPart
-	 * @param stackFrame
-	 * @throws CoreException
-	 */
-	public void addAnnotation(IEditorPart editorPart, IPStackFrame stackFrame) throws CoreException {
-		IPStackFrame selectedFrame = stackFrame;
-		
-		BitList tasks = getTasks(stackFrame.getDebugTarget());
-		if (tasks == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-		ITextEditor textEditor = getTextEditor(editorPart);
-		if (textEditor == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-		IFile file = getFile(textEditor.getEditorInput());
-		if (file == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-		
-		//try to find the stack frame with line number
-		if (selectedFrame.getLineNumber() == 0) {
-			IStackFrame[] frames = selectedFrame.getThread().getStackFrames();
-			for (IStackFrame frame : frames) {
-				if (frame.getLineNumber() > 0) {
-					selectedFrame = (IPStackFrame)frame;
-					break;
-				}
-			}
-		}
-		if (selectedFrame.getLineNumber() > 0) {
-			String job_id = uiDebugManager.getCurrentJobId();
-			synchronized (LOCK) {
-				AnnotationGroup annotationGroup = getAnnotationGroup(job_id);
-				if (annotationGroup == null) {
-					annotationGroup = new AnnotationGroup();
-					putAnnotationGroup(job_id, annotationGroup);
-				}
-				removeAnnotation(annotationGroup, tasks);
-				addAnnotation(annotationGroup, textEditor, file, selectedFrame.getLineNumber(), tasks, (selectedFrame.getLevel() > 1) ? IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_SECONDARY : IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_CURRENT);
-			}
-		}
-	}
-	private PSourceLookupDirector getSourceLocator(String job_id) {
-		IPSession session = uiDebugManager.getDebugSession(job_id);
-		if (session != null) {
-			ISourceLocator locator = session.getLaunch().getSourceLocator();
-			if (locator instanceof PSourceLookupDirector) {
-				return (PSourceLookupDirector)locator;
-			}
-		}
-		return null;
-	}
-	private IPath getFilePath(String job_id, String filename) {
-		PSourceLookupDirector locator = getSourceLocator(job_id);
-		if (locator != null) {
-			Object object = locator.getSourceElement(filename);
-			if (object instanceof IFile) {
-				return ((IFile)object).getFullPath();
-			}
-			if (object instanceof LocalFileStorage) {
-				return ((LocalFileStorage)object).getFullPath();
-			}
-			if (object instanceof FileStorage) {
-				return ((FileStorage)object).getFullPath();
-			}
-		}
-		return new Path(filename);
-	}
-	// called by event
-	/*
-	 * Add annotation called from debug event
-	 */
-	protected void addUnregisterAnnotation(String job_id, int level, String filename, int lineNumber, BitList tasks) throws CoreException {
-		if (tasks.isEmpty())
-			return;
-
-		IFile file = findFile(getFilePath(job_id, filename));
-		//IFile file = findFile(fullPathFileName);
-		if (file == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-
-		IEditorPart editorPart = getEditorPart(file);
-		if (editorPart == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-		ITextEditor textEditor = getTextEditor(editorPart);
-		if (textEditor == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-		
-		synchronized (LOCK) {
-			AnnotationGroup annotationGroup = getAnnotationGroup(job_id);
-			if (annotationGroup == null) {
-				annotationGroup = new AnnotationGroup();
-				putAnnotationGroup(job_id, annotationGroup);
-			}
-			addAnnotation(annotationGroup, textEditor, file, lineNumber, tasks, ((level > 1)?IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT:((containsCurrentSet(tasks)) ? IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT : IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT)));				
-		}
-	}
-	protected void addAnnotation(String job_id, int level, String filename, int lineNumber, BitList rTasks, BitList uTasks) throws CoreException {
-		IFile file = findFile(getFilePath(job_id, filename));
-		//IFile file = findFile(fullPathFileName);
-		if (file == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-
-		IEditorPart editorPart = getEditorPart(file);
-		if (editorPart == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-		ITextEditor textEditor = getTextEditor(editorPart);
-		if (textEditor == null)
-			throw new CoreException(Status.CANCEL_STATUS);
-		
-		synchronized (LOCK) {
-			AnnotationGroup annotationGroup = getAnnotationGroup(job_id);
-			if (annotationGroup == null) {
-				annotationGroup = new AnnotationGroup();
-				putAnnotationGroup(job_id, annotationGroup);
-			}
-			addAnnotation(annotationGroup, textEditor, file, lineNumber, rTasks, ((level > 1)?IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_SECONDARY: IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_CURRENT));				
-			addAnnotation(annotationGroup, textEditor, file, lineNumber, uTasks, ((level > 1)?IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT:((containsCurrentSet(uTasks)) ? IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT : IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT)));				
-		}
-	}
-	/* Is given tasks in the current set
-	 * @param aTasks
-	 * @return
-	 */
-	protected boolean containsCurrentSet(BitList aTasks) {
-		String set_id = uiDebugManager.getCurrentSetId();
-		if (set_id.equals(IElementHandler.SET_ROOT_ID))
-			return true;
-		try {
-			BitList tasks = uiDebugManager.getTasks(set_id);
-			return (tasks != null && tasks.intersects(aTasks));
-		}
-		catch (CoreException e) {
-			return false;
-		}
-	}
-	// generic
-	/* Add annotation
-	 * @param annotationGroup
-	 * @param textEditor
-	 * @param file
-	 * @param lineNumber
-	 * @param tasks
-	 * @param type
-	 * @throws CoreException
-	 */
-	protected void addAnnotation(AnnotationGroup annotationGroup, final ITextEditor textEditor, final IFile file, final int lineNumber, final BitList tasks, final String type) throws CoreException {
-		if (!tasks.isEmpty()) {
-			IDocumentProvider docProvider = textEditor.getDocumentProvider();
-			IAnnotationModel annotationModel = docProvider.getAnnotationModel(textEditor.getEditorInput());
-			if (annotationModel == null)
-				throw new CoreException(Status.CANCEL_STATUS);
-			final Position position = createPosition(lineNumber, docProvider.getDocument(textEditor.getEditorInput()));
-			if (position == null)
-				throw new CoreException(Status.CANCEL_STATUS);
-
-			synchronized (LOCK) {
-				PInstructionPointerAnnotation2 annotation = findAnnotation(annotationGroup, position, type);
-				if (annotation == null) {
-					annotation = new PInstructionPointerAnnotation2(file, type, position, annotationModel);
-					annotationGroup.addAnnotation(annotation);
-				}
-				annotation.addTasks(tasks);
-				annotation.setMessage(isRegisterType(type));
-			}
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					textEditor.selectAndReveal(position.getOffset(), 0);
-				}
-			});
-		}
-	}
-	/* Find annotation
-	 * @param annotationGroup
-	 * @param position
-	 * @param type
-	 * @return
-	 */
-	protected PInstructionPointerAnnotation2 findAnnotation(AnnotationGroup annotationGroup, Position position, String type) {
-		synchronized (LOCK) {
-			for (PInstructionPointerAnnotation2 annotation : annotationGroup.getAnnotations()) {
-				if (annotation.getPosition().equals(position)) {
-					if (annotation.getType().equals(type)) {
-						return annotation;
-					}
-				}
-			}
-			return null;
-		}
-	}
-	// called by debug view
-	/* Remove annotation called from Debug View
-	 * @param editorPart
-	 * @param thread
-	 * @throws CoreException
-	 */
-	protected void removeAnnotation(IEditorPart editorPart, IPThread thread) throws CoreException {
-		removeAnnotation(uiDebugManager.getCurrentJobId(), getTasks(thread));
-	}
-	// called by event
-	/* Remove annotation called from debug event
-	 * @param job_id
-	 * @param tasks
-	 * @throws CoreException
-	 */
-	protected void removeAnnotation(String job_id, BitList tasks) throws CoreException {
-		if (tasks == null || tasks.isEmpty())
-			throw new CoreException(Status.CANCEL_STATUS);
-		synchronized (LOCK) {
-			AnnotationGroup annotationGroup = getAnnotationGroup(job_id);
-			if (annotationGroup != null) {
-				removeAnnotation(annotationGroup, tasks);
-				if (annotationGroup.isEmpty())
-					removeAnnotationGroup(job_id);
-			}
-		}
-	}
-	// generic
-	/* Remove annotation
-	 * @param annotationGroup
-	 * @param tasks
-	 * @throws CoreException
-	 */
-	protected void removeAnnotation(AnnotationGroup annotationGroup, BitList tasks) throws CoreException {
-		synchronized (LOCK) {
-			List<PInstructionPointerAnnotation2> removedList = new ArrayList<PInstructionPointerAnnotation2>(0);
-			for (PInstructionPointerAnnotation2 annotation : annotationGroup.getAnnotations()) {
-				annotation.removeTasks(tasks);
-				if (annotation.isEmpty()) {
-					annotation.removeAnnotation();
-					removedList.add(annotation);
-				} else {
-					annotation.setMessage(isRegisterType(annotation.getType()));
-				}
-			}
-			annotationGroup.removeAnnotations(removedList);
-		}
-	}
-	/* Get iterator of stored annotations
-	 * @param annotationGroup
-	 * @param type
-	 * @return
-	 */
-	public PInstructionPointerAnnotation2[] findAnnotations(AnnotationGroup annotationGroup, String type) {
-		synchronized (LOCK) {
-			List<PInstructionPointerAnnotation2> foundAnnotations = new ArrayList<PInstructionPointerAnnotation2>();
-			for (PInstructionPointerAnnotation2 annotation : annotationGroup.getAnnotations()) {
-				if (annotation.getType().equals(type)) {
-					foundAnnotations.add(annotation);
-				}
-			}
-			return foundAnnotations.toArray(new PInstructionPointerAnnotation2[0]);
-		}
-	}
-	protected PInstructionPointerAnnotation2[] findAnnotations(AnnotationGroup annotationGroup, BitList tasks) {
-		synchronized (LOCK) {
-			List<PInstructionPointerAnnotation2> foundAnnotations = new ArrayList<PInstructionPointerAnnotation2>();
-			if (tasks.isEmpty())
-				return new PInstructionPointerAnnotation2[0];
-
-			for (PInstructionPointerAnnotation2 annotation : annotationGroup.getAnnotations()) {
-				if (!annotation.isMarkDeleted() && annotation.contains(tasks)) {
-					if (!foundAnnotations.contains(annotation))
-						foundAnnotations.add(annotation);
-				}
-			}
-			return foundAnnotations.toArray(new PInstructionPointerAnnotation2[0]);
-		}
-	}
-	/* Find other annotation
-	 * @param annotationGroup
-	 * @param position
-	 * @param isRegister
-	 * @return
-	 */
-	protected PInstructionPointerAnnotation2 findOtherTypeAnnotation(AnnotationGroup annotationGroup, Position position, boolean isRegister) {
-		synchronized (LOCK) {
-			for (PInstructionPointerAnnotation2 annotation : annotationGroup.getAnnotations()) {
-				if (annotation.getPosition().equals(position)) {
-					String annotationType = annotation.getType();
-					if (isRegister) {
-						if (annotationType.equals(IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT) || annotationType.equals(IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT))
-							return annotation;
-					} else {
-						if (annotationType.equals(IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_CURRENT) || annotationType.equals(IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_SECONDARY))
-							return annotation;
-					}
-				}
-			}
-			return null;
-		}
-	}
-	/* Change annotation type
-	 * @param annotation
-	 * @param type
-	 */
-	protected void changeAnnotationType(PInstructionPointerAnnotation2 annotation, String type) {
-		if (!annotation.getType().equals(type)) {			
-			annotation.setType(type);
-		}
-	}
-	protected void register(String job_id, BitList tasks) {
-		synchronized (LOCK) {
-			AnnotationGroup annotationGroup = getAnnotationGroup(job_id);
-			if (annotationGroup != null) {
-				for (PInstructionPointerAnnotation2 annotation : findAnnotations(annotationGroup, tasks)) {
-					BitList cpTasks = tasks.copy();
-					cpTasks.and(annotation.getTasks());
-					if (cpTasks.isEmpty())
-						continue;
-					
-					updateExistedAnnotation(annotationGroup, annotation, cpTasks, false);
-					/*
-					boolean isRegister = isRegisterType(annotation.getType());
-					if (!isRegister)// unregister annotation
-						updateExistedAnnotation(annotationGroup, annotation, cpTasks, isRegister);
-					*/
-				}
-			}
-		}
-	}
-	protected void unregister(String job_id, BitList tasks) {
-		synchronized (LOCK) {
-			AnnotationGroup annotationGroup = getAnnotationGroup(job_id);
-			if (annotationGroup != null) {
-				for (PInstructionPointerAnnotation2 annotation : findAnnotations(annotationGroup, tasks)) {
-					BitList cpTasks = tasks.copy();
-					cpTasks.and(annotation.getTasks());
-					if (cpTasks.isEmpty())
-						continue;
-
-					updateExistedAnnotation(annotationGroup, annotation, cpTasks, true);
-					/*
-					boolean isRegister = isRegisterType(annotation.getType());
-					if (isRegister)// register annotation
-						updateExistedAnnotation(annotationGroup, annotation, cpTasks, isRegister);
-					*/
-				}
-			}
-		}
-	}
-	/* Remove tasks from existed annotation
-	 * @param annotationGroup
-	 * @param annotation
-	 * @param tasks Tasks being removed
-	 * @param isRegister
-	 * @throws CoreException
-	 */
-	protected void updateExistedAnnotation(AnnotationGroup annotationGroup, PInstructionPointerAnnotation2 annotation, BitList tasks, boolean isRegister) {
-		synchronized (LOCK) {
-			IResource file = annotation.getMakerResource();
-			Position position = annotation.getPosition();
-			annotation.removeTasks(tasks);
-			if (annotation.isEmpty()) {
-				annotation.removeAnnotation();
-				annotationGroup.removeAnnotation(annotation);
-			}
-			else {
-				annotation.setMessage(isRegister);
-			}
-	
-			PInstructionPointerAnnotation2 oAnnotation = findOtherTypeAnnotation(annotationGroup, position, isRegister);
-			if (oAnnotation != null) {
-				oAnnotation.addTasks(tasks);
-				oAnnotation.setMessage(!isRegister);
-			}
-			else {
-				//String type = isRegister ? ((containsCurrentSet(tasks) ? IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT : IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT)) : IPTPDebugUIConstants.REG_ANN_INSTR_POINTER_CURRENT;
-				String type = IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT;
-				oAnnotation = new PInstructionPointerAnnotation2(file, type, position, annotation.getAnnotationModel());
-				annotationGroup.addAnnotation(oAnnotation);
-				oAnnotation.addTasks(tasks);
-				oAnnotation.setMessage(!isRegister);
-			}
-		}
-	}
-	/***************************************************************************************************************************************************************************************************
-	 * Set Change Event
-	 **************************************************************************************************************************************************************************************************/
-	/* Update annotation
-	 * @param currentSet current set
-	 * @param preSet previous set
-	 * @throws CoreException
-	 */
-	public void updateAnnotation(final IElementSet currentSet, final IElementSet preSet) {
-		WorkbenchJob uiJob = new WorkbenchJob("Updating annotation...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				AnnotationGroup annotationGroup = getAnnotationGroup(uiDebugManager.getCurrentJobId());
-				if (annotationGroup != null) {
-					try {
-						BitList tasks = uiDebugManager.getTasks(currentSet.getID());
-						synchronized (LOCK) {
-							for (PInstructionPointerAnnotation2 annotation : annotationGroup.getAnnotations()) {
-								// change icon for unregistered processes only if the set is changed
-								if (!isRegisterType(annotation.getType())) {
-									// if all the tasks in current is not match the unregistered tasks, display SET_ANN
-									// simply only display SET_ANN when the current set only contain registered tasks
-									if (currentSet.isRootSet())
-										changeAnnotationType(annotation, IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT);
-									else
-										changeAnnotationType(annotation, annotation.contains(tasks) ? IPTPDebugUIConstants.CURSET_ANN_INSTR_POINTER_CURRENT : IPTPDebugUIConstants.SET_ANN_INSTR_POINTER_CURRENT);
-								}
-							}
-						}
-					}
-					catch (CoreException e) {
-						return e.getStatus();
-					}
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		uiJob.setSystem(true);
-		uiJob.setPriority(Job.INTERACTIVE);
-		uiJob.schedule();
-	}
-	/***************************************************************************************************************************************************************************************************
-	 * Job Change Listener
-	 **************************************************************************************************************************************************************************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.listeners.IJobChangedListener#jobChangedEvent(int, java.lang.String, java.lang.String)
-	 */
-	public void jobChangedEvent(final int type, final String cur_job_id, final String pre_job_id) {
-		WorkbenchJob uiJob = new WorkbenchJob("Updating annotation...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				doJobChangedEvent(type, cur_job_id, pre_job_id, monitor);
-				monitor.done();
-				return Status.OK_STATUS;
-			}
-		};
-		uiJob.setSystem(true);
-		uiJob.setPriority(Job.INTERACTIVE);
-		uiJob.schedule();
-	}
-	private void doJobChangedEvent(int type, String cur_job_id, String pre_job_id, IProgressMonitor monitor) {
-		if (type == IJobChangedListener.REMOVED || (pre_job_id != null && !pre_job_id.equals(IManager.EMPTY_ID))) {
-			AnnotationGroup preAnnotationGroup = getAnnotationGroup(pre_job_id);
-			if (preAnnotationGroup != null) {
-				preAnnotationGroup.throwAllAnnotations();
-			}
-		}
-		if (cur_job_id != null) {
-			AnnotationGroup curAnnotationGroup = getAnnotationGroup(cur_job_id);
-			if (curAnnotationGroup != null) {
-				curAnnotationGroup.retrieveAllAnnontations();
-			}
-		}		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.core.IPDebugEventListener#handleDebugEvent(org.eclipse.ptp.debug.core.events.IPDebugEvent)
-	 */
-	public void handleDebugEvent(final IPDebugEvent event) {
-		WorkbenchJob uiJob = new WorkbenchJob("Updating annotation...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				doHandleDebugEvent(event, monitor);
-				monitor.done();
-				return Status.OK_STATUS;
-			}
-		};
-		uiJob.setSystem(true);
-		uiJob.setPriority(Job.INTERACTIVE);
-		uiJob.schedule();
-	}
-	private void doHandleDebugEvent(IPDebugEvent event, IProgressMonitor monitor) {
-		IPDebugInfo info = event.getInfo();
-		IPJob job = info.getJob();
-		switch(event.getKind()) {
-			case IPDebugEvent.CREATE:
-				switch (event.getDetail()) {
-				case IPDebugEvent.REGISTER:
-					register(job.getID(), info.getAllTasks());
-					break;
-				case IPDebugEvent.BREAKPOINT:
-					break;
-				}
-				break;
-			case IPDebugEvent.TERMINATE:
-				switch (event.getDetail()) {
-				case IPDebugEvent.DEBUGGER:
-					removeAnnotationGroup(job.getID());
-					break;
-				case IPDebugEvent.REGISTER:
-					unregister(job.getID(), info.getAllTasks());
-					break;
-				case IPDebugEvent.BREAKPOINT:
-					break;
-				default:
-					removeAnnotationAction(job, info.getAllTasks());
-					break;
-				}
-				break;
-			case IPDebugEvent.RESUME:
-				removeAnnotationAction(job, info.getAllTasks());
-				break;
-			case IPDebugEvent.SUSPEND:
-				IPDebugSuspendInfo susInfo = (IPDebugSuspendInfo)info;
-				try {
-					addAnnotation(job, susInfo);
-				}
-				catch (final CoreException e) {
-					PTPDebugUIPlugin.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							PTPDebugUIPlugin.errorDialog("Error", e);
-						}
-					});
-				}
-				break;
-			case IPDebugEvent.CHANGE:
-				break;
-			case IPDebugEvent.ERROR:
-				//removeAnnotationAction(job, info.getAllTasks());
-				break;
-		}
-	}
-	private void addAnnotation(IPJob job, IPDebugSuspendInfo info) throws CoreException {
-		int line = info.getLineNumber();
-		if (line == 0) {
-			//FIXME: this method is only for unreg tasks, reg tasks depends on selection on stack frame on debug view
-			addAnnotationWithSourceFound(job, info.getAllUnregisteredTasks(), info.getLevel()+1, info.getDepth());
-		}
-		else {
-			addAnnotation(job.getID(), info.getLevel(), info.getFilename(), line, info.getAllRegisteredTasks(), info.getAllUnregisteredTasks());
-		}
-	}
-	private void addAnnotationWithSourceFound(IPJob job, BitList tasks, int low, int high) throws CoreException {
-		if (tasks.isEmpty())
-			return;
-
-		IPSession session = uiDebugManager.getDebugSession(job);
-		if (session != null) {
-			if (!session.isReady())
-				return;
-			
-			IPDIListStackFramesRequest request = session.getPDISession().getRequestFactory().getListStackFramesRequest(session.getPDISession(), 
-					tasks, low, high);
-			try {
-				session.getPDISession().getEventRequestManager().addEventRequest(request);
-				Map<BitList, Object> map = request.getResultMap(tasks);
-				for (Iterator<BitList> i = map.keySet().iterator(); i.hasNext();) {
-					BitList sTasks = i.next();
-					Object value = map.get(sTasks);
-					if (value instanceof ProxyDebugStackFrame[]) {
-						ProxyDebugStackFrame[] frames = (ProxyDebugStackFrame[])value;
-						for (ProxyDebugStackFrame frame : frames) {
-							ProxyDebugLocator locator = frame.getLocator();
-							if (locator.getLineNumber() > 0) {
-								addUnregisterAnnotation(job.getID(), frame.getLevel(), locator.getFile(), locator.getLineNumber(), sTasks);
-								break;
-							}
-						}
-					}
-				}
-			}
-			catch (PDIException e) {
-				//throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));
-			}
-		}
-	}
-	
-	private void removeAnnotationAction(IPJob job, BitList tasks) {
-		try {
-			removeAnnotation(job.getID(), tasks);
-		}
-		catch (final CoreException e) {
-			PTPDebugUIPlugin.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					PTPDebugUIPlugin.errorDialog("Error", e);
-				}
-			});
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java
deleted file mode 100644
index 31f9e66..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PBreakpointWorkbenchAdapterFactory.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPWatchpoint;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-/**
- * @author Clement chu
- * 
- */
-public class PBreakpointWorkbenchAdapterFactory implements IAdapterFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType != IWorkbenchAdapter.class || !(adaptableObject instanceof IPBreakpoint)) {
-			return null;
-		}
-		return new WorkbenchAdapter() {
-			public String getLabel(Object o) {
-				// for now
-				if (o instanceof IPLineBreakpoint) {
-					return PDebugUIMessages.getString("PBreakpointWorkbenchAdapterFactory.0");
-				}
-				if (o instanceof IPWatchpoint) {
-					return PDebugUIMessages.getString("PBreakpointWorkbenchAdapterFactory.1");
-				}
-				return super.getLabel(o); 
-			}
-		};
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[] { IWorkbenchAdapter.class };
-	}
-}
-
-

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugImage.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugImage.java
deleted file mode 100644
index fdf7291..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugImage.java
+++ /dev/null

@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.net.URL;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.osgi.framework.Bundle;
-
-/**
- * @author clement chu
- *
- */
-public class PDebugImage {
-	public final static String ICONPATH = "icons/";
-	public final static String TOOLICONPATH = ICONPATH + "tool/";
-	public final static String PROCESSICONPATH = ICONPATH + "process/";
-	public final static String DEBUGICONPATH = ICONPATH + "debug/";
-	
-	/*
-	public final static URL ICONURL = PTPDebugUIPlugin.getDefault().getBundle().getEntry(ICONPATH);
-	public final static URL TOOLICONURL = PTPDebugUIPlugin.getDefault().getBundle().getEntry(TOOLICONPATH);
-	public final static URL PROCESSICONURL = PTPDebugUIPlugin.getDefault().getBundle().getEntry(PROCESSICONPATH);
-	public final static URL DEBUGICONURL = PTPDebugUIPlugin.getDefault().getBundle().getEntry(DEBUGICONPATH);
-	
-    private static ImageRegistry imageRegistry = null;
-    */
-    
-    //array view
-	public static final String ICON_ADD_VAR_NORMAL = "add_variable_normal.gif";
-	
-	//expression view
-	public static final String ICON_VAR_ADD_NORMAL = "var_add_normal.gif";
-	public static final String ICON_VAR_DELETE_NORMAL = "var_delete_normal.gif";
-	public static final String ICON_VAR_EDIT_NORMAL = "var_edit_normal.gif";
-	public static final String ICON_VAR_REFRESH_NORMAL = "var_refresh_normal.gif";
-	public static final String ICON_VAR_COMPARE_NORMAL = "var_compare_normal.gif";
-
-	public static final String ICON_RESUME_DISABLE = "resume_disable.gif";
-	public static final String ICON_RESUME_NORMAL = "resume_normal.gif";
-	public static final String ICON_SUSPEND_DISABLE = "suspend_disable.gif";
-	public static final String ICON_SUSPEND_NORMAL = "suspend_normal.gif";
-	public static final String ICON_TERMINATEALL_DISABLE = "terminate_all_disable.gif";
-	public static final String ICON_TERMINATEALL_NORMAL = "terminate_all_normal.gif";
-	public static final String ICON_STEPINTO_DISABLE = "stepinto_disable.gif";
-	public static final String ICON_STEPINTO_NORMAL = "stepinto_normal.gif";
-	public static final String ICON_STEPOVER_DISABLE = "stepover_disable.gif";
-	public static final String ICON_STEPOVER_NORMAL = "stepover_normal.gif";
-	public static final String ICON_STEPRETURN_DISABLE = "stepreturn_disable.gif";
-	public static final String ICON_STEPRETURN_NORMAL = "stepreturn_normal.gif";
-	public static final String ICON_REGISTER_NORMAL = "register_normal.gif";
-	public static final String ICON_UNREGISTER_NORMAL = "unregister_normal.gif";
-	
-	public static final String IMG_PRO_ERROR_SEL = "error_sel.gif";
-	public static final String IMG_PRO_ERROR = "error.gif";
-	public static final String IMG_PRO_RUNNING_SEL = "running_sel.gif";
-	public static final String IMG_PRO_RUNNING = "running.gif";
-	public static final String IMG_PRO_STARTED_SEL = "started_sel.gif";
-	public static final String IMG_PRO_STARTED = "started.gif";
-	public static final String IMG_PRO_STOPPED_SEL = "stopped_sel.gif";
-	public static final String IMG_PRO_STOPPED = "stopped.gif";
-	public static final String IMG_PRO_SUSPENDED_SEL = "suspended_sel.gif";
-	public static final String IMG_PRO_SUSPENDED = "suspended.gif";
-
-	public static final String IMG_DEBUG_PTPBPTSET = "ptp_bpt_set.gif";
-	public static final String IMG_DEBUG_BPTCURSET_EN = "bpt_curr_set_enable.gif";
-	public static final String IMG_DEBUG_BPTMULTISET_EN = "bpt_multi_set_enable.gif";
-	public static final String IMG_DEBUG_BPTNOSET_EN = "bpt_no_set_enable.gif";
-	public static final String IMG_DEBUG_BPTCURSET_DI = "bpt_curr_set_disable.gif";
-	public static final String IMG_DEBUG_BPTMULTISET_DI = "bpt_multi_set_disable.gif";
-	public static final String IMG_DEBUG_BPTNOSET_DI = "bpt_no_set_disable.gif";
-	
-	//TODO
-	public static final String IMG_DEBUG_OVRS_WARNING = "no.gif";
-	public static final String IMG_DEBUG_OVRS_ERROR = "no.gif";
-	public static final String IMG_DEBUG_OVRS_ARGUMENT = "no.gif";
-	public static final String IMG_DEBUG_OVRS_GLOBAL = "no.gif";
-	
-	public static final String IMG_DEBUG_SIGNAL = "no.gif";
-	public static final String IMG_DEBUG_REGISTER_GROUP_DISABLED = "no.gif";
-	public static final String IMG_DEBUG_REGISTER_GROUP = "no.gif";
-
-	public static final String IMG_DEBUG_READ_WATCHPOINT_ENABLED = "no.gif";
-	public static final String IMG_DEBUG_WRITE_WATCHPOINT_ENABLED = "no.gif";
-	public static final String IMG_DEBUG_READ_WATCHPOINT_DISABLED = "no.gif";
-	public static final String IMG_DEBUG_WRITE_WATCHPOINT_DISABLED = "no.gif";
-	public static final String IMG_DEBUG_WATCHPOINT_ENABLED = "no.gif";
-	public static final String IMG_DEBUG_WATCHPOINT_DISABLED = "no.gif";
-
-	public static final String IMG_DEBUG_VARIABLE_POINTER = "no.gif";
-	public static final String IMG_DEBUG_VARIABLE_POINTER_DISABLED = "no.gif";
-	public static final String IMG_DEBUG_VARIABLE_AGGREGATE = "no.gif";
-	public static final String IMG_DEBUG_VARIABLE_AGGREGATE_DISABLED = "no.gif";
-	public static final String IMG_DEBUG_VARIABLE_SIMPLE = "no.gif";
-	public static final String IMG_DEBUG_VARIABLE_SIMPLE_DISABLED = "no.gif";
-	public static final String IMG_DEBUG_REGISTER = "no.gif";
-	public static final String IMG_DEBUG_REGISTER_DISABLED = "no.gif";
-	public static final String IMG_DEBUG_EXECUTABLE_WITH_SYMBOLS = "no.gif";
-	public static final String IMG_DEBUG_EXECUTABLE = "no.gif";
-	public static final String IMG_DEBUG_SHARED_LIBRARY_WITH_SYMBOLS = "no.gif";
-	public static final String IMG_DEBUG_SHARED_LIBRARY = "no.gif";
-	//public static final String IMG_DEBUG_ = "no.gif";
-	//public static final String IMG_DEBUG_ = "no.gif";
-	
-	
-	
-	public static final String IMG_DEBUG_OVER_BPT_GLOB_EN = "global_ovr.gif";
-	public static final String IMG_DEBUG_OVER_BPT_GLOB_DI = "global_ovr_disabled.gif";
-	public static final String IMG_DEBUG_OVER_BPT_COND_EN = "conditional_ovr.gif";
-	public static final String IMG_DEBUG_OVER_BPT_COND_DI = "conditional_ovr_disabled.gif";
-	public static final String IMG_DEBUG_OVER_BPT_INST_EN = "installed_ovr.gif";
-	public static final String IMG_DEBUG_OVER_BPT_INST_DI = "installed_ovr_disabled.gif";
-	public static final String IMG_DEBUG_OVER_BPT_ADDR_EN = "address_ovr.gif";
-	public static final String IMG_DEBUG_OVER_BPT_ADDR_DI = "address_ovr_disabled.gif";
-	public static final String IMG_DEBUG_OVER_BPT_FUNC_EN = "function_ovr.gif";
-	public static final String IMG_DEBUG_OVER_BPT_FUNC_DI = "function_ovr_disabled.gif";
-	
-	/*
-	//array view
-	public static final ImageDescriptor ID_ICON_ADD_VAR_NORMAL = createImageDescriptor(TOOLICONURL, ICON_ADD_VAR_NORMAL, ICON_ADD_VAR_NORMAL);
-
-	//expression view
-	public static final ImageDescriptor ID_ICON_VAR_ADD_NORMAL = createImageDescriptor(TOOLICONURL, ICON_VAR_ADD_NORMAL, ICON_VAR_ADD_NORMAL);
-	public static final ImageDescriptor ID_ICON_VAR_DELETE_NORMAL = createImageDescriptor(TOOLICONURL, ICON_VAR_DELETE_NORMAL, ICON_VAR_DELETE_NORMAL);
-	public static final ImageDescriptor ID_ICON_VAR_EDIT_NORMAL = createImageDescriptor(TOOLICONURL, ICON_VAR_EDIT_NORMAL, ICON_VAR_EDIT_NORMAL);
-	public static final ImageDescriptor ID_ICON_VAR_REFRESH_NORMAL = createImageDescriptor(TOOLICONURL, ICON_VAR_REFRESH_NORMAL, ICON_VAR_REFRESH_NORMAL);
-	public static final ImageDescriptor ID_ICON_VAR_COMPARE_NORMAL = createImageDescriptor(TOOLICONURL, ICON_VAR_COMPARE_NORMAL, ICON_VAR_COMPARE_NORMAL);
-	
-	public static final ImageDescriptor ID_ICON_RESUME_DISABLE = createImageDescriptor(TOOLICONURL, ICON_RESUME_DISABLE, ICON_RESUME_DISABLE);
-	public static final ImageDescriptor ID_ICON_RESUME_NORMAL = createImageDescriptor(TOOLICONURL, ICON_RESUME_NORMAL, ICON_RESUME_NORMAL);
-	public static final ImageDescriptor ID_ICON_SUSPEND_DISABLE = createImageDescriptor(TOOLICONURL, ICON_SUSPEND_DISABLE, ICON_SUSPEND_DISABLE);
-	public static final ImageDescriptor ID_ICON_SUSPEND_NORMAL = createImageDescriptor(TOOLICONURL, ICON_SUSPEND_NORMAL, ICON_SUSPEND_NORMAL);
-	public static final ImageDescriptor ID_ICON_TERMINATEALL_DISABLE = createImageDescriptor(TOOLICONURL, ICON_TERMINATEALL_DISABLE, ICON_TERMINATEALL_DISABLE);
-	public static final ImageDescriptor ID_ICON_TERMINATEALL_NORMAL = createImageDescriptor(TOOLICONURL, ICON_TERMINATEALL_NORMAL, ICON_TERMINATEALL_NORMAL);
-	public static final ImageDescriptor ID_ICON_STEPINTO_DISABLE = createImageDescriptor(TOOLICONURL, ICON_STEPINTO_DISABLE, ICON_STEPINTO_DISABLE);
-	public static final ImageDescriptor ID_ICON_STEPINTO_NORMAL = createImageDescriptor(TOOLICONURL, ICON_STEPINTO_NORMAL, ICON_STEPINTO_NORMAL);
-	public static final ImageDescriptor ID_ICON_STEPOVER_DISABLE = createImageDescriptor(TOOLICONURL, ICON_STEPOVER_DISABLE, ICON_STEPOVER_DISABLE);
-	public static final ImageDescriptor ID_ICON_STEPOVER_NORMAL = createImageDescriptor(TOOLICONURL, ICON_STEPOVER_NORMAL, ICON_STEPOVER_NORMAL);
-	public static final ImageDescriptor ID_ICON_STEPRETURN_DISABLE = createImageDescriptor(TOOLICONURL, ICON_STEPRETURN_DISABLE, ICON_STEPRETURN_DISABLE);
-	public static final ImageDescriptor ID_ICON_STEPRETURN_NORMAL = createImageDescriptor(TOOLICONURL, ICON_STEPRETURN_NORMAL, ICON_STEPRETURN_NORMAL);
-	public static final ImageDescriptor ID_ICON_REGISTER_NORMAL = createImageDescriptor(TOOLICONURL, ICON_REGISTER_NORMAL, ICON_REGISTER_NORMAL);
-	public static final ImageDescriptor ID_ICON_UNREGISTER_NORMAL = createImageDescriptor(TOOLICONURL, ICON_UNREGISTER_NORMAL, ICON_UNREGISTER_NORMAL);
-
-	public static final ImageDescriptor ID_IMG_PRO_ERROR_SEL = createImageDescriptor(PROCESSICONURL, IMG_PRO_ERROR_SEL, IMG_PRO_ERROR_SEL);
-	public static final ImageDescriptor ID_IMG_PRO_ERROR = createImageDescriptor(PROCESSICONURL, IMG_PRO_ERROR, IMG_PRO_ERROR);
-	public static final ImageDescriptor ID_IMG_PRO_RUNNING_SEL = createImageDescriptor(PROCESSICONURL, IMG_PRO_RUNNING_SEL, IMG_PRO_RUNNING_SEL);
-	public static final ImageDescriptor ID_IMG_PRO_RUNNING = createImageDescriptor(PROCESSICONURL, IMG_PRO_RUNNING, IMG_PRO_RUNNING);
-	public static final ImageDescriptor ID_IMG_PRO_STARTED_SEL = createImageDescriptor(PROCESSICONURL, IMG_PRO_STARTED_SEL, IMG_PRO_STARTED_SEL);
-	public static final ImageDescriptor ID_IMG_PRO_STARTED = createImageDescriptor(PROCESSICONURL, IMG_PRO_STARTED, IMG_PRO_STARTED);
-	public static final ImageDescriptor ID_IMG_PRO_STOPPED_SEL = createImageDescriptor(PROCESSICONURL, IMG_PRO_STOPPED_SEL, IMG_PRO_STOPPED_SEL);
-	public static final ImageDescriptor ID_IMG_PRO_STOPPED = createImageDescriptor(PROCESSICONURL, IMG_PRO_STOPPED, IMG_PRO_STOPPED);
-	public static final ImageDescriptor ID_IMG_PRO_SUSPENDED_SEL = createImageDescriptor(PROCESSICONURL, IMG_PRO_SUSPENDED_SEL, IMG_PRO_SUSPENDED_SEL);
-	public static final ImageDescriptor ID_IMG_PRO_SUSPENDED = createImageDescriptor(PROCESSICONURL, IMG_PRO_SUSPENDED, IMG_PRO_SUSPENDED);
-	
-	public static final ImageDescriptor ID_IMG_DEBUG_PTPBPTSET = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_PTPBPTSET, IMG_DEBUG_PTPBPTSET);
-	public static final ImageDescriptor ID_IMG_DEBUG_BPTCURSET_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_BPTCURSET_EN, IMG_DEBUG_BPTCURSET_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_BPTMULTISET_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_BPTMULTISET_EN, IMG_DEBUG_BPTMULTISET_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_BPTNOSET_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_BPTNOSET_EN, IMG_DEBUG_BPTNOSET_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_BPTCURSET_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_BPTCURSET_DI, IMG_DEBUG_BPTCURSET_DI);
-	public static final ImageDescriptor ID_IMG_DEBUG_BPTMULTISET_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_BPTMULTISET_DI, IMG_DEBUG_BPTMULTISET_DI);
-	public static final ImageDescriptor ID_IMG_DEBUG_BPTNOSET_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_BPTNOSET_DI, IMG_DEBUG_BPTNOSET_DI);
-
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_GLOB_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_GLOB_EN, IMG_DEBUG_OVER_BPT_GLOB_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_GLOB_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_GLOB_DI, IMG_DEBUG_OVER_BPT_GLOB_DI);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_COND_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_COND_EN, IMG_DEBUG_OVER_BPT_COND_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_COND_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_COND_DI, IMG_DEBUG_OVER_BPT_COND_DI);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_INST_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_INST_EN, IMG_DEBUG_OVER_BPT_INST_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_INST_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_INST_DI, IMG_DEBUG_OVER_BPT_INST_DI);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_ADDR_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_ADDR_EN, IMG_DEBUG_OVER_BPT_ADDR_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_ADDR_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_ADDR_DI, IMG_DEBUG_OVER_BPT_ADDR_DI);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_FUNC_EN = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_FUNC_EN, IMG_DEBUG_OVER_BPT_FUNC_EN);
-	public static final ImageDescriptor ID_IMG_DEBUG_OVER_BPT_FUNC_DI = createImageDescriptor(DEBUGICONURL, IMG_DEBUG_OVER_BPT_FUNC_DI, IMG_DEBUG_OVER_BPT_FUNC_DI);
-	*/
-
-	public static void initializeImageRegistry(ImageRegistry reg) {
-		Bundle bundle = PTPDebugUIPlugin.getDefault().getBundle();
-
-		//array view
-		registerImage(bundle, reg, TOOLICONPATH, ICON_ADD_VAR_NORMAL);
-		
-		//expression view
-		registerImage(bundle, reg, TOOLICONPATH, ICON_VAR_ADD_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_VAR_DELETE_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_VAR_EDIT_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_VAR_REFRESH_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_VAR_COMPARE_NORMAL);
-
-		registerImage(bundle, reg, TOOLICONPATH, ICON_RESUME_DISABLE);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_RESUME_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_SUSPEND_DISABLE);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_SUSPEND_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_TERMINATEALL_DISABLE);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_TERMINATEALL_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_STEPINTO_DISABLE);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_STEPINTO_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_STEPOVER_DISABLE);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_STEPOVER_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_STEPRETURN_DISABLE);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_STEPRETURN_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_REGISTER_NORMAL);
-		registerImage(bundle, reg, TOOLICONPATH, ICON_UNREGISTER_NORMAL);
-		
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_ERROR_SEL);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_ERROR);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_RUNNING_SEL);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_RUNNING);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_STARTED_SEL);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_STARTED);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_STOPPED_SEL);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_STOPPED);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_SUSPENDED_SEL);
-		registerImage(bundle, reg, PROCESSICONPATH, IMG_PRO_SUSPENDED);
-
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_PTPBPTSET);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_BPTCURSET_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_BPTMULTISET_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_BPTNOSET_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_BPTCURSET_DI);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_BPTMULTISET_DI);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_BPTNOSET_DI);
-
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_GLOB_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_GLOB_DI);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_COND_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_COND_DI);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_INST_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_INST_DI);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_ADDR_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_ADDR_DI);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_FUNC_EN);
-		registerImage(bundle, reg, DEBUGICONPATH, IMG_DEBUG_OVER_BPT_FUNC_DI);
-	}
-	private static void registerImage(Bundle bundle, ImageRegistry registry, String basePath, String file) {
-		URL url = FileLocator.find(bundle, new Path(basePath + file), null);
-		if (url!=null) {
-			ImageDescriptor desc = ImageDescriptor.createFromURL(url);
-			if (desc == null)
-				desc = ImageDescriptor.getMissingImageDescriptor();
-			registry.put(file, desc);
-		}
-	}
-	/** Get image
-	 * @param key
-	 * @return
-	 */
-	public static Image getImage(String key) {
-		return PTPDebugUIPlugin.getDefault().getImageRegistry().get(key);
-	}
-	/** Get image descriptor
-	 * @param key
-	 * @return
-	 */
-	public static ImageDescriptor getDescriptor(String key) {
-		return PTPDebugUIPlugin.getDefault().getImageRegistry().getDescriptor(key);
-	}
-	public static void dispose() {
-		PTPDebugUIPlugin.getDefault().getImageRegistry().dispose();
-	}
-	/*
-	private static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-		}
-		return imageRegistry;
-	}
-	public static void addImage(String key, Image image) {
-		getImageRegistry().put(key, image);
-	}
-	public static void addImageDescriptor(String key, ImageDescriptor imageDescriptor) {
-		getImageRegistry().put(key, imageDescriptor);
-	}
-	public static ImageDescriptor createImageDescriptor(URL iconURL, String key, String name) {
-		try {
-			ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(getIconURL(iconURL, name));
-			addImageDescriptor(key, imageDescriptor);
-			return imageDescriptor;
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	private static URL getIconURL(URL iconURL, String name) throws MalformedURLException {
-		if (iconURL == null)
-			throw new MalformedURLException();
-			
-		return new URL(iconURL, name);
-	}
-	*/	
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugModelPresentation.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugModelPresentation.java
deleted file mode 100644
index 43162ef..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugModelPresentation.java
+++ /dev/null

@@ -1,801 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.math.BigInteger;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IDisconnect;
-import org.eclipse.debug.core.model.IExpression;
-import org.eclipse.debug.core.model.IRegister;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.ITerminate;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.debug.core.model.IWatchExpression;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugEditorPresentation;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.IValueDetailListener;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.ptp.debug.core.model.IEnableDisableTarget;
-import org.eclipse.ptp.debug.core.model.IPAddressBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPDebugElement;
-import org.eclipse.ptp.debug.core.model.IPDebugElementStatus;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPDummyStackFrame;
-import org.eclipse.ptp.debug.core.model.IPFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPGlobalVariable;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPModule;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPThread;
-import org.eclipse.ptp.debug.core.model.IPValue;
-import org.eclipse.ptp.debug.core.model.IPVariable;
-import org.eclipse.ptp.debug.core.model.IPWatchpoint;
-import org.eclipse.ptp.debug.core.model.PDebugElementState;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIBreakpointInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIExitInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISharedLibraryInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDISignalInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointScopeInfo;
-import org.eclipse.ptp.debug.core.pdi.event.IPDIWatchpointTriggerInfo;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeChar;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeReference;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeStruct;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PSourceNotFoundElement;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author Clement chu
- * 
- */
-public class PDebugModelPresentation extends LabelProvider implements IDebugModelPresentation, IDebugEditorPresentation {
-	private static PDebugModelPresentation instance = null;
-	public final static String DISPLAY_FULL_PATHS = "DISPLAY_FULL_PATHS";
-	private static final String DUMMY_STACKFRAME_LABEL = "...";
-	protected Map<String, Object> attributes = new HashMap<String, Object>(3);
-	private OverlayImageCache imageCache = new OverlayImageCache();
-	protected UIDebugManager uiDebugManager = null;
-
-	/**
-	 * Constructor
-	 */
-	public PDebugModelPresentation() {
-		// make sure using the one created by start up
-		if (instance == null)
-			instance = this;
-	}
-	public static PDebugModelPresentation getDefault() {
-		if (instance == null)
-			instance = new PDebugModelPresentation();
-		return instance;
-	}
-
-	/**
-	 * Get UIDebugManager
-	 * @return
-	 */
-	private UIDebugManager getUIDebugManager() {
-		if (uiDebugManager == null) {
-			uiDebugManager = PTPDebugUIPlugin.getUIDebugManager();
-		}
-		return uiDebugManager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugModelPresentation#setAttribute(java.lang.String, java.lang.Object)
-	 */
-	public void setAttribute(String attribute, Object value) {
-		if (value == null)
-			return;
-		getAttributes().put(attribute, value);
-	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugModelPresentation#computeDetail(org.eclipse.debug.core.model.IValue, org.eclipse.debug.ui.IValueDetailListener)
-	 */
-	public void computeDetail(IValue value, IValueDetailListener listener) {
-		PValueDetailProvider.getDefault().computeDetail(value, listener);
-	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ISourcePresentation#getEditorInput(java.lang.Object)
-	 */
-	public IEditorInput getEditorInput(Object element) {
-		return PDebugUIUtils.getEditorInput(element);
-	}
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ISourcePresentation#getEditorId(org.eclipse.ui.IEditorInput, java.lang.Object)
-	 */
-	public String getEditorId(IEditorInput input, Object element) {
-		return PDebugUIUtils.getEditorId(input, element);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		Image baseImage = getBaseImage(element);
-		if (baseImage != null) {
-			ImageDescriptor[] overlays = new ImageDescriptor[] { null, null, null, null };
-			if (element instanceof IPDebugElementStatus && !((IPDebugElementStatus)element).isOK()) {
-				switch(((IPDebugElementStatus)element).getSeverity()) { 
-					case IPDebugElementStatus.WARNING: 
-						overlays[OverlayImageDescriptor.BOTTOM_LEFT] = PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVRS_WARNING); 
-						break;
-					case IPDebugElementStatus.ERROR: 
-						overlays[OverlayImageDescriptor.BOTTOM_LEFT] = PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVRS_ERROR);
-						break;
-				}
-			}
-			if (element instanceof IWatchExpression && ((IWatchExpression)element).hasErrors())
-				overlays[OverlayImageDescriptor.BOTTOM_LEFT] = PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVRS_ERROR); 
-			if (element instanceof IPVariable && ((IPVariable)element).isArgument()) 
-				overlays[OverlayImageDescriptor.TOP_RIGHT] = PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVRS_ARGUMENT); 
-			if (element instanceof IPGlobalVariable && !(element instanceof IRegister)) 
-				overlays[OverlayImageDescriptor.TOP_RIGHT] = PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVRS_GLOBAL);
-
-			return getImageCache().getImageFor(new OverlayImageDescriptor(baseImage, overlays));
-		}
-		return null;
-	}
-
-	/**
-	 * Get base image
-	 * @param element
-	 * @return
-	 */
-	private Image getBaseImage(Object element) {
-		if (element instanceof IPDebugTarget) {
-			IPDebugTarget target = (IPDebugTarget)element;
-			if (target.isPostMortem()) {
-				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED);
-			}
-			if (target.isTerminated() || target.isDisconnected()) {
-				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED);
-			}
-			return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET);
-		}
-		if (element instanceof IPThread) {
-			IPThread thread = (IPThread)element;
-			IPDebugTarget target = (IPDebugTarget)thread.getDebugTarget();
-			if (target.isPostMortem()) {
-				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_THREAD_TERMINATED);
-			}
-			if (thread.isSuspended()) {
-				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED);
-			}
-			else if (thread.isTerminated()) {
-				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_THREAD_TERMINATED);
-			}
-			else {
-				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING);
-			}
-		}
-		if (element instanceof IMarker) {
-			IBreakpoint bp = getBreakpoint((IMarker) element);
-			if (bp != null && bp instanceof IPBreakpoint) {
-				return getBreakpointImage((IPBreakpoint) bp);
-			}
-		}
-		if (element instanceof IPBreakpoint) {
-			return getBreakpointImage((IPBreakpoint) element);
-		}
-		if (element instanceof IRegisterGroup) {
-			return getRegisterGroupImage((IRegisterGroup)element);
-		}
-		if (element instanceof IExpression) {
-			return getExpressionImage((IExpression)element);
-		}
-		if (element instanceof IRegister) {
-			return getRegisterImage((IRegister)element);
-		}
-		if (element instanceof IVariable) {
-			return getVariableImage((IVariable)element);
-		}
-		if (element instanceof IPModule) {
-			return getModuleImage((IPModule)element);
-		}
-		if (element instanceof IPSignal) { 
-			return getSignalImage((IPSignal)element);
-		}
-		return super.getImage(element);
-	}
-	protected Image getSignalImage(IPSignal signal) {
-		return PDebugImage.getImage(PDebugImage.IMG_DEBUG_SIGNAL);
-	}
-	protected Image getRegisterGroupImage(IRegisterGroup element) {
-		IEnableDisableTarget target = (IEnableDisableTarget)element.getAdapter(IEnableDisableTarget.class);
-		if (target != null && !target.isEnabled())
-			return PDebugImage.getImage(PDebugImage.IMG_DEBUG_REGISTER_GROUP_DISABLED);
-		return PDebugImage.getImage(PDebugImage.IMG_DEBUG_REGISTER_GROUP);
-	}
-	protected Image getBreakpointImage(IPBreakpoint breakpoint) {
-		try {
-			if (breakpoint instanceof IPLineBreakpoint)
-				return getLineBreakpointImage((IPLineBreakpoint) breakpoint);
-			if (breakpoint instanceof IPWatchpoint) {
-				return getWatchpointImage((IPWatchpoint)breakpoint);
-			}
-		} catch (CoreException e) {
-			PTPDebugUIPlugin.log(e);
-		}
-		return null;
-	}
-	protected Image getLineBreakpointImage(IPLineBreakpoint breakpoint) throws CoreException {
-		String job_id = breakpoint.getJobId();
-		String cur_job_id = getUIDebugManager().getCurrentJobId();
-		// Display nothing if the breakpoint is not in current job
-		if (!job_id.equals(IPBreakpoint.GLOBAL) && !job_id.equals(cur_job_id))
-			return new Image(null, 1, 1);
-		String descriptor = null;
-		IElementHandler setManager = getUIDebugManager().getElementHandler(job_id);
-		if (setManager == null) // no job running
-			descriptor = breakpoint.isEnabled() ? PDebugImage.IMG_DEBUG_BPTCURSET_EN : PDebugImage.IMG_DEBUG_BPTCURSET_DI;
-		else { // created job
-			String cur_set_id = getUIDebugManager().getCurrentSetId();
-			String bpt_set_id = breakpoint.getSetId();
-			if (bpt_set_id.equals(cur_set_id)) {
-				descriptor = breakpoint.isEnabled() ? PDebugImage.IMG_DEBUG_BPTCURSET_EN : PDebugImage.IMG_DEBUG_BPTCURSET_DI;
-			} else {
-				IElementSet set = (IElementSet)setManager.getElementByID(bpt_set_id);
-				if (set == null)
-					descriptor = breakpoint.isEnabled() ? PDebugImage.IMG_DEBUG_BPTCURSET_EN : PDebugImage.IMG_DEBUG_BPTCURSET_DI;
-				else {
-					if (set.containsMatchSet(cur_set_id))
-						descriptor = breakpoint.isEnabled() ? PDebugImage.IMG_DEBUG_BPTMULTISET_EN : PDebugImage.IMG_DEBUG_BPTMULTISET_DI;
-					else
-						descriptor = breakpoint.isEnabled() ? PDebugImage.IMG_DEBUG_BPTNOSET_EN : PDebugImage.IMG_DEBUG_BPTNOSET_DI;
-				}
-			}
-		}
-		return getImageCache().getImageFor(new OverlayImageDescriptor(PDebugImage.getImage(descriptor), computeBreakpointOverlays(breakpoint)));
-	}
-	protected Image getWatchpointImage(IPWatchpoint watchpoint) throws CoreException {
-		String descriptor = null;
-		if (watchpoint.isEnabled()) {
-			if (watchpoint.isReadType() && !watchpoint.isWriteType())
-				descriptor = PDebugImage.IMG_DEBUG_READ_WATCHPOINT_ENABLED;
-			else if (!watchpoint.isReadType() && watchpoint.isWriteType())
-				descriptor = PDebugImage.IMG_DEBUG_WRITE_WATCHPOINT_ENABLED;
-			else
-				descriptor = PDebugImage.IMG_DEBUG_WATCHPOINT_ENABLED;
-		}
-		else {
-			if (watchpoint.isReadType() && !watchpoint.isWriteType())
-				descriptor = PDebugImage.IMG_DEBUG_READ_WATCHPOINT_DISABLED;
-			else if (!watchpoint.isReadType() && watchpoint.isWriteType())
-				descriptor = PDebugImage.IMG_DEBUG_WRITE_WATCHPOINT_DISABLED;
-			else
-				descriptor = PDebugImage.IMG_DEBUG_WATCHPOINT_DISABLED;
-		}
-		return getImageCache().getImageFor(new OverlayImageDescriptor(PDebugImage.getImage(descriptor), computeBreakpointOverlays(watchpoint)));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		String bt = getBaseText(element);
-		if (bt == null)
-			return null;
-		StringBuffer baseText = new StringBuffer(bt);
-		if (element instanceof IPDebugElementStatus && !((IPDebugElementStatus) element).isOK()) {
-			baseText.append(MessageFormat.format(" <{0}>", new Object[] { ((IPDebugElementStatus)element).getMessage() }));
-		}
-		if (element instanceof IAdaptable) {
-			IEnableDisableTarget target = (IEnableDisableTarget) ((IAdaptable) element).getAdapter(IEnableDisableTarget.class);
-			if (target != null) {
-				if (!target.isEnabled()) {
-					baseText.append(' ');
-					baseText.append(PDebugUIMessages.getString("PTPDebugModelPresentation.disabled1"));
-				}
-			}
-		}
-		return baseText.toString();
-	}
-	private String getBaseText(Object element) {
-		boolean showQualified = isShowQualifiedNames();
-		StringBuffer label = new StringBuffer();
-		try {
-			if (element instanceof IPModule) { 
-				label.append(getModuleText((IPModule)element, showQualified)); 
-				return label.toString();
-			}
-			if (element instanceof IPSignal) {
-				label.append(getSignalText((IPSignal) element));
-				return label.toString();
-			}
-			if (element instanceof IRegisterGroup) { 
-				label.append(((IRegisterGroup)element).getName());
-				return label.toString();
-			}
-			if (element instanceof IWatchExpression) {
-				return getWatchExpressionText((IWatchExpression) element);
-			}
-			if (element instanceof IVariable) {
-				label.append(getVariableText((IVariable) element));
-				return label.toString();
-			}
-			if (element instanceof IValue) {
-				label.append(getValueText((IValue) element));
-				return label.toString();
-			}
-			if (element instanceof IStackFrame) {
-				label.append(getStackFrameText((IStackFrame) element, showQualified));
-				return label.toString();
-			}
-			if (element instanceof PSourceNotFoundElement) {
-				return getBaseText(((PSourceNotFoundElement)element).getElement());
-			}
-			if (element instanceof IMarker) {
-				IBreakpoint breakpoint = getBreakpoint((IMarker) element);
-				if (breakpoint != null) {
-					return getBreakpointText(breakpoint, showQualified);
-				}
-				return null;
-			}
-			if (element instanceof IBreakpoint) {
-				return getBreakpointText((IBreakpoint) element, showQualified);
-			}
-			if (element instanceof IDebugTarget)
-				label.append(getTargetText((IDebugTarget) element, showQualified));
-			else if (element instanceof IThread)
-				label.append(getThreadText((IThread) element, showQualified));
-			if (label.length() > 0) {
-				return label.toString();
-			}
-			if (element instanceof ITerminate) {
-				if (((ITerminate) element).isTerminated()) {
-					label.insert(0, PDebugUIMessages.getString("PTPDebugModelPresentation.terminated1"));
-					return label.toString();
-				}
-			}
-			if (element instanceof IDisconnect) {
-				if (((IDisconnect) element).isDisconnected()) {
-					label.insert(0, PDebugUIMessages.getString("PTPDebugModelPresentation.disconnected1"));
-					return label.toString();
-				}
-			}
-			if (label.length() > 0) {
-				return label.toString();
-			}
-		} catch (DebugException e) {
-			return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.2"), new Object[] { e.getMessage() });
-		} catch (CoreException e) {
-			PTPDebugUIPlugin.log(e);
-		}
-		return null;
-	}
-	protected String getModuleText(IPModule module, boolean qualified) {
-		StringBuffer sb = new StringBuffer();
-		IPath path = module.getImageName();
-		if (!path.isEmpty()) {
-			sb.append(path.lastSegment());
-		}
-		else {
-			sb.append(PDebugUIMessages.getString("PTPDebugModelPresentation.unknown_1"));		
-		}
-		return sb.toString();
-	}
-	protected String getRegisterGroupText(IRegisterGroup group) {
-		String name = PDebugUIMessages.getString("PTPDebugModelPresentation.not_available_1");
-		try {
-			name = group.getName();
-		}
-		catch(DebugException e) {
-			PTPDebugUIPlugin.log(e.getStatus());
-		}
-		return name;
-	}
-	protected boolean isShowQualifiedNames() {
-		Boolean showQualified = (Boolean) getAttributes().get(DISPLAY_FULL_PATHS);
-		showQualified = (showQualified == null) ? Boolean.FALSE : showQualified;
-		return showQualified.booleanValue();
-	}
-	private Map<String, Object> getAttributes() {
-		return attributes;
-	}
-	private OverlayImageCache getImageCache() {
-		return imageCache;
-	}
-	private boolean isEmpty(String string) {
-		return (string == null || string.trim().length() == 0);
-	}
-	protected IBreakpoint getBreakpoint(IMarker marker) {
-		return DebugPlugin.getDefault().getBreakpointManager().getBreakpoint(marker);
-	}
-	private ImageDescriptor[] computeBreakpointOverlays(IPBreakpoint breakpoint) {
-		ImageDescriptor[] overlays = new ImageDescriptor[] { null, null, null, null };
-		try {
-			if (breakpoint.isGlobal()) {
-				overlays[OverlayImageDescriptor.TOP_LEFT] = (breakpoint.isEnabled()) ? PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_GLOB_EN) : PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_GLOB_DI);
-			}
-			if (breakpoint.isConditional()) {
-				overlays[OverlayImageDescriptor.BOTTOM_LEFT] = (breakpoint.isEnabled()) ? PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_COND_EN) : PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_COND_DI);
-			}
-			if (breakpoint.isInstalled()) {
-				overlays[OverlayImageDescriptor.BOTTOM_LEFT] = (breakpoint.isEnabled()) ? PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_INST_EN) : PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_INST_DI);
-			}
-			if (breakpoint instanceof IPAddressBreakpoint) {
-				overlays[OverlayImageDescriptor.TOP_RIGHT] = (breakpoint.isEnabled()) ? PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_ADDR_EN) : PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_ADDR_DI);
-			}
-			if (breakpoint instanceof IPFunctionBreakpoint) {
-				overlays[OverlayImageDescriptor.BOTTOM_RIGHT] = (breakpoint.isEnabled()) ? PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_FUNC_EN) : PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_OVER_BPT_FUNC_DI);
-			}
-		} catch (CoreException e) {
-			PTPDebugUIPlugin.log(e);
-		}
-		return overlays;
-	}
-	protected Image getVariableImage(IVariable element) {
-		if (element instanceof IPVariable) {
-			IAIF aif = null;
-			try {
-				aif = ((IPVariable)element).getAIF();
-			}
-			catch(DebugException e) {
-				// use default image
-			}
-			if (aif == null)
-				return PDebugImage.getImage((((IPVariable)element).isEnabled()) ? PDebugImage.IMG_DEBUG_VARIABLE_SIMPLE : PDebugImage.IMG_DEBUG_VARIABLE_SIMPLE_DISABLED);
-			IAIFType type = aif.getType();
-			if (type instanceof IAIFTypePointer || type instanceof IAIFTypeReference)
-				return PDebugImage.getImage((((IPVariable)element).isEnabled()) ? PDebugImage.IMG_DEBUG_VARIABLE_POINTER : PDebugImage.IMG_DEBUG_VARIABLE_POINTER_DISABLED);
-			else if (type instanceof IAIFTypeArray || type instanceof IAIFTypeStruct)
-				return PDebugImage.getImage((((IPVariable)element).isEnabled()) ? PDebugImage.IMG_DEBUG_VARIABLE_AGGREGATE : PDebugImage.IMG_DEBUG_VARIABLE_AGGREGATE_DISABLED);
-			else
-				return PDebugImage.getImage((((IPVariable)element).isEnabled()) ? PDebugImage.IMG_DEBUG_VARIABLE_SIMPLE : PDebugImage.IMG_DEBUG_VARIABLE_SIMPLE_DISABLED);
-		}
-		return null;
-	}
-	protected Image getRegisterImage(IRegister element) {
-		return ((element instanceof IPVariable && ((IPVariable)element).isEnabled())) ? PDebugImage.getImage(PDebugImage.IMG_DEBUG_REGISTER) : PDebugImage.getImage(PDebugImage.IMG_DEBUG_REGISTER_DISABLED);
-	}
-	protected Image getExpressionImage(IExpression element) {
-		return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_EXPRESSION);
-	}
-	protected Image getModuleImage(IPModule element) {
-		switch(element.getType()) {
-			case IPModule.EXECUTABLE:
-				if (element.areSymbolsLoaded()) {
-					return PDebugImage.getImage(PDebugImage.IMG_DEBUG_EXECUTABLE_WITH_SYMBOLS);
-				}
-				return PDebugImage.getImage(PDebugImage.IMG_DEBUG_EXECUTABLE);
-			case IPModule.SHARED_LIBRARY:
-				if ( element.areSymbolsLoaded() ) {
-					return PDebugImage.getImage(PDebugImage.IMG_DEBUG_SHARED_LIBRARY_WITH_SYMBOLS);
-				}
-				return PDebugImage.getImage(PDebugImage.IMG_DEBUG_SHARED_LIBRARY);
-		}
-		return null;
-	}
-	protected String getVariableText(IVariable var) throws DebugException {
-		StringBuffer label = new StringBuffer();
-		if (var instanceof IPVariable) {
-			IAIF aif = null;
-			try {
-				aif = ((IPVariable) var).getAIF();
-			} catch (DebugException e) {
-				// don't display type
-			}
-			if (aif != null && isShowVariableTypeNames()) {
-				String typeName = getVariableTypeName(aif);
-				if (typeName != null && typeName.length() > 0) {
-					label.append(typeName).append(' ');
-				}
-			}
-			String name = var.getName();
-			if (name != null)
-				label.append(name.trim());
-			String valueString = getValueText(var.getValue());
-			if (!isEmpty(valueString)) {
-				label.append(" = ");
-				label.append(valueString);
-			}
-		}
-		return label.toString();
-	}
-	protected String getValueText(IValue value) {
-		StringBuffer label = new StringBuffer();
-		if (value instanceof IPDebugElementStatus && !((IPDebugElementStatus) value).isOK()) {
-			label.append(MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.error1"), new Object[] { ((IPDebugElementStatus)value).getMessage() }));
-		} else if (value instanceof IPValue) {
-			IAIF aif = null;
-			try {
-				aif = ((IPValue) value).getAIF();
-			} catch (DebugException e) {
-				// don't display type
-			}
-			try {
-				String valueString = value.getValueString();
-				if (valueString != null) {
-					valueString = valueString.trim();
-					if (aif != null && aif instanceof IAIFTypeChar) {
-						if (valueString.length() == 0)
-							valueString = ".";
-						label.append(valueString);
-					} else if (aif == null || (!(aif.getType() instanceof IAIFTypeArray) && !(aif.getType() instanceof IAIFTypeStruct))) {
-						if (valueString.length() > 0) {
-							label.append(valueString);
-						}
-					}
-				}
-			} catch (DebugException e1) {
-			}
-		}
-		return label.toString();
-	}
-	protected String getSignalText(IPSignal signal) {
-		StringBuffer sb = new StringBuffer(PDebugUIMessages.getString("PTPDebugModelPresentation.signal"));
-		try {
-			String name = signal.getName();
-			sb.append(" \'").append(name).append('\'');
-		} catch (DebugException e) {
-		}
-		return sb.toString();
-	}
-	protected String getWatchExpressionText(IWatchExpression expression) {
-		StringBuffer result = new StringBuffer();
-		result.append('"').append(expression.getExpressionText()).append('"');
-		if (expression.isPending()) {
-			result.append(" = ").append("...");
-		} else {
-			IValue value = expression.getValue();
-			if (value instanceof IPValue) {
-				IAIF aif = null;
-				try {
-					aif = ((IPValue)value).getAIF();
-				} catch (DebugException e1) {
-				}
-				if (aif != null && isShowVariableTypeNames()) {
-					String typeName = getVariableTypeName(aif);
-					if (!isEmpty(typeName)) {
-						result.insert(0, typeName + ' ');
-					}
-				}
-				if (expression.isEnabled()) {
-					String valueString = getValueText(value);
-					if (valueString.length() > 0) {
-						result.append(" = ").append(valueString);
-					}
-				}
-			}
-		}
-		if (!expression.isEnabled()) {
-			result.append(' ');
-			result.append(PDebugUIMessages.getString("PTPDebugModelPresentation.disabled1"));
-		}
-		return result.toString();
-	}
-	protected String getTargetText(IDebugTarget target, boolean qualified) throws DebugException {
-		IPDebugTarget t = (IPDebugTarget) target.getAdapter(IPDebugTarget.class);
-		if (t != null) {
-			if (!t.isPostMortem()) {
-				PDebugElementState state = t.getState();
-				if (state.equals(PDebugElementState.EXITED)) {
-					Object info = t.getCurrentStateInfo();
-					String label = PDebugUIMessages.getString("PTPDebugModelPresentation.target1");
-					String reason = "";
-					if (info != null && info instanceof IPDISignalInfo) {
-						IPDISignalInfo sigInfo = (IPDISignalInfo) info;
-						reason = ' ' + MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.target2"), new Object[] { sigInfo.getName(), sigInfo.getDescription() });
-					} else if (info != null && info instanceof IPDIExitInfo) {
-						reason = ' ' + MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.target3"), new Object[] { new Integer(((IPDIExitInfo) info).getCode()) });
-					}
-					return MessageFormat.format(label, new Object[] { target.getName(), reason });
-				} else if (state.equals(PDebugElementState.SUSPENDED)) {
-					return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.target4"), new Object[] { target.getName() });
-				}
-			}
-		}
-		return target.getName();
-	}
-	protected String getThreadText(IThread thread, boolean qualified) throws DebugException {
-		IPDebugTarget target = (IPDebugTarget) thread.getDebugTarget().getAdapter(IPDebugTarget.class);
-		if (target.isPostMortem()) {
-			return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread"), new Object[] { thread.getName() });
-		}
-		if (thread.isTerminated()) {
-			return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread2"), new Object[] { thread.getName() });
-		}
-		if (thread.isStepping()) {
-			return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread3"), new Object[] { thread.getName() });
-		}
-		if (!thread.isSuspended()) {
-			return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread4"), new Object[] { thread.getName() });
-		}
-		if (thread.isSuspended()) {
-			String reason = "";
-			IPDebugElement element = (IPDebugElement) thread.getAdapter(IPDebugElement.class);
-			if (element != null) {
-				Object info = element.getCurrentStateInfo();
-				if (info != null && info instanceof IPDISignalInfo) {
-					reason = MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread5"), new Object[] { ((IPDISignalInfo) info).getName(), ((IPDISignalInfo) info).getDescription() });
-				} else if (info != null && info instanceof IPDIWatchpointTriggerInfo) {
-					reason = MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread6"), new Object[] { ((IPDIWatchpointTriggerInfo) info).getOldValue(), ((IPDIWatchpointTriggerInfo) info).getNewValue() });
-				} else if (info != null && info instanceof IPDIWatchpointScopeInfo) {
-					reason = PDebugUIMessages.getString("PTPDebugModelPresentation.thread7");
-				} else if (info != null && info instanceof IPDIBreakpointInfo) {
-					reason = PDebugUIMessages.getString("PTPDebugModelPresentation.thread8");
-				} else if (info != null && info instanceof IPDISharedLibraryInfo) {
-					reason = PDebugUIMessages.getString("PTPDebugModelPresentation.thread9");
-				}
-			}
-			return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread10"), new Object[] { thread.getName(), reason });
-		}
-		return MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.thread11"), new Object[] { thread.getName() });
-	}
-	protected String getStackFrameText(IStackFrame f, boolean qualified) throws DebugException {
-		if (f instanceof IPStackFrame) {
-			IPStackFrame frame = (IPStackFrame) f;
-			StringBuffer label = new StringBuffer();
-			label.append(frame.getLevel());
-			label.append(' ');
-			String function = frame.getFunction();
-			if (isEmpty(function)) {
-				label.append(PDebugUIMessages.getString("PTPDebugModelPresentation.frame2"));
-			} else {
-				function = function.trim();
-				if (function.length() > 0) {
-					label.append(function);
-					label.append("() ");
-					if (frame.getFile() != null) {
-						IPath path = new Path(frame.getFile());
-						if (!path.isEmpty()) {
-							//label.append(PDebugUIMessages.getString("PTPDebugModelPresentation.frame1"));
-							//label.append(' ');
-							label.append((qualified ? path.toOSString() : path.lastSegment()));
-							label.append(':');
-							if (frame.getFrameLineNumber() != 0)
-								label.append(frame.getFrameLineNumber());
-						}
-					}
-				}
-			}
-			BigInteger address = frame.getAddress();
-			if (address != null) {
-				label.append(' ');
-				label.append(address.toString(16));
-			}
-			return label.toString();
-		}
-		return (f.getAdapter(IPDummyStackFrame.class) != null) ? getDummyStackFrameLabel(f) : f.getName();
-	}	
-	private String getDummyStackFrameLabel(IStackFrame stackFrame) {
-		return DUMMY_STACKFRAME_LABEL;
-	}
-	protected boolean isShowVariableTypeNames() {
-		Boolean show = (Boolean) getAttributes().get(DISPLAY_VARIABLE_TYPE_NAMES);
-		show = show == null ? Boolean.FALSE : show;
-		return show.booleanValue();
-	}
-	public void dispose() {
-		getImageCache().disposeAll();
-		attributes.clear();
-		super.dispose();
-	}
-
-	
-	protected String getBreakpointText(IBreakpoint breakpoint, boolean qualified) throws CoreException {
-		if (breakpoint instanceof IPLineBreakpoint) {
-			return getLineBreakpointText((IPLineBreakpoint) breakpoint, qualified);
-		}
-		return "";
-	}
-	protected String getLineBreakpointText(IPLineBreakpoint breakpoint, boolean qualified) throws CoreException {
-		StringBuffer label = new StringBuffer();
-		appendSourceName(breakpoint, label, qualified);
-		appendLineNumber(breakpoint, label);
-		appendBreakpointStatus(breakpoint, label);
-		return label.toString();
-	}
-	protected StringBuffer appendSourceName(IPBreakpoint breakpoint, StringBuffer label, boolean qualified) throws CoreException {
-		String handle = breakpoint.getSourceHandle();
-		if (!isEmpty(handle)) {
-			IPath path = new Path(handle);
-			if (path.isValidPath(handle)) {
-				label.append(qualified ? path.toOSString() : path.lastSegment());
-			}
-		}
-		return label;
-	}
-	protected StringBuffer appendLineNumber(IPLineBreakpoint breakpoint, StringBuffer label) throws CoreException {
-		int lineNumber = breakpoint.getLineNumber();
-		if (lineNumber > 0) {
-			label.append(" ");
-			label.append(MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.line1"), new Object[] { Integer.toString(lineNumber) }));
-		}
-		return label;
-	}
-	protected StringBuffer appendBreakpointStatus(IPBreakpoint breakpoint, StringBuffer label) throws CoreException {
-		label.append(" ");
-		label.append("{");
-		label.append(breakpoint.getJobName());
-		label.append(":");
-		label.append(breakpoint.getSetId());
-		label.append("}");
-		// label.append(MessageFormat.format(PDebugUIMessages.getString("PTPDebugModelPresentation.details1"), new String[] { jobName, breakpoint.getSetId() }));
-		return label;
-	}
-	private String getVariableTypeName(IAIF aif) {
-		StringBuffer result = new StringBuffer();
-		if (aif != null) {
-			IAIFType type = aif.getType();
-			if (type != null) {
-				result.append(type.toString().trim());
-				if (type instanceof IAIFTypeArray) {
-					int[] dims = ((IAIFTypeArray)type).getDimensionDetails();
-					for (int i = 0; i < dims.length; ++i) {
-						result.append('[');
-						result.append(dims[i]);
-						result.append(']');
-					}
-				}
-			}
-		}
-		return result.toString();
-	}
-	public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) {
-		try {
-			if (frame instanceof IPStackFrame) {
-				PAnnotationManager.getDefault().addAnnotation(editorPart, (IPStackFrame)frame);
-				return true;
-			}
-		}
-		catch (CoreException e) {
-			return false;
-		}
-		return false;
-	}
-	public void removeAnnotations(IEditorPart editorPart, IThread thread) {
-		
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.java
deleted file mode 100644
index 6c410f5..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class PDebugUIMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.PDebugUIMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/** Constructor
-	 * 
-	 */
-	private PDebugUIMessages() {
-	}
-
-	/** Get string
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties
deleted file mode 100644
index 60ad73f..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIMessages.properties
+++ /dev/null

@@ -1,65 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-
-PTPDebugModelPresentation.unknown_1=unknown
-PTPDebugModelPresentation.2=<not available: {0}>
-PTPDebugModelPresentation.4=(disabled)
-PTPDebugModelPresentation.signal=signal
-PTPDebugModelPresentation.not_available_1=<not available>
-
-PTPDebugModelPresentation.error1=<Error. {0}>
-PTPDebugModelPresentation.disabled1=(disabled)
-PTPDebugModelPresentation.terminated1=<terminated>
-PTPDebugModelPresentation.disconnected1=<disconnected>
-
-
-PTPDebugModelPresentation.target1={0} (Exited.{1})
-PTPDebugModelPresentation.target2=Signal ''{0}'' received. Description: {1}.
-PTPDebugModelPresentation.target3=Exit code = {0}.
-PTPDebugModelPresentation.target4={0} (Suspended)
-
-PTPDebugModelPresentation.thread1=Thread [{0}]
-PTPDebugModelPresentation.thread2=Thread [{0}] (Terminated)
-PTPDebugModelPresentation.thread3=Thread [{0}] (Stepping)
-PTPDebugModelPresentation.thread4=Thread [{0}] (Running)
-PTPDebugModelPresentation.thread5=: Signal ''{0}'' received. Description: {1}.
-PTPDebugModelPresentation.thread6=: Watchpoint triggered. Old value: ''{0}''. New value: ''{1}''.
-PTPDebugModelPresentation.thread7=: Watchpoint is out of scope.
-PTPDebugModelPresentation.thread8=: Breakpoint hit.
-PTPDebugModelPresentation.thread9=: Shared library event.
-PTPDebugModelPresentation.thread10=Thread [{0}] (Suspended{1})
-PTPDebugModelPresentation.thread11=Thread [{0}]
-
-PTPDebugModelPresentation.frame1=at
-PTPDebugModelPresentation.frame2=<symbol is not available>
-
-
-PTPDebugModelPresentation.line1=[line: {0}]
-PTPDebugModelPresentation.address1=[address: {0}]
-PTPDebugModelPresentation.function1=[function: {0}]
-PTPDebugModelPresentation.ignorecount1=[ignore count: {0}]
-
-PTPDebugModelPresentation.details1=<Job: {0} - Set: {1}>
-
-PBreakpointWorkbenchAdapterFactory.0=PTP breakpoint
-PBreakpointWorkbenchAdapterFactory.1=PTP watchpoint

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIUtils.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIUtils.java
deleted file mode 100644
index 785c344..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PDebugUIUtils.java
+++ /dev/null

@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.io.File;
-
-import org.eclipse.cdt.internal.ui.util.ExternalEditorInput;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.containers.LocalFileStorage;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.sourcelookup.CommonSourceNotFoundEditorInput;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.ptp.core.resources.FileStorage;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.PSourceNotFoundElement;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @author Clement chu
- * 
- */
-public class PDebugUIUtils {
-	/** Find region by given offset in given document
-	 * @param document
-	 * @param offset
-	 * @return
-	 */
-	static public IRegion findWord(IDocument document, int offset) {
-		int start = -1;
-		int end = -1;
-		try {
-			int pos = offset;
-			char c;
-			while(pos >= 0) {
-				c = document.getChar(pos);
-				//TODO check java char?
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				--pos;
-			}
-			start = pos;
-			pos = offset;
-			int length = document.getLength();
-			while(pos < length) {
-				c = document.getChar(pos);
-				//TODO check java char?
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				++pos;
-			}
-			end = pos;
-		}
-		catch(BadLocationException x) {
-		}
-		if (start > -1 && end > -1) {
-			if (start == offset && end == offset)
-				return new Region(offset, 0);
-			else if (start == offset)
-				return new Region(start, end - start);
-			else
-				return new Region(start + 1, end - start - 1);
-		}
-		return null;
-	}
-
-	/** Get current stack frame
-	 * @return
-	 */
-	static public IPStackFrame getCurrentStackFrame() {
-		IAdaptable context = DebugUITools.getDebugContext();
-		return ( context != null ) ? (IPStackFrame)context.getAdapter( IPStackFrame.class ) : null;
-	}
-	
-	/** Show tasks with standard format
-	 * @param array
-	 * @return
-	 */
-	static public String arrayToString(int[] array) {
-		if (array.length == 0) {
-			return "";
-		}
-		String msg = "";
-		int preTask = array[0];
-		msg += preTask;
-		boolean isContinue = false;
-		for (int i = 1; i < array.length; i++) {
-			if (preTask == (array[i] - 1)) {
-				preTask = array[i];
-				isContinue = true;
-				if (i == (array.length - 1)) {
-					msg += "-" + array[i];
-					break;
-				}
-				continue;
-			}
-			if (isContinue)
-				msg += "-" + preTask;
-			msg += "," + array[i];
-			isContinue = false;
-			preTask = array[i];
-		}
-		return msg;
-	}
-	static public IEditorInput getEditorInput(Object element) {
-		if (element instanceof IMarker) {
-			IResource resource = ((IMarker) element).getResource();
-			if (resource instanceof IFile)
-				return new FileEditorInput((IFile) resource);
-		}
-		if (element instanceof IFile) {
-			IFile f = (IFile)element;
-			if  (f.exists())
-				return new FileEditorInput(f);
-			
-			return new ExternalEditorInput(new LocalFileStorage(f.getFullPath().toFile()));
-		}
-		if (element instanceof IPBreakpoint) {
-			IPBreakpoint pbk = (IPBreakpoint) element;
-			IFile file = null;
-			try {
-				String handle = pbk.getSourceHandle();
-				IPath path = new Path(handle);
-				if (path.isValidPath(handle)) {
-					IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
-					if (files.length > 0) {
-						file = files[0];
-					}
-					else {
-						File fsfile = new File(handle);
-						if (fsfile.isFile() && fsfile.exists()) {
-							return new ExternalEditorInput(new LocalFileStorage(fsfile));
-						}
-					}
-				}
-			} catch (CoreException e) {
-			}
-			if (file == null)
-				file = (IFile) pbk.getMarker().getResource().getAdapter(IFile.class);
-			if (file != null)
-				return new FileEditorInput(file);
-		}
-		if (element instanceof FileStorage || element instanceof LocalFileStorage) {
-			return new ExternalEditorInput((IStorage) element);
-		}
-		if (element instanceof PSourceNotFoundElement) {
-			return new CommonSourceNotFoundEditorInput((PSourceNotFoundElement) element);
-		}
-		return null;
-	}
-	static public String getEditorId(Object element) {
-		String name = null;
-		if (element instanceof IFile) {
-			name = ((IFile)element).getName();
-		}
-		if (element instanceof IEditorInput) {
-			name = ((IEditorInput)element).getName();
-		}
-		//if (element instanceof PSourceNotFoundElement)
-			//return IDebugUIConstants.ID_COMMON_SOURCE_NOT_FOUND_EDITOR;
-		if (name == null)
-			return IDebugUIConstants.ID_COMMON_SOURCE_NOT_FOUND_EDITOR;
-		
-		IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-		IEditorDescriptor descriptor = registry.getDefaultEditor(name);
-		return (descriptor != null) ? descriptor.getId() : CUIPlugin.EDITOR_ID;
-	}
-	static public String getEditorId(IEditorInput input, Object element) {
-		if (input != null) {
-			return getEditorId(input);
-		}
-		return null;
-	}
-	
-	
-	/** Show tasks with standard format
-	 * @param tasks
-	 * @return
-	 */
-	static public String showBitList(BitList tasks) {
-		if (tasks == null || tasks.isEmpty()) {
-			return "";
-		}
-		return arrayToString(tasks.toArray());
-	}
-	//self testing
-	public static void main(String[] args) {
-		BitList tasks = new BitList(0);
-		System.out.println(showBitList(tasks));
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation.java
deleted file mode 100644
index 673f023..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
-/**
- * @author Clement chu
- * 
- */
-public class PInstructionPointerAnnotation extends MarkerAnnotation {
-	private IAnnotationModel annotationModel = null;
-	private BitList tasks = null;
-	private Position position = null;
-	private IMarker marker = null;
-
-	/** Constructor
-	 * @param marker
-	 * @param position
-	 * @param annotationModel
-	 */
-	public PInstructionPointerAnnotation(IMarker marker, Position position, IAnnotationModel annotationModel) {
-		super(marker);
-		this.marker = marker;
-		this.position = position;
-		this.annotationModel = annotationModel;
-	}
-	/** Get annotation model
-	 * @return
-	 */
-	public IAnnotationModel getAnnotationModel() {
-		return annotationModel;
-	}
-	/** Set position
-	 * @param position
-	 */
-	public void setPosition(Position position) {
-		this.position = position;
-	}
-	/** Get position
-	 * @return
-	 */
-	public Position getPosition() {
-		return position;
-	}
-	/** Set marker
-	 * @param marker
-	 */
-	public void setMarker(IMarker marker) {
-		this.marker = marker;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.SimpleMarkerAnnotation#getMarker()
-	 */
-	public IMarker getMarker() {
-		return marker;
-	}
-	/** Set message for annotation
-	 * @param message
-	 */
-	public void setMessage(String message) {
-		try {
-			getMarker().setAttribute(IMarker.MESSAGE, message);
-		} catch (CoreException e) {
-		}
-		setText(message);
-	}
-	/** Set Message 
-	 * @param isRegister
-	 */
-	public void setMessage(boolean isRegister) {
-		int[] tasks = getTasks().toArray();
-		if (tasks.length == 0) {
-			setMessage("");
-			deleteMarker();
-			return;
-		}
-		String msg = "Suspended on " + (isRegister ? "registered" : "unregistered") + " " + (tasks.length == 1 ? "process" : "processes") + ": ";
-		msg += PDebugUIUtils.arrayToString(tasks);
-		setMessage(msg);
-	}
-	/** Get message
-	 * @return
-	 */
-	public String getMessage() {
-		return getText();
-	}
-	/** Set tasks
-	 * @param tasks
-	 */
-	public void setTasks(BitList tasks) {
-		this.tasks = tasks;
-	}
-	/** Get tasks
-	 * @return
-	 */
-	public BitList getTasks() {
-		return tasks;
-	}
-	/** Add tasks
-	 * @param aTasks
-	 */
-	public void addTasks(BitList aTasks) {
-		if (tasks == null) {
-			tasks = aTasks.copy();
-		}
-		if (tasks.size() < aTasks.size()) {
-			aTasks.or(tasks);
-			tasks = aTasks.copy();
-		} else
-			tasks.or(aTasks);
-	}
-	/** Remove tasks
-	 * @param aTasks
-	 */
-	public void removeTasks(BitList aTasks) {
-		tasks.andNot(aTasks);
-	}
-	/** Is no tasks
-	 * @return true if there is no tasks
-	 */
-	public boolean isEmpty() {
-		return tasks.isEmpty();
-	}
-	/** Contains tasks
-	 * @param aTasks
-	 * @return
-	 */
-	public boolean contains(BitList aTasks) {
-		return tasks.intersects(aTasks);
-	}
-	/** Get contains tasks
-	 * @param aTasks
-	 * @return
-	 */
-	public int[] containTasks(BitList aTasks) {
-		aTasks.and(tasks);
-		return aTasks.toArray();
-	}
-	/** Delete marker
-	 * @return true if delete succuss
-	 */
-	public boolean deleteMarker() {
-		IMarker marker = getMarker();
-		if (marker.exists()) {
-			try {
-				marker.delete();
-			} catch (CoreException e) {
-				return false;
-			}
-		}
-		return true;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation2.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation2.java
deleted file mode 100644
index 38a537e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PInstructionPointerAnnotation2.java
+++ /dev/null

@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
-/**
- * @author Clement chu
- * 
- */
-public class PInstructionPointerAnnotation2 {
-	private Annotation annotation = null;
-	private IAnnotationModel annotationModel = null;
-	private BitList tasks = null;
-	private Position position = null;
-	private IResource file = null;
-	private IMarker marker = null;
-	private String type = null;
-
-	/** Constructor
-	 * @param marker
-	 * @param position
-	 * @param annotationModel
-	 */
-	public PInstructionPointerAnnotation2(IResource file, String type, Position position, IAnnotationModel annotationModel) {
-		this.file = file;
-		this.type = type;
-		this.position = position;
-		this.annotationModel = annotationModel;
-		addAnnotationToModel();
-	}
-	private IMarker createMarker() {
-		if (file != null && file.exists()) {
-			try {
-				return file.createMarker(type);
-			} catch (CoreException e) {}
-		}
-		return null;
-	}
-	public IResource getMakerResource() {
-		return file;
-	}
-	/** Get annotation model
-	 * @return
-	 */
-	public IAnnotationModel getAnnotationModel() {
-		return annotationModel;
-	}
-	/** Get position
-	 * @return
-	 */
-	public Position getPosition() {
-		return position;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-		annotation.setType(type);
-	}
-	public void removeAnnotation() {
-		if (isMarkerExists()) {
-			try {
-				marker.delete();
-				marker = null;
-			} catch (CoreException e) {}
-		}
-		annotation.setText("");
-		annotation.markDeleted(true);
-		annotationModel.removeAnnotation(annotation);
-	}
-	private boolean isMarkerExists() {
-		return (marker != null && marker.exists());
-	}
-	public boolean isMarkDeleted() {
-		return (annotation == null || annotation.isMarkedDeleted());
-	}
-	public void addAnnotationToModel() {
-		marker = createMarker();
-		if (isMarkerExists()) {
-			annotation = new MarkerAnnotation(marker);
-		}
-		else {
-			annotation = new Annotation(type, false, "");
-		}
-		annotation.markDeleted(false);
-		annotationModel.addAnnotation(annotation, position);
-	}
-	/** Set message for annotation
-	 * @param message
-	 */
-	private void setMessage(String message) {
-		if (isMarkerExists()) {
-			try {
-				marker.setAttribute(IMarker.MESSAGE, message);
-			} catch (CoreException e) {}
-		}
-		annotation.setText(message);
-	}
-	/** Set Message 
-	 * @param isRegister
-	 */
-	public void setMessage(boolean isRegister) {
-		int[] tasks = getTasks().toArray();
-		if (tasks.length == 0) {
-			removeAnnotation();
-			return;
-		}
-		String msg = "Suspended on " + (isRegister ? "registered" : "unregistered") + " " + (tasks.length == 1 ? "process" : "processes") + ": ";
-		msg += PDebugUIUtils.arrayToString(tasks);
-		setMessage(msg);
-	}
-	/** Set tasks
-	 * @param tasks
-	 */
-	public void setTasks(BitList tasks) {
-		this.tasks = tasks;
-	}
-	/** Get tasks
-	 * @return
-	 */
-	public BitList getTasks() {
-		return tasks;
-	}
-	/** Add tasks
-	 * @param aTasks
-	 */
-	public void addTasks(BitList aTasks) {
-		if (tasks == null) {
-			tasks = aTasks.copy();
-		}
-		if (tasks.size() < aTasks.size()) {
-			aTasks.or(tasks);
-			tasks = aTasks.copy();
-		} else
-			tasks.or(aTasks);
-	}
-	/** Remove tasks
-	 * @param aTasks
-	 */
-	public void removeTasks(BitList aTasks) {
-		tasks.andNot(aTasks);
-	}
-	/** Is no tasks
-	 * @return true if there is no tasks
-	 */
-	public boolean isEmpty() {
-		return tasks.isEmpty();
-	}
-	/** Contains tasks
-	 * @param aTasks
-	 * @return
-	 */
-	public boolean contains(BitList aTasks) {
-		return tasks.intersects(aTasks);
-	}
-	/** Get contains tasks
-	 * @param aTasks
-	 * @return
-	 */
-	public int[] containTasks(BitList aTasks) {
-		aTasks.and(tasks);
-		return aTasks.toArray();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PJobVariableManager.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PJobVariableManager.java
deleted file mode 100644
index ef0537a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PJobVariableManager.java
+++ /dev/null

@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.DebugJobStorage;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.request.IPDIGetAIFRequest;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-
-/**
- * @deprecated replace with PVariableManager
- * @author Clement chu
- */
-public final class PJobVariableManager {
-	private DebugJobStorage variableStorage = new DebugJobStorage("Variable");
-	private DebugJobStorage varProcStorage = new DebugJobStorage("Variable_Process");
-	private final String PROCESS_KEY = "process_key";
-	private final String VALUE_UNKNOWN = "Unkwnon";
-	private final String VALUE_ERROR = "Error in getting value";
-	
-	public void shutdown() {
-		cleanupJobVariableValues();
-		varProcStorage.closeDebugJobStorage();
-		variableStorage.closeDebugJobStorage();
-	}
-	public String getResultDisplay(String job_id, int task_id) {
-		ProcessValue procVal = (ProcessValue)varProcStorage.getValue(job_id, PROCESS_KEY);
-		if (procVal == null) {
-			return "";
-		}
-		
-		StringBuffer display = new StringBuffer();
-		for (VariableValue value : procVal.getValues(task_id)) {
-			display.append("<i>");
-			display.append(value.getVar());
-			display.append("</i>");
-			display.append(" = ");
-			display.append(value.getVal());
-			display.append("<br>");
-		}
-		return display.toString();
-	}
-	public DebugJobStorage getVariableStorage() {
-		return variableStorage;
-	}
-	public boolean isContainVariable(IPJob job, String var) {
-		return (variableStorage.getValue(job.getID(), var) != null);
-	}
-	public void addJobVariable(IPJob job, String var, String[] sets) {
-		addJobVariable(job, var, sets, true);
-	}
-	public void addJobVariable(IPJob job, String var, String[] sets, boolean enable) {
-		JobVariable jVar = (JobVariable)variableStorage.getValue(job.getID(), var);
-		if (jVar == null) {
-			jVar = new JobVariable(job, var, sets, enable);
-		}
-		else {
-			jVar.setSets(sets);
-			jVar.setEnable(enable);
-		}
-		variableStorage.addValue(job.getID(), var, jVar);
-		createProcessValue(job);
-	}
-	private void createProcessValue(IPJob job) {
-		ProcessValue procVal = (ProcessValue)varProcStorage.getValue(job.getID(), PROCESS_KEY);
-		if (procVal == null) {
-			procVal = new ProcessValue(job.size());
-			varProcStorage.addValue(job.getID(), PROCESS_KEY, procVal);
-		}		
-	}
-	public JobVariable[] getJobVariables(String job_id) {
-		return variableStorage.getValueCollection(job_id).toArray(new JobVariable[0]);
-	}
-	public void changeJobVariable(IPJob job, IPJob newJob, String[] sets, String var, String newVar, boolean enable) {
-		removeJobVariable(job.getID(), var);
-		addJobVariable(newJob, newVar, sets, enable);
-	}
-	public void deleteSet(String job_id, String set_id) {
-		for (JobVariable jVar : getJobVariables(job_id)) {
-			if (jVar.containSet(set_id)) {
-				jVar.removeSet(set_id);
-				if (jVar.getSetSize() == 0) {
-					variableStorage.removeValue(job_id, jVar.getVar());
-				}
-			}
-		}
-	}
-	public boolean deleteSet(String job_id, String var, String set_id) {
-		JobVariable jVar = (JobVariable)variableStorage.getValue(job_id, var);
-		if (jVar == null) {
-			return false;
-		}
-		if (!jVar.containSet(set_id)) {
-			return false;
-		}
-		jVar.removeSet(set_id);
-		if (jVar.getSetSize() == 0) {
-			variableStorage.removeValue(job_id, jVar.getVar());
-		}
-		return true;
-	}
-	public void removeJobVariable(String job_id, String var) {
-		variableStorage.removeValue(job_id, var);
-	}
-	public void removeJobVariables(String job_id) {
-		variableStorage.removeJobStorage(job_id);
-	}
-	public void cleanupJobVariableValues() {
-		for (ProcessValue procVal : varProcStorage.getJobValueCollection().toArray(new ProcessValue[0])) {
-			if (procVal != null) {
-				((ProcessValue)procVal).cleanAllValues();
-			}
-		}
-	}
-	public void cleanupJobVariableValues(String job_id, BitList tasks) {
-		ProcessValue procVal = (ProcessValue)varProcStorage.getValue(job_id, PROCESS_KEY);
-		if (procVal != null) {
-			for (int task_id : tasks.toArray()) {
-				procVal.cleanValues(task_id);
-			}
-		}
-	}
-	public String[] getVariables(String job_id, String set_id, boolean enable) {
-		List<String> vars = new ArrayList<String>();
-		for (JobVariable jVar : getJobVariables(job_id)) {
-			if (jVar.isEnable() == enable && jVar.containSet(set_id)) {
-				vars.add(jVar.getVar());
-			}
-		}
-		return vars.toArray(new String[0]);
-	}
-	public void storeProcessValue(ProcessValue procVal, BitList tasks, String var, String val) {
-		for (int task_id : tasks.toArray()) {
-			procVal.addValue(task_id, new VariableValue(var, val));
-		}
-	}
-	public void updateJobVariableValues(String job_id, String set_id, BitList tasks, IProgressMonitor monitor) throws CoreException {
-		ProcessValue procVal = (ProcessValue)varProcStorage.getValue(job_id, PROCESS_KEY);
-		if (procVal != null) {
-			//only update when current set id contain in VariableInfo
-			String[] vars = getVariables(job_id, set_id, true);
-			if (vars.length > 0) {
-				IPSession session = PTPDebugUIPlugin.getUIDebugManager().getDebugSession(job_id);				
-				if (session != null) {
-					//get suspended tasks only in given job and given set
-					BitList suspend_tasks = session.getPDISession().getTaskManager().getSuspendedTasks(tasks);
-					monitor.beginTask("Updating variables value...", (suspend_tasks.cardinality() * vars.length + 1));
-					monitor.worked(1);
-					for (int i=0; i<vars.length; i++) {
-						if (monitor.isCanceled())
-							break;
-						
-						IPDIGetAIFRequest request = session.getPDISession().getRequestFactory().getAIFRequest(suspend_tasks, vars[i]);
-						try {
-							session.getPDISession().getEventRequestManager().addEventRequest(request);
-							Map<BitList, Object> map = request.getResultMap(suspend_tasks);
-							for (Iterator<BitList> it = map.keySet().iterator(); it.hasNext();) {
-								BitList sTasks = it.next();
-								Object value = map.get(sTasks);
-								if (value instanceof IAIF) {
-									storeProcessValue(procVal, sTasks, vars[i], ((IAIF)value).getValue().getValueString());
-									monitor.worked(1);
-								}
-							}
-						}
-						catch (PDIException e) {
-							storeProcessValue(procVal, suspend_tasks, vars[i], VALUE_ERROR);
-						} catch (AIFException e) {
-							storeProcessValue(procVal, suspend_tasks, vars[i], VALUE_ERROR);
-						}
-						/*
-						try {
-							ICommandResult result = session.getExpressionValue(suspend_tasks, vars[i]);
-							BitList[] rTasks = result.getTasksArray();
-							Object[] rValues = result.getResultsArray();
-							
-							for (int j=0; j<rTasks.length; j++) {
-								if (rValues[j] instanceof IAIF) {
-									storeProcessValue(procVal, rTasks[j], vars[i], ((IAIF)rValues[j]).getValue().getValueString());
-									monitor.worked(1);
-								}
-							}
-						} catch (PDIException e) {
-							storeProcessValue(procVal, suspend_tasks, vars[i], VALUE_ERROR);
-						} catch (AIFException e) {
-							storeProcessValue(procVal, suspend_tasks, vars[i], VALUE_ERROR);
-						}
-						*/
-					}
-				}
-			}
-		}
-		monitor.done();
-	}
-	
-	public class JobVariable {
-		IPJob job;
-		String var;
-		String[] sets = new String[0];
-		boolean enable = false;
-		
-		public JobVariable(IPJob job, String var, String[] sets, boolean enable) {
-			this.job = job;
-			this.var = var;
-			this.sets = sets;
-			this.enable = enable;
-		}
-		public IPJob getJob() {
-			return job;
-		}
-		public String getVar() {
-			return var;
-		}
-		public String[] getSets() {
-			return sets;
-		}
-		public boolean isEnable() {
-			return enable;
-		}
-		public boolean containSet(String set_id) {
-			for (String set : sets) {
-				if (set.equals(set_id)) {
-					return true;
-				}
-			}
-			return false;
-		}
-		public void addSet(String set_id) {
-			String[] newSets = new String[sets.length + 1];
-			System.arraycopy(sets, 0, newSets, 0, sets.length);
-			newSets[sets.length] = set_id;
-			setSets(newSets);
-		}
-		public void removeSet(String set_id) {
-			String[] newSets = new String[sets.length - 1];
-			for (int i=0,j=0; i<sets.length; i++) {
-				if (!sets[i].equals(set_id)) {
-					newSets[j] = sets[i];
-					j++;
-				}
-			}
-			setSets(newSets);
-		}
-		public int getSetSize() {
-			return sets.length;
-		}
-		public void setVar(String var) {
-			this.var = var;
-		}
-		public void setSets(String[] sets) {
-			this.sets = sets;
-		}
-		public void setEnable(boolean enable) {
-			this.enable = enable;
-		}
-	}
-	class VariableValue {
-		String var;
-		String val = VALUE_UNKNOWN;
-		
-		VariableValue(String var, String val) {
-			this.var = var;
-			if (val != null)
-				this.val = val;
-		}
-		String getVar() {
-			return var;
-		}
-		String getVal() {
-			return val;
-		}
-		void setVar(String var) {
-			this.var = var;
-		}
-		void setVal(String val) {
-			this.val = val;
-		}
-	}
-	class ProcessValue {
-		int total = 0;
-		Object[] processValues = new Object[0];
-		
-		ProcessValue(int total) {
-			this.total = total;
-			processValues = new Object[total];
-		}
-		void checkValidTask(int task_id) {
-			if (task_id > processValues.length)
-				throw new IllegalArgumentException("Invalid task id"); 
-		}
-		void setValues(int task_id, VariableValue[] values) {
-			checkValidTask(task_id);
-			processValues[task_id] = values;
-		}
-		VariableValue[] getValues(int task_id) {
-			checkValidTask(task_id);
-			Object object = processValues[task_id];
-			if (object instanceof VariableValue[]) {
-				return (VariableValue[])object;
-			}
-			return new VariableValue[0];
-		}
-		void addValue(int task_id, VariableValue value) {
-			VariableValue[] values = getValues(task_id);
-			VariableValue[] newValues = new VariableValue[values.length + 1];
-			if (values.length > 0) {
-				System.arraycopy(values, 0, newValues, 0, values.length);
-			}
-			newValues[values.length] = value;
-			setValues(task_id, newValues);
-		}
-		void updateValue(int task_id, VariableValue value) {
-			for (VariableValue v : getValues(task_id)) {
-				if (v.getVar().equals(value.getVar())) {
-					v.setVal(value.getVal());
-				}
-			}
-		}
-		void cleanValues(int task_id) {
-			processValues[task_id] = null;
-		}
-		void cleanAllValues() {
-			processValues = new Object[total]; 
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PTPDebugPerspectiveFactory.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PTPDebugPerspectiveFactory.java
deleted file mode 100644
index faa6dc2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PTPDebugPerspectiveFactory.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.console.IConsoleConstants;
-/**
- * @author clement chu
- *
- */
-public class PTPDebugPerspectiveFactory implements IPerspectiveFactory {	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
-	 */
-	public void createInitialLayout(IPageLayout layout) {
- 		String editorArea = layout.getEditorArea();
-
-		IFolderLayout folder1= layout.createFolder("bottom", IPageLayout.BOTTOM, (float)0.8, editorArea);
-		folder1.addView(IConsoleConstants.ID_CONSOLE_VIEW);
-		folder1.addView("org.eclipse.debug.ui.MemoryView");
-		folder1.addView("org.eclipse.pde.runtime.LogView");
-		
-		IFolderLayout folder2= layout.createFolder("topLeftUp", IPageLayout.TOP, (float)0.5, editorArea);
-		folder2.addView(IPTPDebugUIConstants.ID_VIEW_PARALLELDEBUG);
-
-		IFolderLayout folder4= layout.createFolder("topRight", IPageLayout.RIGHT, (float)0.6, "topLeftUp");
-		folder4.addView(IDebugUIConstants.ID_BREAKPOINT_VIEW);
-		folder4.addView(IDebugUIConstants.ID_EXPRESSION_VIEW);
-		folder4.addView(IDebugUIConstants.ID_VARIABLE_VIEW);
-		folder4.addView(IPTPDebugUIConstants.ID_VIEW_SIGNAL);
-		folder4.addView(IPTPDebugUIConstants.ID_VIEW_ARRAY);
-		folder4.addView(IPTPDebugUIConstants.ID_VIEW_VARIABLE);
-
-		IFolderLayout folder3= layout.createFolder("topLeftDown", IPageLayout.BOTTOM, (float)0.6, "topLeftUp");
-		folder3.addView(IDebugUIConstants.ID_DEBUG_VIEW);
-
-		IFolderLayout folder5= layout.createFolder("right", IPageLayout.RIGHT,(float)0.8, editorArea);
-		folder5.addView(IPageLayout.ID_OUTLINE);
-		
-		// set toolbar or menu icon
-		//layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-		//layout.addActionSet(IPTPUIConstants.ACTION_SET);
-		
-		// views - short cut
-		layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
-		layout.addShowViewShortcut("org.eclipse.debug.ui.MemoryView");
-		layout.addShowViewShortcut(NewSearchUI.SEARCH_VIEW_ID);
-		layout.addShowViewShortcut(IPTPDebugUIConstants.ID_VIEW_PARALLELDEBUG);
-		layout.addShowViewShortcut(IPTPDebugUIConstants.ID_VIEW_ARRAY);
-		layout.addShowViewShortcut(IPTPDebugUIConstants.ID_VIEW_SIGNAL);
-		layout.addShowViewShortcut(IPTPDebugUIConstants.ID_VIEW_VARIABLE);
-		layout.addShowViewShortcut(IDebugUIConstants.ID_BREAKPOINT_VIEW);
-		layout.addShowViewShortcut(IDebugUIConstants.ID_VARIABLE_VIEW);
-		layout.addShowViewShortcut(IDebugUIConstants.ID_DEBUG_VIEW);
-		layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-		layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-		//layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
-		layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
-		layout.addShowViewShortcut("org.eclipse.pde.runtime.LogView");
-
-		// link - things we should do
-		layout.addShowInPart(IPTPDebugUIConstants.ID_VIEW_PARALLELDEBUG);
-		layout.addShowInPart(IPTPDebugUIConstants.ID_VIEW_ARRAY);
-		layout.addShowInPart(IPTPDebugUIConstants.ID_VIEW_SIGNAL);
-		layout.addShowInPart(IPTPDebugUIConstants.ID_VIEW_VARIABLE);
-		layout.addShowInPart(IDebugUIConstants.ID_DEBUG_VIEW);
-		//layout.addShowInPart(IPageLayout.ID_RES_NAV);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PValueDetailProvider.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PValueDetailProvider.java
deleted file mode 100644
index 67baf68..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PValueDetailProvider.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.ui.IValueDetailListener;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPValue;
-
-/**
- * @author Clement chu
- * 
- */
-public class PValueDetailProvider {
-	private static PValueDetailProvider fInstance = null;
-
-	/** Get instance
-	 * @return
-	 */
-	public static PValueDetailProvider getDefault() {
-		if (fInstance == null) {
-			fInstance = new PValueDetailProvider();
-		}
-		return fInstance;
-	}
-	/** Compute detail
-	 * @param value
-	 * @param listener
-	 */
-	public void computeDetail(final IValue value, final IValueDetailListener listener) {
-		if (value instanceof IPValue) {
-			final IPStackFrame frame = PDebugUIUtils.getCurrentStackFrame();
-			if (frame != null) {
-				DebugPlugin.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						listener.detailComputed(value, ((IPValue) value).evaluateAsExpression(frame));
-					}
-				});
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PVariableManager.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PVariableManager.java
deleted file mode 100644
index b553478..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PVariableManager.java
+++ /dev/null

@@ -1,338 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.pdi.IPDISession;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.core.pdi.model.IPDIExpression;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.views.IToolTipProvider;
-
-/**
- * @author clement
- *
- */
-public class PVariableManager {
-	private Map<String, List<PVariableInfo>> jobVariableMap = new HashMap<String,List<PVariableInfo>>();
-	private UpdateVariableJob upVariableJob = new UpdateVariableJob();
-	
-	public void shutdown() {
-		jobVariableMap.clear();
-		upVariableJob.cancelAll();
-	}
-	public PVariableInfo[] getPVariableInfo() {
-		List<PVariableInfo> aList = new ArrayList<PVariableInfo>();
-		for (Iterator<List<PVariableInfo>> i=jobVariableMap.values().iterator(); i.hasNext();) {
-			aList.addAll(i.next());
-		}
-		return aList.toArray(new PVariableInfo[0]);
-	}
-	public PVariableInfo[] getPVariableInfo(IPJob job) {
-		List<PVariableInfo> infoList = jobVariableMap.get(job.getID());
-		if (infoList == null)
-			return new PVariableInfo[0];
-
-		return infoList.toArray(new PVariableInfo[0]);
-	}
-	public boolean isPVariableEnable(IPJob job, String varname) {
-		List<PVariableInfo> infoList = jobVariableMap.get(job.getID());
-		if (infoList != null) {
-			for (PVariableInfo info : infoList.toArray(new PVariableInfo[0])) {
-				if (info.getName().equals(varname))
-					return info.isEnabled();
-			}
-		}
-		return false;
-	}
-	public void updateVariableStatus(PVariableInfo info, boolean enabled) throws CoreException {
-		info.setEnabled(enabled);
-		getSession(info.getJob()).getPDISession().getExpressionManager().updateStatusMultiExpressions(info.getName(), enabled);
-	}
-	public void updateVariableStatus(IPJob job, String varname, boolean enabled) throws CoreException {
-		PVariableInfo info = findVariableInfo(job, varname);
-		if (info == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "Variable " + varname + " is not existed.", null));
-
-		updateVariableStatus(info, enabled);
-	}
-	public void addVariable(IPJob job, String varname, boolean enabled) throws CoreException {
-		if (findVariableInfo(job, varname) != null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "Variable " + varname + " is already existed.", null));
-		
-		List<PVariableInfo> infoList = jobVariableMap.get(job.getID());
-		if (infoList == null) {
-			infoList = new ArrayList<PVariableInfo>();
-			jobVariableMap.put(job.getID(), infoList);
-		}
-		IPSession session = getSession(job);
-		session.getPDISession().getExpressionManager().createMutliExpressions(session.getTasks(), varname, enabled);
-		infoList.add(new PVariableInfo(job, varname, enabled));
-	}
-	public void removeVariable(IPJob job) {
-		removeVariable(job.getID());
-	}
-	public void removeVariable(String job_id) {
-		jobVariableMap.remove(job_id);
-	}
-	public void removeVariable(IPJob job, String varname) throws CoreException {
-		PVariableInfo info = findVariableInfo(job, varname);
-		if (info == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "Variable " + varname + " is not existed.", null));
-
-		jobVariableMap.get(job.getID()).remove(info);
-		getSession(job).getPDISession().getExpressionManager().removeMutliExpressions(varname);
-	}
-	public void updateVariable(IPJob job, String varname, String newvarname, boolean enabled) throws CoreException {
-		if (newvarname != null) {
-			removeVariable(job, varname);
-			addVariable(job, newvarname, enabled);
-		}
-		else {
-			updateVariableStatus(job, varname, enabled);
-		}
-	}
-	public void updateValues(IPJob job) {
-		try {
-			updateValues(job, getSession(job).getTasks());
-		}
-		catch (CoreException ce) {
-			ce.printStackTrace();
-		}
-	}
-	public void updateValues(final IPJob job, final BitList tasks) {
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			  public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				  try {
-					  IPDISession session = getSession(job).getPDISession();
-					  BitList targetTasks = session.getTaskManager().getSuspendedTasks(tasks);
-					  if (targetTasks.isEmpty())
-						  monitor.done();
-					  else
-						  session.getExpressionManager().updateMultiExpressions(targetTasks, monitor);
-				  }
-				  catch (CoreException ce) {
-					  throw new InterruptedException(ce.getMessage());
-				  }
-				  catch (PDIException e) {
-					  throw new InterruptedException(e.getMessage());
-				  }
-			  }
-		};
-		try {
-			new ProgressMonitorDialog(PTPDebugUIPlugin.getActiveWorkbenchShell()).run(true, true, runnable);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException ie) {
-			ie.printStackTrace();
-		}
-	}
-	public String getValue(final IPJob job, final int task, final IToolTipProvider provider) {
-		try {
-			IPSession session = getSession(job);
-			IPDIExpression[] expressions = session.getPDISession().getExpressionManager().getMultiExpressions(task);
-			if (expressions == null || expressions.length == 0)
-				return "";
-
-			IPProcess p = job.getProcessByIndex(task);
-			if (p == null || p.getState() != ProcessAttributes.State.SUSPENDED)
-				return "";
-			
-			StringBuffer display = new StringBuffer();
-			for (IPDIExpression expression : expressions) {
-				display.append("<i>");
-				display.append(expression.getExpressionText());
-				display.append("</i>");
-				display.append(" = ");
-				try {
-					IAIF aif = expression.getAIF();
-					if (aif == null) {
-						IRunnableWithProgress runnable = new IRunnableWithProgress() {
-							  public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-								  try {
-									  IPSession session = getSession(job);
-									  session.getPDISession().getExpressionManager().updateMultiExpressions(session.getTasks(task), monitor);
-								  }
-								  catch (CoreException ce) {
-									  throw new InterruptedException(ce.getMessage());
-								  }
-								  catch (PDIException e) {
-									  //throw new InterruptedException(e.getMessage());
-								  }
-								  if (provider != null)
-									  provider.update(null, getValue(job, task, null));
-							  }
-						};
-						queueRunnable(runnable);
-						display.append("Pending...");
-					}
-					else {
-						display.append(aif.getValue().getValueString());
-					}
-				}
-				catch (PDIException e) {
-					display.append(e.getMessage());
-				}
-				catch (AIFException ae) {
-					display.append(ae.getMessage());
-				}
-				display.append("<br>");
-			}
-			return display.toString();
-		}
-		catch (CoreException e) {
-			return e.getMessage();
-		}
-	}
-		
-	public void resetValues(final IPJob job) {
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			  public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				  try {
-					  IPSession session = getSession(job);
-					  session.getPDISession().getExpressionManager().cleanMultiExpressions(session.getTasks(), monitor);
-				  }
-				  catch (CoreException ce) {
-					  throw new InterruptedException(ce.getMessage());
-				  }
-				  catch (PDIException e) {
-					  throw new InterruptedException(e.getMessage());
-				  }
-			  }
-		};
-		queueRunnable(runnable);
-	}
-	public void resetValue(final IPJob job, final BitList tasks) {
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			  public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				  try {
-					  IPSession session = getSession(job);
-					  session.getPDISession().getExpressionManager().cleanMultiExpressions(tasks, monitor);
-				  }
-				  catch (CoreException ce) {
-					  throw new InterruptedException(ce.getMessage());
-				  }
-				  catch (PDIException e) {
-					  throw new InterruptedException(e.getMessage());
-				  }
-			  }
-		};
-		queueRunnable(runnable);
-	}
-	
-	private PVariableInfo findVariableInfo(IPJob job, String varname) {
-		List<PVariableInfo> infoList = jobVariableMap.get(job.getID());
-		if (infoList != null) {
-			for (PVariableInfo info : infoList.toArray(new PVariableInfo[0])) {
-				if (info.getName().equals(varname)) {
-					return info;
-				}
-			}
-		}
-		return null;
-	}
-	private IPSession getSession(IPJob job) throws CoreException {
-		IPSession session = PTPDebugCorePlugin.getDebugModel().getSession(job);
-		if (session == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found.", null));
-		
-		return session;
-	}
-	public class PVariableInfo {
-		private IPJob job;
-		private String name;
-		private boolean enabled;
-		
-		public PVariableInfo(IPJob job, String name, boolean enabled) {
-			this.job = job;
-			this.name = name;
-			this.enabled = enabled;
-		}
-		public IPJob getJob() {
-			return job;
-		}
-		public String getName() {
-			return name;
-		}
-		public boolean isEnabled() {
-			return enabled;
-		}
-		public void setEnabled(boolean enabled) {
-			this.enabled = enabled;
-		}
-	}
-	
-	/*************************************************
-	 * Notify Job
-	 *************************************************/
-	public void queueRunnable(IRunnableWithProgress runnable) {
-		upVariableJob.addRunnable(runnable);
-	}
-	private class UpdateVariableJob extends Job {
-		private Vector<IRunnableWithProgress> fRunnables;
-		public UpdateVariableJob() {
-			super("PTP Variable Job");
-			setSystem(true);
-			fRunnables = new Vector<IRunnableWithProgress>(10);
-		}
-		public void cancelAll() {
-			fRunnables.clear();
-			super.cancel();
-		}
-		public void addRunnable(IRunnableWithProgress runnable) {
-			synchronized (fRunnables) {
-				fRunnables.add(runnable);
-			}
-			schedule();
-		}
-		public boolean shouldRun() {
-			return !fRunnables.isEmpty();
-		}
-		public IStatus run(IProgressMonitor monitor) {
-			IRunnableWithProgress[] runnables;
-			synchronized (fRunnables) {
-				runnables = fRunnables.toArray(new IRunnableWithProgress[0]);
-				fRunnables.clear();
-			}
-			MultiStatus failed = null;
-			monitor.beginTask(getName(), runnables.length);
-			for (IRunnableWithProgress runnable : runnables) {
-				try {
-					runnable.run(monitor);
-				}
-				catch (Exception e) {
-					if (failed == null)
-						failed = new MultiStatus(PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, "Event notify error", null);
-					failed.add(new Status(IStatus.ERROR, PTPDebugCorePlugin.getUniqueIdentifier(), PTPDebugCorePlugin.INTERNAL_ERROR, "Event notify error", e));
-				}
-				monitor.worked(1);
-			}
-			monitor.done();
-			if (failed == null)
-				return Status.OK_STATUS;
-			
-			return failed;
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PWatchExpressionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PWatchExpressionDelegate.java
deleted file mode 100644
index 9d83d07..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PWatchExpressionDelegate.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IWatchExpressionDelegate;
-import org.eclipse.debug.core.model.IWatchExpressionListener;
-import org.eclipse.debug.core.model.IWatchExpressionResult;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-
-/**
- * @author Clement chu
- */
-public class PWatchExpressionDelegate implements IWatchExpressionDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IWatchExpressionDelegate#evaluateExpression(java.lang.String, org.eclipse.debug.core.model.IDebugElement, org.eclipse.debug.core.model.IWatchExpressionListener)
-	 */
-	public void evaluateExpression(final String expression, IDebugElement context, final IWatchExpressionListener listener) {
-		if (!(context instanceof IPStackFrame)) {
-			listener.watchEvaluationFinished(null);
-			return;
-		}
-		final IPStackFrame frame = (IPStackFrame) context;
-		Runnable runnable = new Runnable() {
-			public void run() {
-				IValue value = null;
-				DebugException de = null;
-				try {
-					value = frame.evaluateExpression(expression);
-				} catch (DebugException e) {
-					de = e;
-				}
-				IWatchExpressionResult result = evaluationComplete(expression, value, de);
-				listener.watchEvaluationFinished(result);
-			}
-		};
-		DebugPlugin.getDefault().asyncExec(runnable);
-	}
-
-	/** Get watch expression result
-	 * @param expression
-	 * @param value
-	 * @param de
-	 * @return
-	 */
-	protected IWatchExpressionResult evaluationComplete(final String expression, final IValue value, final DebugException de) {
-		return new IWatchExpressionResult() {
-			public IValue getValue() {
-				return value;
-			}
-			public boolean hasErrors() {
-				return (de != null);
-			}
-			public String getExpressionText() {
-				return expression;
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.debug.core.model.IWatchExpressionResult#getException()
-			 */
-			public DebugException getException() {
-				return de;
-			}
-			public String[] getErrorMessages() {
-				return (de != null) ? new String[] { de.getMessage() } : new String[0];
-			}
-		};
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PixelConverter.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PixelConverter.java
deleted file mode 100644
index e80d30d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/PixelConverter.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author Clement chu
- */
-public class PixelConverter {
-	private FontMetrics fFontMetrics;
-
-	public PixelConverter(Control control) {
-		GC gc = new GC(control);
-		gc.setFont(control.getFont());
-		setFontMetrics(gc.getFontMetrics());
-		gc.dispose();
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertHeightInCharsToPixels(int)
-	 */
-	public int convertHeightInCharsToPixels(int chars) {
-		return Dialog.convertHeightInCharsToPixels(getFontMetrics(), chars);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertHorizontalDLUsToPixels(int)
-	 */
-	public int convertHorizontalDLUsToPixels(int dlus) {
-		return Dialog.convertHorizontalDLUsToPixels(getFontMetrics(), dlus);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertVerticalDLUsToPixels(int)
-	 */
-	public int convertVerticalDLUsToPixels(int dlus) {
-		return Dialog.convertVerticalDLUsToPixels(getFontMetrics(), dlus);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#convertWidthInCharsToPixels(int)
-	 */
-	public int convertWidthInCharsToPixels(int chars) {
-		return Dialog.convertWidthInCharsToPixels(getFontMetrics(), chars);
-	}
-
-	private FontMetrics getFontMetrics() {
-		return this.fFontMetrics;
-	}
-
-	private void setFontMetrics(FontMetrics fontMetrics) {
-		this.fFontMetrics = fontMetrics;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/SWTUtil.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/SWTUtil.java
deleted file mode 100644
index 2279079..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/SWTUtil.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DragSource;
-import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Caret;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * @author Clement chu
- */
-public class SWTUtil {
-	/**
-	 * Returns the standard display to be used. The method first checks, if the
-	 * thread calling this method has an associated disaply. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-
-	/**
-	 * Returns the shell for the given widget. If the widget doesn't represent
-	 * a SWT object that manage a shell, <code>null</code> is returned.
-	 * 
-	 * @return the shell for the given widget
-	 */
-	public static Shell getShell(Widget widget) {
-		if (widget instanceof Control)
-			return ((Control)widget).getShell();
-		if (widget instanceof Caret)
-			return ((Caret)widget).getParent().getShell();
-		if (widget instanceof DragSource)
-			return ((DragSource)widget).getControl().getShell();
-		if (widget instanceof DropTarget)
-			return ((DropTarget)widget).getControl().getShell();
-		if (widget instanceof Menu)
-			return ((Menu)widget).getParent().getShell();
-		if (widget instanceof ScrollBar)
-			return ((ScrollBar)widget).getParent().getShell();
-		return null;
-	}
-
-	/**
-	 * Returns a width hint for a button control.
-	 */
-	public static int getButtonWidthHint(Button button) {
-		PixelConverter converter = new PixelConverter(button);
-		int widthHint = converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-	}
-
-	/**
-	 * Returns a height hint for a button control.
-	 */
-//	public static int getButtonHeigthHint(Button button) {
-//		PixelConverter converter = new PixelConverter(button);
-//		return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
-//	}
-
-	/**
-	 * Sets width and height hint for the button control. <b>Note:</b> This
-	 * is a NOP if the button's layout data is not an instance of <code>GridData</code>.
-	 * 
-	 * @param the button for which to set the dimension hint
-	 */
-	public static void setButtonDimensionHint(Button button) {
-		Assert.isNotNull(button);
-		Object gd = button.getLayoutData();
-		if (gd instanceof GridData) {
-			((GridData)gd).widthHint = getButtonWidthHint(button);
-			((GridData)gd).horizontalAlignment = GridData.FILL;	 
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/UIDebugManager.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/UIDebugManager.java
deleted file mode 100644
index 25203f2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/UIDebugManager.java
+++ /dev/null

@@ -1,771 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui;
-
-import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointListener;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.DebugJobStorage;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.PDebugModel;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.ProcessInputStream;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.pdi.PDIException;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.OutputConsole;
-import org.eclipse.ptp.ui.managers.JobManager;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ptp.ui.views.IToolTipProvider;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * @author clement chu
- * 
- */
-public class UIDebugManager extends JobManager implements IBreakpointListener {
-	private interface IDebugProgressMonitor {
-		IStatus runDebugJob(IPJob job, IPSession session, IProgressMonitor monitor);
-	}
-	
-	private class UIDebugWorkbenchJob extends WorkbenchJob {
-		private IPJob job = null;
-		private IPSession session = null;
-		private IDebugProgressMonitor debugMonitor = null;
-		public UIDebugWorkbenchJob(boolean runInDialog, String name, IPJob job, IDebugProgressMonitor debugMonitor) {
-			super(name);
-			this.job = job;
-			this.debugMonitor = debugMonitor;
-			if (runInDialog)
-				PlatformUI.getWorkbench().getProgressService().showInDialog(null, this);
-			schedule();
-		}
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			return debugMonitor.runDebugJob(job, session, monitor);
-		}
-	    public boolean shouldRun() {
-	    	session = getDebugSession(job);
-	    	if (session == null)
-	    		return false;
-	    	if (!session.isReady())
-	    		return false;
-	    	return super.shouldRun();
-	    }
-	}
-	
-	private DebugJobStorage consoleStorage = new DebugJobStorage("Console");
-	private PVariableManager jobVarMgr = new PVariableManager();
-	private PAnnotationManager annotationMgr = null;
-
-	private PDebugModel debugModel = null;
-	private IPSession currentSession = null;
-	private boolean prefAutoUpdateVarOnSuspend = false;
-	
-	private boolean prefAutoUpdateVarOnChange = false;
-	
-	private boolean prefRegisterProc0 = true;
-	
-	private IPropertyChangeListener propertyChangeListener = new IPropertyChangeListener() {
-		public void propertyChange(PropertyChangeEvent event) {
-			String preferenceType = event.getProperty();
-			String value = (String)event.getNewValue();
-			if (preferenceType.equals(IPDebugConstants.PREF_PTP_DEBUG_REGISTER_PROC_0)) {
-				prefRegisterProc0 = new Boolean(value).booleanValue();
-			}
-			else if (preferenceType.equals(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_SUSPEND)) {
-				prefAutoUpdateVarOnSuspend = new Boolean(value).booleanValue();
-			}
-			else if (preferenceType.equals(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_CHANGE)) {
-				prefAutoUpdateVarOnChange = new Boolean(value).booleanValue();
-			}
-			else if (preferenceType.equals(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT)) {
-				for (IPJob job : getJobs()) {
-					IPSession session = getDebugSession(job);
-					if (session != null) {
-						session.getPDISession().setRequestTimeout(new Integer(value).longValue());
-					}
-				}
-			}
-		}
-	};
-	
-	public UIDebugManager() {
-		PTPDebugCorePlugin.getDefault().getPluginPreferences().addPropertyChangeListener(propertyChangeListener);
-		DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this);
-		debugModel = PTPDebugCorePlugin.getDebugModel();
-		annotationMgr = new PAnnotationManager(this);
-		initializePreferences();
-	}
-	
-	/**
-	 * Add process to console window if it is register into Debug View
-	 * @param proc
-	 */
-	public void addConsoleWindow(IPJob job, IPProcess proc) {
-		if (consoleStorage.getValue(job.getID(), proc.getID()) == null) {
-			OutputConsole outputConsole = new OutputConsole(proc.getName(), new ProcessInputStream(proc));
-			consoleStorage.addValue(job.getID(), proc.getID(), outputConsole);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointAdded(org.eclipse.debug.core.model.IBreakpoint)
-	 */
-	public void breakpointAdded(final IBreakpoint breakpoint) {
-		if (PTPDebugUIPlugin.isPTPDebugPerspective()) {
-			if (breakpoint instanceof ICLineBreakpoint) {
-				//delete c breakpoint if the ptp debug perspective is active
-				WorkbenchJob uiJob = new WorkbenchJob("Removing C-Line breakpoint...") {
-					public IStatus runInUIThread(IProgressMonitor monitor) {
-						try {
-							DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);
-						} catch (CoreException e) {
-							return e.getStatus();
-						}
-						return Status.OK_STATUS;
-					}
-				};
-				uiJob.setSystem(true);
-				uiJob.schedule();
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointChanged(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointListener#breakpointRemoved(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.resources.IMarkerDelta)
-	 */
-	public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta) {}
-	
-	/**
-	 * Convert string to integer
-	 * @param id
-	 * @return
-	 */
-	public int convertToInt(String id) {
-		return Integer.parseInt(id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.managers.AbstractUIManager#fireJobChangedEvent(int, java.lang.String, java.lang.String)
-	 */
-	public void fireJobChangedEvent(int type, String cur_jid, String pre_jid) {
-		//TODO ?? updateBreakpointMarker
-		updateBreakpointMarker(IElementHandler.SET_ROOT_ID);
-		removeAllRegisterElements(pre_jid);
-		super.fireJobChangedEvent(type, cur_jid, pre_jid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.internal.ui.AbstractUIManager#fireSetEvent(int, org.eclipse.ptp.ui.model.IElement[], org.eclipse.ptp.ui.model.IElementSet, org.eclipse.ptp.ui.model.IElementSet)
-	 */
-	public synchronized void fireSetEvent(int eventType, IElement[] elements, IElementSet cur_set, IElementSet pre_set) {
-		IPSession session = getDebugSession(getJob());
-		if (session != null) {
-			switch (eventType) {
-			case CREATE_SET_TYPE:
-				BitList cTasks = convertElementsToBitList(session, elements);
-				debugModel.createSet(session, cur_set.getName(), cTasks);
-				break;
-			case DELETE_SET_TYPE:
-				debugModel.deleteSet(session, cur_set.getName());
-				break;
-			case CHANGE_SET_TYPE:
-				if (cur_set != null) {
-					//annotationMgr.updateAnnotation(cur_set, pre_set);
-					updateBreakpointMarker(cur_set.getName());
-					updateRegisterUnRegisterElements(cur_set, pre_set, getCurrentJobId());
-				}
-				break;
-			case ADD_ELEMENT_TYPE:
-				BitList aTasks = convertElementsToBitList(session, elements);
-				debugModel.addTasks(session, cur_set.getName(), aTasks);
-				break;
-			case REMOVE_ELEMENT_TYPE:
-				BitList rTasks = convertElementsToBitList(session, elements);
-				debugModel.removeTasks(session, cur_set.getName(), rTasks);
-				break;
-			}
-			super.fireSetEvent(eventType, elements, cur_set, pre_set);
-		}
-	}
-	
-	/**
-	 * @return
-	 */
-	public String getCurrentJobId() {
-		IPJob job = getJob();
-		if (job != null) {
-			return job.getID();
-		}
-		return IManager.EMPTY_ID;
-	}
-	
-	/**
-	 * @return
-	 */
-	public IPSession getCurrentSession() {
-		if (currentSession == null)
-			currentSession = getDebugSession(getJob());
-		return currentSession;
-	}
-	
-	/**
-	 * Get debug session
-	 * @param job
-	 * @return
-	 */
-	public IPSession getDebugSession(IPJob job) {
-		if (job == null)
-			return null;
-		return debugModel.getSession(job);
-	}
-	
-	/**
-	 * Get debug session
-	 * @param job_id Job ID
-	 * @return
-	 */
-	public IPSession getDebugSession(String job_id) {
-		if (isNoJob(job_id))
-			return null;
-		return getDebugSession(findJobById(job_id));
-	}
-	
-	/**
-	 * @return
-	 */
-	public PVariableManager getJobVariableManager() {
-		return jobVarMgr;
-	}
-	
-	/**
-	 * @param obj
-	 * @return
-	 */
-	public BitList getSelectedRegisteredTasks(Object obj) {
-		IDebugTarget target = null;
-		if (obj instanceof IStackFrame) {
-			target = ((IStackFrame)obj).getDebugTarget();
-		}
-		else if (obj instanceof IThread) {
-			target = ((IThread)obj).getDebugTarget();
-		}
-		else if (obj instanceof IDebugTarget) {
-			target = (IDebugTarget)obj;
-		}
-		
-		if (target instanceof IPDebugTarget) {
-			 return ((IPDebugTarget)target).getTasks();
-		}
-		return null;
-	}
-	
-	/** 
-	 * Get tasks from given set
-	 * @param job_id job ID
-	 * @param set_id set ID
-	 * @return
-	 * @throws CoreException
-	 */
-	public BitList getTasks(IPSession session, String set_id) throws CoreException {
-		return debugModel.getTasks(session, set_id);
-	}
-
-	/**
-	 * @param set_id
-	 * @return
-	 * @throws CoreException
-	 */
-	public BitList getTasks(String set_id) throws CoreException {
-		return getTasks(getCurrentJobId(), set_id);
-	}
-	
-	/**
-	 * @param job_id
-	 * @param set_id
-	 * @return
-	 * @throws CoreException
-	 */
-	public BitList getTasks(String job_id, String set_id) throws CoreException {
-		IPSession session = getDebugSession(job_id);
-		if (session == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found", null));
-		return getTasks(session, set_id);
-	}
-	
-	/**
-	 * Get value text for tooltip
-	 * @param taskID
-	 * @return
-	 */
-	public String getValueText(int taskID, IToolTipProvider provider) {
-		IPJob job = getJob();
-		if (job == null)
-			return "No job found";
-		
-		return getJobVariableManager().getValue(getJob(), taskID, provider);
-	}
-	
-	/**
-	 * @return
-	 */
-	public boolean isAutoUpdateVarOnChange() {
-		return prefAutoUpdateVarOnChange;
-	}
-	
-	/**
-	 * @return
-	 */
-	public boolean isAutoUpdateVarOnSuspend() {
-		return prefAutoUpdateVarOnSuspend;
-	}
-	
-	/**
-	 * Is job in debug mode
-	 * @param job
-	 * @return true if given job in debug mode
-	 */
-	public boolean isDebugMode(IPJob job) {
-		if (job == null)
-			return false;
-		return job.isDebug();
-	}
-	
-	/**
-	 * Is Job in debug mode
-	 * @param job_id Job ID
-	 * @return true if given job in debug mode
-	 */
-	public boolean isDebugMode(String job_id) {
-		if (isNoJob(job_id))
-			return false;
-		return isDebugMode(findJobById(job_id));
-	}
-	
-	/**
-	 * @return
-	 */
-	public boolean isEnabledDefaultRegister() {
-		return prefRegisterProc0;
-	}
-	
-	/**
-	 * Is job running
-	 * @param job
-	 * @return true if job is running
-	 */
-	public boolean isRunning(IPJob job) {
-		return (job != null && !job.isTerminated());
-	}
-	
-	/**
-	 * Is job running
-	 * @param job_id job ID
-	 * @return true if job is running
-	 */
-	public boolean isRunning(String job_id) {
-		if (isNoJob(job_id))
-			return false;
-		return isRunning(findJobById(job_id));
-	}
-	
-	/** 
-	 * Register elements
-	 * @param elements
-	 */
-	public void registerElements(final IElement[] elements) {
-		new UIDebugWorkbenchJob(false, "Registered elements", getJob(), new IDebugProgressMonitor() {
-			public IStatus runDebugJob(IPJob job, IPSession session, IProgressMonitor monitor) {
-				if (job == null || session == null)
-					return Status.CANCEL_STATUS;
-
-				BitList tasks = session.getTasks(-1);
-				for (IElement element : elements) {
-					// only register some unregistered elements
-					if (!element.isRegistered()) {
-						try {
-							tasks.set(Integer.parseInt(element.getName()));
-						} catch (NumberFormatException e) {
-							// The element name had better be the process number
-							PTPDebugCorePlugin.log(e);
-						}
-					}
-				}
-				registerTasks(session, tasks);
-				return Status.OK_STATUS;
-			}
-		});
-	}
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 */
-	public void registerTasks(IPSession session, BitList tasks) {
-		session.createDebugTarget(tasks, true, true);
-	}
-	
-	/** 
-	 * Remove all register elements
-	 * @param job_id job ID
-	 */
-	public void removeAllRegisterElements(final String job_id){
-		new UIDebugWorkbenchJob(false, "Removing registered processes", findJobById(job_id), new IDebugProgressMonitor() {
-			public IStatus runDebugJob(IPJob job, IPSession session, IProgressMonitor monitor) {
-				if (job == null || session == null)
-					return Status.CANCEL_STATUS;
-				
-				session.deleteDebugTargets(false);
-				monitor.done();
-				return Status.OK_STATUS;
-			}
-		});
-	}
-	
-	/**
-	 * Remove process from console list and close its output
-	 * @param proc
-	 */
-	public void removeConsoleWindow(IPJob job, IPProcess proc) {
-		OutputConsole outputConsole = (OutputConsole) consoleStorage.removeValue(job.getID(), proc.getID());
-		if (outputConsole != null) {
-			outputConsole.kill();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.IManager#removeJob(org.eclipse.ptp.core.IPJob)
-	 */
-	public void removeJob(IPJob job) {
-		if (job.isDebug()) {
-			debugModel.shutdownSession(job);
-			removeConsoleWindows(job);
-		}
-		super.removeJob(job);
-	}
-	
-	/** 
-	 * Resume debugger
-	 */
-	public void resume() throws CoreException {
-		resume(getCurrentJobId(), getCurrentSetId());
-	}
-	
-	/** 
-	 * Resume debugger
-	 * @param job_id job ID
-	 * @param set_id set ID
-	 */
-	public void resume(final String job_id, final String set_id) throws CoreException {
-		IPSession session = getDebugSession(job_id);
-		if (session == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found", null));
-		try {
-			session.getPDISession().resume(getTasks(session, set_id), false);
-		} catch (PDIException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.managers.JobManager#setJob(org.eclipse.ptp.core.elements.IPJob)
-	 */
-	public void setJob(IPJob job) {
-		currentSession = getDebugSession(job);
-		super.setJob(job);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.managers.JobManager#shutdown()
-	 */
-	public void shutdown() {
-		PTPDebugCorePlugin.getDefault().getPluginPreferences().removePropertyChangeListener(propertyChangeListener);
-		DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
-		annotationMgr.shutdown();
-		jobVarMgr.shutdown();
-		super.shutdown();
-	}
-	
-	/** 
-	 * Step into debugger
-	 */
-	public void stepInto() throws CoreException {
-		stepInto(getCurrentJobId(), getCurrentSetId());
-	}
-	
-	/** 
-	 * Step into debugger
-	 * @param job_id
-	 * @param set_id
-	 */
-	public void stepInto(final String job_id, final String set_id) throws CoreException {
-		IPSession session = getDebugSession(job_id);
-		if (session == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found", null));
-		try {
-			BitList tasks = getTasks(session, set_id);
-			//filterRunningTasks(tasks, STEP_INTO);
-			session.getPDISession().stepInto(tasks, 1);
-		} catch (PDIException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));
-		}
-	}
-	
-	/** 
-	 * Step over debugger
-	 */
-	public void stepOver() throws CoreException {
-		stepOver(getCurrentJobId(), getCurrentSetId());
-	}
-	
-	/** 
-	 * Step over debugger
-	 * @param job_id
-	 * @param set_id
-	 */
-	public void stepOver(final String job_id, final String set_id) throws CoreException {
-		IPSession session = getDebugSession(job_id);
-		if (session == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found", null));
-		try {
-			BitList tasks = getTasks(session, set_id);
-			//filterRunningTasks(tasks, STEP_OVER);
-			session.getPDISession().stepOver(tasks, 1);
-		} catch (PDIException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));
-		}
-	}
-	
-	/** 
-	 * Step return debugger
-	 */
-	public void stepReturn() throws CoreException {
-		stepReturn(getCurrentJobId(), getCurrentSetId());
-	}
-	
-	/** 
-	 * Step return debugger
-	 * @param job_id
-	 * @param set_id
-	 * @throws CoreException
-	 */
-	public void stepReturn(final String job_id, final String set_id) throws CoreException {
-		IPSession session = getDebugSession(job_id);
-		if (session == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found", null));
-		try {
-			BitList tasks = getTasks(session, set_id);
-			//filterRunningTasks(tasks, STEP_RETURN);
-			session.getPDISession().stepReturn(tasks, 0);
-		} catch (PDIException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));
-		}
-	}
-	
-	/** 
-	 * Suspend debugger
-	 */
-	public void suspend() throws CoreException {
-		suspend(getCurrentJobId(), getCurrentSetId());
-	}
-	
-	/** 
-	 * Suspend debugger
-	 * @param job_id
-	 * @param set_id
-	 */
-	public void suspend(final String job_id, final String set_id) throws CoreException {
-		IPSession session = getDebugSession(job_id);
-		if (session == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found", null));
-		try {
-			session.getPDISession().suspend(getTasks(session, set_id));
-		} catch (PDIException e) {
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));
-		}
-	}
-	
-	/** 
-	 * Terminate debugger
-	 */
-	public void terminate() throws CoreException {
-		terminate(getCurrentJobId(), getCurrentSetId());
-	}
-	
-	/** 
-	 * Terminate debugger
-	 * @param job_id
-	 * @param set_id
-	 */
-	public void terminate(final String job_id, final String set_id) throws CoreException {
-		IPJob job = findJobById(job_id);
-		if (isDebugMode(job)) {
-			IPSession session = getDebugSession(job);
-			if (session == null)
-				throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No session found", null));
-			try {
-				session.getPDISession().terminate(getTasks(session, set_id));
-			} catch (PDIException e) {
-				throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, e.getMessage(), null));
-			}
-		}
-	}
-	
-	/**
-	 * Unregister elements
-	 * @param elements
-	 */
-	public void unregisterElements(final IElement[] elements) {
-		new UIDebugWorkbenchJob(false, "Unregistered elements", getJob(), new IDebugProgressMonitor() {
-			public IStatus runDebugJob(IPJob job, IPSession session, IProgressMonitor monitor) {
-				if (job == null || session == null)
-					return Status.CANCEL_STATUS;
-				
-				BitList tasks = session.getTasks(-1);
-				for (IElement element : elements) {
-					if (element.isRegistered()) {
-						// only unregister some registered elements
-						try {
-							tasks.set(Integer.parseInt(element.getName()));
-						} catch (NumberFormatException e) {
-							// The element name had better be the process number
-							PTPDebugCorePlugin.log(e);
-						}
-					}
-				}
-				unregisterTasks(session, tasks);
-				return Status.OK_STATUS;
-			}
-		});
-	}
-	
-	/**
-	 * @param session
-	 * @param tasks
-	 */
-	public void unregisterTasks(IPSession session, BitList tasks) {
-		session.deleteDebugTarget(tasks, true, true);
-	}
-	
-	/**
-	 * Update breakpoint marker
-	 * @param cur_sid current set ID
-	 */
-	public void updateBreakpointMarker(final String cur_sid) {
-		WorkbenchJob uiJob = new WorkbenchJob("Updating breakpoint marker...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				try {
-					PDebugModel.updatePBreakpoints(cur_sid,  monitor);
-				} catch (CoreException e) {
-					return e.getStatus();
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		uiJob.setSystem(true);
-		uiJob.schedule();
-	}
-	
-	/**
-	 * 
-	 */
-	public void updateCurrentJobVariableValues() {
-		getJobVariableManager().updateValues(getJob());
-	}
-	
-	/** 
-	 * Update register and unregister elements
-	 * @param curSet
-	 * @param preSet
-	 * @param job_id
-	 */
-	public void updateRegisterUnRegisterElements(final IElementSet curSet, final IElementSet preSet, final String job_id) {
-		new UIDebugWorkbenchJob(false, "Updating registered/unregistered processes", findJobById(job_id), new IDebugProgressMonitor() {
-			public IStatus runDebugJob(IPJob job, IPSession session, IProgressMonitor monitor) {
-				if (job == null || session == null)
-					return Status.CANCEL_STATUS;
-				
-				session.reloadDebugTargets(debugModel.getTasks(session, curSet.getID()), true, false);
-				monitor.done();
-				return Status.OK_STATUS;
-			}
-		});
-	}
-	
-	/**
-	 * @param session
-	 * @param elements
-	 * @return
-	 */
-	private BitList convertElementsToBitList(IPSession session, IElement[] elements) {
-		BitList tasks = session.getTasks(-1);
-		for (IElement element : elements) {
-			tasks.set(convertToInt(element.getName()));
-		}
-		return tasks;
-	}
-
-	/**
-	 * @param job
-	 */
-	private void removeConsoleWindows(IPJob job) {
-		for (OutputConsole outputConsole : consoleStorage.getValueCollection(job.getID()).toArray(new OutputConsole[0])) {
-			if (outputConsole != null) {
-				outputConsole.kill();
-			}
-		}
-		consoleStorage.removeJobStorage(job.getID());
-	}
-
-	/**
-	 * Initialize preference settings
-	 */
-	private void initializePreferences() {
-		Preferences prefStore = PTPDebugCorePlugin.getDefault().getPluginPreferences();
-		prefRegisterProc0 = prefStore.getBoolean(IPDebugConstants.PREF_PTP_DEBUG_REGISTER_PROC_0);
-		prefAutoUpdateVarOnSuspend = prefStore.getBoolean(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_SUSPEND);
-		prefAutoUpdateVarOnChange = prefStore.getBoolean(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_CHANGE);
-	}
-
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractBreakpointRulerAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractBreakpointRulerAction.java
deleted file mode 100644
index 1f021e1..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractBreakpointRulerAction.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ptp.debug.core.PDebugModel;
-import org.eclipse.ui.ISaveablePart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class AbstractBreakpointRulerAction extends Action implements IUpdate {
-	private IVerticalRulerInfo info;
-	private IWorkbenchPart targetPart;
-	private IBreakpoint breakpoint;
-
-	/** Get line breakpoint
-	 * @return null if there is no line breakpoint
-	 */
-	protected IBreakpoint determineBreakpoint() {
-		IBreakpoint[] breakpoints = PDebugModel.getPBreakpoints();
-		for(int i = 0; i < breakpoints.length; i++) {
-			IBreakpoint breakpoint = breakpoints[i];
-			if (breakpoint instanceof ILineBreakpoint) {
-				ILineBreakpoint lineBreakpoint = (ILineBreakpoint)breakpoint;
-				if (breakpointAtRulerLine(lineBreakpoint)) {
-					return lineBreakpoint;
-				}
-			}
-		}
-		return null;
-	}
-
-	/** Get vertical ruler info
-	 * @return
-	 */
-	protected IVerticalRulerInfo getInfo() {
-		return info;
-	}
-
-	/** Set vertical ruler info
-	 * @param info
-	 */
-	protected void setInfo(IVerticalRulerInfo info) {
-		this.info = info;
-	}
-
-	/** Get target workbench part
-	 * @return
-	 */
-	protected IWorkbenchPart getTargetPart() {
-		return targetPart;
-	}
-	/** Set target workbench part
-	 * @param targetPart
-	 */
-	protected void setTargetPart(IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-
-	/** Get breakpoint
-	 * @return
-	 */
-	protected IBreakpoint getBreakpoint() {
-		return breakpoint;
-	}
-
-	/** Set breakpoint
-	 * @param breakpoint
-	 */
-	protected void setBreakpoint(IBreakpoint breakpoint) {
-		this.breakpoint = breakpoint;
-	}
-
-	/** Check given breakpoint line number same as current ruler line number
-	 * @param pBreakpoint
-	 * @return true if their line numbers are the same
-	 */
-	protected boolean breakpointAtRulerLine(ILineBreakpoint pBreakpoint) {
-		int lineNumber = getBreakpointLine(pBreakpoint);
-		int rulerLine = getInfo().getLineOfLastMouseButtonActivity();
-		return (rulerLine == lineNumber);
-	}
-
-	/** Get breakpoint line number
-	 * @param breakpoint
-	 * @return -1 if there is no line number
-	 */
-	private int getBreakpointLine(ILineBreakpoint breakpoint) {
-		if (getTargetPart() instanceof ISaveablePart && ((ISaveablePart)getTargetPart()).isDirty()) {
-			try {
-				return breakpoint.getLineNumber();
-			}
-			catch(CoreException e) {
-				DebugPlugin.log(e);
-			}
-		}
-		else {
-			Position position = getBreakpointPosition(breakpoint);
-			if (position != null) {
-				IDocument doc = getDocument();
-				if (doc != null) {
-					try {
-						return doc.getLineOfOffset(position.getOffset());
-					}
-					catch (BadLocationException x) {
-						DebugPlugin.log(x);
-					}
-				}
-			}
-		}
-		return -1;
-	}
-
-	/** Get breakpoint position
-	 * @param breakpoint
-	 * @return null if there is no position found in given breakpoint
-	 */
-	private Position getBreakpointPosition(ILineBreakpoint breakpoint) {
-		IAnnotationModel model = getAnnotationModel();
-		if (model != null) {
-			Iterator<?> it = model.getAnnotationIterator();
-			while(it.hasNext()) {
-				Annotation ann = (Annotation)it.next();
-				if (ann instanceof MarkerAnnotation && ((MarkerAnnotation)ann).getMarker().equals( breakpoint.getMarker())) {
-					return model.getPosition(ann);
-				}
-			}
-		}
-		return null;
-	}
-
-	/** Get document
-	 * @return
-	 */
-	private IDocument getDocument() {
-		IWorkbenchPart targetPart = getTargetPart();
-		if (targetPart instanceof ITextEditor) {
-			ITextEditor textEditor = (ITextEditor)targetPart; 
-			IDocumentProvider provider = textEditor.getDocumentProvider();
-			if (provider != null)
-				return provider.getDocument(textEditor.getEditorInput());
-		}
-		return null;
-	}
-
-	/** Get IAnnotationModel
-	 * @return
-	 */
-	private IAnnotationModel getAnnotationModel() {
-		IWorkbenchPart targetPart = getTargetPart();
-		if (targetPart instanceof ITextEditor) {
-			ITextEditor textEditor = (ITextEditor)targetPart; 
-			IDocumentProvider provider = textEditor.getDocumentProvider();
-			if (provider != null)
-				return provider.getAnnotationModel(textEditor.getEditorInput());
-		}
-		return null;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractDebugActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractDebugActionDelegate.java
deleted file mode 100644
index f6ce6a8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractDebugActionDelegate.java
+++ /dev/null

@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.INullSelectionListener;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * @author Clement chu
- */
-public abstract class AbstractDebugActionDelegate implements IWorkbenchWindowActionDelegate, IViewActionDelegate, IActionDelegate2, ISelectionListener, INullSelectionListener {
-	/**
-	 * The underlying action for this delegate
-	 */
-	private IAction fAction;
-
-	/**
-	 * This action's view part, or <code>null</code> if not installed in a view.
-	 */
-	private IViewPart fViewPart;
-
-	/**
-	 * Cache of the most recent seletion
-	 */
-	private IStructuredSelection fSelection = StructuredSelection.EMPTY;
-
-	/**
-	 * Whether this delegate has been initialized
-	 */
-	private boolean fInitialized = false;
-
-	/**
-	 * The window associated with this action delegate May be <code>null</code>
-	 */
-	protected IWorkbenchWindow fWindow;
-
-	/**
-	 * Background job for this action, or <code>null</code> if none.
-	 */
-	private DebugRequestJob fBackgroundJob = null;
-
-	class DebugRequestJob extends Job {
-		private Object[] fElements = null;
-		/**
-		 * Constructs a new job to perform a debug request (for example, step) in the background.
-		 * 
-		 * @param name
-		 *            job name
-		 */
-		public DebugRequestJob(String name) {
-			super(name);
-			setPriority(Job.INTERACTIVE);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
-		protected IStatus run(IProgressMonitor monitor) {
-			MultiStatus status = new MultiStatus(PTPDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, getStatusMessage(), null);
-			for (int i = 0; i < fElements.length; i++) {
-				Object element = fElements[i];
-				try {
-					doAction(element);
-				} catch (DebugException e) {
-					status.merge(e.getStatus());
-				}
-			}
-			return status;
-		}
-
-		/**
-		 * Sets the selection to operate on.
-		 * 
-		 * @param elements
-		 */
-		public void setTargets(Object[] elements) {
-			fElements = elements;
-		}
-
-	}
-
-	/**
-	 * It's crucial that delegate actions have a zero-arg constructor so that they can be reflected into existence when referenced in an action set in the plugin's plugin.xml file.
-	 */
-	public AbstractDebugActionDelegate() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		if (getWindow() != null) {
-			getWindow().getSelectionService().removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this);
-		}
-		fBackgroundJob = null;
-		fSelection = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		// listen to selection changes in the debug view
-		setWindow(window);
-		window.getSelectionService().addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (action.isEnabled()) {
-			IStructuredSelection selection = getSelection();
-			// disable the action so it cannot be run again until an event or selection change
-			// updates the enablement
-			action.setEnabled(false);
-			if (isRunInBackground()) {
-				runInBackground(action, selection);
-			} else {
-				runInForeground(selection);
-			}
-		}
-	}
-
-	/**
-	 * Runs this action in a background job.
-	 */
-	private void runInBackground(IAction action, IStructuredSelection selection) {
-		if (fBackgroundJob == null) {
-			fBackgroundJob = new DebugRequestJob(action.getText());
-		}
-		fBackgroundJob.setTargets(selection.toArray());
-		fBackgroundJob.schedule();
-	}
-
-	/**
-	 * Runs this action in the UI thread.
-	 */
-	private void runInForeground(final IStructuredSelection selection) {
-		final MultiStatus status = new MultiStatus(PTPDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, getStatusMessage(), null);
-		BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-			public void run() {
-				Iterator<?> selectionIter = selection.iterator();
-				while (selectionIter.hasNext()) {
-					Object element = selectionIter.next();
-					try {
-						doAction(element);
-					} catch (DebugException e) {
-						status.merge(e.getStatus());
-					}
-				}
-			}
-		});
-		reportErrors(status);
-	}
-
-	private void reportErrors(final MultiStatus ms) {
-		if (!ms.isOK()) {
-			IWorkbenchWindow window = PTPDebugUIPlugin.getActiveWorkbenchWindow();
-			if (window != null) {
-				ErrorDialog.openError(window.getShell(), getErrorDialogTitle(), getErrorDialogMessage(), ms);
-			} else {
-				PTPDebugUIPlugin.log(ms);
-			}
-		}
-	}
-
-	/**
-	 * Returns whether or not this action should be run in the background. Subclasses may override.
-	 * 
-	 * @return whether or not this action should be run in the background
-	 */
-	protected boolean isRunInBackground() {
-		return false;
-	}
-
-	/**
-	 * AbstractDebugActionDelegates come in 2 flavors: IViewActionDelegate, IWorkbenchWindowActionDelegate delegates.
-	 * </p>
-	 * <ul>
-	 * <li>IViewActionDelegate delegate: getView() != null</li>
-	 * <li>IWorkbenchWindowActionDelegate: getView == null</li>
-	 * </ul>
-	 * <p>
-	 * Only want to call update(action, selection) for IViewActionDelegates. An initialize call to update(action, selection) is made for all flavors to set the initial enabled state of the underlying action. IWorkbenchWindowActionDelegate's listen to selection changes in the debug view only.
-	 * </p>
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection s) {
-		boolean wasInitialized = initialize(action, s);
-		if (!wasInitialized) {
-			if (getView() != null) {
-				update(action, s);
-			}
-		}
-	}
-
-	protected void update(IAction action, ISelection s) {
-		if (s instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection) s;
-			action.setEnabled(getEnableStateForSelection(ss));
-			setSelection(ss);
-		} else {
-			action.setEnabled(false);
-			setSelection(StructuredSelection.EMPTY);
-		}
-	}
-
-	/**
-	 * Performs the specific action on this element.
-	 */
-	protected abstract void doAction(Object element) throws DebugException;
-
-	/**
-	 * Returns the String to use as an error dialog title for a failed action. Default is to return null.
-	 */
-	protected String getErrorDialogTitle() {
-		return null;
-	}
-
-	/**
-	 * Returns the String to use as an error dialog message for a failed action. This message appears as the "Message:" in the error dialog for this action. Default is to return null.
-	 */
-	protected String getErrorDialogMessage() {
-		return null;
-	}
-
-	/**
-	 * Returns the String to use as a status message for a failed action. This message appears as the "Reason:" in the error dialog for this action. Default is to return the empty String.
-	 */
-	protected String getStatusMessage() {
-		return "";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		fViewPart = view;
-	}
-
-	/**
-	 * Returns this action's view part, or <code>null</code> if not installed in a view.
-	 * 
-	 * @return view part or <code>null</code>
-	 */
-	protected IViewPart getView() {
-		return fViewPart;
-	}
-
-	/**
-	 * Initialize this delegate, updating this delegate's presentation. As well, all of the flavors of AbstractDebugActionDelegates need to have the initial enabled state set with a call to update(IAction, ISelection).
-	 * 
-	 * @param action
-	 *            the presentation for this action
-	 * @return whether the action was initialized
-	 */
-	protected boolean initialize(IAction action, ISelection selection) {
-		if (!isInitialized()) {
-			setAction(action);
-			if (getView() == null) {
-				// update on the selection in the debug view
-				IWorkbenchWindow window = getWindow();
-				if (window != null && window.getShell() != null && !window.getShell().isDisposed()) {
-					IWorkbenchPage page = window.getActivePage();
-					if (page != null) {
-						selection = page.getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
-					}
-				}
-			}
-			update(action, selection);
-			setInitialized(true);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the most recent selection
-	 * 
-	 * @return structured selection
-	 */
-	protected IStructuredSelection getSelection() {
-		return fSelection;
-	}
-
-	/**
-	 * Sets the most recent selection
-	 * 
-	 * @parm selection structured selection
-	 */
-	private void setSelection(IStructuredSelection selection) {
-		fSelection = selection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		update(getAction(), selection);
-	}
-
-	protected void setAction(IAction action) {
-		fAction = action;
-	}
-
-	protected IAction getAction() {
-		return fAction;
-	}
-
-	protected void setView(IViewPart viewPart) {
-		fViewPart = viewPart;
-	}
-
-	protected boolean isInitialized() {
-		return fInitialized;
-	}
-
-	protected void setInitialized(boolean initialized) {
-		fInitialized = initialized;
-	}
-
-	protected IWorkbenchWindow getWindow() {
-		return fWindow;
-	}
-
-	protected void setWindow(IWorkbenchWindow window) {
-		fWindow = window;
-	}
-
-	/**
-	 * Return whether the action should be enabled or not based on the given selection.
-	 */
-	protected boolean getEnableStateForSelection(IStructuredSelection selection) {
-		if (selection.size() == 0) {
-			return false;
-		}
-		Iterator<?> itr = selection.iterator();
-		while (itr.hasNext()) {
-			Object element = itr.next();
-			if (!isEnabledFor(element)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	protected boolean isEnabledFor(Object element) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractListenerActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractListenerActionDelegate.java
deleted file mode 100644
index ae769c8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AbstractListenerActionDelegate.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * @author Clement chu
- */
-public abstract class AbstractListenerActionDelegate  extends AbstractDebugActionDelegate implements IDebugEventSetListener, IActionDelegate2 {
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		DebugPlugin.getDefault().removeDebugEventListener(this);
-	}
-	
-	/**
-	 * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-	 */
-	public void handleDebugEvents(final DebugEvent[] events) {
-		if (getWindow() == null || getAction() == null) {
-			return;
-		}
-		Shell shell= getWindow().getShell();
-		if (shell == null || shell.isDisposed()) {
-			return;
-		}
-		Runnable r= new Runnable() {
-			public void run() {
-				for (int i = 0; i < events.length; i++) {
-					if (events[i].getSource() != null) {
-						doHandleDebugEvent(events[i]);
-					}
-				}
-			}
-		};
-		
-		shell.getDisplay().asyncExec(r);
-	}
-	
-	/**
-	 * Default implementation to update on specific debug events.
-	 * Subclasses should override to handle events differently.
-	 */
-	protected void doHandleDebugEvent(DebugEvent event) {
-		switch (event.getKind()) {
-			case DebugEvent.TERMINATE :
-				update(getAction(), getSelection());
-				break;
-			case DebugEvent.RESUME :
-				if (!event.isEvaluation() || !((event.getDetail() & DebugEvent.EVALUATION_IMPLICIT) != 0)) {
-					update(getAction(), getSelection());
-				}
-				break;
-			case DebugEvent.SUSPEND :
-				// Update on suspend events (even for evaluations), in case the user changed
-				// the selection during an implicit evaluation.
-				update(getAction(), getSelection());
-				break;
-		}
-	}		
-
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window){
-		super.init(window);
-		DebugPlugin.getDefault().addDebugEventListener(this);
-	}
-
-	/**
-	 * @see IViewActionDelegate#init(IViewPart)
-	 */
-	public void init(IViewPart view) {
-		super.init(view);
-		DebugPlugin.getDefault().addDebugEventListener(this);
-		setWindow(view.getViewSite().getWorkbenchWindow());
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.java
deleted file mode 100644
index 882f679..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class ActionMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.actions.ActionMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/** Constructor
-	 * 
-	 */
-	public ActionMessages() {}
-	/** Get string
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
-

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.properties
deleted file mode 100644
index a26b8b7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ActionMessages.properties
+++ /dev/null

@@ -1,71 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-
-ToggleBreakpointRulerAction.Toggle_Breakpoint=Set Breakpoint
-ToggleBreakpointRulerAction.Error_1=Error
-ToggleBreakpointRulerAction.Operation_failed_1=Operation failed.
-ToggleBreakpointAdapter.Empty_editor_1=Empty editor
-ToggleBreakpointAdapter.Missing_document_1=Missing document
-ToggleBreakpointAdapter.Missing_resource_1=Missing resource
-ToggleBreakpointAdapter.Invalid_line_1=Invalid line
-ToggleBreakpointAdapter.Empty_editor_2=Empty editor
-ToggleWatchpointActionDelegate.Error_1=Error
-ToggleBreakpointAdapter.Missing_document_2=Missing document
-ToggleBreakpointAdapter.Missing_resource_2=Missing resource
-ToggleBreakpointAdapter.Invalid_expression_1=Invalid expression: 
-
-RunToLineActionDelegate.Error_1=Error
-RunToLineActionDelegate.Operation_failed_1=Operation failed.
-RunToLineAdapter.Empty_editor_1=Empty editor
-RunToLineAdapter.0=Run To Line failed.
-RunToLineAdapter.Missing_document_1=Missing document
-RunToLineAdapter.Operation_is_not_supported_1=Operation is not supported.
-
-ResumeAtLineActionDelegate.Error_1=Error
-ResumeAtLineAdapter.0=Empty editor
-ResumeAtLineAdapter.1=Missing document
-ResumeAtLineAdapter.2=Empty editor
-ResumeAtLineAdapter.3=Operation is not supported.
-ResumeAtLineAdapter.4=Resume At Line failed.
-
-PBreakpointPropertiesRulerAction.Breakpoint_Properties=Breakpoint &Properties...
-
-EnableDisableBreakpointRulerAction.Enable_Breakpoint_1=&Enable Breakpoint
-EnableDisableBreakpointRulerAction.Enabling_disabling_breakpoints_1=Enabling/disabling breakpoints
-EnableDisableBreakpointRulerAction.Exceptions_occurred_enabling_or_disabling_breakpoint_1=Exceptions occurred enabling or disabling the breakpoint
-EnableDisableBreakpointRulerAction.Disable_Breakpoint_1=&Disable Breakpoint
-
-SignalZeroWorkbenchActionDelegate.0=Exceptions occurred attempting to resume without signal.
-SignalZeroWorkbenchActionDelegate.1=Resume without signal failed.
-SignalZeroWorkbenchActionDelegate.2=Resume Without Signal
-SignalZeroObjectActionDelegate.0=Unable to resume ignoring the signal.
-SignalZeroObjectActionDelegate.1=Operation failed.
-SignalActionDelegate.0=Unable to deliver the signal to the target.
-SignalActionDelegate.1=Operation failed.
-
-RestartActionDelegate.0=Exception(s) occurred attempting to restart.
-RestartActionDelegate.1=Restart failed.
-RestartActionDelegate.2=Restart
-
-EnableVariablesActionDelegate.0=Exceptions occurred enabling the variable(s).
-EnableVariablesActionDelegate.1=Enable variable(s) failed.

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddPExpressionAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddPExpressionAction.java
deleted file mode 100644
index 7c462a5..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddPExpressionAction.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.views.variable.PVariableDialog;
-import org.eclipse.ptp.debug.internal.ui.views.variable.PVariableView;
-
-/**
- * @author Clement chu
- */
-public class AddPExpressionAction extends Action {
-	public static final String name = "Add";
-	private PVariableView view = null;
-
-	/** Constructor
-	 * @param view
-	 */
-	public AddPExpressionAction(PVariableView view) {
-		super(name, IAction.AS_PUSH_BUTTON);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_VAR_ADD_NORMAL));
-	    //setDisabledImageDescriptor(PDebugImage.ID_ICON_VAR_ADD_DISABLE);
-	    setToolTipText(name);
-	    setId(name);
-	    setEnabled(false);
-	    this.view = view;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (new PVariableDialog(view).open() == Window.OK) {
-			view.refresh();
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddVariableAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddVariableAction.java
deleted file mode 100644
index 708114c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/AddVariableAction.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.dialogs.ArrayVariableDialog;
-import org.eclipse.ptp.debug.internal.ui.views.PTabFolder;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Clement chu
- *
- */
-public class AddVariableAction extends Action {
-	protected PTabFolder folder = null;
-	public static final String name = "Add Variable"; 
-
-	/** 
-	 * Constructor
-	 * @param folder
-	 */
-	public AddVariableAction(PTabFolder folder) {
-		super(name, IAction.AS_PUSH_BUTTON);
-		setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_ADD_VAR_NORMAL));
-		setToolTipText(name);
-		this.folder = folder;
-	}
-    /**
-     * Get shell
-     * @return
-     */
-    public Shell getShell() {
-        return folder.getViewSite().getShell();
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		getShell().getDisplay().syncExec(new Runnable() {
-			public void run() {
-				try {
-					openDialog(folder.getStackFrame());
-				} catch (CoreException e) {
-					PTPDebugUIPlugin.errorDialog(getShell(), "Error", e.getStatus());
-				}
-			}
-		} );
-	}
-	
-	/**
-	 * Open array variable dialog
-	 * @param frame
-	 * @throws DebugException
-	 */
-	protected void openDialog(IPStackFrame frame) throws DebugException {
-		if (frame != null) {
-			ArrayVariableDialog dialog = new ArrayVariableDialog(getShell(), frame);
-			if (dialog.open() == Window.OK) {
-				IVariable variable = dialog.getSelectedVariable();
-				if (variable != null) {
-					folder.createTabItem(variable.getName(), variable);
-				}
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/CompareValueAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/CompareValueAction.java
deleted file mode 100644
index 74b0994..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/CompareValueAction.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.views.variable.PVariableView;
-
-/**
- * @author Clement chu
- */
-public class CompareValueAction extends Action {
-	public static final String name = "Compare value";
-	private PVariableView view = null;
-
-	/** Constructor
-	 * @param view
-	 */
-	public CompareValueAction(PVariableView view) {
-		super(name, IAction.AS_PUSH_BUTTON);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_VAR_COMPARE_NORMAL));
-	    //setDisabledImageDescriptor(PDebugImage.ID_ICON_VAR_REFRESH_DISABLE);
-	    setToolTipText(name);
-	    setId(name);
-	    setEnabled(false);
-	    this.view = view;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		//view.getUIManager().updateVariableValue(true, null);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DebugAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DebugAction.java
deleted file mode 100644
index b43103c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DebugAction.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-
-/**
- * @author Clement
- *
- */
-public abstract class DebugAction extends ParallelAction {
-	protected ParallelDebugView view = null;
-	
-	/** Constructor
-	 * @param text
-	 * @param view
-	 */
-	public DebugAction(String text, ParallelDebugView view) {
-		super(text, view);
-		this.view = view;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DeletePExpressionAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DeletePExpressionAction.java
deleted file mode 100644
index d9bef56..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DeletePExpressionAction.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager.PVariableInfo;
-import org.eclipse.ptp.debug.internal.ui.views.variable.PVariableView;
-
-/**
- * @author Clement chu
- */
-public class DeletePExpressionAction extends Action {
-	public static final String name = "Delete";
-	private PVariableView view = null;
-
-	/** Constructor
-	 * @param view
-	 */
-	public DeletePExpressionAction(PVariableView view) {
-		super(name, IAction.AS_PUSH_BUTTON);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_VAR_DELETE_NORMAL));
-	    //setDisabledImageDescriptor(PDebugImage.ID_ICON_VAR_DELETE_DISABLE);
-	    setToolTipText(name);
-	    setId(name);
-	    setEnabled(false);
-	    this.view = view;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		ISelection selection = view.getSelection();
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-			IStructuredSelection structSelection = (IStructuredSelection)selection;
-			for (Iterator<?> i=structSelection.iterator(); i.hasNext();) {
-				PVariableInfo jVar = (PVariableInfo)i.next();
-				try {
-					view.getUIManager().getJobVariableManager().removeVariable(jVar.getJob(), jVar.getName());
-				}
-				catch (CoreException e) {
-					e.printStackTrace();
-				}
-				view.refresh();
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DisableVariablesActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DisableVariablesActionDelegate.java
deleted file mode 100644
index 9107a8f..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/DisableVariablesActionDelegate.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-/**
- * @author Clement chu
- */
-public class DisableVariablesActionDelegate extends EnableVariablesActionDelegate {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.ui.actions.EnableVariablesActionDelegate#isEnableAction()
-	 */
-	protected boolean isEnableAction() {
-		return false;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EditPExpressionAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EditPExpressionAction.java
deleted file mode 100644
index 9fd92a5..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EditPExpressionAction.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.Action;
-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.jface.window.Window;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager.PVariableInfo;
-import org.eclipse.ptp.debug.internal.ui.views.variable.PVariableDialog;
-import org.eclipse.ptp.debug.internal.ui.views.variable.PVariableView;
-
-/**
- * @author Clement chu
- */
-public class EditPExpressionAction extends Action {
-	public static final String name = "Edit";
-	private PVariableView view = null;
-
-	/** Constructor
-	 * @param view
-	 */
-	public EditPExpressionAction(PVariableView view) {
-		super(name, IAction.AS_PUSH_BUTTON);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_VAR_EDIT_NORMAL));
-	    //setDisabledImageDescriptor(PDebugImage.ID_ICON_VAR_EDIT_DISABLE);
-	    setToolTipText(name);
-	    setId(name);
-	    setEnabled(false);
-	    this.view = view;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		ISelection selection = view.getSelection();
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-			PVariableInfo jVar = (PVariableInfo)((IStructuredSelection)selection).getFirstElement();
-			if (!jVar.getJob().getID().equals(view.getUIManager().getCurrentJobId())) {
-				MessageDialog.openError(view.getViewSite().getShell(), "Not allow editing", "Selected item does not belong to current Job");
-				return;
-			}
-			if (new PVariableDialog(view, PVariableDialog.EDIT_MODE).open() == Window.OK) {
-				view.refresh();
-			}
-		}		
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java
deleted file mode 100644
index a8cadb7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerAction.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Clement chu
- *
- */
-public class EnableDisableBreakpointRulerAction extends AbstractBreakpointRulerAction {
-	/** Constructor
-	 * @param part
-	 * @param info
-	 */
-	public EnableDisableBreakpointRulerAction(IWorkbenchPart part, IVerticalRulerInfo info) {
-		setInfo(info);
-		setTargetPart(part);
-		setText(ActionMessages.getString("EnableDisableBreakpointRulerAction.Enable_Breakpoint_1"));
-		setId(IPTPDebugUIConstants.ACTION_ENABLE_DISABLE_BREAKPOINT);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (getBreakpoint() != null) {
-			try {
-				getBreakpoint().setEnabled(!getBreakpoint().isEnabled());
-			} catch (CoreException e) {
-				ErrorDialog.openError(getTargetPart().getSite().getShell(), ActionMessages.getString("EnableDisableBreakpointRulerAction.Enabling_disabling_breakpoints_1"), ActionMessages.getString("EnableDisableBreakpointRulerAction.Exceptions_occurred_enabling_or_disabling_breakpoint_1"), e.getStatus());
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
-	public void update() {
-		setBreakpoint(determineBreakpoint());
-		if (getBreakpoint() == null) {
-			setEnabled(false);
-			return;
-		}
-		setEnabled(true);
-		try {
-			boolean enabled = getBreakpoint().isEnabled();
-			setText(enabled?ActionMessages.getString("EnableDisableBreakpointRulerAction.Disable_Breakpoint_1"):ActionMessages.getString("EnableDisableBreakpointRulerAction.Enable_Breakpoint_1"));
-		} catch (CoreException e) {
-			DebugPlugin.log(e);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java
deleted file mode 100644
index 0da6d50..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableDisableBreakpointRulerActionDelegate.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author clement chu
- *
- */
-public class EnableDisableBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
-	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		return new EnableDisableBreakpointRulerAction(editor, rulerInfo);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableVariablesActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableVariablesActionDelegate.java
deleted file mode 100644
index 0dedcb9..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/EnableVariablesActionDelegate.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.debug.core.model.IEnableDisableTarget;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Clement chu
- */
-public class EnableVariablesActionDelegate implements IViewActionDelegate {
-	private IViewPart fView;
-
-	private IAction fAction;
-
-	public EnableVariablesActionDelegate() {
-	}
-
-	protected IViewPart getView() {
-		return fView;
-	}
-
-	protected void setView(IViewPart view) {
-		fView = view;
-	}
-
-	protected IAction getAction() {
-		return fAction;
-	}
-
-	protected void setAction(IAction action) {
-		fAction = action;
-	}
-
-	/**
-	 * This action enables variables.
-	 */
-	protected boolean isEnableAction() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		setView(view);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		IStructuredSelection selection = getSelection();
-		final int size = selection.size();
-		if (size == 0)
-			return;
-		final Iterator<?> it = selection.iterator();
-		final MultiStatus ms = new MultiStatus(PTPDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.getString("EnableVariablesActionDelegate.0"), null);
-		BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-			public void run() {
-				while(it.hasNext()) {
-					IEnableDisableTarget target = getEnableDisableTarget(it.next());
-					if (target != null) {
-						try {
-							if (size > 1) {
-								target.setEnabled(isEnableAction());
-							}
-							else
-								target.setEnabled(!target.isEnabled());
-						}
-						catch(DebugException e) {
-							ms.merge(e.getStatus());
-						}
-					}
-				}
-				update();
-			}
-		});
-		if (!ms.isOK()) {
-			PTPDebugUIPlugin.errorDialog(ActionMessages.getString("EnableVariablesActionDelegate.1"), ms);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		setAction(action);
-		if (!(selection instanceof IStructuredSelection))
-			return;
-		IStructuredSelection sel = (IStructuredSelection)selection;
-		Object o = sel.getFirstElement();
-		if (getEnableDisableTarget(o) == null)
-			return;
-		Iterator<?> it = sel.iterator();
-		boolean allEnabled = true;
-		boolean allDisabled = true;
-		while(it.hasNext()) {
-			IEnableDisableTarget target = getEnableDisableTarget(it.next());
-			if (target != null && !target.canEnableDisable())
-				continue;
-			if (target.isEnabled())
-				allDisabled = false;
-			else
-				allEnabled = false;
-		}
-		if (isEnableAction())
-			action.setEnabled(!allEnabled);
-		else
-			action.setEnabled(!allDisabled);
-	}
-
-	private IStructuredSelection getSelection() {
-		return (IStructuredSelection)getView().getViewSite().getSelectionProvider().getSelection();
-	}
-
-	protected void update() {
-		getView().getViewSite().getSelectionProvider().setSelection(getView().getViewSite().getSelectionProvider().getSelection());
-	}
-
-	protected IEnableDisableTarget getEnableDisableTarget(Object obj) {
-		IEnableDisableTarget target = null;
-		if (obj instanceof IAdaptable) {
-			target = (IEnableDisableTarget)((IAdaptable)obj).getAdapter(IEnableDisableTarget.class);
-		}
-		return target;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/GotoSet.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/GotoSet.java
deleted file mode 100644
index 64301e3..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/GotoSet.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author clement chu
- *
- */
-public class GotoSet implements IViewActionDelegate {
-	private IStructuredSelection selection = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		IPBreakpoint breakpoint = getPBreakpoint();
-		if (breakpoint != null) {
-			IViewPart view = PTPDebugUIPlugin.getActiveWorkbenchWindow().getActivePage().findView(IPTPDebugUIConstants.ID_VIEW_PARALLELDEBUG);
-			if (view instanceof ParallelDebugView) {
-				ParallelDebugView pview = (ParallelDebugView)view;
-				try {				
-					String jid = breakpoint.getJobId();
-					if (jid.equals(IPBreakpoint.GLOBAL))
-						jid = IManager.EMPTY_ID;
-					
-					pview.doChangeJob(jid);
-					IElementHandler elementHandler = pview.getCurrentElementHandler();
-					if (elementHandler != null) {
-						pview.selectSet((IElementSet)elementHandler.getElementByID(breakpoint.getSetId()));
-					}
-					pview.refresh(true);
-				} catch (CoreException e) {
-					PTPDebugUIPlugin.log(e);
-				}
-			}
-		}
-	}
-	
-	/** Get PTP breakpoint
-	 * @return null if there is no ptp breakpoint
-	 */
-	private IPBreakpoint getPBreakpoint() {
-		if (selection.isEmpty())
-			return null;
-		
-		Object obj = selection.getFirstElement();
-		if (obj instanceof IPBreakpoint)
-			return (IPBreakpoint)obj;
-		
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection)selection;
-			action.setEnabled(this.selection.size()==1 && getPBreakpoint()!=null);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/IResumeAtLineTarget.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/IResumeAtLineTarget.java
deleted file mode 100644
index cb12984..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/IResumeAtLineTarget.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.ISuspendResume;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPart;
-
-public interface IResumeAtLineTarget {	
-	/** Resume at line
-	 * @param part
-	 * @param selection
-	 * @param target
-	 * @throws CoreException
-	 */
-	public void resumeAtLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) throws CoreException;
-	/** Can resume at line
-	 * @param part
-	 * @param selection
-	 * @param target
-	 * @return
-	 */
-	public boolean canResumeAtLine(IWorkbenchPart part, ISelection selection, ISuspendResume target);
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ManageBreakpointRulerActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ManageBreakpointRulerActionDelegate.java
deleted file mode 100644
index bf8fb29..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ManageBreakpointRulerActionDelegate.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author clement chu
- *
- */
-public class ManageBreakpointRulerActionDelegate extends AbstractRulerActionDelegate {
-	private IEditorPart activeEditor;
-	private ToggleBreakpointRulerAction targetAction = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
-	public IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		targetAction = new ToggleBreakpointRulerAction(editor, rulerInfo);
-		return targetAction;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
-	 */
-	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
-		if (activeEditor != null) {
-			if (targetAction != null) {
-				targetAction.dispose();
-				targetAction = null;
-			}
-		}
-		activeEditor = targetEditor;
-		super.setActiveEditor(callerAction, targetEditor);
-	}
-
-	public void mouseDoubleClick(MouseEvent e) {
-		if (PTPDebugUIPlugin.isPTPPerspective())
-			targetAction.run();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesAction.java
deleted file mode 100644
index f5c412f..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesAction.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.dialogs.PropertyDialogAction;
-
-/**
- * @author clement chu
- *
- */
-public class PBreakpointPropertiesAction implements IObjectActionDelegate {
-	private IWorkbenchPart part;
-	private IPBreakpoint breakpoint;
-
-	/** Constructor
-	 * 
-	 */
-	public PBreakpointPropertiesAction() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		part = targetPart;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		PropertyDialogAction propertyAction = new PropertyDialogAction(getActivePart().getSite(), new ISelectionProvider() {
-			public void addSelectionChangedListener( ISelectionChangedListener listener ) {
-			}
-			public ISelection getSelection() {
-				return new StructuredSelection(getBreakpoint());
-			}
-			public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-			}
-			public void setSelection(ISelection selection) {
-			}
-		} );
-		propertyAction.run();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection)selection;
-			if (ss.isEmpty() || ss.size() > 1) {
-				return;
-			}
-			Object element = ss.getFirstElement();
-			if (element instanceof IPBreakpoint) {
-				setBreakpoint((IPBreakpoint)element);
-			}
-		}
-	}
-
-	/** Get active workbench part
-	 * @return
-	 */
-	protected IWorkbenchPart getActivePart() {
-		return part;
-	}
-
-	/** Get ptp breakpoint
-	 * @return
-	 */
-	protected IPBreakpoint getBreakpoint() {
-		return breakpoint;
-	}
-
-	/** Set ptp breakpoint
-	 * @param breakpoint
-	 */
-	protected void setBreakpoint(IPBreakpoint breakpoint) {
-		this.breakpoint = breakpoint;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerAction.java
deleted file mode 100644
index abc6a01..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerAction.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.dialogs.PropertyDialogAction;
-
-/**
- * @author clement chu
- *
- */
-public class PBreakpointPropertiesRulerAction extends AbstractBreakpointRulerAction {
-	/** Constructor
-	 * @param part
-	 * @param info
-	 */
-	public PBreakpointPropertiesRulerAction(IWorkbenchPart part, IVerticalRulerInfo info) {
-		setInfo(info);
-		setTargetPart(part);
-		setText(ActionMessages.getString("PBreakpointPropertiesRulerAction.Breakpoint_Properties"));
-		setId(IPTPDebugUIConstants.ACTION_BREAKPOINT_PROPERTIES);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		if (getBreakpoint() != null) {
-			PropertyDialogAction action = new PropertyDialogAction(getTargetPart().getSite(), new ISelectionProvider() {
-				public void addSelectionChangedListener(ISelectionChangedListener listener) {
-				}
-				public ISelection getSelection() {
-					return new StructuredSelection(getBreakpoint());
-				}
-				public void removeSelectionChangedListener(ISelectionChangedListener listener) {					
-				}
-				public void setSelection(ISelection selection) {
-				}
-				
-			});
-			action.run();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
-	public void update() {
-		setBreakpoint(determineBreakpoint());
-		if (getBreakpoint() == null || !(getBreakpoint() instanceof IPBreakpoint)) {
-			setBreakpoint(null);
-			setEnabled(false);
-			return;
-		}
-		setEnabled(true);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerActionDelegate.java
deleted file mode 100644
index a310d90..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/PBreakpointPropertiesRulerActionDelegate.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author clement chu
- *
- */
-public class PBreakpointPropertiesRulerActionDelegate extends AbstractRulerActionDelegate {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
-	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
-		return new PBreakpointPropertiesRulerAction(editor, rulerInfo);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RegisterAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RegisterAction.java
deleted file mode 100644
index 94433e0..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RegisterAction.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.UIUtils;
-import org.eclipse.ptp.ui.model.IElement;
-/**
- * @author clement chu
- *
- */
-public class RegisterAction extends DebugAction {
-	public static final String name = "Register Selected Elements";
-	private int NUM_PROCESS_WARNING = 10;
-	
-	/** Constructor
-	 * @param view
-	 */
-	public RegisterAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_REGISTER_NORMAL));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {
-		if (validation(elements)) {
-			if (elements.length > NUM_PROCESS_WARNING) {
-				if (!UIUtils.showQuestionDialog("Register Confirmation", "Are you sure you want to register (" + elements.length + ") processes?")) {
-					return;
-				}
-			}
-			try {
-				view.registerSelectedElements();
-				view.refresh(false);
-			} catch (CoreException e) {
-				PTPDebugUIPlugin.errorDialog(getShell(), "Error", e.getStatus());				
-			}
-		}
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RestartActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RestartActionDelegate.java
deleted file mode 100644
index 49184d8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RestartActionDelegate.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.ptp.debug.core.model.IRestart;
-
-/**
- * @author Clement chu
- */
-public class RestartActionDelegate extends AbstractListenerActionDelegate {
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#doAction(java.lang.Object)
-	 */
-	protected void doAction(Object element) throws DebugException {
-		IRestart restartTarget = getRestartTarget(element);
-		if (restartTarget != null) {
-			restartTarget.restart();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#isEnabledFor(java.lang.Object)
-	 */
-	protected boolean isEnabledFor(Object element) {
-		IRestart restartTarget = getRestartTarget(element);
-		if (restartTarget != null) {
-			return checkCapability(restartTarget);
-		}
-		return false;
-	}
-
-	protected boolean checkCapability(IRestart element) {
-		return element.canRestart();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#getStatusMessage()
-	 */
-	protected String getStatusMessage() {
-		return ActionMessages.getString("RestartActionDelegate.0");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#getErrorDialogMessage()
-	 */
-	protected String getErrorDialogMessage() {
-		return ActionMessages.getString("RestartActionDelegate.1");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#getErrorDialogTitle()
-	 */
-	protected String getErrorDialogTitle() {
-		return ActionMessages.getString("RestartActionDelegate.2");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#isRunInBackground()
-	 */
-	protected boolean isRunInBackground() {
-		return true;
-	}
-
-	protected IRestart getRestartTarget(Object element) {
-		if (element instanceof IAdaptable)
-			return (IRestart)((IAdaptable)element).getAdapter(IRestart.class);
-		return getDefaultRestartTarget(element);
-	}
-
-	private IRestart getDefaultRestartTarget(Object element) {
-		if (element instanceof IDebugElement) {
-			IDebugTarget target = ((IDebugElement)element).getDebugTarget();
-			if (target instanceof IRestart)
-				return (IRestart)target;
-		}
-		return null;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAction.java
deleted file mode 100644
index 90d75ab..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAction.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.model.IElement;
-/**
- * @author clement chu
- *
- */
-public class ResumeAction extends DebugAction {
-	public static final String name = "Resume";
-
-	/** Constructor
-	 * @param view
-	 */
-	public ResumeAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_RESUME_NORMAL));
-	    setDisabledImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_RESUME_DISABLE));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IManager manager = view.getUIManager();
-		if (manager instanceof UIDebugManager) {
-			try {
-				setEnabled(false);
-				((UIDebugManager)manager).resume();
-			} catch (CoreException e) {
-				setEnabled(true);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineActionDelegate.java
deleted file mode 100644
index 07af808..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineActionDelegate.java
+++ /dev/null

@@ -1,119 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.model.ISuspendResume;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-
-/**
- * @author clement
- *
- */
-public class ResumeAtLineActionDelegate implements IEditorActionDelegate, IViewActionDelegate, IActionDelegate2 {
-	private IWorkbenchPart fActivePart = null;
-	private IResumeAtLineTarget fPartTarget = null;
-	private IAction fAction = null;
-	private ISelectionListener fSelectionListener = new DebugSelectionListener();
-	protected ISuspendResume fTargetElement = null;
-
-	class DebugSelectionListener implements ISelectionListener {
-		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-			fTargetElement = null;
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection ss = (IStructuredSelection)selection;
-				if (ss.size() == 1) {
-					Object object = ss.getFirstElement();
-					if (object instanceof ISuspendResume) {
-						fTargetElement = (ISuspendResume)object;
-					}
-				}
-			}
-			update();
-		}
-	}
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		init(action);
-		bindTo(targetEditor);
-	}
-	public void init(IAction action) {
-		this.fAction = action;
-		if (action != null) {
-			action.setText(ActionMessages.getString("ResumeAtLineActionDelegate.0"));
-		}
-	}
-	public void dispose() {
-		fActivePart.getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener);
-		fActivePart = null;
-		fPartTarget = null;
-	}
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-	public void run(IAction action) {
-		if (fPartTarget != null && fTargetElement != null) {
-			try {
-				fPartTarget.resumeAtLine(fActivePart, fActivePart.getSite().getSelectionProvider().getSelection(), fTargetElement);
-			}
-			catch(CoreException e) {
-				ErrorDialog.openError(fActivePart.getSite().getWorkbenchWindow().getShell(), ActionMessages.getString("ResumeAtLineActionDelegate.1"), ActionMessages.getString("ResumeAtLineActionDelegate.2"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.fAction = action;
-		update();
-	}
-	protected void update() {
-		if (fAction == null) {
-			return;
-		}
-		boolean enabled = false;
-		if (fPartTarget != null && fTargetElement != null) {
-			IWorkbenchPartSite site = fActivePart.getSite();
-			if (site != null) {
-				ISelectionProvider selectionProvider = site.getSelectionProvider();
-				if (selectionProvider != null) {
-					ISelection selection = selectionProvider.getSelection();
-					enabled = fTargetElement.isSuspended() && fPartTarget.canResumeAtLine(fActivePart, selection, fTargetElement);
-				}
-			}
-		}
-		fAction.setEnabled(enabled);
-	}
-	public void init(IViewPart view) {
-		bindTo(view);
-	}
-	private void bindTo(IWorkbenchPart part) {
-		fActivePart = part;
-		if (part != null) {
-			part.getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener);
-			fPartTarget = (IResumeAtLineTarget)part.getAdapter(IResumeAtLineTarget.class);
-			if (fPartTarget == null) {
-				IAdapterManager adapterManager = Platform.getAdapterManager();
-				// TODO: we could restrict loading to cases when the debugging context is on
-				if (adapterManager.hasAdapter(part, IResumeAtLineTarget.class.getName())) {
-					fPartTarget = (IResumeAtLineTarget)adapterManager.loadAdapter(part, IResumeAtLineTarget.class.getName());
-				}
-			}
-			// Force the selection update
-			ISelection selection = part.getSite().getWorkbenchWindow().getSelectionService().getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
-			fSelectionListener.selectionChanged(part, selection);
-		}
-		update();		
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineAdapter.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineAdapter.java
deleted file mode 100644
index d3813da..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ResumeAtLineAdapter.java
+++ /dev/null

@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.debug.core.model.ISuspendResume;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.debug.core.model.IJumpToLine;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author Clement chu
- *
- */
-public class ResumeAtLineAdapter implements IResumeAtLineTarget {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.ui.actions.IResumeAtLineTarget#resumeAtLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
-	 */
-	public void resumeAtLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) throws CoreException {
-		String errorMessage = null;
-		if (part instanceof ITextEditor) {
-			ITextEditor textEditor = (ITextEditor)part;
-			IEditorInput input = textEditor.getEditorInput();
-			if (input == null) {
-				errorMessage = ActionMessages.getString("ResumeAtLineAdapter.0");
-			}
-			else {
-				IDocument document = textEditor.getDocumentProvider().getDocument( input );
-				if (document == null) {
-					errorMessage = ActionMessages.getString("ResumeAtLineAdapter.1");
-				}
-				else {
-					final String fileName = getFileName(input);
-					ITextSelection textSelection = (ITextSelection)selection;
-					final int lineNumber = textSelection.getStartLine() + 1;
-					if (target instanceof IAdaptable) {
-						final IJumpToLine jumpToLine = (IJumpToLine)((IAdaptable)target).getAdapter(IJumpToLine.class);
-						if (jumpToLine != null && jumpToLine.canJumpToLine(fileName, lineNumber)) {
-							Runnable r = new Runnable() {
-								public void run() {
-									try {
-										jumpToLine.jumpToLine(fileName, lineNumber);
-									}
-									catch(DebugException e) {
-										failed(e);
-									}								
-								}
-							};
-							runInBackground(r);
-						}
-					}
-					return;
-				}
-			}
-		}
-		/*
-		 * TODO DisassemblyView
-		else if (part instanceof DisassemblyView) {
-			IEditorInput input = ((DisassemblyView)part).getInput();
-			if (!(input instanceof DisassemblyEditorInput)) {
-				errorMessage = ActionMessages.getString("ResumeAtLineAdapter.2");
-			}
-			else {
-				ITextSelection textSelection = (ITextSelection)selection;
-				int lineNumber = textSelection.getStartLine() + 1;
-				final IAddress address = ((DisassemblyEditorInput)input).getAddress(lineNumber);
-				if (address != null && target instanceof IAdaptable) {
-					final IJumpToAddress jumpToAddress = (IJumpToAddress)((IAdaptable)target).getAdapter(IJumpToAddress.class);
-					if (jumpToAddress != null && jumpToAddress.canJumpToAddress(address)) {
-						Runnable r = new Runnable() {
-							public void run() {
-								try {
-									jumpToAddress.jumpToAddress(address);
-								} catch(DebugException e) {
-									failed(e);
-								}								
-							}
-						};
-						runInBackground(r);
-					}
-				}
-				return;
-			}
-		}
-		*/
-		else {
-			errorMessage = ActionMessages.getString("ResumeAtLineAdapter.3");
-		}
-		throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, errorMessage, null));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.ui.actions.IResumeAtLineTarget#canResumeAtLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
-	 */
-	public boolean canResumeAtLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) {
-		if (target instanceof IAdaptable) {			
-			if (part instanceof IEditorPart) {
-				IJumpToLine jumpToLine = (IJumpToLine)((IAdaptable)target).getAdapter(IJumpToLine.class);
-				if (jumpToLine == null)
-					return false;
-				IEditorPart editorPart = (IEditorPart)part;
-				IEditorInput input = editorPart.getEditorInput();
-				if (input == null) {
-					return false;
-				}
-				if (!(editorPart instanceof ITextEditor)) {
-					return false;
-				}
-				ITextEditor textEditor = (ITextEditor)editorPart;
-				IDocument document = textEditor.getDocumentProvider().getDocument(input);
-				if (document == null) {
-					return false;
-				}
-				String fileName;
-				try {
-					fileName = getFileName(input);
-				}
-				catch(CoreException e) {
-					return false;
-				}
-				ITextSelection textSelection = (ITextSelection)selection;
-				int lineNumber = textSelection.getStartLine() + 1;
-				return jumpToLine.canJumpToLine(fileName, lineNumber);
-			}
-			/*
-			 * TODO DisassemblyView
-			if (part instanceof DisassemblyView) {
-				IJumpToAddress jumpToAddress = (IJumpToAddress)((IAdaptable)target).getAdapter(IJumpToAddress.class);
-				if (jumpToAddress == null)
-					return false;
-				IEditorInput input = ((DisassemblyView)part).getInput();
-				if (!(input instanceof DisassemblyEditorInput)) {
-					return false;
-				}
-				ITextSelection textSelection = (ITextSelection)selection;
-				int lineNumber = textSelection.getStartLine() + 1;
-				IAddress address = ((DisassemblyEditorInput)input).getAddress(lineNumber);
-				return jumpToAddress.canJumpToAddress(address);
-			}
-			*/
-		}
-		return false;
-	}
-
-	/** Get file name
-	 * @param input
-	 * @return
-	 * @throws CoreException
-	 */
-	private String getFileName(IEditorInput input) throws CoreException {
-		if (input instanceof IFileEditorInput) {
-			return ((IFileEditorInput)input).getFile().getName();
-		}
-		if (input instanceof IStorageEditorInput) {
-			return ((IStorageEditorInput)input).getStorage().getName();
-		}
-		return null;
-	}
-
-	/** Run a job in background
-	 * @param r
-	 */
-	private void runInBackground(Runnable r) {
-		DebugPlugin.getDefault().asyncExec(r);
-	}
-
-	/** Failed to store status handler
-	 * @param e
-	 */
-	protected void failed(Throwable e) {
-		MultiStatus ms = new MultiStatus(PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.STATUS_CODE_ERROR, ActionMessages.getString("ResumeAtLineAdapter.4"), null);
-		ms.add(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.STATUS_CODE_ERROR, e.getMessage(), e));
-		IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(ms);
-		if (handler != null) {
-			try {
-				handler.handleStatus(ms, this);
-			}
-			catch(CoreException ex) {
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetAction.java
deleted file mode 100644
index 4573caf..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetAction.java
+++ /dev/null

@@ -1,214 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- * @author clement
- *
- */
-public abstract class RetargetAction implements IWorkbenchWindowActionDelegate, IPartListener, IUpdate {
-	protected IWorkbenchWindow fWindow = null;
-	private IWorkbenchPart fActivePart = null;
-	private Object fTargetAdapter = null;
-	private IAction fAction = null;
-	private static final ISelection EMPTY_SELECTION = new EmptySelection();  
-	
-	static class EmptySelection implements ISelection {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ISelection#isEmpty()
-		 */
-		public boolean isEmpty() {
-			return true;
-		}
-		
-	}
-	
-	/**
-	 * Returns the current selection in the active part, possibly
-	 * and empty selection, but never <code>null</code>.
-	 * 
-	 * @return the selection in the active part, possibly empty
-	 */
-	private ISelection getTargetSelection() {
-		if (fActivePart != null) {
-			ISelectionProvider selectionProvider = fActivePart.getSite().getSelectionProvider();
-			if (selectionProvider != null) {
-				return selectionProvider.getSelection();
-			}
-		}
-		return EMPTY_SELECTION;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		fWindow.getPartService().removePartListener(this);
-		fActivePart = null;
-		fTargetAdapter = null;
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.fWindow = window;
-		IPartService partService = window.getPartService();
-		partService.addPartListener(this);
-		IWorkbenchPart part = partService.getActivePart();
-		if (part != null) {
-			partActivated(part);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (fTargetAdapter != null) {
-			try {
-				performAction(fTargetAdapter, getTargetSelection(), fActivePart);
-			} catch (CoreException e) {
-				ErrorDialog.openError(fWindow.getShell(), ActionMessages.getString("RetargetAction.2"), ActionMessages.getString("RetargetAction.3"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	
-	/**
-	 * Performs the specific breakpoint toggling.
-	 * 
-	 * @param selection selection in the active part 
-	 * @param part active part
-	 * @throws CoreException if an exception occurrs
-	 */
-	protected abstract void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.fAction = action;
-		// if the active part did not provide an adapter, see if the selectoin does
-		if (fTargetAdapter == null && selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection) selection;
-			if (!ss.isEmpty()) {
-				Object object = ss.getFirstElement();
-				if (object instanceof IAdaptable) {
-					fTargetAdapter = getAdapter((IAdaptable) object);
-				}
-			}
-		}
-		update();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {
-		fActivePart = part;
-		IResource resource = (IResource) part.getAdapter(IResource.class);
-		if (resource == null && part instanceof IEditorPart) {
-			resource = (IResource) ((IEditorPart)part).getEditorInput().getAdapter(IResource.class);
-		}
-		if (resource != null) {
-			fTargetAdapter = getAdapter(resource);
-		}
-		if (fTargetAdapter == null) {
-			fTargetAdapter = getAdapter(part);
-		}
-		update();
-	}
-	
-	protected Object getAdapter(IAdaptable adaptable) {
-		Object adapter  = adaptable.getAdapter(getAdapterClass());
-		if (adapter == null) {
-			IAdapterManager adapterManager = Platform.getAdapterManager();
-			if (adapterManager.hasAdapter(adaptable, getAdapterClass().getName())) { 
-				fTargetAdapter = adapterManager.loadAdapter(adaptable, getAdapterClass().getName()); 
-			}
-		}
-		return adapter;
-	}
-	
-	/**
-	 * Returns the type of adapter (target) this action works on.
-	 * 
-	 * @return the type of adapter this action works on
-	 */
-	protected abstract Class getAdapterClass();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		clearPart(part);
-	}
-	
-	/**
-	 * Clears reference to active part and adapter when a relevant part
-	 * is closed or deactivated.
-	 * 
-	 * @param part workbench part that has been closed or deactivated
-	 */
-	protected void clearPart(IWorkbenchPart part) {
-		if (part.equals(fActivePart)) {
-			fActivePart = null;
-			fTargetAdapter = null;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {
-		clearPart(part);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
-	public void update() {
-		if (fAction == null) {
-			return;
-		}
-		if (fTargetAdapter != null) {
-			fAction.setEnabled(canPerformAction(fTargetAdapter, getTargetSelection(), fActivePart));
-		} else {
-			fAction.setEnabled(false);
-		}
-	}
-	
-	/**
-	 * Returns whether the specific operation is supported.
-	 * 
-	 * @param target the target adapter 
-	 * @param selection the selection to verify the operation on
-	 * @param part the part the operation has been requested on
-	 * @return whether the operation can be performed
-	 */
-	protected abstract boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part); 
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetResumeAtLineAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetResumeAtLineAction.java
deleted file mode 100644
index 6b398d0..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargetResumeAtLineAction.java
+++ /dev/null

@@ -1,85 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.ISuspendResume;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * @author clement
- *
- */
-public class RetargetResumeAtLineAction extends RetargetAction {
-	private ISelectionListener fSelectionListener = new DebugSelectionListener();
-	private ISuspendResume fTargetElement = null;
-
-	class DebugSelectionListener implements ISelectionListener {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-		 */
-		public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-			setTargetElement(null);
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection ss = (IStructuredSelection)selection;
-				if (ss.size() == 1) {
-					Object object = ss.getFirstElement();
-					if (object instanceof ISuspendResume) {
-						setTargetElement((ISuspendResume)object);
-					}
-				}
-			}
-			update();
-		}
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		fWindow.getSelectionService().removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener);
-		super.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		super.init(window);
-		window.getSelectionService().addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, fSelectionListener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.RetargetAction#performAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart)
-	 */
-	protected void performAction(Object target, ISelection selection, IWorkbenchPart part) throws CoreException {
-		((IResumeAtLineTarget)target).resumeAtLine(part, selection, getTargetElement());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.RetargetAction#getAdapterClass()
-	 */
-	protected Class getAdapterClass() {
-		return IResumeAtLineTarget.class;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.RetargetAction#canPerformAction(java.lang.Object, org.eclipse.jface.viewers.ISelection, org.eclipse.ui.IWorkbenchPart)
-	 */
-	protected boolean canPerformAction(Object target, ISelection selection, IWorkbenchPart part) {
-		return getTargetElement() != null && ((IResumeAtLineTarget)target).canResumeAtLine(part, selection, getTargetElement());
-	}
-
-	protected ISuspendResume getTargetElement() {
-		return fTargetElement;
-	}
-
-	protected void setTargetElement(ISuspendResume targetElement) {
-		fTargetElement = targetElement;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargettableActionAdapterFactory.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargettableActionAdapterFactory.java
deleted file mode 100644
index be5feda..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RetargettableActionAdapterFactory.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.IRunToLineTarget;
-import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
-
-/**
- * @author Clement chu
- *
- */
-public class RetargettableActionAdapterFactory implements IAdapterFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter( Object adaptableObject, Class adapterType) {
-		if (adapterType == IToggleBreakpointsTarget.class) {
-			return new ToggleBreakpointAdapter();
-		}
-		if (adapterType == IRunToLineTarget.class) {
-			return new RunToLineAdapter();
-		} 
-		if (adapterType == IResumeAtLineTarget.class) {
-			return new ResumeAtLineAdapter();
-		} 
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[]{IRunToLineTarget.class, IToggleBreakpointsTarget.class, IResumeAtLineTarget.class};
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RunToLineAdapter.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RunToLineAdapter.java
deleted file mode 100644
index 51ca7c0..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/RunToLineAdapter.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.debug.core.model.ISuspendResume;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.actions.IRunToLineTarget;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.debug.core.model.IRunToLine;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author Clement chu
- *
- */
-public class RunToLineAdapter implements IRunToLineTarget {
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IRunToLineTarget#runToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
-	 */
-	public void runToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) throws CoreException {
-		String errorMessage = null;
-		if (part instanceof ITextEditor) {
-			ITextEditor textEditor = (ITextEditor)part;
-			IEditorInput input = textEditor.getEditorInput();
-			if (input == null) {
-				errorMessage = ActionMessages.getString("RunToLineAdapter.Empty_editor_1");
-			}
-			else {
-				IDocument document = textEditor.getDocumentProvider().getDocument(input);
-				if (document == null) {
-					errorMessage = ActionMessages.getString("RunToLineAdapter.Missing_document_1");
-				}
-				else {
-					final String fileName = getFileName(input);
-					ITextSelection textSelection = (ITextSelection)selection;
-					final int lineNumber = textSelection.getStartLine() + 1;
-					if (target instanceof IAdaptable) {
-						final IRunToLine runToLine = (IRunToLine)((IAdaptable)target).getAdapter(IRunToLine.class);
-						if (runToLine != null && runToLine.canRunToLine(fileName, lineNumber)) {
-							Runnable r = new Runnable() {
-								public void run() {
-									try {
-										runToLine.runToLine(fileName, lineNumber, DebugUITools.getPreferenceStore().getBoolean(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE));
-									} catch(DebugException e) {
-										failed(e);
-									}								
-								}
-							};
-							runInBackground( r );
-						}
-					}
-					return;
-				}
-			}
-		}
-		/*
-		 * TODO DisassemblyView
-		else if (part instanceof DisassemblyView) {
-			IEditorInput input = ((DisassemblyView)part).getInput();
-			if (!(input instanceof DisassemblyEditorInput)) {
-				errorMessage = ActionMessages.getString("RunToLineAdapter.Empty_editor_1");
-			}
-			else {
-				ITextSelection textSelection = (ITextSelection)selection;
-				int lineNumber = textSelection.getStartLine() + 1;
-				final IAddress address = ((DisassemblyEditorInput)input).getAddress(lineNumber);
-				if (address != null && target instanceof IAdaptable) {
-					final IRunToAddress runToAddress = (IRunToAddress)((IAdaptable)target).getAdapter(IRunToAddress.class);
-					if (runToAddress != null && runToAddress.canRunToAddress(address)) {
-						Runnable r = new Runnable() {
-							public void run() {
-								try {
-									runToAddress.runToAddress(address, DebugUITools.getPreferenceStore().getBoolean(IDebugUIConstants.PREF_SKIP_BREAKPOINTS_DURING_RUN_TO_LINE));
-								}
-								catch(DebugException e) {
-									failed(e);
-								}								
-							}
-						};
-						runInBackground(r);
-					}
-				}
-				return;
-			}
-		}
-		*/
-		else {
-			errorMessage = ActionMessages.getString("RunToLineAdapter.Operation_is_not_supported_1");
-		}
-		throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, errorMessage, null));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IRunToLineTarget#canRunToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
-	 */
-	public boolean canRunToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) {
-		if (target instanceof IAdaptable) {			
-			if (part instanceof IEditorPart) {
-				IRunToLine runToLine = (IRunToLine)((IAdaptable)target).getAdapter(IRunToLine.class);
-				if (runToLine == null)
-					return false;
-				IEditorPart editorPart = (IEditorPart)part;
-				IEditorInput input = editorPart.getEditorInput();
-				if (input == null) {
-					return false;
-				}
-				if (!(editorPart instanceof ITextEditor)) {
-					return false;
-				}
-				ITextEditor textEditor = (ITextEditor)editorPart;
-				IDocument document = textEditor.getDocumentProvider().getDocument(input);
-				if (document == null) {
-					return false;
-				}
-				String fileName;
-				try {
-					fileName = getFileName(input);
-				}
-				catch (CoreException e) {
-					return false;
-				}
-				ITextSelection textSelection = (ITextSelection)selection;
-				int lineNumber = textSelection.getStartLine() + 1;
-				return runToLine.canRunToLine(fileName, lineNumber);
-			}
-			/*
-			 * TODO DisassemblyView			
-			if (part instanceof DisassemblyView) {
-				IRunToAddress runToAddress = (IRunToAddress)((IAdaptable)target).getAdapter(IRunToAddress.class);
-				if (runToAddress == null)
-					return false;
-				IEditorInput input = ((DisassemblyView)part).getInput();
-				if (!(input instanceof DisassemblyEditorInput)) {
-					return false;
-				}
-				ITextSelection textSelection = (ITextSelection)selection;
-				int lineNumber = textSelection.getStartLine() + 1;
-				IAddress address = ((DisassemblyEditorInput)input).getAddress(lineNumber);
-				return runToAddress.canRunToAddress(address);
-			}
-			*/
-		}
-		return false;
-	}
-
-	/** Get file name
-	 * @param input
-	 * @return
-	 * @throws CoreException
-	 */
-	private String getFileName(IEditorInput input) throws CoreException {
-		if (input instanceof IFileEditorInput) {
-			return ((IFileEditorInput)input).getFile().getName();
-		}
-		if (input instanceof IStorageEditorInput) {
-			return ((IStorageEditorInput)input).getStorage().getName();
-		}
-		return null;
-	}
-
-	/** Run a job in background
-	 * @param r
-	 */
-	private void runInBackground(Runnable r) {
-		DebugPlugin.getDefault().asyncExec(r);
-	}
-
-	/** Failed to store status handler
-	 * @param e
-	 */
-	protected void failed(Throwable e) {
-		MultiStatus ms = new MultiStatus(PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.STATUS_CODE_ERROR, ActionMessages.getString("ResumeAtLineAdapter.4"), null);
-		ms.add(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.STATUS_CODE_ERROR, e.getMessage(), e));
-		IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(ms);
-		if (handler != null) {
-			try {
-				handler.handleStatus(ms, this);
-			}
-			catch(CoreException ex) {
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ShowFullPathsAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ShowFullPathsAction.java
deleted file mode 100644
index 15228f9..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ShowFullPathsAction.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IDebugView;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.internal.ui.PDebugModelPresentation;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.custom.BusyIndicator;
-
-/**
- * @author Clement chu
- *
- */
-public class ShowFullPathsAction extends ViewFilterAction {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		final StructuredViewer viewer = getStructuredViewer();
-		IDebugView view = (IDebugView)getView().getAdapter(IDebugView.class);
-		if (view != null) {
-			IDebugModelPresentation pres = view.getPresentation(PTPDebugUIPlugin.getUniqueIdentifier());
-			if (pres != null) {
-				pres.setAttribute(PDebugModelPresentation.DISPLAY_FULL_PATHS, (getValue()?Boolean.TRUE:Boolean.FALSE));
-				BusyIndicator.showWhile(viewer.getControl().getDisplay(), new Runnable() {
-					public void run() {
-						viewer.refresh();
-						Preferences store = getPreferences();
-						String key = getView().getSite().getId() + "." + getPreferenceKey();
-						store.setValue(key, getValue());
-						PTPDebugUIPlugin.getDefault().savePluginPreferences();						
-					}
-				} );
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.ui.actions.ViewFilterAction#getPreferenceKey()
-	 */
-	protected String getPreferenceKey() {
-		return IPDebugConstants.PREF_SHOW_FULL_PATHS;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalActionDelegate.java
deleted file mode 100644
index bbc7963..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalActionDelegate.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionDelegate;
-
-/**
- * @author Clement chu
- */
-public class SignalActionDelegate extends ActionDelegate implements IObjectActionDelegate {
-	private IPSignal fSignal = null;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		if (getSignal() != null) {
-			final MultiStatus ms = new MultiStatus(PTPDebugUIPlugin.getUniqueIdentifier(), DebugException.REQUEST_FAILED, ActionMessages.getString("SignalActionDelegate.0"), null); //$NON-NLS-1$
-			BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-				public void run() {
-					try {
-						doAction(getSignal());
-					}
-					catch(DebugException e) {
-						ms.merge(e.getStatus());
-					}
-				}
-			});
-			if (!ms.isOK()) {
-				IWorkbenchWindow window = PTPDebugUIPlugin.getActiveWorkbenchWindow();
-				if (window != null) {
-					PTPDebugUIPlugin.errorDialog(ActionMessages.getString("SignalActionDelegate.1"), ms); //$NON-NLS-1$
-				}
-				else {
-					PTPDebugUIPlugin.log(ms);
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			Object element = ((IStructuredSelection)selection).getFirstElement();
-			if (element instanceof IPSignal) {
-				boolean enabled = enablesFor((IPSignal)element);
-				action.setEnabled(enabled);
-				if (enabled) {
-					setSignal((IPSignal)element);
-					return;
-				}
-			}
-		}
-		action.setEnabled(false);
-		setSignal(null);
-	}
-
-	protected void doAction(IPSignal signal) throws DebugException {
-		signal.signal();
-	}
-
-	private boolean enablesFor(IPSignal signal) {
-		return (signal != null && signal.getDebugTarget().isSuspended());
-	}
-
-	private void setSignal(IPSignal signal) {
-		fSignal = signal;
-	}
-
-	protected IPSignal getSignal() {
-		return fSignal;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalPropertiesActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalPropertiesActionDelegate.java
deleted file mode 100644
index 0631dec..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalPropertiesActionDelegate.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.ui.dialogs.PropertyDialogAction;
-
-/**
- * @author Clement chu
- */
-public class SignalPropertiesActionDelegate extends ActionDelegate implements IObjectActionDelegate {
-	private IPSignal fSignal;
-	private IWorkbenchPart fTargetPart;
-
-	/**
-	 * Constructor for SignalPropertiesActionDelegate.
-	 * 
-	 */
-	public SignalPropertiesActionDelegate() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		fTargetPart = targetPart;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			Object element = ((IStructuredSelection)selection).getFirstElement();
-			if (element instanceof IPSignal) {
-				action.setEnabled(true);
-				setSignal((IPSignal)element);
-				return;
-			}
-		}
-		action.setEnabled(false);
-		setSignal(null);
-	}
-
-	protected IPSignal getSignal() {
-		return this.fSignal;
-	}
-
-	private void setSignal(IPSignal signal) {
-		this.fSignal = signal;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		PropertyDialogAction propertyAction = new PropertyDialogAction(getActivePart().getSite(), new ISelectionProvider() {
-			public void addSelectionChangedListener(ISelectionChangedListener listener) {
-			}
-
-			public ISelection getSelection() {
-				return new StructuredSelection(getSignal());
-			}
-
-			public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-			}
-
-			public void setSelection(ISelection selection) {
-			}
-		});
-		propertyAction.run();
-	}
-
-	protected IWorkbenchPart getActivePart() {
-		return fTargetPart;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalZeroWorkbenchActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalZeroWorkbenchActionDelegate.java
deleted file mode 100644
index a9fa9f4..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SignalZeroWorkbenchActionDelegate.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.ptp.debug.core.model.IResumeWithoutSignal;
-
-/**
- * @author Clement chu
- */
-public class SignalZeroWorkbenchActionDelegate extends AbstractListenerActionDelegate {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#doAction(java.lang.Object)
-	 */
-	protected void doAction(Object element) throws DebugException {
-		if (element instanceof IResumeWithoutSignal) {
-			((IResumeWithoutSignal)element).resumeWithoutSignal();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#isEnabledFor(java.lang.Object)
-	 */
-	protected boolean isEnabledFor(Object element) {
-		if (element instanceof IResumeWithoutSignal) {
-			return ((IResumeWithoutSignal)element).canResumeWithoutSignal();
-		}
-		return false;
-	}
-
-	/**
-	 * @see AbstractDebugActionDelegate#getStatusMessage()
-	 */
-	protected String getStatusMessage() {
-		return ActionMessages.getString("SignalZeroWorkbenchActionDelegate.0");
-	}
-
-	/**
-	 * @see AbstractDebugActionDelegate#getErrorDialogMessage()
-	 */
-	protected String getErrorDialogMessage() {
-		return ActionMessages.getString("SignalZeroWorkbenchActionDelegate.1");
-	}
-
-	/**
-	 * @see AbstractDebugActionDelegate#getErrorDialogTitle()
-	 */
-	protected String getErrorDialogTitle() {
-		return ActionMessages.getString("SignalZeroWorkbenchActionDelegate.2");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractDebugActionDelegate#isRunInBackground()
-	 */
-	protected boolean isRunInBackground() {
-		return true;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepAction.java
deleted file mode 100644
index 12cd601..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepAction.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-
-/**
- * @author clement chu
- *
- */
-public abstract class StepAction extends DebugAction {
-	/** Constructor
-	 * @param text
-	 * @param view
-	 */
-	public StepAction(String text, ParallelDebugView view) {
-		super(text, view);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepIntoAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepIntoAction.java
deleted file mode 100644
index 1267fcb..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepIntoAction.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.model.IElement;
-
-/**
- * @author clement chu
- *
- */
-public class StepIntoAction extends StepAction {
-	public static final String name = "Step Into";
-
-	/** Constructor
-	 * @param view
-	 */
-	public StepIntoAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_STEPINTO_NORMAL));
-	    setDisabledImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_STEPINTO_DISABLE));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IManager manager = view.getUIManager();
-		if (manager instanceof UIDebugManager) {
-			try {
-				setEnabled(false);
-				((UIDebugManager)manager).stepInto();
-			} catch (CoreException e) {
-				setEnabled(true);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepOverAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepOverAction.java
deleted file mode 100644
index 19cf4c7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepOverAction.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.model.IElement;
-
-/**
- * @author clement chu
- *
- */
-public class StepOverAction extends StepAction {
-	public static final String name = "Step Over";
-
-	/** Constructor
-	 * @param view
-	 */
-	public StepOverAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_STEPOVER_NORMAL));
-	    setDisabledImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_STEPOVER_DISABLE));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IManager manager = view.getUIManager();
-		if (manager instanceof UIDebugManager) {
-			try {
-				setEnabled(false);
-				((UIDebugManager)manager).stepOver();
-			} catch (CoreException e) {
-				setEnabled(true);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepReturnAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepReturnAction.java
deleted file mode 100644
index 6e37fde..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/StepReturnAction.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.model.IElement;
-
-/**
- * @author clement chu
- *
- */
-public class StepReturnAction extends StepAction {
-	public static final String name = "Step Return";
-
-	/** Constructor
-	 * @param view
-	 */
-	public StepReturnAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_STEPRETURN_NORMAL));
-	    setDisabledImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_STEPRETURN_DISABLE));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IManager manager = view.getUIManager();
-		if (manager instanceof UIDebugManager) {
-			try {
-				setEnabled(false);
-				((UIDebugManager)manager).stepReturn();
-			} catch (CoreException e) {
-				setEnabled(true);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SuspendAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SuspendAction.java
deleted file mode 100644
index 82e9906..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/SuspendAction.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.model.IElement;
-
-/**
- * @author clement chu
- *
- */
-public class SuspendAction extends DebugAction {
-	public static final String name = "Suspend";
-
-	/** Constructor
-	 * @param view
-	 */
-	public SuspendAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_SUSPEND_NORMAL));
-	    setDisabledImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_SUSPEND_DISABLE));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IManager manager = view.getUIManager();
-		if (manager instanceof UIDebugManager) {
-			try {
-				setEnabled(false);
-				((UIDebugManager)manager).suspend();
-			} catch (CoreException e) {
-				setEnabled(true);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/TerminateAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/TerminateAction.java
deleted file mode 100644
index 4883a61..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/TerminateAction.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.model.IElement;
-
-/**
- * @author clement chu
- *
- */
-public class TerminateAction extends DebugAction {
-	public static final String name = "Terminate";
-
-	/** Constructor
-	 * @param view
-	 */
-	public TerminateAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_TERMINATEALL_NORMAL));
-	    setDisabledImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_TERMINATEALL_DISABLE));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IManager manager = view.getUIManager();
-		if (manager instanceof UIDebugManager) {
-			try {
-				setEnabled(false);
-				((UIDebugManager)manager).terminate();
-			} catch (CoreException e) {
-				setEnabled(true);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointAdapter.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointAdapter.java
deleted file mode 100644
index 1b9e09c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointAdapter.java
+++ /dev/null

@@ -1,563 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.debug.core.PDebugModel;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.model.IPLineBreakpoint;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.editors.text.ILocationProvider;
-import org.eclipse.ui.texteditor.IEditorStatusLine;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author Clement chu
- *
- */
-public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
-	private UIDebugManager uiDebugManager = null;
-	/** Constructor
-	 * 
-	 */
-	public ToggleBreakpointAdapter() {
-		uiDebugManager = PTPDebugUIPlugin.getUIDebugManager();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void toggleLineBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
-		if (!PTPDebugUIPlugin.isPTPPerspective())
-			return;
-		
-		String errorMessage = null;
-		if (part instanceof ITextEditor) {
-			ITextEditor textEditor = (ITextEditor)part;
-			IEditorInput input = textEditor.getEditorInput();
-			if (input == null) {
-				errorMessage = ActionMessages.getString("ToggleBreakpointAdapter.Empty_editor_1");
-			}
-			else {
-				IDocument document = textEditor.getDocumentProvider().getDocument( input );
-				if (document == null) {
-					errorMessage = ActionMessages.getString("ToggleBreakpointAdapter.Missing_document_1");
-				}
-				else {
-					IResource resource = getResource(textEditor);
-					if (resource == null) {
-						errorMessage = ActionMessages.getString("ToggleBreakpointAdapter.Missing_resource_1");
-					}
-					else {
-						BreakpointLocationVerifier bv = new BreakpointLocationVerifier();
-						int lineNumber = bv.getValidLineBreakpointLocation(document, ((ITextSelection)selection).getStartLine());
-						if (lineNumber == -1) {
-							errorMessage = ActionMessages.getString("ToggleBreakpointAdapter.Invalid_line_1");
-						}
-						else {
-							IPJob job = uiDebugManager.getJob();
-							String sid = uiDebugManager.getCurrentSetId();
-							sid = (sid == null || sid.length() == 0)?IElementHandler.SET_ROOT_ID:sid;
-							String sourceHandle = getSourceHandle(input);
-							IPLineBreakpoint[] breakpoints = PDebugModel.lineBreakpointsExists(sourceHandle, resource, lineNumber);
-							if (breakpoints.length > 0) {// remove breakpoint if found any breakpoint in current job
-								IPLineBreakpoint breakpoint = PDebugModel.lineBreakpointExists(breakpoints, job);
-								if (breakpoint != null) {
-									if (breakpoint.isGlobal()) {
-										if (job == null) {
-											DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);												
-										}
-									}
-									else {
-										DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);	
-									}
-								}
-								else // create a new breakpoint
-									PDebugModel.createLineBreakpoint(sourceHandle, resource, lineNumber, true, 0, "", true, sid, job);
-							}
-							else // no breakpoint found and create a new one
-								PDebugModel.createLineBreakpoint(sourceHandle, resource, lineNumber, true, 0, "", true, sid, job);
-							return;
-						}
-					}
-				}
-			}
-		}
-		/*
-		 * TODO DisassemblyView
-		else if (part instanceof DisassemblyView) {
-			IEditorInput input = ((DisassemblyView)part).getInput();
-			if (!(input instanceof DisassemblyEditorInput)) {
-				errorMessage = ActionMessages.getString("ToggleBreakpointAdapter.Empty_editor_1");
-			}
-			else {
-				BreakpointLocationVerifier bv = new BreakpointLocationVerifier();
-				int lineNumber = bv.getValidAddressBreakpointLocation( null, ((ITextSelection)selection).getStartLine() );
-				if (lineNumber == -1) {
-					errorMessage = ActionMessages.getString("ToggleBreakpointAdapter.Invalid_line_1");
-				}
-				else {
-					IAddress address = ((DisassemblyEditorInput)input).getAddress(lineNumber);
-					if (address == null) {
-						errorMessage = ActionMessages.getString("ToggleBreakpointAdapter.Invalid_line_1");						
-					}
-					else {
-						ICLineBreakpoint breakpoint = ((DisassemblyEditorInput)input).breakpointExists(address);
-						if (breakpoint != null) {
-							DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);
-						}
-						else {
-							String module = ((DisassemblyEditorInput)input).getModuleFile();
-							IResource resource = getAddressBreakpointResource(((DisassemblyEditorInput)input).getSourceFile());
-							String sourceHandle = getSourceHandle( input );
-							CDIDebugModel.createAddressBreakpoint(module, sourceHandle, resource, ((DisassemblyEditorInput)input).getSourceLine(lineNumber), address, true, 0, "", true);
-						}
-						return;
-					}
-				}
-			}
-		}
-		*/
-		else {
-			errorMessage = ActionMessages.getString("RunToLineAdapter.Operation_is_not_supported_1");
-		}
-		throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, errorMessage, null));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public boolean canToggleLineBreakpoints(IWorkbenchPart part, ISelection selection) {
-		/*
-		 * TODO DisassemblyView
-		if (part instanceof DisassemblyView) {
-			IEditorInput input = ((DisassemblyView)part).getInput();
-			if (!(input instanceof DisassemblyEditorInput) || ((DisassemblyEditorInput)input).equals(DisassemblyEditorInput.EMPTY_EDITOR_INPUT)) {
-				return false;
-			}			
-		}
-		*/
-		return (selection instanceof ITextSelection);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void toggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
-		PDebugUtils.println("*** Not Implemented YET ***");
-		/*
-		 * FIXME doesn't implemenet yet..
-		if (selection instanceof ITextSelection) {
-			String text = ((ITextSelection)selection).getText();
-			if (text != null ) {
-				IResource resource = getResource(part);
-				if (resource instanceof IFile) {
-					ITranslationUnit tu = getTranslationUnit((IFile)resource);
-					if (tu != null) {
-						try {
-							ICElement element = tu.getElement(text.trim());
-							if (element instanceof IFunction || element instanceof IMethod) {
-								toggleMethodBreakpoints0((IDeclaration)element);
-							}
-						}
-						catch(CModelException e) {
-						}
-					}
-				}
-			}
-		}
-		else if ( selection instanceof IStructuredSelection ) {
-			IStructuredSelection ss = (IStructuredSelection)selection;
-			if (ss.size() == 1 && (ss.getFirstElement() instanceof IFunction || ss.getFirstElement() instanceof IMethod)) {
-				toggleMethodBreakpoints0((IDeclaration)ss.getFirstElement());
-			}
-		}
-		*/
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public boolean canToggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) {
-		/*
-		 * FIXME doesn't implemenet yet..
-		if (selection instanceof ITextSelection) {
-			String text = ((ITextSelection)selection).getText();
-			if (text != null) {
-				IResource resource = getResource(part);
-				if ( resource instanceof IFile ) {
-					ITranslationUnit tu = getTranslationUnit((IFile)resource);
-					if (tu != null) {
-						try {
-							ICElement element = tu.getElement( text.trim() );
-							return (element instanceof IFunction || element instanceof IMethod);
-						}
-						catch(CModelException e) {
-						}
-					}
-				}
-			}
-		}
-		else if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection)selection;
-			if (ss.size() == 1) {
-				return (ss.getFirstElement() instanceof IFunction || ss.getFirstElement() instanceof IMethod);
-			}
-		}
-		*/
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void toggleWatchpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
-		/*
-		 * FIXME doesn't implemenet yet..
-		if (selection instanceof ITextSelection) {
-			String text = ((ITextSelection)selection).getText();
-			if (text != null) {
-				IResource resource = getResource(part);
-				if ( resource instanceof IFile ) {
-					ITranslationUnit tu = getTranslationUnit((IFile)resource);
-					if (tu != null) {
-						try {
-							ICElement element = tu.getElement(text.trim());
-							if (element instanceof IVariable) {
-								toggleVariableWatchpoint(part, (IVariable)element);
-							}
-						}
-						catch(CModelException e) {
-						}
-					}
-				}
-			}
-		}
-		else if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection)selection;
-			if (ss.size() == 1 && ss.getFirstElement() instanceof IVariable) {
-				toggleVariableWatchpoint(part, (IVariable)ss.getFirstElement());
-			}
-		}
-		*/
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) {
-		/*
-		 * FIXME doesn't implemenet yet..
-		if (selection instanceof ITextSelection) {
-			String text = ((ITextSelection)selection).getText();
-			if ( text != null ) {
-				IResource resource = getResource(part);
-				if (resource instanceof IFile) {
-					ITranslationUnit tu = getTranslationUnit((IFile)resource);
-					if (tu != null) {
-						try {
-							return (tu.getElement(text.trim()) instanceof IVariable);
-						}
-						catch(CModelException e) {
-						}
-					}
-				}
-			}
-		}
-		else if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection)selection;
-			if (ss.size() == 1) {
-				return (ss.getFirstElement() instanceof IVariable);
-			}
-		}
-		*/
-		return false;
-	}
-
-	/** report
-	 * @param message
-	 * @param part
-	 */
-	protected void report(String message, IWorkbenchPart part) {
-		IEditorStatusLine statusLine = (IEditorStatusLine)part.getAdapter(IEditorStatusLine.class);
-		if (statusLine != null) {
-			if (message != null)
-				statusLine.setMessage(true, message, null);
-			else
-				statusLine.setMessage(true, null, null);
-		}
-		if (message != null && PTPDebugUIPlugin.getActiveWorkbenchShell() != null) {
-			PTPDebugUIPlugin.getActiveWorkbenchShell().getDisplay().beep();
-		}
-	}
-	/** Get resource
-	 * @param part
-	 * @return
-	 */
-	protected static IResource getResource(IWorkbenchPart part) {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		if ( part instanceof IEditorPart ) {
-			IEditorInput editorInput = ((IEditorPart)part).getEditorInput();
-			if ( editorInput instanceof IFileEditorInput ) {
-				return ((IFileEditorInput)editorInput).getFile();
-			}
-			ILocationProvider provider = (ILocationProvider)editorInput.getAdapter( ILocationProvider.class );
-			if ( provider != null ) {
-				IPath location = provider.getPath( editorInput );
-				IFile[] files = root.findFilesForLocation( location );
-				if ( files.length > 0 )
-					return files[0];
-			}
-		}
-		return root;
-	}
-
-	/** Get source handle
-	 * @param input
-	 * @return
-	 * @throws CoreException
-	 */
-	private String getSourceHandle(IEditorInput input) throws CoreException {
-		if (input instanceof IFileEditorInput) {
-			return ((IFileEditorInput)input).getFile().getLocation().toOSString();
-		}
-		if (input instanceof IStorageEditorInput) {
-			return ((IStorageEditorInput)input).getStorage().getFullPath().toOSString();
-		}
-		/*
-		 * TODO DisassemblyView
-		if (input instanceof DisassemblyEditorInput) {
-			String sourceFile = ((DisassemblyEditorInput)input).getSourceFile();
-			if (sourceFile != null) {
-				return sourceFile;
-			}
-			return ((DisassemblyEditorInput)input).getModuleFile();
-		}
-		*/
-		return "";
-	}
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private void toggleVariableWatchpoint(IWorkbenchPart part, IVariable variable) throws CoreException {
-		String sourceHandle = getSourceHandle(variable);
-		IResource resource = getElementResource(variable);
-		String expression = getVariableName( variable );
-		IPWatchpoint watchpoint = CDIDebugModel.watchpointExists(sourceHandle, resource, expression);
-		if (watchpoint != null) {
-			DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(watchpoint, true);
-		}
-		else {
-			AddWatchpointDialog dlg = new AddWatchpointDialog(part.getSite().getShell(), true, false, expression, false);
-			if (dlg.open() != Window.OK)
-				return;
-			expression = dlg.getExpression();
-			int lineNumber = -1;
-			int charStart = -1;
-			int charEnd = -1;
-			try {
-				ISourceRange sourceRange = variable.getSourceRange();
-				if ( sourceRange != null ) {
-					charStart = sourceRange.getStartPos();
-					charEnd = charStart + sourceRange.getLength();
-					if ( charEnd <= 0 ) {
-						charStart = -1;
-						charEnd = -1;
-					}
-					lineNumber = sourceRange.getStartLine();
-				}
-			}
-			catch(CModelException e) {
-				DebugPlugin.log(e);
-			}
-			CDIDebugModel.createWatchpoint(sourceHandle, resource, charStart, charEnd, lineNumber, dlg.getWriteAccess(), dlg.getReadAccess(), expression, true, 0, "", true );
-		}
-	}
-	*/
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private String getSourceHandle(IDeclaration declaration) {
-		ITranslationUnit tu = declaration.getTranslationUnit();
-		if (tu != null) {
-			IResource resource = tu.getResource();
-			if (resource != null)
-				return resource.getLocation().toOSString();
-			return tu.getPath().toOSString();
-		}
-		return "";
-	}
-	*/
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private IResource getElementResource(IDeclaration declaration) {
-		return declaration.getUnderlyingResource();
-	}
-	*/
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private String getFunctionName(IFunction function) {
-		String functionName = function.getElementName();
-		StringBuffer name = new StringBuffer( functionName );
-		ITranslationUnit tu = function.getTranslationUnit();
-		if (tu != null && tu.isCXXLanguage()) {
-			appendParameters(name, function);
-		}
-		return name.toString();
-	}
-	*/
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private String getMethodName(IMethod method) {
-		StringBuffer name = new StringBuffer();
-		String methodName = method.getElementName();
-		ICElement parent = method.getParent();
-		while (parent != null && ( parent.getElementType() == ICElement.C_NAMESPACE || parent.getElementType() == ICElement.C_CLASS)) {
-			name.append(parent.getElementName() ).append( "::");
-			parent = parent.getParent();
-		}
-		name.append(methodName);
-		appendParameters(name, method);
-		return name.toString();
-	}
-	*/
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private void appendParameters(StringBuffer sb, IFunctionDeclaration fd) {
-		String[] params = fd.getParameterTypes();
-		sb.append('(');
-		for(int i = 0; i < params.length; ++i) {
-			sb.append(params[i]);
-			if (i != params.length - 1)
-				sb.append(',');
-		}
-		sb.append(')');
-	}
-	*/
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private String getVariableName(IVariable variable) {
-		return variable.getElementName();
-	}
-	*/
-
-	/*
-	 * FIXME doesn't implemenet yet..
-	private ITranslationUnit getTranslationUnit(IFile file) {
-		Object element = CoreModel.getDefault().create(file);
-		if (element instanceof ITranslationUnit) {
-			return (ITranslationUnit)element;
-		}
-		return null;
-	}
-	*/
-	
-	/*
-	 * FIXME doesn't implemenet yet..
-	private void toggleMethodBreakpoints0(IDeclaration declaration) throws CoreException {
-		String sourceHandle = getSourceHandle(declaration);
-		IResource resource = getElementResource(declaration);
-		String functionName = (declaration instanceof IFunction) ? getFunctionName((IFunction)declaration) : getMethodName((IMethod)declaration);
-		ICFunctionBreakpoint breakpoint = CDIDebugModel.functionBreakpointExists(sourceHandle, resource, functionName);
-		if (breakpoint != null) {
-			DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint(breakpoint, true);
-		}
-		else {
-			int lineNumber = -1;
-			int charStart = -1;
-			int charEnd = -1;
-			try {
-				ISourceRange sourceRange = declaration.getSourceRange();
-				if (sourceRange != null) {
-					charStart = sourceRange.getStartPos();
-					charEnd = charStart + sourceRange.getLength();
-					if (charEnd <= 0) {
-						charStart = -1;
-						charEnd = -1;
-					}
-					lineNumber = sourceRange.getStartLine();
-				}
-			}
-			catch (CModelException e) {
-				DebugPlugin.log(e);
-			}
-			CDIDebugModel.createFunctionBreakpoint(sourceHandle, resource, functionName, charStart, charEnd, lineNumber, true,  0, "", true );
-		}
-	}
-	*/
-
-	/*
-	private IResource getAddressBreakpointResource(String fileName) {
-		if (fileName != null) {
-			IPath path = new Path(fileName);
-			if (path.isValidPath(fileName) ) {
-				IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
-				if (files.length > 0)
-					return files[0];
-			}
-		}
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-	*/
-	
-	private class BreakpointLocationVerifier {
-		/** Get valid line breakpoint location
-		 * @param doc
-		 * @param lineNumber
-		 * @return
-		 */
-		public int getValidLineBreakpointLocation(IDocument doc, int lineNumber) {
-			return lineNumber + 1;
-		}
-		/** Get valid address breakpoint location
-		 * @param doc
-		 * @param lineNumber
-		 * @return
-		 */
-		public int getValidAddressBreakpointLocation(IDocument doc, int lineNumber) {
-			return lineNumber + 1;
-		}
-	}
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointRulerAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointRulerAction.java
deleted file mode 100644
index 57f18b8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleBreakpointRulerAction.java
+++ /dev/null

@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.source.IVerticalRulerInfo;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author Clement chu
- *
- */
-public class ToggleBreakpointRulerAction extends Action {
-	private IVerticalRulerInfo ruler = null;
-	private IWorkbenchPart targetPart = null;
-	private ToggleBreakpointAdapter breakpointAdapter = null;
-	
-	private static final ISelection EMPTY_SELECTION = new ISelection() {
-		public boolean isEmpty() {
-			return true;
-		}
-	};
-    
-	/** Constructor
-     * @param part
-     * @param ruler
-     */
-    public ToggleBreakpointRulerAction(IWorkbenchPart part, IVerticalRulerInfo ruler) {
-		super(ActionMessages.getString("ToggleBreakpointRulerAction.Toggle_Breakpoint"));
-   		this.ruler = ruler;
-   		setTargetPart(part);
-   		breakpointAdapter = new ToggleBreakpointAdapter();
-   		setId(IPTPDebugUIConstants.ACTION_SET_BREAKPOINT);
-    }
-	
-    /** Dispose this action
-     * 
-     */
-    public void dispose() {
-    	setTargetPart(null);
-    	ruler = null;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IAction#run()
-     */
-    public void run() {
-		try {
-			breakpointAdapter.toggleLineBreakpoints(getTargetPart(), getTargetSelection());
-		} catch(CoreException e) {
-			ErrorDialog.openError(getTargetPart().getSite().getShell(), ActionMessages.getString("ToggleBreakpointRulerAction.Error_1"), ActionMessages.getString("ToggleBreakpointRulerAction.Operation_failed_1"), e.getStatus());
-		}
-    }
-
-	/** Get vertical ruler info
-	 * @return
-	 */
-	protected IVerticalRulerInfo getVerticalRulerInfo() {
-		return ruler;
-	}
-
-	/** Get target workbench part
-	 * @return
-	 */
-	private IWorkbenchPart getTargetPart() {
-		return targetPart;
-	}
-
-	/** Set target workbench part
-	 * @param targetPart
-	 */
-	private void setTargetPart(IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-
-	/** Get target selection
-	 * @return
-	 */
-	private ISelection getTargetSelection() {
-		IDocument doc = getDocument();
-		if (doc != null) {
-			int line = getVerticalRulerInfo().getLineOfLastMouseButtonActivity();
-			try {
-				IRegion region = doc.getLineInformation(line);
-				return new TextSelection(doc, region.getOffset(), region.getLength());
-			}
-			catch(BadLocationException e) {
-				DebugPlugin.log(e);
-			} 
-		}
-		return EMPTY_SELECTION;
-	}
-	
-	/** Get document
-	 * @return
-	 */
-	private IDocument getDocument() {
-		IWorkbenchPart targetPart = getTargetPart();
-		if (targetPart instanceof ITextEditor) {
-			ITextEditor textEditor = (ITextEditor)targetPart; 
-			IDocumentProvider provider = textEditor.getDocumentProvider();
-			if (provider != null)
-				return provider.getDocument(textEditor.getEditorInput());
-		}
-		//TODO DisassemblyView
-		return null;
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java
deleted file mode 100644
index 44ea835..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ToggleInstructionStepModeActionDelegate.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.actions.ActionDelegate;
-
-/**
- * @author Clement chu
- */
-public class ToggleInstructionStepModeActionDelegate extends ActionDelegate implements IViewActionDelegate, IPropertyChangeListener {
-	private IPDebugTarget fTarget = null;
-	private IAction fAction = null;
-	private IViewPart fView;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		IAction action = getAction();
-		if (action != null) {
-			if (event.getNewValue() instanceof Boolean) {
-				boolean value = ((Boolean)event.getNewValue()).booleanValue();
-				if (value != action.isChecked())
-					action.setChecked(value);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		fView = view;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {
-		IPDebugTarget target = getTarget();
-		if (target != null)
-			target.removePropertyChangeListener(this);
-		setTarget(null);
-		setAction(null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-		setAction(action);
-		action.setChecked(false);
-		action.setEnabled(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		/*
-		boolean enabled = getAction().isChecked();
-		IPDebugTarget target = getTarget();
-		if (target != null) {
-			target.enableInstructionStepping(enabled);
-			if (enabled) {
-				try {
-					getView().getSite().getPage().showView(IPTPDebugUIConstants.ID_DISASSEMBLY_VIEW);
-				}
-				catch(PartInitException e) {
-					PTPDebugUIPlugin.log(e.getStatus());
-				}
-			}
-		}
-		*/
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		IPDebugTarget newTarget = null;
-		if (selection instanceof IStructuredSelection) {
-			newTarget = getTargetFromSelection(((IStructuredSelection)selection).getFirstElement());
-		}
-		IPDebugTarget oldTarget = getTarget();
-		if (oldTarget != null && !oldTarget.equals(newTarget)) {
-			oldTarget.removePropertyChangeListener(this);
-			setTarget(null);
-			action.setChecked(false);
-		}
-		if (newTarget != null && !newTarget.isTerminated() && !newTarget.isDisconnected()) {
-			setTarget(newTarget);
-			newTarget.addPropertyChangeListener(this);
-			action.setChecked(newTarget.isInstructionSteppingEnabled());
-		}
-		action.setEnabled(newTarget != null && newTarget.supportsInstructionStepping() 
-						   && !newTarget.isTerminated() && !newTarget.isDisconnected());
-	}
-
-	private IPDebugTarget getTarget() {
-		return this.fTarget;
-	}
-
-	private void setTarget(IPDebugTarget target) {
-		this.fTarget = target;
-	}
-
-	private IAction getAction() {
-		return this.fAction;
-	}
-
-	private void setAction(IAction action) {
-		this.fAction = action;
-	}
-
-	private IPDebugTarget getTargetFromSelection(Object element) {
-		if (element instanceof IDebugElement) {
-			IDebugTarget target = ((IDebugElement)element).getDebugTarget();
-			return (target instanceof IPDebugTarget) ? (IPDebugTarget)target : null;
-		}
-		return null;
-	}
-	public IViewPart getView() {
-		return fView;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UnregisterAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UnregisterAction.java
deleted file mode 100644
index fecd2f6..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UnregisterAction.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.debug.ui.views.ParallelDebugView;
-import org.eclipse.ptp.ui.model.IElement;
-/**
- * @author clement chu
- *
- */
-public class UnregisterAction extends DebugAction {
-	public static final String name = "Unregister Selected Elements";
-	
-	/** Constructor
-	 * @param view
-	 */
-	public UnregisterAction(ParallelDebugView view) {
-		super(name, view);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_UNREGISTER_NORMAL));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.actions.ParallelAction#run(org.eclipse.ptp.ui.model.IElement[])
-	 */
-	public void run(IElement[] elements) {
-		if (validation(elements)) {
-			try {
-				view.unregisterSelectedElements();
-				view.refresh(false);
-			} catch (CoreException e) {
-				PTPDebugUIPlugin.errorDialog(getShell(), "Error", e.getStatus());				
-			}
-		}
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UpdatePExpressionAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UpdatePExpressionAction.java
deleted file mode 100644
index 24f033a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/UpdatePExpressionAction.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.views.variable.PVariableView;
-
-/**
- * @author Clement chu
- */
-public class UpdatePExpressionAction extends Action {
-	public static final String name = "Refresh variables";
-	private PVariableView view = null;
-
-	/** Constructor
-	 * @param view
-	 */
-	public UpdatePExpressionAction(PVariableView view) {
-		super(name, IAction.AS_PUSH_BUTTON);
-	    setImageDescriptor(PDebugImage.getDescriptor(PDebugImage.ICON_VAR_REFRESH_NORMAL));
-	    //setDisabledImageDescriptor(PDebugImage.ID_ICON_VAR_REFRESH_DISABLE);
-	    setToolTipText(name);
-	    setId(name);
-	    setEnabled(false);
-	    this.view = view;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		view.getUIManager().updateCurrentJobVariableValues();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ViewFilterAction.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ViewFilterAction.java
deleted file mode 100644
index de2be37..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/actions/ViewFilterAction.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.actions;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.debug.ui.IDebugView;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class ViewFilterAction extends ViewerFilter implements IViewActionDelegate, IActionDelegate2 {
-	private IViewPart view = null;
-	private IAction action = null;
-
-	/** Constructor
-	 * 
-	 */
-	public ViewFilterAction() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
-	public void dispose() {}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
-	public void init(IAction action) {
-		this.action = action;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
-	public void init(IViewPart view) {
-		this.view = view;
-		action.setChecked(getPreferenceValue(view));
-		run(action);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		StructuredViewer viewer = getStructuredViewer();
-		ViewerFilter[] filters = viewer.getFilters();
-		ViewerFilter filter = null;
-		for (int i = 0; i < filters.length; i++) {
-			if (filters[i] == this) {
-				filter = filters[i];
-				break;
-			}
-		}
-		if (filter == null) {
-			viewer.addFilter(this);
-		}
-		viewer.refresh();
-		Preferences store = getPreferences();
-		String key = getView().getSite().getId() + "." + getPreferenceKey(); //$NON-NLS-1$
-		store.setValue(key, action.isChecked());
-		PTPDebugUIPlugin.getDefault().savePluginPreferences();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {}
-
-	/** 
-	 * Get preference key
-	 * @return
-	 */
-	protected abstract String getPreferenceKey();
-	
-	/** 
-	 * Get preference store
-	 * @return
-	 */
-	protected Preferences getPreferences() {
-		return PTPDebugCorePlugin.getDefault().getPluginPreferences();
-	}
-	
-	/** 
-	 * Get preference value
-	 * @param part
-	 * @return
-	 */
-	protected boolean getPreferenceValue(IViewPart part) {
-		String baseKey = getPreferenceKey();
-		String viewKey = part.getSite().getId();
-		String compositeKey = viewKey + "." + baseKey; //$NON-NLS-1$
-		Preferences store = getPreferences();
-		boolean value = false;
-		if (store.contains(compositeKey)) {
-			value = store.getBoolean(compositeKey);
-		} else {
-			value = store.getBoolean(baseKey);
-		}
-		return value;		
-	} 
-
-	/** 
-	 * Get structured viewer
-	 * @return
-	 */
-	protected StructuredViewer getStructuredViewer() {
-		IDebugView view = (IDebugView)getView().getAdapter(IDebugView.class);
-		if (view != null) {
-			Viewer viewer = view.getViewer();
-			if (viewer instanceof StructuredViewer) {
-				return (StructuredViewer)viewer;
-			}
-		}		
-		return null;
-	}
-	
-	/** 
-	 * Check if action is checked
-	 * @return true is action is checked
-	 */
-	protected boolean getValue() {
-		return action.isChecked();
-	}
-	
-	/** 
-	 * Get view
-	 * @return
-	 */
-	protected IViewPart getView() {
-		return view;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/DialogField.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/DialogField.java
deleted file mode 100644
index 7801854..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/DialogField.java
+++ /dev/null

@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.dialogfields;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * @author Clement chu
- */
-public class DialogField {
-	private Label fLabel;
-	protected String fLabelText;
-	
-	private IDialogFieldListener fDialogFieldListener;
-	
-	private boolean fEnabled;
-
-	public DialogField() {
-		fEnabled= true;
-		fLabel= null;
-		fLabelText= "";
-	}
-	
-	/**
-	 * Sets the label of the dialog field.
-	 */
-	public void setLabelText(String labeltext) {
-		fLabelText= labeltext;
-	}
-		
-	// ------ change listener
-	
-	/**
-	 * Defines the listener for this dialog field.
-	 */	
-	public final void setDialogFieldListener(IDialogFieldListener listener) {
-		fDialogFieldListener= listener;
-	}
-
-	/**
-	 * Programatical invocation of a dialog field change.
-	 */		
-	public void dialogFieldChanged() {
-		if (fDialogFieldListener != null) {
-			fDialogFieldListener.dialogFieldChanged(this);
-		}
-	}	
-	
-	// ------- focus management
-	/**
-	 * Tries to set the focus to the dialog field.
-	 * Returns <code>true</code> if the dialog field can take focus.
-	 * 	To be reimplemented by dialog field implementors.
-	 */
-	public boolean setFocus() {
-		return false;
-	}
-
-	/**
-	 * Posts <code>setFocus</code> to the display event queue.
-	 */	
-	public void postSetFocusOnDialogField(Display display) {
-		if (display != null) {
-			display.asyncExec(
-				new Runnable() {
-					public void run() {
-						setFocus();
-					}
-				}
-			);
-		}
-	}		
-	
-	// ------- layout helpers
-	/**
-	 * Creates all controls of the dialog field and fills it to a composite.
-	 * The composite is assumed to have <code>MGridLayout</code> as
-	 * layout.
-	 * The dialog field will adjust its controls' spans to the number of columns given.
-	 * 	To be reimplemented by dialog field implementors.
-	 */
-	public Control[] doFillIntoGrid(Composite parent, int nColumns) {
-		assertEnoughColumns(nColumns);
-		
-		Label label= getLabelControl(parent);
-		label.setLayoutData(gridDataForLabel(nColumns));
-		
-		return new Control[] { label };
-	}
-	
-	/**
-	 * Returns the number of columns of the dialog field.
-	 * 	To be reimplemented by dialog field implementors.
-	 */
-	public int getNumberOfControls() {
-		return 1;	
-	}	
-	
-	protected static GridData gridDataForLabel(int span) {
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= span;
-		return gd;
-	}
-	
-	// ------- ui creation
-	/**
-	 * Creates or returns the created label widget.
-	 * @param parent The parent composite or <code>null</code> if the widget has
-	 * already been created.
-	 */			
-	public Label getLabelControl(Composite parent) {
-		if (fLabel == null) {
-			assertCompositeNotNull(parent);
-			
-			fLabel= new Label(parent, SWT.LEFT | SWT.WRAP);
-			fLabel.setFont(parent.getFont());
-			fLabel.setEnabled(fEnabled);		
-			if (fLabelText != null && !"".equals(fLabelText)) {
-				fLabel.setText(fLabelText);
-			} else {
-				// XXX: to avoid a 16 pixel wide empty label - revisit
-				fLabel.setText(".");
-				fLabel.setVisible(false);
-			}			
-		}
-		return fLabel;
-	}
-
-	/**
-	 * Creates a spacer control.
-	 * @param parent The parent composite
-	 */		
-	public static Control createEmptySpace(Composite parent) {
-		return createEmptySpace(parent, 1);
-	}
-
-	/**
-	 * Creates a spacer control with the given span.
-	 * The composite is assumed to have <code>MGridLayout</code> as
-	 * layout.
-	 * @param parent The parent composite
-	 */			
-	public static Control createEmptySpace(Composite parent, int span) {
-		Label label= new Label(parent, SWT.LEFT);
-		GridData gd= new GridData();
-		gd.horizontalAlignment= GridData.BEGINNING;
-		gd.grabExcessHorizontalSpace= false;
-		gd.horizontalSpan= span;
-		gd.horizontalIndent= 0;
-		gd.widthHint= 0;
-		gd.heightHint= 0;
-		label.setLayoutData(gd);
-		return label;
-	}
-	
-	/**
-	 * Tests is the control is not <code>null</code> and not disposed.
-	*/
-	protected final boolean isOkToUse(Control control) {
-		return (control != null) && !(control.isDisposed());
-	}
-	
-	// --------- enable / disable management	
-	/**
-	 * Sets the enable state of the dialog field.
-	 */
-	public final void setEnabled(boolean enabled) {
-		if (enabled != fEnabled) {
-			fEnabled= enabled;
-			updateEnableState();
-		}
-	}
-	
-	/**
-	 * Called when the enable state changed.
-	 * To be extended by dialog field implementors.
-	 */
-	protected void updateEnableState() {
-		if (fLabel != null) {
-			fLabel.setEnabled(fEnabled);
-		}
-	}
-
-	/**
-	 * Gets the enable state of the dialog field.
-	 */	
-	public final boolean isEnabled() {
-		return fEnabled;
-	}
-
-	protected final void assertCompositeNotNull(Composite comp) {
-		Assert.isNotNull(comp, "uncreated control requested with composite null");
-	}
-
-	protected final void assertEnoughColumns(int nColumns) {
-		Assert.isTrue(nColumns >= getNumberOfControls(), "given number of columns is too small");
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/IDialogFieldListener.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/IDialogFieldListener.java
deleted file mode 100644
index 977e1f6..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/IDialogFieldListener.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.dialogfields;
-
-/**
- * @author Clement chu
- */
-
-public interface IDialogFieldListener {
-	/**
-	 * The dialog field has changed.
-	 */
-	void dialogFieldChanged(DialogField field);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/SelectionButtonDialogField.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/SelectionButtonDialogField.java
deleted file mode 100644
index 08dbd8d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogfields/SelectionButtonDialogField.java
+++ /dev/null

@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.dialogfields;
-
-import org.eclipse.ptp.debug.internal.ui.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author Clement chu
- */
-public class SelectionButtonDialogField extends DialogField {
-	private Button fButton;
-	private boolean fIsSelected;
-	private DialogField[] fAttachedDialogFields;
-	private int fButtonStyle;
-
-	/**
-	 * Creates a selection button.
-	 * Allowed button styles: SWT.RADIO, SWT.CHECK, SWT.TOGGLE, SWT.PUSH
-	 */
-	public SelectionButtonDialogField(int buttonStyle) {
-		super();
-		fIsSelected= false;
-		fAttachedDialogFields= null;
-		fButtonStyle= buttonStyle;
-	}
-	
-	/**
-	 * Attaches a field to the selection state of the selection button.
-	 * The attached field will be disabled if the selection button is not selected.
-	 */
-	public void attachDialogField(DialogField dialogField) {
-		attachDialogFields(new DialogField[] { dialogField });
-	}
-
-	/**
-	 * Attaches fields to the selection state of the selection button.
-	 * The attached fields will be disabled if the selection button is not selected.
-	 */	
-	public void attachDialogFields(DialogField[] dialogFields) {
-		fAttachedDialogFields= dialogFields;
-		for (int i= 0; i < dialogFields.length; i++) {
-			dialogFields[i].setEnabled(fIsSelected);
-		}
-	}	
-	
-	/**
-	 * Returns <code>true</code> is  teh gived field is attached to the selection button.
-	 */
-	public boolean isAttached(DialogField editor) {
-		if (fAttachedDialogFields != null) {
-			for (int i=0; i < fAttachedDialogFields.length; i++) {
-				if (fAttachedDialogFields[i] == editor) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	// ------- layout helpers
-	/*
-	 * @see DialogField#doFillIntoGrid
-	 */
-	public Control[] doFillIntoGrid(Composite parent, int nColumns) {
-		assertEnoughColumns(nColumns);
-		
-		Button button= getSelectionButton(parent);
-		GridData gd= new GridData();
-		gd.horizontalSpan= nColumns;
-		gd.horizontalAlignment= GridData.FILL;
-		if (fButtonStyle == SWT.PUSH) {
-			gd.widthHint = SWTUtil.getButtonWidthHint(button);
-		}			
-		
-		button.setLayoutData(gd);
-		return new Control[] { button };
-	}	
-
-	/*
-	 * @see DialogField#getNumberOfControls
-	 */
-	public int getNumberOfControls() {
-		return 1;	
-	}
-
-	// ------- ui creation
-	/**
-	 * Returns the selection button widget. When called the first time, the widget will be created.
-	 * @param The parent composite when called the first time, or <code>null</code>
-	 * after.
-	 */		
-	public Button getSelectionButton(Composite group) {
-		if (fButton == null) {
-			assertCompositeNotNull(group);
-			
-			fButton= new Button(group, fButtonStyle);
-			fButton.setFont(group.getFont());			
-			fButton.setText(fLabelText);
-			fButton.setEnabled(isEnabled());
-			fButton.setSelection(fIsSelected);
-			fButton.addSelectionListener(new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent e) {
-					doWidgetSelected(e);
-				}
-				public void widgetSelected(SelectionEvent e) {
-					doWidgetSelected(e);
-				}
-			});				
-		}
-		return fButton;
-	}
-	
-	protected void doWidgetSelected(SelectionEvent e) {
-		if (isOkToUse(fButton)) {
-			changeValue(fButton.getSelection());
-		}
-	}	
-	
-	private void changeValue(boolean newState) {
-		if (fIsSelected != newState) {
-			fIsSelected= newState;			
-			if (fAttachedDialogFields != null) {
-				boolean focusSet= false;
-				for (int i= 0; i < fAttachedDialogFields.length; i++) {		
-					fAttachedDialogFields[i].setEnabled(fIsSelected);
-					if (fIsSelected && !focusSet) {
-						focusSet= fAttachedDialogFields[i].setFocus();
-					}
-				}
-			}
-			dialogFieldChanged();
-		} else if (fButtonStyle == SWT.PUSH) {
-			dialogFieldChanged();
-		}
-	}
-
-	// ------ model access	
-	/**
-	 * Returns the selection state of the button.
-	 */
-	public boolean isSelected() {
-		return fIsSelected;
-	}
-
-	/**
-	 * Sets the selection state of the button.
-	 */	
-	public void setSelection(boolean selected) {
-		changeValue(selected);
-		if (isOkToUse(fButton)) {
-			fButton.setSelection(selected);
-		}
-	}
-
-	// ------ enable / disable management
-	/*
-	 * @see DialogField#updateEnableState
-	 */	
-	protected void updateEnableState() {
-		super.updateEnableState();
-		if (isOkToUse(fButton)) {
-			fButton.setEnabled(isEnabled());
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/ArrayVariableDialog.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/ArrayVariableDialog.java
deleted file mode 100644
index b871462..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/ArrayVariableDialog.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.dialogs;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPVariable;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIF;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Clement chu
- *
- */
-public class ArrayVariableDialog extends VariableDialog {
-	public ArrayVariableDialog(Shell parent, IPStackFrame frame) {
-		super(parent, frame);
-	}
-	protected ViewerFilter getViewFilter() {
-		return new ArrayFilter();
-	}
-	private class ArrayFilter extends ViewerFilter {
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (element instanceof IPVariable) {
-				try {
-					IAIF aif = ((IPVariable)element).getAIF();
-					if (aif == null)
-						return false;
-					if (aif.getType() instanceof IAIFTypeArray) {
-						return true;
-					}
-				} catch (DebugException e) {
-					return false;
-				}
-			}
-			return false;
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.java
deleted file mode 100644
index fcdde3f..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.dialogs;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class DialogMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.dialogs.DialogMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/** Constructor
-	 * 
-	 */
-	private DialogMessages() {}
-
-	/** Get string
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.properties
deleted file mode 100644
index 7453745..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/DialogMessages.properties
+++ /dev/null

@@ -1,36 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-VariableDialog.name=Add Variable
-VariableDialog.label=Variables
-
-RangeDialog.from=From
-RangeDialog.to=To
-RangeDialog.group=Range setting
-RangeDialog.row=Row
-RangeDialog.column=Column
-
-PTPVariablesDialog.title=PTP Variable
-PTPVariablesDialog.name=Name:
-PTPVariablesDialog.set=Set:
-PTPVariablesDialog.newSection=New
-PTPVariablesDialog.varSection=Avaiable variables

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/RangeDialog.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/RangeDialog.java
deleted file mode 100644
index 10f3c57..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/RangeDialog.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Clement chu
- *
- */
-public class RangeDialog extends Dialog {
-	private Group rowGroup = null;
-	private Group colGroup = null;
-	private IntegerFieldEditor rowFromField = null;
-	private IntegerFieldEditor rowToField = null;
-	private IntegerFieldEditor colFromField = null;
-	private IntegerFieldEditor colToField = null;
-	private Text errorMessageText = null;
-	private int maxRow = 0;
-	private int maxCol = 0;
-	private int fromRow = 0;
-	private int toRow = 0;
-	private int fromCol = 0;
-	private int toCol = 0;
-	
-    public RangeDialog(Shell parentShell, int maxCol, int maxRow) {
-        super(parentShell);
-        this.maxCol = maxCol;
-        this.toCol = maxCol;
-        this.maxRow = maxRow;
-        this.toRow = maxRow;
-    }
-    public int getFromRow() {
-    	return fromRow;
-    }
-    public int getToRow() {
-    	return toRow;
-    }
-    public int getFromCol() {
-    	return fromCol;
-    }
-    public int getToCol() {
-    	return toCol;
-    }
-    protected void buttonPressed(int buttonId) {
-        if (buttonId == IDialogConstants.OK_ID) {
-        	fromRow = rowFromField.getIntValue();
-            toRow = rowToField.getIntValue();
-        	fromCol = colFromField.getIntValue();
-            toCol = colToField.getIntValue();
-        }        
-        super.buttonPressed(buttonId);
-    }
-    protected void configureShell(Shell shell) {
-        super.configureShell(shell);
-        shell.setText(DialogMessages.getString("RangeDialog.group"));
-    }
-    protected void createButtonsForButtonBar(Composite parent) {
-    	super.createButtonsForButtonBar(parent);
-    	getOkButton().setEnabled(false);
-    }
-    public Button getOkButton() {
-        return getButton(IDialogConstants.OK_ID);
-    }
-    protected Control createDialogArea(Composite parent) {
-    	Composite composite = (Composite)super.createDialogArea(parent);
-
-    	colGroup = new Group(composite, SWT.NONE);
-        colGroup.setText(DialogMessages.getString("RangeDialog.column"));
-        colGroup.setLayout(new FillLayout());
-        colGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-       	colFromField = new RangeIntegerFieldEditor("colFromField", DialogMessages.getString("RangeDialog.from"), colGroup);
-       	colFromField.setPropertyChangeListener(listener);
-       	colToField = new RangeIntegerFieldEditor("colToField", DialogMessages.getString("RangeDialog.to"), colGroup);
-       	colToField.setPropertyChangeListener(listener);
-       	
-    	rowGroup = new Group(composite, SWT.NONE);
-        rowGroup.setText(DialogMessages.getString("RangeDialog.row"));
-        rowGroup.setLayout(new FillLayout());
-        rowGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-       	rowFromField = new RangeIntegerFieldEditor("rowFromField", DialogMessages.getString("RangeDialog.from"), rowGroup);
-       	rowFromField.setPropertyChangeListener(listener);
-       	rowToField = new RangeIntegerFieldEditor("rowToField", DialogMessages.getString("RangeDialog.to"), rowGroup);
-       	rowToField.setPropertyChangeListener(listener);
-       	
-        errorMessageText = new Text(composite, SWT.READ_ONLY);
-        errorMessageText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
-        errorMessageText.setBackground(errorMessageText.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-
-        return composite;
-    }
-    
-    public int open(boolean showCol, boolean showRow, int fromCol, int toCol, int fromRow, int toRow) {
-    	this.fromCol = fromCol;
-    	this.toCol = (toCol==0?maxCol:toCol);
-    	this.fromRow = fromRow;
-    	this.toRow = toRow==0?maxRow:toRow;
-    	return open(showCol, showRow);
-    }
-
-    private int open(boolean showCol, boolean showRow) {
-    	create();
-    	colGroup.setEnabled(showCol);
-       	colFromField.setEnabled(showCol, colGroup);
-       	colToField.setEnabled(showCol, colGroup);
-    	rowGroup.setEnabled(showRow);
-    	rowFromField.setEnabled(showRow, rowGroup);
-    	rowToField.setEnabled(showRow, rowGroup);
-       	colFromField.setStringValue(""+fromCol);
-       	colToField.setStringValue(""+toCol);
-       	rowFromField.setStringValue(""+fromRow);
-       	rowToField.setStringValue(""+toRow);
-    	return open();
-    }
-    
-    private IPropertyChangeListener listener = new IPropertyChangeListener() {
-    	public void propertyChange(PropertyChangeEvent event) {
-    		boolean hasError = false;
-    		if (colGroup.isEnabled()) {
-	    		hasError = (!colFromField.isValid() || !colToField.isValid());
-	    		if (!hasError) {
-	    			int fromValue = colFromField.getIntValue();
-	    			int toValue = colToField.getIntValue();
-	    			hasError = (fromValue < 0 || fromValue >= toValue || toValue > maxCol);
-	    		}
-    		}
-    		if (rowGroup.isEnabled() && !hasError) {
-	    		hasError = (!rowFromField.isValid() || !rowToField.isValid());
-	    		if (!hasError) {
-	    			int fromValue = rowFromField.getIntValue();
-	    			int toValue = rowToField.getIntValue();
-	    			hasError = (fromValue < 0 || fromValue >= toValue || toValue > maxRow);
-	    		}
-    		}
-    		getOkButton().setEnabled(!hasError);
-    		errorMessageText.setText(hasError?"Invalid input":"");
-    	}
-    };
-    
-    private class RangeIntegerFieldEditor extends IntegerFieldEditor {
-    	private RangeIntegerFieldEditor(String name, String label, Composite parent) {
-    		super(name, label, parent);
-    	}
-        protected void createControl(Composite parent) {
-            GridLayout layout = new GridLayout();
-            layout.numColumns = getNumberOfControls();
-            layout.marginWidth = 5;
-            layout.marginHeight = 5;
-            layout.horizontalSpacing = HORIZONTAL_GAP;
-            parent.setLayout(layout);
-            doFillIntoGrid(parent, layout.numColumns);
-        }    	
-    }
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/VariableDialog.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/VariableDialog.java
deleted file mode 100644
index 7fde108..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/dialogs/VariableDialog.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.dialogs;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPVariable;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Clement chu
- * 
- */
-public abstract class VariableDialog extends Dialog {
-	protected IPStackFrame frame = null;
-	protected ListViewer listViewer = null;
-	protected IPVariable selectedVariable = null;
-
-	public VariableDialog(Shell parent, IPStackFrame frame) {
-		super(parent);
-		this.frame = frame;
-	}
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText(DialogMessages.getString("VariableDialog.name"));
-	}
-	protected Control createDialogArea(Composite parent) {
-		final Composite composite = (Composite) super.createDialogArea(parent);
-		Composite result = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout(1, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		result.setLayout(layout);
-		result.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
-		new Label(result, SWT.NONE).setText(DialogMessages.getString("VariableDialog.label"));
-		listViewer = new ListViewer(result, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		listViewer.getList().setLayoutData(new GridData(GridData.FILL_BOTH));
-		listViewer.getList().setFont(parent.getFont());
-		listViewer.setLabelProvider(new LabelProvider() {
-			public String getText(Object element) {
-				if (element instanceof IVariable) {
-					try {
-						return ((IVariable) element).getName();
-					} catch (DebugException e) {
-						return "";
-					}
-				}
-				return "";
-			}
-		});
-		listViewer.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {}
-			public Object[] getElements(Object inputElement) {
-				if (inputElement instanceof Object[])
-					return (Object[]) inputElement;
-				return new Object[0];
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		});
-		listViewer.addFilter(getViewFilter());
-		try {
-			listViewer.setInput(frame.getVariables());
-		} catch (DebugException e) {
-			listViewer.setInput(null);
-		}
-		listViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				getOkButton().setEnabled(!event.getSelection().isEmpty());
-			}
-		});
-		listViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				buttonPressed(IDialogConstants.OK_ID);
-			}
-		});
-		applyDialogFont(composite);
-		return composite;
-	}
-	public void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		getOkButton().setEnabled(false);
-	}
-	protected abstract ViewerFilter getViewFilter();
-	public Button getOkButton() {
-		return getButton(IDialogConstants.OK_ID);
-	}
-	public IPVariable getSelectedVariable() {
-		return selectedVariable;
-	}
-	protected void buttonPressed(int buttonId) {
-		selectedVariable = null;
-		if (buttonId == IDialogConstants.OK_ID) {
-			ISelection selection = listViewer.getSelection();
-			if (!selection.isEmpty()) {
-				if (selection instanceof IStructuredSelection) {
-					Object obj = ((IStructuredSelection) selection).getFirstElement();
-					if (obj instanceof IPVariable)
-						selectedVariable = (IPVariable) obj;
-				}
-			}
-		}
-		super.buttonPressed(buttonId);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/editors/PDebugTextHover.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/editors/PDebugTextHover.java
deleted file mode 100644
index 3b121e6..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/editors/PDebugTextHover.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.editors;
-
-import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHoverExtension;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.internal.ui.PDebugUIUtils;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Clement chu
- * 
- */
-public class PDebugTextHover implements ICEditorTextHover, ITextHoverExtension, ISelectionListener, IPartListener {
-	static final private int MAX_HOVER_INFO_SIZE = 100;
-	protected ISelection fSelection = null;
-	protected IEditorPart fEditor;
-
-	/** Constructor
-	 * 
-	 */
-	public PDebugTextHover() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
-	 */
-	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-		IPStackFrame frame = getFrame();
-		if (frame != null && frame.canEvaluate()) {
-			try {
-				IDocument document = textViewer.getDocument();
-				if (document == null)
-					return null;
-				String expression = document.get(hoverRegion.getOffset(), hoverRegion.getLength());
-				if (expression == null)
-					return null;
-				expression = expression.trim();
-				if (expression.length() == 0)
-					return null;
-				StringBuffer buffer = new StringBuffer();
-				String result = evaluateExpression(frame, expression);
-				if (result == null)
-					return null;
-				
-				try {
-					if (result != null)
-						appendVariable(buffer, frame.getID(), makeHTMLSafe(expression), makeHTMLSafe(result.trim()));
-				}
-				catch(DebugException x) {
-					PTPDebugUIPlugin.log(x);
-				}
-				if (buffer.length() > 0) {
-					return buffer.toString();
-				}
-			}
-			catch(BadLocationException x) {
-				PTPDebugUIPlugin.log(x);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
-	 */
-	public IRegion getHoverRegion(ITextViewer viewer, int offset) {
-		if (viewer != null)
-			return PDebugUIUtils.findWord(viewer.getDocument(), offset);
-		return null;
-	}
-
-	/** Get evalute expression result
-	 * @param frame
-	 * @param expression
-	 * @return
-	 */
-	private String evaluateExpression(IPStackFrame frame, String expression) {
-		String result = null;
-		try {
-			result = frame.evaluateExpressionToString(expression);
-		}
-		catch(DebugException e) {
-			// ignore
-		}
-		return result;
-	}
-
-	/** Append formatted variable text 
-	 * @param buffer
-	 * @param taskID
-	 * @param expression
-	 * @param value
-	 * @throws DebugException
-	 */
-	private static void appendVariable(StringBuffer buffer, int taskID, String expression, String value) throws DebugException {
-		if (value.length() > MAX_HOVER_INFO_SIZE)
-			value = value.substring(0, MAX_HOVER_INFO_SIZE) + " ...";
-		buffer.append("<p>");
-		buffer.append("<pre>").append(taskID + ": ").append(expression).append("</pre>");
-		buffer.append(" = ");
-		buffer.append("<b><pre>").append(value).append("</pre></b>");
-		buffer.append("</p>");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover#setEditor(org.eclipse.ui.IEditorPart)
-	 */
-	public void setEditor(IEditorPart editor) {
-		if (editor != null) {
-			fEditor = editor;
-			// initialize selection
-			Runnable r = new Runnable() {
-				public void run() {
-					IWorkbenchPage page = fEditor.getSite().getPage();
-					page.addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, PDebugTextHover.this);
-					page.addPartListener(PDebugTextHover.this);
-					fSelection = page.getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
-				}
-			};
-			PTPDebugUIPlugin.getStandardDisplay().asyncExec(r);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		fSelection = selection;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partActivated(IWorkbenchPart part) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partBroughtToTop(IWorkbenchPart part) {}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partClosed(IWorkbenchPart part) {
-		if (part.equals(fEditor)) {
-			IWorkbenchPage page = fEditor.getSite().getPage();
-			page.removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this);
-			page.removePartListener(this);
-			fSelection = null;
-			fEditor = null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partDeactivated(IWorkbenchPart part) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void partOpened(IWorkbenchPart part) {}
-
-	/** Get stack frame from selected element
-	 * @return
-	 */
-	protected IPStackFrame getFrame() {
-		if (fSelection instanceof IStructuredSelection) {
-			IStructuredSelection selection = (IStructuredSelection)fSelection;
-			if (selection.size() == 1) {
-				Object el = selection.getFirstElement();
-				if (el instanceof IAdaptable) {
-					return (IPStackFrame)((IAdaptable)el).getAdapter(IPStackFrame.class);
-				}
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
-	 */
-	public IInformationControlCreator getHoverControlCreator() {
-		return null;
-	}
-
-	/** Convert symbol to support html format
-	 * @param string
-	 * @return
-	 */
-	private static String makeHTMLSafe(String string) {
-		StringBuffer buffer = new StringBuffer(string.length());
-		for(int i = 0; i != string.length(); i++) {
-			char ch = string.charAt(i);
-			switch(ch) {
-				case '&':
-					buffer.append("&amp;");
-					break;
-				case '<':
-					buffer.append("&lt;");
-					break;
-				case '>':
-					buffer.append("&gt;");
-					break;
-				default:
-					buffer.append(ch);
-					break;
-			}
-		}
-		return buffer.toString();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PDebugPreferencePage.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PDebugPreferencePage.java
deleted file mode 100644
index df5c29e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PDebugPreferencePage.java
+++ /dev/null

@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.preferences;
-
-import java.text.MessageFormat;
-
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.IDebugView;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.internal.ui.PDebugModelPresentation;
-import org.eclipse.ptp.debug.ui.PreferencesAdapter;
-import org.eclipse.ptp.ui.preferences.AbstractPreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-/**
- * @author Clement chu
- */
-public class PDebugPreferencePage extends AbstractPreferencePage {
-	private Button fPathsButton = null;
-	private Button fRegisteredProcessButton = null;
-	private IntegerFieldEditor commandTimeoutField = null;
-	private Button updateVariableOnSuspendButton = null;
-	private Button updateVariableOnChangeButton = null;
-	
-	protected class WidgetListener implements IPropertyChangeListener {
-		public void propertyChange(PropertyChangeEvent event) {
-			setValid(isValid());
-		}
-	}
-	protected WidgetListener listener = new WidgetListener();
-	
-	/**
-	 * Constructor
-	 */
-	public PDebugPreferencePage() {
-		super();
-		setDescription(PreferenceMessages.getString("PDebugPreferencePage.desc"));
-		setPreferenceStore(new PreferencesAdapter(PTPDebugCorePlugin.getDefault().getPluginPreferences()));
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		// TODO ignored help
-		// getWorkbench().getHelpSystem().setHelp(getControl(), IPDebugHelpContextIds.P_DEBUG_PREFERENCE_PAGE);
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-		createSpacer(composite, 1);
-		createViewSettingPreferences(composite);
-		createSpacer(composite, 1);
-		createCommunicationPreferences(composite);
-		createSpacer(composite, 1);
-		createVariablesPreferences(composite);
-		setValues();
-		return composite;
-	}
-	/**
-	 * Create other debug settings
-	 * 
-	 * @param parent
-	 */
-	protected void createOtherDebugSetting(Composite parent) {}
-	
-	/**
-	 * Create view preference settings
-	 * 
-	 * @param parent
-	 */
-	protected void createViewSettingPreferences(Composite parent) {
-		Composite comp = createGroupComposite(parent, 1, false, PreferenceMessages.getString("PDebugPreferencePage.default1"));
-		fPathsButton = createCheckButton(comp, PreferenceMessages.getString("PDebugPreferencePage.default2"));
-		fRegisteredProcessButton = createCheckButton(comp, PreferenceMessages.getString("PDebugPreferencePage.registerProcess"));
-		fRegisteredProcessButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {}
-			public void widgetSelected(SelectionEvent e) {
-				boolean isChecked = fRegisteredProcessButton.getSelection();
-				if (!isChecked) {
-					MessageDialog.openWarning(getShell(), PreferenceMessages.getString("PDebugPreferencePage.warningTitle1"), PreferenceMessages.getString("PDebugPreferencePage.warning1"));
-				}
-			}
-		});
-	}
-	
-	/**
-	 * Create communication preference settings
-	 * 
-	 * @param parent
-	 */
-	protected void createCommunicationPreferences(Composite parent) {
-		Composite comp = createGroupComposite(parent, 1, false, PreferenceMessages.getString("PDebugPreferencePage.communication_group"));
-		Composite spacingComposite = new Composite(comp, SWT.NONE);
-		spacingComposite.setLayout(new GridLayout());
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		spacingComposite.setLayoutData(data);
-		commandTimeoutField = new IntegerFieldEditor(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT, PreferenceMessages.getString("PDebugPreferencePage.command_timeout"), spacingComposite);
-		commandTimeoutField.setPreferenceStore(getPreferenceStore());
-		commandTimeoutField.setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE);
-		commandTimeoutField.setValidRange(IPDebugConstants.MIN_REQUEST_TIMEOUT, IPDebugConstants.MAX_REQUEST_TIMEOUT);
-		String minValue = Integer.toString(IPDebugConstants.MIN_REQUEST_TIMEOUT);
-		String maxValue = Integer.toString(IPDebugConstants.MAX_REQUEST_TIMEOUT);
-		commandTimeoutField.setErrorMessage(MessageFormat.format(PreferenceMessages.getString("PDebugPreferencePage.timeoutError"), new Object[] { minValue, maxValue }));
-		commandTimeoutField.setEmptyStringAllowed(false);
-		commandTimeoutField.setPropertyChangeListener(listener);
-		commandTimeoutField.load();
-	}
-	
-	/**
-	 * Create variable preference settings
-	 * 
-	 * @param parent
-	 */
-	protected void createVariablesPreferences(Composite parent) {
-		Composite comp = createGroupComposite(parent, 1, false, PreferenceMessages.getString("PDebugPreferencePage.variable_group"));
-		updateVariableOnSuspendButton = createCheckButton(comp, PreferenceMessages.getString("PDebugPreferencePage.updateVariableOnSuspend"));
-		updateVariableOnChangeButton = createCheckButton(comp, PreferenceMessages.getString("PDebugPreferencePage.updateVariableOnChange"));
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	public void performDefaults() {
-		IPreferenceStore store = getPreferenceStore();
-		fPathsButton.setSelection(store.getDefaultBoolean(IPDebugConstants.PREF_SHOW_FULL_PATHS));
-		fRegisteredProcessButton.setSelection(store.getDefaultBoolean(IPDebugConstants.PREF_PTP_DEBUG_REGISTER_PROC_0));
-		commandTimeoutField.setStringValue(String.valueOf(store.getDefaultInt(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT)));
-		updateVariableOnSuspendButton.setSelection(store.getDefaultBoolean(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_SUSPEND));
-		updateVariableOnChangeButton.setSelection(store.getDefaultBoolean(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_CHANGE));
-		commandTimeoutField.loadDefault();
-		super.performDefaults();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		storeValues();
-		PTPDebugCorePlugin.getDefault().savePluginPreferences();
-		refreshView();
-		return true;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#setValues()
-	 */
-	protected void setValues() {
-		IPreferenceStore store = getPreferenceStore();
-		fPathsButton.setSelection(store.getBoolean(IPDebugConstants.PREF_SHOW_FULL_PATHS));
-		fRegisteredProcessButton.setSelection(store.getBoolean(IPDebugConstants.PREF_PTP_DEBUG_REGISTER_PROC_0));
-		commandTimeoutField.setStringValue(String.valueOf(store.getInt(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT)));
-		updateVariableOnSuspendButton.setSelection(store.getBoolean(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_SUSPEND));
-		updateVariableOnChangeButton.setSelection(store.getBoolean(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_CHANGE));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()
-	 */
-	public void dispose() {
-		commandTimeoutField.dispose();
-		fPathsButton.dispose();
-		fRegisteredProcessButton.dispose();
-		updateVariableOnSuspendButton.dispose();
-		updateVariableOnChangeButton.dispose();
-		super.dispose();
-	}	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.ui.preferences.AbstractPreferencePage#storeValues()
-	 */
-	protected void storeValues() {
-		IPreferenceStore store = getPreferenceStore();
-		store.setValue(IPDebugConstants.PREF_SHOW_FULL_PATHS, fPathsButton.getSelection());
-		store.setValue(IPDebugConstants.PREF_PTP_DEBUG_REGISTER_PROC_0, fRegisteredProcessButton.getSelection());
-		store.setValue(IPDebugConstants.PREF_PTP_DEBUG_COMM_TIMEOUT, commandTimeoutField.getIntValue());
-		store.setValue(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_SUSPEND, updateVariableOnSuspendButton.getSelection());
-		store.setValue(IPDebugConstants.PREF_UPDATE_VARIABLES_ON_CHANGE, updateVariableOnChangeButton.getSelection());
-		commandTimeoutField.store();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#isValid()
-	 */
-	public boolean isValid() {
-		setErrorMessage(null);
-		setMessage(null);
-		if (!commandTimeoutField.isValid()) {
-			setErrorMessage(commandTimeoutField.getErrorMessage());
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Refresh debug breakpoint view
-	 */
-	protected void refreshView() {
-		IWorkbenchPage[] pages = getPages();
-		for (int i = 0; i < pages.length; i++) {
-			IViewPart part = pages[i].findView(IDebugUIConstants.ID_BREAKPOINT_VIEW);
-			if (part != null) {
-				IDebugView adapter = (IDebugView) part.getAdapter(IDebugView.class);
-				if (adapter != null) {
-					Viewer viewer = adapter.getViewer();
-					IDebugModelPresentation pres = adapter.getPresentation(PTPDebugCorePlugin.getUniqueIdentifier());
-					if (pres != null) {
-						pres.setAttribute(PDebugModelPresentation.DISPLAY_FULL_PATHS, fPathsButton.getSelection() ? Boolean.TRUE : Boolean.FALSE);
-					}
-					if (viewer instanceof StructuredViewer) {
-						final StructuredViewer structViewer = (StructuredViewer) viewer;
-						BusyIndicator.showWhile(structViewer.getControl().getDisplay(), new Runnable() {
-							public void run() {
-								structViewer.refresh();
-							}
-						});
-					}
-				}
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.java
deleted file mode 100644
index 18d589e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.preferences;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class PreferenceMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.preferences.PreferenceMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/** Constructor
-	 * 
-	 */
-	private PreferenceMessages() {}
-
-	/** Get string
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.properties
deleted file mode 100644
index b477242..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/preferences/PreferenceMessages.properties
+++ /dev/null

@@ -1,40 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
- 
-PDebugPreferencePage.desc=General setting for parallel debugging
-
-PDebugPreferencePage.default1=Default setting
-PDebugPreferencePage.default2=Show full paths on breakpoint
-PDebugPreferencePage.default3=Display breakpoint set
-PDebugPreferencePage.registerProcess=Register process 0 by default
-PDebugPreferencePage.warningTitle1=Warning
-PDebugPreferencePage.warning1=Automatic switching to the PTP Debug Prespective will be disabled if this option is unchecked 
-
-PDebugPreferencePage.communication_group=Communication
-PDebugPreferencePage.command_timeout=&Command timeout (ms):
-PDebugPreferencePage.timeoutError=The valid value range is [{0},{1}].
-
-PDebugPreferencePage.variable_group=Variable
-
-PDebugPreferencePage.updateVariableOnSuspend=The debugger is suspended
-PDebugPreferencePage.updateVariableOnChange=Job or Set is changed

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPreferenceStore.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPreferenceStore.java
deleted file mode 100644
index 9df75e1..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPreferenceStore.java
+++ /dev/null

@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.propertypages;
-
-import java.util.HashMap;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * @author clement chu
- *
- */
-public class PBreakpointPreferenceStore implements IPreferenceStore {
-	protected final static String ENABLED = "ENABLED";
-	protected final static String CONDITION = "CONDITION";
-	protected final static String IGNORE_COUNT = "IGNORE_COUNT";
-
-	protected HashMap<String, Object> properties;
-	private boolean isDirty = false;
-	private ListenerList listeners;
-
-	/** Constructor
-	 * 
-	 */
-	public PBreakpointPreferenceStore() {
-		properties = new HashMap<String, Object>(3);
-		listeners = new ListenerList();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-	 */
-	public void addPropertyChangeListener(IPropertyChangeListener listener) {
-		listeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String)
-	 */
-	public boolean contains(String name) {
-		return properties.containsKey(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, java.lang.Object, java.lang.Object)
-	 */
-	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
-		Object[] listenerArray = listeners.getListeners();
-		if (listenerArray.length > 0 && (oldValue == null || !oldValue.equals(newValue))) {
-			PropertyChangeEvent pe = new PropertyChangeEvent(this, name, oldValue, newValue);
-			for(int i = 0; i < listenerArray.length; ++i) {
-				IPropertyChangeListener l = (IPropertyChangeListener)listenerArray[i];
-				l.propertyChange(pe);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String)
-	 */
-	public boolean getBoolean(String name) {
-		Object b = properties.get(name);
-		if (b instanceof Boolean) {
-			return ((Boolean)b).booleanValue();
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String)
-	 */
-	public boolean getDefaultBoolean(String name) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String)
-	 */
-	public double getDefaultDouble(String name) {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String)
-	 */
-	public float getDefaultFloat(String name) {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String)
-	 */
-	public int getDefaultInt(String name) {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String)
-	 */
-	public long getDefaultLong(String name) {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String)
-	 */
-	public String getDefaultString(String name) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String)
-	 */
-	public double getDouble(String name) {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String)
-	 */
-	public float getFloat(String name) {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String)
-	 */
-	public int getInt(String name) {
-		Object i = properties.get(name);
-		if (i instanceof Integer) {
-			return ((Integer)i).intValue();
-		}
-		return 1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String)
-	 */
-	public long getLong(String name) {
-		return 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String)
-	 */
-	public String getString(String name) {
-		Object str = properties.get(name);
-		if (str instanceof String) {
-			return (String)str;
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String)
-	 */
-	public boolean isDefault(String name) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving()
-	 */
-	public boolean needsSaving() {
-		return isDirty;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, java.lang.String)
-	 */
-	public void putValue(String name, String newValue) {
-		Object oldValue = properties.get(name);
-		if (oldValue == null || !oldValue.equals(newValue)) {
-			properties.put(name, newValue);
-			setDirty(true);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-	 */
-	public void removePropertyChangeListener(IPropertyChangeListener listener) {
-		listeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, double)
-	 */
-	public void setDefault(String name, double value) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, float)
-	 */
-	public void setDefault(String name, float value) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, int)
-	 */
-	public void setDefault(String name, int value) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, long)
-	 */
-	public void setDefault(String name, long value) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, java.lang.String)
-	 */
-	public void setDefault(String name, String defaultObject) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, boolean)
-	 */
-	public void setDefault(String name, boolean value) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String)
-	 */
-	public void setToDefault(String name) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, double)
-	 */
-	public void setValue(String name, double value) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, float)
-	 */
-	public void setValue(String name, float value) {}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, int)
-	 */
-	public void setValue(String name, int newValue) {
-		int oldValue = getInt(name);
-		if (oldValue != newValue) {
-			properties.put(name, new Integer(newValue) );
-			setDirty(true);
-			firePropertyChangeEvent(name, new Integer(oldValue), new Integer(newValue));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, long)
-	 */
-	public void setValue(String name, long value) {}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, java.lang.String)
-	 */
-	public void setValue(String name, String newValue) {
-		Object oldValue = properties.get(name);
-		if (oldValue == null || !oldValue.equals(newValue)) {
-			properties.put(name, newValue);
-			setDirty(true);
-			firePropertyChangeEvent(name, oldValue, newValue);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, boolean)
-	 */
-	public void setValue(String name, boolean newValue) {
-		boolean oldValue = getBoolean(name);
-		if (oldValue != newValue) {
-			properties.put(name, new Boolean(newValue));
-			setDirty(true);
-			firePropertyChangeEvent(name, new Boolean(oldValue), new Boolean(newValue));
-		}
-	}
-
-	/** Set Dirty
-	 * @param isDirty
-	 */
-	protected void setDirty(boolean isDirty) {
-		this.isDirty = isDirty;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPropertyPage.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPropertyPage.java
deleted file mode 100644
index 5b4bb34..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PBreakpointPropertyPage.java
+++ /dev/null

@@ -1,444 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.propertypages;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ptp.debug.core.model.IPAddressBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPFunctionBreakpoint;
-import org.eclipse.ptp.debug.core.model.IPWatchpoint;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPropertyPage;
-
-/**
- * @author clement chu
- * 
- */
-public class PBreakpointPropertyPage extends FieldEditorPreferencePage implements IWorkbenchPropertyPage {
-	class BreakpointIntegerFieldEditor extends IntegerFieldEditor {
-		/** Constructor
-		 * @param name
-		 * @param labelText
-		 * @param parent
-		 */
-		public BreakpointIntegerFieldEditor(String name, String labelText, Composite parent) {
-			super(name, labelText, parent);
-			setErrorMessage(PropertyPageMessages.getString("PBreakpointPropertyPage.0"));
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.StringFieldEditor#checkState()
-		 */
-		protected boolean checkState() {
-			Text control = getTextControl();
-			if (!control.isEnabled()) {
-				clearErrorMessage();
-				return true;
-			}
-			return super.checkState();
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#refreshValidState()
-		 */
-		protected void refreshValidState() {
-			super.refreshValidState();
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#doStore()
-		 */
-		protected void doStore() {
-			Text text = getTextControl();
-			if (text.isEnabled()) {
-				super.doStore();
-			}
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#clearErrorMessage()
-		 */
-		protected void clearErrorMessage() {
-			if (getPage() != null) {
-				String message = getPage().getErrorMessage();
-				if (message != null) {
-					if (getErrorMessage().equals(message)) {
-						super.clearErrorMessage();
-					}
-				} else {
-					super.clearErrorMessage();
-				}
-			}
-		}
-	}
-	class BreakpointStringFieldEditor extends StringFieldEditor {
-		/** Constructor
-		 * @param name
-		 * @param labelText
-		 * @param parent
-		 */
-		public BreakpointStringFieldEditor(String name, String labelText, Composite parent) {
-			super(name, labelText, parent);
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.StringFieldEditor#checkState()
-		 */
-		protected boolean checkState() {
-			Text control = getTextControl();
-			if (!control.isEnabled()) {
-				clearErrorMessage();
-				return true;
-			}
-			return super.checkState();
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#doStore()
-		 */
-		protected void doStore() {
-			Text text = getTextControl();
-			if (text.isEnabled()) {
-				super.doStore();
-			}
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#refreshValidState()
-		 */
-		protected void refreshValidState() {
-			super.refreshValidState();
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#clearErrorMessage()
-		 */
-		protected void clearErrorMessage() {
-			if (getPage() != null) {
-				String message = getPage().getErrorMessage();
-				if (message != null) {
-					if (getErrorMessage().equals(message)) {
-						super.clearErrorMessage();
-					}
-				} else {
-					super.clearErrorMessage();
-				}
-			}
-		}
-	}
-	class LabelFieldEditor extends FieldEditor {
-		private Label titleLabel;
-		private Label valueLabel;
-		private Composite basicComposite;
-		private String value;
-		private String title;
-
-		/** Constructor
-		 * @param parent
-		 * @param title
-		 * @param value
-		 */
-		public LabelFieldEditor(Composite parent, String title, String value) {
-			this.value = value;
-			this.title = title;
-			this.createControl(parent);
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#adjustForNumColumns(int)
-		 */
-		protected void adjustForNumColumns(int numColumns) {
-			((GridData) basicComposite.getLayoutData()).horizontalSpan = numColumns;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#doFillIntoGrid(org.eclipse.swt.widgets.Composite, int)
-		 */
-		protected void doFillIntoGrid(Composite parent, int numColumns) {
-			basicComposite = new Composite(parent, SWT.NULL);
-			GridLayout layout = new GridLayout();
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			layout.numColumns = 2;
-			basicComposite.setLayout(layout);
-			GridData data = new GridData();
-			data.verticalAlignment = GridData.FILL;
-			data.horizontalAlignment = GridData.FILL;
-			basicComposite.setLayoutData(data);
-			titleLabel = new Label(basicComposite, SWT.NONE);
-			titleLabel.setText(title);
-			GridData gd = new GridData();
-			gd.verticalAlignment = SWT.TOP;
-			titleLabel.setLayoutData(gd);
-			valueLabel = new Label(basicComposite, SWT.WRAP);
-			valueLabel.setText(value);
-			gd = new GridData();
-			valueLabel.setLayoutData(gd);
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#getNumberOfControls()
-		 */
-		public int getNumberOfControls() {
-			return 1;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#doLoad()
-		 */
-		protected void doLoad() {}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#doLoadDefault()
-		 */
-		protected void doLoadDefault() {}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.preference.FieldEditor#doStore()
-		 */
-		protected void doStore() {}
-	}
-
-	private BooleanFieldEditor enabled;
-	private BreakpointStringFieldEditor condition;
-	private Text ignoreCountTextControl;
-	private BreakpointIntegerFieldEditor ignoreCount;
-	private IAdaptable element;
-	private PBreakpointPreferenceStore pBreakpointPreferenceStore;
-	private UIDebugManager uiDebugManager = null;
-
-	/** Constructor
-	 * 
-	 */
-	public PBreakpointPropertyPage() {
-		super(GRID);
-		noDefaultAndApplyButton();
-		uiDebugManager = PTPDebugUIPlugin.getUIDebugManager();
-		pBreakpointPreferenceStore = new PBreakpointPreferenceStore();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
-	 */
-	protected void createFieldEditors() {
-		IPBreakpoint breakpoint = getBreakpoint();
-		try {
-			createTypeSpecificLabelFieldEditors(breakpoint);
-			createEnabledField(getFieldEditorParent());
-			IPreferenceStore store = getPreferenceStore();
-			String condition = breakpoint.getCondition();
-			if (condition == null) {
-				condition = "";
-			}
-			store.setValue(PBreakpointPreferenceStore.CONDITION, condition);
-			createConditionEditor(getFieldEditorParent());
-			store.setValue(PBreakpointPreferenceStore.ENABLED, breakpoint.isEnabled());
-			int ignoreCount = breakpoint.getIgnoreCount();
-			store.setValue(PBreakpointPreferenceStore.IGNORE_COUNT, (ignoreCount >= 0) ? ignoreCount : 0);
-			createIgnoreCountEditor(getFieldEditorParent());
-		} catch (CoreException ce) {
-			PTPDebugUIPlugin.errorDialog(getShell(), "Breakpoint Property Page", "", ce);
-		}
-	}
-	/** Create type specific lable field editors
-	 * @param breakpoint
-	 * @throws CoreException
-	 */
-	private void createTypeSpecificLabelFieldEditors(IPBreakpoint breakpoint) throws CoreException {
-		if (breakpoint instanceof IPFunctionBreakpoint) {
-			IPFunctionBreakpoint funcBpt = (IPFunctionBreakpoint) breakpoint;
-			addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.18"), PropertyPageMessages.getString("PBreakpointPropertyPage.3")));
-			String function = funcBpt.getFunction();
-			if (function != null) {
-				addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.2"), function));
-			}
-		} else if (breakpoint instanceof IPAddressBreakpoint) {
-			IPAddressBreakpoint addrBpt = (IPAddressBreakpoint) breakpoint;
-			addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.18"), PropertyPageMessages.getString("PBreakpointPropertyPage.6")));
-			String address = addrBpt.getAddress();
-			if (address != null) {
-				addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.5"), address));
-			}
-		} else if (breakpoint instanceof IPWatchpoint) {
-			IPWatchpoint watchpoint = (IPWatchpoint) breakpoint;
-			String type = "";
-			if (watchpoint.isReadType() && !watchpoint.isWriteType())
-				type = PropertyPageMessages.getString("PBreakpointPropertyPage.11");
-			else if (!watchpoint.isReadType() && watchpoint.isWriteType())
-				type = PropertyPageMessages.getString("PBreakpointPropertyPage.12");
-			else
-				type = PropertyPageMessages.getString("PBreakpointPropertyPage.13");
-
-			String expression = watchpoint.getExpression();
-			addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.18"), type));
-			String projectName = breakpoint.getMarker().getResource().getLocation().toOSString();
-			if (projectName != null) {
-				addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.10"), projectName));
-			}
-			addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.14"), expression));
-		} else if (breakpoint instanceof ILineBreakpoint) {
-			addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.18"), PropertyPageMessages.getString("PBreakpointPropertyPage.8")));
-			String fileName = breakpoint.getSourceHandle();
-			if (fileName != null) {
-				addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.7"), fileName));
-			}
-			ILineBreakpoint lineBpt = (ILineBreakpoint) breakpoint;
-			int lineNumber = lineBpt.getLineNumber();
-			if (lineNumber > 0) {
-				addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.9"), String.valueOf(lineNumber)));
-			}
-		}
-		// Set
-		String job_id = breakpoint.getJobId();
-		String jobName = breakpoint.getJobName();
-		addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.20"), jobName));
-		String set_id = breakpoint.getSetId();
-		addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.21"), set_id));
-		//show total number of processes
-		if (!job_id.equals(IPBreakpoint.GLOBAL)) {
-			IElementHandler setManager = uiDebugManager.getElementHandler(job_id);
-			IElementSet elementSet = (IElementSet)setManager.getElementByID(set_id);
-			addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.22"), String.valueOf(elementSet.size())));
-			String[] setNames = elementSet.getMatchSetIDs();
-			StringBuffer buffer = new StringBuffer();
-			for (int i=0; i<setNames.length; i++) {
-				buffer.append(setNames[i]);
-				if (i < setNames.length - 1)
-					buffer.append(",");
-			}
-			if (buffer.length() > 0)
-				addField(createLabelEditor(getFieldEditorParent(), PropertyPageMessages.getString("PBreakpointPropertyPage.23"), buffer.toString()));
-		}
-	}
-	/** Create enabled field
-	 * @param parent
-	 */
-	protected void createEnabledField(Composite parent) {
-		enabled = new BooleanFieldEditor(PBreakpointPreferenceStore.ENABLED, PropertyPageMessages.getString("PBreakpointPropertyPage.19"), parent);
-		addField(enabled);
-	}
-	/** Create condition field
-	 * @param parent
-	 */
-	protected void createConditionEditor(Composite parent) {
-		condition = new BreakpointStringFieldEditor(PBreakpointPreferenceStore.CONDITION, PropertyPageMessages.getString("PBreakpointPropertyPage.15"), parent);
-		condition.setEmptyStringAllowed(true);
-		condition.setErrorMessage(PropertyPageMessages.getString("PBreakpointPropertyPage.16"));
-		addField(condition);
-	}
-	/** Create ignore count field
-	 * @param parent
-	 */
-	protected void createIgnoreCountEditor(Composite parent) {
-		ignoreCount = new BreakpointIntegerFieldEditor(PBreakpointPreferenceStore.IGNORE_COUNT, PropertyPageMessages.getString("PBreakpointPropertyPage.17"), parent);
-		ignoreCount.setValidRange(0, Integer.MAX_VALUE);
-		ignoreCountTextControl = ignoreCount.getTextControl(parent);
-		try {
-			ignoreCountTextControl.setEnabled(getBreakpoint().getIgnoreCount() >= 0);
-		} catch (CoreException ce) {
-			PTPDebugUIPlugin.log(ce);
-		}
-		addField(ignoreCount);
-	}
-	/** Create label field
-	 * @param parent
-	 * @param title
-	 * @param value
-	 * @return
-	 */
-	protected FieldEditor createLabelEditor(Composite parent, String title, String value) {
-		return new LabelFieldEditor(parent, title, value);
-	}
-	/** Get breakpoint
-	 * @return
-	 */
-	protected IPBreakpoint getBreakpoint() {
-		IAdaptable element = getElement();
-		return (element instanceof IPBreakpoint) ? (IPBreakpoint) element : null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
-	 */
-	public IAdaptable getElement() {
-		return element;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
-	 */
-	public void setElement(IAdaptable element) {
-		this.element = element;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#getPreferenceStore()
-	 */
-	public IPreferenceStore getPreferenceStore() {
-		return pBreakpointPreferenceStore;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		final List<String> changedProperties = new ArrayList<String>(5);
-		getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				changedProperties.add(event.getProperty());
-			}
-		});
-		boolean result = super.performOk();
-		setBreakpointProperties(changedProperties);
-		return result;
-	}
-	/** Set breakpoint properties
-	 * @param changedProperties
-	 */
-	protected void setBreakpointProperties(final List<String> changedProperties) {
-		IWorkspaceRunnable wr = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				IPBreakpoint breakpoint = getBreakpoint();
-				Iterator<String> changed = changedProperties.iterator();
-				while (changed.hasNext()) {
-					String property = (String) changed.next();
-					if (property.equals(PBreakpointPreferenceStore.ENABLED)) {
-						breakpoint.setEnabled(getPreferenceStore().getBoolean(PBreakpointPreferenceStore.ENABLED));
-					} else if (property.equals(PBreakpointPreferenceStore.IGNORE_COUNT)) {
-						breakpoint.setIgnoreCount(getPreferenceStore().getInt(PBreakpointPreferenceStore.IGNORE_COUNT));
-					} else if (property.equals(PBreakpointPreferenceStore.CONDITION)) {
-						breakpoint.setCondition(getPreferenceStore().getString(PBreakpointPreferenceStore.CONDITION));
-					}
-				}
-			}
-		};
-		try {
-			ResourcesPlugin.getWorkspace().run(wr, null);
-		} catch (CoreException ce) {
-			PTPDebugUIPlugin.log(ce);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.java
deleted file mode 100644
index 2273717..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.propertypages;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class PropertyPageMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.propertypages.PropertyPageMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/** Constructor
-	 * 
-	 */
-	private PropertyPageMessages() {}
-
-	/** Get string
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.properties
deleted file mode 100644
index 2f40026..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/PropertyPageMessages.properties
+++ /dev/null

@@ -1,75 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-PBreakpointPropertyPage.0=Ignore count must be a nonnegative integer
-PBreakpointPropertyPage.1=Not available
-PBreakpointPropertyPage.2=Function name: 
-PBreakpointPropertyPage.3=PTP function breakpoint
-PBreakpointPropertyPage.4=Not available
-PBreakpointPropertyPage.5=Address: 
-PBreakpointPropertyPage.6=PTP address breakpoint
-PBreakpointPropertyPage.7=File: 
-PBreakpointPropertyPage.8=PTP line breakpoint
-PBreakpointPropertyPage.9=Line number: 
-PBreakpointPropertyPage.10=Project: 
-PBreakpointPropertyPage.11=PTP read watchpoint
-PBreakpointPropertyPage.12=PTP watchpoint
-PBreakpointPropertyPage.13=PTP access watchpoint
-PBreakpointPropertyPage.14=Expression to watch:
-PBreakpointPropertyPage.15=&Condition:
-PBreakpointPropertyPage.16=Invalid condition.
-PBreakpointPropertyPage.17=&Ignore count: 
-PBreakpointPropertyPage.18=Type:
-PBreakpointPropertyPage.19=Enabled
-PBreakpointPropertyPage.20=Job name:
-PBreakpointPropertyPage.21=Created in set:
-PBreakpointPropertyPage.22=Total number of processes:
-PBreakpointPropertyPage.23=Related sets:
-
-ThreadFilterEditor.0=&Restrict to Selected Targets and Threads:
-
-SignalPropertyPage.0=Description: {0}.
-SignalPropertyPage.1=Pass this signal to the program.
-SignalPropertyPage.2=Suspend the program when this signal happens.
-SignalPropertyPage.4=Operation failed.
-SignalPropertyPage.5=Unable to change signal's properties.
-
-ModulePropertyPage.0=Type:
-ModulePropertyPage.1=executable
-ModulePropertyPage.2=shared library
-ModulePropertyPage.3=core file
-ModulePropertyPage.3=Browse...
-ModulePropertyPage.4=CPU:
-ModulePropertyPage.5=not available
-ModulePropertyPage.6=Base address:
-ModulePropertyPage.7=not available
-ModulePropertyPage.8=Size:
-ModulePropertyPage.9=not available
-ModulePropertyPage.10=Symbols:
-ModulePropertyPage.11=loaded
-ModulePropertyPage.12=not loaded
-ModulePropertyPage.13=Symbols file:
-ModulePropertyPage.14=not found
-ModulePropertyPage.15=Error
-ModulePropertyPage.15=Unable to load symbols.
-ModulePropertyPage.16=Unable to load symbols.
-ModulePropertyPage.16=not available

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/SignalPropertyPage.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/SignalPropertyPage.java
deleted file mode 100644
index ac3a60b..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/propertypages/SignalPropertyPage.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.propertypages;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ptp.debug.core.IPDebugConstants;
-import org.eclipse.ptp.debug.core.PDebugModel;
-import org.eclipse.ptp.debug.core.PDebugUtils;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.internal.ui.dialogfields.SelectionButtonDialogField;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-/**
- * @author Clement
- */
-
-public class SignalPropertyPage extends PropertyPage {
-	private SelectionButtonDialogField fPassButton;
-	private SelectionButtonDialogField fStopButton;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		noDefaultAndApplyButton();
-		Composite composite = new Composite(parent, SWT.NONE);
-		Font font = parent.getFont();
-		composite.setFont(font);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Create description field
-		try {
-			String description = getSignal().getDescription();
-			Label label = new Label(composite, SWT.WRAP);
-			label.setText(MessageFormat.format(PropertyPageMessages.getString("SignalPropertyPage.0"), new Object[] { description }));
-			GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
-			data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-			label.setLayoutData(data);
-			label.setFont(font);
-		}
-		catch(DebugException e1) {
-		}
-
-		// Create pass button
-		try {
-			boolean pass = getSignal().isPassEnabled();
-			fPassButton = new SelectionButtonDialogField(SWT.CHECK);
-			fPassButton.setLabelText(PropertyPageMessages.getString("SignalPropertyPage.1"));
-			fPassButton.setSelection(pass);
-			fPassButton.setEnabled(getSignal().canModify());
-			fPassButton.doFillIntoGrid(composite, 1);
-		}
-		catch(DebugException e) {
-		}
-
-		// Create stop button
-		try {
-			boolean stop = getSignal().isStopEnabled();
-			fStopButton = new SelectionButtonDialogField(SWT.CHECK);
-			fStopButton.setLabelText(PropertyPageMessages.getString("SignalPropertyPage.2"));
-			fStopButton.setSelection(stop);
-			fStopButton.setEnabled(getSignal().canModify());
-			fStopButton.doFillIntoGrid(composite, 1);
-		}
-		catch(DebugException e) {
-		}
-
-		setValid(true);
-		return composite;
-	}
-
-	protected SelectionButtonDialogField getPassButton() {
-		return fPassButton;
-	}
-
-	protected SelectionButtonDialogField getStopButton() {
-		return fStopButton;
-	}
-
-	public IPSignal getSignal() {
-		return (IPSignal)getElement();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		boolean result = super.performOk();
-		if (result) {
-			DebugPlugin.getDefault().asyncExec(
-					new Runnable() {
-						public void run() {
-							if (!getSignal().canModify())
-								return;
-							if (getPassButton() != null) { 
-								try {
-									getSignal().setPassEnabled(getPassButton().isSelected());
-								}
-								catch(DebugException e) {
-									failed(PropertyPageMessages.getString("SignalPropertyPage.5"), e);
-								}
-							}
-							if (getStopButton() != null) { 
-								try {
-									getSignal().setStopEnabled(getStopButton().isSelected());
-								}
-								catch(DebugException e) {
-									failed(PropertyPageMessages.getString("SignalPropertyPage.5"), e);
-								}
-							}
-						}
-					});
-		}
-		return result;
-	}
-
-	protected void failed(String message, Throwable e) {
-		MultiStatus ms = new MultiStatus(PDebugModel.getPluginIdentifier(), IPDebugConstants.STATUS_CODE_ERROR, message, null);
-		ms.add(new Status(IStatus.ERROR, PDebugModel.getPluginIdentifier(), IPDebugConstants.STATUS_CODE_ERROR, e.getMessage(), null));
-		PDebugUtils.error(ms, getSignal());
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java
deleted file mode 100644
index b83a89a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/MappingSourceContainerBrowser.java
+++ /dev/null

@@ -1,71 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.sourcelookup;
-
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
-import org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ptp.debug.core.sourcelookup.MappingSourceContainer;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author clement
- *
- */
-public class MappingSourceContainerBrowser extends AbstractSourceContainerBrowser {
-	private static final String MAPPING = SourceLookupUIMessages.getString("MappingSourceContainerBrowser.0");
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#addSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
-	 */
-	public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) {
-		return new ISourceContainer[] { new MappingSourceContainer(generateName(director)) };
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canAddSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
-	 */
-	public boolean canAddSourceContainers(ISourceLookupDirector director) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[])
-	 */
-	public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) {
-		return (containers.length == 1 && containers[0] instanceof MappingSourceContainer);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.sourcelookup.AbstractSourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[])
-	 */
-	public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) {
-		if (containers.length == 1 && containers[0] instanceof MappingSourceContainer) {
-			PathMappingDialog dialog = new PathMappingDialog(shell, (MappingSourceContainer)containers[0]);
-			if (dialog.open() == Window.OK) {
-				return new ISourceContainer[] { dialog.getMapping() };
-			}
-		}
-		return new ISourceContainer[0];
-	}
-
-	private String generateName(ISourceLookupDirector director) {
-//		int counter = 1;
-//		ISourceContainer[] containers = director.getSourceContainers();
-//		for (int i = 0; i < containers.length; ++i) {
-//			if (MappingSourceContainer.TYPE_ID.equals(containers[i].getType().getId())) {
-//				String name = containers[i].getName(); 
-//				if (name.startsWith(MAPPING)) {
-//					try {
-//						int number = Integer.valueOf(name.substring(MAPPING.length())).intValue();
-//						if (number == counter)
-//							++counter;
-//					}
-//					catch(NumberFormatException e) {
-//					}
-//				}
-//			}
-//		}
-//		return MAPPING + counter;
-		return MAPPING;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/PathMappingDialog.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/PathMappingDialog.java
deleted file mode 100644
index 262632e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/PathMappingDialog.java
+++ /dev/null

@@ -1,521 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.sourcelookup;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.sourcelookup.ISourceContainer;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ptp.debug.core.sourcelookup.MappingSourceContainer;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.MapEntrySourceContainer;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * @author clement
- *
- */
-public class PathMappingDialog extends TitleAreaDialog {
-	class MapEntryDialog extends TitleAreaDialog {
-		private MapEntrySourceContainer fEntry;
-		protected Text fBackendPathText;
-		protected Text fLocalPathText;
-
-		/**
-		 * Constructor for MapEntryDialog.
-		 */
-		public MapEntryDialog(Shell parentShell) {
-			super(parentShell);
-			fEntry = null;
-		}
-
-		/**
-		 * Constructor for MapEntryDialog.
-		 */
-		public MapEntryDialog(Shell parentShell, MapEntrySourceContainer entry) {
-			super(parentShell);
-			fEntry = entry;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-		 */
-		protected Control createDialogArea(Composite parent) {
-			setTitle(SourceLookupUIMessages.getString("PathMappingDialog.0"));
-			//TODO change image
-			setTitleImage(PDebugImage.getImage(PDebugImage.ICON_REGISTER_NORMAL));
-
-			Font font = parent.getFont();
-			Composite composite = new Composite(parent, SWT.NONE);
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 2;
-			layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-			layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-			layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-			layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-			composite.setLayout(layout);
-			GridData data = new GridData(GridData.FILL_BOTH);
-			composite.setLayoutData(data);
-			composite.setFont(font);
-
-			Dialog.applyDialogFont(composite);
-			//PlatformUI.getWorkbench().getHelpSystem().setHelp(getShell(), IPTPDebugHelpContextIds.SOURCE_PATH_MAP_ENTRY_DIALOG);
-
-			setMessage(null);
-
-			Label label = new Label(composite, SWT.LEFT);
-			label.setText(SourceLookupUIMessages.getString("PathMappingDialog.1"));
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.horizontalSpan = 2;
-			label.setLayoutData(data);
-			label.setFont(font);
-			
-			fBackendPathText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.horizontalSpan = 2;
-			fBackendPathText.setLayoutData(data);
-			fBackendPathText.setFont(font);
-			fBackendPathText.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					update();
-				}
-			});
-
-			label = new Label(composite, SWT.LEFT);
-			label.setText(SourceLookupUIMessages.getString("PathMappingDialog.2"));
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			data.horizontalSpan = 2;
-			label.setLayoutData(data);
-			label.setFont(font);
-			
-			fLocalPathText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-			data = new GridData(GridData.FILL_HORIZONTAL);
-			fLocalPathText.setLayoutData(data);
-			fLocalPathText.setFont(font);
-			fLocalPathText.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					update();
-				}
-			});
-
-			Button button = new Button(composite, SWT.PUSH);
-			button.setFont(font);
-			button.setText(SourceLookupUIMessages.getString("PathMappingDialog.3"));
-			button.addSelectionListener(new SelectionListener() { 
-
-				public void widgetSelected(SelectionEvent e) {
-					DirectoryDialog dialog = new DirectoryDialog(MapEntryDialog.this.getShell());
-					String path = dialog.open();
-					if (path != null) {
-						fLocalPathText.setText(path);
-					}
-				}
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-			});
-
-			return composite;
-		}
-
-		protected Control createContents(Composite parent) {
-			Control control = super.createContents(parent);
-			initialize();
-			update();
-			return control;
-		}
-
-		protected void configureShell(Shell newShell) {
-			newShell.setText(SourceLookupUIMessages.getString("PathMappingDialog.4"));
-			super.configureShell(newShell);
-		}
-
-		private void initialize() {
-			if (fEntry != null) {
-				fBackendPathText.setText(fEntry.getBackendPath().toOSString());
-				fLocalPathText.setText(fEntry.getLocalPath().toOSString());
-			}
-		}
-
-		protected void update() {
-			boolean isOk = updateErrorMessage();
-			Button ok = getButton(IDialogConstants.OK_ID);
-			if (ok != null)
-				ok.setEnabled(isOk);
-		}
-
-		protected boolean updateErrorMessage() {
-			setErrorMessage(null);
-			String backendText = fBackendPathText.getText().trim();
-			if (backendText.length() == 0) {
-				setErrorMessage(SourceLookupUIMessages.getString("PathMappingDialog.5"));
-				return false;
-			}
-			if (!new Path(backendText).isValidPath(backendText)) {
-				setErrorMessage(SourceLookupUIMessages.getString("PathMappingDialog.6"));
-				return false;
-			}
-			String localText = fLocalPathText.getText().trim();
-			if (localText.length() == 0) {
-				setErrorMessage(SourceLookupUIMessages.getString("PathMappingDialog.7"));
-				return false;
-			}
-			File localPath = new File(localText);
-			if (!localPath.exists()) {
-				setErrorMessage(SourceLookupUIMessages.getString("PathMappingDialog.8"));
-				return false;
-			}
-			if (!localPath.isDirectory()) {
-				setErrorMessage(SourceLookupUIMessages.getString("PathMappingDialog.9"));
-				return false;
-			}
-			if (!localPath.isAbsolute()) {
-				setErrorMessage(SourceLookupUIMessages.getString("PathMappingDialog.10"));
-				return false;
-			}
-			return true;
-		}
-
-		protected IPath getBackendPath() {
-			return new Path(fBackendPathText.getText().trim());
-		}
-
-		protected IPath getLocalPath() {
-			return new Path(fLocalPathText.getText().trim());
-		}
-
-		protected void okPressed() {
-			if (fEntry == null) {
-				fEntry = new MapEntrySourceContainer();
-				fMapping.addMapEntry(fEntry);
-			}
-			fEntry.setBackendPath(getBackendPath());
-			fEntry.setLocalPath(getLocalPath());
-			super.okPressed();
-		}
-	}
-
-	class PathMappingLabelProvider extends LabelProvider {
-
-		private ILabelProvider fLabelProvider = null;
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			Image image = getWorkbenchLabelProvider().getImage(element);
-			if (image != null) {
-				return image;
-			}
-			return super.getImage(element);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			String label = getWorkbenchLabelProvider().getText(element);
-			if (label == null || label.length() == 0) {
-				if (element instanceof ISourceContainer) {
-					return ((ISourceContainer)element).getName();
-				}
-			}
-			else {
-				return label;
-			}
-			return super.getText(element);
-		}
-
-		private ILabelProvider getWorkbenchLabelProvider() {
-			if (fLabelProvider == null) {
-				fLabelProvider = new WorkbenchLabelProvider();
-			}
-			return fLabelProvider;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
-		public void dispose() {
-			super.dispose();
-			if (fLabelProvider != null) {
-				fLabelProvider.dispose();
-			}
-		}
-	}
-
-	class ContentProvider implements IStructuredContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object input) {
-			if (input instanceof MappingSourceContainer) {
-				try {
-					return ((MappingSourceContainer)input).getSourceContainers();
-				}
-				catch(CoreException e) {
-					setErrorMessage(e.getMessage());
-				}
-			}
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-	}
-
-	private MappingSourceContainer fOriginalMapping;
-
-	protected MappingSourceContainer fMapping;
-
-	private TableViewer fViewer;
-
-	private Text fNameText;
-	private Button fAddButton;
-	private Button fEditButton;
-	private Button fRemoveButton;
-
-	public PathMappingDialog(Shell parentShell, MappingSourceContainer mapping) {
-		super(parentShell);
-		fOriginalMapping = mapping;
-		fMapping = fOriginalMapping.copy();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Control control = super.createContents(parent);
-		updateButtons();
-		return control;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		setTitle(SourceLookupUIMessages.getString("PathMappingDialog.11"));
-		//TODO change image
-		setTitleImage(PDebugImage.getImage(PDebugImage.ICON_REGISTER_NORMAL));
-		
-		Font font = parent.getFont();
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(data);
-		composite.setFont(font);
-
-		Dialog.applyDialogFont(composite);
-		//PlatformUI.getWorkbench().getHelpSystem().setHelp(getShell(), IPTPDebugHelpContextIds.SOURCE_PATH_MAPPING_DIALOG);
-
-		Composite nameComp = new Composite(composite, SWT.NONE);
-		layout = new GridLayout();
-		layout.numColumns = 2;
-		nameComp.setLayout(layout);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		nameComp.setLayoutData(data);
-		nameComp.setFont(font);
-
-		Label label = new Label(nameComp, SWT.LEFT);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		label.setLayoutData(data);
-		label.setFont(font);
-		label.setText(SourceLookupUIMessages.getString("PathMappingDialog.12"));
-		fNameText = new Text(nameComp, SWT.SINGLE | SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		fNameText.setLayoutData(data);
-		fNameText.setFont(font);
-		fNameText.setText(getMapping().getName());
-		fNameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-			}
-		});
-		
-		fViewer = createViewer(composite);
-		data = new GridData(GridData.FILL_BOTH);
-		fViewer.getControl().setLayoutData(data);
-		fViewer.getControl().setFont(font);
-		fViewer.addSelectionChangedListener(new ISelectionChangedListener() { 
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtons();
-			}
-		});
-
-		Composite buttonComp = new Composite(composite, SWT.NONE);
-		GridLayout buttonLayout = new GridLayout();
-		buttonLayout.marginHeight = 0;
-		buttonLayout.marginWidth = 0;
-		buttonComp.setLayout(buttonLayout);
-		data = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		buttonComp.setLayoutData(data);
-		buttonComp.setFont(font);
-
-		GC gc = new GC(parent);
-		gc.setFont(parent.getFont());
-		FontMetrics fontMetrics = gc.getFontMetrics();
-		gc.dispose();
-
-		fAddButton = createPushButton(buttonComp, SourceLookupUIMessages.getString("PathMappingDialog.13"), fontMetrics);
-		fAddButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					MapEntryDialog dialog = new MapEntryDialog(getShell());
-					if (dialog.open() == Window.OK) {
-						getViewer().refresh();
-					}
-				}
-			});
-
-		fEditButton = createPushButton(buttonComp, SourceLookupUIMessages.getString("PathMappingDialog.14"), fontMetrics);
-		fEditButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					MapEntrySourceContainer[] entries = getSelection();
-					if (entries.length > 0) {
-						MapEntryDialog dialog = new MapEntryDialog(getShell(), entries[0]);
-						if (dialog.open() == Window.OK) {
-							getViewer().refresh();
-						}
-					}
-				}
-			});
-
-		fRemoveButton = createPushButton(buttonComp, SourceLookupUIMessages.getString("PathMappingDialog.15"), fontMetrics);
-		fRemoveButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					MapEntrySourceContainer[] entries = getSelection();
-						for (int i = 0; i < entries.length; ++i) {
-							fMapping.removeMapEntry(entries[i]);
-						}
-						getViewer().refresh();
-				}
-			});
-
-		setMessage(null);
-
-		fViewer.setInput(fMapping);
-
-		return composite;
-	}
-
-	private TableViewer createViewer(Composite parent) {
-		TableViewer viewer = new TableViewer(parent);
-		viewer.setContentProvider(new ContentProvider());
-		viewer.setLabelProvider(new PathMappingLabelProvider());
-		return viewer;
-	}
-
-	protected MappingSourceContainer getMapping() {
-		return fOriginalMapping;
-	}
-
-	protected Button createPushButton(Composite parent, String label, FontMetrics fontMetrics) {
-		Button button = new Button(parent, SWT.PUSH);
-		button.setFont(parent.getFont());
-		button.setText(label);
-		GridData gd = getButtonGridData(button, fontMetrics);
-		button.setLayoutData(gd);
-		return button;
-	}
-
-	private GridData getButtonGridData(Button button, FontMetrics fontMetrics) {
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		int widthHint = Dialog.convertHorizontalDLUsToPixels(fontMetrics, IDialogConstants.BUTTON_WIDTH);
-		gd.widthHint = Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-		return gd;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		newShell.setText(SourceLookupUIMessages.getString("PathMappingDialog.16"));
-		super.configureShell(newShell);
-	}
-
-	protected Viewer getViewer() {
-		return fViewer;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		fOriginalMapping.clear();
-		fOriginalMapping.setName(fNameText.getText().trim());
-		try {
-			fOriginalMapping.addMapEntries((MapEntrySourceContainer[])fMapping.getSourceContainers());
-		}
-		catch(CoreException e) {
-		}
-		fMapping.dispose();
-		super.okPressed();
-	}	
-
-	protected MapEntrySourceContainer[] getSelection() {
-		MapEntrySourceContainer[] result = new MapEntrySourceContainer[0];
-		ISelection s = getViewer().getSelection();
-		if (s instanceof IStructuredSelection) {
-			int size = ((IStructuredSelection)s).size();
-			result = (MapEntrySourceContainer[])((IStructuredSelection)s).toList().toArray(new MapEntrySourceContainer[size]);
-		}
-		return result; 
-	}
-
-	protected void updateButtons() {
-		MapEntrySourceContainer[] entries = getSelection();
-		if (fEditButton != null) {
-			fEditButton.setEnabled(entries.length == 1);
-		}
-		if (fRemoveButton != null) {
-			fRemoveButton.setEnabled(entries.length > 0);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java
deleted file mode 100644
index 223c514..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerAdapterFactory.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.sourcelookup;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-/**
- * @author clement
- *
- */
-public class SourceContainerAdapterFactory implements IAdapterFactory {
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType.equals(IWorkbenchAdapter.class)) {
-			return new SourceContainerWorkbenchAdapter();
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[]{ IWorkbenchAdapter.class };
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java
deleted file mode 100644
index 193a2a2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceContainerWorkbenchAdapter.java
+++ /dev/null

@@ -1,93 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.sourcelookup;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.debug.core.sourcelookup.MappingSourceContainer;
-import org.eclipse.ptp.debug.internal.core.sourcelookup.MapEntrySourceContainer;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-/**
- * @author clement
- *
- */
-public class SourceContainerWorkbenchAdapter implements IWorkbenchAdapter {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object o) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	public ImageDescriptor getImageDescriptor(Object o) {
-		if (o instanceof MappingSourceContainer) {
-			//TODO change image
-			return PDebugImage.getDescriptor(PDebugImage.ICON_REGISTER_NORMAL);
-		}
-		if (o instanceof MapEntrySourceContainer) {
-			//TODO change image
-			return PDebugImage.getDescriptor(PDebugImage.ICON_REGISTER_NORMAL);
-		}
-		if (o instanceof ProjectSourceContainer) {
-			IProject project = ((ProjectSourceContainer)o).getProject();
-			if (project != null)
-				return getImageDescriptor(project);
-		}
-		return null;
-	}
-
-	protected ImageDescriptor getImageDescriptor(IProject project) {
-		IWorkbenchAdapter adapter = (IWorkbenchAdapter)project.getAdapter(IWorkbenchAdapter.class);
-		if (adapter != null) {
-			return adapter.getImageDescriptor(project);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
-	 */
-	public String getLabel(Object o) {
-		if (o instanceof MappingSourceContainer) {
-			return SourceLookupUIMessages.getString("SourceContainerWorkbenchAdapter.0") + ((MappingSourceContainer)o).getName(); 
-		}
-		if (o instanceof MapEntrySourceContainer) {
-			return ((MapEntrySourceContainer)o).getName();
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object o) {
-		return null;
-	}
-
-	public String getQualifiedName(IPath path) {
-		StringBuffer buffer = new StringBuffer();
-		String[] segments = path.segments();
-		if (segments.length > 0) {
-			buffer.append(path.lastSegment());
-			if (segments.length > 1) {
-				buffer.append(" - "); 
-				if (path.getDevice() != null) {
-					buffer.append(path.getDevice());
-				}
-				for(int i = 0; i < segments.length - 1; i++) {
-					buffer.append(File.separatorChar);
-					buffer.append(segments[i]);
-				}
-			}
-			return buffer.toString();
-		}
-		return "";
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.java
deleted file mode 100644
index 94a0b50..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.sourcelookup;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author clement
- *
- */
-public class SourceLookupUIMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.sourcelookup.SourceLookupUIMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private SourceLookupUIMessages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.properties
deleted file mode 100644
index cf51ddd..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/sourcelookup/SourceLookupUIMessages.properties
+++ /dev/null

@@ -1,40 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 QNX Software Systems 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:
-#     QNX Software Systems - initial API and implementation
-#     Nokia - Added support for CSourceNotFoundElement ( 167305 )
-###############################################################################
-AddContainerAction.0=&Add...
-AddSourceContainerDialog.0=Add Source
-AddSourceContainerDialog.1=Select the type of source to add to the source lookup path
-DownAction.0=&Down
-EditContainerAction.0=&Edit...
-MappingSourceContainerBrowser.0=New Mapping
-PathMappingDialog.0=Specify the mapping paths
-PathMappingDialog.1=Compilation path:
-PathMappingDialog.2=Local file system path:
-PathMappingDialog.3=&Browse...
-PathMappingDialog.4=Path Mapping
-PathMappingDialog.5=The compilation path must not be empty
-PathMappingDialog.6=Invalid compilation path.
-PathMappingDialog.7=The local file systems path must not be empty
-PathMappingDialog.8=The specified local file system path doesn't exist
-PathMappingDialog.9=The local file system path must be a directory
-PathMappingDialog.10=The local file system path must be absolute
-PathMappingDialog.11=Modify the path mappings
-PathMappingDialog.12=Name:
-PathMappingDialog.13=&Add...
-PathMappingDialog.14=&Edit...
-PathMappingDialog.15=Re&move
-PathMappingDialog.16=Path Mappings
-RemoveAction.0=Re&move
-SourceContainerWorkbenchAdapter.0=Path Mapping: 
-UpAction.0=U&p
-PSourceNotFoundEditor.0=Can''t find a source file at \"{0}\" \nLocate the file or edit the source lookup path to include its location.
-PSourceNotFoundEditor.1=Locate File...
-PSourceNotFoundEditor.2=Missing Source File

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractCTableCellEditor.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractCTableCellEditor.java
deleted file mode 100644
index 6b0947b..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractCTableCellEditor.java
+++ /dev/null

@@ -1,84 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractCTableCellEditor {
-	protected CTable m_Table;
-	protected Rectangle m_Rect;
-	protected int m_Row;
-	protected int m_Col;
-	protected Control m_Control;
-	protected String toolTip;
-	protected ICTableModel m_Model;
-	
-	public void dispose() {
-		if (m_Control != null) {
-			m_Control.dispose();
-			m_Control = null;
-		}
-	}
-	public void open(CTable table, int col, int row, Rectangle rect) {
-		m_Table = table;
-		m_Model = table.getModel();
-		m_Rect = rect;
-		m_Row = row;
-		m_Col = col;
-		if (m_Control == null) {
-			m_Control = createControl();
-			m_Control.setToolTipText(toolTip);
-			m_Control.addFocusListener(new FocusAdapter() {
-				public void focusLost(FocusEvent arg0) {
-					close(true);
-				}
-			});
-		}
-		setBounds(m_Rect);
-		GC gc = new GC(m_Table);
-		m_Table.drawCell(gc, m_Col, m_Row);
-		gc.dispose();
-	}
-	public void close(boolean save) {
-		m_Table.m_CellEditor = null;
-		// m_Control.setVisible(false);
-		GC gc = new GC(m_Table);
-		m_Table.drawCell(gc, m_Col, m_Row);
-		gc.dispose();
-		this.dispose();
-	}
-	public boolean isFocused() {
-		if (m_Control == null)
-			return false;
-		return m_Control.isFocusControl();
-	}
-	public void setBounds(Rectangle rect) {
-		if (m_Control != null)
-			m_Control.setBounds(rect);
-	}
-	protected void onKeyPressed(KeyEvent e) {
-		if ((e.character == '\r') && ((e.stateMask & SWT.SHIFT) == 0)) {
-			close(true);
-		} else if (e.character == SWT.ESC) {
-			close(false);
-		} else {
-			m_Table.scrollToFocus();
-		}
-	}
-	protected void onTraverse(TraverseEvent e) {
-		close(true);
-	}
-	public void setToolTipText(String toolTip) {
-		this.toolTip = toolTip;
-	}
-	protected abstract Control createControl();
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandler.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandler.java
deleted file mode 100644
index bcef85f..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandler.java
+++ /dev/null

@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.ui.AbstractDebugView;
-import org.eclipse.jface.viewers.IBasicPropertyConstants;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Clement Chu
- */
-public abstract class AbstractDebugEventHandler implements IDebugEventSetListener {
-	/**
-	 * This event handler's view
-	 */
-	private AbstractDebugView fView;
-	
-	/**
-	 * Constructs an event handler for the given view.
-	 * 
-	 * @param view debug view
-	 */
-	public AbstractDebugEventHandler(AbstractDebugView view) {
-		setView(view);
-		DebugPlugin plugin= DebugPlugin.getDefault();
-		plugin.addDebugEventListener(this);
-	}
-
-	/**
-	 * Returns the active workbench page or <code>null</code> if none.
-	 */
-	protected IWorkbenchPage getActivePage() {
-		IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window == null) {
-			return null;
-		}
-		return window.getActivePage();
-	}
-	
-	/**
-	 * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-	 */
-	public void handleDebugEvents(final DebugEvent[] events) {
-		if (!isAvailable()) {
-			return;
-		}
-		Runnable r= new Runnable() {
-			public void run() {
-				if (isAvailable()) {
-					if (isViewVisible()) {
-						doHandleDebugEvents(events);
-					}
-					updateForDebugEvents(events);
-				}
-			}
-		};
-		getView().asyncExec(r);
-	}
-	
-	/**
-	 * Updates this view for the given debug events. Unlike
-	 * doHandleDebugEvents(DebugEvent[]) which is only called if the view is
-	 * visible, this method is always called. This allows the view to perform
-	 * updating that must always be performed, even when the view is not
-	 * visible.
-	 */
-	protected void updateForDebugEvents(DebugEvent[] events) {
-	}
-	
-	/**
-	 * Implementation specific handling of debug events.
-	 * Subclasses should override.
-	 */
-	protected abstract void doHandleDebugEvents(DebugEvent[] events);	
-		
-	/**
-	 * Helper method for inserting the given element in the tree viewer - 
-	 * must be called in UI thread
-	 */
-	protected void insert(Object element) {
-		TreeViewer viewer = getTreeViewer();
-		if (isAvailable() && viewer != null) {
-			Object parent= ((ITreeContentProvider)viewer.getContentProvider()).getParent(element);
-			// a parent can be null for a debug target or process that has not yet been associated
-			// with a launch
-			if (parent != null) {
-				getView().showViewer();
-				viewer.add(parent, element);
-			}
-		}
-	}
-
-	/**
-	 * Helper method to remove the given element from the tree viewer - 
-	 * must be called in UI thread.
-	 */
-	protected void remove(Object element) {
-		TreeViewer viewer = getTreeViewer();
-		if (isAvailable() && viewer != null) {
-			getView().showViewer();
-			viewer.remove(element);
-		}
-	}
-
-	/**
-	 * Helper method to update the label of the given element - must be called in UI thread
-	 */
-	protected void labelChanged(Object element) {
-		if (isAvailable()) {
-			getView().showViewer();
-			getStructuredViewer().update(element, new String[] {IBasicPropertyConstants.P_TEXT});
-		}
-	}
-
-	/**
-	 * Refresh the given element in the viewer - must be called in UI thread.
-	 */
-	protected void refresh(Object element) {
-		if (isAvailable()) {
-			 getView().showViewer();
-			 getStructuredViewer().refresh(element);
-		}
-	}
-	
-	/**
-	 * Refresh the viewer - must be called in UI thread.
-	 */
-	public void refresh() {
-		if (isAvailable()) {
-			 getView().showViewer();
-			 getStructuredViewer().refresh();
-		}
-	}	
-
-	/**
-	 * Helper method to select and reveal the given element - must be called in UI thread
-	 */
-	protected void selectAndReveal(Object element) {
-		if (isAvailable()) {
-			getViewer().setSelection(new StructuredSelection(element), true);
-		}
-	}
-	
-	/**
-	 * De-registers this event handler from the debug model.
-	 */
-	public void dispose() {
-		DebugPlugin plugin= DebugPlugin.getDefault();
-		plugin.removeDebugEventListener(this);
-	}
-	
-	/**
-	 * Returns the view this event handler is
-	 * updating.
-	 * 
-	 * @return debug view
-	 */
-	protected AbstractDebugView getView() {
-		return this.fView;
-	}
-	
-	/**
-	 * Sets the view this event handler is updating.
-	 * 
-	 * @param view debug view
-	 */
-	private void setView(AbstractDebugView view) {
-		this.fView = view;
-	}
-
-	/**
-	 * Returns the viewer this event handler is 
-	 * updating.
-	 * 
-	 * @return viewer
-	 */	
-	protected Viewer getViewer() {
-		return getView().getViewer();
-	}
-	
-	/**
-	 * Returns this event handler's viewer as a tree
-	 * viewer or <code>null</code> if none.
-	 * 
-	 * @return this event handler's viewer as a tree
-	 * viewer or <code>null</code> if none
-	 */
-	protected TreeViewer getTreeViewer() {
-		if (getViewer() instanceof TreeViewer) {
-			return (TreeViewer)getViewer();
-		} 
-		return null;
-	}
-		
-	/**
-	 * Returns this event handler's viewer as a structured
-	 * viewer or <code>null</code> if none.
-	 * 
-	 * @return this event handler's viewer as a structured
-	 * viewer or <code>null</code> if none
-	 */
-	protected StructuredViewer getStructuredViewer() {
-		if (getViewer() instanceof StructuredViewer) {
-			return (StructuredViewer)getViewer();
-		} 
-		return null;
-	}
-	
-	/**
-	 * Returns whether this event handler's viewer is
-	 * currently available.
-	 * 
-	 * @return whether this event handler's viewer is
-	 * currently available
-	 */
-	protected boolean isAvailable() {
-		return getView().isAvailable();
-	}
-	
-	/**
-	 * Returns whether this event handler's view is currently visible.
-	 * 
-	 * @return whether this event handler's view is currently visible
-	 */
-	protected boolean isViewVisible() {
-		return getView().isVisible();
-	}	
-	
-	/**
-	 * Called when this event handler's view becomes visible. Default behavior
-	 * is to refresh the view.
-	 */
-	protected void viewBecomesVisible() {
-		refresh();
-	}
-	
-	/**
-	 * Called when this event handler's view becomes hidden. Default behavior is
-	 * to do nothing. Subclasses may override.
-	 */
-	protected void viewBecomesHidden() {
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandlerView.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandlerView.java
deleted file mode 100644
index c8f6cbd..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractDebugEventHandlerView.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import org.eclipse.debug.ui.AbstractDebugView;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class AbstractDebugEventHandlerView extends AbstractDebugView {
-	/**
-	 * Event handler for this view
-	 */
-	private AbstractDebugEventHandler fEventHandler;
-
-	/**
-	 * Sets the event handler for this view
-	 * 
-	 * @param eventHandler event handler
-	 */
-	protected void setEventHandler(AbstractDebugEventHandler eventHandler) {
-		this.fEventHandler = eventHandler;
-	}
-	
-	/**
-	 * Returns the event handler for this view
-	 * 
-	 * @return The event handler for this view
-	 */
-	protected AbstractDebugEventHandler getEventHandler() {
-		return this.fEventHandler;
-	}	
-	
-	/**
-	 * @see IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (getEventHandler() != null) {
-			getEventHandler().dispose();
-		}	
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.AbstractDebugView#becomesHidden()
-	 */
-	protected void becomesHidden() {
-		super.becomesHidden();
-		getEventHandler().viewBecomesHidden();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.AbstractDebugView#becomesVisible()
-	 */
-	protected void becomesVisible() {
-		super.becomesVisible();
-		getEventHandler().viewBecomesVisible();
-	}
-	
-	protected void clearStatusLine() {
-		IStatusLineManager manager = getViewSite().getActionBars().getStatusLineManager(); 
-		manager.setErrorMessage(null);
-		manager.setMessage(null);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractPDebugViewEventHandler.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractPDebugViewEventHandler.java
deleted file mode 100644
index 6dd0126..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/AbstractPDebugViewEventHandler.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.debug.core.IPDebugEventListener;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * @author Clement Chu
- */
-public abstract class AbstractPDebugViewEventHandler implements IPDebugEventListener {
-	/**
-	 * This event handler's view
-	 */
-	private IViewPart fView;
-	
-	protected PDebugEventWorkbenchJob eventWorkbenchJob = new PDebugEventWorkbenchJob();
-	/**
-	 * Constructs an event handler for the given view.
-	 * 
-	 * @param view debug view
-	 */
-	public AbstractPDebugViewEventHandler(IViewPart view) {
-		setView(view);
-		PTPDebugCorePlugin.getDefault().addDebugEventListener(this);
-	}
-	/**
-	 * De-registers this event handler from the debug model.
-	 */
-	public void dispose() {
-		PTPDebugCorePlugin.getDefault().removeDebugEventListener(this);
-	}
-	/**
-	 * Returns the active workbench page or <code>null</code> if none.
-	 */
-	protected IWorkbenchPage getActivePage() {
-		IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window == null) {
-			return null;
-		}
-		return window.getActivePage();
-	}
-	public void handleDebugEvent(final IPDebugEvent event) {
-		eventWorkbenchJob.addEvent(event);
-		/*
-		WorkbenchJob uiJob = new WorkbenchJob("Handling Debug Event") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				doHandleDebugEvent(event, monitor);
-				//updateForDebugEvent(event, monitor);
-				monitor.done();
-				return Status.OK_STATUS;
-			}
-		};
-		uiJob.setSystem(false);
-		uiJob.schedule();
-		*/
-	}
-	/**
-	 * Updates this view for the given debug events. Unlike
-	 * doHandleDebugEvent(IPDebugEvent) which is only called if the view is
-	 * visible, this method is always called. This allows the view to perform
-	 * updating that must always be performed, even when the view is not
-	 * visible.
-	 */
-	//protected void updateForDebugEvent(IPDebugEvent event, IProgressMonitor monitor) {}
-	/**
-	 * Implementation specific handling of debug events.
-	 * Subclasses should override.
-	 */
-	protected abstract void doHandleDebugEvent(IPDebugEvent event, IProgressMonitor monitor);		
-	/**
-	 * Refresh the given element in the viewer - must be called in UI thread.
-	 */
-	protected abstract void refresh(boolean all);
-	/**
-	 * Refresh the viewer - must be called in UI thread.
-	 */
-	public void refresh() {
-		 refresh(false);
-	}	
-	/**
-	 * Returns the view this event handler is updating.
-	 * @return debug view
-	 */
-	protected IViewPart getView() {
-		return this.fView;
-	}
-	/**
-	 * Sets the view this event handler is updating.
-	 * @param view debug view
-	 */
-	private void setView(IViewPart view) {
-		this.fView = view;
-	}
-	class PDebugEventWorkbenchJob extends WorkbenchJob {
-		Vector<IPDebugEvent> events = new Vector<IPDebugEvent>(10);
-		PDebugEventWorkbenchJob() {
-			super("Handling Debug Event");
-		}
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			IPDebugEvent[] pEvents;
-			synchronized (events) {
-				pEvents = events.toArray(new IPDebugEvent[0]);
-				events.clear();
-			}
-			for (IPDebugEvent e : pEvents) {
-				doHandleDebugEvent(e, monitor);
-			}
-			//updateForDebugEvent(event, monitor);
-			monitor.done();
-			return Status.OK_STATUS;
-		}
-		public void addEvent(IPDebugEvent event) {
-			synchronized (events) {
-				events.add(event);
-			}
-			schedule();
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTable.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTable.java
deleted file mode 100644
index 5fa05d2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTable.java
+++ /dev/null

@@ -1,1000 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ScrollBar;
-
-/**
- * @author clement
- *
- */
-public class CTable extends Canvas {
-	protected GC m_GC;
-	protected Display m_Display;
-	protected List<Point> m_Selection;
-	protected AbstractCTableCellEditor m_CellEditor;
-	protected ICTableModel m_Model;
-	protected int m_LeftColumn;
-	protected int m_TopRow;
-	// visiable
-	protected int m_RowsVisible;
-	protected int m_RowsFullyVisible;
-	protected int m_ColumnsVisible;
-	protected int m_ColumnsFullyVisible;
-	// selection
-	protected boolean m_RowSelectionMode;
-	protected boolean m_MultiSelectMode;
-	protected int m_FocusRow;
-	protected int m_FocusCol;
-	protected int m_ClickColumnIndex;
-	protected int m_ClickRowIndex;
-	// resize
-	protected int m_ResizeColumnIndex;
-	protected int m_ResizeColumnLeft;
-	protected int m_ResizeRowIndex;
-	protected int m_ResizeRowTop;
-	protected int m_NewRowSize;
-	// Listener
-	protected List<ICTableCellSelectionListener> cellSelectionListeners;
-	protected List<ICTableCellResizeListener> cellResizeListeners;
-	public CTable(Composite parent, int style) {
-		super(parent, SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.DOUBLE_BUFFERED | style);
-		init();
-	}
-	private void init() {
-		m_GC = new GC(this);
-		m_Display = Display.getCurrent();
-		m_Selection = new ArrayList<Point>();
-		m_CellEditor = null;
-		m_RowSelectionMode = false;
-		m_MultiSelectMode = false;
-		m_TopRow = 0;
-		m_LeftColumn = 0;
-		m_FocusRow = 0;
-		m_FocusCol = 0;
-		m_RowsVisible = 0;
-		m_RowsFullyVisible = 0;
-		m_ColumnsVisible = 0;
-		m_ColumnsFullyVisible = 0;
-		m_ResizeColumnIndex = -1;
-		m_ResizeRowIndex = -1;
-		m_ResizeRowTop = -1;
-		m_NewRowSize = -1;
-		m_ResizeColumnLeft = -1;
-		m_ClickColumnIndex = -1;
-		m_ClickRowIndex = -1;
-		cellSelectionListeners = new ArrayList<ICTableCellSelectionListener>();
-		cellResizeListeners = new ArrayList<ICTableCellResizeListener>();
-		createListeners();
-	}
-	protected void createListeners() {
-		addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent event) {
-				onPaint(event);
-			}
-		});
-		addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				redraw();
-			}
-		});
-		addMouseListener(new MouseAdapter() {
-			public void mouseDown(MouseEvent e) {
-				onMouseDown(e);
-			}
-			public void mouseUp(MouseEvent e) {
-				onMouseUp(e);
-			}
-			public void mouseDoubleClick(MouseEvent e) {
-				onMouseDoubleClick(e);
-			}
-		});
-		addMouseMoveListener(new MouseMoveListener() {
-			public void mouseMove(MouseEvent e) {
-				onMouseMove(e);
-			}
-		});
-		if (getVerticalBar() != null) {
-			getVerticalBar().addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					m_TopRow = getVerticalBar().getSelection();
-					redraw();
-				}
-			});
-		}
-		if (getHorizontalBar() != null) {
-			getHorizontalBar().addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					m_LeftColumn = getHorizontalBar().getSelection();
-					redraw();
-				}
-			});
-		}
-		addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent e) {
-				onKeyDown(e);
-			}
-		});
-	}
-	public ICTableModel getModel() {
-		return m_Model;
-	}
-	public void setModel(ICTableModel model) {
-		m_Model = model;
-		reset();
-	}
-	public Rectangle getVisibleArea() {
-		doCalculations();
-		return new Rectangle(m_LeftColumn, m_TopRow, m_ColumnsFullyVisible, m_RowsFullyVisible);
-	}
-	public void reset() {
-		m_FocusCol = -1;
-		m_FocusRow = -1;
-		clearSelectionWithoutRedraw();
-	}
-	protected int getFixedWidth() {
-		int width = 0;
-		for (int i = 0; i < m_Model.getFixedColumnCount(); i++)
-			width += m_Model.getColumnWidth(i);
-		return width;
-	}
-	protected int getColumnLeft(int index) {
-		if (index < m_Model.getFixedColumnCount()) {
-			int x = 0;
-			for (int i = 0; i < index; i++) {
-				x += m_Model.getColumnWidth(i);
-			}
-			return x;
-		}
-		if (index < m_LeftColumn)
-			return -1;
-		int x = getFixedWidth();
-		for (int i = m_LeftColumn; i < index; i++) {
-			x += m_Model.getColumnWidth(i);
-		}
-		return x;
-	}
-	protected int getColumnRight(int index) {
-		if (index < 0)
-			return 0;
-		return getColumnLeft(index) + m_Model.getColumnWidth(index);
-	}
-	protected int getLastColumnRight() {
-		return getColumnRight(m_Model.getColumnCount() - 1);
-	}
-	protected void doCalculations() {
-		if (m_Model == null) {
-			ScrollBar sb = getHorizontalBar();
-			if (sb != null) {
-				sb.setVisible(false);
-				sb.setMinimum(0);
-				sb.setMaximum(1);
-				sb.setPageIncrement(1);
-				sb.setThumb(1);
-				sb.setSelection(1);
-			}
-			sb = getVerticalBar();
-			if (sb != null) {
-				sb.setVisible(false);
-				sb.setMinimum(0);
-				sb.setMaximum(1);
-				sb.setPageIncrement(1);
-				sb.setThumb(1);
-				sb.setSelection(1);
-			}
-			return;
-		}
-		int m_RowHeight = m_Model.getRowHeight();
-		Rectangle rect = getClientArea();
-		if (m_LeftColumn < m_Model.getFixedColumnCount()) {
-			m_LeftColumn = m_Model.getFixedColumnCount();
-		}
-		if (m_TopRow < m_Model.getFixedRowCount()) {
-			m_TopRow = m_Model.getFixedRowCount();
-		}
-		int fixedHeight = m_RowHeight + (m_Model.getFixedRowCount() - 1) * m_Model.getRowHeight();
-		m_ColumnsVisible = 0;
-		m_ColumnsFullyVisible = 0;
-		if (m_Model.getColumnCount() > m_Model.getFixedColumnCount()) {
-			int runningWidth = getColumnLeft(m_LeftColumn);
-			for (int col = m_LeftColumn; col < m_Model.getColumnCount(); col++) {
-				if (runningWidth < rect.width + rect.x)
-					m_ColumnsVisible++;
-				runningWidth += m_Model.getColumnWidth(col);
-				if (runningWidth < rect.width + rect.x)
-					m_ColumnsFullyVisible++;
-				else
-					break;
-			}
-		}
-		ScrollBar sb = getHorizontalBar();
-		if (sb != null) {
-			//TODO: assume all columns has the same width
-			boolean visiable = !((m_Model.getColumnCount()*m_Model.getColumnWidth(0)+5 < rect.width) && (m_LeftColumn == m_Model.getFixedColumnCount()));
-			sb.setVisible(visiable);
-			if (visiable) {
-				if (m_Model.getColumnCount() <= m_Model.getFixedColumnCount()) {
-					sb.setMinimum(0);
-					sb.setMaximum(1);
-					sb.setPageIncrement(1);
-					sb.setThumb(1);
-					sb.setSelection(1);
-				} else {
-					sb.setMinimum(m_Model.getFixedColumnCount());
-					sb.setMaximum(m_Model.getColumnCount());
-					sb.setIncrement(1);
-					sb.setPageIncrement(2);
-					sb.setThumb(m_ColumnsFullyVisible);
-					sb.setSelection(m_LeftColumn);
-				}
-			}
-		}
-		m_RowsFullyVisible = Math.max(0, (rect.height - fixedHeight) / m_RowHeight);
-		m_RowsFullyVisible = Math.min(m_RowsFullyVisible, m_Model.getRowCount() - m_Model.getFixedRowCount());
-		m_RowsFullyVisible = Math.max(0, m_RowsFullyVisible);
-		m_RowsVisible = m_RowsFullyVisible + 1;
-		if (m_TopRow + m_RowsFullyVisible > m_Model.getRowCount()) {
-			m_TopRow = Math.max(m_Model.getFixedRowCount(), m_Model.getRowCount() - m_RowsFullyVisible);
-		}
-		if (m_TopRow + m_RowsFullyVisible >= m_Model.getRowCount()) {
-			m_RowsVisible--;
-		}
-		sb = getVerticalBar();
-		if (sb != null) {
-			boolean visiable = !((m_Model.getRowCount()*m_Model.getRowHeight()+5 < rect.height) && (m_TopRow == m_Model.getFixedRowCount()));
-			sb.setVisible(visiable);
-			if (visiable) {
-				if (m_Model.getRowCount() <= m_Model.getFixedRowCount()) {
-					sb.setMinimum(0);
-					sb.setMaximum(1);
-					sb.setPageIncrement(1);
-					sb.setThumb(1);
-					sb.setSelection(1);
-				} else {
-					sb.setMinimum(m_Model.getFixedRowCount());
-					sb.setMaximum(m_Model.getRowCount());
-					sb.setPageIncrement(m_RowsVisible);
-					sb.setIncrement(1);
-					sb.setThumb(m_RowsFullyVisible);
-					sb.setSelection(m_TopRow);
-				}
-			}
-		}
-	}
-	public Rectangle getCellRect(int col, int row) {
-		int m_RowHeight = m_Model.getRowHeight();
-		if ((col < 0) || (col >= m_Model.getColumnCount()))
-			return new Rectangle(-1, -1, 0, 0);
-		int x = getColumnLeft(col) + 1;
-		int y;
-		if (row == 0)
-			y = 0;
-		else if (row < m_Model.getFixedRowCount())
-			y = row * m_RowHeight;
-		else
-			y = (m_Model.getFixedRowCount() + row - m_TopRow) * m_RowHeight;
-		int width = m_Model.getColumnWidth(col) - 1;
-		int height = m_RowHeight - 1;
-		if (row == 0)
-			height = m_RowHeight - 1;
-		return new Rectangle(x, y, width, height);
-	}
-	protected boolean canDrawCell(int col, int row, Rectangle clipRect) {
-		Rectangle r = getCellRect(col, row);
-		return canDrawCell(r, clipRect);
-	}
-	protected boolean canDrawCell(Rectangle r, Rectangle clipRect) {
-		if (r.y + r.height < clipRect.y)
-			return false;
-		if (r.y > clipRect.y + clipRect.height)
-			return false;
-		if (r.x + r.width < clipRect.x)
-			return false;
-		if (r.x > clipRect.x + clipRect.width)
-			return false;
-		return true;
-	}
-	public void redraw() {
-		doCalculations();
-		super.redraw();
-	}
-	protected void onPaint(PaintEvent event) {
-		Rectangle rect = getClientArea();
-		GC gc = event.gc;
-		if (m_Model != null) {
-			drawCells(gc, gc.getClipping(), 0, m_Model.getFixedColumnCount(), 0, m_Model.getFixedRowCount());
-			drawCells(gc, gc.getClipping(), m_LeftColumn, m_Model.getColumnCount(), 0, m_Model.getFixedRowCount());
-			drawCells(gc, gc.getClipping(), 0, m_Model.getFixedColumnCount(), m_TopRow, m_TopRow + m_RowsVisible);
-			drawCells(gc, gc.getClipping(), m_LeftColumn, m_Model.getColumnCount(), m_TopRow, m_TopRow + m_RowsVisible);
-			drawBottomSpace(gc);
-		} else {
-			gc.fillRectangle(rect);
-		}
-	}
-	// Bottom-Space
-	protected void drawBottomSpace(GC gc) {
-		Rectangle r = getClientArea();
-		if (m_Model.getRowCount() > 0) {
-			r.y = (m_Model.getFixedRowCount() + m_RowsVisible) * m_Model.getRowHeight() + 1;
-		}
-		gc.setForeground(m_Display.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW));
-		gc.drawLine(0, r.y - 2, getLastColumnRight(), r.y - 2);
-		gc.drawLine(getLastColumnRight(), 0, getLastColumnRight(), r.y - 2);
-	}
-	public void redraw(Rectangle cellsToRedraw) {
-		redraw(cellsToRedraw.x, cellsToRedraw.y, cellsToRedraw.width, cellsToRedraw.height);
-	}
-	public void redraw(int firstCol, int firstRow, int numOfCols, int numOfRows) {
-		Rectangle clipRect = getClientArea();
-		GC gc = new GC(this);
-		drawCells(gc, clipRect, firstCol, firstCol + numOfCols, firstRow, firstRow + numOfRows);
-		gc.dispose();
-	}
-	protected void drawCells(GC gc, Rectangle clipRect, int fromCol, int toCol, int fromRow, int toRow) {
-		int cnt = 0;
-		Rectangle r;
-		if (m_CellEditor != null) {
-			if (!isCellVisible(m_CellEditor.m_Col, m_CellEditor.m_Row)) {
-				Rectangle hide = new Rectangle(-101, -101, 100, 100);
-				m_CellEditor.setBounds(hide);
-			} else {
-				m_CellEditor.setBounds(getCellRect(m_CellEditor.m_Col, m_CellEditor.m_Row));
-			}
-		}
-		for (int row = fromRow; row < toRow; row++) {
-			r = getCellRect(0, row);
-			if (r.y + r.height < clipRect.y) {
-				continue;
-			}
-			if (r.y > clipRect.y + clipRect.height) {
-				break;
-			}
-			for (int col = fromCol; col < toCol; col++) {
-				r = getCellRect(col, row);
-				if (r.x > clipRect.x + clipRect.width) {
-					break;
-				}
-				if (canDrawCell(col, row, clipRect)) {
-					drawCell(gc, col, row);
-					cnt++;
-				}
-			}
-		}
-	}
-	protected void drawCell(GC gc, int col, int row) {
-		if ((row < 0) || (row >= m_Model.getRowCount())) {
-			return;
-		}
-		Rectangle rect = getCellRect(col, row);
-		m_Model.getCellRenderer(col, row).drawCell(gc, rect, col, row, m_Model.getContentAt(col, row), showAsSelected(col, row), col < m_Model.getFixedColumnCount() || row < m_Model.getFixedRowCount(), col == m_ClickColumnIndex && row == m_ClickRowIndex);
-	}
-	protected boolean showAsSelected(int col, int row) {
-		// A cell with an open editor should be drawn without focus
-		if (m_CellEditor != null) {
-			if (col == m_CellEditor.m_Col && row == m_CellEditor.m_Row)
-				return false;
-		}
-		return isCellSelected(col, row);
-	}
-	protected void drawRow(GC gc, int row) {
-		Rectangle clipRect = getClientArea();
-		drawCells(gc, clipRect, 0, m_Model.getFixedColumnCount(), row, row + 1);
-		drawCells(gc, clipRect, m_LeftColumn, m_Model.getColumnCount(), row, row + 1);
-	}
-	protected void drawCol(GC gc, int col) {
-		Rectangle clipRect = getClientArea();
-		drawCells(gc, clipRect, col, col + 1, 0, m_Model.getFixedRowCount());
-		drawCells(gc, clipRect, col, col + 1, m_TopRow, m_TopRow + m_RowsVisible);
-	}
-	protected int getColumnForResize(int x, int y) {
-		if (m_Model == null)
-			return -1;
-		
-		if ((y <= 0) || (y >= m_Model.getFixedRowCount() * m_Model.getRowHeight()))
-			return -1;
-		if (x < getFixedWidth() + 3) {
-			for (int i = 0; i < m_Model.getFixedColumnCount(); i++)
-				if (Math.abs(x - getColumnRight(i)) < 3) {
-					if (m_Model.isColumnResizable(i))
-						return i;
-					return -1;
-				}
-		}
-		for (int i = m_LeftColumn; i < m_Model.getColumnCount(); i++) {
-			int left = getColumnLeft(i);
-			int right = left + m_Model.getColumnWidth(i);
-			if (Math.abs(x - right) < 3) {
-				if (m_Model.isColumnResizable(i))
-					return i;
-				return -1;
-			}
-			if ((x >= left + 3) && (x <= right - 3))
-				break;
-		}
-		return -1;
-	}
-	protected int getRowForResize(int x, int y) {
-		if (m_Model == null || !m_Model.isRowResizable())
-			return -1;
-		if ((x <= 0) || (x >= getFixedWidth()))
-			return -1;
-		if (y < m_Model.getRowHeight())
-			return -1;
-		int row = (y / m_Model.getRowHeight());
-		int rowY = (row + 1) * m_Model.getRowHeight();
-		if (Math.abs(rowY - y) < 3)
-			return row;
-		return -1;
-	}
-	/**
-	 * Returns the number of the row that is present at position y or -1, if out
-	 * of area.
-	 * 
-	 * @param y
-	 * @return int
-	 */
-	public int calcRowNum(int y) {
-		if (m_Model == null)
-			return -1;
-		if (y < m_Model.getRowHeight())
-			return (m_Model.getFixedRowCount() == 0 ? m_TopRow : 0);
-		y -= m_Model.getRowHeight();
-		int row = 1 + (y / m_Model.getRowHeight());
-		if ((row < 0) || (row >= m_Model.getRowCount()))
-			return -1;
-		if (row >= m_Model.getFixedRowCount())
-			return m_TopRow + row - m_Model.getFixedRowCount();
-		return row;
-	}
-	/**
-	 * Returns the number of the column that is present at position x or -1, if
-	 * out of area.
-	 * 
-	 * @param y
-	 * @return int
-	 */
-	public int calcColumnNum(int x) {
-		if (m_Model == null)
-			return -1;
-		int col = 0;
-		int z = 0;
-		for (int i = 0; i < m_Model.getFixedColumnCount(); i++) {
-			if ((x >= z) && (x <= z + m_Model.getColumnWidth(i))) {
-				return i;
-			}
-			z += m_Model.getColumnWidth(i);
-		}
-		col = -1;
-		z = getFixedWidth();
-		for (int i = m_LeftColumn; i < m_Model.getColumnCount(); i++) {
-			if ((x >= z) && (x <= z + m_Model.getColumnWidth(i))) {
-				col = i;
-				break;
-			}
-			z += m_Model.getColumnWidth(i);
-		}
-		return col;
-	}
-	public boolean isCellVisible(int col, int row) {
-		if (m_Model == null)
-			return false;
-		return ((col >= m_LeftColumn && col < m_LeftColumn + m_ColumnsVisible && row >= m_TopRow && row < m_TopRow + m_RowsVisible) || (col < m_Model.getFixedColumnCount() && row < m_Model.getFixedRowCount()));
-	}
-	public boolean isCellFullyVisible(int col, int row) {
-		if (m_Model == null)
-			return false;
-		return ((col >= m_LeftColumn && col < m_LeftColumn + m_ColumnsFullyVisible && row >= m_TopRow && row < m_TopRow + m_RowsFullyVisible) || (col < m_Model.getFixedColumnCount() && row < m_Model.getFixedRowCount()));
-	}
-	public boolean isRowVisible(int row) {
-		if (m_Model == null)
-			return false;
-		return ((row >= m_TopRow && row < m_TopRow + m_RowsVisible) || row < m_Model.getFixedRowCount());
-	}
-	public boolean isRowFullyVisible(int row) {
-		if (m_Model == null)
-			return false;
-		return ((row >= m_TopRow && row < m_TopRow + m_RowsFullyVisible) || row < m_Model.getFixedRowCount());
-	}
-	protected void focusCell(int col, int row, int stateMask) {
-		GC gc = new GC(this);
-		if (m_CellEditor != null)
-			m_CellEditor.close(true);
-
-		if (row >= m_Model.getFixedRowCount() && (col >= m_Model.getFixedColumnCount() || m_RowSelectionMode)) {
-			if ((stateMask & SWT.CTRL) == 0 && (stateMask & SWT.SHIFT) == 0) {
-				// case: no modifier key
-				boolean redrawAll = (m_Selection.size() > 1);
-				int oldFocusRow = m_FocusRow;
-				int oldFocusCol = m_FocusCol;
-				clearSelectionWithoutRedraw();
-				addToSelection(col, row);
-				m_FocusRow = row;
-				m_FocusCol = col;
-				if (redrawAll) {
-					redraw();
-				}
-				else if (m_RowSelectionMode) {
-					if (isRowVisible(oldFocusRow))
-						drawRow(gc, oldFocusRow);
-					if (isRowVisible(m_FocusRow))
-						drawRow(gc, m_FocusRow);
-					
-					drawBottomSpace(gc);
-				}
-				else {
-					if (isCellVisible(oldFocusCol, oldFocusRow))
-						drawCell(gc, oldFocusCol, oldFocusRow);
-					if (isCellVisible(m_FocusCol, m_FocusRow))
-						drawCell(gc, m_FocusCol, m_FocusRow);
-
-					drawBottomSpace(gc);
-				}
-			}
-			else if ((stateMask & SWT.CTRL) != 0) {
-				// case: CTRL key pressed
-				if (toggleSelection(col, row)) {
-					m_FocusCol = col;
-					m_FocusRow = row;
-				}
-				if (m_RowSelectionMode) {
-					drawRow(gc, row);
-				}
-				else {
-					drawCell(gc, col, row);
-				}
-			}
-			else if ((stateMask & SWT.SHIFT) != 0) {
-				// case: SHIFT key pressed
-				if (m_RowSelectionMode) {
-					if (row < m_FocusRow) {
-						// backward selection
-						while (row != m_FocusRow) {
-							addToSelection(0, --m_FocusRow);
-						}
-					}
-					else {
-						// forward selection
-						while (row != m_FocusRow) {
-							addToSelection(0, ++m_FocusRow);
-						}
-					}
-				}
-				else  {// cell selection mode
-					if (row < m_FocusRow || (row == m_FocusRow && col < m_FocusCol)) {
-						// backward selection
-						while (row != m_FocusRow || col != m_FocusCol) {
-							m_FocusCol--;
-							if (m_FocusCol < m_Model.getFixedColumnCount()) {
-								m_FocusCol = m_Model.getColumnCount();
-								m_FocusRow--;
-							}
-							addToSelection(m_FocusCol, m_FocusRow);
-						}
-					}
-					else {
-						// forward selection
-						while (row != m_FocusRow || col != m_FocusCol) {
-							m_FocusCol++;
-							if (m_FocusCol == m_Model.getColumnCount()) {
-								m_FocusCol = m_Model.getFixedColumnCount();
-								m_FocusRow++;
-							}
-							addToSelection(m_FocusCol, m_FocusRow);
-						}
-					}
-				}
-				redraw();
-			}
-			// notify non-fixed cell listeners
-			fireCellSelection(col, row, stateMask);
-		}
-		else {
-			// a fixed cell was focused
-			drawCell(gc, col, row);
-			// notify fixed cell listeners
-			fireFixedCellSelection(col, row, stateMask);
-		}
-		gc.dispose();
-	}
-	protected void onMouseDown(MouseEvent e) {
-		if (e.button == 1) {
-			// deactivateEditor(true);
-			setCapture(true);
-			// Resize column?
-			int columnIndex = getColumnForResize(e.x, e.y);
-			if (columnIndex >= 0) {
-				m_ResizeColumnIndex = columnIndex;
-				m_ResizeColumnLeft = getColumnLeft(columnIndex);
-				return;
-			}
-			// Resize row?
-			int rowIndex = getRowForResize(e.x, e.y);
-			if (rowIndex >= 0) {
-				m_ResizeRowIndex = rowIndex;
-				m_ResizeRowTop = rowIndex * m_Model.getRowHeight();
-				m_NewRowSize = m_Model.getRowHeight();
-				return;
-			}
-		}
-		// focus change
-		int col = calcColumnNum(e.x);
-		int row = calcRowNum(e.y);
-		if (col == -1 || row == -1)
-			return;
-		m_ClickColumnIndex = col;
-		m_ClickRowIndex = row;
-		focusCell(col, row, e.stateMask);
-	}
-	protected void onMouseMove(MouseEvent e) {
-		if (m_Model == null)
-			return;
-		// show resize cursor?
-		if ((m_ResizeColumnIndex != -1) || (getColumnForResize(e.x, e.y) >= 0))
-			setCursor(new Cursor(m_Display, SWT.CURSOR_SIZEWE));
-		else if ((m_ResizeRowIndex != -1) || (getRowForResize(e.x, e.y) >= 0))
-			setCursor(new Cursor(m_Display, SWT.CURSOR_SIZENS));
-		else
-			setCursor(null);
-		if (e.button == 1) {
-			// extend selection?
-			if (m_ClickColumnIndex != -1 && m_MultiSelectMode) {
-				int row = calcRowNum(e.y);
-				int col = calcColumnNum(e.x);
-				if (row >= m_Model.getFixedRowCount() && col >= m_Model.getFixedColumnCount()) {
-					m_ClickColumnIndex = col;
-					m_ClickRowIndex = row;
-					focusCell(col, row, (e.stateMask | SWT.SHIFT));
-				}
-			}
-		}
-		// column resize?
-		if (m_ResizeColumnIndex != -1) {
-			Rectangle rect = getClientArea();
-			int oldSize = m_Model.getColumnWidth(m_ResizeColumnIndex);
-			if (e.x > rect.x + rect.width - 1)
-				e.x = rect.x + rect.width - 1;
-			int newSize = e.x - m_ResizeColumnLeft;
-			if (newSize < m_Model.getColumnWidthMinimum())
-				newSize = m_Model.getColumnWidthMinimum();
-
-			int leftX = getColumnLeft(m_ResizeColumnIndex);
-			int rightX = getColumnRight(m_ResizeColumnIndex);
-			m_Model.setColumnWidth(m_ResizeColumnIndex, newSize);
-			newSize = m_Model.getColumnWidth(m_ResizeColumnIndex);
-			GC gc = new GC(this);
-			gc.copyArea(rightX, 0, rect.width - rightX, rect.height, leftX + newSize, 0);
-			drawCol(gc, m_ResizeColumnIndex);
-			if (newSize < oldSize) {
-				int delta = oldSize - newSize;
-				redraw(rect.width - delta, 0, delta, rect.height, false);
-			}
-			gc.dispose();
-		}
-		// row resize?
-		if (m_ResizeRowIndex != -1) {
-			Rectangle rect = getClientArea();
-			GC gc = new GC(this);
-			// calculate new size
-			if (e.y > rect.y + rect.height - 1)
-				e.y = rect.y + rect.height - 1;
-			m_NewRowSize = e.y - m_ResizeRowTop;
-			if (m_NewRowSize < m_Model.getRowHeightMinimum())
-				m_NewRowSize = m_Model.getRowHeightMinimum();
-
-			gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
-			int lineEnd = getColumnRight(m_LeftColumn + m_ColumnsVisible - 1);
-			int m_LineX = rect.x + 1;
-			int m_LineY = m_ResizeRowTop + m_NewRowSize - 1;
-			gc.drawLine(m_LineX, m_LineY, rect.x + lineEnd, m_LineY);
-			gc.dispose();
-		}
-	}
-	protected void onMouseUp(MouseEvent e) {
-		if (m_Model == null)
-			return;
-		setCapture(false);
-		if (m_ResizeColumnIndex != -1) {
-			fireColumnResize(m_ResizeColumnIndex, m_Model.getColumnWidth(m_ResizeColumnIndex));
-			m_ResizeColumnIndex = -1;
-			redraw();
-		}
-		if (m_ResizeRowIndex != -1) {
-			m_ResizeRowIndex = -1;
-			m_Model.setRowHeight(m_NewRowSize);
-			fireRowResize(m_NewRowSize);
-			redraw();
-		}
-		if (m_ClickColumnIndex != -1) {
-			int col = m_ClickColumnIndex;
-			int row = m_ClickRowIndex;
-			m_ClickColumnIndex = -1;
-			m_ClickRowIndex = -1;
-			if (m_CellEditor == null) {
-				drawCell(new GC(this), col, row);
-			}
-		}
-	}
-	protected void onKeyDown(KeyEvent e) {
-		boolean focusChanged = false;
-		int newFocusRow = m_FocusRow;
-		int newFocusCol = m_FocusCol;
-		if (m_Model == null)
-			return;
-		if ((e.character == ' ') || (e.character == '\r')) {
-			openEditorInFocus();
-			return;
-		} else if (e.keyCode == SWT.HOME) {
-			newFocusCol = m_Model.getFixedColumnCount();
-			if (newFocusRow == -1)
-				newFocusRow = m_Model.getFixedRowCount();
-			focusChanged = true;
-		} else if (e.keyCode == SWT.END) {
-			newFocusCol = m_Model.getColumnCount() - 1;
-			if (newFocusRow == -1)
-				newFocusRow = m_Model.getFixedRowCount();
-			focusChanged = true;
-		} else if (e.keyCode == SWT.ARROW_LEFT) {
-			if (!m_RowSelectionMode) {
-				if (newFocusCol > m_Model.getFixedColumnCount())
-					newFocusCol--;
-			}
-			focusChanged = true;
-		} else if (e.keyCode == SWT.ARROW_RIGHT) {
-			if (!m_RowSelectionMode) {
-				if (newFocusCol == -1) {
-					newFocusCol = m_Model.getFixedColumnCount();
-					newFocusRow = m_Model.getFixedRowCount();
-				} else if (newFocusCol < m_Model.getColumnCount() - 1)
-					newFocusCol++;
-			}
-			focusChanged = true;
-		} else if (e.keyCode == SWT.ARROW_DOWN) {
-			if (newFocusRow == -1) {
-				newFocusRow = m_Model.getFixedRowCount();
-				newFocusCol = m_Model.getFixedColumnCount();
-			} else if (newFocusRow < m_Model.getRowCount() - 1)
-				newFocusRow++;
-			focusChanged = true;
-		} else if (e.keyCode == SWT.ARROW_UP) {
-			if (newFocusRow > m_Model.getFixedRowCount())
-				newFocusRow--;
-			focusChanged = true;
-		} else if (e.keyCode == SWT.PAGE_DOWN) {
-			newFocusRow += m_RowsVisible - 1;
-			if (newFocusRow >= m_Model.getRowCount())
-				newFocusRow = m_Model.getRowCount() - 1;
-			if (newFocusCol == -1)
-				newFocusCol = m_Model.getFixedColumnCount();
-			focusChanged = true;
-		} else if (e.keyCode == SWT.PAGE_UP) {
-			newFocusRow -= m_RowsVisible - 1;
-			if (newFocusRow < m_Model.getFixedRowCount())
-				newFocusRow = m_Model.getFixedRowCount();
-			if (newFocusCol == -1)
-				newFocusCol = m_Model.getFixedColumnCount();
-			focusChanged = true;
-		}
-		if (focusChanged) {
-			focusCell(newFocusCol, newFocusRow, e.stateMask);
-			if (!isCellFullyVisible(m_FocusCol, m_FocusRow))
-				scrollToFocus();
-		}
-	}
-	protected void onMouseDoubleClick(MouseEvent e) {
-		if (m_Model == null)
-			return;
-		if (e.button == 1) {
-			if (e.y < (m_Model.getFixedRowCount() * m_Model.getRowHeight())) {
-				// double click in header area
-				int columnIndex = getColumnForResize(e.x, e.y);
-				resizeColumnOptimal(columnIndex);
-				return;
-			}
-			//FIXME: assume column 0 is fixed column, problem may occur on 2 fixed columns 
-			else if (e.x < m_Model.getColumnWidth(0) + ((m_Model.getFixedColumnCount() - 1) * m_Model.getColumnWidth(0))) {
-				// double click in header area
-				return;
-			}
-			else
-				openEditorInFocus();
-		}
-	}
-	public int resizeColumnOptimal(int column) {
-		if (column >= 0 && column < m_Model.getColumnCount()) {
-			int optWidth = 5;
-			for (int i = 0; i < m_Model.getFixedRowCount(); i++) {
-				int width = m_Model.getCellRenderer(column, i).getOptimalWidth(m_GC, column, i, m_Model.getContentAt(column, i), true);
-				if (width > optWidth)
-					optWidth = width;
-			}
-			for (int i = m_TopRow; i < m_TopRow + m_RowsVisible; i++) {
-				int width = m_Model.getCellRenderer(column, i).getOptimalWidth(m_GC, column, i, m_Model.getContentAt(column, i), true);
-				if (width > optWidth)
-					optWidth = width;
-			}
-			m_Model.setColumnWidth(column, optWidth);
-			redraw();
-			return optWidth;
-		}
-		return -1;
-	}
-	public void openEditorInFocus() {
-		m_CellEditor = m_Model.getCellEditor(m_FocusCol, m_FocusRow);
-		if (m_CellEditor != null) {
-			Rectangle r = getCellRect(m_FocusCol, m_FocusRow);
-			m_CellEditor.open(this, m_FocusCol, m_FocusRow, r);
-		}
-	}
-	protected void scrollToFocus() {
-		boolean change = false;
-		if (getVerticalBar() != null) {
-			if (m_FocusRow < m_TopRow) {
-				m_TopRow = m_FocusRow;
-				change = true;
-			}
-			if (m_FocusRow >= m_TopRow + m_RowsFullyVisible) {
-				m_TopRow = m_FocusRow - m_RowsFullyVisible + 1;
-				change = true;
-			}
-		}
-		if (getHorizontalBar() != null) {
-			if (m_FocusCol < m_LeftColumn) {
-				m_LeftColumn = m_FocusCol;
-				change = true;
-			}
-			if (m_FocusCol >= m_LeftColumn + m_ColumnsFullyVisible) {
-				int oldLeftCol = m_LeftColumn;
-				Rectangle rect = getClientArea();
-				while (m_LeftColumn < m_FocusCol && getColumnRight(m_FocusCol) > rect.width + rect.x) {
-					m_LeftColumn++;
-				}
-				change = (oldLeftCol != m_LeftColumn);
-			}
-		}
-		if (change)
-			redraw();
-	}
-	protected void fireCellSelection(int col, int row, int statemask) {
-		for (int i = 0; i < cellSelectionListeners.size(); i++) {
-			((ICTableCellSelectionListener) cellSelectionListeners.get(i)).cellSelected(col, row, statemask);
-		}
-	}
-	protected void fireFixedCellSelection(int col, int row, int statemask) {
-		for (int i = 0; i < cellSelectionListeners.size(); i++) {
-			((ICTableCellSelectionListener) cellSelectionListeners.get(i)).fixedCellSelected(col, row, statemask);
-		}
-	}
-	protected void fireColumnResize(int col, int newSize) {
-		for (int i = 0; i < cellResizeListeners.size(); i++) {
-			((ICTableCellResizeListener) cellResizeListeners.get(i)).columnResized(col, newSize);
-		}
-	}
-	protected void fireRowResize(int newSize) {
-		for (int i = 0; i < cellResizeListeners.size(); i++) {
-			((ICTableCellResizeListener) cellResizeListeners.get(i)).rowResized(newSize);
-		}
-	}
-	public void addCellSelectionListener(ICTableCellSelectionListener listener) {
-		cellSelectionListeners.add(listener);
-	}
-	public boolean removeCellSelectionListener(ICTableCellSelectionListener listener) {
-		return cellSelectionListeners.remove(listener);
-	}
-	public boolean removeCellResizeListener(ICTableCellResizeListener listener) {
-		return cellResizeListeners.remove(listener);
-	}
-	public void setRowSelectionMode(boolean rowSelectMode) {
-		m_RowSelectionMode = rowSelectMode;
-		clearSelection();
-	}
-	public void setMultiSelectionMode(boolean multiSelectMode) {
-		m_MultiSelectMode = multiSelectMode;
-		clearSelection();
-	}
-	public boolean isRowSelectMode() {
-		return m_RowSelectionMode;
-	}
-	public boolean isMultiSelectMode() {
-		return m_MultiSelectMode;
-	}
-	protected void clearSelectionWithoutRedraw() {
-		m_Selection.clear();
-	}
-	public void clearSelection() {
-		clearSelectionWithoutRedraw();
-		m_FocusCol = -1;
-		m_FocusRow = -1;
-		if (m_MultiSelectMode)
-			redraw();
-	}
-	protected boolean toggleSelection(int col, int row) {
-		if (m_MultiSelectMode) {
-			Point pt = new Point(col, row);
-			if (m_Selection.contains(pt)) {
-				m_Selection.remove(pt);
-				return false;
-			} else {
-				m_Selection.add(pt);
-				return true;
-			}
-		}
-		return false;
-	}
-	protected void addToSelection(int col, int row) {
-		if (m_MultiSelectMode) {
-			if (m_RowSelectionMode)
-				col = 0;
-			Point pt = new Point(col, row);
-			if (!m_Selection.contains(pt)) {
-				m_Selection.add(pt);
-			}
-		}
-	}
-	public void setSelection(int col, int row, boolean scroll) {
-		if (col < m_Model.getColumnCount() && col >= m_Model.getFixedColumnCount() && row < m_Model.getRowCount() && row >= m_Model.getFixedRowCount()) {
-			focusCell(col, row, SWT.None);
-			if (scroll) {
-				scrollToFocus();
-			}
-		}
-	}
-	public boolean isCellSelected(int col, int row) {
-		if (!m_MultiSelectMode) {
-			if (m_RowSelectionMode)
-				return (row == m_FocusRow);
-			return (col == m_FocusCol && row == m_FocusRow);
-		}
-		if (m_RowSelectionMode)
-			col = 0;
-		return m_Selection.contains(new Point(col, row));
-	}
-	public int[] getRowSelection() {
-		if (!m_RowSelectionMode)
-			return null;
-		if (!m_MultiSelectMode) {
-			if (m_FocusRow < 0)
-				return new int[0];
-			int[] tmp = new int[1];
-			tmp[0] = m_FocusRow;
-			return tmp;
-		}
-		Point[] pts = m_Selection.toArray(new Point[0]);
-		int[] erg = new int[pts.length];
-		for (int i = 0; i < erg.length; i++) {
-			erg[i] = pts[i].y;
-		}
-		return erg;
-	}
-	public Point[] getCellSelection() {
-		if (m_RowSelectionMode)
-			return null;
-		if (!m_MultiSelectMode) {
-			if (m_FocusRow < 0 || m_FocusCol < 0)
-				return new Point[0];
-			Point[] tmp = new Point[1];
-			tmp[0] = new Point(m_FocusCol, m_FocusRow);
-			return tmp;
-		}
-		return (Point[]) m_Selection.toArray(new Point[0]);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableCellRenderer.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableCellRenderer.java
deleted file mode 100644
index 9d9f4b3..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableCellRenderer.java
+++ /dev/null

@@ -1,104 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author clement
- *
- */
-public class CTableCellRenderer {
-	public static CTableCellRenderer defaultRenderer = new CTableCellRenderer();
-	protected Display m_Display = null;
-	protected Map<String, Point> stringExtentCache = new HashMap<String, Point>();
-
-	public CTableCellRenderer() {
-		m_Display = Display.getCurrent();
-	}
-	public void dispose() {
-		stringExtentCache.clear();
-	}
-	private Point getStringExtentCache(GC gc, String text) {
-		Point pt = stringExtentCache.get(text);
-		if (pt == null) {
-			pt = gc.stringExtent(text);
-			stringExtentCache.put(text, pt);
-		}
-		return pt;
-	}
-	public int getOptimalWidth(GC gc, int col, int row, Object content, boolean fixed) {
-		return gc.stringExtent(content.toString()).x + 8;
-	}
-	public void drawCell(GC gc, Rectangle rect, int col, int row, Object content, boolean focus, boolean fixed, boolean clicked) {
-		String text = content.toString();
-		if (fixed) {
-			if (col == 0 && row == 0)
-				text = "";
-
-			rect.height += 1;
-			rect.width += 1;
-			gc.setForeground(m_Display.getSystemColor(SWT.COLOR_LIST_FOREGROUND));
-			if (clicked) {
-				drawText(gc, text, rect.x, rect.y, rect.width, rect.height, 1, 1, m_Display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND), m_Display.getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW));
-			} else {
-				drawText(gc, text, rect.x, rect.y, rect.width, rect.height, 1, 1, m_Display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND), m_Display.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW));
-			}
-		}
-		else {
-			Color textColor;
-			Color backColor;
-			Color vBorderColor;
-			Color hBorderColor;
-			if (focus) {
-				textColor = m_Display.getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT);
-				backColor = (m_Display.getSystemColor(SWT.COLOR_LIST_SELECTION));
-				vBorderColor = m_Display.getSystemColor(SWT.COLOR_LIST_SELECTION);
-				hBorderColor = m_Display.getSystemColor(SWT.COLOR_LIST_SELECTION);
-			} else {
-				textColor = m_Display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-				backColor = m_Display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-				vBorderColor = m_Display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-				hBorderColor = m_Display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-			}
-			gc.setForeground(hBorderColor);
-			gc.drawLine(rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height);
-			gc.setForeground(vBorderColor);
-			gc.drawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height);
-			gc.setBackground(backColor);
-			gc.setForeground(textColor);
-			gc.fillRectangle(rect);
-			drawText(gc, text, rect.x + 3, rect.y, rect.width - 3, rect.height, 0, 0);
-		}
-	}
-	private void drawText(GC gc, String text, int x, int y, int w, int h, int leftMargin, int topMargin, Color face, Color shadow) {
-		Color prevForeground = gc.getForeground();
-		Color prevBackground = gc.getBackground();
-		try {
-			gc.setBackground(face);
-			gc.setForeground(shadow);
-			gc.drawRectangle(x-1, y-1, w, h);
-			//gc.fillRectangle(x + 1, y + 1, 1 + leftMargin, h);
-			//gc.fillRectangle(x + 1, y + 1, w - 2, topMargin + 1);
-			gc.setForeground(prevForeground);
-			drawText(gc, text, x, y, w, h, leftMargin, topMargin);
-		} finally {
-			gc.setForeground(prevForeground);
-			gc.setBackground(prevBackground);
-		}
-	}
-	private void drawText(GC gc, String text, int x, int y, int w, int h, int leftMargin, int topMargin) {
-		Point pt = getStringExtentCache(gc, text);
-		if (pt.x > w-leftMargin) {
-			text = "...";
-			pt = getStringExtentCache(gc, text);
-		}
-		gc.drawText(text, x+(w-pt.x)/2+leftMargin, y+(h-pt.y)/2+topMargin);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableComboCellEditor.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableComboCellEditor.java
deleted file mode 100644
index 90c6049..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableComboCellEditor.java
+++ /dev/null

@@ -1,49 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author clement
- *
- */
-public class CTableComboCellEditor extends AbstractCTableCellEditor {
-	private CCombo m_Combo;
-	private String m_Items[];
-	public void open(CTable table, int row, int col, Rectangle rect) {
-		super.open(table, row, col, rect);
-		m_Combo.setFocus();
-		m_Combo.setText((String) m_Model.getContentAt(m_Col, m_Row));
-	}
-	public void close(boolean save) {
-		if (save)
-			m_Model.setContentAt(m_Col, m_Row, m_Combo.getText());
-		super.close(save);
-		m_Combo = null;
-	}
-	protected Control createControl() {
-		m_Combo = new CCombo(m_Table, SWT.READ_ONLY);
-		m_Combo.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-		if (m_Items != null)
-			m_Combo.setItems(m_Items);
-		m_Combo.addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent e) {
-				try {
-					onKeyPressed(e);
-				} catch (Exception ex) {}
-			}
-		});
-		return m_Combo;
-	}
-	public void setBounds(Rectangle rect) {
-		super.setBounds(new Rectangle(rect.x, rect.y + 1, rect.width, rect.height - 2));
-	}
-	public void setItems(String items[]) {
-		m_Items = items;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableTextCellEditor.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableTextCellEditor.java
deleted file mode 100644
index 99d03ba..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/CTableTextCellEditor.java
+++ /dev/null

@@ -1,55 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author clement
- *
- */
-public class CTableTextCellEditor extends AbstractCTableCellEditor {
-	private Text m_Text;
-	private boolean editable;
-	public CTableTextCellEditor(boolean editable) {
-		this.editable = editable;
-	}
-	public void open(CTable table, int col, int row, Rectangle rect) {
-		super.open(table, col, row, rect);
-		m_Text.setText(m_Model.getContentAt(m_Col, m_Row).toString());
-		m_Text.selectAll();
-		m_Text.setVisible(true);
-		m_Text.setFocus();
-	}
-	public void close(boolean save) {
-		if (save)
-			m_Model.setContentAt(m_Col, m_Row, m_Text.getText());
-		super.close(save);
-		m_Text = null;
-	}
-	protected Control createControl() {
-		m_Text = new Text(m_Table, SWT.NONE);
-		m_Text.setEditable(editable);
-		m_Text.addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent e) {
-				try {
-					onKeyPressed(e);
-				} catch (Exception ex) {}
-			}
-		});
-		m_Text.addTraverseListener(new TraverseListener() {
-			public void keyTraversed(TraverseEvent arg0) {
-				onTraverse(arg0);
-			}
-		});
-		return m_Text;
-	}
-	public void setBounds(Rectangle rect) {
-		super.setBounds(new Rectangle(rect.x, rect.y + (rect.height - 15) / 2 + 1, rect.width, 15));
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellResizeListener.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellResizeListener.java
deleted file mode 100644
index 26270fb..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellResizeListener.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-/**
- * @author clement
- *
- */
-public interface ICTableCellResizeListener {
-	void rowResized(int newHeight);
-	void columnResized(int col, int newWidth);
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellSelectionListener.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellSelectionListener.java
deleted file mode 100644
index 131d80d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableCellSelectionListener.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-/**
- * @author clement
- *
- */
-public interface ICTableCellSelectionListener {
-	void cellSelected(int col, int row, int statemask);
-	void fixedCellSelected(int col, int row, int statemask);
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableModel.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableModel.java
deleted file mode 100644
index 886fae9..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/ICTableModel.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views;
-
-/**
- * @author clement
- *
- */
-public interface ICTableModel {
-	Object getContentAt(int col, int row);
-	AbstractCTableCellEditor getCellEditor(int col, int row);
-	int getRowCount();
-	int getFixedRowCount();
-	int getColumnCount();
-	int getFixedColumnCount();
-	int getColumnWidth(int col);
-	boolean isColumnResizable(int col);
-	void setColumnWidth(int col, int value);
-	int getRowHeight();
-	boolean isRowResizable();
-	int getRowHeightMinimum();
-	int getColumnWidthMinimum();
-	void setRowHeight(int value);
-	CTableCellRenderer getCellRenderer(int col, int row);
-	void setContentAt(int col, int row, Object value);
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabFolder.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabFolder.java
deleted file mode 100644
index 2146ebc..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabFolder.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.ptp.ui.views.AbstractParallelView;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabFolder2Adapter;
-import org.eclipse.swt.custom.CTabFolderEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class PTabFolder extends AbstractParallelView {
-	protected Map<String, PTabItem> items = new HashMap<String, PTabItem>();
-	protected CTabFolder folder = null;
-
-	public void createPartControl(Composite parent) {
-		parent.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		folder = new CTabFolder(parent, SWT.TOP);
-		folder.setBorderVisible(true);
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-		folder.setSimple(false);
-	    folder.setUnselectedImageVisible(false);
-	    folder.setUnselectedCloseVisible(false);
-	    
-	    folder.setMinimizeVisible(true);
-	    folder.setMaximizeVisible(true);
-	    folder.addCTabFolder2Listener(new CTabFolder2Adapter() {
-	    	public void minimize(CTabFolderEvent event) {
-	    		folder.setMinimized(true);
-	    	}
-	    	public void maximize(CTabFolderEvent event) {
-	    		folder.setMaximized(true);
-	    		folder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-	    	}
-	    	public void restore(CTabFolderEvent event) {
-	    		folder.setMinimized(false);
-	    		folder.setMaximized(false);
-	    		folder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-	    	}
-	    });
-	    createToolBarMenu(getViewSite().getActionBars().getToolBarManager());
-	}
-	
-	public void createToolBarMenu(IToolBarManager toolBarMgr) {
-		toolBarMgr.add(new Separator(IPTPDebugUIConstants.IUITABVARIABLEGROUP));
-		toolBarMgr.add(new Separator(IPTPDebugUIConstants.IUITABEMPTYGROUP));
-		configureToolBar(toolBarMgr);
-	}
-	protected abstract void configureToolBar(IToolBarManager toolBarMgr);
-	
-	public void setFocus() {
-		folder.setFocus();
-	}
-	
-	public CTabFolder getTabFolder() {
-		return folder;
-	}
-	
-	public void dispose() {
-		closeAllTabs();
-		super.dispose();
-	}
-	public void closeTab(String name) {
-		if (items != null)
-			items.remove(name);
-	}
-	public void closeAllTabs() {
-		for (PTabItem item : getItems()) {
-			item.dispose();
-		}
-		items.clear();
-	}
-	public PTabItem[] getItems() {
-		return items.values().toArray(new PTabItem[0]);
-	}
-	public PTabItem getTab(String name) {
-		return items.get(name);
-	}
-	public IPStackFrame getStackFrame() throws CoreException {
-		ISelection selection = getViewSite().getPage().getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
-		if (selection instanceof StructuredSelection) {
-			Object obj = ((StructuredSelection)selection).getFirstElement();
-			if (obj instanceof IPStackFrame) {
-				return (IPStackFrame)obj;
-			}
-		}
-		/*
-		IWorkbenchWindow activeWindow = PTPDebugUIPlugin.getActiveWorkbenchWindow();
-		if (activeWindow == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, "No active window found", null));
-		
-		IWorkbenchPage page = activeWindow.getActivePage();
-		if (page == null)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, "No active page found", null));	
-
-		IViewPart part = page.findView(IDebugUIConstants.ID_DEBUG_VIEW);
-		if (part != null) {
-			IDebugView adapter = (IDebugView)part.getAdapter(IDebugView.class);
-			if (adapter != null) {				
-				ISelection selection = adapter.getViewer().getSelection();
-				if (selection instanceof StructuredSelection) {
-					Object obj = ((StructuredSelection)selection).getFirstElement();
-					if (obj instanceof IPStackFrame) {
-						return (IPStackFrame)obj;
-					}
-				}
-			}
-		}
-		*/
-		throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, "No stack frame found", null));
-	}	
-	public abstract void createTabItem(String tabName, Object selection) throws DebugException;
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabItem.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabItem.java
deleted file mode 100644
index 263f9f0..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/PTabItem.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * @author Clement chu
- *
- */
-public abstract class PTabItem implements IRunnableContext {
-	protected CTabItem tabItem = null;
-	protected PageBook fPageBook = null;
-	protected TextViewer fTextViewer = null;
-	protected boolean displayError = false;
-	protected PTabFolder view = null;
-	
-	public PTabItem(PTabFolder view) {
-		this(view, "");
-	}
-	public PTabItem(PTabFolder view, String tabName) {
-		this.view = view;
-		tabItem = new CTabItem(view.getTabFolder(), SWT.CLOSE);
-		tabItem.setText(tabName);
-		tabItem.setToolTipText(tabName);
-		tabItem.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent event) {
-				dispose();
-			}
-		});
-	}
-	public CTabItem getTabItem() {
-		return tabItem;
-	}
-	public void setControl() {
-	    tabItem.setControl(createControl(tabItem.getParent()));		
-	}
-	
-	public void setTabName(String tabName) {
-		tabItem.setText(tabName);
-	}
-	protected abstract void dispose();
-
-	public Control createControl(Composite parent) {	
-		fPageBook = new PageBook(parent, SWT.NONE);
-		createErrorPage(fPageBook);
-		createTabPage(fPageBook);
-		return fPageBook;
-	}
-	public void createErrorPage(Composite parent) {
-		if (fTextViewer == null) {
-			fTextViewer = new TextViewer(parent, SWT.WRAP);	
-			fTextViewer.setDocument(new Document());
-			StyledText styleText = fTextViewer.getTextWidget();
-			styleText.setEditable(false);
-			styleText.setEnabled(false);
-		}
-	}
-	public void displayError(Exception e) {
-		displayError = true;
-		StyledText styleText = fTextViewer.getTextWidget();
-		if (styleText != null)
-			styleText.setText("Error: " + e.getMessage());
-
-		fPageBook.showPage(fTextViewer.getControl());
-		clearContext();
-	}
-	protected abstract void createTabPage(Composite parent);
-	protected abstract void clearContext();
-	protected abstract void displayTab();
-	
-	public Point getTextSize(Composite composite, String text) {
-		return new GC(composite).textExtent(text);
-	}
-	
-	public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
-		new ProgressMonitorDialog(fPageBook.getShell()).run(fork, cancelable, runnable);
-	}	
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/AbstractArrayTableModel.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/AbstractArrayTableModel.java
deleted file mode 100644
index b37591d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/AbstractArrayTableModel.java
+++ /dev/null

@@ -1,66 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views.array;
-
-import org.eclipse.ptp.debug.internal.ui.views.AbstractCTableCellEditor;
-import org.eclipse.ptp.debug.internal.ui.views.CTableCellRenderer;
-import org.eclipse.ptp.debug.internal.ui.views.ICTableModel;
-
-/**
- * @author clement
- *
- */
-public abstract class AbstractArrayTableModel implements ICTableModel {
-	protected int colWidth = 30;
-	protected int rowHeight = 20;
-	protected int rows = 1;
-	protected int cols = 1;
-	
-	public void setContentAt(int col, int row, Object value) {}
-	public void setColumnWidth(int col, int value) {
-		colWidth = value;
-	}
-	public void setRowHeight(int value) {
-		if (value < getRowHeightMinimum()) {
-			value = getRowHeightMinimum();
-		}
-		rowHeight = value;
-	}
-	public AbstractCTableCellEditor getCellEditor(int col, int row) {
-		return null;
-	}
-	public int getFixedRowCount() {
-		return 1;
-	}
-	public int getFixedColumnCount() {
-		return 1;
-	}
-	public int getColumnWidth(int col) {
-		return colWidth;
-	}
-	public int getRowHeight() {
-		return rowHeight;
-	}
-	public boolean isColumnResizable(int col) {
-		return true;
-	}
-	public int getFirstRowHeight() {
-		return 20;
-	}
-	public boolean isRowResizable() {
-		return false;
-	}
-	public int getRowHeightMinimum() {
-		return 18;
-	}
-	public int getColumnWidthMinimum() {
-		return 20;
-	}
-	public CTableCellRenderer getCellRenderer(int col, int row) {
-		return CTableCellRenderer.defaultRenderer;
-	}
-	public int getRowCount() {
-		return rows;
-	}
-	public int getColumnCount() {
-		return cols;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.java
deleted file mode 100644
index d26800c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.array;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- *
- */
-public class ArrayMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.views.array.ArrayMessages";
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private ArrayMessages() {}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch(MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.properties
deleted file mode 100644
index 4061684..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayMessages.properties
+++ /dev/null

@@ -1,36 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-ArrayTabItem.initRow=Initialing row headers...
-ArrayTabItem.initCol=Initialing column headers...
-ArrayTabItem.updateTable=Updating the array table...
-ArrayTabItem.initVariable=Initialing variables...
-ArrayTabItem.initCombobox=Initialing combo boxes...
-ArrayTabItem.creatingCombobox=Creating combo boxes...
-ArrayTabItem.done=Done
-ArrayTabItem.cancel=Cancelled by user
-ArrayTabItem.resetRange=Reset range 
-ArrayTabItem.colHead=Col
-ArrayTabItem.rowHead=Row
-ArrayTabItem.showTable=Show table
-ArrayTabItem.noIndexErrTitle=Error
-ArrayTabItem.noIndexErrMsg=Please check the button first

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayTabItem.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayTabItem.java
deleted file mode 100644
index ffb00af..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayTabItem.java
+++ /dev/null

@@ -1,557 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.array;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ptp.debug.core.model.IPStackFrame;
-import org.eclipse.ptp.debug.core.model.IPVariable;
-import org.eclipse.ptp.debug.internal.ui.views.CTable;
-import org.eclipse.ptp.debug.internal.ui.views.ICTableCellSelectionListener;
-import org.eclipse.ptp.debug.internal.ui.views.PTabFolder;
-import org.eclipse.ptp.debug.internal.ui.views.PTabItem;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Spinner;
-
-/**
- * @author Clement chu
- *
- */
-public class ArrayTabItem extends PTabItem {
-	private final String COL_TYPE = "col";
-	private final String ROW_TYPE = "row";
-	private SashForm sashForm = null;
-	private CTable cTable = null;
-	private Composite leftContent = null;
-	private ArrayTableModel arrayModel = null;
-	private IPVariable variable = null;
-	private boolean reloadVariable = false;
-	String type;
-	String name;
-
-	public ArrayTabItem(PTabFolder view, String tabText, IPVariable variable) {
-		super(view, tabText);
-		this.variable = variable;
-		reloadVariable = false;
-		setControl();
-		//view.getTabFolder().setMenu(createPopupMenu());
-	}
-	public void init(final IPVariable variable) {
-		IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				if (monitor == null)
-					monitor = new NullProgressMonitor();
-
-				int dim = 0;
-				monitor.beginTask(MessageFormat.format("{0}", new Object[]{ ArrayMessages.getString("ArrayTabItem.initVariable")}), 10);
-				try {
-					name = variable.getName();
-					type = variable.getReferenceTypeName();
-
-					IValue value = variable.getValue();
-					while (value.hasVariables()) {
-						IVariable[] vars = value.getVariables();
-						for (IVariable var : vars) {
-							value = var.getValue();
-							break;
-						}
-						fillDimensionPanel(vars.length-1);
-						dim++;
-						monitor.worked(3);
-					}
-				}
-				catch (DebugException e) {
-					throw new InvocationTargetException(e);
-				}
-				finally {
-					arrayModel = new ArrayTableModel(dim);
-					monitor.done();
-				}
-			}
-		};
-		try {
-			run(false, false, runnable);
-		} catch(InterruptedException e) {
-			displayError(e);
-		} catch (InvocationTargetException e1) {
-			displayError(e1);
-		}
-	}
-	protected void dispose() {
-		view.closeTab(getTabItem().getText());
-		resetTable();
-		variable = null;
-		getTabItem().dispose();
-	}
-	public void clearContext() {
-		for (Control control : leftContent.getChildren()) {
-			if (control instanceof Button) {
-				((Button)control).setSelection(false);
-			}
-			else if (control instanceof Spinner) {
-				((Spinner)control).setSelection(0);
-			}
-		}
-		resetTable();
-		cTable.redraw();
-	}
-	public void setReloadVariable(boolean reload) {
-		this.reloadVariable = reload;
-	}
-	public void displayTab() {
-		if (!displayError)		
-			fPageBook.showPage(sashForm);
-	}
-	public void createTabPage(Composite parent) {
-		sashForm = new SashForm(parent, SWT.HORIZONTAL | SWT.BORDER);
-		sashForm.setLayout(new FillLayout(SWT.HORIZONTAL));
-		sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		sashForm.SASH_WIDTH = 2;
-		sashForm.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW));
-		leftPanel(sashForm);
-		rightPanel(sashForm);
-		//sashForm.setMaximizedControl(cTable);
-		sashForm.setWeights(new int[] { 1, 3 });
-	}
-	protected Menu createPopupMenu() {
-		Menu menu = new Menu(cTable);
-		MenuItem mItem = new MenuItem(menu, SWT.PUSH);
-		mItem.setText(ArrayMessages.getString("ArrayTabItem.resetRange"));
-		mItem.addSelectionListener(new SelectionAdapter() {
-	    	public void widgetSelected(SelectionEvent e) {
-	    	}
-	    });
-		return menu;
-	}
-	public void updateTable(int colIndex, int rowIndex) {
-		if (colIndex == -1 && rowIndex == -1) {
-			PTPDebugUIPlugin.errorDialog(fPageBook.getShell(), ArrayMessages.getString("ArrayTabItem.noIndexErrTitle"), new Exception(ArrayMessages.getString("ArrayTabItem.noIndexErrMsg")));
-			return;
-		}
-	}
-	private GridLayout createGridLayout(int column, boolean balance, int marginWidth, int marginHeight) {
-		GridLayout layout = new GridLayout(column, balance);
-		layout.marginWidth = marginWidth;
-		layout.marginHeight = marginHeight;
-		return layout;
-	}
-	private GridData createHorizontaGridData(int hozAlign, int width) {
-		GridData gd = new GridData(hozAlign, SWT.BEGINNING, (hozAlign==SWT.FILL), false);
-		gd.widthHint = width;
-		return gd;
-	}
-	private void leftPanel(Composite parent) {
-		ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL| SWT.H_SCROLL);
-		leftContent = new Composite(sc, SWT.NONE);
-		leftContent.setLayout(createGridLayout(3, false, 3, 3));
-		leftContent.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-		sc.setContent(leftContent);
-		sc.setExpandVertical(true);
-		sc.setExpandHorizontal(true);
-
-		new Label(leftContent, SWT.READ_ONLY).setText("col");
-		new Label(leftContent, SWT.READ_ONLY).setText("row");
-		Label sliceLabel = new Label(leftContent, SWT.READ_ONLY);
-		sliceLabel.setLayoutData(new GridData(SWT.CENTER, SWT.BEGINNING, true, false));
-		sliceLabel.setText("Slice");
-		/*
-		Composite composite = new Composite(content, SWT.NONE);		
-		composite.setLayout(createGridLayout(3, false, 0, 0));
-		composite.setLayoutData(createHorizontaGridData(SWT.FILL, 150));
-		Label minLabel = new Label(composite, SWT.READ_ONLY);
-		minLabel.setText("Min");
-		minLabel.setLayoutData(new GridData(SWT.CENTER, SWT.BEGINNING, true, false));
-		new Label(composite, SWT.READ_ONLY).setText("");
-		Label maxLabel = new Label(composite, SWT.READ_ONLY);
-		maxLabel.setText("Max");
-		maxLabel.setLayoutData(new GridData(SWT.CENTER, SWT.BEGINNING, true, false));
-		*/
-		sc.setMinSize(120, SWT.DEFAULT);
-	}
-	private void clearAllCheckboxes(String name) {
-		for (Control control : leftContent.getChildren()) {
-			if (control instanceof Button) {
-				if (control.getToolTipText().equals(name)) {
-					((Button)control).setSelection(false);
-				}
-			}
-		}
-	}
-	private void reload() throws CoreException {
-		IPStackFrame frame = view.getStackFrame();
-		for (IVariable var : frame.getVariables()) {
-			if (var instanceof IPVariable) {
-				IPVariable pvar = (IPVariable)var;
-				String pname = var.getName();
-				String ptype = var.getReferenceTypeName();
-				if (pname.equals(name) && ptype.equals(type)) {
-					variable = pvar;
-					name = pname;
-					type = ptype;
-					reloadVariable = false;
-					break;
-				}
-			}
-		}
-		if (reloadVariable)
-			throw new CoreException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No variable found", null));
-	}
-	public void refreshTable() {
-		if (reloadVariable) {
-			try {
-				reload();
-			}
-			catch (CoreException e) {
-				PTPDebugUIPlugin.errorDialog(fPageBook.getShell(), "Error", e.getStatus());
-				return;
-			}
-		}
-		if (arrayModel != null) {
-			setDimensionValues();
-			if (arrayModel.isAvailable()) {
-				cTable.setModel(arrayModel);
-				arrayModel.initial();
-			}
-			else {
-				resetTable();
-				cTable.redraw();
-			}
-		}
-	}
-	private void resetTable() {
-		arrayModel.reset();
-		cTable.setModel(null);
-	}
-	private void setDimensionValues() {
-		int[][] values = new int[arrayModel.getDimension()][3];
-		int fCol = 1;
-		int fRow = 1;
-		int pos = 0;
-		arrayModel.setColumnCount(1);
-		arrayModel.setRowCount(1);
-		for (Control control : leftContent.getChildren()) {
-			if (control instanceof Button) {
-				if (control.getToolTipText().equals(COL_TYPE)) {
-					values[pos][0] = ((Button)control).getSelection()?1:0;
-					continue;
-				}
-				if (control.getToolTipText().equals(ROW_TYPE)) {
-					values[pos][1] = ((Button)control).getSelection()?1:0;
-					continue;
-				}
-			}
-			if (control instanceof Spinner) {
-				if (values[pos][0] == 1) {
-					values[pos][2] = ((Spinner)control).getMaximum();
-					fCol = ((Spinner)control).getSelection()+1;
-					arrayModel.setColumnCount(values[pos][2]+1);
-				}
-				else if (values[pos][1] == 1) {
-					values[pos][2] = ((Spinner)control).getMaximum();
-					fRow = ((Spinner)control).getSelection()+1;
-					arrayModel.setRowCount(values[pos][2]+1);
-				}
-				else {
-					values[pos][2] = ((Spinner)control).getSelection();
-				}
-				pos++;
-				continue;
-			}
-		}
-		arrayModel.setSelection(fCol, fRow);
-		arrayModel.setValues(values);
-	}
-	private void fillDimensionPanel(int size) {
-		//Slider slider = new Slider(parent, SWT.HORIZONTAL);
-		final Button colBtn = new Button(leftContent, SWT.CHECK);
-		colBtn.setToolTipText(COL_TYPE);
-		colBtn.setLayoutData(createHorizontaGridData(SWT.CENTER, 20));
-		final Button rowBtn = new Button(leftContent, SWT.CHECK);
-		rowBtn.setLayoutData(createHorizontaGridData(SWT.CENTER, 20));
-		rowBtn.setToolTipText(ROW_TYPE);
-
-		colBtn.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = colBtn.getSelection();
-				clearAllCheckboxes(COL_TYPE);
-				colBtn.setSelection(selected);
-				
-				if (selected) {
-					if (rowBtn.getSelection()) {
-						arrayModel.reset();
-						rowBtn.setSelection(false);
-					}
-				}
-				refreshTable();
-			}
-		});
-		rowBtn.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = rowBtn.getSelection();
-				clearAllCheckboxes(ROW_TYPE);
-				rowBtn.setSelection(selected);
-				
-				if (selected) {
-					if (colBtn.getSelection()) {
-						arrayModel.reset();
-						colBtn.setSelection(false);
-					}
-				}
-				refreshTable();
-			}
-		});
-		final Spinner spinner = new Spinner(leftContent, SWT.NONE | SWT.BORDER);
-		spinner.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-		spinner.setMinimum(0);
-		spinner.setMaximum(size);
-		spinner.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!colBtn.getSelection() && !rowBtn.getSelection())
-					arrayModel.reset();
-				refreshTable();
-			}
-		});
-		leftContent.pack(true);
-
-		/*
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(createGridLayout(3, false, 0, 0));
-		composite.setLayoutData(createHorizontaGridData(SWT.FILL, 150));
-		final Spinner minSpinner = new Spinner(composite, SWT.NONE | SWT.BORDER);
-		minSpinner.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-		new Label(composite, SWT.READ_ONLY).setText("/");
-		final Spinner maxSpinner = new Spinner(composite, SWT.NONE | SWT.BORDER);
-		maxSpinner.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-		
-		minSpinner.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				int value = minSpinner.getSelection();
-				if (value >= maxSpinner.getSelection()) {
-					minSpinner.setSelection(maxSpinner.getSelection()-1);
-				}
-			}
-		});
-		maxSpinner.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				int value = maxSpinner.getSelection();
-				if (value <= minSpinner.getSelection()) {
-					maxSpinner.setSelection(minSpinner.getSelection()+1);
-				}
-			}
-		});
-		minSpinner.setMinimum(0);
-		minSpinner.setMaximum(total/2);
-		maxSpinner.setMinimum(total/2+1);
-		maxSpinner.setMaximum(total);
-		minSpinner.setSelection(0);
-		maxSpinner.setSelection(total/2+1);
-		*/
-	}
-	private void rightPanel(Composite parent) {
-		cTable = new CTable(parent, SWT.V_SCROLL | SWT.H_SCROLL);
-		cTable.addCellSelectionListener(new ICTableCellSelectionListener() {
-			public void cellSelected(int col, int row, int statemask) {
-				if (leftContent != null) {
-					boolean isCol = false;
-					boolean isRow = false;
-					for (Control control : leftContent.getChildren()) {
-						if (control instanceof Button) {
-							if (control.getToolTipText().equals(COL_TYPE)) {
-								isCol = ((Button)control).getSelection();
-								continue;
-							}
-							if (control.getToolTipText().equals(ROW_TYPE)) {
-								isRow = ((Button)control).getSelection();
-								continue;
-							}
-						}
-						if (control instanceof Spinner) {
-							if (isCol || isRow) {
-								((Spinner)control).setSelection((isCol?col:row)-1);
-								continue;
-							}
-						}
-					}
-				}				
-			}
-			public void fixedCellSelected(int col, int row, int statemask) {}
-		});
-		//cTable.setRowSelectionMode(true);
-		//cTable.setMultiSelectionMode(true);
-	}
-	private void showTable() {
-		cTable.redraw();
-		cTable.setSelection(arrayModel.getSelectedColumn(), arrayModel.getSelectedRow(), true);
-	}
-	class ArrayTableModel extends AbstractArrayTableModel {
-		private int[][] values;
-		private int fCol = 1;
-		private int fRow = 1;
-		private int dimension;
-		private Object[][] data = null;
-		
-		public ArrayTableModel(int dimension) {
-			this.dimension = dimension;
-		}
-		public Object getContentAt(int col, int row) {
-			if (col == getFixedColumnCount()-1)
-				return "" + (row-1);
-			if (row == getFixedRowCount()-1)
-				return "" + (col-1);
-
-			if (data[col][row] == null)
-				return "";
-			return data[col][row];
-		}
-		public void setRowCount(int rows) {
-			this.rows = rows + getFixedRowCount();
-		}
-		public void setColumnCount(int cols) {
-			this.cols = cols + getFixedColumnCount();
-		}
-		public void reset() {
-			fCol = getFixedColumnCount();
-			fRow = getFixedRowCount();
-			this.values = null;
-			this.data = null;
-		}
-		public void setValues(int[][] values) {
-			this.values = values;
-		}
-		public int getDimension() {
-			return dimension;
-		}
-		public boolean isAvailable() {
-			if (values == null)
-				return false;
-			
-			boolean isCol = false;
-			boolean isRow = false;
-			for (int i=0; i<dimension; i++) {
-				isCol = isCol?true:(values[i][0] == 1);
-				isRow = isRow?true:(values[i][1] == 1);
-			}
-			if (dimension == 1) {
-				return !(!isCol && !isRow);
-			}
-			return (isCol && isRow);
-		}
-		public void setSelection(int col, int row) {
-			this.fCol = col;
-			this.fRow = row;
-		}
-		public int getSelectedColumn() {
-			return fCol;
-		}
-		public int getSelectedRow() {
-			return fRow;
-		}
-		private String getValueString(int col, int row) throws DebugException {
-			IVariable var = variable;
-			for (int i=0; i<dimension; i++) {
-				IVariable[] vars = var.getValue().getVariables();
-				if (vars.length == 0)
-					throw new DebugException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "No Value found", null));
-
-				if (values[i][0] == 1) {
-					var = vars[col-1];
-				}
-				else if (values[i][1] == 1) {
-					var = vars[row-1];
-				}
-				else {
-					var = vars[values[i][2]];
-				}
-			}
-			return var.getValue().getValueString();
-		}
-		public void initial() {
-			if (data != null) {
-				showTable();
-				return;
-			}
-			
-			IRunnableWithProgress runnable = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-			//WorkbenchJob uiJob = new WorkbenchJob("Retrieving values...") {
-				//public IStatus runInUIThread(IProgressMonitor monitor) {
-					if (monitor == null)
-						monitor = new NullProgressMonitor();
-					monitor.beginTask("Retrieving values...", (cols*rows));
-					data = new Object[cols][rows];
-					try {
-						for (int c=getFixedColumnCount(); c<cols; c++) {
-							for (int r=getFixedRowCount(); r<rows; r++) {
-								try {
-									data[c][r] = getValueString(c, r);
-									monitor.worked(1);
-								}
-								catch (DebugException ex) {
-									throw new InvocationTargetException(ex);
-									//return ex.getStatus();
-								}
-							}
-						}
-					}
-					finally {
-						monitor.done();
-					}
-					showTable();
-					//return Status.OK_STATUS;
-				}
-			};
-			/*
-			PlatformUI.getWorkbench().getProgressService().showInDialog(fPageBook.getShell(), uiJob);
-			uiJob.setSystem(false);
-			uiJob.schedule();
-			*/
-			try {
-				run(false, false, runnable);
-			} catch(InterruptedException e) {
-				displayError(e);
-			} catch (InvocationTargetException e1) {
-				displayError(e1);
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayView.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayView.java
deleted file mode 100644
index 380c3b6..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayView.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.array;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ptp.debug.core.model.IPVariable;
-import org.eclipse.ptp.debug.internal.ui.actions.AddVariableAction;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractPDebugViewEventHandler;
-import org.eclipse.ptp.debug.internal.ui.views.PTabFolder;
-import org.eclipse.ptp.debug.internal.ui.views.PTabItem;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author Clement chu
- *
- */
-public class ArrayView extends PTabFolder {
-	protected AbstractPDebugViewEventHandler fEventHandler = null;
-	
-	public void createPartControl(Composite parent) {
-		super.createPartControl(parent);
-		setEventHandler(new ArrayViewEventHandler(this));
-	}
-	protected void setEventHandler(AbstractPDebugViewEventHandler eventHandler) {
-		this.fEventHandler = eventHandler;
-	}
-	protected AbstractPDebugViewEventHandler getEventHandler() {
-		return this.fEventHandler;
-	}
-	public void dispose() {
-		if (getEventHandler() != null)
-			getEventHandler().dispose();
-		super.dispose();
-	}
-	public void repaint(boolean all) {
-		for (PTabItem item : getItems()) {
-			((ArrayTabItem)item).clearContext();
-			((ArrayTabItem)item).setReloadVariable(all);
-		}
-	}
-	
-	protected void configureToolBar(IToolBarManager toolBarMgr) {
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.IUITABVARIABLEGROUP, new AddVariableAction(this));
-	}
-	
-	public void createTabItem(String tabName, Object selection) throws DebugException {
-		if (selection instanceof IPVariable) {
-			if (items.containsKey(tabName)) {
-				throw new DebugException(new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, "Already existed variable", null));
-			}
-			ArrayTabItem item = new ArrayTabItem(this, tabName, (IPVariable)selection);
-			item.init((IPVariable)selection);
-			item.displayTab();
- 			folder.setSelection(item.getTabItem());
- 			items.put(tabName, item);
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayViewEventHandler.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayViewEventHandler.java
deleted file mode 100644
index a19d2d2..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/array/ArrayViewEventHandler.java
+++ /dev/null

@@ -1,43 +0,0 @@
-package org.eclipse.ptp.debug.internal.ui.views.array;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractPDebugViewEventHandler;
-
-/**
- * @author clement
- *
- */
-public class ArrayViewEventHandler extends AbstractPDebugViewEventHandler  {
-	/**
-	 * Constructs a new event handler on the given view
-	 */
-	public ArrayViewEventHandler(ArrayView view) {
-		super(view);
-	}
-	public ArrayView getArrayView() {
-		return (ArrayView)getView();
-	}
-	public void refresh(boolean all) {
-		getArrayView().repaint(all);
-	}
-	protected void doHandleDebugEvent(IPDebugEvent event, IProgressMonitor monitor) {
-		switch(event.getKind()) {
-			case IPDebugEvent.TERMINATE:
-				switch (event.getDetail()) {
-				case IPDebugEvent.DEBUGGER:
-					getArrayView().closeAllTabs();
-					break;
-				case IPDebugEvent.REGISTER:
-					refresh();
-					break;
-				}
-				break;
-			case IPDebugEvent.RESUME:
-				break;
-			case IPDebugEvent.SUSPEND:
-				refresh();
-				break;
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/breakpoints/PBreakpointSetOrganizer.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/breakpoints/PBreakpointSetOrganizer.java
deleted file mode 100644
index 4891898..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/breakpoints/PBreakpointSetOrganizer.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.breakpoints;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.ui.AbstractBreakpointOrganizerDelegate;
-import org.eclipse.debug.ui.BreakpointTypeCategory;
-import org.eclipse.debug.ui.IBreakpointTypeCategory;
-import org.eclipse.ptp.debug.core.model.IPBreakpoint;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-
-/**
- * @author Clement chu
- * 
- */
-public class PBreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate {
-	private Map<String, IAdaptable[]> types = new HashMap<String, IAdaptable[]>();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint)
-	 */
-	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
-		if (!(breakpoint instanceof IPBreakpoint))
-			return null;
-
-		IBreakpointTypeCategory category = (IBreakpointTypeCategory) breakpoint.getAdapter(IBreakpointTypeCategory.class);
-		if (category != null) {
-			return new IAdaptable[] { category };
-		}
-
-		IPBreakpoint pBpt = (IPBreakpoint) breakpoint;
-		try {
-			String sid = pBpt.getSetId();
-			if (sid.length() > 0) {
-				IAdaptable[] categories = (IAdaptable[]) types.get(sid);
-				if (category == null) {
-					categories = new IAdaptable[] { new BreakpointTypeCategory(sid, PDebugImage.getDescriptor(PDebugImage.IMG_DEBUG_PTPBPTSET)) };
-					types.put(sid, categories);
-				}
-				return categories;
-			}
-		} catch (CoreException e) {
-			return null;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose()
-	 */
-	public void dispose() {
-		types.clear();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.java
deleted file mode 100644
index f91e28e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.signals;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- */
-public class SignalsMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.views.signals.SignalsMessages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private SignalsMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.properties
deleted file mode 100644
index cde98be..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsMessages.properties
+++ /dev/null

@@ -1,29 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-
-SignalsViewer.4=Name
-SignalsViewer.5=Pass
-SignalsViewer.6=Suspend
-SignalsViewer.7=Description
-SignalsViewer.8=yes
-SignalsViewer.9=no

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsView.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsView.java
deleted file mode 100644
index 0eaa38f..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsView.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.signals;
-
-import org.eclipse.core.runtime.Preferences.IPropertyChangeListener;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.internal.ui.views.IDebugExceptionHandler;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.debug.core.PTPDebugCorePlugin;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractDebugEventHandlerView;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INullSelectionListener;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Clement Chu
- */
-public class SignalsView extends AbstractDebugEventHandlerView implements ISelectionListener, INullSelectionListener, IPropertyChangeListener, IDebugExceptionHandler {
-	public class SignalsViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			if (columnIndex == 0)
-				return getModelPresentation().getImage(element);
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			if (element instanceof IPSignal) {
-				try {
-					switch(columnIndex) {
-						case 0:
-							return ((IPSignal)element).getName();
-						case 1:
-							return (((IPSignal)element).isPassEnabled()) ? SignalsViewer.YES_VALUE : SignalsViewer.NO_VALUE;
-						case 2:
-							return (((IPSignal)element).isStopEnabled()) ? SignalsViewer.YES_VALUE : SignalsViewer.NO_VALUE;
-						case 3:
-							return ((IPSignal)element).getDescription();
-					}
-				} catch(DebugException e) {
-				}
-			}
-			return null;
-		}
-		
-		private IDebugModelPresentation getModelPresentation() {
-			return PTPDebugUIPlugin.getDebugModelPresentation();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Viewer createViewer(Composite parent) {
-		PTPDebugCorePlugin.getDefault().getPluginPreferences().addPropertyChangeListener(this);
-		
-		// add tree viewer
-		final SignalsViewer vv = new SignalsViewer(parent, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		vv.setContentProvider(createContentProvider());
-		vv.setLabelProvider(new SignalsViewLabelProvider());
-		vv.setUseHashlookup(true);
-
-		// listen to selection in debug view
-		getSite().getPage().addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this);
-		setEventHandler(new SignalsViewEventHandler(this));
-
-		return vv;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#createActions()
-	 */
-	protected void createActions() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId()
-	 */
-	protected String getHelpContextId() {
-		//return IPDebugHelpContextIds.SIGNALS_VIEW;
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager menu) {
-		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-		updateObjects();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager)
-	 */
-	protected void configureToolBar(IToolBarManager tbm) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (!isAvailable() || !isVisible())
-			return;
-		if (selection == null)
-			setViewerInput(new StructuredSelection());
-		else if (selection instanceof IStructuredSelection)
-			setViewerInput((IStructuredSelection)selection);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.ui.views.IDebugExceptionHandler#handleException(org.eclipse.debug.core.DebugException)
-	 */
-	public void handleException(DebugException e) {
-		showMessage(e.getMessage());
-	}
-
-	/**
-	 * Creates this view's content provider.
-	 * 
-	 * @return a content provider
-	 */
-	private IContentProvider createContentProvider() {
-		SignalsViewContentProvider cp = new SignalsViewContentProvider();
-		cp.setExceptionHandler(this);
-		return cp;
-	}
-
-	protected void setViewerInput(IStructuredSelection ssel) {
-		IPDebugTarget target = null;
-		if (ssel != null && ssel.size() == 1) {
-			Object input = ssel.getFirstElement();
-			if (input instanceof IDebugElement && ((IDebugElement)input).getDebugTarget() instanceof IPDebugTarget)
-				target = (IPDebugTarget)((IDebugElement)input).getDebugTarget();
-		}
-
-		if (getViewer() == null)
-			return;
-
-		Object current = getViewer().getInput();
-		if (current != null && current.equals(target)) {
-			updateObjects();
-			return;
-		}
-		
-		showViewer();
-		getViewer().setInput(target);
-		updateObjects();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#becomesHidden()
-	 */
-	protected void becomesHidden() {
-		setViewerInput(new StructuredSelection());
-		super.becomesHidden();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#becomesVisible()
-	 */
-	protected void becomesVisible() {
-		super.becomesVisible();
-		IViewPart part = getSite().getPage().findView(IDebugUIConstants.ID_DEBUG_VIEW);
-		if (part != null) {
-			ISelection selection = getSite().getPage().getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
-			selectionChanged(part, selection);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		getSite().getPage().removeSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, this);
-		PTPDebugCorePlugin.getDefault().getPluginPreferences().removePropertyChangeListener(this);
-		super.dispose();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewContentProvider.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewContentProvider.java
deleted file mode 100644
index 2d05b48..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewContentProvider.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.signals;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.internal.ui.views.IDebugExceptionHandler;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-
-/**
- * @author Clement chu
- */
-public class SignalsViewContentProvider implements IStructuredContentProvider {
-	/**
-	 * Handler for exceptions as content is retrieved
-	 */
-	private IDebugExceptionHandler fExceptionHandler = null;
-
-	public SignalsViewContentProvider() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof IPDebugTarget) {
-			IPDebugTarget target = (IPDebugTarget) inputElement;
-			try {
-				if (target != null) {
-					Object[] signals = target.getSignals();
-					if (signals != null)
-						return signals;
-				}
-			} catch (DebugException e) {
-				if (getExceptionHandler() != null)
-					getExceptionHandler().handleException(e);
-				else
-					PTPDebugUIPlugin.log(e);
-			}
-		}
-		return new Object[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	/**
-	 * Sets an exception handler for this content provider.
-	 * 
-	 * @param handler
-	 *            debug exception handler or <code>null</code>
-	 */
-	protected void setExceptionHandler(IDebugExceptionHandler handler) {
-		fExceptionHandler = handler;
-	}
-
-	/**
-	 * Returns the exception handler for this content provider.
-	 * 
-	 * @return debug exception handler or <code>null</code>
-	 */
-	protected IDebugExceptionHandler getExceptionHandler() {
-		return fExceptionHandler;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewEventHandler.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewEventHandler.java
deleted file mode 100644
index 484da1c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewEventHandler.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.signals;
-
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.ui.AbstractDebugView;
-import org.eclipse.ptp.debug.core.model.IPSignal;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractDebugEventHandler;
-
-/**
- * @author Clement chu
- */
-public class SignalsViewEventHandler extends AbstractDebugEventHandler {
-	/**
-	 * Constructs a new event handler on the given view
-	 * 
-	 * @param view signals view
-	 */
-	public SignalsViewEventHandler(AbstractDebugView view) {
-		super(view);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.views.AbstractDebugEventHandler#doHandleDebugEvents(org.eclipse.debug.core.DebugEvent[])
-	 */
-	protected void doHandleDebugEvents(DebugEvent[] events) {
-		for(int i = 0; i < events.length; i++) {
-			DebugEvent event = events[i];
-			switch(event.getKind()) {
-				case DebugEvent.CREATE:
-				case DebugEvent.TERMINATE:
-					if (event.getSource() instanceof IDebugTarget || event.getSource() instanceof IPSignal)
-						refresh();
-					break;
-				case DebugEvent.SUSPEND:
-					refresh();
-					break;
-				case DebugEvent.CHANGE:
-					if (event.getSource() instanceof IPSignal)
-						refresh(event.getSource());
-					break;
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewer.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewer.java
deleted file mode 100644
index c8e24ba..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/signals/SignalsViewer.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.signals;
-
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.ptp.debug.internal.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-/**
- * @author Clement chu
- */
-public class SignalsViewer extends TableViewer {
-
-	// String constants
-	protected static final String YES_VALUE = SignalsMessages.getString("SignalsViewer.8");
-	protected static final String NO_VALUE = SignalsMessages.getString("SignalsViewer.9");
-
-	// Column properties
-	private static final String CP_NAME = "name";
-	private static final String CP_PASS = "pass";
-	private static final String CP_SUSPEND = "suspend";
-	private static final String CP_DESCRIPTION = "description";
-
-	// Column labels
-	private static final String CL_NAME = SignalsMessages.getString("SignalsViewer.4");
-	private static final String CL_PASS = SignalsMessages.getString("SignalsViewer.5");
-	private static final String CL_SUSPEND = SignalsMessages.getString("SignalsViewer.6");
-	private static final String CL_DESCRIPTION = SignalsMessages.getString("SignalsViewer.7");
-
-	/**
-	 * Constructor for SignalsViewer
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public SignalsViewer(Composite parent, int style) {
-		super(parent, style);
-		Table table = getTable();
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);		
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Create the table columns
-		new TableColumn(table, SWT.NULL);
-		new TableColumn(table, SWT.NULL);
-		new TableColumn(table, SWT.NULL);
-		new TableColumn(table, SWT.NULL);
-		TableColumn[] columns = table.getColumns();
-		columns[0].setResizable(true);
-		columns[1].setResizable(false);
-		columns[2].setResizable(false);
-		columns[3].setResizable(true);
-
-		columns[0].setText(CL_NAME);
-		columns[1].setText(CL_PASS);
-		columns[2].setText(CL_SUSPEND);
-		columns[3].setText(CL_DESCRIPTION);
-
-		PixelConverter pc = new PixelConverter(parent);
-		columns[0].setWidth(pc.convertWidthInCharsToPixels(20));
-		columns[1].setWidth(pc.convertWidthInCharsToPixels(15));
-		columns[2].setWidth(pc.convertWidthInCharsToPixels(15));
-		columns[3].setWidth(pc.convertWidthInCharsToPixels(50));
-
-		setColumnProperties(new String[]{ CP_NAME, CP_PASS, CP_SUSPEND, CP_DESCRIPTION });
-	}
-}
-
-

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/ICheckProvider.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/ICheckProvider.java
deleted file mode 100644
index a642aaa..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/ICheckProvider.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-/**
- * @author Clement chu
- */
-public interface ICheckProvider {
-	public boolean isCheck(Object element);
-}
-

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableCheckboxTableViewer.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableCheckboxTableViewer.java
deleted file mode 100644
index 9a65a6a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableCheckboxTableViewer.java
+++ /dev/null

@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ICheckable;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.ptp.debug.internal.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * @author Clement chu
- */
-public class PVariableCheckboxTableViewer extends TableViewer implements ICheckable {
-	private ListenerList checkStateListeners = new ListenerList();
-	private ICheckProvider checkProvider = null;
-	
-	// String constants
-	protected static final String YES_VALUE = PVariableMessages.getString("PExpressionViewer.yes");
-	protected static final String NO_VALUE = PVariableMessages.getString("PExpressionViewer.no");
-
-	// Column properties
-	private static final String CP_NAME = "name";
-	private static final String CP_JOB = "job";
-
-	// Column labels
-	private static final String CL_NAME = PVariableMessages.getString("PExpressionViewer.name");
-	private static final String CL_JOB = PVariableMessages.getString("PExpressionViewer.job");
-
-	/**
-	 * Constructor for PExpressionViewer
-	 * 
-	 * @param parent
-	 * @param style
-	 */
-	public PVariableCheckboxTableViewer(Composite parent, int style) {
-		super(parent, SWT.CHECK | style);
-		Table table = getTable();
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Create the table columns
-		new TableColumn(table, SWT.NULL);
-		new TableColumn(table, SWT.NULL);
-		new TableColumn(table, SWT.NULL);
-		TableColumn[] columns = table.getColumns();
-		columns[0].setResizable(false);
-		columns[1].setResizable(true);
-		columns[2].setResizable(true);
-
-		columns[0].setText("");
-		columns[1].setText(CL_NAME);
-		columns[2].setText(CL_JOB);
-
-		columns[0].addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				((PVariableViewerSorter)getSorter()).setColumn(0);
-				refresh();
-			}
-		});
-		columns[1].addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				((PVariableViewerSorter)getSorter()).setColumn(1);
-				refresh();
-			}
-		});
-		columns[2].addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				((PVariableViewerSorter)getSorter()).setColumn(2);
-				refresh();
-			}
-		});
-
-		PixelConverter pc = new PixelConverter(parent);
-		columns[0].setWidth(pc.convertWidthInCharsToPixels(3));
-		columns[1].setWidth(pc.convertWidthInCharsToPixels(20));
-		columns[2].setWidth(pc.convertWidthInCharsToPixels(20));
-
-		setColumnProperties(new String[]{ "", CP_NAME, CP_JOB });
-	}
-	
-    public void addCheckStateListener(ICheckStateListener listener) {
-        checkStateListeners.add(listener);
-    }
-    public void removeCheckStateListener(ICheckStateListener listener) {
-        checkStateListeners.remove(listener);
-    }
-    
-    public void setCheckProvider(ICheckProvider checkProvider) {
-    	this.checkProvider = checkProvider;
-    }
-    
-    private void fireCheckStateChanged(final CheckStateChangedEvent event) {
-        Object[] array = checkStateListeners.getListeners();
-        for (int i = 0; i < array.length; i++) {
-            final ICheckStateListener l = (ICheckStateListener) array[i];
-            SafeRunnable.run(new SafeRunnable() {
-                public void run() {
-                    l.checkStateChanged(event);
-                }
-            });
-        }
-    }
-    public void handleSelect(SelectionEvent event) {
-        if (event.detail == SWT.CHECK) {
-            super.handleSelect(event); // this will change the current selection
-
-            TableItem item = (TableItem) event.item;
-            Object data = item.getData();
-            if (data != null) {
-                fireCheckStateChanged(new CheckStateChangedEvent(this, data, item.getChecked()));
-            }
-        } else {
-			super.handleSelect(event);
-		}
-    }
-    public boolean getChecked(Object element) {
-        Widget widget = findItem(element);
-        if (widget instanceof TableItem) {
-            return ((TableItem) widget).getChecked();
-        }
-        return false;
-    }
-    public boolean setChecked(Object element, boolean state) {
-        Assert.isNotNull(element);
-        Widget widget = findItem(element);
-        if (widget instanceof TableItem) {
-            ((TableItem) widget).setChecked(state);
-            return true;
-        }
-        return false;
-    }	
-	protected void doUpdateItem(Widget widget, Object element, boolean fullMap) {
-		super.doUpdateItem(widget, element, fullMap);
-		if (widget instanceof TableItem) {
-			if (checkProvider != null) {
-				((TableItem)widget).setChecked(checkProvider.isCheck(element));
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableContentProvider.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableContentProvider.java
deleted file mode 100644
index 2aa15f7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableContentProvider.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager;
-
-/**
- * @author Clement chu
- */
-public class PVariableContentProvider implements IStructuredContentProvider {
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof PVariableManager) {
-			return ((PVariableManager)inputElement).getPVariableInfo();
-		}
-		return new Object[0];
-	}
-	public void dispose() {}
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableDialog.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableDialog.java
deleted file mode 100644
index badb6af..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableDialog.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager.PVariableInfo;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Clement chu
- */
-public class PVariableDialog extends Dialog {
-	public static final int NEW_MODE = 0;
-	public static final int EDIT_MODE = 1;
-	protected Text varText = null;
-	protected Table varTable = null;
-	protected Button checkBtn = null;
-	protected PVariableView view = null;
-	protected int mode = NEW_MODE;
-
-	public PVariableDialog(PVariableView view) {
-		this(view, NEW_MODE);
-	}
-	public PVariableDialog(PVariableView view, int mode) {
-		super(view.getSite().getShell());
-		this.view = view;
-		this.mode = mode;
-	}
-	public void configureShell(Shell newShell) {
-		newShell.setText(PVariableMessages.getString("PVariablesDialog.title"));
-		super.configureShell(newShell);
-	}
-	/** Get OK Button
-     * @return
-     */
-    public Button getOkButton() {
-        return getButton(IDialogConstants.OK_ID);
-    }
-	private void createOthersSection(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(1, false);
-		layout.marginHeight = 5;
-		layout.marginWidth = 5;
-		layout.verticalSpacing = 25;
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
-		checkBtn = new Button(comp, SWT.CHECK);
-		checkBtn.setText(PVariableMessages.getString("PVariablesDialog.checkBtn"));
-		checkBtn.setSelection(true);
-	}
-
-    /** Display the available variable in debugger
-	 * @param parent
-	 */
-	private void createVarSection(Composite parent) {
-		Group aGroup = new Group(parent, SWT.BORDER);
-		aGroup.setText(PVariableMessages.getString("PVariablesDialog.varSection"));
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginHeight = 5;
-		layout.marginWidth = 5;
-		aGroup.setLayout(layout);
-		aGroup.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false, 2, 1));
-		
-		Label availLabel = new Label(aGroup, SWT.NONE);
-		availLabel.setText(PVariableMessages.getString("PVariablesDialog.availVar"));
-		availLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false, 2, 1));
-		
-		varTable = new Table(aGroup, SWT.CHECK | SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gd.widthHint = 300;
-        gd.heightHint = 150;
-		//gd.verticalSpan = 30;
-		varTable.setLayoutData(gd);
-		varTable.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				TableItem item = (TableItem)e.item;
-				boolean checked = item.getChecked();
-				if (checked) {
-					varText.setText("");
-				}
-				updateButtons();
-				item.setChecked(checked);
-			}
-		});
-
-		Label custLabel = new Label(aGroup, SWT.NONE);
-		custLabel.setText(PVariableMessages.getString("PVariablesDialog.custVar"));
-		custLabel.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false, 2, 1));
-		varText = new Text(aGroup, SWT.BORDER | SWT.NONE);
-		varText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		varText.addKeyListener(new KeyAdapter() {
-			public void keyReleased(KeyEvent e) {
-				if (varText.getText().length() > 0) {
-					TableItem[] items = varTable.getItems();
-					for (int i=0; i<items.length; i++) {
-						items[i].setChecked(false);
-					}
-				}
-				updateButtons();
-			}
-		});
-		varText.setFocus();
-	}
-	private boolean anyTableItemChecked(Table table) {
-		TableItem[] items = table.getItems();
-		for (int i=0; i<items.length; i++) {
-			if (items[i].getChecked())
-				return true;
-		}
-		return false;
-	}
-	private void updateButtons() {
-		boolean enabled = true;
-		if (getSelectedVariables().length == 0) {
-			enabled = false;
-		}
-		getOkButton().setEnabled(enabled);
-	}
-	/** Initialize the content in new section and variable section
-	 * 
-	 */
-	protected void initContent() {
-		PVariableInfo jVar = null;
-		if (mode == EDIT_MODE) {
-			ISelection selection = view.getSelection();
-			if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-				jVar = (PVariableInfo)((IStructuredSelection)selection).getFirstElement();
-				varText.setText(jVar.getName());
-				checkBtn.setSelection(jVar.isEnabled());
-			}
-		}
-
-		TableItem item = null;		
-		for (String var : getAvailableVariables()) {
-			item = new TableItem(varTable, SWT.NONE);
-			item.setText(var);
-			if (jVar != null) {
-				item.setChecked(jVar.getName().equals(var));
-			}
-		}		
-	}
-	/** Get variables from Debug View
-	 * @return variable names
-	 */
-	protected String[] getAvailableVariables() {
-		ISelection selection = view.getSite().getPage().getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
-		if (selection.isEmpty()) {
-			return new String[0];
-		}
-		if (selection instanceof IStructuredSelection) {
-			Object target = ((IStructuredSelection)selection).getFirstElement();
-			try {
-				if (target instanceof IStackFrame) {
-					return getVariables((IStackFrame)target);
-				}
-				else if (target instanceof IThread) {
-					return getVariables(((IThread)target).getTopStackFrame());
-				}
-				else if (target instanceof IPDebugTarget) {
-					IThread[] threads = ((IPDebugTarget)target).getThreads();
-					if (threads.length > 0) {
-						return getVariables(threads[0].getTopStackFrame());
-					}
-				}
-			} catch (DebugException e) {
-				return new String[0];
-			}
-		}
-		return new String[0];
-	}
-	private String[] getVariables(IStackFrame frame) throws DebugException {
-		if (frame == null) 
-			return new String[0];
-		
-		IVariable[] vars = frame.getVariables();
-		String[] varTexts = new String[vars.length];
-		for (int j=0; j<vars.length; j++) {
-			varTexts[j] = vars[j].getName();
-		}
-		return varTexts;
-	}
-	/** Create vertical space
-	 * @param parent
-	 * @param space
-	 */
-	protected void createVerticalSpan(Composite parent, int space) {
-		Label label = new Label(parent, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.verticalSpan = space;
-		label.setLayoutData(gd);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createButtonBar(Composite parent) {
-		Control control = super.createButtonBar(parent);
-		switch(mode) {
-		case NEW_MODE:
-			getOkButton().setText("Create");
-			break;
-		case EDIT_MODE:
-			getOkButton().setText("Edit");
-			break;
-		}
-		updateButtons();
-		return control;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite)super.createDialogArea(parent);
-
-		createVarSection(composite);
-		createVerticalSpan(composite, 2);
-		createOthersSection(composite);
-
-		initContent();
-		return composite;
-	}
-	protected String[] getSelectedVariables() {
-		List<String> vars = new ArrayList<String>();
-		TableItem[] items = varTable.getItems();
-		for (int i=0; i<items.length; i++) {
-			if (items[i].getChecked()) {
-				vars.add(items[i].getText());
-				items[i].setChecked(mode==NEW_MODE);
-			}
-		}
-		if (vars.size() == 0) {
-			if (varText.getText().length() > 0) {
-				vars.add(varText.getText());
-			}
-		}
-		return (String[])vars.toArray(new String[0]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		PVariableManager jobMgr = view.getUIManager().getJobVariableManager();
-		IPJob job = view.getUIManager().getJob();
-		String[] vars = getSelectedVariables();
-		boolean checked = checkBtn.getSelection();
-		switch(mode) {
-		case NEW_MODE:
-			//check duplicate variable
-			for (int i=0; i<vars.length; i++) {
-				try {
-					jobMgr.addVariable(job, vars[i], checked);
-				}
-				catch (CoreException e) {
-					PTPDebugUIPlugin.errorDialog("Duplicate variable", e.getStatus());
-				}
-			}
-			break;
-		case EDIT_MODE:
-			ISelection selection = view.getSelection();
-			if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-				PVariableInfo jVar = (PVariableInfo)((IStructuredSelection)selection).getFirstElement();
-				for (String var : vars) {
-					String newvar = jVar.getName().equals(var)?null:var;
-					try {
-						jobMgr.updateVariable(job, jVar.getName(), newvar, checked);
-					}
-					catch (CoreException e) {
-						
-					}
-				}
-			}
-			break;
-		}
-		super.okPressed();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableLabelProvider.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableLabelProvider.java
deleted file mode 100644
index 08904d7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableLabelProvider.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager.PVariableInfo;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Clement chu
- */
-public class PVariableLabelProvider extends LabelProvider implements ITableLabelProvider, ICheckProvider {
-	public boolean isCheck(Object element) {
-		if (element instanceof PVariableInfo) {
-			return ((PVariableInfo)element).isEnabled();
-		}
-		return false;
-	}
-	public Image getColumnImage(Object element, int columnIndex) {
-		return null;
-	}
-	public String getColumnText(Object element, int columnIndex) {
-		if (element instanceof PVariableInfo) {
-			PVariableInfo jVar = (PVariableInfo)element;
-			switch(columnIndex) {
-			case 1:
-				return jVar.getName();
-			case 2:
-				return jVar.getJob().getName();
-			}
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.java
deleted file mode 100644
index 5ef81d8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author Clement chu
- */
-public class PVariableMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.debug.internal.ui.views.variable.PVariableMessages";
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private PVariableMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.properties b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.properties
deleted file mode 100644
index 833cd3c..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableMessages.properties
+++ /dev/null

@@ -1,35 +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
- ###############################################################################
-##
- # @author Clement
- #
- ##
-
-PExpressionViewer.name=Name
-PExpressionViewer.set=Set
-PExpressionViewer.job=Job
-PExpressionViewer.yes=yes
-PExpressionViewer.no=no
-
-PVariablesDialog.title=PTP Variable
-PVariablesDialog.availVar=Available variable from debugger:
-PVariablesDialog.custVar=Expression:
-PVariablesDialog.setSection=Sets
-PVariablesDialog.varSection=Variable
-PVariablesDialog.checkBtn=Enable/Disable variable

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableView.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableView.java
deleted file mode 100644
index 7733c72..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableView.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.ui.AbstractDebugView;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager.PVariableInfo;
-import org.eclipse.ptp.debug.internal.ui.actions.AddPExpressionAction;
-import org.eclipse.ptp.debug.internal.ui.actions.CompareValueAction;
-import org.eclipse.ptp.debug.internal.ui.actions.DeletePExpressionAction;
-import org.eclipse.ptp.debug.internal.ui.actions.EditPExpressionAction;
-import org.eclipse.ptp.debug.internal.ui.actions.UpdatePExpressionAction;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractPDebugViewEventHandler;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-
-/**
- * @author Clement chu
- */
-public class PVariableView extends AbstractDebugView implements ICheckStateListener {
-	private AbstractPDebugViewEventHandler fEventHandler;
-	private UIDebugManager uiManager = null;
-	private PVariableCheckboxTableViewer viewer = null;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Viewer createViewer(Composite parent) {
-		uiManager = PTPDebugUIPlugin.getUIDebugManager();
-		
-		// add tree viewer
-		viewer = new PVariableCheckboxTableViewer(parent, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		PVariableContentProvider contentProvider = new PVariableContentProvider();
-		PVariableLabelProvider labelProvider = new PVariableLabelProvider();
-
-		viewer.setContentProvider(contentProvider);
-		viewer.setLabelProvider(labelProvider);
-		viewer.setCheckProvider(labelProvider);
-		viewer.setSorter(new PVariableViewerSorter());
-		viewer.setUseHashlookup(true);
-		viewer.setInput(uiManager.getJobVariableManager());
-		viewer.addCheckStateListener(this);
-	
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-		    public void doubleClick(DoubleClickEvent event) {
-		    	if (!getSelection().isEmpty()) {
-		    		getAction(EditPExpressionAction.name).run();
-		    	}
-		    }
-		});
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-		    public void selectionChanged(SelectionChangedEvent event) {
-		    	updateActionsEnable();
-		    }
-		});
-		setEventHandler(new PVariableViewEventHandler(this));
-		return viewer;
-	}
-	public UIDebugManager getUIManager() {
-		return uiManager;
-	}
-	public void refresh() {
-		viewer.refresh();
-		updateActionsEnable();
-	}
-	public ISelection getSelection() {
-		return viewer.getSelection();
-	}
-	/**
-	 * Sets the event handler for this view
-	 * 
-	 * @param eventHandler event handler
-	 */
-	protected void setEventHandler(AbstractPDebugViewEventHandler eventHandler) {
-		this.fEventHandler = eventHandler;
-	}
-	/**
-	 * Returns the event handler for this view
-	 * 
-	 * @return The event handler for this view
-	 */
-	protected AbstractPDebugViewEventHandler getEventHandler() {
-		return this.fEventHandler;
-	}	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#createActions()
-	 */
-	protected void createActions() {
-		setAction(AddPExpressionAction.name, new AddPExpressionAction(this));
-		setAction(EditPExpressionAction.name, new EditPExpressionAction(this));
-		setAction(DeletePExpressionAction.name, new DeletePExpressionAction(this));
-		setAction(UpdatePExpressionAction.name, new UpdatePExpressionAction(this));
-		setAction(CompareValueAction.name, new CompareValueAction(this));
-
-		updateActionsEnable();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager)
-	 */
-	protected void configureToolBar(IToolBarManager toolBarMgr) {
-		toolBarMgr.add(new Separator(IPTPDebugUIConstants.VAR_GROUP));
-
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.VAR_GROUP, getAction(AddPExpressionAction.name));		
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.VAR_GROUP, getAction(EditPExpressionAction.name));		
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.VAR_GROUP, getAction(DeletePExpressionAction.name));		
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.VAR_GROUP, getAction(UpdatePExpressionAction.name));
-		toolBarMgr.add(new Separator());
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.VAR_GROUP, getAction(CompareValueAction.name));
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId()
-	 */
-	protected String getHelpContextId() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager menu) {
-		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-		menu.add(getAction(AddPExpressionAction.name));
-		menu.add(getAction(EditPExpressionAction.name));
-		menu.add(getAction(DeletePExpressionAction.name));
-		menu.add(getAction(UpdatePExpressionAction.name));
-		menu.add(new Separator());
-		menu.add(getAction(CompareValueAction.name));
-		updateObjects();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		viewer.removeCheckStateListener(this);
-		super.dispose();
-		if (getEventHandler() != null) {
-			getEventHandler().dispose();
-		}	
-	}
-
-	private boolean isEmpty() {
-		return (viewer.getTable().getItemCount()==0);
-	}
-	private boolean isCurrentJobAvailable() {
-		String cur_jid = uiManager.getCurrentJobId();
-		return (cur_jid != null && cur_jid.length() > 0);		
-	}
-	public void updateActionsEnable() {
-		getAction(AddPExpressionAction.name).setEnabled(isCurrentJobAvailable());
-		getAction(EditPExpressionAction.name).setEnabled(!getSelection().isEmpty());
-		getAction(DeletePExpressionAction.name).setEnabled(!getSelection().isEmpty());
-		getAction(UpdatePExpressionAction.name).setEnabled(!isEmpty());
-		getAction(CompareValueAction.name).setEnabled(!getSelection().isEmpty());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
-	 */
-	public void checkStateChanged(CheckStateChangedEvent event) {
-		Object data = event.getElement();
-		if (data instanceof PVariableInfo) {
-			try {
-				getUIManager().getJobVariableManager().updateVariableStatus((PVariableInfo)data, event.getChecked());
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewEventHandler.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewEventHandler.java
deleted file mode 100644
index c2538d8..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewEventHandler.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.core.event.IPDebugInfo;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractPDebugViewEventHandler;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.listeners.IJobChangedListener;
-
-/**
- * @author Clement chu
- */
-public class PVariableViewEventHandler extends AbstractPDebugViewEventHandler implements IJobChangedListener {
-	private PVariableManager varMgr;
-	/**
-	 * Constructs a new event handler on the given view
-	 * @param view variable viewer
-	 */
-	public PVariableViewEventHandler(PVariableView view) {
-		super(view);
-		varMgr = PTPDebugUIPlugin.getUIDebugManager().getJobVariableManager();
-		PTPDebugUIPlugin.getUIDebugManager().addJobChangedListener(this);
-	}
-	public void dispose() {
-		PTPDebugUIPlugin.getUIDebugManager().removeJobChangedListener(this);
-		super.dispose();
-	}
-	public PVariableView getPVariableView() {
-		return (PVariableView)getView();
-	}
-	public void refresh(boolean all) {
-		if (getPVariableView().isVisible()) {
-			getPVariableView().refresh();
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.internal.ui.views.AbstractPDebugViewEventHandler#doHandleDebugEvent(org.eclipse.ptp.debug.core.event.IPDebugEvent, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doHandleDebugEvent(IPDebugEvent event, IProgressMonitor monitor) {
-		switch(event.getKind()) {
-			case IPDebugEvent.RESUME:
-				IPDebugInfo info = event.getInfo();
-				varMgr.resetValue(info.getJob(), info.getAllTasks());
-				break;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.listeners.IJobChangedListener#jobChangedEvent(java.lang.String, java.lang.String)
-	 */
-	public void jobChangedEvent(int type, String cur_job_id, String pre_job_id) {
-		switch (type) {
-		case IJobChangedListener.CHANGED:
-			//refresh();
-			break;
-		case IJobChangedListener.REMOVED:
-			if (pre_job_id != null) {
-				varMgr.removeVariable(pre_job_id);
-				refresh();
-			}
-			break;
-		}
-		getPVariableView().updateActionsEnable();
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewerSorter.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewerSorter.java
deleted file mode 100644
index a458f2b..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/internal/ui/views/variable/PVariableViewerSorter.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.internal.ui.views.variable;
-
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.debug.internal.ui.PVariableManager.PVariableInfo;
-
-/**
- * @author Clement chu
- */
-public class PVariableViewerSorter extends ViewerSorter {
-	private boolean[] sortOrder = new boolean[] { false, false, false, false };
-	private int column = 0;
-	
-	public void setColumn(int column) {
-		this.column = column;
-		sortOrder[column] = !sortOrder[column];
-	}
-	public int getColumn() {
-		return column;
-	}
-    public int compare(Viewer viewer, Object e1, Object e2) {
-    	if (!(e1 instanceof PVariableInfo)) {
-    		return super.compare(viewer, e1, e2);
-    	}
-    	
-   		boolean isAccending = sortOrder[column];
-		switch (column) {
-		case 0:
-			if (isAccending) {
-				return ((PVariableInfo)e1).isEnabled()?1:-1;
-			}
-			else {
-				return ((PVariableInfo)e2).isEnabled()?1:-1;
-			}
-		default:
-	    	if (viewer instanceof StructuredViewer) {
-	    		ITableLabelProvider lprov = (ITableLabelProvider) ((StructuredViewer)viewer).getLabelProvider();
-				String name1= lprov.getColumnText(e1, column);
-				String name2= lprov.getColumnText(e2, column);
-				if (isAccending) {
-					return name1.compareTo(name2);
-				}
-				else {
-					return name2.compareTo(name1);
-				}
-	    	}
-		}
-    	return 0;
-    }
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/IPTPDebugUIConstants.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/IPTPDebugUIConstants.java
deleted file mode 100644
index a301fb5..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/IPTPDebugUIConstants.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui;
-
-/**
- * @author Clement chu
- *
- */
-public interface IPTPDebugUIConstants {
-	public static final String PLUGIN_ID = PTPDebugUIPlugin.getUniqueIdentifier();
-	public static final String PREFIX = PLUGIN_ID + ".";
-	
-	public static final String ID_PERSPECTIVE_DEBUG = PREFIX + "PTPDebugPerspective";
-	public static final String ID_VIEW_PARALLELDEBUG = PREFIX + "views.parallelDebugView";
-	public static final String ID_VIEW_ARRAY = PREFIX + "views.ArrayView";
-	public static final String ID_VIEW_SIGNAL = PREFIX + "views.SignalsView";
-	public static final String ID_VIEW_VARIABLE = PREFIX + "views.PVariableView";
-	public static final String ID_BREAKPOINT_ORGANIZER = PREFIX + "pBreakpointSetOrganizer";
-	
-	public static final String ACTION_BREAKPOINT_PROPERTIES = PREFIX + "breakpointProperties";
-	public static final String ACTION_ENABLE_DISABLE_BREAKPOINT = PREFIX + "enableDisableBreakpoint";
-	public static final String ACTION_SET_BREAKPOINT = PREFIX + "toggleBreakpointRulerAction";
-		
-	public static final String REG_ANN_INSTR_POINTER_CURRENT = PREFIX + "regCurrentIP";
-	public static final String REG_ANN_INSTR_POINTER_SECONDARY = PREFIX + "regSecondaryIP";
-	public static final String CURSET_ANN_INSTR_POINTER_CURRENT = PREFIX + "currentSetIP";
-	public static final String SET_ANN_INSTR_POINTER_CURRENT = PREFIX + "setIP";
-	
-	
-	public static final String THREAD_GROUP = "threadGroup";
-	public static final String STEP_GROUP = "stepGroup";
-	public static final String STEP_INTO_GROUP = "stepIntoGroup";
-	public static final String STEP_OVER_GROUP = "stepOverGroup";
-	public static final String STEP_RETURN_GROUP = "stepReturnGroup";
-	public static final String EMPTY_STEP_GROUP = "emptyStepGroup";	
-	public static final String REG_GROUP = "regGroup";	
-
-	public static final String VAR_GROUP = "VarGroup";	
-	
-	public static final String IUITABEMPTYGROUP = "emptygroup";
-    public static final String IUITABVARIABLEGROUP = "variablegroup";	
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PTPDebugUIPlugin.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PTPDebugUIPlugin.java
deleted file mode 100644
index e155072..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PTPDebugUIPlugin.java
+++ /dev/null

@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.model.IPersistableSourceLocator;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ptp.debug.internal.ui.PDebugImage;
-import org.eclipse.ptp.debug.internal.ui.PDebugModelPresentation;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.ui.sourcelookup.DefaultSourceLocator;
-import org.eclipse.ptp.ui.IPTPUIConstants;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author clement chu
- * The main plugin class to be used in the desktop.
- */
-public class PTPDebugUIPlugin extends AbstractUIPlugin {
-	public static final String PLUGIN_ID = "org.eclipse.ptp.debug.ui";
-
-	private static PTPDebugUIPlugin plugin;
-	private static UIDebugManager uiDebugManager = null;
-	
-	/**
-	 * Create a default source locator
-	 * 
-	 * @return default source locator
-	 */
-	public static IPersistableSourceLocator createDefaultSourceLocator() {
-		return new DefaultSourceLocator();
-	}
-	
-	/** 
-	 * Show error dialog
-	 * 
-	 * @param shell
-	 * @param title
-	 * @param s
-	 */
-	public static void errorDialog(Shell shell, String title, IStatus s) {
-		errorDialog(shell, title, s.getMessage(), s);
-	}
-
-	/** 
-	 * Show error dialog
-	 * 
-	 * @param shell
-	 * @param title
-	 * @param message
-	 * @param s
-	 */
-	public static void errorDialog(Shell shell, String title, String message, IStatus s) {
-		if (s != null && message.equals(s.getMessage()))
-			message = null;
-
-		ErrorDialog.openError(shell, title, message, s);
-	}
-	
-    /** 
-	 * Show error dialog
-	 * 
-	 * @param shell
-	 * @param title
-	 * @param message
-	 * @param t
-	 */
-	public static void errorDialog(Shell shell, String title, String message, Throwable t) {
-		IStatus status;
-		if (t instanceof CoreException) {
-			status = ((CoreException)t).getStatus();
-		} else {
-			status = new Status(IStatus.ERROR, getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, "Error within Debug UI: ", t);
-			log(status);	
-		}
-		errorDialog(shell, title, message, status);
-	}	
-
-	/** 
-	 * Show error dialog
-	 * 
-	 * @param shell
-	 * @param title
-	 * @param t
-	 */
-	public static void errorDialog(Shell shell, String title, Throwable t) {
-		errorDialog(shell, title, t.getMessage(), t);
-	}
-	
-	/** 
-	 * Show error dialog
-	 * 
-	 * @param title
-	 * @param s
-	 */
-	public static void errorDialog(String title, IStatus s) {
-		errorDialog(getActiveWorkbenchShell(), title, s.getMessage(), s);
-	}
-	
-	/** 
-	 * Show error dialog
-	 * 
-	 * @param title
-	 * @param t
-	 */
-	public static void errorDialog(String title, Throwable t) {
-		errorDialog(getActiveWorkbenchShell(), title, t.getMessage(), t);
-	}
-
-	/** 
-	 * Get active workbench shell
-	 * 
-	 * @return active workbench shell
-	 */
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window != null) {
-			return window.getShell();
-		}
-		return null;
-	}
-
-	/** 
-	 * Get active workbench window
-	 * 
-	 * @return active workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * @return
-	 */
-	public static PDebugModelPresentation getDebugModelPresentation() {
-		return PDebugModelPresentation.getDefault();
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PTPDebugUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/** 
-	 * Get display
-	 * 
-	 * @return display
-	 */
-	public static Display getDisplay() {
-		Display display= Display.getCurrent();
-		if (display == null) {
-			display= Display.getDefault();
-		}
-		return display;		
-	}
-	
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-	
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = PTPDebugUIPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}	
-	
-	/** 
-	 * Get shell
-	 * 
-	 * @return shell
-	 */
-	public static Shell getShell() {
-		if (getActiveWorkbenchWindow() != null) {
-			return getActiveWorkbenchWindow().getShell();
-		}
-		return null;
-	}
-	
-	/** 
-	 * Get standard display
-	 * 
-	 * @return display
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-	
-	public static UIDebugManager getUIDebugManager() {
-		return uiDebugManager;
-	}
-	
-	/** Get unique identifier of plugin
-	 * 
-	 * @return plugin identifier
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			return PLUGIN_ID;
-
-		return getDefault().getBundle().getSymbolicName();
-	}
-	
-	/** 
-	 * Test if the current perspective is the PTP debug perspective
-	 * 
-	 * @return true if the current perspective is the PTP debug perspective
-	 */
-	public static boolean isPTPDebugPerspective() {
-		return getCurrentPerspectiveID().equals(IPTPDebugUIConstants.ID_PERSPECTIVE_DEBUG);		
-	}
-	
-	/**
-	 * Test if the current perspective is one supplied by PTP
-	 * 
-	 * @return true if the current perspective is supplied by PTP
-	 */
-	public static boolean isPTPPerspective() {
-		String curID = getCurrentPerspectiveID();
-		if (curID == null)
-			return false;
-		return (curID.equals(IPTPUIConstants.PERSPECTIVE_RUN) || curID.equals(IPTPDebugUIConstants.ID_PERSPECTIVE_DEBUG));
-	}
-	
-	/** 
-	 * Log
-	 * 
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-	
-	/** 
-	 * Log 
-	 * 
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-	
-	/** 
-	 * Log
-	 * 
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IPTPUIConstants.INTERNAL_ERROR, "Internal Error", e));
-	}
-	
-	/** 
-	 * Get current perspective ID
-	 * 
-	 * @return current perspective ID
-	 */
-	private static String getCurrentPerspectiveID() {
-		return getActiveWorkbenchWindow().getActivePage().getPerspective().getId();
-	}
-	
-	public static final String PDEBUGGERCONFIGURATION_EXTENSION_POINT_ID = "debuggerConfigurations";
-	public static final String DEBUGGERID_ELEMENT = "debuggerID";
-
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	protected Map<String, IConfigurationElement> fDebuggerPageMap;
-
-	/**
-	 * The constructor.
-	 */
-	public PTPDebugUIPlugin() {
-		super();
-		plugin = this;
-	}
-	
-	/** 
-	 * Get launch debugger tab
-	 * 
-	 * @param debuggerID
-	 * @return
-	 * @throws CoreException
-	 */
-	public ILaunchConfigurationTab getDebuggerPage(String debuggerID) throws CoreException {
-		if (fDebuggerPageMap == null) {
-			initializeDebuggerPageMap();
-		}
-		IConfigurationElement configElement = (IConfigurationElement)fDebuggerPageMap.get(debuggerID);
-		ILaunchConfigurationTab tab = null;
-		if (configElement != null) {
-			tab = (ILaunchConfigurationTab)configElement.createExecutableExtension("class");
-		}
-		return tab;
-	}
-	
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.ptp.debug.ui.UiPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-	
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		uiDebugManager = new UIDebugManager();
-	}
-	
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		uiDebugManager.shutdown();
-		uiDebugManager = null;
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-	
-	/** 
-	 * Initialize launch debugger page  
-	 * 
-	 */
-	protected void initializeDebuggerPageMap() {
-		fDebuggerPageMap = new HashMap<String, IConfigurationElement>(10);
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, PDEBUGGERCONFIGURATION_EXTENSION_POINT_ID);
-		IConfigurationElement[] infos = extensionPoint.getConfigurationElements();
-		for(int i = 0; i < infos.length; i++) {
-			String id = infos[i].getAttribute(DEBUGGERID_ELEMENT);
-			fDebuggerPageMap.put(id, infos[i]);
-		}
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry)
-	 */
-	protected void initializeImageRegistry(ImageRegistry reg) {
-    	PDebugImage.initializeImageRegistry(reg);
-    }
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PreferencesAdapter.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PreferencesAdapter.java
deleted file mode 100644
index 005c130..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/PreferencesAdapter.java
+++ /dev/null

@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.debug.ui;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * Adapts {@link org.eclipse.core.runtime.Preferences} to
- * {@link org.eclipse.jface.preference.IPreferenceStore}
- * 
- * @since 3.0
- */
-public class PreferencesAdapter implements IPreferenceStore {
-
-	/**
-	 * Property change listener. Listens for events of type
-	 * {@link org.eclipse.core.runtime.Preferences.PropertyChangeEvent} and fires
-	 * a {@link org.eclipse.jface.util.PropertyChangeEvent} on the
-	 * adapter with arguments from the received event.
-	 */
-	private class PropertyChangeListener implements Preferences.IPropertyChangeListener {
-
-		/*
-		 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
-		 */
-		public void propertyChange(Preferences.PropertyChangeEvent event) {
-			firePropertyChangeEvent(event.getProperty(), event.getOldValue(), event.getNewValue());
-		}
-	}
-	
-	/** Listeners on the adapter */
-	private ListenerList fListeners= new ListenerList(ListenerList.IDENTITY);
-	
-	/** Listener on the adapted Preferences */
-	private PropertyChangeListener fListener= new PropertyChangeListener();
-	
-	/** Adapted Preferences */
-	private Preferences fPreferences;
-
-	/** True iff no events should be forwarded */
-	private boolean fSilent;
-	
-	/**
-	 * Initialize with empty Preferences.
-	 */
-	public PreferencesAdapter() {
-		this(new Preferences());
-	}
-	/**
-	 * Initialize with the given Preferences.
-	 * 
-	 * @param preferences The preferences to wrap.
-	 */
-	public PreferencesAdapter(Preferences preferences) {
-		fPreferences= preferences;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void addPropertyChangeListener(IPropertyChangeListener listener) {
-		if (fListeners.size() == 0)
-			fPreferences.addPropertyChangeListener(fListener);
-		fListeners.add(listener);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void removePropertyChangeListener(IPropertyChangeListener listener) {
-		fListeners.remove(listener);
-		if (fListeners.size() == 0)
-			fPreferences.removePropertyChangeListener(fListener);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean contains(String name) {
-		return fPreferences.contains(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
-		if (!fSilent) {
-			PropertyChangeEvent event= new PropertyChangeEvent(this, name, oldValue, newValue);
-			Object[] listeners= fListeners.getListeners();
-			for (int i= 0; i < listeners.length; i++)
-				((IPropertyChangeListener) listeners[i]).propertyChange(event);
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean getBoolean(String name) {
-		return fPreferences.getBoolean(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean getDefaultBoolean(String name) {
-		return fPreferences.getDefaultBoolean(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public double getDefaultDouble(String name) {
-		return fPreferences.getDefaultDouble(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public float getDefaultFloat(String name) {
-		return fPreferences.getDefaultFloat(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public int getDefaultInt(String name) {
-		return fPreferences.getDefaultInt(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public long getDefaultLong(String name) {
-		return fPreferences.getDefaultLong(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getDefaultString(String name) {
-		return fPreferences.getDefaultString(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public double getDouble(String name) {
-		return fPreferences.getDouble(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public float getFloat(String name) {
-		return fPreferences.getFloat(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public int getInt(String name) {
-		return fPreferences.getInt(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public long getLong(String name) {
-		return fPreferences.getLong(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public String getString(String name) {
-		return fPreferences.getString(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isDefault(String name) {
-		return fPreferences.isDefault(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean needsSaving() {
-		return fPreferences.needsSaving();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void putValue(String name, String value) {
-		try {
-			fSilent= true;
-			fPreferences.setValue(name, value);
-		} finally {
-			fSilent= false;
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setDefault(String name, double value) {
-		fPreferences.setDefault(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setDefault(String name, float value) {
-		fPreferences.setDefault(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setDefault(String name, int value) {
-		fPreferences.setDefault(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setDefault(String name, long value) {
-		fPreferences.setDefault(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setDefault(String name, String defaultObject) {
-		fPreferences.setDefault(name, defaultObject);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setDefault(String name, boolean value) {
-		fPreferences.setDefault(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setToDefault(String name) {
-		fPreferences.setToDefault(name);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setValue(String name, double value) {
-		fPreferences.setValue(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setValue(String name, float value) {
-		fPreferences.setValue(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setValue(String name, int value) {
-		fPreferences.setValue(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setValue(String name, long value) {
-		fPreferences.setValue(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setValue(String name, String value) {
-		fPreferences.setValue(name, value);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setValue(String name, boolean value) {
-		fPreferences.setValue(name, value);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/DebugActionEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/DebugActionEvent.java
deleted file mode 100644
index c2804f6..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/DebugActionEvent.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-
-/**
- * @author Clement chu
- * @deprecated
- */
-public abstract class DebugActionEvent implements IDebugActionEvent {
-	private Object source = null;
-	private String job_id = "";
-	private Object target = null;
-	
-	/** Constructor
-	 * @param job_id
-	 * @param source
-	 * @param target
-	 */
-	public DebugActionEvent(String job_id, Object source, Object target) {
-		this.job_id = job_id;
-		this.source = source;
-		this.target = target;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.ui.events.IDebugActionEvent#getJobId()
-	 */
-	public String getJobId() {
-		return job_id;
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.ui.events.IDebugActionEvent#getSource()
-	 */
-	public Object getSource() {
-		return source;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.debug.ui.events.IDebugActionEvent#getTarget()
-	 */
-	public Object getTarget() {
-		return target;
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IDebugActionEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IDebugActionEvent.java
deleted file mode 100644
index 4f9bc05..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IDebugActionEvent.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-/**
- * @author Clement chu
- * @deprecated
- */
-public interface IDebugActionEvent {
-	/** Get job ID
-	 * @return
-	 */
-	public String getJobId();
-	/** Get source object
-	 * @return
-	 */
-	public Object getSource();
-	/** Get debug target
-	 * @return
-	 */
-	public Object getTarget();
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IResumedDebugEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IResumedDebugEvent.java
deleted file mode 100644
index 2aa97f7..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/IResumedDebugEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-/**
- * @author Clement chu
- * @deprecated
- */
-public interface IResumedDebugEvent extends IDebugActionEvent {}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ISuspendedDebugEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ISuspendedDebugEvent.java
deleted file mode 100644
index 4a4db3d..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ISuspendedDebugEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-/**
- * @author Clement chu
- * @deprecated
- */
-public interface ISuspendedDebugEvent  extends IDebugActionEvent {}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ITerminatedDebugEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ITerminatedDebugEvent.java
deleted file mode 100644
index 4c12caf..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ITerminatedDebugEvent.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-/**
- * @author Clement chu
- * @deprecated
- */
-public interface ITerminatedDebugEvent  extends IDebugActionEvent {}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ResumedDebugEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ResumedDebugEvent.java
deleted file mode 100644
index ddb3c45..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/ResumedDebugEvent.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-
-
-/**
- * @author Clement chu
- * @deprecated
- */
-public class ResumedDebugEvent extends DebugActionEvent implements IResumedDebugEvent { 
-	/** Constructor
-	 * @param job_id
-	 * @param source
-	 * @param target
-	 */
-	public ResumedDebugEvent(String job_id, Object source, Object target) {
-		super(job_id, source, target);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/SuspendedDebugEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/SuspendedDebugEvent.java
deleted file mode 100644
index 0d37248..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/SuspendedDebugEvent.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-
-
-/**
- * @author Clement chu
- * @deprecated
- */
-public class SuspendedDebugEvent extends DebugActionEvent implements IResumedDebugEvent {
-	/** Constructor
-	 * @param job_id
-	 * @param source
-	 * @param target
-	 */
-	public SuspendedDebugEvent(String job_id, Object source, Object target) {
-		super(job_id, source, target);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/TerminatedDebugEvent.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/TerminatedDebugEvent.java
deleted file mode 100644
index 5f6901e..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/events/TerminatedDebugEvent.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.events;
-
-/**
- * @author Clement chu
- * @deprecated
- */
-public class TerminatedDebugEvent extends DebugActionEvent implements ITerminatedDebugEvent {
-	/** Constructor
-	 * @param job_id
-	 * @param source
-	 * @param target
-	 */
-	public TerminatedDebugEvent(String job_id, Object source, Object target) {
-		super(job_id, source, target);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IDebugActionUpdateListener.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IDebugActionUpdateListener.java
deleted file mode 100644
index 0937e34..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IDebugActionUpdateListener.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.listeners;
-
-import org.eclipse.ptp.debug.ui.events.IDebugActionEvent;
-
-/**
- * @author Clement chu
- * @deprecated
- */
-public interface IDebugActionUpdateListener {
-	/** Handle debug action event
-	 * @param event
-	 */
-	public void handleDebugActionEvent(IDebugActionEvent event);
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IRegListener.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IRegListener.java
deleted file mode 100644
index 3c36832..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/listeners/IRegListener.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.listeners;
-
-import org.eclipse.ptp.core.util.BitList;
-
-/**
- * @author Clement chu
- * @deprecated
- *
- */
-public interface IRegListener {
-	/** Register tasks
-	 * @param tasks
-	 */
-	public void register(BitList tasks);
-	/** Unregister tasks
-	 * @param tasks
-	 */
-	public void unregister(BitList tasks);
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/sourcelookup/DefaultSourceLocator.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/sourcelookup/DefaultSourceLocator.java
deleted file mode 100644
index 0f3c999..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/sourcelookup/DefaultSourceLocator.java
+++ /dev/null

@@ -1,60 +0,0 @@
-package org.eclipse.ptp.debug.ui.sourcelookup;
-
-import org.eclipse.ptp.debug.core.sourcelookup.PSourceLookupDirector;
-
-public class DefaultSourceLocator extends PSourceLookupDirector {
-	/*
-	public void initializeFromMemento(String memento, ILaunchConfiguration configuration) throws CoreException {
-		Element rootElement = DebugPlugin.parseDocument(memento);
-		if (rootElement.getNodeName().equalsIgnoreCase(OldDefaultSourceLocator.ELEMENT_NAME)) {
-			initializeFromOldMemento(memento, configuration);
-		} else {
-			super.initializeFromMemento(memento, configuration);
-		}
-	}
-	private void initializeFromOldMemento(String memento, ILaunchConfiguration configuration) throws CoreException {
-		dispose();
-		setLaunchConfiguration(configuration);
-		OldDefaultSourceLocator old = new OldDefaultSourceLocator();
-		old.initializeFromMemento(memento);
-		IPSourceLocator csl = (IPSourceLocator) old.getAdapter(IPSourceLocator.class);
-		setFindDuplicates(csl.searchForDuplicateFiles());
-		IPSourceLocation[] locations = csl.getSourceLocations();
-
-		// Check if the old source locator includes all referenced projects.
-		// If so, DefaultSpourceContainer should be used.
-		IProject project = csl.getProject();
-		List<IProject> list = PDebugUtils.getReferencedProjects(project);
-		HashSet<String> names = new HashSet<String>(list.size() + 1);
-		names.add(project.getName());
-		Iterator<IProject> it = list.iterator();
-		while (it.hasNext()) {
-			names.add(((IProject) it.next()).getName());
-		}
-		boolean includesDefault = true;
-		for (int i = 0; i < locations.length; ++i) {
-			if (locations[i] instanceof IProjectSourceLocation && ((IProjectSourceLocation) locations[i]).isGeneric()) {
-				if (!names.contains(((IProjectSourceLocation) locations[i]).getProject().getName())) {
-					includesDefault = false;
-					break;
-				}
-			}
-		}
-		// Generate an array of new source containers including DefaultSourceContainer
-		List<IPSourceLocation> locs = new ArrayList<IPSourceLocation>(locations.length);
-		for (int i = 0; i < locations.length; ++i) {
-			if (!includesDefault || !(locations[i] instanceof IProjectSourceLocation && names.contains(((IProjectSourceLocation) locations[i]).getProject().getName())))
-				locs.add(locations[i]);
-		}
-		ISourceContainer[] containers = SourceUtils.convertSourceLocations((IPSourceLocation[]) locs.toArray(new IPSourceLocation[locs.size()]));
-		List<ISourceContainer> cons = new ArrayList<ISourceContainer>(Arrays.asList(containers));
-		if (includesDefault) {
-			DefaultSourceContainer defaultContainer = new DefaultSourceContainer();
-			defaultContainer.init(this);
-			cons.add(0, defaultContainer);
-		}
-		setSourceContainers((ISourceContainer[]) cons.toArray(new ISourceContainer[cons.size()]));
-		initializeParticipants();
-	}
-	*/
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugView.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugView.java
deleted file mode 100644
index 8a16940..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugView.java
+++ /dev/null

@@ -1,650 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.views;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.internal.ui.viewers.model.InternalTreeModelViewer;
-import org.eclipse.debug.ui.AbstractDebugView;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.util.BitList;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.model.IPDebugElement;
-import org.eclipse.ptp.debug.core.model.IPDebugTarget;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.internal.ui.actions.RegisterAction;
-import org.eclipse.ptp.debug.internal.ui.actions.ResumeAction;
-import org.eclipse.ptp.debug.internal.ui.actions.StepIntoAction;
-import org.eclipse.ptp.debug.internal.ui.actions.StepOverAction;
-import org.eclipse.ptp.debug.internal.ui.actions.StepReturnAction;
-import org.eclipse.ptp.debug.internal.ui.actions.SuspendAction;
-import org.eclipse.ptp.debug.internal.ui.actions.TerminateAction;
-import org.eclipse.ptp.debug.internal.ui.actions.UnregisterAction;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractPDebugViewEventHandler;
-import org.eclipse.ptp.debug.ui.IPTPDebugUIConstants;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.IManager;
-import org.eclipse.ptp.ui.actions.ParallelAction;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-import org.eclipse.ptp.ui.model.IElementSet;
-import org.eclipse.ptp.ui.views.IIconCanvasActionListener;
-import org.eclipse.ptp.ui.views.ParallelJobsView;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.progress.WorkbenchJob;
-
-/**
- * @author clement chu
- * 
- */
-public class ParallelDebugView extends ParallelJobsView {
-	// actions
-	protected ParallelAction resumeAction = null;
-	protected ParallelAction suspendAction = null;
-	protected ParallelAction terminateAction = null;
-	protected ParallelAction stepIntoAction = null;
-	protected ParallelAction stepOverAction = null;
-	protected ParallelAction stepReturnAction = null;
-	protected ParallelAction registerAction = null;
-	protected ParallelAction unregisterAction = null;
-	protected AbstractPDebugViewEventHandler fEventHandler = null;
-	protected Viewer launchViewer = null;
-	
-	protected ISelectionChangedListener debugViewSelectChangedListener = new ISelectionChangedListener() {
-		public void selectionChanged(SelectionChangedEvent event) {
-			ISelection selection = event.getSelection();
-			if (!selection.isEmpty()) {
-				if (selection instanceof IStructuredSelection) {
-					Object element = ((IStructuredSelection)selection).getFirstElement();
-					if (element instanceof IPDebugElement) {
-						if (canvas != null && !canvas.isDisposed()) {
-							if (getCurrentSet() != null) {
-								int index = getCurrentSet().findIndexByName(String.valueOf(((IPDebugElement)element).getID()));
-								if (index > -1) {
-									canvas.unselectAllElements();
-									canvas.selectElement(index);
-									canvas.setCurrentSelection(false);
-									refresh(false);
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	};
-	/*
-	private MouseAdapter debugViewMouseAdapter = new MouseAdapter() {
-		public void mouseUp(MouseEvent event) {
-			Object test = event.getSource();
-			if (test instanceof Tree) {
-				TreeItem[] items = ((Tree)test).getSelection();
-				Object[] targets = new Object[items.length];
-				for (int i=0; i<items.length; i++) {
-					targets[i] = items[i].getData();
-				}
-				selectElements(targets);
-			}
-		}
-	};
-	*/
-	public ParallelDebugView(IManager manager) {
-		super(manager);
-	}
-	public ParallelDebugView() {
-		this(PTPDebugUIPlugin.getUIDebugManager());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		Viewer viewer = getDebugViewer();
-		if (viewer != null)
-			viewer.removeSelectionChangedListener(debugViewSelectChangedListener);
-		if (getEventHandler() != null)
-			getEventHandler().dispose();
-		super.dispose();
-	}
-	
-	/**
-	 * @return
-	 */
-	protected Viewer getDebugViewer() {
-		if (launchViewer == null) {
-			IWorkbenchPage page = getViewSite().getPage();
-			if (page == null)
-				return null;
-			IViewPart part = page.findView(IDebugUIConstants.ID_DEBUG_VIEW);
-			if (part == null) {
-				if (page == null)
-					return null;
-				try {
-					part = page.showView(IDebugUIConstants.ID_DEBUG_VIEW);
-				} catch (PartInitException e) {
-					return null;
-				}
-			}
-			if (part != null && part instanceof AbstractDebugView) {
-				launchViewer = ((AbstractDebugView)part).getViewer();
-				if (launchViewer != null)
-					launchViewer.addSelectionChangedListener(debugViewSelectChangedListener);
-			}			
-		}
-		return launchViewer;
-	}
-	
-	/*
-	 * FIXME does not work if create a new set.  Currently we can task id to identify icon, but viewer is using order 
-	private void selectElements(final Object[] objects) {
-        SafeRunnable.run(new SafeRunnable() {
-            public void run() {
-				if (!canvas.isDisposed()) {
-					canvas.unselectAllElements();
-					for (int i=0; i<objects.length; i++) {
-						Object obj = objects[i];
-						int id = ((UIDebugManager) manager).getSelectedRegisteredTasks(obj);
-						if (id > -1) {
-							if (!canvas.isSelected(id))
-								canvas.selectElement(id);
-						}
-					}
-					canvas.redraw();
-					canvas.setCurrentSelection(false);
-				}
-			}
-		});
-	}
-	*/
-		
-	/**
-	 * Sets the event handler for this view
-	 * 
-	 * @param eventHandler event handler
-	 */
-	protected void setEventHandler(AbstractPDebugViewEventHandler eventHandler) {
-		this.fEventHandler = eventHandler;
-	}
-	
-	/**
-	 * Returns the event handler for this view
-	 * 
-	 * @return The event handler for this view
-	 */
-	protected AbstractPDebugViewEventHandler getEventHandler() {
-		return this.fEventHandler;
-	}	
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.ParallelJobView#createView(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createView(Composite parent) {
-		super.createView(parent);
-		setEventHandler(new ParallelDebugViewEventHandler(this));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		super.fillContextMenu(manager);
-		manager.add(new Separator(IPTPDebugUIConstants.THREAD_GROUP));
-		manager.add(new Separator(IPTPDebugUIConstants.STEP_GROUP));
-		manager.add(new GroupMarker(IPTPDebugUIConstants.STEP_INTO_GROUP));
-		manager.add(new GroupMarker(IPTPDebugUIConstants.STEP_OVER_GROUP));
-		manager.add(new GroupMarker(IPTPDebugUIConstants.STEP_RETURN_GROUP));
-		manager.add(new GroupMarker(IPTPDebugUIConstants.EMPTY_STEP_GROUP));
-		manager.add(new Separator(IPTPDebugUIConstants.REG_GROUP));
-
-		manager.appendToGroup(IPTPDebugUIConstants.THREAD_GROUP, resumeAction);
-		manager.appendToGroup(IPTPDebugUIConstants.THREAD_GROUP, suspendAction);
-		manager.appendToGroup(IPTPDebugUIConstants.THREAD_GROUP, terminateAction);
-		manager.appendToGroup(IPTPDebugUIConstants.STEP_INTO_GROUP, stepIntoAction);
-		manager.appendToGroup(IPTPDebugUIConstants.STEP_OVER_GROUP, stepOverAction);
-		manager.appendToGroup(IPTPDebugUIConstants.EMPTY_STEP_GROUP, stepReturnAction);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#createToolBarActionGroup(org.eclipse.jface.action.IToolBarManager)
-	 */
-	protected void createToolBarActionGroup(IToolBarManager toolBarMgr) {
-		toolBarMgr.add(new Separator(IPTPDebugUIConstants.THREAD_GROUP));
-		toolBarMgr.add(new Separator(IPTPDebugUIConstants.STEP_GROUP));
-		toolBarMgr.add(new GroupMarker(IPTPDebugUIConstants.STEP_INTO_GROUP));
-		toolBarMgr.add(new GroupMarker(IPTPDebugUIConstants.STEP_OVER_GROUP));
-		toolBarMgr.add(new GroupMarker(IPTPDebugUIConstants.STEP_RETURN_GROUP));
-		toolBarMgr.add(new GroupMarker(IPTPDebugUIConstants.EMPTY_STEP_GROUP));
-		toolBarMgr.add(new Separator(IPTPDebugUIConstants.REG_GROUP));
-		super.createToolBarActionGroup(toolBarMgr);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#createToolBarActions(org.eclipse.jface.action.IToolBarManager)
-	 */
-	protected void createToolBarActions(IToolBarManager toolBarMgr) {
-		resumeAction = new ResumeAction(this);
-		suspendAction = new SuspendAction(this);
-		terminateAction = new TerminateAction(this);
-		stepIntoAction = new StepIntoAction(this);
-		stepOverAction = new StepOverAction(this);
-		stepReturnAction = new StepReturnAction(this);
-		registerAction = new RegisterAction(this);
-		unregisterAction = new UnregisterAction(this);
-				
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.THREAD_GROUP, resumeAction);
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.THREAD_GROUP, suspendAction);
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.THREAD_GROUP, terminateAction);
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.STEP_INTO_GROUP, stepIntoAction);
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.STEP_OVER_GROUP, stepOverAction);
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.STEP_RETURN_GROUP, stepReturnAction);
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.REG_GROUP, registerAction);
-		toolBarMgr.appendToGroup(IPTPDebugUIConstants.REG_GROUP, unregisterAction);
-		
-		super.buildInToolBarActions(toolBarMgr);
-		//createOrientationActions();
-	}
-	
-	/** Create orientation actions
-	 * 
-	 */
-	protected void createOrientationActions() {
-		IActionBars actionBars = getViewSite().getActionBars();
-		IMenuManager viewMenu = actionBars.getMenuManager();
-		viewMenu.add(new Separator());
-	}
-	
-	/*******************************************************************************************************************************************************************************************************************************************************************************************************
-	 * IIconCanvasActionListener
-	 ******************************************************************************************************************************************************************************************************************************************************************************************************/
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.IIconCanvasActionListener#handleAction(int, int)
-	 */
-	public void handleAction(int type, int index) {
-		IElement element = canvas.getElement(index);
-		if (type == IIconCanvasActionListener.DOUBLE_CLICK_ACTION) {
-			doubleClick(element);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#doubleClick(org.eclipse.ptp.ui.model.IElement)
-	 */
-	public void doubleClick(IElement element) {
-		try {
-			registerElement(element);
-		} catch (CoreException e) {
-			PTPDebugUIPlugin.errorDialog(getViewSite().getShell(), "Error", e.getStatus());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#getToolTipText(java.lang.Object)
-	 */
-	public String[] getToolTipText(Object obj) {
-		if (obj == null)
-			return new String[] {"", ""};
-		String[] header = super.getToolTipText(obj);
-		String variableText = ((UIDebugManager) manager).getValueText(new Integer(((IPProcess)obj).getProcessIndex()).intValue(), this);
-		if (variableText != null && variableText.length() > 0) {
-			return new String[] { header[0], variableText };
-		}
-		return header;
-	}
-	
-	/** Register element
-	 * @param element
-	 * @throws CoreException
-	 */
-	public void registerElement(IElement element) throws CoreException {
-		if (element.isRegistered())
-			((UIDebugManager) manager).unregisterElements(new IElement[] { element });
-		else
-			((UIDebugManager) manager).registerElements(new IElement[] { element });
-	}
-	
-	/** Register selected elements
-	 * @throws CoreException
-	 */
-	public void registerSelectedElements() throws CoreException {
-		if (cur_element_set != null) {
-			((UIDebugManager) manager).registerElements(canvas.getSelectedElements());
-		}
-	}
-	
-	/** Unregister selected elements
-	 * @throws CoreException
-	 */
-	public void unregisterSelectedElements() throws CoreException {
-		if (cur_element_set != null) {
-			((UIDebugManager) manager).unregisterElements(canvas.getSelectedElements());
-		}
-	}
-	// Update button
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.AbstractParallelSetView#updateAction()
-	 */
-	public void updateAction() {
-		super.updateAction();
-		IPJob job = ((UIDebugManager) manager).findJobById(getCurrentID());
-		boolean isDebugMode = ((UIDebugManager) manager).isDebugMode(job);
-		boolean isRunning = ((UIDebugManager) manager).isRunning(job);
-		registerAction.setEnabled(isRunning && isDebugMode);
-		unregisterAction.setEnabled(isRunning && isDebugMode);
-		suspendAction.setEnabled(isRunning && isDebugMode);
-		terminateAction.setEnabled(isRunning);
-		if (isRunning && isDebugMode) {
-			IElementHandler elementHandler = getCurrentElementHandler();
-			if (elementHandler != null) {
-				updateDebugButtons(job);
-			}
-		} else {
-			resumeAction.setEnabled(false);
-			stepIntoAction.setEnabled(false);
-			stepOverAction.setEnabled(false);
-			stepReturnAction.setEnabled(false);
-			suspendAction.setEnabled(false);
-		}
-	}
-	/**
-	 * Update debug button
-	 */
-	public void updateDebugButtons(IPJob job) {
-		IPSession session = ((UIDebugManager) manager).getDebugSession(job);
-		if (session == null)
-			return;
-		IElementSet set = getCurrentSet();
-		if (set == null)
-			return;
-
-		BitList terminatedTasks = session.getPDISession().getTaskManager().getTerminatedTasks();
-		BitList suspendedTasks = session.getPDISession().getTaskManager().getSuspendedTasks();
-		BitList stepReturnTasks = session.getPDISession().getTaskManager().getCanStepReturnTasks();
-		if (terminatedTasks == null || suspendedTasks == null || stepReturnTasks == null)
-			return;
-
-		int setSize = set.size();
-		int totalTerminatedSize = 0;
-		int totalSuspendedSize = 0;
-		int totalStepReturnSize = 0;
-		if (set.isRootSet()) {
-			totalTerminatedSize = terminatedTasks.cardinality();
-			totalSuspendedSize = suspendedTasks.isEmpty() ? 0 : suspendedTasks.cardinality();
-			totalStepReturnSize = stepReturnTasks.isEmpty() ? 0 : stepReturnTasks.cardinality();
-		}
-		else {
-			try {
-				BitList setTasks = ((UIDebugManager) manager).getTasks(set.getID());
-				if (setTasks == null)
-					return;
-				setSize = setTasks.cardinality();
-				BitList setTerminatedTasks = session.getPDISession().getTaskManager().getTerminatedTasks(setTasks.copy());
-				totalTerminatedSize = setTerminatedTasks.cardinality();
-				// size equals: the set contains all terminated processes
-				if (setSize != totalTerminatedSize) {
-					BitList setSuspendedTasks = session.getPDISession().getTaskManager().getSuspendedTasks(setTasks.copy());
-					totalSuspendedSize = setSuspendedTasks.cardinality();
-					BitList setCanStepReturnTasks = session.getPDISession().getTaskManager().getCanStepReturnTasks(setTasks.copy());
-					totalStepReturnSize = setCanStepReturnTasks.cardinality();
-				}
-			} catch (CoreException e) {
-				PTPDebugUIPlugin.log(e);
-			}
-		}
-//System.err.println("Set size: " + setSize + ", T: " + totalTerminatedSize + ", S: "+ totalSuspendedSize + ", Return: " + totalStepReturnSize);
-		boolean enabledTerminatedButton = (setSize != totalTerminatedSize);
-		terminateAction.setEnabled(enabledTerminatedButton);
-		if (enabledTerminatedButton) {// not all processes terminated
-			resumeAction.setEnabled(totalSuspendedSize > 0);
-			boolean enableStepButtons = (setSize == totalSuspendedSize + totalTerminatedSize);
-			stepIntoAction.setEnabled(enableStepButtons);
-			stepOverAction.setEnabled(enableStepButtons);
-			suspendAction.setEnabled(!enableStepButtons);
-			stepReturnAction.setEnabled(enableStepButtons && totalStepReturnSize > 0);
-		} else {// all process terminated
-			resumeAction.setEnabled(false);
-			stepIntoAction.setEnabled(false);
-			stepOverAction.setEnabled(false);
-			stepReturnAction.setEnabled(false);
-			suspendAction.setEnabled(false);
-		}
-	}
-    /* (non-Javadoc)
-     * @see org.eclipse.ptp.ui.views.AbstractParallelElementView#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-     */
-    public void selectionChanged(SelectionChangedEvent event) {
-    	super.selectionChanged(event);
-    	ISelection selection = event.getSelection();
-    	if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-    		IStructuredSelection structSelection = (IStructuredSelection)selection;
-    		if (structSelection.size() == 1 && structSelection.getFirstElement() instanceof IElement) {
-	    		IElement element = (IElement)structSelection.getFirstElement();
-	    		if (element.isRegistered()) {
-					try {
-		    			focusOnDebugTarget(getJobManager().getJob(), Integer.parseInt(element.getName()));
-					} catch (NumberFormatException e) {
-						// The element name had better be the process number
-					}
-	    		}
-    		}
-    	}
-    }
-    
-    /*
-	public void drawSpecial(Object obj, GC gc, int x_loc, int y_loc, int width, int height) {
-		super.drawSpecial(obj, gc, x_loc, y_loc, width, height);
-		if (cur_element_set != null && obj instanceof DebugElement) {
-			DebugElement element =  (DebugElement)obj;
-			switch(element.getType()) {
-			case DebugElement.VALUE_DIFF:
-				gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_BLUE));
-				gc.drawLine(x_loc, y_loc, x_loc+width, y_loc+height);
-				gc.drawLine(x_loc, y_loc+height, x_loc+width, y_loc);
-				break;
-			}
-		}
-	}
-	*/
-	
-	/******************************************************
-	 * focus on debug target on debug view 
-	 ******************************************************/
-	private IDebugElement getDebugElement(IPJob job, int task_id) {
-		IPSession session = ((UIDebugManager)manager).getDebugSession(job);
-		if (session != null) {
-			return session.getLaunch().getDebugTarget(task_id);
-			/*
-			IPDebugTarget debugTarget = session.getLaunch().getDebugTarget(task_id);
-			if (debugTarget != null) {
-				try {
-					IThread[] threads = debugTarget.getThreads();
-					for (int i=0; i<threads.length; i++) {
-						IStackFrame frame = threads[i].getTopStackFrame();
-						if (frame != null)
-							return frame;
-					}
-					if (threads.length > 0) {
-						return threads[0];
-					}
-				}
-				catch (DebugException e) {
-					return debugTarget;
-				}
-				return debugTarget;
-			}
-			*/
-		}
-		return null;
-	}
-	public void focusOnDebugTarget(final IPJob job, final int task_id) {
-		WorkbenchJob wjob = new WorkbenchJob("Focusing on debug element...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				Viewer viewer = getDebugViewer();
-				if (viewer != null) {
-					ISelection selection = viewer.getSelection();
-					//ISelection selection = getViewSite().getPage().getSelection(IDebugUIConstants.ID_DEBUG_VIEW);
-					if (selection instanceof IStructuredSelection) {
-						Object element = ((IStructuredSelection)selection).getFirstElement();
-						if (element instanceof IPDebugElement) {
-							if (((IPDebugElement)element).getID() != task_id) {
-								//FIXME: only work if all elements are collapse
-								//((TreeViewer)viewer).collapseAll();
-
-								IDebugElement focusElement = getDebugElement(job, task_id); 
-								if (focusElement == null) {
-									//do nothing if cannot find debug target
-									return Status.CANCEL_STATUS;
-								}
-								selectOnViewer(viewer, (IPDebugElement)focusElement);
-								// set focus element to selected element
-								element = focusElement;
-							}
-						}
-						else {
-							IDebugElement focusElement = getDebugElement(job, task_id); 
-							if (focusElement == null) {
-								//do nothing if cannot find debug target
-								return Status.CANCEL_STATUS;
-							}
-							selectOnViewer(viewer, (IDebugElement)focusElement);
-							// set focus element to selected element
-							element = focusElement;
-						}
-						
-						if (element instanceof IStackFrame) {
-							//do nothing if selected element is stack frame
-							return Status.CANCEL_STATUS;
-						}
-						if (element instanceof IThread) {
-							//expand thread this thread
-							expandOnViewer(viewer, (IThread)element);
-							return Status.OK_STATUS;
-						}
-						if (element instanceof IDebugTarget) {
-							//expand debug target this thread
-							expandOnViewer(viewer, (IDebugTarget)element);
-							return Status.OK_STATUS;
-						}
-						//if (!((TreeViewer)viewer).getExpandedState(element)) {
-							//((TreeViewer)viewer).setExpandedState(element, true);
-						//}
-					}
-					//viewer.setSelection(new StructuredSelection(focusElement), true);
-					//viewer.setSelection(new StructuredSelection(focusElement.getDebugTarget()), true);
-					//((TreeViewer)viewer).expandAll();
-				}
-				return Status.CANCEL_STATUS;
-			}
-        };
-        //set job priority very low to make sure it is executed at last
-        wjob.setPriority(Job.DECORATE);
-        wjob.schedule(500);
-	}
-	private void expandOnViewer(final Viewer viewer, final IDebugElement element) {
-		WorkbenchJob wjob = new WorkbenchJob("Expanding on viewer...") {
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				((TreeViewer)viewer).setExpandedState(element, true);
-				try {
-					if (element instanceof IThread) {
-						selectOnViewer(viewer, ((IThread)element).getTopStackFrame());
-						return Status.OK_STATUS;
-					}
-					if (element instanceof IDebugTarget) {
-						IThread[] threads = ((IPDebugTarget)element).getThreads();
-						if (threads.length > 0) {
-							expandOnViewer(viewer, threads[0]);
-							return Status.OK_STATUS;
-						}
-						return Status.CANCEL_STATUS;
-					}
-				}
-				catch (DebugException e) {
-					return Status.CANCEL_STATUS;
-				}
-				return Status.OK_STATUS;
-			}
-        };
-        //set job priority very low to make sure it is executed at last
-        wjob.setPriority(Job.DECORATE);
-        wjob.schedule();
-	}
-	private void selectOnViewer(final Viewer viewer, final IDebugElement element) {
-		if (element != null) {
-			WorkbenchJob wjob = new WorkbenchJob("Selecting debug element...") {
-				public IStatus runInUIThread(IProgressMonitor monitor) {
-					/* FIXME 
-					 * In Debug View, there is a Selection Policy.  If current selected element is stack frame and its status is suspended, then it cannot allow to change selection to others.
-					 * Now I used internal class to avoid policy checking
-					 */
-					if (viewer instanceof InternalTreeModelViewer) {
-						((InternalTreeModelViewer) viewer).setSelection(new StructuredSelection(element), true, true);
-					} 
-					else {
-						viewer.setSelection(new StructuredSelection(element), true);
-					}
-					return Status.OK_STATUS;
-				}
-	        };
-	        //set job priority very low to make sure it is executed at last
-	        wjob.setPriority(Job.DECORATE);
-	        wjob.schedule();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.ui.views.ParallelJobsView#changeJobRefresh(org.eclipse.ptp.core.elements.IPJob, boolean)
-	 */
-	public void changeJobRefresh(IPJob job, boolean force) {
-		if (job != null && job.isTerminated()) {
-			IPSession session = ((UIDebugManager) manager).getDebugSession(job);
-			if (session != null) {
-				BitList tasks = session.getTasks();
-				if (!session.getPDISession().getTaskManager().isAllTerminated(tasks)) {
-					session.forceStoppedDebugger(ProcessAttributes.State.ERROR);
-				}
-			}
-		}
-		super.changeJobRefresh(job, force);
-	}
-}

diff --git a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugViewEventHandler.java b/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugViewEventHandler.java
deleted file mode 100644
index e32c46a..0000000
--- a/debug/org.eclipse.ptp.debug.ui/src/org/eclipse/ptp/debug/ui/views/ParallelDebugViewEventHandler.java
+++ /dev/null

@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.debug.ui.views;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.debug.core.IPSession;
-import org.eclipse.ptp.debug.core.event.IPDebugErrorInfo;
-import org.eclipse.ptp.debug.core.event.IPDebugEvent;
-import org.eclipse.ptp.debug.core.event.IPDebugInfo;
-import org.eclipse.ptp.debug.core.event.IPDebugRegisterInfo;
-import org.eclipse.ptp.debug.internal.ui.PDebugUIUtils;
-import org.eclipse.ptp.debug.internal.ui.UIDebugManager;
-import org.eclipse.ptp.debug.internal.ui.views.AbstractPDebugViewEventHandler;
-import org.eclipse.ptp.debug.ui.PTPDebugUIPlugin;
-import org.eclipse.ptp.ui.model.IElement;
-import org.eclipse.ptp.ui.model.IElementHandler;
-
-/**
- * @author Clement chu
- */
-public class ParallelDebugViewEventHandler extends AbstractPDebugViewEventHandler  {
-	private long time_record = 0;
-	
-	/**
-	 * Constructs a new event handler on the given view
-	 */
-	public ParallelDebugViewEventHandler(ParallelDebugView view) {
-		super(view);
-	}
-	public ParallelDebugView getPView() {
-		return (ParallelDebugView)getView();
-	}
-	public void refresh(boolean all) {
-		if (getPView().isVisible())
-			getPView().refresh(all);
-	}
-	protected void doHandleDebugEvent(IPDebugEvent event, IProgressMonitor monitor) {
-		IPDebugInfo info = event.getInfo();
-		final IPJob job = info.getJob();
-		switch(event.getKind()) {
-			case IPDebugEvent.CREATE:
-				switch (event.getDetail()) {
-				case IPDebugEvent.REGISTER:
-					boolean refresh = true;
-					if (info instanceof IPDebugRegisterInfo) {
-						refresh = ((IPDebugRegisterInfo)info).isRefresh();
-					}
-					int[] c_regTask_array = info.getAllTasks().toArray();
-					if (refresh) {
-						IElementHandler elementHandler = getPView().getElementHandler(job.getID());
-						if (elementHandler != null) {
-							ArrayList<IElement> regElementArray = new ArrayList<IElement>();
-							for (int j=0; j<c_regTask_array.length; j++) {
-								IPProcess proc = job.getProcessByIndex(c_regTask_array[j]);
-								((UIDebugManager) getPView().getUIManager()).addConsoleWindow(job, proc);
-								IElement element = elementHandler.getSetRoot().getElementByID(proc.getID());
-								if (element != null) {
-									regElementArray.add(element);
-								}
-							}
-							elementHandler.addToRegister(regElementArray.toArray(new IElement[regElementArray.size()]));
-						}
-						refresh();
-					}
-					if (c_regTask_array.length > 0) {
-						getPView().focusOnDebugTarget(job, c_regTask_array[0]);
-					}
-					break;
-				case IPDebugEvent.DEBUGGER:
-					break;
-				case IPDebugEvent.BREAKPOINT:
-					break;
-				}
-				break;
-			case IPDebugEvent.TERMINATE:
-				IElementHandler elementHandler = getPView().getElementHandler(job.getID());
-				switch (event.getDetail()) {
-				case IPDebugEvent.DEBUGGER:
-					if (elementHandler != null) {
-						elementHandler.removeElements(elementHandler.getRegistered());
-					}
-					refresh(true);
-					break;
-				case IPDebugEvent.REGISTER:
-					boolean refresh = true;
-					if (info instanceof IPDebugRegisterInfo) {
-						refresh = ((IPDebugRegisterInfo)info).isRefresh();
-					}
-					if (refresh) {
-						if (elementHandler != null) {
-							int[] t_regTask_array = info.getAllTasks().toArray();
-							IElement[] regElementArray = new IElement[t_regTask_array.length];
-							for (int j = 0; j < t_regTask_array.length; j++) {
-								IPProcess proc = job.getProcessByIndex(t_regTask_array[j]);
-								((UIDebugManager) getPView().getUIManager()).removeConsoleWindow(job, proc);
-								regElementArray[j] = elementHandler.getSetRoot().getElementByID(proc.getID());
-							}
-							elementHandler.removeFromRegister(regElementArray);
-						}
-						refresh();
-					}
-					break;
-				case IPDebugEvent.BREAKPOINT:
-					break;
-				case IPDebugEvent.PROCESS_SPECIFIC:
-					UIDebugManager uiMgr = (UIDebugManager)getPView().getUIManager();
-					IPSession session = uiMgr.getDebugSession(job);
-					if (session != null) {
-						uiMgr.unregisterTasks(session, info.getAllRegisteredTasks());
-					}
-					refresh(true);
-					break;
-				default:
-					refresh(true);
-					break;
-				}
-				break;
-			case IPDebugEvent.RESUME:
-				time_record = System.currentTimeMillis();
-				System.err.println("================= TIME RESUME: " + time_record);
-				//((UIDebugManager) getPView().getUIManager()).updateVariableValue(false, info.getAllRegisteredTasks());
-				refresh(true);
-				break;
-			case IPDebugEvent.SUSPEND:
-				IPSession s = ((UIDebugManager) getPView().getUIManager()).getDebugSession(job);
-				if (s != null) {
-					if (s.getTasks().cardinality() == s.getPDISession().getTaskManager().getSuspendedTasks().cardinality()) {
-						System.err.println("================= TIME ALL SUSPENDED: " + (System.currentTimeMillis() - time_record));
-						time_record = System.currentTimeMillis();
-					}
-				}
-
-				int[] processes = info.getAllRegisteredTasks().toArray();
-				if (processes.length > 0) {
-					getPView().focusOnDebugTarget(job, processes[0]);
-				}
-				//if (job.getID().equals(getPView().getCurrentID())) {
-					//PTPDebugUIPlugin.getUIDebugManager().updateVariableValueOnSuspend(info.getAllTasks());
-				//}
-				refresh(true);
-				break;
-			case IPDebugEvent.CHANGE:
-				switch (event.getDetail()) {
-				case IPDebugEvent.PROCESS_SPECIFIC:
-					UIDebugManager uiMgr = (UIDebugManager)getPView().getUIManager();
-					if (uiMgr.isEnabledDefaultRegister()) {
-						IPSession session = uiMgr.getDebugSession(job);
-						if (session != null) {
-							uiMgr.registerTasks(session, session.getTasks(0));
-						}
-					}
-					break;
-				case IPDebugEvent.EVALUATION:
-				case IPDebugEvent.CONTENT:
-					/*
-					int[] diffTasks = info.getAllProcesses().toArray();
-					IElementHandler elementHandler = getPView().getElementHandler(job.getID());
-					for (int j=0; j<diffTasks.length; j++) {
-						IElement element = elementHandler.getSetRoot().get(String.valueOf(diffTasks[j]));
-						if (element instanceof DebugElement) {
-							if (detail == IPDebugEvent.EVALUATION) {
-								((DebugElement)element).setType(DebugElement.VALUE_DIFF);
-							}
-							else {
-								((DebugElement)element).resetType();
-							}
-						}
-					}
-					*/
-					break;
-				}
-				break;
-			case IPDebugEvent.ERROR:
-				final IPDebugErrorInfo errInfo = (IPDebugErrorInfo)info;
-				if (event.getDetail() != IPDebugEvent.ERR_NORMAL) {
-					PTPDebugUIPlugin.getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							String msg = "Error on tasks: "+ PDebugUIUtils.showBitList(errInfo.getAllTasks()) + " - " + errInfo.getMsg() + "\nReason: " + errInfo.getDetailsMsg();
-							IStatus status = new Status(IStatus.ERROR, PTPDebugUIPlugin.getUniqueIdentifier(), IStatus.ERROR, msg, null);
-							PTPDebugUIPlugin.errorDialog("Error", status);
-						}
-					});
-					//only change process icon and unregister for fatal error
-					if (event.getDetail() == IPDebugEvent.ERR_FATAL) { 
-						IElementHandler eHandler = getPView().getElementHandler(job.getID());
-						if (eHandler != null) {
-							int[] e_regTask_array = info.getAllRegisteredTasks().toArray();
-							if (e_regTask_array.length > 0) {
-								IElement[] regElementArray = new IElement[e_regTask_array.length];
-								for (int j = 0; j < e_regTask_array.length; j++) {
-									IPProcess proc = job.getProcessByIndex(e_regTask_array[j]);
-									((UIDebugManager) getPView().getUIManager()).removeConsoleWindow(job, proc);
-									regElementArray[j] = eHandler.getSetRoot().getElementByID(proc.getID());
-								}
-								eHandler.removeFromRegister(regElementArray);
-							}
-						}
-						refresh(true);
-					}
-				}
-				break;
-		}
-	}
-}

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath b/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
deleted file mode 100644
index 3aaeea8..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="src" path="suite"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.project b/rdt/org.eclipse.ptp.rdt.ui.tests/.project
deleted file mode 100644
index d89ee51..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.project
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f9482f2..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,7 +0,0 @@
-#Wed Nov 19 13:50:59 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index ac10150..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.rdt.ui.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.ptp.rdt.core;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.core.tests;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.ui;bundle-version="1.0.0",
- org.eclipse.cdt.ui.tests;bundle-version="5.0.2",
- org.eclipse.cdt.ui;bundle-version="5.0.2",
- org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.cdt.core;bundle-version="5.0.2",
- org.eclipse.cdt.core.tests;bundle-version="5.0.1",
- org.junit;bundle-version="3.8.2",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.ui.editors;bundle-version="3.4.0",
- org.eclipse.ptp.services.core;bundle-version="1.0.0"
-Export-Package: org.eclipse.ptp.rdt.ui.tests.navigation,
- org.eclipse.ptp.rdt.ui.tests.suite
-Bundle-Activator: org.eclipse.ptp.rdt.ui.tests.RDTUITestPlugin
-Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.ui.part

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties b/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
deleted file mode 100644
index 0a56acc..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-source.. = test/,\
-           suite/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c b/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c
deleted file mode 100644
index ed3b53d..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c
+++ /dev/null

@@ -1,5 +0,0 @@
-#import "test.h"
-
-int main(int argc, char **argv) {
-
-}

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h b/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h
deleted file mode 100644
index e69de29..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h
+++ /dev/null


diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
deleted file mode 100644
index 49c77c6..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package org.eclipse.ptp.rdt.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class RDTUITestPlugin extends AbstractUIPlugin {
-
-	
-	private static RDTUITestPlugin plugin;
-	
-	public RDTUITestPlugin() {
-		super();
-		plugin = this;
-	}
-
-	public static RDTUITestPlugin getDefault() {
-		return plugin;
-	}
-}

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java
deleted file mode 100644
index db76260..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.ptp.rdt.ui.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-/**
- * Tests that do not require a connection to a remote server.
- */
-public class UIBasicTestSuite extends TestCase {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(UIBasicTestSuite.class.getName());
-		// TODO add some tests
-		return suite;
-	}
-}
\ No newline at end of file

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java
deleted file mode 100644
index 7b468b7..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.ptp.rdt.ui.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.ptp.rdt.ui.tests.navigation.NavigationTests;
-
-
-/**
- * Tests that require a connection to be run,
- * this suite must be launched from a ConnectionSuite.
- */
-public class UIConnectionTestSuite extends TestCase {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(UIConnectionTestSuite.class.getName());
-		
-		suite.addTest(NavigationTests.suite());
-		
-		return suite;
-	}
-}
\ No newline at end of file

diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java b/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
deleted file mode 100644
index ebfc178..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
+++ /dev/null

@@ -1,182 +0,0 @@
-package org.eclipse.ptp.rdt.ui.tests.navigation;
-
-import java.net.URI;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.index.IIndex;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-import org.eclipse.cdt.internal.ui.editor.ASTProvider;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.ui.tests.text.EditorTestHelper;
-import org.eclipse.cdt.ui.tests.text.selection.CPPSelectionTestsAnyIndexer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.internal.rdt.core.index.RemoteFastIndexer;
-import org.eclipse.ptp.internal.rdt.ui.search.actions.OpenDeclarationsAction;
-import org.eclipse.ptp.rdt.core.tests.ConnectionManager;
-import org.eclipse.ptp.rdt.core.tests.RemoteTestProject;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
-
-@SuppressWarnings("restriction")
-
-public class NavigationTests extends CPPSelectionTestsAnyIndexer {
-
-	private static final int MAX_WAIT_TIME = 120000;
-
-	/* I think a lot of the tests that fail do so because of two reasons:
-	 * - Headers are not being skipped as they should be, 
-	 *  
-	 */
-	private static final String[] TESTS_TO_RUN = {
-		"testBug93281",
-		"testBug207320",
-		"testTemplateClassMethod_207320",
-		//"testBasicDefinition", // FAIL cannot reproduce failure
-		"testBasicTemplateInstance_207320",
-		"testBug86829A",
-		//"testCPPSpecDeclsDefs", // FAIL cannot reproduce failure
-		"testBug168533",
-		"testBug95225",
-		//"testBug95202", // FAIL, should not fail when headers are skipped properly
-		"testBug101287",
-		"testBug102258",
-		"testBug103323",
-		"testBug78354",
-		//"testBug103697", // FAIL trying to use local path which fails
-		//"testBug108202", // FAIL
-		//"testCNavigationInCppProject_bug183973", // FAIL
-		//"testFuncWithTypedefForAnonymousStruct_190730", // FAIL
-		//"testFuncWithTypedefForAnonymousEnum_190730", // FAIL
-		"testMacroNavigation",
-		"testMacroNavigation_Bug208300",
-		"testIncludeNavigation",
-		//"testNavigationCppCallsC", // FAIL
-		//"testNavigationCCallsCpp", // FAIL
-		"testNavigationInDefinedExpression_215906",
-	};
-	
-	public static Test suite() {
-		//return suite(NavigationTests.class);
-		TestSuite suite = new TestSuite();
-		for(String testName : TESTS_TO_RUN)
-			suite.addTest(new NavigationTests(testName));
-		return suite;
-	}
-	
-	
-	private static final String PROJECT_NAME = "navigation_test_project";
-	
-	@Override
-	protected String getEditorID() {
-		return "org.eclipse.ptp.rdt.ui.editor.CEditor";
-	}
-
-	@Override
-	protected void waitUntilFileIsIndexed(IIndex index, IFile file, int maxmillis) throws Exception {
-		Thread.sleep(10000);
-        CCorePlugin.getIndexManager().joinIndexer(MAX_WAIT_TIME, new NullProgressMonitor());
-	}
-
-	public NavigationTests(String name) {
-		super(name, RemoteFastIndexer.ID);
-	}
-	
-	@Override
-	protected IASTNode testF3(IFile file, int offset, int length) throws ParserException, CoreException {
-		if (offset < 0)
-			throw new ParserException("offset can not be less than 0 and was " + offset); //$NON-NLS-1$
-		
-        IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        IEditorPart part = null;
-        try {
-            part = page.openEditor(new FileEditorInput(file), getEditorID(), true); //$NON-NLS-1$
-        } catch (PartInitException e) {
-            assertFalse(true);
-        }
-        
-        if (part instanceof CEditor) {
-        	CEditor editor= (CEditor) part;
-    		EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
-            ((AbstractTextEditor)part).getSelectionProvider().setSelection(new TextSelection(offset,length));
-            
-            final OpenDeclarationsAction action = (OpenDeclarationsAction) editor.getAction("OpenDeclarations"); //$NON-NLS-1$
-            action.runSync();
-			
-        	// update the file/part to point to the newly opened IFile/IEditorPart
-            part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); 
-            assertTrue (part instanceof CEditor);
-            editor= (CEditor) part;
-    		EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
-
-    		// the action above should highlight the declaration, so now retrieve it and use that selection to get the IASTName selected on the TU
-            ISelection sel= editor.getSelectionProvider().getSelection();
-            
-            final IASTName[] result= {null};
-            if (sel instanceof ITextSelection) {
-            	final ITextSelection textSel = (ITextSelection)sel;
-            	ITranslationUnit tu = (ITranslationUnit)editor.getInputCElement();
-        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, new NullProgressMonitor(), new ASTRunnable() {
-        			public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
-        				result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength());
-        				return Status.OK_STATUS;
-        			}
-        		});
-        		assertTrue(ok.isOK());
-				return result[0];
-            }
-        }
-        
-        return null;
-    }
-	
-
-	protected void setUp() throws Exception {
-		//super.setUp();
-		
-		IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IViewReference[] refs= page.getViewReferences();
-		for (int i = 0; i < refs.length; i++) {
-			IViewReference viewReference = refs[i];
-			page.setPartState(viewReference, IWorkbenchPage.STATE_RESTORED);
-		}
-		
-		URI projectRootURI = ConnectionManager.getInstance().getWorkspaceURI(PROJECT_NAME);
-		RemoteTestProject remoteProject = new RemoteTestProject(PROJECT_NAME, projectRootURI);
-		
-		ConnectionManager.getInstance().resetServiceModel(remoteProject.getName());
-		ServiceModelManager.getInstance().printServiceModel();
-		
-		fCProject = remoteProject.getCProject();
-	
-		CCorePlugin.getIndexManager().setIndexerId(fCProject, RemoteFastIndexer.ID);
-	}
-	
-	
-	protected void tearDown() throws Exception {
-		super.tearDown(); 
-	}
-
-}

diff --git a/releng/org.eclipse.ptp-feature/.project b/releng/org.eclipse.ptp-feature/.project
deleted file mode 100644
index 7643c2b..0000000
--- a/releng/org.eclipse.ptp-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp-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-feature/build.properties b/releng/org.eclipse.ptp-feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/releng/org.eclipse.ptp-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg

diff --git a/releng/org.eclipse.ptp-feature/eclipse_update_120.jpg b/releng/org.eclipse.ptp-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/releng/org.eclipse.ptp-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/releng/org.eclipse.ptp-feature/epl-v10.html b/releng/org.eclipse.ptp-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp-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-feature/feature.properties b/releng/org.eclipse.ptp-feature/feature.properties
deleted file mode 100644
index 7dbff91..0000000
--- a/releng/org.eclipse.ptp-feature/feature.properties
+++ /dev/null

@@ -1,160 +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=Parallel Tools Platform End-User Runtime
-
-# "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=An integrated environment for the development of \
-parallel applications.
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Parallel Tools Platform Updates
-
-# 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-feature/feature.xml b/releng/org.eclipse.ptp-feature/feature.xml
deleted file mode 100644
index 0bc1cef..0000000
--- a/releng/org.eclipse.ptp-feature/feature.xml
+++ /dev/null

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-      <discovery label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.0"/>
-   </url>
-
-   <includes
-         id="org.eclipse.ptp.core"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp-feature/license.html b/releng/org.eclipse.ptp-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp-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.aix.ppc/.project b/releng/org.eclipse.ptp.aix.ppc/.project
deleted file mode 100644
index dace863..0000000
--- a/releng/org.eclipse.ptp.aix.ppc/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.linux.ppc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.aix.ppc/BUILD b/releng/org.eclipse.ptp.aix.ppc/BUILD
deleted file mode 100755
index 4902487..0000000
--- a/releng/org.eclipse.ptp.aix.ppc/BUILD
+++ /dev/null

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# This script is used to build proxy plugins in the workspace
-#
-
-# This should get replaced by build script with the actual
-# PTP build version number. The script can also be run out of CVS,
-# in which case there is no version.
-VERSION="_@buildVersion@"
-if [ `expr "$VERSION" : "_@[^@]*@"` -gt 0 ]; then
-	VERSION=
-fi
-
-RMS="mpich2 ibm.pe ibm.ll"
-
-KNOWN_PLUGINS="\
-	org.eclipse.ptp.utils$VERSION\
-	org.eclipse.ptp.proxy$VERSION\
-	org.eclipse.ptp.debug.sdm$VERSION"
-		
-PARENT=`dirname $PWD`
-PLUGIN=`basename $PWD`
-PREFIX=$PARENT/$PLUGIN
-
-if [ ! -d bin ]; then
-	mkdir bin
-fi
-
-for rms in $RMS
-do
-	KNOWN_PLUGINS="$KNOWN_PLUGINS org.eclipse.ptp.rm.$rms.proxy$VERSION"
-done
-
-cd $PARENT
-
-for plugin in `echo $KNOWN_PLUGINS`
-do
-	if [ -e $plugin/configure ]; then
-		echo "Building $plugin..."
-		(cd $plugin; \
-		ksh93 configure --prefix=$PREFIX && \
-		chmod +x install-sh && \
-		make install)
-		echo; echo
-	fi
-done
-
-exit 0
-

diff --git a/releng/org.eclipse.ptp.aix.ppc/META-INF/MANIFEST.MF b/releng/org.eclipse.ptp.aix.ppc/META-INF/MANIFEST.MF
deleted file mode 100644
index 18251bc..0000000
--- a/releng/org.eclipse.ptp.aix.ppc/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName.aix.ppc
-Bundle-SymbolicName: org.eclipse.ptp.aix.ppc
-Bundle-Version: 2.1.4.qualifier
-Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider

diff --git a/releng/org.eclipse.ptp.aix.ppc/about.html b/releng/org.eclipse.ptp.aix.ppc/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/releng/org.eclipse.ptp.aix.ppc/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/releng/org.eclipse.ptp.aix.ppc/bin/README b/releng/org.eclipse.ptp.aix.ppc/bin/README
deleted file mode 100644
index 8a898b7..0000000
--- a/releng/org.eclipse.ptp.aix.ppc/bin/README
+++ /dev/null

@@ -1 +0,0 @@
-ORTE_SERVER binary will go here.
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.aix.ppc/build.properties b/releng/org.eclipse.ptp.aix.ppc/build.properties
deleted file mode 100644
index 76d1cf6..0000000
--- a/releng/org.eclipse.ptp.aix.ppc/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = fragment.xml,\
-               about.html,\
-               BUILD,\
-               META-INF/

diff --git a/releng/org.eclipse.ptp.aix.ppc/fragment.xml b/releng/org.eclipse.ptp.aix.ppc/fragment.xml
deleted file mode 100644
index aedc72a..0000000
--- a/releng/org.eclipse.ptp.aix.ppc/fragment.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment>
-
-</fragment>

diff --git a/releng/org.eclipse.ptp.core-feature/.project b/releng/org.eclipse.ptp.core-feature/.project
deleted file mode 100644
index 33a8885..0000000
--- a/releng/org.eclipse.ptp.core-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.core-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.core-feature/build.properties b/releng/org.eclipse.ptp.core-feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/releng/org.eclipse.ptp.core-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg

diff --git a/releng/org.eclipse.ptp.core-feature/epl-v10.html b/releng/org.eclipse.ptp.core-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.core-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.core-feature/feature.properties b/releng/org.eclipse.ptp.core-feature/feature.properties
deleted file mode 100644
index 14bf9cb..0000000
--- a/releng/org.eclipse.ptp.core-feature/feature.properties
+++ /dev/null

@@ -1,159 +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=Parallel Tools Platform Core
-
-# "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=Parallel Tools Platform core components
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Parallel Tools Platform Updates
-
-# 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.core-feature/feature.xml b/releng/org.eclipse.ptp.core-feature/feature.xml
deleted file mode 100644
index e4179ff..0000000
--- a/releng/org.eclipse.ptp.core-feature/feature.xml
+++ /dev/null

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.core"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.utils.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.ui.intro"/>
-      <import plugin="org.eclipse.ui.intro.universal"/>
-      <import plugin="org.eclipse.ptp.utils.ui" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.debug.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.debug.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.remote"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.launch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.proxy.protocol"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.core-feature/license.html b/releng/org.eclipse.ptp.core-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.core-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.etfw-feature/.project b/releng/org.eclipse.ptp.etfw-feature/.project
deleted file mode 100644
index e93fcdb..0000000
--- a/releng/org.eclipse.ptp.etfw-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.perf-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.etfw-feature/build.properties b/releng/org.eclipse.ptp.etfw-feature/build.properties
deleted file mode 100644
index 5d887d5..0000000
--- a/releng/org.eclipse.ptp.etfw-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties

diff --git a/releng/org.eclipse.ptp.etfw-feature/epl-v10.html b/releng/org.eclipse.ptp.etfw-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.etfw-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.etfw-feature/feature.properties b/releng/org.eclipse.ptp.etfw-feature/feature.properties
deleted file mode 100644
index c959835..0000000
--- a/releng/org.eclipse.ptp.etfw-feature/feature.properties
+++ /dev/null

@@ -1,138 +0,0 @@
-# "featureName" property - name of the feature
-featureName=PTP External Tools Framework
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=External Tools Framework components.  These provide the\n\
-ability to build and launch applications with command line based\n\
-tools (such as performance analysis tools), which may be configured from within\n\
-the launch configuration system.\n\
-org.eclipse.ptp.perf:  The core of the framework,manages external tool activity\n\
-though the application launch process.\n\
-org.eclipse.ptp.perf.parallel:  Adds external framework functionality\n\
-to the PTP's parallel launch system.\n\
-org.eclipse.ptp.perf.toolopts:  Provides features for creating\n\
-and manipulating external tool workflows and custom user interfaces\n\
-for external tools.\n
-
-# copyright
-copyright=\
-Copyright (c) 1997-2008\n\
-   Department of Computer and Information Science, University of Oregon\n\
-   Advanced Computing Laboratory, Los Alamos National Laboratory\n\
-   Research Center Juelich, ZAM Germany	\n\
-\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.etfw-feature/feature.xml b/releng/org.eclipse.ptp.etfw-feature/feature.xml
deleted file mode 100644
index 2ae4491..0000000
--- a/releng/org.eclipse.ptp.etfw-feature/feature.xml
+++ /dev/null

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.perf"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.perf">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.cdt.launch"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.debug.core"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.perf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.perf.parallel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.perf.toolopts"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.etfw-feature/license.html b/releng/org.eclipse.ptp.etfw-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.etfw-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.etfw.tau-feature/.project b/releng/org.eclipse.ptp.etfw.tau-feature/.project
deleted file mode 100644
index 8b11a06..0000000
--- a/releng/org.eclipse.ptp.etfw.tau-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.perf.tau-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.etfw.tau-feature/build.properties b/releng/org.eclipse.ptp.etfw.tau-feature/build.properties
deleted file mode 100644
index 5d887d5..0000000
--- a/releng/org.eclipse.ptp.etfw.tau-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties

diff --git a/releng/org.eclipse.ptp.etfw.tau-feature/epl-v10.html b/releng/org.eclipse.ptp.etfw.tau-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.etfw.tau-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.etfw.tau-feature/feature.properties b/releng/org.eclipse.ptp.etfw.tau-feature/feature.properties
deleted file mode 100644
index f1049b5..0000000
--- a/releng/org.eclipse.ptp.etfw.tau-feature/feature.properties
+++ /dev/null

@@ -1,143 +0,0 @@
-# "featureName" property - name of the feature
-featureName=PTP Performance Tools Framework TAU Support
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Extends the performance tools framework with capabilities specific\n\
-to the TAU performance analysis system.\n\
-org.eclipse.ptp.perf.tau: Adds the core GUI and operational features\n\
-required by TAU to the performance framework.\n\
-org.eclipse.ptp.perf.tau.jars: Contains the jar files required\n\
-by the perfdmf plugin.\n\
-org.eclipse.ptp.perf.tau.papiselect: Provides an interface for\n\
-selecting PAPI hardware performance counters.\n\
-org.eclipse.ptp.perf.tau.papitest: A simple test plugin for the\n\
-papiselector\n\
-org.eclipse.ptp.perf.tau.perfdmf: Provides perfdmf performance\n\
-database integration with Eclipse, including the ability to launch\n\
-ParaProf from Eclipse and call back from ParaProf to source code\n\
-in Eclipse.\n\
-org.eclipse.ptp.tau.selinst: Selective instrumentation functionality\n\
-for C/C++\n
-
-# copyright
-copyright=\
-Copyright (c) 1997-2008\n\
-   Department of Computer and Information Science, University of Oregon\n\
-   Advanced Computing Laboratory, Los Alamos National Laboratory\n\
-   Research Center Juelich, ZAM Germany	\n\
-\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml b/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml
deleted file mode 100644
index 04ac54f..0000000
--- a/releng/org.eclipse.ptp.etfw.tau-feature/feature.xml
+++ /dev/null

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.perf.tau"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.perf.tau">
-
-   <description url="http://www.cs.uoregon.edu/research/tau/home.php">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.perf.toolopts"/>
-      <import plugin="org.eclipse.ptp.perf"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.perf.tau"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.perf.tau.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.perf.tau.papiselect"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.perf.tau.papitest"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.perf.tau.perfdmf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.perf.tau.selinst"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.etfw.tau-feature/license.html b/releng/org.eclipse.ptp.etfw.tau-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.etfw.tau-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.etfw.tau.fortran-feature/.project b/releng/org.eclipse.ptp.etfw.tau.fortran-feature/.project
deleted file mode 100644
index 8a45656..0000000
--- a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.perf.tau.fortran-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/build.properties b/releng/org.eclipse.ptp.etfw.tau.fortran-feature/build.properties
deleted file mode 100644
index 5d887d5..0000000
--- a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties

diff --git a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/epl-v10.html b/releng/org.eclipse.ptp.etfw.tau.fortran-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.etfw.tau.fortran-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.etfw.tau.fortran-feature/feature.properties b/releng/org.eclipse.ptp.etfw.tau.fortran-feature/feature.properties
deleted file mode 100644
index d1ec1cb..0000000
--- a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/feature.properties
+++ /dev/null

@@ -1,129 +0,0 @@
-# "featureName" property - name of the feature
-featureName=PTP Performance Tools Framework: TAU Fortran Enabler
-
-# "providerName" property - name of the company that provides the feature
-providerName=University of Oregon
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds selective instrumentation functionality for Fortran via the\n\
-Photran project.\n
-
-# copyright
-copyright=\
-Copyright (c) 1997-2008\n\
-   Department of Computer and Information Science, University of Oregon\n\
-   Advanced Computing Laboratory, Los Alamos National Laboratory\n\
-   Research Center Juelich, ZAM Germany	\n\
-\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/feature.xml b/releng/org.eclipse.ptp.etfw.tau.fortran-feature/feature.xml
deleted file mode 100644
index eb63b12..0000000
--- a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/feature.xml
+++ /dev/null

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.perf.tau.fortran"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.perf.tau.selinstfort">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.photran.ui"/>
-      <import plugin="org.eclipse.ptp.perf.tau.selinst"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.perf.tau.selinstfort"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.etfw.tau.fortran-feature/license.html b/releng/org.eclipse.ptp.etfw.tau.fortran-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.etfw.tau.fortran-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.external-feature/.project b/releng/org.eclipse.ptp.external-feature/.project
deleted file mode 100644
index c8c4597..0000000
--- a/releng/org.eclipse.ptp.external-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.external-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.external-feature/build.properties b/releng/org.eclipse.ptp.external-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.external-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.external-feature/epl-v10.html b/releng/org.eclipse.ptp.external-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.external-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.external-feature/feature.properties b/releng/org.eclipse.ptp.external-feature/feature.properties
deleted file mode 100644
index 5f45aba..0000000
--- a/releng/org.eclipse.ptp.external-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 Common External Components
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=PTP components for supporting various platforms
-
-# 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.external-feature/feature.xml b/releng/org.eclipse.ptp.external-feature/feature.xml
deleted file mode 100644
index 8fbc5e4..0000000
--- a/releng/org.eclipse.ptp.external-feature/feature.xml
+++ /dev/null

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.external"
-      label="%featureName"
-      version="2.1.4.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>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ptp.core" version="2.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.aix.ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.ptp.linux.ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.ptp.linux.x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.ptp.linux.x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.ptp.macosx.ppc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.ptp.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.macosx.x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.external-feature/license.html b/releng/org.eclipse.ptp.external-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.external-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.linux.ppc/.project b/releng/org.eclipse.ptp.linux.ppc/.project
deleted file mode 100644
index dace863..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.linux.ppc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.linux.ppc/BUILD b/releng/org.eclipse.ptp.linux.ppc/BUILD
deleted file mode 100755
index 4da89c0..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/BUILD
+++ /dev/null

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# This script is used to build proxy plugins in the workspace
-#
-
-# This should get replaced by build script with the actual
-# PTP build version number. The script can also be run out of CVS,
-# in which case there is no version.
-VERSION="_@buildVersion@"
-if [ `expr "$VERSION" : "_@[^@]*@"` -gt 0 ]; then
-	VERSION=
-fi
-
-RMS="mpich2 ibm.pe ibm.ll"
-
-KNOWN_PLUGINS="\
-	org.eclipse.ptp.utils$VERSION\
-	org.eclipse.ptp.proxy$VERSION\
-	org.eclipse.ptp.debug.sdm$VERSION"
-		
-PARENT=`dirname $PWD`
-PLUGIN=`basename $PWD`
-PREFIX=$PARENT/$PLUGIN
-
-if [ ! -d bin ]; then
-	mkdir bin
-fi
-
-for rms in $RMS
-do
-	KNOWN_PLUGINS="$KNOWN_PLUGINS org.eclipse.ptp.rm.$rms.proxy$VERSION"
-done
-
-cd $PARENT
-
-for plugin in `echo $KNOWN_PLUGINS`
-do
-	if [ -e $plugin/configure ]; then
-		echo "Building $plugin..."
-		(cd $plugin; \
-		sh configure --prefix=$PREFIX && \
-		chmod +x install-sh && \
-		make install)
-		echo; echo
-	fi
-done
-
-exit 0
-

diff --git a/releng/org.eclipse.ptp.linux.ppc/META-INF/MANIFEST.MF b/releng/org.eclipse.ptp.linux.ppc/META-INF/MANIFEST.MF
deleted file mode 100644
index ad84d36..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName.linux.ppc
-Bundle-SymbolicName: org.eclipse.ptp.linux.ppc
-Bundle-Version: 2.1.4.qualifier
-Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider

diff --git a/releng/org.eclipse.ptp.linux.ppc/about.html b/releng/org.eclipse.ptp.linux.ppc/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/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/releng/org.eclipse.ptp.linux.ppc/bin/.cvsignore b/releng/org.eclipse.ptp.linux.ppc/bin/.cvsignore
deleted file mode 100644
index 3dadf56..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/bin/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-sdm
-*_proxy
-*.py

diff --git a/releng/org.eclipse.ptp.linux.ppc/bin/README b/releng/org.eclipse.ptp.linux.ppc/bin/README
deleted file mode 100644
index 8a898b7..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/bin/README
+++ /dev/null

@@ -1 +0,0 @@
-ORTE_SERVER binary will go here.
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.linux.ppc/build.properties b/releng/org.eclipse.ptp.linux.ppc/build.properties
deleted file mode 100644
index 76d1cf6..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = fragment.xml,\
-               about.html,\
-               BUILD,\
-               META-INF/

diff --git a/releng/org.eclipse.ptp.linux.ppc/fragment.xml b/releng/org.eclipse.ptp.linux.ppc/fragment.xml
deleted file mode 100644
index aedc72a..0000000
--- a/releng/org.eclipse.ptp.linux.ppc/fragment.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment>
-
-</fragment>

diff --git a/releng/org.eclipse.ptp.linux.x86/.project b/releng/org.eclipse.ptp.linux.x86/.project
deleted file mode 100644
index 9d96aeb..0000000
--- a/releng/org.eclipse.ptp.linux.x86/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.linux.x86</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.linux.x86/BUILD b/releng/org.eclipse.ptp.linux.x86/BUILD
deleted file mode 100755
index 4da89c0..0000000
--- a/releng/org.eclipse.ptp.linux.x86/BUILD
+++ /dev/null

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# This script is used to build proxy plugins in the workspace
-#
-
-# This should get replaced by build script with the actual
-# PTP build version number. The script can also be run out of CVS,
-# in which case there is no version.
-VERSION="_@buildVersion@"
-if [ `expr "$VERSION" : "_@[^@]*@"` -gt 0 ]; then
-	VERSION=
-fi
-
-RMS="mpich2 ibm.pe ibm.ll"
-
-KNOWN_PLUGINS="\
-	org.eclipse.ptp.utils$VERSION\
-	org.eclipse.ptp.proxy$VERSION\
-	org.eclipse.ptp.debug.sdm$VERSION"
-		
-PARENT=`dirname $PWD`
-PLUGIN=`basename $PWD`
-PREFIX=$PARENT/$PLUGIN
-
-if [ ! -d bin ]; then
-	mkdir bin
-fi
-
-for rms in $RMS
-do
-	KNOWN_PLUGINS="$KNOWN_PLUGINS org.eclipse.ptp.rm.$rms.proxy$VERSION"
-done
-
-cd $PARENT
-
-for plugin in `echo $KNOWN_PLUGINS`
-do
-	if [ -e $plugin/configure ]; then
-		echo "Building $plugin..."
-		(cd $plugin; \
-		sh configure --prefix=$PREFIX && \
-		chmod +x install-sh && \
-		make install)
-		echo; echo
-	fi
-done
-
-exit 0
-

diff --git a/releng/org.eclipse.ptp.linux.x86/META-INF/MANIFEST.MF b/releng/org.eclipse.ptp.linux.x86/META-INF/MANIFEST.MF
deleted file mode 100644
index 602601f..0000000
--- a/releng/org.eclipse.ptp.linux.x86/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName.linux.x86
-Bundle-SymbolicName: org.eclipse.ptp.linux.x86
-Bundle-Version: 2.1.4.qualifier
-Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider

diff --git a/releng/org.eclipse.ptp.linux.x86/about.html b/releng/org.eclipse.ptp.linux.x86/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/releng/org.eclipse.ptp.linux.x86/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/releng/org.eclipse.ptp.linux.x86/bin/.cvsignore b/releng/org.eclipse.ptp.linux.x86/bin/.cvsignore
deleted file mode 100644
index 3dadf56..0000000
--- a/releng/org.eclipse.ptp.linux.x86/bin/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-sdm
-*_proxy
-*.py

diff --git a/releng/org.eclipse.ptp.linux.x86/bin/README b/releng/org.eclipse.ptp.linux.x86/bin/README
deleted file mode 100644
index 8a898b7..0000000
--- a/releng/org.eclipse.ptp.linux.x86/bin/README
+++ /dev/null

@@ -1 +0,0 @@
-ORTE_SERVER binary will go here.
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.linux.x86/build.properties b/releng/org.eclipse.ptp.linux.x86/build.properties
deleted file mode 100644
index 77490ff..0000000
--- a/releng/org.eclipse.ptp.linux.x86/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = META-INF/,\
-               fragment.xml,\
-               about.html,\
-               BUILD

diff --git a/releng/org.eclipse.ptp.linux.x86/fragment.xml b/releng/org.eclipse.ptp.linux.x86/fragment.xml
deleted file mode 100644
index aedc72a..0000000
--- a/releng/org.eclipse.ptp.linux.x86/fragment.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment>
-
-</fragment>

diff --git a/releng/org.eclipse.ptp.linux.x86_64/.project b/releng/org.eclipse.ptp.linux.x86_64/.project
deleted file mode 100644
index da76721..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.linux.x86_64</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.linux.x86_64/BUILD b/releng/org.eclipse.ptp.linux.x86_64/BUILD
deleted file mode 100755
index 4da89c0..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/BUILD
+++ /dev/null

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# This script is used to build proxy plugins in the workspace
-#
-
-# This should get replaced by build script with the actual
-# PTP build version number. The script can also be run out of CVS,
-# in which case there is no version.
-VERSION="_@buildVersion@"
-if [ `expr "$VERSION" : "_@[^@]*@"` -gt 0 ]; then
-	VERSION=
-fi
-
-RMS="mpich2 ibm.pe ibm.ll"
-
-KNOWN_PLUGINS="\
-	org.eclipse.ptp.utils$VERSION\
-	org.eclipse.ptp.proxy$VERSION\
-	org.eclipse.ptp.debug.sdm$VERSION"
-		
-PARENT=`dirname $PWD`
-PLUGIN=`basename $PWD`
-PREFIX=$PARENT/$PLUGIN
-
-if [ ! -d bin ]; then
-	mkdir bin
-fi
-
-for rms in $RMS
-do
-	KNOWN_PLUGINS="$KNOWN_PLUGINS org.eclipse.ptp.rm.$rms.proxy$VERSION"
-done
-
-cd $PARENT
-
-for plugin in `echo $KNOWN_PLUGINS`
-do
-	if [ -e $plugin/configure ]; then
-		echo "Building $plugin..."
-		(cd $plugin; \
-		sh configure --prefix=$PREFIX && \
-		chmod +x install-sh && \
-		make install)
-		echo; echo
-	fi
-done
-
-exit 0
-

diff --git a/releng/org.eclipse.ptp.linux.x86_64/META-INF/MANIFEST.MF b/releng/org.eclipse.ptp.linux.x86_64/META-INF/MANIFEST.MF
deleted file mode 100644
index 066317c..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName.linux.x86_64
-Bundle-SymbolicName: org.eclipse.ptp.linux.x86_64
-Bundle-Version: 2.1.4.qualifier
-Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider

diff --git a/releng/org.eclipse.ptp.linux.x86_64/about.html b/releng/org.eclipse.ptp.linux.x86_64/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/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/releng/org.eclipse.ptp.linux.x86_64/bin/.cvsignore b/releng/org.eclipse.ptp.linux.x86_64/bin/.cvsignore
deleted file mode 100644
index 3dadf56..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/bin/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-sdm
-*_proxy
-*.py

diff --git a/releng/org.eclipse.ptp.linux.x86_64/bin/README b/releng/org.eclipse.ptp.linux.x86_64/bin/README
deleted file mode 100644
index 8a898b7..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/bin/README
+++ /dev/null

@@ -1 +0,0 @@
-ORTE_SERVER binary will go here.
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.linux.x86_64/build.properties b/releng/org.eclipse.ptp.linux.x86_64/build.properties
deleted file mode 100644
index 77490ff..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = META-INF/,\
-               fragment.xml,\
-               about.html,\
-               BUILD

diff --git a/releng/org.eclipse.ptp.linux.x86_64/fragment.xml b/releng/org.eclipse.ptp.linux.x86_64/fragment.xml
deleted file mode 100644
index aedc72a..0000000
--- a/releng/org.eclipse.ptp.linux.x86_64/fragment.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment>
-
-</fragment>

diff --git a/releng/org.eclipse.ptp.macosx.ppc/.project b/releng/org.eclipse.ptp.macosx.ppc/.project
deleted file mode 100644
index c96f2e7..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.macosx.ppc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.macosx.ppc/BUILD b/releng/org.eclipse.ptp.macosx.ppc/BUILD
deleted file mode 100755
index 4da89c0..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/BUILD
+++ /dev/null

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# This script is used to build proxy plugins in the workspace
-#
-
-# This should get replaced by build script with the actual
-# PTP build version number. The script can also be run out of CVS,
-# in which case there is no version.
-VERSION="_@buildVersion@"
-if [ `expr "$VERSION" : "_@[^@]*@"` -gt 0 ]; then
-	VERSION=
-fi
-
-RMS="mpich2 ibm.pe ibm.ll"
-
-KNOWN_PLUGINS="\
-	org.eclipse.ptp.utils$VERSION\
-	org.eclipse.ptp.proxy$VERSION\
-	org.eclipse.ptp.debug.sdm$VERSION"
-		
-PARENT=`dirname $PWD`
-PLUGIN=`basename $PWD`
-PREFIX=$PARENT/$PLUGIN
-
-if [ ! -d bin ]; then
-	mkdir bin
-fi
-
-for rms in $RMS
-do
-	KNOWN_PLUGINS="$KNOWN_PLUGINS org.eclipse.ptp.rm.$rms.proxy$VERSION"
-done
-
-cd $PARENT
-
-for plugin in `echo $KNOWN_PLUGINS`
-do
-	if [ -e $plugin/configure ]; then
-		echo "Building $plugin..."
-		(cd $plugin; \
-		sh configure --prefix=$PREFIX && \
-		chmod +x install-sh && \
-		make install)
-		echo; echo
-	fi
-done
-
-exit 0
-

diff --git a/releng/org.eclipse.ptp.macosx.ppc/META-INF/MANIFEST.MF b/releng/org.eclipse.ptp.macosx.ppc/META-INF/MANIFEST.MF
deleted file mode 100644
index b3ba67f..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName.macosx.ppc
-Bundle-SymbolicName: org.eclipse.ptp.macosx.ppc
-Bundle-Version: 2.1.4.qualifier
-Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider

diff --git a/releng/org.eclipse.ptp.macosx.ppc/about.html b/releng/org.eclipse.ptp.macosx.ppc/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/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/releng/org.eclipse.ptp.macosx.ppc/bin/.cvsignore b/releng/org.eclipse.ptp.macosx.ppc/bin/.cvsignore
deleted file mode 100644
index 3dadf56..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/bin/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-sdm
-*_proxy
-*.py

diff --git a/releng/org.eclipse.ptp.macosx.ppc/bin/README b/releng/org.eclipse.ptp.macosx.ppc/bin/README
deleted file mode 100644
index 8a898b7..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/bin/README
+++ /dev/null

@@ -1 +0,0 @@
-ORTE_SERVER binary will go here.
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.macosx.ppc/build.properties b/releng/org.eclipse.ptp.macosx.ppc/build.properties
deleted file mode 100644
index 77490ff..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = META-INF/,\
-               fragment.xml,\
-               about.html,\
-               BUILD

diff --git a/releng/org.eclipse.ptp.macosx.ppc/fragment.xml b/releng/org.eclipse.ptp.macosx.ppc/fragment.xml
deleted file mode 100644
index aedc72a..0000000
--- a/releng/org.eclipse.ptp.macosx.ppc/fragment.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment>
-
-</fragment>

diff --git a/releng/org.eclipse.ptp.macosx.x86/.project b/releng/org.eclipse.ptp.macosx.x86/.project
deleted file mode 100644
index b0dc81c..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.macosx.x86</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.macosx.x86/BUILD b/releng/org.eclipse.ptp.macosx.x86/BUILD
deleted file mode 100755
index 4da89c0..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/BUILD
+++ /dev/null

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# This script is used to build proxy plugins in the workspace
-#
-
-# This should get replaced by build script with the actual
-# PTP build version number. The script can also be run out of CVS,
-# in which case there is no version.
-VERSION="_@buildVersion@"
-if [ `expr "$VERSION" : "_@[^@]*@"` -gt 0 ]; then
-	VERSION=
-fi
-
-RMS="mpich2 ibm.pe ibm.ll"
-
-KNOWN_PLUGINS="\
-	org.eclipse.ptp.utils$VERSION\
-	org.eclipse.ptp.proxy$VERSION\
-	org.eclipse.ptp.debug.sdm$VERSION"
-		
-PARENT=`dirname $PWD`
-PLUGIN=`basename $PWD`
-PREFIX=$PARENT/$PLUGIN
-
-if [ ! -d bin ]; then
-	mkdir bin
-fi
-
-for rms in $RMS
-do
-	KNOWN_PLUGINS="$KNOWN_PLUGINS org.eclipse.ptp.rm.$rms.proxy$VERSION"
-done
-
-cd $PARENT
-
-for plugin in `echo $KNOWN_PLUGINS`
-do
-	if [ -e $plugin/configure ]; then
-		echo "Building $plugin..."
-		(cd $plugin; \
-		sh configure --prefix=$PREFIX && \
-		chmod +x install-sh && \
-		make install)
-		echo; echo
-	fi
-done
-
-exit 0
-

diff --git a/releng/org.eclipse.ptp.macosx.x86/META-INF/MANIFEST.MF b/releng/org.eclipse.ptp.macosx.x86/META-INF/MANIFEST.MF
deleted file mode 100644
index 5c2a2f2..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %fragmentName.macosx.x86
-Bundle-SymbolicName: org.eclipse.ptp.macosx.x86
-Bundle-Version: 2.1.4.qualifier
-Fragment-Host: org.eclipse.ptp.core;bundle-version="2.0.0"
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider

diff --git a/releng/org.eclipse.ptp.macosx.x86/about.html b/releng/org.eclipse.ptp.macosx.x86/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/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/releng/org.eclipse.ptp.macosx.x86/bin/.cvsignore b/releng/org.eclipse.ptp.macosx.x86/bin/.cvsignore
deleted file mode 100644
index 41d7c63..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/bin/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-sdm
-*_proxy
-*.py
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.macosx.x86/bin/README b/releng/org.eclipse.ptp.macosx.x86/bin/README
deleted file mode 100644
index 8a898b7..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/bin/README
+++ /dev/null

@@ -1 +0,0 @@
-ORTE_SERVER binary will go here.
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.macosx.x86/build.properties b/releng/org.eclipse.ptp.macosx.x86/build.properties
deleted file mode 100644
index 77490ff..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = META-INF/,\
-               fragment.xml,\
-               about.html,\
-               BUILD

diff --git a/releng/org.eclipse.ptp.macosx.x86/fragment.xml b/releng/org.eclipse.ptp.macosx.x86/fragment.xml
deleted file mode 100644
index aedc72a..0000000
--- a/releng/org.eclipse.ptp.macosx.x86/fragment.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<fragment>
-
-</fragment>

diff --git a/releng/org.eclipse.ptp.pldt-feature/.project b/releng/org.eclipse.ptp.pldt-feature/.project
deleted file mode 100644
index c938ab1..0000000
--- a/releng/org.eclipse.ptp.pldt-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.pldt-feature/build.properties b/releng/org.eclipse.ptp.pldt-feature/build.properties
deleted file mode 100644
index 8c26e98..0000000
--- a/releng/org.eclipse.ptp.pldt-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html
-generateFeatureVersionSuffix=true

diff --git a/releng/org.eclipse.ptp.pldt-feature/buildNotes.txt b/releng/org.eclipse.ptp.pldt-feature/buildNotes.txt
deleted file mode 100644
index 9578ae6..0000000
--- a/releng/org.eclipse.ptp.pldt-feature/buildNotes.txt
+++ /dev/null

@@ -1,90 +0,0 @@
-To build feature:
-BRT 7/18/2006
-
-Goal: package all plugins as jars, package feature as a folder.
-
-(1) plugin build setup
-(2) feature setup
-(3) feature export
-
-(1) plugin build setup
-In EACH plugin manifest, be sure to:
-
-(a) assure there IS a MANIFEST.MF.  If not, go to overview page for plugin.xml
-and click on the link to build an OSGi bundle manifest(this is the MANIFEST.MF file)
-(Note: this link doesn't appear if the project already has a MANIFEST.MF)
-
-(b) Build page: don't build a jar (since we will jar the whole plugin): 
-Under runtime information, delete a jar if it's there, and Add Library of '.'
-then on right side while '.' is selected, Add folder of 'src/' 
-Under Binary Build, the following should be selected:
-META-INF, icons (if any), plugin.xml
-(Note: the classes will be included automatically because of the '.' at the top under
-runtime information)
-And, any other resources the plugins needs such as html files, etc.
-
-(c)To get the classes included in the build:
-on 3.1 build page there is a checkbox for "include selected library in binary build" 
-which modifies build.properties to put '.' in bin.includes   ... 
-there is no checkbox on 3.2 build page.   
-You may have to manually edit build.properties to do this in 3.2
-=====================
-Part of build.properties:
-bin.includes = plugin.xml,\
-               META-INF/,\
-               icons/,\
-               .          <==== make sure this line is there
-=====================
-
-(d)and on runtime tab of manifest editor, under classpath (lower right),
-specify classpath='.'  only.  Delete a jar file if there, and do "New..." to
-add  '.' as the new library name.
-
-
------------------
-
-(2) feature setup
-In this feature project, edit the manifest (feature.xml)
-and on the plug-ins tab, select  each plug-in and be sure to 
-uncheck
-"Unpack the plugin archive after the plugin installation"
-
-This makes sure the plugins get packaged as jars, not folders.
-
-
-------------------
-(3) feature export
-Use export. Ant build seems to work BUT I can't figure out how to get ant build 
-to jar the plugins and not jar the feature.
-
-Context menu on feature (org.eclipse.ptp.pldt) project.
-Export, deployable features
-
-In tabbed section at bottom of export Wizard first page,
-check "Archive file" and set it to something like
-<workspace-location>/org.eclipse.ptp.pldt/org.eclipse.ptp.pldt-1.0.0-YYYYMMDDHHMM.zip
-
-On the options tab, do NOT select "package as individual jar archives."
-This jars the feature too, which doesn't work.
-The feature setup item above sets the jarring of the individual plug-ins.
-
-
-==== the zip that is built will not have eclipse as its root
-unzip to c:\temp\eclipse, 
-rename orig. archive (so empty dirs don't get created) 
-then re-zip with eclipse as its root into the final zip file name.
-OR use rezip.bat  which automates this [brt]
-===========
-Upload notes
-Once you've exported the feature and  
-zipped it up, try this command:
-
-		 scp zip_file.zip user@dev.eclipse.org:downloads/tools/ptp/builds
-
-where 'btibbitts' is your committer username and zip_file.zip is:
-
-		 org.eclipse.ptp.pldt-1.1-IYYYYMMDDHHMM.zip
-
-where I is a capital i (for integration) and YYYYMMDDHHMM is  
-the year, month, day, hour and minute of the build.
-

diff --git a/releng/org.eclipse.ptp.pldt-feature/dev.properties b/releng/org.eclipse.ptp.pldt-feature/dev.properties
deleted file mode 100644
index 6f59b39..0000000
--- a/releng/org.eclipse.ptp.pldt-feature/dev.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-#
-#Thu Jun 28 10:12:19 EDT 2007
-org.eclipse.ptp.pldt.mpi.analysis=bin
-org.eclipse.ptp.pldt.common=bin
-org.eclipse.ptp.pldt.lapi=bin
-org.eclipse.ptp.pldt.help=bin
-org.eclipse.ptp.pldt.mpi.analysis.cdt=bin
-org.eclipse.cdt.doc.user.welcome=bin
-org.eclipse.ptp.pldt.wizards=bin
-@ignoredot@=true
-org.eclipse.ptp.pldt.openmp.core=bin
-org.eclipse.cdt.managedbuilder.xlc.ui=bin
-org.eclipse.ptp.pldt.mpi.core=bin
-org.eclipse.ptp.pldt.welcome=bin
-org.eclipse.ptp.pldt.openmp.ui.pv=bin
-com.ibm.jdg2e.jdt=bin
-org.eclipse.ptp.pldt.openmp.analysis=bin

diff --git a/releng/org.eclipse.ptp.pldt-feature/epl-v10.html b/releng/org.eclipse.ptp.pldt-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.pldt-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.pldt-feature/feature.properties b/releng/org.eclipse.ptp.pldt-feature/feature.properties
deleted file mode 100644
index 1510775..0000000
--- a/releng/org.eclipse.ptp.pldt-feature/feature.properties
+++ /dev/null

@@ -1,133 +0,0 @@
-# Copyright (c) 2005,2008 IBM Corporation
-#
-# features.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=PTP Parallel Language Development Tools
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds a range of static analysis and programming assistance tools.
-
-# copyright
-copyright=\
-Copyright (c) 2006,2008 IBM\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.pldt-feature/feature.xml b/releng/org.eclipse.ptp.pldt-feature/feature.xml
deleted file mode 100644
index 5158196..0000000
--- a/releng/org.eclipse.ptp.pldt-feature/feature.xml
+++ /dev/null

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.pldt"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.pldt.common">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license>
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.core" version="4.0.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.cdt.doc.user"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.cdt"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.ui"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="com.ibm.icu"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.mpi.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.openmp.analysis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.openmp.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.openmp.ui.pv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.wizards"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.mpi.analysis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.mpi.analysis.cdt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.upc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.pldt-feature/license.html b/releng/org.eclipse.ptp.pldt-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.pldt-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.pldt.lapi-feature/.project b/releng/org.eclipse.ptp.pldt.lapi-feature/.project
deleted file mode 100644
index 7d3adeb..0000000
--- a/releng/org.eclipse.ptp.pldt.lapi-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.lapi-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.pldt.lapi-feature/build.properties b/releng/org.eclipse.ptp.pldt.lapi-feature/build.properties
deleted file mode 100644
index 94bb883..0000000
--- a/releng/org.eclipse.ptp.pldt.lapi-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html

diff --git a/releng/org.eclipse.ptp.pldt.lapi-feature/buildNotes.txt b/releng/org.eclipse.ptp.pldt.lapi-feature/buildNotes.txt
deleted file mode 100644
index ccace5a..0000000
--- a/releng/org.eclipse.ptp.pldt.lapi-feature/buildNotes.txt
+++ /dev/null

@@ -1,88 +0,0 @@
-To build feature:
-BRT 7/18/2006
-
-Goal: package all plugins as jars, package feature as a folder.
-
-(1) plugin build setup
-(2) feature setup
-(3) feature export
-
-(1) plugin build setup
-In EACH plugin manifest, be sure to:
-
-(a) assure there IS a MANIFEST.MF.  If not, go to overview page for plugin.xml
-and click on the link to build an OSGi bundle manifest(this is the MANIFEST.MF file)
-(Note: this link doesn't appear if the project already has a MANIFEST.MF)
-
-(b) 
-Note: Don't jar this feature and its plugin, so that the IBM user
-can replace the HTML files with the correct versions from IBM.
-Build page: don't build a jar (since we will jar the whole plugin): 
-Under runtime information, delete a jar if it's there, and Add Library of '.'
-then on right side while '.' is selected, Add folder of 'src/' 
-Under Binary Build, the following should be selected:
-META-INF, icons (if any), plugin.xml
-(Note: the classes will be included automatically because of the '.' at the top under
-runtime information)
-And, any other resources the plugins needs such as html files, etc.
-
-(c)To get the classes included in the build:
-on 3.1 build page there is a checkbox for "include selected library in binary build" 
-which modifies build.properties to put '.' in bin.includes   ... 
-there is no checkbox on 3.2 build page.   
-You may have to manually edit build.properties to do this in 3.2
-=====================
-Part of build.properties:
-bin.includes = plugin.xml,\
-               META-INF/,\
-               icons/,\
-               .          <==== make sure this line is there
-=====================
-
-(d)and on runtime tab of manifest editor, under classpath (lower right),
-specify classpath='.'  only.  Delete a jar file if there, and do "New..." to
-add  '.' as the new library name.
-
-
------------------
-
-(2) feature setup
-In this feature project, edit the manifest (feature.xml)
-and on the plug-ins tab, select  each plug-in and be sure to 
-CHECK
-"Unpack the plugin archive after the plugin installation"
-
-This makes sure the plugins get packaged as jars, not folders.
-
-
-------------------
-(3) feature export
-Use export. Ant build seems to work BUT I can't figure out how to get ant build 
-to jar the plugins and not jar the feature.
-
-Context menu on feature (org.eclipse.ptp.pldt) project.
-Export, deployable features
-
-In tabbed section at bottom of export Wizard first page,
-check "Archive file" and set it to something like
-<workspace-location>/org.eclipse.ptp.pldt/org.eclipse.ptp.pldt-1.0.0-YYYYMMDDHHMM.zip
-
-On the options tab, do NOT select "package as individual jar archives."
-This jars the feature too, which doesn't work.
-The feature setup item above sets the jarring of the individual plug-ins.
-
-
-===========
-Upload notes
-Once you've exported the feature and  
-zipped it up, try this command:
-
-		 scp zip_file.zip user@dev.eclipse.org:downloads/tools/ptp/builds
-
-where 'btibbitts' is your committer username and zip_file.zip is:
-
-		 org.eclipse.ptp.pldt-1.1-IYYYYMMDDHHMM.zip
-
-where I is a capital i (for integration I think) and YYYYMMDDHHMM is  
-the year, month, day, hour and minute of the build.
-

diff --git a/releng/org.eclipse.ptp.pldt.lapi-feature/epl-v10.html b/releng/org.eclipse.ptp.pldt.lapi-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.pldt.lapi-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.pldt.lapi-feature/feature.properties b/releng/org.eclipse.ptp.pldt.lapi-feature/feature.properties
deleted file mode 100644
index 2a2410a..0000000
--- a/releng/org.eclipse.ptp.pldt.lapi-feature/feature.properties
+++ /dev/null

@@ -1,170 +0,0 @@
-# features.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=PTP Parallel Language Development Tools LAPI Support
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=PTP Parallel Language Development Tools support for IBM LAPI library.
-
-# copyright
-copyright=\
-Copyright (c) 2006,2008 IBM\n\
-All rights reserved. This program and the accompanying materials/n/
-are made available under the terms of the Eclipse Public License v1.0/n/
-which accompanies this distribution, and is available at/n/
-http://www.eclipse.org/legal/epl-v10.html/n/
-
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
-/n/
-January 28, 2005/n/
-Usage Of Content/n/
-/n/
-ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT./n/
-/n/Applicable Licenses/n/
-/n/
-Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 1.0 ("CPL"). A copy of the CPL is provided with this Content and is also available at http://www.eclipse.org/legal/cpl-v10.html. For purposes of the CPL, "Program" will mean the Content./n/
-/n/
-Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads")./n/
-/n/
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments are located in directories named "plugins" and Features are located in directories named "features"./n/
-/n/
-Features may also include other Features ("Included Features"). Files named "feature.xml" may contain a list of the names and version numbers of Included Features./n/
-/n/
-The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:/n/
-/n/
-    * The top-level (root) directory/n/
-    * Plug-in and Fragment directories/n/
-    * Subdirectories of the directory named "src" of certain Plug-ins/n/
-    * Feature directories/n/
-/n/
-Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties". 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./n/
-/n/
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):/n/
-/n/
-    * Eclipse Public License Version 1.0 (available at http://www.eclipse.org/legal/epl-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://www-128.ibm.com/developerworks/opensource/library/os-ipl.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 TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is provided, please contact Eclipse.org to determine what terms and conditions govern that particular Content./n/
-/n/
-Cryptography/n/
-/n/
-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./n/
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.pldt.lapi-feature/feature.xml b/releng/org.eclipse.ptp.pldt.lapi-feature/feature.xml
deleted file mode 100644
index 7a744d0..0000000
--- a/releng/org.eclipse.ptp.pldt.lapi-feature/feature.xml
+++ /dev/null

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.pldt.lapi"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.pldt.lapi">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license>
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.ptp.pldt" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.ptp.pldt.common"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.cdt.doc.user"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.lapi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.pldt.lapi-feature/license.html b/releng/org.eclipse.ptp.pldt.lapi-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.pldt.lapi-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

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

@@ -1,2 +0,0 @@
-results
-tools

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.releng</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.releng/build.sh b/releng/org.eclipse.ptp.releng/build.sh
deleted file mode 100644
index 08e0717..0000000
--- a/releng/org.eclipse.ptp.releng/build.sh
+++ /dev/null

@@ -1,34 +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 r342_v20090210 org.eclipse.releng.basebuilder
-cd ..
-
-# Let's go!
-java -jar tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
-	-ws gtk -arch ppc -os linux -application org.eclipse.ant.core.antRunner $*
-
-exit 0

diff --git a/releng/org.eclipse.ptp.releng/build.xml b/releng/org.eclipse.ptp.releng/build.xml
deleted file mode 100644
index 69430c6..0000000
--- a/releng/org.eclipse.ptp.releng/build.xml
+++ /dev/null

@@ -1,565 +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.3/I.I200911161214/cdt-master-5.0.3-I200911161214.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/M20090922-0300/RSE-SDK-M20090922-0300.zip"/>
-		<property name="tauJars" value="${user.home}/tau_jars.zip"/>
-		<property name="branchVersion" value="2.1.4"/>
-		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
-		<property name="forceContextQualifier" value="${timestamp}"/>
-		<property name="buildingOSGi" value="true"/>
-		<property name="buildDirectory" value="${basedir}/results"/>
-		<property name="copyToDir" value="/home/www/tools/ptp/builds/${branchVersion}"/>
-		<property name="testDirectory" value="${buildDirectory}/test"/>
-		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
-		<property name="pde.build.scripts" value="${eclipse.pdebuild.scripts}"/>
-		<property name="collectingFolder" value="eclipse"/>
-		<property name="archivePrefix" value="eclipse"/>
-		<property name="buildType" value="I" />
-		<property name="buildId" value="${buildType}${timestamp}"/>
-		<property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
-		<property name="masterFile" value="ptp-master-${branchVersion}-${buildId}.zip"/>
-		<property name="eclipseTest" value="org.eclipse.test_3.2.0"/>
-		<property name="mailto" value="g.watson@computer.org"/>
-		<property name="eclipseRoot" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse"/>
-		<property name="baseos" value="${osgi.os}"/>
-		<property name="basews" value="${osgi.ws}"/>
-		<property name="basearch" value="${osgi.arch}"/>
-		<property name="tagbranch" value="-r ptp_2_1"/>
-		<property name="tagname" value="v${timestamp}"/>
-		<property name="testReports" value="${zipsdir}/testReports"/>
-		<property name="junit-report-output" value="${testReports}"/>
-		<condition property="onWindows">
-			<os family="windows"/>
-		</condition>
-		<mkdir dir="${buildDirectory}"/>
-		<mkdir dir="${testReports}"/>
-	</target>
-	
-	<target name="fetch" depends="init">
-		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
-			<property name="builder" value="${basedir}/master"/>
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
-			<property name="builder" value="${basedir}/master"/>
-		</ant>
-	</target>
-	
-	<target name="unzip" depends="init" unless="dontUnzip">
-		<untar src="${eclipseDist}" dest="${buildDirectory}" compression="gzip"/>
-		<unzip src="${rseDist}" dest="${buildDirectory}"/>
-		<unzip src="${cdtDist}" dest="${buildDirectory}/eclipse"/>
-		<unzip src="${mylynDist}" dest="${buildDirectory}/eclipse"/>
-	</target>
-	
-	<target name="zips" depends="init,unzip">
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/master" />
-		</ant>
-		<concat destfile="${zipsdir}/compilelog.txt">
-			<fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/>
-		</concat>
-		<loadfile property="compileLog" srcFile="${zipsdir}/compilelog.txt"/>
-		<condition property="hasErrors">
-			<contains string="${compileLog}" substring=" ERROR"/>
-		</condition>
-		<move file="${zipsdir}/${masterFile}" todir="${buildDirectory}"/>
-		<unzip src="${buildDirectory}/${masterFile}" dest="${buildDirectory}/site"/>
-		<move file="${buildDirectory}/eclipse/epl-v10.html" todir="${buildDirectory}/site/eclipse"/>
-		<move file="${buildDirectory}/eclipse/notice.html" todir="${buildDirectory}/site/eclipse"/>
-		<copy file="buildsite.xml" tofile="${buildDirectory}/site/eclipse/site.xml"/>
-		<replace file="${buildDirectory}/site/eclipse/site.xml">
-			<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-		</replace>
-		<copy file="pack.properties" todir="${buildDirectory}/site/eclipse"/>
-
-		<zip destfile="${zipsdir}/${masterFile}"
-			basedir="${buildDirectory}/site/eclipse"/>
-	</target>
-
-	<target name="sign" depends="init" unless="hasErrors">
-		<exec executable="sign">
-			<arg value="${buildDirectory}/${buildType}.${buildId}/${masterFile}"/>
-			<arg value="nomail"/>
-			<arg value="${buildDirectory}/signed"/>
-		</exec>
-		<waitfor maxwait="30" maxwaitunit="minute">
-			<available file="${buildDirectory}/signed/${masterFile}"/>
-		</waitfor>
-		<move file="${buildDirectory}/signed/${masterFile}" todir="${zipsdir}"/>
-	</target>
-	<target name="test" depends="init" unless="hasErrors"/>
-	<target name="copy" depends="init" unless="hasErrors">
-		<mkdir dir="${copyToDir}/${buildType}.${buildId}"/>
-		<copy todir="${copyToDir}/${buildType}.${buildId}">
-			<fileset dir="${buildDirectory}/${buildType}.${buildId}"/>
-		</copy>
-		<!-- Create symlink to latest build -->
-		<symlink action="delete" link="${copyToDir}/latest" failonerror="false"/>
-		<symlink link="${copyToDir}/latest" resource="${copyToDir}/${buildType}.${buildId}" overwrite="true"/>
-		<symlink action="delete" link="${copyToDir}/ptp-master-${branchVersion}-latest.zip" failonerror="false"/>
-		<symlink link="${copyToDir}/ptp-master-${branchVersion}-latest.zip" resource="${copyToDir}/${buildType}.${buildId}/${masterFile}" overwrite="true"/>
-		<symlink action="delete" link="${copyToDir}/rdt-server-unix-${branchVersion}-latest.tar" failonerror="false"/>
-		<symlink link="${copyToDir}/rdt-server-unix-${branchVersion}-latest.tar" resource="${copyToDir}/${buildType}.${buildId}/rdt-server-unix-${branchVersion}.tar" overwrite="true"/>
-	</target>
-	
-	<target name="tagone">
-		<cvs cvsroot="/cvsroot/tools" command="rtag ${tagbranch} ${tagname} ${tagmodule}"/>
-	</target>
-	
-	<target name="tag" depends="init">
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.master"/>
-		</antcall>
-		
-		<!--Features-->
-		<!--
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.core-feature"/>
-		</antcall>	
-		-->	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature"/>
-		</antcall>
-		<!--
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature"/>
-		</antcall>
-		-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature"/>
-		</antcall>		
-		<!--
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/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.mpich2-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>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt.xlc-feature"/>
-		</antcall>	
-		<!--
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell-feature"/>
-		</antcall>		
-		-->
-		
-		<!--Plugins-->
-		<!--
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol"/>
-		</antcall>
-		-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.core"/>
-		</antcall>		
-		<!--
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui"/>
-		</antcall>		
-		-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.ui"/>
-		</antcall>
-		<!--
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.rm.remote"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.launch"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/doc/org.eclipse.ptp.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts"/>
-		</antcall>
-		-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.xlc"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.make.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services.test"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui.test"/>
-		</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/tools/cell/org.eclipse.ptp.cell"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.alf.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.be.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.be.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.cellsimulator"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.launcher.cellbe"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.launcher.pdt"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.remotesimulator"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.ui.deploy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.examples.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.help"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.make.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.gnu.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.gnu.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.xl.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.xl.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.pdt.xml"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.preferences"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.dualcell"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.dualsoma"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.singlecell"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.singlesoma"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.profile.default"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.sputiming"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.sputiming.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.utils"/>
-		</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 6d213a5..0000000
--- a/releng/org.eclipse.ptp.releng/buildsite.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<description url="http://download.eclipse.org/tools/ptp/releases/2.1">
-		Parallel Tools Platform update site - Release 2.1
-	</description>
-	<feature url="features/org.eclipse.ptp_@buildVersion@.jar" id="org.eclipse.ptp" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<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.mpich2_@buildVersion@.jar" id="org.eclipse.ptp.rm.mpich2" 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 url="features/org.eclipse.ptp.cell_@buildVersion@.jar" id="org.eclipse.ptp.cell" 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>
-	<feature id="org.eclipse.ptp.rdt.xlc" url="features/org.eclipse.ptp.rdt.xlc_@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 dca99b8..0000000
--- a/releng/org.eclipse.ptp.releng/maps/ptp.map
+++ /dev/null

@@ -1,162 +0,0 @@
-! The master
-feature@org.eclipse.ptp.master=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.master
-
-! PTP features
-feature@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp-feature
-feature@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature
-feature@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.core-feature
-feature@org.eclipse.ptp.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature
-feature@org.eclipse.ptp.remote.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature
-feature@org.eclipse.ptp.remote.rse=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature
-feature@org.eclipse.ptp.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature
-feature@org.eclipse.ptp.rm.ibm.ll=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.ll-feature
-feature@org.eclipse.ptp.rm.ibm.pe=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.pe-feature
-feature@org.eclipse.ptp.rm.mpich2=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature
-feature@org.eclipse.ptp.rm.openmpi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature
-feature@org.eclipse.ptp.external=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.external-feature
-feature@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature
-
-! PLDT features
-feature@org.eclipse.ptp.pldt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature
-feature@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature
-
-! PTF features
-feature@org.eclipse.ptp.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf-feature
-feature@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau-feature
-feature@org.eclipse.ptp.perf.tau.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau.fortran-feature
-
-! RDT features
-feature@org.eclipse.ptp.rdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature
-feature@org.eclipse.ptp.rdt.xlc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt.xlc-feature
-
-! Cell features
-feature@org.eclipse.ptp.cell=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell-feature
-
-! PTP Plugins
-plugin@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp
-plugin@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.core
-plugin@org.eclipse.ptp.utils.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.core
-plugin@org.eclipse.ptp.utils.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.ui
-plugin@org.eclipse.ptp.proxy.protocol=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol
-plugin@org.eclipse.ptp.remote.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.core
-plugin@org.eclipse.ptp.remote.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core
-plugin@org.eclipse.ptp.remote.remotetools.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui
-plugin@org.eclipse.ptp.remote.rse.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core
-plugin@org.eclipse.ptp.remote.rse.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui
-plugin@org.eclipse.ptp.remote.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.ui
-plugin@org.eclipse.ptp.rm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.core
-plugin@org.eclipse.ptp.rm.ibm.ll.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core
-plugin@org.eclipse.ptp.rm.ibm.ll.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help
-plugin@org.eclipse.ptp.rm.ibm.ll.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy
-plugin@org.eclipse.ptp.rm.ibm.ll.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui
-plugin@org.eclipse.ptp.rm.ibm.pe.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core
-plugin@org.eclipse.ptp.rm.ibm.pe.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help
-plugin@org.eclipse.ptp.rm.ibm.pe.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy
-plugin@org.eclipse.ptp.rm.ibm.pe.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui
-plugin@org.eclipse.ptp.rm.mpi.mpich2.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.core
-plugin@org.eclipse.ptp.rm.mpi.mpich2.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.ui
-plugin@org.eclipse.ptp.rm.mpi.openmpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core
-plugin@org.eclipse.ptp.rm.mpi.openmpi.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui
-plugin@org.eclipse.ptp.rm.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.rm.remote
-plugin@org.eclipse.ptp.rm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui
-plugin@org.eclipse.ptp.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.ui
-plugin@org.eclipse.ptp.debug.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.core
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.debug.sdm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core
-plugin@org.eclipse.ptp.debug.sdm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui
-plugin@org.eclipse.ptp.debug.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy
-plugin@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils
-plugin@org.eclipse.ptp.launch=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.launch
-plugin@org.eclipse.ptp.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/doc/org.eclipse.ptp.help
-
-! Remote Tools Plugins
-plugin@org.eclipse.ptp.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core
-plugin@org.eclipse.ptp.remotetools.environment.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core
-plugin@org.eclipse.ptp.remotetools.environment.generichost=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost
-plugin@org.eclipse.ptp.remotetools.environment.launcher=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher
-plugin@org.eclipse.ptp.remotetools.environment.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui
-plugin@org.eclipse.ptp.remotetools.preferences=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences
-plugin@org.eclipse.ptp.remotetools.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils
-
-! PLDT Plugins
-plugin@org.eclipse.ptp.pldt.common=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common
-plugin@org.eclipse.ptp.pldt.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.help
-plugin@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi
-plugin@org.eclipse.ptp.pldt.mpi.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis
-plugin@org.eclipse.ptp.pldt.mpi.analysis.cdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt
-plugin@org.eclipse.ptp.pldt.mpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core
-plugin@org.eclipse.ptp.pldt.openmp.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis
-plugin@org.eclipse.ptp.pldt.openmp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core
-plugin@org.eclipse.ptp.pldt.openmp.ui.pv=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv
-plugin@org.eclipse.ptp.pldt.upc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.upc
-plugin@org.eclipse.ptp.pldt.wizards=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards
-
-! PTF Plugins
-plugin@org.eclipse.ptp.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf
-plugin@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau
-plugin@org.eclipse.ptp.perf.tau.jars=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars
-plugin@org.eclipse.ptp.perf.tau.papiselect=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect
-plugin@org.eclipse.ptp.perf.tau.perfdmf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf
-plugin@org.eclipse.ptp.perf.tau.selinst=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst
-plugin@org.eclipse.ptp.perf.tau.selinstfort=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort
-plugin@org.eclipse.ptp.perf.toolopts=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts
-
-! RDT Plugins
-plugin@org.eclipse.ptp.rdt.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core
-plugin@org.eclipse.ptp.rdt.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui
-plugin@org.eclipse.ptp.rdt.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services
-plugin@org.eclipse.ptp.rdt.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user
-plugin@org.eclipse.ptp.rdt.xlc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.xlc
-plugin@org.eclipse.ptp.rdt.managedbuilder.xlc.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui
-plugin@org.eclipse.ptp.rdt.make.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.make.ui
-
-! Cell Plugins
-plugin@org.eclipse.ptp.cell=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell
-plugin@org.eclipse.ptp.cell.alf.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.alf.ui
-plugin@org.eclipse.ptp.cell.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.core
-plugin@org.eclipse.ptp.cell.debug.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.core
-plugin@org.eclipse.ptp.cell.debug.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.ui
-plugin@org.eclipse.ptp.cell.debug.be.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.be.core
-plugin@org.eclipse.ptp.cell.debug.be.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.debug.be.ui
-plugin@org.eclipse.ptp.cell.environment.cellsimulator=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.cellsimulator
-plugin@org.eclipse.ptp.cell.environment.launcher.cellbe=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.launcher.cellbe
-plugin@org.eclipse.ptp.cell.environment.launcher.pdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.launcher.pdt
-plugin@org.eclipse.ptp.cell.environment.remotesimulator=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.remotesimulator
-plugin@org.eclipse.ptp.cell.environment.ui.deploy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.environment.ui.deploy
-plugin@org.eclipse.ptp.cell.examples.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.examples.ui
-plugin@org.eclipse.ptp.cell.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.help
-plugin@org.eclipse.ptp.cell.make.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.make.core
-plugin@org.eclipse.ptp.cell.managedbuilder.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.core
-plugin@org.eclipse.ptp.cell.managedbuilder.gnu.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.gnu.core
-plugin@org.eclipse.ptp.cell.managedbuilder.gnu.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.gnu.ui
-plugin@org.eclipse.ptp.cell.managedbuilder.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.ui
-plugin@org.eclipse.ptp.cell.managedbuilder.xl.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.xl.core
-plugin@org.eclipse.ptp.cell.managedbuilder.xl.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.managedbuilder.xl.ui
-plugin@org.eclipse.ptp.cell.pdt.xml=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.pdt.xml
-plugin@org.eclipse.ptp.cell.preferences=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.preferences
-plugin@org.eclipse.ptp.cell.simulator=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator
-plugin@org.eclipse.ptp.cell.simulator.architecture.dualcell=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.dualcell
-plugin@org.eclipse.ptp.cell.simulator.architecture.dualsoma=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.dualsoma
-plugin@org.eclipse.ptp.cell.simulator.architecture.singlecell=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.singlecell
-plugin@org.eclipse.ptp.cell.simulator.architecture.singlesoma=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.architecture.singlesoma
-plugin@org.eclipse.ptp.cell.simulator.profile.default=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.simulator.profile.default
-plugin@org.eclipse.ptp.cell.sputiming=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.sputiming
-plugin@org.eclipse.ptp.cell.sputiming.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.sputiming.ui
-plugin@org.eclipse.ptp.cell.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.ui
-plugin@org.eclipse.ptp.cell.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/cell/org.eclipse.ptp.cell.utils
-
-! 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 cb8bbef..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=ptp_2_1
-
-# The CVS tag to use when fetching elements to build.  By default the
-# builder will use whatever is in the maps.  Use this value to override
-# for example, when doing a nightly build out of HEAD
-# fetchTag=HEAD
-
-ptpTag=ptp_2_1
-
-############## 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 ba7da6a..0000000
--- a/releng/org.eclipse.ptp.releng/master/customTargets.xml
+++ /dev/null

@@ -1,157 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" >
-
-<!-- ===================================================================== -->
-<!-- Run a given ${target} on all elements being built -->
-<!-- Add on <ant> task for each top level element being built. -->
-<!-- ===================================================================== -->
-<target name="allElements">
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.ptp.master"/>
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Targets to assemble the built elements for particular configurations  -->
-<!-- These generally call the generated assemble scripts (named in -->
-<!-- ${assembleScriptName}) but may also add pre and post processing -->
-<!-- Add one target for each root element and each configuration -->
-<!-- ===================================================================== -->
-
-<target name="assemble.org.eclipse.ptp.master.group.group.group">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="ptp-master-${branchVersion}-${buildId}.zip"/>
-	</ant>
-</target>
-	
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="getMapFiles">
-	<copy file="${builder}/../maps/ptp.map" todir="${buildDirectory}/maps"/>
-	<replace file="${buildDirectory}/maps/ptp.map">
-		<replacefilter token="@ptpTag@" value="${ptpTag}"/>
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="postFetch">
-	<condition property="patchesAvailable">
-		<available file="${builder}/patch.xml"/>
-	</condition>
-	<antcall target="applyPatches"/>
-</target>
-
-<target name="applyPatches" if="patchesAvailable">
-	<ant antfile="${builder}/patch.xml"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-	<!--
-	<unzip src="${tauJars}" dest="${buildDirectory}/plugins/org.eclipse.ptp.perf.tau.jars"/>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.aix.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86/BUILD">
-		<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86_64/BUILD">
-		<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.x86/BUILD">
-		<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-	</replace>
-	-->
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="postProcess">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running assemble. -->
-<!-- ===================================================================== -->
-<target name="preAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after  running assemble. -->
-<!-- ===================================================================== -->
-<target name="postAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after the build is done. -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to test the build results -->
-<!-- ===================================================================== -->
-<target name="test">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to publish the build results -->
-<!-- ===================================================================== -->
-<target name="publish">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="You must specify a target when invoking this file" />
-</target>
-
-</project>

diff --git a/releng/org.eclipse.ptp.releng/pack.properties b/releng/org.eclipse.ptp.releng/pack.properties
deleted file mode 100644
index 1cb5a5e..0000000
--- a/releng/org.eclipse.ptp.releng/pack.properties
+++ /dev/null

@@ -1 +0,0 @@
-pack200.default.args=-E4

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

@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# ptpbuild wrapper script
-#
-# Usage: ptpbuild [-t tag] [-d build_dir] [build_args]
-#
-# where
-#
-# tag is the CVS tag used to check out the releng project (default HEAD)
-# build_dir is the location that the build will take place
-# build_args are any arguments you want to pass to the build script
-#
-# set up anything environment specific that needs to be done before
-# launching the build script in the releng project
-
-TAG=HEAD
-CDT_TAG=HEAD
-
-# main staging directory
-BUILD_DIR=/opt/public/download-staging.priv/tools/ptp/releng
-
-args=`getopt d:t: $*`
-
-if [ $? != 0 ]; then
-	echo "usage: ptpbuild [-t tag] [-c cdt_tag] [-d build_dir] [build_args]"
-	exit 1
-fi
-
-set -- $args
-for i
-do
-	case "$i"
-	in
-	-c) CDT_TAG="$2"; shift; shift;;
-	-d) BUILD_DIR="$2"; shift; shift;;
-	-t) TAG="$2"; shift; shift;;
-	--) shift; break;;
-	esac
-done
-
-BUILD_LOG=$BUILD_DIR/ptpbuild_${TAG}_`date +%Y%m%d%H%M`.log
-
-{
-# create the releng staging directory and go there
-mkdir -p $BUILD_DIR && cd $BUILD_DIR
-
-# remove the old build
-rm -fr org.eclipse.ptp
-
-# Check out the releng project
-export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-cvs co -r $TAG -d org.eclipse.ptp org.eclipse.ptp/releng/org.eclipse.ptp.releng
-
-# run the main script
-cd org.eclipse.ptp
-sh build.sh $*
-
-# Build RDT server packages
-cd results/plugins
-
-# Check out rdt.core.remotejars, rdt.core.stubs, cdt.core, cdt.core.lrparser, cdt.core.lrparser.xlc for source
-export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-cvs co -r $TAG -d org.eclipse.ptp.rdt.core.remotejars org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars
-cvs co -r $TAG -d org.eclipse.ptp.rdt.core.stubs org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs
-cvs co -r $CDT_TAG -d org.eclipse.cdt.core org.eclipse.cdt/all/org.eclipse.cdt.core
-cvs co -r $CDT_TAG -d org.eclipse.cdt.core.lrparser org.eclipse.cdt/lrparser/org.eclipse.cdt.core.lrparser
-cvs co -r $CDT_TAG -d org.eclipse.cdt.core.lrparser.xlc org.eclipse.cdt/xlc/org.eclipse.cdt.core.lrparser.xlc
-
-cd org.eclipse.ptp.rdt.core.remotejars
-
-# run the script in remotejars
-export PATH=/opt/public/common/ibm-java2-ppc-50/bin:$PATH
-echo `java -version`
-java -jar ../../../tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
-	-ws gtk -arch ppc -os linux -application org.eclipse.ant.core.antRunner
-
-} >$BUILD_LOG 2>&1
-
-if grep -q 'BUILD FAILED' $BUILD_LOG; then
-	echo "BUILD FAILED. See $BUILD_LOG for details."
-fi
-
-exit 0

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

@@ -1,98 +0,0 @@
-#!/bin/sh
-#
-# script to update PTP versions
-#
-# Usage: update_versions version
-#
-# version - new version string (e.g. "2.1.4")
-#
-# Note: a "qualifier" suffix will automatically be added to the version where appropriate
-#
-
-TMP_DIR=/tmp
-
-if [ $# -lt 1 ]; then
-	echo "usage: update_versions version"
-	exit 1
-fi
-
-version=$1
-
-FEATURES="\
-	org.eclipse.ptp-feature \
-	org.eclipse.ptp.cell-feature \
-	org.eclipse.ptp.core-feature \
-	org.eclipse.ptp.external-feature \
-	org.eclipse.ptp.master \
-	org.eclipse.ptp.perf-feature \
-	org.eclipse.ptp.perf.tau-feature \
-	org.eclipse.ptp.perf.tau.fortran-feature \
-	org.eclipse.ptp.pldt-feature \
-	org.eclipse.ptp.pldt.lapi-feature \
-	org.eclipse.ptp.rdt-feature \
-	org.eclipse.ptp.remote-feature \
-	org.eclipse.ptp.remote.remotetools-feature \
-	org.eclipse.ptp.remote.rse-feature \
-	org.eclipse.ptp.remotetools-feature \
-	org.eclipse.ptp.rm.ibm.ll-feature \
-	org.eclipse.ptp.rm.ibm.pe-feature \
-	org.eclipse.ptp.rm.mpich2-feature \
-	org.eclipse.ptp.rm.openmpi-feature \
-	org.eclipse.ptp.sdm-feature \
-	org.eclipse.ptp.utils-feature"
-	
-PLUGINS="\
-	org.eclipse.ptp.aix.ppc \
-	org.eclipse.ptp.linux.ppc \
-	org.eclipse.ptp.linux.x86 \
-	org.eclipse.ptp.linux.x86_64 \
-	org.eclipse.ptp.macosx.ppc \
-	org.eclipse.ptp.macosx.x86 \
-	org.eclipse.ptp"
-	
-C_PROJECTS="\
-	org.eclipse.ptp.debug.sdm \
-	org.eclipse.ptp.proxy \
-	org.eclipse.ptp.utils"
-	
-update_feature() {
-	sed -e "s/version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/version=\"$2\.qualifier\"/" < $1/feature.xml > $TMP_DIR/${1}_feature.xml
-	mv $TMP_DIR/${1}_feature.xml $1/feature.xml
-}
-
-update_manifest() {
-	sed -e "s/Bundle-Version: *[0-9]\.[0-9]\.[0-9]\.qualifier/Bundle-Version: $2.qualifier/" < $1/META-INF/MANIFEST.MF > $TMP_DIR/${1}_MANIFEST.MF
-	mv $TMP_DIR/${1}_MANIFEST.MF $1/META-INF/MANIFEST.MF
-}
-
-update_configure() {
-	sed -e "s/AC_INIT(\([^,]*\), *[0-9]\.[0-9]\.[0-9])/AC_INIT(\1, $2)/" < $1/configure.in > $TMP_DIR/${1}_configure.in
-	mv $TMP_DIR/${1}_configure.in $1/configure.in
-	(cd $1; autoconf)
-}
-
-for feature in $FEATURES; do
-	echo "Updating $feature..."
-	update_feature $feature $version
-done
-
-for plugin in $PLUGINS; do
-	echo "Updating $plugin..."
-	update_manifest $plugin $version
-done
-
-for project in $C_PROJECTS; do
-	echo "Updating $project..."
-	update_manifest $project $version
-	update_configure $project $version
-done
-
-echo "Updating org.eclipse.ptp.releng..."
-sed -e "s/<property name=\"branchVersion\" value=\"[0-9]\.[0-9]\.[0-9]\"\/>/<property name=\"branchVersion\" value=\"$version\"\/>/" < org.eclipse.ptp.releng/build.xml > $TMP_DIR/org.eclipse.ptp.releng_build.xml
-mv $TMP_DIR/org.eclipse.ptp.releng_build.xml org.eclipse.ptp.releng/build.xml
-
-echo "Updating org.eclipse.ptp.rdt.core.remotejars..."
-sed -e "s/<property name=\"ptpVersion\" value=\"[0-9]\.[0-9]\.[0-9]\"\/>/<property name=\"ptpVersion\" value=\"$version\"\/>/" < org.eclipse.ptp.rdt.core.remotejars/build.xml > $TMP_DIR/org.eclipse.ptp.rdt.core.remotejars_build.xml
-mv $TMP_DIR/org.eclipse.ptp.rdt.core.remotejars_build.xml org.eclipse.ptp.rdt.core.remotejars/build.xml
-
-exit 0

diff --git a/releng/org.eclipse.ptp.remote.remotetools-feature/.project b/releng/org.eclipse.ptp.remote.remotetools-feature/.project
deleted file mode 100644
index 38c456a..0000000
--- a/releng/org.eclipse.ptp.remote.remotetools-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remote.remotetools-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.remote.remotetools-feature/build.properties b/releng/org.eclipse.ptp.remote.remotetools-feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/releng/org.eclipse.ptp.remote.remotetools-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg

diff --git a/releng/org.eclipse.ptp.remote.remotetools-feature/eclipse_update_120.jpg b/releng/org.eclipse.ptp.remote.remotetools-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/releng/org.eclipse.ptp.remote.remotetools-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ

diff --git a/releng/org.eclipse.ptp.remote.remotetools-feature/epl-v10.html b/releng/org.eclipse.ptp.remote.remotetools-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.remote.remotetools-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.remote.remotetools-feature/feature.properties b/releng/org.eclipse.ptp.remote.remotetools-feature/feature.properties
deleted file mode 100644
index 58674bf..0000000
--- a/releng/org.eclipse.ptp.remote.remotetools-feature/feature.properties
+++ /dev/null

@@ -1,133 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Remote Tools Enabler
-
-# "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=Provides support for remote services using Remote Tools
-
-# copyright
-copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.remote.remotetools-feature/feature.xml b/releng/org.eclipse.ptp.remote.remotetools-feature/feature.xml
deleted file mode 100644
index a1bbc79..0000000
--- a/releng/org.eclipse.ptp.remote.remotetools-feature/feature.xml
+++ /dev/null

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.remote.remotetools"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.remote.remotetools.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.remotetools.core"/>
-      <import plugin="org.eclipse.ptp.remotetools.environment.core"/>
-      <import plugin="org.eclipse.ptp.remotetools.utils"/>
-      <import plugin="org.eclipse.ptp.remotetools.preferences"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ptp.remote.remotetools.core" version="2.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remotetools.core" version="2.1.8" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remotetools.environment.core" version="1.3.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remotetools.preferences" version="1.3.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remotetools.utils" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.core" version="2.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.ui" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.utils.ui" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.remote.remotetools.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remote.remotetools.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.remote.remotetools-feature/license.html b/releng/org.eclipse.ptp.remote.remotetools-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.remote.remotetools-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.remotetools-feature/.project b/releng/org.eclipse.ptp.remotetools-feature/.project
deleted file mode 100644
index e84c71d..0000000
--- a/releng/org.eclipse.ptp.remotetools-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools-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.remotetools-feature/build.properties b/releng/org.eclipse.ptp.remotetools-feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/releng/org.eclipse.ptp.remotetools-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg

diff --git a/releng/org.eclipse.ptp.remotetools-feature/epl-v10.html b/releng/org.eclipse.ptp.remotetools-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.remotetools-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.remotetools-feature/feature.properties b/releng/org.eclipse.ptp.remotetools-feature/feature.properties
deleted file mode 100644
index 17b4487..0000000
--- a/releng/org.eclipse.ptp.remotetools-feature/feature.properties
+++ /dev/null

@@ -1,136 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-#
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Remote Tools
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Parallel Tools Platform Remote Tools components
-
-# copyright
-copyright=\
-Copyright (c) 2008 IBM Corporation.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-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.remotetools-feature/feature.xml b/releng/org.eclipse.ptp.remotetools-feature/feature.xml
deleted file mode 100644
index 0496a08..0000000
--- a/releng/org.eclipse.ptp.remotetools-feature/feature.xml
+++ /dev/null

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.remotetools"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.remotetools.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="com.jcraft.jsch"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.launch"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ptp.utils.ui" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.environment.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.environment.generichost"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.environment.launcher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.environment.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.preferences"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.remotetools-feature/license.html b/releng/org.eclipse.ptp.remotetools-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.remotetools-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
deleted file mode 100644
index 861eb7b..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.bluegene-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html

diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
deleted file mode 100644
index 95b0993..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
+++ /dev/null

@@ -1,148 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Blue Gene
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the Blue Gene system
-
-# copyright
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-IBM Corporation - Initial API and implementation\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
deleted file mode 100644
index 5806959..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.bluegene"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/.project b/releng/org.eclipse.ptp.rm.ibm.ll-feature/.project
deleted file mode 100644
index 208bb46..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.ll-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties
deleted file mode 100644
index 8995901..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties
deleted file mode 100644
index d9817b4..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties
+++ /dev/null

@@ -1,133 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For IBM LoadLeveler
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the IBM LoadLeveler
-
-# copyright
-copyright=\
-Copyright (c) 2005, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml
deleted file mode 100644
index 6d5c4f4..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml
+++ /dev/null

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.ll"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.ibm.ll.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.ui" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/.project b/releng/org.eclipse.ptp.rm.ibm.pe-feature/.project
deleted file mode 100644
index 4898b39..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.pe-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties
deleted file mode 100644
index 8995901..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties
deleted file mode 100644
index ec09cd8..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties
+++ /dev/null

@@ -1,132 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Support For IBM Parallel Environment
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the IBM Parallel Environment
-
-# copyright
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml
deleted file mode 100644
index e750bd8..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml
+++ /dev/null

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.pe"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.ibm.pe.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.remote.ui" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/.project b/releng/org.eclipse.ptp.rm.lsf-feature/.project
deleted file mode 100644
index 4e56dff..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.lsf-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties b/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html

diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties b/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
deleted file mode 100644
index 05b6267..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
+++ /dev/null

@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For LSF
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the LSF job scheduler
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml b/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
deleted file mode 100644
index 8b8551f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.lsf"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/license.html b/releng/org.eclipse.ptp.rm.lsf-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/.project b/releng/org.eclipse.ptp.rm.mpich2-feature/.project
deleted file mode 100644
index 52f476f..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpich2-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties b/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html

diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties b/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
deleted file mode 100644
index 335cd5b..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
+++ /dev/null

@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For MPICH2
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for MPICH2
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml b/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
deleted file mode 100644
index d7c8fc1..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.mpich2"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.mpich2.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.mpich2.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.mpich2.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/license.html b/releng/org.eclipse.ptp.rm.mpich2-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/.project b/releng/org.eclipse.ptp.rm.openmpi-feature/.project
deleted file mode 100644
index 14c7d0e..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.openmpi-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/build.properties b/releng/org.eclipse.ptp.rm.openmpi-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html

diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties b/releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties
deleted file mode 100644
index 3e053e0..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties
+++ /dev/null

@@ -1,133 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Open MPI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for Open MPI
-
-# copyright
-copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml b/releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml
deleted file mode 100644
index 7f8c4ed..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml
+++ /dev/null

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.openmpi"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.openmpi.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.rm.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.openmpi.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.openmpi.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/license.html b/releng/org.eclipse.ptp.rm.openmpi-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.rm.orte-feature/.project b/releng/org.eclipse.ptp.rm.orte-feature/.project
deleted file mode 100644
index 5884ded..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.orte-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

diff --git a/releng/org.eclipse.ptp.rm.orte-feature/build.properties b/releng/org.eclipse.ptp.rm.orte-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html

diff --git a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
+++ /dev/null

@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties b/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
deleted file mode 100644
index 48c887f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
+++ /dev/null

@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Open MPI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for Open MPI
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml b/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
deleted file mode 100644
index 89b2532..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
+++ /dev/null

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.orte"
-      label="%featureName"
-      version="2.0.1.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.rm.orte-feature/license.html b/releng/org.eclipse.ptp.rm.orte-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/license.html
+++ /dev/null

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>

diff --git a/releng/org.eclipse.ptp.sdm-feature/.project b/releng/org.eclipse.ptp.sdm-feature/.project
deleted file mode 100644
index b1db802..0000000
--- a/releng/org.eclipse.ptp.sdm-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.sdm-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.sdm-feature/build.properties b/releng/org.eclipse.ptp.sdm-feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/releng/org.eclipse.ptp.sdm-feature/build.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg

diff --git a/releng/org.eclipse.ptp.sdm-feature/epl-v10.html b/releng/org.eclipse.ptp.sdm-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.sdm-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.sdm-feature/feature.properties b/releng/org.eclipse.ptp.sdm-feature/feature.properties
deleted file mode 100644
index 0eb6ba7..0000000
--- a/releng/org.eclipse.ptp.sdm-feature/feature.properties
+++ /dev/null

@@ -1,159 +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 Scalable Debug Manager
-
-# "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=Parallel Tools Platform components that implement the Scalable Debug Manager (SDM)
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Parallel Tools Platform Updates
-
-# 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.sdm-feature/feature.xml b/releng/org.eclipse.ptp.sdm-feature/feature.xml
deleted file mode 100644
index ae00701..0000000
--- a/releng/org.eclipse.ptp.sdm-feature/feature.xml
+++ /dev/null

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.debug.sdm"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.debug.sdm.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.debug.core"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.debug.sdm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.debug.sdm.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.debug.sdm.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.sdm-feature/license.html b/releng/org.eclipse.ptp.sdm-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.sdm-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.utils-feature/.project b/releng/org.eclipse.ptp.utils-feature/.project
deleted file mode 100644
index f995d76..0000000
--- a/releng/org.eclipse.ptp.utils-feature/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.utils-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.utils-feature/build.properties b/releng/org.eclipse.ptp.utils-feature/build.properties
deleted file mode 100644
index 5d887d5..0000000
--- a/releng/org.eclipse.ptp.utils-feature/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties

diff --git a/releng/org.eclipse.ptp.utils-feature/epl-v10.html b/releng/org.eclipse.ptp.utils-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.utils-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.utils-feature/feature.properties b/releng/org.eclipse.ptp.utils-feature/feature.properties
deleted file mode 100644
index aa47864..0000000
--- a/releng/org.eclipse.ptp.utils-feature/feature.properties
+++ /dev/null

@@ -1,136 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Common Utilities
-
-# "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=Parallel Tools Platform components that provide common utility functions
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Parallel Tools Platform Updates
-
-# copyright
-copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.utils-feature/feature.xml b/releng/org.eclipse.ptp.utils-feature/feature.xml
deleted file mode 100644
index 89bdc72..0000000
--- a/releng/org.eclipse.ptp.utils-feature/feature.xml
+++ /dev/null

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.utils"
-      label="%featureName"
-      version="2.1.4.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.utils.core">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.utils.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.utils.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

diff --git a/releng/org.eclipse.ptp.utils-feature/license.html b/releng/org.eclipse.ptp.utils-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.utils-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/.classpath b/releng/org.eclipse.ptp/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/releng/org.eclipse.ptp/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

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

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

@@ -1,70 +0,0 @@
-#Wed Nov 07 10:10:25 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/releng/org.eclipse.ptp/META-INF/MANIFEST.MF b/releng/org.eclipse.ptp/META-INF/MANIFEST.MF
deleted file mode 100644
index 01e5349..0000000
--- a/releng/org.eclipse.ptp/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp
-Bundle-Version: 2.1.4.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

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

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

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

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

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

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp/about.properties b/releng/org.eclipse.ptp/about.properties
deleted file mode 100644
index 9b672a4..0000000
--- a/releng/org.eclipse.ptp/about.properties
+++ /dev/null

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

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

@@ -1,21 +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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties,\
-               about.ini
-src.includes = about.html

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

diff --git a/releng/org.eclipse.ptp/plugin.properties b/releng/org.eclipse.ptp/plugin.properties
deleted file mode 100644
index 2ee9d95..0000000
--- a/releng/org.eclipse.ptp/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = Parallel Tools Platform End-User Runtime
-providerName = Eclipse.org
\ No newline at end of file

diff --git a/releng/org.eclipse.ptp/src/readme.txt b/releng/org.eclipse.ptp/src/readme.txt
deleted file mode 100644
index 170b5f8..0000000
--- a/releng/org.eclipse.ptp/src/readme.txt
+++ /dev/null

@@ -1 +0,0 @@
-This file is present only for build purposes.
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.core/.classpath b/rms/org.eclipse.ptp.rm.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.core/.options b/rms/org.eclipse.ptp.rm.core/.options
deleted file mode 100644
index 5f14381..0000000
--- a/rms/org.eclipse.ptp.rm.core/.options
+++ /dev/null

@@ -1,29 +0,0 @@
-# Tracing
-org.eclipse.ptp.rm.core/debug=true
-
-# Trace jobs that execute remote commands (discover, monitor, etc)
-org.eclipse.ptp.rm.core/debug/command=true
-
-# Trace more details about jobs that execute remote commands (discover, monitor, etc)
-org.eclipse.ptp.rm.core/debug/command/more=true
-
-# Trace job submission on the Runtime System
-org.eclipse.ptp.rm.core/debug/job=true
-
-# Trace status of the Runtime System
-org.eclipse.ptp.rm.core/debug/rts=true
-
-# Trace discover procedure on the Runtime System 
-org.eclipse.ptp.rm.core/debug/rts/discover=true
-
-# Trace monitor procedure on the Runtime System 
-org.eclipse.ptp.rm.core/debug/rts/monitor=true
-
-# Trace status of IPJobs on the Runtime System
-org.eclipse.ptp.rm.core/debug/rts/job=true
-
-# Trace more details of IPJobs on the Runtime System
-org.eclipse.ptp.rm.core/debug/rts/job/more=true
-
-# Redirect output of parallel application to terminal that is running eclipse 
-org.eclipse.ptp.rm.core/debug/rts/job/output=true

diff --git a/rms/org.eclipse.ptp.rm.core/.project b/rms/org.eclipse.ptp.rm.core/.project
deleted file mode 100644
index 94d6481..0000000
--- a/rms/org.eclipse.ptp.rm.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.core/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/rms/org.eclipse.ptp.rm.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 041ce85..0000000
--- a/rms/org.eclipse.ptp.rm.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.core.ToolsRMPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ui,
- org.eclipse.search,
- org.eclipse.core.filesystem,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.utils.core
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.core.messages,
- org.eclipse.ptp.rm.core.rmsystem,
- org.eclipse.ptp.rm.core.rtsystem,
- org.eclipse.ptp.rm.core.utils
-Bundle-Vendor: %pluginProvider

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

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

diff --git a/rms/org.eclipse.ptp.rm.core/about.ini b/rms/org.eclipse.ptp.rm.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/rms/org.eclipse.ptp.rm.core/about.ini
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.core/about.mappings b/rms/org.eclipse.ptp.rm.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.core/about.properties b/rms/org.eclipse.ptp.rm.core/about.properties
deleted file mode 100644
index fa272ae..0000000
--- a/rms/org.eclipse.ptp.rm.core/about.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.core/build.properties b/rms/org.eclipse.ptp.rm.core/build.properties
deleted file mode 100644
index bee531d..0000000
--- a/rms/org.eclipse.ptp.rm.core/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties

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

diff --git a/rms/org.eclipse.ptp.rm.core/plugin.properties b/rms/org.eclipse.ptp.rm.core/plugin.properties
deleted file mode 100644
index d52bf4f..0000000
--- a/rms/org.eclipse.ptp.rm.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Resource Manager Core
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsAttributes.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsAttributes.java
deleted file mode 100644
index eef3012..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsAttributes.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-
-/**
- * 
- * @author Daniel Felix Ferber
- */
-public class AbstractToolsAttributes {
-
-	/*
-	 * I have disabled getLaunchArgumentsAttributeDefinition since
-	 * the launch command will contain all arguments and a variable substitution
-	 * to be replaced with the program executable path.
-	 */
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[] {};
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsPreferenceManager.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsPreferenceManager.java
deleted file mode 100644
index 93ea424..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/AbstractToolsPreferenceManager.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core;
-
-/**
- * Defines constants used to store preferences for a tool. This preference
- * manager only defines constants. It does not provide static methods to
- * read/write/initialize preferences, as used by the PTP plugins. The
- * read/write/initialize operations need to be implemented as static methods in
- * classes extending this resource manager, since only the extending class has
- * knowledge how to read/write/initialize a subset of the preferences that are
- * applicable to the tool.
- * 
- * @author Daniel Felix Ferber
- */
-public abstract class AbstractToolsPreferenceManager {
-	public static final String PREFS_LAUNCH_CMD = "launchCmd"; //$NON-NLS-1$
-	public static final String PREFS_DEBUG_CMD = "debugCmd"; //$NON-NLS-1$
-	public static final String PREFS_DISCOVER_CMD = "discoverCmd"; //$NON-NLS-1$
-	public static final String PREFS_PERIODIC_MONITOR_CMD = "periodicMonitorCmd"; //$NON-NLS-1$
-	public static final String PREFS_PERIODIC_MONITOR_TIME = "periodicMonitorTime"; //$NON-NLS-1$
-	public static final String PREFS_CONTINUOUS_MONITOR_CMD = "continuousMonitorCmd"; //$NON-NLS-1$
-	public static final String PREFS_REMOTE_INSTALL_PATH = "remoteInstallPAth"; //$NON-NLS-1$
-	//	public static final String PREFS_USE_DEFAULTS = "useDefaults"; //$NON-NLS-1$
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/ToolsRMPlugin.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/ToolsRMPlugin.java
deleted file mode 100644
index dd99e45..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/ToolsRMPlugin.java
+++ /dev/null

@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.messages.Messages;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- * @author Daniel Felix Ferber
- */
-public class ToolsRMPlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.core"; //$NON-NLS-1$
-
-	// The shared instance
-	private static ToolsRMPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public ToolsRMPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		DebugUtil.configurePluginDebugOptions();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static ToolsRMPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 * 
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 * 
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 * 
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.ToolsRMPlugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/Messages.java
deleted file mode 100644
index 2fc10a3..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/Messages.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- */
-package org.eclipse.ptp.rm.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.core.messages.messages"; //$NON-NLS-1$
-	public static String AbstractRemoteCommandJob_Exception_CommandFailed;
-	public static String AbstractRemoteCommandJob_Exception_InternalError;
-	public static String AbstractToolRuntimeSystem_Exception_NoConnection;
-	public static String AbstractToolRuntimeSystem_Exception_NoRemoteServices;
-	public static String AbstractToolRuntimeSystem_Exception_ResourceManagerNotInitialized;
-	public static String AbstractToolRuntimeSystem_JobQueueManagerThreadTitle;
-	public static String AbstractToolRuntimeSystemJob_Exception_BeforeExecution;
-	public static String AbstractToolRuntimeSystemJob_Exception_CreateCommand;
-	public static String AbstractToolRuntimeSystemJob_Exception_DefaultAttributeValue;
-	public static String AbstractToolRuntimeSystemJob_Exception_ExecuteCommand;
-	public static String AbstractToolRuntimeSystemJob_Exception_ExecutionFinished;
-	public static String AbstractToolRuntimeSystemJob_Exception_ExecutionStarted;
-	public static String AbstractToolRuntimeSystemJob_Exception_LaunchApplication;
-	public static String AbstractToolRuntimeSystemJob_Exception_PrepareExecution;
-	public static String AbstractToolRuntimeSystemJob_Exception_WaitExecution;
-	public static String AbstractToolRuntimeSystemJob_Success;
-	public static String AbstractToolRuntimeSystemJob_UserCanceled;
-	
-	public static String ToolsRMPlugin_Exception_InternalError;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/messages.properties
deleted file mode 100644
index dc626bd..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/messages/messages.properties
+++ /dev/null

@@ -1,19 +0,0 @@
-AbstractRemoteCommandJob_Exception_CommandFailed=Command failed.
-AbstractRemoteCommandJob_Exception_InternalError=Internal error
-AbstractToolRuntimeSystem_Exception_NoConnection=Could not find connection for resource manager
-AbstractToolRuntimeSystem_Exception_NoRemoteServices=Could not find remote services for resource manager
-AbstractToolRuntimeSystem_Exception_ResourceManagerNotInitialized=Resource manager has not be initialized
-AbstractToolRuntimeSystem_JobQueueManagerThreadTitle=Job Queue Manager
-AbstractToolRuntimeSystemJob_Exception_BeforeExecution=Failed before executing command to launch parallel application.
-AbstractToolRuntimeSystemJob_Exception_CreateCommand=Failed to caculate work directory, environment or command line to launch parallel application.
-AbstractToolRuntimeSystemJob_Exception_DefaultAttributeValue=Failed to create default attribute for {0}.
-AbstractToolRuntimeSystemJob_Exception_ExecuteCommand=Failed to execute command to  launch parallel application.
-AbstractToolRuntimeSystemJob_Exception_ExecutionFinished=Failed after finishing execution of parallel application.
-AbstractToolRuntimeSystemJob_Exception_ExecutionStarted=Failed after executing command to launch parallel application.
-AbstractToolRuntimeSystemJob_Exception_LaunchApplication=Failed to run command to launch parallel application, return exit value {0}.
-AbstractToolRuntimeSystemJob_Exception_PrepareExecution=Failed before executing command to launch parallel application.
-AbstractToolRuntimeSystemJob_Exception_WaitExecution=Failed while executing parallel application.
-AbstractToolRuntimeSystemJob_Success=Command successful, return exit value {0}.
-AbstractToolRuntimeSystemJob_UserCanceled=Job was canceled by user.
-
-ToolsRMPlugin_Exception_InternalError=Internal Error

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractEffectiveToolRMConfiguration.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractEffectiveToolRMConfiguration.java
deleted file mode 100644
index f6a3a17..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractEffectiveToolRMConfiguration.java
+++ /dev/null

@@ -1,121 +0,0 @@
-package org.eclipse.ptp.rm.core.rmsystem;
-
-/**
- * Stores the tool configuration attributes that shall be used, according the
- * the "useDefault" attribute from the resource manager configuration, and
- * appends the remoteInstallPath to the command, if applicable.
- * <p>
- * The selection of the values for the configuration MUST be implemented by the
- * constructor. Typically, if "useDefaults" is of, then configuration is copied
- * from the resource manager configuration. Else, if "useDefaults" is true, then
- * the constructor usually copies the configuration from default values or from
- * the preferences. The constructor may use
- * {@link #applyValues(String, String, String, String, int, String, String)} to
- * set all configuration attributes.
- * <p>
- * All command attributes do automatically add the remoteInstallPath in front to
- * the command string, if remoteInstallPath is not null and not empty.
- * <p>
- * The class provides getters to read the configuration attributes.
- * 
- * @author Daniel Felix Ferber
- */
-public class AbstractEffectiveToolRMConfiguration {
-	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	private String launchCmd;
-	private String debugCmd;
-	private String discoverCmd;
-	private String periodicMonitorCmd;
-	private int periodicMonitorTime;
-	private String continuousMonitorCmd;
-	private String remoteInstallPath;
-	int capabilities;
-
-	private AbstractToolRMConfiguration configuration;
-
-	public AbstractEffectiveToolRMConfiguration(
-			AbstractToolRMConfiguration configuration) {
-		this.configuration = configuration;
-		this.capabilities = configuration.getCapabilities();
-	}
-
-	protected void applyValues(String launchCmd, String debugCmd,
-			String discoverCmd, String periodicMonitorCmd,
-			int periodicMonitorTime, String continuousMonitorCmd,
-			String remoteInstallPath) {
-		this.launchCmd = launchCmd;
-		this.debugCmd = debugCmd;
-		this.discoverCmd = discoverCmd;
-		this.periodicMonitorCmd = periodicMonitorCmd;
-		this.periodicMonitorTime = periodicMonitorTime;
-		this.continuousMonitorCmd = continuousMonitorCmd;
-		this.remoteInstallPath = remoteInstallPath;
-	}
-
-	protected String completeCommand(String command) {
-		if (remoteInstallPath == null) return command;
-		if (remoteInstallPath.length() == 0) return command;
-		// TODO: Remove this hard-coded path calculation!
-		return remoteInstallPath+"/"+command.trim(); //$NON-NLS-1$
-	}
-
-	public String getLaunchCmd() {
-		return completeCommand(launchCmd);
-	}
-
-	public String getDebugCmd() {
-		return completeCommand(debugCmd);
-	}
-
-	public String getDiscoverCmd() {
-		return completeCommand(discoverCmd);
-	}
-
-	public String getPeriodicMonitorCmd() {
-		return completeCommand(periodicMonitorCmd);
-	}
-
-	public int getPeriodicMonitorTime() {
-		return periodicMonitorTime;
-	}
-
-	public String getContinuousMonitorCmd() {
-		return completeCommand(continuousMonitorCmd);
-	}
-
-	public String getRemoteInstallPath() {
-		return remoteInstallPath;
-	}
-
-	public boolean hasDiscoverCmd() {
-		return (capabilities & AbstractToolRMConfiguration.CAP_DISCOVER) != 0
-		&& discoverCmd != null
-		&& !discoverCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasLaunchCmd() {
-		return (capabilities & AbstractToolRMConfiguration.CAP_LAUNCH) != 0
-		&& launchCmd != null && !launchCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasDebugCmd() {
-		return (capabilities & AbstractToolRMConfiguration.CAP_LAUNCH) != 0
-		&& debugCmd != null && !debugCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasContinuousMonitorCmd() {
-		return (capabilities & AbstractToolRMConfiguration.CAP_CONTINUOUS_MONITOR) != 0
-		&& continuousMonitorCmd != null
-		&& !continuousMonitorCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasPeriodicMonitorCmd() {
-		return (capabilities & AbstractToolRMConfiguration.CAP_PERIODIC_MONITOR) != 0
-		&& periodicMonitorCmd != null
-		&& !periodicMonitorCmd.trim().equals(EMPTY_STRING);
-	}
-
-	protected int getCapabilities() {
-		return capabilities;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMConfiguration.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMConfiguration.java
deleted file mode 100644
index fc71381..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMConfiguration.java
+++ /dev/null

@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-/**
- *
- */
-package org.eclipse.ptp.rm.core.rmsystem;
-
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ui.IMemento;
-
-/*
- * TODO: Make this class not extend AbstractRemoteResourceManagerConfiguration/ -
- * Remove references to RemoteConfig - Create new attribute(s) to store remote
- * target, as done on AbstractRemoteResourceManagerConfiguration, but without
- * proxy settings.
- */
-/**
- * @author Daniel Felix Ferber
- */
-public abstract class AbstractToolRMConfiguration extends
-AbstractRemoteResourceManagerConfiguration implements Cloneable {
-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	private static final String TAG_LAUNCH_CMD = "launchCmd"; //$NON-NLS-1$
-	private static final String TAG_DEBUG_CMD = "debugCmd"; //$NON-NLS-1$
-	private static final String TAG_DISCOVER_CMD = "discoverCmd"; //$NON-NLS-1$
-	private static final String TAG_PERIODIC_MONITOR_CMD = "periodicMonitorCmd"; //$NON-NLS-1$
-	private static final String TAG_PERIODIC_MONITOR_TIME = "periodicMonitorTime"; //$NON-NLS-1$
-	private static final String TAG_CONTINUOUS_MONITOR_CMD = "continuousMonitorCmd"; //$NON-NLS-1$
-	private static final String TAG_REMOTE_INSTALL_PATH = "remoteInstallPath"; //$NON-NLS-1$
-	private static final String TAG_USE_DEFAULTS = "useToolDefaults"; //$NON-NLS-1$
-
-	public static final int CAP_LAUNCH = 1 << 0;
-	public static final int CAP_DISCOVER = 1 << 1;
-	public static final int CAP_PERIODIC_MONITOR = 1 << 2;
-	public static final int CAP_CONTINUOUS_MONITOR = 1 << 3;
-	public static final int CAP_REMOTE_INSTALL_PATH = 1 << 4;
-
-	public static final int NO_CAP_SET = 0;
-
-	/**
-	 * Static class to hold tool configuration information
-	 *
-	 * @author dfferber
-	 */
-	static public class ToolsConfig {
-		private RemoteConfig remoteConfig;
-		private String launchCmd;
-		private String debugCmd;
-		private String discoverCmd;
-		private String periodicMonitorCmd;
-		private int periodicMonitorTime;
-		private String continuousMonitorCmd;
-		private String remoteInstallPath;
-		private boolean useToolDefaults;
-
-		public ToolsConfig() {
-			this(new RemoteConfig(), null, null, null, null, 0, null, null, true);
-		}
-
-		public ToolsConfig(RemoteConfig remoteConfig, String launchCmd, String debugCmd,
-				String discoverCmd, String periodicMonitorCmd,
-				int periodicMonitorTime, String continuousMonitorCmd,
-				String remoteInstallPath, boolean useToolDefaults) {
-			super();
-			this.remoteConfig = remoteConfig;
-			this.launchCmd = launchCmd;
-			this.debugCmd = debugCmd;
-			this.discoverCmd = discoverCmd;
-			this.periodicMonitorCmd = periodicMonitorCmd;
-			this.periodicMonitorTime = periodicMonitorTime;
-			this.continuousMonitorCmd = continuousMonitorCmd;
-			this.remoteInstallPath = remoteInstallPath;
-			this.useToolDefaults = useToolDefaults;
-		}
-
-		public RemoteConfig getRemoteConfig() {
-			return remoteConfig;
-		}
-
-		public void setRemoteConfig(RemoteConfig remoteConfig) {
-			this.remoteConfig = remoteConfig;
-		}
-
-		public String getLaunchCmd() {
-			return launchCmd;
-		}
-
-		public void setLaunchCmd(String launchCmd) {
-			this.launchCmd = launchCmd;
-		}
-
-		public String getDebugCmd() {
-			return debugCmd;
-		}
-
-		public void setDebugCmd(String debugCmd) {
-			this.debugCmd = debugCmd;
-		}
-
-		public String getDiscoverCmd() {
-			return discoverCmd;
-		}
-
-		public void setDiscoverCmd(String discoverCmd) {
-			this.discoverCmd = discoverCmd;
-		}
-
-		public String getPeriodicMonitorCmd() {
-			return periodicMonitorCmd;
-		}
-
-		public void setPeriodicMonitorCmd(String periodicMonitorCmd) {
-			this.periodicMonitorCmd = periodicMonitorCmd;
-		}
-
-		public int getPeriodicMonitorTime() {
-			return periodicMonitorTime;
-		}
-
-		public void setPeriodicMonitorTime(int periodicMonitorTime) {
-			this.periodicMonitorTime = periodicMonitorTime;
-		}
-
-		public String getContinuousMonitorCmd() {
-			return continuousMonitorCmd;
-		}
-
-		public void setContinuousMonitorCmd(String continuousMonitorCmd) {
-			this.continuousMonitorCmd = continuousMonitorCmd;
-		}
-
-		public String getRemoteInstallPath() {
-			return remoteInstallPath;
-		}
-
-		public void setRemoteInstallPath(String remoteInstallPath) {
-			this.remoteInstallPath = remoteInstallPath;
-		}
-
-		public boolean useToolDefaults() {
-			return useToolDefaults;
-		}
-
-		public void setUseToolDefaults(boolean useToolDefaults) {
-			this.useToolDefaults = useToolDefaults;
-		}
-	}
-
-	private String launchCmd;
-	private String debugCmd;
-	private String discoverCmd;
-	private String periodicMonitorCmd;
-	private int periodicMonitorTime;
-	private String continuousMonitorCmd;
-	private String remoteInstallPath;
-	private boolean useToolDefaults;
-	private int capabilities;
-
-	public static ToolsConfig loadTool(IResourceManagerFactory factory,
-			IMemento memento) {
-		RemoteConfig remoteConfig = loadRemote(factory, memento);
-
-		String launchCmd = memento.getString(TAG_LAUNCH_CMD);
-		String debugCmd = memento.getString(TAG_DEBUG_CMD);
-		String discoverCmd = memento.getString(TAG_DISCOVER_CMD);
-		String periodicMonitorCmd = memento.getString(TAG_PERIODIC_MONITOR_CMD);
-		Integer periodicMonitorTime = memento
-		.getInteger(TAG_PERIODIC_MONITOR_TIME);
-		String continuousMonitorCmd = memento
-		.getString(TAG_CONTINUOUS_MONITOR_CMD);
-		String remoteInstallPath = memento.getString(TAG_REMOTE_INSTALL_PATH);
-		boolean useToolDefaults = Boolean.parseBoolean(memento
-				.getString(TAG_USE_DEFAULTS));
-
-		ToolsConfig config = new ToolsConfig(remoteConfig, launchCmd, debugCmd,
-				discoverCmd, periodicMonitorCmd, periodicMonitorTime,
-				continuousMonitorCmd, remoteInstallPath, useToolDefaults);
-		return config;
-	}
-
-	public AbstractToolRMConfiguration(int capabilities,
-			ToolsConfig toolsConfig, IResourceManagerFactory factory) {
-		super(toolsConfig.getRemoteConfig(), factory);
-		this.capabilities = capabilities;
-		this.launchCmd = toolsConfig.getLaunchCmd();
-		this.debugCmd = toolsConfig.getDebugCmd();
-		this.discoverCmd = toolsConfig.getDiscoverCmd();
-		this.periodicMonitorCmd = toolsConfig.getPeriodicMonitorCmd();
-		this.periodicMonitorTime = toolsConfig.getPeriodicMonitorTime();
-		this.continuousMonitorCmd = toolsConfig.getContinuousMonitorCmd();
-		this.remoteInstallPath = toolsConfig.getRemoteInstallPath();
-		this.useToolDefaults = toolsConfig.useToolDefaults();
-	}
-
-	public AbstractToolRMConfiguration(int capabilities,
-			AbstractToolRMFactory factory, RemoteConfig config, String toolId,
-			String launchCmd, String debugCmd, String discoverCmd, String periodicMonitorCmd,
-			int periodicMonitorTime, String continuousMonitorCmd,
-			String remoteInstallPath, boolean useToolDefaults) {
-		super(config, factory);
-		this.capabilities = capabilities;
-		setLaunchCmd(launchCmd);
-		setDebugCmd(debugCmd);
-		setDiscoverCmd(discoverCmd);
-		setPeriodicMonitorCmd(periodicMonitorCmd);
-		setPeriodicMonitorTime(periodicMonitorTime);
-		setContinuousMonitorCmd(continuousMonitorCmd);
-		setRemoteInstallPath(remoteInstallPath);
-		setUseToolDefaults(useToolDefaults);
-	}
-
-	@Override
-	public abstract Object clone();
-
-	@Override
-	public void save(IMemento memento) {
-		super.save(memento);
-		memento.putString(TAG_LAUNCH_CMD, launchCmd);
-		memento.putString(TAG_DEBUG_CMD, debugCmd);
-		memento.putString(TAG_DISCOVER_CMD, discoverCmd);
-		memento.putString(TAG_PERIODIC_MONITOR_CMD, periodicMonitorCmd);
-		memento.putInteger(TAG_PERIODIC_MONITOR_TIME, periodicMonitorTime);
-		memento.putString(TAG_CONTINUOUS_MONITOR_CMD, continuousMonitorCmd);
-		memento.putString(TAG_REMOTE_INSTALL_PATH, remoteInstallPath);
-		memento.putString(TAG_USE_DEFAULTS, Boolean.toString(useToolDefaults));
-	}
-
-	abstract public void setDefaultNameAndDesc();
-
-	public String getLaunchCmd() {
-		return launchCmd;
-	}
-
-	public void setLaunchCmd(String launchCmd) {
-		this.launchCmd = launchCmd;
-	}
-
-	public String getDebugCmd() {
-		return debugCmd;
-	}
-
-	public void setDebugCmd(String debugCmd) {
-		this.debugCmd = debugCmd;
-	}
-
-	public String getDiscoverCmd() {
-		return discoverCmd;
-	}
-
-	public void setDiscoverCmd(String discoverCmd) {
-		this.discoverCmd = discoverCmd;
-	}
-
-	public String getPeriodicMonitorCmd() {
-		return periodicMonitorCmd;
-	}
-
-	public void setPeriodicMonitorCmd(String periodicMonitorCmd) {
-		this.periodicMonitorCmd = periodicMonitorCmd;
-	}
-
-	public int getPeriodicMonitorTime() {
-		return periodicMonitorTime;
-	}
-
-	public void setPeriodicMonitorTime(int periodicMonitorTime) {
-		this.periodicMonitorTime = periodicMonitorTime;
-	}
-
-	public String getContinuousMonitorCmd() {
-		return continuousMonitorCmd;
-	}
-
-	public void setContinuousMonitorCmd(String continuousMonitorCmd) {
-		this.continuousMonitorCmd = continuousMonitorCmd;
-	}
-
-	public String getRemoteInstallPath() {
-		return remoteInstallPath;
-	}
-
-	public void setRemoteInstallPath(String remoteInstallPath) {
-		this.remoteInstallPath = remoteInstallPath;
-	}
-
-	public boolean useToolDefaults() {
-		return useToolDefaults;
-	}
-
-	public void setUseToolDefaults(boolean useToolDefaults) {
-		this.useToolDefaults = useToolDefaults;
-	}
-
-	public boolean hasDiscoverCmd() {
-		return (capabilities & CAP_DISCOVER) != 0 && discoverCmd != null
-		&& !discoverCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasLaunchCmd() {
-		return (capabilities & CAP_LAUNCH) != 0 && launchCmd != null
-		&& !launchCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasDebugCmd() {
-		return (capabilities & CAP_LAUNCH) != 0 && debugCmd != null
-		&& !debugCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasContinuousMonitorCmd() {
-		return (capabilities & CAP_CONTINUOUS_MONITOR) != 0
-		&& continuousMonitorCmd != null
-		&& !continuousMonitorCmd.trim().equals(EMPTY_STRING);
-	}
-
-	public boolean hasPeriodicMonitorCmd() {
-		return (capabilities & CAP_PERIODIC_MONITOR) != 0
-		&& periodicMonitorCmd != null
-		&& !periodicMonitorCmd.trim().equals(EMPTY_STRING);
-	}
-
-	protected int getCapabilities() {
-		return capabilities;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMFactory.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMFactory.java
deleted file mode 100644
index 2740c9c..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolRMFactory.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.rmsystem;
-
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public abstract class AbstractToolRMFactory extends AbstractResourceManagerFactory {
-
-	public AbstractToolRMFactory(String name) {
-		super(name);
-	}
-
-	public IResourceManagerConfiguration copyConfiguration(
-			IResourceManagerConfiguration configuration) {
-		return (IResourceManagerConfiguration) configuration.clone();
-	}
-
-	@Override
-	abstract public IResourceManagerControl create(IResourceManagerConfiguration config);
-
-	abstract public IResourceManagerConfiguration createConfiguration();
-
-	abstract public IResourceManagerConfiguration loadConfiguration(IMemento memento);
-
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolResourceManager.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolResourceManager.java
deleted file mode 100644
index 731c566..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rmsystem/AbstractToolResourceManager.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.rmsystem;
-
-import java.io.OutputStream;
-import java.util.Collection;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-
-/**
- * @author Daniel Felix Ferber
- */
-public abstract class AbstractToolResourceManager extends AbstractRuntimeResourceManager {
-
-	public AbstractToolResourceManager(String id, IPUniverseControl universe,
-			IResourceManagerConfiguration config) {
-		super(id, universe, config);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManager#getAttributeDefinitionManager()
-	 */
-	@Override
-	public AttributeDefinitionManager getAttributeDefinitionManager() {
-		return super.getAttributeDefinitionManager();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doBeforeCloseConnection()
-	 */
-	@Override
-	protected void doBeforeCloseConnection() {
-		/*
-		 * Defaults to empty implementation
-		 */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doAfterCloseConnection()
-	 */
-	@Override
-	protected void doAfterCloseConnection() {
-		/*
-		 * Defaults to empty implementation
-		 */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doAfterOpenConnection()
-	 */
-	@Override
-	protected void doAfterOpenConnection() {
-		/*
-		 * Defaults to empty implementation
-		 */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doBeforeOpenConnection()
-	 */
-	@Override
-	protected void doBeforeOpenConnection() {
-		/*
-		 * Defaults to empty implementation
-		 */
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateJob(org.eclipse.ptp.core.elementcontrols.IPQueueControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPJobControl doCreateJob(IPQueueControl queue, String jobId, AttributeManager attrs) {
-		return newJob(queue, jobId, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateMachine(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPMachineControl doCreateMachine(String machineId, AttributeManager attrs) {
-		return newMachine(machineId, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateNode(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPNodeControl doCreateNode(IPMachineControl machine, String nodeId, AttributeManager attrs) {
-		return newNode(machine, nodeId, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateProcess(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPProcessControl doCreateProcess(IPJobControl job, String processId, AttributeManager attrs) {
-		return newProcess(job, processId, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateQueue(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPQueueControl doCreateQueue(String queueId, AttributeManager attrs) {
-		return newQueue(queueId, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateJobs(org.eclipse.ptp.core.elementcontrols.IPQueueControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateJobs(IPQueueControl queue, Collection<IPJobControl> jobs, AttributeManager attrs) {
-		return updateJobs(queue, jobs, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateMachines(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateMachines(Collection<IPMachineControl> machines, AttributeManager attrs) {
-		return updateMachines(machines, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateNodes(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateNodes(IPMachineControl machine, Collection<IPNodeControl> nodes, AttributeManager attrs) {
-		return updateNodes(machine, nodes, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateProcesses(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateProcesses(IPJobControl job, Collection<IPProcessControl> processes, AttributeManager attrs) {
-		return updateProcesses(job, processes, attrs);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateQueues(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateQueues(Collection<IPQueueControl> queues, AttributeManager attrs) {
-		return updateQueues(queues, attrs);
-	}
-
-	protected void createHostList(OutputStream os, String queueID, String jobID) throws CoreException {
-		String rmID = getConfiguration().getResourceManagerId();
-		IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rmID);
-		IPQueue queue = rm.getQueueById(queueID);
-		IPJob job = queue.getJobById(jobID);
-		IPProcess processes [] = job.getProcesses();
-		processes[0].getNode();
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractRemoteCommandJob.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractRemoteCommandJob.java
deleted file mode 100644
index ab0f6b5..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractRemoteCommandJob.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.remote.core.IRemoteProcess;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.core.messages.Messages;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.utils.core.linux.ArgumentParser;
-
-/**
- * Abstract implementation of a job that executes a command on the remote host and parses its output.
- * The job might be automatically rescheduled if created with the proper constructor.
- * Use this class a useful starting point to implement discover and monitor jobs.
- *
- * @author Daniel Felix Ferber
- */
-abstract public class AbstractRemoteCommandJob extends Job {
-	static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	String command;
-	String interruptedErrorMessage;
-	String processErrorMessage;
-	String parsingErrorMessage;
-	int reschedule = 0;
-	IRemoteProcess jobProcess;
-	AbstractToolRuntimeSystem rtSystem;
-
-	/**
-	 * A job for a remote command that is run only once.
-	 * @param name Name of the job
-	 * @param command Command executed remotely
-	 * @param interruptedErrorMessage Error message if the job is interrupted or <code>null</code>.
-	 * @param processErrorMessage Error message remote command fails or <code>null</code>.
-	 * @param parsingErrorMessage Error message if the output of the remote command cannot be parsed or <code>null</code>.
-	 */
-	public AbstractRemoteCommandJob(AbstractToolRuntimeSystem rtSystem, String name, String command, String interruptedErrorMessage, String processErrorMessage,
-			String parsingErrorMessage) {
-		super(name);
-		this.rtSystem = rtSystem;
-		this.command = command;
-		this.interruptedErrorMessage = interruptedErrorMessage;
-		this.processErrorMessage = processErrorMessage;
-		this.parsingErrorMessage = parsingErrorMessage;
-	}
-
-	/**
-	 * A job for a remote command that is run periodically.
-	 * @param name Name of the job
-	 * @param command Command executed remotely
-	 * @param interruptedErrorMessage Error message if the job is interrupted or <code>null</code>.
-	 * @param processErrorMessage Error message remote command fails or <code>null</code>.
-	 * @param parsingErrorMessage Error message if the output of the remote command cannot be parsed or <code>null</code>.
-	 * @param reschedule Time in milliseconds between executions of the command.
-	 */
-	public AbstractRemoteCommandJob(AbstractToolRuntimeSystem rtSystem, String name, String command, String interruptedErrorMessage, String processErrorMessage,
-			String parsingErrorMessage, int reschedule) {
-		super(name);
-		this.rtSystem = rtSystem;
-		this.command = command;
-		this.interruptedErrorMessage = interruptedErrorMessage;
-		this.processErrorMessage = processErrorMessage;
-		this.parsingErrorMessage = parsingErrorMessage;
-		this.reschedule = reschedule;
-	}
-
-	/**
-	 * Parses output of the command.
-	 * @param output Reader with output from the command.
-	 * @throws CoreException Parsing failed
-	 */
-	protected abstract void parse(BufferedReader output) throws CoreException;
-
-	/**
-	 * Default implementation of the job.
-	 */
-	@Override
-	protected IStatus run(IProgressMonitor monitor) {
-		try {
-			Assert.isNotNull(rtSystem);
-			Assert.isNotNull(command);
-			Assert.isTrue(! command.trim().equals(EMPTY_STRING));
-
-			/*
-			 * Proposed enhancements
-			 * TODO: Substitution of variables in the command string
-			 * TODO: Substitution of attributes in the command strng
-			 * TODO: Append remote installation path to launch command.
-			 * TODO: Extend class to provide XML SAX parser.
-			 */
-			ArgumentParser argumentParser = new ArgumentParser(command);
-			List<String> arguments = argumentParser.getTokenList();
-
-			checkCancel(monitor);
-
-			try {
-				IRemoteProcessBuilder cmdBuilder = rtSystem.createProcessBuilder(arguments);
-				synchronized (this) {
-					DebugUtil.trace(DebugUtil.COMMAND_TRACING, "Run command: {0}", command); //$NON-NLS-1$
-					jobProcess = cmdBuilder.start();
-				}
-			} catch (IOException e) {
-				throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.PLUGIN_ID, processErrorMessage, e));
-			}
-
-			checkCancel(monitor);
-
-			BufferedReader stdout = new BufferedReader(new InputStreamReader(jobProcess.getInputStream()));
-			IStatus parseStatus = Status.OK_STATUS;
-			try {
-				parse(stdout);
-			} catch (CoreException e) {
-				DebugUtil.error(DebugUtil.COMMAND_TRACING_MORE, "Command parsing failed: {0}", e); //$NON-NLS-1$
-				parseStatus = e.getStatus();
-				if (parseStatus.getSeverity() == IStatus.ERROR)
-					throw e;
-			}
-
-			checkCancel(monitor);
-
-			try {
-				DebugUtil.trace(DebugUtil.COMMAND_TRACING_MORE, "Command: waiting to finish."); //$NON-NLS-1$
-				jobProcess.waitFor();
-			} catch (InterruptedException e) {
-				throw new CoreException(new Status(IStatus.INFO, ToolsRMPlugin.PLUGIN_ID, interruptedErrorMessage, e));
-			}
-
-			DebugUtil.trace(DebugUtil.COMMAND_TRACING_MORE, "Command: exit value {0}.", jobProcess.exitValue()); //$NON-NLS-1$
-
-			if (reschedule > 0) {
-				DebugUtil.trace(DebugUtil.COMMAND_TRACING_MORE, "Command: reschedule in {0} miliseconds.", reschedule); //$NON-NLS-1$
-				schedule(reschedule);
-			}
-
-			return parseStatus;
-		} catch (CoreException e) {
-			DebugUtil.error(DebugUtil.COMMAND_TRACING_MORE, "Command failed: {0}", e); //$NON-NLS-1$
-			return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractRemoteCommandJob_Exception_CommandFailed, e);
-		} catch (Exception e) {
-			DebugUtil.error(DebugUtil.COMMAND_TRACING_MORE, "Command failed: {0}", e); //$NON-NLS-1$
-			return new Status(IStatus.ERROR, ToolsRMPlugin.PLUGIN_ID, Messages.AbstractRemoteCommandJob_Exception_InternalError, e);
-		} finally {
-			synchronized (this) {
-				if (jobProcess != null) {
-					jobProcess.destroy();
-				}
-				jobProcess = null;
-			}
-		}
-	}
-
-	private void checkCancel(IProgressMonitor monitor) throws CoreException {
-		if (monitor.isCanceled())
-			throw new CoreException(new Status(IStatus.INFO, ToolsRMPlugin.PLUGIN_ID, interruptedErrorMessage, null));
-	}
-
-	@Override
-	protected void canceling() {
-		synchronized (this) {
-			if (jobProcess != null) {
-				jobProcess.destroy();
-				jobProcess = null;
-			}
-		}
-	}
-}
-

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystem.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystem.java
deleted file mode 100644
index d818e78..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystem.java
+++ /dev/null

@@ -1,690 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.rtsystem;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.BooleanAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.QueueAttributes;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.core.messages.Messages;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.rtsystem.AbstractRuntimeSystem;
-import org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory;
-import org.eclipse.ptp.rtsystem.events.IRuntimeJobChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeMachineChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNodeChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeProcessChangeEvent;
-import org.eclipse.ptp.rtsystem.events.RuntimeEventFactory;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-/**
- * Implements the Runtime System to support calling command line tools to discover, monitor and launch parallel applications.
- * TODO: Synchronize methods to avoid race conditions
- * TODO: Split this class into two: the tools RTS and a command tools RTS.
- *
- * @author Daniel Felix Ferber
- */
-public abstract class AbstractToolRuntimeSystem extends AbstractRuntimeSystem {
-	/**
-	 * Executes jobs from the queue.
-	 * @author dfferber
-	 * TODO: Is this JobRunner really required? Why not dispatching the jobs immediately?
-	 */
-	class JobRunner implements Runnable {
-		public void run() {
-			DebugUtil.trace(DebugUtil.JOB_TRACING, "RTS {0}: started job thread", rmConfiguration.getName()); //$NON-NLS-1$
-			try {
-				while (connection != null) {
-					Job job = pendingJobQueue.take();
-					if (job instanceof IToolRuntimeSystemJob) {
-						DebugUtil.trace(DebugUtil.JOB_TRACING, "RTS {0}: schedule job #{1}", rmConfiguration.getName(), ((IToolRuntimeSystemJob)job).getJobID()); //$NON-NLS-1$
-					} else {
-						DebugUtil.trace(DebugUtil.JOB_TRACING, "RTS {0}: schedule job #{1}", rmConfiguration.getName(), job.getName()); //$NON-NLS-1$
-					}
-					job.schedule();
-				}
-			} catch (InterruptedException e) {
-				// Ignore
-			} catch (Exception e) {
-				DebugUtil.error(DebugUtil.JOB_TRACING, "RTS {0}: {1}", rmConfiguration.getName(), e); //$NON-NLS-1$
-				ToolsRMPlugin.log(e);
-			}
-			DebugUtil.trace(DebugUtil.JOB_TRACING, "RTS {0}: terminated job thread", rmConfiguration.getName()); //$NON-NLS-1$
-		}
-	}
-
-	/** The RM id of the RM manager that created the RTS. */
-	private String rmID;
-
-	/** Id generator for machines, queues and nodes. */
-	private Integer nextID;
-
-	/** Id generator for jobs. */
-	private Integer jobNumber;
-
-	/** A local reference of the RM configuration used by the RM manager that created the RTS. */
-	protected AbstractToolRMConfiguration rmConfiguration;
-
-	/** Attribute definitions for the RTS. */
-	protected AttributeDefinitionManager attrMgr;
-
-	/** Remote Service used to run commands on the remote host. */
-	protected IRemoteServices remoteServices = null;
-
-	/** Track if events are enabled. */
-	private boolean eventsEnabled = false;
-
-
-	protected IRemoteConnection connection = null;
-
-	private Thread jobQueueThread = null;
-
-	/** Job to monitor remote system and is executed periodically. */
-	private Job periodicMonitorJob;
-
-	/** Job to monitor remote system and is executed continuously. */
-	private Job continousMonitorJob;
-
-	/** Jobs created by this RTS. */
-	Map<String, Job> jobs = Collections.synchronizedMap(new HashMap<String, Job>());
-
-	/** Jobs created, but not yet started. */
-	LinkedBlockingQueue<Job> pendingJobQueue = new LinkedBlockingQueue<Job>();
-
-	/** Jobs created and started. */
-	//	ConcurrentLinkedQueue<IToolRuntimeSystemJob> runningJobQueue = new ConcurrentLinkedQueue<IToolRuntimeSystemJob>();
-
-	/** Helper object to create events for the RM. */
-	private IRuntimeEventFactory eventFactory = new RuntimeEventFactory();
-
-	public AbstractToolRuntimeSystem(Integer id, AbstractToolRMConfiguration config, AttributeDefinitionManager manager) {
-		this.rmID = id.toString();
-		this.nextID = id + 1;
-		this.jobNumber = 0;
-		this.rmConfiguration = config;
-		this.attrMgr = manager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeSystem#startup(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void startup(IProgressMonitor monitor) throws CoreException {
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: startup", rmConfiguration.getName()); //$NON-NLS-1$
-		remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(rmConfiguration.getRemoteServicesId());
-		if (remoteServices == null) {
-			throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.PLUGIN_ID, Messages.AbstractToolRuntimeSystem_Exception_NoRemoteServices));
-		}
-		IRemoteConnectionManager connectionManager = remoteServices.getConnectionManager();
-		Assert.isNotNull(connectionManager);
-
-		connection = connectionManager.getConnection(rmConfiguration.getConnectionName());
-		if (connection == null) {
-			throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.PLUGIN_ID, Messages.AbstractToolRuntimeSystem_Exception_NoConnection));
-		}
-
-		if (!connection.isOpen()) {
-			try {
-				connection.open(monitor);
-			} catch (RemoteConnectionException e) {
-				throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.PLUGIN_ID, e.getMessage()));
-			}
-		}
-
-		if (monitor.isCanceled()) {
-			connection.close(monitor);
-			connection = null;
-			return;
-		}
-
-		try {
-			doStartup(monitor);
-		} catch (CoreException e) {
-			connection.close(monitor);
-			connection = null;
-			throw e;
-		}
-
-		Job discoverJob = createDiscoverJob();
-		if (discoverJob != null) {
-			discoverJob.schedule();
-		}
-
-		if (!monitor.isCanceled()) {
-			fireRuntimeRunningStateEvent(eventFactory.newRuntimeRunningStateEvent());
-			if (jobQueueThread == null) {
-				jobQueueThread = new Thread(new JobRunner(), Messages.AbstractToolRuntimeSystem_JobQueueManagerThreadTitle);
-				jobQueueThread.start();
-			}
-		} else {
-			connection.close(monitor);
-			connection = null;
-		}
-	}
-
-	/**
-	 * Template method to extend the startup procedure.
-	 * @param monitor The progress monitor.
-	 * @throws CoreException
-	 */
-	protected abstract void doStartup(IProgressMonitor monitor) throws CoreException;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IRuntimeSystem#shutdown(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void shutdown(IProgressMonitor monitor) throws CoreException {
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: shutdown", rmConfiguration.getName()); //$NON-NLS-1$
-		doShutdown(monitor);
-
-		stopEvents();
-
-		/*
-		 * Stop jobs that might be in the pending queue.
-		 * Also stop the thread that dispatches pending jobs.
-		 */
-		jobQueueThread.interrupt();
-		for (Job job : pendingJobQueue) {
-			job.cancel();
-		}
-
-		/*
-		 * Stop jobs that are running or that already finished.
-		 */
-		Iterator<Job> iterator = jobs.values().iterator();
-		while (iterator.hasNext()) {
-			Job job = iterator.next();
-			job.cancel();
-			iterator.remove();
-		}
-
-		/*
-		 * Close the the connection.
-		 */
-		if (connection != null) {
-			connection.close(monitor);
-		}
-
-		connection = null;
-		jobQueueThread = null;
-		fireRuntimeShutdownStateEvent(eventFactory.newRuntimeShutdownStateEvent());
-	}
-
-	/**
-	 * Template method to extend the shutdown procedure.
-	 * @param monitor The progress monitor.
-	 * @throws CoreException
-	 */
-	protected abstract void doShutdown(IProgressMonitor monitor) throws CoreException;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IMonitoringSystem#startEvents()
-	 */
-	public void startEvents() throws CoreException {
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: start events", rmConfiguration.getName()); //$NON-NLS-1$
-		/*
-		 * Create monitor jobs, if they do not already exist. They may exist but be suspended.
-		 * If the job is not applicate, then no job will be created, according to capabilities for the RM.
-		 */
-		if (periodicMonitorJob == null) {
-			periodicMonitorJob = createPeriodicMonitorJob();
-		}
-		if (continousMonitorJob == null) {
-			continousMonitorJob = createContinuousMonitorJob();
-		}
-		/*
-		 * Only schedule the job if they are available. If the job does not exists, then it was
-		 * not created because the capability is not defined in the RM.
-		 */
-		if (periodicMonitorJob != null) {
-			periodicMonitorJob.schedule();
-		}
-		if (continousMonitorJob != null) {
-			continousMonitorJob.schedule();
-		}
-		doStartEvents();
-	}
-
-	/**
-	 * Template method to extend the startEvents procedure.
-	 * @throws CoreException
-	 */
-	protected abstract void doStartEvents() throws CoreException;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IMonitoringSystem#stopEvents()
-	 */
-	public void stopEvents() throws CoreException {
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: stop events", rmConfiguration.getName()); //$NON-NLS-1$
-		if (periodicMonitorJob != null) {
-			periodicMonitorJob.cancel();
-		}
-		if (continousMonitorJob != null) {
-			continousMonitorJob.cancel();
-		}
-		doStopEvents();
-	}
-
-	/**
-	 * Template method to extend the stopEvents procedure.
-	 * @throws CoreException
-	 */
-	protected abstract void doStopEvents() throws CoreException;
-
-	/**
-	 * Creates a job that discovers the remote machine. The default implementation runs the discover
-	 * command if defined in the RM capability.
-	 * @return
-	 */
-	protected abstract Job createDiscoverJob() throws CoreException;
-
-	/**
-	 * Creates a job that periodically monitors the remote machine. The default implementation runs the periodic monitor
-	 * command if defined in the RM capability.
-	 * @return
-	 */
-	protected abstract Job createPeriodicMonitorJob() throws CoreException;
-
-	/**
-	 * Creates a job that keeps monitoring the remote machine. The default implementation runs the continuous monitor
-	 * command if defined in the RM capability.
-	 * @return
-	 */
-	protected abstract Job createContinuousMonitorJob() throws CoreException;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IControlSystem#submitJob(org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	public void submitJob(String subId, AttributeManager attrMgr) throws CoreException {
-		if (remoteServices == null) {
-			throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.PLUGIN_ID, Messages.AbstractToolRuntimeSystem_Exception_ResourceManagerNotInitialized));
-		}
-
-		/*
-		 * Add some more attributes to the launch information.
-		 */
-		attrMgr.addAttribute(JobAttributes.getSubIdAttributeDefinition().create(subId));
-
-		/*
-		 * Create the IPJob.
-		 */
-		String queueID = attrMgr.getAttribute(JobAttributes.getQueueIdAttributeDefinition()).getValue();
-		String jobID = createJob(queueID, attrMgr);
-		attrMgr.addAttribute(JobAttributes.getJobIdAttributeDefinition().create(jobID));
-
-		DebugUtil.trace(DebugUtil.JOB_TRACING, "RTS {0}: job submission #{0}, job id #{1}, queue id @{2}", rmConfiguration.getName(), subId, jobID, queueID); //$NON-NLS-1$
-
-		/*
-		 * Create the job that runs the application.
-		 */
-		Job job = createRuntimeSystemJob(jobID, queueID, attrMgr);
-		jobs.put(jobID, job);
-		try {
-			pendingJobQueue.put(job);
-		} catch (InterruptedException e) {
-			throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.PLUGIN_ID, e.getMessage()));
-		}
-	}
-
-	abstract public Job createRuntimeSystemJob(String jobID, String queueID, AttributeManager attrMgr) throws CoreException;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rtsystem.IControlSystem#terminateJob(org.eclipse.ptp.core.elements.IPJob)
-	 */
-	public void terminateJob(IPJob ipJob) throws CoreException {
-		DebugUtil.trace(DebugUtil.JOB_TRACING, "RTS {0}: terminate job #{1}", rmConfiguration.getName(), ipJob.getID()); //$NON-NLS-1$
-		Job job = jobs.get(ipJob.getID());
-		pendingJobQueue.remove(job);
-		job.cancel();
-	}
-
-	/**
-	 * Notify RM to change job attributes.
-	 *
-	 * @param id job ID
-	 * @param attrs new attributes
-	 */
-	//	protected void changeJobAttributes(String id, IAttribute<?, ?, ?>... attrs) {
-	//		ElementAttributeManager mgr = new ElementAttributeManager();
-	//		AttributeManager attrMgr = new AttributeManager();
-	//		for (IAttribute<?, ?, ?> attr : attrs) {
-	//			attrMgr.addAttribute(attr);
-	//		}
-	//		mgr.setAttributeManager(new RangeSet(id), attrMgr);
-	//		fireRuntimeJobChangeEvent(eventFactory.newRuntimeJobChangeEvent(mgr));
-	//	}
-
-	//	/**
-	//	 * Notify RM to change job state.
-	//	 *
-	//	 * @param id job ID
-	//	 * @param state new state
-	//	 */
-	//	protected void changeJobState(String id, JobAttributes.State state) {
-	//		ElementAttributeManager mgr = new ElementAttributeManager();
-	//		AttributeManager attrMgr = new AttributeManager();
-	//		attrMgr.addAttribute(JobAttributes.getStateAttributeDefinition().create(state));
-	//		mgr.setAttributeManager(new RangeSet(id), attrMgr);
-	//		fireRuntimeJobChangeEvent(eventFactory.newRuntimeJobChangeEvent(mgr));
-	//	}
-
-	/**
-	 * Notify RM to create a new job.
-	 *
-	 * @param parentID parent element ID
-	 * @param jobID the ID of the job
-	 * @param attrMgr attributes from the job thread
-	 */
-	public String createJob(String parentID, AttributeManager attrMgr) {
-		ElementAttributeManager mgr = new ElementAttributeManager();
-		AttributeManager jobAttrMgr = new AttributeManager();
-
-		/*
-		 * Add generated attributes.
-		 */
-		String jobID = generateID().toString();
-		jobAttrMgr.addAttribute(JobAttributes.getJobIdAttributeDefinition().create(jobID));
-		jobAttrMgr.addAttribute(JobAttributes.getQueueIdAttributeDefinition().create(parentID));
-		jobAttrMgr.addAttribute(JobAttributes.getStateAttributeDefinition().create(JobAttributes.State.PENDING));
-		jobAttrMgr.addAttribute(JobAttributes.getUserIdAttributeDefinition().create(System.getenv("USER"))); //$NON-NLS-1$
-		jobAttrMgr.addAttribute(ElementAttributes.getNameAttributeDefinition().create(generateJobName()));
-
-		/*
-		 * Get relevant attributes from launch attributes.
-		 */
-		String subId = attrMgr.getAttribute(JobAttributes.getSubIdAttributeDefinition()).getValue();
-		String execName  = attrMgr.getAttribute(JobAttributes.getExecutableNameAttributeDefinition()).getValue();
-		String execPath = attrMgr.getAttribute(JobAttributes.getExecutablePathAttributeDefinition()).getValue();
-		String workDir = attrMgr.getAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition()).getValue();
-		Integer numProcs = attrMgr.getAttribute(JobAttributes.getNumberOfProcessesAttributeDefinition()).getValue();
-		List<String> progArgs = attrMgr.getAttribute(JobAttributes.getProgramArgumentsAttributeDefinition()).getValue();
-		BooleanAttribute debugAttr = attrMgr.getAttribute(JobAttributes.getDebugFlagAttributeDefinition());
-
-		/*
-		 * Copy these relevant attributes to IPJob.
-		 */
-		jobAttrMgr.addAttribute(JobAttributes.getSubIdAttributeDefinition().create(subId));
-		jobAttrMgr.addAttribute(JobAttributes.getExecutableNameAttributeDefinition().create(execName));
-		jobAttrMgr.addAttribute(JobAttributes.getExecutablePathAttributeDefinition().create(execPath));
-		jobAttrMgr.addAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition().create(workDir));
-		try {
-			jobAttrMgr.addAttribute(JobAttributes.getNumberOfProcessesAttributeDefinition().create(numProcs));
-		} catch (IllegalValueException e) {
-			ToolsRMPlugin.log(e);
-		}
-		jobAttrMgr.addAttribute(JobAttributes.getProgramArgumentsAttributeDefinition().create(progArgs.toArray(new String[0])));
-		if (debugAttr != null) {
-			jobAttrMgr.addAttribute(JobAttributes.getDebugFlagAttributeDefinition().create(debugAttr.getValue()));
-		}
-
-		/*
-		 * Notify RM.
-		 */
-		mgr.setAttributeManager(new RangeSet(jobID), jobAttrMgr);
-		fireRuntimeNewJobEvent(eventFactory.newRuntimeNewJobEvent(parentID, mgr));
-
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: new job #{1}", rmConfiguration.getName(), jobID); //$NON-NLS-1$
-
-		return jobID;
-	}
-
-
-	/**
-	 * Notify RM to create a new machine.
-	 * @param name name of the machine
-	 * @return the id of the new machine
-	 */
-	public String createMachine(String name) {
-		String id = generateID().toString();
-		ElementAttributeManager mgr = new ElementAttributeManager();
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.UP));
-		attrMgr.addAttribute(ElementAttributes.getNameAttributeDefinition().create(name));
-		mgr.setAttributeManager(new RangeSet(id), attrMgr);
-		fireRuntimeNewMachineEvent(eventFactory.newRuntimeNewMachineEvent(rmID, mgr));
-
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: new machine #{1}", rmConfiguration.getName(), id); //$NON-NLS-1$
-
-		return id;
-	}
-
-	/**
-	 * Notify RM to create a new node.
-	 * @param parentID The ID of the machine the node belongs to
-	 * @param name the name of the node
-	 * @param number the number of the node (rank)
-	 * @return the id of the new node
-	 */
-	public String createNode(String parentID, String name, int number) {
-		String id = generateID();
-		ElementAttributeManager mgr = new ElementAttributeManager();
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttribute(NodeAttributes.getStateAttributeDefinition().create(NodeAttributes.State.UP));
-		try {
-			attrMgr.addAttribute(NodeAttributes.getNumberAttributeDefinition().create(number));
-		} catch (IllegalValueException e) {
-			/*
-			 * This exception is not possible, since number is always valid.
-			 */
-			ToolsRMPlugin.log(e);
-			assert false;
-		}
-		attrMgr.addAttribute(ElementAttributes.getNameAttributeDefinition().create(name));
-		mgr.setAttributeManager(new RangeSet(id), attrMgr);
-		fireRuntimeNewNodeEvent(eventFactory.newRuntimeNewNodeEvent(parentID, mgr));
-
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: new node #{1}", rmConfiguration.getName(), id); //$NON-NLS-1$
-
-		return id;
-	}
-
-	/**
-	 * Notify RM to create a new queue.
-	 *
-	 * @param name the name of the queue
-	 * @return the id of the new queue
-	 */
-	public String createQueue(String name) {
-		String id = generateID();
-		ElementAttributeManager mgr = new ElementAttributeManager();
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttribute(QueueAttributes.getStateAttributeDefinition().create(QueueAttributes.State.NORMAL));
-		attrMgr.addAttribute(ElementAttributes.getNameAttributeDefinition().create(name));
-		mgr.setAttributeManager(new RangeSet(id), attrMgr);
-		fireRuntimeNewQueueEvent(eventFactory.newRuntimeNewQueueEvent(rmID, mgr));
-
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: new queue #{1}", rmConfiguration.getName(), id); //$NON-NLS-1$
-
-		return id;
-	}
-
-	/**
-	 * Notify RM to create a new process.
-	 *
-	 * @param parentID the id of the job the process belongs to
-	 * @param name the name of the process
-	 * @param index the index (rank) of the process
-	 * @return the id of the new process
-	 */
-	public String createProcess(String parentID, String name, int index) {
-		String id = generateID();
-		ElementAttributeManager mgr = new ElementAttributeManager();
-		AttributeManager attrMgr = new AttributeManager();
-
-		attrMgr.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(ProcessAttributes.State.STARTING));
-		try {
-			attrMgr.addAttribute(ProcessAttributes.getIndexAttributeDefinition().create(index));
-		} catch (IllegalValueException e) {
-			// This is not possible
-			Assert.isTrue(false);
-		}
-		attrMgr.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create(parentID));
-		attrMgr.addAttribute(ElementAttributes.getNameAttributeDefinition().create(name));
-		mgr.setAttributeManager(new RangeSet(id), attrMgr);
-		fireRuntimeNewProcessEvent(eventFactory.newRuntimeNewProcessEvent(parentID, mgr));
-
-		DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}: new process #{1}", rmConfiguration.getName(), id); //$NON-NLS-1$
-
-		return id;
-	}
-
-	public void changeProcess(String processID, AttributeManager changedAttrMgr) {
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttributes(changedAttrMgr.getAttributes());
-		ElementAttributeManager elementAttrs = new ElementAttributeManager();
-		elementAttrs.setAttributeManager(new RangeSet(processID), attrMgr);
-		IRuntimeProcessChangeEvent event = eventFactory.newRuntimeProcessChangeEvent(elementAttrs);
-		fireRuntimeProcessChangeEvent(event);
-
-		for (IAttribute<?, ?, ?> attr : changedAttrMgr.getAttributes()) {
-			DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}, process #{1}: {2}={3}", rmConfiguration.getName(), processID, attr.getDefinition().getId(), attr.getValueAsString()); //$NON-NLS-1$
-		}
-	}
-
-	public void changeJob(String jobID, AttributeManager changedAttrMgr) {
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttributes(changedAttrMgr.getAttributes());
-		ElementAttributeManager elementAttrs = new ElementAttributeManager();
-		elementAttrs.setAttributeManager(new RangeSet(jobID), attrMgr);
-		IRuntimeJobChangeEvent event = eventFactory.newRuntimeJobChangeEvent(elementAttrs);
-		fireRuntimeJobChangeEvent(event);
-
-		for (IAttribute<?, ?, ?> attr : changedAttrMgr.getAttributes()) {
-			DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}, job #{1}: {2}={3}", rmConfiguration.getName(), jobID, attr.getDefinition().getId(), attr.getValueAsString()); //$NON-NLS-1$
-		}
-	}
-
-	public void changeNode(String nodeID, AttributeManager changedAttrMgr) {
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttributes(changedAttrMgr.getAttributes());
-		ElementAttributeManager elementAttrs = new ElementAttributeManager();
-		elementAttrs.setAttributeManager(new RangeSet(nodeID), attrMgr);
-		IRuntimeNodeChangeEvent event = eventFactory.newRuntimeNodeChangeEvent(elementAttrs);
-		fireRuntimeNodeChangeEvent(event);
-
-		for (IAttribute<?, ?, ?> attr : changedAttrMgr.getAttributes()) {
-			DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}, node #{1}: {2}={3}", rmConfiguration.getName(), nodeID, attr.getDefinition().getId(), attr.getValueAsString()); //$NON-NLS-1$
-		}
-	}
-
-	public void changeMachine(String machineID, AttributeManager changedAttrMgr) {
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttributes(changedAttrMgr.getAttributes());
-		ElementAttributeManager elementAttrs = new ElementAttributeManager();
-		elementAttrs.setAttributeManager(new RangeSet(machineID), attrMgr);
-		IRuntimeMachineChangeEvent event = eventFactory.newRuntimeMachineChangeEvent(elementAttrs);
-		fireRuntimeMachineChangeEvent(event);
-
-		for (IAttribute<?, ?, ?> attr : changedAttrMgr.getAttributes()) {
-			DebugUtil.trace(DebugUtil.RTS_TRACING, "RTS {0}, machine #{1}: {2}={3}", rmConfiguration.getName(), machineID, attr.getDefinition().getId(), attr.getValueAsString()); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Generate a new element ID
-	 *
-	 * @return new element ID
-	 */
-	protected String generateID() {
-		// TODO: Add RM id?
-		String id = nextID.toString();
-		nextID++;
-		return id;
-	}
-
-	/**
-	 * Generate a job name
-	 *
-	 * @return job name
-	 */
-	protected String generateJobName() {
-		return "job" + jobNumber++; //$NON-NLS-1$
-	}
-
-	public IRemoteProcessBuilder createProcessBuilder(List<String> command) {
-		return remoteServices.getProcessBuilder(connection, command);
-	}
-
-	public IRemoteProcessBuilder createProcessBuilder(List<String> command, String workdir) throws IOException {
-		IFileStore directory = null;
-		 /* 
-		  * Ignore workdir if we're using RSE to avoid triggering bug #258481
-		  */
-		if (!getRemoteServices().getId().equals("org.eclipse.ptp.remote.RSERemoteServices")) { //$NON-NLS-1$
-			IRemoteFileManager fileManager = remoteServices.getFileManager(connection);
-			if (fileManager != null) {
-				directory = fileManager.getResource(new Path(workdir), new NullProgressMonitor());
-			}
-		}
-		IRemoteProcessBuilder processBuilder = remoteServices.getProcessBuilder(connection, command);
-		processBuilder.directory(directory);
-		return processBuilder;
-	}
-
-	public String getRmID() {
-		return rmID;
-	}
-
-	public AbstractToolRMConfiguration getRmConfiguration() {
-		return rmConfiguration;
-	}
-
-	public IRemoteConnection getConnection() {
-		return connection;
-	}
-
-	public IRemoteServices getRemoteServices() {
-		return remoteServices;
-	}
-
-	public abstract AbstractEffectiveToolRMConfiguration retrieveEffectiveToolRmConfiguration();
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystemJob.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystemJob.java
deleted file mode 100644
index eeebd77..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/AbstractToolRuntimeSystemJob.java
+++ /dev/null

@@ -1,632 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.rtsystem;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.ArrayAttribute;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.BooleanAttribute;
-import org.eclipse.ptp.core.attributes.EnumeratedAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.remote.core.IRemoteProcess;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.core.messages.Messages;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.utils.core.linux.ArgumentParser;
-
-/**
- * Implements a job that controls the parallel application launched with a command line tool.
- * This class is different from {@link AbstractRemoteCommandJob} because it is not aimed towards parsing output of the
- * tool called by command line, but to prepare a whole launch environment for the command line tool, also supporting
- * semantics of the parallel application launcher.
- *
- * @author Daniel Felix Ferber
- */
-public abstract class AbstractToolRuntimeSystemJob extends Job implements IToolRuntimeSystemJob {
-
-	protected String jobID;
-	protected String queueID;
-	protected boolean debug = false;
-	protected IRemoteProcess process = null;
-	protected AttributeManager attrMgr;
-	protected AbstractToolRuntimeSystem rtSystem;
-
-	protected boolean terminateJobFlag = false;
-
-	public AbstractToolRuntimeSystemJob(String jobID, String queueID, String name, AbstractToolRuntimeSystem rtSystem,
-			AttributeManager attrMgr) {
-		super(name);
-		this.attrMgr = attrMgr;
-		this.rtSystem = rtSystem;
-		this.jobID = jobID;
-		this.queueID = queueID;
-	}
-
-	@Override
-	public Object getAdapter(Class adapter) {
-		if (adapter == IToolRuntimeSystemJob.class) {
-			return this;
-		}
-		return super.getAdapter(adapter);
-	}
-
-	public String getQueueID() {
-		return queueID;
-	}
-
-	public String getJobID() {
-		return jobID;
-	}
-
-	public AbstractToolRuntimeSystem getRtSystem() {
-		return rtSystem;
-	}
-
-	public AttributeManager getAttrMgr() {
-		return attrMgr;
-	}
-	
-	public boolean isDebug() {
-		return debug;
-	}
-
-	@Override
-	protected IStatus run(IProgressMonitor monitor) {
-		BooleanAttribute debugAttr = attrMgr.getAttribute(JobAttributes.getDebugFlagAttributeDefinition());
-		if (debugAttr != null) {
-			debug = debugAttr.getValue().booleanValue();
-		}
-		
-		changeJobState(JobAttributes.State.STARTED);
-
-		if (DebugUtil.RTS_JOB_TRACING_MORE) {
-			System.out.println("Launch attributes:"); //$NON-NLS-1$
-			String array[] = getAttrMgr().toStringArray();
-			for (int i = 0; i < array.length; i++) {
-				System.out.println(array[i]);
-			}
-		}
-
-		try {
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: handle prepare", jobID); //$NON-NLS-1$
-			doPrepareExecution(monitor);
-		} catch (CoreException e) {
-			changeJobState(JobAttributes.State.ERROR);
-			return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_Exception_PrepareExecution, e);
-		}
-		
-		if (monitor.isCanceled()) {
-			changeJobState(JobAttributes.State.TERMINATED);
-			return new Status(IStatus.OK, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_UserCanceled);
-		}
-
-		try {
-			/*
-			 * Calculate command and environment.
-			 */
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "About to run RTS job #{0}.", jobID); //$NON-NLS-1$
-			List<String> command = null;
-			Map<String,String> environment = null;
-			String directory = null;
-			try {
-				AttributeManager baseSubstitutionAttributeManager = retrieveBaseSubstitutionAttributes();
-				environment = retrieveEnvironment(baseSubstitutionAttributeManager);
-				directory = retrieveWorkingDirectory(baseSubstitutionAttributeManager);
-
-				AttributeManager commandSubstitutionAttributeManager = retrieveCommandSubstitutionAttributes(baseSubstitutionAttributeManager, directory, environment);
-				if (isDebug()) {
-					command = retrieveCreateDebugCommand(commandSubstitutionAttributeManager);
-				} else {
-					command = retrieveCreateLaunchCommand(commandSubstitutionAttributeManager);
-				}
-				if (DebugUtil.RTS_JOB_TRACING) {
-					System.out.println("Available macros for environment and work directory:"); //$NON-NLS-1$
-					for (IAttribute<?, ?, ?> attr : baseSubstitutionAttributeManager.getAttributes()) {
-						System.out.println(MessageFormat.format("  {0}={1}", attr.getDefinition().getId(), attr.getValueAsString())); //$NON-NLS-1$
-					}
-					System.out.println("Available macros for command:"); //$NON-NLS-1$
-					for (IAttribute<?, ?, ?> attr : commandSubstitutionAttributeManager.getAttributes()) {
-						System.out.println(MessageFormat.format("  {0}={1}", attr.getDefinition().getId(), attr.getValueAsString())); //$NON-NLS-1$
-					}
-					System.out.println("Environment variables:"); //$NON-NLS-1$
-					for (Entry<String, String> env : environment.entrySet()) {
-						System.out.println(MessageFormat.format("  export {0}={1}", env.getKey(), env.getValue())); //$NON-NLS-1$
-					}
-					System.out.println(MessageFormat.format("Work directory: {0}", directory)); //$NON-NLS-1$
-					ArgumentParser argumentParser = new ArgumentParser(command);
-					System.out.println(MessageFormat.format("Command: {0}", argumentParser.getCommandLine(false))); //$NON-NLS-1$
-				}
-			} catch (CoreException e) {
-				changeJobState(JobAttributes.State.ERROR);
-				return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_Exception_CreateCommand, e);
-			}
-
-			try {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: handle before execution", jobID); //$NON-NLS-1$
-				doBeforeExecution(monitor);
-			} catch (CoreException e) {
-				changeJobState(JobAttributes.State.ERROR);
-				return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_Exception_BeforeExecution, e);
-			}
-
-			if (monitor.isCanceled()) {
-				changeJobState(JobAttributes.State.TERMINATED);
-				return new Status(IStatus.OK, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_UserCanceled);
-			}
-
-			/*
-			 * Execute remote command for the job.
-			 */
-			try {
-				IRemoteProcessBuilder processBuilder = rtSystem.createProcessBuilder(command, directory);
-				processBuilder.environment().putAll(environment);
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: start", jobID); //$NON-NLS-1$
-				process = processBuilder.start();
-			} catch (IOException e) {
-				changeJobState(JobAttributes.State.ERROR);
-				return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_Exception_ExecuteCommand, e);
-			}
-
-			try {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: handle start", jobID); //$NON-NLS-1$
-				doExecutionStarted(monitor);
-			} catch (CoreException e) {
-				changeJobState(JobAttributes.State.ERROR);
-				return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_Exception_ExecutionStarted, e);
-			}
-
-			if (monitor.isCanceled()) {
-				changeJobState(JobAttributes.State.TERMINATED);
-				return new Status(IStatus.OK, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_UserCanceled);
-			}
-
-			changeJobState(JobAttributes.State.RUNNING);
-
-			try {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: wait to finish", jobID); //$NON-NLS-1$
-				doWaitExecution(monitor);
-			} catch (CoreException e) {
-				changeJobState(JobAttributes.State.ERROR);
-				return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_Exception_WaitExecution, e);
-			}
-
-			if (monitor.isCanceled()) {
-				changeJobState(JobAttributes.State.TERMINATED);
-				return new Status(IStatus.OK, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_UserCanceled);
-			}
-
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING, "RTS job #{0}: exit value {1}", jobID, process.exitValue()); //$NON-NLS-1$
-
-
-			//			try {
-			//				DebugUtil.trace(DebugUtil.COMMAND_TRACING, "RTS job #{0}: wait to finish", jobID); //$NON-NLS-1$
-			//				process.waitFor();
-			//			} catch (InterruptedException e) {
-			//				changeJobState(JobAttributes.State.ERROR);
-			//				return new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), "Failed while terminating the command.", e);
-			//			}
-
-			try {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: handle finish", jobID); //$NON-NLS-1$
-				doExecutionFinished(monitor);
-			} catch (CoreException e) {
-				changeJobState(JobAttributes.State.ERROR);
-				return new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.AbstractToolRuntimeSystemJob_Exception_ExecutionFinished, e);
-			}
-
-			changeJobState(JobAttributes.State.TERMINATED);
-
-			return new Status(IStatus.OK, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), NLS.bind(Messages.AbstractToolRuntimeSystemJob_Success, process.exitValue()));
-
-		} finally {
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: cleanup", jobID); //$NON-NLS-1$
-			final IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID());
-			if (rm != null) {
-				final IPQueue queue = rm.getQueueById(getQueueID());
-				if (queue != null) {
-					final IPJob ipJob = queue.getJobById(getJobID());
-					if (ipJob != null) {
-						switch (ipJob.getState()) {
-						case TERMINATED:
-						case ERROR:
-							break;
-						case PENDING:
-						case RUNNING:
-						case STARTED:
-						case SUSPENDED:
-						case UNKNOWN:
-							changeJobState(JobAttributes.State.TERMINATED);
-							break;
-						}
-					}
-				}
-			}
-			doExecutionCleanUp(monitor);
-		}
-	}
-
-	abstract protected void doPrepareExecution(IProgressMonitor monitor) throws CoreException;
-
-	abstract protected void doExecutionCleanUp(IProgressMonitor monitor);
-
-	abstract protected void doWaitExecution(IProgressMonitor monitor) throws CoreException;
-
-	abstract protected void doExecutionFinished(IProgressMonitor monitor) throws CoreException;
-
-	abstract protected void doExecutionStarted(IProgressMonitor monitor) throws CoreException;
-
-	abstract protected void doBeforeExecution(IProgressMonitor monitor) throws CoreException;
-
-	abstract protected void doTerminateJob();
-
-	/**
-	 * Change the state of the job state.
-	 * @param newState
-	 */
-	protected void changeJobState(JobAttributes.State newState) {
-		EnumeratedAttribute<JobAttributes.State> state = JobAttributes.getStateAttributeDefinition().create(newState);
-		AttributeManager attrManager = new AttributeManager();
-		attrManager.addAttribute(state);
-		rtSystem.changeJob(jobID, attrManager);
-	}
-
-	/**
-	 * Retrieve the working directory for the launch.
-	 * @param baseSubstitutionAttributeManager
-	 * @return
-	 */
-	protected String retrieveWorkingDirectory(AttributeManager baseSubstitutionAttributeManager) {
-		/*
-		 * TODO Return IPath instead of string
-		 */
-		String workdir = attrMgr.getAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition()).getValue();
-		String newWorkdir = replaceVariables(workdir, baseSubstitutionAttributeManager);
-		if (! workdir.equals(newWorkdir)) {
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "Changed work directory from {0} to {1}", workdir, newWorkdir); //$NON-NLS-1$
-			workdir = newWorkdir;
-		}
-		return workdir;
-	}
-
-	/**
-	 * Retrieve the environment variables.
-	 * @param baseSubstitutionAttributeManager
-	 */
-	protected Map<String,String> retrieveEnvironment(AttributeManager baseSubstitutionAttributeManager) throws CoreException {
-		HashMap<String, String> environmentMap = new HashMap<String, String>();
-
-		/*
-		 * First, get environment from the attribute manager.
-		 */
-		retrieveEnvironmentFromAttrMrg(environmentMap);
-
-		/*
-		 * Then, get extra environment variables that are specific for the tool.
-		 */
-		HashMap<String, String> extraEnvironmentMap = doRetrieveToolEnvironment();
-		if (extraEnvironmentMap != null) {
-			environmentMap.putAll(extraEnvironmentMap);
-		}
-
-		/*
-		 * Do substitution on each environment variable.
-		 */
-		for (Iterator<Entry<String, String>> iterator = environmentMap.entrySet().iterator(); iterator.hasNext();) {
-			Entry<String, String> env = iterator.next();
-			String value = env.getValue();
-			String newValue = replaceVariables(value, baseSubstitutionAttributeManager);
-			if (! value.equals(newValue)) {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "Changed environment '{0}={1}' to '{0}={2}", env.getKey(), value, newValue); //$NON-NLS-1$
-				env.setValue(newValue);
-			}
-		}
-
-		return environmentMap;
-	}
-
-	/**
-	 * Retrieve additional environment variables that are specific for the tool.
-	 */
-	abstract protected HashMap<String, String> doRetrieveToolEnvironment() throws CoreException;
-
-	private void retrieveEnvironmentFromAttrMrg(
-			HashMap<String, String> environmentMap) {
-		ArrayAttribute<String> environmentAttribute = getAttrMgr().getAttribute(JobAttributes.getEnvironmentAttributeDefinition());
-		if (environmentAttribute != null) {
-			List<String> environment = environmentAttribute.getValue();
-			for (String entry : environment) {
-				int i = entry.indexOf('=');
-				String key = entry.substring(0, i);
-				String value = entry.substring(i+1);
-				environmentMap.put(key, value);
-			}
-		}
-	}
-
-	/**
-	 * Retrieve attributes used to expand macros.
-	 * @return
-	 * @throws CoreException
-	 */
-	protected AttributeManager retrieveBaseSubstitutionAttributes() throws CoreException {
-		AttributeManager newAttributeManager = new AttributeManager(getAttrMgr().getAttributes());
-
-		/*
-		 * First, add all default attributes that are default attributes for the launch.
-		 * If they are not present in the launch attributes, then use default value.
-		 */
-		for (IAttributeDefinition<?, ?, ?> attributeDefinition : getDefaultSubstitutionAttributes()) {
-			IAttribute<?, ?, ?> attribute = newAttributeManager.getAttribute(attributeDefinition.getId());
-			if (attribute == null) {
-				// Create one with default value.
-				try {
-					newAttributeManager.addAttribute(attributeDefinition.create());
-				} catch (IllegalValueException e) {
-					throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), NLS.bind(Messages.AbstractToolRuntimeSystemJob_Exception_DefaultAttributeValue, attributeDefinition.getName()), e));
-				}
-			}
-		}
-
-		/*
-		 * Then, add attributes that are specific for the tool.
-		 */
-		IAttribute<?,?,?> extraAttributes[] = doRetrieveToolBaseSubstitutionAttributes();
-		if (extraAttributes != null) {
-			newAttributeManager.addAttributes(extraAttributes);
-		}
-
-		return newAttributeManager;
-	}
-
-	/**
-	 * Retrieve additional attributes to expand macros that are specific for the tool.
-	 */
-	abstract protected IAttribute<?, ?, ?>[] doRetrieveToolBaseSubstitutionAttributes() throws CoreException;
-
-	/**
-	 * A list of all attributes definitions from the launch configuration that can be used to expand macros.
-	 * @return
-	 */
-	protected IAttributeDefinition<?, ?, ?>[] getDefaultSubstitutionAttributes() {
-		return new IAttributeDefinition[]{
-				JobAttributes.getEnvironmentAttributeDefinition(),
-				JobAttributes.getExecutableNameAttributeDefinition(),
-				JobAttributes.getExecutablePathAttributeDefinition(),
-				JobAttributes.getJobIdAttributeDefinition(),
-				JobAttributes.getNumberOfProcessesAttributeDefinition(),
-				JobAttributes.getProgramArgumentsAttributeDefinition(),
-				JobAttributes.getQueueIdAttributeDefinition(),
-				JobAttributes.getSubIdAttributeDefinition(),
-				JobAttributes.getUserIdAttributeDefinition(),
-				JobAttributes.getWorkingDirectoryAttributeDefinition()
-		};
-	}
-
-	final protected AttributeManager retrieveCommandSubstitutionAttributes(
-			AttributeManager baseSubstitutionAttributeManager,
-			String directory, Map<String, String> environment) {
-		AttributeManager newAttributeManager = new AttributeManager(baseSubstitutionAttributeManager.getAttributes());
-
-		/*
-		 * Add attributes that are specific for the tool.
-		 */
-		IAttribute<?,?,?> extraAttributes[] = doRetrieveToolCommandSubstitutionAttributes(baseSubstitutionAttributeManager, directory, environment);
-		if (extraAttributes != null) {
-			newAttributeManager.addAttributes(extraAttributes);
-		}
-
-		return newAttributeManager;
-	}
-
-
-	abstract protected IAttribute<?, ?, ?>[] doRetrieveToolCommandSubstitutionAttributes(
-			AttributeManager baseSubstitutionAttributeManager,
-			String directory, Map<String, String> environment);
-
-	protected List<String> retrieveCreateLaunchCommand(AttributeManager substitutionAttributeManager) throws CoreException {
-		/*
-		 * Create launch command. If there is no launch command, simply launch the executable.
-		 */
-		AbstractEffectiveToolRMConfiguration effectiveConfiguration = getRtSystem().retrieveEffectiveToolRmConfiguration();
-		List<String> command = new ArrayList<String>();
-		if (! effectiveConfiguration.hasLaunchCmd()) {
-			// Fall back to calling the executable.
-			StringAttribute execPath = getAttrMgr().getAttribute(JobAttributes.getExecutablePathAttributeDefinition());
-			ArrayAttribute<String> arguments = getAttrMgr().getAttribute(JobAttributes.getProgramArgumentsAttributeDefinition());
-			command.add(execPath.getValue());
-			command.addAll(arguments.getValue());
-		} else {
-			// Use the tool to launch executable
-			String launchCommand = effectiveConfiguration.getLaunchCmd();
-			Assert.isNotNull(launchCommand);
-			Assert.isTrue(launchCommand.trim().length() > 0);
-			launchCommand = replaceVariables(launchCommand, substitutionAttributeManager);
-			ArgumentParser argumentParser = new ArgumentParser(launchCommand);
-			command = argumentParser.getTokenList();
-		}
-		return command;
-	}
-
-	protected List<String> retrieveCreateDebugCommand(AttributeManager substitutionAttributeManager) throws CoreException {
-		/*
-		 * Create debug command. If there is no debug command, simply launch the executable.
-		 */
-		AbstractEffectiveToolRMConfiguration effectiveConfiguration = getRtSystem().retrieveEffectiveToolRmConfiguration();
-		List<String> command = new ArrayList<String>();
-		if (! effectiveConfiguration.hasDebugCmd()) {
-			// Fall back to calling the executable.
-			StringAttribute execPath = getAttrMgr().getAttribute(JobAttributes.getExecutablePathAttributeDefinition());
-			ArrayAttribute<String> arguments = getAttrMgr().getAttribute(JobAttributes.getProgramArgumentsAttributeDefinition());
-			command.add(execPath.getValue());
-			command.addAll(arguments.getValue());
-		} else {
-			// Use the tool to launch executable
-			String debugCommand = effectiveConfiguration.getDebugCmd();
-			Assert.isNotNull(debugCommand);
-			Assert.isTrue(debugCommand.trim().length() > 0);
-			debugCommand = replaceVariables(debugCommand, substitutionAttributeManager);
-			ArgumentParser argumentParser = new ArgumentParser(debugCommand);
-			command = argumentParser.getTokenList();
-		}
-		return command;
-	}
-
-	/*
-	 * Pattern to fined variables according these rules:
-	 * Starts with "${" and ends with "}"
-	 * The content is a name and a set of parameters separated by ":"
-	 * In the parameters, "\" may be used to quote following chars: '\', '}' and ':'
-	 *
-	 * TODO move this patter substitution code into the attribute manager
-	 * TODO enable the attribute manager to do substitution -> have this feature available on entire PTP.
-	 */
-	static final Pattern variablePattern = Pattern.compile(("/$/{(/w+)("+"(?:(?:////)|(?:///})|[^/}])*"+")/}").replace('/','\\')); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	static final Pattern parameterPattern = Pattern.compile(":((?:(?:////)|(?:///:)|(?:///})|[^:])*)".replace('/', '\\')); //$NON-NLS-1$
-
-	/**
-	 * Performs substitution of variables using attributes from the attribute manager as variables.
-	 * @param input the string with variables.
-	 * @param substitutionAttributeManager
-	 * @return The string after substitution of variables.
-	 */
-	protected String replaceVariables(String input, AttributeManager substitutionAttributeManager) {
-		StringBuffer output = new StringBuffer();
-		Matcher matcher = variablePattern.matcher(input);
-
-		int lastPos = 0;
-		while (matcher.find()) {
-			int startPos = matcher.start();
-			int endPos = matcher.end();
-			String name = matcher.group(1);
-			String parameterList = matcher.group(2);
-			String variable = matcher.group();
-			output.append(input.substring(lastPos, startPos));
-
-			/*
-			 * Resolve variable.
-			 */
-			String resolvedValue = null;
-			IAttribute<?,?,?> attribute = substitutionAttributeManager.getAttribute(name);
-			if (attribute != null) {
-				if (attribute instanceof ArrayAttribute<?>) {
-					/*
-					 * Retrieve parameters or use defaults.
-					 */
-					String optStartStr = ""; //$NON-NLS-1$
-					String optEndStr = ""; //$NON-NLS-1$
-					String startStr = ""; //$NON-NLS-1$
-					String endStr = ""; //$NON-NLS-1$
-					String separatorStr = " "; //$NON-NLS-1$
-					Matcher paramMatcher = parameterPattern.matcher(parameterList);
-					if (paramMatcher.find()) {
-						startStr = paramMatcher.group(1);
-						if (paramMatcher.find()) {
-							separatorStr = paramMatcher.group(1);
-							if (paramMatcher.find()) {
-								endStr = paramMatcher.group(1);
-								if (paramMatcher.find()) {
-									optStartStr = paramMatcher.group(1);
-									if (paramMatcher.find()) {
-										optEndStr = paramMatcher.group(1);
-									}
-								}
-							}
-						}
-					}
-
-					/*
-					 * Build content.
-					 */
-					ArrayAttribute<?> array_attr = (ArrayAttribute<?>) attribute;
-					StringBuffer buffer = new StringBuffer();
-					boolean first = true;
-					List<?> array = array_attr.getValue();
-					if (array.size() > 0) {
-						buffer.append(optStartStr);
-					}
-					buffer.append(startStr);
-					for (Object element : array) {
-						if (first) {
-							first = false;
-						} else {
-							buffer.append(separatorStr);
-						}
-						assert element != null;
-						buffer.append(element);
-					}
-					buffer.append(endStr);
-					if (array.size() > 0) {
-						buffer.append(optEndStr);
-					}
-					resolvedValue = buffer.toString();
-				} else {
-					resolvedValue = attribute.getValueAsString();
-				}
-			}
-
-			/*
-			 * If failed to resolve variable, keep it on the string. Else replace by its value.
-			 */
-			if (resolvedValue == null) {
-				output.append(variable);
-			} else {
-				// Recursive macro substitution
-				resolvedValue = replaceVariables(resolvedValue, substitutionAttributeManager);
-				output.append(resolvedValue);
-			}
-			lastPos = endPos;
-		}
-		output.append(input.substring(lastPos));
-		String result = output.toString();
-		return result;
-	}
-
-	public void terminate() {
-		terminateJobFlag = true;
-		if (process != null) {
-			process.destroy();
-		}
-		doTerminateJob();
-	}
-
-	@Override
-	protected void canceling() {
-		terminate();
-		super.canceling();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/DefaultToolRuntimeSystemJob.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/DefaultToolRuntimeSystemJob.java
deleted file mode 100644
index 510bb53..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/DefaultToolRuntimeSystemJob.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.rm.core.utils.ITextInputStreamListener;
-import org.eclipse.ptp.rm.core.utils.TextInputStreamObserver;
-
-/**
- * Sample implementation of {@link AbstractToolRuntimeSystemJob}. Not used anymore.
- * @deprecated
- * @author Daniel Felix Ferber
- */
-@Deprecated
-public class DefaultToolRuntimeSystemJob extends AbstractToolRuntimeSystemJob {
-
-	private TextInputStreamObserver stderrObserver;
-	private TextInputStreamObserver stdoutObserver;
-
-	public DefaultToolRuntimeSystemJob(String jobID, String queueID, String name, AbstractToolRuntimeSystem rtSystem,
-			AttributeManager attrMgr) {
-		super(jobID, queueID, name, rtSystem, attrMgr);
-	}
-
-	@Override
-	protected void doBeforeExecution(IProgressMonitor monitor) throws CoreException {
-		// Nothing
-	}
-
-	@Override
-	protected void doExecutionFinished(IProgressMonitor monitor) throws CoreException {
-		// Nothing
-	}
-
-	@Override
-	protected void doExecutionStarted(IProgressMonitor monitor) throws CoreException {
-		// Nothing
-	}
-
-	@Override
-	protected void doExecutionCleanUp(IProgressMonitor monitor) {
-		// Nothing
-	}
-
-	/**
-	 * Only consumes application output.
-	 */
-	@Override
-	protected void doWaitExecution(IProgressMonitor monitor) throws CoreException {
-		BufferedReader inReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-		BufferedReader errReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
-
-		stdoutObserver = new TextInputStreamObserver(
-				inReader,
-				new ITextInputStreamListener() {
-					public void newLine(String line) {
-						System.out.println(line);
-					}
-
-					public void streamClosed() {
-						// Empty implementation.
-					}
-
-					public void streamError(Exception e) {
-						// Empty implementation.
-					}
-				}
-		);
-		stdoutObserver.start();
-
-		stderrObserver = new TextInputStreamObserver(
-				errReader,
-				new ITextInputStreamListener() {
-					public void newLine(String line) {
-						System.err.println(line);
-					}
-
-					public void streamClosed() {
-						// Empty implementation.
-					}
-
-					public void streamError(Exception e) {
-						// Empty implementation.
-					}
-				}
-		);
-		stderrObserver.start();
-
-		try {
-			stderrObserver.join();
-		} catch (InterruptedException e1) {
-			e1.printStackTrace();
-		}
-		try {
-			stdoutObserver.join();
-		} catch (InterruptedException e1) {
-			e1.printStackTrace();
-		}
-	}
-
-	@Override
-	protected void doTerminateJob() {
-		if (stderrObserver != null) {
-			stderrObserver.kill();
-			stderrObserver = null;
-		}
-		if (stdoutObserver != null) {
-			stdoutObserver.kill();
-			stdoutObserver = null;
-		}
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolBaseSubstitutionAttributes() throws CoreException {
-		return new IAttribute<?, ?, ?>[0];
-	}
-
-	@Override
-	protected HashMap<String, String> doRetrieveToolEnvironment()
-	throws CoreException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolCommandSubstitutionAttributes(
-			AttributeManager baseSubstitutionAttributeManager,
-			String directory, Map<String, String> environment) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	protected void doPrepareExecution(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/IToolRuntimeSystemJob.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/IToolRuntimeSystemJob.java
deleted file mode 100644
index a72415a..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/rtsystem/IToolRuntimeSystemJob.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.rtsystem;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public interface IToolRuntimeSystemJob {
-
-	String getJobID();
-
-	AbstractToolRuntimeSystem getRtSystem();
-
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/DebugUtil.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/DebugUtil.java
deleted file mode 100644
index f5656d9..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/DebugUtil.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.core.utils;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class DebugUtil {
-	private static final String COMMAND_TRACING_OPTION = "org.eclipse.ptp.rm.core/debug/command"; //$NON-NLS-1$
-	private static final String COMMAND_TRACING_OPTION_MORE = "org.eclipse.ptp.rm.core/debug/command/more"; //$NON-NLS-1$
-	private static final String JOB_TRACING_OPTION = "org.eclipse.ptp.rm.core/debug/job"; //$NON-NLS-1$
-	private static final String RTS_TRACING_OPTION = "org.eclipse.ptp.rm.core/debug/rts"; //$NON-NLS-1$
-	private static final String RTS_DISCOVER_TRACING_OPTION = "org.eclipse.ptp.rm.core/debug/rts/discover"; //$NON-NLS-1$
-	private static final String RTS_MONITOR_TRACING_OPTION = "org.eclipse.ptp.rm.core/debug/rts/monitor"; //$NON-NLS-1$
-	private static final String RTS_JOB_TRACING_OPTION = "org.eclipse.ptp.rm.core/debug/rts/job"; //$NON-NLS-1$
-	private static final String RTS_JOB_TRACING_OPTION_MORE = "org.eclipse.ptp.rm.core/debug/rts/job/more"; //$NON-NLS-1$
-	private static final String RTS_JOB_OUTPUT_TRACING_OPTION = "org.eclipse.ptp.rm.core/debug/rts/job/output"; //$NON-NLS-1$
-
-	public static boolean COMMAND_TRACING = false;
-	public static boolean COMMAND_TRACING_MORE = false;
-	public static boolean JOB_TRACING = false;
-	public static boolean RTS_TRACING = false;
-	public static boolean RTS_DISCOVER_TRACING = false;
-	public static boolean RTS_MONITOR_TRACING = false;
-	public static boolean RTS_JOB_TRACING = false;
-	public static boolean RTS_JOB_TRACING_MORE = false;
-	public static boolean RTS_JOB_OUTPUT_TRACING = false;
-
-	public static void configurePluginDebugOptions() {
-		if (ToolsRMPlugin.getDefault().isDebugging()) {
-			String option = Platform.getDebugOption(COMMAND_TRACING_OPTION);
-			if (option != null) {
-				COMMAND_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(COMMAND_TRACING_OPTION_MORE);
-			if (option != null) {
-				COMMAND_TRACING_MORE = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(JOB_TRACING_OPTION);
-			if (option != null) {
-				JOB_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(RTS_TRACING_OPTION);
-			if (option != null) {
-				RTS_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(RTS_DISCOVER_TRACING_OPTION);
-			if (option != null) {
-				RTS_DISCOVER_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(RTS_MONITOR_TRACING_OPTION);
-			if (option != null) {
-				RTS_MONITOR_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(RTS_JOB_TRACING_OPTION);
-			if (option != null) {
-				RTS_JOB_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(RTS_JOB_TRACING_OPTION_MORE);
-			if (option != null) {
-				RTS_JOB_TRACING_MORE = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(RTS_JOB_OUTPUT_TRACING_OPTION);
-			if (option != null) {
-				RTS_JOB_OUTPUT_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-		}
-	}
-
-	public static void trace(boolean option, String pattern, Object ... arguments) {
-		trace(option, MessageFormat.format(pattern, arguments));
-	}
-
-	public static void trace(boolean option, String message) {
-		if (option) {
-			System.out.println(message);
-			System.out.flush();
-		}
-	}
-
-	public static void error(boolean option, String pattern, Object ... arguments) {
-		error(option, MessageFormat.format(pattern, arguments));
-	}
-
-	public static void error(boolean option, String message) {
-		if (option) {
-			System.err.println(message);
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/IInputStreamListener.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/IInputStreamListener.java
deleted file mode 100644
index 83db760..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/IInputStreamListener.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.utils;
-
-
-/**
- * A listener that is called when some chunk of data is received from a stream.
- * A IStreamListener is an entity that can receive one chunk at time.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public interface IInputStreamListener {
-	void newBytes(byte bytes[], int length);
-	void streamClosed();
-	void streamError(Exception e);
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/ITextInputStreamListener.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/ITextInputStreamListener.java
deleted file mode 100644
index 040979c..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/ITextInputStreamListener.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.utils;
-
-/**
- * A listener that is called when an entire line is read from a stream.
- * A ILineStreamListener is an entity that can receive one line of text at time.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public interface ITextInputStreamListener {
-	void newLine(String line);
-	void streamClosed();
-	void streamError(Exception e);
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamListenerToOutputStream.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamListenerToOutputStream.java
deleted file mode 100644
index b991356..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamListenerToOutputStream.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.core.utils;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.core.PTPCorePlugin;
-
-/**
- * An {@link IInputStreamListener} that forwards output to a piped stream.
- *
- * @author Daniel Felix Ferber
- */
-public class InputStreamListenerToOutputStream implements IInputStreamListener {
-
-	boolean enabled = true;
-	OutputStream outputStream;
-
-	public InputStreamListenerToOutputStream(OutputStream outputStream) {
-		this.outputStream = outputStream;
-	}
-
-	public void newBytes(byte[] bytes, int length) {
-		try {
-			if (isEnabled()) {
-				outputStream.write(bytes, 0, length);
-			}
-		} catch (IOException e) {
-			disable();
-			log(e);
-		}
-	}
-
-	public void streamClosed() {
-		try {
-			disable();
-			outputStream.close();
-		} catch (IOException e) {
-			log(e);
-		}
-	}
-
-	public void streamError(Exception e) {
-		disable();
-		log(e);
-	}
-
-	protected void log(Exception e) {
-		PTPCorePlugin.log(e);
-	}
-
-	public synchronized void disable() {
-		enabled = false;
-	}
-
-	public synchronized boolean isEnabled() {
-		return enabled;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamObserver.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamObserver.java
deleted file mode 100644
index df71aa3..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/InputStreamObserver.java
+++ /dev/null

@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.utils;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.ptp.core.PTPCorePlugin;
-
-/**
- * A thread that forwards data from an inputstream to a {@link IInputStreamListener}.
- * <p>
- * This is a general facility that allows to forward data received from an
- * inputstream to a listener object.
- *
- * Copied and adapted from remote tools. Multiple listeners are now supported.
- *
- * @author Daniel Felix Ferber
- */
-public class InputStreamObserver extends Thread {
-	boolean closed = false;
-	/*
-	 * TODO: Open issues
-	 * - Does access to 'killed' attribute need synchronized access?
-	 * - On sockets, often one byte is read one after the other, instead of
-	 *   blocks of bytes. Maybe adding some delay might force to read
-	 *   more than one byte.
-	 */
-	/**
-	 * Stream that is been observed and read.
-	 */
-	private InputStream input;
-
-	/**
-	 * Signals that observer should stop running.
-	 */
-	private boolean killed;
-
-	/**
-	 * Listeners that are called when data is received.
-	 */
-	ListenerList listeners = new ListenerList();
-
-	private static final int BUFFER_SIZE = 100;
-
-	public InputStreamObserver(InputStream input) {
-		this.input = input;
-		setName(this.getClass().getName());
-	}
-
-	public InputStreamObserver(InputStream input, String name) {
-		this.input = input;
-		setName(name);
-	}
-
-	public InputStreamObserver(InputStream input, IInputStreamListener listener, String name) {
-		this.input = input;
-		this.listeners.add(listener);
-		setName(name);
-	}
-
-	public InputStreamObserver(InputStream input, IInputStreamListener listener) {
-		this.input = input;
-		this.listeners.add(listener);
-		setName(this.getClass().getName());
-	}
-
-	/**
-	 * Stop observing data and terminate thread.
-	 * Since InputStream cannot be interrupted, it will not interrupt immediately, but only when next input is received.
-	 */
-	public synchronized void kill() {
-		killed = true;
-		interrupt();
-	}
-
-	protected void log(String s) {
-		//		PTPCorePlugin.log(s);
-	}
-
-	protected void log(Throwable e) {
-		PTPCorePlugin.log(e);
-	}
-
-	void streamClosed() {
-		if (closed) return;
-		log("Stream closed"); //$NON-NLS-1$
-		closed = true;
-		for (Object listener : listeners.getListeners()) {
-			try {
-				((IInputStreamListener)listener).streamClosed();
-			} catch (Exception e) {
-				log(e);
-				listeners.remove(listener);
-			}
-		}
-	}
-
-	void streamError(Exception e) {
-		if (closed) return;
-		log("Recovered from exception: " + e.getMessage()); //$NON-NLS-1$
-		for (Object listener : listeners.getListeners()) {
-			try {
-				((IInputStreamListener)listener).streamError(e);
-			} catch (Exception ee) {
-				log(ee);
-				listeners.remove(listener);
-			}
-		}
-	}
-
-	void newBytes(byte buffer[], int length) {
-		if (closed) return;
-		log("Received: " + Integer.toString(length) + " bytes"); //$NON-NLS-1$ //$NON-NLS-2$
-		for (Object listener : listeners.getListeners()) {
-			try {
-				((IInputStreamListener)listener).newBytes(buffer, length);
-			} catch (Exception e) {
-				log(e);
-				listeners.remove(listener);
-			}
-		}
-	}
-
-	/**
-	 * Run stream observer.
-	 */
-	@Override
-	public void run() {
-		byte buffer[] = new byte[BUFFER_SIZE];
-		log("Started observing"); //$NON-NLS-1$
-		while (!killed) {
-			try {
-				int bytes = input.read(buffer);
-				if (bytes > 0) {
-					newBytes(buffer, bytes);
-				} else if (bytes == -1) {
-					streamClosed();
-					break;
-				}
-			} catch (IOException e) {
-				if (killed) {
-					streamClosed();
-					break;
-				} else if (e instanceof EOFException) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			} catch (NullPointerException e) {
-				/*
-				 * When the stream is closed, Java may raise a
-				 * NullPointerException. This case is handled like a
-				 * IOException, as above.
-				 */
-				if (killed) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			}
-		}
-		log("Finished observing"); //$NON-NLS-1$
-	}
-
-	public void addListener(IInputStreamListener listener) {
-		listeners.add(listener);
-	}
-
-	public void removeListener(IInputStreamListener listener) {
-		listeners.remove(listener);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/TextInputStreamObserver.java b/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/TextInputStreamObserver.java
deleted file mode 100644
index 95c11f8..0000000
--- a/rms/org.eclipse.ptp.rm.core/src/org/eclipse/ptp/rm/core/utils/TextInputStreamObserver.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.core.utils;
-
-import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.IOException;
-
-/**
- * Connects an BufferedReader a text listener.
- * <p>
- * This is a general facility that allows to forward data received from an
- * buffered reader to a listener object. Note that only one listener is
- * connected to the observer.
- *
- * Copied and adapted from remote tools.
- *
- * @author Daniel Felix Ferber
- * @since 1.0
- *
- */
-public class TextInputStreamObserver extends Thread {
-	/**
-	 * Stream that is been observed and read.
-	 */
-	private BufferedReader reader;
-
-	/**
-	 * Signals that bridge should stop.
-	 */
-	private boolean killed;
-
-	/**
-	 * Listener that is called when data is received.
-	 */
-	private ITextInputStreamListener listener;
-
-	public TextInputStreamObserver(BufferedReader input, ITextInputStreamListener listener,
-			String name) {
-		this.reader = input;
-		this.listener = listener;
-		setName(name);
-	}
-
-	public TextInputStreamObserver(BufferedReader input, ITextInputStreamListener listener) {
-		this.reader = input;
-		this.listener = listener;
-		setName(this.getClass().getName());
-	}
-
-	/**
-	 * Stop observing data and terminate thread.
-	 * Since InputStream cannot be interrupted, it will not interrupt immediately, but only when next input is received.
-	 */
-	public synchronized void kill() {
-		killed = true;
-		interrupt();
-	}
-
-	void log(String string) {
-		//		System.err.println(name + ": " + s);
-	}
-
-	void newLine(String line) {
-		log("Received: " + Integer.toString(line.length()) + " bytes"); //$NON-NLS-1$ //$NON-NLS-2$
-		listener.newLine(line);
-	}
-
-	void streamClosed() {
-		log("Stream closed"); //$NON-NLS-1$
-		listener.streamClosed();
-	}
-
-	void streamError(Exception e) {
-		log("Recovered from exception: " + e.getMessage()); //$NON-NLS-1$
-		listener.streamError(e);
-	}
-
-	@Override
-	public void run() {
-		String line;
-
-		while (!killed) {
-			try {
-				line = reader.readLine();
-				if (line == null) {
-					streamClosed();
-					return;
-				} else {
-					newLine(line);
-				}
-			} catch (IOException e) {
-				if (e instanceof EOFException) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			} catch (NullPointerException e) {
-				if (killed) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			}
-		}
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/.classpath b/rms/org.eclipse.ptp.rm.ibm.ll.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/.project b/rms/org.eclipse.ptp.rm.ibm.ll.core/.project
deleted file mode 100644
index aa212d4..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.ll.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.ll.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0799c5f..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.ll.core;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.ibm.ll.core.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.search,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.ptp.proxy.protocol,
- org.eclipse.ptp.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.remote.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.ibm.ll.core,
- org.eclipse.ptp.rm.ibm.ll.core.rmsystem

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.html b/rms/org.eclipse.ptp.rm.ibm.ll.core/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.ini b/rms/org.eclipse.ptp.rm.ibm.ll.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.ini
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.mappings b/rms/org.eclipse.ptp.rm.ibm.ll.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.properties b/rms/org.eclipse.ptp.rm.ibm.ll.core/about.properties
deleted file mode 100644
index d85d6da..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/about.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/build.properties b/rms/org.eclipse.ptp.rm.ibm.ll.core/build.properties
deleted file mode 100644
index a179b11..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/eclipse32.png b/rms/org.eclipse.ptp.rm.ibm.ll.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.properties
deleted file mode 100644
index 9016af6..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM LoadLeveler Support
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.xml b/rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.xml
deleted file mode 100644
index 6a923c3..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/plugin.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!-- 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                               -->
-<plugin>
-   <extension
-         point="org.eclipse.ptp.core.resourceManagers">
-      <resourceManager
-            class="org.eclipse.ptp.rm.ibm.ll.core.rmsystem.IBMLLResourceManagerFactory"
-            id="org.eclipse.ptp.ibmll.core.resourcemanager"/>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/Activator.java b/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/Activator.java
deleted file mode 100644
index efbf331..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/Activator.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.ibm.ll.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.ibm.ll.core";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/IBMLLAttributes.java b/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/IBMLLAttributes.java
deleted file mode 100644
index 418fbe3..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/IBMLLAttributes.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.core;
-
-
-
-/**
- * IBMLL specific attributes
- */
-public class IBMLLAttributes {
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManager.java b/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManager.java
deleted file mode 100644
index f809d2a..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManager.java
+++ /dev/null

@@ -1,171 +0,0 @@
- /*******************************************************************************
-  * Copyright (c) 2006 The Regents of the University of California. 
-  * This material was produced under U.S. Government contract W-7405-ENG-36 
-  * for Los Alamos National Laboratory, which is operated by the University 
-  * of California for the U.S. Department of Energy. The U.S. Government has 
-  * rights to use, reproduce, and distribute this software. NEITHER THE 
-  * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-  * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-  * to produce derivative works, such modified software should be clearly marked, 
-  * so as not to confuse it with the version available from LANL.
-  * 
-  * Additionally, this program and the accompanying materials 
-  * are made available under the terms of the Eclipse Public License v1.0
-  * which accompanies this distribution, and is available at
-  * http://www.eclipse.org/legal/epl-v10.html
-  * 
-  * LA-CC 04-115
-  *  
- * 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
-  *******************************************************************************/
- package org.eclipse.ptp.rm.ibm.ll.core.rmsystem;
-
- import java.util.Collection;
-
- import org.eclipse.ptp.core.attributes.AttributeManager;
- import org.eclipse.ptp.core.elementcontrols.IPJobControl;
- import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
- import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
- import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
- import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
- import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.rm.ibm.ll.core.rtsystem.IBMLLProxyRuntimeClient;
-import org.eclipse.ptp.rm.ibm.ll.core.rtsystem.IBMLLRuntimeSystem;
- import org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager;
- import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
- public class IBMLLResourceManager extends AbstractRuntimeResourceManager {
-
- 	private Integer IBMLLRMID;
- 	
- 	public IBMLLResourceManager(Integer id, IPUniverseControl universe, IResourceManagerConfiguration config) {
- 		super(id.toString(), universe, config);
- 		IBMLLRMID = id;
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterCloseConnection()
- 	 */
- 	protected void doAfterCloseConnection() {
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterOpenConnection()
- 	 */
- 	protected void doAfterOpenConnection() {
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeCloseConnection()
- 	 */
- 	protected void doBeforeCloseConnection() {
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeOpenConnection()
- 	 */
- 	protected void doBeforeOpenConnection() {
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateJob(org.eclipse.ptp.core.elementcontrols.IPQueueControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected IPJobControl doCreateJob(IPQueueControl queue, String jobId, AttributeManager attrs) {
- 		return newJob(queue, jobId, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateMachine(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected IPMachineControl doCreateMachine(String machineId, AttributeManager attrs) {
- 		return newMachine(machineId, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateNode(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected IPNodeControl doCreateNode(IPMachineControl machine, String nodeId, AttributeManager attrs) {
- 		return newNode(machine, nodeId, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateProcess(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected IPProcessControl doCreateProcess(IPJobControl job, String processId, AttributeManager attrs) {
- 		return newProcess(job, processId, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateQueue(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected IPQueueControl doCreateQueue(String queueId, AttributeManager attrs) {
- 		return newQueue(queueId, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateRuntimeSystem()
- 	 */
- 	@Override
- 	protected IRuntimeSystem doCreateRuntimeSystem() {
- 		IBMLLResourceManagerConfiguration config = (IBMLLResourceManagerConfiguration) getConfiguration();
- 		/* load up the control and monitoring systems for OMPI */
- 		IBMLLProxyRuntimeClient runtimeProxy = new IBMLLProxyRuntimeClient(config, IBMLLRMID);
- 		return new IBMLLRuntimeSystem(runtimeProxy, getAttributeDefinitionManager());
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateJobs(org.eclipse.ptp.core.elements.IPQueue, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected boolean doUpdateJobs(IPQueueControl queue, Collection<IPJobControl> jobs,
- 			AttributeManager attrs) {
- 		return updateJobs(queue, jobs, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateMachines(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected boolean doUpdateMachines(Collection<IPMachineControl> machines,
- 			AttributeManager attrs) {
- 		return updateMachines(machines, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateNodes(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected boolean doUpdateNodes(IPMachineControl machine, 
- 			Collection<IPNodeControl> nodes, AttributeManager attrs) {
- 		return updateNodes(machine, nodes, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateProcesses(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected boolean doUpdateProcesses(IPJobControl job,
- 			Collection<IPProcessControl> processes, AttributeManager attrs) {
- 		return updateProcesses(job, processes, attrs);
- 	}
-
- 	/* (non-Javadoc)
- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateQueues(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- 	 */
- 	@Override
- 	protected boolean doUpdateQueues(Collection<IPQueueControl> queues,
- 			AttributeManager attrs) {
- 		return updateQueues(queues, attrs);
- 	}
-
- }
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerConfiguration.java
deleted file mode 100644
index 967844e..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerConfiguration.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *
- * 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.rm.ibm.ll.core.rmsystem;
-
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-final public class IBMLLResourceManagerConfiguration extends AbstractRemoteResourceManagerConfiguration {
-
-	public static IResourceManagerConfiguration load(IBMLLResourceManagerFactory factory,
-			IMemento memento) {
-
-		RemoteConfig remoteConfig = loadRemote(factory, memento);
-		
-		IBMLLResourceManagerConfiguration config = 
-			new IBMLLResourceManagerConfiguration(factory, remoteConfig);
-
-		return config;
-	}
-	
-	public IBMLLResourceManagerConfiguration(IBMLLResourceManagerFactory factory) {
-		this(factory, new RemoteConfig());
-		setDefaultNameAndDesc();
-	}
-	
-	public IBMLLResourceManagerConfiguration(IBMLLResourceManagerFactory factory,
-			RemoteConfig remoteConfig) {
-		super(remoteConfig, factory);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#clone()
-	 */
-	@Override
-	public Object clone() {
-		CommonConfig commonConf = new CommonConfig(getName(),
-				getDescription(), getUniqueName());
-		RemoteConfig remoteConf = new RemoteConfig(commonConf,
-				getRemoteServicesId(), getConnectionName(),
-				getProxyServerPath(), getLocalAddress(),
-				getInvocationOptionsStr(), getOptions());
-		return new IBMLLResourceManagerConfiguration(
-				(IBMLLResourceManagerFactory) getFactory(), remoteConf);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setDefaultNameAndDesc()
-	 */
-	public void setDefaultNameAndDesc() {
-		String name = "IBMLL";
-		String conn = getConnectionName();
-		if (conn != null && !conn.equals("")) {
-			name += "@" + conn;
-		}
-		setName(name);
-		setDescription("IBMLL Resource Manager");
-	}
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerFactory.java
deleted file mode 100644
index aefb0ce..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rmsystem/IBMLLResourceManagerFactory.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.core.rmsystem;
-
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-public class IBMLLResourceManagerFactory extends AbstractResourceManagerFactory {
-
-	public IBMLLResourceManagerFactory() {
-		super("IBM LoadLeveler");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#copyConfiguration(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public IResourceManagerConfiguration copyConfiguration(
-			IResourceManagerConfiguration configuration) {
-		return (IResourceManagerConfiguration)configuration.clone();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#create(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public IResourceManagerControl create(IResourceManagerConfiguration confIn) {
-		IBMLLResourceManagerConfiguration configuration = (IBMLLResourceManagerConfiguration) confIn;
-		final PTPCorePlugin plugin = PTPCorePlugin.getDefault();
-		final IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
-		return new IBMLLResourceManager(universe.getNextResourceManagerId(), universe, configuration);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#createConfiguration()
-	 */
-	public IResourceManagerConfiguration createConfiguration() {
-		return new IBMLLResourceManagerConfiguration(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#loadConfiguration(org.eclipse.ui.IMemento)
-	 */
-	public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
-		return IBMLLResourceManagerConfiguration.load(this, memento);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLProxyRuntimeClient.java b/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLProxyRuntimeClient.java
deleted file mode 100644
index 3f99fd5..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLProxyRuntimeClient.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.ibm.ll.core.rtsystem;
-
-import org.eclipse.ptp.rm.ibm.ll.core.rmsystem.IBMLLResourceManagerConfiguration;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeClient;
-
-public class IBMLLProxyRuntimeClient extends AbstractRemoteProxyRuntimeClient {
-	public IBMLLProxyRuntimeClient(IBMLLResourceManagerConfiguration config, 
-			int baseModelId) {
-		super(config, baseModelId);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLRuntimeSystem.java b/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLRuntimeSystem.java
deleted file mode 100644
index 59e84d2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.core/src/org/eclipse/ptp/rm/ibm/ll/core/rtsystem/IBMLLRuntimeSystem.java
+++ /dev/null

@@ -1,35 +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
- *
- * 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
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.ibm.ll.core.rtsystem;
-
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeSystem;
-
-public class IBMLLRuntimeSystem extends AbstractRemoteProxyRuntimeSystem {
-	public IBMLLRuntimeSystem(IBMLLProxyRuntimeClient proxy, AttributeDefinitionManager manager) {
-		super(proxy, manager);
-	}
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/.classpath b/rms/org.eclipse.ptp.rm.ibm.ll.help/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/.project b/rms/org.eclipse.ptp.rm.ibm.ll.help/.project
deleted file mode 100755
index f8351ec..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.ll.help</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.ll.help/META-INF/MANIFEST.MF
deleted file mode 100755
index 7576451..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.ll.help;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.ibm.ll.help.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Eclipse-LazyStart: true

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/about.html b/rms/org.eclipse.ptp.rm.ibm.ll.help/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/build.properties b/rms/org.eclipse.ptp.rm.ibm.ll.help/build.properties
deleted file mode 100755
index e8361be..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/IBMLLMainHelp.html b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/IBMLLMainHelp.html
deleted file mode 100755
index 5757f8e..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/IBMLLMainHelp.html
+++ /dev/null

@@ -1,248 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<!-- Copyright (c) 2007 IBM Corporation.                                     -->
-<!-- All rights reserved. This program and the accompanying materials        -->
-<!-- are made available under the terms of the Eclipse Public License v1.0   -->
-<!-- which accompanies this distribution, and is available at                -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                               -->
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Running IBM LoadLeveler Batch Jobs</title>
-</head>
-
-<body>
-<h1>Running IBM LoadLeveler Batch Jobs</h1>
-<h2><A name=introduction></A>Introduction</h2>
-<p>This plugin allows you to run a parallel or serial application (job) using the Tivoli 
-Workload Scheduler LoadLeveler from within the PTP framework. In addition to running parallel 
-and serial jobs, you can monitor their status and control their execution from within PTP.</p>
-<h2><A name=requirements></A>Requirements</h2>
-<p>In addition to having Eclipse and PTP installed, you need to have the following software packages installed.</p>
-<ul>
-<li>IBM Tivoli Workload Scheduler LoadLeveler 3.4 or later</li>
-</ul>
-<p>See the following IBM Tivoli Workload Scheduler LoadLeveler V3.4 guides for specific LoadLeveler 
-installation and configuration requirements:</p>
-<ul>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am2in206.pdf">
-Tivoli Workload Scheduler LoadLeveler V3.4 Installation Guide
-</li>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am2ug305.pdf">
-Tivoli Workload Scheduler LoadLeveler V3.4 Using and Administering Guide
-</li>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am2mg105.pdf">
-Tivoli Workload Scheduler LoadLeveler V3.4 Diagnosis and Messages Guide
-</li>
-</ul>
-
-<h2><A name=starting></A>Getting Started</h2>
-<p>Define an appropriate project, either a C/C++ project using CDT or a FORTRAN project using Photran. You can define 
-either a standard make project or a managed make project.</p>
-<p>You should use the following compiler invocation commands
-to invoke the compiler if you want to build a parallel program to run with the LoadLeveler proxy, either in your makefile, or when specifying the compiler and linker in a managed make project.</p>
-<ul>
-<li>AIX</li>
-<ul>
-<li>mpcc_r for C programs</li>
-<li>mpCC_r for C++ programs</li>
-<li>mpxlf_r for FORTRAN programs</li>
-</ul>
-<li>Linux</li>
-<ul>
-<li>mpcc for C programs</li>
-<li>mpCC for C++ programs</li>
-<li>mpfort for FORTRAN programs</li>
-</ul>
-</ul> 
-<p>The following image shows how the compiler is specified for a managed make project. The correct linker should also
-be specified by clicking the settings for the linker.</p>
-<img src="images/project_create.jpg">
-<h2><A name=preferences></A>Setting Up Preferences</h2>
-<p>Once you have created your project, you should switch to the PTP runtime perspective, and set up the default 
-preferences for LoadLeveler and specify the required resource manager. This setup needs to only be done once.</p>
-<p>To setup the default preferences: Window->Preferences->PTP->Resource Managers->LoadLeveler. The IBMLL preferences 
-panel is displayed. Here, you specify the default path for a resource manager to be used for LoadLeveler.</p>
-<img src="images/ibmll_preferences.jpg">
-<P>In addition to the location of the proxy, you may specify parameters that control the execution of the 
-proxy and the front end gui.</p>
-<ul>
-<li><b>Library Proxy Provate Library Path</b> - If you have a non standard LoadLeveler installation then you can specify the 
-directory containing the LoadLeveler shared library libllapi.a (AIX) or libllapi.so (Linux).</li>
-<li><b>LoadLeveler Proxy Message Options</b> - can be used to turn on or off different catagories of messages generated by 
-the LoadLeveler proxy.</li>
-<li><b>LoadLeveler Proxy Debug Options</b> - If you are debugging the proxy, you can force the proxy into a spin loop 
-in the main entry point allowing a debugger to be attached. Once a debugger has been attached then breakpoints can 
-be assigned and the loop canceled by setting the "debug_loop" variable to 0 in the debugger and continuing execution.</li>
-<li><b>LoadLeveler Gui Message Options</b> - can be used to turn on or off different catagories of messages generated by 
-the LoadLeveler Resource Manager Launch.</li>
-<li><b>LoadLeveler Multicluster Options</b> - When running LoadLeveler version 3.4.1.2 or later then LoadLeveler will 
-inform the proxy of whether or not it is configured to run Multicluster. If running an earlier version of LoadLeveler 
-then you must tell the proxy by forcing the Local or Multicluster mode.</li>
-<li><b>LoadLeveler Job Command File Template Override</b> - When submitting jobs using the basic mode, parameters are 
-substituted into a template file before the job is submitted to LoadLeveler. You can specify your own template file 
-containing a mix of the keywords to be substituted and specific job command file parameters of your choice.</li>
-<li><b>LoadLeveler Basic Template Options</b> - You can instruct the proxy to write the template file it is using to /tmp each time
-the proxy is started and the main entry point is entered, or never write the template file for those cases where you are 
-using only advanced mode or are specifying your own template file to be used.</li>
-<li><b>LoadLeveler Proxy Polling Options</b> - In order to determine the nodes and jobs status the proxy must poll
-LoadLeveler. The polling options specify the number of seconds between querys. The Node polling allows a minimum and maximum poll.
-Each time the proxy polls LoadLeveler for node status and there have not been any changes since the last poll then the time 
-is incrementally increased until the maximum time is reached. This helps to minimize the impact on LoadLeveler of 
-continuously pooling for data.</li>
-</ul> 
-<h2><A name=createmanager></A>Creating a Resource Manager</h2>
-<p>Once you have set up preferences, you should create the resource manager for LoadLeveler: To do this, right-click in the
-resource managers view and selecting <b>Add Resource Manager</b> from the menu. A resource manager wizard will be 
-displayed. Select <b>IBMLL</b> from the list of resource manager types and click next. The next panel displayed configures
-the IBMLL resource manager. Select the Remote service provider and proxy server location from the dropdown lists. You can
-also create a new proxy server location by clicking the <b>New</b> button in this pane. Specify the path to the proxy 
-server executable, or just accept the value filled in as default from the preferences panel. Uncheck the <b>Launch server 
-manually</b> and click next again. On the final page of the resource configuration manager wizard, either accept the 
-default resource manager name, or uncheck the checkbox and enter a name and description for the resource manager. 
-Then click finish to create the resource manager entry.</p>
-<p>The image below shows the series of IBMLL proxy configuration panels of the resource manager wizard.</p>
-<p>Configure the resource manager.</P>
-<img src="images/ibmll_proxy_config_1.jpg">
-<p>Override preferences setings specifically for this occurance of the resource manager.</p>
-<img src="images/ibmll_proxy_config_2.jpg">
-<p>Name this occurance of the resource manager.</p>
-<img src="images/ibmll_proxy_config_3.jpg">
-<p>You may have as many resource managers defined as you require for your system configuration.</p>
-<h2><A name=startmanager></A>Starting a Resource Manager</h2>
-<p>Once you have defined a resource manager, you must start it before it can run a parallel application using that
-resource manager. To start a resource manager, right-click over the name of the resource manager in the resource manager 
-view then select <b>Start resource manager</b> from the popup menu. Once started, the icon for the selected resource 
-manager will turn green.</p> 
-<p>If necessary, you can stop a resource manager by right-clicking over its name in the resource manager and selecting 
-<b>Stop resource manager</b> from the popup menu. Normally, a resource manger will shutdown automatically when PTP is
-shutdown, and if it was running when PTP was shutdown, then it will automatically start when PTP is started again.</p>
-<img src="images/ibmll_start_resource_manager.jpg">
-<h2><A name=running></A>Running a Parallel Application</h2>
-<p>Once an application has been compiled, the first step in running the application is to be sure the resource manager for 
-LoadLeveler is running on a node in the LoadLeveler cluster where you intend to start the application. To do this, check the resource 
-manager's entry in the resource manager view. The icon for the resource manager should be green. If it is not green, then 
-right click over the resource manager's name and select <b>Start resource manager</b> from the popup menu to start the
-resource manager.</p>
-<p>Before running an application, it must have a launch configuration defined for it. A launch configuration contains 
-all of the settings required to run the application. The values entered in a launch configuration are saved so that the
-next time the application is run using the same launch configuration, those values do not need to be entered again.</p>
-<p>To create a launch configuration, click the <b>Run</b> menu in the Eclipse menubar and select <b>Open Run Dialog</b>. 
-Alternatively, click the dropdown next to the run icon in the Eclipse toolbar and select Open Run Dialog. 
-When the run dialog is displayed, right click over <b>Parallel Application</b> and click <b>New</b> from the menu. 
-This will create a new launch configuration. Set its name to the desired value. Select the <b>Main</b> tab and fill in
-the name of the project and the application program.</p>
-<img src="images/ibmll_run_application_1.jpg">
-<p>Make sure that the debugger tab has an appropriate debugger selected.
-Fill in the Arguments tab with any application program arguments. Fill in the Environment tab with any environment variable
-settings required by the application.</p>
-<p>The <b>Resources</b> tab is the tab where invocation options unique to LoadLeveler. When it is initially displayed,
-it will appear with the <b>advanced</b> option selected allowing specification of an existing complete LoadLeveler job command
-file (no substitutions permitted). This is intended for the experienced LoadLeveler user who has constructed his/her own 
-complex job command file to run parallel or serial jobs.</p>
-<img src="images/ibmll_run_advanced_application_2.jpg">
-<p>When <b>Run</b> is selected the job command file is passed to the LoadLeveler Resource manager proxy and is submitted 
-to LoadLeveler for execution. When the job starts it will appear in the PTP view.</p>
-<img src="images/ibmll_run_advanced_application_3.jpg">
-<p>If the <b>Basic</b> option is selected then you will be permitted to specify a template
-file for parameter value substitution. Multiple tabbed panels will be activated to allow specification 
-of a subset of LoadLeveler Job Command file parameters. If you need to specify a parameter not supported by the tabbed panels
- then you must override the template file being used and add the parameter to your own template.</p>
-<img src="images/ibmll_run_basic_application_2.jpg">
-<p>Example of the <b>Nodes/Network</b> Tab</p>
-<img src="images/ibmll_run_basic_application_3.jpg">
-<h2><A name=template></A>Template File For Basic Mode</h2>
-<p>Currently, only a subset of LoadLeveler Job Command File parameters can be specified on the Tabbed Panels. The following 
-is an example of the template file used by the LoadLeveler Resource manager and all of the possible parameters. Additionally,
-this template lists those parameters that are not supported by the Resource Manager. If 
-you want to use any parameters not supported by the tabbed panels then copy the template file to your own file 
-and customize your own template file.<br><br> 
-<small>
-#!/bin/sh<br>
-# @ account_no = &lt;&lt;&lt;LL_PTP_ACCOUNT_NO&gt;&gt;&gt;<br>
-# @ arguments = &lt;&lt;&lt;progArgs&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ bg_connection<br>
-#(NOT SUPPORTED)# @ bg_partition<br>
-#(NOT SUPPORTED)# @ bg_requirements<br>
-#(NOT SUPPORTED)# @ bg_route<br>
-#(NOT SUPPORTED)# @ bg_shape<br>
-#(NOT SUPPORTED)# @ bg_size<br>
-# @ blocking = &lt;&lt;&lt;LL_PTP_BLOCKING&gt;&gt;&gt;<br>
-# @ bulkxfer = &lt;&lt;&lt;LL_PTP_BULKXFER&gt;&gt;&gt;<br>
-# @ checkpoint = &lt;&lt;&lt;LL_PTP_CHECKPOINT&gt;&gt;&gt;<br>
-# @ ckpt_dir = &lt;&lt;&lt;LL_PTP_CKPT_DIR&gt;&gt;&gt;<br>
-# @ ckpt_execute_dir = &lt;&lt;&lt;LL_PTP_CKPT_EXECUTE_DIR&gt;&gt;&gt;<br>
-# @ ckpt_file = &lt;&lt;&lt;LL_PTP_CKPT_FILE&gt;&gt;&gt;<br>
-# @ ckpt_time_limit = &lt;&lt;&lt;LL_PTP_CKPT_TIME_LIMIT_HARD&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_CKPT_TIME_LIMIT_SOFT&gt;&gt;&gt;<br>
-# @ class = &lt;&lt;&lt;LL_PTP_CLASS&gt;&gt;&gt;<br>
-# @ cluster_input_file = &lt;&lt;&lt;LL_PTP_CLUSTER_INPUT_FILE_1&gt;&gt;&gt;<br>
-# @ cluster_input_file = &lt;&lt;&lt;LL_PTP_CLUSTER_INPUT_FILE_2&gt;&gt;&gt;<br>
-# @ cluster_input_file = &lt;&lt;&lt;LL_PTP_CLUSTER_INPUT_FILE_3&gt;&gt;&gt;<br>
-# @ cluster_list = &lt;&lt;&lt;LL_PTP_CLUSTER_LIST&gt;&gt;&gt;<br>
-# @ cluster_output_file = &lt;&lt;&lt;LL_PTP_CLUSTER_OUTPUT_FILE_1&gt;&gt;&gt;<br>
-# @ cluster_output_file = &lt;&lt;&lt;LL_PTP_CLUSTER_OUTPUT_FILE_2&gt;&gt;&gt;<br>
-# @ cluster_output_file = &lt;&lt;&lt;LL_PTP_CLUSTER_OUTPUT_FILE_3&gt;&gt;&gt;<br>
-# @ comment = &lt;&lt;&lt;LL_PTP_COMMENT&gt;&gt;&gt;<br>
-# @ core_limit = &lt;&lt;&lt;LL_PTP_CORE_LIMIT_HARD&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_CORE_LIMIT_SOFT&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ coschedule<br>
-# @ cpu_limit = &lt;&lt;&lt;LL_PTP_CPU_LIMIT_HARD&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_CPU_LIMIT_SOFT&gt;&gt;&gt;<br>
-# @ data_limit = &lt;&lt;&lt;LL_PTP_DATA_LIMIT_HARD&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_DATA_LIMIT_SOFT&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ dependency<br>
-# @ env_copy = &lt;&lt;&lt;LL_PTP_ENV_COPY&gt;&gt;&gt;<br>
-# @ environment = &lt;&lt;&lt;LL_PTP_ENVIRONMENT&gt;&gt;&gt;<br>
-# @ error = &lt;&lt;&lt;LL_PTP_ERROR&gt;&gt;&gt;<br>
-# @ executable = &lt;&lt;&lt;execPath&gt;&gt;&gt;/&lt;&lt;&lt;execName&gt;&gt;&gt;<br>
-# @ executable = &lt;&lt;&lt;LL_PTP_EXECUTABLE&gt;&gt;&gt;<br>
-# @ file_limit = &lt;&lt;&lt;LL_PTP_FILE_LIMIT_HARD&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_FILE_LIMIT_SOFT&gt;&gt;&gt;<br>
-# @ group = &lt;&lt;&lt;LL_PTP_GROUP&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ hold<br>
-# @ image_size = &lt;&lt;&lt;LL_PTP_IMAGE_SIZE&gt;&gt;&gt;<br>
-# @ initialdir = &lt;&lt;&lt;workingDir&gt;&gt;&gt;<br>
-# @ initialdir = &lt;&lt;&lt;LL_PTP_INITIALDIR&gt;&gt;&gt;<br>
-# @ input = &lt;&lt;&lt;LL_PTP_INPUT&gt;&gt;&gt;<br>
-# @ job_cpu_limit = &lt;&lt;&lt;LL_PTP_JOB_CPU_LIMIT_HARD&gt;&gt;&gt;, &lt;&lt;&lt;LL_PTP_JOB_CPU_LIMIT_SOFT&gt;&gt;&gt;<br>
-# @ job_name = &lt;&lt;&lt;LL_PTP_JOB_NAME&gt;&gt;&gt;<br>
-# @ job_type = &lt;&lt;&lt;LL_PTP_JOB_TYPE&gt;&gt;&gt;<br>
-# @ large_page = &lt;&lt;&lt;LL_PTP_LARGE_PAGE&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ max_processors<br>
-# @ mcm_affinity_options = &lt;&lt;&lt;LL_PTP_MCM_AFFINITY_OPTIONS&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ min_processors<br>
-# @ network.MPI = &lt;&lt;&lt;LL_PTP_NETWORK_MPI&gt;&gt;&gt;<br>
-# @ network.LAPI = &lt;&lt;&lt;LL_PTP_NETWORK_LAPI&gt;&gt;&gt;<br>
-# @ network.MPI_LAPI = &lt;&lt;&lt;LL_PTP_NETWORK_MPI_LAPI&gt;&gt;&gt;<br>
-# @ node = &lt;&lt;&lt;LL_PTP_NODE_MIN&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_NODE_MAX&gt;&gt;&gt;<br>
-# @ node_usage = &lt;&lt;&lt;LL_PTP_NODE_USAGE&gt;&gt;&gt;<br>
-# @ notification = &lt;&lt;&lt;LL_PTP_NOTIFICATION&gt;&gt;&gt;<br>
-# @ notify_user = &lt;&lt;&lt;LL_PTP_NOTIFY_USER&gt;&gt;&gt;<br>
-# @ output = &lt;&lt;&lt;LL_PTP_OUTPUT&gt;&gt;&gt;<br>
-# @ preferences = &lt;&lt;&lt;LL_PTP_PREFERENCES&gt;&gt;&gt;<br>
-# @ requirements = &lt;&lt;&lt;LL_PTP_REQUIREMENTS&gt;&gt;&gt;<br>
-# @ resources = &lt;&lt;&lt;LL_PTP_RESOURCES&gt;&gt;&gt;<br>
-# @ restart = &lt;&lt;&lt;LL_PTP_RESTART&gt;&gt;&gt;<br>
-# @ restart_from_ckpt = &lt;&lt;&lt;LL_PTP_RESTART_FROM_CKPT&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ restart_on_same_nodes<br>
-# @ rset = &lt;&lt;&lt;LL_PTP_RSET&gt;&gt;&gt;<br>
-# @ shell = &lt;&lt;&lt;LL_PTP_SHELL&gt;&gt;&gt;<br>
-# @ smt = &lt;&lt;&lt;LL_PTP_SMT&gt;&gt;&gt;<br>
-# @ stack_limit = &lt;&lt;&lt;LL_PTP_STACK_LIMIT_HARD&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_STACK_LIMIT_SOFT&gt;&gt;&gt;<br>
-# @ start_date = &lt;&lt;&lt;LL_PTP_START_DATE&gt;&gt;&gt;<br>
-#(NOT SUPPORTED)# @ step_name<br>
-# @ task_geometry = &lt;&lt;&lt;LL_PTP_TASK_GEOMETRY&gt;&gt;&gt;<br>
-# @ tasks_per_node = &lt;&lt;&lt;LL_PTP_TASKS_PER_NODE&gt;&gt;&gt;<br>
-# @ total_tasks = &lt;&lt;&lt;LL_PTP_TOTAL_TASKS&gt;&gt;&gt;<br>
-# @ user_priority = &lt;&lt;&lt;LL_PTP_USER_PRIORITY&gt;&gt;&gt;<br>
-# @ wall_clock_limit = &lt;&lt;&lt;LL_PTP_WALLCLOCK_HARD&gt;&gt;&gt;,&lt;&lt;&lt;LL_PTP_WALLCLOCK_SOFT&gt;&gt;&gt;<br>
-# @ queue<br>
-</small>
-</p>
-<h2><A name=restrictions></A>Restrictions</h2>
-<ul>
-<li>All pathnames specified in the Resources tab of the launch configuration must be absolute pathnames</li>
-</ul>
-</body>
-</html>
-

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_preferences.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_preferences.jpg
deleted file mode 100644
index 648f755..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_preferences.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_1.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_1.jpg
deleted file mode 100644
index 366d8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_1.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_2.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_2.jpg
deleted file mode 100644
index cc37e04..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_2.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_3.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_3.jpg
deleted file mode 100644
index d30a326..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_proxy_config_3.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_2.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_2.jpg
deleted file mode 100644
index 9aee569..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_2.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_3.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_3.jpg
deleted file mode 100644
index d907bef..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_advanced_application_3.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_application_1.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_application_1.jpg
deleted file mode 100644
index 4979127..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_application_1.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_2.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_2.jpg
deleted file mode 100644
index bf52e5e..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_2.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_3.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_3.jpg
deleted file mode 100644
index 2d9413f..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_run_basic_application_3.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_start_resource_manager.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_start_resource_manager.jpg
deleted file mode 100644
index d94ced0..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/ibmll_start_resource_manager.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/project_create.jpg b/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/project_create.jpg
deleted file mode 100644
index f813296..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/html/images/project_create.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.properties
deleted file mode 100644
index 5977a1e..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM LoadLeveler User Guide
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.xml b/rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.xml
deleted file mode 100755
index 5c3bd1b..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/plugin.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!-- Copyright (c) 2007 IBM Corporation.                                     -->
-<!-- All rights reserved. This program and the accompanying materials        -->
-<!-- are made available under the terms of the Eclipse Public License v1.0   -->
-<!-- which accompanies this distribution, and is available at                -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                               -->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/src/org/eclipse/ptp/rm/ibm/ll/help/Activator.java b/rms/org.eclipse.ptp.rm.ibm.ll.help/src/org/eclipse/ptp/rm/ibm/ll/help/Activator.java
deleted file mode 100755
index d60b2ac..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/src/org/eclipse/ptp/rm/ibm/ll/help/Activator.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2007 IBM Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.eclipse.ptp.rm.ibm.ll.help;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.ibm.ll.help";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.help/toc.xml b/rms/org.eclipse.ptp.rm.ibm.ll.help/toc.xml
deleted file mode 100755
index 4558687..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.help/toc.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright (c) 2007 IBM Corporation.                                     -->
-<!-- All rights reserved. This program and the accompanying materials        -->
-<!-- are made available under the terms of the Eclipse Public License v1.0   -->
-<!-- which accompanies this distribution, and is available at                -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                               -->
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Running IBM LoadLeveler Batch Jobs">
-	<topic label="Introduction"  href="html/IBMLLMainHelp.html#introduction"> 
-	</topic>
-	<topic label="Requirements" href="html/IBMLLMainHelp.html#requirements"></topic>
-	<topic label="Getting Started" href="html/IBMLLMainHelp.html#starting"></topic>
-	<topic label="Setting Up Preferences" href="html/IBMLLMainHelp.html#preferences"></topic>
-	<topic label="Creating a Resource Manager" href="html/IBMLLMainHelp.html#createmanager"></topic>
-	<topic label="Starting a Resource Manager" href="html/IBMLLMainHelp.html#startmanager"></topic>
-	<topic label="Running an application" href="html/IBMLLMainHelp.html#running"></topic>
-	<topic label="Template File For Basic Mode" href="html/IBMLLMainHelp.html#template"></topic>
-	<topic label="Restrictions" href="html/IBMLLMainHelp.html#restrictions"></topic>
-</toc>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cdtproject b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cdtproject
deleted file mode 100644
index 6516b85..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cdtproject
+++ /dev/null

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.ELF"/>
-<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.MachO">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-<extension point="org.eclipse.cdt.core.CIndexer" id="org.eclipse.cdt.core.domsourceindexer"/>
-<data>
-<item id="scannerConfiguration">
-<autodiscovery enabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile" problemReportingEnabled="true"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction useDefault="true" command="make" arguments="-f ${project_name}_scd.mk"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction useDefault="true" command="gcc" arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</item>
-<item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</item>
-<item id="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="all" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>all</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-<target name="clean" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>clean</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-<target name="install" targetID="org.eclipse.cdt.make.MakeTargetBuilder" path="">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-</buildTargets>
-</item>
-</data>
-</cdtproject>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cproject b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cproject
deleted file mode 100644
index 9670cd7..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cproject
+++ /dev/null

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="converted.config.1309096210">
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="all" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>all</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-<target name="clean" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>clean</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-<target name="install" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments/>
-<buildTarget>install</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-</buildTargets>
-</storageModule>
-<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1309096210" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-</extensions>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-</storageModule>
-</cproject>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cvsignore b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cvsignore
deleted file mode 100644
index 6e05ba5..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.cvsignore
+++ /dev/null

@@ -1,8 +0,0 @@
-.settings
-autom4te.cache
-stamp-h1
-Makefile
-config.status
-config.h
-.deps
-a.out.dSYM

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.project b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.project
deleted file mode 100644
index 59bf7de..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/.project
+++ /dev/null

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.ll.proxy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.makeBuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.core.errorOutputParser</key>
-					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.environment</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.inc</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.clean</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.command</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.full</key>
-					<value>clean all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.auto</key>
-					<value>all</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.make.core.makeNature</nature>
-		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/AUTHORS b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/AUTHORS
deleted file mode 100644
index 73f3225..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/AUTHORS
+++ /dev/null

@@ -1 +0,0 @@
-Dave Wootton <dwootton@us.ibm.com>
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/COPYING b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/COPYING
deleted file mode 100644
index 8b7e105..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/COPYING
+++ /dev/null

@@ -1,16 +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
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/ChangeLog b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/ChangeLog
+++ /dev/null


diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/INSTALL b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/INSTALL
+++ /dev/null

@@ -1 +0,0 @@
-See README for build/install instructions.

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index f506672..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.ll.proxy
-Bundle-Version: 2.1.1.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ptp.proxy,
- org.eclipse.ptp.utils

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.am b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.am
deleted file mode 100644
index c029345..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.am
+++ /dev/null

@@ -1,14 +0,0 @@
-# Copyright (c) 2007 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-
-bin_PROGRAMS =			ptp_ibmll_proxy
-
-ptp_ibmll_proxy_SOURCES =		src/ptp_ibmll_proxy.c
-ptp_ibmll_proxy_CFLAGS =		-g -I/opt/ibmll/LoadL/full/include/ -I/usr/lpp/LoadL/full/include/ -I$(PROXY)/include -I$(UTILS)/include $(AM_CFLAGS) 
-
-ptp_ibmll_proxy_LDFLAGS = -g -ldl
-ptp_ibmll_proxy_LDADD =		-lpthread 

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.in b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.in
deleted file mode 100644
index a793961..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/Makefile.in
+++ /dev/null

@@ -1,567 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Copyright (c) 2007 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-bin_PROGRAMS = ptp_ibmll_proxy$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_ptp_ibmll_proxy_OBJECTS =  \
-	ptp_ibmll_proxy-ptp_ibmll_proxy.$(OBJEXT)
-ptp_ibmll_proxy_OBJECTS = $(am_ptp_ibmll_proxy_OBJECTS)
-ptp_ibmll_proxy_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(ptp_ibmll_proxy_SOURCES)
-DIST_SOURCES = $(ptp_ibmll_proxy_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-ptp_ibmll_proxy_SOURCES = src/ptp_ibmll_proxy.c
-ptp_ibmll_proxy_CFLAGS = -g -I/opt/ibmll/LoadL/full/include/ -I/usr/lpp/LoadL/full/include/ -I$(PROXY)/include -I$(UTILS)/include $(AM_CFLAGS) 
-ptp_ibmll_proxy_LDFLAGS = -g -ldl
-ptp_ibmll_proxy_LDADD = -lpthread 
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-ptp_ibmll_proxy$(EXEEXT): $(ptp_ibmll_proxy_OBJECTS) $(ptp_ibmll_proxy_DEPENDENCIES) 
-	@rm -f ptp_ibmll_proxy$(EXEEXT)
-	$(LINK) $(ptp_ibmll_proxy_LDFLAGS) $(ptp_ibmll_proxy_OBJECTS) $(ptp_ibmll_proxy_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-ptp_ibmll_proxy-ptp_ibmll_proxy.o: src/ptp_ibmll_proxy.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmll_proxy_CFLAGS) $(CFLAGS) -MT ptp_ibmll_proxy-ptp_ibmll_proxy.o -MD -MP -MF "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Tpo" -c -o ptp_ibmll_proxy-ptp_ibmll_proxy.o `test -f 'src/ptp_ibmll_proxy.c' || echo '$(srcdir)/'`src/ptp_ibmll_proxy.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Tpo" "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Po"; else rm -f "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_ibmll_proxy.c' object='ptp_ibmll_proxy-ptp_ibmll_proxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmll_proxy_CFLAGS) $(CFLAGS) -c -o ptp_ibmll_proxy-ptp_ibmll_proxy.o `test -f 'src/ptp_ibmll_proxy.c' || echo '$(srcdir)/'`src/ptp_ibmll_proxy.c
-
-ptp_ibmll_proxy-ptp_ibmll_proxy.obj: src/ptp_ibmll_proxy.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmll_proxy_CFLAGS) $(CFLAGS) -MT ptp_ibmll_proxy-ptp_ibmll_proxy.obj -MD -MP -MF "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Tpo" -c -o ptp_ibmll_proxy-ptp_ibmll_proxy.obj `if test -f 'src/ptp_ibmll_proxy.c'; then $(CYGPATH_W) 'src/ptp_ibmll_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_ibmll_proxy.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Tpo" "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Po"; else rm -f "$(DEPDIR)/ptp_ibmll_proxy-ptp_ibmll_proxy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_ibmll_proxy.c' object='ptp_ibmll_proxy-ptp_ibmll_proxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmll_proxy_CFLAGS) $(CFLAGS) -c -o ptp_ibmll_proxy-ptp_ibmll_proxy.obj `if test -f 'src/ptp_ibmll_proxy.c'; then $(CYGPATH_W) 'src/ptp_ibmll_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_ibmll_proxy.c'; fi`
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/NEWS b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/NEWS
+++ /dev/null


diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/README b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/README
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/README
+++ /dev/null


diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/about.html b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/aclocal.m4 b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/aclocal.m4
deleted file mode 100644
index fd273ba..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/aclocal.m4
+++ /dev/null

@@ -1,878 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/build.properties b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/build.properties
deleted file mode 100644
index c766786..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/build.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-bin.includes = AUTHORS,\
-               COPYING,\
-               ChangeLog,\
-               INSTALL,\
-               Makefile.am,\
-               Makefile.in,\
-               NEWS,\
-               README,\
-               aclocal.m4,\
-               compile,\
-               config.guess,\
-               config.h.in,\
-               config.status,\
-               config.sub,\
-               configure,\
-               configure.in,\
-               depcomp,\
-               install-sh,\
-               missing,\
-               src/,\
-               META-INF/,\
-               plugin.properties,\
-               about.html

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/compile b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/compile
deleted file mode 100755
index a81e000..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/compile
+++ /dev/null

@@ -1,136 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-	*.o | *.obj)
-	  ;;
-	*)
-	  args="$args -o $ofile"
-	  ofile=
-	  ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.guess b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.guess
deleted file mode 100755
index f4f7772..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.guess
+++ /dev/null

@@ -1,1321 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-04'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
-		fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-	CPU=mipsel 
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif 
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-		echo i386-${UNAME_MACHINE}-nto-qnx
-	else
-		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	fi
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.h.in b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.h.in
deleted file mode 100644
index 7af61c8..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.h.in
+++ /dev/null

@@ -1,64 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `proxysvr' library (-lproxysvr). */
-#undef HAVE_LIBPROXYSVR
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#undef HAVE_LIBUTILS
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.sub b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.sub
deleted file mode 100755
index f365797..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/config.sub
+++ /dev/null

@@ -1,1443 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-07'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 | mipsisa64 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-        sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure
deleted file mode 100755
index 3bb48be..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure
+++ /dev/null

@@ -1,6009 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for org.eclipse.ptp.ibmll 2.1.1.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='org.eclipse.ptp.ibmll'
-PACKAGE_TARNAME='org-eclipse-ptp-ibmll'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='org.eclipse.ptp.ibmll 2.1.1'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="src/ptp_ibmll_proxy.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-CPP
-GREP
-EGREP
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures org.eclipse.ptp.ibmll 2.1.1 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/org-eclipse-ptp-ibmll]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of org.eclipse.ptp.ibmll 2.1.1:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-ll-header=DIR    local LoadLeveler header directory [none]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-org.eclipse.ptp.ibmll configure 2.1.1
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by org.eclipse.ptp.ibmll $as_me 2.1.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-am__api_version="1.9"
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='org-eclipse-ptp-ibmll'
- VERSION='2.1.1'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		{ { echo "$as_me:$LINENO: error: utils directory not found" >&5
-echo "$as_me: error: utils directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		{ { echo "$as_me:$LINENO: error: proxy directory not found" >&5
-echo "$as_me: error: proxy directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-LIBS="$LIBS -L$UTILS -L$PROXY"
-
-
-# Check whether --with-ll-header was given.
-if test "${with_ll_header+set}" = set; then
-  withval=$with_ll_header; llinclude=-I$withval
-else
-  llinclude=""
-fi
-
-lldir="$llinclude -I/opt/ibmll/LoadL/full/include -I/usr/lpp/LoadL/full/include"
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-        CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt  -I$UTILS/include -I$PROXY/include $lldir"
-else
-        CFLAGS="$CFLAGS -Wall -I$UTILS/include -I$PROXY/include $lldir"
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-
-
-{ echo "$as_me:$LINENO: checking for bitset_new in -lutils" >&5
-echo $ECHO_N "checking for bitset_new in -lutils... $ECHO_C" >&6; }
-if test "${ac_cv_lib_utils_bitset_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutils  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bitset_new ();
-int
-main ()
-{
-return bitset_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_utils_bitset_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_utils_bitset_new=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_utils_bitset_new" >&5
-echo "${ECHO_T}$ac_cv_lib_utils_bitset_new" >&6; }
-if test $ac_cv_lib_utils_bitset_new = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTILS 1
-_ACEOF
-
-  LIBS="-lutils $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for proxy_svr_init in -lproxysvr" >&5
-echo $ECHO_N "checking for proxy_svr_init in -lproxysvr... $ECHO_C" >&6; }
-if test "${ac_cv_lib_proxysvr_proxy_svr_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lproxysvr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char proxy_svr_init ();
-int
-main ()
-{
-return proxy_svr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_proxysvr_proxy_svr_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_proxysvr_proxy_svr_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_proxysvr_proxy_svr_init" >&5
-echo "${ECHO_T}$ac_cv_lib_proxysvr_proxy_svr_init" >&6; }
-if test $ac_cv_lib_proxysvr_proxy_svr_init = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPROXYSVR 1
-_ACEOF
-
-  LIBS="-lproxysvr $LIBS"
-
-fi
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-if test "${ac_cv_header_llapi_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for llapi.h" >&5
-echo $ECHO_N "checking for llapi.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_llapi_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_llapi_h" >&5
-echo "${ECHO_T}$ac_cv_header_llapi_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking llapi.h usability" >&5
-echo $ECHO_N "checking llapi.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <llapi.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking llapi.h presence" >&5
-echo $ECHO_N "checking llapi.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <llapi.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: llapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: llapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: llapi.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: llapi.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: llapi.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: llapi.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: llapi.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: llapi.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: llapi.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: llapi.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: llapi.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: llapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: llapi.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: llapi.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: llapi.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: llapi.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for llapi.h" >&5
-echo $ECHO_N "checking for llapi.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_llapi_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_llapi_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_llapi_h" >&5
-echo "${ECHO_T}$ac_cv_header_llapi_h" >&6; }
-
-fi
-if test $ac_cv_header_llapi_h = yes; then
-  :
-else
-  { echo "$as_me:$LINENO: LoadLeveler not installed, skipping..." >&5
-echo "$as_me: LoadLeveler not installed, skipping..." >&6;}
-	 { (exit 1); exit 1; }
-
-fi
-
-
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by org.eclipse.ptp.ibmll $as_me 2.1.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-org.eclipse.ptp.ibmll config.status 2.1.1
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure.in b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure.in
deleted file mode 100644
index c321926..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/configure.in
+++ /dev/null

@@ -1,80 +0,0 @@
-dnl Copyright (c) 2006, 2007 IBM Corporation, and others.
-dnl All rights reserved. This program and the accompanying materials
-dnl are made available under the terms of the Eclipse Public License v1.0
-dnl which accompanies this distribution, and is available at
-dnl http://www.eclipse.org/legal/epl-v10.html
-dnl
-dnl
-
-AC_PREREQ(2.50)
-
-AC_INIT(org.eclipse.ptp.ibmll, 2.1.1)
-AC_CONFIG_SRCDIR(src/ptp_ibmll_proxy.c)
-AC_CONFIG_HEADERS(config.h)
-
-AM_INIT_AUTOMAKE
-
-AC_CANONICAL_BUILD
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		AC_MSG_ERROR([utils directory not found])
-	fi
-fi
-
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		AC_MSG_ERROR([proxy directory not found])
-	fi
-fi
-
-LIBS="$LIBS -L$UTILS -L$PROXY"
-
-AC_ARG_WITH(ll-header, AC_HELP_STRING([--with-ll-header=DIR], 
-			[local LoadLeveler header directory @<:@none@:>@]),
-			llinclude=-I$withval, llinclude="")
-lldir="$llinclude -I/opt/ibmll/LoadL/full/include -I/usr/lpp/LoadL/full/include"
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-        CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt  -I$UTILS/include -I$PROXY/include $lldir"
-else
-        CFLAGS="$CFLAGS -Wall -I$UTILS/include -I$PROXY/include $lldir"
-fi
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-dnl
-dnl Check for libraries.
-dnl
-AC_CHECK_LIB(utils, bitset_new)
-AC_CHECK_LIB(proxysvr, proxy_svr_init)
-
-dnl
-dnl Check for header files.
-dnl
-
-AC_HEADER_STDC
-AC_CHECK_HEADER([llapi.h], [], 
-	[AC_MSG_NOTICE([LoadLeveler not installed, skipping...])
-	 AS_EXIT
-	])
-
-dnl
-dnl Check for types
-dnl
-AC_TYPE_SIGNAL
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/depcomp b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/depcomp
deleted file mode 100755
index 11e2d3b..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/depcomp
+++ /dev/null

@@ -1,522 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2004-05-31.23
-
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit 0
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/install-sh b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/install-sh
deleted file mode 100755
index ebc6691..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/install-sh
+++ /dev/null

@@ -1,250 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/missing b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/missing
deleted file mode 100755
index e7ef83a..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/missing
+++ /dev/null

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/plugin.properties
deleted file mode 100644
index 8225e61..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM LoadLeveler Proxy Agent
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/src/ptp_ibmll_proxy.c b/rms/org.eclipse.ptp.rm.ibm.ll.proxy/src/ptp_ibmll_proxy.c
deleted file mode 100644
index 08ffdf1..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.proxy/src/ptp_ibmll_proxy.c
+++ /dev/null

@@ -1,3628 +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
- * 
- * 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
- * 
- ******************************************************************************/
-
-/******************************************************************************
- *  NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
- *  This code best developed and formatted on Linux using indent as follows: 
- * indent -kr -bap -bli2 -br -brs -cbi2 -ci2 -cli2 -d2 -di2 -fc1 -i2 -l1255 
- *         -lc255 -nbad -nbfde -nbfda -nbc -nsob -nut -sc -nfca ptp_ibmll_proxy.c
- * Note that the formatter still screws up a few comments but they are easily    
- * fixed and the code is so much more readable. It is appreciated if you stay                                  
- * with this formatting if you change the code in the repository. Thanks.                                      
- ******************************************************************************/
-#include <pthread.h>
-#include "config.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#ifdef __linux__
-#include <getopt.h>
-#endif
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
-#include <proxy_cmd.h>
-#include <proxy.h>
-#include <proxy_tcp.h>
-#include <proxy_event.h>
-#include <proxy_cmd.h>
-#include <proxy_msg.h>
-#include <handler.h>
-#include <signal.h>
-#include <list.h>
-#include <hash.h>
-#include <limits.h>
-#include <dlfcn.h>
-#include <llapi.h>
-/*
- * RTEV_ERROR codes are used internally in the ibmll specific plugin
- */
-#define RTEV_ERROR_LL_INIT	    	  RTEV_OFFSET + 1000
-#define RTEV_ERROR_LL_FINALIZE      RTEV_OFFSET + 1001
-#define RTEV_ERROR_LL_SUBMIT_JOB   RTEV_OFFSET + 1002
-#define RTEV_ERROR_CANCEL_JOB			RTEV_OFFSET + 1003
-#define DEFAULT_PROXY "tcp"
-#define DEFAULT_QUEUE_NAME "default"
-#define ATTRIB_NODE_NAME_ID 1
-#define ATTRIB_QUEUE_NAME_ID 1
-/*
- * The following groups of definitions belong in a global PTP header,
- * not in individual proxies
- */
-/*
- * RTEV codes must EXACTLY
- * match org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEvent
- */
-#define RTEV_OFFSET			200
-static RETSIGTYPE ptp_signal_handler(int sig);
-static int server(char *name, char *host, int port, char *libpath);
-static int command_initialize(int gui_transmission_id, int nargs, char *args[]);
-static int command_define_model(int gui_transmission_id, int nargs, char *args[]);
-static int command_submit_job(int gui_transmission_id, int nargs, char *args[]);
-static int command_cancel_job(int gui_transmission_id, int nargs, char *args[]);
-static int command_terminate(int gui_transmission_id, int nargs, char *args[]);
-static int command_start_events(int gui_transmission_id, int nargs, char *args[]);
-static int command_halt_events(int gui_transmission_id, int nargs, char *args[]);
-static void print_message_args(int nargs, char *args[]);
-static void print_message(int type, const char *, ...); /* INFO, TRACE & WARNING to stdout, ERROR & FATAL to stderr */
-#define INFO_MESSAGE 0
-#define TRACE_MESSAGE 1
-#define WARNING_MESSAGE 2
-#define ERROR_MESSAGE 3
-#define FATAL_MESSAGE 4
-#define ARGS_MESSAGE 5
-static int state_trace = 0;     /* 0=message off, 1=message on */
-static int state_info = 0;      /* 0=message off, 1=message on */
-static int state_warning = 0;   /* 0=message off, 1=message on */
-static int state_error = 0;     /* 0=message off, 1=message on */
-static int state_fatal = 0;     /* 0=message off, 1=message on */
-static int state_args = 0;      /* 0=message off, 1=message on */
-static int state_events_active = 0;     /* events are off initialize */
-static int state_debug_loop = 0;        /* debug loop for debugger attach is off by default */
-static int state_shutdown_requested = 0;        /* shutdown not in progress */
-static int state_message_timedate = 1;  /* want time date stamp in messages */
-static int state_message_threadid = 1;  /* want thread id in messages */
-static int state_template = 1;  /* always write default template at startup */
-static char *static_template_prefix = "/tmp/PTP_IBMLL_TEMPLATE_";
-static char *userid = NULL;
-static char static_template_name[256];  /* template path and name */
-static char *static_template_override = "";
-static int max_node_sleep_seconds = 300;
-static int min_node_sleep_seconds = 30;
-static int job_sleep_seconds = 30;
-static char hostname[256];
-static int debug_level = 0; /* 0 is off */
-
-struct ClusterObject {          /* a LoadLeveler cluster (same as a ptp machine) */
-  int proxy_generated_cluster_id;
-  char *cluster_name;
-  Hash *node_hash;
-  int proxy_generated_queue_id;
-  int cluster_state;
-  int queue_state;
-  int cluster_is_local;
-  int node_cleanup_required;
-  int job_cleanup_required;
-};
-typedef struct ClusterObject ClusterObject;
-
-struct NodeObject {             /* a LoadLeveler or ptp node in a cluster (machine) */
-  int proxy_generated_node_id;
-  int node_found;               /* node found indicator */
-  int node_state;
-  char *node_name;              /* use the name as the key to the node hash table in the cluster object */
-};
-typedef struct NodeObject NodeObject;
-NodeObject *get_node_in_hash(Hash * node_hash, char *node_name);
-void add_node_to_hash(Hash * node_hash, NodeObject * node_object);
-void delete_node_from_list(List * node_list, NodeObject * node_object);
-
-struct JobObject {              /* a LoadLeveler or ptp job in a cluster */
-  int proxy_generated_job_id;
-  char *gui_assigned_job_id;
-  int job_found;                /* job found indicator */
-  int job_state;                /* 1=submitted, 2=in queue */
-  time_t job_submit_time;       /* time when submitted */
-  List *task_list;              /* processes running for this job */
-  LL_STEP_ID ll_step_id;
-  char *cluster_name;
-};
-typedef struct JobObject JobObject;
-JobObject *get_job_in_list(List * job_list, LL_STEP_ID ll_step_ID);
-JobObject *get_job_in_list_from_id(List * job_list, int job_id);
-void add_job_to_list(List * job_list, JobObject * job_object);
-void delete_job_from_list(List * job_list, JobObject * job_object);
-
-struct TaskObject {             /* a LoadLeveler or ptp task for job */
-  int proxy_generated_task_id;
-  int task_found;               /* job found indicator */
-  int ll_task_id;
-  int task_state;
-  char *node_name;
-  char *node_address;
-};
-typedef struct TaskObject TaskObject;
-TaskObject *get_task_in_list(List * task_list, char *task_instance_machine_name, int ll_task_id);
-void add_task_to_list(List * task_list, TaskObject * task_object);
-void delete_task_from_list(List * task_list, TaskObject * task_object);
-
-static void sendErrorEvent(int gui_transmission_id, int type, char *msg);
-static void sendJobSubmissionErrorEvent(int gui_transmission_id, char *subid, char *msgtext);
-static void sendOkEvent(int gui_transmission_id);
-static void sendShutdownEvent(int gui_transmission_id);
-static int sendAttrDefIntEvent(int gui_transmission_id, char *id, char *shortname, char *description, int show, int default_value, int llimit, int ulimit);
-static int sendAttrDefStringEvent(int gui_transmission_id, char *id, char *shortname, char *description, int show, char *value);
-static int sendMachineAddEvent(int gui_transmission_id, ClusterObject * cluster_object);
-static int sendQueueAddEvent(int gui_transmission_id, ClusterObject * cluster_object);
-static int sendNodeAddEvent(int gui_transmission_id, ClusterObject * cluster_object, NodeObject * node_object);
-static int sendNodeChangeEvent(int gui_transmission_id, ClusterObject * cluster_object, NodeObject * node_object);
-static int sendNodeRemoveEvent(int gui_transmission_id, ClusterObject * cluster_object, NodeObject * node_object);
-static int sendJobAddEvent(int gui_transmission_id, ClusterObject * cluster_object, JobObject * job_object);
-static int sendJobChangeEvent(int gui_transmission_id, JobObject * job_object);
-static int sendJobRemoveEvent(int gui_transmission_id, JobObject * job_object);
-static int sendTaskAddEvent(int gui_transmission_id, ClusterObject * cluster_object, JobObject * job_object, TaskObject * task_object);
-static int sendTaskChangeEvent(int gui_transmission_id, JobObject * job_object, TaskObject * task_object);
-static int sendTaskRemoveEvent(int gui_transmission_id, JobObject * job_object, TaskObject * task_object);
-
-static int generate_id(void);
-static void enqueue_event_to_proxy_server(proxy_msg * event);
-int main(int argc, char *argv[]);
-extern char **environ;
-void refresh_cluster_list();    /* refresh static list of clusters */
-static List *cluster_list = NULL;       /* list of clusters if multicluster (we'll set to single local if none) */
-static List *job_list = NULL;   /* job list for all clusters (since jobs can move) */
-int get_multicluster_status();  /* are we running multicluster or single cluster ? */
-static int multicluster_status = -1;    /* init to not determined yet  - we want 0-local 1-multicluster */
-static pthread_t thread_map_table[256] = { 0, 0, 0, 0 };        /* to simplify messages */
-static void malloc_check(void *p, const char *function, int line);
-int is_substitution_required(char *line);
-
-int register_thread(pthread_t handle);
-int find_thread(pthread_t handle);
-
-#define MY_STATE_UNKNOWN 0
-#define MY_STATE_UP 1
-#define MY_STATE_DOWN 2
-#define MY_STATE_STOPPED 3
-#define MY_STATE_RUNNING 4
-#define MY_STATE_IDLE 5
-#define MY_STATE_TERMINATED 6
-
-static int ptp_signal_exit;
-static int ptp_signal_thread;
-static List *events = NULL;
-static RETSIGTYPE(*saved_signals[NSIG]) (int);
-static proxy_svr *ll_proxy = NULL;
-static pthread_t monitor_LoadLeveler_jobs_thread = 0;
-static pthread_attr_t monitor_LoadLeveler_jobs_thread_attr;
-static void *monitor_LoadLeveler_jobs(void *args);
-static pthread_t monitor_LoadLeveler_nodes_thread = 0;
-static pthread_attr_t monitor_LoadLeveler_nodes_thread_attr;
-static void *monitor_LoadLeveler_nodes(void *args);
-static pthread_mutex_t access_LoadLeveler_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t proxy_svr_queue_msg_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t print_message_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t master_lock = PTHREAD_MUTEX_INITIALIZER;
-#ifdef __linux__
-static struct option longopts[] = {
-  {"proxy", required_argument, NULL, 'P'},
-  {"port", required_argument, NULL, 'p'},
-  {"host", required_argument, NULL, 'h'},
-  {"lib_override", optional_argument, NULL, 'l'},
-  {"debug_loop", optional_argument, NULL, 'd'},
-  {"debug", optional_argument, NULL, 'g'},
-  {"trace_messages", optional_argument, NULL, 't'},
-  {"info_messages", optional_argument, NULL, 'i'},
-  {"warning_messages", optional_argument, NULL, 'w'},
-  {"error_messages", optional_argument, NULL, 'e'},
-  {"fatal_messages", optional_argument, NULL, 'f'},
-  {"args_messages", optional_argument, NULL, 'a'},
-  {"multicluster", optional_argument, NULL, 'm'},
-  {"template_override", optional_argument, NULL, 'o'},
-  {"template_write", optional_argument, NULL, 'r'},
-  {"node_polling_min", optional_argument, NULL, 'x'},
-  {"node_polling_max", optional_argument, NULL, 'y'},
-  {"job_polling", optional_argument, NULL, 'z'},
-  {NULL, 0, NULL, 0}
-};
-#endif
-static proxy_svr_helper_funcs helper_funcs = {
-  NULL,
-  NULL
-};
-static proxy_cmd ibmll_cmds[] = {
-  command_terminate,
-  command_initialize,
-  command_define_model,
-  command_start_events,
-  command_halt_events,
-  command_submit_job,
-  command_cancel_job
-};
-static proxy_commands command_tab = {
-  0, sizeof(ibmll_cmds) / sizeof(proxy_cmd), ibmll_cmds
-};
-
-static char * ibmll_libpath_name = NULL;
-static void * ibmll_libpath_handle = 0;
-static int ibmll_proxy_base_id = 0;
-static char ibmll_proxy_base_id_string[256];
-static int ibmll_last_id = 0;
-static int start_events_gui_transmission_id = 0;
-
-/**********************************************************************
- * LoadLeveler symbols from dynamic load of libllapi.a or libllapi.so *
- **********************************************************************/
-
-static struct {
-  LL_element *(*ll_query) (enum QueryType);
-  int (*ll_set_request) (LL_element *, enum QueryFlags, char **, enum DataFilter);
-  LL_element *(*ll_get_objs) (LL_element *, enum LL_Daemon, char *, int *, int *);
-  int (*ll_get_data) (LL_element *, enum LLAPI_Specification, void *);
-  int (*ll_deallocate) (LL_element *);
-  LL_element *(*ll_next_obj) (LL_element *);
-  int (*ll_free_objs) (LL_element *);
-  int (*ll_cluster) (int, LL_element **, LL_cluster_param *);
-  int (*ll_submit_job) (char *job_cmd_file, char *monitor_program, char *monitor_arg, LL_job * job_info, int job_version);
-  int (*ll_terminate_job) (LL_terminate_job_info * ptr);
-  void (*ll_free_job_info) (LL_job * job_info, int job_version);
-  char *(*ll_error) (LL_element ** errObj, int print_to);
-} LL_SYMS;
-
-int my_ll_cluster(int, LL_element **, LL_cluster_param *);
-int my_ll_get_data(LL_element *, enum LLAPI_Specification, void *);
-LL_element *my_ll_query(enum QueryType);
-int my_ll_free_objs(LL_element *);
-int my_ll_deallocate(LL_element *);
-LL_element *my_ll_next_obj(LL_element *);
-LL_element *my_ll_get_objs(LL_element *, enum LL_Daemon, char *, int *, int *);
-int my_ll_set_request(LL_element *, enum QueryFlags, char **, enum DataFilter);
-int my_ll_submit_job(int gui_transmission_id, char *job_sub_id, char *command_file, char *job_env_vars[][3]);
-int my_ll_terminate_job(int gui_transmission_id, JobObject * job_object);
-void my_ll_free_job_info(LL_job * job_info);
-
-void print_proxy_message(proxy_msg * msg);
-
-  /*-----------------------------------------------------------------------* 
-   * attributes to send to front end in response to the                    * 
-   * command_define_model call to initialize the tabbed panels.            * 
-   * This code is set up to send up blanks as defaults and not return any  *
-   * field with blank back from gui so it will be stripped from job        *
-   * command file.                                                         * 
-   *-----------------------------------------------------------------------*/
-
-  /*-----------------------------------------------------------------------* 
-   * Strings                                                               * 
-   *-----------------------------------------------------------------------*/
-typedef struct {
-  char *id;                     /* Attribute identifier                 */
-  char *short_name;             /* Description used as label in GUI     */
-  char *long_name;              /* Text used for tooltip text in GUI   */
-  char *default_value;          /* Attribute's default value            */
-} string_launch_attr;
-
-static string_launch_attr string_launch_attrs[] = {
-  {"LL_PTP_JOB_COMMAND_FILE", "IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_LABEL", "IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_TOOLTIP", ""},
-  {"LL_PTP_JOB_COMMAND_FILE_TEMPLATE", "IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_TEMPLATE_LABEL", "IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_TEMPLATE_TOOLTIP", "/tmp/PTP_IBMLL_TEMPLATE_userid"},
-  {"LL_PTP_CLASS", "IBMLLLaunch.LL_PTP_CLASS_LABEL", "IBMLLLaunch.LL_PTP_CLASS_TOOLTIP", "No_Class"},
-  {"LL_PTP_COMMENT", "IBMLLLaunch.LL_PTP_COMMENT_LABEL", "IBMLLLaunch.LL_PTP_COMMENT_TOOLTIP", ""},
-  {"LL_PTP_ERROR", "IBMLLLaunch.LL_PTP_ERROR_LABEL", "IBMLLLaunch.LL_PTP_ERROR_TOOLTIP", "/dev/null"},
-  {"LL_PTP_EXECUTABLE", "IBMLLLaunch.LL_PTP_EXECUTABLE_LABEL", "IBMLLLaunch.LL_PTP_EXECUTABLE_TOOLTIP", ""},
-  {"LL_PTP_ENVIRONMENT", "IBMLLLaunch.LL_PTP_ENVIRONMENT_LABEL", "IBMLLLaunch.LL_PTP_ENVIRONMENT_TOOLTIP", "COPY_ALL"},
-  {"LL_PTP_INPUT", "IBMLLLaunch.LL_PTP_INPUT_LABEL", "IBMLLLaunch.LL_PTP_INPUT_TOOLTIP", "/dev/null"},
-  {"LL_PTP_OUTPUT", "IBMLLLaunch.LL_PTP_OUTPUT_LABEL", "IBMLLLaunch.LL_PTP_OUTPUT_TOOLTIP", "/dev/null"},
-  {"LL_PTP_INITIALDIR", "IBMLLLaunch.LL_PTP_INITIALDIR_LABEL", "IBMLLLaunch.LL_PTP_INITIALDIR_TOOLTIP", ""},
-  {"LL_PTP_JOB_NAME", "IBMLLLaunch.LL_PTP_JOB_NAME_LABEL", "IBMLLLaunch.LL_PTP_JOB_NAME_TOOLTIP", ""},
-  {"LL_PTP_NETWORK_MPI", "IBMLLLaunch.LL_PTP_NETWORK_MPI_LABEL", "IBMLLLaunch.LL_PTP_NETWORK_MPI_TOOLTIP", ""},
-  {"LL_PTP_NETWORK_LAPI", "IBMLLLaunch.LL_PTP_NETWORK_LAPI_LABEL", "IBMLLLaunch.LL_PTP_NETWORK_LAPI_TOOLTIP", ""},
-  {"LL_PTP_NETWORK_MPI_LAPI", "IBMLLLaunch.LL_PTP_NETWORK_MPI_LAPI_LABEL", "IBMLLLaunch.LL_PTP_NETWORK_MPI_LAPI_TOOLTIP", ""},
-  {"LL_PTP_REQUIREMENTS", "IBMLLLaunch.LL_PTP_REQUIREMENTS_LABEL", "IBMLLLaunch.LL_PTP_REQUIREMENTS_TOOLTIP", ""},
-  {"LL_PTP_RESOURCES", "IBMLLLaunch.LL_PTP_RESOURCES_LABEL", "IBMLLLaunch.LL_PTP_RESOURCES_TOOLTIP", ""},
-  {"LL_PTP_SHELL", "IBMLLLaunch.LL_PTP_SHELL_LABEL", "IBMLLLaunch.LL_PTP_SHELL_TOOLTIP", ""},
-  {"LL_PTP_TASK_GEOMETRY", "IBMLLLaunch.LL_PTP_TASK_GEOMETRY_LABEL", "IBMLLLaunch.LL_PTP_TASK_GEOMETRY_TOOLTIP", ""},
-  {"LL_PTP_NODE_MIN", "IBMLLLaunch.LL_PTP_NODE_MIN_LABEL", "IBMLLLaunch.LL_PTP_NODE_MIN_TOOLTIP", ""},
-  {"LL_PTP_NODE_MAX", "IBMLLLaunch.LL_PTP_NODE_MAX_LABEL", "IBMLLLaunch.LL_PTP_NODE_MAX_TOOLTIP", ""},
-  {"LL_PTP_BLOCKING", "IBMLLLaunch.LL_PTP_BLOCKING_LABEL", "IBMLLLaunch.LL_PTP_BLOCKING_TOOLTIP", ""},
-  {"LL_PTP_TOTAL_TASKS", "IBMLLLaunch.LL_PTP_TOTAL_TASKS_LABEL", "IBMLLLaunch.LL_PTP_TOTAL_TASKS_TOOLTIP", ""},
-  {"LL_PTP_WALLCLOCK_HARD", "IBMLLLaunch.LL_PTP_WALLCLOCK_HARD_LABEL", "IBMLLLaunch.LL_PTP_WALLCLOCK_HARD_TOOLTIP", "00:00:00"},
-  {"LL_PTP_WALLCLOCK_SOFT", "IBMLLLaunch.LL_PTP_WALLCLOCK_SOFT_LABEL", "IBMLLLaunch.LL_PTP_WALLCLOCK_SOFT_TOOLTIP", "00:00:00"}
-
-};
-
-  /*-----------------------------------------------------------------------* 
-   * Enums                                                                 * 
-   *-----------------------------------------------------------------------*/
-typedef struct {
-  char *id;                     /* Attribute identifier                 */
-  char *short_name;             /* Description used as label in GUI */
-  char *long_name;              /* Text used for tooltip text in GUI */
-  char *default_value;          /* Attribute's default value            */
-  char *enums;                  /* Enumeration values ',' delimited     */
-} enum_launch_attr;
-
-static enum_launch_attr enum_attrs[] = {
-  {"LL_PTP_JOB_TYPE", "IBMLLLaunch.LL_PTP_JOB_TYPE_LABEL", "IBMLLLaunch.LL_PTP_JOB_TYPE_TOOLTIP", "Parallel", "Serial|Parallel|MPICH"},
-  {"LL_PTP_BULK_XFER", "IBMLLLaunch.LL_PTP_BULK_XFER_LABEL", "IBMLLLaunch.LL_PTP_BULK_XFER_TOOLTIP", "(LoadLeveler default)", "(LoadLeveler default)|YES|NO"},
-  {"LL_PTP_LARGE_PAGE", "IBMLLLaunch.LL_PTP_LARGE_PAGE_LABEL", "IBMLLLaunch.LL_PTP_LARGE_PAGE_TOOLTIP", "(LoadLeveler default)", "(LoadLeveler default)|Y|M|N"},
-  {"LL_PTP_SUBMIT_MODE", "IBMLLLaunch.LL_PTP_SUBMIT_MODE_LABEL", "IBMLLLaunch.LL_PTP_SUBMIT_MODE_TOOLTIP", "Advanced", "Advanced|Basic"}
-};
-
-  /*-----------------------------------------------------------------------* 
-   * Ints                                                                  * 
-   *-----------------------------------------------------------------------*/
-typedef struct {
-  char *id;                     /* Attribute identifier                 */
-  char *short_name;             /* Description used as label in GUI */
-  char *long_name;              /* Text used for tooltip text in GUI */
-  int default_value;            /* Attribute's default value            */
-  int llimit;                   /* Attribute's lower limit (min)        */
-  int ulimit;                   /* Attribute's upper limit (max)        */
-} int_launch_attr;
-
-int_launch_attr int_attrs[] = {
-  {"LL_PTP_TASKS_PER_NODE", "IBMLLLaunch.LL_PTP_TASKS_PER_NODE_LABEL", "IBMLLLaunch.LL_PTP_TASKS_PER_NODE_TOOLTIP", 0,0,INT_MAX}
-};
-
-  /*-----------------------------------------------------------------------* 
-   * Longs                                                                 * 
-   *-----------------------------------------------------------------------*/
-typedef struct {
-  char *id;                     /* Attribute identifier                 */
-  char *short_name;             /* Description used as label in GUI */
-  char *long_name;              /* Text used for tooltip text in GUI */
-  long long default_value;      /* Attribute's default value            */
-  long long llimit;             /* Attribute's lower limit (min)        */
-  long long ulimit;             /* Attribute's upper limit (max)        */
-} long_int_launch_attr;
-
-long_int_launch_attr long_int_attrs[] = {
-  {"PlaceHolder-long", "???", "Place holder:", 0, 0, 0x7fffffffffffffffLL}
-};
-
-/************************************************************************* 
- * Job Command File Template                                             * 
- *************************************************************************/
-static char *job_command_file_template[] = {
-  "#!/bin/sh",
-  "# @ account_no = <<<LL_PTP_ACCOUNT_NO>>>",
-  "# @ arguments = <<<progArgs>>>",
-  "#(NOT SUPPORTED)# @ bg_connection",
-  "#(NOT SUPPORTED)# @ bg_partition",
-  "#(NOT SUPPORTED)# @ bg_requirements",
-  "#(NOT SUPPORTED)# @ bg_route",
-  "#(NOT SUPPORTED)# @ bg_shape",
-  "#(NOT SUPPORTED)# @ bg_size",
-  "# @ blocking = <<<LL_PTP_BLOCKING>>>",
-  "# @ bulkxfer = <<<LL_PTP_BULKXFER>>>",
-  "# @ checkpoint = <<<LL_PTP_CHECKPOINT>>>",
-  "# @ ckpt_dir = <<<LL_PTP_CKPT_DIR>>>",
-  "# @ ckpt_execute_dir = <<<LL_PTP_CKPT_EXECUTE_DIR>>>",
-  "# @ ckpt_file = <<<LL_PTP_CKPT_FILE>>>",
-  "# @ ckpt_time_limit = <<<LL_PTP_CKPT_TIME_LIMIT_HARD>>>,<<<LL_PTP_CKPT_TIME_LIMIT_SOFT>>>",
-  "# @ class = <<<LL_PTP_CLASS>>>",
-  "# @ cluster_input_file = <<<LL_PTP_CLUSTER_INPUT_FILE_1>>>",
-  "# @ cluster_input_file = <<<LL_PTP_CLUSTER_INPUT_FILE_2>>>",
-  "# @ cluster_input_file = <<<LL_PTP_CLUSTER_INPUT_FILE_3>>>",
-  "# @ cluster_list = <<<LL_PTP_CLUSTER_LIST>>>",
-  "# @ cluster_output_file = <<<LL_PTP_CLUSTER_OUTPUT_FILE_1>>>",
-  "# @ cluster_output_file = <<<LL_PTP_CLUSTER_OUTPUT_FILE_2>>>",
-  "# @ cluster_output_file = <<<LL_PTP_CLUSTER_OUTPUT_FILE_3>>>",
-  "# @ comment = <<<LL_PTP_COMMENT>>>",
-  "# @ core_limit = <<<LL_PTP_CORE_LIMIT_HARD>>>,<<<LL_PTP_CORE_LIMIT_SOFT>>>",
-  "#(NOT SUPPORTED)# @ coschedule",
-  "# @ cpu_limit = <<<LL_PTP_CPU_LIMIT_HARD>>>,<<<LL_PTP_CPU_LIMIT_SOFT>>>",
-  "# @ data_limit = <<<LL_PTP_DATA_LIMIT_HARD>>>,<<<LL_PTP_DATA_LIMIT_SOFT>>>",
-  "#(NOT SUPPORTED)# @ dependency",
-  "# @ env_copy = <<<LL_PTP_ENV_COPY>>>",
-  "# @ environment = <<<LL_PTP_ENVIRONMENT>>>",
-  "# @ error = <<<LL_PTP_ERROR>>>",
-  "# @ executable = <<<execPath>>>/<<<execName>>>",
-  "# @ executable = <<<LL_PTP_EXECUTABLE>>>",
-  "# @ file_limit = <<<LL_PTP_FILE_LIMIT_HARD>>>,<<<LL_PTP_FILE_LIMIT_SOFT>>>",
-  "# @ group = <<<LL_PTP_GROUP>>>",
-  "#(NOT SUPPORTED)# @ hold",
-  "# @ image_size = <<<LL_PTP_IMAGE_SIZE>>>",
-  "# @ initialdir = <<<workingDir>>>",
-  "# @ initialdir = <<<LL_PTP_INITIALDIR>>>",
-  "# @ input = <<<LL_PTP_INPUT>>>",
-  "# @ job_cpu_limit = <<<LL_PTP_JOB_CPU_LIMIT_HARD>>>, <<<LL_PTP_JOB_CPU_LIMIT_SOFT>>>",
-  "# @ job_name = <<<LL_PTP_JOB_NAME>>>",
-  "# @ job_type = <<<LL_PTP_JOB_TYPE>>>",
-  "# @ large_page = <<<LL_PTP_LARGE_PAGE>>>",
-  "#(NOT SUPPORTED)# @ max_processors",
-  "# @ mcm_affinity_options = <<<LL_PTP_MCM_AFFINITY_OPTIONS>>>",
-  "#(NOT SUPPORTED)# @ min_processors",
-  "# @ network.MPI = <<<LL_PTP_NETWORK_MPI>>>",
-  "# @ network.LAPI = <<<LL_PTP_NETWORK_LAPI>>>",
-  "# @ network.MPI_LAPI = <<<LL_PTP_NETWORK_MPI_LAPI>>>",
-  "# @ node = <<<LL_PTP_NODE_MIN>>>,<<<LL_PTP_NODE_MAX>>>",
-  "# @ node_usage = <<<LL_PTP_NODE_USAGE>>>",
-  "# @ notification = <<<LL_PTP_NOTIFICATION>>>",
-  "# @ notify_user = <<<LL_PTP_NOTIFY_USER>>>",
-  "# @ output = <<<LL_PTP_OUTPUT>>>",
-  "# @ preferences = <<<LL_PTP_PREFERENCES>>>",
-  "# @ requirements = <<<LL_PTP_REQUIREMENTS>>>",
-  "# @ resources = <<<LL_PTP_RESOURCES>>>",
-  "# @ restart = <<<LL_PTP_RESTART>>>",
-  "# @ restart_from_ckpt = <<<LL_PTP_RESTART_FROM_CKPT>>>",
-  "#(NOT SUPPORTED)# @ restart_on_same_nodes",
-  "# @ rset = <<<LL_PTP_RSET>>>",
-  "# @ shell = <<<LL_PTP_SHELL>>>",
-  "# @ smt = <<<LL_PTP_SMT>>>",
-  "# @ stack_limit = <<<LL_PTP_STACK_LIMIT_HARD>>>,<<<LL_PTP_STACK_LIMIT_SOFT>>>",
-  "# @ start_date = <<<LL_PTP_START_DATE>>>",
-  "#(NOT SUPPORTED)# @ step_name",
-  "# @ task_geometry = <<<LL_PTP_TASK_GEOMETRY>>>",
-  "# @ tasks_per_node = <<<LL_PTP_TASKS_PER_NODE>>>",
-  "# @ total_tasks = <<<LL_PTP_TOTAL_TASKS>>>",
-  "# @ user_priority = <<<LL_PTP_USER_PRIORITY>>>",
-  "# @ wall_clock_limit = <<<LL_PTP_WALLCLOCK_HARD>>>,<<<LL_PTP_WALLCLOCK_SOFT>>>",
-  "# @ queue"
-};
-
-/************************************************************************* 
- * Proxy command handler - command_initialize                            * 
- *                                                                       * 
- * Dynamically load LoadLeveler lib (libllapi.a for AIX or               * 
- * libllapi.so for Linux) then resolve the functions we need to          * 
- * call to talk to LoadLeveler (submit, cancel or query jobs,            * 
- * query machines, ...)                                                  * 
- *                                                                       * 
- * See llapi.h for interfaces to LoadLeveler.                            * 
- *************************************************************************/
-int command_initialize(int gui_transmission_id, int nargs, char *args[])
-{
-  int i;
-  int dlopen_mode = 0;
-  int my_errno = 0;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message_args(nargs, args);
-
-  for (i = 0; i < nargs; i++) {
-  	if (proxy_test_attribute(BASE_ID_ATTR, args[i])) {
-  		ibmll_proxy_base_id = proxy_get_attribute_value_int(args[i]);      /* the base id established by gui front end */
-  	}
-  }  
-  sprintf(ibmll_proxy_base_id_string, "%d", ibmll_proxy_base_id);
-
-  memset(&LL_SYMS, '\0', sizeof(LL_SYMS));      /* zero the LoadLeveler dlsym symbol table */
-  print_message(INFO_MESSAGE, "dlopen LoadLeveler shared library %s.\n", ibmll_libpath_name);
-  dlopen_mode = RTLD_LOCAL | RTLD_NOW;
-#ifdef _AIX
-  dlopen_mode = dlopen_mode | RTLD_MEMBER;
-#endif
-  ibmll_libpath_handle = dlopen(ibmll_libpath_name, dlopen_mode);
-  my_errno = errno;
-  if (ibmll_libpath_handle == NULL) {
-    print_message(ERROR_MESSAGE, "dlopen of %s failed with errno=%d.\n", ibmll_libpath_name, my_errno);
-    sendErrorEvent(gui_transmission_id, RTEV_ERROR_LL_INIT, "dlopen failed for LoadLeveler shared library");
-    return PROXY_RES_ERR;
-  } else {
-    print_message(INFO_MESSAGE, "dlopen %s successful.\n", ibmll_libpath_name);
-  }
-
-  print_message(INFO_MESSAGE, "Locating LoadLeveler functions via dlsym.\n");
-  *(void **) (&(LL_SYMS.ll_query)) = dlsym(ibmll_libpath_handle, "ll_query");
-  *(void **) (&LL_SYMS.ll_set_request) = dlsym(ibmll_libpath_handle, "ll_set_request");
-  *(void **) (&LL_SYMS.ll_get_objs) = dlsym(ibmll_libpath_handle, "ll_get_objs");
-  *(void **) (&LL_SYMS.ll_get_data) = dlsym(ibmll_libpath_handle, "ll_get_data");
-  *(void **) (&LL_SYMS.ll_free_objs) = dlsym(ibmll_libpath_handle, "ll_free_objs");
-  *(void **) (&LL_SYMS.ll_deallocate) = dlsym(ibmll_libpath_handle, "ll_deallocate");
-  *(void **) (&LL_SYMS.ll_next_obj) = dlsym(ibmll_libpath_handle, "ll_next_obj");
-  *(void **) (&LL_SYMS.ll_cluster) = dlsym(ibmll_libpath_handle, "ll_cluster");
-  *(void **) (&LL_SYMS.ll_submit_job) = dlsym(ibmll_libpath_handle, "llsubmit");
-  *(void **) (&LL_SYMS.ll_terminate_job) = dlsym(ibmll_libpath_handle, "ll_terminate_job");
-  *(void **) (&LL_SYMS.ll_free_job_info) = dlsym(ibmll_libpath_handle, "llfree_job_info");
-  *(void **) (&LL_SYMS.ll_error) = dlsym(ibmll_libpath_handle, "ll_error");
-  if ((LL_SYMS.ll_query == NULL) || (LL_SYMS.ll_set_request == NULL)
-      || (LL_SYMS.ll_get_objs == NULL) || (LL_SYMS.ll_get_data == NULL)
-      || (LL_SYMS.ll_free_objs == NULL)
-      || (LL_SYMS.ll_deallocate == NULL)
-      || (LL_SYMS.ll_cluster == NULL)
-      || (LL_SYMS.ll_next_obj == NULL)
-      || (LL_SYMS.ll_free_job_info == NULL)
-      || (LL_SYMS.ll_terminate_job == NULL)
-      || (LL_SYMS.ll_error == NULL)
-      || (LL_SYMS.ll_submit_job == NULL)) {
-    print_message(ERROR_MESSAGE, "One or more LoadLeveler symbols could not be located in %s.\n", ibmll_libpath_name);
-    sendErrorEvent(gui_transmission_id, RTEV_ERROR_LL_INIT, "LoadLeveler symbols not located");
-    return PROXY_RES_ERR;
-  } else {
-    print_message(INFO_MESSAGE, "Successfully located all of the required LoadLeveler functions via dlsym.\n");
-  }
-
-  sendOkEvent(gui_transmission_id);
-
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return PROXY_RES_OK;
-}
-
-/************************************************************************* 
- * Proxy command handler - command_define_model                          * 
- *                                                                       * 
- * Send attributes to front end describing the launch                    * 
- * configuration (labels, default values, etc).                          * 
- *************************************************************************/
-int command_define_model(int gui_transmission_id, int nargs, char *args[])
-{
-  int i = 0;
-  char proxy_generated_attribute_string[256];
-  proxy_msg *msg;
-  char *cp;
-  char *end_cp;
-  char *cp_save;
-  int n;
-
-/* 
- * Send the attribute definitions, launch attribute definitions,
- * and element definitions known by this proxy to the GUI.
- */
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message_args(nargs, args);
-
-    /*-----------------------------------------------------------------------* 
-     * send strings                                                          * 
-     *-----------------------------------------------------------------------*/
-  for (i = 0; i < (sizeof(string_launch_attrs) / sizeof(string_launch_attr)); i++) {
-    if (strcmp("LL_PTP_JOB_COMMAND_FILE_TEMPLATE", string_launch_attrs[i].id) == 0) {
-      if (strlen(static_template_override) > 0) {
-        sendAttrDefStringEvent(gui_transmission_id, string_launch_attrs[i].id, string_launch_attrs[i].short_name, string_launch_attrs[i].long_name, 0, static_template_override);
-      } else {
-        sendAttrDefStringEvent(gui_transmission_id, string_launch_attrs[i].id, string_launch_attrs[i].short_name, string_launch_attrs[i].long_name, 0, static_template_name);
-      }
-    } else {
-      sendAttrDefStringEvent(gui_transmission_id, string_launch_attrs[i].id, string_launch_attrs[i].short_name, string_launch_attrs[i].long_name, 0, string_launch_attrs[i].default_value);
-    }
-  }
-
-    /*-----------------------------------------------------------------------* 
-     * send ints                                                             * 
-     *-----------------------------------------------------------------------*/
-  for (i = 0; i < (sizeof(int_attrs) / sizeof(int_launch_attr)); i++) {
-    sendAttrDefIntEvent(gui_transmission_id, int_attrs[i].id, int_attrs[i].short_name, int_attrs[i].long_name, 0, int_attrs[i].default_value, int_attrs[i].llimit, int_attrs[i].ulimit);
-  }
-
-    /*-----------------------------------------------------------------------* 
-     * send longs                                                            * 
-     *-----------------------------------------------------------------------*/
-  for (i = 0; i < (sizeof(long_int_attrs) / sizeof(long_int_launch_attr)); i++) {
-    msg = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, gui_transmission_id);
-    proxy_msg_add_int(msg, 1);
-    proxy_msg_add_int(msg, 8);
-    proxy_msg_add_string(msg, long_int_attrs[i].id);
-    proxy_msg_add_string(msg, "BIGINTEGER");
-    proxy_msg_add_string(msg, long_int_attrs[i].short_name);
-    proxy_msg_add_string(msg, long_int_attrs[i].long_name);
-    proxy_msg_add_int(msg, 0);
-    sprintf(proxy_generated_attribute_string, "%lld", long_int_attrs[i].default_value);
-    proxy_msg_add_string(msg, proxy_generated_attribute_string);
-    sprintf(proxy_generated_attribute_string, "%lld", long_int_attrs[i].llimit);
-    proxy_msg_add_string(msg, proxy_generated_attribute_string);
-    sprintf(proxy_generated_attribute_string, "%lld", long_int_attrs[i].ulimit);
-    proxy_msg_add_string(msg, proxy_generated_attribute_string);
-    enqueue_event_to_proxy_server(msg);
-  }
-
-    /*-----------------------------------------------------------------------* 
-     * send enums                                                            * 
-     *-----------------------------------------------------------------------*/
-  for (i = 0; i < (sizeof(enum_attrs) / sizeof(enum_launch_attr)); i++) {
-
-
-  /*
-   * Count the number of enumerations in the enum list. Enumerations are
-   * delimited by '|' so number of enumerations is number of '|' + 1
-   */
-    cp = enum_attrs[i].enums;
-    n = 1;
-    while (*cp != '\0') {
-      if ((*cp) == '|') {
-        n = n + 1;
-      }
-      cp = cp + 1;
-    }
-  /*
-   * Create the enumeration attribute definition header
-   */
-    msg = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, gui_transmission_id);
-    proxy_msg_add_int(msg, 1);
-    proxy_msg_add_int(msg, n + 6);
-    proxy_msg_add_string(msg, enum_attrs[i].id);
-    proxy_msg_add_string(msg, "ENUMERATED");
-    proxy_msg_add_string(msg, enum_attrs[i].short_name);
-    proxy_msg_add_string(msg, enum_attrs[i].long_name);
-    proxy_msg_add_int(msg, 0);
-    proxy_msg_add_string(msg, enum_attrs[i].default_value);
-
-  /*
-   * Append enumerations to message. Since enumerations string is
-   * a string literal that is illegal to modify, create a working copy
-   */
-    cp = strdup(enum_attrs[i].enums);
-    cp_save = cp;
-    for (;;) {
-      end_cp = strchr(cp, '|');
-      if (end_cp == NULL) {
-        proxy_msg_add_string(msg, cp);
-        break;
-      } else {
-        *end_cp = '\0';
-        proxy_msg_add_string(msg, cp);
-        cp = end_cp + 1;
-      }
-    }
-    free(cp_save);
-  /*
-   * Send the attribute definition
-   */
-    enqueue_event_to_proxy_server(msg);
-  }
-
-    /*-----------------------------------------------------------------------* 
-     * done defining the model                                               * 
-     *-----------------------------------------------------------------------*/
-  sendOkEvent(gui_transmission_id);
-
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return PROXY_RES_OK;
-}
-
-/************************************************************************* 
- * Proxy command handler - command_start_events                          * 
- *                                                                       * 
- * In the LoadLeveler world a PTP machine is a cluster - so here we      * 
- *************************************************************************/
-int command_start_events(int gui_transmission_id, int nargs, char *args[])
-{
-
-/* 
- * Send the complete machine state to the GUI.  Query LoadLeveler 
- * to get the set of nodes that are part of the cluster (machine) 
- * and send new node events to the GUI for each node.
- */
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message_args(nargs, args);
-
-  state_events_active = 1;      /* events are now active */
-  start_events_gui_transmission_id = gui_transmission_id;
-
-/* Create thread to monitor LoadLeveler clusters of machines (these are nodes in a machine in ptp lingo).  */
-  pthread_attr_init(&monitor_LoadLeveler_nodes_thread_attr);
-  pthread_attr_setdetachstate(&monitor_LoadLeveler_nodes_thread_attr, PTHREAD_CREATE_DETACHED);
-  pthread_create(&monitor_LoadLeveler_nodes_thread, &monitor_LoadLeveler_nodes_thread_attr, monitor_LoadLeveler_nodes, NULL);
-  register_thread(monitor_LoadLeveler_nodes_thread);
-
-/* Create thread to monitor LoadLeveler jobs in clusters.  */
-  pthread_attr_init(&monitor_LoadLeveler_jobs_thread_attr);
-  pthread_attr_setdetachstate(&monitor_LoadLeveler_jobs_thread_attr, PTHREAD_CREATE_DETACHED);
-  pthread_create(&monitor_LoadLeveler_jobs_thread, &monitor_LoadLeveler_jobs_thread_attr, monitor_LoadLeveler_jobs, NULL);
-  register_thread(monitor_LoadLeveler_jobs_thread);
-  print_message(INFO_MESSAGE, "remapped thread id for nodes is %ul->%i and for jobs is %ul->%i\n", monitor_LoadLeveler_nodes_thread, find_thread(monitor_LoadLeveler_nodes_thread), monitor_LoadLeveler_jobs_thread, find_thread(monitor_LoadLeveler_jobs_thread));
-
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return PROXY_RES_OK;
-}
-
-/************************************************************************* 
- * Proxy command handler - command_submit_job                            * 
- *                                                                       * 
- * In the proxy we are accepting environment variables to be passed on   * 
- * to submit. These come in as env=VARNAME=VALUE                         * 
- *                                                                       * 
- * We also accept a finite number of variables to control the cmd file   * 
- * submit. This is the name of the command file and optionally a hex     * 
- * string to be written to the specified commanf file.                   * 
- *  Hex string only -> write into cmd file in tmp and submit             * 
- *  Cmd file only -> submit                                              * 
- *  Hex string and cmd file -> write into specified cmd file and submit  * 
- * It is expected that all other variables are processed in the gui and  * 
- * substituted into a template job command file.                         * 
- *************************************************************************/
-int command_submit_job(int gui_transmission_id, int nargs, char *args[])
-{
-  int rc = 0;
-
-  char *cp = NULL;
-  char *job_sub_id = NULL;
-  char *ll_job_command_file = NULL;
-  char *ll_job_command_file_template = NULL;
-  char *job_env_vars[1024][3];  /* allow 1024 env vars keyword, new value, old value */
-  char *ll_ptp_vars[1024][2];   /* allow 1024 ll vars keyword, value */
-  int i = 0;
-  int k = 0;
-  int o = 0;
-  int match = 0;
-  int env_count = 0;
-  int ll_count = 0;
-  char incoming[2048];
-  char outgoing[2048];
-  char submit_temp_file[256];
-  int submit_temp_file_fd = 0;
-  FILE *submit_template_FILE = NULL;
-  int advanced_mode = 1;        /* preset to advanced mode */
-  int bytes_written = 0;
-  int myerrno = 0;
-  int submit_failed = 0;        /* preset to all ok on this submit */
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message_args(nargs, args);
-
-  memset(job_env_vars, '\0', sizeof(job_env_vars));     /* zero the area */
-  memset(submit_temp_file, '\0', sizeof(submit_temp_file));     /* zero the area */
-
-    /*-----------------------------------------------------------------------* 
-     * process args passed into the submit command                           * 
-     *-----------------------------------------------------------------------*/
-  for (i = 0; args[i] != NULL; i++) {
-
-      /*-----------------------------------------------------------------------* 
-       * LoadLeveler keywords                                                  * 
-       *-----------------------------------------------------------------------*/
-    if (strncmp(args[i], "LL_PTP_JOB_COMMAND_FILE=", strlen("LL_PTP_JOB_COMMAND_FILE=")) == 0) {
-      cp = strchr(args[i], '=');
-      ll_job_command_file = strdup(cp + 1);
-    }
-    if (strncmp(args[i], "LL_PTP_JOB_COMMAND_FILE_TEMPLATE=", strlen("LL_PTP_JOB_COMMAND_FILE_TEMPLATE=")) == 0) {
-      cp = strchr(args[i], '=');
-      ll_job_command_file_template = strdup(cp + 1);
-    }
-
-     /*-----------------------------------------------------------------------* 
-      * General PTP launch configuration variables and environment vars       * 
-      *-----------------------------------------------------------------------*/
-    if (strncmp(args[i], JOB_SUB_ID_ATTR "=", strlen(JOB_SUB_ID_ATTR) + 1) == 0) {
-      cp = strchr(args[i], '=');
-      job_sub_id = strdup(cp + 1);      /* pick up the val part of the job id */
-    }
-
-    if (strncmp(args[i], JOB_ENV_ATTR "=", strlen(JOB_ENV_ATTR) + 1) == 0) {
-      cp = strchr(args[i], '=');        /* pick up the val part of env= which is a keyword=value pair */
-      cp++;                     /* first char of keyword=value */
-      memset(incoming, '\0', sizeof(incoming));
-      strcpy(incoming, cp);     /* pick up into work area for modifications */
-      cp = strchr(incoming, '=');       /* pick up the = in keyword=value pair */
-      *cp = '\0';               /* make key a string by itself */
-      cp++;                     /* first char of value in keyword=value pair */
-      job_env_vars[env_count][0] = strdup(incoming);    /* keyword */
-      job_env_vars[env_count][1] = strdup(cp);  /* new value */
-      env_count++;
-    }
-
-     /*-----------------------------------------------------------------------* 
-      * Substitution variables (like LL_PTP_xxxxxxxxx)                        * 
-      *-----------------------------------------------------------------------*/
-    if ((strncmp(args[i], "LL_PTP_", strlen("LL_PTP_")) == 0) || (strncmp(args[i], "workingDir", strlen("workingDir")) == 0) || (strncmp(args[i], "progArgs", strlen("progArgs")) == 0) || (strncmp(args[i], "execName", strlen("execName")) == 0) || (strncmp(args[i], "execPath", strlen("execPath")) == 0)
-      ) {
-      memset(incoming, '\0', sizeof(incoming));
-      strcpy(incoming, args[i]);        /* pick up into work area for modifications */
-      cp = strchr(incoming, '=');       /* pick up the = in keyword=value pair */
-      *cp = '\0';               /* make key a string by itself */
-      ll_ptp_vars[ll_count][0] = strdup(incoming);      /* pick up the keyword */
-      cp++;                     /* first char of value in keyword=value pair */
-      ll_ptp_vars[ll_count][1] = strdup(cp);    /* pick up the value */
-      print_message(INFO_MESSAGE, "Received keyword[%d]=value %s=%s\n", ll_count, ll_ptp_vars[ll_count][0], ll_ptp_vars[ll_count][1]);
-      if (strcmp(ll_ptp_vars[ll_count][0], "LL_PTP_SUBMIT_MODE") == 0) {
-        if (strcmp(ll_ptp_vars[ll_count][1], "Basic") == 0) {
-          advanced_mode = 0;    /* no longer advanced mode - now we are basic */
-        }
-      }
-      ll_count++;               /* count it */
-    }
-
-  }                             /* end loop on args passed into submit command */
-
-    /*-----------------------------------------------------------------------* 
-     * Handle overrides of LL_PTP_xxxxx variables over  PTP variables        * 
-     * LL_PTP_INITIALDIR overrides workingDir                                *
-     * LL_PTP_EXECUTABLE overrides execPath/execName                         *
-     *-----------------------------------------------------------------------*/
-  for (k = 0; k < ll_count; k++) {      /* loop on keyword value pairs */
-    if (strncmp("LL_PTP_EXECUTABLE", ll_ptp_vars[k][0], strlen(ll_ptp_vars[k][0])) == 0) {      /* match so far */
-      for (i = 0; i < ll_count; i++) {  /* loop on keyword value pairs */
-        if (strncmp("execPath", ll_ptp_vars[i][0], strlen(ll_ptp_vars[i][0])) == 0) {
-          free(ll_ptp_vars[i][0]);
-          ll_ptp_vars[i][0] = strdup(" ");
-        }
-        if (strncmp("execName", ll_ptp_vars[i][0], strlen(ll_ptp_vars[i][0])) == 0) {
-          free(ll_ptp_vars[i][0]);
-          ll_ptp_vars[i][0] = strdup(" ");
-        }
-      }
-    }
-    if (strncmp("LL_PTP_INITIALDIR", ll_ptp_vars[k][0], strlen(ll_ptp_vars[k][0])) == 0) {      /* match so far */
-      for (i = 0; i < ll_count; i++) {  /* loop on keyword value pairs */
-        if (strncmp("workingDir", ll_ptp_vars[i][0], strlen(ll_ptp_vars[i][0])) == 0) {
-          free(ll_ptp_vars[i][0]);
-          ll_ptp_vars[i][0] = strdup(" ");
-        }
-      }
-    }
-  }                             /* end loop on keyword value pairs */
-
-
-     /*-----------------------------------------------------------------------* 
-      * Perform substitutions and do submit                                   * 
-      *-----------------------------------------------------------------------*/
-  if (advanced_mode == 1) {     /* if advanced mode submit - no substitutions */
-    rc = my_ll_submit_job(gui_transmission_id, job_sub_id, ll_job_command_file, job_env_vars);
-    if (rc == 0) {              /* if job submit successful */
-      print_message(INFO_MESSAGE, "Job %s submitted.\n", ll_job_command_file);
-    } /* end if job submit successful */
-    else {                      /* if job submit error */
-      print_message(ERROR_MESSAGE, "Job submit failed for job %s.\n", ll_job_command_file);
-    }                           /* end if job submit error */
-  } /* end if advanced mode submit - no substitutions */
-  else {                        /* if basic mode submit -  substitutions to be performed */
-    /*-----------------------------------------------------------------------* 
-     * Open a temp file for submitting on /tmp                               * 
-     *-----------------------------------------------------------------------*/
-    strcpy(submit_temp_file, "/tmp/ll_ptp_temp_submit_file_");
-    strcat(submit_temp_file, userid);
-    strcat(submit_temp_file, "_XXXXXX");
-    submit_temp_file_fd = mkstemp(submit_temp_file);
-
-    /*-----------------------------------------------------------------------* 
-     * Open template file                                                    * 
-     *-----------------------------------------------------------------------*/
-    submit_template_FILE = fopen(ll_job_command_file_template, "r");
-    if (submit_template_FILE == NULL) {
-      myerrno = errno;
-      print_message(ERROR_MESSAGE, "Unable to open submit template file %s, errno=%d\n", ll_job_command_file_template, myerrno);
-      submit_failed = 1;        /* stop procesing the submit */
-    }
-
-    /*-----------------------------------------------------------------------* 
-     * Read in from template and substitute in key=value, if line contains   * 
-     * any non substituted then don't write the line back out                * 
-     *-----------------------------------------------------------------------*/
-    if (submit_failed == 0) {   /* if still ok to process */
-      memset(incoming, '\0', sizeof(incoming)); /* zero the area */
-      while ((fgets(incoming, sizeof(incoming), submit_template_FILE)) != NULL) {       /* read line into incoming */
-        o = 0;                  /* outgoing line position */
-        memset(outgoing, '\0', sizeof(outgoing));       /* zero the outgoing area */
-
-        for (i = 0; i < strlen(incoming);) {    /* loop on incoming line */
-          match = 0;
-          if (strlen(&incoming[i]) >= 6) {      /* if line left is >= 6 */
-            if (strncmp(&incoming[i], "<<<", 3) == 0) { /* maybe a match */
-              for (k = 0; k < ll_count; k++) {  /* loop on keyword value pairs */
-                if (strncmp(&incoming[i + 3], ll_ptp_vars[k][0], strlen(ll_ptp_vars[k][0])) == 0) {     /* match so far */
-                  if (strncmp(&incoming[i + 3 + strlen(ll_ptp_vars[k][0])], ">>>", 3) == 0) {   /* it is a complete match ! */
-                    strncpy(&outgoing[o], ll_ptp_vars[k][1], strlen(ll_ptp_vars[k][1]));
-                    i = i + 6 + strlen(ll_ptp_vars[k][0]);      /* next char in incoming line */
-                    o = o + strlen(ll_ptp_vars[k][1]);  /* next char in outgoing line */
-                    match = 1;  /* we match on this string in incoming */
-                    break;
-                  }             /* end if it is a complete match */
-                }               /* end if match */
-              }                 /* end loop on keyword value pairs */
-            }                   /* end if maybe a match */
-          }                     /* end if line left is >= 7 */
-          if (match == 0) {
-            outgoing[o++] = incoming[i++];      /* copy 1 byte over to new line */
-          }
-
-        }                       /* end loop on incoming line */
-
-        if (is_substitution_required(outgoing) == 0) {  /* if there are not any <<<XXXXXXXX>>> variables */
-          bytes_written = write(submit_temp_file_fd, outgoing, strlen(outgoing));
-        }
-      /* end loop on keyword value pairs */
-        myerrno = errno;
-        memset(incoming, '\0', sizeof(incoming));       /* zero the area for next template read */
-      }
-    }                           /* end if still ok to process */
-    if (submit_temp_file_fd > 0) {
-      close(submit_temp_file_fd);
-    }
-    if (submit_template_FILE != NULL) {
-      fclose(submit_template_FILE);
-    }
-
-    if (submit_failed == 0) {   /* if still ok to process */
-    /*-----------------------------------------------------------------------* 
-     * Submit the file                                                       * 
-     *-----------------------------------------------------------------------*/
-      rc = my_ll_submit_job(gui_transmission_id, job_sub_id, submit_temp_file, job_env_vars);
-      if (rc == 0) {            /* if job submit successful */
-        print_message(INFO_MESSAGE, "Job %s submitted.\n", submit_temp_file);
-      } /* end if job submit successful */
-      else {                    /* if job submit error */
-        print_message(ERROR_MESSAGE, "Job submit failed for job %s.\n", submit_temp_file);
-        submit_failed = 1; /* flag as failed */
-      }                         /* end if job submit error */
-
-    /*-----------------------------------------------------------------------* 
-     * Delete the temporary file                                             * 
-     *-----------------------------------------------------------------------*/
-      remove(submit_temp_file); /* delete the tmp file */
-    }          /* end if still ok to process */
-    
-    /*-----------------------------------------------------------------------* 
-     * Cleanup after submit                                                  * 
-     *-----------------------------------------------------------------------*/
-    for (i = 0; i < ll_count; i++) {
-      free(ll_ptp_vars[i][0]);
-      ll_ptp_vars[i][0] = NULL;
-      free(ll_ptp_vars[i][1]);
-      ll_ptp_vars[i][1] = NULL;
-    }
-    if (ll_job_command_file_template != NULL) {
-      free(ll_job_command_file_template);
-      ll_job_command_file_template = NULL;
-    }
-
-    if (ll_job_command_file != NULL) {
-      free(ll_job_command_file);
-      ll_job_command_file = NULL;
-    }
-  }                             /* end if basic mode */
-
-  if (submit_failed == 0) {
-    sendOkEvent(gui_transmission_id);     /* close out the halt events command */
-  }
-  else {
-	sendJobSubmissionErrorEvent(gui_transmission_id, job_sub_id, "LoadLeveler job submit failed.");
-  }
-  
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return PROXY_RES_OK;
-}
-
-/************************************************************************* 
- * Proxy command handler - command_halt_events                           * 
- *************************************************************************/
-int command_halt_events(int gui_transmission_id, int nargs, char *args[])
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message_args(nargs, args);
-
-  sendOkEvent(start_events_gui_transmission_id);        /* close out the start events command (kept open for async) */
-  state_events_active = 0;      /* events are now inactive */
-  sendOkEvent(gui_transmission_id);     /* close out the halt events command */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return PROXY_RES_OK;
-}
-
-/************************************************************************* 
- * Proxy command handler - command_cancel_job                            * 
- *************************************************************************/
-int command_cancel_job(int gui_transmission_id, int nargs, char *args[])
-{
-  int i;
-  int job_ident = -1;
-  JobObject *job_object = NULL;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message_args(nargs, args);
-
-  for (i = 0; i < nargs; i++) {
-    if (proxy_test_attribute(JOB_ID_ATTR, args[i])) {
-	  job_ident = proxy_get_attribute_value_int(args[i]);
-    }
-  }
-  job_object = get_job_in_list_from_id(job_list, job_ident);
-  if (job_object != NULL) {
-    my_ll_terminate_job(gui_transmission_id, job_object);
-  }
-
-  sendOkEvent(gui_transmission_id);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * Proxy command handler - command_terminate                             * 
- *************************************************************************/
-int command_terminate(int gui_transmission_id, int nargs, char *args[])
-{
-  int rc = 0;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message_args(nargs, args);
-  state_shutdown_requested = 1;
-
-  print_message(INFO_MESSAGE, "Waiting for monitor threads to become inactve.\n");
-  pthread_mutex_lock(&master_lock);
-  print_message(INFO_MESSAGE, "Continuing termination request.\n");
-  print_message(INFO_MESSAGE, "dlclose LoadLeveler shared library %s.\n", ibmll_libpath_name);
-  rc = dlclose(ibmll_libpath_handle);
-  if (rc != 0) {
-    print_message(ERROR_MESSAGE, "dlclose of %s failed with rc=%d.\n", rc);
-    sendErrorEvent(gui_transmission_id, RTEV_ERROR_LL_INIT, "dlclose failed for LoadLeveler shared library");
-    sendShutdownEvent(gui_transmission_id);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    pthread_mutex_unlock(&master_lock);
-    return PROXY_RES_ERR;
-  } else {
-    print_message(INFO_MESSAGE, "dlclose %s successful.\n", ibmll_libpath_name);
-    sendShutdownEvent(gui_transmission_id);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    pthread_mutex_unlock(&master_lock);
-    return PROXY_RES_OK;
-  }
-  pthread_mutex_unlock(&master_lock);
-}
-
-
-/************************************************************************* 
- * Service thread - Loop while allowed to monitor LoadLeveler for nodes  * 
- *************************************************************************/
-void *monitor_LoadLeveler_nodes(void *job_ident)
-{
-  int rc = 0;
-  int i = 0;
-  char *node_name = NULL;
-  LL_element *node = NULL;
-  LL_element *query_elem = NULL;
-  int node_count = 0;
-  int sleep_seconds = 30;
-  int sleep_time_reset = 0;     /* if changes this pass */
-  LL_element *errObj = NULL;
-
-  ListElement *cluster_list_element = NULL;
-  ClusterObject *cluster_object = NULL;
-  NodeObject *node_object = NULL;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-  /*-----------------------------------------------------------------------* 
-   * loop forever until we are told we are shutting down.                  * 
-   *-----------------------------------------------------------------------*/
-  while (state_shutdown_requested == 0) {       /* loop while not shutting down */
-    pthread_mutex_lock(&master_lock);
-    if (state_shutdown_requested == 1) {        /* if main task started shutdown and snuck in at the right time */
-      pthread_mutex_unlock(&master_lock);
-      break;
-    }
-    query_elem = NULL;
-    node_name = NULL;
-    node_count = 0;
-    node = NULL;
-    LL_cluster_param cluster_parm;
-    char *remote_cluster[2];
-    Hash *node_hash = NULL;
-    HashEntry *hash_element = NULL;
-    List *node_list = NULL;
-    ListElement *node_list_element = NULL;
-    sleep_time_reset = 0;       /* preset for this loop that no changes were detected */
-
-    print_message(TRACE_MESSAGE, ">>> %s thread running. line=%d.\n", __FUNCTION__, __LINE__);
-    if (cluster_list == NULL) {
-      refresh_cluster_list();   /* insure we have latest cluster configuration from LoadLeveler */
-    }
-
-    if (cluster_list != NULL) { /* if we have clusters, nodes, etc. */
-
-      /*-----------------------------------------------------------------------* 
-       * loop on the cluster list we obtained earlier from LoadLeveler.        * 
-       *-----------------------------------------------------------------------*/
-      cluster_list_element = cluster_list->l_head;
-      while (cluster_list_element != NULL) {    /* while we have a cluster to query */
-        cluster_object = cluster_list_element->l_value; /* get our cluster object from this list element */
-        cluster_list_element = cluster_list_element->l_next;    /* prepare for next pass */
-        if (cluster_object->node_hash->count <= 0) {    /* if no nodes in this cluster */
-          sleep_time_reset = 1; /* we need to keep looking for nodes, etc on short interval */
-        }
-
-        if (multicluster_status == 1) { /* if running multicluster */
-
-         /*-----------------------------------------------------------------------* 
-          * we are running multicluster - set cluster name into environment       * 
-          * to influence where LoadLeveler searches for data (what cluster)       * 
-          *-----------------------------------------------------------------------*/
-          remote_cluster[0] = cluster_object->cluster_name;
-          remote_cluster[1] = NULL;
-          print_message(INFO_MESSAGE, "Setting access for LoadLeveler cluster=%s.\n", cluster_object->cluster_name);
-          cluster_parm.action = CLUSTER_SET;    /* we are setting the cluster for remote access */
-          cluster_parm.cluster_list = remote_cluster;   /* cluster name we want data from */
-          rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);   /* set the cluster name */
-        } /* end if this is not a local cluster */
-        else {                  /* this is a local cluster */
-
-         /*-----------------------------------------------------------------------* 
-          * not running multicluster                                              * 
-          *-----------------------------------------------------------------------*/
-          print_message(INFO_MESSAGE, "Setting access for LoadLeveler local cluster (single cluster).\n");
-          cluster_parm.action = CLUSTER_UNSET;  /* we are unsetting the cluster */
-          cluster_parm.cluster_list = NULL;
-          rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);   /* unset the cluster name - back to local */
-        }                       /* end if this is a local cluster */
-
-        /*-----------------------------------------------------------------------* 
-         * build a LoadLeveler query object (for nodes)                          * 
-         *-----------------------------------------------------------------------*/
-        query_elem = my_ll_query(MACHINES);
-        if (query_elem == NULL) {
-          print_message(ERROR_MESSAGE, "Unable to obtain query element. LoadLeveler may not be active or is not responding.\n");
-          continue;
-        }
-
-        /*-----------------------------------------------------------------------* 
-         * set the request type for LoadLeveler (we want nodes)                  * 
-         *-----------------------------------------------------------------------*/
-        print_message(INFO_MESSAGE, "Call LoadLeveler (ll_set_request) for nodes in cluster=%s.\n", cluster_object->cluster_name);
-        rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-        if (rc != 0) {
-          rc = my_ll_deallocate(query_elem);
-          query_elem = NULL;
-          continue;
-        }
-
-        /*-----------------------------------------------------------------------* 
-         * get nodes from LoadLeveler for current or local cluster.              * 
-         *-----------------------------------------------------------------------*/
-        print_message(INFO_MESSAGE, "Call LoadLeveler (ll_get_objs) for nodes in cluster=%s.\n", cluster_object->cluster_name);
-        node = my_ll_get_objs(query_elem, LL_CM, NULL, &node_count, &rc);
-        if (rc != 0) {
-          rc = my_ll_deallocate(query_elem);
-          query_elem = NULL;
-          continue;
-        }
-
-        print_message(INFO_MESSAGE, "Number of LoadLeveler Nodes=%d in cluster=%s.\n", node_count, cluster_object->cluster_name);
-
-        /*-----------------------------------------------------------------------* 
-         * loop on the nodes returned by LoadLeveler                             * 
-         *-----------------------------------------------------------------------*/
-        i = 0;
-        while (node != NULL) {  /* node points to the first or next node in the list from LoadLeveler */
-          print_message(INFO_MESSAGE, "LoadLeveler Node %d:\n", i);
-          rc = my_ll_get_data(node, LL_MachineName, &node_name);
-          if (rc == 0) { /* do something here with the node object */
-            print_message(INFO_MESSAGE, "Node name=%s\n", node_name);
-            if ((node_object = get_node_in_hash(cluster_object->node_hash, node_name)) != NULL) {       /* existing node */
-              /*-----------------------------------------------------------------------* 
-               * node returned by LoadLeveler was found in our ptp node list.          * 
-               * flag it as found.                                                     * 
-               *-----------------------------------------------------------------------*/
-              node_object->node_found = 1;      /* flag it as found */
-              if (node_object->node_state != MY_STATE_UP) {
-                node_object->node_state = MY_STATE_UP;
-                sleep_time_reset = 1;   /* we have a change this pass */
-                print_message(INFO_MESSAGE, "Schedule event notification: node=%s changed for LoadLeveler Cluster=%s.\n", node_name, cluster_object->cluster_name);
-                sendNodeChangeEvent(start_events_gui_transmission_id, cluster_object, node_object);
-              }
-            } else {            /* new node (not yet in list) */
-              /*-----------------------------------------------------------------------* 
-               * node returned by LoadLeveler was not found in our ptp node list       * 
-               * add it and generate an event to the gui. flag it as added.            * 
-               *-----------------------------------------------------------------------*/
-              node_object = (NodeObject *) malloc(sizeof(NodeObject));
-              malloc_check(node_object, __FUNCTION__, __LINE__);
-              memset(node_object, '\0', sizeof(node_object));   /* zero the malloc area */
-              node_object->proxy_generated_node_id = generate_id();     /* a unique identifier for this cluster */
-              node_object->node_name = strdup(node_name);
-              node_object->node_found = 2;      /* flag it as added */
-              node_object->node_state = MY_STATE_UP;
-              sleep_time_reset = 1;     /* we have a change this pass */
-              add_node_to_hash(cluster_object->node_hash, (void *) node_object);        /* add the new node object to the hash */
-              sleep_time_reset = 1;     /* we have a change this pass */
-              print_message(INFO_MESSAGE, "Schedule event notification: node=%s added for LoadLeveler Cluster=%s.\n", node_name, cluster_object->cluster_name);
-              sendNodeAddEvent(start_events_gui_transmission_id, cluster_object, node_object);
-            }                   /* end if new node */
-          }                     /* we got a node name ok */
-
-          i++;
-          node = my_ll_next_obj(query_elem);
-        }                       /* end while we have a node */
-
-        /*-----------------------------------------------------------------------* 
-         * loop on the ptp node list to see if any nodes were not returned       * 
-         * by LoadLeveler on this pass (maybe they went down).                   * 
-         * generate an event (changed/gone) to the gui.                          * 
-         *-----------------------------------------------------------------------*/
-        node_hash = cluster_object->node_hash;  /* pick up the node hash */
-        if (node_hash != NULL) {        /* if we have a node hash table ok */
-          HashSet(node_hash);   /* position to beginning of the hash table */
-          hash_element = HashGet(node_hash);    /* get next hash table entry */
-          while (hash_element != NULL) {
-            node_list = (List *) hash_element->h_data;  /* the hash entry is a list of node objects */
-            hash_element = HashGet(node_hash);  /* get next hash table entry */
-            node_list_element = node_list->l_head;      /* first in list */
-            while (node_list_element != NULL) { /* while we have a node to query */
-              node_object = node_list_element->l_value; /* get our node object from this list element */
-              node_list_element = node_list_element->l_next;    /* prepare for next pass */
-              if (node_object->node_found == 0) {       /* if not found - node went away */
-                if (node_object->node_state != MY_STATE_UNKNOWN) {
-                  node_object->node_state = MY_STATE_UNKNOWN;
-                  print_message(INFO_MESSAGE, "Schedule event notification: node=%s changed for LoadLeveler Cluster=%s.\n", node_name, cluster_object->cluster_name);
-                  sendNodeChangeEvent(start_events_gui_transmission_id, cluster_object, node_object);
-                  sleep_time_reset = 1; /* we have a change this pass */
-                }
-              } else {          /* node was found or added this pass */
-                node_object->node_found = 0;    /* reset for next pass */
-              }
-            }                   /* end while we have node list element to look at */
-
-          }                     /* end while we still have hash table entry */
-        }                       /* end if we have a node hash table ok */
-        if (query_elem != NULL) {
-          rc = my_ll_free_objs(query_elem);
-          rc = my_ll_deallocate(query_elem);
-          query_elem = NULL;
-        }
-
-      }                         /* end while we have a cluster to query */
-    } /* end if we have cluster list, nodes, etc. */
-    else {
-      sleep_time_reset = 1;     /* we need to keep looking for nodes, etc */
-    }
-
-    pthread_mutex_unlock(&master_lock);
-
-    /*-----------------------------------------------------------------------* 
-     * adjust sleep interval based on changes this pass.                     * 
-     *-----------------------------------------------------------------------*/
-    if (sleep_time_reset == 1) {        /* yes - there was activity */
-      sleep_seconds = min_node_sleep_seconds;   /* set to min sleep interval */
-    } /* end if activity this pass */
-    else {                      /* if no activity this pass */
-      sleep_seconds = sleep_seconds + min_node_sleep_seconds;
-      if (sleep_seconds > max_node_sleep_seconds) {     /* if max exceeded */
-        sleep_seconds = max_node_sleep_seconds; /* reset to max sleep interval */
-      }                         /* end if max exceeded */
-    }                           /* end if no activity this pass */
-
-    /*-----------------------------------------------------------------------* 
-     * sleep and loop again on the LoadLeveler machines.                     * 
-     *-----------------------------------------------------------------------*/
-    if (state_shutdown_requested == 0) {
-      int sleep_interval = 0;
-      int mini_sleep_interval = (sleep_seconds + 4) / 5;
-      print_message(INFO_MESSAGE, "%s Sleeping for (%d seconds) %d intervals of 5 seconds\n", __FUNCTION__, mini_sleep_interval * 5, mini_sleep_interval);
-      for (sleep_interval = 0; sleep_interval < mini_sleep_interval; sleep_interval++) {
-        if (state_shutdown_requested == 0) {
-          sleep(5);
-        }
-      }
-    }
-
-  }                             /* end while we are not shutting down */
-
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return NULL;
-}
-
-/************************************************************************* 
- * Service thread - Loop while allowed to monitor LoadLeveler for jobs   * 
- *************************************************************************/
-void *monitor_LoadLeveler_jobs(void *job_ident)
-{
-  int rc = 0;
-  int i = 0;
-  char *job_name = NULL;
-  char *job_submit_host = NULL;
-  char *step_ID = NULL;
-  LL_STEP_ID ll_step_id;
-  int step_machine_count = 0;
-  LL_element *job = NULL;
-  LL_element *step = NULL;
-  LL_element *query_elem = NULL;
-  LL_element *node = NULL;
-  LL_element *task = NULL;
-  LL_element *task_instance = NULL;
-  int job_count = 0;
-  LL_element *errObj = NULL;
-  LL_cluster_param cluster_parm;
-  char *remote_cluster[2];
-  ListElement *job_list_element = NULL;
-  List *task_list = NULL;
-  ListElement *task_list_element = NULL;
-  char *task_instance_machine_name = NULL;
-  char *task_instance_machine_address = NULL;
-  int task_instance_task_ID = 0;
-  int step_node_count = 0;
-  int node_task_count = 0;
-  int task_instance_count = 0;
-  time_t my_clock;
-
-  ListElement *cluster_list_element = NULL;
-  ClusterObject *cluster_object = NULL;
-  JobObject *job_object = NULL;
-  TaskObject *task_object = NULL;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-  /*-----------------------------------------------------------------------* 
-   * loop forever until we are told we are shutting down.                  * 
-   *-----------------------------------------------------------------------*/
-  while (state_shutdown_requested == 0) {       /* loop while not shutting down */
-    pthread_mutex_lock(&master_lock);
-    if (state_shutdown_requested == 1) {        /* if main task started shutdown and snuck in at the right time */
-      pthread_mutex_unlock(&master_lock);
-      break;
-    }
-    query_elem = NULL;
-    job_name = NULL;
-    step_ID = NULL;
-    job_count = 0;
-    step_machine_count = 0;
-    job = NULL;
-    char *pChar = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s thread running. line=%d.\n", __FUNCTION__, __LINE__);
-
-    if (cluster_list != NULL) { /* if we have clusters, nodes, etc. from monitor_LoadLeveler_nodes thread */
-
-      /*-----------------------------------------------------------------------* 
-       * loop on the cluster list we obtained earlier from LoadLeveler.        * 
-       *-----------------------------------------------------------------------*/
-      cluster_list_element = cluster_list->l_head;
-      while (cluster_list_element != NULL) {    /* while we have a cluster to query */
-        cluster_object = cluster_list_element->l_value; /* get our cluster object from this list element */
-        cluster_list_element = cluster_list_element->l_next;    /* prepare for next pass */
-
-        if (cluster_object != NULL) {   /* if we have a cluster object */
-          if (cluster_object->node_hash != NULL) {      /* if we have a node has table to look at */
-            if (cluster_object->node_hash->count > 0) { /* if we have nodes in this cluster */
-
-              if (multicluster_status == 1) {   /* if running multicluster */
-
-         /*-----------------------------------------------------------------------* 
-          * we are running multicluster - set cluster name into environment       * 
-          * to influence where LoadLeveler searches for data (what cluster)       * 
-          *-----------------------------------------------------------------------*/
-                remote_cluster[0] = cluster_object->cluster_name;
-                remote_cluster[1] = NULL;
-                print_message(INFO_MESSAGE, "Setting access for LoadLeveler cluster=%s.\n", cluster_object->cluster_name);
-                cluster_parm.action = CLUSTER_SET;      /* we are setting the cluster for remote access */
-                cluster_parm.cluster_list = remote_cluster;     /* cluster name we want data from */
-                rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);     /* set the cluster name */
-              } /* end if this is not a local cluster */
-              else {            /* this is a local cluster */
-
-         /*-----------------------------------------------------------------------* 
-          * not running multicluster                                              * 
-          *-----------------------------------------------------------------------*/
-                print_message(INFO_MESSAGE, "Setting access for LoadLeveler local cluster (single cluster).\n");
-                cluster_parm.action = CLUSTER_UNSET;    /* we are unsetting the cluster */
-                cluster_parm.cluster_list = NULL;
-                rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);     /* unset the cluster name - back to local */
-              }                 /* end if this is a local cluster */
-
-        /*-----------------------------------------------------------------------* 
-         * build a LoadLeveler query object (for jobs)                           * 
-         *-----------------------------------------------------------------------*/
-              query_elem = my_ll_query(JOBS);
-              if (query_elem == NULL) {
-                print_message(ERROR_MESSAGE, "Unable to obtain query element. LoadLeveler may not be active or is not responding.\n");
-                continue;
-              }
-
-        /*-----------------------------------------------------------------------* 
-         * set the request type for LoadLeveler (we want nodes)                  * 
-         *-----------------------------------------------------------------------*/
-              print_message(INFO_MESSAGE, "Call LoadLeveler (ll_set_request) for jobs in cluster=%s.\n", cluster_object->cluster_name);
-              rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-              if (rc != 0) {
-                rc = my_ll_deallocate(query_elem);
-                query_elem = NULL;
-                continue;
-              }
-
-        /*-----------------------------------------------------------------------* 
-         * get jobs from LoadLeveler for current or local cluster.               * 
-         *-----------------------------------------------------------------------*/
-              print_message(INFO_MESSAGE, "Call LoadLeveler (ll_get_objs) for jobs in cluster=%s.\n", cluster_object->cluster_name);
-              job_count = 0;    /* preset to no jobs found in cluster */
-              job = my_ll_get_objs(query_elem, LL_CM, NULL, &job_count, &rc);
-              if (rc != 0) {
-                rc = my_ll_deallocate(query_elem);
-                query_elem = NULL;
-              }
-
-              print_message(INFO_MESSAGE, "Number of LoadLeveler Jobs=%d in cluster=%s.\n", job_count, cluster_object->cluster_name);
-
-        /*-----------------------------------------------------------------------* 
-         * loop on the jobs returned by LoadLeveler                              * 
-         *-----------------------------------------------------------------------*/
-              i = 0;
-              while (job != NULL) {     /* job points to the first or next job in the list from LoadLeveler */
-                print_message(INFO_MESSAGE, "LoadLeveler Job %d:\n", i);
-                rc = my_ll_get_data(job, LL_JobSubmitHost, &job_submit_host);
-                rc = my_ll_get_data(job, LL_JobName, &job_name);
-                if (rc == 0) { /* do something here with the job object */
-                  print_message(INFO_MESSAGE, "Job name=%s\n", job_name);
-                  rc = my_ll_get_data(job, LL_JobGetFirstStep, &step);  /* get a job step */
-                  while (step != NULL) {        /* while we have a step */
-                    step_machine_count = 0;     /* pre assume job not running */
-                    rc = my_ll_get_data(step, LL_StepID, &step_ID);
-                    if (rc == 0) {    /* do something here with the step object */
-               /*-----------------------------------------------------------------------* 
-                * break the job step name apart into a LoadLeveler LL_STEP_ID           * 
-                *-----------------------------------------------------------------------*/
-                      ll_step_id.from_host = strdup(job_submit_host);
-                      pChar = step_ID + strlen(job_submit_host) + 1;    /* The next segment is the cluster or job number */
-                      pChar = strtok(pChar, ".");
-                      ll_step_id.cluster = atoi(pChar); /* The last token is the proc or step number */
-                      pChar = strtok(NULL, ".");
-                      ll_step_id.proc = atoi(pChar);
-
-                      print_message(INFO_MESSAGE, "Job step ID=%s.%d.%d\n", ll_step_id.from_host, ll_step_id.cluster, ll_step_id.proc);
-                      if ((job_object = get_job_in_list(job_list, ll_step_id)) != NULL) {       /* existing step */
-
-              /*-----------------------------------------------------------------------* 
-               * step returned by LoadLeveler was found in our ptp job list.           * 
-               * flag it as found.                                                     * 
-               *-----------------------------------------------------------------------*/
-                        job_object->job_found = 1;      /* flag it as found */
-                        if (job_object->job_state == MY_STATE_UNKNOWN) {
-                          job_object->job_state = MY_STATE_IDLE;
-                          print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                          sendJobChangeEvent(start_events_gui_transmission_id, job_object);
-                        }
-                        if (multicluster_status == 1) { /* if running multicluster */
-                          if (strcmp(job_object->cluster_name, cluster_object->cluster_name) != 0) {    /* if job moved */
-                            sendJobRemoveEvent(start_events_gui_transmission_id, job_object);
-                            job_object->cluster_name = cluster_object->cluster_name;    /* pick up new cluster */
-                            sendJobAddEvent(start_events_gui_transmission_id, cluster_object, job_object);
-                          }     /* if job moved */
-                        }       /* end if running multicluster */
-                      } else {  /* new job (not yet in list) */
-
-              /*-----------------------------------------------------------------------* 
-               * job returned by LoadLeveler was not found in our ptp job list         * 
-               * add it and generate an event to the gui. flag it as added.            * 
-               *-----------------------------------------------------------------------*/
-                        job_object = (JobObject *) malloc(sizeof(JobObject));
-                        malloc_check(job_object, __FUNCTION__, __LINE__);
-                        memset(job_object, '\0', sizeof(job_object));   /* zero the malloc area */
-                        job_object->proxy_generated_job_id = generate_id();     /* a unique identifier for this cluster */
-                        job_object->gui_assigned_job_id = "-1"; /* unsolicited job from proxy */
-                        job_object->ll_step_id.from_host = strdup(ll_step_id.from_host);
-                        job_object->ll_step_id.cluster = ll_step_id.cluster;
-                        job_object->ll_step_id.proc = ll_step_id.proc;
-                        job_object->job_found = 2;      /* flag it as newly added */
-                        job_object->job_state = MY_STATE_IDLE;
-                        job_object->task_list = NewList();      /* list to hold tasks for this job step */
-                        job_object->cluster_name = strdup(cluster_object->cluster_name);
-                        add_job_to_list(job_list, (void *) job_object); /* add the new job object to the list */
-                        print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d added for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                        sendJobAddEvent(start_events_gui_transmission_id, cluster_object, job_object);
-                      }         /* end if new node */
-                      rc = my_ll_get_data(step, LL_StepNodeCount, &step_node_count);    /* nodes running on */
-                      print_message(INFO_MESSAGE, "Step=%s.%d.%d. StepNodeCount=%d.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, step_node_count);
-
-                /*-----------------------------------------------------------------------* 
-                 * if this job from LoadLeveler has nodes (is running-like) then loop on *
-                 * the nodes to see task status for new or existing tasks.               * 
-                 *-----------------------------------------------------------------------*/
-                      if (step_node_count > 0) {        /* if job step is in running-like state (is using nodes) */
-                        rc = my_ll_get_data(step, LL_StepGetFirstNode, &node);  /* node */
-
-                  /*-----------------------------------------------------------------------* 
-                   * loop on the nodes in the job returned by LoadLeveler                  * 
-                   *-----------------------------------------------------------------------*/
-                        while (node != NULL) {  /* while we have a valid LoadLeveler node */
-                          rc = my_ll_get_data(node, LL_NodeTaskCount, &node_task_count);        /* tasks running on node */
-                          print_message(INFO_MESSAGE, "NodeTaskCount=%d.\n", node_task_count);
-                          rc = my_ll_get_data(node, LL_NodeGetFirstTask, &task);        /* task */
-
-                  /*-----------------------------------------------------------------------* 
-                   * loop on the tasks in the job returned by LoadLeveler                  * 
-                   *-----------------------------------------------------------------------*/
-                          while (task != NULL) {
-                            rc = my_ll_get_data(task, LL_TaskTaskInstanceCount, &task_instance_count);  /* task instances */
-                            print_message(INFO_MESSAGE, "TaskInstanceCount=%d.\n", task_instance_count);
-                            rc = my_ll_get_data(task, LL_TaskGetFirstTaskInstance, &task_instance);     /* task instances */
-
-                      /*-----------------------------------------------------------------------* 
-                       * loop on the task_instances in the job returned by LoadLeveler         * 
-                       *-----------------------------------------------------------------------*/
-                            while (task_instance != NULL) {
-                              rc = my_ll_get_data(task_instance, LL_TaskInstanceMachineName, &task_instance_machine_name);      /* machine name */
-                              rc = my_ll_get_data(task_instance, LL_TaskInstanceMachineAddress, &task_instance_machine_address);        /* machine name */
-                              rc = my_ll_get_data(task_instance, LL_TaskInstanceTaskID, &task_instance_task_ID);        /* task id */
-                              print_message(INFO_MESSAGE, "TaskInstanceMachineName=%s. TaskInstanceMachineAddress=%s. TaskInstanceTaskID=%d.\n", task_instance_machine_name, task_instance_machine_address, task_instance_task_ID);
-                              if ((task_object = get_task_in_list(job_object->task_list, task_instance_machine_name, task_instance_task_ID)) != NULL) { /* existing task */
-
-                         /*-----------------------------------------------------------------------* 
-                         * task returned by LoadLeveler was found in our ptp job task list.      * 
-                         * flag it as found.                                                     * 
-                         *-----------------------------------------------------------------------*/
-                                task_object->ll_task_id = task_instance_task_ID;
-                                task_object->task_found = 1;    /* flag it as found */
-                                if (task_object->task_state != MY_STATE_RUNNING) {
-                                  task_object->task_state = MY_STATE_RUNNING;
-                                  print_message(INFO_MESSAGE, "Schedule event notification: Task_ID=%d running on node_name=%s added for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n", task_object->ll_task_id, task_object->node_name, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                                  sendTaskChangeEvent(start_events_gui_transmission_id, job_object, task_object);
-                                }
-                                if (job_object->job_state != MY_STATE_RUNNING) {
-                                  job_object->job_state = MY_STATE_RUNNING;
-                                  print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                                  sendJobChangeEvent(start_events_gui_transmission_id, job_object);
-                                }
-                              } else {  /* new task (not yet in list) */
-
-                           /*-----------------------------------------------------------------------* 
-                            * task returned by LoadLeveler was not found in our ptp job task list   * 
-                            * add it and generate an event to the gui. flag it as added.            * 
-                            *-----------------------------------------------------------------------*/
-                                task_object = (TaskObject *) malloc(sizeof(TaskObject));
-                                malloc_check(task_object, __FUNCTION__, __LINE__);
-                                memset(task_object, '\0', sizeof(task_object)); /* zero the malloc area */
-                                task_object->proxy_generated_task_id = generate_id();   /* a unique identifier for this cluster */
-                                task_object->ll_task_id = task_instance_task_ID;
-                                task_object->node_name = strdup(task_instance_machine_name);
-                                task_object->node_address = strdup(task_instance_machine_address);
-                                task_object->task_found = 2;    /* flag it as added */
-                                task_object->task_state = MY_STATE_RUNNING;
-                                print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                                if (job_object->job_state != MY_STATE_RUNNING) {
-                                  job_object->job_state = MY_STATE_RUNNING;
-                                  print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                                  sendJobChangeEvent(start_events_gui_transmission_id, job_object);
-                                }
-                                add_task_to_list(job_object->task_list, (void *) task_object);  /* add the new task object to the list */
-                                print_message(INFO_MESSAGE, "Schedule event notification: Task_ID=%d running on node_name=%s added for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n", task_object->ll_task_id, task_object->node_name, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                                sendTaskAddEvent(start_events_gui_transmission_id, cluster_object, job_object, task_object);
-                              } /* end if new node */
-                              rc = my_ll_get_data(task, LL_TaskGetNextTaskInstance, &task_instance);    /* task instances */
-                            }
-                            rc = my_ll_get_data(node, LL_NodeGetNextTask, &task);       /* task */
-                          }
-                          rc = my_ll_get_data(step, LL_StepGetNextNode, &node); /* node */
-                        }       /* end while we have a valid LoadLeveler node */
-                      }           /* end if job step is in running-like state (is using nodes) */
-                      
-                /*-----------------------------------------------------------------------* 
-                 * loop on the tasks in the job object - if any not found that were      * 
-                 * present before then generate deleted task events.                     * 
-                 *-----------------------------------------------------------------------*/
-                      task_list = (List *) job_object->task_list;       /* the task list in the job */
-                      task_list_element = task_list->l_head;    /* first in list */
-                      while (task_list_element != NULL) {       /* while we have a task to query */
-                        task_object = task_list_element->l_value;       /* get the task object (if any) */
-                        task_list_element = task_list_element->l_next;  /* prepare for next pass */
-                        if (task_object != 0) { /* if we have a task object */
-                          if (task_object->task_found == 0) {   /* if not found or added this pass */
-                            task_object->task_state = MY_STATE_TERMINATED;
-                            task_object->task_found = 0;        /* reset for next pass */
-                            print_message(INFO_MESSAGE, "Schedule event notification: Task_ID=%d running on node_name=%s deleted for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n", task_object->ll_task_id, task_object->node_name, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                            sendTaskRemoveEvent(start_events_gui_transmission_id, job_object, task_object);
-                            delete_task_from_list(task_list, task_object);      /* clean this task object and delete from the job */
-                            if (SizeOfList(task_list) == 0) {
-                              if (job_object->job_state == MY_STATE_RUNNING) {
-                                job_object->job_state = MY_STATE_TERMINATED;    /* job is done */
-                                print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d terminated for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                                sendJobChangeEvent(start_events_gui_transmission_id, job_object);
-                              /* NO print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d deleted for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name); */
-                              /* NO sendJobRemoveEvent(start_events_gui_transmission_id, job_object); */
-                              } else {
-                                job_object->job_state = MY_STATE_IDLE;
-                                print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                                sendJobChangeEvent(start_events_gui_transmission_id, job_object);
-                              }
-                            }
-                          } else {      /* it was found or added this pass */
-                            task_object->task_found = 0;        /* reset for next pass */
-                          }
-                        }       /* end if we have a task object */
-                      }         /* end while we have task list element to look at */
-
-
-                      rc = my_ll_get_data(job, LL_JobGetNextStep, &step);       /* get another job step */
-                    }
-                  }             /* end while we have a step */
-                }               /* we got a job name ok */
-
-                i++;
-                job = my_ll_next_obj(query_elem);
-              }                 /* end while we have a job */
-            }                   /* end if we have nodes in this cluster */
-          }                     /* end if we have a node table in this cluster */
-        }                       /* end if we have a cluster object */
-        if (query_elem != NULL) {
-          rc = my_ll_free_objs(query_elem);
-          rc = my_ll_deallocate(query_elem);
-          query_elem = NULL;
-        }
-      }                         /* end while we have a cluster to query */
-
-      if (query_elem != NULL) {
-        rc = my_ll_free_objs(query_elem);
-        rc = my_ll_deallocate(query_elem);
-        query_elem = NULL;
-      }
-
-      /*-----------------------------------------------------------------------* 
-       * get the time and see if job has been sitting in submitted state too   * 
-       * long.                                                                 * 
-       *-----------------------------------------------------------------------*/
-      time(&my_clock);             /* what time is it ? */
-
-      /*-----------------------------------------------------------------------* 
-       * loop on the ptp job list to see if any jobs were not returned         * 
-       * by LoadLeveler on this pass (maybe they went down).                   * 
-       * generate an event (changed/gone) to the gui.                          * 
-       *-----------------------------------------------------------------------*/
-      if (job_list != NULL) {   /* if we have a job list ok */
-        job_list_element = job_list->l_head;    /* first in list */
-        while (job_list_element != NULL) {      /* while we have a job to query */
-          job_object = job_list_element->l_value;       /* get our job object from this list element */
-          job_list_element = job_list_element->l_next;  /* prepare for next pass */
-          if ((job_object->job_found == 0) &&   /* if job not found */
-              ((job_object->job_state != MY_STATE_UNKNOWN) ||   /* and was running */
-               ((my_clock - job_object->job_submit_time) > 300))) {        /* or never queued after time limit (seconds) */
-            job_object->job_found = 0;  /* reset for next pass */
-
-            /*-----------------------------------------------------------------------* 
-             * loop on the tasks in the job object - send deleted event and mark     *
-             * all deleted.                                                          *
-             *-----------------------------------------------------------------------*/
-            task_list = (List *) job_object->task_list; /* the task list in the job */
-            task_list_element = task_list->l_head;      /* first in list */
-            while (task_list_element != NULL) { /* while we have a task to delete */
-              task_object = task_list_element->l_value; /* get the task object (if any) */
-              task_list_element = task_list_element->l_next;    /* prepare for next pass */
-              if (task_object != 0) {   /* if we have a task object */
-                print_message(INFO_MESSAGE, "Schedule event notification: Task_ID=%d deleted on node_name=%s deleted for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n", task_object->ll_task_id, task_object->node_name, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                sendTaskRemoveEvent(start_events_gui_transmission_id, job_object, task_object);
-                delete_task_from_list(task_list, task_object);  /* clean this task object and delete from the job */
-                if (SizeOfList(task_list) == 0) {
-                  job_object->job_state = MY_STATE_IDLE;
-                  print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-                  sendJobChangeEvent(start_events_gui_transmission_id, job_object);
-                }
-              }                 /* end if we have a task object */
-            }                   /* end while we have task list element to look at */
-
-            job_object->job_state = MY_STATE_TERMINATED;        /* job is done */
-            print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d terminated for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-            sendJobChangeEvent(start_events_gui_transmission_id, job_object);
-            print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d deleted for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-            sendJobRemoveEvent(start_events_gui_transmission_id, job_object);
-            delete_job_from_list(job_list, job_object); /* clean this job object and delete from its cluster */
-          } /* end if not found and was not previously in queue */
-          else {                /* job was found or not found but hasn't made it to queue yet */
-            job_object->job_found = 0;  /* reset for next pass */
-          }                     /* end if job was found or not found but hasn't made it to queue yet */
-        }                       /* end while we have job list element to look at */
-      }                         /* end while we have a job list table */
-    }
-  /* end if we have a clusters, nodes, etc */
-    pthread_mutex_unlock(&master_lock);
-
-    /*-----------------------------------------------------------------------* 
-     * sleep and loop again on the LoadLeveler machines.                     * 
-     *-----------------------------------------------------------------------*/
-    if (state_shutdown_requested == 0) {
-      int sleep_interval = 0;
-      int mini_sleep_interval = (job_sleep_seconds + 4) / 5;
-      print_message(INFO_MESSAGE, "%s Sleeping for (%d seconds) %d intervals of 5 seconds\n", __FUNCTION__, mini_sleep_interval * 5, mini_sleep_interval);
-      for (sleep_interval = 0; sleep_interval < mini_sleep_interval; sleep_interval++) {
-        if (state_shutdown_requested == 0) {
-          sleep(5);
-        }
-      }
-    }
-  }                             /* end while we are not shutting down */
-
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return NULL;
-}
-
-/************************************************************************* 
- * Retrieve a list of LoadLeveler clusters.                              * 
- * If no multicluster environment then return a list of 1 cluster.       *
- *************************************************************************/
-void refresh_cluster_list()
-{
-  int rc = 0;
-  int i = 0;
-  LL_element *query_elem = NULL;
-  LL_element *cluster = NULL;
-  int cluster_count = 0;
-  char *cluster_name = NULL;
-  int cluster_local = 0;
-  ClusterObject *cluster_object = NULL;
-  char workarea[512];
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-  if ((state_shutdown_requested == 0) && (state_events_active == 1)) {  /* if not shutting down */
-
-    if (multicluster_status == -1) {    /* if state not yet determined */
-      multicluster_status = get_multicluster_status();  /* are we running multicluster? */
-    }
-  /* end if state not yet determined */
-    switch (multicluster_status) {
-
-      /*-----------------------------------------------------------------------* 
-       * no contact with loadleveler yet                                       * 
-       *-----------------------------------------------------------------------*/
-      case -1:
-        break;
-
-      /*-----------------------------------------------------------------------* 
-       * single cluster and multi cluster                                      * 
-       *-----------------------------------------------------------------------*/
-      case 0:                  /* single cluster */
-        if (cluster_list == NULL) {     /* if no list obtained yet */
-          cluster_list = NewList();     /* create a new cluster list */
-          job_list = NewList(); /* create a new job list */
-        }
-      /* end if no list obtained yet */
-        print_message(INFO_MESSAGE, "Number of LoadLeveler Clusters=0 (not running multicluster).\n");
-        i = 0;
-        cluster_object = (ClusterObject *) malloc(sizeof(ClusterObject));
-        malloc_check(cluster_object, __FUNCTION__, __LINE__);
-        memset(cluster_object, '\0', sizeof(cluster_object));   /* zero the malloc area */
-        cluster_object->proxy_generated_cluster_id = generate_id();     /* a unique identifier for this cluster */
-        cluster_object->proxy_generated_queue_id = generate_id();       /* a unique identifier for this cluster */
-        cluster_object->cluster_state = MY_STATE_UP;    /* mark cluster object created */
-        cluster_object->queue_state = MY_STATE_UP;      /* mark queue object created */
-        memset(workarea, '\0', sizeof(workarea));       /* zero the area */
-        strcpy(workarea,"Local@");
-        strcat(workarea,hostname);
-        strcat(workarea," (not multicluster)");
-        cluster_object->cluster_name = strdup(workarea);      /* first cluster in the list is the local cluster (noname) */
-        cluster_object->cluster_is_local = 1;   /* this is a local cluster */
-        cluster_object->node_hash = HashCreate(1024);
-        print_message(INFO_MESSAGE, "Cluster name=%s\n", cluster_name);
-        AddToList(cluster_list, (void *) cluster_object);       /* add the new cluster object to the list */
-        print_message(INFO_MESSAGE, "Send event notification: PTP Machine added for LoadLeveler Cluster=%s.\n", cluster_name);
-        sendMachineAddEvent(start_events_gui_transmission_id, cluster_object);
-        print_message(INFO_MESSAGE, "Send event notification: PTP Queue added for LoadLeveler Cluster=%s.\n", cluster_name);
-        sendQueueAddEvent(start_events_gui_transmission_id, cluster_object);
-        break;
-
-      /*-----------------------------------------------------------------------* 
-       * multicluster                                                          * 
-       *-----------------------------------------------------------------------*/
-      case 1:                  /* multicluster */
-        if (cluster_list == NULL) {     /* if no list obtained yet */
-          cluster_list = NewList();     /* create a new cluster list */
-          job_list = NewList(); /* create a new job list */
-        }
-      /* end if no list obtained yet */
-        query_elem = NULL;
-
-        query_elem = my_ll_query(MCLUSTERS);
-
-        if (query_elem == NULL) {
-          print_message(ERROR_MESSAGE, "Unable to obtain query element. LoadLeveler may not be active.\n");
-          multicluster_status = -1;     /* we need to come in here again */
-          return;
-        }
-
-        print_message(INFO_MESSAGE, "Call LoadLeveler (ll_set_request) for clusters.\n");
-        rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-
-        if (rc != 0) {
-          rc = my_ll_deallocate(query_elem);
-          query_elem = NULL;
-          multicluster_status = -1;     /* we need to come in here again */
-          return;
-        }
-
-        print_message(INFO_MESSAGE, "Call LoadLeveler (ll_get_objs) for clusters.\n");
-        cluster = my_ll_get_objs(query_elem, LL_SCHEDD, NULL, &cluster_count, &rc);
-        if (rc != 0) {
-          rc = my_ll_deallocate(query_elem);
-          query_elem = NULL;
-          multicluster_status = -1;     /* we need to come in here again */
-          return;
-        }
-
-        print_message(INFO_MESSAGE, "Number of LoadLeveler Clusters=%d.\n", cluster_count);
-        i = 0;
-        while ((cluster != NULL) && (query_elem != NULL)) {
-          print_message(INFO_MESSAGE, "Cluster %d:\n", i);
-          rc = my_ll_get_data(cluster, LL_MClusterName, &cluster_name);
-          if (rc != 0) {
-            rc = my_ll_free_objs(query_elem);
-            rc = my_ll_deallocate(query_elem);
-            query_elem = NULL;
-            multicluster_status = -1;   /* we need to come in here again */
-            return;
-          } else {
-            cluster_object = (ClusterObject *) malloc(sizeof(ClusterObject));
-            malloc_check(cluster_object, __FUNCTION__, __LINE__);
-            memset(cluster_object, '\0', sizeof(cluster_object));       /* zero the malloc area */
-            cluster_object->proxy_generated_cluster_id = generate_id(); /* a unique identifier for this cluster */
-            cluster_object->proxy_generated_queue_id = generate_id();   /* a unique identifier for this cluster */
-            cluster_object->cluster_state = MY_STATE_UP;        /* mark cluster object created */
-            cluster_object->queue_state = MY_STATE_UP;  /* mark queue object created */
-            rc = my_ll_get_data(cluster, LL_MClusterLocal, &cluster_local);
-            cluster_object->cluster_name = strdup(cluster_name);        /* first cluster in the list is the local cluster (noname) */
-            if (cluster_local == 1) {
-              cluster_object->cluster_is_local = 1;     /* this is a local cluster */
-            }
-            cluster_object->node_hash = HashCreate(1024);
-            print_message(INFO_MESSAGE, "Cluster name=%s\n", cluster_name);
-            AddToList(cluster_list, (void *) cluster_object);   /* add the new cluster object to the list */
-            print_message(INFO_MESSAGE, "Send event notification: PTP Machine added for LoadLeveler Cluster=%s.\n", cluster_name);
-            sendMachineAddEvent(start_events_gui_transmission_id, cluster_object);
-            print_message(INFO_MESSAGE, "Send event notification: PTP Queue added for LoadLeveler Cluster=%s.\n", cluster_name);
-            sendQueueAddEvent(start_events_gui_transmission_id, cluster_object);
-          }
-
-          i++;
-          cluster = my_ll_next_obj(query_elem);
-        }
-
-        if (query_elem != NULL) {
-          rc = my_ll_free_objs(query_elem);
-          rc = my_ll_deallocate(query_elem);
-        }
-        query_elem = NULL;
-        break;
-
-    }                           /* end switch */
-
-  }                             /* end if not shutdown */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return;
-}
-
-/************************************************************************* 
- * Send OK Event to front end GUI                                        * 
- *************************************************************************/
-void sendOkEvent(int gui_transmission_id)
-{
-  proxy_msg *msg;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  msg = proxy_ok_event(gui_transmission_id);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * Send Shutdown Event to front end GUI                                  * 
- *************************************************************************/
-void sendShutdownEvent(int gui_transmission_id)
-{
-  proxy_msg *msg;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  msg = proxy_shutdown_event(gui_transmission_id);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * Send ERROR Event to front end GUI (error type and message)            * 
- *************************************************************************/
-void sendErrorEvent(int gui_transmission_id, int type, char *msgtext)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. type=%d. message=%s.\n", __FUNCTION__, __LINE__, type, msgtext);
-/* 
- * Send an error message to the front end
- */
-  proxy_msg *msg;
-  msg = new_proxy_msg(PROXY_EV_ERROR, gui_transmission_id);
-  proxy_msg_add_int(msg, type);
-  proxy_msg_add_string(msg, msgtext);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return;
-}
-
-/************************************************************************* 
- * Send job submission ERROR Event to front end GUI (error type and      *
- * message)                                                              * 
- *************************************************************************/
-void sendJobSubmissionErrorEvent(int gui_transmission_id, char *subid, char *msgtext)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. id=%s. message=%s.\n", __FUNCTION__, __LINE__, subid, msgtext);
-/* 
- * Send an error message to the front end
- */
-  proxy_msg *msg;
-  msg = proxy_submitjob_error_event(gui_transmission_id, subid, 0, msgtext);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return;
-}
-
-/************************************************************************* 
- * Send Configuration panel integer attribute Event to front end GUI     * 
- *************************************************************************/
-static int sendAttrDefIntEvent(int gui_transmission_id, char *attribute_id, char *attribute_shortname, char *attribute_description, int attribute_show, int attribute_default_value, int attribute_llimit, int attribute_ulimit)
-{
-  proxy_msg *msg;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. id=%s. name=%s. description=%s. default=%d. value1=%d. value2=%d.\n", __FUNCTION__, __LINE__, attribute_id, attribute_shortname, attribute_description, attribute_default_value, attribute_llimit, attribute_ulimit);
-  msg = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, gui_transmission_id);
-  proxy_msg_add_int(msg, 1);
-  proxy_msg_add_int(msg, 8);
-  proxy_msg_add_string(msg, attribute_id);
-  proxy_msg_add_string(msg, "INTEGER");
-  proxy_msg_add_string(msg, attribute_shortname);
-  proxy_msg_add_string(msg, attribute_description);
-  proxy_msg_add_int(msg, attribute_show);
-  proxy_msg_add_int(msg, attribute_default_value);
-  proxy_msg_add_int(msg, attribute_llimit);
-  proxy_msg_add_int(msg, attribute_ulimit);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * Send Configuration panel string attribute Event to front end GUI      * 
- *************************************************************************/
-static int sendAttrDefStringEvent(int gui_transmission_id, char *attribute_id, char *attribute_shortname, char *attribute_description, int attribute_show, char *attribute_value)
-{
-  proxy_msg *msg;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. id=%s. name=%s. description=%s. value=%s.\n", __FUNCTION__, __LINE__, attribute_id, attribute_shortname, attribute_description, attribute_value);
-  msg = proxy_attr_def_string_event(gui_transmission_id, attribute_id, attribute_shortname, attribute_description, attribute_show, attribute_value);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * Determine if LoadLeveler is configured multicluster.                  * 
- * If any errors then default to local. This code will not be called     * 
- * if the user has forced us to run local only or multicluster mode.     * 
- *************************************************************************/
-int get_multicluster_status()
-{
-  int rc = 0;
-  int i = 0;
-  LL_element *query_elem = NULL;
-  LL_element *cluster = NULL;
-  int cluster_count = 0;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-  if ((state_shutdown_requested == 0) && (state_events_active == 1)) {  /* if not shutting down and allowed to process events */
-
-    if (multicluster_status == -1) {    /* if state not yet determined */
-
-      query_elem = NULL;
-      query_elem = my_ll_query(CLUSTERS);
-
-      if (query_elem == NULL) {
-        print_message(ERROR_MESSAGE, "Unable to obtain query element. LoadLeveler may not be active.\n");
-        return -1;
-      }
-
-    /* Get information relating to LoadLeveler clusters.
-     * QUERY_ALL: we are querying for local cluster data  
-     * NULL: no filter needed 
-     * ALL_DATA: we want all the information available about the cluster */
-
-      print_message(INFO_MESSAGE, "Call LoadLeveler (ll_set_request) for cluster.\n");
-      rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-
-      print_message(INFO_MESSAGE, "Call LoadLeveler (ll_get_objs) for cluster.\n");
-      cluster = my_ll_get_objs(query_elem, LL_CM, NULL, &cluster_count, &rc);
-      if (rc < 0) {
-        rc = my_ll_deallocate(query_elem);
-        return -1;
-      }
-
-      print_message(INFO_MESSAGE, "Number of LoadLeveler Clusters=%d.\n", cluster_count);
-      i = 0;
-      if (cluster != NULL) {
-        print_message(INFO_MESSAGE, "Cluster %d:\n", i);
-        rc = my_ll_get_data(cluster, LL_ClusterMusterEnvironment, &multicluster_status);
-        if (rc != 0) {
-          print_message(ERROR_MESSAGE, "Error rc=%d trying to determine if LoadLeveler is running local or multicluster configuration. Defaulting to local cluster only (no multicluster).\n", rc);
-          multicluster_status = 0;      /* default to local */
-        } else {
-          print_message(INFO_MESSAGE, "Multicluster returned is = %d.\n", multicluster_status);
-        }
-
-      }
-
-    /* First we need to release the individual objects that were */
-    /* obtained by the query */
-      rc = my_ll_free_objs(query_elem);
-      rc = my_ll_deallocate(query_elem);
-    }                           /* end if state not yet determined */
-  }                             /* end if not shutdown */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return multicluster_status;
-}
-
-/************************************************************************* 
- * send cluster added event to gui (a cluster to LoadLeveler is a        * 
- * PTP machine to the gui)                                               * 
- *************************************************************************/
-static int sendMachineAddEvent(int gui_transmission_id, ClusterObject * cluster_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_cluster_id_string[256];
-  char *machine_state_to_report = MACHINE_STATE_UNKNOWN;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. cluster=%s. state=%d.\n", __FUNCTION__, __LINE__, cluster_object->cluster_name, cluster_object->cluster_state);
-  memset(proxy_generated_cluster_id_string, '\0', sizeof(proxy_generated_cluster_id_string));   /* zero the area */
-  sprintf(proxy_generated_cluster_id_string, "%d", cluster_object->proxy_generated_cluster_id);
-
-  switch (cluster_object->cluster_state) {
-    case MY_STATE_UP:
-      machine_state_to_report = MACHINE_STATE_UP;
-      break;
-    case MY_STATE_DOWN:
-      machine_state_to_report = MACHINE_STATE_DOWN;
-      break;
-    default:
-      machine_state_to_report = MACHINE_STATE_UNKNOWN;
-      break;
-  }
-  msg = proxy_new_machine_event(gui_transmission_id, ibmll_proxy_base_id_string, proxy_generated_cluster_id_string, cluster_object->cluster_name, machine_state_to_report);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send queue aqdded event to gui (one per cluster)                      * 
- *************************************************************************/
-static int sendQueueAddEvent(int gui_transmission_id, ClusterObject * cluster_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_queue_id_string[256];
-  char *queue_state_to_report = QUEUE_STATE_STOPPED;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. queue=%s. state=%d.\n", __FUNCTION__, __LINE__, cluster_object->cluster_name, cluster_object->queue_state);
-  memset(proxy_generated_queue_id_string, '\0', sizeof(proxy_generated_queue_id_string));       /* zero the area */
-  sprintf(proxy_generated_queue_id_string, "%d", cluster_object->proxy_generated_queue_id);
-
-  switch (cluster_object->cluster_state) {
-    case MY_STATE_UP:
-      queue_state_to_report = QUEUE_STATE_NORMAL;
-      break;
-    default:
-      queue_state_to_report = QUEUE_STATE_STOPPED;
-      break;
-  }
-
-  msg = proxy_new_queue_event(gui_transmission_id, ibmll_proxy_base_id_string, proxy_generated_queue_id_string, cluster_object->cluster_name, queue_state_to_report);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send node added event to gui                                          * 
- *************************************************************************/
-static int sendNodeAddEvent(int gui_transmission_id, ClusterObject * cluster_object, NodeObject * node_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_cluster_id_string[256];
-  char proxy_generated_node_id_string[256];
-  char *node_state_to_report = NODE_STATE_UNKNOWN;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. cluster=%s. node=%s. state=%d.\n", __FUNCTION__, __LINE__, cluster_object->cluster_name, node_object->node_name, node_object->node_state);
-  memset(proxy_generated_cluster_id_string, '\0', sizeof(proxy_generated_cluster_id_string));   /* zero the area */
-  memset(proxy_generated_node_id_string, '\0', sizeof(proxy_generated_node_id_string)); /* zero the area */
-  sprintf(proxy_generated_cluster_id_string, "%d", cluster_object->proxy_generated_cluster_id);
-  sprintf(proxy_generated_node_id_string, "%d", node_object->proxy_generated_node_id);
-
-  switch (node_object->node_state) {
-    case MY_STATE_UP:
-      node_state_to_report = NODE_STATE_UP;
-      break;
-    case MY_STATE_DOWN:
-      node_state_to_report = NODE_STATE_DOWN;
-      break;
-    default:
-      node_state_to_report = NODE_STATE_UNKNOWN;
-      break;
-  }
-
-  msg = proxy_new_node_event(gui_transmission_id, proxy_generated_cluster_id_string, 1);        /* 1==number new nodes in cluster */
-  proxy_add_node(msg, proxy_generated_node_id_string, node_object->node_name, node_state_to_report, 0); /* 0==extra attributes */
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send node changed event to gui                                        * 
- *************************************************************************/
-static int sendNodeChangeEvent(int gui_transmission_id, ClusterObject * cluster_object, NodeObject * node_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_node_id_string[256];
-  char *node_state_to_report = NODE_STATE_UNKNOWN;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. cluster=%s. node=%s. state=%d.\n", __FUNCTION__, __LINE__, cluster_object->cluster_name, node_object->node_name, node_object->node_state);
-  memset(proxy_generated_node_id_string, '\0', sizeof(proxy_generated_node_id_string)); /* zero the area */
-  sprintf(proxy_generated_node_id_string, "%d", node_object->proxy_generated_node_id);
-
-  switch (node_object->node_state) {
-    case MY_STATE_UP:
-      node_state_to_report = NODE_STATE_UP;
-      break;
-    case MY_STATE_DOWN:
-      node_state_to_report = NODE_STATE_DOWN;
-      break;
-    default:
-      node_state_to_report = NODE_STATE_UNKNOWN;
-      break;
-  }
-
-  msg = proxy_node_change_event(gui_transmission_id, proxy_generated_node_id_string, 1);        /* 1==number new nodes in cluster */
-  proxy_add_node(msg, proxy_generated_node_id_string, node_object->node_name, node_state_to_report, 0); /* 0==extra attributes */
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send node removed event to gui                                        * 
- *************************************************************************/
-static int sendNodeRemoveEvent(int gui_transmission_id, ClusterObject * cluster_object, NodeObject * node_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_node_id_string[256];
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. cluster=%s.\n", __FUNCTION__, __LINE__, cluster_object->cluster_name, node_object->node_name);
-  memset(proxy_generated_node_id_string, '\0', sizeof(proxy_generated_node_id_string)); /* zero the area */
-  sprintf(proxy_generated_node_id_string, "%d", node_object->proxy_generated_node_id);
-
-  msg = proxy_remove_node_event(gui_transmission_id, proxy_generated_node_id_string);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send job added event to gui                                           * 
- *************************************************************************/
-static int sendJobAddEvent(int gui_transmission_id, ClusterObject * cluster_object, JobObject * job_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_job_id_string[256];
-  char proxy_generated_queue_id_string[256];
-  char job_name_string[256];
-  char *job_state_to_report = JOB_STATE_INIT;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. state=%d.\n", __FUNCTION__, __LINE__, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->job_state);
-  memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));   /* zero the area */
-  memset(proxy_generated_queue_id_string, '\0', sizeof(proxy_generated_queue_id_string));       /* zero the area */
-  memset(job_name_string, '\0', sizeof(job_name_string));       /* zero the area */
-  sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-  sprintf(proxy_generated_queue_id_string, "%d", cluster_object->proxy_generated_queue_id);
-
-  switch (job_object->job_state) {
-    case MY_STATE_IDLE:
-      job_state_to_report = JOB_STATE_INIT;
-      break;
-    case MY_STATE_RUNNING:
-      job_state_to_report = JOB_STATE_RUNNING;
-      break;
-    case MY_STATE_STOPPED:
-      job_state_to_report = JOB_STATE_INIT;
-      break;
-    case MY_STATE_TERMINATED:
-      job_state_to_report = JOB_STATE_TERMINATED;
-      break;
-    default:
-      job_state_to_report = JOB_STATE_INIT;
-      break;
-  }
-
-  sprintf(job_name_string, "%s.%d.%d", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc);
-  msg = proxy_new_job_event(gui_transmission_id, proxy_generated_queue_id_string, proxy_generated_job_id_string, job_name_string, job_state_to_report, job_object->gui_assigned_job_id);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send job changed event to gui                                         * 
- *************************************************************************/
-static int sendJobChangeEvent(int gui_transmission_id, JobObject * job_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_job_id_string[256];
-  char job_state_string[256];
-  char *job_state_to_report = JOB_STATE_INIT;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. state=%d.\n", __FUNCTION__, __LINE__, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->job_state);
-  memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));   /* zero the area */
-  memset(job_state_string, '\0', sizeof(job_state_string));     /* zero the area */
-  sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-
-  switch (job_object->job_state) {
-    case MY_STATE_IDLE:
-      job_state_to_report = JOB_STATE_INIT;
-      break;
-    case MY_STATE_RUNNING:
-      job_state_to_report = JOB_STATE_RUNNING;
-      break;
-    case MY_STATE_STOPPED:
-      job_state_to_report = JOB_STATE_INIT;
-      break;
-    case MY_STATE_TERMINATED:
-      job_state_to_report = JOB_STATE_TERMINATED;
-      break;
-    default:
-      job_state_to_report = JOB_STATE_INIT;
-      break;
-  }
-
-  msg = proxy_job_change_event(gui_transmission_id, proxy_generated_job_id_string, 1);
-  sprintf(job_state_string, "%d", job_object->job_state);
-  proxy_add_string_attribute(msg, JOB_STATE_ATTR, job_state_to_report);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send job removed event to gui                                         * 
- *************************************************************************/
-static int sendJobRemoveEvent(int gui_transmission_id, JobObject * job_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_job_id_string[256];
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. state=%d.\n", __FUNCTION__, __LINE__, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->job_state);
-  memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));   /* zero the area */
-  sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-
-  msg = proxy_remove_job_event(gui_transmission_id, proxy_generated_job_id_string);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send task added event to gui                                          * 
- *************************************************************************/
-static int sendTaskAddEvent(int gui_transmission_id, ClusterObject * cluster_object, JobObject * job_object, TaskObject * task_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_job_id_string[256];
-  char proxy_generated_task_id_string[256];
-  char ll_task_id_string[256];
-  char *task_state_to_report = PROC_STATE_STOPPED;
-  NodeObject *node_object = NULL;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. node=%s. task=%d.\n", __FUNCTION__, __LINE__, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, task_object->node_name, task_object->ll_task_id);
-  memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));   /* zero the area */
-  memset(proxy_generated_task_id_string, '\0', sizeof(proxy_generated_task_id_string)); /* zero the area */
-  memset(ll_task_id_string, '\0', sizeof(ll_task_id_string));   /* zero the area */
-  sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-  sprintf(proxy_generated_task_id_string, "%d", task_object->proxy_generated_task_id);
-  sprintf(ll_task_id_string, "%d", task_object->ll_task_id);
-  msg = proxy_new_process_event(gui_transmission_id, proxy_generated_job_id_string, 1); /* 1 == num tasks */
-
-  switch (task_object->task_state) {
-    case MY_STATE_IDLE:
-      task_state_to_report = PROC_STATE_STARTING;
-      break;
-    case MY_STATE_RUNNING:
-      task_state_to_report = PROC_STATE_RUNNING;
-      break;
-    case MY_STATE_STOPPED:
-      task_state_to_report = PROC_STATE_STOPPED;
-      break;
-    case MY_STATE_TERMINATED:
-      task_state_to_report = PROC_STATE_EXITED;
-      break;
-    default:
-      task_state_to_report = PROC_STATE_STARTING;
-      break;
-  }
-
-
-  proxy_add_process(msg, proxy_generated_task_id_string, ll_task_id_string, task_state_to_report, 2);   /* 2=extra attrs */
-
-  node_object = get_node_in_hash(cluster_object->node_hash, task_object->node_name);
-  proxy_add_int_attribute(msg, PROC_NODEID_ATTR, node_object->proxy_generated_node_id); /* proxy node id */
-  proxy_add_int_attribute(msg, PROC_INDEX_ATTR, task_object->ll_task_id);       /* loadleveler task id */
-
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send task changed event to gui                                        * 
- *************************************************************************/
-static int sendTaskChangeEvent(int gui_transmission_id, JobObject * job_object, TaskObject * task_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_task_id_string[256];
-  char *task_state_to_report = PROC_STATE_STOPPED;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  memset(proxy_generated_task_id_string, '\0', sizeof(proxy_generated_task_id_string)); /* zero the area */
-  sprintf(proxy_generated_task_id_string, "%d", task_object->proxy_generated_task_id);
-  msg = proxy_process_change_event(gui_transmission_id, proxy_generated_task_id_string, 1);
-
-  switch (task_object->task_state) {
-    case MY_STATE_IDLE:
-      task_state_to_report = PROC_STATE_STARTING;
-      break;
-    case MY_STATE_RUNNING:
-      task_state_to_report = PROC_STATE_RUNNING;
-      break;
-    case MY_STATE_STOPPED:
-      task_state_to_report = PROC_STATE_STOPPED;
-      break;
-    case MY_STATE_TERMINATED:
-      task_state_to_report = PROC_STATE_EXITED;
-      break;
-    default:
-      task_state_to_report = PROC_STATE_STARTING;
-      break;
-  }
-
-  proxy_add_string_attribute(msg, PROC_STATE_ATTR, task_state_to_report);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * send task removed event to gui                                        * 
- *************************************************************************/
-static int sendTaskRemoveEvent(int gui_transmission_id, JobObject * job_object, TaskObject * task_object)
-{
-  proxy_msg *msg;
-  char proxy_generated_task_id_string[256];
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  memset(proxy_generated_task_id_string, '\0', sizeof(proxy_generated_task_id_string)); /* zero the area */
-  sprintf(proxy_generated_task_id_string, "%d", task_object->proxy_generated_task_id);
-  msg = proxy_remove_process_event(gui_transmission_id, proxy_generated_task_id_string);
-  enqueue_event_to_proxy_server(msg);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return 0;
-}
-
-/************************************************************************* 
- * Generate a unique id                                                  * 
- *************************************************************************/
-static int generate_id()
-{
-  return ibmll_proxy_base_id + ibmll_last_id++;
-}
-
-/************************************************************************* 
- * Send an event message (proxy_msg) to gui                              * 
- *************************************************************************/
-static void enqueue_event_to_proxy_server(proxy_msg * msg)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_proxy_message(msg);
-  pthread_mutex_lock(&proxy_svr_queue_msg_lock);
-  proxy_svr_queue_msg(ll_proxy, msg);
-  pthread_mutex_unlock(&proxy_svr_queue_msg_lock);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * Print command arguments from gui command calls                        * 
- *************************************************************************/
-void print_message_args(int nargs, char *optional_args[])
-{
-  int i = 0;
-  if (optional_args != NULL) {
-    while ((optional_args[i] != NULL) && (i < nargs)) {
-      print_message(ARGS_MESSAGE, " '%s'", optional_args[i++]);
-    }
-  }
-  print_message(ARGS_MESSAGE, "\n");
-}
-
-/************************************************************************* 
- * Proxy startup and command loop                                        * 
- *************************************************************************/
-int main(int argc, char *argv[])
-{
-  char *user_libpath = NULL;    /* final LoadLeveler lib path and
-                                 * shared library name */
-  char *host = "localhost";
-  char *proxy_str = DEFAULT_PROXY;
-  int ch;
-  int port = PROXY_TCP_PORT;
-  int rc;
-  struct passwd *pwd;
-  int i = 0;
-  char *cp = NULL;
-  int n = 0;
-
-  n = 0; /* prevent warning on linux for unsed var (used only on aix) */
-/* preprocess input args to set debug loop and message processing 
- * before we do any further processing */
-
-  for (i = 0; i < argc; i++) {
-    if (strstr(argv[i], "debug_loop=y") != NULL) {
-      state_debug_loop = 1;     /* turn on hard loop for attaching debugger */
-      continue;
-    }
-    if (strstr(argv[i], "trace_messages=y") != NULL) {
-      state_trace = 1;          /* turn on tracing messages */
-      continue;
-    }
-    if (strstr(argv[i], "info_messages=y") != NULL) {
-      state_info = 1;           /* turn on info messages */
-      continue;
-    }
-    if (strstr(argv[i], "warning_messages=y") != NULL) {
-      state_warning = 1;        /* turn on warning messages */
-      continue;
-    }
-    if (strstr(argv[i], "error_messages=y") != NULL) {
-      state_error = 1;          /* turn on error messages */
-      continue;
-    }
-    if (strstr(argv[i], "fatal_messages=y") != NULL) {
-      state_fatal = 1;          /* turn on fatal messages */
-      continue;
-    }
-    if (strstr(argv[i], "args_messages=y") != NULL) {
-      state_args = 1;           /* turn on args messages */
-      continue;
-    }
-  }
-
-
-  register_thread(pthread_self());
-
-/* set following directive to "if 1" and recompile to turn on debug, "if 0" and recompile to turn off debug */
-  if (state_debug_loop) {
-    int debug_loop = 1;
-    while (debug_loop > 0) {
-      if ((debug_loop % 60) == 1) {
-        print_message(INFO_MESSAGE, "Debug loop - attach debugger, set breakpoints and then change debug_loop to 0 to continue.\n");
-      }
-      debug_loop++;
-      sleep(1);
-    }
-  }
-
-  gethostname(hostname,sizeof(hostname));
-  cp = strchr(hostname, '.');
-  if (cp != NULL) {
-      *cp = '\0';
-  }
-  
-  for (i = 0; i < argc; i++) {
-    print_message(INFO_MESSAGE, "Main called with arg[%d]=%s.\n", i, argv[i]);
-  }
-
-  pwd = getpwuid(getuid());
-  userid = strdup(pwd->pw_name);
-
-#ifdef __linux__  
-  while ((ch = getopt_long(argc, argv, "P:p:h:l:d:t:i:w:e:f:a:m:o:r:x:y:z:", longopts, NULL)) != -1) {
-    switch (ch) {
-      case 'P':
-        proxy_str = strdup(optarg);
-        break;
-      case 'p':
-        port = atoi(optarg);
-        break;
-      case 'g':
-        debug_level = atoi(optarg);
-        break;
-      case 'h':
-        host = strdup(optarg);
-        break;
-      case 'l':
-        user_libpath = strdup(optarg);  /* user has specified override full path to LoadLeveler shared library */
-        break;
-      case 'm':
-        if (strncmp(optarg, "y", 1) == 0) {     /* y - multicluster forced on */
-          multicluster_status = 1;      /* force multicluster */
-        } else if (strncmp(optarg, "n", 1) == 0) {      /* n - multicluster forced off */
-          multicluster_status = 0;      /* force local */
-        } else {                /* d - default to LoadLeveler determine multicluster state */
-          multicluster_status = -1;     /* allow LoadLeveler to determine mode */
-        }
-        break;
-      case 'o':
-        static_template_override = strdup(optarg);      /* user supplied template file name */
-        break;
-      case 'r':
-        if (strncmp(optarg, "y", 1) == 0) {     /* write template file always (at main startup) */
-          state_template = 1;   /* write template at every main startup */
-        } else {                /* n - do not write default template file */
-          state_template = 0;   /* never write template file */
-        }
-        break;
-      case 'd':                /* already preprocessed */
-      case 't':                /* already preprocessed */
-      case 'i':                /* already preprocessed */
-      case 'w':                /* already preprocessed */
-      case 'e':                /* already preprocessed */
-      case 'f':                /* already preprocessed */
-      case 'a':                /* already preprocessed */
-        break;
-      case 'x':                /* min node polling */
-        min_node_sleep_seconds = atoi(optarg);
-        break;
-      case 'y':                /* max node polling */
-        max_node_sleep_seconds = atoi(optarg);
-        break;
-      case 'z':                /* job polling */
-        job_sleep_seconds = atoi(optarg);
-        break;
-      default:
-        print_message(ERROR_MESSAGE, "%s [--Proxy=proxy] [--host=host_name] [--port=port] [--debug=level] [--lib_override=directory] [--debug_loop=y|n] [--trace_messages=y|n] [--info_messages=y|n] [--warning_messages=y|n] [--error_messages=y|n] [--fatal_messages=y|n] [--args_messages=y|n] [--multicluster=d|n|y] [--template_override=file] [--template_write=y|n] --node_polling_min=value --node_polling_max=value --job_polling=value \n", argv[0]);
-        fflush(stderr);
-        return 1;
-    }
-  }
-#else
- /* AIX does not have the getopt_long function. Since the proxy is
-  * invoked only by the PTP front end, the following simplified options
-  * parsing is sufficient.
-  * Make sure that this is maintained in sync with the above
-  * getopt_long loop.
-  */
-n = 1;
-while (n < argc) {
- cp = strchr(argv[n], '=');
- if (cp != NULL) {
-     *cp = '\0';
-     if (strcmp(argv[n], "--proxy") == 0) {
-         proxy_str = strdup(cp + 1);
-         n = n + 1;
-     }
-     else if (strcmp(argv[n], "--port") == 0) {
-         port = atoi(cp + 1);
-         n = n + 1;
-     }
-     else if (strcmp(argv[n], "--host") == 0) {
-         host = strdup(cp + 1);
-         n = n + 1;
-     }
-     else if (strcmp(argv[n], "--lib_override") == 0) {
-    	 user_libpath = strdup(cp + 1);  /* user has specified override full path to LoadLeveler shared library */
-              n = n + 1;
-          }
-     else if (strcmp(argv[n], "--multicluster") == 0) {
-    	 if (strncmp(cp + 1, "y", 1) == 0) {     /* y - multicluster forced on */
-    	           multicluster_status = 1;      /* force multicluster */
-    	         } else if (strncmp(cp + 1, "n", 1) == 0) {      /* n - multicluster forced off */
-    	           multicluster_status = 0;      /* force local */
-    	         } else {                /* d - default to LoadLeveler determine multicluster state */
-    	           multicluster_status = -1;     /* allow LoadLeveler to determine mode */
-    	         }
-                   n = n + 1;
-               }
-     else if (strcmp(argv[n], "--template_override") == 0) {
-    	 static_template_override = strdup(cp + 1);      /* user supplied template file name */
-                   n = n + 1;
-               }
-     else if (strcmp(argv[n], "--template_write") == 0) {
-    	 if (strncmp(cp + 1, "y", 1) == 0) {     /* write template file always (at main startup) */
-    	           state_template = 1;   /* write template at every main startup */
-    	         } else {                /* n - do not write default template file */
-    	           state_template = 0;   /* never write template file */
-    	         }
-                   n = n + 1;
-               }
-     else if ((strcmp(argv[n], "--debug_loop") == 0) || /* already preprocessed */
-    	      (strcmp(argv[n], "--trace_messages") == 0) || /* already preprocessed */
-    	      (strcmp(argv[n], "--info_messages") == 0) || /* already preprocessed */
-    	      (strcmp(argv[n], "--warning_messages") == 0) || /* already preprocessed */
-    	      (strcmp(argv[n], "--error_messages") == 0) || /* already preprocessed */
-    	      (strcmp(argv[n], "--fatal_messages") == 0) || /* already preprocessed */
-    		  (strcmp(argv[n], "--args_messages") == 0)) { /* already preprocessed */
-                   n = n + 1;
-               }
-     else if (strcmp(argv[n], "--node_polling_min") == 0) {
-    	 min_node_sleep_seconds = atoi(cp + 1);
-                   n = n + 1;
-               }
-     else if (strcmp(argv[n], "--node_polling_max") == 0) {
-    	 max_node_sleep_seconds = atoi(cp + 1);
-                   n = n + 1;
-               }
-     else if (strcmp(argv[n], "--debug") == 0) {
-     	    debug_level = atoi(cp + 1);
-     		n = n + 1;
-     	    }
-     else if (strcmp(argv[n], "--job_polling") == 0) {
-    	  job_sleep_seconds = atoi(cp + 1);
-                   n = n + 1;
-               }
-     else {
-         print_message(ERROR_MESSAGE, "Invalid argument %s (%d)\n", argv[n], n);
-         print_message(ERROR_MESSAGE, "%s [--Proxy=proxy] [--host=host_name] [--port=port] [--lib_override=directory] [--debug_loop=y|n] [--trace_messages=y|n] [--info_messages=y|n] [--warning_messages=y|n] [--error_messages=y|n] [--fatal_messages=y|n] [--args_messages=y|n] [--multicluster=d|n|y] [--template_override=file] [--template_write=y|n] --node_polling_min=value --node_polling_max=value --job_polling=value \n", argv[0]);
-               fflush(stderr);
-         return 1;
-     }
- }
-}
- 
-#endif
-  ptp_signal_exit = 0;
-  ptp_signal_thread = -1;
-  signal(SIGINT, ptp_signal_handler);
-  signal(SIGHUP, ptp_signal_handler);
-  signal(SIGILL, ptp_signal_handler);
-  signal(SIGSEGV, ptp_signal_handler);
-  signal(SIGTERM, ptp_signal_handler);
-  signal(SIGQUIT, ptp_signal_handler);
-  signal(SIGABRT, ptp_signal_handler);
-  rc = server(proxy_str, host, port, user_libpath);
-  state_shutdown_requested = 1;
-  exit(rc);
-}
-
-/************************************************************************* 
- * Handle a signal                                                       * 
- *************************************************************************/
-RETSIGTYPE ptp_signal_handler(int sig)
-{
-  ptp_signal_exit = sig;
-  ptp_signal_thread = find_thread(pthread_self());
-  if (sig >= 0 && sig < NSIG) {
-    RETSIGTYPE(*saved_signal) (int) = saved_signals[sig];
-    if (saved_signal != SIG_ERR && saved_signal != SIG_IGN && saved_signal != SIG_DFL) {
-      saved_signal(sig);
-    }
-  }
-}
-
-
-/************************************************************************* 
- * Print message (with time and date and thread id)                      * 
- * Info, Trace, Arg and Warning messages go to stdout.                   * 
- * Error and Fatal messages go to stderr.                                * 
- *************************************************************************/
-static void print_message(int type, const char *format, ...)
-{
-  va_list ap;
-  char timebuf[20];
-  time_t my_clock;
-  struct tm a_tm;
-  int thread_id = 0;
-
-  memset(timebuf, '\0', sizeof(timebuf));       /* zero the area */
-  pthread_mutex_lock(&print_message_lock);
-  pthread_t tid = pthread_self();       /* what thread am I ? */
-  for (thread_id = 0; thread_id < (sizeof(thread_map_table) / sizeof(pthread_t)); thread_id++) {
-    if (tid == thread_map_table[thread_id]) {
-      break;
-    }
-  }
-  time(&my_clock);                 /* what time is it ? */
-  localtime_r(&my_clock, &a_tm);
-  strftime(&timebuf[0], 15, "%m/%d %02H:%02M:%02S", &a_tm);
-
-  va_start(ap, format);
-  switch (type) {
-    case INFO_MESSAGE:
-      if (state_info == 1) {    /* if info messages allowed */
-        if (state_message_timedate != 0) {
-          fprintf(stdout, "%s ", timebuf);
-        }
-        if (state_message_threadid != 0) {
-          fprintf(stdout, "T(%d) ", thread_id);
-        }
-        fprintf(stdout, "Info: ");
-        vfprintf(stdout, format, ap);
-        fflush(stdout);
-      }
-      break;
-    case TRACE_MESSAGE:
-      if (state_trace == 1) {   /* if trace messages allowed */
-        if (state_message_timedate != 0) {
-          fprintf(stdout, "%s ", timebuf);
-        }
-        if (state_message_threadid != 0) {
-          fprintf(stdout, "T(%d) ", thread_id);
-        }
-        fprintf(stdout, "Trace: ");
-        vfprintf(stdout, format, ap);
-        fflush(stdout);
-      }
-      break;
-    case WARNING_MESSAGE:
-      if (state_warning == 1) { /* if warning messages allowed */
-        if (state_message_timedate != 0) {
-          fprintf(stdout, "%s ", timebuf);
-        }
-        if (state_message_threadid != 0) {
-          fprintf(stdout, "T(%d) ", thread_id);
-        }
-        fprintf(stdout, "Warning: ");
-        vfprintf(stdout, format, ap);
-        fflush(stdout);
-      }
-      break;
-    case ERROR_MESSAGE:
-      if (state_error == 1) {   /* if error messages allowed */
-        if (state_message_timedate != 0) {
-          fprintf(stderr, "%s ", timebuf);
-        }
-        if (state_message_threadid != 0) {
-          fprintf(stderr, "T(%d) ", thread_id);
-        }
-        fprintf(stderr, "Error: ");
-        vfprintf(stderr, format, ap);
-        fflush(stderr);
-      }
-      break;
-    case FATAL_MESSAGE:        /* fatal messages are never suppressed */
-      if (state_fatal == 1) {   /* if fatal messages allowed */
-        if (state_message_timedate != 0) {
-          fprintf(stderr, "%s ", timebuf);
-        }
-        if (state_message_threadid != 0) {
-          fprintf(stderr, "T(%d) ", thread_id);
-        }
-        fprintf(stderr, "Fatal: ");
-        vfprintf(stderr, format, ap);
-        fflush(stderr);
-      }
-      break;
-    case ARGS_MESSAGE:
-      if (state_args == 1) {    /* if formatted arg messages are allowed */
-        if (state_message_timedate != 0) {
-          fprintf(stdout, "%s ", timebuf);
-        }
-        if (state_message_threadid != 0) {
-          fprintf(stdout, "T(%d) ", thread_id);
-        }
-        fprintf(stdout, "Args: ");
-        vfprintf(stdout, format, ap);
-        fprintf(stdout, "\n");
-        fflush(stdout);
-      }
-      break;
-    default:                   /* unknown message type - allow it */
-      if (state_message_timedate != 0) {
-        fprintf(stdout, "%s ", timebuf);
-      }
-      if (state_message_threadid != 0) {
-        fprintf(stdout, "T(%d) ", thread_id);
-      }
-      fprintf(stdout, ": ");
-      vfprintf(stdout, format, ap);
-      fflush(stdout);
-      break;
-  }
-
-  va_end(ap);
-
-  pthread_mutex_unlock(&print_message_lock);
-}
-
-/************************************************************************* 
- * main proxy processing                                                 * 
- *************************************************************************/
-int server(char *name, char *host, int port, char *user_libpath)
-{
-/* 
- * Initialize the proxy, connect to front end, then run the main loop
- * until the proxy is requested to shut down.
- */
-  char shared_buffer[1024];
-  char *msg1 = NULL;
-  char *msg2 = NULL;
-  int rc = 0;
-  struct timeval timeout = {
-    0, 20000
-  };
-  int lib_found = 0;
-  int status = 0;
-  struct stat statinfo;
-  int i = 0;
-  int save_errno = 0;
-  int connect_rc=0;
-#ifdef  __linux__
-  char *libpath[] = {
-    NULL, "/opt/ibmll/LoadL/full/lib/", "/opt/ibmll/LoadL/so/lib/", (char *) -1
-  };
-  char *libname = "libllapi.so";
-#else
-  char *libpath[] = {
-    NULL, "/usr/lpp/LoadL/full/lib", "/usr/lpp/LoadL/so/lib", "/opt/ibmll/LoadL/full/lib/", "/opt/ibmll/LoadL/so/lib/", (char *) -1
-  };
-  char *libname = "libllapi.a";
-#endif
-  int template_write = 1;       /* preset to write */
-  FILE *template_FILE = NULL;
-  int template_count = 0;
-
-  memset(shared_buffer, '\0', sizeof(shared_buffer));   /* zero the area */
-  memset(static_template_name, '\0', sizeof(static_template_name));     /* zero the area */
-
-  /*-----------------------------------------------------------------------* 
-   *                                                                       * 
-   * Find the LoadLeveler shared library we are using for AIX or Linux.    *
-   * If we cannot find it then LoadLeveler is not installed or we have     * 
-   *  been directed to use the wrong path.  If we find it OK then we will  *
-   * try to dynamic open the library and compare versions later in the     *
-   * command_initialize.                                                   * 
-   *-----------------------------------------------------------------------*/
-  if (user_libpath != NULL) {   /* if user specified lib */
-    if (strlen(user_libpath) > 0) {     /* if not a null string */
-      libpath[0] = user_libpath;        /* pick up user specified libpath
-                                         * as only one to check */
-      libpath[1] = (char *) -1; /* new end of list */
-    }
-  }
-
-  lib_found = 0;                /* preset to not found */
-  print_message(INFO_MESSAGE, "Searching for LoadLeveler shared library.\n");
-  while ((libpath[i] != (char *) -1) && (lib_found == 0)) {     /* if not end of list and not yet found */
-    if (libpath[i] != NULL) {   /* if valid entry */
-      strcpy(shared_buffer, libpath[i]);
-      strcat(shared_buffer, "/");
-      strcat(shared_buffer, libname);
-    /* see if this is a valid LoadLeveler shared library */
-      print_message(INFO_MESSAGE, "Trying: %s\n", shared_buffer);
-      status = stat(shared_buffer, &statinfo);
-      save_errno = errno;
-      if (status == 0) {
-#ifdef _AIX
-      strcat(shared_buffer,"(shr.o)");
-#endif
-        ibmll_libpath_name = strdup(shared_buffer);
-        print_message(INFO_MESSAGE, "Successful search: Found LoadLeveler shared library %s\n", ibmll_libpath_name);
-        lib_found = 1;          /* we found it */
-        break;
-      } else {
-        print_message(ERROR_MESSAGE, "Search failure: \"stat\" of LoadLeveler shared library %s returned errno=%d.\n", shared_buffer, save_errno);
-      }
-    }
-    i++;
-  }
-
-  if (lib_found == 0) {
-    print_message(FATAL_MESSAGE, "No LoadLeveler shared library found - quitting...\n");
-    state_shutdown_requested = 1;
-    exit(99);
-  }
-
-  /*-----------------------------------------------------------------------* 
-   * If allowed, write the template file to /tmp                           *
-   * Template file will be saved with userid as                            *
-   * /tmp/PTP_IBMLL_TEMPLATE_userid                                        *
-   *-----------------------------------------------------------------------*/
-  switch (state_template) {
-    case 0:                    /* do not write template file */
-      template_write = 0;
-      break;
-    case 1:                    /* always write template file */
-    default:
-      template_write = 1;
-      break;
-  }
-
-  if (template_write == 1) {
-    strcpy(&static_template_name[0], static_template_prefix);
-    strcpy(&static_template_name[strlen(static_template_prefix)], userid);
-    print_message(INFO_MESSAGE, "Writing job command template file %s.\n", static_template_name);
-
-    template_FILE = fopen(static_template_name, "w");   /* reset file length to 0 or create file */
-    template_count = sizeof(job_command_file_template) / sizeof(job_command_file_template[0]);
-
-    for (i = 0; i < template_count; i++) {
-      fputs(job_command_file_template[i], template_FILE);
-      fputs("\n", template_FILE);
-    }
-    fclose(template_FILE);
-
-  }
-
-  /*-----------------------------------------------------------------------* 
-   * continue proxy initialization                                         *
-   *-----------------------------------------------------------------------*/
-  events = NewList();
-  if (proxy_svr_init(name, &timeout, &helper_funcs, &command_tab, &ll_proxy) != PROXY_RES_OK) {
-    return 0;
-  }
-
-  if ((connect_rc = proxy_svr_connect(ll_proxy, host, port)) == PROXY_RES_OK) {
-  print_message(INFO_MESSAGE, "Running proxy on port %d.\n", port);
-  while (ptp_signal_exit == 0 && state_shutdown_requested == 0) {
-    if ((proxy_svr_progress(ll_proxy) != PROXY_RES_OK)) {
-      print_message(INFO_MESSAGE, "Ending node monitor loop\n");
-      break;
-    }
-  }
-
-  if (ptp_signal_exit != 0) {
-    switch (ptp_signal_exit) {
-      case SIGINT:
-        msg1 = "INT";
-        msg2 = "Interrupt";
-        break;
-      case SIGHUP:
-        msg1 = "HUP";
-        msg2 = "Hangup";
-        break;
-      case SIGILL:
-        msg1 = "ILL";
-        msg2 = "Illegal Instruction";
-        break;
-      case SIGSEGV:
-        msg1 = "SEGV";
-        msg2 = "Segmentation Violation";
-        break;
-      case SIGTERM:
-        msg1 = "TERM";
-        msg2 = "Termination";
-        break;
-      case SIGQUIT:
-        msg1 = "QUIT";
-        msg2 = "Quit";
-        break;
-      case SIGABRT:
-        msg1 = "ABRT";
-        msg2 = "Process Aborted";
-        break;
-      default:
-        msg1 = "***UNKNOWN SIGNAL***";
-        msg2 = "ERROR - UNKNOWN SIGNAL";
-        break;
-    }
-    print_message(FATAL_MESSAGE, "###### SIGNAL: %i (%s) detected in T(%i)\n", ptp_signal_exit, msg1, ptp_signal_thread);
-    print_message(FATAL_MESSAGE, "###### Shutting down proxy\n");
-    print_message(FATAL_MESSAGE, "ptp_ibmll_proxy received signal %s (%s) and is exiting.\n", msg1, msg2);
-  /* our return code = the signal that fired */
-    rc = ptp_signal_exit;
-  }
-  }
-  else {
-   print_message(ERROR_MESSAGE,"proxy connection failed. rc=%d\n",connect_rc);
-  }
-  proxy_svr_finish(ll_proxy);
-  print_message(INFO_MESSAGE, "proxy_svr_finish returned.\n");
-  state_shutdown_requested = 1;
-  return rc;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to retrieve the cluster element                      * 
- *************************************************************************/
-int my_ll_cluster(int version, LL_element ** errObj, LL_cluster_param * cp)
-{
-  int rc = 0;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. version=%d.\n", __FUNCTION__, __LINE__, version);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  rc = (*LL_SYMS.ll_cluster) (version, errObj, cp);     /* set the cluster name */
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (rc != 0) {
-    print_message(INFO_MESSAGE, "LoadLeveler ll_cluster rc=%d.\n", rc);
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-  return rc;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to get data                                          * 
- *************************************************************************/
-int my_ll_get_data(LL_element * request, enum LLAPI_Specification spec, void *result)
-{
-  int rc = 0;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. LLAPI_Specification=%d.\n", __FUNCTION__, __LINE__, spec);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  rc = (*LL_SYMS.ll_get_data) (request, spec, result);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (rc != 0) {
-    print_message(INFO_MESSAGE, "LoadLeveler ll_get_data rc=%d.\n", rc);
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-  return rc;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to perform a query                                   * 
- *************************************************************************/
-LL_element *my_ll_query(enum QueryType type)
-{
-  LL_element *query_elem = NULL;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. QueryType=%d.\n", __FUNCTION__, __LINE__, type);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  query_elem = (*LL_SYMS.ll_query) (type);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (query_elem == NULL) {
-    print_message(INFO_MESSAGE, "LoadLeveler ll_query element=NULL. End of list was probably reached.\n");
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return query_elem;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to free the objects in the query element             * 
- *************************************************************************/
-int my_ll_free_objs(LL_element * query_elem)
-{
-  int rc = 0;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  rc = (*LL_SYMS.ll_free_objs) (query_elem);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (rc != 0) {
-    print_message(ERROR_MESSAGE, "LoadLeveler ll_free_objs rc=%d.\n", rc);
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-  return rc;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to deallocate the query element                      * 
- *************************************************************************/
-int my_ll_deallocate(LL_element * query_elem)
-{
-  int rc = 0;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  rc = (*LL_SYMS.ll_deallocate) (query_elem);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (rc != 0) {
-    print_message(ERROR_MESSAGE, "LoadLeveler ll_deallocate rc=%d.\n", rc);
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-  return rc;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to get the next object from the returned list        * 
- *************************************************************************/
-LL_element *my_ll_next_obj(LL_element * query_elem)
-{
-  LL_element *next_elem = NULL;;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  next_elem = (*LL_SYMS.ll_next_obj) (query_elem);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (next_elem == NULL) {
-    print_message(INFO_MESSAGE, "LoadLeveler ll_next_obj element=NULL. End of list was probably reached.\n");
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-  return next_elem;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to get objects from the previously returned element  * 
- *************************************************************************/
-LL_element *my_ll_get_objs(LL_element * query_elem, enum LL_Daemon daemon, char *ignore, int *value, int *rc)
-{
-  *rc = 0;                      /* preset rc to 0 */
-  LL_element *ret_object = NULL;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. LL_Daemon=%d.\n", __FUNCTION__, __LINE__, daemon);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  ret_object = LL_SYMS.ll_get_objs(query_elem, daemon, ignore, value, rc);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (ret_object == NULL) {
-    print_message(INFO_MESSAGE, "LoadLeveler ll_get_objs element=NULL. End of list was probably reached.\n");
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, *rc);
-  return ret_object;
-}
-
-/************************************************************************* 
- *  Call LoadLeveler to build a request object for a subsequent call     * 
- *************************************************************************/
-int my_ll_set_request(LL_element * query_elem, enum QueryFlags qflags, char **ignore, enum DataFilter dfilter)
-{
-  int rc = 0;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. QueryFlags=%d.\n", __FUNCTION__, __LINE__, qflags);
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  rc = LL_SYMS.ll_set_request(query_elem, qflags, ignore, dfilter);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (rc != 0) {
-    print_message(ERROR_MESSAGE, "LoadLeveler ll_set_request rc=%i.\n", rc);
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-  return rc;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to submit a job                                      * 
- *                                                                       * 
- * In the proxy we are accepting environment variables to be passed on   * 
- * to submit by forking the submit and making sure we se the env vars    * 
- * into the environment.                                                 * 
- *************************************************************************/
-int my_ll_submit_job(int gui_transmission_id, char *job_sub_id, char *command_file, char *job_env_vars[][3])
-{
-  LL_job job_info;
-  LL_job_step *job_step_info;
-  JobObject *job_object = NULL;
-  int submit_rc = 0;
-  LL_cluster_param cluster_parm;
-  LL_element *errObj = NULL;
-  int i = 0;
-  ClusterObject *cluster_object = NULL;
-  ListElement *cluster_list_element = NULL;
-  time_t my_clock;
-  char *tempstring = NULL;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  memset(&job_info, '\0', sizeof(job_info));    /* zero the job info area */
-
-  pthread_mutex_lock(&master_lock);
-  cluster_list_element = cluster_list->l_head;  /* always submit to the first cluster */
-  cluster_object = cluster_list_element->l_value;       /* get our cluster object from this list element */
-
-  /*-----------------------------------------------------------------------* 
-   * always submit local regardless if running multicluster or not         * 
-   *-----------------------------------------------------------------------*/
-  print_message(INFO_MESSAGE, "Setting access for LoadLeveler local cluster (single cluster).\n");
-  cluster_parm.action = CLUSTER_UNSET;  /* we are unsetting the cluster */
-  cluster_parm.cluster_list = NULL;
-  submit_rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);    /* unset the cluster name - back to local */
-
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-
-  /*-----------------------------------------------------------------------* 
-   * retrieve environment variables                                        * 
-   *-----------------------------------------------------------------------*/
-  i = 0;
-  while (job_env_vars[i][0] != NULL) {  /* if keyword */
-    tempstring = getenv(job_env_vars[i][0]);
-    if (tempstring != NULL) {
-      print_message(INFO_MESSAGE, "Retrieving env var %s=%s.\n", job_env_vars[i][0], tempstring);
-      job_env_vars[i][2] = strdup(tempstring);  /* if old value */
-    }
-    i++;
-  }
-
-  /*-----------------------------------------------------------------------* 
-   * write new environment variables                                       * 
-   *-----------------------------------------------------------------------*/
-  i = 0;
-  while (job_env_vars[i][0] != NULL) {  /* if keyword */
-    if (job_env_vars[i][1] != NULL) {   /* if new value */
-      if ((job_env_vars[i][2] == NULL) ||       /* if no old val */
-          ((job_env_vars[i][2] != NULL) &&      /* or if we had old value and different than new */
-           (strcmp(job_env_vars[i][1], job_env_vars[i][2]) != 0))) {    /* and if old and new not identical */
-        print_message(INFO_MESSAGE, "Setting env var %s=%s.\n", job_env_vars[i][0], job_env_vars[i][1]);
-        setenv(job_env_vars[i][0], job_env_vars[i][1], 1);      /* set the new value */
-      }
-    }
-    i++;
-  }
-
-  /*-----------------------------------------------------------------------* 
-   * submit job                                                            * 
-   *-----------------------------------------------------------------------*/
-  submit_rc = LL_SYMS.ll_submit_job(command_file, NULL, NULL, &job_info, LL_JOB_VERSION);
-  if (submit_rc == -1) {
-    char *theError = LL_SYMS.ll_error(NULL, 3); /* print any internal errors */
-    print_message(ERROR_MESSAGE, "Internal errors (if any) returned by LoadLeveler submit API:\n%s\n\n", theError);
-  }
-
-  /*-----------------------------------------------------------------------* 
-   * restore environment variables                                         * 
-   *-----------------------------------------------------------------------*/
-  i = 0;
-
-  while (job_env_vars[i][0] != NULL) {  /* if keyword */
-    if (job_env_vars[i][1] != NULL) {   /* if new value */
-
-      if (job_env_vars[i][2] != NULL) { /* if we had old value */
-        if (strcmp(job_env_vars[i][1], job_env_vars[i][2]) != 0) {      /* and if old and new not identical */
-          print_message(INFO_MESSAGE, "Restoring env var %s=%s.\n", job_env_vars[i][0], job_env_vars[i][2]);
-          setenv(job_env_vars[i][0], job_env_vars[i][2], 1);    /* restore old value back into environment */
-        }
-      } /* end if we had old value */
-      else {                    /* if new only - no old */
-        print_message(INFO_MESSAGE, "Unsetting env var %s.\n", job_env_vars[i][0]);
-        unsetenv(job_env_vars[i][0]);   /* unset new value we put in environment */
-      }                         /* end if new value only */
-
-    }                           /* end if we had a new value */
-    i++;
-  }                             /* end while loop on keywords */
-
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (submit_rc != 0) {
-    print_message(ERROR_MESSAGE, "LoadLeveler ll_submit_job rc=%i.\n", submit_rc);
-  } else {
-    print_message(INFO_MESSAGE, "Job Submitted: job_name=%s submithost=%s owner=%s steps=%d.\n", job_info.job_name, job_info.submit_host, job_info.owner, job_info.steps);
-
-    time(&my_clock);               /* what time is it ? */
-
-    for (i = 0; i < job_info.steps; i++) {
-      job_step_info = job_info.step_list[i];
-      print_message(INFO_MESSAGE, "Job step:  step_name=%s. step_class=%s. step_id=%s.%d.%d\n", job_step_info->step_name, job_step_info->stepclass, job_step_info->id.from_host, job_step_info->id.cluster, job_step_info->id.proc);
-
-    /*-----------------------------------------------------------------------* 
-     * create new job object for submitted job                               * 
-     *-----------------------------------------------------------------------*/
-      job_object = (JobObject *) malloc(sizeof(JobObject));
-      malloc_check(job_object, __FUNCTION__, __LINE__);
-      memset(job_object, '\0', sizeof(job_object));     /* zero the malloc area */
-      job_object->proxy_generated_job_id = generate_id();       /* a unique identifier for this cluster */
-      job_object->gui_assigned_job_id = "-1";   /* preset to async id (2 - n) */
-      if (i == 0) {             /* if first */
-        job_object->gui_assigned_job_id = job_sub_id;   /* pick up the parsed jobid for the first jobstep in job */
-      }                         /* end if first */
-      job_object->ll_step_id.from_host = strdup(job_step_info->id.from_host);
-      job_object->ll_step_id.cluster = job_step_info->id.cluster;
-      job_object->ll_step_id.proc = job_step_info->id.proc;
-      job_object->task_list = NewList();        /* list to hold tasks for this job step */
-      job_object->cluster_name = strdup(cluster_object->cluster_name);
-      job_object->job_state = MY_STATE_IDLE;
-      job_object->job_submit_time = my_clock;      /* time since epoch when job submitted */
-      add_job_to_list(job_list, (void *) job_object);   /* add the new job object to the list */
-      print_message(INFO_MESSAGE, "Schedule event notification: Job=%s.%d.%d added for LoadLeveler Cluster=%s.\n", job_object->ll_step_id.from_host, job_object->ll_step_id.cluster, job_object->ll_step_id.proc, job_object->cluster_name);
-      sendJobAddEvent(start_events_gui_transmission_id, cluster_object, job_object);
-    }
-
-    my_ll_free_job_info(&job_info);
-  }
-
-  pthread_mutex_unlock(&master_lock);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, submit_rc);
-  return submit_rc;
-}
-
-/************************************************************************* 
- * Call LoadLeveler to cancel a job                                      * 
- *************************************************************************/
-int my_ll_terminate_job(int gui_transmission_id, JobObject * job_object)
-{
-  LL_terminate_job_info terminate_job_info;
-  int rc = 0;
-  LL_cluster_param cluster_parm;
-  LL_element *errObj = NULL;
-  char *remote_cluster[2];
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  memset(&terminate_job_info, '\0', sizeof(terminate_job_info));        /* zero the terminate job info area */
-
-  pthread_mutex_lock(&master_lock);
-  if (multicluster_status == 1) {       /* if running multicluster */
-
-   /*-----------------------------------------------------------------------* 
-    * we are running multicluster - set cluster name into environment       * 
-    * to influence where LoadLeveler searches for data (what cluster)       * 
-    *-----------------------------------------------------------------------*/
-    remote_cluster[0] = job_object->cluster_name;
-    remote_cluster[1] = NULL;
-    print_message(INFO_MESSAGE, "Setting access for LoadLeveler cluster %s.\n", job_object->cluster_name);
-    cluster_parm.action = CLUSTER_SET;  /* we are setting the cluster for remote access */
-    cluster_parm.cluster_list = remote_cluster; /* cluster name we want to cancel job in */
-    rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm); /* set the cluster name */
-  } /* end if this is not a local cluster */
-  else {                        /* this is a local cluster */
-
-   /*-----------------------------------------------------------------------* 
-    * not running multicluster                                              * 
-    *-----------------------------------------------------------------------*/
-    print_message(INFO_MESSAGE, "Setting access for LoadLeveler local cluster (single cluster).\n");
-    cluster_parm.action = CLUSTER_UNSET;        /* we are unsetting the cluster */
-    cluster_parm.cluster_list = NULL;
-    rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm); /* unset the cluster name - back to local */
-  }                             /* end if this is a local cluster */
-
-  /*-----------------------------------------------------------------------* 
-   * send the ll cancel command and hope that it eventually works          * 
-   *-----------------------------------------------------------------------*/
-  terminate_job_info.version_num = LL_PROC_VERSION;
-  terminate_job_info.StepId.cluster = job_object->ll_step_id.cluster;   /* old notation for job number */
-  terminate_job_info.StepId.proc = job_object->ll_step_id.proc; /* old notation for step number */
-  terminate_job_info.StepId.from_host = job_object->ll_step_id.from_host;       /* old notation for originating schedd node name */
-  terminate_job_info.msg = NULL;        /* message to use */
-  pthread_mutex_lock(&access_LoadLeveler_lock);
-  rc = LL_SYMS.ll_terminate_job(&terminate_job_info);
-  pthread_mutex_unlock(&access_LoadLeveler_lock);
-  if (rc != 0) {
-    print_message(ERROR_MESSAGE, "LoadLeveler ll_terminate_job rc=%i.\n", rc);
-  }
-
-  pthread_mutex_unlock(&master_lock);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-  return rc;
-}
-
-/************************************************************************* 
- * call LoadLeveler to free job info                                     * 
- *************************************************************************/
-void my_ll_free_job_info(LL_job * job_info)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  LL_SYMS.ll_free_job_info(job_info, LL_JOB_VERSION);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * find node in my hash table                                            * 
- *************************************************************************/
-NodeObject *get_node_in_hash(Hash * node_hash, char *node_name)
-{
-  int hash_key = 0;
-  List *node_list = NULL;
-  ListElement *node_list_element = NULL;
-  NodeObject *node_object = NULL;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. name=%s.\n", __FUNCTION__, __LINE__, node_name);
-  hash_key = HashCompute(node_name, strlen(node_name));
-  node_list = HashSearch(node_hash, hash_key);
-  if (node_list != NULL) {
-    node_list_element = node_list->l_head;      /* beginning of the list */
-    while (node_list_element != NULL) {
-      node_object = node_list_element->l_value;
-      node_list_element = node_list_element->l_next;    /* prepare for next pass */
-      if (strcmp(node_name, node_object->node_name) == 0) {
-        print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. node_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, node_object);
-        return node_object;
-      }
-    }
-  }
-  node_object = NULL;           /* not found in list */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. node_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, node_object);
-  return node_object;
-}
-
-/************************************************************************* 
- * add node to my hash table                                             * 
- *************************************************************************/
-void add_node_to_hash(Hash * node_hash, NodeObject * node_object)
-{
-  int hash_key;
-  List *node_list;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. object=x\'%08x\'.\n", __FUNCTION__, __LINE__, node_object);
-  hash_key = HashCompute(node_object->node_name, strlen(node_object->node_name));
-  node_list = HashSearch(node_hash, hash_key);
-  if (node_list == NULL) {
-    node_list = NewList();
-    AddToList(node_list, node_object);
-    HashInsert(node_hash, hash_key, node_list);
-  } else {
-    AddToList(node_list, node_object);
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * find job in my list                                                   * 
- *************************************************************************/
-JobObject *get_job_in_list(List * job_list, LL_STEP_ID ll_step_id)
-{
-  ListElement *job_list_element = NULL;
-  JobObject *job_object = NULL;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. name=%s.%d.%d.\n", __FUNCTION__, __LINE__, ll_step_id.from_host, ll_step_id.cluster, ll_step_id.proc);
-  job_list_element = job_list->l_head;  /* beginning of the list */
-  while (job_list_element != NULL) {
-    job_object = job_list_element->l_value;
-    job_list_element = job_list_element->l_next;        /* prepare for next pass */
-    if ((strcmp(ll_step_id.from_host, job_object->ll_step_id.from_host) == 0) && (ll_step_id.cluster == job_object->ll_step_id.cluster) && (ll_step_id.proc == job_object->ll_step_id.proc)) {
-      print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. job_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, job_object);
-      return job_object;
-    }
-  }
-  job_object = NULL;            /* not found in list */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. job_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, job_object);
-  return job_object;
-}
-
-JobObject *get_job_in_list_from_id(List * job_list, int job_id)
-{
-  ListElement *job_list_element = NULL;
-  JobObject *job_object = NULL;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. id=%d.\n", __FUNCTION__, __LINE__, job_id);
-  job_list_element = job_list->l_head;  /* beginning of the list */
-  while (job_list_element != NULL) {
-    job_object = job_list_element->l_value;
-    job_list_element = job_list_element->l_next;        /* prepare for next pass */
-    if (job_id == job_object->proxy_generated_job_id) {
-      print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. job_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, job_object);
-      return job_object;
-    }
-  }
-  job_object = NULL;            /* not found in list */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. job_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, job_object);
-  return job_object;
-}
-
-/************************************************************************* 
- * add job to my list                                                    * 
- *************************************************************************/
-void add_job_to_list(List * job_list, JobObject * job_object)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, job_object);
-  AddToList(job_list, job_object);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * save real thread number for mapping to useable number (0, 1, 2, ...)  * 
- *************************************************************************/
-int register_thread(pthread_t handle)
-{
-  int thread_id = -1;
-
-  for (thread_id = 0; thread_id < (sizeof(thread_map_table) / sizeof(pthread_t)); thread_id++) {
-    if (thread_map_table[thread_id] == 0) {
-      thread_map_table[thread_id] = handle;
-      break;
-    }
-  }
-  return thread_id;
-}
-
-/************************************************************************* 
- * map my threads to useable number (0, 1, 2, ...)                       * 
- *************************************************************************/
-int find_thread(pthread_t handle)
-{
-  int thread_id = -1;
-
-  for (thread_id = 0; thread_id < (sizeof(thread_map_table) / sizeof(pthread_t)); thread_id++) {
-    if (thread_map_table[thread_id] == handle) {
-      break;
-    }
-  }
-  return thread_id;
-}
-
-/************************************************************************* 
- * verify that malloc didn't fail                                        * 
- *************************************************************************/
-void malloc_check(void *p, const char *function, int line)
-{
-  if (p == NULL) {
-    print_message(ERROR_MESSAGE, "Memory allocation error in function %s (line %d)\n", function, line);
-    state_shutdown_requested = 1;
-    exit(1);
-  }
-
-}
-
-/************************************************************************* 
- * find task in my list                                                  * 
- *************************************************************************/
-TaskObject *get_task_in_list(List * task_list, char *task_instance_machine_name, int ll_task_id)
-{
-  TaskObject *task_object = NULL;
-  ListElement *task_list_element = NULL;
-
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. id=%d.\n", __FUNCTION__, __LINE__, ll_task_id);
-  task_list_element = task_list->l_head;        /* beginning of the list */
-  while (task_list_element != NULL) {   /* while we have a valid task element */
-    task_object = task_list_element->l_value;
-    task_list_element = task_list_element->l_next;      /* prepare for next pass */
-    if ((ll_task_id == task_object->ll_task_id) && (strcmp(task_object->node_name, task_instance_machine_name) == 0)) {
-      print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. task_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, task_object);
-      return task_object;
-    }
-  }                             /* end while we have a valid task element */
-  task_object = NULL;           /* not found */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. task_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, task_object);
-  return task_object;
-}
-
-/************************************************************************* 
- * add task to my list                                                   * 
- *************************************************************************/
-void add_task_to_list(List * task_list, TaskObject * task_object)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. task_object=x\'%08x\'.\n", __FUNCTION__, __LINE__, task_object);
-  AddToList(task_list, task_object);
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * delete node from my list                                              * 
- *************************************************************************/
-void delete_node_from_list(List * node_list, NodeObject * node_object)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  if (node_object->node_name != NULL) {
-    free(node_object->node_name);
-    node_object->node_name = NULL;
-  }
-  RemoveFromList(node_list, node_object);       /* remove from list and free memory */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * delete job from my list                                               * 
- *************************************************************************/
-void delete_job_from_list(List * job_list, JobObject * job_object)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  if (job_object->ll_step_id.from_host != NULL) {
-    free(job_object->ll_step_id.from_host);
-    job_object->ll_step_id.from_host = NULL;
-  }
-  if (job_object->cluster_name != NULL) {
-    free(job_object->cluster_name);
-    job_object->cluster_name = NULL;
-  }
-  if (job_object->task_list != NULL) {
-    free(job_object->task_list);
-    job_object->task_list = NULL;
-  }
-  RemoveFromList(job_list, job_object); /* remove from list and free memory */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * delete task from my list                                              * 
- *************************************************************************/
-void delete_task_from_list(List * task_list, TaskObject * task_object)
-{
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  if (task_object->node_name != NULL) {
-    free(task_object->node_name);
-    task_object->node_name = NULL;
-  }
-  if (task_object->node_address != NULL) {
-    free(task_object->node_address);
-    task_object->node_address = NULL;
-  }
-  RemoveFromList(task_list, task_object);       /* remove from list and free memory */
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * dump out all the parms being sent back to the proxy front end         * 
- *************************************************************************/
-void print_proxy_message(proxy_msg * msg)
-{
-  int i = 0;
-  print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-  print_message(INFO_MESSAGE, "msg_id=%d. trans_id=%d. num_args=%d. arg_size=%d.\n", msg->msg_id, msg->trans_id, msg->num_args, msg->arg_size);
-  if (msg->num_args > 0) {      /* if we have arguments */
-    print_message(INFO_MESSAGE, "proxy msg (event) arguments:\n");
-    for (i = 0; i < msg->num_args; i++) {
-      print_message(INFO_MESSAGE, "arg[%d]=%s.\n", i, msg->args[i]);
-    }
-  }
-  print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/************************************************************************* 
- * see if <<<XXXXXXXX>>> variable in the line                            * 
- *************************************************************************/
-int is_substitution_required(char *line)
-{
-  char *position1 = NULL;
-  char *position2 = NULL;
-  for (position1 = line; strlen(position1) >= 6; position1++) {
-    if (strncmp(position1, "<<<", 3) == 0) {    /* if <<< found */
-      for (position2 = position1 + 3; strlen(position2) >= 3; position2++) {
-        if (((position2[0] >= 'a') && (position2[0] <= 'z')) || ((position2[0] >= 'A') && (position2[0] <= 'Z')) || ((position2[0] >= '0') && (position2[0] <= '9')) || (position2[0] == '_')) {
-          continue;
-        } else {
-          if (strncmp(position2, ">>>", 3) == 0) {      /* if >>> found */
-            return 1;           /* found a <<<XXXXXXXX>>> match */
-          } /* end if <<< found */
-          else {
-            break;
-          }
-        }
-      }
-    }                           /* end if <<< found */
-  }
-  return 0;
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/.classpath b/rms/org.eclipse.ptp.rm.ibm.ll.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/.project b/rms/org.eclipse.ptp.rm.ibm.ll.ui/.project
deleted file mode 100644
index 566a5fc..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.ll.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.ll.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index c7134ae..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.ll.ui;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.ibm.ll.ui.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.rm.ibm.ll.core,
- org.eclipse.ptp.launch,
- org.eclipse.debug.core,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui;bundle-version="2.0.0",
- org.eclipse.ptp.rm.remote,
- org.eclipse.core.filesystem,
- org.eclipse.ptp.utils.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.ibm.ll.ui,
- org.eclipse.ptp.rm.ibm.ll.ui.preferences

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/about.html b/rms/org.eclipse.ptp.rm.ibm.ll.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/build.properties b/rms/org.eclipse.ptp.rm.ibm.ll.ui/build.properties
deleted file mode 100644
index 0973416..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.properties
deleted file mode 100644
index 1e94b98..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM LoadLeveler UI
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.xml b/rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.xml
deleted file mode 100644
index a5a1afd..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/plugin.xml
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage"
-            class="org.eclipse.ptp.rm.ibm.ll.ui.preferences.IBMLLPreferencePage"
-            id="org.eclipse.ptp.ibmll.ui.preferences.IBMLLPreferencePage"
-            name="LoadLeveler">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.ui.rmConfigurations">
-      <configurationWizard
-            class="org.eclipse.ptp.rm.ibm.ll.ui.wizards.IBMLLResourceManagerConfigurationWizardPageFactory"
-            id="org.eclipse.ptp.ibmll.ui.configurationWizard"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.launch.rmLaunchConfigurations">
-      <launchConfiguration
-            class="org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration.IBMLLRMLaunchConfigurationFactory"
-            id="org.eclipse.ptp.ibmll.ui.launchConfiguration"/>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/Activator.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/Activator.java
deleted file mode 100644
index c9c6d9c..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/Activator.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.ibm.ll.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.ibm.ll.ui";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		IBMLLPreferenceManager.initializePreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/IBMLLPreferenceManager.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/IBMLLPreferenceManager.java
deleted file mode 100644
index 8c52ecc..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/IBMLLPreferenceManager.java
+++ /dev/null

@@ -1,76 +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
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.remote.core.IRemoteProxyOptions;
-import org.eclipse.ptp.rm.remote.ui.preferences.PreferenceConstants;
-
-public class IBMLLPreferenceManager {
-	private static final String PROXY_EXECUTABLE_NAME = "ptp_ibmll_proxy";
-	private static final String PROXY_EXECUTABLE_PATH = null; // use local fragment directory
-	private static final boolean LAUNCH_MANUALLY = false; // use local fragment directory
-	private static final int OPTIONS = IRemoteProxyOptions.PORT_FORWARDING;
-	
-	public static int getDefaultOptions() {
-		return OPTIONS;
-	}
-	
-	public static boolean getDefaultLaunchManualFlag() {
-		return LAUNCH_MANUALLY;
-	}
-
-	public static String getDefaultProxyExecutablePath() {
-		return PROXY_EXECUTABLE_PATH;
-	}
-
-	public static Preferences getPreferences() {
-		return Activator.getDefault().getPluginPreferences();
-	}
-	
-	public static void savePreferences() {
-		Activator.getDefault().savePluginPreferences();
-	}
-	
-	public static void initializePreferences() {
-		Preferences preferences = Activator.getDefault().getPluginPreferences();
-		
-		String server = "";
-			
-		if (PROXY_EXECUTABLE_PATH != null) {
-			server = new Path(PROXY_EXECUTABLE_PATH).append(PROXY_EXECUTABLE_NAME).toOSString();
-		} else {
-			server = PTPCorePlugin.getDefault().locateFragmentFile("org.eclipse.ptp", PROXY_EXECUTABLE_NAME);
-			if (server == null) {
-				server = "";
-			}
-       }
-		
-		preferences.setDefault(PreferenceConstants.PROXY_PATH, server);
-		preferences.setDefault(PreferenceConstants.OPTIONS, OPTIONS); 
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.java
deleted file mode 100644
index 0bf16d9..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.internal.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.properties b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.properties
deleted file mode 100644
index e7c6ad5..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/internal/ui/Messages.properties
+++ /dev/null

@@ -1,171 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2006, 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
-#*******************************************************************************
-
-IBMLLResourceManagerConfigurationWizardPage.name=IBM LoadLeveler Configuration Wizard Page
-IBMLLResourceManagerConfigurationWizardPage.title=IBM LoadLeveler Configuration Wizard Page
-IBMLLResourceManagerConfigurationWizardPage.description=IBM LoadLeveler Configuration Wizard Page
-
-#IBMLLPreferencePage and IBMLLResourceManagerConfigurationWizardPage
-IBMLLPrefWizPage.browseButton=Browse
-
-IBMLLPrefWizPage.proxyOptionsGroupLabel=LoadLeveler Proxy Message Options
-IBMLLPrefWizPage.proxyLibraryGroupLabel=LoadLeveler Proxy Private Library Path
-IBMLLPrefWizPage.proxyLibraryToolTip=Specify the directory to where libllapi.a or libllapi.so is installed if non-standard installation
-IBMLLPrefWizPage.proxyLibraryLabel=Library Path Override
-IBMLLPrefWizPage.proxyDebugGroupLabel=LoadLeveler Proxy Debug Options
-IBMLLPrefWizPage.ProxyMessageLabel=Messages:
-IBMLLPrefWizPage.ProxyTraceMessageLabel=Trace
-IBMLLPrefWizPage.ProxyTraceMessageToolTip=Output proxy trace messages to console
-IBMLLPrefWizPage.ProxyInfoMessageLabel=Info
-IBMLLPrefWizPage.ProxyInfoMessageToolTip=Output proxy information messages to console
-IBMLLPrefWizPage.ProxyWarningMessageLabel=Warning
-IBMLLPrefWizPage.ProxyWarningMessageToolTip=Output proxy warning messages to console
-IBMLLPrefWizPage.ProxyErrorMessageLabel=Error
-IBMLLPrefWizPage.ProxyErrorMessageToolTip=Output proxy error messages to console
-IBMLLPrefWizPage.ProxyFatalMessageLabel=Fatal
-IBMLLPrefWizPage.ProxyFatalMessageToolTip=Output proxy fatal messages to console
-IBMLLPrefWizPage.ProxyArgsMessageLabel=Args
-IBMLLPrefWizPage.ProxyArgsMessageToolTip=Output proxy argument messages to console
-IBMLLPrefWizPage.ProxyDebugLoopLabel=Debug Loop
-IBMLLPrefWizPage.ProxyDebugLoopToolTip=Spin loop in proxy to allow debugger attach
-
-IBMLLPrefWizPage.proxyMulticlusterGroupLabel=LoadLeveler Multicluster Options
-IBMLLPrefWizPage.proxyMulticlusterDefaultLabel=LoadLeveler Default
-IBMLLPrefWizPage.proxyMulticlusterDefaultToolTip=Allow LoadLeveler to determine multicluster or single cluster configuration
-IBMLLPrefWizPage.proxyMulticlusterForceLocalLabel=Force Local
-IBMLLPrefWizPage.proxyMulticlusterForceLocalToolTip=Force configuration to single (non-multicluster) configuration (usually used with pre 3.4.1.2 versions of LoadLeveler)
-IBMLLPrefWizPage.proxyMulticlusterForceMulticlusterLabel=Force Multicluster
-IBMLLPrefWizPage.proxyMulticlusterForceMulticlusterToolTip=Force configuration to multicluster configuration (usually used with pre 3.4.1.2 versions of LoadLeveler)
-
-IBMLLPrefWizPage.proxyTemplateGroupLabel=LoadLeveler Job Command File Template Override
-IBMLLPrefWizPage.proxyTemplateOptionsGroupLabel=LoadLeveler Basic Template Options
-IBMLLPrefWizPage.proxyTemplateLabel=Template File Override
-IBMLLPrefWizPage.proxyTemplateToolTip=LoadLeveler Template Job Command File Override (values are substituted for <<<keyword>>> occurrences in the template file)
-IBMLLPrefWizPage.proxyTemplateNeverLabel=Never Write
-IBMLLPrefWizPage.proxyTemplateNeverToolTip=Never Write Default Template Job Command File to /tmp at Resource Manager start 
-IBMLLPrefWizPage.proxyTemplateAlwaysLabel=Always Write
-IBMLLPrefWizPage.proxyTemplateAlwaysToolTip=Always Write Default Template Job Command File to /tmp at Resource Manager start
-
-IBMLLPrefWizPage.proxyPollingGroupLabel=LoadLeveler Proxy Polling Options
-IBMLLPrefWizPage.proxyPollingNodeMinToolTip=Minimum number of seconds for polling LoadLeveler for Node status
-IBMLLPrefWizPage.proxyPollingNodeMinLabel=Node Min
-IBMLLPrefWizPage.proxyPollingNodeMaxToolTip=Maximum number of seconds for polling LoadLeveler for Node status
-IBMLLPrefWizPage.proxyPollingNodeMaxLabel=Node Max
-IBMLLPrefWizPage.proxyPollingJobToolTip=Number of seconds for polling LoadLeveler for Job status
-IBMLLPrefWizPage.proxyPollingJobLabel=Job
-
-IBMLLPrefWizPage.guiOptionsGroupLabel=LoadLeveler Gui Message Options
-IBMLLPrefWizPage.GuiMessageLabel=Messages:
-IBMLLPrefWizPage.GuiTraceMessageLabel=Trace
-IBMLLPrefWizPage.GuiTraceMessageToolTip=Output gui trace messages to console
-IBMLLPrefWizPage.GuiInfoMessageLabel=Info
-IBMLLPrefWizPage.GuiInfoMessageToolTip=Output gui information messages to console
-IBMLLPrefWizPage.GuiWarningMessageLabel=Warning
-IBMLLPrefWizPage.GuiWarningMessageToolTip=Output gui warning messages to console
-IBMLLPrefWizPage.GuiErrorMessageLabel=Error
-IBMLLPrefWizPage.GuiErrorMessageToolTip=Output gui error messages to console
-IBMLLPrefWizPage.GuiFatalMessageLabel=Fatal
-IBMLLPrefWizPage.GuiFatalMessageToolTip=Output gui fatal messages to console
-IBMLLPrefWizPage.GuiArgsMessageLabel=Args
-IBMLLPrefWizPage.GuiArgsMessageToolTip=Output gui argument messages to console
-
-
-GeneralTab.title=General
-SchedulingBasicTab.title=Scheduling (Basic)
-SchedulingRequirementsTab.title=Scheduling (Requirements)
-SchedulingResourcesTab.title=Scheduling (Resources)
-RuntimeTab.title=Runtime
-NodesNetworkTab.title=Nodes/Network
-LimitsTab.title=Limits
-FileSelector.BrowseButton=Browse
-
-Invalid.llJobCommandFile=Job Command File must specify a readable file.
-Invalid.llJobCommandFileTemplate=Job Command Template File must specify a readable file.
-Invalid.llLibraryPath=Library Path must specify a valid directory.
-Invalid.llJobName=Job Name must contain any combination of letters, numbers, or both.
-Invalid.llClass=Job Class must contain any combination of letters, numbers, or both.
-Invalid.llNodeMin=Node Minimum must specify a positive integer.
-Invalid.llNodeMax=Node Maximum must specify a positive integer.
-Invalid.llNodeMinMax=Node Minimum must be less than or equal to Node Maximum.
-Invalid.llBlocking=Blocking must specify the multiple that tasks be assigned to machines or \"unlimited\" (tasks be assigned to each machine until it runs out of initiators).
-Invalid.llTasksPerNode=Tasks Per Node must specify a positive integer.
-Invalid.llTotalTasks=Total Tasks must specify a positive integer.
-Invalid.llWallClockLimitHard=Hard Wall Clock Limit must specify the hard limit for elapsed time a job can run. [[HH:]MM:]SS
-Invalid.llWallClockLimitSoft=Soft Wall Clock Limit must specify the soft limit for elapsed time a job can run. [[HH:]MM:]SS
-Invalid.llTasksPerNode_llTotalTasks=Tasks Per Node and Total Tasks are mutually exclusive. Do not specify both for the same job.
-Invalid.llTaskGeometry_llJobType=Task Geomentry is on permitted for Job Type = Parallel.
-Invalid.llTaskGeometry_llTasksPerNode=Task Geometry and Tasks Per Node are mutually exclusive.  Do not specify both for the same job.
-Invalid.llTaskGeometry_llTotalTasks=Task Geometry and Total Tasks are mutually exclusive.  Do not specify both for the same job.
-Invalid.llTaskGeometry_llNodeMin=Task Geometry and Node are mutually exclusive.  Do not specify both for the same job.
-Invalid.llTaskGeometry_llNodeMax=Task Geometry and Node are mutually exclusive.  Do not specify both for the same job.
-Invalid.llTaskGeometry_llBlocking=Task Geometry and Blocking are mutually exclusive.  Do not specify both for the same job.
-
-IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_LABEL=LoadLeveler job command file:
-IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_TEMPLATE_LABEL=LoadLeveler job command file template:
-IBMLLLaunch.LL_PTP_CLASS_LABEL=Job class:
-IBMLLLaunch.LL_PTP_COMMENT_LABEL=Comment:
-IBMLLLaunch.LL_PTP_ERROR_LABEL=Standard error:
-IBMLLLaunch.LL_PTP_EXECUTABLE_LABEL=Executable (override):
-IBMLLLaunch.LL_PTP_ENVIRONMENT_LABEL=Environment:
-IBMLLLaunch.LL_PTP_INPUT_LABEL=Standard input:
-IBMLLLaunch.LL_PTP_OUTPUT_LABEL=Standard output:
-IBMLLLaunch.LL_PTP_INITIALDIR_LABEL=Initialdir (override):
-IBMLLLaunch.LL_PTP_JOB_NAME_LABEL=Job name:
-IBMLLLaunch.LL_PTP_NETWORK_MPI_LABEL=Network mpi:
-IBMLLLaunch.LL_PTP_NETWORK_LAPI_LABEL=Network lapi:
-IBMLLLaunch.LL_PTP_NETWORK_MPI_LAPI_LABEL=Network mpi_lapi:
-IBMLLLaunch.LL_PTP_REQUIREMENTS_LABEL=Requirements:
-IBMLLLaunch.LL_PTP_RESOURCES_LABEL=Resources:
-IBMLLLaunch.LL_PTP_SHELL_LABEL=Shell:
-IBMLLLaunch.LL_PTP_TASK_GEOMETRY_LABEL=Task geometry:
-IBMLLLaunch.LL_PTP_NODE_MIN_LABEL=Node (min):
-IBMLLLaunch.LL_PTP_NODE_MAX_LABEL=Node (max):
-IBMLLLaunch.LL_PTP_BLOCKING_LABEL=Blocking:
-IBMLLLaunch.LL_PTP_TOTAL_TASKS_LABEL=Total tasks:
-IBMLLLaunch.LL_PTP_WALLCLOCK_HARD_LABEL=Hard wall clock limit:
-IBMLLLaunch.LL_PTP_WALLCLOCK_SOFT_LABEL=Soft wall clock limit:
-IBMLLLaunch.LL_PTP_TASKS_PER_NODE_LABEL=Tasks per node:
-IBMLLLaunch.LL_PTP_JOB_TYPE_LABEL=Job type:
-IBMLLLaunch.LL_PTP_BULK_XFER_LABEL=Bulkxfer:
-IBMLLLaunch.LL_PTP_LARGE_PAGE_LABEL=Large page:
-IBMLLLaunch.LL_PTP_SUBMIT_MODE_LABEL=Submit mode:
-
-IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_TOOLTIP=Specify complete command file if advanced mode (no substitutions will be performed).
-IBMLLLaunch.LL_PTP_JOB_COMMAND_FILE_TEMPLATE_TOOLTIP=Specify command file that may use <<<KEYWORD>>> substitutions if using basic mode.
-IBMLLLaunch.LL_PTP_CLASS_TOOLTIP=Specify the job class to use. Syntax: class = name
-IBMLLLaunch.LL_PTP_COMMENT_TOOLTIP=Specify text to describe characteristics or distinguishing features of the job. Syntax: comment = description
-IBMLLLaunch.LL_PTP_ERROR_TOOLTIP=Specify a file to use as standard error (stderr) when the job runs. Syntax: error = filename
-IBMLLLaunch.LL_PTP_EXECUTABLE_TOOLTIP=Override the executable defined on the PTP menu. Syntax: executable = name
-IBMLLLaunch.LL_PTP_ENVIRONMENT_TOOLTIP=Specifies login initial environment variables set by LoadLeveler when your job step starts and overrides any additional environment variables specified on the PTP environment menu. Syntax: environment = env1 ; env2 ; ...
-IBMLLLaunch.LL_PTP_INPUT_TOOLTIP=Specify a file to use as standard input (stdin) when the job runs. Syntax: input = filename
-IBMLLLaunch.LL_PTP_OUTPUT_TOOLTIP=Specify a file to use as standard output (stdout) when the job runs. Syntax: output = filename
-IBMLLLaunch.LL_PTP_INITIALDIR_TOOLTIP=Override the initial working directory specified on the PTP menu. Syntax: initialdir = pathname
-IBMLLLaunch.LL_PTP_JOB_NAME_TOOLTIP=Specify the name of the job. Syntax: job_name = job_name
-IBMLLLaunch.LL_PTP_NETWORK_MPI_TOOLTIP=Specify the communication protocols, adapters and their characteristics. Syntax: network.protocol = type [,usage[,mode[,comm_level[,instances=<number|max>[,rcxtblocks=number]]]]]
-IBMLLLaunch.LL_PTP_NETWORK_LAPI_TOOLTIP=Specify the communication protocols, adapters and their characteristics. Syntax: network.protocol = type [,usage[,mode[,comm_level[,instances=<number|max>[,rcxtblocks=number]]]]]
-IBMLLLaunch.LL_PTP_NETWORK_MPI_LAPI_TOOLTIP=Specify the communication protocols, adapters and their characteristics. Syntax: network.protocol = type [,usage[,mode[,comm_level[,instances=<number|max>[,rcxtblocks=number]]]]]
-IBMLLLaunch.LL_PTP_REQUIREMENTS_TOOLTIP=Specify the requirements which a node in the LoadLeveler cluster must meet to execute any job. Syntax: requirements = Boolean_expression
-IBMLLLaunch.LL_PTP_RESOURCES_TOOLTIP=Specify quantities of the consumable resources consumed by each task of a job. Syntax: resources=name(count) name(count) ... name(count)
-IBMLLLaunch.LL_PTP_SHELL_TOOLTIP=Specify the name of the shell to use for the job. Syntax: shell = name
-IBMLLLaunch.LL_PTP_TASK_GEOMETRY_TOOLTIP=Group tasks of a parallel job to run together on the same node. Syntax: task_geometry={(task id,task id,...)(task id,task id, ...) ... }
-IBMLLLaunch.LL_PTP_NODE_MIN_TOOLTIP=Specify the minimum number of nodes requested. Syntax: node = [min][,max]
-IBMLLLaunch.LL_PTP_NODE_MAX_TOOLTIP=Specify the maximum number of nodes requested. Syntax: node = [min][,max]
-IBMLLLaunch.LL_PTP_BLOCKING_TOOLTIP=Specify the multiple for which tasks will be assigned to nodes. Syntax: blocking = integer | unlimited
-IBMLLLaunch.LL_PTP_TOTAL_TASKS_TOOLTIP=Specify the total number of tasks of a parallel job you want to run on the available nodes. Syntax: total_tasks = number
-IBMLLLaunch.LL_PTP_WALLCLOCK_HARD_TOOLTIP=Specify the hard limit (HH:MM:SS) for the elapsed time the job can run. Syntax: wall_clock_limit = hardlimit,softlimit
-IBMLLLaunch.LL_PTP_WALLCLOCK_SOFT_TOOLTIP=Specify the soft limit (HH:MM:SS) for the elapsed time the job can run. Syntax: wall_clock_limit = hardlimit,softlimit
-IBMLLLaunch.LL_PTP_TASKS_PER_NODE_TOOLTIP=Specify the number of tasks of a parallel job you want to run per node. Syntax: tasks_per_node = number
-IBMLLLaunch.LL_PTP_JOB_TYPE_TOOLTIP=Specify the type of the job. Syntax: job_type = serial | parallel | MPICH
-IBMLLLaunch.LL_PTP_BULK_XFER_TOOLTIP=Specify whether the communications subsystem will use bulk data transfer for user space jobs. Syntax: bulkxfer = yes | no 
-IBMLLLaunch.LL_PTP_LARGE_PAGE_TOOLTIP=Specify whether or not a job requires Large Page support from AIX. Syntax: large_page = value
-IBMLLLaunch.LL_PTP_SUBMIT_MODE_TOOLTIP=Advanced mode(submit complete job command file - no substitutions) or Basic mode (submit job command file template after menu substitutions).
-
-Wizard.InvocationOptionsTitle=IBM LoadLeveler Proxy Invocation Options
-Wizard.InvocationOptions=Specify invocation options for IBM LoadLeveler proxy server
-Wizard.ConfigurationTitle=IBM LoadLeveler Proxy Configuration
-Wizard.Configuration=Enter information to connect to an IBM LoadLeveler proxy server

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferenceConstants.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferenceConstants.java
deleted file mode 100644
index 98fd028..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferenceConstants.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.preferences;
-
-public interface IBMLLPreferenceConstants
-{
-
-    public static final String LL_YES = "Y";
-    public static final String LL_NO = "N";
-    
-    public static final String PROXY_INFO_MESSAGE = "ProxyInfoMessage";
-    public static final String PROXY_TRACE_MESSAGE = "ProxyTraceMessage";
-    public static final String PROXY_WARNING_MESSAGE = "ProxyWarningMessage";
-    public static final String PROXY_ERROR_MESSAGE = "ProxyErrorMessage";
-    public static final String PROXY_FATAL_MESSAGE = "ProxyFatalMessage";
-    public static final String PROXY_ARGS_MESSAGE = "ProxyArgsMessage";
-    public static final String PROXY_DEBUG_LOOP="ProxyDebugLoop";
-    public static final String PROXY_LOADLEVELER_LIBRARY_PATH="ProxyLoadLevelerLibraryPath";
-    public static final String PROXY_DEFAULT_MULTICLUSTER="ProxyLoadLevelerMulticlusterDefault";
-    public static final String PROXY_FORCE_LOCAL="ProxyLoadLevelerMulticlusterForceLocal";
-    public static final String PROXY_FORCE_MULTICLUSTER="ProxyLoadLevelerMulticlusterForceMulticluster";
-    public static final String PROXY_LOADLEVELER_TEMPLATE_FILE="ProxyLoadLevelerTemplateFile";
-    public static final String PROXY_WRITE_TEMPLATE_ALWAYS="ProxyLoadLevelerTemplateAlways";
-    public static final String PROXY_WRITE_TEMPLATE_NEVER="ProxyLoadLevelerTemplateNever";
-    public static final String PROXY_MIN_NODE_POLLING="ProxyMinimumNodePolling";
-    public static final String PROXY_MAX_NODE_POLLING="ProxyMaximumNodePolling";
-    public static final String PROXY_JOB_POLLING="ProxyJobPolling";
-    
-    public static final String GUI_INFO_MESSAGE = "GuiInfoMessage";
-    public static final String GUI_TRACE_MESSAGE = "GuiTraceMessage";
-    public static final String GUI_WARNING_MESSAGE = "GuiWarningMessage";
-    public static final String GUI_ERROR_MESSAGE = "GuiErrorMessage";
-    public static final String GUI_FATAL_MESSAGE = "GuiFatalMessage";
-    public static final String GUI_ARGS_MESSAGE = "GuiArgsMessage";
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferencePage.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferencePage.java
deleted file mode 100644
index 0df8adf..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/preferences/IBMLLPreferencePage.java
+++ /dev/null

@@ -1,870 +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
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.ibm.ll.ui.IBMLLPreferenceManager;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.remote.ui.preferences.AbstractRemotePreferencePage;
-import org.eclipse.ptp.utils.ui.swt.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-public class IBMLLPreferencePage extends AbstractRemotePreferencePage {
-
-	private Text proxyLibraryTextWidget = null;
-	private EventMonitor libraryListener = null; /* validate library name */
-	private Button libraryBrowseButton = null;
-
-	private Button proxyTraceMessageButton = null;
-	private Button proxyInfoMessageButton = null;
-	private Button proxyWarningMessageButton = null;
-	private Button proxyErrorMessageButton = null;
-	private Button proxyFatalMessageButton = null;
-	private Button proxyArgsMessageButton = null;
-	private Button proxyDebugLoopButton = null;
-
-	private Button proxyForceLocalRadioButton = null;
-	private Button proxyForceMulticlusterRadioButton = null;
-	private Button proxyLLDefaultRadioButton = null;
-
-	private Text proxyTemplateTextWidget = null;
-	private EventMonitor templateListener = null; /* validate template file name */
-	private Button proxyTemplateNeverRadioButton = null;
-	private Button proxyTemplateAlwaysRadioButton = null;
-	private Button templateBrowseButton = null;
-
-	private Spinner proxyPollingNodeMin = null;
-	private Spinner proxyPollingNodeMax = null;
-	private Spinner proxyPollingJob = null;
-
-	private Button guiTraceMessageButton = null;
-	private Button guiInfoMessageButton = null;
-	private Button guiWarningMessageButton = null;
-	private Button guiErrorMessageButton = null;
-	private Button guiFatalMessageButton = null;
-	private Button guiArgsMessageButton = null;
-
-	private EventMonitor eventMonitor = null;
-
-	public boolean performOk() {
-//		System.err.println("preferences: performOk entered...");
-		updatePreferencePage();
-		return super.performOk();
-	}
-
-	private class EventMonitor implements SelectionListener, ModifyListener {
-		public EventMonitor() {
-//			System.err.println("preferences: EventMonitor");
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-//			System.err.println("preferences: widgetDefaultSelected");
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-//			System.err.println("preferences: widgetSelected");
-	
-				Object source = e.getSource();
-				if (source == libraryBrowseButton) {
-//					System.err.println("preferences: libraryBrowseButton");
-					DirectoryDialog dialog = new DirectoryDialog(getShell());
-					String selectedPath = dialog.open();
-					if (selectedPath != null)
-						proxyLibraryTextWidget.setText(selectedPath);
-				} 
-				else if (source == templateBrowseButton) {
-//					System.err.println("preferences: templateBrowseButton");
-					FileDialog dialog = new FileDialog(getShell());
-					String correctPath = getFieldContent(proxyTemplateTextWidget.getText().trim());
-					if (correctPath != null) {
-						File path = new File(correctPath);
-						if (path.exists())
-							dialog.setFilterPath(path.isFile() ? correctPath : path
-									.getParent());
-					}
-
-					String selectedPath = dialog.open();
-					if (selectedPath != null)
-						proxyTemplateTextWidget.setText(selectedPath);
-				}
-		}
-
-		public void widgetModified(SelectionEvent e) {
-//			System.err.println("preferences: widgetModified");
-		}
-
-		public void modifyText(ModifyEvent e) {
-//			System.err.println("preferences: modifyText");
-//			System.err.println("widget entered is "+ e.widget.toString());
-			if (e.widget.equals(proxyPollingJob)) {
-//				System.err.println("widget entered is proxyPollingJob");
-			}
-			if (e.widget.equals(proxyPollingNodeMin)) {
-//				System.err.println("widget entered is proxyPollingNodeMin");
-				int min_value = proxyPollingNodeMin.getSelection();
-				int max_value = proxyPollingNodeMax.getSelection();
-				if (min_value > max_value) {
-					proxyPollingNodeMax.setSelection(min_value);
-				}
-				
-			}
-			if (e.widget.equals(proxyPollingNodeMax)) {
-//				System.err.println("widget entered is proxyPollingNodeMax");
-				int min_value = proxyPollingNodeMin.getSelection();
-				int max_value = proxyPollingNodeMax.getSelection();
-				if (max_value < min_value) {
-					proxyPollingNodeMin.setSelection(max_value);
-				}
-			}
-			if (e.widget.equals(proxyLibraryTextWidget)) {
-//				System.err.println("widget entered is proxyLibraryTextWidget");
-				String correctPath = getFieldContent(proxyLibraryTextWidget.getText().trim());
-				if (correctPath != null) {
-					File path = new File(correctPath);
-					if (path.exists() && (path.isDirectory())) {
-						setErrorMessage(null);
-						setValid(true);
-					}
-					else {
-						setErrorMessage(Messages
-								.getString("Invalid.llLibraryPath"));
-						setValid(false);
-					}
-				}
-			}
-			if (e.widget.equals(proxyTemplateTextWidget)) {
-//				System.err.println("widget entered is proxyTemplateTextWidget");
-				String correctPath = getFieldContent(proxyTemplateTextWidget.getText().trim());
-				if (correctPath != null) {
-					File path = new File(correctPath);
-					if (path.exists() && (path.isFile())) {
-						setErrorMessage(null);
-						setValid(true);
-					}
-					else {
-						setErrorMessage(Messages
-								.getString("Invalid.llJobCommandFileTemplate"));
-						setValid(false);
-					}
-				}
-				
-			}
-			
-
-		}
-	}
-
-	@Override
-	public Preferences getPreferences() {
-		return IBMLLPreferenceManager.getPreferences();
-	}
-
-	@Override
-	public void savePreferences() {
-		IBMLLPreferenceManager.savePreferences();
-	}
-
-	/**
-	 * Create the widgets for preference settings. This method calls the
-	 * superclass createContents() method to create the default widgets for the
-	 * panel, then creates the additional widgets needed.
-	 * 
-	 * @param parent -
-	 *            The parent widget for this pane
-	 * 
-	 * @return the top level widget for the preference pane
-	 */
-	protected Control createContents(Composite parent) {
-		Control preferencePane;
-		Group proxyLibraryGroup = null;
-		Group proxyOptionsGroup = null;
-		Group proxyDebugGroup = null;
-		Group guiOptionsGroup = null;
-		Group proxyMulticlusterGroup = null;
-		Group proxyTemplateGroup = null;
-		Group proxyTemplateOptionsGroup = null;
-		Group proxyPollingGroup = null;
-		Preferences preferences = null;
-		libraryBrowseButton = null;
-		templateBrowseButton = null;
-		
-		String preferenceValue;
-
-		preferences = getPreferences();
-		eventMonitor = new EventMonitor();
-		preferencePane = super.createContents(parent);
-
-		// *********************************************************************
-		// Alternate LoadLeveler Library Install Location
-		// *********************************************************************
-		proxyLibraryGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyLibraryGroup.setLayout(createGridLayout(3, false, 0, 0));
-		proxyLibraryGroup.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL,
-				5));
-		proxyLibraryGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyLibraryGroupLabel"));
-
-		new Label(proxyLibraryGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyLibraryLabel"));
-
-		proxyLibraryTextWidget = new Text(proxyLibraryGroup, SWT.SINGLE
-				| SWT.BORDER);
-		proxyLibraryTextWidget.setLayoutData(new GridData(
-				GridData.FILL_HORIZONTAL));
-		libraryListener = new EventMonitor();
-		proxyLibraryTextWidget.addModifyListener(libraryListener);
-		proxyLibraryTextWidget
-				.setText(preferences
-						.getString(IBMLLPreferenceConstants.PROXY_LOADLEVELER_LIBRARY_PATH));
-		proxyLibraryTextWidget.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyLibraryToolTip"));
-
-		 libraryBrowseButton =
-		 SWTUtil.createPushButton(proxyLibraryGroup, Messages
-		 .getString("IBMLLPrefWizPage.browseButton"),
-		 null);
-		 libraryBrowseButton.addSelectionListener(libraryListener);
-
-		// *********************************************************************
-		// Check box group for proxy messages
-		// *********************************************************************
-		proxyOptionsGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyOptionsGroup.setLayout(new RowLayout());
-		proxyOptionsGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyOptionsGroupLabel"));
-
-		proxyTraceMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyTraceMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyTraceMessageLabel"));
-		proxyTraceMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyTraceMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_TRACE_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyTraceMessageButton.setSelection(true);
-		}
-		// proxyTraceMessageButton.addSelectionListener(eventMonitor);
-
-		proxyInfoMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyInfoMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyInfoMessageLabel"));
-		proxyInfoMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyInfoMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_INFO_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyInfoMessageButton.setSelection(true);
-		}
-		// proxyInfoMessageButton.addSelectionListener(eventMonitor);
-
-		proxyWarningMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyWarningMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyWarningMessageLabel"));
-		proxyWarningMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyWarningMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_WARNING_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyWarningMessageButton.setSelection(true);
-		}
-		// proxyWarningMessageButton.addSelectionListener(eventMonitor);
-
-		proxyErrorMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyErrorMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyErrorMessageLabel"));
-		proxyErrorMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyErrorMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_ERROR_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyErrorMessageButton.setSelection(true);
-		}
-		// proxyErrorMessageButton.addSelectionListener(eventMonitor);
-
-		proxyFatalMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyFatalMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyFatalMessageLabel"));
-		proxyFatalMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyFatalMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_FATAL_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyFatalMessageButton.setSelection(true);
-		}
-		// proxyFatalMessageButton.addSelectionListener(eventMonitor);
-
-		proxyArgsMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyArgsMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyArgsMessageLabel"));
-		proxyArgsMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyArgsMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_ARGS_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyArgsMessageButton.setSelection(true);
-		}
-		// proxyArgsMessageButton.addSelectionListener(eventMonitor);
-
-		// *********************************************************************
-		// Check box group for proxy debug
-		// *********************************************************************
-		proxyDebugGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyDebugGroup.setLayout(new RowLayout());
-		proxyDebugGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyDebugGroupLabel"));
-
-		proxyDebugLoopButton = new Button(proxyDebugGroup, SWT.CHECK);
-		proxyDebugLoopButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyDebugLoopLabel"));
-		proxyDebugLoopButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyDebugLoopToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_DEBUG_LOOP);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyDebugLoopButton.setSelection(true);
-		}
-		// proxyDebugLoopButton.addSelectionListener(eventMonitor);
-
-		// *********************************************************************
-		// Check box group for gui messages
-		// *********************************************************************
-		guiOptionsGroup = new Group((Composite) preferencePane, SWT.NONE);
-		guiOptionsGroup.setLayout(new RowLayout());
-		guiOptionsGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.guiOptionsGroupLabel"));
-
-		guiTraceMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiTraceMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiTraceMessageLabel"));
-		guiTraceMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiTraceMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_TRACE_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiTraceMessageButton.setSelection(true);
-		}
-		// guiTraceMessageButton.addSelectionListener(eventMonitor);
-
-		guiInfoMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiInfoMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiInfoMessageLabel"));
-		guiInfoMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiInfoMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_INFO_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiInfoMessageButton.setSelection(true);
-		}
-		// guiInfoMessageButton.addSelectionListener(eventMonitor);
-
-		guiWarningMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiWarningMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiWarningMessageLabel"));
-		guiWarningMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiWarningMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_WARNING_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiWarningMessageButton.setSelection(true);
-		}
-		// guiWarningMessageButton.addSelectionListener(eventMonitor);
-
-		guiErrorMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiErrorMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiErrorMessageLabel"));
-		guiErrorMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiErrorMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_ERROR_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiErrorMessageButton.setSelection(true);
-		}
-		// guiErrorMessageButton.addSelectionListener(eventMonitor);
-
-		guiFatalMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiFatalMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiFatalMessageLabel"));
-		guiFatalMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiFatalMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_FATAL_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiFatalMessageButton.setSelection(true);
-		}
-		// guiFatalMessageButton.addSelectionListener(eventMonitor);
-
-		guiArgsMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiArgsMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiArgsMessageLabel"));
-		guiArgsMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiArgsMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_ARGS_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiArgsMessageButton.setSelection(true);
-		}
-		// guiArgsMessageButton.addSelectionListener(eventMonitor);
-
-		// *********************************************************************
-		// Radio box group for multicluster
-		// *********************************************************************
-		proxyMulticlusterGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyMulticlusterGroup.setLayout(new RowLayout());
-		proxyMulticlusterGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyMulticlusterGroupLabel"));
-
-		proxyLLDefaultRadioButton = new Button(proxyMulticlusterGroup,
-				SWT.RADIO);
-		proxyLLDefaultRadioButton
-				.setText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterDefaultLabel"));
-		preferenceValue = preferences.getString(IBMLLPreferenceConstants.PROXY_DEFAULT_MULTICLUSTER);
-        if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-        	proxyLLDefaultRadioButton.setSelection(true);
-        }
-		proxyLLDefaultRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		// proxyLLDefaultRadioButton.addSelectionListener(radioSelected);
-		proxyLLDefaultRadioButton
-				.setToolTipText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterDefaultToolTip"));
-
-		proxyForceLocalRadioButton = new Button(proxyMulticlusterGroup,
-				SWT.RADIO);
-		proxyForceLocalRadioButton
-				.setText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterForceLocalLabel"));
-		preferenceValue = preferences.getString(IBMLLPreferenceConstants.PROXY_FORCE_LOCAL);
-        if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-        	proxyForceLocalRadioButton.setSelection(true);
-        }
-		proxyForceLocalRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		// proxyForceLocalRadioButton.addSelectionListener(radioSelected);
-		proxyForceLocalRadioButton
-				.setToolTipText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterForceLocalToolTip"));
-
-		proxyForceMulticlusterRadioButton = new Button(proxyMulticlusterGroup,
-				SWT.RADIO);
-		proxyForceMulticlusterRadioButton
-				.setText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterForceMulticlusterLabel"));
-		preferenceValue = preferences.getString(IBMLLPreferenceConstants.PROXY_FORCE_MULTICLUSTER);
-        if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-        	proxyForceMulticlusterRadioButton.setSelection(true);
-        }
-		proxyForceMulticlusterRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		// proxyForceMulticlusterRadioButton.addSelectionListener(radioSelected);
-		proxyForceMulticlusterRadioButton
-				.setToolTipText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterForceMulticlusterToolTip"));
-
-		// *********************************************************************
-		// Template name group
-		// *********************************************************************
-		proxyTemplateGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyTemplateGroup.setLayout(createGridLayout(3, false, 0, 0));
-		proxyTemplateGroup.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL,
-				5));
-		proxyTemplateGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateGroupLabel"));
-
-		new Label(proxyTemplateGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateLabel"));
-
-		proxyTemplateTextWidget = new Text(proxyTemplateGroup, SWT.SINGLE
-				| SWT.BORDER);
-		proxyTemplateTextWidget.setLayoutData(new GridData(
-				GridData.FILL_HORIZONTAL));
-		templateListener = new EventMonitor();
-		proxyTemplateTextWidget.addModifyListener(templateListener);
-		proxyTemplateTextWidget
-				.setText(preferences
-						.getString(IBMLLPreferenceConstants.PROXY_LOADLEVELER_TEMPLATE_FILE));
-		proxyTemplateTextWidget.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateToolTip"));
-
-		 templateBrowseButton =
-		 SWTUtil.createPushButton(proxyTemplateGroup,
-		 Messages.getString("IBMLLPrefWizPage.browseButton"),
-		 null);
-		 templateBrowseButton.addSelectionListener(templateListener);
-
-		// *********************************************************************
-		// Template options group
-		// *********************************************************************
-		proxyTemplateOptionsGroup = new Group((Composite) preferencePane,
-				SWT.NONE);
-		proxyTemplateOptionsGroup.setLayout(new RowLayout());
-		proxyTemplateOptionsGroup
-				.setText(Messages
-						.getString("IBMLLPrefWizPage.proxyTemplateOptionsGroupLabel"));
-
-		proxyTemplateNeverRadioButton = new Button(proxyTemplateOptionsGroup,
-				SWT.RADIO);
-		proxyTemplateNeverRadioButton.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateNeverLabel"));
-		proxyTemplateNeverRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		preferenceValue = preferences.getString(IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_NEVER);
-        if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-        	proxyTemplateNeverRadioButton.setSelection(true);
-        }
-		// proxyTemplateNeverRadioButton.addSelectionListener(radioSelected);
-		proxyTemplateNeverRadioButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateNeverToolTip"));
-
-		proxyTemplateAlwaysRadioButton = new Button(proxyTemplateOptionsGroup,
-				SWT.RADIO);
-		proxyTemplateAlwaysRadioButton.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateAlwaysLabel"));
-		preferenceValue = preferences.getString(IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_ALWAYS);
-        if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-        	proxyTemplateAlwaysRadioButton.setSelection(true);
-        }
-		proxyTemplateAlwaysRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		// proxyTemplateAlwaysRadioButton.addSelectionListener(radioSelected);
-		proxyTemplateAlwaysRadioButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateAlwaysToolTip"));
-
-		// *********************************************************************
-		// Polling options group
-		// *********************************************************************
-		proxyPollingGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyPollingGroup.setLayout(new RowLayout());
-		proxyPollingGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingGroupLabel"));
-
-		new Label(proxyPollingGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMinLabel"));
-
-		proxyPollingNodeMin = new Spinner(proxyPollingGroup, SWT.READ_ONLY);
-		proxyPollingNodeMin.setIncrement(10);
-		proxyPollingNodeMin.setMinimum(30);
-		proxyPollingNodeMin.setMaximum(300);
-		proxyPollingNodeMin.setPageIncrement(50);
-		proxyPollingNodeMin.setSelection(preferences.getInt(IBMLLPreferenceConstants.PROXY_MIN_NODE_POLLING));
-		proxyPollingNodeMin.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMinToolTip"));
-		proxyPollingNodeMin.addModifyListener(eventMonitor);
-
-		new Label(proxyPollingGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMaxLabel"));
-
-		proxyPollingNodeMax = new Spinner(proxyPollingGroup, SWT.READ_ONLY);
-		proxyPollingNodeMax.setIncrement(10);
-		proxyPollingNodeMax.setMinimum(30);
-		proxyPollingNodeMax.setMaximum(500);
-		proxyPollingNodeMax.setPageIncrement(50);
-		proxyPollingNodeMax.setSelection(preferences.getInt(IBMLLPreferenceConstants.PROXY_MAX_NODE_POLLING));
-		proxyPollingNodeMax.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMaxToolTip"));
-		proxyPollingNodeMax.addModifyListener(eventMonitor);
-
-		new Label(proxyPollingGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingJobLabel"));
-
-		proxyPollingJob = new Spinner(proxyPollingGroup, SWT.READ_ONLY);
-		proxyPollingJob.setIncrement(10);
-		proxyPollingJob.setMinimum(30);
-		proxyPollingJob.setMaximum(300);
-		proxyPollingJob.setPageIncrement(50);
-		proxyPollingJob.setSelection(preferences.getInt(IBMLLPreferenceConstants.PROXY_JOB_POLLING));
-		proxyPollingJob.setToolTipText(Messages.getString("IBMLLPrefWizPage.proxyPollingJobToolTip"));
-		proxyPollingJob.addModifyListener(eventMonitor);
-
-		return preferencePane;
-	}
-
-	/**
-	 * Update the preferences store with the values set in the widgets managed
-	 * by this class.
-	 */
-	protected void updatePreferencePage() {
-		Preferences preferences;
-
-		preferences = getPreferences();
-
-		if (proxyLibraryTextWidget != null) {
-			preferences.setValue(
-					IBMLLPreferenceConstants.PROXY_LOADLEVELER_LIBRARY_PATH,
-					proxyLibraryTextWidget.getText().trim());
-		}
-
-		if (proxyTraceMessageButton != null) {
-			if (proxyTraceMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_TRACE_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_TRACE_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyInfoMessageButton != null) {
-			if (proxyInfoMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_INFO_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_INFO_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyWarningMessageButton != null) {
-			if (proxyWarningMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_WARNING_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_WARNING_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyErrorMessageButton != null) {
-			if (proxyErrorMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_ERROR_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_ERROR_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyFatalMessageButton != null) {
-			if (proxyFatalMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_FATAL_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_FATAL_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyArgsMessageButton != null) {
-			if (proxyArgsMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_ARGS_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_ARGS_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyDebugLoopButton != null) {
-			if (proxyDebugLoopButton.getSelection()) {
-				preferences.setValue(IBMLLPreferenceConstants.PROXY_DEBUG_LOOP,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(IBMLLPreferenceConstants.PROXY_DEBUG_LOOP,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-
-		if (guiTraceMessageButton != null) {
-			if (guiTraceMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_TRACE_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_TRACE_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (guiInfoMessageButton != null) {
-			if (guiInfoMessageButton.getSelection()) {
-				preferences.setValue(IBMLLPreferenceConstants.GUI_INFO_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(IBMLLPreferenceConstants.GUI_INFO_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (guiWarningMessageButton != null) {
-			if (guiWarningMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_WARNING_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_WARNING_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (guiErrorMessageButton != null) {
-			if (guiErrorMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_ERROR_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_ERROR_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (guiFatalMessageButton != null) {
-			if (guiFatalMessageButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_FATAL_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.GUI_FATAL_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (guiArgsMessageButton != null) {
-			if (guiArgsMessageButton.getSelection()) {
-				preferences.setValue(IBMLLPreferenceConstants.GUI_ARGS_MESSAGE,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(IBMLLPreferenceConstants.GUI_ARGS_MESSAGE,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyLLDefaultRadioButton != null) {
-			if (proxyLLDefaultRadioButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_DEFAULT_MULTICLUSTER,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_DEFAULT_MULTICLUSTER,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyForceLocalRadioButton != null) {
-			if (proxyForceLocalRadioButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_FORCE_LOCAL,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_FORCE_LOCAL,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyForceMulticlusterRadioButton != null) {
-			if (proxyForceMulticlusterRadioButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_FORCE_MULTICLUSTER,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_FORCE_MULTICLUSTER,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyTemplateTextWidget != null) {
-			preferences.setValue(
-					IBMLLPreferenceConstants.PROXY_LOADLEVELER_TEMPLATE_FILE,
-					proxyTemplateTextWidget.getText().trim());
-		}
-
-		if (proxyTemplateNeverRadioButton != null) {
-			if (proxyTemplateNeverRadioButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_NEVER,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_NEVER,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-
-		if (proxyTemplateAlwaysRadioButton != null) {
-			if (proxyTemplateAlwaysRadioButton.getSelection()) {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_ALWAYS,
-						IBMLLPreferenceConstants.LL_YES);
-			} else {
-				preferences.setValue(
-						IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_ALWAYS,
-						IBMLLPreferenceConstants.LL_NO);
-			}
-		}
-		
-		if (proxyPollingNodeMin != null) {
-			preferences.setValue(IBMLLPreferenceConstants.PROXY_MIN_NODE_POLLING,proxyPollingNodeMin.getSelection());
-		}
-		
-		if (proxyPollingNodeMax != null) {
-			preferences.setValue(IBMLLPreferenceConstants.PROXY_MAX_NODE_POLLING,proxyPollingNodeMax.getSelection());
-		}
-		
-		if (proxyPollingJob != null) {
-			preferences.setValue(IBMLLPreferenceConstants.PROXY_JOB_POLLING,proxyPollingJob.getSelection());
-		}
-
-	}
-	
-	protected String getFieldContent(String text) 
-	{
-		if (text.trim().length() == 0 || text.equals(""))
-			return null;
-
-		return text;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/BooleanRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/BooleanRowWidget.java
deleted file mode 100644
index e0d7638..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/BooleanRowWidget.java
+++ /dev/null

@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import java.util.List;
-
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.StringSetAttributeDefinition;
-import org.eclipse.ptp.rm.ibm.ll.ui.*;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Widget;
-
-public class BooleanRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private StringSetAttributeDefinition attrDef;
-    private BooleanOption widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class for events needed for notification of changes in data value for this widget
-     *
-     */
-    private class EventMonitor implements SelectionListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	/**
-	 * Set the non-default value indicator if the widget's value does not match the attribute's default
-	 * value
-	 * @param e The selection event indicating this object was clicked
-	 */
-	public void widgetSelected(SelectionEvent e)
-	{
-	    Button selectedButton;
-
-	    selectedButton = (Button) e.getSource();
-	    if (selectedButton.getText().equals(defaultValue)) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-    }
-
-    private class BooleanOption
-    {
-	private String attrValue;
-	private Composite group;
-	private Button buttons[];
-
-	/**
-	 * Create a radio button pair for use in selecting a boolean option. This object is a container for a pair of
-	 * radio buttons in a group box.
-	 * 
-	 * @param parent The parent widget for this object
-	 * @param labels A list of two labels used to label the radio buttons
-	 */
-	public BooleanOption(Composite parent, List<String> labels, int button_id)
-	{
-	    GridLayout layout;
-
-	    if (labels.size() != 2) {
-		throw new IllegalArgumentException("BooleanOption requires two labels");
-	    }
-	    group = new Composite(parent, SWT.NONE);
-	    layout = new GridLayout(2, true);
-	    layout.marginHeight = 0;
-	    layout.marginWidth = 0;
-	    group.setLayout(layout);
-	    buttons = new Button[2];
-	    buttons[0] = new Button(group, SWT.RADIO);
-	    buttons[0].setText(labels.get(0));
-	    buttons[0].setData(WidgetAttributes.BUTTON_ID, button_id);
-	    buttons[1] = new Button(group, SWT.RADIO);
-	    buttons[1].setText(labels.get(1));
-	    buttons[1].setData(WidgetAttributes.BUTTON_ID, button_id);
-	}
-
-	/**
-	 * Set the tooltip text for the object. The tooltip text is set on the group object
-	 * 
-	 * @param text The tooltip text
-	 */
-	public void setToolTipText(String text)
-	{
-	    group.setToolTipText(text);
-	}
-
-	/**
-	 * Set the selection state. The button with text matching the value string is set selected
-	 * 
-	 * @param value The value to be selected.
-	 */
-	public void setSelectedButton(String value)
-	{
-	    if (buttons[0].getText().equals(value)) {
-		buttons[0].setSelection(true);
-	    } else {
-		buttons[1].setSelection(true);
-	    }
-	}
-
-	/**
-	 * Get the value for the selected button. The value returned is the label for the selected button.
-	 * 
-	 * @return Value for this object
-	 */
-	public String getValue()
-	{
-	    if (buttons[0].getSelection()) {
-		return buttons[0].getText();
-	    }
-	    return buttons[1].getText();
-	}
-
-	/**
-	 * Set the layout data for this object
-	 * 
-	 * @param gd Layout data
-	 */
-	public void setLayoutData(GridData gd)
-	{
-	    group.setLayoutData(gd);
-	}
-
-	/**
-	 * Set the enable state for the Button objects in this object to the specified state 
-	 * @param state Enable state for this widget
-	 */
-	public void setEnabled(boolean state)
-	{
-	    buttons[0].setEnabled(state);
-	    buttons[1].setEnabled(state);
-	}
-
-	/**
-	 * Determine if this widget is in the enabled state
-	 * @return Enable state
-	 */
-	public boolean isEnabled()
-	{
-	    return buttons[0].isEnabled();
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData(String value)
-	{
-	    attrValue = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public String getData()
-	{
-	    return attrValue;
-	}
-
-	/**
-	 * Add a selection listener to the Button objects contained in this object
-	 * @param listener The selection listener
-	 */
-	public void addSelectionListener(SelectionListener listener)
-	{
-	    buttons[0].addSelectionListener(listener);
-	    buttons[1].addSelectionListener(listener);
-	}
-	
-	public boolean isMatchingWidget(Widget source)
-	{
-	    return ((source == buttons[0]) || (source == buttons[1]));
-	}
-    }
-
-    /**
-     * Create the widgets contained within this row. This class assumes that the layout manager for the
-     * Composite parent is a GridLayout with four columns.
-     * @param parent The Composite object that contains this widget
-     * @param id The attribute name for this widget
-     * @param def The attribute definition for this widget
-     */
-    public BooleanRowWidget(Composite parent, String id, StringSetAttributeDefinition def, int button_id)
-    {
-	attrDef = def;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	label.setText(Messages.getString(attrDef.getName()));
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	widget = new BooleanOption(parent, attrDef.getValues(), button_id);
-	widget.setToolTipText(Messages.getString(attrDef.getDescription()));
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = true;
-	gridData.horizontalSpan = 2;
-	widget.setLayoutData(gridData);
-	widget.setData(id);
-	try {
-	    defaultValue = attrDef.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addSelectionListener(eventMonitor);
-    }
-
-    /**
-     * Add a selection listener to this object. This method is a wrapper that just calls 
-     * addSelectionListener for the BooleanOption widget contained in this class
-     * @param listener The selection listener
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Set the enable state for the BooleanOption object contained in this object
-     * @param state The enable state
-     */
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-
-    /**
-     * Set the value for the BooleanOption object contained in this object. The result is that the radio button with
-     * label text matching the value parameter is set selected.
-     * @param value The value to set
-     */
-    public void setValue(String value)
-    {
-	widget.setSelectedButton(value);
-    }
-
-    /**
-     * Get the attribute name stored in this object.
-     * @return The attribute name
-     */
-    public String getData()
-    {
-	return widget.getData();
-    }
-
-    /**
-     * Get the value of the BooleanOption object contained in this object. THe returned value is the label text of the
-     * radio button in selected state.
-     * @return The object's value
-     */
-    public String getValue()
-    {
-	return widget.getValue();
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget.isMatchingWidget(source);
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    public String getDefaultValue()
-    {
-    return defaultValue;	
-    }
-    
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/CheckboxRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/CheckboxRowWidget.java
deleted file mode 100644
index ca15062..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/CheckboxRowWidget.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.rm.ibm.ll.ui.*;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Widget;
-
-public class CheckboxRowWidget implements ValidationState
-{
-
-    private Label label;
-    private Label fill;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attrDef;
-    private Button widget;
-    private String defaultValue;
-    private int validationState;
-
-    /**
-     * Create a checkbox widget and associated widgets. This class assumes that the layout manager for the 
-     * parent Composite object is a GridLayout with 4 columns. 
-     * @param parent The parent Composite widget
-     * @param id The name of the attribute associated with this object
-     * @param def The attribute definition for the attribute associated with this object 
-     */
-    public CheckboxRowWidget(Composite parent, String id, IAttributeDefinition<?, ?, ?> def)
-    {
-	attrDef = def;
-	label = new Label(parent, SWT.NONE);
-	label.setText(Messages.getString(def.getName()));
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	widget = new Button(parent, SWT.CHECK);
-	widget.setToolTipText(Messages.getString(def.getDescription()));
-	widget.setText("");
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData(WidgetAttributes.ATTR_NAME, id);
-	fill = new Label(parent, SWT.NONE);
-	fill.setText("");
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	fill.setLayoutData(gridData);
-    }
-
-    /**
-     * Add a selection listener for this object
-     * @param listener The listener
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Set the value of a data object in this class using the associated key
-     * @param key The data object key
-     * @param value The value to set
-     */
-    public void setData(String key, Object value)
-    {
-	widget.setData(key, value);
-    }
-
-    /**
-     * Return status indicating if this object is in the selected state
-     * @return selection state
-     */
-    public boolean getSelection()
-    {
-	return widget.getSelection();
-    }
-
-    /**
-     * Set the selection state (check mark) for this widget
-     * @param state The state to be set
-     */
-    public void setSelection(boolean state)
-    {
-	widget.setSelection(state);
-    }
-
-    /**
-     * Get the value associated with the specified key
-     * @param key Key for data to be retrieved
-     * @return The data value
-     */
-    public String getData(String key)
-    {
-	return (String) widget.getData(key);
-    }
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget == source;
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ComboRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ComboRowWidget.java
deleted file mode 100644
index 0571b9a..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ComboRowWidget.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import java.util.Iterator;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.StringSetAttributeDefinition;
-import org.eclipse.ptp.rm.ibm.ll.ui.*;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Widget;
-
-public class ComboRowWidget implements ValidationState
-{
-
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attrDef;
-    private Combo widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class used to monitor for changes in the data value of this object
-     */
-    private class EventMonitor implements ModifyListener, SelectionListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Handle event notification indicating that the value entered in the text field of the widget has changed
-	 * @param e The notification event
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    setDefaultStatus();
-	}
-
-	/**
-	 * Handle event notification indicating that a value has been selected from the Combo dropdown
-	 * @param e The notification event
-	 */
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	public void widgetSelected(SelectionEvent e)
-	{
-	    setDefaultStatus();
-	}
-    }
-
-    /**
-     * Create an object containing a Combo widget and related widgets for use in a tab pabe. This class assumes that the
-     * layout manager for the parent Composite widget is a GridLayout with 4 columns.
-     * @param parent The parent Composite widget
-     * @param id The name of the attribute associated with this object
-     * @param def The attribute definition for the attribute associated with this object
-     * @param readOnly Indicates whether the Combo widget is editable
-     */
-    public ComboRowWidget(Composite parent, String id, IAttributeDefinition<?, ?, ?> def, boolean readOnly, int selector_id)
-    {
-	Iterator<String> iter;
-
-	attrDef = def;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	label.setText(Messages.getString(attrDef.getName()));
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	if (readOnly) {
-	    widget = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
-	} else {
-	    widget = new Combo(parent, SWT.DROP_DOWN);
-	}
-	iter = ((StringSetAttributeDefinition) def).getValues().iterator();
-	while (iter.hasNext()) {
-	    widget.add(iter.next());
-	}
-	// Even though setToolTipText is called, the tooltip text does not
-	// appear when this is run on Linux. The problem seems to be
-	// setting tooltip text on a read-only combobox. Editable comboboxes
-	// work correctly. Maybe a Linux implementation bug since this works
-	// on Windows XP.
-	widget.setToolTipText(Messages.getString(attrDef.getDescription()));
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.horizontalSpan = 2;
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData(WidgetAttributes.ATTR_NAME, id);
-    widget.setData(WidgetAttributes.BUTTON_ID, selector_id);
-	try {
-	    defaultValue = attrDef.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-	widget.addSelectionListener(eventMonitor);
-    }
-
-    /** 
-     * Add a selection listener to this object for notification that a value was selected from the Combo dropdown
-     * @param listener The listener object
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Add a modify listener to this object for notification that the value in the Combo's text entry field has changed
-     * @param listener The listener object
-     */
-    public void addModifyListener(ModifyListener listener)
-    {
-	widget.addModifyListener(listener);
-    }
-
-    /**
-     * Get the data value from the Combo widget
-     * @return The data value
-     */
-    public String getValue()
-    {
-	return widget.getText().trim();
-    }
-
-    /**
-     * Set the data value in the Combo widget.
-     * @param value Data value
-     */
-    public void setValue(String value)
-    {
-	widget.setText(value);
-    }
-
-    /**
-     * Get the data value associated with the specified key
-     * @param key The key to be used
-     * @return The data value associated with the key
-     */
-    public String getData(String key)
-    {
-	return (String) widget.getData(key);
-    }
-
-    /**
-     * Get the enable state for the object 
-     * @return the enable state
-     */
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-
-    /**
-     * Set the non-default status flag to show whether the data value for this object is equal to the default value
-     * for the attribute.
-     */
-    protected void setDefaultStatus()
-    {
-	String value;
-	
-	value = widget.getText().trim();
-	if ((value.length() == 0) || (value.equals(defaultValue))) {
-	    nonDefaultMarker.setText(" ");
-	} else {
-	    nonDefaultMarker.setText("*");
-	}
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget == source;
-    }
-
-	public String getDefaultValue() {
-		return defaultValue;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/DualFieldRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/DualFieldRowWidget.java
deleted file mode 100644
index 62c7f5e..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/DualFieldRowWidget.java
+++ /dev/null

@@ -1,379 +0,0 @@
-
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.rm.ibm.ll.ui.*;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-public class DualFieldRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attr1;
-    private IAttributeDefinition<?, ?, ?> attr2;
-    private DualField widget;
-    private String defaultValue[];
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class used to monitor changes in value for this object
-     *
-     */
-    private class EventMonitor implements ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Set the non-default indicator to '*' if the data value for this object does not match
-	 * the default value from the attribute definition
-	 * @param e The event indicating value has changed
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    String value[];
-
-	    value = widget.getText();
-	    if ((value[0].equals(defaultValue[0])) && (value[1].equals(defaultValue[1]))) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-
-    }
-
-    /**
-     * This class implements a widget containing two text fields laid out horizontally. The intended use is for
-     * attributes which may have two values, such as MP_BUFFER_SIZE, so that each field can be handled and validated
-     * individually.
-     */
-    private class DualField
-    {
-	private Object attrValue1;
-	private Object attrValue2;
-	private Composite group;
-	private Text value[];
-
-	/**
-	 * Create the DualField object
-	 * 
-	 * @param parent parent for this object
-	 */
-	public DualField(Composite parent)
-	{
-	    GridLayout layout;
-	    GridData gd;
-
-	    group = new Composite(parent, SWT.NONE);
-	    layout = new GridLayout(2, true);
-	    layout.marginWidth = 0;
-	    layout.marginHeight = 0;
-	    gd = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-	    group.setLayout(layout);
-	    value = new Text[2];
-	    value[0] = new Text(group, SWT.SINGLE | SWT.BORDER);
-	    value[0].setLayoutData(gd);
-	    value[1] = new Text(group, SWT.SINGLE | SWT.BORDER);
-	    value[1].setLayoutData(gd);
-
-	}
-
-	/**
-	 * Set the layout data for this widget
-	 * 
-	 * @param gd Layout data
-	 */
-	public void setLayoutData(GridData gd)
-	{
-	    group.setLayoutData(gd);
-	}
-
-	/**
-	 * Add a ModifyListener that will monitor the Text field for modifications
-	 * 
-	 * @param listener The ModifyListener
-	 */
-	public void addModifyListener(ModifyListener listener)
-	{
-	    value[0].addModifyListener(listener);
-	    value[1].addModifyListener(listener);
-	}
-
-	/**
-	 * Set tooltip text for each field of the widget
-	 * 
-	 * @param tip1 Tooltip text for first field
-	 * @param tip2 Tooltip text for second field
-	 */
-	public void setToolTipText(String tip1, String tip2)
-	{
-	    value[0].setToolTipText(tip1);
-	    value[1].setToolTipText(tip2);
-	}
-
-	/**
-	 * Set initial values for each field in the widget
-	 * 
-	 * @param value1 Value for first field
-	 * @param value2 Value for second field
-	 */
-	public void setText(String value1, String value2)
-	{
-	    value[0].setText(value1);
-	    value[1].setText(value2);
-	}
-
-	/**
-	 * Get the value pair for this widget
-	 * 
-	 * @return text values contained in text widgets
-	 */
-	public String[] getText()
-	{
-	    String textValue[];
-
-	    textValue = new String[2];
-	    textValue[0] = value[0].getText().trim();
-	    textValue[1] = value[1].getText().trim();
-	    return textValue;
-	}
-
-	/**
-	 * Check if this widget is enabled
-	 * 
-	 * @return Enable state
-	 */
-	public boolean isEnabled()
-	{
-	    return value[0].isEnabled();
-	}
-
-	/**
-	 * Set the enable state for this widget
-	 * 
-	 * @param state Enable state
-	 */
-	public void setEnabled(boolean state)
-	{
-	    value[0].setEnabled(state);
-	    value[1].setEnabled(state);
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData1(Object value)
-	{
-	    attrValue1 = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public Object getData1()
-	{
-	    return attrValue1;
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData2(Object value)
-	{
-	    attrValue2 = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public Object getData2()
-	{
-	    return attrValue2;
-	}
-	
-	public boolean isMatchingWidget(Widget source)
-	{
-	    return ((value[0] == source) || (value[1] == source));
-	}
-    }
-
-    /**
-     * Create a widget with two text entry fields representing the two sub-fields required by this widget.
-     * This class assumes that the layout set for the parent Composite object is a GridLayout with four columns.
-     * @param parent The parent widget
-     * @param id1 The attribute name for the first field in this widget
-     * @param id2 The attribute name for the second field in this widget
-     * @param def1 The attribute definition for the first field in this widget
-     * @param def2 The attribute definition for the second field in this widget
-     */
-    public DualFieldRowWidget(Composite parent, String id1, String id2, IAttributeDefinition<?, ?, ?> def1,
-	    IAttributeDefinition<?, ?, ?> def2)
-    {
-	attr1 = def1;
-	attr2 = def2;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	label.setText(Messages.getString(attr1.getName()));
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	widget = new DualField(parent);
-	widget.setToolTipText(Messages.getString(attr1.getDescription()), Messages.getString(attr2.getDescription()));
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.horizontalSpan = 2;
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData1(id1);
-	widget.setData2(id2);
-	try {
-	    defaultValue = new String[2];
-	    defaultValue[0] = attr1.create().getValueAsString();
-	    defaultValue[1] = attr2.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue[0] = "";
-	    defaultValue[1] = "";
-	    ;
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-    }
-
-    /**
-     * Add a modify listener to this object 
-     * @param listener The listener object
-     */
-    public void addModifyListener(ModifyListener listener)
-    {
-	widget.addModifyListener(listener);
-    }
-
-    /**
-     * Set the enable state for this widget
-     * @param state The enable state
-     */
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-
-    /**
-     * Set the values for the two Text widgets contained in this object
-     * @param value1 First text object's value
-     * @param value2 Second text object's value
-     */
-    public void setValue(String value1, String value2)
-    {
-	widget.setText(value1, value2);
-    }
-
-    /** 
-     * Get the data object (the attribute name) associated with the first Text widget in this object
-     * @return The attribute name
-     */
-    public Object getData1()
-    {
-	return widget.getData1();
-    }
-
-    /** 
-     * Get the data object (the attribute name) associated with the second Text widget in this object
-     * @return The attribute name
-     */
-    public Object getData2()
-    {
-	return widget.getData2();
-    }
-
-    /**
-     * Return a String array containing the values from the two Text objects contained in this object
-     * @return Two element array containing the value from the two Text widgets contained in this object
-     */
-    public String[] getValue()
-    {
-	return widget.getText();
-    }
-
-    /**
-     * Return the enable state for this object
-     * @return The enable state
-     */
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget.isMatchingWidget(source);
-    }
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/FileSelectorRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/FileSelectorRowWidget.java
deleted file mode 100644
index 4a291d6..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/FileSelectorRowWidget.java
+++ /dev/null

@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration.ValidationState;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-public class FileSelectorRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attr;
-    private FileSelector widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class for notifications when the value of the pathname field changes
-     *
-     */
-    private class EventMonitor implements ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Set the non-default indicator for this object when the pathname does not match the default pathname for this
-	 * object
-	 * @param e The notification event
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    if (widget.getPath().equals(defaultValue)) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-    }
-
-    /**
-     * This class is a container for a text field and browse button combination used for file selection. When the browse
-     * button is clicked, the registered SelectionListener will pop up a file or directory dialog prompting the user for
-     * a path. When the user clicks ok in that dialog, the text field in this object is filled in with the selected
-     * path. The browse button and text box are treated as a single object by the rest of the code in this file so that
-     * they can be easily set to enabled or disabled state.
-     * 
-     */
-    private class FileSelector
-    {
-	private Object attrValue;
-	private Text path;
-	private Button browseButton;
-
-	/**
-	 * Create the file selector object
-	 * 
-	 * @param parent Parent widget for the file selector
-	 * @param selectorID Identifier for this file selector
-	 * @param tooltipText Tooltip text for the selector
-	 */
-	public FileSelector(Composite parent, Integer selectorID, String tooltipText)
-	{
-	    GridData gd;
-
-	    path = new Text(parent, SWT.SINGLE | SWT.BORDER);
-	    path.setToolTipText(tooltipText);
-	    gd = new GridData(GridData.FILL_HORIZONTAL);
-	    gd.grabExcessHorizontalSpace = true;
-	    path.setLayoutData(gd);
-	    browseButton = new Button(parent, SWT.PUSH);
-	    browseButton.setText(Messages.getString("FileSelector.BrowseButton"));
-	    browseButton.setData(WidgetAttributes.BUTTON_ID, new Integer(selectorID));
-	    gd = new GridData(GridData.FILL_HORIZONTAL);
-	    gd.grabExcessHorizontalSpace = false;
-	    browseButton.setLayoutData(gd);
-
-	}
-
-	/**
-	 * Set the file selector's enable state
-	 * 
-	 * @param enable Enable state
-	 */
-	public void setEnabled(boolean enable)
-	{
-	    path.setEnabled(enable);
-	    browseButton.setEnabled(enable);
-	}
-
-	/**
-	 * Determine the enable state for the file selector
-	 * 
-	 * @return enable state
-	 */
-	public boolean isEnabled()
-	{
-	    return path.isEnabled();
-	}
-
-	/**
-	 * Set the path to be displayed in the text field of the file selector
-	 * 
-	 * @param pathname Pathname to be displayed
-	 */
-	public void setPath(String pathname)
-	{
-	    path.setText(pathname);
-	}
-
-	/**
-	 * Get the specified path from the text field of the file selector
-	 * 
-	 * @return Pathname
-	 */
-	public String getPath()
-	{
-	    return path.getText();
-	}
-
-	/**
-	 * Set focus on the text field within the selector widget
-	 * 
-	 * @return
-	 */
-	public boolean setFocus()
-	{
-	    return path.setFocus();
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData(Object value)
-	{
-	    attrValue = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public Object getData()
-	{
-	    return attrValue;
-	}
-
-	public void addSelectionListener(SelectionListener listener)
-	{
-	    browseButton.addSelectionListener(listener);
-	}
-
-	public void addModifyListener(ModifyListener listener)
-	{
-	    path.addModifyListener(listener);
-	}
-	
-	public boolean isMatchingWidget(Widget source)
-	{
-	    return path == source;
-	}
-    }
-
-    /**
-     * Create a file selector widget and related widgets for this class. This class assumes that the layout manager
-     * for the parent Composite object is a GridLayout with 4 columns.
-     * @param parent
-     * @param id
-     * @param selectorID
-     * @param def
-     */
-    public FileSelectorRowWidget(Composite parent, String id, Integer selectorID, IAttributeDefinition<?, ?, ?> def)
-    {
-	attr = def;
-	label = new Label(parent, SWT.NONE);
-	label.setText(Messages.getString(attr.getName()));
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label.setLayoutData(gridData);
-	widget = new FileSelector(parent, selectorID, Messages.getString(attr.getDescription()));
-	widget.setData(id);
-	try {
-	    defaultValue = attr.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-    }
-
-    /**
-     * Set the pathname for this object
-     * @param path Pathname
-     */
-    public void setPath(String path)
-    {
-	widget.setPath(path);
-    }
-
-    /**
-     * Set the enable state for this object
-     * @param state The enable state
-     */
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-
-    /**
-     * Set the data value (attribute name) for this object
-     * @param value The data value
-     */
-    public void setData(Object value)
-    {
-	widget.setData(value);
-    }
-
-    /**
-     * Get the data value (attribute name) for this object
-     * @return The data value
-     */
-    public Object getData()
-    {
-	return widget.getData();
-    }
-
-    /**
-     * Get the pathname specified in this object
-     * @return Pathname
-     */
-    public String getValue()
-    {
-	return widget.getPath().trim();
-    }
-    
-    /**
-     * Get the enable state for this object
-     * @return The enable state
-     */
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-
-    /**
-     * Set focus to the text field within this object
-     */
-    public void setFocus()
-    {
-	widget.setFocus();
-    }
-
-    /**
-     * Add a selection listener which will receive notifications when the browse button in this object has
-     * been clicked.
-     * @param listener The listener
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Add a selection listener which will receive notifications when the path name field in this object has changed value
-     * @param listener The listener
-     */
-    public void addModifyListener(ModifyListener listener)
-    {
-	widget.addModifyListener(listener);
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget.isMatchingWidget(source);
-    }
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 1437ddb..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,3036 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.core.attributes.BigIntegerAttribute;
-import org.eclipse.ptp.core.attributes.BigIntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringSetAttribute;
-import org.eclipse.ptp.core.attributes.StringSetAttributeDefinition;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.rm.ibm.ll.core.rmsystem.IBMLLResourceManagerConfiguration;
-import org.eclipse.ptp.rm.ibm.ll.ui.IBMLLPreferenceManager;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.ibm.ll.ui.preferences.IBMLLPreferenceConstants;
-import org.eclipse.ptp.rmsystem.AbstractResourceManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Widget;
-
-public class IBMLLRMLaunchConfigurationDynamicTab extends
-		AbstractRMLaunchConfigurationDynamicTab {
-	private static final int INFO_MESSAGE = 0;
-	private static final int TRACE_MESSAGE = 1;
-	private static final int WARNING_MESSAGE = 2;
-	private static final int ERROR_MESSAGE = 3;
-	private static final int FATAL_MESSAGE = 4;
-	private static final int ARGS_MESSAGE = 5;
-
-	private static int state_trace = 0; /* 0=message off, 1=message on */
-	private static int state_info = 0; /* 0=message off, 1=message on */
-	private static int state_warning = 1; /* 0=message off, 1=message on */
-	private static int state_error = 1; /* 0=message off, 1=message on */
-	private static int state_args = 0; /* 0=message off, 1=message on */
-	private static int state_fatal = 1; /* 0=message off, 1=message on */
-
-	/*
-	 * The following constants define the names of all attributes which may be
-	 * known by the IBMLL proxy.
-	 */
-	private static final String LL_PTP_JOB_COMMAND_FILE = "LL_PTP_JOB_COMMAND_FILE";
-	private static final String LL_PTP_JOB_COMMAND_FILE_TEMPLATE = "LL_PTP_JOB_COMMAND_FILE_TEMPLATE";
-	private static final String LL_PTP_SUBMIT_MODE = "LL_PTP_SUBMIT_MODE";
-	private static final String LL_PTP_CLASS = "LL_PTP_CLASS";
-	private static final String LL_PTP_COMMENT = "LL_PTP_COMMENT";
-	private static final String LL_PTP_ERROR = "LL_PTP_ERROR";
-	private static final String LL_PTP_INPUT = "LL_PTP_INPUT";
-	private static final String LL_PTP_OUTPUT = "LL_PTP_OUTPUT";
-	private static final String LL_PTP_INITIALDIR = "LL_PTP_INITIALDIR";
-	private static final String LL_PTP_JOB_NAME = "LL_PTP_JOB_NAME";
-	private static final String LL_PTP_JOB_TYPE = "LL_PTP_JOB_TYPE";
-	private static final String LL_PTP_NETWORK_MPI = "LL_PTP_NETWORK_MPI";
-	private static final String LL_PTP_NETWORK_LAPI = "LL_PTP_NETWORK_LAPI";
-	private static final String LL_PTP_NETWORK_MPI_LAPI = "LL_PTP_NETWORK_MPI_LAPI";
-	private static final String LL_PTP_REQUIREMENTS = "LL_PTP_REQUIREMENTS";
-	private static final String LL_PTP_RESOURCES = "LL_PTP_RESOURCES";
-	private static final String LL_PTP_SHELL = "LL_PTP_SHELL";
-	private static final String LL_PTP_TASK_GEOMETRY = "LL_PTP_TASK_GEOMETRY";
-	private static final String LL_PTP_BULK_XFER = "LL_PTP_BULK_XFER";
-	private static final String LL_PTP_LARGE_PAGE = "LL_PTP_LARGE_PAGE";
-	private static final String LL_PTP_NODE_MIN = "LL_PTP_NODE_MIN";
-	private static final String LL_PTP_NODE_MAX = "LL_PTP_NODE_MAX";
-	private static final String LL_PTP_BLOCKING = "LL_PTP_BLOCKING";
-	private static final String LL_PTP_TOTAL_TASKS = "LL_PTP_TOTAL_TASKS";
-	private static final String LL_PTP_WALLCLOCK_HARD = "LL_PTP_WALLCLOCK_HARD";
-	private static final String LL_PTP_WALLCLOCK_SOFT = "LL_PTP_WALLCLOCK_SOFT";
-	private static final String LL_PTP_TASKS_PER_NODE = "LL_PTP_TASKS_PER_NODE";
-	private static final String LL_PTP_EXECUTABLE = "LL_PTP_EXECUTABLE";
-	private static final String LL_PTP_ENVIRONMENT = "LL_PTP_ENVIRONMENT";
-	private static final String LL_PTP_MAX_INT = "LL_PTP_MAX_INT";
-
-	/*
-	 * End of attribute name list.
-	 */
-	private static final String ENABLE_STATE = "ENABLE_STATE";
-	private static final RMLaunchValidation success = new RMLaunchValidation(
-			true, "");
-
-	private static final int LL_PTP_JOB_COMMAND_FILE_SELECTOR = 18;
-	private static final int LL_PTP_SUBMIT_MODE_RADIOBOX = 100;
-	private static final int LL_PTP_JOB_COMMAND_FILE_TEMPLATE_SELECTOR = 19;
-	private static final int LL_PTP_JOB_TYPE_SELECTOR = 20;
-
-	private static final int KBYTE = 1024;
-	private static final int MBYTE = 1024 * 1024;
-	private static final int GBYTE = 1024 * 1024 * 1024;
-
-	private boolean ignoreModifyEvents = false;
-	private EventMonitor eventMonitor;
-	private Composite mainPanel;
-	private TabFolder tabbedPane;
-	private ILaunchConfigurationWorkingCopy currentLaunchConfig;
-	private IResourceManager currentRM;
-	private BooleanRowWidget llSubmitMode;
-	private boolean allFieldsValid = true;
-	private String errorMessage;
-	private Vector<Object> activeWidgets;
-	private IRemoteConnection remoteConnection;
-	private IRemoteServices remoteService;
-	private IRemoteUIServices remoteUIService;
-	private Shell parentShell;
-
-	private Composite generalTabPane = null;
-	private Composite schedulingBasicTabPane = null;
-	private Composite schedulingRequirementsTabPane = null;
-	private Composite schedulingResourcesTabPane = null;
-	private Composite runtimeTabPane = null;
-	private Composite nodesNetworkTabPane = null;
-	private Composite limitsTabPane = null;
-
-	private FileSelectorRowWidget llJobCommandFile = null;
-	private FileSelectorRowWidget llJobCommandFileTemplate = null;
-
-	/*
-	 * Widgets for General Tab
-	 */
-	private TextRowWidget llComment = null;
-	private TextRowWidget llJobName = null;
-	private ComboRowWidget llJobType = null;
-	/*
-	 * Widgets for Scheduling (Basic) Tab
-	 */
-	private TextRowWidget llClass = null;
-	private ComboRowWidget llLargePage = null;
-	/*
-	 * Widgets for Scheduling (Requirements) Tab
-	 */
-	private TextRowWidget llRequirements = null;
-	/*
-	 * Widgets for Scheduling (Resources) Tab
-	 */
-	private TextRowWidget llResources = null;
-	/*
-	 * Widgets for Runtime
-	 */
-	private TextRowWidget llError = null;
-	private TextRowWidget llInput = null;
-	private TextRowWidget llOutput = null;
-	private TextRowWidget llInitialDir = null;
-	private TextRowWidget llShell = null;
-	private TextRowWidget llExecutable = null;
-	private TextRowWidget llEnvironment = null;
-	/*
-	 * Widgets for Nodes/Network Tab
-	 */
-	private TextRowWidget llBlocking = null;
-	private ComboRowWidget llBulkxfer = null;
-	private TextRowWidget llNetwork_mpi = null;
-	private TextRowWidget llNetwork_lapi = null;
-	private TextRowWidget llNetwork_mpi_lapi = null;
-	private TextRowWidget llNodeMin = null;
-	private TextRowWidget llNodeMax = null;
-	private TextRowWidget llTaskGeometry = null;
-	private TextRowWidget llTasksPerNode = null;
-	private TextRowWidget llTotalTasks = null;
-	/*
-	 * Widgets for Limits Tab Note: llWallClockLimitHard and
-	 * llWallClockLimitSoft are duplicated here.
-	 */
-	private TextRowWidget llWallClockLimitHard = null;
-	private TextRowWidget llWallClockLimitSoft = null;
-
-	Preferences myPreferences = null;
-	/**
-	 * Exception class intended for use in validating fields within this panel.
-	 * When a validation error occurs, the validation code should create and
-	 * throw a ValidationException, which is intended to be caught by the top
-	 * level validation method.
-	 */
-	public class ValidationException extends Exception {
-		/**
-		 *
-		 */
-		private static final long serialVersionUID = 1L;
-
-		@SuppressWarnings("unused")
-		private ValidationException() {
-			throw new IllegalAccessError(
-					"ValidationException default constructor should not be called");
-		}
-
-		/**
-		 * Create a ValidationException with error message
-		 *
-		 * @param message
-		 *            The error message
-		 */
-		public ValidationException(String message) {
-			super(message);
-		}
-	}
-
-	/**
-	 * Internal class which handles events of interest to this panel
-	 */
-	private class EventMonitor implements ModifyListener, SelectionListener {
-		public EventMonitor() {
-			print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-					+ ":EventMonitor entered.");
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":EventMonitor returning.");
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-					+ ":widgetDefaultSelected entered.");
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":widgetDefaultSelected returning.");
-		}
-
-		/**
-		 * Handle events sent when registered buttons are clicked
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			Object widgetData;
-
-			print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-					+ ":widgetSelected entered.");
-			// Determine which button was clicked based on the data value stored
-			// in that button object
-			// and handle processing for that button.
-			widgetData = e.widget.getData(WidgetAttributes.BUTTON_ID);
-			if (widgetData == null) {
-				// A widget other than a file selector browse button was
-				// clicked. Just call
-				// fireContentsChanged to drive enabling the Apply/Revert
-				// buttons. Since the widget is supposed
-				// to be a button widget, no validation of user data is needed.
-				fireContentsChanged();
-			} else {
-
-				switch (((Integer) widgetData).intValue()) {
-				case LL_PTP_JOB_COMMAND_FILE_SELECTOR:
-					getInputFile(llJobCommandFile,
-							"File.llJobCommandFileTitle",
-							"llJobCommandFilePath");
-					break;
-				case LL_PTP_JOB_COMMAND_FILE_TEMPLATE_SELECTOR:
-					getInputFile(llJobCommandFileTemplate,
-							"File.llJobCommandFileTemplateTitle",
-							"llJobCommandFileTemplatePath");
-					break;
-				case LL_PTP_SUBMIT_MODE_RADIOBOX:
-					setLaunchPanelMode();
-					validateAllFields();
-					break;
-				case LL_PTP_JOB_TYPE_SELECTOR:
-					validateAllFields();
-					break;
-				}
-
-			}
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":widgetSelected returning.");
-		}
-
-		/**
-		 * Handle events sent when registered Text and Combo widgets have their
-		 * text field modified.
-		 */
-		public void modifyText(ModifyEvent e) {
-			print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-					+ ":modifyText entered.");
-			// Text and Combo widgets send ModifyEvents any time their text
-			// value is modified, including
-			// when the value is modified by a setText() call. The only time
-			// ModifyEvents are of interest is
-			// when the user has entered text. Code which calls setText() on a
-			// widget should set the
-			// ignoreModifyEvents before calling setText() and reset
-			// ignoreModifyEvents after the call.
-			setFieldValidationRequired((Widget) e.getSource());
-			if (!ignoreModifyEvents) {
-				validateAllFields();
-			}
-
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":modifyText returning.");
-		}
-	}
-
-	public IBMLLRMLaunchConfigurationDynamicTab(IResourceManager rm) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":IBMLLRMLaunchConfigurationDynamicTab entered.");
-		myPreferences = IBMLLPreferenceManager.getPreferences();
-
-		if ((myPreferences.getString(IBMLLPreferenceConstants.GUI_TRACE_MESSAGE)).equals(IBMLLPreferenceConstants.LL_YES)) {
-			state_trace = 1;
-		} else {
-			state_trace  = 0;
-		}
-
-		if ((myPreferences.getString(IBMLLPreferenceConstants.GUI_INFO_MESSAGE)).equals(IBMLLPreferenceConstants.LL_YES)) {
-			state_info = 1;
-		} else {
-			state_info  = 0;
-		}
-
-		if ((myPreferences.getString(IBMLLPreferenceConstants.GUI_WARNING_MESSAGE)).equals(IBMLLPreferenceConstants.LL_YES)) {
-			state_warning = 1;
-		} else {
-			state_warning  = 0;
-		}
-
-		if ((myPreferences.getString(IBMLLPreferenceConstants.GUI_ERROR_MESSAGE)).equals(IBMLLPreferenceConstants.LL_YES)) {
-			state_error = 1;
-		} else {
-			state_error  = 0;
-		}
-
-		if ((myPreferences.getString(IBMLLPreferenceConstants.GUI_ARGS_MESSAGE)).equals(IBMLLPreferenceConstants.LL_YES)) {
-			state_args = 1;
-		} else {
-			state_args  = 0;
-		}
-
-		if ((myPreferences.getString(IBMLLPreferenceConstants.GUI_FATAL_MESSAGE)).equals(IBMLLPreferenceConstants.LL_YES)) {
-			state_fatal = 1;
-		} else {
-			state_fatal  = 0;
-		}
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":IBMLLRMLaunchConfigurationDynamicTab returning.");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#canSave(org.eclipse.swt.widgets.Control,
-	 *      org.eclipse.ptp.rmsystem.IResourceManager,
-	 *      org.eclipse.ptp.core.IPQueue)
-	 */
-	public RMLaunchValidation canSave(Control control, IResourceManager rm,
-			IPQueue queue) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":canSave entered.");
-		if (allFieldsValid) {
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":canSave returning.");
-			return success;
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":canSave returning.");
-		return new RMLaunchValidation(false, errorMessage);
-	}
-
-	/**
-	 * Get the directory path from the launch configuration
-	 *
-	 * @param attrName
-	 *            Launch configuration attribute name for this directory
-	 * @return Directory path
-	 */
-	private String getFileDialogPath(String attrName) {
-		String dir;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getFileDialogPath entered.");
-		dir = "/";
-		if (currentLaunchConfig != null) {
-			try {
-				dir = currentLaunchConfig.getAttribute(attrName, "/");
-			} catch (CoreException e) {
-				dir = "/";
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getFileDialogPath returning.");
-		return dir;
-	}
-
-	/**
-	 * Save directory path in the launch configuration
-	 *
-	 * @param attrName
-	 *            Launch configuration attribute name for this directory
-	 * @param path
-	 *            Directory path
-	 */
-	private void saveFileDialogPath(String attrName, String path) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":saveFileDialogPath entered.");
-		if (currentLaunchConfig != null) {
-			currentLaunchConfig.setAttribute(attrName, path);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":saveFileDialogPath returning.");
-	}
-
-	/**
-	 * Display a file selector dialog prompting the user for the path of an
-	 * input file. If the user clicks 'open', then set the pathname into the
-	 * text field of the specified FileSelector object.
-	 *
-	 * @param selector
-	 *            The FileSelector object to hold path name
-	 * @param titleID
-	 *            Title for the dialog
-	 * @param pathAttrID
-	 *            Launch configuration attribute id for saving path info
-	 */
-	protected void getInputFile(FileSelectorRowWidget selector, String titleID,
-			String pathAttrID) {
-		String selectedFile = null;
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getInputFile entered.");
-		if (remoteUIService != null) {
-			IRemoteUIFileManager fmgr = remoteUIService.getUIFileManager();
-			fmgr.setConnection(remoteConnection);
-			selectedFile = fmgr.browseFile(parentShell, Messages.getString(titleID),
-							getFileDialogPath(pathAttrID)).toString();
-		}
-		if (selectedFile != null) {
-			saveFileDialogPath(pathAttrID, selectedFile);
-			selector.setPath(selectedFile);
-			selector.setFocus();
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getInputFile returning.");
-	}
-
-	/**
-	 * Display a file selector dialog prompting the user for the path of an
-	 * output file. If the user clicks 'save', then set the pathname into the
-	 * text field of the specified FileSelector object.
-	 *
-	 * @param selector
-	 *            The FileSelector object to hold path name
-	 * @param titleID
-	 *            Title for the dialog
-	 * @param pathAttrID
-	 *            Launch configuration attribute id for saving path info
-	 */
-	protected void getOutputFile(FileSelectorRowWidget selector,
-			String titleID, String pathAttrID) {
-		String selectedFile = null;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getOutputFile entered.");
-		if (remoteUIService != null) {
-			IRemoteUIFileManager fmgr = remoteUIService.getUIFileManager();
-			fmgr.setConnection(remoteConnection);
-			selectedFile = fmgr.browseFile(parentShell, Messages.getString(titleID),
-							getFileDialogPath(pathAttrID)).toString();
-		}
-		if (selectedFile != null) {
-			saveFileDialogPath(pathAttrID, selectedFile);
-			selector.setPath(selectedFile);
-			selector.setFocus();
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getOutputFile returning.");
-	}
-
-	/**
-	 * Display a directory selector dialog prompting the user for the pathname
-	 * of a directory. If the user clocks 'ok', then set the pathname into the
-	 * text field of the specified FileSelector.
-	 *
-	 * @param selector
-	 *            FileSelector object to be updated
-	 * @param titleID
-	 *            Title for the dialog
-	 * @param pathAttrID
-	 *            Launch configuration attribute id for saving path info
-	 */
-	protected void getDirectory(FileSelectorRowWidget selector, String titleID,
-			String pathAttrID) {
-		String selectedFile = null;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getDirectory entered.");
-		if (remoteUIService != null) {
-			IRemoteUIFileManager fmgr = remoteUIService.getUIFileManager();
-			fmgr.setConnection(remoteConnection);
-			selectedFile = fmgr.browseDirectory(parentShell, Messages.getString(titleID),
-							getFileDialogPath(pathAttrID)).toString();
-		}
-		if (selectedFile != null) {
-			String parentDir;
-
-			parentDir = new File(selectedFile).getParent();
-			if (parentDir == null) {
-				saveFileDialogPath(pathAttrID, "/");
-			} else {
-				saveFileDialogPath(pathAttrID, parentDir);
-			}
-			selector.setPath(selectedFile);
-			selector.setFocus();
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getDirectory returning.");
-	}
-
-	/**
-	 * Mark the validation state for the specified widget to indicate that the
-	 * widget value must be validated.
-	 *
-	 * @param source
-	 *            The widget to validate.
-	 */
-	protected void setFieldValidationRequired(Widget source) {
-		// Iterate thru the list of widgets looking for the widget which needs
-		// to be validated. When found, set
-		// that widget's validation state to indicate validation is needed.
-		// Widget class needs
-		// to be checked since although these widgets perform similar functions,
-		// they do not comprise a set of
-		// logically related widgets that can be easily organized in a class
-		// hierarchy.
-		Iterator<Object> i;
-
-		i = activeWidgets.iterator();
-		while (i.hasNext()) {
-			Object widget;
-
-			widget = i.next();
-			if (widget instanceof BooleanRowWidget) {
-				if (((BooleanRowWidget) widget).isMatchingWidget(source)) {
-					((BooleanRowWidget) widget).setValidationRequired();
-					return;
-				}
-			} else if (widget instanceof CheckboxRowWidget) {
-				if (((CheckboxRowWidget) widget).isMatchingWidget(source)) {
-					((CheckboxRowWidget) widget).setValidationRequired();
-					return;
-				}
-			} else if (widget instanceof ComboRowWidget) {
-				if (((ComboRowWidget) widget).isMatchingWidget(source)) {
-					((ComboRowWidget) widget).setValidationRequired();
-					return;
-				}
-			} else if (widget instanceof DualFieldRowWidget) {
-				if (((DualFieldRowWidget) widget).isMatchingWidget(source)) {
-					((DualFieldRowWidget) widget).setValidationRequired();
-					return;
-				}
-			} else if (widget instanceof FileSelectorRowWidget) {
-				if (((FileSelectorRowWidget) widget).isMatchingWidget(source)) {
-					((FileSelectorRowWidget) widget).setValidationRequired();
-					return;
-				}
-			} else if (widget instanceof TextRowWidget) {
-				if (((TextRowWidget) widget).isMatchingWidget(source)) {
-					((TextRowWidget) widget).setValidationRequired();
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Mark all widget's validation state to indicate that the widget value has
-	 * changed, meaning validation is required.
-	 */
-	private void markAllFieldsChanged() {
-		Iterator<Object> i;
-
-		i = activeWidgets.iterator();
-		while (i.hasNext()) {
-			Object widget;
-
-			widget = i.next();
-			if (widget instanceof BooleanRowWidget) {
-				((BooleanRowWidget) widget).setValidationRequired();
-			} else if (widget instanceof CheckboxRowWidget) {
-				((CheckboxRowWidget) widget).setValidationRequired();
-			} else if (widget instanceof ComboRowWidget) {
-				((ComboRowWidget) widget).setValidationRequired();
-			} else if (widget instanceof DualFieldRowWidget) {
-				((DualFieldRowWidget) widget).setValidationRequired();
-			} else if (widget instanceof FileSelectorRowWidget) {
-				((FileSelectorRowWidget) widget).setValidationRequired();
-			} else if (widget instanceof TextRowWidget) {
-				((TextRowWidget) widget).setValidationRequired();
-			}
-		}
-	}
-
-	/**
-	 * Disable the tab pane widget and all children of the tab pane. Calling
-	 * setEnabled(false) on the tab pane widget disables the tab pane and
-	 * prevents interaction with child widgets, but does not change the visible
-	 * state of the child widget. This method changes the state of all widgets
-	 * to correctly indicate they are disabled.
-	 *
-	 * @param widget
-	 *            The widget to be disabled.
-	 */
-	private void disableTabPaneWidget(Control widget) {
-		Control children[];
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":disableTabPaneWidget entered.");
-		// For any Composite widget, recursively call this method for each child
-		// of the Composite. This must be
-		// done before disabling the Composite since disabling the Composite
-		// also marks its children disabled
-		// and the real enable/disable state of the child cannot be preserved.
-		if (widget instanceof Composite) {
-			children = ((Composite) widget).getChildren();
-			for (int i = 0; i < children.length; i++) {
-				disableTabPaneWidget(children[i]);
-			}
-		}
-		// Remember the current state of the widget, then disable it.
-		widget.setData(ENABLE_STATE, Boolean.valueOf(widget.isEnabled()));
-		widget.setEnabled(false);
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":disableTabPaneWidget returning.");
-	}
-
-	/**
-	 * Restore widget back to its previous enable/disable state
-	 *
-	 * @param widget
-	 *            The widget whose state is to be restored.
-	 */
-	private void restoreTabPaneWidgetState(Control widget) {
-		Control children[];
-		Boolean state;
-		boolean enableFlag;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":restoreTabPaneWidgetState entered.");
-		// Get widget's previous enable/disable state. If there is no saved
-		// state, such as when initially
-		// creating the parallel tab in basic mode, then enable the widget.
-		state = (Boolean) widget.getData(ENABLE_STATE);
-		if (state == null) {
-			enableFlag = true;
-		} else {
-			enableFlag = state.booleanValue();
-		}
-		widget.setEnabled(enableFlag);
-		// Recursively call this method to handle children of a Composite
-		// widget. Note that ordering of processing
-		// here does not matter since enabling a Composite widget does not
-		// automatically enable its children.
-		if (widget instanceof Composite) {
-			children = ((Composite) widget).getChildren();
-			for (int i = 0; i < children.length; i++) {
-				restoreTabPaneWidgetState(children[i]);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":restoreTabPaneWidgetState returning.");
-	}
-
-	/**
-	 * Restore widget back to its previous enable/disable state
-	 *
-	 * @param widget
-	 *            The widget whose state is to be restored.
-	 */
-	private void enableTabPaneWidgetState(Control widget) {
-		Control children[];
-		Boolean state;
-		boolean enableFlag;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":enableTabPaneWidgetState entered.");
-		// Enable the widget.
-		widget.setEnabled(true);
-		// Recursively call this method to handle children of a Composite
-		// widget. Note that ordering of processing
-		// here does not matter since enabling a Composite widget does not
-		// automatically enable its children.
-		if (widget instanceof Composite) {
-			children = ((Composite) widget).getChildren();
-			for (int i = 0; i < children.length; i++) {
-				enableTabPaneWidgetState(children[i]);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":enableTabPaneWidgetState returning.");
-	}
-
-	/**
-	 * Set launch panel mode based on llSubmitMode setting. If checked, then set
-	 * submit mode, where the user supplies a LL setup script. Otherwise set
-	 * basic mode, where the user chooses LL options from a tabbed dialog panel.
-	 */
-	protected void setLaunchPanelMode() {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setLaunchPanelMode entered.");
-		if (llSubmitMode != null) {
-			if (llSubmitMode.getValue().equals("Advanced")) {
-				if (llJobCommandFile != null) {
-					llJobCommandFile.setEnabled(true);
-				}
-				if (llJobCommandFileTemplate != null) {
-					llJobCommandFileTemplate.setEnabled(false);
-				}
-				disableTabPaneWidget(tabbedPane);
-			} else {
-				if (llJobCommandFile != null) {
-					llJobCommandFile.setEnabled(false);
-				}
-				if (llJobCommandFileTemplate != null) {
-					llJobCommandFileTemplate.setEnabled(true);
-				}
-				enableTabPaneWidgetState(tabbedPane);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setLaunchPanelMode returning.");
-
-	}
-
-	/**
-	 * Create a text widget in the tabbed view. The text field spans columns 2
-	 * and 3 of the tabbed pane. The label and tooltip text are obtained from
-	 * the attribute definition object.
-	 *
-	 * @param parent
-	 *            Parent widget (the pane in the tabbed view)
-	 * @param rm
-	 *            Resource manager used by this launch config
-	 * @param id
-	 *            Attribute id for rm attribute this widget represents
-	 * @return TextRowWidget entry widget
-	 */
-	private TextRowWidget createTextWidget(Composite parent,
-			IResourceManager rm, String id) {
-		TextRowWidget widget;
-		IAttributeDefinition<?, ?, ?> attr;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createTextWidget entered.");
-		widget = null;
-		attr = rm.getAttributeDefinition(id);
-		if (attr != null) {
-			widget = new TextRowWidget(parent, id, attr);
-			widget.addModifyListener(eventMonitor);
-			widget.setValidationRequired();
-			activeWidgets.add(widget);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createTextWidget returning.");
-		return widget;
-	}
-
-	/**
-	 * Create a text widget in the tabbed view. The text field spans columns 2
-	 * and 3 of the tabbed pane. The label and tooltip text are obtained from
-	 * the attribute definition object.
-	 *
-	 * @param parent
-	 *            Parent widget (the pane in the tabbed view)
-	 * @param rm
-	 *            Resource manager used by this launch config
-	 * @param id1
-	 *            Attribute id for first rm attribute this widget represents
-	 * @param id2
-	 *            Attribute id for second rm attribute this widget represents
-	 * @return Text entry widget
-	 */
-	private DualFieldRowWidget createDualField(Composite parent,
-			IResourceManager rm, String id1, String id2) {
-		DualFieldRowWidget widget;
-		IAttributeDefinition<?, ?, ?> attr1;
-		IAttributeDefinition<?, ?, ?> attr2;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createDualField entered.");
-		widget = null;
-		attr1 = rm.getAttributeDefinition(id1);
-		attr2 = rm.getAttributeDefinition(id2);
-		if ((attr1 != null) && (attr2 != null)) {
-			widget = new DualFieldRowWidget(parent, id1, id2, attr1, attr2);
-			widget.addModifyListener(eventMonitor);
-			widget.setValidationRequired();
-			activeWidgets.add(widget);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createDualField returning.");
-		return widget;
-	}
-
-	/**
-	 * Create a checkbox widget in the tabbed view. The checkbox is in column 2
-	 * and column 3 is a filler (Label) widget. To ensure consistent alignment,
-	 * this method allocates extra horizontal space to the 2nd column. The label
-	 * and tooltip text are obtained from the attribute definition object.
-	 *
-	 * @param parent
-	 *            Parent widget (the pane in the tabbed view)
-	 * @param rm
-	 *            Resource manager used by this launch config
-	 * @param id
-	 *            Attribute id for rm attribute this widget represents
-	 * @return Checkbox button for this attribute
-	 */
-	private CheckboxRowWidget createCheckbox(Composite parent,
-			IResourceManager rm, String id) {
-		CheckboxRowWidget widget;
-		StringAttributeDefinition attrDef;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createCheckbox entered.");
-		widget = null;
-		attrDef = (StringAttributeDefinition) rm.getAttributeDefinition(id);
-		if (attrDef != null) {
-			widget = new CheckboxRowWidget(parent, id, attrDef);
-			widget.setValidationRequired();
-			activeWidgets.add(widget);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createCheckbox returning.");
-		return widget;
-	}
-
-	/**
-	 * Create a radio button pair in the tabbed view. The label, button labels,
-	 * and tooltip text are obtained from the attribute definition object.
-	 *
-	 * @param parent
-	 *            Parent widget (the pane in the tabbed view)
-	 * @param rm
-	 *            Resource manager used by this launch config
-	 * @param id
-	 *            Attribute id for rm attribute this widget represents
-	 * @return Checkbox button for this attribute
-	 */
-	private BooleanRowWidget createBooleanOption(Composite parent,
-			IResourceManager rm, String id) {
-		BooleanRowWidget widget;
-		StringSetAttributeDefinition attrDef;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createBooleanOption entered.");
-		widget = null;
-		attrDef = (StringSetAttributeDefinition) rm.getAttributeDefinition(id);
-		if (attrDef != null) {
-			widget = new BooleanRowWidget(parent, id, attrDef,
-					LL_PTP_SUBMIT_MODE_RADIOBOX);
-			widget.setValidationRequired();
-			widget.addSelectionListener(eventMonitor);
-			activeWidgets.add(widget);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createBooleanOption returning.");
-		return widget;
-	}
-
-	/**
-	 * Create a text field and pushbutton in this row. The text field is in
-	 * column 2 and the pushbutton in column 3. The user either fills in the
-	 * text field with a pathname, or clicks the button to pop up a file
-	 * selector dialog that then fills in the text field. To ensure consistent
-	 * alignment, this method allocates extra horizontal space to the 2nd
-	 * column. The label and tooltip text are obtained from the attribute
-	 * definition object.
-	 *
-	 * @param parent
-	 *            Parent widget (the pane in the tabbed view)
-	 * @param rm
-	 *            Resource manager used by this launch config
-	 * @param id
-	 *            Attribute id for rm attribute this widget represents
-	 * @param selectorID
-	 *            Identifier used to identify the browse button associated with
-	 *            this widget
-	 * @return Text entry field for this attribute
-	 */
-	private FileSelectorRowWidget createFileSelector(Composite parent,
-			IResourceManager rm, String id, int selectorID) {
-		FileSelectorRowWidget widget;
-		StringAttributeDefinition attr;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createFileSelector entered.");
-		widget = null;
-		attr = (StringAttributeDefinition) rm.getAttributeDefinition(id);
-		if (attr != null) {
-			widget = new FileSelectorRowWidget(parent, id, selectorID, attr);
-			widget.setData(id);
-			widget.setValidationRequired();
-			widget.addModifyListener(eventMonitor);
-			widget.addSelectionListener(eventMonitor);
-			activeWidgets.add(widget);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createFileSelector returning.");
-		return widget;
-	}
-
-	/**
-	 * Create a combobox widget in the tabbed view. The widget spans columns 2
-	 * and 3 of the tabbed pane. The label and tooltip text are obtained from
-	 * the attribute definition object.
-	 *
-	 * @param parent
-	 *            Parent widget (the pane in the tabbed view)
-	 * @param rm
-	 *            Resource manager used by this launch config
-	 * @param id
-	 *            Attribute id for rm attribute this widget represents
-	 * @return ComboRowWidget used by this attribute
-	 */
-	private ComboRowWidget createCombobox(Composite parent,
-			IResourceManager rm, String id, int selector_id) {
-		ComboRowWidget widget;
-		IAttributeDefinition<?, ?, ?> attr;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createCombobox entered.");
-		widget = null;
-		attr = rm.getAttributeDefinition(id);
-		if (attr != null) {
-			widget = new ComboRowWidget(parent, id, attr, true, selector_id);
-			widget.setValidationRequired();
-			widget.addSelectionListener(eventMonitor);
-			activeWidgets.add(widget);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createCombobox returning.");
-		return widget;
-	}
-
-	/**
-	 * Create an editable combobox in the tabbed view. The widget spans columns
-	 * 2 and 3 of the tabbed pane. The label and tooltip text are obtained from
-	 * the attribute definition object.
-	 *
-	 * @param parent
-	 *            Parent widget (the pane in the tabbed view)
-	 * @param rm
-	 *            Resource manager used by this launch config
-	 * @param id
-	 *            Attribute id for rm attribute this widget represents
-	 * @return Editable ComboRowWidget used by this attribute
-	 */
-	private ComboRowWidget createEditableCombobox(Composite parent,
-			IResourceManager rm, String id, int selector_id) {
-		ComboRowWidget widget;
-		IAttributeDefinition<?, ?, ?> attr;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createEditableCombobox entered.");
-		widget = null;
-		attr = rm.getAttributeDefinition(id);
-		if (attr != null) {
-			widget = new ComboRowWidget(parent, id, attr, false, selector_id);
-			widget.setValidationRequired();
-			widget.addSelectionListener(eventMonitor);
-			widget.addModifyListener(eventMonitor);
-			activeWidgets.add(widget);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createEditableCombobox returning.");
-		return widget;
-	}
-
-	/**
-	 * Reset all widgets within this pane to null as part of panel
-	 * initialization. Depending on OS and operation mode (with or without
-	 * LoadLeveler), some widgets will not appear on the panels, where the set
-	 * of attribute definitions sent by the proxy determines that set. New
-	 * widgets will be generated only when a corresponding attribute definition
-	 * is sent by the proxy. Any code which accesses a widget should ensure the
-	 * widget is not null before accessing the widget object.
-	 */
-	private void clearAllWidgets() {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":clearAllWidgets entered.");
-		llComment = null;
-		llJobName = null;
-		llJobType = null;
-		llClass = null;
-		llLargePage = null;
-		llWallClockLimitHard = null;
-		llWallClockLimitSoft = null;
-		llRequirements = null;
-		llResources = null;
-		llError = null;
-		llInput = null;
-		llOutput = null;
-		llInitialDir = null;
-		llShell = null;
-		llExecutable = null;
-		llEnvironment = null;
-		llBlocking = null;
-		llBulkxfer = null;
-		llNetwork_mpi = null;
-		llNetwork_lapi = null;
-		llNetwork_mpi_lapi = null;
-		llNodeMin = null;
-		llNodeMax = null;
-		llTaskGeometry = null;
-		llTasksPerNode = null;
-		llTotalTasks = null;
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":clearAllWidgets returning.");
-
-	}
-
-	/**
-	 * Create the layout object for a pane in the TabFolder
-	 *
-	 * @return Layout for use in the tabbed pane
-	 */
-	private Layout createTabPaneLayout() {
-		GridLayout layout;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createTabPaneLayout entered.");
-		layout = new GridLayout(4, false);
-		layout.marginWidth = 4;
-		layout.horizontalSpacing = 8;
-		layout.verticalSpacing = 4;
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createTabPaneLayout returning.");
-		return layout;
-	}
-
-	/**
-	 * Create the tasks tab of the attributes pane
-	 *
-	 * @param rm
-	 *            resource manager associated with this launch configuration
-	 */
-	private void createGeneralTab(IResourceManager rm) {
-		TabItem tab;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createGeneralTab entered.");
-		tab = new TabItem(tabbedPane, SWT.NONE);
-		generalTabPane = new Composite(tabbedPane, SWT.NONE);
-		tab.setControl(generalTabPane);
-		tab.setText(Messages.getString("GeneralTab.title"));
-		generalTabPane.setLayout(createTabPaneLayout());
-		llComment = createTextWidget(generalTabPane, rm, LL_PTP_COMMENT);
-		llJobName = createTextWidget(generalTabPane, rm, LL_PTP_JOB_NAME);
-		llJobType = createCombobox(generalTabPane, rm, LL_PTP_JOB_TYPE, LL_PTP_JOB_TYPE_SELECTOR);
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createGeneralTab returning.");
-	}
-
-	/**
-	 * Create the I/O tab of the attributes pane
-	 *
-	 * @param rm
-	 *            resource manager associated with this launch configuration
-	 */
-	private void createSchedulingBasicTab(IResourceManager rm) {
-		TabItem tab;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createSchedulingBasicTab entered.");
-		tab = new TabItem(tabbedPane, SWT.NONE);
-		schedulingBasicTabPane = new Composite(tabbedPane, SWT.NONE);
-		tab.setControl(schedulingBasicTabPane);
-		tab.setText(Messages.getString("SchedulingBasicTab.title"));
-		schedulingBasicTabPane.setLayout(createTabPaneLayout());
-		llClass = createTextWidget(schedulingBasicTabPane, rm, LL_PTP_CLASS);
-		llLargePage = createCombobox(schedulingBasicTabPane, rm,
-				LL_PTP_LARGE_PAGE, 0);
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createSchedulingBasicTab returning.");
-	}
-
-	/**
-	 * Create the diagnostics tab of the attributes pane
-	 *
-	 * @param rm
-	 *            resource manager associated with this launch configuration
-	 */
-	private void createSchedulingRequirementsTab(IResourceManager rm) {
-		TabItem tab;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createSchedulingRequirementsTab entered.");
-		tab = new TabItem(tabbedPane, SWT.NONE);
-		schedulingRequirementsTabPane = new Composite(tabbedPane, SWT.NONE);
-		tab.setControl(schedulingRequirementsTabPane);
-		tab.setText(Messages.getString("SchedulingRequirementsTab.title"));
-		schedulingRequirementsTabPane.setLayout(createTabPaneLayout());
-		llRequirements = createTextWidget(schedulingRequirementsTabPane, rm,
-				LL_PTP_REQUIREMENTS);
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createSchedulingRequirementsTab returning.");
-	}
-
-	/**
-	 * Create the debug tab of the attributes pane
-	 *
-	 * @param rm
-	 *            resource manager associated with this launch configuration
-	 */
-	private void createSchedulingResourcesTab(IResourceManager rm) {
-		TabItem tab;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createSchedulingResourcesTab entered.");
-		tab = new TabItem(tabbedPane, SWT.NONE);
-		schedulingResourcesTabPane = new Composite(tabbedPane, SWT.NONE);
-		tab.setControl(schedulingResourcesTabPane);
-		tab.setText(Messages.getString("SchedulingResourcesTab.title"));
-		schedulingResourcesTabPane.setLayout(createTabPaneLayout());
-		llResources = createTextWidget(schedulingResourcesTabPane, rm,
-				LL_PTP_RESOURCES);
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createSchedulingResourcesTab returning.");
-	}
-
-	/**
-	 * Create the system resources tab of the attributes pane
-	 *
-	 * @param rm
-	 *            resource manager associated with this launch configuration
-	 */
-	private void createRuntimeTab(IResourceManager rm) {
-		TabItem tab;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createRuntimeTab entered.");
-		tab = new TabItem(tabbedPane, SWT.NONE);
-		runtimeTabPane = new Composite(tabbedPane, SWT.NONE);
-		tab.setControl(runtimeTabPane);
-		tab.setText(Messages.getString("RuntimeTab.title"));
-		runtimeTabPane.setLayout(createTabPaneLayout());
-		llError = createTextWidget(runtimeTabPane, rm, LL_PTP_ERROR);
-		llOutput = createTextWidget(runtimeTabPane, rm, LL_PTP_OUTPUT);
-		llInput = createTextWidget(runtimeTabPane, rm, LL_PTP_INPUT);
-		llExecutable = createTextWidget(runtimeTabPane, rm, LL_PTP_EXECUTABLE);
-		llInitialDir = createTextWidget(runtimeTabPane, rm, LL_PTP_INITIALDIR);
-		llEnvironment = createTextWidget(runtimeTabPane, rm, LL_PTP_ENVIRONMENT);
-		llShell = createTextWidget(runtimeTabPane, rm, LL_PTP_SHELL);
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createRuntimeTab returning.");
-	}
-
-	/**
-	 * Create the node allocation tab of the attributes pane
-	 *
-	 * @param rm
-	 *            resource manager associated with this launch configuration
-	 */
-	private void createNodesNetworkTab(IResourceManager rm) {
-		TabItem tab;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createNodesNetworkTab entered.");
-		tab = new TabItem(tabbedPane, SWT.NONE);
-		nodesNetworkTabPane = new Composite(tabbedPane, SWT.NONE);
-		tab.setControl(nodesNetworkTabPane);
-		tab.setText(Messages.getString("NodesNetworkTab.title"));
-		nodesNetworkTabPane.setLayout(createTabPaneLayout());
-		llBlocking = createTextWidget(nodesNetworkTabPane, rm, LL_PTP_BLOCKING);
-		llBulkxfer = createCombobox(nodesNetworkTabPane, rm,
-				LL_PTP_BULK_XFER, 0);
-		llNetwork_mpi = createTextWidget(nodesNetworkTabPane, rm,
-				LL_PTP_NETWORK_MPI);
-		llNetwork_lapi = createTextWidget(nodesNetworkTabPane, rm,
-				LL_PTP_NETWORK_LAPI);
-		llNetwork_mpi_lapi = createTextWidget(nodesNetworkTabPane, rm,
-				LL_PTP_NETWORK_MPI_LAPI);
-		llNodeMin = createTextWidget(nodesNetworkTabPane, rm, LL_PTP_NODE_MIN);
-		llNodeMax = createTextWidget(nodesNetworkTabPane, rm, LL_PTP_NODE_MAX);
-		llTaskGeometry = createTextWidget(nodesNetworkTabPane, rm,
-				LL_PTP_TASK_GEOMETRY);
-		llTasksPerNode = createTextWidget(nodesNetworkTabPane, rm,
-				LL_PTP_TASKS_PER_NODE);
-		llTotalTasks = createTextWidget(nodesNetworkTabPane, rm,
-				LL_PTP_TOTAL_TASKS);
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createNodesNetworkTab returning.");
-	}
-
-	/**
-	 * Create the first performance tab of the attributes pane. Due to the
-	 * number of performance related attributes, there are two performance tabs.
-	 *
-	 * @param rm
-	 *            resource manager associated with this launch configuration
-	 */
-	private void createLimitsTab(IResourceManager rm) {
-		TabItem tab;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createLimitsTab entered.");
-		tab = new TabItem(tabbedPane, SWT.NONE);
-		limitsTabPane = new Composite(tabbedPane, SWT.NONE);
-		tab.setControl(limitsTabPane);
-		tab.setText(Messages.getString("LimitsTab.title"));
-		limitsTabPane.setLayout(createTabPaneLayout());
-		llWallClockLimitHard = createTextWidget(limitsTabPane, rm,
-				LL_PTP_WALLCLOCK_HARD);
-		llWallClockLimitSoft = createTextWidget(limitsTabPane, rm,
-				LL_PTP_WALLCLOCK_SOFT);
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createLimitsTab returning.");
-	}
-
-	/**
-	 * Create a pane containing the submit mode radio box
-	 *
-	 * @param rm
-	 *            The resource manager associated with this launch configuration
-	 */
-	private void createModeBox(IResourceManager rm) {
-		GridData gd;
-		GridLayout layout;
-		Composite pane;
-
-		pane = new Composite(mainPanel, SWT.NONE);
-		layout = new GridLayout(4, false);
-		layout.marginWidth = 4;
-		layout.horizontalSpacing = 8;
-		layout.verticalSpacing = 4;
-		pane.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		pane.setLayoutData(gd);
-
-		llSubmitMode = createBooleanOption(pane, rm, LL_PTP_SUBMIT_MODE);
-		if (llSubmitMode != null) {
-			llSubmitMode.addSelectionListener(eventMonitor);
-			llJobCommandFile = createFileSelector(pane, rm,
-					LL_PTP_JOB_COMMAND_FILE, LL_PTP_JOB_COMMAND_FILE_SELECTOR);
-			llJobCommandFileTemplate = createFileSelector(pane, rm,
-					LL_PTP_JOB_COMMAND_FILE_TEMPLATE,
-					LL_PTP_JOB_COMMAND_FILE_TEMPLATE_SELECTOR);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createModeBox returning.");
-
-	}
-
-	/**
-	 * This method creates all of the GUI elements of the resource-manager
-	 * specific pane within the parallel tab of the launch configuration dialog.
-	 *
-	 * @param parent
-	 *            This control's parent
-	 * @param rm
-	 *            The resource manager associated with this launch configuration
-	 * @param queue
-	 *            Currently selected queue
-	 */
-	public void createControl(Composite parent, IResourceManager rm,
-			IPQueue queue) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":createControl entered.");
-		IBMLLResourceManagerConfiguration config;
-		IRemoteConnectionManager connMgr;
-
-		config = (IBMLLResourceManagerConfiguration) ((AbstractResourceManager) rm)
-				.getConfiguration();
-		remoteService = PTPRemoteCorePlugin.getDefault().getRemoteServices(
-				config.getRemoteServicesId());
-		remoteUIService = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(remoteService);
-		connMgr = remoteService.getConnectionManager();
-		remoteConnection = connMgr.getConnection(config.getConnectionName());
-		parentShell = parent.getShell();
-		clearAllWidgets();
-		activeWidgets = new Vector<Object>();
-		eventMonitor = new EventMonitor();
-		mainPanel = new Composite(parent, SWT.NONE);
-		mainPanel.setLayout(new GridLayout(1, false));
-		createModeBox(rm);
-		tabbedPane = new TabFolder(mainPanel, SWT.TOP);
-		createGeneralTab(rm);
-		createSchedulingBasicTab(rm);
-		createSchedulingRequirementsTab(rm);
-		createSchedulingResourcesTab(rm);
-		createRuntimeTab(rm);
-		createNodesNetworkTab(rm);
-		createLimitsTab(rm);
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":createControl returning.");
-		currentRM = rm;
-	}
-
-	/**
-	 * Add an attribute to the set of launch attributes if not same as default
-	 * sent from proxy
-	 *
-	 * @param rm
-	 *            The resource manager associated with the current launch
-	 *            configuration
-	 * @param config
-	 *            The current launch configuration
-	 * @param attrs
-	 *            The attributes vector containing the set of launch attributes
-	 * @param attrName
-	 *            The name of the attribute to be added to launch attributes
-	 */
-	private void addAttribute(IResourceManager rm, ILaunchConfiguration config,
-			Vector<StringAttribute> attrs, String attrName) {
-		String attrValue;
-		String defaultValue;
-		StringAttribute attr;
-		StringAttributeDefinition attrDef;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":addAttribute entered.");
-		if (rm.getAttributeDefinition(attrName) != null) {
-			try {
-				attrValue = config.getAttribute(attrName, "");
-			} catch (CoreException e) {
-				attrValue = "";
-			}
-
-			defaultValue = getAttrDefaultValue(rm, attrName);
-
-			if ((attrValue.trim().length() > 0)
-					&& ((!attrValue.equals(defaultValue))
-							|| (attrName.equals("LL_PTP_JOB_TYPE"))
-							|| (attrName
-									.equals("LL_PTP_JOB_COMMAND_FILE_TEMPLATE"))
-							|| (attrName.equals("LL_PTP_SUBMIT_MODE"))
-							|| (attrName.equals("LL_PTP_CLASS"))
-							|| (attrName.equals("LL_PTP_INPUT"))
-							|| (attrName.equals("LL_PTP_OUTPUT"))
-							|| (attrName.equals("LL_PTP_ERROR"))
-							|| (attrName.equals("LL_PTP_ENVIRONMENT"))
-							|| (attrName.equals("LL_PTP_JOB_TYPE")) || (attrName
-							.equals("LL_PTP_JOB_COMMAND_FILE")))) {
-				attrDef = new StringAttributeDefinition(attrName, "", "",
-						false, "");
-				attr = new StringAttribute(attrDef, attrValue);
-				attrs.add(attr);
-			}
-
-		}
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":addAttribute returning.");
-	}
-
-	/**
-	 * Get the set of attributes to be used as launch attributes
-	 *
-	 * @param rm
-	 *            The resource manager associated with the current launch
-	 *            configuration
-	 * @param queue
-	 *            The current queue (not used for LL since there is only a
-	 *            single queue)
-	 * @param configuration
-	 *            The current launch configuration
-	 */
-	public IAttribute<String, StringAttribute, StringAttributeDefinition>[] getAttributes(
-			IResourceManager rm, IPQueue queue,
-			ILaunchConfiguration configuration, String mode) throws CoreException {
-		Vector<StringAttribute> attrs;
-		StringAttribute attrArray[];
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getAttributes entered.");
-		attrs = new Vector<StringAttribute>();
-		attrArray = new StringAttribute[0];
-
-		Map<String, StringAttribute> allAttrs;
-		Set<String> attrNames;
-		Iterator<String> i;
-		String name;
-
-		allAttrs = configuration.getAttributes();
-		attrNames = allAttrs.keySet();
-		i = attrNames.iterator();
-		while (i.hasNext()) {
-			name = i.next();
-			if (name.startsWith("LL_PTP_")) {
-				addAttribute(rm, configuration, attrs, name);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getAttributes returning.");
-		return attrs.toArray(attrArray);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#getControl()
-	 */
-	public Control getControl() {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getControl entered.");
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getControl returning.");
-		return mainPanel;
-	}
-
-	/**
-	 * Get the default value for an attribute from the resource manager, giving
-	 * preference to a user override of the default value (which the user does
-	 * by setting of the corresponding environment variable before starting the
-	 * proxy.) The user's override is passed to the front end by the proxy as a
-	 * string attribute where the leading 'MP_' of the attribute name is
-	 * replaced with 'EN_'
-	 *
-	 * @param rm
-	 *            The resource manager currently associated with the launch
-	 *            configuration
-	 * @param attrName
-	 *            The name of the attribute
-	 * @return The value of the attribute
-	 */
-	private String getAttrLocalDefaultValue(IResourceManager rm, String attrName) {
-		IAttributeDefinition<?, ?, ?> attrDef;
-		String localDefaultEnv;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getAttrLocalDefaultValue entered.");
-		localDefaultEnv = attrName.replaceFirst("^MP_", "EN_");
-		attrDef = rm.getAttributeDefinition(localDefaultEnv);
-		if (attrDef != null) {
-			try {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":getAttrLocalDefaultValue returning.");
-				return attrDef.create().getValueAsString();
-			} catch (IllegalValueException e) {
-			}
-		}
-		attrDef = rm.getAttributeDefinition(attrName);
-		if (attrDef != null) {
-			try {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":getAttrLocalDefaultValue returning.");
-				return attrDef.create().getValueAsString();
-			} catch (IllegalValueException e) {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":getAttrLocalDefaultValue returning.");
-				return "";
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getAttrLocalDefaultValue returning.");
-		return "";
-	}
-
-	/**
-	 * Get the default value for an attribute from the resource manager
-	 *
-	 * @param rm
-	 *            The resource manager currently associated with the launch
-	 *            configuration
-	 * @param attrName
-	 *            The name of the attribute
-	 * @return The value of the attribute
-	 */
-	private String getAttrDefaultValue(IResourceManager rm, String attrName) {
-		IAttributeDefinition<?, ?, ?> attrDef;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getAttrDefaultValue entered.");
-		attrDef = rm.getAttributeDefinition(attrName);
-		if (attrDef != null) {
-			try {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":getAttrDefaultValue returning.");
-				return attrDef.create().getValueAsString();
-			} catch (IllegalValueException e) {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":getAttrDefaultValue returning.");
-				return "";
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getAttrDefaultValue returning.");
-		return "";
-	}
-
-	/**
-	 * Get the attribute value for the specified attribute. If the value is
-	 * stored in the launch configuration, that value is used. Otherwise the
-	 * default value from the resource manager is used.
-	 *
-	 * @param config
-	 *            The current launch configuration
-	 * @param rm
-	 *            The resource manager currently associated with the launch
-	 *            configuration
-	 * @param attrName
-	 *            The name of the attribute
-	 * @return The value of the attribute
-	 */
-	private String getAttrInitialValue(ILaunchConfiguration config,
-			IResourceManager rm, String attrName) {
-		String value;
-		IAttributeDefinition<?, ?, ?> rmAttrDef;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getAttrInitialValue entered.");
-		try {
-			value = config.getAttribute(attrName, "_no_value_");
-		} catch (CoreException e) {
-			value = "_no_value_";
-		}
-		if (value.equals("_no_value_")) {
-			// Get the default attribute value, where that default may be the
-			// value
-			// specified by the user as an override to the LL default value.
-			value = getAttrLocalDefaultValue(rm, attrName);
-		}
-		// If an attribute is defined as an integer attribute, then determine if
-		// the attribute is evenly divisible by 1G, 1M or 1K, and if so, then
-		// convert the
-		// value accordingly. The tests must be done largest to smallest so that
-		// the largest conversion factor is used. The attribute value may
-		// already be
-		// in the form 999[gGmMkK]. Converting that to a long will result in a
-		// NumberFormatException, so a try/catch block is required, where the
-		// string
-		// value is returned in thecase of a NumberFormatException
-		rmAttrDef = rm.getAttributeDefinition(attrName);
-		if (rmAttrDef instanceof IntegerAttributeDefinition
-				|| rmAttrDef instanceof BigIntegerAttributeDefinition) {
-			long intVal;
-
-			try {
-				intVal = Long.valueOf(value);
-				if (intVal != 0) {
-					if ((intVal % GBYTE) == 0) {
-						print_message(TRACE_MESSAGE, "<<< "
-								+ this.getClass().getName()
-								+ ":getAttrInitialValue returning.");
-						return String.valueOf(intVal / GBYTE) + "G";
-					} else {
-						if ((intVal % MBYTE) == 0) {
-							print_message(TRACE_MESSAGE, "<<< "
-									+ this.getClass().getName()
-									+ ":getAttrInitialValue returning.");
-							return String.valueOf(intVal / MBYTE) + "M";
-						} else {
-							if ((intVal % KBYTE) == 0) {
-								print_message(TRACE_MESSAGE, "<<< "
-										+ this.getClass().getName()
-										+ ":getAttrInitialValue returning.");
-								return String.valueOf(intVal / KBYTE) + "K";
-							}
-						}
-					}
-				}
-			} catch (NumberFormatException e) {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":getAttrInitialValue returning.");
-				return value;
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":getAttrInitialValue returning.");
-		return value;
-	}
-
-	/**
-	 * Set checkbox to checked state if attribute has value equal to checkValue
-	 * otherwise set it unchecked
-	 *
-	 * @param checkbox
-	 *            The checkbox to set
-	 * @param attrValue
-	 *            The attribute value to check
-	 * @param checkValue
-	 *            The value corresponding to a checked checkbox
-	 */
-	private void setValue(CheckboxRowWidget checkbox, String attrValue,
-			String checkValue) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setValue entered.");
-		if (checkbox != null) {
-			if (attrValue.equals(checkValue)) {
-				checkbox.setSelection(true);
-			} else {
-				checkbox.setSelection(false);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setValue returning.");
-	}
-
-	private void setValue(BooleanRowWidget option, String checkValue) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setValue entered.");
-		if (option != null) {
-			option.setValue(checkValue);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setValue returning.");
-	}
-
-	/**
-	 * Set the text value for a Text widget to the specified value if the widget
-	 * is not null.
-	 *
-	 * @param widget
-	 *            The widget to set
-	 * @param value
-	 *            The value to be set
-	 */
-	private void setValue(TextRowWidget widget, String value) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setValue entered.");
-		if (widget != null) {
-			widget.setValue(value);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setValue returning.");
-	}
-
-	/**
-	 * Set the text value for a DualField widget to the specified value if the
-	 * widget is not null.
-	 *
-	 * @param widget
-	 *            The widget to set
-	 * @param value1
-	 *            The value to be set in field 1
-	 * @param value2
-	 *            The value to be set in field 2
-	 */
-	private void setValue(DualFieldRowWidget widget, String value1,
-			String value2) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setValue entered.");
-		if (widget != null) {
-			widget.setValue(value1, value2);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setValue returning.");
-	}
-
-	/**
-	 * Set the text value for a ComboRowWidget to the specified value if the
-	 * widget is not null.
-	 *
-	 * @param widget
-	 *            The widget to set
-	 * @param value
-	 *            The value to be set
-	 */
-	private void setValue(ComboRowWidget widget, String value) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setValue entered.");
-		if (widget != null) {
-			widget.setValue(value);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setValue returning.");
-	}
-
-	/**
-	 * Set the pathname for a file selector if the file selector is not null
-	 *
-	 * @param selector
-	 *            File selector to be updated
-	 * @param path
-	 *            Pathname
-	 */
-	private void setValue(FileSelectorRowWidget selector, String path) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setValue entered.");
-		if (selector != null) {
-			selector.setPath(path);
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setValue returning.");
-	}
-
-	/**
-	 * Set initial values for all widgets
-	 *
-	 * @param configuration
-	 *            The current launch configuration
-	 * @param rm
-	 *            The resource manager currently associated with the launch
-	 *            configuration
-	 */
-	private void setInitialValues(ILaunchConfiguration config,
-			IResourceManager rm) {
-		Object widget;
-		Iterator<Object> i;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setInitialValues entered.");
-		// All Text and Combo widgets have ModifyListeners registered on them in
-		// order to invoke field validation
-		// when contents of the widget's text field change. The ModifyListener
-		// is invoked for each widget as a
-		// result of calling the setText() method for the widget. The resulting
-		// ModifyEvent results in calling
-		// validateAllFields(), which invokesfireContentsChanged(), which in
-		// turn results in performApply() being
-		// invoked. The performApply() method saves all widget's values into the
-		// current launch configuration.
-		// Since at the time that setInitialValues is called, widgets may be
-		// blank, this results in storing
-		// blanks for all attributes in the launch configuration, wiping out the
-		// saved values in the launch
-		// configuration.
-		// To avoid this, ignoreModifyEvents is set, so that the ModifyListener
-		// does nothing.
-		ignoreModifyEvents = true;
-		i = activeWidgets.iterator();
-		while (i.hasNext()) {
-			widget = i.next();
-			if (widget instanceof FileSelectorRowWidget) {
-				setValue((FileSelectorRowWidget) widget, getAttrInitialValue(
-						config, rm, (String) ((FileSelectorRowWidget) widget)
-								.getData()));
-			} else if (widget instanceof DualFieldRowWidget) {
-				setValue((DualFieldRowWidget) widget, getAttrInitialValue(
-						config, rm, (String) ((DualFieldRowWidget) widget)
-								.getData1()), getAttrInitialValue(config, rm,
-						(String) ((DualFieldRowWidget) widget).getData2()));
-			} else if (widget instanceof TextRowWidget) {
-				setValue((TextRowWidget) widget, getAttrInitialValue(config,
-						rm, ((TextRowWidget) widget)
-								.getData(WidgetAttributes.ATTR_NAME)));
-			} else if (widget instanceof ComboRowWidget) {
-				setValue((ComboRowWidget) widget, getAttrInitialValue(config,
-						rm, ((ComboRowWidget) widget)
-								.getData(WidgetAttributes.ATTR_NAME)));
-			} else if (widget instanceof BooleanRowWidget) {
-				setValue((BooleanRowWidget) widget, getAttrInitialValue(config,
-						rm, ((BooleanRowWidget) widget).getData()));
-			} else if (widget instanceof CheckboxRowWidget) {
-				setValue((CheckboxRowWidget) widget, getAttrInitialValue(
-						config, rm, ((CheckboxRowWidget) widget)
-								.getData(WidgetAttributes.ATTR_NAME)), "yes");
-			}
-
-		}
-		setLaunchPanelMode();
-		// Setup complete, re-enable ModifyListener
-		ignoreModifyEvents = false;
-		markAllFieldsChanged();
-		// All fields need to be validated because a different resource manager
-		// may have been selected, and therefore
-		// values saved in the launch configuration, such as pathnames may no
-		// longer be valid.
-		validateAllFields();
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setInitialValues returning.");
-	}
-
-	/**
-	 * Set state for widgets based on dependencies between widget values. At the
-	 * point this method is called, all widgets are in enabled state, so it is
-	 * only necessary to disable widgets.
-	 */
-	private void setInitialWidgetState() {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setInitialWidgetState entered.");
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setInitialWidgetState returning.");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#initializeFrom(org.eclipse.swt.widgets.Control,
-	 *      org.eclipse.ptp.rmsystem.IResourceManager,
-	 *      org.eclipse.ptp.core.IPQueue,
-	 *      org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public RMLaunchValidation initializeFrom(Control control,
-			IResourceManager rm, IPQueue queue,
-			ILaunchConfiguration configuration) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":initializeFrom entered.");
-		if (configuration instanceof ILaunchConfigurationWorkingCopy) {
-			currentLaunchConfig = (ILaunchConfigurationWorkingCopy) configuration;
-		}
-		setInitialValues(configuration, rm);
-		setInitialWidgetState();
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":initializeFrom returning.");
-		return success;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#isValid(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      org.eclipse.ptp.rmsystem.IResourceManager,
-	 *      org.eclipse.ptp.core.IPQueue)
-	 */
-	public RMLaunchValidation isValid(ILaunchConfiguration configuration,
-			IResourceManager rm, IPQueue queue) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":isValid entered.");
-		if (allFieldsValid) {
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":isValid returning.");
-			return success;
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":isValid returning.");
-		return new RMLaunchValidation(false, errorMessage);
-	}
-
-	/**
-	 * Store the value from a Text widget into the specified launch
-	 * configuration if the widget is not null
-	 *
-	 * @param config
-	 *            The launch configuration
-	 * @param rm
-	 *            The resource manager currently used by the launch
-	 *            configuration
-	 * @param attr
-	 *            The name of the attribute
-	 * @param control
-	 *            The widget to obtain the value from
-	 */
-	private void setConfigAttr(ILaunchConfigurationWorkingCopy config,
-			IResourceManager rm, String attr, TextRowWidget control) {
-		IAttributeDefinition<?, ?, ?> attrDef;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setConfigAttr entered.");
-		if (control != null) {
-			String attrValue;
-
-			attrDef = rm.getAttributeDefinition(attr);
-			try {
-				if ((attrDef instanceof IntegerAttributeDefinition)
-						|| (attrDef instanceof BigIntegerAttributeDefinition)) {
-					attrValue = getIntegerValue(control.getValue());
-				} else {
-					attrValue = control.getValue();
-				}
-				config.setAttribute(attr, attrValue);
-			} catch (NumberFormatException e) {
-				// If the field has an invalid numeric value, then don't save it
-				// in the launch configuration
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setConfigAttr returning.");
-	}
-
-	/**
-	 * Store the value from a DialField widget into the specified launch
-	 * configuration if the widget is not null
-	 *
-	 * @param config
-	 *            The launch configuration
-	 * @param attr
-	 *            The name of the attribute
-	 * @param control
-	 *            The widget to obtain the value from
-	 */
-	private void setConfigAttr(ILaunchConfigurationWorkingCopy config,
-			String attr1, String attr2, DualFieldRowWidget control) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setConfigAttr entered.");
-		if (control != null) {
-			String value[];
-
-			value = control.getValue();
-			config.setAttribute(attr1, value[0].trim());
-			config.setAttribute(attr2, value[1].trim());
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setConfigAttr returning.");
-	}
-
-	/**
-	 * Store the value from a ComboRowWidget into the specified launch
-	 * configuration if the widget is not null
-	 *
-	 * @param config
-	 *            The launch configuration
-	 * @param attr
-	 *            The name of the attribute
-	 * @param control
-	 *            The widget to obtain the value from
-	 */
-	private void setConfigAttr(ILaunchConfigurationWorkingCopy config,
-			String attr, ComboRowWidget control) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setConfigAttr entered.");
-		if (control != null) {
-			config.setAttribute(attr, control.getValue());
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setConfigAttr returning.");
-	}
-
-	/**
-	 * Store the value from a file selector into the specified launch
-	 * configuration if the file selector is not null
-	 *
-	 * @param config
-	 *            The launch configuration
-	 * @param attr
-	 *            The name of the attribute
-	 * @param control
-	 *            The widget to obtain the value from
-	 */
-	private void setConfigAttr(ILaunchConfigurationWorkingCopy config,
-			String attr, FileSelectorRowWidget control) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setConfigAttr entered.");
-		if (control != null) {
-			config.setAttribute(attr, control.getValue());
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setConfigAttr returning.");
-	}
-
-	/**
-	 * Store the value from a Button widget into the specified launch
-	 * configuration if the widget is not null
-	 *
-	 * @param config
-	 *            The launch configuration
-	 * @param attr
-	 *            The name of the attribute
-	 * @param control
-	 *            The widget to obtain the value from
-	 * @param trueVal
-	 *            The value to set if the button is selected
-	 */
-	private void setConfigAttr(ILaunchConfigurationWorkingCopy config,
-			String attr, CheckboxRowWidget control, String trueVal,
-			String falseVal) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setConfigAttr entered.");
-		if (control != null) {
-			config.setAttribute(attr, (control.getSelection() ? trueVal
-					: falseVal));
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setConfigAttr returning.");
-	}
-
-	private void setConfigAttr(ILaunchConfigurationWorkingCopy config,
-			String attr, BooleanRowWidget control) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setConfigAttr entered.");
-		if (control != null) {
-			config.setAttribute(attr, control.getValue());
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setConfigAttr returning.");
-	}
-
-	/**
-	 * Save the values entered in this panel in the launch configuration
-	 *
-	 * @param config
-	 */
-	private void saveConfigurationData(ILaunchConfigurationWorkingCopy config,
-			IResourceManager rm) {
-		Object widget;
-		Iterator<Object> i;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":saveConfigurationData entered.");
-		i = activeWidgets.iterator();
-		while (i.hasNext()) {
-			widget = i.next();
-			if (widget instanceof TextRowWidget) {
-				setConfigAttr(config, rm, ((TextRowWidget) widget)
-						.getData(WidgetAttributes.ATTR_NAME),
-						(TextRowWidget) widget);
-			} else if (widget instanceof ComboRowWidget) {
-				setConfigAttr(config, (String) ((ComboRowWidget) widget)
-						.getData(WidgetAttributes.ATTR_NAME),
-						(ComboRowWidget) widget);
-			} else if (widget instanceof CheckboxRowWidget) {
-				setConfigAttr(config, (String) ((CheckboxRowWidget) widget)
-						.getData(WidgetAttributes.ATTR_NAME),
-						(CheckboxRowWidget) widget, "yes", "no");
-			} else if (widget instanceof BooleanRowWidget) {
-				setConfigAttr(config, (String) ((BooleanRowWidget) widget)
-						.getData(), (BooleanRowWidget) widget);
-			} else if (widget instanceof FileSelectorRowWidget) {
-				setConfigAttr(config, (String) ((FileSelectorRowWidget) widget)
-						.getData(), (FileSelectorRowWidget) widget);
-			} else if (widget instanceof DualFieldRowWidget) {
-				setConfigAttr(config, (String) ((DualFieldRowWidget) widget)
-						.getData1(), (String) ((DualFieldRowWidget) widget)
-						.getData2(), (DualFieldRowWidget) widget);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":saveConfigurationData returning.");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy,
-	 *      org.eclipse.ptp.rmsystem.IResourceManager,
-	 *      org.eclipse.ptp.core.IPQueue)
-	 */
-	public RMLaunchValidation performApply(
-			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-			IPQueue queue) {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":performApply entered.");
-		currentLaunchConfig = configuration;
-		saveConfigurationData(configuration, rm);
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":performApply returning.");
-		return new RMLaunchValidation(true, "");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy,
-	 *      org.eclipse.ptp.rmsystem.IResourceManager,
-	 *      org.eclipse.ptp.core.IPQueue)
-	 */
-	public RMLaunchValidation setDefaults(
-			ILaunchConfigurationWorkingCopy config, IResourceManager rm,
-			IPQueue queue) {
-		IAttribute<?, ?, ?> rmAttrs[];
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":setDefaults entered.");
-		currentLaunchConfig = config;
-		rmAttrs = rm.getAttributes();
-		for (int i = 0; i < rmAttrs.length; i++) {
-			try {
-				config.setAttribute(rmAttrs[i].getDefinition().getId(),
-						rmAttrs[i].getDefinition().create().getValueAsString());
-			} catch (IllegalValueException e) {
-			}
-		}
-		// setDefaultValues(config, rm);
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":setDefaults returning.");
-		return success;
-	}
-
-	/**
-	 * Handle validation of all fields in the tabbed pane of the launch
-	 * configuration's parallel tab.
-	 */
-	protected void validateAllFields() {
-		// This method is the top level driver for validating the fields in the
-		// tabbed pane. It is called when a field in the tabbed pane is
-		// modified, via a ModifyListener registered on
-		// each text or editable combobox widget It calls a validation method
-		// for each tab in the pane. Validation
-		// should be done in tab order, left to right,
-		// All validation is done in the scope of a try block which catches any
-		// ValidationException propagated up
-		// from lower level methods. The idea is to validate the fields within
-		// tab order left to right, then within each
-		// tab, from top to bottom. Each validation method will throw a
-		// ValidationException if that field fails
-		// validation, where the thrown exception will stop further validation
-		// of the pane. This structure allows fields
-		// to be easily moved to another pane, or to reorder fields within a
-		// pane. Using an exception to terminate
-		// validation also avoids cluttering the logic of the validation method
-		// with deeply nested 'if ... else ...'
-		// logic.
-		// If all fields are valid, then the allFieldsValid flag is set so that
-		// the isValid() and canSave() methods can
-		// easily check panel validity.
-		// Validation of valid dependencies between fields should be performed
-		// as a second step after all fields have
-		// been individually validated for correct values.
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateAllFields entered.");
-		try {
-			if (llSubmitMode.getValue().equals("Advanced")) {
-				validateInputPath(llJobCommandFile, "Invalid.llJobCommandFile");
-			} else {
-				validateInputPath(llJobCommandFileTemplate,
-						"Invalid.llJobCommandFileTemplate");
-				validateGeneralTab();
-				validateSchedulingBasicTab();
-				validateSchedulingRequirementsTab();
-				validateSchedulingResourcesTab();
-				validateRuntimeTab();
-				validateNodesNetworkTab();
-				validateLimitsTab();
-			}
-			allFieldsValid = true;
-		} catch (ValidationException e) {
-			errorMessage = e.getMessage();
-			allFieldsValid = false;
-		}
-		fireContentsChanged();
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateAllFields returning.");
-	}
-
-	/**
-	 * Validate fields in task specification tab
-	 *
-	 * @throws ValidationException
-	 */
-	private void validateGeneralTab() throws ValidationException {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateGeneralTab entered.");
-		validateAlphaNumeric(llJobName, "Invalid.llJobName");
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateGeneralTab returning.");
-	}
-
-	/**
-	 * Validate all text and editable combobox fields in the I/O tab, top to
-	 * bottom
-	 *
-	 * @throws ValidationException
-	 */
-	private void validateSchedulingBasicTab() throws ValidationException {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateSchedulingBasicTab entered.");
-		validateAlphaNumeric(llClass, "Invalid.llClass");
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateSchedulingBasicTab returning.");
-	}
-
-	/**
-	 * Validate all text and editable combobox fields in diagnostic tab, top to
-	 * bottom
-	 *
-	 * @throws ValidationException
-	 */
-	private void validateSchedulingRequirementsTab() throws ValidationException {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateSchedulingRequirementsTab entered.");
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateSchedulingRequirementsTab returning.");
-	}
-
-	/**
-	 * Validate all text and editable combobox fields in the debug tab, top to
-	 * bottom
-	 *
-	 * @throws ValidationException
-	 */
-	private void validateSchedulingResourcesTab() throws ValidationException {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateSchedulingResourcesTab entered.");
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateSchedulingResourcesTab returning.");
-	}
-
-	/**
-	 * Validate all text and editable combobox fields in the system resources
-	 * tab, top to bottom
-	 *
-	 * @throws ValidationException
-	 */
-	private void validateRuntimeTab() throws ValidationException {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateRuntimeTab entered.");
-//no checks will be performed on the following widgets at this time
-//		llError = createTextWidget(runtimeTabPane, rm, LL_PTP_ERROR);
-//		llOutput = createTextWidget(runtimeTabPane, rm, LL_PTP_OUTPUT);
-//		llInput = createTextWidget(runtimeTabPane, rm, LL_PTP_INPUT);
-//		llExecutable = createTextWidget(runtimeTabPane, rm, LL_PTP_EXECUTABLE);
-//		llInitialDir = createTextWidget(runtimeTabPane, rm, LL_PTP_INITIALDIR);
-//		llEnvironment = createTextWidget(runtimeTabPane, rm, LL_PTP_ENVIRONMENT);
-//		llShell = createTextWidget(runtimeTabPane, rm, LL_PTP_SHELL);
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateRuntimeTab returning.");
-	}
-
-	/**
-	 * Validate all text and editable combobox fields in the node allocation
-	 * tab, top to bottom
-	 *
-	 * @throws ValidationException
-	 */
-	private void validateNodesNetworkTab() throws ValidationException {
-
-		String tpn = "";
-		String tpn_default = "";
-		String tt = "";
-		String tt_default = "";
-		String jt = "";
-		String jt_default = "";
-		String nm = "";
-		String nm_default = "";
-		String nmx = "";
-		String nmx_default = "";
-		String b = "";
-		String b_default = "";
-		String tg = "";
-		String tg_default = "";
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateNodesNetworkTab entered.");
-		if (llTaskGeometry != null) {
-			tg = llTaskGeometry.getValue();
-			if (tg.length() > 0) {
-			  tg_default = llTaskGeometry.getDefaultValue();
-			}
-		}
-
-		if (llTasksPerNode != null) {
-			tpn = llTasksPerNode.getValue();
-			if (tpn.length() > 0) {
-			  tpn_default = llTasksPerNode.getDefaultValue();
-			}
-		}
-
-		if (llTotalTasks != null) {
-			tt = llTotalTasks.getValue();
-			if (tt.length() > 0) {
-			  tt_default = llTotalTasks.getDefaultValue();
-			}
-		}
-
-		if (llJobType != null) {
-			jt = llJobType.getValue();
-			if (jt.length() > 0) {
-			  jt_default = llJobType.getDefaultValue();
-			}
-		}
-
-		if (llNodeMin != null) {
-			nm = llNodeMin.getValue();
-			if (nm.length() > 0) {
-			  nm_default = llNodeMin.getDefaultValue();
-			}
-		}
-
-		if (llNodeMax != null) {
-			nmx = llNodeMax.getValue();
-			if (nmx.length() > 0) {
-			  nmx_default = llNodeMax.getDefaultValue();
-			}
-		}
-
-		if (llBlocking != null) {
-			b = llBlocking.getValue();
-			if (b.length() > 0) {
-			  b_default = llBlocking.getDefaultValue();
-			}
-		}
-
-		if ((tpn.equals(tpn_default) == false) &&
-		   (tt.equals(tt_default) == false)) {
-			throw new ValidationException(Messages.getString("Invalid.llTasksPerNode_llTotalTasks"));
-		}
-
-		if ((tg.equals(tg_default) == false) &&
-		    (jt.equalsIgnoreCase("Parallel") == false)) {
-		    throw new ValidationException(Messages.getString("Invalid.llTaskGeometry_llJobType"));
-		    }
-
-		if ((tg.equals(tg_default) == false) &&
-				(tpn.equals(tpn_default) == false)) {
-			throw new ValidationException(Messages.getString("Invalid.llTaskGeometry_llTasksPerNode"));
-		}
-
-		if ((tg.equals(tg_default) == false) &&
-				(tt.equals(tt_default) == false)) {
-			throw new ValidationException(Messages.getString("Invalid.llTaskGeometry_llTotalTasks"));
-		}
-
-		if ((tg.equals(tg_default) == false) &&
-				(nm.equals(nm_default) == false)) {
-			throw new ValidationException(Messages.getString("Invalid.llTaskGeometry_llNodeMin"));
-		}
-
-		if ((tg.equals(tg_default) == false) &&
-				(nmx.equals(nmx_default) == false)) {
-			throw new ValidationException(Messages.getString("Invalid.llTaskGeometry_llNodeMax"));
-		}
-
-		if ((tg.equals(tg_default) == false) &&
-				(b.equals(b_default) == false)) {
-			throw new ValidationException(Messages.getString("Invalid.llTaskGeometry_llBlocking"));
-		}
-
-		validatePositiveOrUnlimitedNumeric(llBlocking,"Invalid.llBlocking");
-
-//no checks will be performed on the following widgets at this time
-//		llNetwork_mpi = createTextWidget(nodesNetworkTabPane, rm,
-//				LL_PTP_NETWORK_MPI);
-//		llNetwork_lapi = createTextWidget(nodesNetworkTabPane, rm,
-//				LL_PTP_NETWORK_LAPI);
-//		llNetwork_mpi_lapi = createTextWidget(nodesNetworkTabPane, rm,
-//				LL_PTP_NETWORK_MPI_LAPI);
-//		validateNumericRange(llNodeMin, LL_PTP_NODE_MIN, "Invalid.llNodeMin");
-//		validateNumericRange(llNodeMax, LL_PTP_NODE_MAX, "Invalid.llNodeMax");
-//no checks will be performed on the following widgets at this time
-//		llTaskGeometry = createTextWidget(nodesNetworkTabPane, rm,
-//				LL_PTP_TASK_GEOMETRY);
-
-		validateNumericMinMax(llNodeMin, LL_PTP_NODE_MIN, "Invalid.llNodeMin", llNodeMax, LL_PTP_NODE_MAX, "Invalid.llNodeMax"); 
-		validatePositiveNumeric(llTasksPerNode,"Invalid.llTasksPerNode");
-		validatePositiveNumeric(llTotalTasks,"Invalid.llTotalTasks");
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateNodesNetworkTab returning.");
-	}
-
-	/**
-	 * Validate all text and editable combobox fields in performance tab 1, top
-	 * to bottom
-	 *
-	 * @throws ValidationException
-	 */
-	private void validateLimitsTab() throws ValidationException {
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateLimitsTab entered.");
-		validateClockValue(llWallClockLimitHard,"Invalid.llWallClockLimitHard");
-		validateClockValue(llWallClockLimitSoft,"Invalid.llWallClockLimitSoft");
-
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateLimitsTab returning.");
-	}
-
-	/**
-	 * Validate that an input file is accessible
-	 *
-	 * @param selector
-	 *            The file selector containing the pathname
-	 * @param errorID
-	 *            id of the error string used if file is inaccessible
-	 * @throws ValidationException
-	 */
-	private void validateInputPath(FileSelectorRowWidget selector,
-			String errorID) throws ValidationException {
-		String path;
-
-		if ((selector != null) && selector.isEnabled()
-				&& selector.isValidationRequired()) {
-			path = selector.getValue();
-			if (path.length() == 0) {
-				selector.resetValidationState();
-				return;
-			}
-			try {
-				validateInputPath(path, errorID);
-				selector.resetValidationState();
-			} catch (ValidationException e) {
-				selector.setFieldInError();
-				throw e;
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Validate that an output file is accessible
-	 *
-	 * @param selector
-	 *            The file selector containing the pathname
-	 * @param errorID
-	 *            id of the error string used if the file is inaccessible
-	 * @throws ValidationException
-	 */
-//	private void validateOutputPath(FileSelectorRowWidget selector,
-//			String errorID) throws ValidationException {
-//		String path;
-//
-//		if ((selector != null) && selector.isEnabled()
-//				&& selector.isValidationRequired()) {
-//			path = selector.getValue();
-//			if (path.length() == 0) {
-//				selector.resetValidationState();
-//				return;
-//			}
-//			try {
-//				validateOutputPath(path, errorID);
-//				selector.resetValidationState();
-//			} catch (ValidationException e) {
-//				selector.setFieldInError();
-//				throw e;
-//			}
-//		}
-//	}
-
-	/**
-	 * Validate that in input file is accessible
-	 *
-	 * @param path
-	 *            Pathname of the input file
-	 * @param errorID
-	 *            id of the error string used if the file is inaccessible
-	 * @throws ValidationException
-	 * @throws IOException
-	 */
-	private void validateInputPath(String path, String errorID)
-			throws ValidationException, IOException {
-		IPath testPath;
-		IFileStore remoteResource;
-		IFileInfo fileInfo;
-
-		testPath = new Path(path);
-		if (!testPath.isValidPath(path)) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-		remoteResource = remoteService.getFileManager(remoteConnection)
-				.getResource(testPath, new NullProgressMonitor());
-		fileInfo = remoteResource.fetchInfo();
-		if ((!fileInfo.exists()) || (fileInfo.isDirectory())) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-	}
-
-	/**
-	 * Validate that an output file is accessible
-	 *
-	 * @param path
-	 *            Pathname of the output file
-	 * @param errorID
-	 *            id of the error string used if the file is not accessible
-	 * @throws ValidationException
-	 * @throws IOException
-	 */
-	private void validateOutputPath(String path, String errorID)
-			throws ValidationException, IOException {
-		IPath testPath;
-		IFileStore remoteResource;
-		IFileInfo fileInfo;
-
-		testPath = new Path(path);
-		if (!testPath.isValidPath(path)) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-		remoteResource = remoteService.getFileManager(remoteConnection)
-				.getResource(testPath, new NullProgressMonitor());
-		fileInfo = remoteResource.fetchInfo();
-		if (fileInfo.isDirectory()) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-	}
-
-	/**
-	 * Validate that the directory pathname is valid
-	 *
-	 * @param selector
-	 *            File selector containing the directory name
-	 * @param errorID
-	 *            id of the error string used if the directory is invalid
-	 * @throws ValidationException
-	 * @throws IOException
-	 */
-	private void validateDirectory(FileSelectorRowWidget selector,
-			String errorID) throws ValidationException, IOException {
-		String path;
-		IPath testPath;
-		IFileStore remoteResource;
-		IFileInfo fileInfo;
-
-		if ((selector != null) && selector.isEnabled()
-				&& selector.isValidationRequired()) {
-			path = selector.getValue();
-			try {
-				if (path.length() == 0) {
-					selector.resetValidationState();
-					return;
-				}
-
-				testPath = new Path(path);
-				if (!testPath.isValidPath(path)) {
-					throw new ValidationException(Messages.getString(errorID));
-				}
-				remoteResource = remoteService.getFileManager(remoteConnection)
-						.getResource(testPath, new NullProgressMonitor());
-				fileInfo = remoteResource.fetchInfo();
-				if (!fileInfo.isDirectory()) {
-					throw new ValidationException(Messages
-							.getString(errorID));
-				}
-				selector.resetValidationState();
-			} catch (ValidationException e) {
-				selector.setFieldInError();
-				throw e;
-			}
-		}
-	}
-
-	/**
-	 * Verify that the value selected or entered in an editable combobox is a
-	 * valid value, as determined by checking the attribute definition for the
-	 * attribute.
-	 *
-	 * @param widget
-	 *            The combobox to be checked
-	 * @param attrName
-	 *            The attribute name
-	 * @return true if the value is a valid selection, false otherwise
-	 */
-	private boolean isValidListSelection(ComboRowWidget widget, String attrName) {
-		StringSetAttributeDefinition attrDef;
-		@SuppressWarnings("unused")
-		StringSetAttribute attr;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":isValidListSelection entered.");
-		attrDef = (StringSetAttributeDefinition) currentRM
-				.getAttributeDefinition(attrName);
-		if (attrDef != null) {
-			try {
-				attr = attrDef.create(widget.getValue());
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":isValidListSelection returning.");
-				return true;
-			} catch (IllegalValueException e) {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":isValidListSelection returning.");
-				return false;
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":isValidListSelection returning.");
-		return true;
-	}
-
-	/**
-	 * Validate that the minValue is less than or equal to the maxValue.
-	 *
-	 * @param controlMin
-	 *            The min Text widget to be verified
-	 * @param attrNameMin
-	 *            The name of the min attribute
-	 * @param errorIDMin
-	 *            The id of the error message used if controlMin validation fails
-	 * @param controlMax
-	 *            The max Text widget to be verified
-	 * @param attrNameMax
-	 *            The name of the max attribute
-	 * @param errorIDMax
-	 *            The id of the error message used if controlMax validation fails
-	 * @throws ValidationException
-	 *             Indicates that Text widget failed validation
-	 */
-	private void validateNumericMinMax(TextRowWidget controlMin, String attrNameMin, String errorIDMin,
-			TextRowWidget controlMax, String attrNameMax,
-			String errorIDMax) throws ValidationException {
-		String strMin = "", strMax = "";
-		int iMin = 0, iMax = 0;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateNumericMinMax entered.");
-				
-		if (controlMin != null) {
-			strMin = controlMin.getValue();
-			if (strMin.length() > 0) {
-				iMin = validatePositiveNumeric(strMin, errorIDMin);
-			}
-		}
-		if (controlMax != null) {
-			strMax = controlMax.getValue();
-			if (strMax.length() > 0) {
-				iMax = validatePositiveNumeric(strMax, errorIDMax);
-			}
-		}
-		if ((strMin.length() > 0) && (strMax.length() > 0)) {
-			if (iMin > iMax) {
-				throw new ValidationException(Messages.getString("Invalid.llNodeMinMax"));
-			}
-		}
-		
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateNumericMinMax returning.");
-	}
-
-	/**
-	 * Validate that an integer value is within the range allowed for the
-	 * attribute.
-	 *
-	 * @param control
-	 *            The Text widget to be verified
-	 * @param attrName
-	 *            The name of the attribute
-	 * @param errorID
-	 *            The id of the error message used if validation fails
-	 * @throws ValidationException
-	 *             Indicates that Text widget failed validation
-	 */
-	private void validateNumericRange(TextRowWidget control, String attrName,
-			String errorID) throws ValidationException {
-		String value;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateNumericRange entered.");
-		if (control != null) {
-			value = control.getValue();
-			if (value.length() > 0) {
-				validateNumericRange(value, attrName, errorID);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateNumericRange returning.");
-	}
-
-	/**
-	 * Validate that an integer value is within the range allowed for the
-	 * attribute.
-	 *
-	 * @param value
-	 *            The value to be verified
-	 * @param attrName
-	 *            The name of the attribute
-	 * @param errorID
-	 *            The id of the error message used if validation fails
-	 * @throws ValidationException
-	 *             Indicates that Text widget failed validation
-	 */
-	private void validateNumericRange(String value, String attrName,
-			String errorID) throws ValidationException {
-		int testValue;
-		int len;
-		char suffix;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateNumericRange entered.");
-		len = value.length();
-		suffix = value.charAt(len - 1);
-		if (Character.isDigit(suffix)) {
-			try {
-				testValue = Integer.valueOf(value);
-			} catch (NumberFormatException e) {
-				throw new ValidationException(Messages.getString(errorID));
-			}
-		} else {
-			try {
-				testValue = Integer.valueOf(value.substring(0, len - 1));
-				if ((suffix == 'G') || (suffix == 'g')) {
-					testValue = testValue * GBYTE;
-				} else if ((suffix == 'M') || (suffix == 'm')) {
-					testValue = testValue * MBYTE;
-				} else if ((suffix == 'K') || (suffix == 'k')) {
-					testValue = testValue * KBYTE;
-				} else {
-					throw new ValidationException(Messages.getString(errorID));
-				}
-			} catch (NumberFormatException e) {
-				throw new ValidationException(Messages.getString(errorID));
-			}
-		}
-		validateNumericRange(testValue, attrName, errorID);
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateNumericRange returning.");
-	}
-
-	/**
-	 * Validate that an integer value is within the range allowed for the
-	 * attribute.
-	 *
-	 * @param value
-	 *            The value to be verified
-	 * @param attrName
-	 *            The name of the attribute
-	 * @param errorID
-	 *            The id of the error message used if validation fails
-	 * @throws ValidationException
-	 *             Indicates that Text widget failed validation
-	 */
-	private void validateNumericRange(int value, String attrName, String errorID)
-			throws ValidationException {
-		IntegerAttributeDefinition attrDef;
-		@SuppressWarnings("unused")
-		IntegerAttribute attr;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateNumericRange entered.");
-		attrDef = (IntegerAttributeDefinition) currentRM
-				.getAttributeDefinition(attrName);
-		try {
-			attr = attrDef.create(value);
-		} catch (IllegalValueException e) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateNumericRange returning.");
-	}
-
-	/**
-	 * Convert a string which may have a suffix 'k', 'm' or 'g' to it's actual
-	 * numeric value, multiplying by the appropriate multiplier
-	 *
-	 * @param value
-	 *            The number to be converted
-	 * @return The converted number
-	 */
-	private String getIntegerValue(String value) {
-		int testValue;
-		int len;
-		char suffix;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":getIntegerValue entered.");
-		testValue = 0;
-		len = value.length();
-		if (len == 0) {
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":getIntegerValue returning.");
-			return "";
-		} else {
-			suffix = value.charAt(len - 1);
-			if (Character.isDigit(suffix)) {
-				print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-						+ ":getIntegerValue returning.");
-				return value;
-			} else {
-				if (len >= 2) {
-					testValue = Integer.valueOf(value.substring(0, len - 1));
-					if ((suffix == 'G') || (suffix == 'g')) {
-						testValue = testValue * GBYTE;
-					} else if ((suffix == 'M') || (suffix == 'm')) {
-						testValue = testValue * MBYTE;
-					} else if ((suffix == 'K') || (suffix == 'k')) {
-						testValue = testValue * KBYTE;
-					} else {
-						print_message(TRACE_MESSAGE, "<<< "
-								+ this.getClass().getName()
-								+ ":getIntegerValue returning.");
-						return "";
-					}
-				}
-			}
-			print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-					+ ":getIntegerValue returning.");
-			return String.valueOf(testValue);
-		}
-	}
-
-	/**
-	 * Validate that a BigInteger value is within the range allowed for the
-	 * attribute.
-	 *
-	 * @param value
-	 *            The value to be verified
-	 * @param attrName
-	 *            The name of the attribute
-	 * @param errorID
-	 *            The id of the error message used if validation fails
-	 * @throws ValidationException
-	 *             Indicates that Text widget failed validation
-	 */
-	private void validateLongNumericRange(String value, String attrName,
-			String errorID) throws ValidationException {
-		BigIntegerAttributeDefinition attrDef;
-		@SuppressWarnings("unused")
-		BigIntegerAttribute attr;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateLongNumericRange entered.");
-		attrDef = (BigIntegerAttributeDefinition) currentRM
-				.getAttributeDefinition(attrName);
-		try {
-			attr = attrDef.create(value);
-		} catch (IllegalValueException e) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateLongNumericRange returning.");
-	}
-
-	/**
-	 * Validate a String's value to verify it is within the allowed range
-	 *
-	 * @param value
-	 *            String to be verified
-	 * @param lowLimit
-	 *            Low limit of range
-	 * @param highLimit
-	 *            High limit of range
-	 * @param errorID
-	 *            id of the error message used if value is not in allowable
-	 *            range
-	 * @throws ValidationException
-	 */
-	private void validateNumericRange(String value, int lowLimit,
-			int highLimit, String errorID) throws ValidationException {
-		int n;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateNumericRange entered.");
-		try {
-			n = Integer.valueOf(value);
-			if ((n < lowLimit) || (n > highLimit)) {
-				throw new ValidationException(Messages.getString(errorID));
-			}
-		} catch (NumberFormatException e) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateNumericRange returning.");
-	}
-
-	/**
-	 * Print a message: Info, Trace, Arg and Warning messages go to stdout.
-	 * Error and Fatal messages go to stderr. *
-	 */
-	private void print_message(int type, String message) {
-		switch (type) {
-		case INFO_MESSAGE:
-			if (state_info == 1) {
-				System.out.println("Info: " + message);
-			}
-			break;
-		case TRACE_MESSAGE:
-			if (state_trace == 1) {
-				System.out.println("Trace: " + message);
-			}
-			break;
-		case WARNING_MESSAGE:
-			if (state_warning == 1) {
-				System.out.println("Warning: " + message);
-			}
-			break;
-		case ARGS_MESSAGE:
-			if (state_args == 1) {
-				System.out.println("Args: " + message);
-			}
-			break;
-		case ERROR_MESSAGE:
-			if (state_error == 1) {
-				System.err.println("Error: " + message);
-			}
-			break;
-		case FATAL_MESSAGE:
-			if (state_fatal == 1) {
-				System.err.println("Fatal " + message);
-			}
-			break;
-		default:
-			System.out.println(message);
-			break;
-		}
-	}
-
-	private void validateAlphaNumeric(TextRowWidget control, String errorID) throws ValidationException {
-		String value;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateAlphaNumeric entered.");
-		if (control != null) {
-			value = control.getValue();
-			if (value.length() > 0) {
-				validateAlphaNumeric(value, errorID);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateAlphaNumeric returning.");
-	}
-
-	private void validateAlphaNumeric(String value, String errorID) throws ValidationException {
-		int i;
-		String stripped = value.trim();
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateAlphaNumeric entered.");
-		for (i=0; i<stripped.length(); i++) {
-			if (stripped.matches("[a-zA-Z_0-9]*") == false) {
-				throw new ValidationException(Messages.getString(errorID));
-			}
-		}
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateAlphaNumeric returning.");
-	}
-
-	private void validatePositiveOrUnlimitedNumeric(TextRowWidget control, String errorID) throws ValidationException {
-		String value;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validatePositiveOrUnlimitedNumeric entered.");
-		if (control != null) {
-			value = control.getValue();
-			if (value.trim().equalsIgnoreCase("unlimited")) {
-				// nothing to do - unlimited is valid value
-			} else {
-			if (value.length() > 0) {
-				validatePositiveOrUnlimitedNumeric(value, errorID);
-			} }
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validatePositiveOrUnlimitedNumeric returning.");
-	}
-
-	private void validatePositiveOrUnlimitedNumeric(String value, String errorID) throws ValidationException {
-		int n;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validatePositiveOrUnlimitedNumeric entered.");
-		try {
-			n = Integer.valueOf(value);
-			if ((n < 1) || (n > Integer.MAX_VALUE)) {
-				throw new ValidationException(Messages.getString(errorID));
-			}
-		} catch (NumberFormatException e) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validatePositiveOrUnlimitedNumeric returning.");
-	}
-	private void validatePositiveNumeric(TextRowWidget control, String errorID) throws ValidationException {
-		String value;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validatePositiveNumeric entered.");
-		if (control != null) {
-			value = control.getValue();
-			if (value.length() > 0) {
-				validatePositiveNumeric(value, errorID);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validatePositiveNumeric returning.");
-	}
-
-	private int validatePositiveNumeric(String value, String errorID) throws ValidationException {
-		int n = 0;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validatePositiveNumeric entered.");
-		try {
-			n = Integer.valueOf(value);
-			if ((n < 0) || (n > Integer.MAX_VALUE)) {
-				throw new ValidationException(Messages.getString(errorID));
-			}
-		} catch (NumberFormatException e) {
-			throw new ValidationException(Messages.getString(errorID));
-		}
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validatePositiveNumeric returning.");
-		return n;
-	}
-
-	private void validateClockValue(TextRowWidget control, String errorID) throws ValidationException {
-		String value;
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateClockValue entered.");
-		if (control != null) {
-			value = control.getValue();
-			if (value.length() > 0) {
-				validateClockValue(value, errorID);
-			}
-		}
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateClockValue returning.");
-	}
-
-	private void validateClockValue(String value, String errorID) throws ValidationException {
-		int i;
-		String stripped = value.trim();
-
-		print_message(TRACE_MESSAGE, ">>> " + this.getClass().getName()
-				+ ":validateClockValue entered.");
-		for (i=0; i<stripped.length(); i++) {
-			if (stripped.matches("[0-9]+(:[0-9]+){0,2}") == false) {
-				throw new ValidationException(Messages.getString(errorID));
-			}
-		}
-
-		print_message(TRACE_MESSAGE, "<<< " + this.getClass().getName()
-				+ ":validateClockValue returning.");
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationFactory.java
deleted file mode 100644
index 4115088..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/IBMLLRMLaunchConfigurationFactory.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ibm.ll.core.rmsystem.IBMLLResourceManager;
-
-public class IBMLLRMLaunchConfigurationFactory extends
-		AbstractRMLaunchConfigurationFactory {
-
-	@Override
-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {
-		return new IBMLLRMLaunchConfigurationDynamicTab(rm);
-	}
-
-	@Override
-	public Class<? extends IResourceManager> getResourceManagerClass() {
-		return IBMLLResourceManager.class;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/TextRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/TextRowWidget.java
deleted file mode 100644
index 5494ebc..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/TextRowWidget.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.rm.ibm.ll.ui.*;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-public class TextRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attrDef;
-    private Text widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal class which listens for events indicating the data value for this object has changed
-     *
-     */
-    private class EventMonitor implements ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Change the non-default value indicator for this object to indicate whether the data value matches
-	 * the default value from the attribute definition
-	 * @param e The event indicating data value has changed 
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    String value;
-	    
-	    value = widget.getText().trim();
-	    if ((value.length () == 0) || (value.equals(defaultValue))) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-    }
-
-    /**
-     * Create a widget which is used as a text entry field in the launch configuration. This class assumes that
-     * the layout manager set for the parent Composite object is a GridLayout widget with 4 columns
-     * @param parent The parent Composite object
-     * @param id The name of the attribute for this widget
-     * @param def The attribute definition for this widget
-     */
-    public TextRowWidget(Composite parent, String id, IAttributeDefinition<?, ?, ?> def)
-    {
-	attrDef = def;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	label.setText(Messages.getString(attrDef.getName()));
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText("*");
-	widget = new Text(parent, SWT.SINGLE | SWT.BORDER);
-	widget.setToolTipText(Messages.getString(attrDef.getDescription()));
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.horizontalSpan = 2;
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData(WidgetAttributes.ATTR_NAME, id);
-	try {
-	    defaultValue = attrDef.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-    }
-
-    /**
-     * Add a ModifyListener to this object
-     * @param monitor the listening object
-     */
-    public void addModifyListener(ModifyListener monitor)
-    {
-	widget.addModifyListener(monitor);
-    }
-
-    /**
-     * Get the data value for this object
-     * @return The data value
-     */
-    public String getValue()
-    {
-	return widget.getText().trim();
-    }
-
-    /**
-     * Set the data value for this object
-     * @param value The data value
-     */
-    public void setValue(String value)
-    {
-	widget.setText(value);
-    }
-
-    /**
-     * Get the data object (attribute name) stored in this widget
-     * @param key The key to use in retrieving the data object
-     * @return the data object
-     */
-    public String getData(String key)
-    {
-	return (String) widget.getData(key);
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget == source;
-    }
-    
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-    
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-
-	public String getDefaultValue() {
-		return defaultValue;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ValidationState.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ValidationState.java
deleted file mode 100644
index 6a9b0b8..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/ValidationState.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-
-import org.eclipse.swt.widgets.Widget;
-
-public interface ValidationState
-{
-    public static final int UNCHANGED = 0;
-    public static final int CHANGED = 1;
-    public static final int IN_ERROR=2;
-    
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState();
-    
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired();
-    
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError();
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired();
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source);
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/WidgetAttributes.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/WidgetAttributes.java
deleted file mode 100644
index f16d4b1..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/rmLaunchConfiguration/WidgetAttributes.java
+++ /dev/null

@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.rmLaunchConfiguration;
-
-public interface WidgetAttributes
-{
-    public static final String ATTR_NAME = "ATTR_NAME";
-    public static final String BUTTON_ID = "BUTTON_ID";
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPage.java
deleted file mode 100644
index 06586c1..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPage.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.wizards;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.ibm.ll.ui.IBMLLPreferenceManager;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteProxyResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-
-public final class IBMLLResourceManagerConfigurationWizardPage extends
-	AbstractRemoteProxyResourceManagerConfigurationWizardPage {
-	
-	public IBMLLResourceManagerConfigurationWizardPage(RMConfigurationWizard wizard) {
-		super(wizard, Messages.getString("Wizard.ConfigurationTitle"));
-		setTitle(Messages.getString("Wizard.ConfigurationTitle"));
-		setDescription(Messages.getString("Wizard.Configuration"));
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPageFactory.java
deleted file mode 100644
index b5c14af..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerConfigurationWizardPageFactory.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.wizards;
-
-import org.eclipse.ptp.rm.ibm.ll.core.rmsystem.IBMLLResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-public class IBMLLResourceManagerConfigurationWizardPageFactory extends
-		RMConfigurationWizardPageFactory {
-
-	public IBMLLResourceManagerConfigurationWizardPageFactory() {
-		// no-op
-	}
-
-	public RMConfigurationWizardPage[] getPages(RMConfigurationWizard wizard) {
-		return new RMConfigurationWizardPage[]{new IBMLLResourceManagerConfigurationWizardPage(wizard), 
-						       new IBMLLResourceManagerOptionWizardPage(wizard)};
-	}
-
-	public Class<IBMLLResourceManagerFactory> getRMFactoryClass() {
-		return IBMLLResourceManagerFactory.class;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerOptionWizardPage.java b/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerOptionWizardPage.java
deleted file mode 100644
index bece4f7..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.ll.ui/src/org/eclipse/ptp/rm/ibm/ll/ui/wizards/IBMLLResourceManagerOptionWizardPage.java
+++ /dev/null

@@ -1,756 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.ll.ui.wizards;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.ibm.ll.ui.IBMLLPreferenceManager;
-import org.eclipse.ptp.rm.ibm.ll.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.ibm.ll.ui.preferences.IBMLLPreferenceConstants;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.utils.ui.swt.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-public class IBMLLResourceManagerOptionWizardPage extends
-		RMConfigurationWizardPage {
-	private Composite preferencePane;
-
-	private Text proxyLibraryTextWidget = null;
-	private EventMonitor libraryListener = null;
-	private Button libraryBrowseButton = null;;
-
-	private Button proxyTraceMessageButton = null;
-	private Button proxyInfoMessageButton = null;
-	private Button proxyWarningMessageButton = null;
-	private Button proxyErrorMessageButton = null;
-	private Button proxyFatalMessageButton = null;
-	private Button proxyArgsMessageButton = null;
-	private Button proxyDebugLoopButton = null;
-
-	private Button proxyForceLocalRadioButton = null;
-	private Button proxyForceMulticlusterRadioButton = null;
-	private Button proxyLLDefaultRadioButton = null;
-
-	private Text proxyTemplateTextWidget = null;
-	private EventMonitor templateListener = null;
-	private Button proxyTemplateNeverRadioButton = null;
-	private Button proxyTemplateAlwaysRadioButton = null;
-	private Button templateBrowseButton = null;;
-
-	private Button guiTraceMessageButton = null;
-	private Button guiInfoMessageButton = null;
-	private Button guiWarningMessageButton = null;
-	private Button guiErrorMessageButton = null;
-	private Button guiFatalMessageButton = null;
-	private Button guiArgsMessageButton = null;
-
-	private Spinner proxyPollingNodeMin = null;
-	private Spinner proxyPollingNodeMax = null;
-	private Spinner proxyPollingJob = null;
-
-	private EventMonitor eventMonitor = null;
-
-	private AbstractRemoteResourceManagerConfiguration config;
-	private RMConfigurationWizard confWizard;
-
-	private class EventMonitor implements SelectionListener, ModifyListener {
-		public EventMonitor() {
-//			 System.err.println("wizard: EventMonitor entered");
-			updateConfigOptions();
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-//			 System.err.println("wizard: widgetDefaultSelected entered");
-			updateConfigOptions();
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-//			 System.err.println("wizard: widgetSelected entered");
-			Object source = e.getSource();
-			if (source == libraryBrowseButton) {
-//				System.err.println("preferences: libraryBrowseButton");
-				DirectoryDialog dialog = new DirectoryDialog(getShell());
-				String selectedPath = dialog.open();
-				if (selectedPath != null)
-					proxyLibraryTextWidget.setText(selectedPath);
-			} 
-			else if (source == templateBrowseButton) {
-//				System.err.println("preferences: templateBrowseButton");
-				FileDialog dialog = new FileDialog(getShell());
-				String correctPath = getFieldContent(proxyTemplateTextWidget.getText().trim());
-				if (correctPath != null) {
-					File path = new File(correctPath);
-					if (path.exists())
-						dialog.setFilterPath(path.isFile() ? correctPath : path
-								.getParent());
-				}
-
-				String selectedPath = dialog.open();
-				if (selectedPath != null)
-					proxyTemplateTextWidget.setText(selectedPath);
-			}
-			updateConfigOptions();
-		}
-
-		public void widgetModified(SelectionEvent e) {
-//			 System.err.println("wizard: widgetModified entered");
-			updateConfigOptions();
-		}
-
-		public void modifyText(ModifyEvent e) {
-//			 System.err.println("preferences: modifyText entered");
-			// System.err.println("widget entered is "+ e.widget.toString());
-			if (e.widget.equals(proxyPollingJob)) {
-				// System.err.println("widget entered is proxyPollingJob");
-			}
-			if (e.widget.equals(proxyPollingNodeMin)) {
-				// System.err.println("widget entered is proxyPollingNodeMin");
-				int min_value = proxyPollingNodeMin.getSelection();
-				int max_value = proxyPollingNodeMax.getSelection();
-				if (min_value > max_value) {
-					proxyPollingNodeMax.setSelection(min_value);
-				}
-
-			}
-			if (e.widget.equals(proxyPollingNodeMax)) {
-				// System.err.println("widget entered is proxyPollingNodeMax");
-				int min_value = proxyPollingNodeMin.getSelection();
-				int max_value = proxyPollingNodeMax.getSelection();
-				if (max_value < min_value) {
-					proxyPollingNodeMin.setSelection(max_value);
-				}
-			}
-			if (e.widget.equals(proxyLibraryTextWidget)) {
-//				System.err.println("widget entered is proxyLibraryTextWidget");
-				String correctPath = getFieldContent(proxyLibraryTextWidget.getText().trim());
-				if (correctPath != null) {
-					File path = new File(correctPath);
-					if (path.exists() && (path.isDirectory())) {
-						setErrorMessage(null);
-					}
-					else {
-						setErrorMessage(Messages
-								.getString("Invalid.llLibraryPath"));
-						return;
-					}
-				}
-			}
-			if (e.widget.equals(proxyTemplateTextWidget)) {
-//				System.err.println("widget entered is proxyTemplateTextWidget");
-				String correctPath = getFieldContent(proxyTemplateTextWidget.getText().trim());
-				if (correctPath != null) {
-					File path = new File(correctPath);
-					if (path.exists() && (path.isFile())) {
-						setErrorMessage(null);
-					}
-					else {
-						setErrorMessage(Messages
-								.getString("Invalid.llJobCommandFileTemplate"));
-						return;
-					}
-				}
-				
-			}
-			
-			updateConfigOptions();
-			// TODO - check for valid file here - or else implement a browse
-			// button to select and check somewhere
-
-		}
-	}
-
-	public IBMLLResourceManagerOptionWizardPage(RMConfigurationWizard wizard) {
-		super(wizard, Messages.getString("Wizard.InvocationOptionsTitle"));
-		setTitle(Messages.getString("Wizard.InvocationOptionsTitle"));
-		setDescription(Messages.getString("Wizard.InvocationOptions"));
-		confWizard = getConfigurationWizard();
-		config = (AbstractRemoteResourceManagerConfiguration) confWizard
-				.getConfiguration();
-	}
-
-	/**
-	 * Get the preferences object for the IBMLL implementation
-	 * 
-	 * @return the preferences object
-	 */
-	public Preferences getPreferences() {
-		return IBMLLPreferenceManager.getPreferences();
-	}
-
-	/**
-	 * Create the widgets for this proxy configuration page
-	 * 
-	 * @param parent -
-	 *            The parent widget for this class
-	 */
-	@Override
-	public void createControl(Composite parent) {
-
-		Group proxyLibraryGroup = null;
-		Group proxyOptionsGroup = null;
-		Group proxyDebugGroup = null;
-		Group guiOptionsGroup = null;
-		Group proxyMulticlusterGroup = null;
-		Group proxyTemplateGroup = null;
-		Group proxyTemplateOptionsGroup = null;
-		Group proxyPollingGroup = null;
-		Preferences preferences = null;
-		libraryBrowseButton = null;
-		templateBrowseButton = null;
-		String preferenceValue;
-
-		preferences = getPreferences();
-		eventMonitor = new EventMonitor();
-
-		GridLayout layout;
-
-		preferences = getPreferences();
-		preferencePane = new Composite(parent, SWT.NONE);
-		layout = new GridLayout(2, true);
-		preferencePane.setLayout(layout);
-
-		// *********************************************************************
-		// Alternate LoadLeveler Library Install Location
-		// *********************************************************************
-		proxyLibraryGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyLibraryGroup.setLayout(createGridLayout(3, false, 0, 0));
-		proxyLibraryGroup.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL,
-				5));
-		proxyLibraryGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyLibraryGroupLabel"));
-
-		new Label(proxyLibraryGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyLibraryLabel"));
-
-		proxyLibraryTextWidget = new Text(proxyLibraryGroup, SWT.SINGLE
-				| SWT.BORDER);
-		proxyLibraryTextWidget.setLayoutData(new GridData(
-				GridData.FILL_HORIZONTAL));
-		libraryListener = new EventMonitor();
-		proxyLibraryTextWidget.addModifyListener(libraryListener);
-		proxyLibraryTextWidget
-				.setText(preferences
-						.getString(IBMLLPreferenceConstants.PROXY_LOADLEVELER_LIBRARY_PATH));
-		proxyLibraryTextWidget.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyLibraryToolTip"));
-
-		 libraryBrowseButton =
-			 SWTUtil.createPushButton(proxyLibraryGroup, Messages
-			 .getString("IBMLLPrefWizPage.browseButton"),
-			 null);
-			 libraryBrowseButton.addSelectionListener(libraryListener);
-
-		// *********************************************************************
-		// Check box group for proxy messages
-		// *********************************************************************
-		proxyOptionsGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyOptionsGroup.setLayout(new RowLayout());
-		proxyOptionsGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyOptionsGroupLabel"));
-
-		proxyTraceMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyTraceMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyTraceMessageLabel"));
-		proxyTraceMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyTraceMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_TRACE_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyTraceMessageButton.setSelection(true);
-		}
-		 proxyTraceMessageButton.addSelectionListener(eventMonitor);
-
-		proxyInfoMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyInfoMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyInfoMessageLabel"));
-		proxyInfoMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyInfoMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_INFO_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyInfoMessageButton.setSelection(true);
-		}
-		 proxyInfoMessageButton.addSelectionListener(eventMonitor);
-
-		proxyWarningMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyWarningMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyWarningMessageLabel"));
-		proxyWarningMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyWarningMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_WARNING_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyWarningMessageButton.setSelection(true);
-		}
-		 proxyWarningMessageButton.addSelectionListener(eventMonitor);
-
-		proxyErrorMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyErrorMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyErrorMessageLabel"));
-		proxyErrorMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyErrorMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_ERROR_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyErrorMessageButton.setSelection(true);
-		}
-		 proxyErrorMessageButton.addSelectionListener(eventMonitor);
-
-		proxyFatalMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyFatalMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyFatalMessageLabel"));
-		proxyFatalMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyFatalMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_FATAL_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyFatalMessageButton.setSelection(true);
-		}
-		 proxyFatalMessageButton.addSelectionListener(eventMonitor);
-
-		proxyArgsMessageButton = new Button(proxyOptionsGroup, SWT.CHECK);
-		proxyArgsMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyArgsMessageLabel"));
-		proxyArgsMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyArgsMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_ARGS_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyArgsMessageButton.setSelection(true);
-		}
-		 proxyArgsMessageButton.addSelectionListener(eventMonitor);
-
-		// *********************************************************************
-		// Check box group for proxy debug
-		// *********************************************************************
-		proxyDebugGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyDebugGroup.setLayout(new RowLayout());
-		proxyDebugGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyDebugGroupLabel"));
-
-		proxyDebugLoopButton = new Button(proxyDebugGroup, SWT.CHECK);
-		proxyDebugLoopButton.setText(Messages
-				.getString("IBMLLPrefWizPage.ProxyDebugLoopLabel"));
-		proxyDebugLoopButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.ProxyDebugLoopToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_DEBUG_LOOP);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyDebugLoopButton.setSelection(true);
-		}
-		 proxyDebugLoopButton.addSelectionListener(eventMonitor);
-
-		// *********************************************************************
-		// Check box group for gui messages
-		// *********************************************************************
-		guiOptionsGroup = new Group((Composite) preferencePane, SWT.NONE);
-		guiOptionsGroup.setLayout(new RowLayout());
-		guiOptionsGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.guiOptionsGroupLabel"));
-
-		guiTraceMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiTraceMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiTraceMessageLabel"));
-		guiTraceMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiTraceMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_TRACE_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiTraceMessageButton.setSelection(true);
-		}
-		 guiTraceMessageButton.addSelectionListener(eventMonitor);
-
-		guiInfoMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiInfoMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiInfoMessageLabel"));
-		guiInfoMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiInfoMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_INFO_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiInfoMessageButton.setSelection(true);
-		}
-		 guiInfoMessageButton.addSelectionListener(eventMonitor);
-
-		guiWarningMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiWarningMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiWarningMessageLabel"));
-		guiWarningMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiWarningMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_WARNING_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiWarningMessageButton.setSelection(true);
-		}
-		 guiWarningMessageButton.addSelectionListener(eventMonitor);
-
-		guiErrorMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiErrorMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiErrorMessageLabel"));
-		guiErrorMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiErrorMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_ERROR_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiErrorMessageButton.setSelection(true);
-		}
-		 guiErrorMessageButton.addSelectionListener(eventMonitor);
-
-		guiFatalMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiFatalMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiFatalMessageLabel"));
-		guiFatalMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiFatalMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_FATAL_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiFatalMessageButton.setSelection(true);
-		}
-		 guiFatalMessageButton.addSelectionListener(eventMonitor);
-
-		guiArgsMessageButton = new Button(guiOptionsGroup, SWT.CHECK);
-		guiArgsMessageButton.setText(Messages
-				.getString("IBMLLPrefWizPage.GuiArgsMessageLabel"));
-		guiArgsMessageButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.GuiArgsMessageToolTip"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.GUI_ARGS_MESSAGE);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			guiArgsMessageButton.setSelection(true);
-		}
-		 guiArgsMessageButton.addSelectionListener(eventMonitor);
-
-		// *********************************************************************
-		// Radio box group for multicluster
-		// *********************************************************************
-		proxyMulticlusterGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyMulticlusterGroup.setLayout(new RowLayout());
-		proxyMulticlusterGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyMulticlusterGroupLabel"));
-
-		proxyLLDefaultRadioButton = new Button(proxyMulticlusterGroup,
-				SWT.RADIO);
-		proxyLLDefaultRadioButton.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyMulticlusterDefaultLabel"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_DEFAULT_MULTICLUSTER);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyLLDefaultRadioButton.setSelection(true);
-		}
-		proxyLLDefaultRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		 proxyLLDefaultRadioButton.addSelectionListener(eventMonitor);
-		proxyLLDefaultRadioButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyMulticlusterDefaultToolTip"));
-
-		proxyForceLocalRadioButton = new Button(proxyMulticlusterGroup,
-				SWT.RADIO);
-		proxyForceLocalRadioButton.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyMulticlusterForceLocalLabel"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_FORCE_LOCAL);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyForceLocalRadioButton.setSelection(true);
-		}
-		proxyForceLocalRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		 proxyForceLocalRadioButton.addSelectionListener(eventMonitor);
-		proxyForceLocalRadioButton
-				.setToolTipText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterForceLocalToolTip"));
-
-		proxyForceMulticlusterRadioButton = new Button(proxyMulticlusterGroup,
-				SWT.RADIO);
-		proxyForceMulticlusterRadioButton
-				.setText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterForceMulticlusterLabel"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_FORCE_MULTICLUSTER);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyForceMulticlusterRadioButton.setSelection(true);
-		}
-		proxyForceMulticlusterRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		 proxyForceMulticlusterRadioButton.addSelectionListener(eventMonitor);
-		proxyForceMulticlusterRadioButton
-				.setToolTipText(Messages
-						.getString("IBMLLPrefWizPage.proxyMulticlusterForceMulticlusterToolTip"));
-
-		// *********************************************************************
-		// Template name group
-		// *********************************************************************
-		proxyTemplateGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyTemplateGroup.setLayout(createGridLayout(3, false, 0, 0));
-		proxyTemplateGroup.setLayoutData(spanGridData(GridData.FILL_HORIZONTAL,
-				5));
-		proxyTemplateGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateGroupLabel"));
-
-		new Label(proxyTemplateGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateLabel"));
-
-		proxyTemplateTextWidget = new Text(proxyTemplateGroup, SWT.SINGLE
-				| SWT.BORDER);
-		proxyTemplateTextWidget.setLayoutData(new GridData(
-				GridData.FILL_HORIZONTAL));
-		templateListener = new EventMonitor();
-		proxyTemplateTextWidget.addModifyListener(templateListener);
-		proxyTemplateTextWidget
-				.setText(preferences
-						.getString(IBMLLPreferenceConstants.PROXY_LOADLEVELER_TEMPLATE_FILE));
-		proxyTemplateTextWidget.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateToolTip"));
-
-		 templateBrowseButton =
-			 SWTUtil.createPushButton(proxyTemplateGroup,
-			 Messages.getString("IBMLLPrefWizPage.browseButton"),
-			 null);
-			 templateBrowseButton.addSelectionListener(templateListener);
-
-		// *********************************************************************
-		// Template options group
-		// *********************************************************************
-		proxyTemplateOptionsGroup = new Group((Composite) preferencePane,
-				SWT.NONE);
-		proxyTemplateOptionsGroup.setLayout(new RowLayout());
-		proxyTemplateOptionsGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateOptionsGroupLabel"));
-
-		proxyTemplateNeverRadioButton = new Button(proxyTemplateOptionsGroup,
-				SWT.RADIO);
-		proxyTemplateNeverRadioButton.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateNeverLabel"));
-		proxyTemplateNeverRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_NEVER);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyTemplateNeverRadioButton.setSelection(true);
-		}
-		 proxyTemplateNeverRadioButton.addSelectionListener(eventMonitor);
-		proxyTemplateNeverRadioButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateNeverToolTip"));
-
-		proxyTemplateAlwaysRadioButton = new Button(proxyTemplateOptionsGroup,
-				SWT.RADIO);
-		proxyTemplateAlwaysRadioButton.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateAlwaysLabel"));
-		preferenceValue = preferences
-				.getString(IBMLLPreferenceConstants.PROXY_WRITE_TEMPLATE_ALWAYS);
-		if (preferenceValue.equals(IBMLLPreferenceConstants.LL_YES)) {
-			proxyTemplateAlwaysRadioButton.setSelection(true);
-		}
-		proxyTemplateAlwaysRadioButton.setData(new Integer(SWT.IMAGE_BMP));
-		 proxyTemplateAlwaysRadioButton.addSelectionListener(eventMonitor);
-		proxyTemplateAlwaysRadioButton.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyTemplateAlwaysToolTip"));
-
-		// *********************************************************************
-		// Polling options group
-		// *********************************************************************
-		proxyPollingGroup = new Group((Composite) preferencePane, SWT.NONE);
-		proxyPollingGroup.setLayout(new RowLayout());
-		proxyPollingGroup.setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingGroupLabel"));
-
-		new Label(proxyPollingGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMinLabel"));
-
-		proxyPollingNodeMin = new Spinner(proxyPollingGroup, SWT.READ_ONLY);
-		proxyPollingNodeMin.setIncrement(10);
-		proxyPollingNodeMin.setMinimum(30);
-		proxyPollingNodeMin.setMaximum(300);
-		proxyPollingNodeMin.setPageIncrement(50);
-		proxyPollingNodeMin.setSelection(preferences
-				.getInt(IBMLLPreferenceConstants.PROXY_MIN_NODE_POLLING));
-		proxyPollingNodeMin.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMinToolTip"));
-		proxyPollingNodeMin.addModifyListener(eventMonitor);
-
-		new Label(proxyPollingGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMaxLabel"));
-
-		proxyPollingNodeMax = new Spinner(proxyPollingGroup, SWT.READ_ONLY);
-		proxyPollingNodeMax.setIncrement(10);
-		proxyPollingNodeMax.setMinimum(30);
-		proxyPollingNodeMax.setMaximum(500);
-		proxyPollingNodeMax.setPageIncrement(50);
-		proxyPollingNodeMax.setSelection(preferences
-				.getInt(IBMLLPreferenceConstants.PROXY_MAX_NODE_POLLING));
-		proxyPollingNodeMax.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingNodeMaxToolTip"));
-		proxyPollingNodeMax.addModifyListener(eventMonitor);
-
-		new Label(proxyPollingGroup, SWT.NONE).setText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingJobLabel"));
-
-		proxyPollingJob = new Spinner(proxyPollingGroup, SWT.READ_ONLY);
-		proxyPollingJob.setIncrement(10);
-		proxyPollingJob.setMinimum(30);
-		proxyPollingJob.setMaximum(300);
-		proxyPollingJob.setPageIncrement(50);
-		proxyPollingJob.setSelection(preferences
-				.getInt(IBMLLPreferenceConstants.PROXY_JOB_POLLING));
-		proxyPollingJob.setToolTipText(Messages
-				.getString("IBMLLPrefWizPage.proxyPollingJobToolTip"));
-		proxyPollingJob.addModifyListener(eventMonitor);
-
-		setControl(preferencePane);
-	}
-
-	/**
-	 * Retrieve the settings specified on this panel and create the string
-	 * containing proxy invocation options corresponding to those values
-	 * 
-	 * @return Status indicating successful completion
-	 */
-	protected boolean updateConfigOptions() {
-		String options;
-
-		options = "";
-		if (proxyLibraryTextWidget != null) {
-			if (proxyLibraryTextWidget.getText().trim().length() > 0) {
-				options = options + "--lib_override="
-						+ proxyLibraryTextWidget.getText().trim() + " ";
-			}
-		}
-
-		if (proxyTraceMessageButton != null) {
-			if (proxyTraceMessageButton.getSelection()) {
-				options = options + "--trace_messages=y ";
-			}
-		}
-
-		if (proxyInfoMessageButton != null) {
-			if (proxyInfoMessageButton.getSelection()) {
-				options = options + "--info_messages=y ";
-			}
-		}
-
-		if (proxyWarningMessageButton != null) {
-			if (proxyWarningMessageButton.getSelection()) {
-				options = options + "--warning_messages=y ";
-			}
-		}
-
-		if (proxyErrorMessageButton != null) {
-			if (proxyErrorMessageButton.getSelection()) {
-				options = options + "--error_messages=y ";
-			}
-		}
-
-		if (proxyFatalMessageButton != null) {
-			if (proxyFatalMessageButton.getSelection()) {
-				options = options + "--fatal_messages=y ";
-			}
-		}
-
-		if (proxyArgsMessageButton != null) {
-			if (proxyArgsMessageButton.getSelection()) {
-				options = options + "--args_messages=y ";
-			}
-		}
-
-		if (proxyDebugLoopButton != null) {
-			if (proxyDebugLoopButton.getSelection()) {
-				options = options + "--debug_loop=y ";
-			}
-		}
-
-		if ((proxyLLDefaultRadioButton != null)
-				&& (proxyForceLocalRadioButton != null)
-				&& (proxyForceMulticlusterRadioButton != null)) {
-			if (proxyLLDefaultRadioButton.getSelection()) {
-				options = options + "--multicluster=d ";
-			} else if (proxyForceLocalRadioButton.getSelection()) {
-				options = options + "--multicluster=n ";
-			} else if (proxyForceMulticlusterRadioButton.getSelection()) {
-				options = options + "--multicluster=y ";
-			}
-		}
-
-		if (proxyTemplateTextWidget != null) {
-			if (proxyTemplateTextWidget.getText().trim().length() > 0) {
-				options = options + "--template_override="
-						+ proxyTemplateTextWidget.getText().trim() + " ";
-			}
-		}
-
-		if (proxyTemplateNeverRadioButton != null) {
-			if (proxyTemplateNeverRadioButton.getSelection()) {
-				options = options + "--template_write=n ";
-			} else if (proxyTemplateAlwaysRadioButton.getSelection()) {
-				options = options + "--template_write=a ";
-			}
-		}
-
-		if (proxyPollingNodeMin != null) {
-			options = options + "--node_polling_min="
-					+ proxyPollingNodeMin.getSelection() + " ";
-		}
-
-		if (proxyPollingNodeMax != null) {
-			options = options + "--node_polling_max="
-					+ proxyPollingNodeMax.getSelection() + " ";
-		}
-
-		if (proxyPollingJob != null) {
-			options = options + "--job_polling="
-					+ proxyPollingJob.getSelection() + " ";
-		}
-
-//		 System.err.println("Options from wizard page are now set to: " +
-//		 options );
-
-		config.setInvocationOptions(options);
-
-		return true;
-	}
-
-	protected GridLayout createGridLayout(int columns, boolean isEqual, int mh,
-			int mw) {
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = columns;
-		gridLayout.makeColumnsEqualWidth = isEqual;
-		gridLayout.marginHeight = mh;
-		gridLayout.marginWidth = mw;
-		return gridLayout;
-	}
-
-	protected GridData spanGridData(int style, int space) {
-		GridData gd = null;
-		if (style == -1)
-			gd = new GridData();
-		else
-			gd = new GridData(style);
-		gd.horizontalSpan = space;
-		return gd;
-	}
-	
-	protected String getFieldContent(String text) 
-	{
-		if (text.trim().length() == 0 || text.equals(""))
-			return null;
-
-		return text;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/.classpath b/rms/org.eclipse.ptp.rm.ibm.pe.core/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/.project b/rms/org.eclipse.ptp.rm.ibm.pe.core/.project
deleted file mode 100755
index fc72189..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.pe.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.pe.core/META-INF/MANIFEST.MF
deleted file mode 100755
index 0e9d9a3..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.pe.core;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.ibm.pe.core.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ptp.core,
- org.eclipse.search,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.proxy.protocol
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.ibm.pe.core,
- org.eclipse.ptp.rm.ibm.pe.core.rmsystem

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/about.ini b/rms/org.eclipse.ptp.rm.ibm.pe.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/about.ini
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/about.mappings b/rms/org.eclipse.ptp.rm.ibm.pe.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/about.properties b/rms/org.eclipse.ptp.rm.ibm.pe.core/about.properties
deleted file mode 100644
index aa66929..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/about.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/build.properties b/rms/org.eclipse.ptp.rm.ibm.pe.core/build.properties
deleted file mode 100755
index 0d0bf8c..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/eclipse32.png b/rms/org.eclipse.ptp.rm.ibm.pe.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.properties
deleted file mode 100644
index 233f80d..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM Parallel Environment Support
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.xml b/rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.xml
deleted file mode 100755
index 9969ef9..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/plugin.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!-- 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                               -->
-<plugin>
-   <extension
-         point="org.eclipse.ptp.core.resourceManagers">
-      <resourceManager
-            class="org.eclipse.ptp.rm.ibm.pe.core.rmsystem.PEResourceManagerFactory"
-            id="org.eclipse.ptp.ibmpe.core.resourcemanager"/>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/Activator.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/Activator.java
deleted file mode 100755
index b92c1ad..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/Activator.java
+++ /dev/null

@@ -1,74 +0,0 @@
-package org.eclipse.ptp.rm.ibm.pe.core;
-/*******************************************************************************
- * 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
- *  
- * 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
- *******************************************************************************/
-    
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.ibm.pe.core";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceConstants.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceConstants.java
deleted file mode 100644
index 483e349..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceConstants.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.core;
-
-public interface PEPreferenceConstants
-{
-    // Values of constants used as preference keys should be prefixed with
-    // 'PE_' to ensure no collisions with any other preference keys
-    public static final String TRACE_NOTHING = "None";
-    public static final String TRACE_FUNCTION = "Function";
-    public static final String TRACE_DETAIL = "Detail";
-    public static final String LOAD_LEVELER_OPTION = "PE_useLoadLeveler";
-    public static final String TRACE_LEVEL = "PE_traceLevel";
-    public static final String RUN_MINIPROXY = "PE_runMiniproxy";
-    public static final String LOAD_LEVELER_MODE = "PE_LoadLevelerMode";
-    public static final String LIBRARY_OVERRIDE = "PE_libraryOverride";
-    public static final String NODE_MIN_POLL_INTERVAL = "PE_NodeMinPollInterval";
-    public static final String NODE_MAX_POLL_INTERVAL = "PE_NodeMaxPollInterval";
-    public static final String JOB_POLL_INTERVAL = "PE_JobPollInterval";
-    public static final String OPTION_YES = "Y";
-    public static final String OPTION_NO = "N";
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceManager.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceManager.java
deleted file mode 100755
index 6c3d1d7..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/PEPreferenceManager.java
+++ /dev/null

@@ -1,85 +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
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.core;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.remote.core.IRemoteProxyOptions;
-import org.eclipse.ptp.rm.remote.ui.preferences.PreferenceConstants;
-
-public class PEPreferenceManager
-{
-    private static final String PROXY_EXECUTABLE_NAME = "ptp_ibmpe_proxy";
-    private static final String PROXY_EXECUTABLE_PATH = null; // use local fragment directory
-    private static final int OPTIONS = IRemoteProxyOptions.PORT_FORWARDING;
-
-    public static int getDefaultOptions()
-    {
-	return OPTIONS;
-    }
-
-    public static String getDefaultProxyExecutablePath()
-    {
-	return PROXY_EXECUTABLE_PATH;
-    }
-
-    public static Preferences getPreferences()
-    {
-	return Activator.getDefault().getPluginPreferences();
-    }
-
-    public static void savePreferences()
-    {
-	Activator.getDefault().savePluginPreferences();
-    }
-
-    public static void initializePreferences()
-    {
-	Preferences preferences = Activator.getDefault().getPluginPreferences();
-
-	String server = "";
-
-	if (PROXY_EXECUTABLE_PATH != null) {
-	    server = new Path(PROXY_EXECUTABLE_PATH).append(PROXY_EXECUTABLE_NAME).toOSString();
-	} else {
-	    server = PTPCorePlugin.getDefault().locateFragmentFile("org.eclipse.ptp", PROXY_EXECUTABLE_NAME);
-	    if (server == null) {
-		server = "";
-	    }
-	}
-
-	preferences.setDefault(PreferenceConstants.PROXY_PATH, server);
-	preferences.setDefault(PreferenceConstants.OPTIONS, OPTIONS);
-	preferences.setDefault(PEPreferenceConstants.LOAD_LEVELER_OPTION, PEPreferenceConstants.OPTION_NO);
-	preferences.setDefault(PEPreferenceConstants.LOAD_LEVELER_MODE, "d");
-	preferences.setDefault(PEPreferenceConstants.JOB_POLL_INTERVAL, "30");
-	preferences.setDefault(PEPreferenceConstants.NODE_MIN_POLL_INTERVAL, "30");
-	preferences.setDefault(PEPreferenceConstants.NODE_MAX_POLL_INTERVAL, "120");
-	preferences.setDefault(PEPreferenceConstants.LIBRARY_OVERRIDE, "");
-	preferences.setDefault(PEPreferenceConstants.RUN_MINIPROXY, PEPreferenceConstants.OPTION_YES);
-	preferences.setDefault(PEPreferenceConstants.TRACE_LEVEL, PEPreferenceConstants.TRACE_NOTHING);
-    }
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManager.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManager.java
deleted file mode 100755
index 95748b1..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManager.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- * 
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.core.rmsystem;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.rm.ibm.pe.core.rtsystem.PEProxyRuntimeClient;
-import org.eclipse.ptp.rm.ibm.pe.core.rtsystem.PERuntimeSystem;
-import org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-public class PEResourceManager extends AbstractRuntimeResourceManager {
-
-	private Integer PERMID;
-	
-	public PEResourceManager(Integer id, IPUniverseControl universe, IResourceManagerConfiguration config) {
-		super(id.toString(), universe, config);
-		PERMID = id;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterCloseConnection()
-	 */
-	protected void doAfterCloseConnection() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterOpenConnection()
-	 */
-	protected void doAfterOpenConnection() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeCloseConnection()
-	 */
-	protected void doBeforeCloseConnection() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeOpenConnection()
-	 */
-	protected void doBeforeOpenConnection() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateJob(org.eclipse.ptp.core.elementcontrols.IPQueueControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPJobControl doCreateJob(IPQueueControl queue, String jobId, AttributeManager attrs) {
-		return newJob(queue, jobId, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateMachine(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPMachineControl doCreateMachine(String machineId, AttributeManager attrs) {
-		return newMachine(machineId, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateNode(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPNodeControl doCreateNode(IPMachineControl machine, String nodeId, AttributeManager attrs) {
-		return newNode(machine, nodeId, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateProcess(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPProcessControl doCreateProcess(IPJobControl job, String processId, AttributeManager attrs) {
-		return newProcess(job, processId, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateQueue(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected IPQueueControl doCreateQueue(String queueId, AttributeManager attrs) {
-		return newQueue(queueId, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateRuntimeSystem()
-	 */
-	@Override
-	protected IRuntimeSystem doCreateRuntimeSystem() {
-		PEResourceManagerConfiguration config = (PEResourceManagerConfiguration) getConfiguration();
-		/* load up the control and monitoring systems for OMPI */
-		PEProxyRuntimeClient runtimeProxy = new PEProxyRuntimeClient(config, PERMID);
-		return new PERuntimeSystem(runtimeProxy, getAttributeDefinitionManager());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateJobs(org.eclipse.ptp.core.elements.IPQueue, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateJobs(IPQueueControl queue, Collection<IPJobControl> jobs,
-			AttributeManager attrs) {
-		return updateJobs(queue, jobs, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateMachines(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateMachines(Collection<IPMachineControl> machines,
-			AttributeManager attrs) {
-		return updateMachines(machines, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateNodes(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateNodes(IPMachineControl machine, 
-			Collection<IPNodeControl> nodes, AttributeManager attrs) {
-		return updateNodes(machine, nodes, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateProcesses(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateProcesses(IPJobControl job,
-			Collection<IPProcessControl> processes, AttributeManager attrs) {
-		return updateProcesses(job, processes, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateQueues(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected boolean doUpdateQueues(Collection<IPQueueControl> queues,
-			AttributeManager attrs) {
-		return updateQueues(queues, attrs);
-	}
-
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerConfiguration.java
deleted file mode 100755
index cc0f80c..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerConfiguration.java
+++ /dev/null

@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115 
- * 
- * Copyright (c) 2006, 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
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.rm.ibm.pe.core.rmsystem;
-
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-final public class PEResourceManagerConfiguration extends AbstractRemoteResourceManagerConfiguration
-{
-
-    	// Values of tags used as memento keys should be prefixed with 'PE_' to ensure no
-    	// collisions with other proxy's settings
-    private static final String TAG_USE_LOADLEVELER = "PE_UseLoadLeveler";
-    private static final String TAG_DEBUG_LEVEL = "PE_DebugLevel";
-    private static final String TAG_RUN_MINIPROXY = "PE_RunMiniproxy";
-    private static final String TAG_SUSPEND_PROXY = "PE_SuspendProxy";
-    private static final String TAG_LOADLEVELER_MODE = "PE_LoadLevelerMode";
-    private static final String TAG_MIN_NODE_POLL_INTERVAL = "PE_NodeMinPollInterval";
-    private static final String TAG_MAX_NODE_POLL_INTERVAL = "PE_NodeMaxPollInterval";
-    private static final String TAG_JOB_POLL_INTERVAL = "PE_JobPollInterval";
-    private static final String TAG_LIBRARY_OVERRIDE = "PE_LibraryOverride";
-    private String useLoadLeveler;
-    private String runMiniproxy;
-    private String debugLevel;
-    private String suspendProxy;
-    private String loadLevelerMode;
-    private String nodeMinPollInterval;
-    private String nodeMaxPollInterval;
-    private String jobPollInterval;
-    private String libraryOverride;
-
-    public static IResourceManagerConfiguration load(PEResourceManagerFactory factory, IMemento memento)
-    {
-
-	RemoteConfig remoteConfig;
-	String useLoadLeveler;
-	String runMiniproxy;
-	String debugLevel;
-	String suspendProxy;
-	String loadLevelerMode;
-	String nodeMinPollInterval;
-	String nodeMaxPollInterval;
-	String jobPollInterval;
-	String libraryOverride;
-
-	remoteConfig = loadRemote(factory, memento);
-	useLoadLeveler = memento.getString(TAG_USE_LOADLEVELER);
-	runMiniproxy = memento.getString(TAG_RUN_MINIPROXY);
-	debugLevel = memento.getString(TAG_DEBUG_LEVEL);
-	suspendProxy = memento.getString(TAG_SUSPEND_PROXY);
-	nodeMinPollInterval = memento.getString(TAG_MIN_NODE_POLL_INTERVAL);
-	nodeMaxPollInterval = memento.getString(TAG_MAX_NODE_POLL_INTERVAL);
-	jobPollInterval = memento.getString(TAG_JOB_POLL_INTERVAL);
-	libraryOverride = memento.getString(TAG_LIBRARY_OVERRIDE);
-	loadLevelerMode = memento.getString(TAG_LOADLEVELER_MODE);
-	PEResourceManagerConfiguration config = new PEResourceManagerConfiguration(factory, remoteConfig,
-		useLoadLeveler, runMiniproxy, debugLevel, suspendProxy, loadLevelerMode, libraryOverride, 
-		nodeMinPollInterval, nodeMaxPollInterval, jobPollInterval);
-
-	return config;
-    }
-
-    public PEResourceManagerConfiguration(PEResourceManagerFactory factory, RemoteConfig remoteConfig,
-	    String useLoadLeveler, String runMiniproxy, String debugLevel, String suspendProxy,
-	    String loadLevelerMode, String libraryOverride, String nodeMinPollInterval, 
-	    String nodeMaxPollInterval, String jobPollInterval)
-    {
-	super(remoteConfig, factory);
-	this.useLoadLeveler = useLoadLeveler;
-	this.runMiniproxy = runMiniproxy;
-	this.debugLevel = debugLevel;
-	this.suspendProxy = suspendProxy;
-	this.loadLevelerMode = loadLevelerMode;
-	this.libraryOverride = libraryOverride;
-	this.nodeMinPollInterval = nodeMinPollInterval;
-	this.nodeMaxPollInterval = nodeMaxPollInterval;
-	this.jobPollInterval = jobPollInterval;
-    }
-
-    public PEResourceManagerConfiguration(PEResourceManagerFactory factory)
-    {
-	this(factory, new RemoteConfig(), "N", "Y", "None", "N", "d", "", "", "", "");
-	setDefaultNameAndDesc();
-    }
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#clone()
-	 */
-	@Override
-	public Object clone() {
-		CommonConfig commonConf = new CommonConfig(getName(),
-				getDescription(), getUniqueName());
-		RemoteConfig remoteConf = new RemoteConfig(commonConf,
-				getRemoteServicesId(), getConnectionName(),
-				getProxyServerPath(), getLocalAddress(),
-				getInvocationOptionsStr(), getOptions());
-		return new PEResourceManagerConfiguration(
-				(PEResourceManagerFactory) getFactory(), remoteConf,
-				getUseLoadLeveler(), getRunMiniproxy(), getDebugLevel(), 
-				getSuspendProxy(), getLoadLevelerMode(), getLibraryOverride(),
-				getNodeMinPollInterval(), getNodeMaxPollInterval(),
-				getJobPollInterval());
-	}
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setDefaultNameAndDesc()
-     */
-    public void setDefaultNameAndDesc()
-    {
-	String name = "PE";
-	String conn = getConnectionName();
-	if (conn != null && !conn.equals("")) {
-	    name += "@" + conn;
-	}
-	setName(name);
-	setDescription("PE Resource Manager");
-    }
-
-    /**
-     * Get flag indicating LoadLeveler is used to allocate nodes
-     * 
-     * @return the LoadLeveler flag
-     */
-    public String getUseLoadLeveler()
-    {
-	return useLoadLeveler;
-    }
-
-    /**
-     * Get flag indicating the miniproxy is to run following main proxy shutdown
-     * 
-     * @return Miniproxy flag
-     */
-    public String getRunMiniproxy()
-    {
-	return runMiniproxy;
-    }
-
-    /**
-     * Get the proxy debug level
-     * 
-     * @return debug level
-     */
-    public String getDebugLevel()
-    {
-	return debugLevel;
-    }
-
-    /**
-     * Get the flag indicating proxy should be suspended at startup (for debugging)
-     * 
-     * @return the suspend proxy flag
-     */
-    public String getSuspendProxy()
-    {
-	return suspendProxy;
-    }
-
-//    /*
-//     * Save option settings for resource manager definition (non-Javadoc)
-//     * 
-//     * @see org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration#doSave(org.eclipse.ui.IMemento)
-//     */
-//    protected void doSave(IMemento memento)
-//    {
-//	super.doSave(memento);
-//	memento.putString(TAG_USE_LOADLEVELER, useLoadLeveler);
-//	memento.putString(TAG_RUN_MINIPROXY, runMiniproxy);
-//	memento.putString(TAG_DEBUG_LEVEL, debugLevel);
-//	memento.putString(TAG_MIN_NODE_POLL_INTERVAL, nodeMinPollInterval);
-//	memento.putString(TAG_MAX_NODE_POLL_INTERVAL, nodeMaxPollInterval);
-//	memento.putString(TAG_JOB_POLL_INTERVAL, jobPollInterval);
-//	memento.putString(TAG_LOADLEVELER_MODE, loadLevelerMode);
-//	memento.putString(TAG_LIBRARY_OVERRIDE, libraryOverride);
-//	memento.putString(TAG_SUSPEND_PROXY, suspendProxy);
-//    }
-
-    /**
-     * Set flag indicating whether LoadLeveler is used to allocate nodes
-     * @param useLoadLeveler - flag inidcating LoadLeveler used to allocate nodes
-     */
-    public void setUseLoadLeveler(String useLoadLeveler)
-    {
-        this.useLoadLeveler = useLoadLeveler;
-    }
-
-    /**
-     * Set flag indicating whether miniproxy should run following proxy shutdown
-     * @param runMiniproxy Flag indicating miniproxy should run
-     */
-    public void setRunMiniproxy(String runMiniproxy)
-    {
-        this.runMiniproxy = runMiniproxy;
-    }
-
-    /**
-     * Set the debug level for the proxy
-     * @param debugLevel Debug level
-     */
-    public void setDebugLevel(String debugLevel)
-    {
-        this.debugLevel = debugLevel;
-    }
-
-    /**
-     * Set flag indicating whether proxy should be suspended at startup (for debugging)
-     * @param suspendProxy proxy suspension flag
-     */
-    public void setSuspendProxy(String suspendProxy)
-    {
-        this.suspendProxy = suspendProxy;
-    }
-
-    /**
-     * Get LoadLeveler run mode (local, multicluster, default)
-     * @return the loadLevelerMode
-     */
-    public String getLoadLevelerMode()
-    {
-        return loadLevelerMode;
-    }
-
-    /**
-     * Set LoadLeveler run mode (local, multicluster, default)
-     * @param loadLevelerMode the loadLevelerMode to set
-     */
-    public void setLoadLevelerMode(String loadLevelerMode)
-    {
-        this.loadLevelerMode = loadLevelerMode;
-    }
-
-    /**
-     * Get the minimum interval to poll LoadLeveler for node status
-     * @return the nodePollMinInterval
-     */
-    public String getNodeMinPollInterval()
-    {
-        return nodeMinPollInterval;
-    }
-
-    /**
-     * Set the minimum interval to poll LoadLeveler for node status
-     * @param nodePollMinInterval the nodePollMinInterval to set
-     */
-    public void setNodeMinPollInterval(String nodeMinPollInterval)
-    {
-        this.nodeMinPollInterval = nodeMinPollInterval;
-    }
-
-    /**
-     * Get the maximum interval to poll LoadLeveler for node status
-     * @return the nodePollMaxInterval
-     */
-    public String getNodeMaxPollInterval()
-    {
-        return nodeMaxPollInterval;
-    }
-
-    /**
-     * Set the maximum interval to poll LoadLeveler for node status
-     * @param nodePollMaxInterval the nodePollMaxInterval to set
-     */
-    public void setNodeMaxPollInterval(String nodeMaxPollInterval)
-    {
-        this.nodeMaxPollInterval = nodeMaxPollInterval;
-    }
-
-    /**
-     * Get the interval to poll LoadLeveler for job status
-     * @return the jobPollInterval
-     */
-    public String getJobPollInterval()
-    {
-        return jobPollInterval;
-    }
-
-    /**
-     * Set the interval to poll LoadLeveler for job status
-     * @param jobPollInterval the jobPollInterval to set
-     */
-    public void setJobPollInterval(String jobPollInterval)
-    {
-        this.jobPollInterval = jobPollInterval;
-    }
-
-    /**
-     * Get the alternate library path for the LoadLeveler API library
-     * @return the libraryOverride
-     */
-    public String getLibraryOverride()
-    {
-        return libraryOverride;
-    }
-
-    /**
-     * Set the alternate library path for the LoadLeveler API library
-     * @param libraryOverride the libraryOverride to set
-     */
-    public void setLibraryOverride(String libraryOverride)
-    {
-        this.libraryOverride = libraryOverride;
-    }
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerFactory.java
deleted file mode 100755
index 48897b3..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rmsystem/PEResourceManagerFactory.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceConstants;
-import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceManager;
-import org.eclipse.ptp.rm.remote.ui.preferences.PreferenceConstants;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-public class PEResourceManagerFactory extends AbstractResourceManagerFactory {
-
-	public PEResourceManagerFactory() {
-		super("IBM Parallel Environment");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#copyConfiguration(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public IResourceManagerConfiguration copyConfiguration(IResourceManagerConfiguration configuration) {
-	    return (IResourceManagerConfiguration) configuration.clone();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#create(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public IResourceManagerControl create(IResourceManagerConfiguration confIn) {
-		PEResourceManagerConfiguration configuration = (PEResourceManagerConfiguration) confIn;
-		final PTPCorePlugin plugin = PTPCorePlugin.getDefault();
-		final IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
-		return new PEResourceManager(universe.getNextResourceManagerId(), universe, configuration);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#createConfiguration()
-	 */
-	public IResourceManagerConfiguration createConfiguration() {
-		PEResourceManagerConfiguration conf = new PEResourceManagerConfiguration(this);
-		
-		Preferences preferences = PEPreferenceManager.getPreferences();
-		
-		conf.setProxyServerPath(preferences.getString(PreferenceConstants.PROXY_PATH));
-		conf.setOptions(preferences.getInt(PreferenceConstants.OPTIONS));
-		conf.setDebugLevel(preferences.getString(PEPreferenceConstants.TRACE_LEVEL));
-		conf.setJobPollInterval(preferences.getString(PEPreferenceConstants.JOB_POLL_INTERVAL));
-		conf.setLibraryOverride(preferences.getString(PEPreferenceConstants.LIBRARY_OVERRIDE));
-		conf.setLoadLevelerMode(preferences.getString(PEPreferenceConstants.LOAD_LEVELER_MODE));
-		conf.setNodeMaxPollInterval(preferences.getString(PEPreferenceConstants.NODE_MAX_POLL_INTERVAL));
-		conf.setNodeMinPollInterval(preferences.getString(PEPreferenceConstants.NODE_MIN_POLL_INTERVAL));
-		conf.setRunMiniproxy(preferences.getString(PEPreferenceConstants.RUN_MINIPROXY));
-		conf.setUseLoadLeveler(preferences.getString(PEPreferenceConstants.LOAD_LEVELER_OPTION));
-
-		return conf;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#loadConfiguration(org.eclipse.ui.IMemento)
-	 */
-	public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
-		return PEResourceManagerConfiguration.load(this, memento);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PEProxyRuntimeClient.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PEProxyRuntimeClient.java
deleted file mode 100755
index 3f27272..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PEProxyRuntimeClient.java
+++ /dev/null

@@ -1,18 +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
- */
-package org.eclipse.ptp.rm.ibm.pe.core.rtsystem;
-
-import org.eclipse.ptp.rm.ibm.pe.core.rmsystem.PEResourceManagerConfiguration;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeClient;
-
-public class PEProxyRuntimeClient extends AbstractRemoteProxyRuntimeClient {
-	public PEProxyRuntimeClient(PEResourceManagerConfiguration config, 
-			int baseModelId) {
-		super(config, baseModelId);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PERuntimeSystem.java b/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PERuntimeSystem.java
deleted file mode 100755
index de071db..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.core/src/org/eclipse/ptp/rm/ibm/pe/core/rtsystem/PERuntimeSystem.java
+++ /dev/null

@@ -1,35 +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
- * 
- * Copyright (c) 2006, 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
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.ibm.pe.core.rtsystem;
-
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeSystem;
-
-public class PERuntimeSystem extends AbstractRemoteProxyRuntimeSystem {
-	public PERuntimeSystem(PEProxyRuntimeClient proxy, AttributeDefinitionManager manager) {
-		super(proxy, manager);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/.classpath b/rms/org.eclipse.ptp.rm.ibm.pe.help/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/.project b/rms/org.eclipse.ptp.rm.ibm.pe.help/.project
deleted file mode 100755
index 1ba10c4..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.pe.help</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.pe.help/META-INF/MANIFEST.MF
deleted file mode 100755
index 5beac1f..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.pe.help;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.ibm.pe.help.Activator
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Eclipse-LazyStart: true

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/build.properties b/rms/org.eclipse.ptp.rm.ibm.pe.help/build.properties
deleted file mode 100755
index 956d87b..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/PEMainHelp.html b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/PEMainHelp.html
deleted file mode 100755
index f80068f..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/PEMainHelp.html
+++ /dev/null

@@ -1,257 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<!-- Copyright (c) 2007 IBM Corporation.                                     -->
-<!-- All rights reserved. This program and the accompanying materials        -->
-<!-- are made available under the terms of the Eclipse Public License v1.0   -->
-<!-- which accompanies this distribution, and is available at                -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                               -->
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Running IBM Parallel Environment Applications</title>
-</head>
-
-<body>
-<h1>Running IBM Parallel Environment Applications</h1>
-<h2><A name=introduction></A>Introduction</h2>
-<p>This plugin allows you to run a parallel application using IBM Parallel Environment from within the PTP framework. 
-In addition to running applications, you can monitor their status, control their execution, and view their stdio
-output from within PTP. You can also debug a parallel application using the built in PTP parallel debugger.</p>
-<p>You can run and debug parallel applications either as local projects or as remote projects, using the remote development 
-environment support that is part of PTP.</p>
-<p>Optionally, you can use IBM Tivoli WorkloadScheduler LoadLeveler to manage your application's access to system resources</p>
-<p>This plugin consists of two parts. The first is the Eclipse PTP plugin code which is responsible for the PTP views 
-presented to the user and the user's interaction with those views. The second part is a resource manager (proxy), which is
-responsible for communicating with the PTP PE plugin code, invoking the parallel application, and reporting application
-status to the PTP PE plugin.</p>
-<h2><A name=requirements></A>Requirements</h2>
-<p>In addition to having Eclipse and PTP installed, you need to have the following software packages installed.</p>
-<ul>
-<li>CDT 4.0, available from the Eclipse download site</li>
-<li>Parallel Environment 4.3.1 or later, available from IBM</li>
-<li>LAPI 2.4.4.0 or later, available from IBM</li>
-<li>IBM Tivoli WorkloadScheduler LoadLeveler 3.4 or later, available from IBM, if you plan to use LoadLeveler to manage your application's
-access to system resources</li> 
-</ul>
-<p>You should review the following information about Parallel Environment installation and usage
-<ul>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am101m00.pdf">
-IBM Parallel Environment for AIX and Linux Installation Guide</a>
-</li>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am102m00.pdf">
-IBM Parallel Environment for AIX 5L and Linux Operation and Use, Vol 1, Using the Parallel Operating Environment</a>
-</li>
-</ul>
-<p>If you are using LoadLeveler to manage your application's access to system resources, then you should review the following
-LoadLeveler documentation</p>
-<ul>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am2in206.pdf">
-Tivoli Workload Scheduler LoadLeveler V3.4 Installation Guide</a>
-</li>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am2ug305.pdf">
-Tivoli Workload Scheduler LoadLeveler V3.4 Using and Administering Guide</a>
-</li>
-<li>
-<a href="http://publib.boulder.ibm.com/epubs/pdf/am2mg105.pdf">
-Tivoli Workload Scheduler LoadLeveler V3.4 Diagnosis and Messages Guide</a>
-</li>
-</ul>
-<h2><A name=installation></A>Installation</h2>
-If you will be running applications using PE with a host list and not using LoadLeveler to manage resource allocation,
-then installation is complete once you complete the PTP plugin installation procedures. If you plan to use LoadLeveler 
-to manage resource allocation, then you will need to rebuild the Parallel Environment proxy by following these steps
-<ol>
-<li>Make sure you have installed LoadLeveler and that the llapi.h include file exists on your system.
-It normally is located in the ./full/include directory within a LoadLeveler installation. 
-LoadLeveler is normally installed in /usr/lpp/LoadL on AIX systems and in /opt/ibmll/LoadL on Linux systems. LoadLeveler may also be 
-installed in a private directory if you choose to do so.
-<li>cd to the org.eclipse.ptp.ibmpe.proxy directory inside your plugins directory.</li>
-<li>Invoke the configure script in that directory with the <b>--with-ll-header</b> flag, specifying the path to
-the directory containing llapi.h. (Use <b>configure --help</b> to see a complete list of configure script options)</li>
-<li>Invoke <b>make</b> in the same directory.
-</ol>
-<h2><A name=starting></A>Getting Started</h2>
-<p>Define an appropriate project, either a C/C++ project using CDT, or a Fortran project using Photran. You can define 
-either a standard make project or a managed make project.</p>
-<p>When you define the project, you should specify the project location as a directory which is shared among all nodes 
-where the parallel application will run to ensure Parallel Environment has access to the executable on all nodes. The 
-following image shows how a project can be created using a directory visible to all nodes.</p>
-<img src="images/project_create_1.jpg"> 
-<p>You should use the following compiler invocation commands
-to invoke the compiler, either in your makefile, or when specifying the compiler and linker in a managed make project.</p>
-<ul>
-<li>AIX</li>
-<ul>
-<li>mpcc_r for C programs</li>
-<li>mpCC_r for C++ programs</li>
-<li>mpxlf_r for Fortran programs</li>
-</ul>
-<li>Linux</li>
-<ul>
-<li>mpcc for C programs</li>
-<li>mpCC for C++ programs</li>
-<li>mpfort for Fortran programs</li>
-</ul>
-</ul> 
-<p>The following image shows how the compiler is specified for a managed make project. The correct linker should also
-be specified by clicking the settings for the linker.</p>
-<img src="images/project_create_2.jpg">
-<p>Once you have created your project, you should switch to the PTP runtime perspective, and set up the default 
-preferences for Parallel Environment and specify the required resource manager. This setup needs to only be done once.</p>
-<p>You specify the default preferences by opening the preferences dialog, opening the <b>PTP</b> node, opening the
-<b>Resource Managers</b> node, and then clicking the <b>Parallel Environment</b> entry. The PE preferences panel is displayed. Here,
-you specify the default settings for a resource manager to be used for Parallel Environment.</p>
-<img src="images/pe_preferences.jpg">
-<p>The settings that can be specified here are:</p>
-<ul>
-<li>The pathname to the PE proxy executable. This proxy handles the interaction between the Eclipse PTP session and your 
-parallel applications.</li>
-<li>Multiplexing options</li>
-<li>Whether the proxy is started manually or is started automatically when Eclipse is started</li>
-<li>Whether LoadLeveler is used to manage access to system resources</li>
-<li>If LoadLeveler is used:</li>
-<ul>
-<li>Whether PTP forces LoadLeveler to operate in multi-cluster mode, single (local) cluster mode, or to use the mode 
-LoadLeveler was configured for</li>
-<li>The minimum interval that the proxy will poll LoadLeveler to query node status</li>
-<li>The maximum interval that the proxy will poll LoadLeveler to query node status</li>
-<li>The interval that the proxy will poll LoadLeveler for job status</li>
-<li>Alternate directory for the LoadLaveler interface library. This option is useful if LoadLeveler is not installed
-on the node where the proxy runs, and you have installed your own copy of the LoadLeveler interface library libllapi</li>
-<li>Whether a second proxy process is started when the PTP PE proxy shuts down. This second proxy is useful in cases where
-an application writes data to STDIO. If the PE PTP proxy shuts down without starting the second proxy, then the application
-may suspend since there is no process intercepting the STDIO output from the application. If this option is selected,
-a second, smaller, proxy is started. This second proxy intercepts the STDIO output from the application and writes it to
-files in /tmp. This prevents the application from blocking when the pipes connected to the application's STDIO
-file descriptors are full.</li>
-<li>Specify the level of tracing performed by the proxy. This option is useful when attempting to diagnose problems
-with the PTP PE plugin</li>
-</ul>
-<p>Once you have set up preferences, create the resource manager for Parallel Environment. To do this, right-click in the
-resource managers view and select <b>Add Resource Manager</b> from the menu. A resource manager wizard will be 
-displayed. Select <b>PE</b> from the list of resource manager types and click next.</p> 
-<p>The next panel displayed is the first wizard panel which configures the PE resource manager.</p>
-<img src="images/pe_proxy_config_1.jpg">
-<p>This panel is the standard PTP wizard resource manager configuration wizard panel which specifies the location and
-connection attributes for a proxy.</p>
-<p>Select the Remote service provider and proxy server location from the dropdown lists. You can
-also create a new proxy server location by clicking the <b>New</b> button in this pane. Specify the path to the proxy 
-server executable, or just accept the value filled in as default from the preferences panel. Uncheck the <b>Launch server 
-manually</b> and click next again to proceed to the next wizard panel</p> 
-<img src="images/pe_proxy_config_2.jpg">
-<p>This panel is used to specify the proxy options for this particular resource manager configuration. Most of the
-options on this panel are identical with the corresponding option in the PE plugin preferences panel.
-This panel has one additional option, which specifies whether the proxy execution is to be suspended immediately after 
-it starts. This option is intended to be used in debugging the proxy in cases where it is necessary to suspend proxy 
-execution before the first command sent to the proxy is processed, so that a debugger can be attached to the proxy process</p>
-<p>Once the fields on this panel have been filled in, click next to proceed to the next wizard panel</p>
-<p>On the final page of the resource configuration manager wizard, either accept the 
-default resource manager name, or uncheck the checkbox and enter a name and description for the resource manager. 
-Then click finish to create the resource manager entry.</p>
-<p>You may have as many resource managers defined as you require for your system configuration.</p>
-<p>Once you have defined a resource manager, you must start it before it can run a parallel application using that
-resource manager. To start a resource manager, right-click over the name of the resource manager in the resource manager 
-view then select <b>Start resource manager</b> from the popup menu. Once started, the icon for the selected resource 
-manager will turn green.</p> 
-<p>If necessary, you can stop a resource manager by right-clicking over its name in the resource manager and selecting 
-<b>Stop resource manager</b> from the popup menu. Normally, a resource manger will shutdown automatically when PTP is
-shutdown, and if it was running when PTP was shutdown, then it will automatically start when PTP is started again.</p>
-<p>You can edit resource manager configuration for a resource manager that is in the stopped state by double clicking
-the resource manager name or by right clicking the resource manager name and selecting <b>Edit Resource Manager</b> 
-from the drop down menu.</p>
-<h2><A name=running></A>Running a Parallel Application</h2>
-<p>Once an application has been compiled, the first step in running the application is to be sure the resource manager for 
-Parallel Environment is running on the node where you intend to start the application. To do this, check the resource 
-manager's entry in the resource manager view. The icon for the resource manager should be green. If it is not green, then 
-right click over the resource manager's name and select <b>Start resource manager</b> from the popup menu to start the
-resource manager.</p>
-<p>Before running an application, it must have a launch configuration defined for it. A launch configuration contains 
-all of the settings required to run the application. The values entered in a launch configuration are saved so that the
-next time the application is run using the same launch configuration, those values do not need to be entered again.</p>
-<p>To create a launch configuration, click the <b>Run</b> menu in the Eclipse menubar and select <b>Open Run Dialog</b>. 
-Alternatively, click the dropdown next to the run icon in the Eclipse toolbar and select Open Run Dialog. 
-When the run dialog is displayed, right click over <b>Parallel Application</b> and click <b>New</b> from the menu. 
-This will create a new launch configuration. Set its name to the desired value. Select the <b>Main</b> tab and fill in
-the name of the project and the application program. Make sure that the debugger tab has an appropriate debugger selected.
-Fill in the Arguments tab with any application program arguments. Fill in the Environment tab with any environment variable
-settings required by the application. If you are using Parallel Environment in basic mode, described below, then you should
-not set any Parallel Environment environment variables (starting with MP_) in the Environment tab and not specify any
-options specific to the <b>poe</b> command in the Arguments tab, since those settings may conflict with settings in the
-Parallel tab and cause application invocation to fail.</p>
-<p>The <b>Resources</b> tab is the tab where invocation options unique to Parallel Environment are specified. When it is initially displayed,
-it will appear as follows.</p>
-<img src="images/pe_run_config.jpg">
-<p>The first step is to select a resource manager from the dropdown list at the top of the resources tab. This list contains
-entries for each running resource manager. </p>
-<p>The next step is to select the run mode for the resource manager by checking or unchecking the <b>Advanced Mode</b>
-checkbox.</p>
-<p>When this checkbox is checked, the resource manager is running in advanced mode. In this mode, you need to have an existing
-setup script created. This is a text file, similar to a .rc or .profile script, where you specify Parallel Environment
-environment variable settings. Each setting is specified as a keyword-value pair such as</p>
-<samp>
-MP_PROCS=2<br>
-MP_HOSTFILE=/home/deepview/hostfile
-</samp>
-<p>This file should contain only Parallel Environment environment variable settings. Anything else is ignored. 
-Environment variable settings in this file are not validity checked. You may also specify Parallel Environment environment 
-variables in the Environment tab in this mode, as well as specifying parameters to the <b>poe</b> command in the Arguments
-tab in advanced mode. Any settings in these tabs will not be checked, and may result in conflicts with what is specified
-in the setup script.</p>
-<p>When using advanced mode, the <b>Environment Setup Script</b> will be enabled, and you must fill in the pathname to the 
-setup script.</p>
-<p>If the <b>Advanced Mode</b> checkbox is not checked, then the resource manager is running in basic mode. In this mode,
-the tabbed pane at the bottom of the Parallel tab will be enabled, and you can fill in the required values for running 
-your application.</p>
-<p>In basic mode, each Parallel Environment option has a field in the tabbed pane at the bottom of the parallel tab. 
-Each field has flyover help, where you can see that help by moving the mouse over the field in question. Each field is 
-validity checked where possible to reduce the probability of invoking an application with invalid parameters.</p>
-<p>If any value in the parallel tab is invalid, an error message will appear in the upper left corner of the launch
-configuration dialog and the apply and run buttons will be disabled. Once all fields have valid values, then you can
-click the <b>Apply</b>button to save the current settings for the launch configuration, or click the <b>Run</b> button to
-invoke the application.</p>
-<p>As a minimum, the launch configuration or the Parallel Environment setup script must specify the path name of a valid 
-hostfile (MP_HOSTFILE) and number of parallel tasks (MP_TASKS)<p>
-<h3><a name=debugging></a>Debugging a Parallel Application</h3>
-You can debug a parallel application using the built in PTP parallel debugger. You can do this using the same run configuration 
-that you use for running your application. You can debug the application by clicking the debug icon 
-in the Eclipse toolbar or by selecting <b>Debug Configurations</b> from the Eclipse run menu. Before you debug a parallel application 
-for the first time, you should make sure that you have properly configured the debugger by opening
-the run configuration and selecting the debug tab then making sure the debugger settings are correct.</p>  
-<h2><a name=redirection></a>Redirecting stdio</h2>
-<p>The default behavior is that data the application writes to stdout is sent to the PTP GUI. That data can be viewed by 
-double clicking the task icon for the task, normally task 0, in the jobs view row for the application. This will open
-a process view window showing the data. By default, the application stderr output is written to the console where Eclipse 
-was invoked.</p>
-<p>If the application writes a large amount of data to stdout or stderr, the default behavior of sending that data to the
-PTP GUI for handling can cause the GUI to become slow or unresponsive. Alternatively, stdout and stderr can be redirected to
-files on the node where the resource manager process is running. This is done by specifying the path name for stdout or
-stderr in the fields labelled <b>Stdout Path</b> or <b>Stderr Path</b> in the parallel tab of the launch configuration.</p>
-
-<h2><a name=monitoring></a>Monitoring Application Execution</h2>
-<p>Once you click run to invoke the application, the resource manager will monitor the application's execution. When Parallel
-Environment allocates tasks to nodes, the default machine view for the resource manager will be updated to show the nodes 
-that are currently in use. If you move the mouse over a node icon, in the machine view, you will see the hostname for that node. 
-If you double click a node icon in the machine view, the node attributes and process info windows in the machine view
-will be updated to report current status for that node. Once a job completes, the machines view will be updated to 
-show the current status. As applications complete, nodes may disappear from the machine view if no other parallel tasks
-invoked by you are using those nodes.</p>
-<p>Once a parallel application starts, the jobs view will be updated to show an entry for that job, along with icons for each
-task in the application. The job and task icons will change state once Parallel Environment setup is complete to show the
-job is running, and again when the application exits, to show that the job has completed. At any time that a job is shown in
-the jobs view, you can double click a task icon to show the stdout output for that task if stdout has not been
-redirected to a file.</p>
-<h2><A name=restrictions></A>Restrictions</h2>
-<ul>
-<li>Applications cannot read input from stdin at this time</li>
-<li>Debugging applications is not supported at this time</li>
-<li>All pathnames specified in the Parallel tab of the launch configuration must be absolute pathnames</li>
-<li>When using LoadLeveler, you can only viw stdout and stderr output for applications started by you using this plugin. 
-You cannot view output from other applications even though you can see their process icons in the PTP jobs view.</li> 
-</ul>
-</body>
-</html>
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_preferences.jpg b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_preferences.jpg
deleted file mode 100755
index fac5c2a..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_preferences.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config.jpg b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config.jpg
deleted file mode 100755
index fc4e291..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_1.jpg b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_1.jpg
deleted file mode 100755
index 06b2993..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_1.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_2.jpg b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_2.jpg
deleted file mode 100755
index 129dfe2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_proxy_config_2.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_run_config.jpg b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_run_config.jpg
deleted file mode 100755
index f38397e..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/pe_run_config.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_1.jpg b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_1.jpg
deleted file mode 100755
index 69e2d0b..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_1.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_2.jpg b/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_2.jpg
deleted file mode 100755
index f813296..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/html/images/project_create_2.jpg
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.properties
deleted file mode 100644
index 79e7490..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM Parallel Environment User Guide
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.xml b/rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.xml
deleted file mode 100755
index 5c3bd1b..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/plugin.xml
+++ /dev/null

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<!-- Copyright (c) 2007 IBM Corporation.                                     -->
-<!-- All rights reserved. This program and the accompanying materials        -->
-<!-- are made available under the terms of the Eclipse Public License v1.0   -->
-<!-- which accompanies this distribution, and is available at                -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                               -->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/src/org/eclipse/ptp/rm/ibm/pe/help/Activator.java b/rms/org.eclipse.ptp.rm.ibm.pe.help/src/org/eclipse/ptp/rm/ibm/pe/help/Activator.java
deleted file mode 100755
index bf4b457..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/src/org/eclipse/ptp/rm/ibm/pe/help/Activator.java
+++ /dev/null

@@ -1,61 +0,0 @@
-package org.eclipse.ptp.rm.ibm.pe.help;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.ibm.pe.help";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.help/toc.xml b/rms/org.eclipse.ptp.rm.ibm.pe.help/toc.xml
deleted file mode 100755
index 0b03b39..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.help/toc.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright (c) 2007 IBM Corporation.                                     -->
-<!-- All rights reserved. This program and the accompanying materials        -->
-<!-- are made available under the terms of the Eclipse Public License v1.0   -->
-<!-- which accompanies this distribution, and is available at                -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                               -->
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Running IBM Parallel Environment Applications">
-	<topic label="Introduction"  href="html/PEMainHelp.html#introduction"> 
-	</topic>
-	<topic label="Requirements" href="html/PEMainHelp.html#requirements"></topic>
-	<topic label="Installation" href="html/PEMainHelp.html#installation"></topic>
-	<topic label="Getting Started" href="html/PEMainHelp.html#starting"></topic>
-	<topic label="Running an application" href="html/PEMainHelp.html#running"></topic>
-	<topic label="Redirecting stdio" href="html/PEMainHelp.html#redirection"></topic>
-	<topic label="Monitoring application execution" href="html/PEMainHelp.html#monitoring"></topic>
-	<topic label="Restrictions" href="html/PEMainHelp.html#restrictions"></topic>
-</toc>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cdtproject b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cdtproject
deleted file mode 100755
index 340b59f..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cdtproject
+++ /dev/null

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<data>
-<item id="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</item>
-<item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</item>
-</data>
-</cdtproject>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cproject b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cproject
deleted file mode 100755
index ba0bd68..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cproject
+++ /dev/null

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="converted.config.2051549429">
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="false"/>
-</scannerInfoProvider>
-</profile>
-</storageModule>
-
-<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.2051549429" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-<pathentry kind="src" path=""/>
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-</storageModule>
-</cconfiguration>
-</storageModule>
-</cproject>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cvsignore b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cvsignore
deleted file mode 100644
index 20c6abf..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.cvsignore
+++ /dev/null

@@ -1,8 +0,0 @@
-autom4te.cache
-ptp_ibmpe_miniproxy
-stamp-h1
-.deps
-config.status
-ptp_ibmpe_proxy
-Makefile
-a.out.dSYM

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.project b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.project
deleted file mode 100755
index 3bec149..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.project
+++ /dev/null

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.pe.proxy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.makeBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.core.errorOutputParser</key>
-					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.environment</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.inc</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.location</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.command</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.clean</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.auto</key>
-					<value>all</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</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.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.make.core.makeNature</nature>
-		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.settings/org.eclipse.cdt.core.prefs b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100755
index a2212a7..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null

@@ -1,5 +0,0 @@
-#Thu Apr 17 09:11:20 EDT 2008
-eclipse.preferences.version=1
-indexer/indexerId=org.eclipse.cdt.core.fastIndexer
-indexerId=org.eclipse.cdt.core.fastIndexer
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/AUTHORS b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/AUTHORS
deleted file mode 100644
index 73f3225..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/AUTHORS
+++ /dev/null

@@ -1 +0,0 @@
-Dave Wootton <dwootton@us.ibm.com>
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/COPYING b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/COPYING
deleted file mode 100644
index 8b7e105..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/COPYING
+++ /dev/null

@@ -1,16 +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
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/ChangeLog b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/ChangeLog
+++ /dev/null


diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/INSTALL b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/INSTALL
+++ /dev/null

@@ -1 +0,0 @@
-See README for build/install instructions.

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index a7f4074..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.pe.proxy
-Bundle-Version: 2.1.1.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ptp.proxy,
- org.eclipse.ptp.utils

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.am b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.am
deleted file mode 100755
index 0e15414..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.am
+++ /dev/null

@@ -1,17 +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
-
-bin_PROGRAMS =			ptp_ibmpe_proxy ptp_ibmpe_miniproxy
-
-ptp_ibmpe_proxy_SOURCES =		src/ptp_ibmpe_proxy.c
-ptp_ibmpe_proxy_CFLAGS =		-g -I$(PROXY)/include -I$(UTILS)/include -I/opt/ibmll/LoadL/full/include/ -I/usr/lpp/LoadL/full/include/ -I$(PROXY)/include -I$(UTILS)/include $(AM_CFLAGS) 
-ptp_ibmpe_proxy_LDFLAGS = -g
-ptp_ibmpe_proxy_LDADD =		-ldl -lpthread 
-
-ptp_ibmpe_miniproxy_SOURCES =		src/ptp_ibmpe_miniproxy.c
-ptp_ibmpe_miniproxy_CFLAGS =		-g 
-ptp_ibmpe_miniproxy_LDFLAGS = -g
-ptp_ibmpe_miniproxy_LDADD =		-lpthread 

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.in b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.in
deleted file mode 100644
index c82d884..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/Makefile.in
+++ /dev/null

@@ -1,595 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# 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
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-bin_PROGRAMS = ptp_ibmpe_proxy$(EXEEXT) ptp_ibmpe_miniproxy$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_ptp_ibmpe_miniproxy_OBJECTS =  \
-	ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.$(OBJEXT)
-ptp_ibmpe_miniproxy_OBJECTS = $(am_ptp_ibmpe_miniproxy_OBJECTS)
-ptp_ibmpe_miniproxy_DEPENDENCIES =
-am_ptp_ibmpe_proxy_OBJECTS =  \
-	ptp_ibmpe_proxy-ptp_ibmpe_proxy.$(OBJEXT)
-ptp_ibmpe_proxy_OBJECTS = $(am_ptp_ibmpe_proxy_OBJECTS)
-ptp_ibmpe_proxy_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(ptp_ibmpe_miniproxy_SOURCES) $(ptp_ibmpe_proxy_SOURCES)
-DIST_SOURCES = $(ptp_ibmpe_miniproxy_SOURCES) \
-	$(ptp_ibmpe_proxy_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POE = @POE@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-ptp_ibmpe_proxy_SOURCES = src/ptp_ibmpe_proxy.c
-ptp_ibmpe_proxy_CFLAGS = -g -I$(PROXY)/include -I$(UTILS)/include -I/opt/ibmll/LoadL/full/include/ -I/usr/lpp/LoadL/full/include/ -I$(PROXY)/include -I$(UTILS)/include $(AM_CFLAGS) 
-ptp_ibmpe_proxy_LDFLAGS = -g
-ptp_ibmpe_proxy_LDADD = -ldl -lpthread 
-ptp_ibmpe_miniproxy_SOURCES = src/ptp_ibmpe_miniproxy.c
-ptp_ibmpe_miniproxy_CFLAGS = -g 
-ptp_ibmpe_miniproxy_LDFLAGS = -g
-ptp_ibmpe_miniproxy_LDADD = -lpthread 
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-ptp_ibmpe_miniproxy$(EXEEXT): $(ptp_ibmpe_miniproxy_OBJECTS) $(ptp_ibmpe_miniproxy_DEPENDENCIES) 
-	@rm -f ptp_ibmpe_miniproxy$(EXEEXT)
-	$(LINK) $(ptp_ibmpe_miniproxy_LDFLAGS) $(ptp_ibmpe_miniproxy_OBJECTS) $(ptp_ibmpe_miniproxy_LDADD) $(LIBS)
-ptp_ibmpe_proxy$(EXEEXT): $(ptp_ibmpe_proxy_OBJECTS) $(ptp_ibmpe_proxy_DEPENDENCIES) 
-	@rm -f ptp_ibmpe_proxy$(EXEEXT)
-	$(LINK) $(ptp_ibmpe_proxy_LDFLAGS) $(ptp_ibmpe_proxy_OBJECTS) $(ptp_ibmpe_proxy_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.o: src/ptp_ibmpe_miniproxy.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_miniproxy_CFLAGS) $(CFLAGS) -MT ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.o -MD -MP -MF "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Tpo" -c -o ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.o `test -f 'src/ptp_ibmpe_miniproxy.c' || echo '$(srcdir)/'`src/ptp_ibmpe_miniproxy.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Tpo" "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Po"; else rm -f "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_ibmpe_miniproxy.c' object='ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_miniproxy_CFLAGS) $(CFLAGS) -c -o ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.o `test -f 'src/ptp_ibmpe_miniproxy.c' || echo '$(srcdir)/'`src/ptp_ibmpe_miniproxy.c
-
-ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.obj: src/ptp_ibmpe_miniproxy.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_miniproxy_CFLAGS) $(CFLAGS) -MT ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.obj -MD -MP -MF "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Tpo" -c -o ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.obj `if test -f 'src/ptp_ibmpe_miniproxy.c'; then $(CYGPATH_W) 'src/ptp_ibmpe_miniproxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_ibmpe_miniproxy.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Tpo" "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Po"; else rm -f "$(DEPDIR)/ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_ibmpe_miniproxy.c' object='ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_miniproxy_CFLAGS) $(CFLAGS) -c -o ptp_ibmpe_miniproxy-ptp_ibmpe_miniproxy.obj `if test -f 'src/ptp_ibmpe_miniproxy.c'; then $(CYGPATH_W) 'src/ptp_ibmpe_miniproxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_ibmpe_miniproxy.c'; fi`
-
-ptp_ibmpe_proxy-ptp_ibmpe_proxy.o: src/ptp_ibmpe_proxy.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_proxy_CFLAGS) $(CFLAGS) -MT ptp_ibmpe_proxy-ptp_ibmpe_proxy.o -MD -MP -MF "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Tpo" -c -o ptp_ibmpe_proxy-ptp_ibmpe_proxy.o `test -f 'src/ptp_ibmpe_proxy.c' || echo '$(srcdir)/'`src/ptp_ibmpe_proxy.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Tpo" "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Po"; else rm -f "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_ibmpe_proxy.c' object='ptp_ibmpe_proxy-ptp_ibmpe_proxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_proxy_CFLAGS) $(CFLAGS) -c -o ptp_ibmpe_proxy-ptp_ibmpe_proxy.o `test -f 'src/ptp_ibmpe_proxy.c' || echo '$(srcdir)/'`src/ptp_ibmpe_proxy.c
-
-ptp_ibmpe_proxy-ptp_ibmpe_proxy.obj: src/ptp_ibmpe_proxy.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_proxy_CFLAGS) $(CFLAGS) -MT ptp_ibmpe_proxy-ptp_ibmpe_proxy.obj -MD -MP -MF "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Tpo" -c -o ptp_ibmpe_proxy-ptp_ibmpe_proxy.obj `if test -f 'src/ptp_ibmpe_proxy.c'; then $(CYGPATH_W) 'src/ptp_ibmpe_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_ibmpe_proxy.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Tpo" "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Po"; else rm -f "$(DEPDIR)/ptp_ibmpe_proxy-ptp_ibmpe_proxy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_ibmpe_proxy.c' object='ptp_ibmpe_proxy-ptp_ibmpe_proxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_ibmpe_proxy_CFLAGS) $(CFLAGS) -c -o ptp_ibmpe_proxy-ptp_ibmpe_proxy.obj `if test -f 'src/ptp_ibmpe_proxy.c'; then $(CYGPATH_W) 'src/ptp_ibmpe_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_ibmpe_proxy.c'; fi`
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/NEWS b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/NEWS
+++ /dev/null


diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/README b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/README
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/README
+++ /dev/null


diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/about.html b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/aclocal.m4 b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/aclocal.m4
deleted file mode 100644
index fd273ba..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/aclocal.m4
+++ /dev/null

@@ -1,878 +0,0 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/build.properties b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/build.properties
deleted file mode 100644
index 09c4738..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/build.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-bin.includes = AUTHORS,\
-               COPYING,\
-               ChangeLog,\
-               INSTALL,\
-               Makefile.am,\
-               Makefile.in,\
-               NEWS,\
-               README,\
-               about.html,\
-               aclocal.m4,\
-               compile,\
-               config.guess,\
-               config.h.in,\
-               config.status,\
-               config.sub,\
-               configure,\
-               configure.in,\
-               depcomp,\
-               install-sh,\
-               missing,\
-               src/,\
-               META-INF/,\
-               plugin.properties
- 
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/compile b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/compile
deleted file mode 100755
index a81e000..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/compile
+++ /dev/null

@@ -1,136 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2003-11-09.00
-
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-  case "$1" in
-    -o)
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
-      # So we do something ugly here.
-      ofile=$2
-      shift
-      case "$ofile" in
-	*.o | *.obj)
-	  ;;
-	*)
-	  args="$args -o $ofile"
-	  ofile=
-	  ;;
-      esac
-       ;;
-    *.c)
-      cfile=$1
-      args="$args $1"
-      ;;
-    *)
-      args="$args $1"
-      ;;
-  esac
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.guess b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.guess
deleted file mode 100755
index f4f7772..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.guess
+++ /dev/null

@@ -1,1321 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-04'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
-		fi ;;
-	esac
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-	CPU=mipsel 
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif 
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
-		UNAME_MACHINE=pc
-		echo i386-${UNAME_MACHINE}-nto-qnx
-	else
-		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-	fi
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h
deleted file mode 100644
index d1e64bf..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h
+++ /dev/null

@@ -1,71 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `proxysvr' library (-lproxysvr). */
-#define HAVE_LIBPROXYSVR 1
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#define HAVE_LIBUTILS 1
-
-/* Define to 1 if you have the <llapi.h> header file. */
-/* #undef HAVE_LLAPI_H */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Name of package */
-#define PACKAGE "org-eclipse-ptp-ibmpe"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "org.eclipse.ptp.ibmpe"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "org.eclipse.ptp.ibmpe 2.0.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "org-eclipse-ptp-ibmpe"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0"
-
-/* Location of poe program */
-#define POE "/usr/bin/poe"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "2.0.0"

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h.in b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h.in
deleted file mode 100644
index 6741cb4..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.h.in
+++ /dev/null

@@ -1,70 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `proxysvr' library (-lproxysvr). */
-#undef HAVE_LIBPROXYSVR
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#undef HAVE_LIBUTILS
-
-/* Define to 1 if you have the <llapi.h> header file. */
-#undef HAVE_LLAPI_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Location of poe program */
-#undef POE
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.sub b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.sub
deleted file mode 100755
index f365797..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/config.sub
+++ /dev/null

@@ -1,1443 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-03-07'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 | mipsisa64 \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-	        ;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-        sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure
deleted file mode 100755
index 5d8924b..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure
+++ /dev/null

@@ -1,6070 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for org.eclipse.ptp.ibmpe 2.1.1.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='org.eclipse.ptp.ibmpe'
-PACKAGE_TARNAME='org-eclipse-ptp-ibmpe'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='org.eclipse.ptp.ibmpe 2.1.1'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="src/ptp_ibmpe_proxy.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-CPP
-GREP
-EGREP
-POE
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures org.eclipse.ptp.ibmpe 2.1.1 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/org-eclipse-ptp-ibmpe]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of org.eclipse.ptp.ibmpe 2.1.1:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-ll-header=DIR    local LoadLeveler header directory [none]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-org.eclipse.ptp.ibmpe configure 2.1.1
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by org.eclipse.ptp.ibmpe $as_me 2.1.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-am__api_version="1.9"
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='org-eclipse-ptp-ibmpe'
- VERSION='2.1.1'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		{ { echo "$as_me:$LINENO: error: utils directory not found" >&5
-echo "$as_me: error: utils directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		{ { echo "$as_me:$LINENO: error: proxy directory not found" >&5
-echo "$as_me: error: proxy directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-
-# Check whether --with-ll-header was given.
-if test "${with_ll_header+set}" = set; then
-  withval=$with_ll_header; llinclude=-I$withval
-else
-  llinclude=""
-fi
-
-lldir="$llinclude -I/opt/ibmll/LoadL/full/include -I/usr/lpp/LoadL/full/include"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-	CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-	CFLAGS="$CFLAGS -Wall"
-fi
-
-CFLAGS="$CFLAGS -I$UTILS/include -I$PROXY/include $lldir"
-LIBS="$LIBS -L$UTILS -L$PROXY"
-
-
-
-{ echo "$as_me:$LINENO: checking for bitset_new in -lutils" >&5
-echo $ECHO_N "checking for bitset_new in -lutils... $ECHO_C" >&6; }
-if test "${ac_cv_lib_utils_bitset_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutils  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bitset_new ();
-int
-main ()
-{
-return bitset_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_utils_bitset_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_utils_bitset_new=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_utils_bitset_new" >&5
-echo "${ECHO_T}$ac_cv_lib_utils_bitset_new" >&6; }
-if test $ac_cv_lib_utils_bitset_new = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTILS 1
-_ACEOF
-
-  LIBS="-lutils $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for proxy_svr_init in -lproxysvr" >&5
-echo $ECHO_N "checking for proxy_svr_init in -lproxysvr... $ECHO_C" >&6; }
-if test "${ac_cv_lib_proxysvr_proxy_svr_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lproxysvr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char proxy_svr_init ();
-int
-main ()
-{
-return proxy_svr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_proxysvr_proxy_svr_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_proxysvr_proxy_svr_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_proxysvr_proxy_svr_init" >&5
-echo "${ECHO_T}$ac_cv_lib_proxysvr_proxy_svr_init" >&6; }
-if test $ac_cv_lib_proxysvr_proxy_svr_init = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPROXYSVR 1
-_ACEOF
-
-  LIBS="-lproxysvr $LIBS"
-
-fi
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in llapi.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- CFLAGS="$CFLAGS -DHAVE_LLAPI_H"
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-# Extract the first word of "poe", so it can be a program name with args.
-set dummy poe; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_POE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $POE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_POE="$POE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_POE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_POE" && ac_cv_path_POE="no"
-  ;;
-esac
-fi
-POE=$ac_cv_path_POE
-if test -n "$POE"; then
-  { echo "$as_me:$LINENO: result: $POE" >&5
-echo "${ECHO_T}$POE" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-if test "$ac_cv_path_POE" != no; then
-
-cat >>confdefs.h <<_ACEOF
-#define POE "$ac_cv_path_POE"
-_ACEOF
-
-else
-	{ echo "$as_me:$LINENO: PE not installed, skipping..." >&5
-echo "$as_me: PE not installed, skipping..." >&6;}
-	{ (exit 1); exit 1; }
-fi
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by org.eclipse.ptp.ibmpe $as_me 2.1.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-org.eclipse.ptp.ibmpe config.status 2.1.1
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-POE!$POE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure.in b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure.in
deleted file mode 100755
index 87bc591..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/configure.in
+++ /dev/null

@@ -1,89 +0,0 @@
-dnl Copyright (c) 2006, 2008 IBM Corporation, and others.
-dnl All rights reserved. This program and the accompanying materials
-dnl are made available under the terms of the Eclipse Public License v1.0
-dnl which accompanies this distribution, and is available at
-dnl http://www.eclipse.org/legal/epl-v10.html
-dnl
-dnl
-
-AC_PREREQ(2.50)
-
-AC_INIT(org.eclipse.ptp.ibmpe, 2.1.1)
-AC_CONFIG_SRCDIR(src/ptp_ibmpe_proxy.c)
-AC_CONFIG_HEADERS(config.h)
-
-AM_INIT_AUTOMAKE
-
-AC_CANONICAL_BUILD
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		AC_MSG_ERROR([utils directory not found])
-	fi
-fi
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		AC_MSG_ERROR([proxy directory not found])
-	fi
-fi
-
-AC_ARG_WITH(ll-header, AC_HELP_STRING([--with-ll-header=DIR], 
-			[local LoadLeveler header directory @<:@none@:>@]),
-			[llinclude=-I$withval], [llinclude=""])
-lldir="$llinclude -I/opt/ibmll/LoadL/full/include -I/usr/lpp/LoadL/full/include"
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-os=`uname -s`
-if test "x$os" = "xAIX" ; then
-	CFLAGS="$CFLAGS -qinfo=gen -qcpluscmt"
-else
-	CFLAGS="$CFLAGS -Wall"
-fi
-
-CFLAGS="$CFLAGS -I$UTILS/include -I$PROXY/include $lldir"
-LIBS="$LIBS -L$UTILS -L$PROXY"
-
-dnl
-dnl Check for libraries.
-dnl
-AC_CHECK_LIB(utils, bitset_new)
-AC_CHECK_LIB(proxysvr, proxy_svr_init)
-
-dnl
-dnl Check for header files.
-dnl
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS([llapi.h], [CFLAGS="$CFLAGS -DHAVE_LLAPI_H"])
-
-dnl
-dnl Check for types
-dnl
-AC_TYPE_SIGNAL
-dnl
-dnl Check for "poe" program
-dnl
-AC_PATH_PROG(POE, [poe], no)
-if test "$ac_cv_path_POE" != no; then
-	AC_DEFINE_UNQUOTED(POE, "$ac_cv_path_POE", [Location of poe program])
-else
-	AC_MSG_NOTICE([PE not installed, skipping...])
-	AS_EXIT
-fi
-
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/depcomp b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/depcomp
deleted file mode 100755
index 11e2d3b..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/depcomp
+++ /dev/null

@@ -1,522 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2004-05-31.23
-
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit 0
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
-      # latter, because the former will be cleaned when $dir.libs is
-      # erased.
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir$base.o.d"
-      tmpdepfile3="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      tmpdepfile3="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   elif test -f "$tmpdepfile2"; then
-      tmpdepfile="$tmpdepfile2"
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/install-sh b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/install-sh
deleted file mode 100755
index ebc6691..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/install-sh
+++ /dev/null

@@ -1,250 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/missing b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/missing
deleted file mode 100755
index e7ef83a..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/missing
+++ /dev/null

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2003-09-02.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/plugin.properties
deleted file mode 100644
index 23566d7..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM Parallel Environment Proxy Agent
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_miniproxy.c b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_miniproxy.c
deleted file mode 100755
index 5ea9b91..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_miniproxy.c
+++ /dev/null

@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <stdio.h>
-#include <errno.h>
-
-int main(int argc, char *argv[]);
-static void *stdout_writer(void *fd);
-static void *stderr_writer(void *fd);
-static void common_writer(int fd, char *file_suffix);
-
-static char *stdout_prefix;
-static char *stderr_prefix;
-static FILE *trace_fd;
-static int thread_count;
-static pthread_t tid;
-static pthread_mutex_t count_lock = PTHREAD_MUTEX_INITIALIZER;
-
-int
-main(int argc, char *argv[])
-{
-    /*
-     * Parse command line parameter and redirect stdin, stdout and stderr
-     * to the specified target file.
-     * In principle, this code could be part of the main proxy module, in
-     * which case, the main proxy would just fork a copy of itself and run
-     * this code in the new child. It turns out this does not work, since 
-     * at the point that the proxy is shut down, there may still be data 
-     * queued to be sent to the front end. Attempts to write this data 
-     * result in I/O errors once the front end has closed the proxy
-     * connection, and there is not a safe way to shut down the queued I/O.
-     * A separate process is likely safer anyway, since if the proxy has
-     * other problems, they could also interfere with the I/O handling.
-     * Since this miniproxy cannot assume a communication path to the front
-     * end, the miniproxy will silently fail on errors, unless tracing is
-     * enabled. 
-     * The command line consists of a single parameter which this function
-     * must parse. The parameter contains blank delimited tokens as follows
-     * trace flag (y or n). Tracing is active when flag is 'y'
-     * Pathname prefix for stdout files, or /dev/null 
-     * Pathname prefix for stderr files, or /dev/null
-     * Number of stdin file descriptors (fds) following, may be 0
-     * Set of stdin fds
-     * Number of stdout file descriptors following, may be 0
-     * Set of stdout fds
-     * Number of stderr file descriptors following, may be 0
-     * Set of stderr fds
-     */
-    char *token;
-    int num_fds;
-    int current_fd;
-    int i;
-
-    if (argc != 2) {
-	exit(1);
-    }
-    token = strtok(argv[1], " ");
-    if (token == NULL) {
-	exit(1);
-    }
-    if (*token == 'y') {
-	trace_fd = fopen("/tmp/ptp_ibmpe_miniproxy.log", "w");
-    }
-    stdout_prefix = strtok(NULL, " ");
-    if (stdout_prefix == NULL) {
-	exit(1);
-    }
-    stderr_prefix = strtok(NULL, " ");
-    if (stderr_prefix == NULL) {
-	exit(1);
-    }
-    token = strtok(NULL, " ");
-    if (token == NULL) {
-	exit(1);
-    }
-    num_fds = atoi(token);
-    /*
-     * For stdin, just redirect stdin to /dev/null. The application will
-     * get an unexpected eof, which it will hopefully handle more
-     * gracefully than the SIGPIPE it would get without attempting
-     * redirection. There is really no other alternative here.
-     */
-    for (i = 0; i < num_fds; i++) {
-	int stdin_fd;
-
-	token = strtok(NULL, " ");
-	if (token == NULL) {
-	    exit(1);
-	}
-	current_fd = atoi(token);
-	stdin_fd - open("/dev/null", O_RDONLY);
-	if (stdin_fd != -1) {
-	    if (trace_fd != NULL) {
-		fprintf(trace_fd, "Redirect stdin pipe fd %d to /dev/null\n",
-			current_fd);
-		fflush(trace_fd);
-	    }
-	    dup2(current_fd, stdin_fd);
-	}
-    }
-    token = strtok(NULL, " ");
-    if (token == NULL) {
-	exit(1);
-    }
-    /*
-     * Start a thread for each stdout file descriptor, where output will be
-     * redirected to /dev/null or to a user specified target file
-     */
-    num_fds = atoi(token);
-    for (i = 0; i < num_fds; i++) {
-	token = strtok(NULL, " ");
-	if (token == NULL) {
-	    exit(1);
-	}
-	current_fd = atoi(token);
-	if (trace_fd != NULL) {
-	    fprintf(trace_fd, "Starting stdout writer thread for fd %d\n",
-		    current_fd);
-	    fflush(trace_fd);
-	}
-	pthread_mutex_lock(&count_lock);
-	thread_count = thread_count + 1;
-	pthread_mutex_unlock(&count_lock);
-	pthread_create(&tid, NULL, stdout_writer, (void *) current_fd);
-    }
-    token = strtok(NULL, " ");
-    if (token == NULL) {
-	exit(1);
-    }
-    /*
-     * Start a thread for each stdout file descriptor, where output will be
-     * redirected to /dev/null or to a user specified target file
-     */
-    num_fds = atoi(token);
-    for (i = 0; i < num_fds; i++) {
-	token = strtok(NULL, " ");
-	if (token == NULL) {
-	    exit(1);
-	}
-	current_fd = atoi(token);
-	if (trace_fd != NULL) {
-	    fprintf(trace_fd, "Starting stderr writer thread for fd %d\n",
-		    current_fd);
-	    fflush(trace_fd);
-	}
-	pthread_mutex_lock(&count_lock);
-	thread_count = thread_count + 1;
-	pthread_mutex_unlock(&count_lock);
-	pthread_create(&tid, NULL, stderr_writer, (void *) current_fd);
-    }
-    /*
-     * Wait until there are no more I/O threads
-     */
-    while (thread_count > 0) {
-	sleep(60);
-    }
-    exit(0);
-}
-
-void *
-stdout_writer(void *fd)
-{
-    common_writer((int) fd, "stdout");
-    return NULL;
-}
-
-void *
-stderr_writer(void *fd)
-{
-    common_writer((int) fd, "stderr");
-    return NULL;
-}
-
-void
-common_writer(int fd, char *file_suffix)
-{
-    /*
-     * Handle redirection of output to /dev/null or to user-specified
-     * file. This function first changes the file descriptor from 
-     * non-blocking I/O to blocking I/O then loops, copying data from
-     * input to output until eof is reached.
-     */
-    int flags;
-    int status;
-    int out_fd;
-    char buf[256];
-    char path[PATH_MAX];
-
-    flags = fcntl((int) fd, F_GETFL);
-    flags = flags & (0xffffffff ^ O_NONBLOCK);
-    status = fcntl((int) fd, F_SETFL, flags);
-    if (status != -1) {
-	if (strcmp(stdout_prefix, "/dev/null") == 0) {
-	    out_fd = open(stdout_prefix, O_RDWR | O_CREAT | O_TRUNC, 0644);
-	}
-	else {
-	    snprintf(path, sizeof path, "%s_fd%d.%s", stdout_prefix, (int) fd,
-		     file_suffix);
-	    path[sizeof path - 1] = '\0';
-	    out_fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666);
-	}
-	if (out_fd != -1) {
-	    status = read((int) fd, buf, sizeof buf);
-	    while (status > 0) {
-		status = write(out_fd, buf, status);
-		if (status == -1) {
-		    break;
-		}
-		status = read((int) fd, buf, sizeof buf);
-	    }
-	    if ((status == -1) && (trace_fd != NULL)) {
-		fprintf(trace_fd, "I/O error in writer thread for fd %d: %s\n",
-			(int) fd, strerror(errno));
-		fflush(trace_fd);
-	    }
-	    close(out_fd);
-	}
-    }
-    if (trace_fd != NULL) {
-	fprintf(trace_fd, "Writer thread for fd %d complete\n", (int) fd);
-	fflush(trace_fd);
-    }
-    pthread_mutex_lock(&count_lock);
-    thread_count = thread_count - 1;
-    pthread_mutex_unlock(&count_lock);
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c b/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c
deleted file mode 100755
index ada5558..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.proxy/src/ptp_ibmpe_proxy.c
+++ /dev/null

@@ -1,6016 +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
- * 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
- *
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0s
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- ******************************************************************************/
-
-/*
- * Questions/problems
- * 22) Should probably serialize around process and node object generation to
- *	   simplify generation of node and process state change messages affecting
- *	   multiple nodes or processes with consecutive object id ranges
- * 23) For PE/LL case, machine_id and queue_id need to be set to the machine id and
- * 	   queue id for the cluster that contains the node where this proxy is running.
- * 	   (LoadLeveler restricts interactive PE applications to running only on the
- *         cluster where the poe process runs, which in our case is the node where the
- *         proxy runs)
- */
-
-#include <pthread.h>
-#include "config.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
-#include <dirent.h>
-#include <proxy_cmd.h>
-#include <proxy.h>
-#include <proxy_tcp.h>
-#include <proxy_event.h>
-#include <proxy_cmd.h>
-#include <proxy_msg.h>
-#include <proxy_attr.h>
-#include <handler.h>
-#include <signal.h>
-#include <list.h>
-#include <hash.h>
-#include <limits.h>
-#include <dlfcn.h>
-#ifdef __linux__
-#include <getopt.h>
-#endif
-#ifdef _AIX
-#include <procinfo.h>
-#endif
-#ifdef HAVE_LLAPI_H
-#include <llapi.h>
-#endif
-
-#define PE_DUAL_POE_DEBUG				/* Include code for PE proxy support for the dual poe debugger.*/
-
-#define DEFAULT_PROXY "tcp"
-#define DEFAULT_QUEUE_NAME "default"
-#define SKIPPING_SPACES			1
-#define PARSING_UNQUOTED_ARG	2
-#define PARSING_QUOTED_ARG		3
-#define SKIPPING_CHARS			4
-#define READ_BUFFER_SIZE 1024
-#define STDIO_WRITE_BUFSIZE 1024
-#ifndef POE
-#define POE "/usr/bin/poe"
-#endif /* POE */
-#define PMD_HELPER				"/usr/bin/pmdhelper"		/* default dual poe debugger helper */
-#define INFO_MESSAGE 0
-#define TRACE_MESSAGE 1
-#define TRACE_DETAIL_MESSAGE 2
-#define WARNING_MESSAGE 3
-#define ERROR_MESSAGE 4
-#define FATAL_MESSAGE 5
-#define ARGS_MESSAGE 6
-#define ATTR_FOR_LINUX 0x0000001
-#define ATTR_FOR_AIX 0x00000002
-#define ATTR_FOR_PE_STANDALONE 0x00000100
-#define ATTR_FOR_PE_WITH_LL 0x00000200
-#define ATTR_FOR_ALL_OS 0x000000ff
-#define ATTR_FOR_ALL_PROXY 0x0000ff00
-#define ATTR_ALWAYS_ALLOWED 0xffffffff
-#define TRACE_ENTRY print_message(TRACE_MESSAGE, ">>> %s entered. (Line %d)\n", __FUNCTION__, __LINE__);
-#define TRACE_EXIT print_message(TRACE_MESSAGE, "<<< %s exited. (Line %d)\n", __FUNCTION__, __LINE__);
-#define TRACE_DETAIL(format) print_message(TRACE_DETAIL_MESSAGE, format)
-#define TRACE_DETAIL_V(format, ...) print_message(TRACE_DETAIL_MESSAGE, format, __VA_ARGS__)
-
-typedef struct jobinfo *jobinfoptr;	/* Forward reference to jobinfo         */
-
-typedef struct {
-    char *read_buf;		/* Read buffer for stdout/stderr        */
-    char *write_buf;		/* Write buffer for stdout/stderr       */
-    char *cp;			/* Current character in write buffer    */
-    int allocated;		/* Allocated size of write buffer       */
-    int remaining;		/* Bytes left in write buffer           */
-    void (*write_func) (jobinfoptr job, char *buf);	/* Function writing data */
-} ioinfo;
-
-typedef struct {
-    int proxy_taskid;		/* Process id assigned by proxy         */
-    pid_t parent_pid;		/* PID for parent (poe) process         */
-    pid_t task_pid;		/* PID for this process                 */
-    char *ipaddr;		/* IP address of node where task is     */
-    char *hostname;		/* Hostname of node where task is       */
-} taskinfo;
-
-typedef struct jobinfo {
-    int proxy_jobid;		/* Job id assigned by proxy             */
-    char *submit_jobid;		/* Jobid used when submitted by GUI     */
-    pid_t poe_pid;		/* Process id for main poe process      */
-    pid_t task0_pid;		/* Process id for app. task 0           */
-#ifdef PE_DUAL_POE_DEBUG
-    jobinfoptr debugger_job;    /* reference to debugger job */
-    jobinfoptr debuggee_job;    /* reference to debuggee job */
-#endif
-    int debugging;		/* Job is being debugged 		*/
-    char *sdm_debugdir;         /* Directory path for SDM debugger      */
-    char *sdm_debugname;        /* Pathname to the top level debugger   */
-    char **sdm_debugargs;       /* Array of debugger args               */
-    char **sdm_envp;            /* Environment variables for SDM        */
-    int sdm_debug_arg_count;    /* Number of debugger args              */
-    int stdin_fd;		/* STDIN pipe/file descriptor           */
-    int stdout_fd;		/* STDOUT pipe/file descriptor          */
-    int stderr_fd;		/* STDERR pipe/file descriptor          */
-    ioinfo stdout_info;		/* Stdout file buffer info              */
-    ioinfo stderr_info;		/* Stderr file buffer info              */
-    int numtasks;		/* Number of tasks in application       */
-    taskinfo *tasks;		/* Tasks in this application            */
-    pthread_t startup_thread;	/* Startup monitor thread for app       */
-    time_t submit_time;		/* Time job was submitted               */
-    int label_io:1;		/* User set MP_LABELIO                  */
-    int split_io:1;		/* STDOUT is split by task              */
-    int stdin_redirect:1;	/* Stdin redirected to file             */
-    int stdout_redirect:1;	/* Stdout redirected to file            */
-    int stderr_redirect:1;	/* Stderr redirected to file            */
-    int discovered_job:1;	/* Job already running at PTP startup   */
-} jobinfo;
-
-typedef struct NODE_REFCOUNT {
-    struct NODE_REFCOUNT *next;	/* -> Next node in hash chain           */
-    char *key;			/* Hash key for this structure          */
-    int proxy_nodeid;		/* Proxy assigned node id for node      */
-    int node_number;		/* This node's node number              */
-    int task_count;		/* Number of tasks running on node      */
-} node_refcount;
-
-typedef struct {
-    char *id;			/* Attribute identifier                 */
-    int type;			/* Cases where attribute is allowed */
-    char *short_name;		/* Description used as label in GUI     */
-    char *long_name;		/* Text used for tooltip text in GUI    */
-    char *default_value;	/* Attribute's default value            */
-} string_launch_attr;
-
-typedef struct {
-    char *id;			/* Attribute identifier                 */
-    int type;			/* Cases where attribute is allowed */
-    char *short_name;		/* Description used as label in GUI */
-    char *long_name;		/* Text used for tooltip text in GUI */
-    char *default_value;	/* Attribute's default value            */
-    char *enums;		/* Enumeration values ',' delimited     */
-} enum_launch_attr;
-
-typedef struct {
-    char *id;			/* Attribute identifier                 */
-    int type;			/* Cases where attribute is allowed */
-    char *short_name;		/* Description used as label in GUI */
-    char *long_name;		/* Text used for tooltip text in GUI */
-    int default_value;		/* Attribute's default value            */
-    int llimit;			/* Attribute's lower limit              */
-    int ulimit;			/* Attribute's upper limit              */
-} int_launch_attr;
-
-typedef struct {
-    char *id;			/* Attribute identifier                 */
-    int type;			/* Cases where attribute is allowed */
-    char *short_name;		/* Description used as label in GUI */
-    char *long_name;		/* Text used for tooltip text in GUI */
-    long long default_value;	/* Attribute's default value            */
-    long long llimit;		/* Attribute's lower limit              */
-    long long ulimit;		/* Attribute's upper limit              */
-} long_int_launch_attr;
-
-static RETSIGTYPE ptp_signal_handler(int sig);
-static int server(char *name, char *host, int port);
-static int PE_start_daemon(int trans_id, int nargs, char *args[]);
-static int PE_define_model(int trans_id, int nargs, char *args[]);
-static int PE_submit_job(int trans_id, int nargs, char *args[]);
-static int PE_terminate_job(int trans_id, int nargs, char *args[]);
-static int PE_quit(int trans_id, int nargs, char *args[]);
-static int PE_start_events(int trans_id, int nargs, char *args[]);
-static int PE_halt_events(int trans_id, int nargs, char *args[]);
-static int shutdown_proxy(void);
-static void job_enqueue(jobinfo *, pid_t);
-static void post_error(int trans_id, int type, char *msg);
-static void post_submitjob_error(int trans_id, char *subid, char *msg);
-static char **create_exec_parmlist(char *execname, char *targetname, char *args, char *helper);
-static char **create_child_sdm_parmlist(char *debugger_path, char *debugger_name, int debug_args_count, char **debug_args);
-static char **create_debug_parmlist(char *debugger_name, int debug_args_count, char **debug_args);
-static char **create_env_array(char *args[], int split_io, char *mp_buffer_mem,
-			       char *mp_rdma_count, char *debugger_id, int is_debugger);
-static void add_environment_variable(char *env_var);
-static int setup_stdio_fd(int run_trans_id, char *subid, int pipe_fds[], char *path, char *stdio_name,
-			  int *fd, int *redirect);
-static int setup_child_stdio(int run_trans_id, char *subid, int stdio_fd, int redirect,
-			     int *file_fd, int pipe_fd[]);
-static int stdout_handler(int fd, void *job);
-static int stderr_handler(int fd, void *job);
-static void check_bufsize(ioinfo * file_info);
-static void send_stdout(jobinfo * job, char *buf);
-static void send_stderr(jobinfo * job, char *buf);
-static int write_output(int fd, jobinfo * job, ioinfo * file_info);
-static void *zombie_reaper(void *args);
-static void update_node_refcounts(int numtasks, taskinfo * tasks);
-static void delete_noderef(char *hostname);
-static void *startup_monitor(void *pid);
-static void delete_task_list(int numtasks, taskinfo * tasks);
-static void *kill_process(void *pid);
-static void update_nodes(int trans_id, FILE * hostlist);
-static void malloc_check(void *p, const char *function, int line);
-static node_refcount *add_node(char *key);
-static node_refcount *find_node(char *key);
-static void hash_cleanup(void *hash_list);
-static void send_ok_event(int trans_id);
-static void discover_jobs(void);
-static void add_discovered_job(char *pid);
-static void redirect_io(void);
-static proxy_msg *proxy_attr_def_enum_event(int trans_id, char *id, char *name,
-					    char *desc, int display, char *def, int count);
-static proxy_msg *proxy_attr_def_int_limits_event(int trans_id, char *id,
-						  char *name, char *desc, int display, int def,
-						  int llimit, int ulimit);
-static proxy_msg *proxy_attr_def_long_int_limits_event(int trans_id, char *id, char *name,
-						       char *desc, int display, long long def,
-						       long long llimit, long long ulimit);
-static void send_string_attrs(int trans_id, int flags);
-static void send_int_attrs(int trans_id, int flags);
-static void send_long_int_attrs(int trans_id, int flags);
-static void send_enum_attrs(int trans_id, int flags);
-static void send_local_default_attrs(int trans_id);
-static void send_new_node_list(int trans_id, int machine_id, List * new_nodes);
-static void send_job_state_change_event(int trans_id, int jobid, char *state);
-static void send_process_state_change_event(int trans_id, jobinfo * job, char *state);
-static void send_process_state_output_event(int trans_id, int procid, char *output);
-static int generate_id(void);
-static void enqueue_event(proxy_msg * event);
-static void print_message(int type, const char *format, ...);
-static void print_message_args(int argc, char *optional_args[]);
-static int find_load_leveler_library(void);
-int main(int argc, char *argv[]);
-#ifdef HAVE_LLAPI_H
-static int load_load_leveler_library(int trans_id);
-#endif
-
-extern char **environ;
-static int events_enabled = 0;
-static int shutdown_requested;
-static int ptp_signal_exit;
-static List *jobs = NULL;		/* Jobs run by this proxy                   */
-static Hash *nodes;		/* Nodes currently in use                   */
-static int node_count = 0;		/* Number of active nodes                   */
-static int global_node_index = 0;	/* Sequentially assigned node number        */
-static RETSIGTYPE(*saved_signals[NSIG]) (int);
-static proxy_svr *pe_proxy = NULL;	/* Handle for proxy message link            */
-static int base_id;		/* Base id for proxy objects                */
-static int last_id = 1;		/* Last assigned object id                  */
-static int queue_id;		/* Object id for our queue                  */
-static int machine_id;		/* Object id for our machine                */
-static int start_events_transid;	/* start_events command id          */
-static int run_miniproxy = 0;	/* Run miniproxy at proxy shutdown */
-static char emsg_buffer[_POSIX_PATH_MAX + 50];	/* Buffer for building error msg */
-static int use_load_leveler = 0;	/* Use LL resource managment/tracking      */
-static char *user_libpath;	/* Alternate libdir for LoadLeveler      */
-static int multicluster_status;	/* LoadLeveler multicluster status          */
-static int min_node_sleep_seconds = 30;	/* Min. LL node status interval     */
-static int max_node_sleep_seconds = 300;	/* Max. LL node status interval    */
-static int job_sleep_seconds = 30;	/* LL job status interval        */
-static char ibmll_libpath_name[_POSIX_PATH_MAX];	/* LoadLeveler lib path */
-static char miniproxy_path[_POSIX_PATH_MAX];
-
-/*
- * List functions are safe for adding or removing list elements since they
- * have appropriate locks for updating the list. However, since the list
- * current location pointer is part of the list object, any time the list
- * is traversed, starting with a SetList call, the list must be locked
- * since a SetList call for the same list on a different thread can
- * invalidate the list positioning for the first thread.
- */
-static pthread_mutex_t job_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t node_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t print_message_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_attr_t thread_attrs;	/* Thread creation attributes       */
-static pthread_t termination_thread;	/* Thread to monitor process exit   */
-static int state_trace = 0;
-static int state_trace_detail = 0;
-static int state_info = 0;
-static int state_warning = 0;
-static int state_error = 1;
-static int state_args = 0;
-static int state_message_timedate = 1;
-static int state_message_threadid = 1;
-static int state_events_active = 0;
-static pthread_t thread_map_table[256];
-static char *my_username;
-static int next_env_entry;
-static int env_array_size;
-static char **env_array;
-
-#ifdef __linux__
-static struct option longopts[] = {
-    {"proxy", required_argument, NULL, 'P'},
-    {"port", required_argument, NULL, 'p'},
-    {"host", required_argument, NULL, 'h'},
-    {"useloadleveler", required_argument, NULL, 'L'},
-    {"trace", required_argument, NULL, 't'},
-    {"lib_override", required_argument, NULL, 'l'},
-    {"multicluster", required_argument, NULL, 'm'},
-    {"template_override", required_argument, NULL, 'o'},
-    {"template_write", required_argument, NULL, 'r'},
-    {"node_polling_min", required_argument, NULL, 'x'},
-    {"node_polling_max", required_argument, NULL, 'y'},
-    {"job_polling", required_argument, NULL, 'z'},
-    {"suspend_at_startup", no_argument, NULL, 'S'},
-    {"debug", required_argument, NULL, 'D'},
-    {"runMiniproxy", no_argument, NULL, 'M'},
-    {NULL, 0, NULL, 0}
-};
-static char *libpath[] = { NULL, "/opt/ibmll/LoadL/full/lib/",
-    "/opt/ibmll/LoadL/so/lib/", (char *) -1
-};
-static char *libname = "libllapi.so";
-#else
-static char *libpath[] = {
-    NULL, "/usr/lpp/LoadL/full/lib", "/usr/lpp/LoadL/so/lib", "/opt/ibmll/LoadL/full/lib/",
-	"/opt/ibmll/LoadL/so/lib/", (char *) -1
-};
-static char *libname = "libllapi.a";
-#endif
-
-#ifdef HAVE_LLAPI_H
-
-#define MY_STATE_UNKNOWN 0
-#define MY_STATE_UP 1
-#define MY_STATE_DOWN 2
-#define MY_STATE_STOPPED 3
-#define MY_STATE_RUNNING 4
-#define MY_STATE_IDLE 5
-#define MY_STATE_TERMINATED 6
-
-struct ClusterObject {		/* a LoadLeveler cluster (same as a ptp machine) */
-    int proxy_generated_cluster_id;
-    char *cluster_name;
-    Hash *node_hash;
-    int proxy_generated_queue_id;
-    int cluster_state;
-    int queue_state;
-    int cluster_is_local;
-    int node_cleanup_required;
-    int job_cleanup_required;
-};
-typedef struct ClusterObject ClusterObject;
-
-struct NodeObject {		/* a LoadLeveler or ptp node in a cluster (machine) */
-    int proxy_generated_node_id;
-    int node_found;		/* node found indicator */
-    int node_state;
-    char *node_name;		/* use the name as the key to the node hash table in the cluster object */
-};
-typedef struct NodeObject NodeObject;
-
-struct JobObject {		/* a LoadLeveler or ptp job in a cluster */
-    int proxy_generated_job_id;
-    char *gui_assigned_job_id;
-    int job_found;		/* job found indicator */
-    int job_state;		/* 1=submitted, 2=in queue */
-    time_t job_submit_time;	/* time when submitted */
-    List *task_list;		/* processes running for this job */
-    LL_STEP_ID ll_step_id;
-    char *cluster_name;
-};
-typedef struct JobObject JobObject;
-struct TaskObject {		/* a LoadLeveler or ptp task for job */
-    int proxy_generated_task_id;
-    int task_found;		/* job found indicator */
-    int ll_task_id;
-    int task_state;
-    char *node_name;
-    char *node_address;
-};
-typedef struct TaskObject TaskObject;
-
-static void *ibmll_libpath_handle = NULL;
-static struct {
-    LL_element *(*ll_query) (enum QueryType);
-    int (*ll_set_request) (LL_element *, enum QueryFlags, char **, enum DataFilter);
-    LL_element *(*ll_get_objs) (LL_element *, enum LL_Daemon, char *, int *, int *);
-    int (*ll_get_data) (LL_element *, enum LLAPI_Specification, void *);
-    int (*ll_deallocate) (LL_element *);
-    LL_element *(*ll_next_obj) (LL_element *);
-    int (*ll_free_objs) (LL_element *);
-    int (*ll_cluster) (int, LL_element **, LL_cluster_param *);
-    int (*ll_submit_job) (char *job_cmd_file, char *monitor_program, char *monitor_arg,
-			  LL_job * job_info, int job_version);
-    int (*ll_terminate_job) (LL_terminate_job_info * ptr);
-    void (*ll_free_job_info) (LL_job * job_info, int job_version);
-    char *(*ll_error) (LL_element ** errObj, int print_to);
-} LL_SYMS;
-
-static int state_shutdown_requested = 0;	/* shutdown not in progress */
-TaskObject *task_object = NULL;
-static pthread_t monitor_LoadLeveler_jobs_thread = 0;
-static pthread_attr_t monitor_LoadLeveler_jobs_thread_attr;
-static pthread_t monitor_LoadLeveler_nodes_thread = 0;
-static pthread_attr_t monitor_LoadLeveler_nodes_thread_attr;
-static pthread_mutex_t master_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t access_LoadLeveler_lock = PTHREAD_MUTEX_INITIALIZER;
-static List *cluster_list = NULL;	/* list of clusters if multicluster (we'll set to single local if none) */
-static List *job_list = NULL;	/* job list for all clusters (since jobs can move) */
-static pthread_mutex_t job_notify_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t job_notify_condvar = PTHREAD_COND_INITIALIZER;
-static char ibmll_proxy_base_id_string[256];
-static ClusterObject *my_cluster;
-
-static void *monitor_LoadLeveler_jobs(void *args);
-static void *monitor_LoadLeveler_nodes(void *args);
-static int get_multicluster_status();
-static int my_ll_get_data(LL_element * request, enum LLAPI_Specification spec, void *result);
-static int my_ll_cluster(int version, LL_element ** errObj, LL_cluster_param * cp);
-static int my_ll_deallocate(LL_element * query_elem);
-static LL_element *my_ll_query(enum QueryType type);
-static int my_ll_free_objs(LL_element * query_elem);
-static LL_element *my_ll_next_obj(LL_element * query_elem);
-static LL_element *my_ll_get_objs(LL_element * query_elem, enum LL_Daemon daemon, char *ignore,
-				  int *value, int *rc);
-static int my_ll_set_request(LL_element * query_elem, enum QueryFlags qflags, char **ignore,
-			     enum DataFilter dfilter);
-static int sendNodeAddEvent(int gui_transmission_id, ClusterObject * cluster_object,
-			    NodeObject * node_object);
-static int sendNodeChangeEvent(int gui_transmission_id, ClusterObject * cluster_object,
-			       NodeObject * node_object);
-static int sendJobAddEvent(int gui_transmission_id, ClusterObject * cluster_object,
-			   JobObject * job_object);
-static int sendJobChangeEvent(int gui_transmission_id, JobObject * job_object);
-static int sendJobRemoveEvent(int gui_transmission_id, JobObject * job_object);
-static int sendTaskAddEvent(int gui_transmission_id, ClusterObject * cluster_object,
-			    JobObject * job_object, TaskObject * task_object);
-static int sendTaskChangeEvent(int gui_transmission_id, JobObject * job_object,
-			       TaskObject * task_object);
-static int sendTaskRemoveEvent(int gui_transmission_id, JobObject * job_object,
-			       TaskObject * task_object);
-static int sendQueueAddEvent(int gui_transmission_id, ClusterObject * cluster_object);
-static int sendMachineAddEvent(int gui_transmission_id, ClusterObject * cluster_object);
-static void add_job_to_list(List * job_list, JobObject * job_object);
-static void add_task_to_list(List * task_list, TaskObject * task_object);
-static void add_node_to_hash(Hash * node_hash, NodeObject * node_object);
-static void delete_task_from_list(List * task_list, TaskObject * task_object);
-static JobObject *get_job_in_list(List * job_list, LL_STEP_ID ll_step_id);
-static NodeObject *get_node_in_hash(Hash * node_hash, char *node_name);
-static TaskObject *get_task_in_list(List * task_list, char *task_instance_machine_name,
-				    int ll_task_id);
-static void refresh_cluster_list();
-#endif
-
-static proxy_svr_helper_funcs helper_funcs = { NULL, NULL };
-
-/*
- * Proxy infrastructure expects commands in exactly this sequence.
- * Be careful when adding or deleting commands
- */
-static proxy_cmd cmds[] = {
-		PE_quit,
-		PE_start_daemon,
-		PE_define_model,
-		PE_start_events,
-		PE_halt_events,
-		PE_submit_job,
-		PE_terminate_job
-};
-static proxy_commands command_tab = { 0, sizeof cmds / sizeof(proxy_cmd), cmds };
-
-static char *mp_infolevel_labels[] = {"Error", "Warning", "Informational",
-    "Diagnostic", "Diagnostic level 4", "Diagnostic level 5",
-    "Diagnostic level 6"
-};
-
-/*
- * This table defines the launch attributes corresponding to PE environment
- * variables for the stand-alone PE case for Linux.
- */
-static string_launch_attr string_launch_attrs[] = {
-    /*
-     * Attributes needed in both basic and advanced mode
-     */
-    {"PE_STDIN_PATH", ATTR_ALWAYS_ALLOWED, "Stdin Path", "Specify path for stdin input file", ""},
-    {"PE_STDOUT_PATH", ATTR_ALWAYS_ALLOWED, "Stdout Path",
-     "Specify path for stdout output file", ""},
-    {"PE_STDERR_PATH", ATTR_ALWAYS_ALLOWED, "Stderr Path",
-      "Specify path for stderr output file", ""},
-    /*
-     * I/O Related attributes
-     */
-    {"MP_IONODEFILE", ATTR_ALWAYS_ALLOWED, "MPI I/O Node List",
-     "Specify file listing nodes performing parallel I/O (MP_IONODEFILE)",
-     ""},
-    /*
-     * Diagnostic related attributes
-     */
-    {"MP_PMDLOG_DIR", ATTR_ALWAYS_ALLOWED, "PMD Log Directory",
-     "Specify directory where PMD log is generated (MP_PMDLOG_DIR)", ""},
-    {"MP_PRIORITY_LOG_DIR", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Priority Log Directory",
-     "Specify directory containing co-scheduler log (MP_PRIORITY_LOG_DIR)", "/tmp"},
-    {"MP_PRIORITY_LOG_NAME", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Priority Log Name",
-     "Specify name of co-scheduler log (MP_PRIORITY_LOG_NAME)", "pmadjpri.log"},
-    /*
-     * Debug related attributes
-     */
-    {"MP_COREDIR", ATTR_ALWAYS_ALLOWED, "Corefile Directory",
-     "Specify directory for application's core files (MP_COREDIR)", ""},
-    {"MP_DEBUG_INITIAL_STOP", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Initial Breakpoint",
-     "Initial breakpoint when debugging an application (MP_DEBUG_INITIAL_STOP)", ""},
-    {"MP_PROFDIR", ATTR_FOR_LINUX | ATTR_FOR_ALL_PROXY, "GMON Directory",
-     "Directory containing GMON profiling data files (GMON_PROFDIR)", ""},
-    /*
-     * System resource related  attributes
-     */
-    {"MP_PRIORITY", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Dispatch Priority Class",
-     "Specify priority class or high/low priority values (MP_PRIORITY)", ""},
-    /*
-     * Node allocation related attributes
-     */
-    {"MP_CMDFILE", ATTR_ALWAYS_ALLOWED, "Command File",
-     "Specify script to load nodes in partition (MP_CMDFILE)", ""},
-    {"MP_HOSTFILE", ATTR_FOR_ALL_OS | ATTR_FOR_ALL_PROXY, "Host List File",
-     "Specify name of host list file for node allocation (MP_HOSTFILE)", ""},
-    {"MP_REMOTEDIR", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY,
-     "Specify name of script echoing current directory (MP_REMOTEDIR)", ""},
-    {"MP_LLFILE", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Job Command File",
-     "Specify path of a LoadLeveler job command file used for node allocation (MP_LLFILE)", ""},
-    {"MP_RMPOOL", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Resource Pool",
-     "Name or number of resource pool to use for node allocation (MP_RMPOOL)", ""},
-    /*
-     * Performance related attributes
-     */
-    /*
-     * Miscellaneous attributes
-     */
-    {"MP_EUILIBPATH", ATTR_ALWAYS_ALLOWED, "Library Path",
-     "Specify path to message passing and communications libraries (MP_EUILIBPATH)", ""},
-    {"MP_CKPTFILE", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Checkpoint File Name",
-     "Base name of the chcekpoint file (MP_CKPTFILE)", ""},
-    {"MP_CKPTDIR", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Checkpoint Directory",
-     "Directory where the checkpoint file will reside (MP_CHPTDIR)", ""},
-
-    /*
-     * Alternate resource manager attributes
-     */
-    {"MP_RMLIB", ATTR_FOR_ALL_OS | ATTR_FOR_PE_STANDALONE, "Resource Manager Library",
-     "Specify alternate resource manager library", ""}, /*
-     * Other attributes
-     */
-    {"PE_ENV_SCRIPT", ATTR_ALWAYS_ALLOWED, "Environment Setup Script",
-     "Specify if using basic or advanced mode", ""},
-    {"PE_ADVANCED_MODE", ATTR_ALWAYS_ALLOWED, "Advanced Mode",
-     "Specify name of PE environment variable setup script", "no"},
-    {"MP_SAVE_LLFILE", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Save Job Command File",
-     "Specify path of generated LoadLeveler job command file (MP_SAVE_LLFILE)", ""},
-    {"MP_SAVEHOSTFILE", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Save Hostlist File",
-     "Specify path of generated host list file (MP_SAVEHOSTFILE)", ""}
-};
-
-static enum_launch_attr enum_attrs[] = {
-    /*
-     * I/O tab related attributes
-     */
-    {"MP_DEVTYPE", ATTR_ALWAYS_ALLOWED, "Device Type Class",
-     "Specify that Infiniband interconnect is to be used (MP_DEVTYPE)", "", "|ib"},
-    {"MP_LABELIO", ATTR_ALWAYS_ALLOWED, "Label I/O",
-     "Specify if application output is labeled by task id (MP_LABELIO)", "no", "yes|no"},
-    {"MP_IO_ERRLOG", ATTR_ALWAYS_ALLOWED, "Create I/O Error Log",
-     "Specify if I/O error logging is enabled (MP_IO_ERRLOG)", "no", "yes|no"},
-    {"PE_SPLIT_STDOUT", ATTR_ALWAYS_ALLOWED, "Split STDOUT by Task",
-     "Specify if stdio output is split by task", "no", "yes|no"},
-    {"MP_STDINMODE", ATTR_ALWAYS_ALLOWED, "STDIN Mode",
-     "Specify how application's stdin is managed (MP_STDINMODE)", "all", "all|none"},
-    {"MP_STDOUTMODE", ATTR_ALWAYS_ALLOWED, "STDOUT Mode",
-     "Specify how application's stdio output is handled (MP_STDOUTMODE)",
-     "unordered", "ordered|unordered"},
-    /*
-     * Diagnostic tab related attributes
-     */
-    {"MP_PMDLOG", ATTR_ALWAYS_ALLOWED, "Create PMD Log",
-     "Specify if PE diagnostic messages are logged", "no", "yes|no"},
-    {"MP_PRINTENV", ATTR_ALWAYS_ALLOWED, "Print Environment",
-     "Specify if PE environment variables are printed (MP_PRINTENV)", "no", "yes|no"},
-    {"MP_PRIORITY_LOG", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Log Co-scheduler Messages",
-     "Specify if messages are logged to co-scheduler log (MP_PRIORITY_LOG)", "yes", "yes|no"},
-    {"MP_INFOLEVEL", ATTR_ALWAYS_ALLOWED, "Message Level",
-     "Specify level of PE message reporting (MP_INFOLEVEL)", "Warning",
-     "Error|Warning|Informational|Diagnostic|Diagnostic level 4|Diagnostic level 5|Diagnostic level 6"},
-    {"MP_LAPI_TRACE_LEVEL", ATTR_ALWAYS_ALLOWED, "LAPI Trace Level",
-     "Specify level of LAPI trace (MP_LAPI_TRACE_LEVEL)", "0", "0|1|2|3|4|5"},
-    {"MP_STATISTICS", ATTR_ALWAYS_ALLOWED, "MPI Statistics",
-     "Obtain communication statistics for user space jobs (MP_STATISTICS)", "no", "yes|no|print"},
-
-    /*
-     * Debug tab related attributes
-     */
-    {"MP_DEBUG_NOTIMEOUT", ATTR_ALWAYS_ALLOWED, "Suppress Timeout",
-     "Specify if debugger can attach without causing application timeout (MP_DEBUG_NOTIMEOUT)",
-     "no", "yes|no"},
-    {"MP_COREFILE_SIGTERM", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Corefile on SIGTERM",
-     "Specify if corefile generated on SIGTERM (MP_COREFILE_SIGTERM)", "no", "yes|no"},
-    {"MP_EUIDEVELOP", ATTR_ALWAYS_ALLOWED, "MPI Parameter Checking",
-     "Specify level of MPI parameter checking (MP_EUIDEVELOP)", "no", "yes|no|debug|minimum"},
-    {"MP_COREFILE_FORMAT", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY,
-     "Specify core file format or name of lightweight core file (MP_COREFILE_FORMAT)",
-     "standard", "standard|STDERR"},
-    /*
-     * System tab related attributes
-     */
-    {"MP_ADAPTER_USE", ATTR_ALWAYS_ALLOWED, "Exclusive Adapter Use",
-     "Specify how node's adapter should be used (MP_ADAPTER_USE)", "shared", "dedicated|shared"},
-    {"MP_CPU_USE", ATTR_ALWAYS_ALLOWED, "Exclusive CPU Use",
-     "Specify how node's CPU should be used (MP_CPU_USE)", "multiple", "multiple|unique"},
-    {"MP_EUIDEVICE", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Adapter",
-     "Specify adapter to use for message passing (MP_EUIDEVICE)",
-     "", "en0|fi0|tr0|sn_all|sn_single|ml0"},
-    {"MP_EUIDEVICE", ATTR_FOR_LINUX | ATTR_FOR_ALL_PROXY, "Adapter",
-     "Specify adapter to use for message passing (MP_EUIDEVICE)", "", "ethx|sn_all|sn_single"},
-    {"MP_EUILIB", ATTR_FOR_ALL_OS | ATTR_FOR_ALL_PROXY, "Communications Subsystem",
-     "Communications susbsystem to be used (MP_EUILIB)", "ip", "ip|us"},
-    {"MP_INSTANCES", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Window or IP Instances",
-     "Number of user space windows or IP addresses to assign (MP_INSTANCES)", "", "|max"},
-    {"MP_RETRY", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Node Retry Interval",
-     "Period in seconds between node allocation retries (MP_RETRY)", "0", "|wait"},
-    /*
-     * Node tab related attributes
-     */
-    {"MP_PGMMODEL", ATTR_ALWAYS_ALLOWED, "Programming Model",
-     "Specify programming model (MP_PGMMODEL)", "spmd", "spmd|mpmd"},
-    /*
-     * Performance tab related attributes
-     */
-    {"MP_CC_SCRATCH_BUF", ATTR_ALWAYS_ALLOWED, "Fastest Collectives",
-     "Specify if fastest collective algorithm is used (MP_CC_SCRATCH_BUF)", "yes", "yes|no"},
-    {"MP_CSS_INTERRUPT", ATTR_ALWAYS_ALLOWED, "Packets Generate Interrupts",
-     "Specify if arriving packets generate interrupts (MP_CSS_INTERRUPT)", "no", "yes|no"},
-    {"MP_PRIORITY_NTP", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Coscheduler disables NTP",
-     "Specify if PE co-scheduler turns NTP off (MP_PRIORITY_NTP)", "no", "yes|no"},
-    {"MP_SHARED_MEMORY", ATTR_ALWAYS_ALLOWED, "Use Shared Memory",
-     "Specify is shared memory used for communication (MP_SHARED_MEMORY)", "yes", "yes|no"},
-    {"MP_SINGLE_THREAD", ATTR_ALWAYS_ALLOWED, "Single MPI Thread",
-     "Specify if application has single thread with MPI calls (MP_SINGLE_THREAD)",
-     "no", "yes|no"},
-    {"MP_WAIT_MODE", ATTR_ALWAYS_ALLOWED, "Wait Mode",
-     "Specify thread behavior when waiting for messages (MP_WAIT_MODE)",
-     "poll", "nopoll|poll|sleep|yield"},
-    {"MP_TASK_AFFINITY", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Task Affinity",
-     "Specify task affinity constraints (MP_TASK_AFFINITY)", "", "|SNI|-1"},
-    {"MP_NEWJOB", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Maintain Partition",
-     "Maintain LoadLeveler parttition for multiple job steps (MP_NEWJOB)", "no", "yes|no"},
-    {"MP_USE_BULK_XFER", ATTR_FOR_AIX | ATTR_FOR_PE_WITH_LL, "Use Bulk Transfer",
-     "Exploit high performance switch data transfer (MP_USE_BULK_XFER)", "no", "yes|no"},
-    /*
-     * Miscellaneous tab related attributes
-     */
-    {"MP_HINTS_FILTERED", ATTR_ALWAYS_ALLOWED, "Hints Filtered",
-     "Specify if MPI info objects reject hints (MP_HINTS_FILTERED)", "yes", "yes|no"},
-    {"MP_CLOCK_SOURCE", ATTR_ALWAYS_ALLOWED, "Clock Source",
-     "Specify if high performance switch clock is time source (MP_CLOCK_SOURCE)", "", "|OS"},
-    {"MP_MSG_API", ATTR_ALWAYS_ALLOWED, "Message Passing API",
-     "Specify message passing API used by application (MP_MSG_API)",
-     "MPI", "MPI|LAPI|MPI_LAPI|MPI,LAPI"},
-    {"MP_TLP_REQUIRED", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Large Page Check",
-     "Specify if PE checks if application was compiled with large pages (MP_TLP_REQUIRED)",
-     "none", "none|warn|kill"},
-    {"MP_CKPTDIR_PER_TASK", ATTR_FOR_AIX | ATTR_FOR_ALL_PROXY, "Checkpoint Directory Per Task",
-     "Specify if separate checkpoint directory per task (MP_CKPTDIR_PER_TASK)", "no"}
-};
-
-int_launch_attr int_attrs[] = {
-    /*
-     * I/O tab related attributes
-     */
-    {"MP_IO_BUFFER_SIZE", ATTR_ALWAYS_ALLOWED, "MPI I/O Buffer Size",
-     "Specify default buffer size for MPI-IO (MPI_IO_BUFFER_SIZE)", 8192, 1, 0x8000000},
-	/*
-	 * Node tab related attributes
-	 */
-    {"MP_PROCS", ATTR_ALWAYS_ALLOWED,
-     "Number of Tasks", "Specify number of program tasks (MP_PROCS)", 1, 1, INT_MAX},
-    {"MP_NODES", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL,
-     "Number of Nodes", "Number of nodes to allocate (MP_NODES)", 1, 1, INT_MAX},
-    {"MP_TASKS_PER_NODE", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Tasks per Node",
-     "Number of tasks to assign to a node (MP_TASKS_PER_NODE)", 1, 1, INT_MAX},
-
-    {"MP_RETRY_COUNT", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Node Retry Count",
-     "Number of times to retry node allocation (MP_RETRYCOUNT)", 1, 1, INT_MAX},
-    {"MP_RETRY_INT", ATTR_FOR_ALL_OS | ATTR_FOR_PE_WITH_LL, "Node Retry Interval",
-    "Interval to retry node allocation (MP_RETRY_INTERVAL)", 1, 1, INT_MAX},
-	/*
-	 * Performance tab related attributes
-	 */
-    {"MP_ACK_THRESH", ATTR_ALWAYS_ALLOWED, "Acknowledgment Threshold",
-     "Specify packet acknowledgment threshhold (MP_ACK_THRESH)", 30, 1, 31},
-    {"MP_EAGER_LIMIT", ATTR_ALWAYS_ALLOWED, "Eager Limit",
-     "Specify rendezvous protocol message size threshold (MP_EAGER_LIMIT)",
-     0x10000, 1, INT_MAX},
-    {"MP_MSG_ENVELOPE_BUF", ATTR_ALWAYS_ALLOWED, "Envelope Buffer Size",
-     "Specify size of message envelope buffer (MP_MSG_ENVELOPE_BUF)",
-     0x800000, 1000001, INT_MAX},
-    {"MP_POLLING_INTERVAL", ATTR_ALWAYS_ALLOWED, "MPI Polling Interval",
-     "Specify PE polling interval (MP_POLLING_INTERVAL)", 400000, 1, INT_MAX},
-    {"PE_RDMA_COUNT", ATTR_ALWAYS_ALLOWED, "Number of rCtx Blocks",
-     "Specify number of rCxt blocks (MP_RDMA_COUNT)", 0, 0, INT_MAX},
-    {"PE_RDMA_COUNT_2", ATTR_ALWAYS_ALLOWED, "Number of rCtx Blocks",
-     "Specify number of rCxt blocks (MP_RDMA_COUNT)", 0, 0, INT_MAX},
-    {"MP_RETRANSMIT_INTERVAL", ATTR_ALWAYS_ALLOWED, "MPI Retransmit Interval",
-     "Specify interval to check if retransmit neeeded (MP_RETRANSMIT_INTERVAL)",
-     10000, 1000, INT_MAX},
-    {"MP_REXMIT_BUF_CNT", ATTR_ALWAYS_ALLOWED, "Retransmit Buffers",
-     "Specify number of retransmit buffers per task (MP_REXMIT_BUF_CNT)", 128, 1, INT_MAX},
-    {"MP_REXMIT_BUF_SIZE", ATTR_ALWAYS_ALLOWED, "Maximum LAPI Buffered Message",
-     "Specify maximum LAPI buffer size (MP_REXMIT_BUF_SIZE)", 65568, 1, INT_MAX},
-    {"MP_UDP_PACKET_SIZE", ATTR_ALWAYS_ALLOWED,
-     "UDP Packet Size", "Specify UDP packet size (MP_UDP_PACKET_SIZE)", 1, 1, INT_MAX},
-    {"PE_BUFFER_MEM", ATTR_ALWAYS_ALLOWED, "Buffer Memory",
-     "Specify size of preallocated early arrival buffer (MP_BUFFER_MEM)",
-     0x4000000, 0, INT_MAX},
-    {"MP_BULK_MIN_MSG_SIZE", ATTR_FOR_AIX | ATTR_FOR_PE_WITH_LL, "Minimum Bulk Message Size",
-     "Minimum message size to use bulk transfer path (MP_BULK_MIN_MSG_SIZE)",
-     153600, 0, INT_MAX},
-	/*
-	 * Miscellaneous tab related attributes
-	 */
-    {"MP_THREAD_STACKSIZE", ATTR_ALWAYS_ALLOWED, "Additional MPI Thread Stack Size",
-     "Specify additional stack size for MPI service thread (MP_THREAD_STACKSIZE)",
-     0, 0, INT_MAX},
-    {"MP_PULSE", ATTR_ALWAYS_ALLOWED, "Pulse Interval",
-     "Specify interval PE checks remote modes (MP_PULSE)", 600, 0, INT_MAX},
-    {"MP_TIMEOUT", ATTR_ALWAYS_ALLOWED, "Connection Timeout",
-     "Specify timeout limit for connecting to remote nodes (MP_TIMEOUT)", 150, 1, INT_MAX},
-	/*
-	 * Additional integer attributes used only for validation of attribute
-	 * field contents. These are used in cases where a single integer,
-	 * string or enumerated attribute is insufficient for validating
-	 * an attribute field, for instance where an allowable value is an
-	 * enumeration or integer value, or where a field contains
-	 * multiple sub-fields, such as mmm,nnn. For these attributes,
-	 * short name, long name and default value are irrelevant.
-	 */
-    {"MP_INSTANCES_INT", ATTR_ALWAYS_ALLOWED, "???", "???", 0, 0, INT_MAX},
-};
-
-long_int_launch_attr long_int_attrs[] = {
-    {"PE_BUFFER_MEM_MAX", ATTR_ALWAYS_ALLOWED, "???",
-     "Specify maximum size of early arrival buffer (MP_BUFFER_MEM)", 0, 0, 0x7fffffffffffffffLL}
-};
-
-/*************************************************************************/
-
-/* Proxy command handlers                                                */
-
-/*************************************************************************/
-int
-PE_start_daemon(int trans_id, int nargs, char *args[])
-{
-    /*
-     * Proxy startup. Allocate a list to contain machine definitions, where
-     * each unique hostfile defines a new machine. Create a thread that
-     * will monitor started poe processes for termination and will
-     * notify the front end that the poe process has terminated.
-     */
-    pthread_attr_t term_thread_attrs;
-    struct passwd *userinfo;
-
-    TRACE_ENTRY;
-    print_message_args(nargs, args);
-    userinfo = getpwuid(getuid());
-    my_username = strdup(userinfo->pw_name);
-    base_id = strtol(args[1], NULL, 10);
-    nodes = HashCreate(1024);
-    pthread_attr_init(&thread_attrs);
-    pthread_attr_setdetachstate(&thread_attrs, PTHREAD_CREATE_DETACHED);
-    pthread_attr_init(&term_thread_attrs);
-    pthread_attr_setdetachstate(&term_thread_attrs, PTHREAD_CREATE_JOINABLE);
-    pthread_create(&termination_thread, &thread_attrs, zombie_reaper, NULL);
-#ifdef HAVE_LLAPI_H
-    strcpy(ibmll_proxy_base_id_string, args[1]);
-    if (use_load_leveler) {
-	load_load_leveler_library(trans_id);
-    }
-#endif
-    send_ok_event(trans_id);
-    TRACE_EXIT;
-    return PROXY_RES_OK;
-}
-
-int
-PE_define_model(int trans_id, int nargs, char *args[])
-{
-    /*
-     * Send the attribute definitions, launch attribute definitions,
-     * and element definitions known by this proxy to the GUI.
-     */
-    int flags;
-
-    TRACE_ENTRY;
-    flags = 0;
-#ifdef __linux__
-    flags = flags | ATTR_FOR_LINUX;
-#endif
-#ifdef _AIX
-    flags = flags | ATTR_FOR_AIX;
-#endif
-    if (use_load_leveler) {
-	flags = flags | ATTR_FOR_PE_WITH_LL;
-    }
-    else {
-	flags = flags | ATTR_FOR_PE_STANDALONE;
-    }
-    print_message_args(nargs, args);
-    send_string_attrs(trans_id, flags);
-    send_int_attrs(trans_id, flags);
-    send_long_int_attrs(trans_id, flags);
-    send_enum_attrs(trans_id, flags);
-    send_local_default_attrs(trans_id);
-    send_ok_event(trans_id);
-    TRACE_EXIT;
-    return PROXY_RES_OK;
-}
-
-int
-PE_start_events(int trans_id, int nargs, char *args[])
-{
-    /*
-     * Send the complete machine state to the GUI. In PE standalone case,
-     * there is only a machine and a queue, since nodes are not known
-     * until an appliation is invoked and a hostlist provided. In the
-     * PE/LoadLeveler case, query LoadLeveler to get the set of nodes
-     * that are part of the cluster (machine) and send new node events
-     * to the GUI for each node.
-     */
-
-    TRACE_ENTRY;
-    print_message_args(nargs, args);
-    start_events_transid = trans_id;
-    state_events_active = 1;
-    if (use_load_leveler) {
-#ifdef HAVE_LLAPI_H
-	/*
-	 * If LoadLeveler is used, then PE jobs will use the machine and queue that the node where this
-	 * proxy is running is a member of, so machine_id and queue_id won't be generated here
-	 */
-	/* Create thread to monitor LoadLeveler clusters of machines (these are nodes in a machine in ptp lingo).  */
-	pthread_attr_init(&monitor_LoadLeveler_nodes_thread_attr);
-	pthread_attr_setdetachstate(&monitor_LoadLeveler_nodes_thread_attr,
-				    PTHREAD_CREATE_DETACHED);
-	pthread_create(&monitor_LoadLeveler_nodes_thread, &monitor_LoadLeveler_nodes_thread_attr,
-		       monitor_LoadLeveler_nodes, NULL);
-
-	/* Create thread to monitor LoadLeveler jobs in clusters.  */
-	pthread_attr_init(&monitor_LoadLeveler_jobs_thread_attr);
-	pthread_attr_setdetachstate(&monitor_LoadLeveler_jobs_thread_attr, PTHREAD_CREATE_DETACHED);
-	pthread_create(&monitor_LoadLeveler_jobs_thread, &monitor_LoadLeveler_jobs_thread_attr,
-		       monitor_LoadLeveler_jobs, NULL);
-#endif
-    }
-    else {
-	char id_str[12];
-	char base_id_str[12];
-
-	machine_id = generate_id();
-	queue_id = generate_id();
-	sprintf(base_id_str, "%d", base_id);
-	sprintf(id_str, "%d", machine_id);
-	enqueue_event(proxy_new_machine_event(trans_id, base_id_str, id_str,
-					      "default", MACHINE_STATE_UP));
-	sprintf(id_str, "%d", queue_id);
-	enqueue_event(proxy_new_queue_event(trans_id, base_id_str, id_str,
-					    "default", QUEUE_STATE_NORMAL));
-	/*
-	 * Look for poe jobs already running on system
-	 */
-	discover_jobs();
-    }
-    /*
-     * Do not send an acknowledgment for the PE_start_events command here
-     * since asynchronous event notifications for new machine, node,
-     * process, job, as well as state changes in those objects use the
-     * start_events transaction id. If an ack is sent here, that
-     * transaction id is invalid and any events using that id will cause
-     * an exception in the front end state machine loop, terminating the
-     * state machine.
-     */
-    TRACE_EXIT;
-    return PROXY_RES_OK;
-}
-
-int
-PE_submit_job(int trans_id, int nargs, char *args[])
-{
-    /*
-     * Submit a Parallel Environmnent application for execution.
-     * This function:
-     * 1) parses the passed argument list
-     * 2) sets the current working directory
-     * 3) sets all environment variables passed in the argument list
-     * 4) creates pipes to handle stdio to/from the application
-     * 5) sets up I/O handlers for stdio
-     * 6) sets up the argument list for the application
-     * 7) starts the application by fork/exec
-     * 8) starts a monitoring thread whose purpose is to wait for the
-     *    attach.cfg file to be created, then update job state to running.
-     * 9) notify the front end a new job has been submitted
-     */
-    char *execname;
-    char *execdir;
-    char *debugger_path;
-    char *debugger_name;
-    char **debug_args;
-    char *argp;
-    char *jobid;
-    char *cp;
-    char *cwd;
-    char *stdin_path;
-    char *stdout_path;
-    char *stderr_path;
-    char *mp_buffer_mem;
-    char *mp_buffer_mem_max;
-    char *mp_rdma_count;
-    char *mp_rdma_count_2;
-    char **envp;
-    jobinfo *job;
-    int  debug_dual_poe_mode = 0;
-    char pe_debugger_id[32] = { 0 };		// POE PID of parallel debugger.
-    char *pmd_helper = 0;
-#ifdef PE_DUAL_POE_DEBUG
-    jobinfo *debugger_job;
-#endif
-    int i;
-    int debug_arg_count;
-    int label_io;
-    int split_io;
-    int status;
-    int stdout_pipe[2];
-    int stderr_pipe[2];
-    pid_t pid;
-    int mp_buffer_mem_set;
-    int mp_rdma_count_set;
-    int redirect;
-    int debug_sdm_mode;
-    char mp_rdma_count_value[50];
-    char mp_buffer_mem_value[50];
-
-    TRACE_ENTRY;
-    print_message_args(nargs, args);
-    jobid = NULL;
-    execdir = NULL;
-    execname = NULL;
-    cwd = NULL;
-    argp = NULL;
-    label_io = 0;
-    split_io = 0;
-    stdin_path = NULL;
-    stdout_path = NULL;
-    stderr_path = NULL;
-    mp_buffer_mem = "";
-    mp_buffer_mem_max = "";
-    mp_buffer_mem_set = 0;
-    mp_buffer_mem_value[0] = '\0';
-    mp_rdma_count = "";
-    mp_rdma_count_2 = "";
-    mp_rdma_count_set = 0;
-    mp_rdma_count_value[0] = '\0';
-    debug_arg_count = 0;
-    debug_sdm_mode = 0;
-    /*
-     * Process arguments passed to this function
-     */
-    TRACE_DETAIL("+++ Parsing arguments\n");
-    debug_args = (char **) malloc(10 * sizeof(char *));
-    malloc_check(debug_args, __FUNCTION__, __LINE__);
-    for (i = 0; args[i] != NULL; i++) {
-	/*
-	 * Check if this is a PE environment variable, for instance
-	 * MP_PROCS=2
-	 */
-	if (strncmp(args[i], "MP_", 3) == 0) {
-	    cp = strchr(args[i], '=');
-	    if (cp != NULL) {
-		/*
-		 * The MP_LABELIO and MP_HOSTFILE environment variables are
-		 * used by the proxy so process them here.
-		 */
-		*cp = '\0';
-		if (strcmp(args[i], "MP_LABELIO") == 0) {
-		    if (strcmp((cp + 1), "yes") == 0) {
-			label_io = 1;
-		    }
-		}
-		else if ((!use_load_leveler) && (strcmp(args[i], "MP_HOSTFILE")) == 0) {
-		    FILE *hostlist;
-		    /*
-		     * Process host file, building new machine
-		     * configuration if this is a unique hostfile.
-		     * If LoadLeveler is used, then don't process hostfile since node status
-		     * is handled by tracking Loadleveler's view of node status.
-		     */
-		    hostlist = fopen((cp + 1), "r");
-		    if (hostlist != NULL) {
-			update_nodes(trans_id, hostlist);
-			fclose(hostlist);
-		    }
-		}
-		/*
-		 * If MP_INFOLEVEL is > 1 char, then convert from label
-		 * name to real setting value. Note that the original
-		 * setting is overwritten, which is ok since the
-		 * new value is guaranteed to be shorter than the
-		 * original value.
-		 */
-		else if ((strcmp(args[i], "MP_INFOLEVEL") == 0) && (strlen(cp + 1) != 1)) {
-		    int n;
-
-		    for (n = 0; n < sizeof mp_infolevel_labels / sizeof(char *); n++) {
-			if (strcmp(cp + 1, mp_infolevel_labels[n]) == 0) {
-			    break;
-			}
-		    }
-		    if (n < (sizeof mp_infolevel_labels / sizeof(char *))) {
-			sprintf(cp + 1, "%d", n);
-		    }
-		}
-		/*
-		 * Restore the '=' in the environment variable setting
-		 */
-		*cp = '=';
-	    }
-	}
-	/*
-	 * Check if this is a variable set by the PE front end and handle it
-	 * if so.
-	 */
-	else if (strncmp(args[i], "PE_", 3) == 0) {
-	    cp = strchr(args[i], '=');
-	    if (cp != NULL) {
-		*cp = '\0';
-		if (strcmp(args[i], "PE_STDIN_PATH") == 0) {
-		    stdin_path = cp + 1;
-		}
-		else if (strcmp(args[i], "PE_STDOUT_PATH") == 0) {
-		    stdout_path = cp + 1;
-		}
-		else if (strcmp(args[i], "PE_STDERR_PATH") == 0) {
-		    stderr_path = cp + 1;
-		}
-		else if ((strcmp(args[i], "PE_SPLIT_STDOUT") == 0)
-			 && (strcmp(cp + 1, "yes") == 0)) {
-		    split_io = 1;
-		}
-		/*
-		 * The PE environment variable MP_BUFFER_MEM gets
-		 * special handling since it is the only environment
-		 * variable which has up to 2 parameters, These parameters
-		 * are treated separately in the GUI to simplify
-		 * validation. The GUI sends the attributes PE_BUFFER_MEM
-		 * and PE_BUFFER_MEM_MAX representing these two values.
-		 * This code must re-assemble the parameters into a proper
-		 * MP_BUFFER_MEM setting and ensure that the environment
-		 * variable gets set. Since the values passed by the
-		 * GUI must not be passed directly to the application, the
-		 * front end identifies them with a PE_ prefix instead of
-		 * the usual MP_ prefix.
-		 * MP_RDMA_COUNT gets similar treatment, using GUI attributes
-		 * PE_RDMA_COUNT and PE_RDMA_COUNT_2
-		 */
-		else if (strcmp(args[i], "PE_BUFFER_MEM") == 0) {
-		    mp_buffer_mem = cp + 1;
-		    mp_buffer_mem_set = 1;
-		}
-		else if (strcmp(args[i], "PE_BUFFER_MEM_MAX") == 0) {
-		    mp_buffer_mem_max = cp + 1;
-		    mp_buffer_mem_set = 1;
-		}
-		else if (strcmp(args[i], "PE_RDMA_COUNT") == 0) {
-		    mp_rdma_count = cp + 1;
-		    mp_rdma_count_set = 1;
-		}
-		else if (strcmp(args[i], "PE_RDMA_COUNT_2") == 0) {
-		    mp_rdma_count_2 = cp + 1;
-		    mp_rdma_count_set = 1;
-		}
-#ifdef PE_DUAL_POE_DEBUG
-		else if (strcmp(args[i], "PE_DEBUG_MODE") == 0) {
-			if (strcasecmp(cp+1, "sdm") == 0)
-				debug_sdm_mode = 1;
-			else if (strcasecmp(cp+1, "dual") == 0) {
-				debug_dual_poe_mode++;
-				if (!pmd_helper)
-					pmd_helper = PMD_HELPER;
-			}
-		}
-		else if (strcmp(args[i], "PE_DEBUG_HELPER") == 0) {
-			pmd_helper = cp + 1;
-		}
-#endif
-	    }
-	}
-	else {
-	    /*
-	     * Look for general launch configuration variables and handle
-	     * appropriately
-	     */
-	    cp = strchr(args[i], '=');
-	    if (cp != NULL) {
-		*cp = '\0';
-		cp = cp + 1;
-		if (strcmp(args[i], JOB_SUB_ID_ATTR) == 0) {
-		    jobid = strdup(cp);
-		}
-		else if (strcmp(args[i], JOB_EXEC_NAME_ATTR) == 0) {
-		    execname = strdup(cp);
-		}
-		else if (strcmp(args[i], JOB_WORKING_DIR_ATTR) == 0) {
-			cwd = strdup(cp);
-		}
-		else if (strcmp(args[i], JOB_PROG_ARGS_ATTR) == 0) {
-		    argp = strdup(cp);
-		}
-		else if (strcmp(args[i], JOB_EXEC_PATH_ATTR) == 0) {
-		    execdir = strdup(cp);
-		}
-		else if (strcmp(args[i], JOB_ENV_ATTR) == 0) {
-		}
-		else if (strcmp(args[i], JOB_DEBUG_EXEC_NAME_ATTR) == 0) {
-		    debugger_name = strdup(cp);
-		}
-		else if (strcmp(args[i], JOB_DEBUG_EXEC_PATH_ATTR) == 0) {
-			debugger_path = strdup(cp);
-		}
-		else if (strcmp(args[i], JOB_DEBUG_ARGS_ATTR) == 0) {
-		    debug_args[debug_arg_count] = strdup(cp);
-		    debug_arg_count = debug_arg_count + 1;
-		}
-		else if (strcmp(args[i], JOB_DEBUG_FLAG_ATTR) == 0) {
-		    debug_sdm_mode = 1;
-		}
-		else if (strcmp(args[i], "debugStopInMain") == 0) {
-		}
-		*(cp - 1) = '=';
-	    }
-	}
-    }
-    if (jobid == NULL) {
-    	post_error(trans_id, PROXY_EV_RT_SUBMITJOB_ERROR, "Missing ID on job submission");
-    }
-    if (cwd != NULL) {
-    	status = chdir(cwd);
-	    if (status == -1) {
-		post_submitjob_error(trans_id, jobid,
-			   "Invalid working directory");
-		TRACE_EXIT;
-		return PROXY_RES_OK;
-	    }
-    }
-    if (mp_buffer_mem_set) {
-	snprintf(mp_buffer_mem_value, sizeof mp_buffer_mem_value,
-		 "MP_BUFFER_MEM=%s%s%s", mp_buffer_mem, (mp_buffer_mem_max[0]
-							 == '\0') ? "" : ",", mp_buffer_mem_max);
-    }
-    if (mp_rdma_count_set) {
-	snprintf(mp_rdma_count_value, sizeof mp_rdma_count_value,
-		 "MP_RDMA_COUNT=%s%s%s", mp_rdma_count, (mp_rdma_count_2[0]
-							 == '\0') ? "" : ",", mp_rdma_count_2);
-    }
-    if (execdir == NULL) {
-    post_submitjob_error(trans_id, jobid, "No executable directory specified");
-	TRACE_EXIT;
-	return PROXY_RES_OK;
-    }
-    if (execname == NULL) {
-    post_submitjob_error(trans_id, jobid, "No executable specified");
-	TRACE_EXIT;
-	return PROXY_RES_OK;
-    }
-    job = (jobinfo *) malloc(sizeof(jobinfo));
-    malloc_check(job, __FUNCTION__, __LINE__);
-    memset(job, 0, sizeof(jobinfo));
-#ifdef PE_DUAL_POE_DEBUG
-    /*DEBUG*/
-	if (debug_dual_poe_mode) {
-		char *debugger_full_path;
-
-		debug_sdm_mode = 0;			// disable SDM debugger launch.
-		/*
-		 * If no path is specified, then try to locate execuable.
-		 */
-		if (debugger_path == NULL || debugger_name == NULL) {
-			post_submitjob_error(trans_id, jobid, "Debugger executuable not found");
-			return PROXY_RES_OK;
-		} else {
-			asprintf(&debugger_full_path, "%s/%s", debugger_path, debugger_name);
-		}
-
-		if (access(debugger_full_path, X_OK) < 0) {
-			post_submitjob_error(trans_id, jobid, strerror(errno));
-			return PROXY_RES_OK;
-		}
-
-	    debugger_job = (jobinfo *) malloc(sizeof(jobinfo));
-	    malloc_check(debugger_job, __FUNCTION__, __LINE__);
-	    memset(debugger_job, 0, sizeof(jobinfo));
-	    debugger_job->debuggee_job = job;
-	    job->debugger_job = debugger_job;
-
-	    TRACE_DETAIL("+++ Forking poe/debugger process\n");
-	    pid = fork();
-	    if (pid == 0) {
-	    	char **debugger_args;
-	    	char **debugger_envp;
-	    	int max_fd;
-	    	int a;
-
-	    	debug_arg_count++;
-			debugger_args = (char **)malloc((debug_arg_count+3) * sizeof(char *));
-			debugger_args[0] = POE;
-			debugger_args[1] = debugger_full_path;
-			/* Use --jobid to inform node elements of debugger what their poe pid is.
-			 * This 'jobid' will be used to set up a message queue to accept connections
-			 * from the application process when it launches on the node.
-			 */
-			asprintf(&debugger_args[2], "--jobid=%d", getpid());
-			for (i = 0, a = 3; i < nargs; i++) {
-				if (strncmp(args[i], JOB_DEBUG_ARGS_ATTR, strlen(JOB_DEBUG_ARGS_ATTR)) == 0) {
-					debugger_args[a] = strchr(args[i], '=') + 1;
-					a++;
-				}
-			}
-			debugger_args[a] = NULL;
-
-			snprintf(pe_debugger_id, sizeof pe_debugger_id, "PE_DEBUGGER_ID=%d", getpid());
-			debugger_envp = create_env_array(args, 0, NULL, NULL, pe_debugger_id, 1);
-
-			max_fd = sysconf(_SC_OPEN_MAX);
-			for (i = STDERR_FILENO + 1; i < max_fd; i++) {
-			    close(i);
-			}
-			/*
-			 * Invoke the debugger as a target of 'poe'
-			 */
-			TRACE_DETAIL_V("+++ Ready to invoke debugger %s\n", debugger_full_path);
-			i = 0;
-			while (debugger_envp[i] != NULL) {
-			    TRACE_DETAIL_V("Target debugger_envp[%d]: %s\n", i, debugger_envp[i]);
-			    i++;
-			}
-			i = 0;
-			while (debugger_args[i] != NULL) {
-			    TRACE_DETAIL_V("Target debugger_args[%d]: %s\n", i, debugger_args[i]);
-			    i++;
-			}
-			status = execve(POE, debugger_args, debugger_envp);
-			print_message(ERROR_MESSAGE, "%s failed to execute, status %s\n", debugger_args[0], strerror(errno));
-			post_submitjob_error(trans_id, jobid, "Exec failed");
-			TRACE_EXIT;
-			exit(1);
-	    }
-	    else if (pid == -1) {
-		    post_submitjob_error(trans_id, jobid, "Debugger fork failed");
-		    return PROXY_RES_OK;
-		}
-	    /* Parent continues on... */
-		/* Augment the application's environment to include a debug marker based upon the poe pid of the debugger. */
-		snprintf(pe_debugger_id, sizeof pe_debugger_id, "PE_DEBUGGER_ID=%d", pid);
-		debugger_job->poe_pid = pid;
-		/* TODO: Do some more initialization of debugger_job here */
-	}
-#endif
-    TRACE_DETAIL("+++ Setting up stdio pipe descriptors\n");
-    TRACE_DETAIL_V("+++ stdout path: %s\n", stdout_path == NULL ? "NULL" : stdout_path);
-    TRACE_DETAIL_V("+++ stderr path: %s\n", stderr_path == NULL ? "NULL" : stderr_path);
-    /*
-     * Set up pipes or files to handle stdio for application. If the path
-     * for a file is null, then that file descriptor will be redirected to
-     * a pipe.
-     * Handle file descriptor setup for stdout first
-     */
-    status =
-	setup_stdio_fd(trans_id, jobid, stdout_pipe, stdout_path, "stdout", &(job->stdout_fd), &redirect);
-    if (status == -1) {
-	TRACE_EXIT;
-	return PROXY_RES_OK;
-    }
-    job->stdout_redirect = redirect;
-    TRACE_DETAIL_V("stdout FD %d %d\n", stdout_pipe[0], stdout_pipe[1]);
-    status =
-	setup_stdio_fd(trans_id, jobid, stderr_pipe, stderr_path, "stderr", &(job->stderr_fd), &redirect);
-    if (status == -1) {
-	TRACE_EXIT;
-	return PROXY_RES_OK;
-    }
-    job->stderr_redirect = redirect;
-    TRACE_DETAIL_V("stderr FD %d %d\n", stderr_pipe[0], stderr_pipe[1]);
-    job->submit_jobid = jobid;
-    job->label_io = label_io;
-    job->split_io = split_io;
-    job->stdout_info.read_buf = (char *) malloc(READ_BUFFER_SIZE);
-    malloc_check(job->stdout_info.read_buf, __FUNCTION__, __LINE__);
-    job->stdout_info.write_buf = (char *) malloc(STDIO_WRITE_BUFSIZE);
-    malloc_check(job->stdout_info.write_buf, __FUNCTION__, __LINE__);
-    job->stdout_info.allocated = STDIO_WRITE_BUFSIZE;
-    job->stdout_info.remaining = STDIO_WRITE_BUFSIZE - 1;
-    job->stdout_info.cp = job->stdout_info.write_buf;
-    job->stdout_info.write_func = send_stdout;
-    job->stderr_info.read_buf = (char *) malloc(READ_BUFFER_SIZE);
-    malloc_check(job->stderr_info.read_buf, __FUNCTION__, __LINE__);
-    job->stderr_info.write_buf = (char *) malloc(STDIO_WRITE_BUFSIZE);
-    malloc_check(job->stderr_info.write_buf, __FUNCTION__, __LINE__);
-    job->stderr_info.allocated = STDIO_WRITE_BUFSIZE;
-    job->stderr_info.remaining = STDIO_WRITE_BUFSIZE - 1;
-    job->stderr_info.cp = job->stderr_info.write_buf;
-    job->stderr_info.write_func = send_stderr;
-    job->discovered_job = 0;
-    envp = create_env_array(args, split_io, mp_buffer_mem_value, mp_rdma_count_value, pe_debugger_id, 0);
-    TRACE_DETAIL("+++ Forking child process\n");
-    pid = fork();
-    if (pid == 0) {
-	char **argv;
-	char poe_target[_POSIX_PATH_MAX * 2 + 2];
-	int max_fd;
-
-	snprintf(poe_target, sizeof poe_target, "%s/%s", execdir, execname);
-	poe_target[sizeof poe_target - 1] = '\0';
-	/*
-	 * Set up executable argument list and environment variables first
-	 * since there is a small timing window where a second run command
-	 * could be processed while this process is still setting up parameters
-	 * for the first run, resulting in modification of the first program's
-	 * parameters and environment variables.
-	 */
-	TRACE_DETAIL_V("+++ Creating poe exec() parameter list %s\n", pmd_helper ? "with pmdhelper" : "");
-	if (debug_sdm_mode) {
-	    argv = create_child_sdm_parmlist(debugger_path, debugger_name, debug_arg_count, debug_args);
-	}
-	else {
-	    argv = create_exec_parmlist(POE, poe_target, argp, pmd_helper);
-	}
-	/*
-	 * Connect stdio to pipes or files owned by parent process (the
-	 * proxy)
-	 */
-	TRACE_DETAIL("+++ Setting up poe stdio file descriptors\n");
-	status =
-	    setup_child_stdio(trans_id, jobid, STDOUT_FILENO, job->stdout_redirect, &(job->stdout_fd),
-			      stdout_pipe);
-	if (status == -1) {
-	    TRACE_EXIT;
-	    exit(1);
-	}
-	status =
-	    setup_child_stdio(trans_id, jobid, STDERR_FILENO, job->stderr_redirect, &(job->stderr_fd),
-			      stderr_pipe);
-	if (status == -1) {
-	    TRACE_EXIT;
-	    exit(1);
-	}
-	/*
-	 * Close all open file descriptors above stderr.
-	 */
-	max_fd = sysconf(_SC_OPEN_MAX);
-	for (i = STDERR_FILENO + 1; i < max_fd; i++) {
-	    close(i);
-	}
-	/*
-	 * Invoke the application as a target of 'poe'
-	 */
-	TRACE_DETAIL_V("+++ Ready to invoke %s\n", poe_target);
-	i = 0;
-	while (envp[i] != NULL) {
-	    TRACE_DETAIL_V("Target env[%d]: %s\n", i, envp[i]);
-	    i = i + 1;
-	}
-	i = 0;
-	while (argv[i] != NULL) {
-	    TRACE_DETAIL_V("Target arg[%d]: %s\n", i, argv[i]);
-	    i = i + 1;
-	}
-	status = execve("/usr/bin/poe", argv, envp);
-	print_message(ERROR_MESSAGE, "%s failed to execute, status %s\n", argv[0], strerror(errno));
-	post_submitjob_error(trans_id, jobid, "Exec failed");
-	TRACE_EXIT;
-	exit(1);
-    }
-    else {
-	if (pid == -1) {
-#ifdef PE_DUAL_POE_DEBUG
-            if (debug_dual_poe_mode) {
-                /* TODO: Take down debugger poe. */
-            }
-#endif
-	    post_submitjob_error(trans_id, jobid, "Fork failed");
-	    return PROXY_RES_OK;
-	}
-	else {
-#ifdef PE_DUAL_POE_DEBUG
-            if (debug_dual_poe_mode) {
-                job_enqueue(debugger_job, debugger_job->poe_pid);
-            }
-#endif
-	    if (!job->stdout_redirect) {
-		close(stdout_pipe[1]);
-	    }
-	    if (!job->stderr_redirect) {
-		close(stderr_pipe[1]);
-	    }
-            job->debugging = debug_sdm_mode;
-            if (debug_sdm_mode) {
-                job->sdm_envp = envp;
-                job->sdm_debugdir = debugger_path;
-                job->sdm_debugname = debugger_name;
-                job->sdm_debugargs = debug_args;
-                job->sdm_debug_arg_count = debug_arg_count;
-            }
-            job_enqueue(job, pid);
-	}
-    }
-    send_ok_event(trans_id);
-    TRACE_EXIT;
-    return PROXY_RES_OK;
-}
-
-int
-PE_halt_events(int trans_id, int nargs, char *args[])
-{
-    /*
-     * Set flag indicating events are shut down, and send OK acks for
-     * both the start_events and stop_events commands now. Once the
-     * ack for the start_events command is sent, the start_events
-     * transaction id is no longer valid.
-     */
-    TRACE_ENTRY;
-    print_message_args(nargs, args);
-    events_enabled = 0;
-    send_ok_event(start_events_transid);
-    send_ok_event(trans_id);
-    TRACE_EXIT;
-    return PROXY_RES_OK;
-}
-
-int
-PE_terminate_job(int trans_id, int nargs, char *args[])
-{
-    /*
-     * Terminate the application. The initial kill is SIGTERM. If that
-     * doesn't work, then a separate thread issues a kill -9 one minute
-     * later.
-     */
-    pthread_t kill_tid;
-    jobinfo *job;
-    int job_ident = -1;
-    int i;
-
-    TRACE_ENTRY;
-    print_message_args(nargs, args);
-    pthread_mutex_lock(&job_lock);
-    SetList(jobs);
-    job = GetListElement(jobs);
-	for (i = 0; i < nargs; i++) {
-		if (proxy_test_attribute(JOB_ID_ATTR, args[i])) {
-			job_ident = proxy_get_attribute_value_int(args[i]);
-		}
-	}
-    while (job != NULL) {
-	if (job_ident == job->proxy_jobid) {
-	    break;
-	}
-	job = GetListElement(jobs);
-    }
-    if (job != NULL) {
-#ifdef PE_DUAL_POE_DEBUG
-    	/* Is this a debugger job? */
-    	if (job->debuggee_job) {
-    		jobinfo *debuggee_job = job->debuggee_job;
-    		job->debuggee_job = NULL;
-    		kill (debuggee_job->poe_pid, SIGTERM);
-    		pthread_create(&kill_tid, &thread_attrs, kill_process, (void *) debuggee_job->poe_pid);
-    	}
-#endif
-	kill(job->poe_pid, SIGTERM);
-	/*
-	 * Create a thread to kill the process with kill(9) if the
-	 * target process is still around after 1 minute.
-	 */
-	pthread_create(&kill_tid, &thread_attrs, kill_process, (void *) job->poe_pid);
-    }
-    pthread_mutex_unlock(&job_lock);
-    send_ok_event(trans_id);
-    TRACE_EXIT;
-    return PROXY_RES_OK;
-}
-
-int
-PE_quit(int trans_id, int nargs, char *args[])
-{
-    void *thread_status;
-
-    TRACE_ENTRY;
-    print_message_args(nargs, args);
-#ifdef HAVE_LLAPI_H
-    if (use_load_leveler) {
-	dlclose(ibmll_libpath_handle);
-	state_shutdown_requested = 1;
-    }
-#endif
-    pthread_cancel(termination_thread);
-    pthread_join(termination_thread, &thread_status);
-    enqueue_event(proxy_shutdown_event(trans_id));
-    if (run_miniproxy) {
-	redirect_io();
-    }
-    shutdown_requested = 1;
-    TRACE_EXIT;
-    return PROXY_RES_OK;
-}
-
-/*************************************************************************/
-/*                                                                       */
-/* Job support routines.                                                 */
-/*                                                                       */
-/*************************************************************************/
-void
-job_enqueue(jobinfo *job, pid_t pid)
-{
-    char jobname[40];
-    char queue_id_str[12];
-    char jobid_str[12];
-
-    /*
-     * Update job information for application and notify front end that job is started.
-     */
-    job->tasks = NULL;
-    job->poe_pid = pid;
-    job->task0_pid = -1;
-    job->submit_time = time(NULL);
-    job->proxy_jobid = generate_id();
-    TRACE_DETAIL_V("+++ Created poe process pid %d for jobid %d\n", job->poe_pid, job->proxy_jobid);
-    /*
-     * Create thread to watch for application's attach.cfg file to be created.
-     */
-    pthread_create(&job->startup_thread, &thread_attrs, startup_monitor, job);
-    AddToList(jobs, job);
-#ifdef PE_DUAL_POE_DEBUG
-    if (job->debuggee_job)
-    	return;		// Don't report debugger
-#endif
-    snprintf(jobname, sizeof jobname, "%s.%s", my_username, job->submit_jobid);
-    jobname[sizeof jobname - 1] = '\0';
-    sprintf(queue_id_str, "%d", queue_id);
-    sprintf(jobid_str, "%d", job->proxy_jobid);
-    enqueue_event(proxy_new_job_event(start_events_transid,
-				      queue_id_str, jobid_str, jobname, JOB_STATE_INIT,
-				      job->submit_jobid));
-}
-
-/*************************************************************************/
-
-/* Service threads                                                       */
-
-/*************************************************************************/
-void *
-startup_monitor(void *job_ident)
-{
-    /*
-     * Wait for the attach.cfg file for this task to be completely filled
-     * in, then read and parse it to build the map of tasks to nodes for
-     * this application
-     */
-    char tasklist_path[_POSIX_PATH_MAX + 1];
-    char *cfginfo;
-    FILE *cfgfile;
-    int numtasks;
-    taskinfo *tasks;
-    taskinfo *taskp;
-    jobinfo *job;
-    proxy_msg *msg;
-    int status;
-    int done;
-    time_t last_mtime;
-    struct stat fileinfo;
-    int i;
-    char *proxy_taskid;
-    List *new_nodes;
-    List *taskid_list;
-    char jobid_str[30];
-    char procid_str[12];
-    char procname[20];
-
-    TRACE_ENTRY;
-    job = (jobinfo *) job_ident;
-    if (job->discovered_job) {
-	new_nodes = NewList();
-    }
-    taskid_list = NewList();
-    snprintf(tasklist_path, sizeof tasklist_path, "/tmp/.ppe.%d.attach.cfg", job->poe_pid);
-    tasklist_path[sizeof tasklist_path - 1] = '\0';
-    print_message(TRACE_DETAIL_MESSAGE, "Waiting for task config file %s\n", tasklist_path);
-    last_mtime = -1;
-    /*
-     * Wait for the attach.cfg file to be created and to not be modified
-     * within the last second before trying to read and parse it
-     */
-    for (;;) {
-	sleep(1);
-	status = stat(tasklist_path, &fileinfo);
-	if (status == 0) {
-	    if ((last_mtime >= job->submit_time) && (last_mtime == fileinfo.st_mtime)) {
-		break;
-	    }
-	    else {
-		last_mtime = fileinfo.st_mtime;
-	    }
-	}
-    }
-    TRACE_DETAIL_V("+++ Have task config file %s\n", tasklist_path);
-    done = 0;
-    while (!done) {
-	char *lineptr;
-	char *tokenptr;
-	char *linep;
-	char *p;
-	int tasknum;
-	int numlines;
-
-	stat(tasklist_path, &fileinfo);
-	cfgfile = fopen(tasklist_path, "r");
-	if (cfgfile != NULL) {
-	    cfginfo = (char *) malloc(fileinfo.st_size);
-	    malloc_check(cfginfo, __FUNCTION__, __LINE__);
-	    status = fread(cfginfo, fileinfo.st_size, 1, cfgfile);
-	    fclose(cfgfile);
-	    if (status != fileinfo.st_size) {
-		/*
-		 * First line contains version info which we don't care
-		 * about, and so it is ignored
-		 */
-		p = strtok_r(cfginfo, ";", &lineptr);
-		if (p == NULL) {
-		    break;
-		}
-		/*
-		 * Second line contains number of tasks in job
-		 */
-		p = strtok_r(NULL, ";", &lineptr);
-		if (p == NULL) {
-		    break;
-		}
-		linep = p;
-		p = strtok_r(linep, " ", &tokenptr);
-		numtasks = atoi(p);
-		numlines = 0;
-		TRACE_DETAIL_V("+++ Application has %d tasks\n", numtasks);
-		tasks = (taskinfo *) calloc(numtasks, sizeof(taskinfo));
-		malloc_check(tasks, __FUNCTION__, __LINE__);
-		/*
-		 * Now read one line per task and build task list
-		 */
-		p = strtok_r(NULL, ";", &lineptr);
-		if (p == NULL) {
-		    break;
-		}
-		while (!done) {
-		    char *cp;
-		    linep = p;
-		    TRACE_DETAIL_V("Processing %s", linep);
-		    /*
-		     * get task index
-		     */
-		    p = strtok_r(linep, " ", &tokenptr);
-		    if (p == NULL) {
-			break;
-		    }
-		    tasknum = atoi(p);
-		    taskp = &tasks[tasknum];
-		    taskp->proxy_taskid = generate_id();
-#ifdef __linux__
-		    /*
-		     * skip ignored token
-		     */
-		    p = strtok_r(NULL, " ", &tokenptr);
-		    if (p == NULL) {
-			break;
-		    }
-#endif
-		    /*
-		     * get node IP address
-		     */
-		    p = strtok_r(NULL, " ", &tokenptr);
-		    if (p == NULL) {
-			break;
-		    }
-		    taskp->ipaddr = strdup(p);
-		    /*
-		     * get task hostname. hostname will be truncated to
-		     * short form if LoadLeveler is not being used. If Loadleveler
-		     * is used, it's node list uses full host name so truncation is
-		     * not allowed.
-		     */
-		    p = strtok_r(NULL, " ", &tokenptr);
-		    if (p == NULL) {
-			break;
-		    }
-		    if (!use_load_leveler) {
-			cp = strchr(p, '.');
-			if (cp != NULL) {
-			    *cp = '\0';
-			}
-		    }
-		    taskp->hostname = strdup(p);
-		    /*
-		     * get task pid
-		     */
-		    p = strtok_r(NULL, " ", &tokenptr);
-		    if (p == NULL) {
-			break;
-		    }
-		    taskp->task_pid = atoi(p);
-		    /*
-		     * get task parent pid
-		     */
-		    p = strtok_r(NULL, " ", &tokenptr);
-		    if (p == NULL) {
-			break;
-		    }
-		    taskp->parent_pid = atoi(p);
-		    numlines = numlines + 1;
-		    if (numlines >= numtasks) {
-			done = 1;
-			break;
-		    }
-		    /*
-		     * Read next line of task info
-		     */
-		    p = strtok_r(NULL, ";", &lineptr);
-		    if (p == NULL) {
-			break;
-		    }
-		}
-		/*
-		 * If numline == numtasks then the file was complete and
-		 * we are done with parsing the file. Otherwise clean up
-		 * the list and try again
-		 */
-		if (!done) {
-		    free(cfginfo);
-		    delete_task_list(tasknum + 1, tasks);
-		}
-	    }
-	    else {
-		/*
-		 * File was not completely read. Close the file then try
-		 * again.
-		 */
-		free(cfginfo);
-		fclose(cfgfile);
-		delete_task_list(tasknum + 1, tasks);
-		sleep(1);
-	    }
-	}
-    }
-    job->tasks = tasks;
-    job->numtasks = numtasks;
-#ifdef PE_DUAL_POE_DEBUG
-    if (job->debuggee_job != NULL)        /* The debugger job doesn't report */
-    	goto out;
-#endif
-    /*
-     * For each task in the application, send a new process event to the
-     * GUI.
-     */
-    taskp = tasks;
-    sprintf(jobid_str, "%d", ((jobinfo *) job_ident)->proxy_jobid);
-    msg = proxy_new_process_event(start_events_transid, jobid_str, numtasks);
-#if 0
-	/*
-	 * Need to determine whether the proxy or the GUI writes the routing file.
-	 * If the GUI writes the routing file, that may become a problem as larger
-	 * numbers of tasks are run. If the GUI writes the routing file, the task list
-	 * is sent across the network connection twice, first from the proxy to the GUI
-	 * and then back from the GUI to the node where the proxy runs.
-	 *
-	 * For now, the GUI writes the routing file. This code may be clobbering the
-	 * routing file generated by the GUI so it is disabled.
-	 */
-    if (job->debugging) {
-	FILE *routing_file;
-
-	TRACE_DETAIL("\nCreating routing file\n");
-	routing_file = fopen("routing_file", "rw");
-	if (routing_file != NULL) {
-	    fprintf(routing_file, "%d\n", numtasks);
-	    TRACE_DETAIL("Writing routing data\n");
-	    for (i = 0; i < numtasks; i++) {
-		fprintf(routing_file, "%d %s 7777\n", i, taskp[i].hostname);
-	    }
-	    fclose(routing_file);
-	}
-	else {
-	    TRACE_DETAIL_V("\nError writing routing file: %s\n", strerror(errno));
-	}
-    }
-#endif
-    if (job->discovered_job) {
-	/*
-	 * If this is a job running before the proxy started, then
-	 * there will be no hostfile. In this case, just add new
-	 * nodes for each unique nodename found in the attach.cfg file.
-	 */
-	for (i = 0; i < numtasks; i++) {
-	    if (find_node(taskp[i].hostname) == NULL) {
-		node_refcount *node;
-
-		node = add_node(taskp[i].hostname);
-		AddToList(new_nodes, node);
-		node_count = node_count + 1;
-	    }
-	}
-	if (SizeOfList(new_nodes) > 0) {
-	    send_new_node_list(start_events_transid, machine_id, new_nodes);
-	}
-	DestroyList(new_nodes, NULL);
-    }
-    if (use_load_leveler) {
-#ifdef HAVE_LLAPI_H
-	NodeObject *node;
-
-	for (i = 0; i < numtasks; i++) {
-	    if (i == 0) {
-		job->task0_pid = taskp->task_pid;
-	    }
-	    node = get_node_in_hash(my_cluster->node_hash, taskp[i].hostname);
-	    if (node == NULL) {
-		print_message(ERROR_MESSAGE, "Node %s not found in node list\n", taskp->hostname);
-	    }
-	    else {
-		sprintf(procid_str, "%d", taskp[i].proxy_taskid);
-                AddToList(taskid_list, strdup(procid_str));
-		sprintf(procname, "task_%d", i);
-		proxy_add_process(msg, procid_str, procname, PROC_STATE_STARTING, 3);
-		proxy_add_int_attribute(msg, PROC_NODEID_ATTR, node->proxy_generated_node_id);
-                AddToList(taskid_list, &(node->proxy_generated_node_id));
-		proxy_add_int_attribute(msg, PROC_INDEX_ATTR, i);
-		proxy_add_int_attribute(msg, PROC_PID_ATTR, taskp[i].task_pid);
-	    }
-	}
-#endif
-    }
-    else {
-	for (i = 0; i < numtasks; i++) {
-	    node_refcount *node;
-
-	    if (i == 0) {
-		job->task0_pid = taskp->task_pid;
-	    }
-	    /*
-	     * Increment the number of tasks running on the node and send the
-	     * new process event
-	     */
-	    node = find_node(taskp[i].hostname);
-	    if (node == NULL) {
-		print_message(ERROR_MESSAGE, "Node %s not found in node list\n", taskp->hostname);
-	    }
-	    else {
-
-		node->task_count = node->task_count + 1;
-		sprintf(procid_str, "%d", taskp[i].proxy_taskid);
-                AddToList(taskid_list, strdup(procid_str));
-		sprintf(procname, "task_%d", i);
-		proxy_add_process(msg, procid_str, procname, PROC_STATE_STARTING, 3);
-		proxy_add_int_attribute(msg, PROC_NODEID_ATTR, node->proxy_nodeid);
-		proxy_add_int_attribute(msg, PROC_INDEX_ATTR, i);
-		proxy_add_int_attribute(msg, PROC_PID_ATTR, taskp[i].task_pid);
-	    }
-	}
-    }
-    enqueue_event(msg);
-      /*
-       * Notify front end that each task is started
-       */
-    SetList(taskid_list);
-    proxy_taskid = GetListElement(taskid_list);
-    while (proxy_taskid != NULL) {
-        proxy_msg *msg;
-
-        msg = proxy_process_change_event(start_events_transid, proxy_taskid, 1);
-        free(proxy_taskid);
-        proxy_add_string_attribute(msg, PROC_STATE_ATTR, PROC_STATE_RUNNING);
-        enqueue_event(msg);
-        proxy_taskid = GetListElement(taskid_list);
-    }
-    DestroyList(taskid_list, NULL);
-    /*
-     * attach.cfg file is complete and has been parsed. Notify the
-     * front end that the job is running
-     */
-    send_job_state_change_event(start_events_transid, job->proxy_jobid, JOB_STATE_RUNNING);
-    /*
-     * Now that all task pids are known, I/O from the application can be
-     * enabled since we can now map I/O to a specific pid. This is done
-     * here only for stdout since task mapping information is required to
-     * handle splitting stdout by task. Output to stderr is not split by
-     * task, so the stderr file handler is registered at application startup.
-     * If the job was a job discovered at proxy startup, there is no connection
-     * to stdio file descriptors, so don't register file handlers.
-     */
-    if (!job->stdout_redirect && !job->discovered_job) {
-	RegisterFileHandler(job->stdout_fd, READ_FILE_HANDLER, stdout_handler, job);
-    }
-    if (job->debugging) {
-	  /*
-	   * If this is a debug session then we need to start the top level SDM process
-	   * at this point. The child SDM processes have already been created by the
-	   * fork/exec of the poe process (which in the debug case is 'poe sdm ...') above.
-	   */
-	pid_t sdm_pid;
-	char *debugger;
-	int len;
-	char **argv;
-
-	sdm_pid = fork();
-	if (sdm_pid == 0) {
-	    TRACE_DETAIL("+++ Ready to invoke top level SDM\n");
-	    argv = create_debug_parmlist(job->sdm_debugname, job->sdm_debug_arg_count, job->sdm_debugargs);
-	    len = strlen(job->sdm_debugdir) + strlen(job->sdm_debugname) + 2;
-	    debugger = (char *) malloc(len);
-	    malloc_check(debugger, __FUNCTION__, __LINE__);
-	    strcpy(debugger, job->sdm_debugdir);
-	    strcat(debugger, "/");
-	    strcat(debugger, job->sdm_debugname);
-sleep(5);
-	    status = execve(debugger, argv, job->sdm_envp);
-	    print_message(ERROR_MESSAGE, "%s failed to execute, status %s\n", argv[0], strerror(errno));
-	    TRACE_EXIT;
-	    exit(1);
-	}
-	else {
-	    if (sdm_pid == -1) {
-		return PROXY_RES_OK;
-	    }
-	    else {
-		/*
-		 * This is the parent leg of the fork for invoking the top level SDM.
-		 * No explicit processing required here. All we care about is
-		 * eventually catching the SDM exit status so we don't create a zonbie.
-		 */
-	    }
-        }
-    }
-#ifdef PE_DUAL_POE_DEBUG
-  out:
-#endif
-    /*
-     * The startup thread exits at this point, so clear the reference in
-     * the job info
-     */
-    job->startup_thread = 0;
-    TRACE_EXIT;
-    return NULL;
-}
-
-void *
-zombie_reaper(void *arg)
-{
-    /*
-     * Watch for poe tasks started by this proxy to terminate. When a task
-     * terminates, clean up resources and notify the front end that a job
-     * has completed. Post completion status to front end. This function is
-     * invoked by a thread started at proxy startup, and runs until the
-     * proxy is shut down
-     */
-    int status;
-    pid_t terminated_pmd;
-    struct rusage rusage_info;
-    jobinfo *job;
-
-    TRACE_ENTRY;
-    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
-    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
-
-    for (;;) {
-	pthread_mutex_lock(&job_lock);
-	/*
-	 * Scan the job list looking for jobs running before the proxy
-	 * started. For each of those jobs, check if the poe process
-	 * still exists. If the process has disappeared, then mark the
-	 * job terminated.
-	 */
-	SetList(jobs);
-	job = GetListElement(jobs);
-	while (job != NULL) {
-	    if ((job->discovered_job) && (kill(job->poe_pid, 0) != 0)) {
-		TRACE_DETAIL_V("+++ poe process %d Exited with unknown status\n", job->poe_pid);
-		send_job_state_change_event(start_events_transid,
-					    job->proxy_jobid, JOB_STATE_TERMINATED);
-		send_process_state_change_event(start_events_transid, job, PROC_STATE_EXITED);
-		if (job->tasks != NULL) {
-		    if (!use_load_leveler) {
-			update_node_refcounts(job->numtasks, job->tasks);
-		    }
-		    delete_task_list(job->numtasks, job->tasks);
-		}
-		RemoveFromList(jobs, job);
-	    }
-	    job = GetListElement(jobs);
-	}
-	/*
-	 * wait for any poe task to terminate
-	 */
-	terminated_pmd = wait3(&status, WNOHANG, &rusage_info);
-	if (terminated_pmd > 0) {
-
-	    TRACE_DETAIL_V("+++ Pid %d exited\n", terminated_pmd);
-	    /*
-	     * Look for job with matching poe process pid. If found, then
-	     * post process status to front end and clean up resources
-	     * If no match to pid is found, it's probably a top level SDM debugger
-	     * process, and no additional processing is needed.
-	     */
-	    SetList(jobs);
-	    job = GetListElement(jobs);
-	    while (job != NULL) {
-		if (terminated_pmd == job->poe_pid) {
-		    break;
-		}
-		job = GetListElement(jobs);
-	    }
-	    if (job != NULL) {
-		/*
-		 * POE process status used to be reported to the GUI.
-		 * Apparently, now, only job status is posted.
-		 */
-		if (status <= 128) {
-		    TRACE_DETAIL_V("+++ %d Exited with status %08x\n", terminated_pmd, status);
-		    send_job_state_change_event(start_events_transid,
-						job->proxy_jobid, JOB_STATE_TERMINATED);
-		    send_process_state_change_event(start_events_transid, job, PROC_STATE_EXITED);
-		}
-		else {
-		    TRACE_DETAIL_V("+++ %d signalled with status %08x\n", terminated_pmd,
-				   status - 128);
-		    send_job_state_change_event(start_events_transid, job->proxy_jobid,
-						JOB_STATE_ERROR);
-		    send_process_state_change_event(start_events_transid, job,
-						    PROC_STATE_EXITED_SIGNALLED);
-		}
-		/*
-		 * Since the job is terminated, the stdio file descriptor
-		 * pipes should be unregistered from the main polling loop
-		 * and the file descriptors closed. However, if there
-		 * is still data in the buffers, this data would be lost.
-		 * So, leave the pipes registered. The polling loop
-		 * will eventually process the data left in the pipe. If the
-		 * last line of output does not end with a newline, that
-		 * line may be lost
-		 */
-		if (job->tasks != NULL) {
-		    if (!use_load_leveler) {
-			update_node_refcounts(job->numtasks, job->tasks);
-		    }
-		    delete_task_list(job->numtasks, job->tasks);
-		}
-		free(job->submit_jobid);
-		free(job->stdout_info.read_buf);
-		free(job->stderr_info.read_buf);
-		free(job->stdout_info.write_buf);
-		free(job->stderr_info.write_buf);
-		RemoveFromList(jobs, job);
-		free(job);
-	    }
-	}
-	pthread_mutex_unlock(&job_lock);
-	/*
-	 * Poll for status once per second
-	 */
-	sleep(1);
-    }
-    TRACE_EXIT;
-}
-
-void
-redirect_io(void)
-{
-    /*
-     * STDIO for running applications needs to be redirected in order to
-     * prevent the application from terminating with SIGPIPE for stdin
-     * or from blocking on stdout or stderr pipes when they fill.
-     * To do this, build a command line invocation for a miniproxy
-     * process consisting of the path prefixes for stdout and stderr
-     * file descriptors followed by lists of file descriptors for stdin,
-     * stdout and stderr, then invoke the miniproxy.
-     */
-    jobinfo *job;
-    int stdin_count;
-    int stdout_count;
-    int stderr_count;
-    int redirected_fds;
-    char *miniproxy_args[3];
-    char *miniproxy_parmlist;
-    char *stdin_fds;
-    char *stdout_fds;
-    char *stderr_fds;
-    char num[10];
-    static char *miniproxy_env[] = { NULL };
-
-    /*
-     * Determine how many non-redirected file descriptors there are for
-     * stdin, stdout and stderr.
-     */
-    TRACE_ENTRY;
-    stdin_count = 0;
-    stdout_count = 0;
-    stderr_count = 0;
-    SetList(jobs);
-    job = GetListElement(jobs);
-    redirected_fds = 0;
-    while (job != NULL) {
-	if (!job->stdin_redirect) {
-	    stdin_count = stdin_count + 1;
-	    redirected_fds = 1;
-	}
-	if (!job->stdout_redirect) {
-	    stdout_count = stdout_count + 1;
-	    redirected_fds = 1;
-	}
-	if (!job->stderr_redirect) {
-	    stderr_count = stderr_count + 1;
-	    redirected_fds = 1;
-	}
-	job = GetListElement(jobs);
-    }
-    if (redirected_fds) {
-	/*
-	 * Allocate a string long enough to hold three pathnames, and lists of file
-	 * descriptors for stdin, stdout and stderr, each prefixed with a file
-	 * descriptor count. Then allocate work strings for each file descriptor list
-	 */
-	miniproxy_parmlist = (char *) malloc(PATH_MAX * 3 + stdin_count * 11 +
-					     stdout_count * 11 + stderr_count * 11 + 30);
-	if (miniproxy_parmlist == NULL) {
-	    exit(1);
-	}
-	stdin_fds = (char *) malloc(stdin_count * 11);
-	malloc_check(stdin_fds, __FUNCTION__, __LINE__);
-	stdout_fds = (char *) malloc(stdout_count * 11);
-	malloc_check(stdout_fds, __FUNCTION__, __LINE__);
-	stderr_fds = (char *) malloc(stderr_count * 11);
-	malloc_check(stderr_fds, __FUNCTION__, __LINE__);
-	/*
-	 * Initialize the file descriptor lists, then concatenate each
-	 * fd number for a non-redirected file to its list.
-	 */
-	stdin_fds[0] = '\0';
-	stdout_fds[0] = '\0';
-	stderr_fds[0] = '\0';
-	SetList(jobs);
-	job = GetListElement(jobs);
-	while (job != NULL) {
-	    if (!job->stdin_redirect) {
-		sprintf(num, "%d ", job->stdin_fd);
-		strcat(stdin_fds, num);
-	    }
-	    if (!job->stdout_redirect) {
-		sprintf(num, "%d ", job->stdout_fd);
-		strcat(stdout_fds, num);
-	    }
-	    if (!job->stderr_redirect) {
-		sprintf(num, "%d ", job->stderr_fd);
-		strcat(stderr_fds, num);
-	    }
-	    job = GetListElement(jobs);
-	}
-	/*
-	 * Build the miniproxy parameter list. All data is contained in a
-	 * string that is tokenized into individual parameters by miniproxy
-	 */
-	strcpy(miniproxy_parmlist, miniproxy_args[0]);
-	if (state_trace == 0) {
-	    strcat(miniproxy_parmlist, " n");
-	}
-	else {
-	    strcat(miniproxy_parmlist, " y");
-	}
-	strcat(miniproxy_parmlist, " /tmp/mp_stdout /tmp/mp_stderr ");
-	sprintf(num, "%d ", stdin_count);
-	strcat(miniproxy_parmlist, num);
-	strcat(miniproxy_parmlist, stdin_fds);
-	sprintf(num, "%d ", stdout_count);
-	strcat(miniproxy_parmlist, num);
-	strcat(miniproxy_parmlist, stdout_fds);
-	sprintf(num, "%d ", stderr_count);
-	strcat(miniproxy_parmlist, num);
-	strcat(miniproxy_parmlist, stderr_fds);
-	miniproxy_args[0] = miniproxy_path;
-	miniproxy_args[1] = miniproxy_parmlist;
-	miniproxy_args[2] = NULL;
-	print_message(TRACE_DETAIL_MESSAGE, "Invoking miniproxy with args %s\n",
-		      miniproxy_parmlist);
-	if (fork() == 0) {
-	    execve(miniproxy_args[0], miniproxy_args, miniproxy_env);
-	    print_message(ERROR_MESSAGE, "Failed to invke miniproxy %s: %s\n",
-			  miniproxy_args[0], strerror(errno));
-	    TRACE_EXIT;
-	    exit(1);
-	}
-    }
-}
-
-#ifdef HAVE_LLAPI_H
-
-void *
-monitor_LoadLeveler_nodes(void *job_ident)
-{
-    int rc = 0;
-    int i = 0;
-    char *node_name = NULL;
-    LL_element *node = NULL;
-    LL_element *query_elem = NULL;
-    int node_count = 0;
-    int sleep_seconds = 30;
-    int sleep_time_reset = 0;	/* if changes this pass */
-    LL_element *errObj = NULL;
-
-    ListElement *cluster_list_element = NULL;
-    ClusterObject *cluster_object = NULL;
-    NodeObject *node_object = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-  /*-----------------------------------------------------------------------*
-   * loop forever until we are told we are shutting down.                  *
-   *-----------------------------------------------------------------------*/
-    while (state_shutdown_requested == 0) {
-	pthread_mutex_lock(&master_lock);
-	if (state_shutdown_requested == 1) {
-	    pthread_mutex_unlock(&master_lock);
-	    break;
-	}
-	query_elem = NULL;
-	node_name = NULL;
-	node_count = 0;
-	node = NULL;
-	LL_cluster_param cluster_parm;
-	char *remote_cluster[2];
-	Hash *node_hash = NULL;
-	HashEntry *hash_element = NULL;
-	List *node_list = NULL;
-	ListElement *node_list_element = NULL;
-	sleep_time_reset = 0;
-
-	print_message(TRACE_MESSAGE, ">>> %s thread running. line=%d.\n", __FUNCTION__, __LINE__);
-	if (cluster_list == NULL) {
-	    refresh_cluster_list();
-	}
-
-	if (cluster_list != NULL) {
-
-      /*-----------------------------------------------------------------------*
-       * loop on the cluster list we obtained earlier from LoadLeveler.        *
-       *-----------------------------------------------------------------------*/
-	    cluster_list_element = cluster_list->l_head;
-	    while (cluster_list_element != NULL) {
-		cluster_object = cluster_list_element->l_value;
-		cluster_list_element = cluster_list_element->l_next;
-		if (cluster_object->node_hash->count <= 0) {
-		    sleep_time_reset = 1;
-		}
-
-		if (multicluster_status == 1) {
-
-	 /*-----------------------------------------------------------------------*
-          * we are running multicluster - set cluster name into environment       *
-          * to influence where LoadLeveler searches for data (what cluster)       *
-          *-----------------------------------------------------------------------*/
-		    remote_cluster[0] = cluster_object->cluster_name;
-		    remote_cluster[1] = NULL;
-		    print_message(INFO_MESSAGE, "Setting access for LoadLeveler cluster=%s.\n",
-				  cluster_object->cluster_name);
-		    cluster_parm.action = CLUSTER_SET;
-		    cluster_parm.cluster_list = remote_cluster;
-		    rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);
-		}
-		else {
-
-	 /*-----------------------------------------------------------------------*
-          * not running multicluster                                              *
-          *-----------------------------------------------------------------------*/
-		    print_message(INFO_MESSAGE,
-				  "Setting access for LoadLeveler local cluster (single cluster).\n");
-		    cluster_parm.action = CLUSTER_UNSET;
-		    cluster_parm.cluster_list = NULL;
-		    rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);
-		}
-
-	/*-----------------------------------------------------------------------*
-         * build a LoadLeveler query object (for nodes)                          *
-         *-----------------------------------------------------------------------*/
-		query_elem = my_ll_query(MACHINES);
-		if (query_elem == NULL) {
-		    print_message(ERROR_MESSAGE,
-				  "Unable to obtain query element. LoadLeveler may not be active or is not responding.\n");
-		    continue;
-		}
-
-	/*-----------------------------------------------------------------------*
-         * set the request type for LoadLeveler (we want nodes)                  *
-         *-----------------------------------------------------------------------*/
-		print_message(INFO_MESSAGE,
-			      "Call LoadLeveler (ll_set_request) for nodes in cluster=%s.\n",
-			      cluster_object->cluster_name);
-		rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-		if (rc != 0) {
-		    rc = my_ll_deallocate(query_elem);
-		    query_elem = NULL;
-		    continue;
-		}
-
-	/*-----------------------------------------------------------------------*
-         * get nodes from LoadLeveler for current or local cluster.              *
-         *-----------------------------------------------------------------------*/
-		print_message(INFO_MESSAGE,
-			      "Call LoadLeveler (ll_get_objs) for nodes in cluster=%s.\n",
-			      cluster_object->cluster_name);
-		node = my_ll_get_objs(query_elem, LL_CM, NULL, &node_count, &rc);
-		if (rc != 0) {
-		    rc = my_ll_deallocate(query_elem);
-		    query_elem = NULL;
-		    continue;
-		}
-
-		print_message(INFO_MESSAGE, "Number of LoadLeveler Nodes=%d in cluster=%s.\n",
-			      node_count, cluster_object->cluster_name);
-
-	/*-----------------------------------------------------------------------*
-         * loop on the nodes returned by LoadLeveler                             *
-         *-----------------------------------------------------------------------*/
-		i = 0;
-		while (node != NULL) {
-		    print_message(INFO_MESSAGE, "LoadLeveler Node %d:\n", i);
-		    rc = my_ll_get_data(node, LL_MachineName, &node_name);
-		    if (rc == 0) {
-			print_message(INFO_MESSAGE, "Node name=%s\n", node_name);
-			if ((node_object = get_node_in_hash(cluster_object->node_hash, node_name)) != NULL) {
-
-	      /*-----------------------------------------------------------------------*
-               * node returned by LoadLeveler was found in our ptp node list.          *
-               * flag it as found.                                                     *
-               *-----------------------------------------------------------------------*/
-			    node_object->node_found = 1;
-			    if (node_object->node_state != MY_STATE_UP) {
-				node_object->node_state = MY_STATE_UP;
-				sleep_time_reset = 1;
-				print_message(INFO_MESSAGE,
-					      "Schedule event notification: node=%s changed for LoadLeveler Cluster=%s.\n",
-					      node_name, cluster_object->cluster_name);
-				sendNodeChangeEvent(start_events_transid, cluster_object,
-						    node_object);
-			    }
-			}
-			else {	/* new node (not yet in list) */
-
-	      /*-----------------------------------------------------------------------*
-               * node returned by LoadLeveler was not found in our ptp node list       *
-               * add it and generate an event to the gui. flag it as added.            *
-               *-----------------------------------------------------------------------*/
-			    node_object = (NodeObject *) malloc(sizeof(NodeObject));
-			    malloc_check(node_object, __FUNCTION__, __LINE__);
-			    memset(node_object, '\0', sizeof(node_object));
-			    node_object->proxy_generated_node_id = generate_id();
-			    node_object->node_name = strdup(node_name);
-			    node_object->node_found = 2;
-			    node_object->node_state = MY_STATE_UP;
-			    sleep_time_reset = 1;
-			    add_node_to_hash(cluster_object->node_hash, (void *) node_object);
-			    sleep_time_reset = 1;
-			    print_message(INFO_MESSAGE,
-					  "Schedule event notification: node=%s added for LoadLeveler Cluster=%s.\n",
-					  node_name, cluster_object->cluster_name);
-			    sendNodeAddEvent(start_events_transid, cluster_object, node_object);
-			}
-		    }
-
-		    i++;
-		    node = my_ll_next_obj(query_elem);
-		}
-
-	/*-----------------------------------------------------------------------*
-         * loop on the ptp node list to see if any nodes were not returned       *
-         * by LoadLeveler on this pass (maybe they went down).                   *
-         * generate an event (changed/gone) to the gui.                          *
-         *-----------------------------------------------------------------------*/
-		node_hash = cluster_object->node_hash;
-		if (node_hash != NULL) {
-		    HashSet(node_hash);
-		    hash_element = HashGet(node_hash);
-		    while (hash_element != NULL) {
-			node_list = (List *) hash_element->h_data;
-			hash_element = HashGet(node_hash);
-			node_list_element = node_list->l_head;
-			while (node_list_element != NULL) {
-			    node_object = node_list_element->l_value;
-			    node_list_element = node_list_element->l_next;
-			    if (node_object->node_found == 0) {
-				if (node_object->node_state != MY_STATE_UNKNOWN) {
-				    node_object->node_state = MY_STATE_UNKNOWN;
-				    print_message(INFO_MESSAGE,
-						  "Schedule event notification: node=%s changed for LoadLeveler Cluster=%s.\n",
-						  node_name, cluster_object->cluster_name);
-				    sendNodeChangeEvent(start_events_transid, cluster_object,
-							node_object);
-				    sleep_time_reset = 1;
-				}
-			    }
-			    else {
-				node_object->node_found = 0;
-			    }
-			}
-
-		    }
-		}
-		if (query_elem != NULL) {
-		    rc = my_ll_free_objs(query_elem);
-		    rc = my_ll_deallocate(query_elem);
-		    query_elem = NULL;
-		}
-
-	    }
-	}
-	else {
-	    sleep_time_reset = 1;
-	}
-
-	pthread_mutex_unlock(&master_lock);
-
-    /*-----------------------------------------------------------------------*
-     * adjust sleep interval based on changes this pass.                     *
-     *-----------------------------------------------------------------------*/
-	if (sleep_time_reset == 1) {
-	    sleep_seconds = min_node_sleep_seconds;
-	}
-	else {
-	    sleep_seconds = sleep_seconds + min_node_sleep_seconds;
-	    if (sleep_seconds > max_node_sleep_seconds) {
-		sleep_seconds = max_node_sleep_seconds;
-	    }
-	}
-
-    /*-----------------------------------------------------------------------*
-     * sleep and loop again on the LoadLeveler machines.                     *
-     *-----------------------------------------------------------------------*/
-	if (state_shutdown_requested == 0) {
-	    int sleep_interval = 0;
-	    int mini_sleep_interval = (sleep_seconds + 4) / 5;
-	    print_message(INFO_MESSAGE, "%s Sleeping for (%d seconds) %d intervals of 5 seconds\n",
-			  __FUNCTION__, mini_sleep_interval * 5, mini_sleep_interval);
-	    for (sleep_interval = 0; sleep_interval < mini_sleep_interval; sleep_interval++) {
-		if (state_shutdown_requested == 0) {
-		    sleep(5);
-		}
-	    }
-	}
-
-    }
-
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return NULL;
-}
-
-/*************************************************************************
- * Service thread - Loop while allowed to monitor LoadLeveler for jobs   *
- *************************************************************************/
-void *
-monitor_LoadLeveler_jobs(void *job_ident)
-{
-    int rc = 0;
-    int i = 0;
-    char *job_name = NULL;
-    char *job_submit_host = NULL;
-    char *step_ID = NULL;
-    LL_STEP_ID ll_step_id;
-    int step_machine_count = 0;
-    LL_element *job = NULL;
-    LL_element *step = NULL;
-    LL_element *query_elem = NULL;
-    LL_element *node = NULL;
-    LL_element *task = NULL;
-    LL_element *task_instance = NULL;
-    int job_count = 0;
-    LL_element *errObj = NULL;
-    LL_cluster_param cluster_parm;
-    char *remote_cluster[2];
-    ListElement *job_list_element = NULL;
-    List *task_list = NULL;
-    ListElement *task_list_element = NULL;
-    char *task_instance_machine_name = NULL;
-    char *task_instance_machine_address = NULL;
-    int task_instance_task_ID = 0;
-    int step_node_count = 0;
-    int node_task_count = 0;
-    int task_instance_count = 0;
-    time_t my_clock;
-
-    ListElement *cluster_list_element = NULL;
-    ClusterObject *cluster_object = NULL;
-    JobObject *job_object = NULL;
-    TaskObject *task_object = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-  /*-----------------------------------------------------------------------*
-   * loop forever until we are told we are shutting down.                  *
-   *-----------------------------------------------------------------------*/
-    while (state_shutdown_requested == 0) {
-	pthread_mutex_lock(&master_lock);
-	if (state_shutdown_requested == 1) {
-	    pthread_mutex_unlock(&master_lock);
-	    break;
-	}
-	query_elem = NULL;
-	job_name = NULL;
-	step_ID = NULL;
-	job_count = 0;
-	step_machine_count = 0;
-	job = NULL;
-	char *pChar = NULL;
-
-	print_message(TRACE_MESSAGE, ">>> %s thread running. line=%d.\n", __FUNCTION__, __LINE__);
-
-	if (cluster_list != NULL) {
-
-      /*-----------------------------------------------------------------------*
-       * loop on the cluster list we obtained earlier from LoadLeveler.        *
-       *-----------------------------------------------------------------------*/
-	    cluster_list_element = cluster_list->l_head;
-	    while (cluster_list_element != NULL) {
-		cluster_object = cluster_list_element->l_value;
-		cluster_list_element = cluster_list_element->l_next;
-
-		if (cluster_object != NULL) {
-		    if (cluster_object->node_hash != NULL) {
-			if (cluster_object->node_hash->count > 0) {
-
-			    if (multicluster_status == 1) {
-
-	 /*-----------------------------------------------------------------------*
-          * we are running multicluster - set cluster name into environment       *
-          * to influence where LoadLeveler searches for data (what cluster)       *
-          *-----------------------------------------------------------------------*/
-				remote_cluster[0] = cluster_object->cluster_name;
-				remote_cluster[1] = NULL;
-				print_message(INFO_MESSAGE,
-					      "Setting access for LoadLeveler cluster=%s.\n",
-					      cluster_object->cluster_name);
-				cluster_parm.action = CLUSTER_SET;
-				cluster_parm.cluster_list = remote_cluster;
-				rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);
-			    }
-			    else {
-
-	 /*-----------------------------------------------------------------------*
-          * not running multicluster                                              *
-          *-----------------------------------------------------------------------*/
-				print_message(INFO_MESSAGE,
-					      "Setting access for LoadLeveler local cluster (single cluster).\n");
-				cluster_parm.action = CLUSTER_UNSET;
-				cluster_parm.cluster_list = NULL;
-				rc = my_ll_cluster(LL_API_VERSION, &errObj, &cluster_parm);
-			    }
-
-	/*-----------------------------------------------------------------------*
-         * build a LoadLeveler query object (for jobs)                           *
-         *-----------------------------------------------------------------------*/
-			    query_elem = my_ll_query(JOBS);
-			    if (query_elem == NULL) {
-				print_message(ERROR_MESSAGE,
-					      "Unable to obtain query element. LoadLeveler may not be active or is not responding.\n");
-				continue;
-			    }
-
-	/*-----------------------------------------------------------------------*
-         * set the request type for LoadLeveler (we want nodes)                  *
-         *-----------------------------------------------------------------------*/
-			    print_message(INFO_MESSAGE,
-					  "Call LoadLeveler (ll_set_request) for jobs in cluster=%s.\n",
-					  cluster_object->cluster_name);
-			    rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-			    if (rc != 0) {
-				rc = my_ll_deallocate(query_elem);
-				query_elem = NULL;
-				continue;
-			    }
-
-	/*-----------------------------------------------------------------------*
-         * get jobs from LoadLeveler for current or local cluster.               *
-         *-----------------------------------------------------------------------*/
-			    print_message(INFO_MESSAGE,
-					  "Call LoadLeveler (ll_get_objs) for jobs in cluster=%s.\n",
-					  cluster_object->cluster_name);
-			    job_count = 0;
-			    job = my_ll_get_objs(query_elem, LL_CM, NULL, &job_count, &rc);
-			    if (rc != 0) {
-				rc = my_ll_deallocate(query_elem);
-				query_elem = NULL;
-			    }
-
-			    print_message(INFO_MESSAGE,
-					  "Number of LoadLeveler Jobs=%d in cluster=%s.\n",
-					  job_count, cluster_object->cluster_name);
-
-	/*-----------------------------------------------------------------------*
-         * loop on the jobs returned by LoadLeveler                              *
-         *-----------------------------------------------------------------------*/
-			    i = 0;
-			    while (job != NULL) {
-				print_message(INFO_MESSAGE, "LoadLeveler Job %d:\n", i);
-				rc = my_ll_get_data(job, LL_JobSubmitHost, &job_submit_host);
-				rc = my_ll_get_data(job, LL_JobName, &job_name);
-				if (rc == 0) {	/* do something here with the job object */
-				    /*
-				     * For interactive PE jobs submitted thru LoadLeveler, there is no way to match
-				     * the invocation of the job thru PE and the appearance of the job in the Loadleveler
-				     * job queue since when the job is submitted, the only thing known is the pid of the poe
-				     * process, and the pid is not available in the responses to LoadLeveler queries. If the pid was
-				     * available, then we could match up based on reading the attach.cfg file generated by PE.
-				     * The alternative is to attempt to detect interactive PE jobs in the LoadLeveler job queue
-				     * and ignore them. The proxy threads created to monitor interactive PE status by watching for the
-				     * attach.cfg file and process termination will be responsible for creating the new job events
-				     * and associated events for the interactive PE job. This isn't 100% perfect, but with the available
-				     * information is probably the best that can be done.
-				     */
-				    int job_step_type;
-
-				    my_ll_get_data(job, LL_JobStepType, &job_step_type);
-				    if (job_step_type == INTERACTIVE_JOB) {
-					int job_is_remote;
-					char *submit_user_name;
-
-					my_ll_get_data(job, LL_JobIsRemote, &job_is_remote);
-					if (job_is_remote) {
-					    my_ll_get_data(job, LL_JobSubmittingUser,
-							   *submit_user_name);
-					}
-					else {
-					    LL_element *job_credentials;
-
-					    my_ll_get_data(job, LL_JobCredential, &job_credentials);
-					    my_ll_get_data(job_credentials, LL_CredentialUserName,
-							   &submit_user_name);
-					}
-					if (strcmp(my_username, submit_user_name) == 0) {
-					    print_message(INFO_MESSAGE,
-							  "Job %s is an interactive job for this user, and is ignored\n",
-							  job_name);
-					    free(submit_user_name);
-					    job = my_ll_next_obj(query_elem);
-					    continue;
-					}
-					else {
-					    free(submit_user_name);
-					}
-				    }
-				    print_message(INFO_MESSAGE, "Job name=%s\n", job_name);
-				    rc = my_ll_get_data(job, LL_JobGetFirstStep, &step);
-				    while (step != NULL) {
-					step_machine_count = 0;
-					rc = my_ll_get_data(step, LL_StepID, &step_ID);
-					if (rc != 0) {
-					    rc = my_ll_free_objs(query_elem);
-					    rc = my_ll_deallocate(query_elem);
-					    query_elem = NULL;
-					    continue;
-					}
-					else {
-
-	       /*-----------------------------------------------------------------------*
-                * break the job step name apart into a LoadLeveler LL_STEP_ID           *
-                *-----------------------------------------------------------------------*/
-					    ll_step_id.from_host = strdup(job_submit_host);
-					    pChar = step_ID + strlen(job_submit_host) + 1;
-					    pChar = strtok(pChar, ".");
-					    ll_step_id.cluster = atoi(pChar);
-					    pChar = strtok(NULL, ".");
-					    ll_step_id.proc = atoi(pChar);
-
-					    print_message(INFO_MESSAGE, "Job step ID=%s.%d.%d\n",
-							  ll_step_id.from_host, ll_step_id.cluster,
-							  ll_step_id.proc);
-					    if ((job_object = get_job_in_list(job_list, ll_step_id)) != NULL) {
-
-	      /*-----------------------------------------------------------------------*
-               * step returned by LoadLeveler was found in our ptp job list.           *
-               * flag it as found.                                                     *
-               *-----------------------------------------------------------------------*/
-						job_object->job_found = 1;
-						if (job_object->job_state == MY_STATE_UNKNOWN) {
-						    job_object->job_state = MY_STATE_IDLE;
-						    print_message(INFO_MESSAGE,
-								  "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n",
-								  job_object->ll_step_id.from_host,
-								  job_object->ll_step_id.cluster,
-								  job_object->ll_step_id.proc,
-								  job_object->cluster_name);
-						    sendJobChangeEvent(start_events_transid,
-								       job_object);
-						}
-						if (multicluster_status == 1) {
-						    if (strcmp(job_object->cluster_name, cluster_object->cluster_name) != 0) {
-							sendJobRemoveEvent(start_events_transid,
-									   job_object);
-							job_object->cluster_name = cluster_object->cluster_name;
-							sendJobAddEvent(start_events_transid,
-									cluster_object, job_object);
-						    }
-						}
-					    }
-					    else {
-
-	      /*-----------------------------------------------------------------------*
-               * job returned by LoadLeveler was not found in our ptp job list         *
-               * add it and generate an event to the gui. flag it as added.            *
-               *-----------------------------------------------------------------------*/
-						job_object =
-						    (JobObject *) malloc(sizeof(JobObject));
-						malloc_check(job_object, __FUNCTION__, __LINE__);
-						memset(job_object, '\0', sizeof(job_object));
-						job_object->proxy_generated_job_id = generate_id();
-						job_object->gui_assigned_job_id = "-1";
-						job_object->ll_step_id.from_host =
-						    strdup(ll_step_id.from_host);
-						job_object->ll_step_id.cluster = ll_step_id.cluster;
-						job_object->ll_step_id.proc = ll_step_id.proc;
-						job_object->job_found = 2;
-						job_object->job_state = MY_STATE_IDLE;
-						job_object->task_list = NewList();
-						job_object->cluster_name =
-						    strdup(cluster_object->cluster_name);
-						add_job_to_list(job_list, (void *) job_object);
-						print_message(INFO_MESSAGE,
-							      "Schedule event notification: Job=%s.%d.%d added for LoadLeveler Cluster=%s.\n",
-							      job_object->ll_step_id.from_host,
-							      job_object->ll_step_id.cluster,
-							      job_object->ll_step_id.proc,
-							      job_object->cluster_name);
-						sendJobAddEvent(start_events_transid,
-								cluster_object, job_object);
-					    }
-					    rc = my_ll_get_data(step, LL_StepNodeCount, &step_node_count);
-					    print_message(INFO_MESSAGE,
-							  "Step=%s.%d.%d. StepNodeCount=%d.\n",
-							  job_object->ll_step_id.from_host,
-							  job_object->ll_step_id.cluster,
-							  job_object->ll_step_id.proc,
-							  step_node_count);
-
-		/*-----------------------------------------------------------------------*
-                 * if this job from LoadLeveler has nodes (is running-like) then loop on *
-                 * the nodes to see task status for new or existing tasks.               *
-                 *-----------------------------------------------------------------------*/
-					    if (step_node_count > 0) {
-						rc = my_ll_get_data(step, LL_StepGetFirstNode, &node);	/* node */
-
-		  /*-----------------------------------------------------------------------*
-                   * loop on the nodes in the job returned by LoadLeveler                  *
-                   *-----------------------------------------------------------------------*/
-						while (node != NULL) {
-						    rc = my_ll_get_data(node, LL_NodeTaskCount, &node_task_count);
-						    print_message(INFO_MESSAGE,
-								  "NodeTaskCount=%d.\n",
-								  node_task_count);
-						    rc = my_ll_get_data(node, LL_NodeGetFirstTask, &task);
-
-		  /*-----------------------------------------------------------------------*
-                   * loop on the tasks in the job returned by LoadLeveler                  *
-                   *-----------------------------------------------------------------------*/
-						    while (task != NULL) {
-							rc = my_ll_get_data(task, LL_TaskTaskInstanceCount, &task_instance_count);
-							print_message(INFO_MESSAGE,
-								      "TaskInstanceCount=%d.\n",
-								      task_instance_count);
-							rc = my_ll_get_data(task, LL_TaskGetFirstTaskInstance, &task_instance);
-
-		      /*-----------------------------------------------------------------------*
-                       * loop on the task_instances in the job returned by LoadLeveler         *
-                       *-----------------------------------------------------------------------*/
-							while (task_instance != NULL) {
-							    rc = my_ll_get_data(task_instance, LL_TaskInstanceMachineName, &task_instance_machine_name);
-							    rc = my_ll_get_data(task_instance, LL_TaskInstanceMachineAddress, &task_instance_machine_address);
-							    rc = my_ll_get_data(task_instance, LL_TaskInstanceTaskID, &task_instance_task_ID);
-							    print_message(INFO_MESSAGE,
-									  "TaskInstanceMachineName=%s. TaskInstanceMachineAddress=%s. TaskInstanceTaskID=%d.\n",
-									  task_instance_machine_name,
-									  task_instance_machine_address,
-									  task_instance_task_ID);
-							    if ((task_object = get_task_in_list(job_object->task_list, task_instance_machine_name, task_instance_task_ID)) != NULL) {
-
-			 /*-----------------------------------------------------------------------*
-                         * task returned by LoadLeveler was found in our ptp job task list.      *
-                         * flag it as found.                                                     *
-                         *-----------------------------------------------------------------------*/
-								task_object->ll_task_id =
-								    task_instance_task_ID;
-								task_object->task_found = 1;
-								if (task_object->task_state !=
-								    MY_STATE_RUNNING) {
-								    task_object->task_state =
-									MY_STATE_RUNNING;
-								    print_message(INFO_MESSAGE,
-										  "Schedule event notification: Task_ID=%d running on node_name=%s added for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n",
-										  task_object->ll_task_id,
-										  task_object->node_name,
-										  job_object->ll_step_id.
-										  from_host,
-										  job_object->ll_step_id.
-										  cluster,
-										  job_object->ll_step_id.proc,
-										  job_object->cluster_name);
-								    sendTaskChangeEvent
-									(start_events_transid,
-									 job_object, task_object);
-								}
-								if (job_object->job_state !=
-								    MY_STATE_RUNNING) {
-								    job_object->job_state =
-									MY_STATE_RUNNING;
-								    print_message(INFO_MESSAGE,
-										  "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n",
-										  job_object->ll_step_id.
-										  from_host,
-										  job_object->ll_step_id.
-										  cluster,
-										  job_object->ll_step_id.proc,
-										  job_object->cluster_name);
-								    sendJobChangeEvent
-									(start_events_transid,
-									 job_object);
-								}
-							    }
-							    else {
-
-			   /*-----------------------------------------------------------------------*
-                            * task returned by LoadLeveler was not found in our ptp job task list   *
-                            * add it and generate an event to the gui. flag it as added.            *
-                            *-----------------------------------------------------------------------*/
-								task_object =
-								    (TaskObject *)
-								    malloc(sizeof(TaskObject));
-								malloc_check(task_object,
-									     __FUNCTION__,
-									     __LINE__);
-								memset(task_object, '\0', sizeof(task_object));
-								task_object->proxy_generated_task_id = generate_id();
-								task_object->ll_task_id =
-								    task_instance_task_ID;
-								task_object->node_name =
-								    strdup
-								    (task_instance_machine_name);
-								task_object->node_address =
-								    strdup
-								    (task_instance_machine_address);
-								task_object->task_found = 2;	/* flag it as added */
-								task_object->task_state =
-								    MY_STATE_RUNNING;
-								print_message(INFO_MESSAGE,
-									      "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n",
-									      job_object->ll_step_id.from_host,
-									      job_object->ll_step_id.cluster,
-									      job_object->ll_step_id.proc,
-									      job_object->cluster_name);
-								if (job_object->job_state !=
-								    MY_STATE_RUNNING) {
-								    job_object->job_state =
-									MY_STATE_RUNNING;
-								    print_message(INFO_MESSAGE,
-										  "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n",
-										  job_object->ll_step_id.
-										  from_host,
-										  job_object->ll_step_id.
-										  cluster,
-										  job_object->ll_step_id.proc,
-										  job_object->cluster_name);
-								    sendJobChangeEvent
-									(start_events_transid,
-									 job_object);
-								}
-								add_task_to_list(job_object->task_list, (void *) task_object);
-								print_message(INFO_MESSAGE,
-									      "Schedule event notification: Task_ID=%d running on node_name=%s added for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n",
-									      task_object->ll_task_id,
-									      task_object->node_name,
-									      job_object->ll_step_id.from_host,
-									      job_object->ll_step_id.cluster,
-									      job_object->ll_step_id.proc,
-									      job_object->cluster_name);
-								sendTaskAddEvent
-								    (start_events_transid,
-								     cluster_object, job_object,
-								     task_object);
-							    }
-							    rc = my_ll_get_data(task, LL_TaskGetNextTaskInstance, &task_instance);
-							}
-							rc = my_ll_get_data(node, LL_NodeGetNextTask, &task);
-						    }
-						    rc = my_ll_get_data(step, LL_StepGetNextNode, &node);
-						}
-					    }
-
-		/*-----------------------------------------------------------------------*
-                 * loop on the tasks in the job object - if any not found that were      *
-                 * present before then generate deleted task events.                     *
-                 *-----------------------------------------------------------------------*/
-					    task_list = (List *) job_object->task_list;
-					    task_list_element = task_list->l_head;
-					    while (task_list_element != NULL) {
-						task_object = task_list_element->l_value;
-						task_list_element = task_list_element->l_next;
-						if (task_object != 0) {
-						    if (task_object->task_found == 0) {
-							task_object->task_state =
-							    MY_STATE_TERMINATED;
-							task_object->task_found = 0;
-							print_message(INFO_MESSAGE,
-								      "Schedule event notification: Task_ID=%d running on node_name=%s deleted for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n",
-								      task_object->ll_task_id,
-								      task_object->node_name,
-								      job_object->ll_step_id.
-								      from_host,
-								      job_object->ll_step_id.
-								      cluster,
-								      job_object->ll_step_id.proc,
-								      job_object->cluster_name);
-							sendTaskRemoveEvent(start_events_transid,
-									    job_object,
-									    task_object);
-							delete_task_from_list(task_list, task_object);
-							if (SizeOfList(task_list) == 0) {
-							    if (job_object->job_state ==
-								MY_STATE_RUNNING) {
-								job_object->job_state = MY_STATE_TERMINATED;
-								print_message(INFO_MESSAGE,
-									      "Schedule event notification: Job=%s.%d.%d terminated for LoadLeveler Cluster=%s.\n",
-									      job_object->ll_step_id.from_host,
-									      job_object->ll_step_id.cluster,
-									      job_object->ll_step_id.proc,
-									      job_object->cluster_name);
-								sendJobChangeEvent
-								    (start_events_transid,
-								     job_object);
-							    }
-							    else {
-								job_object->job_state =
-								    MY_STATE_IDLE;
-								print_message(INFO_MESSAGE,
-									      "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n",
-									      job_object->ll_step_id.from_host,
-									      job_object->ll_step_id.cluster,
-									      job_object->ll_step_id.proc,
-									      job_object->cluster_name);
-								sendJobChangeEvent
-								    (start_events_transid,
-								     job_object);
-							    }
-							}
-						    }
-						    else {
-							task_object->task_found = 0;
-						    }
-						}
-					    }
-
-
-					    rc = my_ll_get_data(job, LL_JobGetNextStep, &step);
-					}
-				    }
-				}
-
-				i++;
-				job = my_ll_next_obj(query_elem);
-			    }
-			}
-		    }
-		}
-		if (query_elem != NULL) {
-		    rc = my_ll_free_objs(query_elem);
-		    rc = my_ll_deallocate(query_elem);
-		    query_elem = NULL;
-		}
-	    }
-
-	    if (query_elem != NULL) {
-		rc = my_ll_free_objs(query_elem);
-		rc = my_ll_deallocate(query_elem);
-		query_elem = NULL;
-	    }
-
-      /*-----------------------------------------------------------------------*
-       * get the time and see if job has been sitting in submitted state too   *
-       * long.                                                                 *
-       *-----------------------------------------------------------------------*/
-	    time(&my_clock);
-
-      /*-----------------------------------------------------------------------*
-       * loop on the ptp job list to see if any jobs were not returned         *
-       * by LoadLeveler on this pass (maybe they went down).                   *
-       * generate an event (changed/gone) to the gui.                          *
-       *-----------------------------------------------------------------------*/
-	    if (job_list != NULL) {
-		job_list_element = job_list->l_head;
-		while (job_list_element != NULL) {
-		    job_object = job_list_element->l_value;
-		    job_list_element = job_list_element->l_next;
-		    if ((job_object->job_found == 0) &&
-			((job_object->job_state != MY_STATE_UNKNOWN) ||
-			 ((my_clock - job_object->job_submit_time) > 300))) {
-			job_object->job_found = 0;
-
-	    /*-----------------------------------------------------------------------*
-             * loop on the tasks in the job object - send deleted event and mark     *
-             * all deleted.                                                          *
-             *-----------------------------------------------------------------------*/
-			task_list = (List *) job_object->task_list;
-			task_list_element = task_list->l_head;
-			while (task_list_element != NULL) {
-			    task_object = task_list_element->l_value;
-			    task_list_element = task_list_element->l_next;
-			    if (task_object != 0) {
-				print_message(INFO_MESSAGE,
-					      "Schedule event notification: Task_ID=%d deleted on node_name=%s deleted for LoadLeveler Job=%s.%d.%d for LoadLeveler Cluster=%s.\n",
-					      task_object->ll_task_id, task_object->node_name,
-					      job_object->ll_step_id.from_host,
-					      job_object->ll_step_id.cluster,
-					      job_object->ll_step_id.proc,
-					      job_object->cluster_name);
-				sendTaskRemoveEvent(start_events_transid, job_object, task_object);
-				delete_task_from_list(task_list, task_object);
-				if (SizeOfList(task_list) == 0) {
-				    job_object->job_state = MY_STATE_IDLE;
-				    print_message(INFO_MESSAGE,
-						  "Schedule event notification: Job=%s.%d.%d changed for LoadLeveler Cluster=%s.\n",
-						  job_object->ll_step_id.from_host,
-						  job_object->ll_step_id.cluster,
-						  job_object->ll_step_id.proc,
-						  job_object->cluster_name);
-				    sendJobChangeEvent(start_events_transid, job_object);
-				}
-			    }
-			}
-
-			job_object->job_state = MY_STATE_TERMINATED;
-			print_message(INFO_MESSAGE,
-				      "Schedule event notification: Job=%s.%d.%d terminated for LoadLeveler Cluster=%s.\n",
-				      job_object->ll_step_id.from_host,
-				      job_object->ll_step_id.cluster, job_object->ll_step_id.proc,
-				      job_object->cluster_name);
-			sendJobChangeEvent(start_events_transid, job_object);
-			print_message(INFO_MESSAGE,
-				      "Schedule event notification: Job=%s.%d.%d deleted for LoadLeveler Cluster=%s.\n",
-				      job_object->ll_step_id.from_host,
-				      job_object->ll_step_id.cluster, job_object->ll_step_id.proc,
-				      job_object->cluster_name);
-			sendJobRemoveEvent(start_events_transid, job_object);
-		    }
-		    else {
-			job_object->job_found = 0;
-		    }
-		}
-	    }
-	}
-	pthread_mutex_unlock(&master_lock);
-
-    /*-----------------------------------------------------------------------*
-     * sleep and loop again on the LoadLeveler machines.                     *
-     *-----------------------------------------------------------------------*/
-	if (state_shutdown_requested == 0) {
-	    int sleep_interval = 0;
-	    int mini_sleep_interval = (job_sleep_seconds + 4) / 5;
-	    print_message(INFO_MESSAGE, "%s Sleeping for (%d seconds) %d intervals of 5 seconds\n",
-			  __FUNCTION__, mini_sleep_interval * 5, mini_sleep_interval);
-	    for (sleep_interval = 0; sleep_interval < mini_sleep_interval; sleep_interval++) {
-		if (state_shutdown_requested == 0) {
-		    struct timespec wakeup_time;
-		    int status;
-
-		    gettimeofday(&wakeup_time, NULL);
-		    wakeup_time.tv_sec = wakeup_time.tv_sec + 5;
-		    pthread_mutex_lock(&job_notify_lock);
-		    status =
-			pthread_cond_timedwait(&job_notify_condvar, &job_notify_lock, &wakeup_time);
-		    pthread_mutex_unlock(&job_notify_lock);
-		    if (status == 0) {
-			print_message(INFO_MESSAGE, "Main thread requests job query\n");
-			break;
-		    }
-		    else {
-			if (status != ETIMEDOUT) {
-			    print_message(INFO_MESSAGE,
-					  "Error in condition wait in job query thread: %s(%d)\n",
-					  strerror(status), status);
-			}
-			else {
-			    print_message(INFO_MESSAGE,
-					  "Job query thread woke up after 5 second wait\n");
-			}
-		    }
-		}
-	    }
-	}
-    }
-
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return NULL;
-}
-#endif
-
-/**************************************************************************/
-
-/* Support functions                                                      */
-
-/**************************************************************************/
-char **
-create_exec_parmlist(char *execname, char *targetname, char *args, char *helper)
-{
-    char *tokenized_args;
-    char *cp;
-    char **argv;
-    int i;
-    int arg_count;
-    int state;
-    char quote;
-    /*
-     * Process argument list to 'poe' command. This is done in two passes
-     * The first pass determines how many arguments there are so that argv
-     * can be allocated, and terminates each arg with a '\0'.  The first
-     * pass ignores whitespace outside of quoted strings when counting
-     * and tokenizing args. It must preserve spaces within quoted strings
-     * and also deal with quoted strings within an arg, for instance
-     * 'This is an arg with a "quoted string" inside'
-     */
-    TRACE_ENTRY;
-    arg_count = 3;
-    if (helper)
-    	arg_count++;
-    if (args == NULL) {
-	argv = malloc(arg_count * sizeof(char *));
-	malloc_check(argv, __FUNCTION__, __LINE__);
-	i = 0;
-	argv[i++] = execname;
-#ifdef PE_DUAL_POE_DEBUG
-	if (helper)
-		argv[i++] = helper;
-#endif
-	argv[i++] = targetname;
-	argv[i++] = NULL;
-    }
-    else {
-	quote = '\0';
-	tokenized_args = strdup(args);
-	cp = tokenized_args;
-	state = SKIPPING_SPACES;
-	while (*cp != '\0') {
-	    switch (*cp) {
-		case ' ':
-		    if (state == PARSING_UNQUOTED_ARG) {
-				arg_count++;
-			*cp = '\0';
-			state = SKIPPING_SPACES;
-		    }
-		    break;
-		case '"':
-		case '\'':
-		    if (state == PARSING_QUOTED_ARG) {
-			if (*cp == quote) {
-				arg_count++;
-			    quote = '\0';
-			    *cp = '\0';
-			    state = SKIPPING_SPACES;
-			}
-			else {
-			    quote = *cp;
-			    state = PARSING_QUOTED_ARG;
-			}
-		    }
-		    break;
-		default:
-		    if (state == SKIPPING_SPACES) {
-			state = PARSING_UNQUOTED_ARG;
-		    }
-	    }
-	    cp++;
-	}
-	if (state != SKIPPING_SPACES) {
-	    /*
-	     * Last arg is terminated by ending '\0' so needs to be counted here
-	     */
-		arg_count++;
-	}
-	/*
-	 * The second pass allocates argv, with one extra slot for the
-	 * poe executable, one for the name of the executable invoked by
-	 * poe and one for the terminating null pointer. It then builds the
-	 * argv array by scanning for the start of each arg, skipping
-	 * over an initial quote, if present. The trailing quote in a
-	 * quoted arg was removed by the first pass tokenizing step.
-	 */
-	argv = malloc(sizeof(char *) * arg_count);
-	malloc_check(argv, __FUNCTION__, __LINE__);
-	i = 0;
-	argv[i++] = execname;
-#ifdef PE_DUAL_POE_DEBUG
-	if (helper)
-		argv[i++] = helper;
-#endif
-	argv[i++] = targetname;
-	cp = tokenized_args;
-	state = SKIPPING_SPACES;
-	while (i < (arg_count + 2)) {
-	    if (state == SKIPPING_SPACES) {
-		if (*cp != ' ') {
-		    state = SKIPPING_CHARS;
-		    if ((*cp == '"') || (*cp == '\'')) {
-			argv[i] = cp + 1;
-		    }
-		    else {
-			argv[i] = cp;
-		    }
-		    i++;
-		}
-	    }
-	    else {
-		if (*cp == '\0') {
-		    state = SKIPPING_SPACES;
-		}
-	    }
-	    cp++;
-	}
-	argv[i] = NULL;
-    }
-    TRACE_EXIT;
-    return argv;
-}
-
-char **
-create_debug_parmlist(char *debugname, int debug_args_count, char **debug_args)
-{
-    char **argv;
-    int n;
-    int i;
-
-    argv = (char **) malloc((debug_args_count + 3) * sizeof(char *));
-    malloc_check(argv, __FUNCTION__, __LINE__);
-    n = 0;
-    argv[n++] = debugname;
-    argv[n++] = "--master";
-    for (i = 0; i < debug_args_count; i++) {
-	argv[n++] = debug_args[i];
-    }
-    argv[n++] = NULL;
-    return argv;
-}
-
-char **
-create_child_sdm_parmlist(char *debugdir, char *debugname, int debug_args_count, char **debug_args)
-{
-    char *debugger;
-    char **argv;
-    int len;
-    int n;
-    int i;
-
-    len = strlen(debugdir) + strlen(debugname) + 2;
-    debugger = (char *) malloc(len * sizeof(char));
-    malloc_check(debugger, __FUNCTION__, __LINE__);
-    argv = (char **) malloc((debug_args_count + 3) * sizeof(char *));
-    malloc_check(argv, __FUNCTION__, __LINE__);
-    sprintf(debugger, "%s/%s", debugdir, debugname);
-    n = 0;
-    argv[n++] = "poe";
-    argv[n++] = debugger;
-    for (i = 0; i < debug_args_count; i++) {
-	argv[n++] = debug_args[i];
-    }
-    argv[n++] = NULL;
-    return argv;
-}
-
-char **
-create_env_array(char *args[], int split_io, char *mp_buffer_mem, char *mp_rdma_count, char *debugger_id, int is_debugger)
-{
-    /*
-     * Set up the environment variable array for the target application.
-     * Environment variables have two forms. Environment variables set on
-     * the environment tab of the launch configuration have the form
-     * env=HOME=/home/ptpuser. PE environment variables set on the
-     * parallel tab of the launch configuration have the form MP_PROCS=2
-     * Both types of environment variables are added to the application
-     * environment array in the form HOME=/home/ptpuser.
-     * The user may have requested stdout output to be split by task. If so,
-     * then MP_LABELIO must be set to 'yes' as the last environment variable
-     * setting in the array.
-     * No other environment variables are passed to the application.
-     */
-    int i;
-    int has_mp_procs = 0;
-
-    TRACE_ENTRY;
-    env_array_size = 100;
-    next_env_entry = 0;
-    env_array = (char **) malloc(sizeof(char *) * env_array_size);
-    for (i = 0; args[i] != NULL; i++) {
-	if (strncmp(args[i], "MP_", 3) == 0) {
-#ifdef PE_DUAL_POE_DEBUG
-		if (is_debugger && strncmp(args[i], "MP_PROCS=", 9) == 0) {
-			int nprocs = atoi(args[i] + 9) + 1;
-			char procs_str[128];
-
-			snprintf(procs_str, sizeof(procs_str), "MP_PROCS=%d", nprocs);
-			add_environment_variable(strdup(procs_str));
-			has_mp_procs = 1;
-		}
-		else if (is_debugger && strncmp(args[i], "MP_MSG_API=", 11) == 0) {
-			/* Strip this out and replace with PE_DEBUG_MSG_API (see below) */;
-		}
-		else {
-			add_environment_variable(strdup(args[i]));
-		}
-#else
-		add_environment_variable(strdup(args[i]));
-#endif
-	}
-	else {
-	    if (strncmp(args[i], "env=", 4) == 0) {
-	    	add_environment_variable(strdup(args[i]) + 4);
-	    }
-	}
-    }
-#ifdef PE_DUAL_POE_DEBUG
-    if (is_debugger && !has_mp_procs)
-    	add_environment_variable("MP_PROCS=2");
-#endif
-
-    if (split_io == 1) {
-	add_environment_variable("MP_LABELIO=yes");
-    }
-    if (mp_buffer_mem && mp_buffer_mem[0] != '\0') {
-	add_environment_variable(mp_buffer_mem);
-    }
-    if (mp_rdma_count && mp_rdma_count[0] != '\0') {
-	add_environment_variable(mp_rdma_count);
-    }
-#ifdef PE_DUAL_POE_DEBUG
-    if (debugger_id && debugger_id[0] != '\0') {
-    	add_environment_variable(debugger_id);
-    }
-#endif
-    if (use_load_leveler) {
-	add_environment_variable("MP_RESD=yes");
-	print_message(TRACE_DETAIL_MESSAGE, "PE Job uses LoadLeveler resource management\n");
-    }
-    else {
-	add_environment_variable("MP_RESD=no");
-    }
-    add_environment_variable(NULL);
-    TRACE_EXIT;
-    return env_array;
-}
-
-/*
- * Add the specified environment variable to the poe process environment variable set
- */
-void
-add_environment_variable(char *env_var)
-{
-    if (next_env_entry >= env_array_size) {
-	env_array_size = env_array_size + 10;
-	env_array = (char **) realloc(env_array, sizeof(char *) * env_array_size);
-	malloc_check(env_array, __FUNCTION__, __LINE__);
-    }
-    env_array[next_env_entry++] = env_var;
-}
-
-/*
- * Set up the file descriptor for stdio output files
- */
-int
-setup_stdio_fd(int run_trans_id, char *subid, int pipe_fds[], char *path, char *stdio_name, int *fd,
-	       int *redirect)
-{
-    int status;
-
-    TRACE_ENTRY;
-    if (path == NULL) {
-	status = pipe(pipe_fds);
-	if (status == -1) {
-	    snprintf(emsg_buffer, sizeof emsg_buffer,
-		     "Error creating %s pipe: %s", stdio_name, strerror(errno));
-	    emsg_buffer[sizeof emsg_buffer - 1] = '\0';
-	    post_submitjob_error(run_trans_id, subid, emsg_buffer);
-	    TRACE_EXIT;
-	    return -1;
-	}
-	status = fcntl(pipe_fds[0], F_SETFL, O_NONBLOCK);
-	if (status == -1) {
-	    snprintf(emsg_buffer, sizeof emsg_buffer,
-		     "Error initializing %s pipe: %s", stdio_name, strerror(errno));
-	    emsg_buffer[sizeof emsg_buffer - 1] = '\0';
-	    post_submitjob_error(run_trans_id, subid, emsg_buffer);
-	    TRACE_EXIT;
-	    return -1;
-	}
-	*fd = pipe_fds[0];
-	*redirect = 0;
-    }
-    else {
-	*fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0644);
-	if (*fd == -1) {
-	    snprintf(emsg_buffer, sizeof emsg_buffer,
-		     "Error redirecting %s to %s: %s", stdio_name, path, strerror(errno));
-	    emsg_buffer[sizeof emsg_buffer - 1] = '\0';
-	    post_submitjob_error(run_trans_id, subid, emsg_buffer);
-	    TRACE_EXIT;
-	    return -1;
-	}
-	*redirect = 1;
-    }
-    TRACE_EXIT;
-    return 0;
-}
-
-/*
- * Set up a stdio file descriptor for child process so it is redirected to a file or pipe
- */
-int
-setup_child_stdio(int run_trans_id, char *subid, int stdio_fd, int redirect, int *file_fd, int pipe_fd[])
-{
-    int status;
-
-    TRACE_ENTRY;
-    if (redirect) {
-	status = dup2(*file_fd, stdio_fd);
-    }
-    else {
-	close(pipe_fd[0]);
-	status = dup2(pipe_fd[1], stdio_fd);
-    }
-    if (status == -1) {
-	snprintf(emsg_buffer, sizeof emsg_buffer,
-		 "Error setting stdio file descriptor (%d) for application: %s",
-		 stdio_fd, strerror(errno));
-	emsg_buffer[sizeof emsg_buffer - 1] = '\0';
-	post_submitjob_error(run_trans_id, subid, emsg_buffer);
-    }
-    TRACE_EXIT;
-    return status;
-}
-
-void
-update_nodes(int trans_id, FILE * hostlist)
-{
-    /*
-     * Create a node list, containing unique nodes, from the hostlist file.
-     * Each time this function is called, new nodes may be referenced in the
-     * hostlist since there is no restriction on modifying the hostlist. Any
-     * new nodes will be added to the machine configuration.
-     *
-     * Message format for nodes message is event-id (RTEV_NATTR) followed by
-     * encoded key-value pairs where each token is preceded with one space.
-     * Multiple consecutive spaces in the message will cause parsing errors
-     * in the Java code handling the response.
-     */
-    char *res;
-    char *valstr;
-    char hostname[256];
-    List *new_nodes;
-
-    TRACE_ENTRY;
-    valstr = NULL;
-    res = fgets(hostname, sizeof(hostname), hostlist);
-    new_nodes = NewList();
-    while (res != NULL) {
-	char *cp;
-
-	/*
-	 * Truncate node name to short form name
-	 */
-	cp = strpbrk(hostname, ".\n\r");
-	if (cp != NULL) {
-	    *cp = '\0';
-	}
-	if (find_node(hostname) == NULL) {
-	    node_refcount *node;
-
-	    node = add_node(hostname);
-	    AddToList(new_nodes, node);
-	    node_count = node_count + 1;
-	}
-	res = fgets(hostname, sizeof(hostname), hostlist);
-    }
-    send_new_node_list(start_events_transid, machine_id, new_nodes);
-    DestroyList(new_nodes, NULL);
-    TRACE_EXIT;
-}
-
-node_refcount *
-find_node(char *key)
-{
-    /*
-     * Look for node with matching key in the node list. The HashSearch
-     * function only looks for a matching hash value. Since multiple keys
-     * may hash to the same hash value, an additional check needs to be
-     * made of keys that hash to the same value before determining a true
-     * match.
-     */
-    int hash;
-    List *node_list;
-
-    TRACE_ENTRY;
-    TRACE_DETAIL_V("+++ Looking for node '%s'\n", key);
-    hash = HashCompute(key, strlen(key));
-    node_list = HashSearch(nodes, hash);
-    if (node_list == NULL) {
-	TRACE_EXIT;
-	return NULL;
-    }
-    else {
-	node_refcount *node;
-
-	/*
-	 * Optimally, this code would obtain a lock on the hash node rather
-	 * than locking all accesses to nodes, but currently the hash entry
-	 * only contains a pointer to the list. If this becomes a problem
-	 * then the hash object could be replaced with a structure
-	 * containing the node lock and the list pointer.
-	 */
-	pthread_mutex_lock(&node_lock);
-	SetList(node_list);
-	node = GetListElement(node_list);
-	while (node != NULL) {
-	    if (strcmp(key, node->key) == 0) {
-		break;
-	    }
-	    node = GetListElement(node_list);
-	}
-	pthread_mutex_unlock(&node_lock);
-	TRACE_EXIT;
-	return node;
-    }
-}
-
-node_refcount *
-add_node(char *key)
-{
-    /*
-     * Add a node to the node list. Since the hash functions in hash.c only
-     * detect duplicate hash values, and not keys that map to the same hash
-     * value, the data at each node in the hash table is a simple linked
-     * list of keys that map to the same hash and the associated data.
-     */
-    int hash;
-    node_refcount *node;
-    List *node_list;
-
-    /*
-     * Create the node for the hostname. The node key is the node's hostname
-     */
-    TRACE_ENTRY;
-    node = malloc(sizeof(node_refcount));
-    malloc_check(node, __FUNCTION__, __LINE__);
-    node->key = strdup(key);
-    node->node_number = global_node_index;
-    global_node_index = global_node_index + 1;
-    node->proxy_nodeid = generate_id();
-    node->task_count = 0;
-    /*
-     * Look for the hash key. If the hash key already exists, then
-     * just add the hostname to the list for the hash key. Otherwise,
-     * create a new list, add the hostname to the list and then add the
-     * node list as the 'data' for the hash node.
-     */
-    hash = HashCompute(key, strlen(key));
-    node_list = HashSearch(nodes, hash);
-    if (node_list == NULL) {
-	node_list = NewList();
-	AddToList(node_list, node);
-	HashInsert(nodes, hash, node_list);
-    }
-    else {
-	AddToList(node_list, node);
-    }
-    TRACE_EXIT;
-    return node;
-}
-
-void
-update_node_refcounts(int numtasks, taskinfo * tasks)
-{
-    /*
-     * Update node reference counts (number of tasks running on node),
-     * subtracting 1 for each appearance of a node name in the task
-     * list. If the count for a node is zero, then that node needs to
-     * be removed from the node list and the front end notified.
-     */
-    node_refcount *noderef;
-    int i;
-
-    TRACE_ENTRY;
-    for (i = 0; i < numtasks; i++) {
-	noderef = find_node(tasks[i].hostname);
-	if (noderef == NULL) {
-	    print_message(TRACE_DETAIL_MESSAGE,
-			  "Failed to find expected node %s\n", tasks[i].hostname);
-	}
-	else {
-	    noderef->task_count = noderef->task_count - 1;
-	    if (noderef->task_count <= 0) {
-		print_message(TRACE_DETAIL_MESSAGE,
-			      "No tasks left on %s, deleting\n", tasks[i].hostname);
-		delete_noderef(tasks[i].hostname);
-	    }
-	    else {
-		print_message(TRACE_DETAIL_MESSAGE,
-			      "Refcount for %s is %d\n", tasks[i].hostname, noderef->task_count);
-	    }
-	}
-    }
-    TRACE_EXIT;
-}
-
-void
-delete_noderef(char *hostname)
-{
-    /*
-     * delete node from the node list and notify the front end
-     */
-    int hash;
-    List *node_list;
-    node_refcount *node;
-
-    TRACE_ENTRY;
-    hash = HashCompute(hostname, strlen(hostname));
-    node_list = HashSearch(nodes, hash);
-    if (node_list == NULL) {
-	TRACE_EXIT;
-	return;
-    }
-    pthread_mutex_lock(&node_lock);
-    SetList(node_list);
-    node = GetListElement(node_list);
-    while (node != NULL) {
-	if (strcmp(node->key, hostname) == 0) {
-	    char node_number[11];
-
-	    free(node->key);
-	    RemoveFromList(node_list, node);
-	    sprintf(node_number, "%d", node->proxy_nodeid);
-	    print_message(TRACE_DETAIL_MESSAGE, "Sending delete event for node %s\n", node_number);
-	    enqueue_event(proxy_remove_node_event(start_events_transid, node_number));
-	    free(node);
-	    break;
-	}
-	node = GetListElement(node_list);
-    }
-    pthread_mutex_unlock(&node_lock);
-    TRACE_EXIT;
-}
-
-void
-delete_task_list(int numtasks, taskinfo * tasks)
-{
-    int i;
-
-    TRACE_ENTRY;
-    for (i = 0; i < numtasks; i++) {
-	if (tasks[i].hostname != NULL) {
-	    free(tasks[i].hostname);
-	}
-	if (tasks[i].ipaddr != NULL) {
-	    free(tasks[i].ipaddr);
-	}
-    }
-    free(tasks);
-    TRACE_EXIT;
-}
-
-void
-hash_cleanup(void *hash_list)
-{
-    TRACE_ENTRY;
-    DestroyList(hash_list, NULL);
-    TRACE_EXIT;
-}
-
-void *
-kill_process(void *pid)
-{
-    TRACE_ENTRY;
-    sleep(60);
-    kill((pid_t) pid, 9);
-    TRACE_EXIT;
-    return NULL;
-}
-
-void
-malloc_check(void *p, const char *function, int line)
-{
-    if (p == NULL) {
-	print_message(FATAL_MESSAGE,
-		      "Memory allocation error in resource manager in %s (line %d)\n",
-		      function, line);
-	exit(1);
-    }
-
-}
-
-#ifdef HAVE_LLAPI_H
-
-int
-load_load_leveler_library(int trans_id)
-{
-    int dlopen_mode;
-    int my_errno;
-
-    memset(&LL_SYMS, '\0', sizeof(LL_SYMS));	/* zero the LoadLeveler dlsym symbol table */
-    dlopen_mode = 0;
-    print_message(INFO_MESSAGE, "dlopen LoadLeveler shared library %s.\n", ibmll_libpath_name);
-#ifdef _AIX
-    dlopen_mode = RTLD_LOCAL | RTLD_NOW | RTLD_MEMBER;
-#else
-    dlopen_mode = RTLD_LOCAL | RTLD_NOW;
-#endif
-    ibmll_libpath_handle = dlopen(ibmll_libpath_name, dlopen_mode);
-    my_errno = errno;
-    if (ibmll_libpath_handle == NULL) {
-	print_message(ERROR_MESSAGE, "dlopen of %s failed with errno=%d.\n", ibmll_libpath_name,
-		      my_errno);
-#if 0
-	sendErrorEvent(trans_id, RTEV_ERROR_LL_INIT,
-		       "dlopen failed for LoadLeveler shared library");
-#endif
-	return PROXY_RES_ERR;
-    }
-    else {
-	print_message(INFO_MESSAGE, "dlopen %s successful.\n", ibmll_libpath_name);
-    }
-
-    print_message(INFO_MESSAGE, "Locating LoadLeveler functions via dlsym.\n");
-    *(void **) (&(LL_SYMS.ll_query)) = dlsym(ibmll_libpath_handle, "ll_query");
-    *(void **) (&LL_SYMS.ll_set_request) = dlsym(ibmll_libpath_handle, "ll_set_request");
-    *(void **) (&LL_SYMS.ll_get_objs) = dlsym(ibmll_libpath_handle, "ll_get_objs");
-    *(void **) (&LL_SYMS.ll_get_data) = dlsym(ibmll_libpath_handle, "ll_get_data");
-    *(void **) (&LL_SYMS.ll_free_objs) = dlsym(ibmll_libpath_handle, "ll_free_objs");
-    *(void **) (&LL_SYMS.ll_deallocate) = dlsym(ibmll_libpath_handle, "ll_deallocate");
-    *(void **) (&LL_SYMS.ll_next_obj) = dlsym(ibmll_libpath_handle, "ll_next_obj");
-    *(void **) (&LL_SYMS.ll_cluster)
-	= dlsym(ibmll_libpath_handle, "ll_cluster");
-    *(void **) (&LL_SYMS.ll_submit_job) = dlsym(ibmll_libpath_handle, "llsubmit");
-    *(void **) (&LL_SYMS.ll_terminate_job) = dlsym(ibmll_libpath_handle, "ll_terminate_job");
-    *(void **) (&LL_SYMS.ll_free_job_info) = dlsym(ibmll_libpath_handle, "llfree_job_info");
-    *(void **) (&LL_SYMS.ll_error) = dlsym(ibmll_libpath_handle, "ll_error");
-    if ((LL_SYMS.ll_query == NULL) || (LL_SYMS.ll_set_request == NULL)
-	|| (LL_SYMS.ll_get_objs == NULL) || (LL_SYMS.ll_get_data == NULL)
-	|| (LL_SYMS.ll_free_objs == NULL)
-	|| (LL_SYMS.ll_deallocate == NULL) || (LL_SYMS.ll_cluster == NULL)
-	|| (LL_SYMS.ll_next_obj == NULL) || (LL_SYMS.ll_free_job_info
-					     == NULL) || (LL_SYMS.ll_terminate_job == NULL)
-	|| (LL_SYMS.ll_error == NULL) || (LL_SYMS.ll_submit_job == NULL)) {
-	print_message(ERROR_MESSAGE,
-		      "One or more LoadLeveler symbols could not be located in %s.\n",
-		      ibmll_libpath_name);
-#if 0
-	sendErrorEvent(trans_id, RTEV_ERROR_LL_INIT, "LoadLeveler symbols not located");
-#endif
-	return PROXY_RES_ERR;
-    }
-    else {
-	print_message(INFO_MESSAGE,
-		      "Successfully located all of the required LoadLeveler functions via dlsym.\n");
-    }
-    return PROXY_RES_OK;
-}
-
-/*************************************************************************
- * Call LoadLeveler to get data                                          *
- *************************************************************************/
-int
-my_ll_get_data(LL_element * request, enum LLAPI_Specification spec, void *result)
-{
-    int rc = 0;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. LLAPI_Specification=%d.\n", __FUNCTION__,
-		  __LINE__, spec);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    rc = (*LL_SYMS.ll_get_data) (request, spec, result);
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (rc != 0) {
-	print_message(INFO_MESSAGE, "LoadLeveler ll_get_data rc=%d.\n", rc);
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-    return rc;
-}
-
-/*************************************************************************
- * Call LoadLeveler to retrieve the cluster element                      *
- *************************************************************************/
-int
-my_ll_cluster(int version, LL_element ** errObj, LL_cluster_param * cp)
-{
-    int rc = 0;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. version=%d.\n", __FUNCTION__, __LINE__,
-		  version);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    rc = (*LL_SYMS.ll_cluster) (version, errObj, cp);	/* set the cluster name */
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (rc != 0) {
-	print_message(INFO_MESSAGE, "LoadLeveler ll_cluster rc=%d.\n", rc);
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-    return rc;
-}
-
-
-/*************************************************************************
- * Call LoadLeveler to deallocate the query element                      *
- *************************************************************************/
-int
-my_ll_deallocate(LL_element * query_elem)
-{
-    int rc = 0;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    rc = (*LL_SYMS.ll_deallocate) (query_elem);
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (rc != 0) {
-	print_message(ERROR_MESSAGE, "LoadLeveler ll_deallocate rc=%d.\n", rc);
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-    return rc;
-}
-
-/*************************************************************************
- * Call LoadLeveler to perform a query                                   *
- *************************************************************************/
-LL_element *
-my_ll_query(enum QueryType type)
-{
-    LL_element *query_elem = NULL;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. QueryType=%d.\n", __FUNCTION__, __LINE__,
-		  type);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    query_elem = (*LL_SYMS.ll_query) (type);
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (query_elem == NULL) {
-	print_message(INFO_MESSAGE,
-		      "LoadLeveler ll_query element=NULL. End of list was probably reached.\n");
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return query_elem;
-}
-
-/*************************************************************************
- * Call LoadLeveler to free the objects in the query element             *
- *************************************************************************/
-int
-my_ll_free_objs(LL_element * query_elem)
-{
-    int rc = 0;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    rc = (*LL_SYMS.ll_free_objs) (query_elem);
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (rc != 0) {
-	print_message(ERROR_MESSAGE, "LoadLeveler ll_free_objs rc=%d.\n", rc);
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-    return rc;
-}
-
-/*************************************************************************
- * Call LoadLeveler to get the next object from the returned list        *
- *************************************************************************/
-LL_element *
-my_ll_next_obj(LL_element * query_elem)
-{
-    LL_element *next_elem = NULL;;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    next_elem = (*LL_SYMS.ll_next_obj) (query_elem);
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (next_elem == NULL) {
-	print_message(INFO_MESSAGE,
-		      "LoadLeveler ll_next_obj element=NULL. End of list was probably reached.\n");
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return next_elem;
-}
-
-/*************************************************************************
- * Call LoadLeveler to get objects from the previously returned element  *
- *************************************************************************/
-LL_element *
-my_ll_get_objs(LL_element * query_elem, enum LL_Daemon daemon, char *ignore, int *value, int *rc)
-{
-    *rc = 0;			/* preset rc to 0 */
-    LL_element *ret_object = NULL;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. LL_Daemon=%d.\n", __FUNCTION__, __LINE__,
-		  daemon);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    ret_object = LL_SYMS.ll_get_objs(query_elem, daemon, ignore, value, rc);
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (ret_object == NULL) {
-	print_message(INFO_MESSAGE,
-		      "LoadLeveler ll_get_objs element=NULL. End of list was probably reached.\n");
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__,
-		  *rc);
-    return ret_object;
-}
-
-/*************************************************************************
- *  Call LoadLeveler to build a request object for a subsequent call     *
- *************************************************************************/
-int
-my_ll_set_request(LL_element * query_elem, enum QueryFlags qflags, char **ignore,
-		  enum DataFilter dfilter)
-{
-    int rc = 0;
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. QueryFlags=%d.\n", __FUNCTION__,
-		  __LINE__, qflags);
-    pthread_mutex_lock(&access_LoadLeveler_lock);
-    rc = LL_SYMS.ll_set_request(query_elem, qflags, ignore, dfilter);
-    pthread_mutex_unlock(&access_LoadLeveler_lock);
-    if (rc != 0) {
-	print_message(ERROR_MESSAGE, "LoadLeveler ll_set_request rc=%i.\n", rc);
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. rc=%d.\n", __FUNCTION__, __LINE__, rc);
-    return rc;
-}
-
-/*************************************************************************
- * send node added event to gui                                          *
- *************************************************************************/
-static int
-sendNodeAddEvent(int gui_transmission_id, ClusterObject * cluster_object, NodeObject * node_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_cluster_id_string[256];
-    char proxy_generated_node_id_string[256];
-    char *node_state_to_report = NODE_STATE_UNKNOWN;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. cluster=%s. node=%s. state=%d.\n",
-		  __FUNCTION__, __LINE__, cluster_object->cluster_name, node_object->node_name,
-		  node_object->node_state);
-    memset(proxy_generated_cluster_id_string, '\0', sizeof(proxy_generated_cluster_id_string));
-    memset(proxy_generated_node_id_string, '\0', sizeof(proxy_generated_node_id_string));
-    sprintf(proxy_generated_cluster_id_string, "%d", cluster_object->proxy_generated_cluster_id);
-    sprintf(proxy_generated_node_id_string, "%d", node_object->proxy_generated_node_id);
-
-    switch (node_object->node_state) {
-	case MY_STATE_UP:
-	    node_state_to_report = NODE_STATE_UP;
-	    break;
-	case MY_STATE_DOWN:
-	    node_state_to_report = NODE_STATE_DOWN;
-	    break;
-	default:
-	    node_state_to_report = NODE_STATE_UNKNOWN;
-	    break;
-    }
-
-    msg = proxy_new_node_event(gui_transmission_id, proxy_generated_cluster_id_string, 1);
-    proxy_add_node(msg, proxy_generated_node_id_string, node_object->node_name, node_state_to_report, 0);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send node changed event to gui                                        *
- *************************************************************************/
-static int
-sendNodeChangeEvent(int gui_transmission_id, ClusterObject * cluster_object,
-		    NodeObject * node_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_node_id_string[256];
-    char *node_state_to_report = NODE_STATE_UNKNOWN;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. cluster=%s. node=%s. state=%d.\n",
-		  __FUNCTION__, __LINE__, cluster_object->cluster_name, node_object->node_name,
-		  node_object->node_state);
-    memset(proxy_generated_node_id_string, '\0', sizeof(proxy_generated_node_id_string));
-    sprintf(proxy_generated_node_id_string, "%d", node_object->proxy_generated_node_id);
-
-    switch (node_object->node_state) {
-	case MY_STATE_UP:
-	    node_state_to_report = NODE_STATE_UP;
-	    break;
-	case MY_STATE_DOWN:
-	    node_state_to_report = NODE_STATE_DOWN;
-	    break;
-	default:
-	    node_state_to_report = NODE_STATE_UNKNOWN;
-	    break;
-    }
-
-    msg = proxy_node_change_event(gui_transmission_id, proxy_generated_node_id_string, 1);
-    proxy_add_node(msg, proxy_generated_node_id_string, node_object->node_name, node_state_to_report, 0);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send job added event to gui                                           *
- *************************************************************************/
-static int
-sendJobAddEvent(int gui_transmission_id, ClusterObject * cluster_object, JobObject * job_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_job_id_string[256];
-    char proxy_generated_queue_id_string[256];
-    char job_name_string[256];
-    char *job_state_to_report = JOB_STATE_INIT;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. state=%d.\n", __FUNCTION__,
-		  __LINE__, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster,
-		  job_object->ll_step_id.proc, job_object->job_state);
-    memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));
-    memset(proxy_generated_queue_id_string, '\0', sizeof(proxy_generated_queue_id_string));
-    memset(job_name_string, '\0', sizeof(job_name_string));
-    sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-    sprintf(proxy_generated_queue_id_string, "%d", cluster_object->proxy_generated_queue_id);
-
-    switch (job_object->job_state) {
-	case MY_STATE_IDLE:
-	    job_state_to_report = JOB_STATE_INIT;
-	    break;
-	case MY_STATE_RUNNING:
-	    job_state_to_report = JOB_STATE_RUNNING;
-	    break;
-	case MY_STATE_STOPPED:
-	    job_state_to_report = JOB_STATE_INIT;
-	    break;
-	case MY_STATE_TERMINATED:
-	    job_state_to_report = JOB_STATE_TERMINATED;
-	    break;
-	default:
-	    job_state_to_report = JOB_STATE_INIT;
-	    break;
-    }
-
-    sprintf(job_name_string, "%s.%d.%d", job_object->ll_step_id.from_host,
-	    job_object->ll_step_id.cluster, job_object->ll_step_id.proc);
-    msg =
-	proxy_new_job_event(gui_transmission_id, proxy_generated_queue_id_string,
-			    proxy_generated_job_id_string, job_name_string, job_state_to_report,
-			    job_object->gui_assigned_job_id);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send job changed event to gui                                         *
- *************************************************************************/
-static int
-sendJobChangeEvent(int gui_transmission_id, JobObject * job_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_job_id_string[256];
-    char job_state_string[256];
-    char *job_state_to_report = JOB_STATE_INIT;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. state=%d.\n", __FUNCTION__,
-		  __LINE__, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster,
-		  job_object->ll_step_id.proc, job_object->job_state);
-    memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));
-    memset(job_state_string, '\0', sizeof(job_state_string));
-    sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-
-    switch (job_object->job_state) {
-	case MY_STATE_IDLE:
-	    job_state_to_report = JOB_STATE_INIT;
-	    break;
-	case MY_STATE_RUNNING:
-	    job_state_to_report = JOB_STATE_RUNNING;
-	    break;
-	case MY_STATE_STOPPED:
-	    job_state_to_report = JOB_STATE_INIT;
-	    break;
-	case MY_STATE_TERMINATED:
-	    job_state_to_report = JOB_STATE_TERMINATED;
-	    break;
-	default:
-	    job_state_to_report = JOB_STATE_INIT;
-	    break;
-    }
-
-    msg = proxy_job_change_event(gui_transmission_id, proxy_generated_job_id_string, 1);
-    sprintf(job_state_string, "%d", job_object->job_state);
-    proxy_add_string_attribute(msg, JOB_STATE_ATTR, job_state_to_report);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send job removed event to gui                                         *
- *************************************************************************/
-static int
-sendJobRemoveEvent(int gui_transmission_id, JobObject * job_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_job_id_string[256];
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. state=%d.\n", __FUNCTION__,
-		  __LINE__, job_object->ll_step_id.from_host, job_object->ll_step_id.cluster,
-		  job_object->ll_step_id.proc, job_object->job_state);
-    memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));
-    sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-
-    msg = proxy_remove_job_event(gui_transmission_id, proxy_generated_job_id_string);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send task added event to gui                                          *
- *************************************************************************/
-static int
-sendTaskAddEvent(int gui_transmission_id, ClusterObject * cluster_object, JobObject * job_object,
-		 TaskObject * task_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_job_id_string[256];
-    char proxy_generated_task_id_string[256];
-    char ll_task_id_string[256];
-    char *task_state_to_report = PROC_STATE_STOPPED;
-    NodeObject *node_object = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job=%s.%d.%d. node=%s. task=%d.\n",
-		  __FUNCTION__, __LINE__, job_object->ll_step_id.from_host,
-		  job_object->ll_step_id.cluster, job_object->ll_step_id.proc,
-		  task_object->node_name, task_object->ll_task_id);
-    memset(proxy_generated_job_id_string, '\0', sizeof(proxy_generated_job_id_string));
-    memset(proxy_generated_task_id_string, '\0', sizeof(proxy_generated_task_id_string));
-    memset(ll_task_id_string, '\0', sizeof(ll_task_id_string));
-    sprintf(proxy_generated_job_id_string, "%d", job_object->proxy_generated_job_id);
-    sprintf(proxy_generated_task_id_string, "%d", task_object->proxy_generated_task_id);
-    sprintf(ll_task_id_string, "%d", task_object->ll_task_id);
-    msg = proxy_new_process_event(gui_transmission_id, proxy_generated_job_id_string, 1);
-
-    switch (task_object->task_state) {
-	case MY_STATE_IDLE:
-	    task_state_to_report = PROC_STATE_STARTING;
-	    break;
-	case MY_STATE_RUNNING:
-	    task_state_to_report = PROC_STATE_RUNNING;
-	    break;
-	case MY_STATE_STOPPED:
-	    task_state_to_report = PROC_STATE_STOPPED;
-	    break;
-	case MY_STATE_TERMINATED:
-	    task_state_to_report = PROC_STATE_EXITED;
-	    break;
-	default:
-	    task_state_to_report = PROC_STATE_STARTING;
-	    break;
-    }
-
-
-    proxy_add_process(msg, proxy_generated_task_id_string, ll_task_id_string, task_state_to_report, 2);
-
-    node_object = get_node_in_hash(cluster_object->node_hash, task_object->node_name);
-    proxy_add_int_attribute(msg, PROC_NODEID_ATTR, node_object->proxy_generated_node_id);
-    proxy_add_int_attribute(msg, PROC_INDEX_ATTR, task_object->ll_task_id);
-
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send task changed event to gui                                        *
- *************************************************************************/
-static int
-sendTaskChangeEvent(int gui_transmission_id, JobObject * job_object, TaskObject * task_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_task_id_string[256];
-    char *task_state_to_report = PROC_STATE_STOPPED;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-    memset(proxy_generated_task_id_string, '\0', sizeof(proxy_generated_task_id_string));
-    sprintf(proxy_generated_task_id_string, "%d", task_object->proxy_generated_task_id);
-    msg = proxy_process_change_event(gui_transmission_id, proxy_generated_task_id_string, 1);
-
-    switch (task_object->task_state) {
-	case MY_STATE_IDLE:
-	    task_state_to_report = PROC_STATE_STARTING;
-	    break;
-	case MY_STATE_RUNNING:
-	    task_state_to_report = PROC_STATE_RUNNING;
-	    break;
-	case MY_STATE_STOPPED:
-	    task_state_to_report = PROC_STATE_STOPPED;
-	    break;
-	case MY_STATE_TERMINATED:
-	    task_state_to_report = PROC_STATE_EXITED;
-	    break;
-	default:
-	    task_state_to_report = PROC_STATE_STARTING;
-	    break;
-    }
-
-    proxy_add_string_attribute(msg, PROC_STATE_ATTR, task_state_to_report);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send task removed event to gui                                        *
- *************************************************************************/
-static int
-sendTaskRemoveEvent(int gui_transmission_id, JobObject * job_object, TaskObject * task_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_task_id_string[256];
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-    memset(proxy_generated_task_id_string, '\0', sizeof(proxy_generated_task_id_string));
-    sprintf(proxy_generated_task_id_string, "%d", task_object->proxy_generated_task_id);
-    msg = proxy_remove_process_event(gui_transmission_id, proxy_generated_task_id_string);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send cluster added event to gui (a cluster to LoadLeveler is a        *
- * PTP machine to the gui)                                               *
- *************************************************************************/
-static int
-sendMachineAddEvent(int gui_transmission_id, ClusterObject * cluster_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_cluster_id_string[256];
-    char *machine_state_to_report = MACHINE_STATE_UNKNOWN;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. cluster=%s. state=%d.\n", __FUNCTION__,
-		  __LINE__, cluster_object->cluster_name, cluster_object->cluster_state);
-    memset(proxy_generated_cluster_id_string, '\0', sizeof(proxy_generated_cluster_id_string));
-    sprintf(proxy_generated_cluster_id_string, "%d", cluster_object->proxy_generated_cluster_id);
-
-    // TODO - Need to ensure that machine_id gets set to the machine for the cluster owning the proxy node
-    my_cluster = cluster_object;
-    machine_id = cluster_object->proxy_generated_cluster_id;
-    switch (cluster_object->cluster_state) {
-	case MY_STATE_UP:
-	    machine_state_to_report = MACHINE_STATE_UP;
-	    break;
-	case MY_STATE_DOWN:
-	    machine_state_to_report = MACHINE_STATE_DOWN;
-	    break;
-	default:
-	    machine_state_to_report = MACHINE_STATE_UNKNOWN;
-	    break;
-    }
-    msg =
-	proxy_new_machine_event(gui_transmission_id, ibmll_proxy_base_id_string,
-				proxy_generated_cluster_id_string, cluster_object->cluster_name,
-				machine_state_to_report);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * send queue added event to gui (one per cluster)                      *
- *************************************************************************/
-static int
-sendQueueAddEvent(int gui_transmission_id, ClusterObject * cluster_object)
-{
-    proxy_msg *msg;
-    char proxy_generated_queue_id_string[256];
-    char *queue_state_to_report = QUEUE_STATE_STOPPED;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. queue=%s. state=%d.\n", __FUNCTION__,
-		  __LINE__, cluster_object->cluster_name, cluster_object->queue_state);
-    memset(proxy_generated_queue_id_string, '\0', sizeof(proxy_generated_queue_id_string));
-    sprintf(proxy_generated_queue_id_string, "%d", cluster_object->proxy_generated_queue_id);
-
-    // TODO - Need to ensure that queue_id gets set to the queue belonging to the cluster where the proxy node resides
-    queue_id = cluster_object->proxy_generated_queue_id;
-    switch (cluster_object->cluster_state) {
-	case MY_STATE_UP:
-	    queue_state_to_report = QUEUE_STATE_NORMAL;
-	    break;
-	default:
-	    queue_state_to_report = QUEUE_STATE_STOPPED;
-	    break;
-    }
-
-    msg =
-	proxy_new_queue_event(gui_transmission_id, ibmll_proxy_base_id_string,
-			      proxy_generated_queue_id_string, cluster_object->cluster_name,
-			      queue_state_to_report);
-    enqueue_event(msg);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return 0;
-}
-
-/*************************************************************************
- * add job to my list                                                    *
- *************************************************************************/
-void
-add_job_to_list(List * job_list, JobObject * job_object)
-{
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. job_object=x\'%08x\'.\n", __FUNCTION__,
-		  __LINE__, job_object);
-    AddToList(job_list, job_object);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/*************************************************************************
- * add task to my list                                                   *
- *************************************************************************/
-void
-add_task_to_list(List * task_list, TaskObject * task_object)
-{
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. task_object=x\'%08x\'.\n", __FUNCTION__,
-		  __LINE__, task_object);
-    AddToList(task_list, task_object);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/*************************************************************************
- * add node to my hash table                                             *
- *************************************************************************/
-void
-add_node_to_hash(Hash * node_hash, NodeObject * node_object)
-{
-    int hash_key;
-    List *node_list;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. object=x\'%08x\'.\n", __FUNCTION__,
-		  __LINE__, node_object);
-    hash_key = HashCompute(node_object->node_name, strlen(node_object->node_name));
-    node_list = HashSearch(node_hash, hash_key);
-    if (node_list == NULL) {
-	node_list = NewList();
-	AddToList(node_list, node_object);
-	HashInsert(node_hash, hash_key, node_list);
-    }
-    else {
-	AddToList(node_list, node_object);
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-
-/*************************************************************************
- * delete task from my list                                              *
- *************************************************************************/
-void
-delete_task_from_list(List * task_list, TaskObject * task_object)
-{
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-    if (task_object->node_name != NULL) {
-	free(task_object->node_name);
-	task_object->node_name = NULL;
-    }
-    if (task_object->node_address != NULL) {
-	free(task_object->node_address);
-	task_object->node_address = NULL;
-    }
-    RemoveFromList(task_list, task_object);
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-}
-
-/*************************************************************************
- * find job in my list                                                   *
- *************************************************************************/
-JobObject *
-get_job_in_list(List * job_list, LL_STEP_ID ll_step_id)
-{
-    ListElement *job_list_element = NULL;
-    JobObject *job_object = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. name=%s.%d.%d.\n", __FUNCTION__,
-		  __LINE__, ll_step_id.from_host, ll_step_id.cluster, ll_step_id.proc);
-    job_list_element = job_list->l_head;
-    while (job_list_element != NULL) {
-	job_object = job_list_element->l_value;
-	job_list_element = job_list_element->l_next;
-	if ((strcmp(ll_step_id.from_host, job_object->ll_step_id.from_host) == 0)
-	    && (ll_step_id.cluster == job_object->ll_step_id.cluster)
-	    && (ll_step_id.proc == job_object->ll_step_id.proc)) {
-	    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. job_object=x\'%08x\'.\n",
-			  __FUNCTION__, __LINE__, job_object);
-	    return job_object;
-	}
-    }
-    job_object = NULL;
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. job_object=x\'%08x\'.\n", __FUNCTION__,
-		  __LINE__, job_object);
-    return job_object;
-}
-
-/*************************************************************************
- * find node in my hash table                                            *
- *************************************************************************/
-NodeObject *
-get_node_in_hash(Hash * node_hash, char *node_name)
-{
-    int hash_key = 0;
-    List *node_list = NULL;
-    ListElement *node_list_element = NULL;
-    NodeObject *node_object = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. name=%s.\n", __FUNCTION__, __LINE__,
-		  node_name);
-    hash_key = HashCompute(node_name, strlen(node_name));
-    node_list = HashSearch(node_hash, hash_key);
-    if (node_list != NULL) {
-	node_list_element = node_list->l_head;
-	while (node_list_element != NULL) {
-	    node_object = node_list_element->l_value;
-	    node_list_element = node_list_element->l_next;
-	    if (strcmp(node_name, node_object->node_name) == 0) {
-		print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. node_object=x\'%08x\'.\n",
-			      __FUNCTION__, __LINE__, node_object);
-		return node_object;
-	    }
-	}
-    }
-    node_object = NULL;
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. node_object=x\'%08x\'.\n",
-		  __FUNCTION__, __LINE__, node_object);
-    return node_object;
-}
-
-/*************************************************************************
- * find task in my list                                                  *
- *************************************************************************/
-TaskObject *
-get_task_in_list(List * task_list, char *task_instance_machine_name, int ll_task_id)
-{
-    TaskObject *task_object = NULL;
-    ListElement *task_list_element = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d. id=%d.\n", __FUNCTION__, __LINE__,
-		  ll_task_id);
-    task_list_element = task_list->l_head;
-    while (task_list_element != NULL) {
-	task_object = task_list_element->l_value;
-	task_list_element = task_list_element->l_next;
-	if ((ll_task_id == task_object->ll_task_id)
-	    && (strcmp(task_object->node_name, task_instance_machine_name) == 0)) {
-	    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. task_object=x\'%08x\'.\n",
-			  __FUNCTION__, __LINE__, task_object);
-	    return task_object;
-	}
-    }
-    task_object = NULL;
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d. task_object=x\'%08x\'.\n",
-		  __FUNCTION__, __LINE__, task_object);
-    return task_object;
-}
-
-/*************************************************************************
- * Determine if LoadLeveler is configured multicluster.                  *
- * If any errors then default to local. This code will not be called     *
- * if the user has forced us to run local only or multicluster mode.     *
- *************************************************************************/
-int
-get_multicluster_status()
-{
-    int rc = 0;
-    int i = 0;
-    LL_element *query_elem = NULL;
-    LL_element *cluster = NULL;
-    int cluster_count = 0;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-    if ((state_shutdown_requested == 0) && (state_events_active == 1)) {
-
-	if (multicluster_status == -1) {
-
-	    query_elem = NULL;
-	    query_elem = my_ll_query(CLUSTERS);
-
-	    if (query_elem == NULL) {
-		print_message(ERROR_MESSAGE,
-			      "Unable to obtain query element. LoadLeveler may not be active.\n");
-		return -1;
-	    }
-
-	    /* Get information relating to LoadLeveler clusters.
-	     * QUERY_ALL: we are querying for local cluster data
-	     * NULL: no filter needed
-	     * ALL_DATA: we want all the information available about the cluster */
-
-	    print_message(INFO_MESSAGE, "Call LoadLeveler (ll_set_request) for cluster.\n");
-	    rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-
-	    print_message(INFO_MESSAGE, "Call LoadLeveler (ll_get_objs) for cluster.\n");
-	    cluster = my_ll_get_objs(query_elem, LL_CM, NULL, &cluster_count, &rc);
-	    if (rc < 0) {
-		rc = my_ll_deallocate(query_elem);
-		return -1;
-	    }
-
-	    print_message(INFO_MESSAGE, "Number of LoadLeveler Clusters=%d.\n", cluster_count);
-	    i = 0;
-	    if (cluster != NULL) {
-		print_message(INFO_MESSAGE, "Cluster %d:\n", i);
-		rc = my_ll_get_data(cluster, LL_ClusterMusterEnvironment, &multicluster_status);
-		if (rc != 0) {
-		    print_message(ERROR_MESSAGE,
-				  "Error rc=%d trying to determine if LoadLeveler is running local or multicluster configuration. Defaulting to local cluster only (no multicluster).\n",
-				  rc);
-		    multicluster_status = 0;
-		}
-		else {
-		    print_message(INFO_MESSAGE, "Multicluster returned is = %d.\n",
-				  multicluster_status);
-		}
-
-	    }
-
-	    /* First we need to release the individual objects that were */
-	    /* obtained by the query */
-	    rc = my_ll_free_objs(query_elem);
-	    rc = my_ll_deallocate(query_elem);
-	}
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return multicluster_status;
-}
-
-/*************************************************************************
- * Retrieve a list of LoadLeveler clusters.                              *
- * If no multicluster environment then return a list of 1 cluster.       *
- *************************************************************************/
-void
-refresh_cluster_list()
-{
-    int rc = 0;
-    int i = 0;
-    LL_element *query_elem = NULL;
-    LL_element *cluster = NULL;
-    int cluster_count = 0;
-    char *cluster_name = NULL;
-    int cluster_local = 0;
-    ClusterObject *cluster_object = NULL;
-
-    print_message(TRACE_MESSAGE, ">>> %s entered. line=%d.\n", __FUNCTION__, __LINE__);
-
-    if ((state_shutdown_requested == 0) && (state_events_active == 1)) {
-
-	if (multicluster_status == -1) {
-	    multicluster_status = get_multicluster_status();
-	}
-
-	switch (multicluster_status) {
-
-      /*-----------------------------------------------------------------------*
-       * no contact with loadleveler yet                                       *
-       *-----------------------------------------------------------------------*/
-	    case -1:
-		break;
-
-      /*-----------------------------------------------------------------------*
-       * single cluster and multi cluster                                      *
-       *-----------------------------------------------------------------------*/
-	    case 0:
-		if (cluster_list == NULL) {
-		    cluster_list = NewList();
-		    job_list = NewList();
-		}
-		/* end if no list obtained yet */
-		print_message(INFO_MESSAGE,
-			      "Number of LoadLeveler Clusters=0 (not running multicluster).\n");
-		i = 0;
-		cluster_object = (ClusterObject *) malloc(sizeof(ClusterObject));
-		malloc_check(cluster_object, __FUNCTION__, __LINE__);
-		memset(cluster_object, '\0', sizeof(cluster_object));
-		cluster_object->proxy_generated_cluster_id = generate_id();
-		cluster_object->proxy_generated_queue_id = generate_id();
-		cluster_object->cluster_state = MY_STATE_UP;
-		cluster_object->queue_state = MY_STATE_UP;
-		cluster_object->cluster_name = strdup("Local (not multicluster)");
-		cluster_object->cluster_is_local = 1;
-		cluster_object->node_hash = HashCreate(1024);
-		print_message(INFO_MESSAGE, "Cluster name=%s\n", cluster_name);
-		AddToList(cluster_list, (void *) cluster_object);
-		print_message(INFO_MESSAGE,
-			      "Send event notification: PTP Machine added for LoadLeveler Cluster=%s.\n",
-			      cluster_name);
-		sendMachineAddEvent(start_events_transid, cluster_object);
-		print_message(INFO_MESSAGE,
-			      "Send event notification: PTP Queue added for LoadLeveler Cluster=%s.\n",
-			      cluster_name);
-		sendQueueAddEvent(start_events_transid, cluster_object);
-		break;
-
-      /*-----------------------------------------------------------------------*
-       * multicluster                                                          *
-       *-----------------------------------------------------------------------*/
-	    case 1:
-		if (cluster_list == NULL) {
-		    cluster_list = NewList();
-		    job_list = NewList();
-		}
-		/* end if no list obtained yet */
-		query_elem = NULL;
-
-		query_elem = my_ll_query(MCLUSTERS);
-
-		if (query_elem == NULL) {
-		    print_message(ERROR_MESSAGE,
-				  "Unable to obtain query element. LoadLeveler may not be active.\n");
-		    multicluster_status = -1;
-		    return;
-		}
-
-		print_message(INFO_MESSAGE, "Call LoadLeveler (ll_set_request) for clusters.\n");
-		rc = my_ll_set_request(query_elem, QUERY_ALL, NULL, ALL_DATA);
-
-		if (rc != 0) {
-		    rc = my_ll_deallocate(query_elem);
-		    query_elem = NULL;
-		    multicluster_status = -1;
-		    return;
-		}
-
-		print_message(INFO_MESSAGE, "Call LoadLeveler (ll_get_objs) for clusters.\n");
-		cluster = my_ll_get_objs(query_elem, LL_SCHEDD, NULL, &cluster_count, &rc);
-		if (rc != 0) {
-		    rc = my_ll_deallocate(query_elem);
-		    query_elem = NULL;
-		    multicluster_status = -1;
-		    return;
-		}
-
-		print_message(INFO_MESSAGE, "Number of LoadLeveler Clusters=%d.\n", cluster_count);
-		i = 0;
-		while ((cluster != NULL) && (query_elem != NULL)) {
-		    print_message(INFO_MESSAGE, "Cluster %d:\n", i);
-		    rc = my_ll_get_data(cluster, LL_MClusterName, &cluster_name);
-		    if (rc != 0) {
-			rc = my_ll_free_objs(query_elem);
-			rc = my_ll_deallocate(query_elem);
-			query_elem = NULL;
-			multicluster_status = -1;
-			return;
-		    }
-		    else {
-			cluster_object = (ClusterObject *) malloc(sizeof(ClusterObject));
-			malloc_check(cluster_object, __FUNCTION__, __LINE__);
-			memset(cluster_object, '\0', sizeof(cluster_object));
-			cluster_object->proxy_generated_cluster_id = generate_id();
-			cluster_object->proxy_generated_queue_id = generate_id();
-			cluster_object->cluster_state = MY_STATE_UP;
-			cluster_object->queue_state = MY_STATE_UP;
-			rc = my_ll_get_data(cluster, LL_MClusterLocal, &cluster_local);
-			cluster_object->cluster_name = strdup(cluster_name);
-			if (cluster_local == 1) {
-			    cluster_object->cluster_is_local = 1;
-			}
-			cluster_object->node_hash = HashCreate(1024);
-			print_message(INFO_MESSAGE, "Cluster name=%s\n", cluster_name);
-			AddToList(cluster_list, (void *) cluster_object);
-			print_message(INFO_MESSAGE,
-				      "Send event notification: PTP Machine added for LoadLeveler Cluster=%s.\n",
-				      cluster_name);
-			sendMachineAddEvent(start_events_transid, cluster_object);
-			print_message(INFO_MESSAGE,
-				      "Send event notification: PTP Queue added for LoadLeveler Cluster=%s.\n",
-				      cluster_name);
-			sendQueueAddEvent(start_events_transid, cluster_object);
-		    }
-
-		    i++;
-		    cluster = my_ll_next_obj(query_elem);
-		}
-
-		if (query_elem != NULL) {
-		    rc = my_ll_free_objs(query_elem);
-		    rc = my_ll_deallocate(query_elem);
-		}
-		query_elem = NULL;
-		break;
-
-	}
-
-    }
-    print_message(TRACE_MESSAGE, "<<< %s returning. line=%d.\n", __FUNCTION__, __LINE__);
-    return;
-}
-
-#endif
-
-void
-send_string_attrs(int trans_id, int flags)
-{
-
-/*
- * Send string attributes, including default values, to front end
- */
-    TRACE_ENTRY;
-    int i;
-
-    for (i = 0; i < (sizeof string_launch_attrs / sizeof(string_launch_attr)); i++) {
-	if ((string_launch_attrs[i].type & flags) == flags) {
-	    enqueue_event(proxy_attr_def_string_event(trans_id,
-						      string_launch_attrs[i].id,
-						      string_launch_attrs[i].short_name,
-						      string_launch_attrs[i].long_name, 0,
-						      string_launch_attrs[i].default_value));
-	}
-    }
-    TRACE_EXIT;
-}
-
-void
-send_int_attrs(int trans_id, int flags)
-{
-    /*
-     * Send integer attributes, including default value, lower and upper
-     * bounds, to front end
-     */
-    int i;
-
-    TRACE_ENTRY;
-    for (i = 0; i < (sizeof int_attrs / sizeof(int_launch_attr)); i++) {
-	if ((int_attrs[i].type & flags) == flags) {
-	    enqueue_event(proxy_attr_def_int_limits_event(trans_id,
-							  int_attrs[i].id, int_attrs[i].short_name,
-							  int_attrs[i].long_name, 0,
-							  int_attrs[i].default_value,
-							  int_attrs[i].llimit,
-							  int_attrs[i].ulimit));
-	}
-    }
-    TRACE_EXIT;
-}
-
-void
-send_long_int_attrs(int trans_id, int flags)
-{
-    /*
-     * Send long (64 bit) intgeger attributes, including default value and
-     * lower and upper bounds to front end
-     */
-    int i;
-
-    TRACE_ENTRY;
-    for (i = 0; i < (sizeof long_int_attrs / sizeof(long_int_launch_attr)); i++) {
-	if ((long_int_attrs[i].type & flags) == flags) {
-	    enqueue_event(proxy_attr_def_long_int_limits_event(trans_id,
-							       long_int_attrs[i].id,
-							       long_int_attrs[i].short_name,
-							       long_int_attrs[i].long_name, 0,
-							       long_int_attrs[i].default_value,
-							       long_int_attrs[i].llimit,
-							       long_int_attrs[i].ulimit));
-	}
-    }
-    TRACE_EXIT;
-}
-
-void
-send_enum_attrs(int trans_id, int flags)
-{
-    /*
-     * Send enumerated attributes, including default and allowable values, to
-     * front end.
-     */
-    int i;
-
-    TRACE_ENTRY;
-    for (i = 0; i < (sizeof enum_attrs / sizeof(enum_launch_attr)); i++) {
-	char *cp;
-	char *end_cp;
-	char *cp_save;
-	int n;
-
-	proxy_msg *msg;
-
-	if ((enum_attrs[i].type & flags) == flags) {
-	    /*
-	     * Count the number of enumerations in the enum list. Enumerations are
-	     * delimited by '|' so number of enumerations is number of '|' + 1
-	     */
-	    cp = enum_attrs[i].enums;
-	    n = 1;
-	    while (*cp != '\0') {
-		if ((*cp) == '|') {
-		    n = n + 1;
-		}
-		cp = cp + 1;
-	    }
-	    /*
-	     * Create the enumeration attribute definition header
-	     */
-	    msg = proxy_attr_def_enum_event(trans_id, enum_attrs[i].id,
-					    enum_attrs[i].short_name, enum_attrs[i].long_name, 0,
-					    enum_attrs[i].default_value, n);
-	    /*
-	     * Append enumerations to message. Since enumerations string is
-	     * a string literal that is illegal to modify, create a working copy
-	     */
-	    cp = strdup(enum_attrs[i].enums);
-	    cp_save = cp;
-	    for (;;) {
-		end_cp = strchr(cp, '|');
-		if (end_cp == NULL) {
-		    proxy_msg_add_string(msg, cp);
-		    break;
-		}
-		else {
-		    *end_cp = '\0';
-		    proxy_msg_add_string(msg, cp);
-		    cp = end_cp + 1;
-		}
-	    }
-	    free(cp_save);
-	    /*
-	     * Send the attribute definition
-	     */
-	    enqueue_event(msg);
-	}
-    }
-    TRACE_EXIT;
-}
-
-void
-send_local_default_attrs(int trans_id)
-{
-    /*
-     * Send values of any PE environment variables (MP_*) to front end. These
-     * are sent as string attributes with the MP_ prefix replaced with
-     * EN_. These are used by the front end to set local (user) default values
-     * for PE environment values, overriding IBM defaults.
-     */
-    char **env;
-    char *cp;
-    char *value;
-
-    TRACE_ENTRY;
-    env = environ;
-    while (*env != NULL) {
-	/*
-	 * Check if the environment variable is a PE environment variable.
-	 */
-	if (memcmp(*env, "MP_", 3) == 0) {
-	    /*
-	     * Make a duplicate of the environment then split into name/value
-	     * at '=', change the first two characters of the name to 'EN' and
-	     * send it to the front end as a string attribute. These attributes
-	     * do not have attribute name or description since they do not
-	     * display in the GUI.
-	     */
-	    cp = strdup(*env);
-	    value = strchr(cp, '=');
-	    if (value != NULL) {
-		*value = '\0';
-		value = value + 1;
-		memcpy(cp, "EN", 2);
-		enqueue_event(proxy_attr_def_string_event(trans_id, cp, "", "", 0, value));
-	    }
-	    free(cp);
-	}
-	env = env + 1;
-    }
-    TRACE_EXIT;
-}
-
-#ifdef __linux__
-void
-discover_jobs()
-{
-    /*
-     * Look for already running poe jobs started by this user, and inform
-     * the front end of each new job. For Linux, new jobs are found by
-     * reading /proc looking for directories corresponding to processes.
-     * For each process which is owned by the user running the proxy, and
-     * where the executable named in the command line is /usr/bin/poe,
-     * generate the new job.
-     */
-    DIR *procdir;
-    struct dirent *proc_entry;
-    uid_t my_uid;
-    struct stat stat_info;
-    int status;
-    char cmd_path[PATH_MAX];
-
-    TRACE_ENTRY;
-    my_uid = getuid();
-    procdir = opendir("/proc");
-    if (procdir == NULL) {
-	TRACE_EXIT;
-	return;
-    }
-    status = chdir("/proc");
-    if (status != 0) {
-	TRACE_EXIT;
-	return;
-    }
-    proc_entry = readdir(procdir);
-    /*
-     * For each filename in /proc, determine if it is a directory owned by
-     * the user running the proxy. If it is, then attempt to read
-     * /proc/<pid>/cmdline and verify the executable's pathname. If it is
-     * /usr/bin/poe, then this is a new job to be added to the job list.
-     * Note that since a process may exit at any time, this function must
-     * anticipate errors attempting to open or read files in /proc.
-     */
-    while (proc_entry != NULL) {
-	status = stat(proc_entry->d_name, &stat_info);
-	if (status == 0) {
-	    if ((stat_info.st_uid == my_uid) && (S_ISDIR(stat_info.st_mode))) {
-		FILE *cmdline_file;
-
-		snprintf(cmd_path, sizeof cmd_path, "/proc/%s/cmdline", proc_entry->d_name);
-		cmdline_file = fopen(cmd_path, "r");
-		if (cmdline_file != NULL) {
-		    char cmdline[PATH_MAX];
-		    char *cp;
-
-		    cp = fgets(cmdline, sizeof cmdline, cmdline_file);
-		    if (cp != NULL) {
-			int len;
-
-			/*
-			 * The command line is an array of '\0' terminated
-			 * tokens representing arg[0] thru arg[n]. Look
-			 * at the last 3 characters of arg[0] to see if
-			 * it is a poe process.
-			 */
-			len = strlen(cmdline);
-			if (len >= 3) {
-			    cp = cp + len - 3;
-			}
-			if (strcmp(cp, "poe") == 0) {
-			    add_discovered_job(proc_entry->d_name);
-			}
-		    }
-		    fclose(cmdline_file);
-		}
-	    }
-	}
-	proc_entry = readdir(procdir);
-    }
-    closedir(procdir);
-    TRACE_EXIT;
-}
-#endif
-
-#ifdef _AIX
-void
-discover_jobs()
-{
-    /*
-     * Look for already running poe jobs started by this user, and inform
-     * the front end of each new job. For AIX, do this by querying the
-     * process table and notifying the front end for each job detected.
-     */
-    struct procsinfo *procinfo;
-    int num_procs;
-    uid_t uid;
-    pid_t start_pid;
-
-    /*
-     * Just get the number of entries in the process table so that we know
-     * how big of an array to allocate. Note that processes may be added or
-     * deleted from the process table before the next call to getprocs, so it
-     * is remotely possible that a newly started poe process is missed or
-     * a poe process just terminating is found. The chances of either happening
-     * are small and not worth the trouble of iterating on getprocs() to ensure
-     * all processes are detected
-     */
-    TRACE_ENTRY;
-    start_pid = 0;
-    num_procs = getprocs(NULL, sizeof(struct procsinfo), NULL,
-			 sizeof(struct fdsinfo), &start_pid, INT_MAX);
-    if (num_procs > 0) {
-	procinfo = (struct procsinfo *) malloc(num_procs * sizeof(struct procsinfo));
-	malloc_check(procinfo, __FUNCTION__, __LINE__);
-	/*
-	 * Now get the actual process table.
-	 * start_pid must be reset in order for getprocs to get process
-	 * table information.
-	 */
-	start_pid = 0;
-	num_procs = getprocs(procinfo, sizeof(struct procsinfo), NULL,
-			     sizeof(struct fdsinfo), &start_pid, num_procs);
-	if (num_procs >= 0) {
-	    int i;
-
-	    uid = getuid();
-	    /*
-	     * Notify the front end for each poe process owned by the user
-	     */
-	    for (i = 0; i < num_procs; i++) {
-		if (procinfo[i].pi_uid == uid) {
-		    char *cp;
-
-		    cp = strrchr(procinfo[i].pi_comm, '/');
-		    if (cp == NULL) {
-			cp = procinfo[i].pi_comm;
-		    }
-		    else {
-			cp = cp + 1;
-		    }
-		    if (strcmp(cp, "poe") == 0) {
-			char poe_pid[20];
-
-			snprintf(poe_pid, sizeof poe_pid, "%d", procinfo[i].pi_pid);
-			add_discovered_job(poe_pid);
-		    }
-		}
-	    }
-	}
-	free(procinfo);
-    }
-    TRACE_EXIT;
-}
-#endif
-
-void
-add_discovered_job(char *pid)
-{
-    /*
-     * Create a new job object for the discovered job, add it to the job
-     * list, and notify the proxy of the new job.
-     */
-    jobinfo *job;
-    struct passwd *userinfo;
-    char jobid_str[12];
-    char queueid_str[12];
-    char jobname[40];
-
-    TRACE_ENTRY;
-    job = calloc(1, sizeof(jobinfo));
-    malloc_check(job, __FUNCTION__, __LINE__);
-    job->proxy_jobid = generate_id();
-    job->submit_jobid = "";
-    job->poe_pid = atoi(pid);
-    job->discovered_job = 1;
-    job->submit_time = 0;
-    sprintf(jobid_str, "%d", job->proxy_jobid);
-    sprintf(queueid_str, "%d", queue_id);
-    userinfo = getpwuid(getuid());
-    snprintf(jobname, sizeof jobname, "%s.run_%s", userinfo->pw_name, pid);
-    jobname[sizeof jobname - 1] = '\0';
-    AddToList(jobs, job);
-    enqueue_event(proxy_new_job_event(start_events_transid, queueid_str,
-				      jobid_str, jobname, JOB_STATE_INIT, job->submit_jobid));
-    /*
-     * Start a thread to watch for the attach.cfg file for this job
-     * as if it was invoked by the front end.
-     */
-    pthread_create(&job->startup_thread, &thread_attrs, startup_monitor, job);
-    TRACE_EXIT;
-}
-
-/*************************************************************************/
-
-/* STDOUT/STDERR handling                                                */
-
-/*************************************************************************/
-int
-stdout_handler(int fd, void *job)
-{
-    return write_output(fd, (jobinfo *) job, &((jobinfo *) job)->stdout_info);
-}
-
-int
-stderr_handler(int fd, void *job)
-{
-    return write_output(fd, (jobinfo *) job, &((jobinfo *) job)->stderr_info);
-}
-
-int
-write_output(int fd, jobinfo * job, ioinfo * file_info)
-{
-    /*
-     * Read available data from the file descriptor and send it to
-     * front end. Data is read from a non-blocking pipe to avoid hanging
-     * on a read of an incomplete line of data. As a result, the data read
-     * may be an incomplete line. This requires that as data is read, it is
-     * appended to a second buffer until a newline character is read.
-     * Once the newline character is read, the second buffer is sent to the
-     * front end and the buffer reset so the next line of output can be
-     * built.
-     * FIX: May need to flush an incomplete line of output if the
-     * application process exits (and closes the pipe) before the ending
-     * newline is seen.
-     */
-    int byte_count;
-    char *cp;
-
-    byte_count = read(fd, file_info->read_buf, READ_BUFFER_SIZE - 1);
-    while (byte_count > 0) {
-	file_info->read_buf[byte_count] = '\0';
-	cp = file_info->read_buf;
-	while (*cp != '\0') {
-	    check_bufsize(file_info);
-	    *file_info->cp = *cp;
-	    if (*cp == '\n') {
-		check_bufsize(file_info);
-		file_info->cp = file_info->cp + 1;
-		*file_info->cp = '\0';
-		file_info->write_func(job, file_info->write_buf);
-		file_info->cp = file_info->write_buf;
-		file_info->remaining = file_info->allocated;
-	    }
-	    else {
-		file_info->cp = file_info->cp + 1;
-		file_info->remaining = file_info->remaining - 1;
-	    }
-	    cp = cp + 1;
-	}
-	byte_count = read(fd, file_info->read_buf, READ_BUFFER_SIZE - 1);
-    }
-    if (byte_count == -1) {
-	if ((errno == EINTR) || (errno == EAGAIN)) {
-	    return 0;
-	}
-	else {
-	    return -1;
-	}
-    }
-    else {
-	print_message(TRACE_DETAIL_MESSAGE, "EOF for fd %d. Unregistering handler\n", fd);
-	UnregisterFileHandler(fd);
-	close(fd);
-	return 0;
-    }
-}
-
-void
-check_bufsize(ioinfo * file_info)
-{
-    if (file_info->remaining == 0) {
-	file_info->allocated = file_info->allocated * 2;
-	file_info->write_buf = (char *) realloc(file_info->write_buf, file_info->allocated);
-	malloc_check(file_info->write_buf, __FILE__, __LINE__);
-    }
-}
-
-void
-send_stdout(jobinfo * job, char *buf)
-{
-    /*
-     * Send the data written to stdio file descriptors to the front end.
-     * If the user requested I/O to be split by task, then tag the message
-     * with the task id of the originating task. Otherwise, tag it for task
-     * 0.  In order to properly tag stdio, the proxy internally sets
-     * MP_LABELIO=yes If the user had also set MP_LABELIO=yes, then send
-     * the output with the PE-generated task id to the front end. Otherwise
-     * strip off the task id before sending the message.
-     */
-    char *cp;
-    char *outp;
-    int task;
-
-    if (job->split_io) {
-        cp = strchr(buf, ':');
-        if (cp != NULL) {
-	        *cp = '\0';
-	        task = atoi(buf);
-	        *cp = ':';
-	    if (job->label_io) {
-	        outp = buf;
-	    }
-	    else {
-	        outp = cp + 1;
-	    }
-        }
-        else {
-	    task = 0;
-	    outp = buf;
-        }
-    }
-    else {
-        task = 0;
-        outp = buf;
-    }
-    send_process_state_output_event(start_events_transid, job->tasks[task].proxy_taskid, outp);
-}
-
-void
-send_stderr(jobinfo * job, char *buf)
-{
-    /*
-     * Send the data written to stderr file descriptors to the front end.
-     */
-    fprintf(stderr, "%s", buf);
-}
-
-/*************************************************************************/
-
-/* Functions to send events to front end GUI                             */
-
-/*************************************************************************/
-
-void
-send_ok_event(int trans_id)
-{
-    proxy_msg *msg;
-
-    msg = proxy_ok_event(trans_id);
-    enqueue_event(msg);
-}
-
-void
-post_error(int trans_id, int type, char *msgtext)
-{
-    /*
-     * Send an error message to the front end
-     */
-    proxy_msg *msg;
-
-    fprintf(stderr, "post_error: %s\n", msgtext);
-    fflush(stderr);
-    msg = proxy_error_event(trans_id, type, msgtext);
-    enqueue_event(msg);
-    return;
-}
-
-void
-post_submitjob_error(int trans_id, char *subid, char *msgtext)
-{
-    /*
-     * Send an error message to the front end
-     */
-    proxy_msg *msg;
-
-    fprintf(stderr, "post_submitjob_error: %s\n", msgtext);
-    fflush(stderr);
-    msg = proxy_submitjob_error_event(trans_id, subid, 0, msgtext);
-    enqueue_event(msg);
-    return;
-}
-
-/*
- * Functions to send event notifications to front end. The attributes
- * and attribute values allowed for each event are defined in proxy_event.h
- */
-
-proxy_msg *
-proxy_attr_def_int_limits_event(int trans_id, char *id,
-				char *name, char *desc, int display, int def, int llimit,
-				int ulimit)
-{
-    proxy_msg *msg;
-
-    msg = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, trans_id);
-    proxy_msg_add_int(msg, 1);
-    proxy_msg_add_int(msg, 8);
-    proxy_msg_add_string(msg, id);
-    proxy_msg_add_string(msg, "INTEGER");
-    proxy_msg_add_string(msg, name);
-    proxy_msg_add_string(msg, desc);
-    proxy_msg_add_int(msg, display);
-    proxy_msg_add_int(msg, def);
-    proxy_msg_add_int(msg, llimit);
-    proxy_msg_add_int(msg, ulimit);
-    return msg;
-}
-
-proxy_msg *
-proxy_attr_def_long_int_limits_event(int trans_id, char *id,
-				     char *name, char *desc, int display, long long def,
-				     long long llimit, long long ulimit)
-{
-    proxy_msg *msg;
-    char num_str[22];
-
-    msg = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, trans_id);
-    proxy_msg_add_int(msg, 1);
-    proxy_msg_add_int(msg, 8);
-    proxy_msg_add_string(msg, id);
-    proxy_msg_add_string(msg, "BIGINTEGER");
-    proxy_msg_add_string(msg, name);
-    proxy_msg_add_string(msg, desc);
-    proxy_msg_add_int(msg, display);
-    sprintf(num_str, "%lld", def);
-    proxy_msg_add_string(msg, num_str);
-    sprintf(num_str, "%lld", llimit);
-    proxy_msg_add_string(msg, num_str);
-    sprintf(num_str, "%lld", ulimit);
-    proxy_msg_add_string(msg, num_str);
-    return msg;
-}
-
-proxy_msg *
-proxy_attr_def_enum_event(int trans_id, char *id,
-			  char *name, char *desc, int display, char *def, int count)
-{
-    proxy_msg *msg;
-
-    msg = new_proxy_msg(PROXY_EV_RT_ATTR_DEF, trans_id);
-    proxy_msg_add_int(msg, 1);
-    proxy_msg_add_int(msg, count + 6);
-    proxy_msg_add_string(msg, id);
-    proxy_msg_add_string(msg, "ENUMERATED");
-    proxy_msg_add_string(msg, name);
-    proxy_msg_add_string(msg, desc);
-    proxy_msg_add_int(msg, display);
-    proxy_msg_add_string(msg, def);
-    return msg;
-}
-
-void
-send_new_node_list(int trans_id, int machine_id, List * new_nodes)
-{
-    proxy_msg *msg;
-    node_refcount *noderef;
-    char id_string[12];
-
-    pthread_mutex_lock(&node_lock);
-    SetList(new_nodes);
-    sprintf(id_string, "%d", machine_id);
-    msg = proxy_new_node_event(trans_id, id_string, SizeOfList(new_nodes));
-    noderef = GetListElement(new_nodes);
-    while (noderef != NULL) {
-	sprintf(id_string, "%d", noderef->proxy_nodeid);
-	proxy_add_node(msg, id_string, noderef->key, NODE_STATE_UP, 0);
-	noderef = GetListElement(new_nodes);
-    }
-    pthread_mutex_unlock(&node_lock);
-    enqueue_event(msg);
-}
-
-void
-send_job_state_change_event(int trans_id, int proxy_jobid, char *state)
-{
-    proxy_msg *msg;
-    char jobid_str[12];
-
-    sprintf(jobid_str, "%d", proxy_jobid);
-    msg = proxy_job_change_event(trans_id, jobid_str, 1);
-    proxy_msg_add_keyval_string(msg, JOB_STATE_ATTR, state);
-    enqueue_event(msg);
-}
-
-void
-send_process_state_change_event(int trans_id, jobinfo * job, char *state)
-{
-    /*
-     * Send state change event for all processes associated with the job
-     *
-     * Find each range of consecutive process object ids and send a
-     * notification to the front end for that range of processes. This
-     * usually reduces the number of process state change messages sent
-     * to the front end. In the most common case, where a single
-     * application was started before the next application was started,
-     * there will only be a single message. If two application's
-     * startup overlaps, then there is no guarantee of consecutive
-     * ids for processes, then more than one message may be generated.
-     */
-    taskinfo *tasks;
-    taskinfo *info;
-    int task_index;
-    int start_task;
-    int next_task;
-    proxy_msg *msg;
-    char range[25];
-    int i;
-
-    tasks = job->tasks;
-    if (tasks == NULL) {
-	return;
-    }
-    task_index = -1;
-    info = tasks;
-    i = 0;
-    while (i < job->numtasks) {
-	task_index = info->proxy_taskid;
-	start_task = task_index;
-	next_task = task_index;
-	/*
-	 * Loop as long as the process object ids are consecutive and
-	 * not end of list.
-	 */
-	while (task_index == next_task) {
-	    i = i + 1;
-	    info = &tasks[i];
-	    next_task = next_task + 1;
-	    if (i >= job->numtasks) {
-		break;
-	    }
-	    task_index = info->proxy_taskid;
-	}
-	if (task_index != -1) {
-	    /*
-	     * Generate a process state change event for a consecutive
-	     * range of process id objects. next_task will have a value
-	     * 1 more than the last consecutive object id.
-	     */
-	    snprintf(range, sizeof range, "%d-%d", start_task, next_task - 1);
-	    range[sizeof range - 1] = '\0';
-	    msg = proxy_process_change_event(trans_id, range, 1);
-	    proxy_msg_add_keyval_string(msg, PROC_STATE_ATTR, state);
-	    enqueue_event(msg);
-	    task_index = -1;
-	}
-    }
-}
-
-void
-send_process_state_output_event(int trans_id, int procid, char *output)
-{
-    proxy_msg *msg;
-    char procid_str[12];
-
-    sprintf(procid_str, "%d", procid);
-    msg = proxy_process_change_event(trans_id, procid_str, 1);
-    proxy_msg_add_keyval_string(msg, PROC_STDOUT_ATTR, output);
-    print_message(TRACE_DETAIL_MESSAGE, "Sent stdout: %s\n", output);
-    enqueue_event(msg);
-}
-
-int
-generate_id()
-{
-    return base_id + last_id++;
-}
-
-void
-enqueue_event(proxy_msg * msg)
-{
-    proxy_svr_queue_msg(pe_proxy, msg);
-}
-
-static void
-print_usage(char *progname)
-{
-	print_message(FATAL_MESSAGE,
-		  "%s [--proxy=proxy] [--host=host_name] [--port=port] [--useloadleveler=y/n] [--trace=level] [--lib_override=directory] [--multicluster=d|n|y] [--template_override=file] [--template_write=y|n] --node_polling_min=value --node_polling_max=value --job_polling=value\n",
-		   progname);
-}
-/*************************************************************************/
-
-/* Proxy startup and command loop                                        */
-
-/*************************************************************************/
-int
-main(int argc, char *argv[])
-{
-    char *host = "localhost";
-    char *proxy_str = DEFAULT_PROXY;
-    int ch;
-    int port = PROXY_TCP_PORT;
-    int rc;
-    int debug;
-    char *cp;
-
-    strcpy(miniproxy_path, argv[0]);
-    cp = strrchr(miniproxy_path, '/');
-    if (cp != NULL) {
-	strcpy(cp + 1, "ptp_ibmpe_miniproxy");
-    }
-    else {
-	strcpy(miniproxy_path, "./ptp_ibmpe_miniproxy");
-    }
-#ifdef __linux__
-    while ((ch = getopt_long(argc, argv, "D:P:p:h:t:l:m:o:r:x:y:z:LSM", longopts, NULL)) != -1) {
-	switch (ch) {
-	    case 'P':
-		proxy_str = optarg;
-		break;
-	    case 'p':
-		port = atoi(optarg);
-		break;
-	    case 'h':
-		host = optarg;
-		break;
-	    case 'L':
-		use_load_leveler = 1;
-		break;
-	    case 't':
-		if (strcmp(optarg, "Function") == 0) {
-		    state_trace = 1;
-		    state_trace_detail = 0;
-		}
-		else if (strcmp(optarg, "Detail") == 0) {
-		    state_trace = 1;
-		    state_trace_detail = 1;
-		    state_info = 1;
-		}
-		else if (strcmp(optarg, "None") == 0) {
-		    state_trace = 0;
-		    state_trace_detail = 0;
-		}
-		else {
-		    print_message(FATAL_MESSAGE, "Incorrect trace level '%s'\n", optarg);
-		    return 1;
-		}
-		break;
-	    case 'D':
-		break;
-	    case 'l':
-		user_libpath = strdup(optarg);	/* user has specified override full path to LoadLeveler shared library */
-		break;
-	    case 'm':
-		if (strncmp(optarg, "y", 1) == 0) {	/* y - multicluster forced on */
-		    multicluster_status = 1;	/* force multicluster */
-		}
-		else if (strncmp(optarg, "n", 1) == 0) {	/* n - multicluster forced off */
-		    multicluster_status = 0;	/* force local */
-		}
-		else {		/* d - default to LoadLeveler determine multicluster state */
-		    multicluster_status = -1;	/* allow LoadLeveler to determine mode */
-		}
-		break;
-	    case 'x':		/* min node polling */
-		min_node_sleep_seconds = atoi(optarg);
-		break;
-	    case 'y':		/* max node polling */
-		max_node_sleep_seconds = atoi(optarg);
-		break;
-	    case 'z':		/* job polling */
-		job_sleep_seconds = atoi(optarg);
-		break;
-	    case 'S':
-		debug = 1;
-		while (debug) {
-		    sleep(1);
-		}
-		break;
-	    case 'M':
-		run_miniproxy = 1;
-		break;
-	    default:
-                print_usage(argv[0]);
-		exit(1);
-	}
-    }
-#else
-    /*
-     * AIX does not have the getopt_long function. Since the proxy is
-     * invoked only by the PTP front end, the following simplified options
-     * parsing is sufficient.
-     * Make sure that this is maintained in sync with the above
-     * getopt_long loop.
-     */
-    int n = 1;
-    while (n < argc) {
-	cp = strchr(argv[n], '=');
-	if (cp == NULL) {
-	    if (strcmp(argv[n], "--suspend_at_startup") == 0) {
-		debug = 1;
-		while (debug) {
-		    sleep(1);
-		}
-	    }
-	    else if (strcmp(argv[n], "--runMiniproxy") == 0) {
-		run_miniproxy = 1;
-	    }
-	    else if (strcmp(argv[n], "--useloadleveler") == 0) {
-		use_load_leveler = 1;
-	    }
-	    else {
-		print_message(FATAL_MESSAGE, "Invalid argument %s (%d)\n", argv[n], n);
-    		print_usage(argv[0]);
-		exit(1);
-	    }
-	}
-	else {
-	    *cp = '\0';
-	    if (strcmp(argv[n], "--proxy") == 0) {
-		proxy_str = cp + 1;
-	    }
-	    else if (strcmp(argv[n], "--port") == 0) {
-		port = atoi(cp + 1);
-	    }
-	    else if (strcmp(argv[n], "--host") == 0) {
-		host = cp + 1;
-	    }
-	    else if (strcmp(argv[n], "--trace") == 0) {
-		if (strcmp(cp + 1, "Function") == 0) {
-		    state_trace = 1;
-		    state_trace_detail = 0;
-		}
-		else if (strcmp(cp + 1, "Detail") == 0) {
-		    state_trace = 1;
-		    state_trace_detail = 1;
-		    state_info = 1;
-		}
-		else if (strcmp(cp + 1, "None") == 0) {
-		    state_trace = 0;
-		    state_trace_detail = 0;
-		}
-		else {
-		    print_message(FATAL_MESSAGE, "Incorrect trace level '%s'\n", argv[n + 1]);
-		    return 1;
-		}
-	    }
-	    else if (strcmp(argv[n], "--lib-override") == 0) {
-		user_libpath = strdup(cp + 1);
-	    }
-	    else if (strcmp(argv[n], "--multicluster") == 0) {
-		if (strncmp(cp + 1, "y", 1) == 0) {
-		    multicluster_status = 1;
-		}
-		else if (strncmp(cp + 1, "n", 1) == 0) {
-		    multicluster_status = 0;
-		}
-		else {
-		    multicluster_status = -1;
-		}
-	    }
-	    else if (strcmp(argv[n], "--node_polling_min") == 0) {
-		min_node_sleep_seconds = atoi(cp + 1);
-	    }
-	    else if (strcmp(argv[n], "--node_polling_max") == 0) {
-		max_node_sleep_seconds = atoi(cp + 1);
-	    }
-	    else if (strcmp(argv[n], "--job_polling") == 0) {
-		job_sleep_seconds = atoi(cp + 1);
-	    }
-	    else if (strcmp(argv[n], "--debug") == 0) {
-		/* Do nothing */
-	    }
-	    else {
-		print_message(FATAL_MESSAGE, "Invalid argument %s (%d)\n", argv[n], n);
-		print_usage(argv[0]);
-		exit(1);
-	    }
-	}
-	n = n + 1;
-    }
-#endif
-    if (use_load_leveler) {
-	if (find_load_leveler_library() != 0) {
-	    exit(1);
-	}
-    }
-    ptp_signal_exit = 0;
-    signal(SIGINT, ptp_signal_handler);
-    signal(SIGHUP, SIG_IGN);
-    signal(SIGILL, ptp_signal_handler);
-    signal(SIGSEGV, ptp_signal_handler);
-    signal(SIGTERM, ptp_signal_handler);
-    signal(SIGQUIT, ptp_signal_handler);
-    signal(SIGABRT, ptp_signal_handler);
-    rc = server(proxy_str, host, port);
-    HashDestroy(nodes, hash_cleanup);
-    exit(rc);
-}
-
-int
-find_load_leveler_library()
-{
-
-    /*-----------------------------------------------------------------------*
-     *                                                                       *
-     * Find the LoadLeveler shared library we are using for AIX or Linux.    *
-     * If we cannot find it then LoadLeveler is not installed or we have     *
-     *  been directed to use the wrong path.  If we find it OK then we will  *
-     * try to dynamic open the library and compare versions later in the     *
-     * command_initialize.                                                   *
-     *-----------------------------------------------------------------------*/
-    int lib_found;
-    int i;
-    int status;
-    struct stat statinfo;
-
-    if (user_libpath != NULL) {	/* if user specified lib */
-	if (strlen(user_libpath) > 0) {	/* if not a null string */
-	    libpath[0] = user_libpath;	/* pick up user specified libpath
-					 * as only one to check */
-	    libpath[1] = (char *) -1;	/* new end of list */
-	}
-    }
-
-    lib_found = 0;		/* preset to not found */
-    i = 0;
-    print_message(INFO_MESSAGE, "Searching for LoadLeveler shared library.\n");
-    while ((libpath[i] != (char *) -1) && (lib_found == 0)) {	/* if not end of list and not yet found */
-	if (libpath[i] != NULL) {	/* if valid entry */
-	    strcpy(ibmll_libpath_name, libpath[i]);
-	    strcat(ibmll_libpath_name, "/");
-	    strcat(ibmll_libpath_name, libname);
-	    /* see if this is a valid LoadLeveler shared library */
-	    print_message(INFO_MESSAGE, "Trying: %s\n", ibmll_libpath_name);
-	    status = stat(ibmll_libpath_name, &statinfo);
-	    if (status == 0) {
-#ifdef _AIX
-		strcat(ibmll_libpath_name, "(shr.o)");
-#endif
-		print_message(INFO_MESSAGE,
-			      "Successful search: Found LoadLeveler shared library %s\n",
-			      ibmll_libpath_name);
-		lib_found = 1;	/* we found it */
-		break;
-	    }
-	    else {
-		print_message(ERROR_MESSAGE,
-			      "Search failure: \"stat\" of LoadLeveler shared library %s returned errno=%d.\n",
-			      ibmll_libpath_name, errno);
-	    }
-	}
-	i++;
-    }
-
-    if (lib_found == 0) {
-	print_message(FATAL_MESSAGE, "No LoadLeveler shared library found - quitting...\n");
-	return -1;
-    }
-    return 0;
-}
-
-int
-shutdown_proxy(void)
-{
-    return 0;
-}
-
-RETSIGTYPE
-ptp_signal_handler(int sig)
-{
-    ptp_signal_exit = sig;
-    if (sig >= 0 && sig < NSIG) {
-	RETSIGTYPE(*saved_signal) (int) = saved_signals[sig];
-	if (saved_signal != SIG_ERR && saved_signal != SIG_IGN && saved_signal != SIG_DFL) {
-	    saved_signal(sig);
-	}
-    }
-}
-
-int
-server(char *name, char *host, int port)
-{
-    /*
-     * Initialize the proxy, connect to front end, then run the main loop
-     * until the proxy is requested to shut down.
-     */
-    char *msg1;
-    char *msg2;
-    int rc;
-    struct timeval timeout = { 0, 20000 };
-
-    jobs = NewList();
-    if (proxy_svr_init(name, &timeout, &helper_funcs, &command_tab, &pe_proxy)
-	!= PROXY_RES_OK)
-	return 0;
-
-    rc = proxy_svr_connect(pe_proxy, host, port);
-    if (rc != PROXY_RES_OK) {
-	print_message(INFO_MESSAGE, "proxy_connect fails with %d status.\n", rc);
-	return 0;
-    }
-    print_message(INFO_MESSAGE, "Running IBMPE proxy to host %s via port %d\n", host, port);
-
-    while (ptp_signal_exit == 0 && !shutdown_requested) {
-	if ((proxy_svr_progress(pe_proxy) != PROXY_RES_OK)) {
-	    print_message(TRACE_DETAIL_MESSAGE, "Loop ending\n");
-	    break;
-	}
-    }
-
-    if (ptp_signal_exit != 0) {
-	switch (ptp_signal_exit) {
-	    case SIGINT:
-		msg1 = "INT";
-		msg2 = "Interrupt";
-		break;
-	    case SIGHUP:
-		msg1 = "HUP";
-		msg2 = "Hangup";
-		break;
-	    case SIGILL:
-		msg1 = "ILL";
-		msg2 = "Illegal Instruction";
-		break;
-	    case SIGSEGV:
-		msg1 = "SEGV";
-		msg2 = "Segmentation Violation";
-		break;
-	    case SIGTERM:
-		msg1 = "TERM";
-		msg2 = "Termination";
-		break;
-	    case SIGQUIT:
-		msg1 = "QUIT";
-		msg2 = "Quit";
-		break;
-	    case SIGABRT:
-		msg1 = "ABRT";
-		msg2 = "Process Aborted";
-		break;
-	    default:
-		msg1 = "***UNKNOWN SIGNAL***";
-		msg2 = "ERROR - UNKNOWN SIGNAL";
-		break;
-	}
-	print_message(FATAL_MESSAGE,
-		      "ptp_pe_proxy received signal %s (%s) and is exiting.", msg1, msg2);
-	shutdown_proxy();
-	/* our return code = the signal that fired */
-	rc = ptp_signal_exit;
-    }
-    DestroyList(jobs, NULL);
-    proxy_svr_finish(pe_proxy);
-    print_message(TRACE_DETAIL_MESSAGE, "proxy_svr_finish returned.\n");
-
-    return rc;
-}
-
-/*************************************************************************
- * Print message (with time and date and thread id)                      *
- * Info, Trace, Arg and Warning messages go to stdout.                   *
- * Error and Fatal messages go to stderr.                                *
- *************************************************************************/
-void
-print_message(int type, const char *format, ...)
-{
-    va_list ap;
-    char timebuf[20];
-    time_t my_clock;
-    struct tm a_tm;
-    int thread_id = 0;
-
-    pthread_mutex_lock(&print_message_lock);
-    pthread_t tid = pthread_self();	/* what thread am I ? */
-    for (thread_id = 0; thread_id < (sizeof(thread_map_table)
-				     / sizeof(pthread_t)); thread_id++) {
-	if (tid == thread_map_table[thread_id]) {
-	    break;
-	}
-    }
-    time(&my_clock);		/* what time is it ? */
-    localtime_r(&my_clock, &a_tm);
-    strftime(&timebuf[0], 15, "%m/%d %02H:%02M:%02S", &a_tm);
-
-    va_start(ap, format);
-    switch (type) {
-	case INFO_MESSAGE:
-	    if (state_info == 1) {	/* if info messages allowed */
-		if (state_message_timedate != 0) {
-		    fprintf(stdout, "%s ", timebuf);
-		}
-		if (state_message_threadid != 0) {
-		    fprintf(stdout, "T(%d) ", thread_id);
-		}
-		fprintf(stdout, "Info: ");
-		vfprintf(stdout, format, ap);
-		fflush(stdout);
-	    }
-	    break;
-	case TRACE_MESSAGE:
-	    if (state_trace == 1) {	/* if trace messages allowed */
-		if (state_message_timedate != 0) {
-		    fprintf(stdout, "%s ", timebuf);
-		}
-		if (state_message_threadid != 0) {
-		    fprintf(stdout, "T(%d) ", thread_id);
-		}
-		fprintf(stdout, "Trace: ");
-		vfprintf(stdout, format, ap);
-		fflush(stdout);
-	    }
-	    break;
-	case TRACE_DETAIL_MESSAGE:
-	    if (state_trace_detail == 1) {	/* if trace messages allowed */
-		if (state_message_timedate != 0) {
-		    fprintf(stdout, "%s ", timebuf);
-		}
-		if (state_message_threadid != 0) {
-		    fprintf(stdout, "T(%d) ", thread_id);
-		}
-		fprintf(stdout, "Trace: ");
-		vfprintf(stdout, format, ap);
-		fflush(stdout);
-	    }
-	    break;
-	case WARNING_MESSAGE:
-	    if (state_warning == 1) {	/* if warning messages allowed */
-		if (state_message_timedate != 0) {
-		    fprintf(stdout, "%s ", timebuf);
-		}
-		if (state_message_threadid != 0) {
-		    fprintf(stdout, "T(%d) ", thread_id);
-		}
-		fprintf(stdout, "Warning: ");
-		vfprintf(stdout, format, ap);
-		fflush(stdout);
-	    }
-	    break;
-	case ERROR_MESSAGE:
-	    if (state_error == 1) {	/* if error messages allowed */
-		if (state_message_timedate != 0) {
-		    fprintf(stderr, "%s ", timebuf);
-		}
-		if (state_message_threadid != 0) {
-		    fprintf(stderr, "T(%d) ", thread_id);
-		}
-		fprintf(stderr, "Error: ");
-		vfprintf(stderr, format, ap);
-		fflush(stderr);
-	    }
-	    break;
-	case FATAL_MESSAGE:	/* fatal messages are never suppressed */
-	    if (state_error == 1) {	/* if error messages allowed */
-		if (state_message_timedate != 0) {
-		    fprintf(stderr, "%s ", timebuf);
-		}
-		if (state_message_threadid != 0) {
-		    fprintf(stderr, "T(%d) ", thread_id);
-		}
-		fprintf(stderr, "Fatal: ");
-		vfprintf(stderr, format, ap);
-		fflush(stderr);
-	    }
-	    break;
-	case ARGS_MESSAGE:
-	    if (state_args == 1) {	/* if formatted arg messages are allowed */
-		if (state_message_timedate != 0) {
-		    fprintf(stdout, "%s ", timebuf);
-		}
-		if (state_message_threadid != 0) {
-		    fprintf(stdout, "T(%d) ", thread_id);
-		}
-		fprintf(stdout, "Args: ");
-		vfprintf(stdout, format, ap);
-		fprintf(stdout, "\n");
-		fflush(stdout);
-	    }
-	    break;
-	default:		/* unknown message type - allow it */
-	    if (state_message_timedate != 0) {
-		fprintf(stdout, "%s ", timebuf);
-	    }
-	    if (state_message_threadid != 0) {
-		fprintf(stdout, "T(%d) ", thread_id);
-	    }
-	    fprintf(stdout, ": ");
-	    vfprintf(stdout, format, ap);
-	    fflush(stdout);
-	    break;
-    }
-
-    va_end(ap);
-
-    pthread_mutex_unlock(&print_message_lock);
-}
-
-void
-print_message_args(int argc, char *optional_args[])
-{
-    int i;
-    if (optional_args != NULL) {
-        if (argc < 0) {
-        	argc = 0;
-        	while (optional_args[argc] != NULL)
-        		++argc;
-        }
-	for (i = 0; i < argc; i++) {
-	    print_message(TRACE_MESSAGE, " '%s'\n", optional_args[i]);
-	}
-    }
-}
-
-/*
- * This source file formatted using following indent options
- * -bap
- * -bbb
- * -br
- * -brs
- * -cli4
- * -i4
- * -l80
- * -lp
- * -ts8
- * -bli4
- * -npcs
- */

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/.classpath b/rms/org.eclipse.ptp.rm.ibm.pe.ui/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/.project b/rms/org.eclipse.ptp.rm.ibm.pe.ui/.project
deleted file mode 100755
index 3b209ba..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.pe.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ibm.pe.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 7deeaee..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ibm.pe.ui;singleton:=true
-Bundle-Version: 2.1.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.ibm.pe.ui.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.rm.ibm.pe.core,
- org.eclipse.ptp.launch,
- org.eclipse.debug.core,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.core.filesystem,
- org.eclipse.ptp.rm.remote
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.ibm.pe.ui,
- org.eclipse.ptp.rm.ibm.pe.ui.preferences

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/build.properties b/rms/org.eclipse.ptp.rm.ibm.pe.ui/build.properties
deleted file mode 100755
index 0dc34f7..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.properties b/rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.properties
deleted file mode 100644
index 658fafb..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP IBM Parallel Environment UI
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.xml b/rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.xml
deleted file mode 100755
index 06c9449..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/plugin.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!-- 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                               -->
-<plugin>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage"
-            class="org.eclipse.ptp.rm.ibm.pe.ui.preferences.PEPreferencePage"
-            id="org.eclipse.ptp.ibmpe.ui.preferences.PEPreferencePage"
-            name="Parallel Environment">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.ui.rmConfigurations">
-      <configurationWizard
-            class="org.eclipse.ptp.rm.ibm.pe.ui.wizards.PEResourceManagerConfigurationWizardPageFactory"
-            id="org.eclipse.ptp.ibmpe.ui.configurationWizard"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.launch.rmLaunchConfigurations">
-      <launchConfiguration
-            class="org.eclipse.ptp.rm.ibm.pe.ui.rmLaunchConfiguration.PERMLaunchConfigurationFactory"
-            id="org.eclipse.ptp.ibmpe.ui.launchConfiguration"/>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/Activator.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/Activator.java
deleted file mode 100755
index 824f146..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/Activator.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2006, 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
- */
-
-package org.eclipse.ptp.rm.ibm.pe.ui;
-
-import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceManager;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.ibm.pe.ui";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		PEPreferenceManager.initializePreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.java
deleted file mode 100755
index 6b3b804..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.internal.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.ibm.pe.ui.internal.ui.Messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.properties b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.properties
deleted file mode 100755
index 38d75b9..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/internal/ui/Messages.properties
+++ /dev/null

@@ -1,132 +0,0 @@
- * Copyright (c) 2006, 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
-PEResourceManagerConfigurationWizardPage.name=PE Configuration Wizard Page
-PEResourceManagerConfigurationWizardPage.title=PE Configuration Wizard Page
-PEResourceManagerConfigurationWizardPage.description=PE Configuration Wizard Page
-
-#PEPreferencesPage
-PEPreferencesPage.group_PEd=Parallel Environment Environment Daemon
-PEPreferencesPage.PEdFile_text=PEd file:
-PEPreferencesPage.Select_PEd_FILE=Select PEd file
-PEPreferencesPage.Incorrect_PEd_file=Invalid PE daemon file
-PEPreferencesPage.PEdArgs_text=PEd arguments:
-PEPreferencesPage.PEdFull_text=PEd run command:
-PEPreferencesPage.group_proxy=Parallel Environment PTP Proxy Server
-PEPreferencesPage.PEServer_text=PE|PTP proxy server file:
-PEPreferencesPage.Select_PE_PROXY_FILE=Select PE|PTP Proxy server file
-PEPreferencesPage.Incorrect_server_file=Invalid PE|PTP proxy server file
-PEPreferencesPage.manual=Launch PE server manually
-PEPreferencesPage.browseButton=Browse
-
-TasksTab.title=Tasks
-IOTab.title=I/O
-DIAGTab.title=Diagnostics
-DEBUGTab.title=Debug
-SYSTab.title=System
-NODETab.title=Nodes
-PERFTab1.title=Performance 1
-PERFTab2.title=Performance 2
-RMTab.title=Other RM
-MISCTab.title=Miscellaneous
-
-PELaunch.browse=Browse
-PELaunch.basicMode=Basic Mode
-PELaunch.envScript=PE Environment Script
-
-File.mpIONodeFileTitle=Select path for I/O node list
-File.peStdinPathTitle=Select path for application's stdin file
-File.peStdoutPathTitle=Select path for application's stdout file
-File.peStderrPathTitle=Select path for application's stderr file
-File.mpCoredirTitle=Select directory for PE application core files
-File.mpCmdfileTitle=Select path for PE command file
-File.mpHostfileTitle=Select path for PE host list file
-File.mpRemotedirTitle=Select PE remote directory
-File.mpLLFileTitle=Select path for LoadLeveler command file
-File.mpSaveHostFileTitle=Select path for saved host list file
-File.mpSaveLLFileTitle=Select path for saved LoadLeveler command file
-File.mpEuilibPathTitle=Select path for MPI communications library
-File.peRMLibTitle=Select path for alternate resource manager library
-File.peEnvScriptTitle=Select path for PE environment setup script
-File.mpProfDirTitle=Select directory for GMON data files
-File.mpPriorityLogDirTitle=Select directory for priority log
-File.mpPriorityLogNameTitle=Specify path for priority log
-File.mpCkptDirTitle=Specify path for checkpoint directory
-File.mpCkpfFileTitle=Specify pathname for checkpoint file
-File.mpPMDLogDirTitle=Specify path for PMD log directory
-
-Invalid.mpIOBufferSize=MPI I/O Buffer size must be numeric in range 0-128M.
-Invalid.mpIONodeFile=MPI I/O Node List must specify a readable file.
-Invalid.mpStdinMode=STDIN mode must be 'all', 'none' or valid taskid.
-Invalid.mpStdoutMode=STDOUT mode must be 'ordered', 'unordered' or valid taskid.
-Invalid.peStdinPath=Stdin path must specify a readable file.
-Invalid.peStdoutPath=Stdout path must specify a writable file.
-Invalid.peStderrPath=Stderr path must specify a writable file. 
-Invalid.mpPrintEnv=Print Environment must be 'yes', 'no', or pathname of a script file.
-Invalid.mpCoreDir=Corefile Directory must specify a valid directory name.
-Invalid.mpProfDir=GMON Directory must specify a valid directory name.
-Invalid.mpInstances="Window or IP Instances must be 'max' or number > 0.
-Invalid.mpCmdFile=Command File must specify a readable file.
-Invalid.mpHostFile=Host List File must specify a readable file.
-Invalid.mpLLFile=Job Command File must specify a readable file.
-Invalid.mpNodes=Number of Nodes must be a number > zero.
-Invalid.mpProcs=Number of Tasks must be a number > zero.
-Invalid.mpRemoteDir=Remote Directory Command must specify a readable file.
-Invalid.mpRetry=Node Retry Interval must be 'wait' or a number > zero.
-Invalid.mpRetryCount=Node Retry Count must be a number > zero.
-Invalid.mpTasksPerNode=Tasks per Node must be a number > zero.
-Invalid.mpAckThresh=Acknowledgment Threshold must be a number between 1 and 31.
-Invalid.mpPollingInterval=MPI Polling interval must be a number > 0.
-Invalid.peRDMACount=Number of rCtx Blocks must be a number or number pair > 0.
-Invalid.peRDMACountPair=Number of rCtx Blocks cannot specify second value without specifying first value.
-Invalid.mpUDPPacketSize=UDP Packet Size must be a number > 0.
-Invalid.mpBulkMinMsgSize=Minimum Bulk Message Size must be a number > 0. 
-Invalid.peBufferMem=Buffer Memory must be a number or number > 0.
-Invalid.peBufferMem2=Buffer Memory must be a number or number > 0.
-Invalid.mpMsgEnvelopeBuf=Envelope Buffer Size must be a number >= 1,000,000.
-Invalid.mpEagerLimit=Message Size Threshold must be a number > 0.
-Invalid.mpRetransmitInterval=MPI Retransmit Interval must be a number >= 1000.
-Invalid.mpRexmitBufCnt=Retransmit Buffers must be a number > 0.
-Invalid.mpRexmitBufSize=Maximum LAPI Buffered Message must be a number > 0.
-Invalid.mpRMLib=Resource Manager Library must specify a readable file.
-Invalid.mpEuiLibPath=Library Path must specify a readable file.
-Invalid.mpPulse=Pulse Interval must be a number > 0.
-Invalid.mpThreadStackSize=MPI Thread Stack Size must be a number > 0.
-Invalid.mpTimeout=Connection Timeout must be a number > 0.
-Invalid.mpSaveLLFile=Save Job Command File must specify a writable file.
-Invalid.mpSaveHostFile=Save Hostlist File must specify a writable file.
-Invalid.peEnvScript=Environment Setup Script must specify a readable file.
-Invalid.mpPriorityLogDir=Priority Log Directory must specify a valid directory name.
-Invalid.mpPriorityLogName=Priority Log Name must specify a writable file.
-Invalid.mpCorefileFormat=Corefile Format must be 'standard', 'STDERR' or pathname of lightweight core file.
-Invalid.remoteConnectionError=Error in remote connection:
-Invalid.disallowedEnvVar=PE environment variables cannot be set in environment tab in basic mode.
-Invalid.disallowedOption=PE command line options cannot be specified in basic mode.
-
-PEDialogs.InvocationOptionsTitle=PE Proxy Invocation Options
-PEDialogs.InvocationOptions=Specify invocation options for PE proxy server
-PEDialogs.LoadLevelerOptionLabel=Use LoadLeveler
-PEDialogs.TraceLevelLabel=Trace Level
-PEDialogs.ConfigurationTitle=PE Proxy Configuration
-PEDialogs.Configuration=Enter information to connect to a PE proxy server
-PEDialogs.SuspendLabel=Suspend proxy at startup (for debugging)
-PEDialogs.MiniproxyLabel=Allow applications to run after proxy shutdown
-PEDialogs.libOverrideLabel=Alternate LoadLeveler library path
-PEDialogs.GroupLabel=Proxy options
-PEDialogs.TraceLevelLabel=Trace options
-PEDialogs.MiniproxyLabel=Allow applications to run after proxy shutdown
-PEDialogs.browse=Browse
-PEDialogs.LLRunMode=Multicluster mode
-PEDialogs.llModeLocal=Local
-PEDialogs.llModeMulticluster=Multicluster
-PEDialogs.llModeDefault=Default
-PEDialogs.minNodePollInterval=Node poll minimum interval
-PEDialogs.maxNodePollInterval=Node poll maximum interval
-PEDialogs.jobPollInterval=Job poll interval
-PEDialogs.invalidMinPollInterval=Minimum node polling interval is not numeric.
-PEDialogs.invalidMaxPollInterval=Maximum node polling interval is not numeric.
-PEDialogs.invalidJobPollInterval=Job polling interval is not numeric.
-PEDialogs.invalidLibraryPath=Alternate LoadLeveler library path is invalid
-PEDialogs.librarySelectorTitle=Select Alternate LoadLeveler Library
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/preferences/PEPreferencePage.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/preferences/PEPreferencePage.java
deleted file mode 100755
index df3c4cb..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/preferences/PEPreferencePage.java
+++ /dev/null

@@ -1,344 +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
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceConstants;
-import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceManager;
-import org.eclipse.ptp.rm.ibm.pe.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.remote.ui.preferences.AbstractRemotePreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class PEPreferencePage extends AbstractRemotePreferencePage
-{
-
-    private Button loadLevelerOption;
-    private Button runMiniproxy;
-    private Button libOverrideBrowse;
-    private Button llModeLocal;
-    private Button llModeMulticluster;
-    private Button llModeDefault;
-    private Text nodePollMinInterval;
-    private Text nodePollMaxInterval;
-    private Text jobPollInterval;
-    private Text libOverridePath;
-    private Group llModeGroup;
-    private Composite llOverrideBox;
-    private Combo traceOptions;
-    private Label loadLevelerLabel;
-    private Label traceLabel;
-    private Label runMiniproxyLabel;
-    private Label libOverrideLabel;
-    private Label llModeLabel;
-    private Label nodePollMinLabel;
-    private Label nodePollMaxLabel;
-    private Label jobPollLabel;
-    private EventMonitor eventMonitor;
-
-    private class EventMonitor implements SelectionListener, ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	public void widgetSelected(SelectionEvent e)
-	{
-	    if (loadLevelerOption.getSelection()) {
-		setLLWidgetEnableState(true);
-	    } else {
-		setLLWidgetEnableState(false);
-	    }
-	    updatePreferencePage();
-	}
-
-	public void modifyText(ModifyEvent e)
-	{
-	    updatePreferencePage();
-	}
-    }
-
-    @Override
-    public Preferences getPreferences()
-    {
-	return PEPreferenceManager.getPreferences();
-    }
-
-    @Override
-    public void savePreferences()
-    {
-	PEPreferenceManager.savePreferences();
-    }
-
-    /**
-     * Create the widgets for preference settings. This method calls the superclass createContents() method to create
-     * the default widgets for the panel, then creates the additional widgets needed.
-     * 
-     * @param parent - The parent widget for this pane
-     * 
-     * @return the top level widget for the preference pane
-     */
-    protected Control createContents(Composite parent)
-    {
-	Control preferencePane;
-	GridLayout layout;
-	GridLayout libPathLayout;
-	GridData gd;
-	Group optionsGroup;
-	Preferences preferences;
-	String preferenceValue;
-
-	preferences = getPreferences();
-	eventMonitor = new EventMonitor();
-	preferencePane = super.createContents(parent);
-	optionsGroup = new Group((Composite) preferencePane, SWT.SHADOW_ETCHED_IN);
-	layout = new GridLayout(2, true);
-	optionsGroup.setLayout(layout);
-	optionsGroup.setText(Messages.getString("PEDialogs.GroupLabel"));
-	loadLevelerLabel = new Label(optionsGroup, SWT.NONE);
-	loadLevelerLabel.setText(Messages.getString("PEDialogs.LoadLevelerOptionLabel"));
-	loadLevelerOption = new Button(optionsGroup, SWT.CHECK);
-	preferenceValue = preferences.getString(PEPreferenceConstants.LOAD_LEVELER_OPTION);
-	if (preferenceValue.equals(PEPreferenceConstants.OPTION_YES)) {
-	    loadLevelerOption.setSelection(true);
-	}
-
-	llModeLabel = new Label(optionsGroup, SWT.NONE);
-	llModeLabel.setText(Messages.getString("PEDialogs.LLRunMode"));
-	llModeGroup = new Group(optionsGroup, SWT.SHADOW_ETCHED_IN);
-	layout = new GridLayout(2, true);
-	llModeGroup.setLayout(layout);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	llModeGroup.setLayoutData(gd);
-	llModeLocal = new Button(llModeGroup, SWT.RADIO);
-	llModeLocal.setText(Messages.getString("PEDialogs.llModeLocal"));
-	llModeMulticluster = new Button(llModeGroup, SWT.RADIO);
-	llModeMulticluster.setText(Messages.getString("PEDialogs.llModeMulticluster"));
-	llModeDefault = new Button(llModeGroup, SWT.RADIO);
-	llModeDefault.setText(Messages.getString("PEDialogs.llModeDefault"));
-	llModeDefault.setSelection(false);
-	llModeLocal.setSelection(false);
-	llModeMulticluster.setSelection(false);
-	preferenceValue = preferences.getString(PEPreferenceConstants.LOAD_LEVELER_MODE);
-	if (preferenceValue.equals("y")) {
-	    llModeMulticluster.setSelection(true);
-	} else if (preferenceValue.equals("n")) {
-	    llModeLocal.setSelection(true);
-	} else {
-	    llModeDefault.setSelection(true);
-	}
-
-	nodePollMinLabel = new Label(optionsGroup, SWT.NONE);
-	nodePollMinLabel.setText(Messages.getString("PEDialogs.minNodePollInterval"));
-	nodePollMinInterval = new Text(optionsGroup, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	nodePollMinInterval.setLayoutData(gd);
-	preferenceValue = preferences.getString(PEPreferenceConstants.NODE_MIN_POLL_INTERVAL);
-	nodePollMinInterval.setText(preferenceValue);
-
-	nodePollMaxLabel = new Label(optionsGroup, SWT.NONE);
-	nodePollMaxLabel.setText(Messages.getString("PEDialogs.maxNodePollInterval"));
-	nodePollMaxInterval = new Text(optionsGroup, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	nodePollMaxInterval.setLayoutData(gd);
-	preferenceValue = preferences.getString(PEPreferenceConstants.NODE_MAX_POLL_INTERVAL);
-	nodePollMaxInterval.setText(preferenceValue);
-
-	jobPollLabel = new Label(optionsGroup, SWT.NONE);
-	jobPollLabel.setText(Messages.getString("PEDialogs.jobPollInterval"));
-	jobPollInterval = new Text(optionsGroup, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	jobPollInterval.setLayoutData(gd);
-	preferenceValue = preferences.getString(PEPreferenceConstants.JOB_POLL_INTERVAL);
-	jobPollInterval.setText(preferenceValue);
-
-	libOverrideLabel = new Label(optionsGroup, SWT.NONE);
-	libOverrideLabel.setText(Messages.getString("PEDialogs.libOverrideLabel"));
-
-	llOverrideBox = new Composite(optionsGroup, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	llOverrideBox.setLayoutData(gd);
-	libPathLayout = new GridLayout(2, false);
-	libPathLayout.marginLeft = 0;
-	libPathLayout.marginRight = 0;
-	libPathLayout.marginWidth = 0;
-	llOverrideBox.setLayout(libPathLayout);
-	libOverridePath = new Text(llOverrideBox, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	libOverridePath.setLayoutData(gd);
-	libOverrideBrowse = new Button(llOverrideBox, SWT.PUSH);
-	libOverrideBrowse.setText(Messages.getString("PEDialogs.browse"));
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = false;
-	libOverrideBrowse.setLayoutData(gd);
-	preferenceValue = preferences.getString(PEPreferenceConstants.LIBRARY_OVERRIDE);
-	libOverridePath.setText(preferenceValue);
-
-	runMiniproxyLabel = new Label(optionsGroup, SWT.NONE);
-	runMiniproxyLabel.setText(Messages.getString("PEDialogs.MiniproxyLabel"));
-	runMiniproxy = new Button(optionsGroup, SWT.CHECK);
-	preferenceValue = preferences.getString(PEPreferenceConstants.RUN_MINIPROXY);
-	if (preferenceValue.equals(PEPreferenceConstants.OPTION_YES)) {
-	    runMiniproxy.setSelection(true);
-	}
-	traceLabel = new Label(optionsGroup, SWT.NONE);
-	traceLabel.setText(Messages.getString("PEDialogs.TraceLevelLabel"));
-	traceOptions = new Combo(optionsGroup, SWT.READ_ONLY);
-	traceOptions.add(PEPreferenceConstants.TRACE_NOTHING);
-	traceOptions.add(PEPreferenceConstants.TRACE_FUNCTION);
-	traceOptions.add(PEPreferenceConstants.TRACE_DETAIL);
-	traceOptions.setText(preferences.getString(PEPreferenceConstants.TRACE_LEVEL));
-
-	if (!loadLevelerOption.getSelection()) {
-	    setLLWidgetEnableState(false);
-	}
-	loadLevelerOption.addSelectionListener(eventMonitor);
-	llModeLocal.addSelectionListener(eventMonitor);
-	llModeMulticluster.addSelectionListener(eventMonitor);
-	llModeDefault.addSelectionListener(eventMonitor);
-	nodePollMinInterval.addModifyListener(eventMonitor);
-	nodePollMaxInterval.addModifyListener(eventMonitor);
-	jobPollInterval.addModifyListener(eventMonitor);
-	libOverridePath.addModifyListener(eventMonitor);
-	libOverrideBrowse.addSelectionListener(eventMonitor);
-	traceOptions.addSelectionListener(eventMonitor);
-	runMiniproxy.addSelectionListener(eventMonitor);
-
-	return preferencePane;
-    }
-
-    /**
-     * Set the widget enable state for these widgets based on whether the use LoadLeveler checkbox is checked
-     * 
-     * @param state
-     */
-    private void setLLWidgetEnableState(boolean state)
-    {
-	llModeLocal.setEnabled(state);
-	llModeMulticluster.setEnabled(state);
-	llModeDefault.setEnabled(state);
-	nodePollMinInterval.setEnabled(state);
-	nodePollMaxInterval.setEnabled(state);
-	jobPollInterval.setEnabled(state);
-	libOverridePath.setEnabled(state);
-	libOverrideBrowse.setEnabled(state);
-    }
-
-    /**
-     * Update the preferences store with the values set in the widgets managed by this class.
-     */
-    protected void updatePreferencePage()
-    {
-	Preferences preferences;
-
-	super.updatePreferencePage();
-	preferences = getPreferences();
-	if (loadLevelerOption != null) {
-	    if (loadLevelerOption.getSelection()) {
-		int interval;
-		String widgetValue;
-
-		preferences.setValue(PEPreferenceConstants.LOAD_LEVELER_OPTION, PEPreferenceConstants.OPTION_YES);
-		if (llModeDefault.getSelection()) {
-		    widgetValue = "d";
-		} else if (llModeLocal.getSelection()) {
-		    widgetValue = "n";
-		} else {
-		    widgetValue = "y";
-		}
-		preferences.setValue(PEPreferenceConstants.LOAD_LEVELER_MODE, widgetValue);
-		widgetValue = nodePollMinInterval.getText().trim();
-		if (widgetValue.length() > 0) {
-		    try {
-			interval = Integer.valueOf(widgetValue);
-		    }
-		    catch (NumberFormatException e) {
-			setErrorMessage(Messages.getString("PEDialogs.invalidMinPollInterval"));
-			return;
-		    }
-		}
-		preferences.setValue(PEPreferenceConstants.NODE_MIN_POLL_INTERVAL, widgetValue);
-		widgetValue = nodePollMaxInterval.getText().trim();
-		if (widgetValue.length() > 0) {
-		    try {
-			interval = Integer.valueOf(widgetValue);
-		    }
-		    catch (NumberFormatException e) {
-			setErrorMessage(Messages.getString("PEDialogs.invalidMaxPollInterval"));
-			return;
-		    }
-		}
-		preferences.setValue(PEPreferenceConstants.NODE_MAX_POLL_INTERVAL, widgetValue);
-		widgetValue = jobPollInterval.getText().trim();
-		if (widgetValue.length() > 0) {
-		    try {
-			interval = Integer.valueOf(widgetValue);
-		    }
-		    catch (NumberFormatException e) {
-			setErrorMessage(Messages.getString("PEDialogs.invalidJobPollInterval"));
-			return;
-		    }
-		}
-		preferences.setValue(PEPreferenceConstants.JOB_POLL_INTERVAL, widgetValue);
-		widgetValue = libOverridePath.getText().trim();
-		preferences.setValue(PEPreferenceConstants.LIBRARY_OVERRIDE, widgetValue);
-	    } else {
-		preferences.setValue(PEPreferenceConstants.LOAD_LEVELER_OPTION, PEPreferenceConstants.OPTION_NO);
-	    }
-	}
-	if (traceOptions != null) {
-	    preferences.setValue(PEPreferenceConstants.TRACE_LEVEL, traceOptions.getText());
-	}
-	if (runMiniproxy != null) {
-	    if (runMiniproxy.getSelection()) {
-		preferences.setValue(PEPreferenceConstants.RUN_MINIPROXY, PEPreferenceConstants.OPTION_YES);
-	    } else {
-		preferences.setValue(PEPreferenceConstants.RUN_MINIPROXY, PEPreferenceConstants.OPTION_NO);
-	    }
-	}
-    }
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationDynamicTab.java
deleted file mode 100755
index 58d6006..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,3160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.rmLaunchConfiguration;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.core.attributes.BigIntegerAttribute;
-import org.eclipse.ptp.core.attributes.BigIntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringSetAttribute;
-import org.eclipse.ptp.core.attributes.StringSetAttributeDefinition;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.rm.ibm.pe.core.rmsystem.PEResourceManagerConfiguration;
-import org.eclipse.ptp.rm.ibm.pe.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.ibm.pe.ui.widgets.BooleanRowWidget;
-import org.eclipse.ptp.rm.ibm.pe.ui.widgets.CheckboxRowWidget;
-import org.eclipse.ptp.rm.ibm.pe.ui.widgets.ComboRowWidget;
-import org.eclipse.ptp.rm.ibm.pe.ui.widgets.DualFieldRowWidget;
-import org.eclipse.ptp.rm.ibm.pe.ui.widgets.FileSelectorRowWidget;
-import org.eclipse.ptp.rm.ibm.pe.ui.widgets.TextRowWidget;
-import org.eclipse.ptp.rm.ibm.pe.ui.widgets.WidgetAttributes;
-import org.eclipse.ptp.rmsystem.AbstractResourceManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Widget;
-
-public class PERMLaunchConfigurationDynamicTab extends AbstractRMLaunchConfigurationDynamicTab
-{
-    // TODO
-    // 8) popup 'notepad' editor to create host file
-    /*
-     * The following constants define the names of all attributes which may be known by the PE proxy. Names starting
-     * with MP_* represent the corresponding PE environment variables. Names starting with PE_* represent additional
-     * attributes used internally by the PE proxy.
-     */
-    private static final String MP_ACK_THRESH = "MP_ACK_THRESH";
-    private static final String MP_ADAPTER_USE = "MP_ADAPTER_USE";
-    private static final String MP_BULK_MIN_MSG_SIZE = "MP_BULK_MIN_MSG_SIZE";
-    private static final String MP_CC_SCRATCH_BUF = "MP_CC_SCRATCH_BUF";
-    private static final String MP_CLOCK_SOURCE = "MP_CLOCK_SOURCE";
-    private static final String MP_CKPTDIR = "MP_CKPTDIR";
-    private static final String MP_CKPTDIR_PERTASK = "MP_CKPTDIR_PERTASK";
-    private static final String MP_CKPTFILE = "MP_CKPTFILE";
-    private static final String MP_CMDFILE = "MP_CMDFILE";
-    private static final String MP_COREDIR = "MP_COREDIR";
-    private static final String MP_COREFILE_FORMAT = "MP_COREFILE_FORMAT";
-    private static final String MP_COREFILE_SIGTERM = "MP_COREFILE_SIGTERM";
-    private static final String MP_CPU_USE = "MP_CPU_USE";
-    private static final String MP_CSS_INTERRUPT = "MP_CSS_INTERRUPT";
-    private static final String MP_DEBUG_INITIAL_STOP = "MP_DEBUG_INITIAL_STOP";
-    private static final String MP_DEBUG_NOTIMEOUT = "MP_DEBUG_NOTIMEOUT";
-    private static final String MP_DEVTYPE = "MP_DEVTYPE";
-    private static final String MP_EAGER_LIMIT = "MP_EAGER_LIMIT";
-    private static final String MP_EUIDEVELOP = "MP_EUIDEVELOP";
-    private static final String MP_EUIDEVICE = "MP_EUIDEVICE";
-    private static final String MP_EUILIB = "MP_EUILIB";
-    private static final String MP_EUILIBPATH = "MP_EUILIBPATH";
-    private static final String MP_HINTS_FILTERED = "MP_HINTS_FILTERED";
-    private static final String MP_HOSTFILE = "MP_HOSTFILE";
-    private static final String MP_INFOLEVEL = "MP_INFOLEVEL";
-    private static final String MP_INSTANCES = "MP_INSTANCES";
-    private static final String MP_IO_BUFFER_SIZE = "MP_IO_BUFFER_SIZE";
-    private static final String MP_IO_ERRLOG = "MP_IO_ERRLOG";
-    private static final String MP_IONODEFILE = "MP_IONODEFILE";
-    private static final String MP_LABELIO = "MP_LABELIO";
-    private static final String MP_LAPI_TRACE_LEVEL = "MP_LAPI_TRACE_LEVEL";
-    private static final String MP_LLFILE = "MP_LLFILE";
-    private static final String MP_MSG_API = "MP_MSG_API";
-    private static final String MP_MSG_ENVELOPE_BUF = "MP_MSG_ENVELOPE_BUF";
-    private static final String MP_NEWJOB = "MP_NEWJOB";
-    private static final String MP_NODES = "MP_NODES";
-    private static final String MP_PGMMODEL = "MP_PGMMODEL";
-    private static final String MP_PMDLOG = "MP_PMDLOG";
-    private static final String MP_PMDLOG_DIR = "MP_PMDLOG_DIR";
-    private static final String MP_POLLING_INTERVAL = "MP_POLLING_INTERVAL";
-    private static final String MP_PRINTENV = "MP_PRINTENV";
-    private static final String MP_PRIORITY = "MP_PRIORITY";
-    private static final String MP_PRIORITY_LOG = "MP_PRIORITY_LOG";
-    private static final String MP_PRIORITY_LOG_DIR = "MP_PRIORITY_LOG_DIR";
-    private static final String MP_PRIORITY_LOG_NAME = "MP_PRIORITY_LOG_NAME";
-    private static final String MP_PRIORITY_NTP = "MP_PRIORITY_NTP";
-    private static final String MP_PROCS = "MP_PROCS";
-    private static final String MP_PROFDIR = "MP_PROFDIR";
-    private static final String MP_PULSE = "MP_PULSE";
-    private static final String MP_REMOTEDIR = "MP_REMOTEDIR";
-    private static final String MP_RETRANSMIT_INTERVAL = "MP_RETRANSMIT_INTERVAL";
-    private static final String MP_RETRY = "MP_RETRY";
-    private static final String MP_RETRY_COUNT = "MP_RETRY_COUNT";
-    private static final String MP_REXMIT_BUF_CNT = "MP_REXMIT_BUF_CNT";
-    private static final String MP_REXMIT_BUF_SIZE = "MP_REXMIT_BUF_SIZE";
-    private static final String MP_RMLIB = "MP_RMLIB";
-    private static final String MP_RMPOOL = "MP_RMPOOL";
-    private static final String MP_SAVE_LLFILE = "MP_SAVE_LLFILE";
-    private static final String MP_SAVEHOSTFILE = "MP_SAVEHOSTFILE";
-    private static final String MP_SHARED_MEMORY = "MP_SHARED_MEMORY";
-    private static final String MP_SINGLE_THREAD = "MP_SINGLE_THREAD";
-    private static final String MP_STATISTICS = "MP_STATISTICS";
-    private static final String MP_STDINMODE = "MP_STDINMODE";
-    private static final String MP_STDOUTMODE = "MP_STDOUTMODE";
-    private static final String MP_TASK_AFFINITY = "MP_TASK_AFFINITY";
-    private static final String MP_TASKS_PER_NODE = "MP_TASKS_PER_NODE";
-    private static final String MP_THREAD_STACKSIZE = "MP_THREAD_STACKSIZE";
-    private static final String MP_TIMEOUT = "MP_TIMEOUT";
-    private static final String MP_TLP_REQUIRED = "MP_TLP_REQUIRED";
-    private static final String MP_UDP_PACKET_SIZE = "MP_UDP_PACKET_SIZE";
-    private static final String MP_USE_BULK_XFER = "MP_USE_BULK_XFER";
-    private static final String MP_WAIT_MODE = "MP_WAIT_MODE";
-    private static final String PE_ADVANCED_MODE = "PE_ADVANCED_MODE";
-    private static final String PE_BUFFER_MEM = "PE_BUFFER_MEM";
-    private static final String PE_BUFFER_MEM_MAX = "PE_BUFFER_MEM_MAX";
-    private static final String PE_ENV_SCRIPT = "PE_ENV_SCRIPT";
-    private static final String PE_RDMA_COUNT = "PE_RDMA_COUNT";
-    private static final String PE_RDMA_COUNT_2 = "PE_RDMA_COUNT_2";
-    private static final String PE_SPLIT_STDOUT = "PE_SPLIT_STDOUT";
-    private static final String PE_STDERR_PATH = "PE_STDERR_PATH";
-    private static final String PE_STDIN_PATH = "PE_STDIN_PATH";
-    private static final String PE_STDOUT_PATH = "PE_STDOUT_PATH";
-    private static final String MP_INSTANCES_INT = "MP_INSTANCES_INT";
-    private static final String MP_RETRY_INT = "MP_RETRY_INT";
-    /*
-     * End of attribute name list.
-     */
-    private static final String ENABLE_STATE = "ENABLE_STATE";
-    private static final RMLaunchValidation success = new RMLaunchValidation(true, "");
-    private static final int MP_IONODEFILE_SELECTOR = 1;
-    private static final int PE_STDIN_PATH_SELECTOR = 2;
-    private static final int PE_STDOUT_PATH_SELECTOR = 3;
-    private static final int PE_STDERR_PATH_SELECTOR = 4;
-    private static final int MP_COREDIR_SELECTOR = 5;
-    private static final int MP_CMDFILE_SELECTOR = 6;
-    private static final int MP_HOSTFILE_SELECTOR = 7;
-    private static final int MP_REMOTEDIR_SELECTOR = 8;
-    private static final int MP_LLFILE_SELECTOR = 9;
-    private static final int MP_EUILIBPATH_SELECTOR = 10;
-    private static final int MP_SAVE_LLFILE_SELECTOR = 11;
-    private static final int MP_SAVEHOSTFILE_SELECTOR = 12;
-    private static final int MP_RMLIB_SELECTOR = 13;
-    private static final int PE_ENV_SCRIPT_SELECTOR = 14;
-    private static final int MP_PROFDIR_SELECTOR = 15;
-    private static final int MP_PRIORITY_LOG_DIR_SELECTOR = 16;
-    private static final int MP_PRIORITY_LOG_NAME_SELECTOR = 17;
-    private static final int MP_CKPTFILE_SELECTOR = 18;
-    private static final int MP_CKPTDIR_SELECTOR = 19;
-    private static final int MP_PMDLOG_DIR_SELECTOR = 20;
-    private static final int PE_ADVANCED_MODE_CHECKBOX = 100;
-    private static final int KBYTE = 1024;
-    private static final int MBYTE = 1024 * 1024;
-    private static final int GBYTE = 1024 * 1024 * 1024;
-    /*
-     * List of valid PE Environment variables. This list must be kept
-     * in sorted ascending order. MP_FENCE and MP_NOARGLIST must not
-     * appear in this list since they are allowed to be used to
-     * control command line parsing.
-     */
-    private static final String PEEnvVars[] = {
-	"MP_ACK_THRESH",
-	"MP_ADAPTER_USE",
-	"MP_BUFFER_MEM",
-	"MP_BUFFER_MEM_MAX",
-	"MP_BULK_MIN_MSG_SIZE",
-	"MP_CC_SCRATCH_BUF",
-	"MP_CKPTDIR",
-	"MP_CKPTDIR_PERTASK",
-	"MP_CKPTFILE",
-	"MP_CLOCK_SOURCE",
-	"MP_CMDFILE",
-	"MP_COREDIR",
-	"MP_COREFILE_FORMAT",
-	"MP_COREFILE_SIGTERM",
-	"MP_CPU_USE",
-	"MP_CSS_INTERRUPT",
-	"MP_DEBUG_INITIAL_STOP",
-	"MP_DEBUG_NOTIMEOUT",
-	"MP_DEVTYPE",
-	"MP_EAGER_LIMIT",
-	"MP_EUIDEVELOP",
-	"MP_EUIDEVICE",
-	"MP_EUILIB",
-	"MP_EUILIBPATH",
-	"MP_HINTS_FILTERED",
-	"MP_HOSTFILE",
-	"MP_INFOLEVEL",
-	"MP_INSTANCES",
-	"MP_INSTANCES_INT",
-	"MP_IO_BUFFER_SIZE",
-	"MP_IO_ERRLOG",
-	"MP_IONODEFILE",
-	"MP_LABELIO",
-	"MP_LAPI_TRACE_LEVEL",
-	"MP_LLFILE",
-	"MP_MSG_API",
-	"MP_MSG_ENVELOPE_BUF",
-	"MP_NEWJOB",
-	"MP_NODES",
-	"MP_PGMMODEL",
-	"MP_PMDLOG",
-	"MP_PMDLOG_DIR",
-	"MP_POLLING_INTERVAL",
-	"MP_PRINTENV",
-	"MP_PRIORITY",
-	"MP_PRIORITY_LOG",
-	"MP_PRIORITY_LOG_DIR",
-	"MP_PRIORITY_LOG_NAME",
-	"MP_PRIORITY_NTP",
-	"MP_PROCS",
-	"MP_PROFDIR",
-	"MP_PULSE",
-	"MP_RDMA_COUNT",
-	"MP_REMOTEDIR",
-	"MP_RETRANSMIT_INTERVAL",
-	"MP_RETRY",
-	"MP_RETRY_COUNT",
-	"MP_RETRY_INT",
-	"MP_REXMIT_BUF_CNT",
-	"MP_REXMIT_BUF_SIZE",
-	"MP_RMLIB",
-	"MP_RMPOOL",
-	"MP_SAVEHOSTFILE",
-	"MP_SAVE_LLFILE",
-	"MP_SHARED_MEMORY",
-	"MP_SINGLE_THREAD",
-	"MP_STATISTICS",
-	"MP_STDINMODE",
-	"MP_STDOUTMODE",
-	"MP_TASK_AFFINITY",
-	"MP_TASKS_PER_NODE",
-	"MP_THREAD_STACKSIZE",
-	"MP_TIMEOUT",
-	"MP_TLP_REQUIRED",
-	"MP_UDP_PACKET_SIZE",
-	"MP_USE_BULK_XFER",
-	"MP_WAIT_MODE"
-    };
-    /*
-     * List of valid Parallel Environment options. This list must be kept
-     * in sorted ascending order.
-     */
-    private static final String PEOptions[] = {
-	"-ack_thresh",
-        "-adapter_use",
-        "-buffer_mem",
-        "-bulk_min_msg_size",
-        "-cc_scratch_buf",
-        "-clock_source",
-        "-cmdfile",
-        "-coredir",
-        "-corefile_format",
-        "-corefile_sigterm",
-        "-cpu_use",
-        "-css_interrupt",
-        "-debug_notimeout",
-        "-devtype",
-        "-eager_limit",
-        "-euidevelop",
-        "-euidevice",
-        "-euilib",
-        "-euilibpath",
-        "-hfile",
-        "-hints_filtered",
-        "-hostfile",
-        "-ilevel",
-        "-infolevel",
-        "-instances",
-        "-io_buffer_size",
-        "-io_errlog",
-        "-ionodefile",
-        "-labelio",
-        "-llfile",
-        "-msg_api",
-        "-msg_envelope_buf",
-        "-newjob",
-        "-nodes",
-        "-pgmmodel",
-        "-pmdlog",
-        "-pmdlog_dir",
-        "-polling_interval",
-        "-printenv",
-        "-priority_log",
-        "-priority_log_dir",
-        "-priority_log_name",
-        "-priority_ntp",
-        "-procs",
-        "-profdir",
-        "-pulse",
-        "-rdma_count",
-        "-resd",
-        "-retransmit_interval",
-        "-retry",
-        "-retrycount",
-        "-rexmit_buf_cnt",
-        "-rmpool",
-        "-savehostfile",
-        "-save_llfile",
-        "-shared_memory",
-        "-single_thread",
-        "-statistics",
-        "-stdinmode",
-        "-stdoutmode",
-        "-task_affinity",
-        "-tasks_per_node",
-        "-thread_stacksize",
-        "-tlp_required",
-        "-udp_packet_size",
-        "-use_bulk_xfer",
-        "-wait_mode"
-    };
-
-    private boolean ignoreModifyEvents = false;
-    private EventMonitor eventMonitor;
-    private Composite mainPanel;
-    private boolean useLoadLeveler = false;
-    private TabFolder tabbedPane;
-    private ILaunchConfigurationWorkingCopy currentLaunchConfig;
-    private IResourceManager currentRM;
-    private CheckboxRowWidget peAdvancedMode;
-    private FileSelectorRowWidget peEnvScript;
-    private boolean allFieldsValid = true;
-    private String errorMessage;
-    private Composite tasksTabPane;
-    private Composite ioTabPane;
-    private Composite diagTabPane;
-    private Composite debugTabPane;
-    private Composite systemTabPane;
-    private Composite nodeTabPane;
-    private Composite performanceTab1Pane;
-    private Composite performanceTab2Pane;
-    private Composite alternateRMTabPane;
-    private Composite miscTabPane;
-    private Vector<Object> activeWidgets;
-    private IRemoteConnection remoteConnection;
-    private IRemoteServices remoteService;
-    private IRemoteUIServices remoteUIService;
-    private Shell parentShell;
-//    private RSEFileManager remoteFileManager;
-    /*
-     * Widgets for IO tab
-     */
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpDevType;
-    private TextRowWidget mpIOBufferSize;
-    private FileSelectorRowWidget mpIONodeFile;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpLabelIO;
-    private ComboRowWidget mpStdinMode;
-    private ComboRowWidget mpStdoutMode;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpIOErrLog;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget peSplitStdout;
-    private FileSelectorRowWidget peStdinPath;
-    private FileSelectorRowWidget peStdoutPath;
-    private FileSelectorRowWidget peStderrPath;
-    /*
-     * Widgets for diagnostic tab
-     */
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpInfoLevel;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpLAPITraceLevel;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpPMDLog;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpPrintEnv;
-    private BooleanRowWidget mpPriorityLog;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpStatistics;
-    private FileSelectorRowWidget mpPmdLogDir;
-    /*
-     * Widgets for debug tab
-     */
-    private FileSelectorRowWidget mpCoreDir;
-    private ComboRowWidget mpCorefileFormat;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpCorefileSigterm;
-    @SuppressWarnings("unused")
-    private TextRowWidget mpDebugInitialStop;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpDebugNotimeout;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpEuiDevelop;
-    private FileSelectorRowWidget mpProfDir;
-    /*
-     * Widgets for system resources tab
-     */
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpAdapterUse;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpCpuUse;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpEuiDevice;
-    private ComboRowWidget mpInstances;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpEuiLib;
-    /*
-     * Widgets for node allocation tab
-     */
-    private FileSelectorRowWidget mpCmdFile;
-    private FileSelectorRowWidget mpHostFile;
-    private TextRowWidget mpNodes;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpPgmModel;
-    private TextRowWidget mpProcs;
-    private FileSelectorRowWidget mpRemoteDir;
-    private TextRowWidget mpTasksPerNode;
-    private FileSelectorRowWidget mpLLFile;
-    @SuppressWarnings({ "unused", "unused" })
-    private BooleanRowWidget mpNewJob;
-    @SuppressWarnings("unused")
-    private TextRowWidget mpRMPool;
-    private ComboRowWidget mpRetry;
-    private TextRowWidget mpRetryCount;
-    /*
-     * Widgets for performance tabs
-     */
-    private TextRowWidget mpAckThresh;
-    private DualFieldRowWidget peBufferMem;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpCCScratchBuf;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpCSSInterrupt;
-    private TextRowWidget mpEagerLimit;
-    private TextRowWidget mpMsgEnvelopeBuf;
-    private TextRowWidget mpPollingInterval;
-    private TextRowWidget mpPriority;
-    private BooleanRowWidget mpPriorityNTP;
-    private DualFieldRowWidget peRDMACount;
-    private TextRowWidget mpRetransmitInterval;
-    private TextRowWidget mpRexmitBufCnt;
-    private TextRowWidget mpRexmitBufSize;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpSharedMemory;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpSingleThread;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpTaskAffinity;
-    private TextRowWidget mpUDPPacketSize;
-
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpWaitMode;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpUseBulkXfer;
-    private TextRowWidget mpBulkMinMsgSize;
-    /*
-     * Widgets for miscellaneous tab
-     */
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpClockSource;
-    private FileSelectorRowWidget mpEuiLibPath;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpHintsFiltered;
-    private ComboRowWidget mpMsgApi;
-    private TextRowWidget mpPulse;
-    private TextRowWidget mpThreadStackSize;
-    private TextRowWidget mpTimeout;
-    @SuppressWarnings("unused")
-    private ComboRowWidget mpTLPRequired;
-    private FileSelectorRowWidget mpSaveLLFile;
-    private FileSelectorRowWidget mpSaveHostFile;
-    private FileSelectorRowWidget mpPriorityLogDir;
-    private TextRowWidget mpPriorityLogName;
-    private FileSelectorRowWidget mpCkptDir;
-    private FileSelectorRowWidget mpCkptFile;
-    @SuppressWarnings("unused")
-    private BooleanRowWidget mpCkptDirPerTask;
-    /*
-     * Widgets for other RM tab
-     */
-    private FileSelectorRowWidget mpRMLib;
-
-
-
-
-
-    /**
-     * Exception class intended for use in validating fields within this panel. When a validation error occurs, the
-     * validation code should create and throw a ValidationException, which is intended to be caught by the top level
-     * validation method.
-     */
-    private class ValidationException extends Exception
-    {
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@SuppressWarnings("unused")
-	private ValidationException()
-	{
-	    throw new IllegalAccessError("ValidationException default constructor should not be called");
-	}
-
-	/**
-	 * Create a ValidationException with error message
-	 *
-	 * @param message The error message
-	 */
-	public ValidationException(String message)
-	{
-	    super(message);
-	}
-    }
-
-    /**
-     * Internal class which handles events of interest to this panel
-     */
-    private class EventMonitor implements ModifyListener, SelectionListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	/**
-	 * Handle events sent when registered buttons are clicked
-	 */
-	public void widgetSelected(SelectionEvent e)
-	{
-	    Object widgetData;
-
-	    // Determine which button was clicked based on the data value stored in that button object
-	    // and handle processing for that button.
-	    widgetData = e.widget.getData(WidgetAttributes.BUTTON_ID);
-	    if (widgetData == null) {
-		// A widget other than a file selector browse button was clicked. Just call
-		// fireContentsChanged to drive enabling the Apply/Revert buttons. Since the widget is supposed
-		// to be a button widget, no validation of user data is needed.
-		fireContentsChanged();
-		if (e.getSource() == mpMsgApi) {
-		    setMsgApiDependentsState();
-		} else if (e.getSource() == mpRetry) {
-		    setRetryDependentsState();
-		}
-	    } else {
-		switch (((Integer) widgetData).intValue()) {
-		case MP_IONODEFILE_SELECTOR:
-		    getInputFile(mpIONodeFile, "File.mpIONodeFileTitle", "mpIONodeFilePath");
-		    break;
-		case PE_STDIN_PATH_SELECTOR:
-		    getInputFile(peStdinPath, "File.peStdinPathTitle", "peStdinPath");
-		    break;
-		case PE_STDOUT_PATH_SELECTOR:
-		    getOutputFile(peStdoutPath, "File.peStdoutPathTitle", "peStdoutPath");
-		    break;
-		case PE_STDERR_PATH_SELECTOR:
-		    getOutputFile(peStderrPath, "File.peStderrPathTitle", "peStderrPath");
-		    break;
-		case MP_COREDIR_SELECTOR:
-		    getDirectory(mpCoreDir, "File.mpCoredirTitle", "mpCoredirPath");
-		    break;
-		case MP_CMDFILE_SELECTOR:
-		    getInputFile(mpCmdFile, "File.mpCmdfileTitle", "mpCmdfilePath");
-		    break;
-		case MP_HOSTFILE_SELECTOR:
-		    getInputFile(mpHostFile, "File.mpHostfileTitle", "mpHostfilePath");
-		    break;
-		case MP_REMOTEDIR_SELECTOR:
-		    getInputFile(mpRemoteDir, "File.mpRemotedirTitle", "mpRemotedirPath");
-		    break;
-		case MP_LLFILE_SELECTOR:
-		    getInputFile(mpLLFile, "File.mpLLFileTitle", "mpLLFilePath");
-		    break;
-		case MP_EUILIBPATH_SELECTOR:
-		    getInputFile(mpEuiLibPath, "File.mpEuilibPathTitle", "mpEuilibPathPath");
-		    break;
-		case MP_SAVE_LLFILE_SELECTOR:
-		    getOutputFile(mpSaveLLFile, "File.mpSaveLLFileTitle", "mpSaveLLFilePath");
-		    break;
-		case MP_SAVEHOSTFILE_SELECTOR:
-		    getOutputFile(mpSaveHostFile, "File.mpSaveHostFileTitle", "mpSaveHostFilePath");
-		    break;
-		case MP_RMLIB_SELECTOR:
-		    getInputFile(mpRMLib, "File.peRMLibTitle", "mpRMLibPath");
-		    break;
-		case PE_ENV_SCRIPT_SELECTOR:
-		    getInputFile(peEnvScript, "File.peEnvScriptTitle", "peEnvScriptPath");
-		    break;
-		case MP_PROFDIR_SELECTOR:
-		    getDirectory(mpProfDir, "File.mpProfDirTitle", "mpProfDirPath");
-		    break;
-		case MP_PRIORITY_LOG_DIR_SELECTOR:
-		    getDirectory(mpPriorityLogDir, "File.mpPriorityLogDirTitle", "mpPriorityLogDirPath");
-		    break;
-		case MP_CKPTDIR_SELECTOR:
-		    getDirectory(mpCkptDir, "File.mpCkptDirTitle", "mpCkptDirPath");
-		    break;
-		case MP_CKPTFILE_SELECTOR:
-		    getOutputFile(mpCkptFile, "File.mpCkptFileTitle", "mpCkptFilePath");
-		    break;
-		case MP_PMDLOG_DIR_SELECTOR:
-		    getDirectory(mpPmdLogDir, "File.mpPMDLogDirTitle", "mpPMDLogDirPath");
-		    break;
-		case PE_ADVANCED_MODE_CHECKBOX:
-		    setLaunchPanelMode();
-		    validateAllFields();
-		    break;
-		}
-	    }
-	}
-
-	/**
-	 * Handle events sent when registered Text and Combo widgets have their text field modified.
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    // Text and Combo widgets send ModifyEvents any time their text value is modified, including
-	    // when the value is modified by a setText() call. The only time ModifyEvents are of interest is
-	    // when the user has entered text. Code which calls setText() on a widget should set the
-	    // ignoreModifyEvents before calling setText() and reset ignoreModifyEvents after the call.
-	    setFieldValidationRequired((Widget) e.getSource());
-	    if (!ignoreModifyEvents) {
-		validateAllFields();
-	    }
-	    if (e.getSource() == mpPriority) {
-		setPriorityDependentsState();
-	    } else if (e.getSource() == mpRetry) {
-		setRetryDependentsState();
-	    } else if ((mpLLFile != null) && (mpLLFile.isMatchingWidget((Widget) e.getSource()))) {
-		setLLFileDependentState();
-	    }
-	}
-    }
-
-    public PERMLaunchConfigurationDynamicTab(IResourceManager rm)
-    {
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#canSave(org.eclipse.swt.widgets.Control,
-     *      org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
-     */
-    public RMLaunchValidation canSave(Control control, IResourceManager rm, IPQueue queue)
-    {
-	if (allFieldsValid) {
-	    return success;
-	}
-	return new RMLaunchValidation(false, errorMessage);
-    }
-
-    /**
-     * Get the directory path from the launch configuration
-     *
-     * @param attrName Launch configuration attribute name for this directory
-     * @return Directory path
-     */
-    private String getFileDialogPath(String attrName)
-    {
-	String dir;
-
-	dir = "/";
-	if (currentLaunchConfig != null) {
-	    try {
-		dir = currentLaunchConfig.getAttribute(attrName, "/");
-	    }
-	    catch (CoreException e) {
-		dir = "/";
-	    }
-	}
-	return dir;
-    }
-
-    /**
-     * Save directory path in the launch configuration
-     *
-     * @param attrName Launch configuration attribute name for this directory
-     * @param path Directory path
-     */
-    private void saveFileDialogPath(String attrName, String path)
-    {
-	if (currentLaunchConfig != null) {
-	    currentLaunchConfig.setAttribute(attrName, path);
-	}
-    }
-
-    /**
-     * Display a file selector dialog prompting the user for the path of an input file. If the user clicks 'open', then
-     * set the pathname into the text field of the specified FileSelector object.
-     *
-     * @param selector The FileSelector object to hold path name
-     * @param titleID Title for the dialog
-     * @param pathAttrID Launch configuration attribute id for saving path info
-     */
-    protected void getInputFile(FileSelectorRowWidget selector, String titleID, String pathAttrID)
-    {
-	String selectedFile = null;
-
-	if (remoteUIService != null) {
-		IRemoteUIFileManager fmgr = remoteUIService.getUIFileManager();
-		fmgr.setConnection(remoteConnection);
-		selectedFile = fmgr.browseFile(parentShell, Messages.getString(titleID),
-						getFileDialogPath(pathAttrID)).toString();
-	}
-	if (selectedFile != null) {
-	    saveFileDialogPath(pathAttrID, selectedFile);
-	    selector.setPath(selectedFile);
-	    selector.setFocus();
-	}
-    }
-
-    /**
-     * Display a file selector dialog prompting the user for the path of an output file. If the user clicks 'save', then
-     * set the pathname into the text field of the specified FileSelector object.
-     *
-     * @param selector The FileSelector object to hold path name
-     * @param titleID Title for the dialog
-     * @param pathAttrID Launch configuration attribute id for saving path info
-     */
-    protected void getOutputFile(FileSelectorRowWidget selector, String titleID, String pathAttrID)
-    {
-	String selectedFile = null;
-
-	if (remoteUIService != null) {
-		IRemoteUIFileManager fmgr = remoteUIService.getUIFileManager();
-		fmgr.setConnection(remoteConnection);
-		selectedFile = fmgr.browseFile(parentShell, Messages.getString(titleID),
-						getFileDialogPath(pathAttrID)).toString();
-	}
-	if (selectedFile != null) {
-	    saveFileDialogPath(pathAttrID, selectedFile);
-	    selector.setPath(selectedFile);
-	    selector.setFocus();
-	}
-    }
-
-    /**
-     * Display a directory selector dialog prompting the user for the pathname of a directory. If the user clocks 'ok',
-     * then set the pathname into the text field of the specified FileSelector.
-     *
-     * @param selector FileSelector object to be updated
-     * @param titleID Title for the dialog
-     * @param pathAttrID Launch configuration attribute id for saving path info
-     */
-    protected void getDirectory(FileSelectorRowWidget selector, String titleID, String pathAttrID)
-    {
-	String selectedFile = null;
-
-	if (remoteUIService != null) {
-		IRemoteUIFileManager fmgr = remoteUIService.getUIFileManager();
-		fmgr.setConnection(remoteConnection);
-		selectedFile = fmgr.browseDirectory(parentShell, Messages.getString(titleID),
-						getFileDialogPath(pathAttrID)).toString();
-	}
-	if (selectedFile != null) {
-	    String parentDir;
-
-	    parentDir = new File(selectedFile).getParent();
-	    if (parentDir == null) {
-		saveFileDialogPath(pathAttrID, "/");
-	    }
-	    else {
-		saveFileDialogPath(pathAttrID, parentDir);
-	    }
-	    selector.setPath(selectedFile);
-	    selector.setFocus();
-	}
-    }
-
-    /**
-     * Mark the validation state for the specified widget to indicate that the widget value must be validated.
-     * @param source The widget to validate.
-     */
-    protected void setFieldValidationRequired(Widget source)
-    {
-	// Iterate thru the list of widgets looking for the widget which needs to be validated. When found, set
-	// that widget's validation state to indicate validation is needed. Widget class needs
-	// to be checked since although these widgets perform similar functions, they do not comprise a set of
-	// logically related widgets that can be easily organized in a class hierarchy.
-	Iterator<Object> i;
-
-	i = activeWidgets.iterator();
-	while (i.hasNext()) {
-	    Object widget;
-
-	    widget = i.next();
-	    if (widget instanceof BooleanRowWidget) {
-		if (((BooleanRowWidget) widget).isMatchingWidget(source)) {
-		    ((BooleanRowWidget) widget).setValidationRequired();
-		    return;
-		}
-	    }
-	    else if (widget instanceof CheckboxRowWidget) {
-		if (((CheckboxRowWidget) widget).isMatchingWidget(source)) {
-		    ((CheckboxRowWidget) widget).setValidationRequired();
-		    return;
-		}
-	    }
-	    else if (widget instanceof ComboRowWidget) {
-		if (((ComboRowWidget) widget).isMatchingWidget(source)) {
-		    ((ComboRowWidget) widget).setValidationRequired();
-		    return;
-		}
-	    }
-	    else if (widget instanceof DualFieldRowWidget) {
-		if (((DualFieldRowWidget) widget).isMatchingWidget(source)) {
-		    ((DualFieldRowWidget) widget).setValidationRequired();
-		    return;
-		}
-	    }
-	    else if (widget instanceof FileSelectorRowWidget) {
-		if (((FileSelectorRowWidget) widget).isMatchingWidget(source)) {
-		    ((FileSelectorRowWidget) widget).setValidationRequired();
-		    return;
-		}
-	    }
-	    else if (widget instanceof TextRowWidget) {
-		if (((TextRowWidget) widget).isMatchingWidget(source)) {
-		    ((TextRowWidget) widget).setValidationRequired();
-		    return;
-		}
-	    }
-	}
-    }
-
-    /**
-     * Mark all widget's validation state to indicate that the widget value has changed, meaning validation is
-     * required.
-     */
-    private void markAllFieldsChanged()
-    {
-	Iterator<Object> i;
-
-	i = activeWidgets.iterator();
-	while (i.hasNext()) {
-	    Object widget;
-
-	    widget = i.next();
-	    if (widget instanceof BooleanRowWidget) {
-		((BooleanRowWidget) widget).setValidationRequired();
-	    }
-	    else if (widget instanceof CheckboxRowWidget) {
-		((CheckboxRowWidget) widget).setValidationRequired();
-	    }
-	    else if (widget instanceof ComboRowWidget) {
-		((ComboRowWidget) widget).setValidationRequired();
-	    }
-	    else if (widget instanceof DualFieldRowWidget) {
-		((DualFieldRowWidget) widget).setValidationRequired();
-	    }
-	    else if (widget instanceof FileSelectorRowWidget) {
-		((FileSelectorRowWidget) widget).setValidationRequired();
-	    }
-	    else if (widget instanceof TextRowWidget) {
-		((TextRowWidget) widget).setValidationRequired();
-	    }
-	}
-    }
-
-    /**
-     * Disable the tab pane widget and all children of the tab pane. Calling setEnabled(false) on the tab pane widget
-     * disables the tab pane and prevents interaction with child widgets, but does not change the visible state of the
-     * child widget. This method changes the state of all widgets to correctly indicate they are disabled.
-     *
-     * @param widget The widget to be disabled.
-     */
-    private void disableTabPaneWidget(Control widget)
-    {
-	Control children[];
-
-	// For any Composite widget, recursively call this method for each child of the Composite. This must be
-	// done before disabling the Composite since disabling the Composite also marks its children disabled
-	// and the real enable/disable state of the child cannot be preserved.
-	if (widget instanceof Composite) {
-	    children = ((Composite) widget).getChildren();
-	    for (int i = 0; i < children.length; i++) {
-		disableTabPaneWidget(children[i]);
-	    }
-	}
-	// Remember the current state of the widget, then disable it.
-	widget.setData(ENABLE_STATE, Boolean.valueOf(widget.isEnabled()));
-	widget.setEnabled(false);
-    }
-
-    /**
-     * Restore widget back to its previous enable/disable state
-     *
-     * @param widget The widget whose state is to be restored.
-     */
-    private void restoreTabPaneWidgetState(Control widget)
-    {
-	Control children[];
-	Boolean state;
-	boolean enableFlag;
-
-	// Get widget's previous enable/disable state. If there is no saved state, such as when initially
-	// creating the parallel tab in basic mode, then enable the widget.
-	state = (Boolean) widget.getData(ENABLE_STATE);
-	if (state == null) {
-	    enableFlag = true;
-	} else {
-	    enableFlag = state.booleanValue();
-	}
-	widget.setEnabled(enableFlag);
-	// Recursively call this method to handle children of a Composite widget. Note that ordering of processing
-	// here does not matter since enabling a Composite widget does not automatically enable its children.
-	if (widget instanceof Composite) {
-	    children = ((Composite) widget).getChildren();
-	    for (int i = 0; i < children.length; i++) {
-		restoreTabPaneWidgetState(children[i]);
-	    }
-	}
-    }
-
-    /**
-     * Set launch panel mode based on peAdvancedMode setting. If checked, then set advanced mode, where the user
-     * supplies a PE setup script. Otherwise set basic mode, where the user chooses PE options from a tabbed dialog
-     * panel.
-     */
-    protected void setLaunchPanelMode()
-    {
-	if (peAdvancedMode != null) {
-	    if (peAdvancedMode.getSelection()) {
-		peEnvScript.setEnabled(true);
-		disableTabPaneWidget(tabbedPane);
-	    } else {
-		peEnvScript.setEnabled(false);
-		restoreTabPaneWidgetState(tabbedPane);
-	    }
-	}
-    }
-
-
-    /**
-     * Create a text widget in the tabbed view. The text field spans columns 2 and 3 of the tabbed pane. The label and
-     * tooltip text are obtained from the attribute definition object.
-     *
-     * @param parent Parent widget (the pane in the tabbed view)
-     * @param rm Resource manager used by this launch config
-     * @param id Attribute id for rm attribute this widget represents
-     * @return TextRowWidget entry widget
-     */
-    private TextRowWidget createTextWidget(Composite parent, IResourceManager rm, String id)
-    {
-	TextRowWidget widget;
-	IAttributeDefinition<?, ?, ?> attr;
-
-	widget = null;
-	attr = rm.getAttributeDefinition(id);
-	if (attr != null) {
-	    widget = new TextRowWidget(parent, id, attr);
-	    widget.addModifyListener(eventMonitor);
-	    activeWidgets.add(widget);
-	}
-	return widget;
-    }
-
-    /**
-     * Create a text widget in the tabbed view. The text field spans columns 2 and 3 of the tabbed pane. The label and
-     * tooltip text are obtained from the attribute definition object.
-     *
-     * @param parent Parent widget (the pane in the tabbed view)
-     * @param rm Resource manager used by this launch config
-     * @param id1 Attribute id for first rm attribute this widget represents
-     * @param id2 Attribute id for second rm attribute this widget represents
-     * @return Text entry widget
-     */
-    private DualFieldRowWidget createDualField(Composite parent, IResourceManager rm, String id1, String id2)
-    {
-	DualFieldRowWidget widget;
-	IAttributeDefinition<?, ?, ?> attr1;
-	IAttributeDefinition<?, ?, ?> attr2;
-
-	widget = null;
-	attr1 = rm.getAttributeDefinition(id1);
-	attr2 = rm.getAttributeDefinition(id2);
-	if ((attr1 != null) && (attr2 != null)) {
-	    widget = new DualFieldRowWidget(parent, id1, id2, attr1, attr2);
-	    widget.addModifyListener(eventMonitor);
-	    activeWidgets.add(widget);
-	}
-	return widget;
-    }
-
-    /**
-     * Create a checkbox widget in the tabbed view. The checkbox is in column 2 and column 3 is a filler (Label) widget.
-     * To ensure consistent alignment, this method allocates extra horizontal space to the 2nd column. The label and
-     * tooltip text are obtained from the attribute definition object.
-     *
-     * @param parent Parent widget (the pane in the tabbed view)
-     * @param rm Resource manager used by this launch config
-     * @param id Attribute id for rm attribute this widget represents
-     * @return Checkbox button for this attribute
-     */
-    private CheckboxRowWidget createCheckbox(Composite parent, IResourceManager rm, String id)
-    {
-	CheckboxRowWidget widget;
-	StringAttributeDefinition attrDef;
-
-	widget = null;
-	attrDef = (StringAttributeDefinition) rm.getAttributeDefinition(id);
-	if (attrDef != null) {
-	    widget = new CheckboxRowWidget(parent, id, attrDef);
-	    activeWidgets.add(widget);
-	}
-	return widget;
-    }
-
-    /**
-     * Create a radio button pair in the tabbed view. The label, button labels, and tooltip text are obtained from the
-     * attribute definition object.
-     *
-     * @param parent Parent widget (the pane in the tabbed view)
-     * @param rm Resource manager used by this launch config
-     * @param id Attribute id for rm attribute this widget represents
-     * @return Checkbox button for this attribute
-     */
-    private BooleanRowWidget createBooleanOption(Composite parent, IResourceManager rm, String id)
-    {
-	BooleanRowWidget widget;
-	StringSetAttributeDefinition attrDef;
-
-	widget = null;
-	attrDef = (StringSetAttributeDefinition) rm.getAttributeDefinition(id);
-	if (attrDef != null) {
-	    widget = new BooleanRowWidget(parent, id, attrDef, -1);
-	    widget.addSelectionListener(eventMonitor);
-	    activeWidgets.add(widget);
-	}
-	return widget;
-    }
-
-    /**
-     * Create a text field and pushbutton in this row. The text field is in column 2 and the pushbutton in column 3. The
-     * user either fills in the text field with a pathname, or clicks the button to pop up a file selector dialog that
-     * then fills in the text field. To ensure consistent alignment, this method allocates extra horizontal space to the
-     * 2nd column. The label and tooltip text are obtained from the attribute definition object.
-     *
-     * @param parent Parent widget (the pane in the tabbed view)
-     * @param rm Resource manager used by this launch config
-     * @param id Attribute id for rm attribute this widget represents
-     * @param selectorID Identifier used to identify the browse button associated with this widget
-     * @return Text entry field for this attribute
-     */
-    private FileSelectorRowWidget createFileSelector(Composite parent, IResourceManager rm, String id, int selectorID)
-    {
-	FileSelectorRowWidget widget;
-	StringAttributeDefinition attr;
-
-	widget = null;
-	attr = (StringAttributeDefinition) rm.getAttributeDefinition(id);
-	if (attr != null) {
-	    widget = new FileSelectorRowWidget(parent, id, selectorID, attr);
-	    widget.setData(id);
-	    widget.addModifyListener(eventMonitor);
-	    widget.addSelectionListener(eventMonitor);
-	    activeWidgets.add(widget);
-	}
-	return widget;
-    }
-
-    /**
-     * Create a combobox widget in the tabbed view. The widget spans columns 2 and 3 of the tabbed pane. The label and
-     * tooltip text are obtained from the attribute definition object.
-     *
-     * @param parent Parent widget (the pane in the tabbed view)
-     * @param rm Resource manager used by this launch config
-     * @param id Attribute id for rm attribute this widget represents
-     * @return ComboRowWidget used by this attribute
-     */
-    private ComboRowWidget createCombobox(Composite parent, IResourceManager rm, String id)
-    {
-	ComboRowWidget widget;
-	IAttributeDefinition<?, ?, ?> attr;
-
-	widget = null;
-	attr = rm.getAttributeDefinition(id);
-	if (attr != null) {
-	    widget = new ComboRowWidget(parent, id, attr, true);
-	    widget.addSelectionListener(eventMonitor);
-	    activeWidgets.add(widget);
-	}
-	return widget;
-    }
-
-    /**
-     * Create an editable combobox in the tabbed view. The widget spans columns 2 and 3 of the tabbed pane. The label
-     * and tooltip text are obtained from the attribute definition object.
-     *
-     * @param parent Parent widget (the pane in the tabbed view)
-     * @param rm Resource manager used by this launch config
-     * @param id Attribute id for rm attribute this widget represents
-     * @return Editable ComboRowWidget used by this attribute
-     */
-    private ComboRowWidget createEditableCombobox(Composite parent, IResourceManager rm, String id)
-    {
-	ComboRowWidget widget;
-	IAttributeDefinition<?, ?, ?> attr;
-
-	widget = null;
-	attr = rm.getAttributeDefinition(id);
-	if (attr != null) {
-	    widget = new ComboRowWidget(parent, id, attr, false);
-	    widget.addSelectionListener(eventMonitor);
-	    widget.addModifyListener(eventMonitor);
-	    activeWidgets.add(widget);
-	}
-	return widget;
-    }
-
-    /**
-     * Reset all widgets within this pane to null as part of panel initialization. Depending on OS and operation mode
-     * (with or without LoadLeveler), some widgets will not appear on the panels, where the set of attribute definitions
-     * sent by the proxy determines that set. New widgets will be generated only when a corresponding attribute
-     * definition is sent by the proxy. Any code which accesses a widget should ensure the widget is not null before
-     * accessing the widget object.
-     */
-    private void clearAllWidgets()
-    {
-	mpIOBufferSize = null;
-	mpIONodeFile = null;
-	mpLabelIO = null;
-	mpDevType = null;
-	mpPriorityLogDir = null;
-	mpPriorityLogName = null;
-	mpStdinMode = null;
-	mpStdoutMode = null;
-	mpIOErrLog = null;
-	peSplitStdout = null;
-	peStdinPath = null;
-	peStdoutPath = null;
-	peStderrPath = null;
-	mpInfoLevel = null;
-	mpLAPITraceLevel = null;
-	mpPMDLog = null;
-	mpPrintEnv = null;
-	mpPriorityLog = null;
-	mpStatistics = null;
-	mpCoreDir = null;
-	mpCorefileFormat = null;
-	mpCorefileSigterm = null;
-	mpDebugInitialStop = null;
-	mpDebugNotimeout = null;
-	mpEuiDevelop = null;
-	mpProfDir = null;
-	mpAdapterUse = null;
-	mpCpuUse = null;
-	mpEuiDevice = null;
-	mpInstances = null;
-	mpEuiLib = null;
-	mpCmdFile = null;
-	mpHostFile = null;
-	mpNodes = null;
-	mpPgmModel = null;
-	mpProcs = null;
-	mpRemoteDir = null;
-	mpTasksPerNode = null;
-	mpLLFile = null;
-	mpNewJob = null;
-	mpRMPool = null;
-	mpRetry = null;
-	mpRetryCount = null;
-	mpAckThresh = null;
-	peBufferMem = null;
-	mpCCScratchBuf = null;
-	mpCSSInterrupt = null;
-	mpEagerLimit = null;
-	mpMsgEnvelopeBuf = null;
-	mpPollingInterval = null;
-	mpPriority = null;
-	mpPriorityNTP = null;
-	peRDMACount = null;
-	mpRetransmitInterval = null;
-	mpRexmitBufCnt = null;
-	mpRexmitBufSize = null;
-	mpSharedMemory = null;
-	mpSingleThread = null;
-	mpTaskAffinity = null;
-	mpUDPPacketSize = null;
-	mpWaitMode = null;
-	mpUseBulkXfer = null;
-	mpBulkMinMsgSize = null;
-	mpClockSource = null;
-	mpEuiLibPath = null;
-	mpHintsFiltered = null;
-	mpMsgApi = null;
-	mpPulse = null;
-	mpThreadStackSize = null;
-	mpTimeout = null;
-	mpTLPRequired = null;
-	mpSaveLLFile = null;
-	mpSaveHostFile = null;
-	mpRMLib = null;
-	mpCkptDir = null;
-	mpCkptFile = null;
-	mpCkptDirPerTask = null;
-	mpPmdLogDir = null;
-    }
-
-    /**
-     * Set enable state for widgets which are dependent on the setting for mpPriority.
-     */
-    private void setPriorityDependentsState()
-    {
-	if ((mpPriority.getValue().length() == 0) ||
-		(mpPriority.getValue().equals(getDefaultAttributeValue(currentRM, MP_PRIORITY)))) {
-	    if (mpPriorityLog != null) {
-		mpPriorityLog.setEnabled(false);
-	    }
-	    if (mpPriorityNTP != null) {
-		mpPriorityNTP.setEnabled(false);
-	    }
-	    if (mpPriorityLogDir != null) {
-		mpPriorityLogDir.setEnabled(false);
-	    }
-	    if (mpPriorityLogName != null) {
-		mpPriorityLogName.setEnabled(false);
-	    }
-	}
-	else {
-	    if (mpPriorityLog != null) {
-		mpPriorityLog.setEnabled(true);
-	    }
-	    if (mpPriorityNTP != null) {
-		mpPriorityNTP.setEnabled(true);
-	    }
-	    if (mpPriorityLogDir != null) {
-		mpPriorityLogDir.setEnabled(true);
-	    }
-	    if (mpPriorityLogName != null) {
-		mpPriorityLogName.setEnabled(true);
-	    }
-	}
-    }
-    /**
-     * Set enable state for widgets which are dependent on the setting for mpMsgApi
-     */
-    private void setMsgApiDependentsState()
-    {
-	if (mpMsgApi.getValue().equals("MPI,LAPI")) {
-	    if (peRDMACount != null) {
-		peRDMACount.setEnabled(true);
-	    }
-	}
-	else {
-	    if (peRDMACount != null) {
-		peRDMACount.setEnabled(false);
-	    }
-	}
-    }
-
-    /**
-     * Set enable state for MP_RETRY_COUNT, where it is not enabled if MP_RETRY = 'wait' and
-     * enabled otherwise.
-     */
-    private void setRetryDependentsState()
-    {
-	if (mpRetryCount != null) {
-	    if (mpRetry.getValue().equals("wait")) {
-		mpRetryCount.setEnabled(true);
-	    }
-	    else {
-		mpRetryCount.setEnabled(false);
-	    }
-	}
-    }
-
-    /**
-     * Set enable state for widgets dependent on MP_LLFILE setting
-     */
-    private void setLLFileDependentState()
-    {
-	boolean enableState;
-
-	if ((mpLLFile != null) && (mpLLFile.getValue().length() > 0)) {
-	    enableState = false;
-	}
-	else {
-	    enableState = true;
-	}
-	if ((mpMsgApi != null) && (!mpMsgApi.getValue().equals("MPI,LAPI"))) {
-	    if (peRDMACount != null) {
-		peRDMACount.setEnabled(enableState);
-	    }
-	} else {
-	    if (peRDMACount != null) {
-		peRDMACount.setEnabled(false);
-	    }
-	}
-	if (mpAdapterUse != null) {
-	    mpAdapterUse.setEnabled(false);
-	}
-	if (mpCpuUse != null) {
-	    mpCpuUse.setEnabled(enableState);
-	}
-	if (mpEuiDevice != null) {
-	    mpEuiDevice.setEnabled(enableState);
-	}
-	if (mpEuiLib != null) {
-	    mpEuiLib.setEnabled(enableState);
-	}
-	if (mpInstances != null) {
-	    mpInstances.setEnabled(enableState);
-	}
-	if (mpNodes != null) {
-	    mpNodes.setEnabled(enableState);
-	}
-	if (mpProcs != null) {
-	    mpProcs.setEnabled(enableState);
-	}
-	if (mpRMPool != null) {
-	    mpRMPool.setEnabled(enableState);
-	}
-	if (mpTasksPerNode != null) {
-	    mpTasksPerNode.setEnabled(enableState);
-	}
-	if (mpTaskAffinity != null) {
-	    mpTaskAffinity.setEnabled(enableState);
-	}
-	if (mpUseBulkXfer != null) {
-	    mpUseBulkXfer.setEnabled(enableState);
-	}
-	if (mpSaveLLFile != null) {
-	    mpSaveLLFile.setEnabled(enableState);
-	}
-	if (mpSaveHostFile != null) {
-	    mpSaveHostFile.setEnabled(enableState);
-	}
-    }
-   /**
-     * Create the layout object for a pane in the TabFolder
-     *
-     * @return Layout for use in the tabbed pane
-     */
-    private Layout createTabPaneLayout()
-    {
-	GridLayout layout;
-
-	layout = new GridLayout(4, false);
-	layout.marginWidth = 4;
-	layout.horizontalSpacing = 8;
-	layout.verticalSpacing = 4;
-	return layout;
-    }
-
-    /**
-     * Create the tasks tab of the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createTasksTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	tasksTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(tasksTabPane);
-	tab.setText(Messages.getString("TasksTab.title"));
-	tasksTabPane.setLayout(createTabPaneLayout());
-	mpHostFile = createFileSelector(tasksTabPane, rm, MP_HOSTFILE, MP_HOSTFILE_SELECTOR);
-	mpProcs = createTextWidget(tasksTabPane, rm, MP_PROCS);
-	mpNodes = createTextWidget(tasksTabPane, rm, MP_NODES);
-	mpTasksPerNode = createTextWidget(tasksTabPane, rm, MP_TASKS_PER_NODE);
-    }
-    /**
-     * Create the I/O tab of the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createIOTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	ioTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(ioTabPane);
-	tab.setText(Messages.getString("IOTab.title"));
-	ioTabPane.setLayout(createTabPaneLayout());
-	mpStdinMode = createEditableCombobox(ioTabPane, rm, MP_STDINMODE);
-	mpStdoutMode = createEditableCombobox(ioTabPane, rm, MP_STDOUTMODE);
-	mpLabelIO = createBooleanOption(ioTabPane, rm, MP_LABELIO);
-	peSplitStdout = createBooleanOption(ioTabPane, rm, PE_SPLIT_STDOUT);
-    }
-
-    /**
-     * Create the diagnostics tab of the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createDiagnosticTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	diagTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(diagTabPane);
-	tab.setText(Messages.getString("DIAGTab.title"));
-	diagTabPane.setLayout(createTabPaneLayout());
-	mpPmdLogDir = createFileSelector(diagTabPane, rm, MP_PMDLOG_DIR, MP_PMDLOG_DIR_SELECTOR);
-	mpInfoLevel = createCombobox(diagTabPane, rm, MP_INFOLEVEL);
-	mpPrintEnv = createEditableCombobox(diagTabPane, rm, MP_PRINTENV);
-	mpPMDLog = createBooleanOption(diagTabPane, rm, MP_PMDLOG);
-	mpPriorityLog = createBooleanOption(diagTabPane, rm, MP_PRIORITY_LOG);
-	mpStatistics = createCombobox(diagTabPane, rm, MP_STATISTICS);
-    }
-
-    /**
-     * Create the debug tab of the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createDebugTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	debugTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(debugTabPane);
-	tab.setText(Messages.getString("DEBUGTab.title"));
-	debugTabPane.setLayout(createTabPaneLayout());
-	mpEuiDevelop = createCombobox(debugTabPane, rm, MP_EUIDEVELOP);
-	mpCorefileFormat = createEditableCombobox(debugTabPane, rm, MP_COREFILE_FORMAT);
-	mpCoreDir = createFileSelector(debugTabPane, rm, MP_COREDIR, MP_COREDIR_SELECTOR);
-	mpProfDir = createFileSelector(debugTabPane, rm, MP_PROFDIR, MP_PROFDIR_SELECTOR);
-	mpDebugInitialStop = createTextWidget(debugTabPane, rm, MP_DEBUG_INITIAL_STOP);
-	mpDebugNotimeout = createBooleanOption(debugTabPane, rm, MP_DEBUG_NOTIMEOUT);
-	mpCorefileSigterm = createBooleanOption(debugTabPane, rm, MP_COREFILE_SIGTERM);
-    }
-
-    /**
-     * Create the system resources tab of the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createSystemTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	systemTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(systemTabPane);
-	tab.setText(Messages.getString("SYSTab.title"));
-	systemTabPane.setLayout(createTabPaneLayout());
-	mpEuiDevice = createCombobox(systemTabPane, rm, MP_EUIDEVICE);
-	mpEuiLib = createCombobox(systemTabPane, rm, MP_EUILIB);
-	mpInstances = createEditableCombobox(systemTabPane, rm, MP_INSTANCES);
-	mpAdapterUse = createBooleanOption(systemTabPane, rm, MP_ADAPTER_USE);
-	mpCpuUse = createBooleanOption(systemTabPane, rm, MP_CPU_USE);
-    }
-
-    /**
-     * Create the node allocation tab of the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createNodeAllocationTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	nodeTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(nodeTabPane);
-	tab.setText(Messages.getString("NODETab.title"));
-	nodeTabPane.setLayout(createTabPaneLayout());
-	mpCmdFile = createFileSelector(nodeTabPane, rm, MP_CMDFILE, MP_CMDFILE_SELECTOR);
-	mpRemoteDir = createFileSelector(nodeTabPane, rm, MP_REMOTEDIR, MP_REMOTEDIR_SELECTOR);
-	mpLLFile = createFileSelector(nodeTabPane, rm, MP_LLFILE, MP_LLFILE_SELECTOR);
-	mpRMPool = createTextWidget(nodeTabPane, rm, MP_RMPOOL);
-	mpRetryCount = createTextWidget(nodeTabPane, rm, MP_RETRY_COUNT);
-	mpPgmModel = createCombobox(nodeTabPane, rm, MP_PGMMODEL);
-	mpRetry = createEditableCombobox(nodeTabPane, rm, MP_RETRY);
-	mpNewJob = createBooleanOption(nodeTabPane, rm, MP_NEWJOB);
-	if (mpLLFile != null) {
-	    mpLLFile.addModifyListener(eventMonitor);
-	}
-    }
-
-    /**
-     * Create the first performance tab of the attributes pane. Due to the number of performance related attributes,
-     * there are two performance tabs.
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createPerformanceTab1(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	performanceTab1Pane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(performanceTab1Pane);
-	tab.setText(Messages.getString("PERFTab1.title"));
-	performanceTab1Pane.setLayout(createTabPaneLayout());
-	mpAckThresh = createTextWidget(performanceTab1Pane, rm, MP_ACK_THRESH);
-	mpPollingInterval = createTextWidget(performanceTab1Pane, rm, MP_POLLING_INTERVAL);
-	mpPriority = createTextWidget(performanceTab1Pane, rm, MP_PRIORITY);
-	mpBulkMinMsgSize = createTextWidget(performanceTab1Pane, rm, MP_BULK_MIN_MSG_SIZE);
-	mpUDPPacketSize = createTextWidget(performanceTab1Pane, rm, MP_UDP_PACKET_SIZE);
-	peRDMACount = createDualField(performanceTab1Pane, rm, PE_RDMA_COUNT, PE_RDMA_COUNT_2);
-	mpWaitMode = createCombobox(performanceTab1Pane, rm, MP_WAIT_MODE);
-	mpPriorityNTP = createBooleanOption(performanceTab1Pane, rm, MP_PRIORITY_NTP);
-	mpCCScratchBuf = createBooleanOption(performanceTab1Pane, rm, MP_CC_SCRATCH_BUF);
-	mpCSSInterrupt = createBooleanOption(performanceTab1Pane, rm, MP_CSS_INTERRUPT);
-	mpUseBulkXfer = createBooleanOption(performanceTab1Pane, rm, MP_USE_BULK_XFER);
-    }
-
-    /**
-     * Create the second performance tab for the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createPerformanceTab2(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	performanceTab2Pane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(performanceTab2Pane);
-	tab.setText(Messages.getString("PERFTab2.title"));
-	performanceTab2Pane.setLayout(createTabPaneLayout());
-	peBufferMem = createDualField(performanceTab2Pane, rm, PE_BUFFER_MEM, PE_BUFFER_MEM_MAX);
-	mpMsgEnvelopeBuf = createTextWidget(performanceTab2Pane, rm, MP_MSG_ENVELOPE_BUF);
-	mpEagerLimit = createTextWidget(performanceTab2Pane, rm, MP_EAGER_LIMIT);
-	mpRetransmitInterval = createTextWidget(performanceTab2Pane, rm, MP_RETRANSMIT_INTERVAL);
-	mpRexmitBufCnt = createTextWidget(performanceTab2Pane, rm, MP_REXMIT_BUF_CNT);
-	mpRexmitBufSize = createTextWidget(performanceTab2Pane, rm, MP_REXMIT_BUF_SIZE);
-	mpTaskAffinity = createEditableCombobox(performanceTab2Pane, rm, MP_TASK_AFFINITY);
-	mpSharedMemory = createBooleanOption(performanceTab2Pane, rm, MP_SHARED_MEMORY);
-	mpSingleThread = createBooleanOption(performanceTab2Pane, rm, MP_SINGLE_THREAD);
-    }
-
-    /**
-     * Create the miscellaneous tab of the attributes pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createMiscellaneousTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	miscTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(miscTabPane);
-	tab.setText(Messages.getString("MISCTab.title"));
-	miscTabPane.setLayout(createTabPaneLayout());
-	mpClockSource = createCombobox(miscTabPane, rm, MP_CLOCK_SOURCE);
-	mpMsgApi = createCombobox(miscTabPane, rm, MP_MSG_API);
-	mpTLPRequired = createCombobox(miscTabPane, rm, MP_TLP_REQUIRED);
-	mpDevType = createCombobox(miscTabPane, rm, MP_DEVTYPE);
-	mpLAPITraceLevel = createCombobox(miscTabPane, rm, MP_LAPI_TRACE_LEVEL);
-	mpEuiLibPath = createFileSelector(miscTabPane, rm, MP_EUILIBPATH, MP_EUILIBPATH_SELECTOR);
-	mpSaveLLFile = createFileSelector(miscTabPane, rm, MP_SAVE_LLFILE, MP_SAVE_LLFILE_SELECTOR);
-	mpSaveHostFile = createFileSelector(miscTabPane, rm, MP_SAVEHOSTFILE, MP_SAVEHOSTFILE_SELECTOR);
-	mpPriorityLogDir = createFileSelector(miscTabPane, rm, MP_PRIORITY_LOG_DIR, MP_PRIORITY_LOG_DIR_SELECTOR);
-	mpPriorityLogName = createTextWidget(miscTabPane, rm, MP_PRIORITY_LOG_NAME);
-	mpCkptDir = createFileSelector(miscTabPane, rm, MP_CKPTDIR, MP_CKPTDIR_SELECTOR);
-	mpCkptFile = createFileSelector(miscTabPane, rm, MP_CKPTFILE, MP_CKPTFILE_SELECTOR);
-	mpIONodeFile = createFileSelector(miscTabPane, rm, MP_IONODEFILE, MP_IONODEFILE_SELECTOR);
-	mpPulse = createTextWidget(miscTabPane, rm, MP_PULSE);
-	mpThreadStackSize = createTextWidget(miscTabPane, rm, MP_THREAD_STACKSIZE);
-	mpTimeout = createTextWidget(miscTabPane, rm, MP_TIMEOUT);
-	mpIOBufferSize = createTextWidget(miscTabPane, rm, MP_IO_BUFFER_SIZE);
-	mpHintsFiltered = createBooleanOption(miscTabPane, rm, MP_HINTS_FILTERED);
-	mpIOErrLog = createBooleanOption(miscTabPane, rm, MP_IO_ERRLOG);
-	mpCkptDirPerTask = createBooleanOption(miscTabPane, rm, MP_CKPTDIR_PERTASK);
-    }
-
-    /**
-     * Create the alternate resource manager tab of the resources pane
-     *
-     * @param rm resource manager associated with this launch configuration
-     */
-    private void createOtherRMTab(IResourceManager rm)
-    {
-	TabItem tab;
-
-	tab = new TabItem(tabbedPane, SWT.NONE);
-	alternateRMTabPane = new Composite(tabbedPane, SWT.NONE);
-	tab.setControl(alternateRMTabPane);
-	tab.setText(Messages.getString("RMTab.title"));
-	alternateRMTabPane.setLayout(createTabPaneLayout());
-	mpRMLib = createFileSelector(alternateRMTabPane, rm, MP_RMLIB, MP_RMLIB_SELECTOR);
-    }
-
-    /**
-     * Create a pane containing the advanced mode checkbox and PE setup script name
-     *
-     * @param rm The resource manager associated with this launch configuration
-     */
-    private void createModeBox(IResourceManager rm)
-    {
-	GridData gd;
-	GridLayout layout;
-	Composite pane;
-
-	pane = new Composite(mainPanel, SWT.NONE);
-	layout = new GridLayout(4, false);
-	layout.marginWidth = 4;
-	layout.horizontalSpacing = 8;
-	layout.verticalSpacing = 4;
-	pane.setLayout(layout);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	pane.setLayoutData(gd);
-	peAdvancedMode = createCheckbox(pane, rm, PE_ADVANCED_MODE);
-	if (peAdvancedMode != null) {
-	    peAdvancedMode.setData(WidgetAttributes.BUTTON_ID, (Object) new Integer(PE_ADVANCED_MODE_CHECKBOX));
-	    peAdvancedMode.addSelectionListener(eventMonitor);
-	}
-	peEnvScript = createFileSelector(pane, rm, PE_ENV_SCRIPT, PE_ENV_SCRIPT_SELECTOR);
-    }
-
-    /**
-     * Create a pane containing the file selectors for stdio redirection
-     *
-     * @param rm The resource manager associated with this launch configuration
-     */
-    private void createRedirectBox(IResourceManager rm)
-    {
-	GridData gd;
-	GridLayout layout;
-	Composite pane;
-
-	pane = new Composite(mainPanel, SWT.NONE);
-	layout = new GridLayout(4, false);
-	layout.marginWidth = 8;
-	layout.horizontalSpacing = 8;
-	layout.verticalSpacing = 8;
-	pane.setLayout(layout);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	pane.setLayoutData(gd);
-	peStdinPath = createFileSelector(pane, rm, PE_STDIN_PATH, PE_STDIN_PATH_SELECTOR);
-	peStdoutPath = createFileSelector(pane, rm, PE_STDOUT_PATH, PE_STDOUT_PATH_SELECTOR);
-	peStderrPath = createFileSelector(pane, rm, PE_STDERR_PATH, PE_STDERR_PATH_SELECTOR);
-    }
-
-    /**
-     * This method creates all of the GUI elements of the resource-manager specific pane within the parallel tab of the
-     * launch configuration dialog.
-     *
-     * @param parent This control's parent
-     * @param rm The resource manager associated with this launch configuration
-     * @param queue Currently selected queue
-     */
-    public void createControl(Composite parent, IResourceManager rm, IPQueue queue)
-    {
-	PEResourceManagerConfiguration config;
-	IRemoteConnectionManager connMgr;
-
-	config = (PEResourceManagerConfiguration) ((AbstractResourceManager) rm).getConfiguration();
-	remoteService = PTPRemoteCorePlugin.getDefault().getRemoteServices(config.getRemoteServicesId());
-	remoteUIService = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(remoteService);
-	connMgr = remoteService.getConnectionManager();
-	remoteConnection = connMgr.getConnection(config.getConnectionName());
-	parentShell = parent.getShell();
-	clearAllWidgets();
-	activeWidgets = new Vector<Object>();
-	eventMonitor = new EventMonitor();
-	mainPanel = new Composite(parent, SWT.NONE);
-	mainPanel.setLayout(new GridLayout(1, false));
-	createModeBox(rm);
-	createRedirectBox(rm);
-	tabbedPane = new TabFolder(mainPanel, SWT.TOP);
-	createTasksTab(rm);
-	createIOTab(rm);
-	createDiagnosticTab(rm);
-	createDebugTab(rm);
-	createSystemTab(rm);
-	createNodeAllocationTab(rm);
-	createPerformanceTab1(rm);
-	createPerformanceTab2(rm);
-	if (!useLoadLeveler) {
-	    createOtherRMTab(rm);
-	}
-	createMiscellaneousTab(rm);
-	currentRM = rm;
-    }
-
-    /**
-     * Add an attribute to the set of launch attributes if its value is not equal to the default value and the attribute
-     * is known to the specified resource manager.
-     *
-     * @param rm The resource manager associated with the current launch configuration
-     * @param config The current launch configuration
-     * @param attrs The attributes vector containing the set of launch attributes
-     * @param attrName The name of the attribute to be added to launch attributes
-     */
-    private void addAttribute(IResourceManager rm, ILaunchConfiguration config, Vector<StringAttribute> attrs,
-	    String attrName)
-    {
-	String attrValue;
-	String defaultValue;
-	StringAttribute attr;
-	StringAttributeDefinition attrDef;
-
-	if (rm.getAttributeDefinition(attrName) != null) {
-	    try {
-		attrValue = config.getAttribute(attrName, "");
-	    }
-	    catch (CoreException e) {
-		attrValue = "";
-	    }
-	    defaultValue = getAttrDefaultValue(rm, attrName);
-	    // Don't add attribute if it has default value or if it is blank.
-	    // This reduces number of attributes sent in run command.
-	    if ((attrValue.length() > 0) && (!attrValue.equals(defaultValue))) {
-		attrDef = new StringAttributeDefinition(attrName, "", "", false, "");
-		attr = new StringAttribute(attrDef, attrValue);
-		attrs.add(attr);
-	    }
-	}
-    }
-
-    /**
-     * Get the set of attributes to be used as launch attributes
-     *
-     * @param rm The resource manager associated with the current launch configuration
-     * @param queue The current queue (not used for PE since there is only a single queue)
-     * @param configuration The current launch configuration
-     */
-    public IAttribute<String, StringAttribute, StringAttributeDefinition>[] getAttributes(IResourceManager rm,
-	    			IPQueue queue, ILaunchConfiguration configuration, String mode)
-	    			throws CoreException
-    {
-	Vector<StringAttribute> attrs;
-	StringAttribute attrArray[];
-
-	attrs = new Vector<StringAttribute>();
-	attrArray = new StringAttribute[0];
-	if (configuration.getAttribute(PE_ADVANCED_MODE, "").equals("yes")) {
-	    BufferedReader rdr;
-	    String setupScriptPath;
-
-	    setupScriptPath = configuration.getAttribute(PE_ENV_SCRIPT, "");
-	    try {
-		String envData;
-
-		rdr = new BufferedReader(new FileReader(setupScriptPath));
-		envData = rdr.readLine();
-		while (envData != null) {
-		    envData = envData.trim();
-		    if (envData.startsWith("MP_")) {
-			String tokens[];
-			StringAttributeDefinition attrDef;
-			StringAttribute attr;
-
-			tokens = envData.split("=");
-			if (tokens.length == 2) {
-			    attrDef = new StringAttributeDefinition(tokens[0], "", "", false, "");
-			    attr = new StringAttribute(attrDef, tokens[1]);
-			    attrs.add(attr);
-			}
-		    }
-		    envData = rdr.readLine();
-		}
-	    }
-	    catch (FileNotFoundException e) {
-		System.out.println("PE Environment setup file " + setupScriptPath + " not found.");
-	    }
-	    catch (IOException e) {
-		System.out.println("Error reading PE environment setup file " + setupScriptPath + ": " +
-				   e.getMessage());
-	    }
-	} else {
-	    Map<String, StringAttribute> allAttrs;
-	    Set<String> attrNames;
-	    Iterator<String> i;
-	    String name;
-
-	    allAttrs = configuration.getAttributes();
-	    attrNames = allAttrs.keySet();
-	    i = attrNames.iterator();
-	    while (i.hasNext()) {
-		name = i.next();
-		if ((name.startsWith("MP_")) || ((name.startsWith("PE_")) && (! name.equals(PE_ENV_SCRIPT)))) {
-		    addAttribute(rm, configuration, attrs, name);
-		}
-	    }
-	}
-	return attrs.toArray(attrArray);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#getControl()
-     */
-    public Control getControl()
-    {
-	return mainPanel;
-    }
-
-    /**
-     * Get the default value for an attribute from the resource manager, giving
-     * preference to a user override of the default value (which the user does by setting of the
-     * corresponding environment variable before starting the proxy.) The user's override
-     * is passed to the front end by the proxy as a string attribute where the leading 'MP_' of
-     * the attribute name is replaced with 'EN_'
-     *
-     * @param rm The resource manager currently associated with the launch configuration
-     * @param attrName The name of the attribute
-     * @return The value of the attribute
-     */
-    private String getAttrLocalDefaultValue(IResourceManager rm, String attrName)
-    {
-	IAttributeDefinition<?, ?, ?> attrDef;
-	String localDefaultEnv;
-
-	localDefaultEnv = attrName.replaceFirst("^MP_", "EN_");
-	attrDef = rm.getAttributeDefinition(localDefaultEnv);
-	if (attrDef != null) {
-	    try {
-		return attrDef.create().getValueAsString();
-	    }
-	    catch (IllegalValueException e) {
-	    }
-	}
-	attrDef = rm.getAttributeDefinition(attrName);
-	if (attrDef != null) {
-	    try {
-		return attrDef.create().getValueAsString();
-	    }
-	    catch (IllegalValueException e) {
-		return "";
-	    }
-	}
-	return "";
-    }
-
-    /**
-     * Get the default value for an attribute from the resource manager
-     *
-     * @param rm The resource manager currently associated with the launch configuration
-     * @param attrName The name of the attribute
-     * @return The value of the attribute
-     */
-    private String getAttrDefaultValue(IResourceManager rm, String attrName)
-    {
-	IAttributeDefinition<?, ?, ?> attrDef;
-
-	attrDef = rm.getAttributeDefinition(attrName);
-	if (attrDef != null) {
-	    try {
-		return attrDef.create().getValueAsString();
-	    }
-	    catch (IllegalValueException e) {
-		return "";
-	    }
-	}
-	return "";
-    }
-
-    /**
-     * Get the attribute value for the specified attribute. If the value is stored in the launch configuration, that
-     * value is used. Otherwise the default value from the resource manager is used.
-     *
-     * @param config The current launch configuration
-     * @param rm The resource manager currently associated with the launch configuration
-     * @param attrName The name of the attribute
-     * @return The value of the attribute
-     */
-    private String getAttrInitialValue(ILaunchConfiguration config, IResourceManager rm, String attrName)
-    {
-	String value;
-	IAttributeDefinition<?, ?, ?> rmAttrDef;
-
-	try {
-	    value = config.getAttribute(attrName, "_no_value_");
-	}
-	catch (CoreException e) {
-	    value = "_no_value_";
-	}
-	if (value.equals("_no_value_")) {
-	    	// Get the default attribute value, where that default may be the value
-	    	// specified by the user as an override to the PE default value.
-	    value = getAttrLocalDefaultValue(rm, attrName);
-	}
-		// If an attribute is defined as an integer attribute, then determine if
-		// the attribute is evenly divisible by 1G, 1M or 1K, and if so, then convert the
-		// value accordingly. The tests must be done largest to smallest so that
-		// the largest conversion factor is used. The attribute value may already be
-		// in the form 999[gGmMkK]. Converting that to a long will result in a
-		// NumberFormatException, so a try/catch block is required, where the string
-		// value is returned in thecase of a NumberFormatException
-	rmAttrDef = rm.getAttributeDefinition(attrName);
-	if (rmAttrDef instanceof IntegerAttributeDefinition || rmAttrDef instanceof BigIntegerAttributeDefinition) {
-	    long intVal;
-
-	    try {
-	    intVal = Long.valueOf(value);
-	    	if (intVal != 0) {
-	    	    if ((intVal % GBYTE) == 0) {
-	    		return String.valueOf(intVal / GBYTE) + "G";
-	    	    }
-	    	    else {
-	    		if ((intVal % MBYTE) == 0) {
-	    		    return String.valueOf(intVal / MBYTE) + "M";
-	    		}
-	    		else {
-	    		    if ((intVal % KBYTE) == 0) {
-	    			return String.valueOf(intVal / KBYTE) + "K";
-	    		    }
-	    		}
-	    	    }
-	    	}
-	    }
-	    catch (NumberFormatException e) {
-		return value;
-	    }
-	}
-	return value;
-    }
-
-    /**
-     * Set checkbox to checked state if attribute has value equal to checkValue otherwise set it unchecked
-     *
-     * @param checkbox The checkbox to set
-     * @param attrValue The attribute value to check
-     * @param checkValue The value corresponding to a checked checkbox
-     */
-    private void setValue(CheckboxRowWidget checkbox, String attrValue, String checkValue)
-    {
-	if (checkbox != null) {
-	    if (attrValue.equals(checkValue)) {
-		checkbox.setSelection(true);
-	    } else {
-		checkbox.setSelection(false);
-	    }
-	}
-    }
-
-    private void setValue(BooleanRowWidget option, String checkValue)
-    {
-	if (option != null) {
-	    option.setValue(checkValue);
-	}
-    }
-
-    /**
-     * Set the text value for a Text widget to the specified value if the widget is not null.
-     *
-     * @param widget The widget to set
-     * @param value The value to be set
-     */
-    private void setValue(TextRowWidget widget, String value)
-    {
-	if (widget != null) {
-	    widget.setValue(value);
-	}
-    }
-
-    /**
-     * Set the text value for a DualField widget to the specified value if the widget is not null.
-     *
-     * @param widget The widget to set
-     * @param value1 The value to be set in field 1
-     * @param value2 The value to be set in field 2
-     */
-    private void setValue(DualFieldRowWidget widget, String value1, String value2)
-    {
-	if (widget != null) {
-	    widget.setValue(value1, value2);
-	}
-    }
-
-    /**
-     * Set the text value for a ComboRowWidget to the specified value if the widget is not null.
-     *
-     * @param widget The widget to set
-     * @param value The value to be set
-     */
-    private void setValue(ComboRowWidget widget, String value)
-    {
-	if (widget != null) {
-	    widget.setValue(value);
-	}
-    }
-
-    /**
-     * Set the pathname for a file selector if the file selector is not null
-     *
-     * @param selector File selector to be updated
-     * @param path Pathname
-     */
-    private void setValue(FileSelectorRowWidget selector, String path)
-    {
-	if (selector != null) {
-	    selector.setPath(path);
-	}
-    }
-
-    /**
-     * Set initial values for all widgets
-     *
-     * @param configuration The current launch configuration
-     * @param rm The resource manager currently associated with the launch configuration
-     */
-    private void setInitialValues(ILaunchConfiguration config, IResourceManager rm)
-    {
-	Object widget;
-	Iterator<Object> i;
-
-	// All Text and Combo widgets have ModifyListeners registered on them in order to invoke field validation
-	// when contents of the widget's text field change. The ModifyListener is invoked for each widget as a
-	// result of calling the setText() method for the widget. The resulting ModifyEvent results in calling
-	// validateAllFields(), which invokesfireContentsChanged(), which in turn results in performApply() being
-	// invoked. The performApply() method saves all widget's values into the current launch configuration.
-	// Since at the time that setInitialValues is called, widgets may be blank, this results in storing
-	// blanks for all attributes in the launch configuration, wiping out the saved values in the launch
-	// configuration.
-	// To avoid this, ignoreModifyEvents is set, so that the ModifyListener does nothing.
-	ignoreModifyEvents = true;
-	i = activeWidgets.iterator();
-	while (i.hasNext()) {
-	    widget = i.next();if (widget instanceof FileSelectorRowWidget) {
-		setValue((FileSelectorRowWidget) widget, getAttrInitialValue(config, rm,
-			 (String) ((FileSelectorRowWidget) widget).getData()));
-	    } else if (widget instanceof DualFieldRowWidget) {
-		setValue((DualFieldRowWidget) widget,
-			getAttrInitialValue(config, rm, (String) ((DualFieldRowWidget) widget).getData1()),
-			getAttrInitialValue(config, rm, (String) ((DualFieldRowWidget) widget).getData2()));
-	    }
-	    else if (widget instanceof TextRowWidget) {
-		setValue((TextRowWidget) widget,
-			 getAttrInitialValue(config, rm, ((TextRowWidget) widget).getData(WidgetAttributes.ATTR_NAME)));
-	    }
-	    else if (widget instanceof ComboRowWidget) {
-		setValue((ComboRowWidget) widget,
-			 getAttrInitialValue(config, rm, ((ComboRowWidget) widget).getData(WidgetAttributes.ATTR_NAME)));
-	    }
-	    else if (widget instanceof BooleanRowWidget) {
-		setValue((BooleanRowWidget) widget,
-			 getAttrInitialValue(config, rm, ((BooleanRowWidget) widget).getData()));
-	    }
-	    else if (widget instanceof CheckboxRowWidget) {
-		setValue((CheckboxRowWidget) widget,
-			 getAttrInitialValue(config, rm, ((CheckboxRowWidget) widget).getData(WidgetAttributes.ATTR_NAME)),
-			 "yes");
-	    }
-
-	}
-	setLaunchPanelMode();
-	// Setup complete, re-enable ModifyListener
-	ignoreModifyEvents = false;
-	markAllFieldsChanged();
-	// All fields need to be validated because a different resource manager may have been selected, and therefore
-	// values saved in the launch configuration, such as pathnames may no longer be valid.
-	validateAllFields();
-    }
-
-    /**
-     * Set state for widgets based on dependencies between widget values. At the point this method is called,
-     * all widgets are in enabled state, so it is only necessary to disable widgets.
-     */
-    private void setInitialWidgetState(IResourceManager rm)
-    {
-	String mpPriorityDefaultValue;
-	boolean enableState;
-
-	mpPriorityDefaultValue = getDefaultAttributeValue(rm, MP_PRIORITY);
-	if ((mpPriority != null)
-		&& ((mpPriority.getValue().length() == 0) || mpPriority.getValue().equals(mpPriorityDefaultValue))) {
-	    enableState = false;
-	} else {
-	    enableState = true;
-	}
-	if (mpPriorityLog != null) {
-	    mpPriorityLog.setEnabled(enableState);
-	}
-	if (mpPriorityNTP != null) {
-	    mpPriorityNTP.setEnabled(enableState);
-	}
-	if (mpPriorityLogDir != null) {
-	    mpPriorityLogDir.setEnabled(enableState);
-	}
-	if (mpPriorityLogName != null) {
-	    mpPriorityLogName.setEnabled(enableState);
-	}
-	if ((mpRetry != null) && (mpRetry.getValue().equals("wait"))) {
-	    if (mpRetryCount != null) {
-		mpRetryCount.setEnabled(false);
-	    }
-	} else {
-	    if (mpRetryCount != null) {
-		mpRetryCount.setEnabled(true);
-	    }
-	}
-	setLLFileDependentState();
-    }
-
-    /**
-     * Get the default value for an attribute
-     * @param rm The current resource manager
-     * @param attributeName The name of the attribute
-     * @return The default attribute value or empty string if value cannot be retrieved
-     */
-    private String getDefaultAttributeValue(IResourceManager rm, String attributeName)
-    {
-	String defaultValue;
-
-	try {
-	    IAttributeDefinition<?, ?, ?> def;
-
-	    def = rm.getAttributeDefinition(attributeName);
-	    if (def != null) {
-		defaultValue = def.create().getValueAsString();
-	    }
-	    else {
-		defaultValue = "";
-	    }
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	return defaultValue;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#initializeFrom(org.eclipse.swt.widgets.Control,
-     *      org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue,
-     *      org.eclipse.debug.core.ILaunchConfiguration)
-     */
-    public RMLaunchValidation initializeFrom(Control control, IResourceManager rm, IPQueue queue,
-	    ILaunchConfiguration configuration)
-    {
-	if (configuration instanceof ILaunchConfigurationWorkingCopy) {
-	    currentLaunchConfig = (ILaunchConfigurationWorkingCopy) configuration;
-	}
-	setInitialValues(configuration, rm);
-	setInitialWidgetState(rm);
-	return success;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#isValid(org.eclipse.debug.core.ILaunchConfiguration,
-     *      org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
-     */
-    public RMLaunchValidation isValid(ILaunchConfiguration configuration, IResourceManager rm, IPQueue queue)
-    {
-		// If running in basic mode, then any PE command line options and
-		// environment variables are disallowed since those settings may
-		// conflict with what is specified in the resources tab panel.
-	if ((peAdvancedMode != null) && (! peAdvancedMode.getSelection())) {
-	    Map<String, String> environment;
-	    String optionsFence;
-	    String noPEArgs;
-	    String commandOptions;
-	    StringTokenizer tokenizedOptions;
-
-	    try {
-		Iterator<String> iter;
-		environment = configuration.getAttribute("org.eclipse.debug.core.environmentVariables",
-			new HashMap<String, String>());
-		iter = environment.keySet().iterator();
-		while (iter.hasNext()) {
-		    if (Arrays.binarySearch(PEEnvVars, iter.next()) >= 0) {
-			return new RMLaunchValidation(false, Messages.getString("Invalid.disallowedEnvVar"));
-		    }
-		}
-			// If MP_NOARGLIST or MP_FENCE environment variables are set then handle parsing
-			// of command line options accordingly.
-		noPEArgs = environment.get("MP_NOARGLIST");
-		if ((noPEArgs == null) || (noPEArgs.equalsIgnoreCase("no"))) {
-		    optionsFence = environment.get("MP_FENCE");
-		    if (optionsFence == null) {
-			optionsFence = "";
-		    }
-		    commandOptions = configuration.getAttribute("org.eclipse.ptp.launch.ARGUMENT_ATTR", "");
-		    tokenizedOptions = new StringTokenizer(commandOptions, " ");
-		    while (tokenizedOptions.hasMoreTokens()) {
-			String option;
-
-			option = tokenizedOptions.nextToken();
-			if (option.equals(optionsFence)) {
-			    break;
-			}
-			if (Arrays.binarySearch(PEOptions, option) >= 0) {
-			    return new RMLaunchValidation(false, Messages.getString("Invalid.disallowedOption"));
-			}
-		    }
-		}
-	    }
-	    catch (CoreException e) {
-	    }
-	}
-	if (allFieldsValid) {
-	    return success;
-	}
-	return new RMLaunchValidation(false, errorMessage);
-    }
-
-    /**
-     * Store the value from a Text widget into the specified launch configuration if the widget is not null
-     *
-     * @param config The launch configuration
-     * @param rm The resource manager currently used by the launch configuration
-     * @param attr The name of the attribute
-     * @param control The widget to obtain the value from
-     */
-    private void setConfigAttr(ILaunchConfigurationWorkingCopy config, IResourceManager rm, String attr,
-	    		       TextRowWidget control)
-    {
-	IAttributeDefinition<?, ?, ?> attrDef;
-
-	if (control != null) {
-	    String attrValue;
-
-	    attrDef = rm.getAttributeDefinition(attr);
-	    try {
-		if ((attrDef instanceof IntegerAttributeDefinition) || (attrDef instanceof BigIntegerAttributeDefinition)) {
-		    attrValue = getIntegerValue(control.getValue());
-		}
-		else {
-		    attrValue = control.getValue();
-		}
-		config.setAttribute(attr, attrValue);
-	    }
-	    catch (NumberFormatException e) {
-		// If the field has an invalid numeric value, then don't save it in the launch configuration
-	    }
-	}
-    }
-
-    /**
-     * Store the value from a DialField widget into the specified launch configuration if the widget is not null
-     *
-     * @param config The launch configuration
-     * @param attr The name of the attribute
-     * @param control The widget to obtain the value from
-     */
-    private void setConfigAttr(ILaunchConfigurationWorkingCopy config, String attr1, String attr2,
-	    		       DualFieldRowWidget control)
-    {
-	if (control != null) {
-	    String value[];
-
-	    value = control.getValue();
-	    config.setAttribute(attr1, value[0].trim());
-	    config.setAttribute(attr2, value[1].trim());
-	}
-    }
-
-    /**
-     * Store the value from a ComboRowWidget into the specified launch configuration if the widget is not null
-     * @param config The launch configuration
-     * @param attr The name of the attribute
-     * @param control The widget to obtain the value from
-     */
-    private void setConfigAttr(ILaunchConfigurationWorkingCopy config, String attr, ComboRowWidget control)
-    {
-	if (control != null) {
-	    config.setAttribute(attr, control.getValue());
-	}
-    }
-
-    /**
-     * Store the value from a file selector into the specified launch configuration if the file selector is not null
-     *
-     * @param config The launch configuration
-     * @param attr The name of the attribute
-     * @param control The widget to obtain the value from
-     */
-    private void setConfigAttr(ILaunchConfigurationWorkingCopy config, String attr, FileSelectorRowWidget control)
-    {
-	if (control != null) {
-	    config.setAttribute(attr, control.getValue());
-	}
-    }
-
-    /**
-     * Store the value from a Button widget into the specified launch configuration if the widget is not null
-     *
-     * @param config The launch configuration
-     * @param attr The name of the attribute
-     * @param control The widget to obtain the value from
-     * @param trueVal The value to set if the button is selected
-     */
-    private void setConfigAttr(ILaunchConfigurationWorkingCopy config, String attr, CheckboxRowWidget control,
-	    String trueVal, String falseVal)
-    {
-	if (control != null) {
-	    config.setAttribute(attr, (control.getSelection() ? trueVal : falseVal));
-	}
-    }
-
-    private void setConfigAttr(ILaunchConfigurationWorkingCopy config, String attr, BooleanRowWidget control)
-    {
-	if (control != null) {
-	    config.setAttribute(attr, control.getValue());
-	}
-    }
-
-    /**
-     * Save the values entered in this panel in the launch configuration
-     *
-     * @param config
-     */
-    private void saveConfigurationData(ILaunchConfigurationWorkingCopy config, IResourceManager rm)
-    {
-	Object widget;
-	Iterator<Object> i;
-
-	if (activeWidgets != null) {
-	    i = activeWidgets.iterator();
-	    while (i.hasNext()) {
-		widget = i.next();
-		if (widget instanceof TextRowWidget) {
-		    setConfigAttr(config, rm, ((TextRowWidget) widget).getData(WidgetAttributes.ATTR_NAME),
-			    (TextRowWidget) widget);
-		} else if (widget instanceof ComboRowWidget) {
-		    setConfigAttr(config, (String) ((ComboRowWidget) widget).getData(WidgetAttributes.ATTR_NAME),
-			    (ComboRowWidget) widget);
-		} else if (widget instanceof CheckboxRowWidget) {
-		    setConfigAttr(config, (String) ((CheckboxRowWidget) widget).getData(WidgetAttributes.ATTR_NAME),
-			    (CheckboxRowWidget) widget, "yes", "no");
-		} else if (widget instanceof BooleanRowWidget) {
-		    setConfigAttr(config, (String) ((BooleanRowWidget) widget).getData(), (BooleanRowWidget) widget);
-		} else if (widget instanceof FileSelectorRowWidget) {
-		    setConfigAttr(config, (String) ((FileSelectorRowWidget) widget).getData(),
-			    (FileSelectorRowWidget) widget);
-		} else if (widget instanceof DualFieldRowWidget) {
-		    setConfigAttr(config, (String) ((DualFieldRowWidget) widget).getData1(),
-			    (String) ((DualFieldRowWidget) widget).getData2(), (DualFieldRowWidget) widget);
-		}
-	    }
-	}
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy,
-     *      org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
-     */
-    public RMLaunchValidation performApply(ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-	    IPQueue queue)
-    {
-	currentLaunchConfig = configuration;
-	saveConfigurationData(configuration, rm);
-	return new RMLaunchValidation(true, "");
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy,
-     *      org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
-     */
-    public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy config, IResourceManager rm,
-	    IPQueue queue)
-    {
-	IAttribute<?, ?, ?> rmAttrs[];
-
-	currentLaunchConfig = config;
-	rmAttrs = rm.getAttributes();
-	for (int i = 0; i < rmAttrs.length; i++) {
-	    try {
-		config.setAttribute(rmAttrs[i].getDefinition().getId(),
-		    		    rmAttrs[i].getDefinition().create().getValueAsString());
-	    }
-	    catch (IllegalValueException e) {
-	    }
-	}
-//	setDefaultValues(config, rm);
-	return success;
-    }
-
-    /**
-     * Handle validation of all fields in the tabbed pane of the launch configuration's parallel tab.
-     */
-    protected void validateAllFields()
-    {
-	// This method is the top level driver for validating the fields in the
-	// tabbed pane. It is called when a field in the tabbed pane is modified, via a ModifyListener registered on
-	// each text or editable combobox widget It calls a validation method for each tab in the pane. Validation
-	// should be done in tab order, left to right,
-	// All validation is done in the scope of a try block which catches any ValidationException propagated up
-	// from lower level methods. The idea is to validate the fields within tab order left to right, then within each
-	// tab, from top to bottom. Each validation method will throw a ValidationException if that field fails
-	// validation, where the thrown exception will stop further validation of the pane. This structure allows fields
-	// to be easily moved to another pane, or to reorder fields within a pane. Using an exception to terminate
-	// validation also avoids cluttering the logic of the validation method with deeply nested 'if ... else ...'
-	// logic.
-	// If all fields are valid, then the allFieldsValid flag is set so that the isValid() and canSave() methods can
-	// easily check panel validity.
-	// Validation of valid dependencies between fields should be performed as a second step after all fields have
-	// been individually validated for correct values.
-	try {
-	    if (peAdvancedMode.getSelection()) {
-		validateInputPath(peEnvScript, "Invalid.peEnvScript");
-		validateRedirectBox();
-	    } else {
-		validateRedirectBox();
-		validateTasksTab();
-		validateIOTab();
-		validateDiagnosticTab();
-		validateDebugTab();
-		validateSystemTab();
-		validateNodeTab();
-		validatePerformanceTab1();
-		validatePerformanceTab2();
-		validateRMTab();
-		validateMiscTab();
-	    }
-	    allFieldsValid = true;
-	}
-	catch (ValidationException e) {
-	    errorMessage = e.getMessage();
-	    allFieldsValid = false;
-	}
-	fireContentsChanged();
-    }
-
-    /**
-     * Validate that an integer value is within the range allowed for the attribute.
-     *
-     * @param value The value to be verified
-     * @param attrName The name of the attribute
-     * @param errorID The id of the error message used if validation fails
-     * @throws ValidationException Indicates that Text widget failed validation
-     */
-    private void validateNumericRange(String value, String attrName, String errorID) throws ValidationException
-    {
-        int testValue;
-        int len;
-        char suffix;
-
-        len = value.length();
-        suffix = value.charAt(len - 1);
-        if (Character.isDigit(suffix)) {
-            try {
-        	testValue = Integer.valueOf(value);
-            }
-            catch (NumberFormatException e) {
-        	throw new ValidationException(Messages.getString(errorID));
-            }
-        }
-        else {
-            try {
-        	testValue = Integer.valueOf(value.substring(0, len - 1));
-        	if ((suffix == 'G') || (suffix == 'g')) {
-        	    testValue = testValue * GBYTE;
-        	}
-        	else if ((suffix == 'M') || (suffix == 'm')) {
-        	    testValue = testValue * MBYTE;
-        	}
-        	else if ((suffix == 'K') || (suffix == 'k')) {
-        	    testValue = testValue * KBYTE;
-        	}
-        	else {
-        	    throw new ValidationException(Messages.getString(errorID));
-        	}
-            }
-            catch (NumberFormatException e) {
-        	throw new ValidationException(Messages.getString(errorID));
-            }
-        }
-        validateNumericRange(testValue, attrName, errorID);
-    }
-
-    /**
-     * Validate file selectors used to specify stdio redirection
-     *
-     * @throws ValidationException
-     */
-    private void validateRedirectBox() throws ValidationException
-    {
-	validateInputPath(peStdinPath, "Invalid.peStdinPath");
-	validateOutputPath(peStdoutPath, "Invalid.peStdoutPath");
-	validateOutputPath(peStderrPath, "Invalid.peStderrPath");
-    }
-
-    /**
-     * Validate fields in task specification tab
-     * @throws ValidationException
-     */
-    private void validateTasksTab() throws ValidationException
-    {
-	validateInputPath(mpHostFile, "Invalid.mpHostFile");
-	validateNumericRange(mpProcs, MP_PROCS, "Invalid.mpProcs");
-	validateNumericRange(mpNodes, MP_NODES, "Invalid.mpNodes");
-	validateNumericRange(mpTasksPerNode, MP_TASKS_PER_NODE, "Invalid.mpTasksPerNode");
-    }
-
-    /**
-     * Validate all text and editable combobox fields in the I/O tab, top to bottom
-     *
-     * @throws ValidationException
-     */
-    private void validateIOTab() throws ValidationException
-    {
-	validateStdinMode();
-	validateStdoutMode();
-    }
-
-    /**
-     * Validate all text and editable combobox fields in diagnostic tab, top to bottom
-     *
-     * @throws ValidationException
-     */
-    private void validateDiagnosticTab() throws ValidationException
-    {
-    }
-
-    /**
-     * Validate all text and editable combobox fields in the debug tab, top to bottom
-     *
-     * @throws ValidationException
-     */
-    private void validateDebugTab() throws ValidationException
-    {
-	validateCorefileFormat();
-	validateDirectory(mpCoreDir, "Invalid.mpCoreDir");
-	validateDirectory(mpProfDir, "Invalid.mpProfDir");
-    }
-
-    /**
-     * Validate all text and editable combobox fields in the system resources tab, top to bottom
-     *
-     * @throws ValidationException
-     */
-    private void validateSystemTab() throws ValidationException
-    {
-	validateInstances();
-    }
-
-    /**
-     * Validate all text and editable combobox fields in the node allocation tab, top to bottom
-     *
-     * @throws ValidationException
-     */
-    private void validateNodeTab() throws ValidationException
-    {
-	validateNumericRange(mpTasksPerNode, MP_TASKS_PER_NODE, "Invalid.mpTasksPerNode");
-	validateInputPath(mpRemoteDir, "Invalid.mpRemoteDir");
-	validateInputPath(mpCmdFile, "Invalid.mpCmdFile");
-	validateInputPath(mpLLFile, "Invalid.mpLLFile");
-	validateRetry();
-	validateNumericRange(mpRetryCount, MP_RETRY_COUNT, "Invalid.mpRetryCount");
-    }
-
-    /**
-     * Validate all text and editable combobox fields in performance tab 1, top to bottom
-     *
-     * @throws ValidationException
-     */
-    private void validatePerformanceTab1() throws ValidationException
-    {
-	validateNumericRange(mpAckThresh, MP_ACK_THRESH, "Invalid.mpAckThresh");
-	validateNumericRange(mpPollingInterval, MP_POLLING_INTERVAL, "Invalid.mpPollingInterval");
-	validateRDMACount();
-	validateNumericRange(mpUDPPacketSize, MP_UDP_PACKET_SIZE, "Invalid.mpUDPPacketSize");
-	validateNumericRange(mpBulkMinMsgSize, MP_BULK_MIN_MSG_SIZE, "Invalid.mpBulkMinMsgSize");
-    }
-
-    /**
-     * Validate all text and editable combobox fields in performance tab 2, top to bottom
-     *
-     * @throws ValidationException
-     */
-    private void validatePerformanceTab2() throws ValidationException
-    {
-	validateBufferMem();
-	validateNumericRange(mpMsgEnvelopeBuf, MP_MSG_ENVELOPE_BUF, "Invalid.mpMsgEnvelopeBuf");
-	validateNumericRange(mpEagerLimit, MP_EAGER_LIMIT, "Invalid.mpEagerLimit");
-	validateNumericRange(mpRetransmitInterval, MP_RETRANSMIT_INTERVAL, "Invalid.mpRetransmitInterval");
-	validateNumericRange(mpRexmitBufCnt, MP_REXMIT_BUF_CNT, "Invalid.mpRexmitBufCnt");
-	validateNumericRange(mpRexmitBufSize, MP_REXMIT_BUF_SIZE, "Invalid.mpRexmitBufSize");
-    }
-
-    /**
-     * Validate all text and editable combobox fields in the alternate resource manager tab
-     *
-     * @throws ValidationException
-     */
-    private void validateRMTab() throws ValidationException
-    {
-	validateInputPath(mpRMLib, "Invalid.mpRMLib");
-    }
-
-    /**
-     * Validate all text fields and editable combo boxes in the miscellaneous tab
-     *
-     * @throws ValidationException
-     */
-    private void validateMiscTab() throws ValidationException
-    {
-	validateInputPath(mpEuiLibPath, "Invalid.mpEuiLibPath");
-	validateNumericRange(mpPulse, MP_PULSE, "Invalid.mpPulse");
-	validateNumericRange(mpThreadStackSize, MP_THREAD_STACKSIZE, "Invalid.mpThreadStackSize");
-	validateNumericRange(mpTimeout, MP_TIMEOUT, "Invalid.mpTimeout");
-	validateNumericRange(mpIOBufferSize, MP_IO_BUFFER_SIZE, "Invalid.mpIOBufferSize");
-	validateOutputPath(mpSaveLLFile, "Invalid.mpSaveLLFile");
-	validateOutputPath(mpSaveHostFile, "Invalid.mpSaveHostFile");
-	validateDirectory(mpPriorityLogDir, "Invalid.mpPriorityLogDir");
-	validateInputPath(mpIONodeFile, "Invalid.mpIONodeFile");
-    }
-
-    /**
-     * Validate that an input file is accessible
-     *
-     * @param selector The file selector containing the pathname
-     * @param errorID id of the error string used if file is inaccessible
-     * @throws ValidationException
-     */
-    private void validateInputPath(FileSelectorRowWidget selector, String errorID) throws ValidationException
-    {
-	String path;
-
-	if ((selector != null) && selector.isEnabled() && selector.isValidationRequired()) {
-	    path = selector.getValue();
-	    if (path.length() == 0) {
-		selector.resetValidationState();
-		return;
-	    }
-	    try {
-		validateInputPath(path, errorID);
-		selector.resetValidationState();
-	    }
-	    catch (ValidationException e) {
-		selector.setFieldInError();
-		throw e;
-	    }
-	}
-    }
-
-    /**
-     * Validate that an output file is accessible
-     *
-     * @param selector The file selector containing the pathname
-     * @param errorID id of the error string used if the file is inaccessible
-     * @throws ValidationException
-     */
-    private void validateOutputPath(FileSelectorRowWidget selector, String errorID) throws ValidationException
-    {
-	String path;
-
-	if ((selector != null) && selector.isEnabled() && selector.isValidationRequired()) {
-	    path = selector.getValue();
-	    if (path.length() == 0) {
-		selector.resetValidationState();
-		return;
-	    }
-	    try {
-		validateOutputPath(path, errorID);
-		selector.resetValidationState();
-	    }
-	    catch (ValidationException e) {
-		selector.setFieldInError();
-		throw e;
-	    }
-	}
-    }
-
-    /**
-     * Validate that in input file is accessible
-     *
-     * @param path Pathname of the input file
-     * @param errorID id of the error string used if the file is inaccessible
-     * @throws ValidationException
-     */
-    private void validateInputPath(String path, String errorID) throws ValidationException
-    {
-	IPath testPath;
-	IFileStore remoteResource;
-	IFileInfo fileInfo;
-
-	testPath = new Path(path);
-	if (! testPath.isValidPath(path)) {
-	    throw new ValidationException(Messages.getString(errorID));
-	}
-	try {
-	    remoteResource = remoteService.getFileManager(remoteConnection).getResource(testPath, new NullProgressMonitor());
-	    fileInfo = remoteResource.fetchInfo();
-	    if ((! fileInfo.exists()) || (fileInfo.isDirectory())) {
-		throw new ValidationException(Messages.getString(errorID));
-	    }
-	}
-	catch (IOException e) {
-	    throw new ValidationException(Messages.getString("Invalid.remoteConnectionError") + " " + e.getMessage());
-	}
-    }
-
-    /**
-     * Validate that an output file is accessible
-     *
-     * @param path Pathname of the output file
-     * @param errorID id of the error string used if the file is not accessible
-     * @throws ValidationException
-     */
-    private void validateOutputPath(String path, String errorID) throws ValidationException
-    {
-	IPath testPath;
-	IFileStore remoteResource;
-	IFileInfo fileInfo;
-
-	testPath = new Path(path);
-	if (! testPath.isValidPath(path)) {
-	    throw new ValidationException(Messages.getString(errorID));
-	}
-	try {
-	    remoteResource = remoteService.getFileManager(remoteConnection).getResource(testPath, new NullProgressMonitor());
-	    fileInfo = remoteResource.fetchInfo();
-	    if (fileInfo.isDirectory()) {
-		throw new ValidationException(Messages.getString(errorID));
-	    }
-	}
-	catch (IOException e) {
-	    throw new ValidationException(Messages.getString("Invalid.remoteConnectionError") + " " + e.getMessage());
-	}
-    }
-
-    /**
-     * Validate that the directory pathname is valid
-     *
-     * @param selector File selector containing the directory name
-     * @param errorID id of the error string used if the directory is invalid
-     * @throws ValidationException
-     */
-    private void validateDirectory(FileSelectorRowWidget selector, String errorID) throws ValidationException
-    {
-	String path;
-	IPath testPath;
-	IFileStore remoteResource;
-	IFileInfo fileInfo;
-
-	if ((selector != null) && selector.isEnabled() && selector.isValidationRequired()) {
-	    path = selector.getValue();
-	    try {
-		if (path.length() == 0) {
-		    selector.resetValidationState();
-		    return;
-		}
-
-		testPath = new Path(path);
-		if (! testPath.isValidPath(path)) {
-		    throw new ValidationException(Messages.getString(errorID));
-		}
-		try {
-		    remoteResource = remoteService.getFileManager(remoteConnection).getResource(testPath, new NullProgressMonitor());
-		    fileInfo = remoteResource.fetchInfo();
-		    if (! fileInfo.isDirectory()) {
-			throw new ValidationException(Messages.getString(errorID));
-		    }
-		}
-		catch (IOException e) {
-		    throw new ValidationException(Messages.getString("Invalid.remoteConnectionError") + " " + e.getMessage());
-		}
-		selector.resetValidationState();
-	    }
-	    catch (ValidationException e) {
-		selector.setFieldInError();
-		throw e;
-	    }
-	}
-    }
-
-    /**
-     * Validate the MP_STDINMODE setting
-     *
-     * @throws ValidationException
-     */
-    private void validateStdinMode() throws ValidationException
-    {
-	String widgetValue;
-	int numProcs;
-
-	if ((mpStdinMode != null) && (mpStdinMode.isEnabled())) {
-	    widgetValue = mpStdinMode.getValue();
-	    if (widgetValue.length() == 0) {
-		return;
-	    }
-	    if (isValidListSelection(mpStdinMode, MP_STDINMODE)) {
-		return;
-	    }
-	    try {
-		numProcs = Integer.valueOf(mpProcs.getValue());
-	    }
-	    catch (NumberFormatException e) {
-		throw new ValidationException(Messages.getString("Invalid.mpStdinMode"));
-	    }
-	    validateNumericRange(widgetValue, 0, numProcs, "Invalid.mpStdinMode");
-	}
-    }
-
-    /**
-     * Validate the MP_STDOUTMODE setting
-     *
-     * @throws ValidationException
-     */
-    private void validateStdoutMode() throws ValidationException
-    {
-	String widgetValue;
-	int numProcs;
-
-	if ((mpStdoutMode != null) && (mpStdoutMode.isEnabled())) {
-	    widgetValue = mpStdoutMode.getValue();
-	    if (widgetValue.length() == 0) {
-		return;
-	    }
-	    if (isValidListSelection(mpStdoutMode, MP_STDOUTMODE)) {
-		return;
-	    }
-	    try {
-		numProcs = Integer.valueOf(mpProcs.getValue());
-	    }
-	    catch (NumberFormatException e) {
-		throw new ValidationException(Messages.getString("Invalid.mpStdoutMode"));
-	    }
-	    validateNumericRange(widgetValue, 0, numProcs - 1, "Invalid.mpStdoutMode");
-	}
-    }
-
-    private void validateCorefileFormat() throws ValidationException
-    {
-
-	if ((mpCorefileFormat != null) && mpCorefileFormat.isEnabled() && mpCorefileFormat.isValidationRequired()) {
-	    String widgetValue;
-	    widgetValue = mpCorefileFormat.getValue();
-	    try {
-		if (widgetValue.length() == 0) {
-		    return;
-		}
-		if (isValidListSelection(mpCorefileFormat, MP_COREFILE_FORMAT)) {
-		    return;
-		}
-		validateOutputPath(widgetValue, "Invalid.mpCorefileFormat");
-		mpCorefileFormat.resetValidationState();
-	    }
-	    catch (ValidationException e) {
-		mpCorefileFormat.setFieldInError();
-		throw e;
-	    }
-	}
-    }
-
-    /**
-     * Validate the MP_INSTANCES setting
-     *
-     * @throws ValidationException
-     */
-    private void validateInstances() throws ValidationException
-    {
-	if ((mpInstances != null) && (mpInstances.isEnabled())) {
-	    String widgetValue;
-
-	    widgetValue = mpInstances.getValue();
-	    if (widgetValue.length() == 0) {
-		return;
-	    }
-	    if (isValidListSelection(mpInstances, MP_INSTANCES)) {
-		return;
-	    }
-	    validateNumericRange(widgetValue, MP_INSTANCES_INT, "Invalid.mpInstances");
-	}
-    }
-
-    /**
-     * Validate the MP_RETRY setting
-     *
-     * @throws ValidationException
-     */
-    private void validateRetry() throws ValidationException
-    {
-	if ((mpRetry != null) && (mpRetry.isEnabled())) {
-	    String widgetValue;
-
-	    widgetValue = mpRetry.getValue();
-	    if (widgetValue.length() == 0) {
-		return;
-	    }
-	    if (isValidListSelection(mpRetry, MP_RETRY)) {
-		return;
-	    }
-	    validateNumericRange(widgetValue, MP_RETRY_INT, "Invalid.mpRetry");
-	}
-    }
-
-    /**
-     * Validate the MP_RDMA_COUNT setting
-     *
-     * @throws ValidationException
-     */
-    private void validateRDMACount() throws ValidationException
-    {
-	if ((peRDMACount != null) && (peRDMACount.isEnabled())) {
-	    String widgetValue[];
-
-	    widgetValue = peRDMACount.getValue();
-	    if ((widgetValue[0].length() == 0) && (widgetValue[1].length() > 0)) {
-		throw new ValidationException(Messages.getString("Invalid.peRDMACountPair"));
-	    }
-	    if (widgetValue[0].length() > 0) {
-		validateNumericRange(widgetValue[0], PE_BUFFER_MEM, "Invalid.peRDMACount");
-	    }
-	    if (widgetValue[1].length() > 0) {
-		validateLongNumericRange(widgetValue[1], PE_BUFFER_MEM_MAX, "Invalid.peRDMACount");
-	    }
-	}
-    }
-
-    /**
-     * Validate the MP_BUFFER_MEM setting
-     *
-     * @throws ValidationException
-     */
-    private void validateBufferMem() throws ValidationException
-    {
-	if ((peBufferMem != null) || peBufferMem.isEnabled() && peBufferMem.isValidationRequired()) {
-	    String widgetValue[];
-
-	    widgetValue = peBufferMem.getValue();
-	    try {
-		if (widgetValue[0].length() > 0) {
-		    validateNumericRange(widgetValue[0], PE_BUFFER_MEM, "Invalid.peBufferMem");
-		}
-		if (widgetValue[1].length() > 0) {
-		    validateLongNumericRange(widgetValue[1], PE_BUFFER_MEM_MAX, "Invalid.peBufferMem2");
-		}
-		peBufferMem.resetValidationState();
-	    }
-	    catch (ValidationException e) {
-		peBufferMem.setFieldInError();
-		throw e;
-	    }
-	}
-    }
-
-    /**
-     * Verify that the value selected or entered in an editable combobox is a valid value, as determined by checking the
-     * attribute definition for the attribute.
-     *
-     * @param widget The combobox to be checked
-     * @param attrName The attribute name
-     * @return true if the value is a valid selection, false otherwise
-     */
-    private boolean isValidListSelection(ComboRowWidget widget, String attrName)
-    {
-	StringSetAttributeDefinition attrDef;
-	@SuppressWarnings("unused")
-	StringSetAttribute attr;
-
-	attrDef = (StringSetAttributeDefinition) currentRM.getAttributeDefinition(attrName);
-	if (attrDef != null) {
-	    try {
-		attr = attrDef.create(widget.getValue());
-		return true;
-	    }
-	    catch (IllegalValueException e) {
-		return false;
-	    }
-	}
-	return true;
-    }
-
-    /**
-     * Validate that an integer value is within the range allowed for the attribute.
-     *
-     * @param control The Text widget to be verified
-     * @param attrName The name of the attribute
-     * @param errorID The id of the error message used if validation fails
-     * @throws ValidationException Indicates that Text widget failed validation
-     */
-    private void validateNumericRange(TextRowWidget control, String attrName, String errorID)
-	    throws ValidationException
-    {
-	String value;
-
-	if ((control != null) && control.isEnabled() && control.isValidationRequired()) {
-	    value = control.getValue();
-	    if (value.length() > 0) {
-		try {
-		    validateNumericRange(value, attrName, errorID);
-		}
-		catch (ValidationException e) {
-		    control.setFieldInError();
-		    throw e;
-		}
-		control.resetValidationState();
-	    }
-	}
-    }
-
-
-    /**
-     * Validate that an integer value is within the range allowed for the attribute.
-     *
-     * @param value The value to be verified
-     * @param attrName The name of the attribute
-     * @param errorID The id of the error message used if validation fails
-     * @throws ValidationException Indicates that Text widget failed validation
-     */
-    private void validateNumericRange(int value, String attrName, String errorID) throws ValidationException
-    {
-	IntegerAttributeDefinition attrDef;
-	@SuppressWarnings("unused")
-	IntegerAttribute attr;
-
-	attrDef = (IntegerAttributeDefinition) currentRM.getAttributeDefinition(attrName);
-	try {
-	    attr = attrDef.create(value);
-	}
-	catch (IllegalValueException e) {
-	    throw new ValidationException(Messages.getString(errorID));
-	}
-    }
-
-    /**
-     * Convert a string which may have a suffix 'k', 'm' or 'g' to it's actual numeric value, multiplying by the
-     * appropriate multiplier
-     * @param value The number to be converted
-     * @return The converted number
-     */
-    private String getIntegerValue(String value)
-    {
-	int testValue;
-	int len;
-	char suffix;
-
-	testValue = 0;
-	len = value.length();
-	if (len == 0) {
-	    return "";
-	}
-	else {
-	    suffix = value.charAt(len - 1);
-	    if (Character.isDigit(suffix)) {
-		return value;
-	    }
-	    else {
-		if (len >= 2) {
-		    testValue = Integer.valueOf(value.substring(0, len - 1));
-		    if ((suffix == 'G') || (suffix == 'g')) {
-			testValue = testValue * GBYTE;
-		    }
-		    else if ((suffix == 'M') || (suffix == 'm')) {
-			testValue = testValue * MBYTE;
-		    }
-		    else if ((suffix == 'K') || (suffix == 'k')) {
-			testValue = testValue * KBYTE;
-		    }
-		    else {
-			return "";
-		    }
-		}
-	    }
-	    return String.valueOf(testValue);
-	}
-    }
-
-    /**
-     * Validate that a BigInteger value is within the range allowed for the attribute.
-     *
-     * @param value The value to be verified
-     * @param attrName The name of the attribute
-     * @param errorID The id of the error message used if validation fails
-     * @throws ValidationException Indicates that Text widget failed validation
-     */
-    private void validateLongNumericRange(String value, String attrName, String errorID) throws ValidationException
-    {
-	BigIntegerAttributeDefinition attrDef;
-	@SuppressWarnings("unused")
-	BigIntegerAttribute attr;
-
-	attrDef = (BigIntegerAttributeDefinition) currentRM.getAttributeDefinition(attrName);
-	try {
-	    attr = attrDef.create(value);
-	}
-	catch (IllegalValueException e) {
-	    throw new ValidationException(Messages.getString(errorID));
-	}
-    }
-
-    /**
-     * Validate a String's value to verify it is within the allowed range
-     *
-     * @param value String to be verified
-     * @param lowLimit Low limit of range
-     * @param highLimit High limit of range
-     * @param errorID id of the error message used if value is not in allowable range
-     * @throws ValidationException
-     */
-    private void validateNumericRange(String value, int lowLimit, int highLimit, String errorID)
-	    throws ValidationException
-    {
-	int n;
-
-	try {
-	    n = Integer.valueOf(value);
-	    if ((n < lowLimit) || (n > highLimit)) {
-		throw new ValidationException(Messages.getString(errorID));
-	    }
-	}
-	catch (NumberFormatException e) {
-	    throw new ValidationException(Messages.getString(errorID));
-	}
-    }
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationFactory.java
deleted file mode 100755
index 6a3e955..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/rmLaunchConfiguration/PERMLaunchConfigurationFactory.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006, 2007 Los Alamos National Security, LLC.
- * This material was produced under U.S. Government contract DE-AC52-06NA25396
- * for Los Alamos National Laboratory (LANL), which is operated by the Los Alamos
- * National Security, LLC (LANS) for the U.S. Department of Energy.  The U.S. Government has
- * rights to use, reproduce, and distribute this software. NEITHER THE
- * GOVERNMENT NOR LANS 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
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.rmLaunchConfiguration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ibm.pe.core.rmsystem.PEResourceManager;
-
-public class PERMLaunchConfigurationFactory extends
-		AbstractRMLaunchConfigurationFactory {
-
-	@Override
-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {
-		return new PERMLaunchConfigurationDynamicTab(rm);
-	}
-
-	@Override
-	public Class<? extends IResourceManager> getResourceManagerClass() {
-		return PEResourceManager.class;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/BooleanRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/BooleanRowWidget.java
deleted file mode 100644
index bd60232..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/BooleanRowWidget.java
+++ /dev/null

@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-import java.util.List;
-
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.StringSetAttributeDefinition;
-//TODO drw import org.eclipse.ptp.ibmll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Widget;
-
-public class BooleanRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private StringSetAttributeDefinition attrDef;
-    private BooleanOption widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class for events needed for notification of changes in data value for this widget
-     *
-     */
-    private class EventMonitor implements SelectionListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	/**
-	 * Set the non-default value indicator if the widget's value does not match the attribute's default
-	 * value
-	 * @param e The selection event indicating this object was clicked
-	 */
-	public void widgetSelected(SelectionEvent e)
-	{
-	    Button selectedButton;
-
-	    selectedButton = (Button) e.getSource();
-	    if (selectedButton.getText().equals(defaultValue)) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-    }
-
-    private class BooleanOption
-    {
-	private String attrValue;
-	private Composite group;
-	private Button buttons[];
-
-	/**
-	 * Create a radio button pair for use in selecting a boolean option. This object is a container for a pair of
-	 * radio buttons in a group box.
-	 * 
-	 * @param parent The parent widget for this object
-	 * @param labels A list of two labels used to label the radio buttons
-	 */
-	public BooleanOption(Composite parent, List<String> labels, int button_id)
-	{
-	    GridLayout layout;
-
-	    if (labels.size() != 2) {
-		throw new IllegalArgumentException("BooleanOption requires two labels");
-	    }
-	    group = new Composite(parent, SWT.NONE);
-	    layout = new GridLayout(2, true);
-	    layout.marginHeight = 0;
-	    layout.marginWidth = 0;
-	    group.setLayout(layout);
-	    buttons = new Button[2];
-	    buttons[0] = new Button(group, SWT.RADIO);
-	    buttons[0].setText(labels.get(0));
-	    buttons[0].setData(WidgetAttributes.BUTTON_ID, button_id);
-	    buttons[1] = new Button(group, SWT.RADIO);
-	    buttons[1].setText(labels.get(1));
-	    buttons[1].setData(WidgetAttributes.BUTTON_ID, button_id);
-	}
-
-	/**
-	 * Set the tooltip text for the object. The tooltip text is set on the group object
-	 * 
-	 * @param text The tooltip text
-	 */
-	public void setToolTipText(String text)
-	{
-	    group.setToolTipText(text);
-	}
-
-	/**
-	 * Set the selection state. The button with text matching the value string is set selected
-	 * 
-	 * @param value The value to be selected.
-	 */
-	public void setSelectedButton(String value)
-	{
-	    if (buttons[0].getText().equals(value)) {
-		buttons[0].setSelection(true);
-	    } else {
-		buttons[1].setSelection(true);
-	    }
-	}
-
-	/**
-	 * Get the value for the selected button. The value returned is the label for the selected button.
-	 * 
-	 * @return Value for this object
-	 */
-	public String getValue()
-	{
-	    if (buttons[0].getSelection()) {
-		return buttons[0].getText();
-	    }
-	    return buttons[1].getText();
-	}
-
-	/**
-	 * Set the layout data for this object
-	 * 
-	 * @param gd Layout data
-	 */
-	public void setLayoutData(GridData gd)
-	{
-	    group.setLayoutData(gd);
-	}
-
-	/**
-	 * Set the enable state for the Button objects in this object to the specified state 
-	 * @param state Enable state for this widget
-	 */
-	public void setEnabled(boolean state)
-	{
-	    buttons[0].setEnabled(state);
-	    buttons[1].setEnabled(state);
-	}
-
-	/**
-	 * Determine if this widget is in the enabled state
-	 * @return Enable state
-	 */
-	public boolean isEnabled()
-	{
-	    return buttons[0].isEnabled();
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData(String value)
-	{
-	    attrValue = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public String getData()
-	{
-	    return attrValue;
-	}
-
-	/**
-	 * Add a selection listener to the Button objects contained in this object
-	 * @param listener The selection listener
-	 */
-	public void addSelectionListener(SelectionListener listener)
-	{
-	    buttons[0].addSelectionListener(listener);
-	    buttons[1].addSelectionListener(listener);
-	}
-	
-	public boolean isMatchingWidget(Widget source)
-	{
-	    return ((source == buttons[0]) || (source == buttons[1]));
-	}
-    }
-
-    /**
-     * Create the widgets contained within this row. This class assumes that the layout manager for the
-     * Composite parent is a GridLayout with four columns.
-     * @param parent The Composite object that contains this widget
-     * @param id The attribute name for this widget
-     * @param def The attribute definition for this widget
-     */
-    public BooleanRowWidget(Composite parent, String id, StringSetAttributeDefinition def, int button_id)
-    {
-	attrDef = def;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	//TODO drw label.setText(Messages.getString(attrDef.getName()));
-	label.setText(attrDef.getName());
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	widget = new BooleanOption(parent, attrDef.getValues(), button_id);
-	//TODO drw widget.setToolTipText(Messages.getString(attrDef.getDescription()));
-	widget.setToolTipText(attrDef.getDescription());
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = true;
-	gridData.horizontalSpan = 2;
-	widget.setLayoutData(gridData);
-	widget.setData(id);
-	try {
-	    defaultValue = attrDef.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addSelectionListener(eventMonitor);
-    }
-
-    /**
-     * Add a selection listener to this object. This method is a wrapper that just calls 
-     * addSelectionListener for the BooleanOption widget contained in this class
-     * @param listener The selection listener
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Set the enable state for the BooleanOption object contained in this object
-     * @param state The enable state
-     */
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-
-    /**
-     * Set the value for the BooleanOption object contained in this object. The result is that the radio button with
-     * label text matching the value parameter is set selected.
-     * @param value The value to set
-     */
-    public void setValue(String value)
-    {
-	widget.setSelectedButton(value);
-    }
-
-    /**
-     * Get the attribute name stored in this object.
-     * @return The attribute name
-     */
-    public String getData()
-    {
-	return widget.getData();
-    }
-
-    /**
-     * Get the value of the BooleanOption object contained in this object. THe returned value is the label text of the
-     * radio button in selected state.
-     * @return The object's value
-     */
-    public String getValue()
-    {
-	return widget.getValue();
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget.isMatchingWidget(source);
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/CheckboxRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/CheckboxRowWidget.java
deleted file mode 100644
index d110348..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/CheckboxRowWidget.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-//TODO drw import org.eclipse.ptp.ibmll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Widget;
-
-public class CheckboxRowWidget implements ValidationState
-{
-
-    private Label label;
-    private Label fill;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attrDef;
-    private Button widget;
-    private String defaultValue;
-    private int validationState;
-
-    /**
-     * Create a checkbox widget and associated widgets. This class assumes that the layout manager for the 
-     * parent Composite object is a GridLayout with 4 columns. 
-     * @param parent The parent Composite widget
-     * @param id The name of the attribute associated with this object
-     * @param def The attribute definition for the attribute associated with this object 
-     */
-    public CheckboxRowWidget(Composite parent, String id, IAttributeDefinition<?, ?, ?> def)
-    {
-	attrDef = def;
-	label = new Label(parent, SWT.NONE);
-	//TODO drw label.setText(Messages.getString(def.getName()));
-	label.setText(def.getName());
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	widget = new Button(parent, SWT.CHECK);
-	//TODO drw widget.setToolTipText(Messages.getString(def.getDescription()));
-	widget.setToolTipText(def.getDescription());
-	widget.setText("");
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData(WidgetAttributes.ATTR_NAME, id);
-	fill = new Label(parent, SWT.NONE);
-	fill.setText("");
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	fill.setLayoutData(gridData);
-    }
-
-    /**
-     * Add a selection listener for this object
-     * @param listener The listener
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Set the value of a data object in this class using the associated key
-     * @param key The data object key
-     * @param value The value to set
-     */
-    public void setData(String key, Object value)
-    {
-	widget.setData(key, value);
-    }
-
-    /**
-     * Return status indicating if this object is in the selected state
-     * @return selection state
-     */
-    public boolean getSelection()
-    {
-	return widget.getSelection();
-    }
-
-    /**
-     * Set the selection state (check mark) for this widget
-     * @param state The state to be set
-     */
-    public void setSelection(boolean state)
-    {
-	widget.setSelection(state);
-    }
-
-    /**
-     * Get the value associated with the specified key
-     * @param key Key for data to be retrieved
-     * @return The data value
-     */
-    public String getData(String key)
-    {
-	return (String) widget.getData(key);
-    }
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget == source;
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ComboRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ComboRowWidget.java
deleted file mode 100644
index 5f3f8f4..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ComboRowWidget.java
+++ /dev/null

@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-import java.util.Iterator;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.StringSetAttributeDefinition;
-//TODO drw import org.eclipse.ptp.ibmll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Widget;
-
-public class ComboRowWidget implements ValidationState
-{
-
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attrDef;
-    private Combo widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class used to monitor for changes in the data value of this object
-     */
-    private class EventMonitor implements ModifyListener, SelectionListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Handle event notification indicating that the value entered in the text field of the widget has changed
-	 * @param e The notification event
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    setDefaultStatus();
-	}
-
-	/**
-	 * Handle event notification indicating that a value has been selected from the Combo dropdown
-	 * @param e The notification event
-	 */
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	public void widgetSelected(SelectionEvent e)
-	{
-	    setDefaultStatus();
-	}
-    }
-
-    /**
-     * Create an object containing a Combo widget and related widgets for use in a tab pabe. This class assumes that the
-     * layout manager for the parent Composite widget is a GridLayout with 4 columns.
-     * @param parent The parent Composite widget
-     * @param id The name of the attribute associated with this object
-     * @param def The attribute definition for the attribute associated with this object
-     * @param readOnly Indicates whether the Combo widget is editable
-     */
-    public ComboRowWidget(Composite parent, String id, IAttributeDefinition<?, ?, ?> def, boolean readOnly)
-    {
-	Iterator<String> iter;
-
-	attrDef = def;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	//TODO drw label.setText(Messages.getString(attrDef.getName()));
-	label.setText(attrDef.getName());
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	if (readOnly) {
-	    widget = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
-	} else {
-	    widget = new Combo(parent, SWT.DROP_DOWN);
-	}
-	iter = ((StringSetAttributeDefinition) def).getValues().iterator();
-	while (iter.hasNext()) {
-	    widget.add(iter.next());
-	}
-	// Even though setToolTipText is called, the tooltip text does not
-	// appear when this is run on Linux. The problem seems to be
-	// setting tooltip text on a read-only combobox. Editable comboboxes
-	// work correctly. Maybe a Linux implementation bug since this works
-	// on Windows XP.
-	//TODO drw widget.setToolTipText(Messages.getString(attrDef.getDescription()));
-	widget.setToolTipText(attrDef.getDescription());
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.horizontalSpan = 2;
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData(WidgetAttributes.ATTR_NAME, id);
-	try {
-	    defaultValue = attrDef.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-	widget.addSelectionListener(eventMonitor);
-    }
-
-    /** 
-     * Add a selection listener to this object for notification that a value was selected from the Combo dropdown
-     * @param listener The listener object
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Add a modify listener to this object for notification that the value in the Combo's text entry field has changed
-     * @param listener The listener object
-     */
-    public void addModifyListener(ModifyListener listener)
-    {
-	widget.addModifyListener(listener);
-    }
-
-    /**
-     * Get the data value from the Combo widget
-     * @return The data value
-     */
-    public String getValue()
-    {
-	return widget.getText().trim();
-    }
-
-    /**
-     * Set the data value in the Combo widget.
-     * @param value Data value
-     */
-    public void setValue(String value)
-    {
-	widget.setText(value);
-    }
-
-    /**
-     * Get the data value associated with the specified key
-     * @param key The key to be used
-     * @return The data value associated with the key
-     */
-    public String getData(String key)
-    {
-	return (String) widget.getData(key);
-    }
-
-    /**
-     * Set the enable state for the object
-     * @param state - The enable state for the widget
-     */
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-    /**
-     * Get the enable state for the object 
-     * @return the enable state
-     */
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-
-    /**
-     * Set the non-default status flag to show whether the data value for this object is equal to the default value
-     * for the attribute.
-     */
-    protected void setDefaultStatus()
-    {
-	String value;
-	
-	value = widget.getText().trim();
-	if ((value.length() == 0) || (value.equals(defaultValue))) {
-	    nonDefaultMarker.setText(" ");
-	} else {
-	    nonDefaultMarker.setText("*");
-	}
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget == source;
-    }
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/DualFieldRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/DualFieldRowWidget.java
deleted file mode 100644
index 62ee410..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/DualFieldRowWidget.java
+++ /dev/null

@@ -1,380 +0,0 @@
-
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-//TODO drw import org.eclipse.ptp.ibmll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-public class DualFieldRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attr1;
-    private IAttributeDefinition<?, ?, ?> attr2;
-    private DualField widget;
-    private String defaultValue[];
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class used to monitor changes in value for this object
-     *
-     */
-    private class EventMonitor implements ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Set the non-default indicator to '*' if the data value for this object does not match
-	 * the default value from the attribute definition
-	 * @param e The event indicating value has changed
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    String value[];
-
-	    value = widget.getText();
-	    if ((value[0].equals(defaultValue[0])) && (value[1].equals(defaultValue[1]))) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-
-    }
-
-    /**
-     * This class implements a widget containing two text fields laid out horizontally. The intended use is for
-     * attributes which may have two values, such as MP_BUFFER_SIZE, so that each field can be handled and validated
-     * individually.
-     */
-    private class DualField
-    {
-	private Object attrValue1;
-	private Object attrValue2;
-	private Composite group;
-	private Text value[];
-
-	/**
-	 * Create the DualField object
-	 * 
-	 * @param parent parent for this object
-	 */
-	public DualField(Composite parent)
-	{
-	    GridLayout layout;
-	    GridData gd;
-
-	    group = new Composite(parent, SWT.NONE);
-	    layout = new GridLayout(2, true);
-	    layout.marginWidth = 0;
-	    layout.marginHeight = 0;
-	    gd = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-	    group.setLayout(layout);
-	    value = new Text[2];
-	    value[0] = new Text(group, SWT.SINGLE | SWT.BORDER);
-	    value[0].setLayoutData(gd);
-	    value[1] = new Text(group, SWT.SINGLE | SWT.BORDER);
-	    value[1].setLayoutData(gd);
-
-	}
-
-	/**
-	 * Set the layout data for this widget
-	 * 
-	 * @param gd Layout data
-	 */
-	public void setLayoutData(GridData gd)
-	{
-	    group.setLayoutData(gd);
-	}
-
-	/**
-	 * Add a ModifyListener that will monitor the Text field for modifications
-	 * 
-	 * @param listener The ModifyListener
-	 */
-	public void addModifyListener(ModifyListener listener)
-	{
-	    value[0].addModifyListener(listener);
-	    value[1].addModifyListener(listener);
-	}
-
-	/**
-	 * Set tooltip text for each field of the widget
-	 * 
-	 * @param tip1 Tooltip text for first field
-	 * @param tip2 Tooltip text for second field
-	 */
-	public void setToolTipText(String tip1, String tip2)
-	{
-	    value[0].setToolTipText(tip1);
-	    value[1].setToolTipText(tip2);
-	}
-
-	/**
-	 * Set initial values for each field in the widget
-	 * 
-	 * @param value1 Value for first field
-	 * @param value2 Value for second field
-	 */
-	public void setText(String value1, String value2)
-	{
-	    value[0].setText(value1);
-	    value[1].setText(value2);
-	}
-
-	/**
-	 * Get the value pair for this widget
-	 * 
-	 * @return text values contained in text widgets
-	 */
-	public String[] getText()
-	{
-	    String textValue[];
-
-	    textValue = new String[2];
-	    textValue[0] = value[0].getText().trim();
-	    textValue[1] = value[1].getText().trim();
-	    return textValue;
-	}
-
-	/**
-	 * Check if this widget is enabled
-	 * 
-	 * @return Enable state
-	 */
-	public boolean isEnabled()
-	{
-	    return value[0].isEnabled();
-	}
-
-	/**
-	 * Set the enable state for this widget
-	 * 
-	 * @param state Enable state
-	 */
-	public void setEnabled(boolean state)
-	{
-	    value[0].setEnabled(state);
-	    value[1].setEnabled(state);
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData1(Object value)
-	{
-	    attrValue1 = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public Object getData1()
-	{
-	    return attrValue1;
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData2(Object value)
-	{
-	    attrValue2 = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public Object getData2()
-	{
-	    return attrValue2;
-	}
-	
-	public boolean isMatchingWidget(Widget source)
-	{
-	    return ((value[0] == source) || (value[1] == source));
-	}
-    }
-
-    /**
-     * Create a widget with two text entry fields representing the two sub-fields required by this widget.
-     * This class assumes that the layout set for the parent Composite object is a GridLayout with four columns.
-     * @param parent The parent widget
-     * @param id1 The attribute name for the first field in this widget
-     * @param id2 The attribute name for the second field in this widget
-     * @param def1 The attribute definition for the first field in this widget
-     * @param def2 The attribute definition for the second field in this widget
-     */
-    public DualFieldRowWidget(Composite parent, String id1, String id2, IAttributeDefinition<?, ?, ?> def1,
-	    IAttributeDefinition<?, ?, ?> def2)
-    {
-	attr1 = def1;
-	attr2 = def2;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	//TODO drw label.setText(Messages.getString(attr1.getName()));
-	label.setText(attr1.getName());
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	widget = new DualField(parent);
-	//TODO drw widget.setToolTipText(Messages.getString(attr1.getDescription()), Messages.getString(attr2.getDescription()));
-	widget.setToolTipText(attr1.getDescription(), attr2.getDescription());
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.horizontalSpan = 2;
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData1(id1);
-	widget.setData2(id2);
-	try {
-	    defaultValue = new String[2];
-	    defaultValue[0] = attr1.create().getValueAsString();
-	    defaultValue[1] = attr2.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue[0] = "";
-	    defaultValue[1] = "";
-	    ;
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-    }
-
-    /**
-     * Add a modify listener to this object 
-     * @param listener The listener object
-     */
-    public void addModifyListener(ModifyListener listener)
-    {
-	widget.addModifyListener(listener);
-    }
-
-    /**
-     * Set the enable state for this widget
-     * @param state The enable state
-     */
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-
-    /**
-     * Set the values for the two Text widgets contained in this object
-     * @param value1 First text object's value
-     * @param value2 Second text object's value
-     */
-    public void setValue(String value1, String value2)
-    {
-	widget.setText(value1, value2);
-    }
-
-    /** 
-     * Get the data object (the attribute name) associated with the first Text widget in this object
-     * @return The attribute name
-     */
-    public Object getData1()
-    {
-	return widget.getData1();
-    }
-
-    /** 
-     * Get the data object (the attribute name) associated with the second Text widget in this object
-     * @return The attribute name
-     */
-    public Object getData2()
-    {
-	return widget.getData2();
-    }
-
-    /**
-     * Return a String array containing the values from the two Text objects contained in this object
-     * @return Two element array containing the value from the two Text widgets contained in this object
-     */
-    public String[] getValue()
-    {
-	return widget.getText();
-    }
-
-    /**
-     * Return the enable state for this object
-     * @return The enable state
-     */
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget.isMatchingWidget(source);
-    }
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/FileSelectorRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/FileSelectorRowWidget.java
deleted file mode 100644
index 6bc42b8..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/FileSelectorRowWidget.java
+++ /dev/null

@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-//TODO drw import org.eclipse.ptp.ibmll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-public class FileSelectorRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attr;
-    private FileSelector widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal listener class for notifications when the value of the pathname field changes
-     *
-     */
-    private class EventMonitor implements ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Set the non-default indicator for this object when the pathname does not match the default pathname for this
-	 * object
-	 * @param e The notification event
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    if (widget.getPath().equals(defaultValue)) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-    }
-
-    /**
-     * This class is a container for a text field and browse button combination used for file selection. When the browse
-     * button is clicked, the registered SelectionListener will pop up a file or directory dialog prompting the user for
-     * a path. When the user clicks ok in that dialog, the text field in this object is filled in with the selected
-     * path. The browse button and text box are treated as a single object by the rest of the code in this file so that
-     * they can be easily set to enabled or disabled state.
-     * 
-     */
-    private class FileSelector
-    {
-	private Object attrValue;
-	private Text path;
-	private Button browseButton;
-
-	/**
-	 * Create the file selector object
-	 * 
-	 * @param parent Parent widget for the file selector
-	 * @param selectorID Identifier for this file selector
-	 * @param tooltipText Tooltip text for the selector
-	 */
-	public FileSelector(Composite parent, Integer selectorID, String tooltipText)
-	{
-	    GridData gd;
-
-	    path = new Text(parent, SWT.SINGLE | SWT.BORDER);
-	    path.setToolTipText(tooltipText);
-	    gd = new GridData(GridData.FILL_HORIZONTAL);
-	    gd.grabExcessHorizontalSpace = true;
-	    path.setLayoutData(gd);
-	    browseButton = new Button(parent, SWT.PUSH);
-	    //TODO drw browseButton.setText(Messages.getString("FileSelector.BrowseButton"));
-	    browseButton.setText("Browse");
-	    browseButton.setData(WidgetAttributes.BUTTON_ID, new Integer(selectorID));
-	    gd = new GridData(GridData.FILL_HORIZONTAL);
-	    gd.grabExcessHorizontalSpace = false;
-	    browseButton.setLayoutData(gd);
-
-	}
-
-	/**
-	 * Set the file selector's enable state
-	 * 
-	 * @param enable Enable state
-	 */
-	public void setEnabled(boolean enable)
-	{
-	    path.setEnabled(enable);
-	    browseButton.setEnabled(enable);
-	}
-
-	/**
-	 * Determine the enable state for the file selector
-	 * 
-	 * @return enable state
-	 */
-	public boolean isEnabled()
-	{
-	    return path.isEnabled();
-	}
-
-	/**
-	 * Set the path to be displayed in the text field of the file selector
-	 * 
-	 * @param pathname Pathname to be displayed
-	 */
-	public void setPath(String pathname)
-	{
-	    path.setText(pathname);
-	}
-
-	/**
-	 * Get the specified path from the text field of the file selector
-	 * 
-	 * @return Pathname
-	 */
-	public String getPath()
-	{
-	    return path.getText();
-	}
-
-	/**
-	 * Set focus on the text field within the selector widget
-	 * 
-	 * @return
-	 */
-	public boolean setFocus()
-	{
-	    return path.setFocus();
-	}
-
-	/**
-	 * Set the 'data object' as if we were setting the ATTR_NAME object for a Widget object.
-	 * 
-	 * @param value - The value to be set
-	 */
-	public void setData(Object value)
-	{
-	    attrValue = value;
-	}
-
-	/**
-	 * Return the 'data object' as if we were retrieving the ATTR_NAME object for a Widget object
-	 * 
-	 * @return - Value of the data object
-	 */
-	public Object getData()
-	{
-	    return attrValue;
-	}
-
-	public void addSelectionListener(SelectionListener listener)
-	{
-	    browseButton.addSelectionListener(listener);
-	}
-
-	public void addModifyListener(ModifyListener listener)
-	{
-	    path.addModifyListener(listener);
-	}
-	
-	public boolean isMatchingWidget(Widget source)
-	{
-	    return path == source;
-	}
-    }
-
-    /**
-     * Create a file selector widget and related widgets for this class. This class assumes that the layout manager
-     * for the parent Composite object is a GridLayout with 4 columns.
-     * @param parent
-     * @param id
-     * @param selectorID
-     * @param def
-     */
-    public FileSelectorRowWidget(Composite parent, String id, Integer selectorID, IAttributeDefinition<?, ?, ?> def)
-    {
-	attr = def;
-	label = new Label(parent, SWT.NONE);
-	//TODO drw label.setText(Messages.getString(attr.getName()));
-	label.setText(attr.getName());
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText(" ");
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label.setLayoutData(gridData);
-	//TODO drw widget = new FileSelector(parent, selectorID, Messages.getString(attr.getDescription()));
-	widget = new FileSelector(parent, selectorID,attr.getDescription());
-	widget.setData(id);
-	try {
-	    defaultValue = attr.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-    }
-
-    /**
-     * Set the pathname for this object
-     * @param path Pathname
-     */
-    public void setPath(String path)
-    {
-	widget.setPath(path);
-    }
-
-    /**
-     * Set the enable state for this object
-     * @param state The enable state
-     */
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-
-    /**
-     * Set the data value (attribute name) for this object
-     * @param value The data value
-     */
-    public void setData(Object value)
-    {
-	widget.setData(value);
-    }
-
-    /**
-     * Get the data value (attribute name) for this object
-     * @return The data value
-     */
-    public Object getData()
-    {
-	return widget.getData();
-    }
-
-    /**
-     * Get the pathname specified in this object
-     * @return Pathname
-     */
-    public String getValue()
-    {
-	return widget.getPath().trim();
-    }
-    
-    /**
-     * Get the enable state for this object
-     * @return The enable state
-     */
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-
-    /**
-     * Set focus to the text field within this object
-     */
-    public void setFocus()
-    {
-	widget.setFocus();
-    }
-
-    /**
-     * Add a selection listener which will receive notifications when the browse button in this object has
-     * been clicked.
-     * @param listener The listener
-     */
-    public void addSelectionListener(SelectionListener listener)
-    {
-	widget.addSelectionListener(listener);
-    }
-
-    /**
-     * Add a selection listener which will receive notifications when the path name field in this object has changed value
-     * @param listener The listener
-     */
-    public void addModifyListener(ModifyListener listener)
-    {
-	widget.addModifyListener(listener);
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget.isMatchingWidget(source);
-    }
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/TextRowWidget.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/TextRowWidget.java
deleted file mode 100644
index 2466283..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/TextRowWidget.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-//TODO drw import org.eclipse.ptp.ibmll.ui.internal.ui.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-
-public class TextRowWidget implements ValidationState
-{
-    private Label label;
-    private Label nonDefaultMarker;
-    private GridData gridData;
-    private IAttributeDefinition<?, ?, ?> attrDef;
-    private Text widget;
-    private String defaultValue;
-    private EventMonitor eventMonitor;
-    private int validationState;
-
-    /**
-     * Internal class which listens for events indicating the data value for this object has changed
-     *
-     */
-    private class EventMonitor implements ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	/**
-	 * Change the non-default value indicator for this object to indicate whether the data value matches
-	 * the default value from the attribute definition
-	 * @param e The event indicating data value has changed 
-	 */
-	public void modifyText(ModifyEvent e)
-	{
-	    String value;
-	    
-	    value = widget.getText().trim();
-	    if ((value.length () == 0) || (value.equals(defaultValue))) {
-		nonDefaultMarker.setText(" ");
-	    } else {
-		nonDefaultMarker.setText("*");
-	    }
-	}
-    }
-
-    /**
-     * Create a widget which is used as a text entry field in the launch configuration. This class assumes that
-     * the layout manager set for the parent Composite object is a GridLayout widget with 4 columns
-     * @param parent The parent Composite object
-     * @param id The name of the attribute for this widget
-     * @param def The attribute definition for this widget
-     */
-    public TextRowWidget(Composite parent, String id, IAttributeDefinition<?, ?, ?> def)
-    {
-	attrDef = def;
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.grabExcessHorizontalSpace = false;
-	label = new Label(parent, SWT.NONE);
-	//TODO drw label.setText(Messages.getString(attrDef.getName()));
-	label.setText(attrDef.getName());
-	label.setLayoutData(gridData);
-	nonDefaultMarker = new Label(parent, SWT.NONE);
-	nonDefaultMarker.setText("*");
-	widget = new Text(parent, SWT.SINGLE | SWT.BORDER);
-	//TODO drw widget.setToolTipText(Messages.getString(attrDef.getDescription()));
-	widget.setToolTipText(attrDef.getDescription());
-	gridData = new GridData(GridData.FILL_HORIZONTAL);
-	gridData.horizontalSpan = 2;
-	gridData.grabExcessHorizontalSpace = true;
-	widget.setLayoutData(gridData);
-	widget.setData(WidgetAttributes.ATTR_NAME, id);
-	try {
-	    defaultValue = attrDef.create().getValueAsString();
-	}
-	catch (IllegalValueException e) {
-	    defaultValue = "";
-	}
-	eventMonitor = new EventMonitor();
-	widget.addModifyListener(eventMonitor);
-    }
-
-    /**
-     * Add a ModifyListener to this object
-     * @param monitor the listening object
-     */
-    public void addModifyListener(ModifyListener monitor)
-    {
-	widget.addModifyListener(monitor);
-    }
-
-    /**
-     * Get the data value for this object
-     * @return The data value
-     */
-    public String getValue()
-    {
-	return widget.getText().trim();
-    }
-
-    /**
-     * Set the data value for this object
-     * @param value The data value
-     */
-    public void setValue(String value)
-    {
-	widget.setText(value);
-    }
-
-    /**
-     * Get the data object (attribute name) stored in this widget
-     * @param key The key to use in retrieving the data object
-     * @return the data object
-     */
-    public String getData(String key)
-    {
-	return (String) widget.getData(key);
-    }
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState()
-    {
-	validationState = ValidationState.UNCHANGED;
-    }
-
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError()
-    {
-	validationState = ValidationState.IN_ERROR;
-    }
-
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired()
-    {
-	validationState = ValidationState.CHANGED;
-    }
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired()
-    {
-	return ((validationState == ValidationState.CHANGED) || (validationState == ValidationState.IN_ERROR));
-    }
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source)
-    {
-	return widget == source;
-    }
-    
-    public void setEnabled(boolean state)
-    {
-	widget.setEnabled(state);
-    }
-    
-    public boolean isEnabled()
-    {
-	return widget.isEnabled();
-    }
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ValidationState.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ValidationState.java
deleted file mode 100644
index fe5a442..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/ValidationState.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-import org.eclipse.swt.widgets.Widget;
-
-public interface ValidationState
-{
-    public static final int UNCHANGED = 0;
-    public static final int CHANGED = 1;
-    public static final int IN_ERROR=2;
-    
-
-    /**
-     * Set this object's validation state to indicate no validation is required
-     */
-    public void resetValidationState();
-    
-    /**
-     * Set this object's validation state to indicate the value has changed and validation is required
-     */
-    public void setValidationRequired();
-    
-    /**
-     * Set this object's validation state to indicate that the value is in error and must be validated again
-     */
-    public void setFieldInError();
-
-    /**
-     * Return status indicating if this object needs to be validated
-     * @return - validation status
-     */
-    public boolean isValidationRequired();
-    
-    /** 
-     * Return status indicating that the actual widget contained in this object is the widget that is being searched
-     * for
-     * @param source - The widget that is being searched for
-     * @return - status indicating this object contains the matching widget.
-     */
-    public boolean isMatchingWidget(Widget source);
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/WidgetAttributes.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/WidgetAttributes.java
deleted file mode 100644
index 3f400b1..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/widgets/WidgetAttributes.java
+++ /dev/null

@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.widgets;
-
-public interface WidgetAttributes
-{
-    public static final String ATTR_NAME = "ATTR_NAME";
-    public static final String BUTTON_ID = "BUTTON_ID";
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPage.java
deleted file mode 100755
index 8e259d8..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPage.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.wizards;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.ptp.rm.ibm.pe.ui.internal.ui.Messages;
-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteProxyResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.swt.widgets.Shell;
-
-public final class PEResourceManagerConfigurationWizardPage extends
-	AbstractRemoteProxyResourceManagerConfigurationWizardPage {
-	
-    private RMConfigurationWizard configWizard;
-    
-	public PEResourceManagerConfigurationWizardPage(RMConfigurationWizard wizard) {
-		super(wizard, Messages.getString("PEDialogs.ConfigurationTitle"));
-		setTitle(Messages.getString("PEDialogs.ConfigurationTitle"));
-		setDescription(Messages.getString("PEDialogs.Configuration"));
-		configWizard = wizard;
-	}
-	
-	protected String createOptionsDialog(Shell shell, String initialOptions) {
-	    PEResourceManagerOptionDialog dialog;
-	    
-	    dialog = new PEResourceManagerOptionDialog(shell, configWizard, initialOptions);
-		if (dialog.open() == Dialog.OK) {
-			return dialog.getValue();
-		}
-	    return initialOptions;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPageFactory.java
deleted file mode 100755
index 152587e..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerConfigurationWizardPageFactory.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *  
- * Copyright (c) 2006, 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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.wizards;
-
-import org.eclipse.ptp.rm.ibm.pe.core.rmsystem.PEResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-public class PEResourceManagerConfigurationWizardPageFactory extends
-		RMConfigurationWizardPageFactory {
-
-	public PEResourceManagerConfigurationWizardPageFactory() {
-		// no-op
-	}
-
-	public RMConfigurationWizardPage[] getPages(RMConfigurationWizard wizard) {
-		return new RMConfigurationWizardPage[]{new PEResourceManagerConfigurationWizardPage(wizard)};
-	}
-
-	public Class<PEResourceManagerFactory> getRMFactoryClass() {
-		return PEResourceManagerFactory.class;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerOptionDialog.java b/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerOptionDialog.java
deleted file mode 100644
index 590b33d..0000000
--- a/rms/org.eclipse.ptp.rm.ibm.pe.ui/src/org/eclipse/ptp/rm/ibm/pe/ui/wizards/PEResourceManagerOptionDialog.java
+++ /dev/null

@@ -1,510 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.ptp.rm.ibm.pe.ui.wizards;
-
-import java.io.IOException;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceConstants;
-import org.eclipse.ptp.rm.ibm.pe.core.PEPreferenceManager;
-import org.eclipse.ptp.rm.ibm.pe.core.rmsystem.PEResourceManagerConfiguration;
-import org.eclipse.ptp.rm.ibm.pe.ui.internal.ui.Messages;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-public class PEResourceManagerOptionDialog extends TitleAreaDialog
-{
-    private static final String SUSPEND_AT_STARTUP_OPTION = "--suspend_at_startup";
-    private static final String USE_LOADLEVELER_OPTION = "--useloadleveler";
-    private static final String MULTICLUSTER_OPTION = "--multicluster";
-    private static final String NODE_POLL_MIN_OPTION = "--node_polling_min";
-    private static final String NODE_POLL_MAX_OPTION = "--node_polling_max";
-    private static final String JOB_POLL_OPTION = "--job_polling";
-    private static final String LIB_OVERRIDE_OPTION = "--lib_override";
-    private static final String TRACE_OPTION = "--trace";
-    private static final String RUN_MINIPROXY_OPTION = "--runMiniproxy";
-    private Composite optionsPane;
-    private Button loadLevelerOption;
-    private Button suspendOption;
-    private Button runMiniproxy;
-    private Button libOverrideBrowse;
-    private Button llModeLocal;
-    private Button llModeMulticluster;
-    private Button llModeDefault;
-    private Text nodePollMinInterval;
-    private Text nodePollMaxInterval;
-    private Text jobPollInterval;
-    private Text libOverridePath;
-    private Group llModeGroup;
-    private Composite llOverrideBox;
-    private Combo debugLevel;
-    private Label llLabel;
-    private Label debugLabel;
-    private Label suspendLabel;
-    private Label runMiniproxyLabel;
-    private Label libOverrideLabel;
-    private Label llModeLabel;
-    private Label nodePollMinLabel;
-    private Label nodePollMaxLabel;
-    private Label jobPollLabel;
-    private Shell parentShell;
-    private String proxyOptions;
-    private PEResourceManagerConfiguration config;
-    private RMConfigurationWizard confWizard;
-    private IRemoteServices remoteService;
-    private IRemoteUIServices remoteUIService;
-    private IRemoteConnection remoteConnection;
-    private IRemoteConnectionManager connMgr;
-
-    private EventMonitor eventMonitor;
-
-    private class EventMonitor implements SelectionListener, ModifyListener
-    {
-	public EventMonitor()
-	{
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	public void widgetSelected(SelectionEvent e)
-	{
-	    if (e.getSource() == loadLevelerOption) {
-		if (loadLevelerOption.getSelection()) {
-		    setLLWidgetEnableState(true);
-		} else {
-		    setLLWidgetEnableState(false);
-		}
-	    }
-	    if (e.getSource() == libOverrideBrowse) {
-		String selectedFile = null;
-
-		if (remoteUIService != null) {
-			IRemoteUIFileManager fmgr = remoteUIService.getUIFileManager();
-			fmgr.setConnection(remoteConnection);
-			selectedFile = fmgr.browseDirectory(parentShell, 
-					Messages.getString("PEDialogs.librarySelectorTitle"), "/").toString();
-		}
-		if (selectedFile != null) {
-		    libOverridePath.setText(selectedFile);
-		}
-	    } else {
-		validateInput(e.getSource());
-	    }
-	}
-
-	public void modifyText(ModifyEvent e)
-	{
-	    validateInput(e.getSource());
-	}
-    }
-
-    public PEResourceManagerOptionDialog(Shell parent, RMConfigurationWizard wizard, String initialOptions)
-    {
-	super(parent);
-	parentShell = parent;
-	confWizard = wizard;
-	config = (PEResourceManagerConfiguration) confWizard.getConfiguration();
-	setInitialOptions(initialOptions);
-	create();
-    }
-
-    /**
-     * Get the preferences object for the PE implementation
-     * 
-     * @return the preferences object
-     */
-    public Preferences getPreferences()
-    {
-	return PEPreferenceManager.getPreferences();
-    }
-
-    /**
-     * Create the widgets for this proxy configuration page and set their values
-     * to the last saved values for this resource manager
-     * 
-     * @param parent - The parent widget for this class
-     */
-    protected Control createDialogArea(Composite parent)
-    {
-	GridLayout layout;
-	GridLayout libPathLayout;
-	GridLayout modeLayout;
-	GridData gd;
-	Preferences preferences;
-	String preferenceValue;
-
-	setTitle(Messages.getString("PEDialogs.InvocationOptionsTitle"));
-	eventMonitor = new EventMonitor();
-	preferences = getPreferences();
-	optionsPane = new Composite(parent, SWT.NONE);
-	layout = new GridLayout(2, true);
-	optionsPane.setLayout(layout);
-
-	llLabel = new Label(optionsPane, SWT.NONE);
-	llLabel.setText(Messages.getString("PEDialogs.LoadLevelerOptionLabel"));
-	loadLevelerOption = new Button(optionsPane, SWT.CHECK);
-	preferenceValue = config.getUseLoadLeveler();
-	if ((preferenceValue != null) && (preferenceValue.equals(PEPreferenceConstants.OPTION_YES))) {
-	    loadLevelerOption.setSelection(true);
-	}
-	llModeLabel = new Label(optionsPane, SWT.NONE);
-	llModeLabel.setText(Messages.getString("PEDialogs.LLRunMode"));
-	llModeGroup = new Group(optionsPane, SWT.SHADOW_ETCHED_IN);
-	modeLayout = new GridLayout(2, true);
-	llModeGroup.setLayout(modeLayout);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	llModeGroup.setLayoutData(gd);
-	llModeLocal = new Button(llModeGroup, SWT.RADIO);
-	llModeLocal.setText(Messages.getString("PEDialogs.llModeLocal"));
-	llModeMulticluster = new Button(llModeGroup, SWT.RADIO);
-	llModeMulticluster.setText(Messages.getString("PEDialogs.llModeMulticluster"));
-	llModeDefault = new Button(llModeGroup, SWT.RADIO);
-	llModeDefault.setText(Messages.getString("PEDialogs.llModeDefault"));
-	llModeDefault.setSelection(false);
-	llModeLocal.setSelection(false);
-	llModeMulticluster.setSelection(false);
-	preferenceValue = config.getLoadLevelerMode();
-	if (preferenceValue != null) {
-	    if (preferenceValue.equals("y")) {
-		llModeMulticluster.setSelection(true);
-	    } else if (preferenceValue.equals("n")) {
-		llModeLocal.setSelection(true);
-	    }
-	    else {
-		llModeDefault.setSelection(true);
-	    }
-	} 
-	else {
-	    llModeDefault.setSelection(true);
-	}
-
-	nodePollMinLabel = new Label(optionsPane, SWT.NONE);
-	nodePollMinLabel.setText(Messages.getString("PEDialogs.minNodePollInterval"));
-	nodePollMinInterval = new Text(optionsPane, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	nodePollMinInterval.setLayoutData(gd);
-	preferenceValue = config.getNodeMinPollInterval();
-	if (preferenceValue != null) {
-	    nodePollMinInterval.setText(preferenceValue);
-	}
-
-	nodePollMaxLabel = new Label(optionsPane, SWT.NONE);
-	nodePollMaxLabel.setText(Messages.getString("PEDialogs.maxNodePollInterval"));
-	nodePollMaxInterval = new Text(optionsPane, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	nodePollMaxInterval.setLayoutData(gd);
-	preferenceValue = config.getNodeMaxPollInterval();
-	if (preferenceValue != null) {
-	    nodePollMaxInterval.setText(preferenceValue);
-	}
-
-	jobPollLabel = new Label(optionsPane, SWT.NONE);
-	jobPollLabel.setText(Messages.getString("PEDialogs.jobPollInterval"));
-	jobPollInterval = new Text(optionsPane, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	jobPollInterval.setLayoutData(gd);
-	preferenceValue = config.getJobPollInterval();
-	if (preferenceValue != null) {
-	    jobPollInterval.setText(preferenceValue);
-	}
-
-	libOverrideLabel = new Label(optionsPane, SWT.NONE);
-	libOverrideLabel.setText(Messages.getString("PEDialogs.libOverrideLabel"));
-
-	llOverrideBox = new Composite(optionsPane, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	llOverrideBox.setLayoutData(gd);
-	libPathLayout = new GridLayout(2, false);
-	libPathLayout.marginLeft = 0;
-	libPathLayout.marginRight = 0;
-	libPathLayout.marginWidth = 0;
-	llOverrideBox.setLayout(libPathLayout);
-	libOverridePath = new Text(llOverrideBox, SWT.NONE);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = true;
-	libOverridePath.setLayoutData(gd);
-	libOverrideBrowse = new Button(llOverrideBox, SWT.PUSH);
-	libOverrideBrowse.setText(Messages.getString("PEDialogs.browse"));
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.grabExcessHorizontalSpace = false;
-	libOverrideBrowse.setLayoutData(gd);
-	preferenceValue = config.getLibraryOverride();
-	if (preferenceValue != null) {
-	    libOverridePath.setText(preferenceValue);
-	}
-
-	runMiniproxyLabel = new Label(optionsPane, SWT.NONE);
-	runMiniproxyLabel.setText(Messages.getString("PEDialogs.MiniproxyLabel"));
-	runMiniproxy = new Button(optionsPane, SWT.CHECK);
-	preferenceValue = config.getRunMiniproxy();
-	if ((preferenceValue != null) && (preferenceValue.equals(PEPreferenceConstants.OPTION_YES))) {
-	    runMiniproxy.setSelection(true);
-	}
-
-	debugLabel = new Label(optionsPane, SWT.NONE);
-	debugLabel.setText(Messages.getString("PEDialogs.TraceLevelLabel"));
-	debugLevel = new Combo(optionsPane, SWT.READ_ONLY);
-	debugLevel.add(PEPreferenceConstants.TRACE_NOTHING);
-	debugLevel.add(PEPreferenceConstants.TRACE_FUNCTION);
-	debugLevel.add(PEPreferenceConstants.TRACE_DETAIL);
-	preferenceValue = config.getDebugLevel();
-	if (preferenceValue != null) {
-	    debugLevel.setText(preferenceValue);
-	}
-
-	suspendLabel = new Label(optionsPane, SWT.NULL);
-	suspendLabel.setText(Messages.getString("PEDialogs.SuspendLabel"));
-	suspendOption = new Button(optionsPane, SWT.CHECK);
-	preferenceValue = config.getSuspendProxy();
-	// suspendOption is used to specify that the proxy should suspend after it has recognized this
-	// option so that a debugger can attach to it. Since this is a debugging aid, there is no
-	// preferences setting for this flag (proxies should never suspend at startup by default)
-	if ((preferenceValue != null) && (preferenceValue.equals(PEPreferenceConstants.OPTION_YES))) {
-	    suspendOption.setSelection(true);
-	}
-
-	if (!loadLevelerOption.getSelection()) {
-	    setLLWidgetEnableState(false);
-	}
-	loadLevelerOption.addSelectionListener(eventMonitor);
-	suspendOption.addSelectionListener(eventMonitor);
-	llModeLocal.addSelectionListener(eventMonitor);
-	llModeMulticluster.addSelectionListener(eventMonitor);
-	llModeDefault.addSelectionListener(eventMonitor);
-	nodePollMinInterval.addModifyListener(eventMonitor);
-	nodePollMaxInterval.addModifyListener(eventMonitor);
-	jobPollInterval.addModifyListener(eventMonitor);
-	libOverridePath.addModifyListener(eventMonitor);
-	libOverrideBrowse.addSelectionListener(eventMonitor);
-	runMiniproxy.addSelectionListener(eventMonitor);
-	suspendOption.addSelectionListener(eventMonitor);
-	debugLevel.addSelectionListener(eventMonitor);
-		// Ensure that the starting values for this dialog are valid and that options contained in this
-		// dialog are stored in the option string even if no changes are made.
-	validateInput(null);
-	return optionsPane;
-    }
-
-    	/**
-    	 * Set the widget enable state for these widgets based on whether the use LoadLeveler checkbox
-    	 * is checked
-    	 * 
-    	 * @param state
-    	 */
-    private void setLLWidgetEnableState(boolean state)
-    {
-	llModeLocal.setEnabled(state);
-	llModeMulticluster.setEnabled(state);
-	llModeDefault.setEnabled(state);
-	nodePollMinInterval.setEnabled(state);
-	nodePollMaxInterval.setEnabled(state);
-	jobPollInterval.setEnabled(state);
-	libOverridePath.setEnabled(state);
-	libOverrideBrowse.setEnabled(state);
-    }
-
-    /**
-     * Retrieve the settings specified on this panel, validate those values, 
-     * and create the string containing proxy invocation options corresponding to those values
-     * 
-     * @return Status indicating successful completion
-     */
-    protected boolean validateInput(Object eventSource)
-    {
-	String traceOpt;
-
-	proxyOptions = "";
-	setErrorMessage(null);
-	if (loadLevelerOption.getSelection()) {
-	    String widgetValue;
-	    String multiclusterMode;
-	    int interval;
-
-	    proxyOptions = proxyOptions + USE_LOADLEVELER_OPTION + " ";
-	    config.setUseLoadLeveler(PEPreferenceConstants.OPTION_YES);
-	    proxyOptions = proxyOptions + MULTICLUSTER_OPTION + "=";
-	    if (llModeDefault.getSelection()) {
-		multiclusterMode = "d";
-	    } else if (llModeLocal.getSelection()) {
-		multiclusterMode = "n";
-	    } else {
-		multiclusterMode = "y";
-	    }
-	    proxyOptions = proxyOptions + multiclusterMode + " ";
-	    config.setLoadLevelerMode(multiclusterMode);
-	    widgetValue = nodePollMinInterval.getText().trim();
-	    if (widgetValue.length() > 0) {
-		try {
-		    interval = Integer.valueOf(widgetValue);
-		}
-		catch (NumberFormatException e) {
-		    setErrorMessage(Messages.getString("PEDialogs.invalidMinPollInterval"));
-		    return false;
-		}
-		proxyOptions = proxyOptions + NODE_POLL_MIN_OPTION + "=" + widgetValue + " ";
-	    }
-	    config.setNodeMinPollInterval(widgetValue);
-	    widgetValue = nodePollMaxInterval.getText().trim();
-	    if (widgetValue.length() > 0) {
-		try {
-		    interval = Integer.valueOf(widgetValue);
-		}
-		catch (NumberFormatException e) {
-		    setErrorMessage(Messages.getString("PEDialogs.invalidMaxPollInterval"));
-		    return false;
-		}
-		proxyOptions = proxyOptions + NODE_POLL_MAX_OPTION + "=" + widgetValue + " ";
-	    }
-	    config.setNodeMaxPollInterval(widgetValue);
-	    widgetValue = jobPollInterval.getText().trim();
-	    if (widgetValue.length() > 0) {
-		try {
-		    interval = Integer.valueOf(widgetValue);
-		}
-		catch (NumberFormatException e) {
-		    setErrorMessage(Messages.getString("PEDialogs.invalidJobPollInterval"));
-		    return false;
-		}
-		proxyOptions = proxyOptions + JOB_POLL_OPTION + "=" + widgetValue + " ";
-	    }
-	    config.setJobPollInterval(widgetValue);
-	    widgetValue = libOverridePath.getText().trim();
-	    if ((widgetValue.length() > 0) && (eventSource == libOverridePath)) {
-		IFileStore remoteResource;
-		IFileInfo fileInfo;
-		IPath testPath;
-
-		remoteService = PTPRemoteCorePlugin.getDefault().getRemoteServices(config.getRemoteServicesId());
-		connMgr = remoteService.getConnectionManager();
-		remoteConnection = connMgr.getConnection(config.getConnectionName());
-		testPath = new Path(widgetValue);
-		if (!testPath.isValidPath(widgetValue)) {
-		    setErrorMessage(Messages.getString("PEDialogs.invalidLibraryPath"));
-		}
-		try {
-		    remoteResource = remoteService.getFileManager(remoteConnection).getResource(testPath,
-			    new NullProgressMonitor());
-		    fileInfo = remoteResource.fetchInfo();
-		    if ((!fileInfo.exists()) || (! fileInfo.isDirectory())) {
-			setErrorMessage(Messages.getString("PEDialogs.invalidLibraryPath"));
-		    }
-		}
-		catch (IOException e) {
-		    setErrorMessage(Messages.getString("Invalid.remoteConnectionError") + " " + e.getMessage());
-		}
-		proxyOptions = proxyOptions + LIB_OVERRIDE_OPTION + "=" + widgetValue + " ";
-	    }
-	    config.setLibraryOverride(widgetValue);
-	} else {
-	    config.setUseLoadLeveler(PEPreferenceConstants.OPTION_NO);
-	}
-	traceOpt = debugLevel.getText();
-	if (traceOpt.length() > 0) {
-	    proxyOptions = proxyOptions + TRACE_OPTION + "=" + traceOpt + " ";
-	    config.setDebugLevel(traceOpt);
-	}
-	if (suspendOption.getSelection()) {
-	    proxyOptions = proxyOptions + SUSPEND_AT_STARTUP_OPTION;
-	    config.setSuspendProxy(PEPreferenceConstants.OPTION_YES);
-	} else {
-	    config.setSuspendProxy(PEPreferenceConstants.OPTION_NO);
-	}
-	if (runMiniproxy.getSelection()) {
-	    proxyOptions = proxyOptions + RUN_MINIPROXY_OPTION + " ";
-	    config.setRunMiniproxy(PEPreferenceConstants.OPTION_YES);
-	} else {
-	    config.setRunMiniproxy(PEPreferenceConstants.OPTION_NO);
-	}
-	config.setInvocationOptions(proxyOptions);
-	return true;
-    }
-    
-    public String getValue()
-    {
-	return proxyOptions;
-    }
-    
-    public void setInitialOptions(String initialOptions)
-    {
-	StringTokenizer options;
-	
-	options = new StringTokenizer(initialOptions, " ");
-	config.setSuspendProxy(PEPreferenceConstants.OPTION_NO);
-	config.setRunMiniproxy(PEPreferenceConstants.OPTION_NO);
-	while (options.hasMoreTokens()) {
-	    String currentToken[];
-	    
-	    currentToken = options.nextToken().split("=");
-	    if (currentToken.length == 1) {
-		if (currentToken[0].equals(SUSPEND_AT_STARTUP_OPTION)) {
-		    config.setSuspendProxy(PEPreferenceConstants.OPTION_YES);
-		}
-		else if (currentToken[0].equals(RUN_MINIPROXY_OPTION)) {
-		    config.setRunMiniproxy(PEPreferenceConstants.OPTION_YES);
-		}  
-		else if (currentToken[0].equals(USE_LOADLEVELER_OPTION)) {
-		    config.setUseLoadLeveler(PEPreferenceConstants.OPTION_YES);
-		}  
-	    }
-	    else {
-		if (currentToken[0].equals(MULTICLUSTER_OPTION)) {
-		    config.setLoadLevelerMode(currentToken[1]);
-		}
-		else if (currentToken[0].equals(NODE_POLL_MIN_OPTION)) {
-		    config.setNodeMinPollInterval(currentToken[1]);
-		}
-		else if (currentToken[0].equals(NODE_POLL_MAX_OPTION)) {
-		    config.setNodeMaxPollInterval(currentToken[1]);
-		}
-		else if (currentToken[0].equals(JOB_POLL_OPTION)) {
-		    config.setJobPollInterval(currentToken[1]);
-		}
-		else if (currentToken[0].equals(LIB_OVERRIDE_OPTION)) {
-		    config.setLibraryOverride(currentToken[1]);
-		}
-		else if (currentToken[0].equals(TRACE_OPTION)) {
-		    config.setDebugLevel(currentToken[1]);
-		}
-	    }
-	}
-    }
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project
deleted file mode 100644
index 8b6ce0a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpi.mpich2.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF
deleted file mode 100644
index aeec931..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.mpi.mpich2.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.core,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.remote.core,
- org.eclipse.core.filesystem,
- org.eclipse.ui,
- org.eclipse.search
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.mpi.mpich2.core,
- org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem,
- org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem
-Bundle-Vendor: %pluginProvider

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

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties
deleted file mode 100644
index 23415e8..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties
deleted file mode 100644
index f921f89..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               data/,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties
deleted file mode 100644
index 3c8db9e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-LAUNCH_CMD=mpiexec -l -a ${MPICH2_jobid} ${MPICH2_args} ${MPICH2_env} ${execPath}/${execName} ${progArgs}
-DEBUG_CMD=mpiexec  -l -a ${MPICH2_jobid} ${MPICH2_args} ${MPICH2_env} ${debugExecPath}/${debugExecName} ${debugArgs}
-DISCOVER_CMD=mpdtrace -l
-PERIODIC_CMD=mpdlistjobs
-PERIODIC_TIME=5000
-PATH=
-USE_DEFAULTS=true

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties
deleted file mode 100644
index 56fb5bb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP MPICH2 (new) Support
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml
deleted file mode 100644
index d7a3aa8..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.core.resourceManagers">
-      <resourceManager
-            class="org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerFactory"
-            id="org.eclipse.ptp.mpich2.core.resourcemanager"/>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java
deleted file mode 100644
index 27da4e6..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ApplicationAttributes {
-	private static final String EFFECTIVE_MPICH2_ENV_ATTR_ID = "MPICH2_env"; //$NON-NLS-1$
-	private static final String EFFECTIVE_MPICH2_PROG_ARGS_ATTR_ID = "MPICH2_progArgs"; //$NON-NLS-1$
-	private static final String EFFECTIVE_MPICH2_WORKING_DIR_ATTR_ID = "MPICH2_workingDir"; //$NON-NLS-1$
-
-	private final static ArrayAttributeDefinition<String> effectiveMPICH2EnvAttrDef =
-		new ArrayAttributeDefinition<String>(EFFECTIVE_MPICH2_ENV_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title,
-				Messages.MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description, true, null);
-
-	private final static ArrayAttributeDefinition<String> effectiveMPICH2ProgArgsAttrDef =
-		new ArrayAttributeDefinition<String>(EFFECTIVE_MPICH2_PROG_ARGS_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title,
-				Messages.MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description, true, null);
-
-	private final static StringAttributeDefinition effectiveMPICH2WorkingDirAttrDef =
-		new StringAttributeDefinition(EFFECTIVE_MPICH2_WORKING_DIR_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title,
-				Messages.MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 * Environment variables that MPICH2 has passed to the processes.
-	 */
-	public static ArrayAttributeDefinition<String> getEffectiveMPICH2EnvAttributeDefinition() {
-		return effectiveMPICH2EnvAttrDef;
-	}
-
-	/**
-	 * Program arguments that MPICH2 has passed to the processes.
-	 */
-	public static ArrayAttributeDefinition<String> getEffectiveMPICH2ProgArgsAttributeDefinition() {
-		return effectiveMPICH2ProgArgsAttrDef;
-	}
-
-	/**
-	 * Working directory where MPICH2 has started the processes.
-	 */
-	public static StringAttributeDefinition getEffectiveMPICH2WorkingDirAttributeDefinition() {
-		return effectiveMPICH2WorkingDirAttrDef;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java
deleted file mode 100644
index bab4b2d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.osgi.framework.Bundle;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2Defaults {
-
-	public static String LAUNCH_CMD = null;
-	public static String DEBUG_CMD = null;
-	public static String DISCOVER_CMD = null;
-	public static String PERIODIC_CMD = null;
-	public static int PERIODIC_TIME = 0;
-	public static String PATH = null;
-	public static boolean USE_DEFAULTS = false;
-
-	private static String defaultsResourcePath = "/data/defaults.properties"; //$NON-NLS-1$
-
-	public static void loadDefaults() throws CoreException {
-		Path defaultsPropertiesPath = new Path(defaultsResourcePath);
-		Bundle bundle = MPICH2Plugin.getDefault().getBundle();
-		Properties properties = read(defaultsPropertiesPath, bundle);
-
-		LAUNCH_CMD = getString(bundle, properties, "LAUNCH_CMD"); //$NON-NLS-1$
-		DEBUG_CMD = getString(bundle, properties, "DEBUG_CMD"); //$NON-NLS-1$
-		DISCOVER_CMD = getString(bundle, properties, "DISCOVER_CMD"); //$NON-NLS-1$
-		PERIODIC_CMD = getString(bundle, properties, "PERIODIC_CMD"); //$NON-NLS-1$
-		PERIODIC_TIME = getInteger(bundle, properties, "PERIODIC_TIME"); //$NON-NLS-1$
-		PATH = getString(bundle, properties, "PATH"); //$NON-NLS-1$
-		USE_DEFAULTS = getBoolean(bundle, properties, "USE_DEFAULTS"); //$NON-NLS-1$
-
-		assert LAUNCH_CMD != null;
-		assert DEBUG_CMD != null;
-		assert DISCOVER_CMD != null;
-		assert PERIODIC_CMD != null;
-		assert PATH != null;
-	}
-
-	public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
-	throws CoreException {
-		InputStream inStream;
-		Properties properties = new Properties();
-		try {
-			inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
-			properties.load(inStream);
-
-
-		} catch (IOException e) {
-			throw MPICH2Plugin.coreErrorException(Messages.MPICH2Defaults_Exception_FailedReadFile, e);
-		}
-		return properties;
-	}
-
-	public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = properties.getProperty(key);
-		if (value == null) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2Defaults_MissingValue, key)));
-		}
-		
-		return value;
-	}
-
-	public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2Defaults_FailedParseInteger, key)));
-		}
-	}
-
-	public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		return Boolean.parseBoolean(value);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
deleted file mode 100644
index d5110df..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes.
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2JobAttributes {
-
-	private static final String JOB_ID_ATTR_ID = "MPICH2_jobid"; //$NON-NLS-1$
-	private static final String HOSTNAME_ATTR_ID = "MPICH2_hostname"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition jobIdAttrDef =
-		new StringAttributeDefinition(JOB_ID_ATTR_ID, Messages.MPICH2JobAttributes_mpiJobIdAttrDef_title,
-				Messages.MPICH2JobAttributes_mpiJobIdAttrDef_description, true, ""); //$NON-NLS-1$
-
-	private final static StringAttributeDefinition hostnameAttrDef =
-		new StringAttributeDefinition(HOSTNAME_ATTR_ID, Messages.MPICH2JobAttributes_hostnameAttrDef_title, 
-				Messages.MPICH2JobAttributes_hostnameAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 */
-	public static StringAttributeDefinition getJobIdAttributeDefinition() {
-		return jobIdAttrDef;
-	}
-
-	/**
-	 */
-	public static StringAttributeDefinition getHostnameAttributeDefinition() {
-		return hostnameAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{jobIdAttrDef, hostnameAttrDef};
-	}
-
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java
deleted file mode 100644
index 3430da2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * OMPI-specific attributes
- * 
- * @author Daniel Felix Ferber
- */
-public class MPICH2LaunchAttributes {
-	private static final String LAUNCH_ARGS_ATTR_ID = "MPICH2_args"; //$NON-NLS-1$
-	private static final String ENV_KEYS_ATTR_ID = "MPICH2_envKeys"; //$NON-NLS-1$
-	private static final String ENV_ARGS_ATTR_ID = "MPICH2_env"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition launchArgsAttrDef =
-		new StringAttributeDefinition(LAUNCH_ARGS_ATTR_ID, Messages.MPICH2LaunchAttributes_launchArgsAttrDef_title,
-				Messages.MPICH2LaunchAttributes_launchArgsAttrDef_description, false, ""); //$NON-NLS-1$
-
-	private final static ArrayAttributeDefinition<String> environmentKeyAttrDef = new ArrayAttributeDefinition<String>(
-			ENV_KEYS_ATTR_ID, Messages.MPICH2LaunchAttributes_environmentKeyAttrDef_title,
-			Messages.MPICH2LaunchAttributes_environmentKeyAttrDef_description, false,
-			new String[0]);
-
-	private final static StringAttributeDefinition environmentArgsAttrDef = new StringAttributeDefinition(
-			ENV_ARGS_ATTR_ID, Messages.MPICH2LaunchAttributes_environmentArgsAttrDef_title, Messages.MPICH2LaunchAttributes_environmentArgsAttrDef_description, false,
-	"${MPICH2_envKeys:: -x ::-x :}"); //$NON-NLS-1$
-
-	/**
-	 * List of names of environment variables for the application.
-	 */
-	public static ArrayAttributeDefinition<String> getEnvironmentKeysAttributeDefinition() {
-		return environmentKeyAttrDef;
-	}
-
-	/**
-	 * Environment variables for the application, as expected by openmpi command line.
-	 */
-	public static StringAttributeDefinition getEnvironmentArgsAttributeDefinition() {
-		return environmentArgsAttrDef;
-	}
-
-	/**
-	 * Arguments for the application, as expected by openmpi command line.
-	 */
-	public static StringAttributeDefinition getLaunchArgumentsAttributeDefinition() {
-		return launchArgsAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				launchArgsAttrDef,environmentArgsAttrDef,environmentKeyAttrDef
-		};
-	}
-
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java
deleted file mode 100644
index 248b51b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class MPICH2MachineAttributes {
-
-	private static final String STATUS_MESSAGE = "MPICH2_statusMessage"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition statusMessageAttrDef =
-		new StringAttributeDefinition(STATUS_MESSAGE, Messages.MPICH2MachineAttributes_statusMessageAttrDef_title,
-				Messages.MPICH2MachineAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 * Status message if it was not possible to discover the machine.
-	 */
-	public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
-		return statusMessageAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{statusMessageAttrDef};
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java
deleted file mode 100644
index 8a21b96..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class MPICH2NodeAttributes {
-
-	private static final String NUM_NODES_ID = "MPICH2_numNodes"; //$NON-NLS-1$
-	private static final String MAX_NUM_NODES_ID = "MPICH2_maxNumNodes"; //$NON-NLS-1$
-	private static final String STATUS_MESSAGE = "MPICH2_statusMessage"; //$NON-NLS-1$
-	private static final String OVERSUBSCRIBED = "MPICH2_oversubscribed"; //$NON-NLS-1$
-
-	private final static IntegerAttributeDefinition numNodesAttrDef =
-		new IntegerAttributeDefinition(NUM_NODES_ID, Messages.MPICH2NodeAttributes_numNodesAttrDef_title,
-				Messages.MPICH2NodeAttributes_numNodesAttrDef_description, true, new Integer(0));
-
-	private final static IntegerAttributeDefinition maxNumNodesAttrDef =
-		new IntegerAttributeDefinition(MAX_NUM_NODES_ID, Messages.MPICH2NodeAttributes_maxNumNodesAttrDef_title,
-				Messages.MPICH2NodeAttributes_maxNumNodesAttrDef_description, true, new Integer(0));
-
-	private final static StringAttributeDefinition statusMessageAttrDef =
-		new StringAttributeDefinition(STATUS_MESSAGE, Messages.MPICH2NodeAttributes_statusMessageAttrDef_title,
-				Messages.MPICH2NodeAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
-	private final static BooleanAttributeDefinition oversubscribedAttrDef =
-		new BooleanAttributeDefinition(OVERSUBSCRIBED, Messages.MPICH2NodeAttributes_oversubscribedAttrDef_title,
-				Messages.MPICH2NodeAttributes_oversubscribedAttrDef_description, true, new Boolean(false));
-
-	/**
-	 * Number of slots suggested on the node.
-	 */
-	public static IntegerAttributeDefinition getNumberOfNodesAttributeDefinition() {
-		return numNodesAttrDef;
-	}
-
-	/**
-	 * Maximal number of slots on the node. Zero if not set.
-	 */
-	public static IntegerAttributeDefinition getMaximalNumberOfNodesAttributeDefinition() {
-		return maxNumNodesAttrDef;
-	}
-
-	/**
-	 * Status message if it was not possible to discover the node.
-	 */
-	public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
-		return statusMessageAttrDef;
-	}
-
-	/**
-	 * If node is oversubscribed.
-	 */
-	public static BooleanAttributeDefinition getOversubscribedAttributeDefinition() {
-		return oversubscribedAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{numNodesAttrDef,maxNumNodesAttrDef,statusMessageAttrDef};
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java
deleted file mode 100644
index 64d74b1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class MPICH2Plugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.mpich2.core"; //$NON-NLS-1$
-
-	// The shared instance
-	private static MPICH2Plugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public MPICH2Plugin() {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		MPICH2Defaults.loadDefaults();
-		MPICH2PreferenceManager.initializePreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static MPICH2Plugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 * 
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 * 
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 * 
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.MPICH2Plugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java
deleted file mode 100644
index 018ddb3..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.AbstractToolsPreferenceManager;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2PreferenceManager extends AbstractToolsPreferenceManager {
-	public static final String PREFIX = "mpich2-"; //$NON-NLS-1$
-
-	public static Preferences getPreferences() {
-		return MPICH2Plugin.getDefault().getPluginPreferences();
-	}
-
-	public static void savePreferences() {
-		MPICH2Plugin.getDefault().savePluginPreferences();
-	}
-
-	public static void initializePreferences() {
-		Preferences preferences = MPICH2Plugin.getDefault().getPluginPreferences();
-		preferences.setDefault(PREFIX + PREFS_LAUNCH_CMD, MPICH2Defaults.LAUNCH_CMD);
-		preferences.setDefault(PREFIX + PREFS_DEBUG_CMD, MPICH2Defaults.DEBUG_CMD);
-		preferences.setDefault(PREFIX + PREFS_DISCOVER_CMD, MPICH2Defaults.DISCOVER_CMD);
-		preferences.setDefault(PREFIX + PREFS_PERIODIC_MONITOR_CMD, MPICH2Defaults.PERIODIC_CMD);
-		preferences.setDefault(PREFIX + PREFS_PERIODIC_MONITOR_TIME, MPICH2Defaults.PERIODIC_TIME);
-		preferences.setDefault(PREFIX + PREFS_REMOTE_INSTALL_PATH, MPICH2Defaults.PATH);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java
deleted file mode 100644
index 3ef6bfe..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.mpich2.core.messages.messages"; //$NON-NLS-1$
-	public static String MPICH2Defaults_Exception_FailedReadFile;
-	public static String MPICH2Defaults_FailedParseInteger;
-	public static String MPICH2Defaults_MissingValue;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title;
-	public static String MPICH2JobAttributes_hostnameAttrDef_description;
-	public static String MPICH2JobAttributes_hostnameAttrDef_title;
-	public static String MPICH2JobAttributes_mappingModeAttrDef_description;
-	public static String MPICH2JobAttributes_mappingModeAttrDef_title;
-	public static String MPICH2JobAttributes_mpiJobIdAttrDef_description;
-	public static String MPICH2JobAttributes_mpiJobIdAttrDef_title;
-	public static String MPICH2JobAttributes_vpidRangeAttrDef_description;
-	public static String MPICH2JobAttributes_vpidRangeAttrDef_title;
-	public static String MPICH2JobAttributes_vpidStartAttrDef_description;
-	public static String MPICH2JobAttributes_vpidStartAttrDef_title;
-	public static String MPICH2LaunchAttributes_environmentArgsAttrDef_description;
-	public static String MPICH2LaunchAttributes_environmentArgsAttrDef_title;
-	public static String MPICH2LaunchAttributes_environmentKeyAttrDef_description;
-	public static String MPICH2LaunchAttributes_environmentKeyAttrDef_title;
-	public static String MPICH2LaunchAttributes_launchArgsAttrDef_description;
-	public static String MPICH2LaunchAttributes_launchArgsAttrDef_title;
-	public static String MPICH2MachineAttributes_statusMessageAttrDef_description;
-	public static String MPICH2MachineAttributes_statusMessageAttrDef_title;
-	public static String MPICH2NodeAttributes_maxNumNodesAttrDef_description;
-	public static String MPICH2NodeAttributes_maxNumNodesAttrDef_title;
-	public static String MPICH2NodeAttributes_numNodesAttrDef_description;
-	public static String MPICH2NodeAttributes_numNodesAttrDef_title;
-	public static String MPICH2NodeAttributes_oversubscribedAttrDef_description;
-	public static String MPICH2NodeAttributes_oversubscribedAttrDef_title;
-	public static String MPICH2NodeAttributes_statusMessageAttrDef_description;
-	public static String MPICH2NodeAttributes_statusMessageAttrDef_title;
-	public static String MPICH2Plugin_Exception_InternalError;
-
-	public static String MPICH2ResourceManagerConfiguration_defaultDescription;
-	public static String MPICH2ResourceManagerConfiguration_defaultName;
-	public static String MPICH2ResourceManagerFactory_ResourceManagerName;
-
-	public static String MPICH2DiscoverJob_defaultQueueName;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailed;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailedParseHostFile;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailedReadHostFile;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFileEmpty;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFileNotFound;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandInternalError;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandMissingHostFilePath;
-	public static String MPICH2DiscoverJob_Exception_HostFileErrors;
-	public static String MPICH2DiscoverJob_Exception_HostFileParseError;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailed;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedParse;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedParseOutput;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedWithCode;
-	public static String MPICH2DiscoverJob_Exception_IgnoredInvalidParameter;
-	public static String MPICH2DiscoverJob_Exception_InvalidMaxSlotsParameter;
-	public static String MPICH2DiscoverJob_Exception_InvalidSlotsParameter;
-	public static String MPICH2DiscoverJob_interruptedErrorMessage;
-	public static String MPICH2DiscoverJob_name;
-	public static String MPICH2DiscoverJob_parsingErrorMessage;
-	public static String MPICH2DiscoverJob_processErrorMessage;
-	
-	public static String MPICH2MonitorJob_interruptedErrorMessage;
-	public static String MPICH2MonitorJob_name;
-	public static String MPICH2MonitorJob_parsingErrorMessage;
-	public static String MPICH2MonitorJob_processErrorMessage;
-	public static String MPICH2MonitorJob_Exception_CommandFailed;
-	public static String MPICH2MonitorJob_Exception_InternalError;
-	
-	public static String MPICH2ProcessMapText12Parser_Exception_InvalidLine;
-	public static String MPICH2ProcessMapText12Parser_Exception_MissingDisplayMapInformation;
-	public static String MPICH2ProcessMapText12Parser_Exception_BrokenDisplayMapInformation;
-	
-	public static String MPICH2ProcessMapXml13Parser_Exception_AttributeNotInteger;
-	public static String MPICH2ProcessMapXml13Parser_Exception_MissingAttribute;
-	public static String MPICH2ProcessMapXml13Parser_Exception_UnknownAttribute;
-	public static String MPICH2ProcessMapXml13Parser_Exception_UnknownElement;
-	
-	public static String MPICH2RuntimeSystem_JobName;
-	public static String MPICH2RuntimeSystemJob_Exception_FailedParse;
-	public static String MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch;
-	public static String MPICH2RuntimeSystemJob_ProcessName;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties
deleted file mode 100644
index f889084..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties
+++ /dev/null

@@ -1,87 +0,0 @@
-MPICH2Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH2Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH2Defaults_MissingValue=Missing default value for {0}
-MPICH213Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH213Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH213Defaults_MissingValue=Missing default value for {0}
-MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description=Effective environment supplied by MPICH2 to executable on launch
-MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title=Environment for MPICH2 processes
-MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description=Effective command-line arguments by MPICH2 supplied to executable
-MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title=Program Arguments for MPICH2 processes
-MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description=Effective working directory where MPICH2 launched the processes
-MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title=Working Directory for MPICH2 processes
-MPICH2JobAttributes_hostnameAttrDef_description=MPICH2 job hostname
-MPICH2JobAttributes_hostnameAttrDef_title=MPICH2 hostname
-MPICH2JobAttributes_mappingModeAttrDef_description=MPICH2 mapping mode
-MPICH2JobAttributes_mappingModeAttrDef_title=MPICH2 mapping mode
-MPICH2JobAttributes_mpiJobIdAttrDef_description=MPICH2 job id
-MPICH2JobAttributes_mpiJobIdAttrDef_title=MPICH2 job id
-MPICH2JobAttributes_vpidRangeAttrDef_description=MPICH2 vpid range
-MPICH2JobAttributes_vpidRangeAttrDef_title=MPICH2 vpid range
-MPICH2JobAttributes_vpidStartAttrDef_description=MPICH2 vpid start
-MPICH2JobAttributes_vpidStartAttrDef_title=MPICH2 vpid start
-MPICH2LaunchAttributes_environmentArgsAttrDef_description=Command line arguments to set environment variables for each MPICH2 processes
-MPICH2LaunchAttributes_environmentArgsAttrDef_title=MPICH2 Environment arguments
-MPICH2LaunchAttributes_environmentKeyAttrDef_description=Name of environment variables supplied to the each MPICH2 processes
-MPICH2LaunchAttributes_environmentKeyAttrDef_title=MPICH2 environment variables
-MPICH2LaunchAttributes_launchArgsAttrDef_description=Command line arguments for MPICH2
-MPICH2LaunchAttributes_launchArgsAttrDef_title=MPICH2 arguments
-MPICH2MachineAttributes_statusMessageAttrDef_description=MPICH2 status message
-MPICH2MachineAttributes_statusMessageAttrDef_title=MPICH2 status message
-MPICH2NodeAttributes_maxNumNodesAttrDef_description=MPICH2 maximal number of nodes on the host
-MPICH2NodeAttributes_maxNumNodesAttrDef_title=MPICH2 maximal number of nodes
-MPICH2NodeAttributes_numNodesAttrDef_description=MPICH2 number of nodes on the host
-MPICH2NodeAttributes_numNodesAttrDef_title=MPICH2 number of nodes
-MPICH2NodeAttributes_oversubscribedAttrDef_description=MPICH2 oversubscribed node (more processes than available)
-MPICH2NodeAttributes_oversubscribedAttrDef_title=MPICH2 oversubscribed
-MPICH2NodeAttributes_statusMessageAttrDef_description=MPICH2 status message
-MPICH2NodeAttributes_statusMessageAttrDef_title=MPICH2 status message
-MPICH2Plugin_Exception_InternalError=Internal error
-
-MPICH2ResourceManagerConfiguration_defaultDescription=MPICH2 Resource Manager
-MPICH2ResourceManagerConfiguration_defaultName=MPICH2
-MPICH2ResourceManagerFactory_ResourceManagerName=MPICH2 (new)
-
-MPICH2DiscoverJob_defaultQueueName=default
-MPICH2DiscoverJob_Exception_DiscoverCommandFailed=Error while running discover command: {0}.
-MPICH2DiscoverJob_Exception_DiscoverCommandFailedParseHostFile=Failed to parse hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandFailedReadHostFile=Failed read hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFileEmpty=Empty hostfile is not allowed ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFileNotFound=Failed find hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute=Discover command informed a path to hostfile that is not an absolute path ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandInternalError=Internal error while running discover command: {0}
-MPICH2DiscoverJob_Exception_DiscoverCommandMissingHostFilePath=Discover command did not inform path to default hostfile. If necessary, set MCA parameters to define default hostfile path.
-MPICH2DiscoverJob_Exception_HostFileErrors=There are errors in the hostfile.
-MPICH2DiscoverJob_Exception_HostFileParseError=Parse error(s) in hostfile.
-MPICH2DiscoverJob_Exception_HostnameCommandFailed=Failed to run command to get hostname.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedParse=Failed to parse command for hostname.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedParseOutput=Failed to parse output of discover command.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedWithCode=Command to get hostname failed with exit code {0}
-MPICH2DiscoverJob_Exception_IgnoredInvalidParameter=Invalid parameter was ignored for this host.
-MPICH2DiscoverJob_Exception_InvalidMaxSlotsParameter=Invalid 'max-slots' parameter was ignored for this host.
-MPICH2DiscoverJob_Exception_InvalidSlotsParameter=Invalid 'slots/cpus/count' parameter was ignored for this host.
-MPICH2DiscoverJob_interruptedErrorMessage=Interrupted while running MPICH2 discover command.
-MPICH2DiscoverJob_name=Discover MPICH2 on {0}
-MPICH2DiscoverJob_parsingErrorMessage=Failed to parse output of MPICH2 discover command.
-MPICH2DiscoverJob_processErrorMessage=Failed to create remote process for MPICH2 discover command.
-
-MPICH2ProcessMapText12Parser_Exception_InvalidLine=Invalid output from MPICH2: {0}
-MPICH2ProcessMapText12Parser_Exception_MissingDisplayMapInformation=Output from MPICH2 has no information about processes and nodes.
-MPICH2ProcessMapText12Parser_Exception_BrokenDisplayMapInformation=Incomplete output from MPICH2.
-
-MPICH2ProcessMapXml13Parser_Exception_AttributeNotInteger=Attribute {0} is not an valid integer ({1})
-MPICH2ProcessMapXml13Parser_Exception_MissingAttribute=Missing XML attribute: {0}
-MPICH2ProcessMapXml13Parser_Exception_UnknownAttribute=Unknown XML attribute: {0}
-MPICH2ProcessMapXml13Parser_Exception_UnknownElement=Unknown XML element: {0}
-
-MPICH2RuntimeSystem_JobName=MPICH2 Job
-MPICH2RuntimeSystemJob_Exception_FailedParse=Failed to parse MPICH2 run command output.
-MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch=Hostnames from MPICH2 output do not match expected hostname.
-MPICH2RuntimeSystemJob_ProcessName=MPICH2 run
-
-MPICH2MonitorJob_interruptedErrorMessage=Interrupted while running MPICH2 monitor command.
-MPICH2MonitorJob_name=Monitor MPICH2 on {0}
-MPICH2MonitorJob_parsingErrorMessage=Failed to parse output of MPICH2 monitor command.
-MPICH2MonitorJob_processErrorMessage=Failed to create remote process for MPICH2 monitor command.
-MPICH2MonitorJob_Exception_CommandFailed=Error while running command: {0}.
-MPICH2MonitorJob_Exception_InternalError=Internal error while running command: {0}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java
deleted file mode 100644
index 367ea8f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-
-public class EffectiveMPICH2ResourceManagerConfiguration extends
-AbstractEffectiveToolRMConfiguration {
-
-	public EffectiveMPICH2ResourceManagerConfiguration(
-			AbstractToolRMConfiguration configuration) {
-		super(configuration);
-		MPICH2ResourceManagerConfiguration MPICH2configuration = (MPICH2ResourceManagerConfiguration)configuration;
-		String launchCmd = null;
-		String debugCmd = null;
-		String discoverCmd = null;
-		String periodicCmd = null;
-		int periodicTime = 0;
-		String remoteInstallPath = null;
-		if (MPICH2configuration.useToolDefaults()) {
-			Preferences preferences = MPICH2PreferenceManager.getPreferences();
-			launchCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD);
-			debugCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD);
-			discoverCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD);
-			periodicCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_CMD);
-			periodicTime = preferences.getInt(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_TIME);
-		} else {
-			launchCmd = MPICH2configuration.getLaunchCmd();
-			debugCmd = MPICH2configuration.getDebugCmd();
-			discoverCmd = MPICH2configuration.getDiscoverCmd();
-			periodicCmd = MPICH2configuration.getPeriodicMonitorCmd();
-			periodicTime = MPICH2configuration.getPeriodicMonitorTime();
-		}
-		remoteInstallPath = MPICH2configuration.getRemoteInstallPath();
-		applyValues(launchCmd, debugCmd, discoverCmd, periodicCmd, periodicTime, null, remoteInstallPath);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java
deleted file mode 100755
index 6d459e8..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.rm.core.AbstractToolsAttributes;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolResourceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem.MPICH2RuntimeSystem;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManager extends AbstractToolResourceManager {
-
-	private Integer MPICH2_RMID;
-	private MPICH2RuntimeSystem rts = null;
-
-	public MPICH2ResourceManager(Integer id, IPUniverseControl universe, IResourceManagerConfiguration config) {
-		super(id.toString(), universe, config);
-		MPICH2_RMID = id;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateRuntimeSystem()
-	 */
-	@Override
-	protected IRuntimeSystem doCreateRuntimeSystem() {
-		MPICH2ResourceManagerConfiguration config = (MPICH2ResourceManagerConfiguration) getConfiguration();
-		AttributeDefinitionManager attrDefMgr = getAttributeDefinitionManager();
-		attrDefMgr.setAttributeDefinitions(AbstractToolsAttributes.getDefaultAttributeDefinitions());
-		rts = new MPICH2RuntimeSystem(MPICH2_RMID, config, attrDefMgr);
-		return rts;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
deleted file mode 100755
index b5570af..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-/**
- *
- */
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManagerConfiguration extends
-AbstractToolRMConfiguration implements Cloneable {
-
-	public static int MPICH2_CAPABILITIES = CAP_LAUNCH | CAP_DISCOVER | CAP_PERIODIC_MONITOR | CAP_REMOTE_INSTALL_PATH;
-
-	private static final String TAG_VERSION_ID = "versionId"; //$NON-NLS-1$
-
-	/**
-	 * Static class to hold openmpi configuration information
-	 *
-	 * @author dfferber
-	 */
-	static public class MPICH2Config {
-
-		private ToolsConfig toolsConfig;
-		private String versionId;
-
-		public MPICH2Config() {
-			this(new ToolsConfig(), null);
-		}
-
-		public MPICH2Config(ToolsConfig toolsConfig, String versionId) {
-			super();
-			this.toolsConfig = toolsConfig;
-			this.versionId = versionId;
-		}
-
-		public ToolsConfig getToolsConfig() {
-			return toolsConfig;
-		}
-
-		public void setToolsConfig(ToolsConfig toolsConfig) {
-			this.toolsConfig = toolsConfig;
-		}
-
-		public String getVersionId() {
-			return versionId;
-		}
-
-		public void setVersionId(String versionId) {
-			this.versionId = versionId;
-		}
-	}
-
-	private String versionId;
-
-	public static MPICH2Config loadOpenMpiConfig(IResourceManagerFactory factory,
-			IMemento memento) {
-		ToolsConfig toolsConfig = loadTool(factory, memento);
-
-		String versionId = memento.getString(TAG_VERSION_ID);
-
-		MPICH2Config config = new MPICH2Config(toolsConfig, versionId);
-		return config;
-	}
-
-	public static MPICH2ResourceManagerConfiguration load(
-			MPICH2ResourceManagerFactory factory, IMemento memento) {
-		MPICH2Config mpich2Config = loadOpenMpiConfig(factory, memento);
-		MPICH2ResourceManagerConfiguration config = new MPICH2ResourceManagerConfiguration(factory, mpich2Config);
-		return config;
-	}
-
-	public MPICH2ResourceManagerConfiguration(MPICH2ResourceManagerFactory factory) {
-		super(MPICH2_CAPABILITIES, new ToolsConfig(), factory);
-
-		Preferences prefs = MPICH2PreferenceManager.getPreferences();
-		setLaunchCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD));
-		setDebugCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD));
-		setDiscoverCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD));
-		setPeriodicMonitorCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_CMD));
-		setPeriodicMonitorTime(prefs.getInt(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_TIME));
-		setRemoteInstallPath(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_REMOTE_INSTALL_PATH));
-		//		setUseToolDefaults(prefs.getBoolean(MPICH213PreferenceManager.PREFIX + MPICH213PreferenceManager.PREFS_USE_DEFAULTS));
-	}
-
-	public MPICH2ResourceManagerConfiguration(MPICH2ResourceManagerFactory factory,
-			MPICH2Config config) {
-		super(MPICH2_CAPABILITIES, config.getToolsConfig(), factory);
-	}
-
-	@Override
-	public Object clone() {
-		CommonConfig commonConf = new CommonConfig(getName(),
-				getDescription(), getUniqueName());
-		RemoteConfig remoteConf = new RemoteConfig(commonConf,
-				getRemoteServicesId(), getConnectionName(),
-				getProxyServerPath(), getLocalAddress(),
-				getInvocationOptionsStr(), getOptions());
-		ToolsConfig toolsConfig = new ToolsConfig(
-				remoteConf,
-				getLaunchCmd(),
-				getDebugCmd(),
-				getDiscoverCmd(),
-				getPeriodicMonitorCmd(),
-				getPeriodicMonitorTime(),
-				getContinuousMonitorCmd(),
-				getRemoteInstallPath(),
-				useToolDefaults());
-		MPICH2Config openMpiConfig = new MPICH2Config(toolsConfig, getVersionId());
-
-		return new MPICH2ResourceManagerConfiguration(
-				(MPICH2ResourceManagerFactory) getFactory(), openMpiConfig);
-	}
-
-	@Override
-	public void save(IMemento memento) {
-		super.save(memento);
-		memento.putString(TAG_VERSION_ID, versionId);
-	}
-
-	@Override
-	public void setDefaultNameAndDesc() {
-		String name = Messages.MPICH2ResourceManagerConfiguration_defaultName;
-		String conn = getConnectionName();
-		if (conn != null && !conn.equals(EMPTY_STRING)) {
-			name += "@" + conn; //$NON-NLS-1$
-		}
-		setName(name);
-		setDescription(Messages.MPICH2ResourceManagerConfiguration_defaultDescription);
-	}
-
-	public String getVersionId() {
-		return versionId;
-	}
-
-	public void setVersionId(String versionId) {
-		this.versionId = versionId;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java
deleted file mode 100755
index a37b95b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManagerFactory extends AbstractResourceManagerFactory {
-
-	public MPICH2ResourceManagerFactory() {
-		// QUESTION: Wouldnt it be better to take name from extension point?
-		// Extension point already has a name.
-		super(Messages.MPICH2ResourceManagerFactory_ResourceManagerName);
-	}
-
-	protected MPICH2ResourceManagerFactory(String name) {
-		super(name);
-	}
-
-	public IResourceManagerConfiguration copyConfiguration(
-			IResourceManagerConfiguration configuration) {
-		return (IResourceManagerConfiguration)configuration.clone();
-	}
-
-	@Override
-	public IResourceManagerControl create(IResourceManagerConfiguration confIn) {
-		MPICH2ResourceManagerConfiguration configuration = (MPICH2ResourceManagerConfiguration) confIn;
-		PTPCorePlugin plugin = PTPCorePlugin.getDefault();
-		IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
-		return new MPICH2ResourceManager(universe.getNextResourceManagerId(), universe, configuration);
-	}
-
-	public IResourceManagerConfiguration createConfiguration() {
-		MPICH2ResourceManagerConfiguration conf = new MPICH2ResourceManagerConfiguration(this);
-
-		return conf;
-	}
-
-	public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
-		return MPICH2ResourceManagerConfiguration.load(this, memento);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java
deleted file mode 100644
index 6e7c409..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteCommandJob;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2MachineAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2NodeAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2DiscoverJob extends AbstractRemoteCommandJob {
-	MPICH2RuntimeSystem rts;
-
-	public MPICH2DiscoverJob(MPICH2RuntimeSystem rts) {
-		super(rts,
-				NLS.bind(Messages.MPICH2DiscoverJob_name, rts.getRmConfiguration().getName()),
-				rts.retrieveEffectiveToolRmConfiguration().getDiscoverCmd(),
-				Messages.MPICH2DiscoverJob_interruptedErrorMessage,
-				Messages.MPICH2DiscoverJob_processErrorMessage,
-				Messages.MPICH2DiscoverJob_parsingErrorMessage);
-		this.rts = rts;
-	}
-
-	@Override
-	protected void parse(BufferedReader output) throws CoreException {
-		/*
-		 * MPI resource manager have only one machine and one queue.
-		 * There they are implicitly "discovered".
-		 */
-		IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rts.getRmID());
-		String machineID = rts.createMachine(rm.getName());
-		rts.setMachineID(machineID);
-		String queueID = rts.createQueue(Messages.MPICH2DiscoverJob_defaultQueueName);
-		rts.setQueueID(queueID);
-
-		IPMachine machine = rm.getMachineById(machineID);
-		assert machine != null;
-
-		/*
-		 * Any exception from now on is caught in order to add the error message as an attribute to the machine.
-		 * Then, the exception is re-thrown.
-		 */
-		try {
-			/*
-			 * Parse output of trace command that describes the system configuration.
-			 */
-			MPICH2TraceParser parser = new MPICH2TraceParser();
-			MPICH2HostMap hostMap = parser.parse(output);
-			if (hostMap == null) {
-				machine.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				machine.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(Messages.MPICH2DiscoverJob_Exception_HostFileParseError));
-				throw new CoreException(new Status(IStatus.ERROR, MPICH2Plugin.getDefault().getBundle().getSymbolicName(), parser.getErrorMessage()));
-			}
-
-			/*
-			 * Create model according to data from discover.
-			 */
-			int nodeCounter = 0;
-
-			for (MPICH2HostMap.Host host : hostMap.getHosts()) {
-
-				// Add node to model
-				String nodeId = rts.createNode(machineID, host.getName(), nodeCounter++);
-
-				// Add processor information to node.
-				AttributeManager attrManager = new AttributeManager();
-				if (host.getNumProcessors() != 0) {
-					try {
-						attrManager.addAttribute(MPICH2NodeAttributes.getNumberOfNodesAttributeDefinition().create(host.getNumProcessors()));
-					} catch (IllegalValueException e) {
-						// This situation is not possible since host.getNumProcessors() is always valid.
-						assert false;
-					}
-				}
-				rts.changeNode(nodeId, attrManager);
-				rts.setNodeIDForName(host.getName(), nodeId);
-			}
-		} catch (CoreException e) {
-			/*
-			 * Show message of core exception and change machine status to error.
-			 */
-			if (e.getStatus().getSeverity() == IStatus.ERROR) {
-				AttributeManager attrManager = new AttributeManager();
-				attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2DiscoverJob_Exception_DiscoverCommandFailed, e.getMessage())));
-				rts.changeMachine(machineID, attrManager);
-			}
-			throw e;
-		} catch (Exception e) {
-			/*
-			 * Show message of all other exceptions and change machine status to error.
-			 */
-			AttributeManager attrManager = new AttributeManager();
-			attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-			attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2DiscoverJob_Exception_DiscoverCommandInternalError, e.getMessage())));
-			rts.changeMachine(machineID, attrManager);
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java
deleted file mode 100644
index 554d64c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2HostMap {
-	public static class Host {
-		public final static int NO_ERRORS = 0;
-		public final static int ERR_NUM_SLOTS = 1 << 1;
-		public final static int ERR_MAX_NUM_SLOTS = 1 << 2;
-		public final static int ERR_UNKNOWN_ATTR = 1 << 3;
-
-		private String name = null;
-		private String addr = null;
-		private String port = null;
-		private int numProcessors = 0;
-		private int maxNumProcessors = 0;
-		private int errors = NO_ERRORS;
-
-		public Host(String hostname, String address, String port) {
-			this.name = hostname;
-			this.addr = address;
-			this.port = port;
-		}
-
-		public int getNumProcessors() {
-			return numProcessors;
-		}
-
-		public int getMaxNumProcessors() {
-			return maxNumProcessors;
-		}
-
-		public String getName() {
-			return name;
-		}
-		
-		public String getAddress() {
-			return addr;
-		}
-
-		public String getPort() {
-			return port;
-		}
-
-		public int getErrors() {
-			return errors;
-		}
-
-		public void setNumProcessors(int numProcessors) {
-			this.numProcessors = numProcessors;
-		}
-
-		public void setMaxNumProcessors(int maxNumProcessors) {
-			this.maxNumProcessors = maxNumProcessors;
-		}
-
-		public void addErrors(int errors) {
-			this.errors |= errors;
-		}
-	}
-
-	List<Host> hosts = new ArrayList<Host>();
-	Map<String, Host> hostNameToHost = new HashMap<String, Host>();
-	public boolean hasErrors = false;
-
-	protected void addHost(Host host) {
-		hosts.add(host);
-		hostNameToHost.put(host.getName(), host);
-	}
-
-	public Host[] getHosts() {
-		return hosts.toArray(new Host[hosts.size()]);
-	}
-
-	public Iterator<Host> getHostIterator() {
-		return hosts.listIterator();
-	}
-
-	public Host getHostByName(String name) {
-		return hostNameToHost.get(name);
-	}
-
-	public void addHost(String name, String address, String port) {
-		MPICH2HostMap.Host host = new MPICH2HostMap.Host(name, address, port);
-		addHost(host);
-	}
-
-	public int count() {
-		return hosts.size();
-	}
-
-	public boolean hasParseErrors() {
-		return hasErrors;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java
deleted file mode 100644
index 642fd76..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2JobMap {
-
-	/**
-	 * An MPICH2 job.
-	 */
-	public class Job {
-		private static final int JOBID = 1 << 0;
-		private static final int JOBALIAS = 1 << 1;
-		private static final int USERNAME = 1 << 2;
-		private static final int HOST = 1 << 3;
-		private static final int PID = 1 << 4;
-		private static final int SID = 1 << 5;
-		private static final int RANK = 1 << 6;
-		private static final int PGM = 1 << 7;
-		
-		private String jobID = null;
-		private String jobAlias = null;
-		private String username = null;
-		private String host = null;
-		private int pid = 0;
-		private int sid = 0;
-		private int rank = 0;
-		private String pgm = null;
-		private int complete;
-
-		public Job() {
-			this.complete = 0;
-		}
-		
-		/**
-		 * @return the host
-		 */
-		public String getHost() {
-			return host;
-		}
-		
-		/**
-		 * @return the jobID
-		 */
-		public String getJobID() {
-			return jobID;
-		}
-		
-		/**
-		 * @return the jobAlias
-		 */
-		public String getJobAlias() {
-			return jobAlias;
-		}
-		
-		/**
-		 * @return the pgm
-		 */
-		public String getPgm() {
-			return pgm;
-		}
-		
-		/**
-		 * @return the pid
-		 */
-		public int getPid() {
-			return pid;
-		}
-		
-		/**
-		 * @return the rank
-		 */
-		public int getRank() {
-			return rank;
-		}
-		
-		/**
-		 * @return the sid
-		 */
-		public int getSid() {
-			return sid;
-		}
-
-		/**
-		 * @return the username
-		 */
-		public String getUsername() {
-			return username;
-		}
-		
-		/**
-		 * @return the complete
-		 */
-		public boolean isComplete() {
-			return complete == (JOBID | JOBALIAS | USERNAME | HOST | PID | SID | RANK | PGM);
-		}
-		
-		/**
-		 * @param host the host to set
-		 */
-		public void setHost(String host) {
-			this.host = host;
-			this.complete |= HOST;
-		}
-		
-		/**
-		 * @param jobID the jobID to set
-		 */
-		public void setJobID(String jobID) {
-			this.jobID = jobID;
-			this.complete |= JOBID;
-		}
-		
-		/**
-		 * @param jobAlias the jobAlias to set
-		 */
-		public void setJobAlias(String jobAlias) {
-			this.jobAlias = jobAlias;
-			this.complete |= JOBALIAS;
-		}
-
-		/**
-		 * @param pgm the pgm to set
-		 */
-		public void setPgm(String pgm) {
-			this.pgm = pgm;
-			this.complete |= PGM;
-		}
-		
-		/**
-		 * @param pid the pid to set
-		 */
-		public void setPid(int pid) {
-			this.pid = pid;
-			this.complete |= PID;
-		}
-		
-		/**
-		 * @param rank the rank to set
-		 */
-		public void setRank(int rank) {
-			this.rank = rank;
-			this.complete |= RANK;
-		}
-		
-		/**
-		 * @param sid the sid to set
-		 */
-		public void setSid(int sid) {
-			this.sid = sid;
-			this.complete |= SID;
-		}
-		/**
-		 * @param username the username to set
-		 */
-		public void setUsername(String username) {
-			this.username = username;
-			this.complete |= USERNAME;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		@Override
-		public String toString() {
-			String str = "Job "; //$NON-NLS-1$
-			if (!isComplete()) {
-				str += "(incomplete) ["; //$NON-NLS-1$
-			} else {
-				str += "]"; //$NON-NLS-1$
-			}
-			if ((complete & JOBID) == JOBID) {
-				str += " id: " + jobID; //$NON-NLS-1$
-			}
-			if ((complete & JOBALIAS) == JOBALIAS) {
-				str += " alias: " + jobAlias; //$NON-NLS-1$
-			}
-			if ((complete & USERNAME) == USERNAME) {
-				str += " username:" + username; //$NON-NLS-1$
-			}
-			if ((complete & HOST) == HOST) {
-				str += " host:" + host; //$NON-NLS-1$
-			}
-			if ((complete & PID) == PID) {
-				str += " pid:" + pid; //$NON-NLS-1$
-			}
-			if ((complete & SID) == SID) {
-				str += " sid:" + sid; //$NON-NLS-1$
-			}
-			if ((complete & RANK) == RANK) {
-				str += " rank:" + rank; //$NON-NLS-1$
-			}
-			if ((complete & PGM) == PGM) {
-				str += " pgm:" + pgm; //$NON-NLS-1$
-			}
-			return str + "]"; //$NON-NLS-1$
-		}
-
-	}
-
-	private final Map<String, List<Job>> jobsByID = new HashMap<String, List<Job>>();
-	public boolean hasErrors = false;
-
-	public MPICH2JobMap() {
-		// Nothing.
-	}
-
-	public void addJob(Job job) {
-		List<Job> jobs = jobsByID.get(job.getJobID());
-		if (jobs == null) {
-			jobs = new ArrayList<Job>();
-			jobsByID.put(job.getJobID(), jobs);			
-		}
-		jobs.add(job);
-	}
-	
-	public List<Job> getJob(String jobID) {
-		return jobsByID.get(jobID);
-	}
-
-	public Collection<List<Job>> getJobs() {
-		return jobsByID.values();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java
deleted file mode 100644
index db25f92..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java
+++ /dev/null

@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2ListJobsParser {
-	public enum JobListState {JOBLIST_INIT, JOBLIST_START, JOBLIST_END, JOBLIST_COMPLETE, JOBLIST_ERROR}
-	
-	private JobListState state;
-	private MPICH2JobMap map = new MPICH2JobMap();
-	private String errorMsg;
-	
-	/**
-	 * @param parser
-	 * @param line
-	 * @param job
-	 */
-	private void processJobInfo(String line, MPICH2JobMap.Job job) {
-		String[] parts = line.split("="); //$NON-NLS-1$
-		String key;
-		String value;
-
-		if (parts.length == 1) {
-			key = parts[0].trim();
-			value = ""; //$NON-NLS-1$
-		} else if (parts.length == 2) {
-			key = parts[0].trim();
-			value = parts[1].trim();
-		} else {
-			state = JobListState.JOBLIST_ERROR;
-			errorMsg = line;
-			return;
-		}
-		
-		if ("jobid".equals(key)) { //$NON-NLS-1$
-			job.setJobID(value);
-		} else if ("jobalias".equals(key)) { //$NON-NLS-1$
-			job.setJobAlias(value);
-		} else if ("username".equals(key)) { //$NON-NLS-1$
-			job.setUsername(value);
-		} else if ("host".equals(key)) { //$NON-NLS-1$
-			job.setHost(value);
-		} else if ("pid".equals(key)) { //$NON-NLS-1$
-			job.setPid(Integer.parseInt(value));
-		} else if ("sid".equals(key)) { //$NON-NLS-1$
-			job.setSid(Integer.parseInt(value));
-		} else if ("rank".equals(key)) { //$NON-NLS-1$
-			job.setRank(Integer.parseInt(value));
-		} else if ("pgm".equals(key)) { //$NON-NLS-1$
-			job.setPgm(value);
-		} else {
-			state = JobListState.JOBLIST_ERROR;
-			errorMsg = line;
-			return;
-		}
-		
-		if (job.isComplete()) {
-			state = JobListState.JOBLIST_END;
-		}
-	}
-	
-	/**
-	 * @param reader
-	 * @return
-	 * @throws IOException
-	 */
-	public MPICH2JobMap parse(BufferedReader reader) throws IOException {
-		String line = null;
-		MPICH2JobMap.Job job = null;
-
-		state = JobListState.JOBLIST_INIT;
-		
-		while (state != JobListState.JOBLIST_COMPLETE) {
-			switch (state) {
-			case JOBLIST_INIT:
-				if ((line = reader.readLine()) == null) {
-					state = JobListState.JOBLIST_COMPLETE;
-					break;
-				}
-				
-				line = line.trim();
-
-				if (line.length() == 0) {
-					// Ignore empty line
-					break;
-				}
-
-				state = JobListState.JOBLIST_START;
-
-				job = map.new Job();
-				processJobInfo(line, job);
-				break;
-			
-			case JOBLIST_START:
-				if ((line = reader.readLine()) == null) {
-					state = JobListState.JOBLIST_END;
-					break;
-				}
-				
-				line = line.trim();
-
-				if (line.length() == 0) {
-					state = JobListState.JOBLIST_END;
-					break;
-				}
-				
-				processJobInfo(line, job);
-				break;
-				
-			case JOBLIST_END:
-				if (job != null) {
-					if (job.isComplete()) {
-						map.addJob(job);
-					} else {
-						DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "job is incomplete, skipping" + job.toString()); //$NON-NLS-1$
-					}
-				}
-				
-				if (line == null) {
-					state = JobListState.JOBLIST_COMPLETE;
-				} else {
-					state = JobListState.JOBLIST_INIT;
-				}
-				DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "found job " + job.toString()); //$NON-NLS-1$
-				break;
-				
-			case JOBLIST_COMPLETE:
-				break;
-				
-			case JOBLIST_ERROR:
-				while ((line = reader.readLine()) != null) {
-					errorMsg += "\n" + line; //$NON-NLS-1$
-				}
-				return null;
-			}
-		}
-		
-		return map;
-	}
-	
-	/**
-	 * @return
-	 */
-	public String getErrorMessage() {
-		return errorMsg;
-	}
-}
-

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
deleted file mode 100644
index e63278c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteCommandJob;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2MachineAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2PeriodicJob extends AbstractRemoteCommandJob {
-	MPICH2RuntimeSystem rts;
-
-	public MPICH2PeriodicJob(MPICH2RuntimeSystem rts) {
-		super(rts,
-				NLS.bind(Messages.MPICH2MonitorJob_name, rts.getRmConfiguration().getName()),
-				rts.retrieveEffectiveToolRmConfiguration().getPeriodicMonitorCmd(),
-				Messages.MPICH2MonitorJob_interruptedErrorMessage,
-				Messages.MPICH2MonitorJob_processErrorMessage,
-				Messages.MPICH2MonitorJob_parsingErrorMessage,
-				rts.retrieveEffectiveToolRmConfiguration().getPeriodicMonitorTime());
-		this.rts = rts;
-	}
-
-	@Override
-	protected void parse(BufferedReader output) throws CoreException {
-		/*
-		 * MPI resource manager have only one machine and one queue.
-		 * There they are implicitly "discovered".
-		 */
-		IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rts.getRmID());
-		IPMachine machine = rm.getMachineById(rts.getMachineID());
-		IPQueue queue = rm.getQueueById(rts.getQueueID());
-		
-		/*
-		 * We may be called before the model has been set up properly. Do nothing
-		 * if this is the case.
-		 */
-		if (machine == null || queue == null) {
-			return;
-		}
-
-		/*
-		 * Any exception from now on is caught in order to add the error message as an attribute to the machine.
-		 * Then, the exception is re-thrown.
-		 */
-		try {
-			/*
-			 * Parse output of mpdlistjobs command.
-			 */
-			MPICH2ListJobsParser parser = new MPICH2ListJobsParser();
-			MPICH2JobMap jobMap = parser.parse(output);
-			if (jobMap == null) {
-				throw new CoreException(new Status(IStatus.ERROR, MPICH2Plugin.getDefault().getBundle().getSymbolicName(), parser.getErrorMessage()));
-			}
-
-			/*
-			 * Update model according to data. First create any new jobs.
-			 */
-			for (List<MPICH2JobMap.Job> jobs : jobMap.getJobs()) {
-				for (MPICH2JobMap.Job job : jobs) {
-					IPJob pJob = queue.getJobById(job.getJobAlias());
-					if (pJob == null) {
-						// Not one of our jobs
-						continue;
-					}
-					IPProcessControl process = (IPProcessControl)pJob.getProcessByIndex(job.getRank());
-					if (process != null) {
-						// process already exists, don't need to do anything
-						continue;
-					}
-					String nodeID = rts.getNodeIDforName(job.getHost());
-					if (nodeID == null) {
-						throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch, null));
-					}
-	
-					String processName = Integer.toString(job.getRank());
-					String processID = rts.createProcess(job.getJobAlias(), processName, job.getRank());
-					process = (IPProcessControl)pJob.getProcessById(processID);
-	
-					IPNode node = machine.getNodeById(nodeID);
-	
-					/*
-					 * Although one could call processControl.addNode(node) to assign the process to the node, this does not work.
-					 * It is necessary to call nodeControl.addProcesses(processControl) instead.
-					 */
-					IPNodeControl nodeControl = (IPNodeControl) node;
-					nodeControl.addProcesses(Arrays.asList(new IPProcessControl[] {process}));
-
-					process.setState(ProcessAttributes.State.RUNNING);
-				}
-			}
-		} catch (CoreException e) {
-			/*
-			 * Show message of core exception and change machine status to error.
-			 */
-			if (e.getStatus().getSeverity() == IStatus.ERROR) {
-				AttributeManager attrManager = new AttributeManager();
-				attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2MonitorJob_Exception_CommandFailed, e.getMessage())));
-				rts.changeMachine(machine.getID(), attrManager);
-			}
-			throw e;
-		} catch (Exception e) {
-			/*
-			 * Show message of all other exceptions and change machine status to error.
-			 */
-			AttributeManager attrManager = new AttributeManager();
-			attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-			attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2MonitorJob_Exception_InternalError, e.getMessage())));
-			rts.changeMachine(machine.getID(), attrManager);
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
deleted file mode 100644
index b9316dc..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.EffectiveMPICH2ResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerConfiguration;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RuntimeSystem extends AbstractToolRuntimeSystem {
-
-	/** The machine where open mpi is running on. */
-	private String machineID;
-	/** The queue that dispatches jobs to mpi. */
-	private String queueID;
-	/** Mapping of discovered hosts and their ID for IPNode elements. */
-	private Map<String,String> nodeNameToIDMap = new HashMap<String, String>();
-
-	public MPICH2RuntimeSystem(Integer rmid,
-			MPICH2ResourceManagerConfiguration config,
-			AttributeDefinitionManager attrDefMgr) {
-		super(rmid, config, attrDefMgr);
-	}
-
-	protected void setMachineID(String machineID) {
-		this.machineID = machineID;
-	}
-
-	protected void setQueueID(String queueID) {
-		this.queueID = queueID;
-	}
-
-	public String getMachineID() {
-		return machineID;
-	}
-
-	public String getQueueID() {
-		return queueID;
-	}
-
-	public String getNodeIDforName(String hostname) {
-		return nodeNameToIDMap.get(hostname);
-	}
-
-	public void setNodeIDForName(String hostname, String nodeID) {
-		nodeNameToIDMap.put(hostname, nodeID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doShutdown(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	protected void doShutdown(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartEvents()
-	 */
-	@Override
-	protected void doStartEvents() throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartup(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	protected void doStartup(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStopEvents()
-	 */
-	@Override
-	protected void doStopEvents() throws CoreException {
-		// Nothing to do
-	}
-
-	@Override
-	protected Job createDiscoverJob() {
-		if (!rmConfiguration.hasDiscoverCmd()) {
-			return null;
-		}
-		Job job = new MPICH2DiscoverJob(this);
-		job.setPriority(Job.INTERACTIVE);
-		job.setSystem(false);
-		job.setUser(false);
-		return job;
-	}
-
-	@Override
-	protected Job createPeriodicMonitorJob() {
-		if (!rmConfiguration.hasPeriodicMonitorCmd()) {
-			return null;
-		}
-		Job job = new MPICH2PeriodicJob(this);
-		job.setPriority(Job.INTERACTIVE);
-		job.setSystem(false);
-		job.setUser(false);
-		return job;
-	}
-
-	@Override
-	protected Job createContinuousMonitorJob() {
-		return null;
-	}
-
-	@Override
-	public Job createRuntimeSystemJob(String jobID, String queueID, AttributeManager attrMgr) {
-		return new MPICH2RuntimeSystemJob(jobID, queueID, Messages.MPICH2RuntimeSystem_JobName, this, attrMgr);
-	}
-
-
-	@Override
-	public AbstractEffectiveToolRMConfiguration retrieveEffectiveToolRmConfiguration() {
-		return new EffectiveMPICH2ResourceManagerConfiguration(getRmConfiguration());
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
deleted file mode 100644
index e56a8d7..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
+++ /dev/null

@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.IProcessListener;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystemJob;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.rm.core.utils.InputStreamListenerToOutputStream;
-import org.eclipse.ptp.rm.core.utils.InputStreamObserver;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2JobAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2LaunchAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-
-/**
- * 
- * @author Daniel Felix Ferber
- * @author Greg Watson
- *
- */
-public class MPICH2RuntimeSystemJob extends AbstractToolRuntimeSystemJob {
-	
-	private Object lock1 = new Object();
-	private InputStreamObserver stderrObserver;
-	private InputStreamObserver stdoutObserver;
-
-	protected final ReentrantLock procsLock = new ReentrantLock();
-	protected final Condition procsCondition = procsLock.newCondition();
-	protected int numRunningProcs = 0;
-
-	protected IProcessListener processListener = new IProcessListener() {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IProcessListener#handleEvent(org.eclipse.ptp.core.elements.events.IProcessChangeEvent)
-		 */
-		public void handleEvent(IProcessChangeEvent e) {
-			if (e.getAttributes().getAttribute(ProcessAttributes.getStateAttributeDefinition()) != null
-					&& e.getSource().getState() == ProcessAttributes.State.RUNNING) {
-				procsLock.lock();
-				try {
-					numRunningProcs++;
-					procsCondition.signalAll();
-				} finally {
-					procsLock.unlock();
-				}
-			}
-		}
-	};
-	
-	protected IJobChildListener jobChildListener = new IJobChildListener() {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedProcessEvent)
-		 */
-		public void handleEvent(IChangedProcessEvent e) {
-			// ignore
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewProcessEvent)
-		 */
-		public void handleEvent(INewProcessEvent e) {
-			for (IPProcess process : e.getProcesses()) {
-				process.addElementListener(processListener);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveProcessEvent)
-		 */
-		public void handleEvent(IRemoveProcessEvent e) {
-			for (IPProcess process : e.getProcesses()) {
-				process.removeElementListener(processListener);
-			}
-		}
-	};
-	
-	public MPICH2RuntimeSystemJob(String jobID, String queueID, String name, AbstractToolRuntimeSystem rtSystem, AttributeManager attrMgr) {
-		super(jobID, queueID, name, rtSystem, attrMgr);
-	}
-
-	private void changeAllProcessesStatus(State newState) {
-		final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-
-		/*
-		 * Mark all running and starting processes as finished.
-		 */
-		List<String> ids = new ArrayList<String>();
-		for (IPProcess ipProcess : ipJob.getProcesses()) {
-			switch (ipProcess.getState()) {
-			case EXITED:
-			case ERROR:
-			case EXITED_SIGNALLED:
-				break;
-			case RUNNING:
-			case STARTING:
-			case SUSPENDED:
-			case UNKNOWN:
-				ids.add(ipProcess.getID());
-				break;
-			}
-		}
-
-		AttributeManager attrMrg = new AttributeManager();
-		attrMrg.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(newState));
-		for (String processId : ids) {
-			rtSystem.changeProcess(processId, attrMrg);
-		}
-	}
-
-	@Override
-	protected void doBeforeExecution(IProgressMonitor monitor) throws CoreException {
-		final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-		ipJob.addChildListener(jobChildListener);
-	}
-
-	@Override
-	protected void doExecutionCleanUp(IProgressMonitor monitor) {
-		if (process != null) {
-			process.destroy();
-		}
-		if (stderrObserver != null) {
-			stderrObserver.kill();
-			stderrObserver = null;
-		}
-		if (stdoutObserver != null) {
-			stdoutObserver.kill();
-			stdoutObserver = null;
-		}
-		// TODO: more cleanup?
-		changeAllProcessesStatus(ProcessAttributes.State.EXITED);
-	}
-
-	@Override
-	protected void doExecutionFinished(IProgressMonitor monitor) throws CoreException {
-		changeAllProcessesStatus(ProcessAttributes.State.EXITED);
-	}
-
-	@Override
-	protected void doExecutionStarted(IProgressMonitor monitor) throws CoreException {
-		final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-
-		/*
-		 * Listener that saves stdout.
-		 */
-		final PipedOutputStream stdoutOutputStream = new PipedOutputStream();
-		final PipedInputStream stdoutInputStream = new PipedInputStream();
-		try {
-			stdoutInputStream.connect(stdoutOutputStream);
-		} catch (IOException e) {
-			assert false; // This exception is not possible
-		}
-		final InputStreamListenerToOutputStream stdoutPipedStreamListener = new InputStreamListenerToOutputStream(stdoutOutputStream);
-
-		Thread stdoutThread = new Thread() {
-			@Override
-			public void run() {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: started", getJobID()); //$NON-NLS-1$
-				BufferedReader stdoutBufferedReader = new BufferedReader(new InputStreamReader(stdoutInputStream));
-				try {
-					String line = stdoutBufferedReader.readLine();
-					while (line != null) {
-						int index = 0;
-						int pos = line.indexOf(": "); //$NON-NLS-1$
-						if (pos > 0) {
-							try {
-								index = Integer.parseInt(line.substring(0, pos));
-								line = line.substring(pos+1);
-							} catch (NumberFormatException e) {
-								// ignore
-							}
-						}
-						synchronized (lock1) {
-							IPProcess ipProc = ipJob.getProcessByIndex(index);
-							if (ipProc != null) {
-								ipProc.addAttribute(ProcessAttributes.getStdoutAttributeDefinition().create(line));
-							}
-							DebugUtil.trace(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", jobID, line); //$NON-NLS-1$
-						}
-						line = stdoutBufferedReader.readLine();
-					}
-				} catch (IOException e) {
-					DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: {0}", e); //$NON-NLS-1$
-					MPICH2Plugin.log(e);
-				} finally {
-					stdoutPipedStreamListener.disable();
-				}
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: finished", jobID); //$NON-NLS-1$
-			}
-		};
-
-		/*
-		 * Listener that saves stderr.
-		 */
-		final PipedOutputStream stderrOutputStream = new PipedOutputStream();
-		final PipedInputStream stderrInputStream = new PipedInputStream();
-		try {
-			stderrInputStream.connect(stderrOutputStream);
-		} catch (IOException e) {
-			assert false; // This exception is not possible
-		}
-		final InputStreamListenerToOutputStream stderrPipedStreamListener = new InputStreamListenerToOutputStream(stderrOutputStream);
-		Thread stderrThread = new Thread() {
-			@Override
-			public void run() {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: started", getJobID()); //$NON-NLS-1$
-				final BufferedReader stderrBufferedReader = new BufferedReader(new InputStreamReader(stderrInputStream));
-				try {
-					String line = stderrBufferedReader.readLine();
-					while (line != null) {
-						int index = 0;
-						int pos = line.indexOf(": "); //$NON-NLS-1$
-						if (pos > 0) {
-							try {
-								index = Integer.parseInt(line.substring(0, pos));
-								line = line.substring(pos+1);
-							} catch (NumberFormatException e) {
-								// ignore
-							}
-						}
-						synchronized (lock1) {
-							IPProcess ipProc = ipJob.getProcessByIndex(index);
-							if (ipProc != null) {
-								ipProc.addAttribute(ProcessAttributes.getStderrAttributeDefinition().create(line));
-							}
-							DebugUtil.error(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", getJobID(), line); //$NON-NLS-1$
-						}
-						line = stderrBufferedReader.readLine();
-					}
-				} catch (IOException e) {
-					DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: {1}", getJobID(), e); //$NON-NLS-1$
-					MPICH2Plugin.log(e);
-				} finally {
-					stderrPipedStreamListener.disable();
-				}
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: finished", getJobID()); //$NON-NLS-1$
-			}
-		};
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: starting all threads", getJobID()); //$NON-NLS-1$
-		/*
-		 * Create and start listeners.
-		 */
-		stdoutThread.start();
-		stderrThread.start();
-
-		stderrObserver = new InputStreamObserver(process.getErrorStream());
-		stdoutObserver = new InputStreamObserver(process.getInputStream());
-
-		stdoutObserver.addListener(stdoutPipedStreamListener);
-		stderrObserver.addListener(stderrPipedStreamListener);
-
-		stderrObserver.start();
-		stdoutObserver.start();
-		
-		/*
-		 * At this point we need to pause until all processes have started. This is because
-		 * the model semantics are such that the job state must not be set to RUNNING until
-		 * all the job's processes (if there are any) have been created and also set to RUNNING.
-		 */
-		
-		/*
-		 * We know that a MPICH2 job has a number of processes attribute
-		 */
-		int numProcs = 1;
-		IntegerAttribute numProcsAttr = attrMgr.getAttribute(JobAttributes.getNumberOfProcessesAttributeDefinition());
-		if (numProcsAttr != null) {
-			numProcs = numProcsAttr.getValue().intValue();
-		}
-		
-		procsLock.lock();
-		try {
-			while (!monitor.isCanceled() && numRunningProcs < numProcs) {
-				try {
-					procsCondition.await(500, TimeUnit.MILLISECONDS);
-				} catch (InterruptedException e) {
-					// ignore
-				}
-			}
-		} finally {
-			procsLock.unlock();
-		}
-	}
-
-	@Override
-	protected void doPrepareExecution(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolBaseSubstitutionAttributes() throws CoreException {
-		// TODO make macros available for environment variables and work directory.
-		return null;
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolCommandSubstitutionAttributes(
-			AttributeManager baseSubstitutionAttributeManager,
-			String directory, Map<String, String> environment) {
-
-		List<IAttribute<?, ?, ?>> newAttributes = new ArrayList<IAttribute<?,?,?>>();
-
-		/*
-		 * An MPICH2 specific attribute.
-		 * Attribute that contains a list of names of environment variables.
-		 */
-		int p = 0;
-		String keys[] = new String[environment.size()];
-		for (String key : environment.keySet()) {
-			keys[p++] = key;
-		}
-		newAttributes.add(MPICH2LaunchAttributes.getEnvironmentKeysAttributeDefinition().create(keys));
-
-		/*
-		 * An MPICH2 specific attribute.
-		 * A shortcut that generates arguments for the MPICH2 run command.
-		 */
-		newAttributes.add(MPICH2LaunchAttributes.getEnvironmentArgsAttributeDefinition().create());
-		
-		/*
-		 * The jobid is used to alias the MPICH2 job so that it can be matched later.
-		 */
-		newAttributes.add(MPICH2JobAttributes.getJobIdAttributeDefinition().create(jobID));
-		
-		return newAttributes.toArray(new IAttribute<?, ?, ?>[newAttributes.size()]);
-	}
-
-	@Override
-	protected HashMap<String, String> doRetrieveToolEnvironment()
-	throws CoreException {
-		// No extra environment variables needs to be set for MPICH2.
-		return null;
-	}
-
-	@Override
-	protected void doTerminateJob() {
-		// Empty implementation.
-	}
-
-	@Override
-	protected void doWaitExecution(IProgressMonitor monitor) throws CoreException {
-		/*
-		 * Wait until both stdout and stderr stop because stream are closed.
-		 * This means that the process has finished.
-		 */
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stderr thread to finish", jobID); //$NON-NLS-1$
-		try {
-			stderrObserver.join();
-		} catch (InterruptedException e1) {
-			// Ignore
-		}
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stdout thread to finish", jobID); //$NON-NLS-1$
-		try {
-			stdoutObserver.join();
-		} catch (InterruptedException e1) {
-			// Ignore
-		}
-
-		/*
-		 * Still experience has shown that remote process might not have yet terminated, although stdout and stderr is closed.
-		 */
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting mpi process to finish completely", jobID); //$NON-NLS-1$
-		try {
-			process.waitFor();
-		} catch (InterruptedException e) {
-			// Ignore
-		}
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: completely finished", jobID); //$NON-NLS-1$
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java
deleted file mode 100644
index f0433c0..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2TraceParser {
-	private String errorMessage = null;
-	private MPICH2HostMap map = new MPICH2HostMap();
-	private static Pattern pattern = Pattern.compile("([^_]+)_([0-9])+ \\(([0-9.]+)\\)"); //$NON-NLS-1$
-
-	/**
-	 * Parse the output of the mpdtrace command.
-	 * 
-	 * @param reader
-	 * @return an MPICH2HostMap containing the known hosts, or null if there was an error
-	 * @throws IOException
-	 */
-	public MPICH2HostMap parse(BufferedReader reader) throws IOException {
-		MPICH2TraceParser parser = new MPICH2TraceParser();
-		String line;
-		while ((line = reader.readLine()) != null) {
-			line = line.trim();
-
-			if (line.length()==0) {
-				// Ignore empty line
-				continue;
-			}
-
-			Matcher matcher = pattern.matcher(line);
-			if (!matcher.matches()) {
-				/*
-				 * Probably an error from mpdtrace. Collect lines and mark error.
-				 */
-				errorMessage = ""; //$NON-NLS-1$
-				
-				while ((line = reader.readLine()) != null) {
-					errorMessage += line + "\n"; //$NON-NLS-1$
-				}
-				
-				return null;
-			}
-
-			if (matcher.matches() && matcher.groupCount() == 3) {
-				String host = matcher.group(1);
-				String port = matcher.group(2);
-				String addr = matcher.group(3);
-				parser.map.addHost(host, addr, port);
-				DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "found host " + host + " addr " + addr + " port " + port); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-		}
-		
-		return parser.map;
-	}
-	
-	/**
-	 * @return error message
-	 */
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-}
-

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath
deleted file mode 100644
index 1fa3e68..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project
deleted file mode 100644
index bbf2126..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpi.mpich2.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e878eb7..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.mpi.mpich2.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.launch,
- org.eclipse.debug.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.rm.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.mpi.mpich2.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.mpi.mpich2.ui,
- org.eclipse.ptp.rm.mpi.mpich2.ui.launch,
- org.eclipse.ptp.rm.mpi.mpich2.ui.preferences,
- org.eclipse.ptp.rm.mpi.mpich2.ui.wizards
-Bundle-Vendor: %pluginProvider

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties
deleted file mode 100644
index dfa3b91..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties
deleted file mode 100644
index e15a32c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-NUMPROCS=1
-NOLOCAL=false
-PREFIX=
-USEPREFIX=false
-HOSTFILE=
-USEHOSTFILE=false
-HOSTLIST=
-USEHOSTLIST=false
-ARGUMENTS=
-USEDEFAULTARGUMENTS=true
-USEDEFAULTPARAMETERS=true
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties
deleted file mode 100644
index f66bf1f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP MPICH2 (new) UI
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml
deleted file mode 100644
index bc2e1e1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-<extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage.OpenMPI"
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.preferences.MPICH2PreferencePage"
-            id="org.eclipse.ptp.rm.openmpi.ui.preferences.OpenMPI12"
-            name="Open MPI 1.2">
-      </page>
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage"
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.preferences.EmptyPage"
-            id="org.eclipse.ptp.ui.preferences.rmPreferencesPage.OpenMPI"
-            name="Open MPI">
-      </page>
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage.OpenMPI"
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.preferences.MPICH213PreferencePage"
-            id="org.eclipse.ptp.rm.openmpi.ui.preferences.OpenMPI13"
-            name="Open MPI 1.3">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.ui.rmConfigurations">
-      <configurationWizard
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.wizards.MPICH2RMConfigurationWizardPageFactory"
-            id="org.eclipse.ptp.rm.mpich2.ui.configurationWizard"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.launch.rmLaunchConfigurations">
-      <launchConfiguration
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.launch.MPICH2RMLaunchConfigurationFactory"
-            id="org.eclipse.ptp.rm.mpich2.ui.launchConfiguration"/>
-   </extension>
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java
deleted file mode 100644
index 6baa3e1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.launch.MPICH2LaunchConfigurationDefaults;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class MPICH2UIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.mpich2.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static MPICH2UIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public MPICH2UIPlugin() {
-		// Empty implementation.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		MPICH2LaunchConfigurationDefaults.loadDefaults();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static MPICH2UIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 *
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 *
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 *
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.MPICH2UIPlugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 *
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 180d5d7..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class AdvancedMPICH2RMLaunchConfigurationDynamicTab extends
-AbstractRMLaunchConfigurationDynamicTab {
-
-	Composite control;
-	Button useArgsDefaultsButton;
-	Text argsText;
-
-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener
-	implements ICheckStateListener {
-		public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			super.doWidgetSelected(e);
-		}
-
-		public void checkStateChanged(CheckStateChangedEvent event) {
-			// do nothing
-		}
-	}
-
-	class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
-		private boolean useDefArgs;
-		private String args;
-
-		protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
-			super(page);
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			useDefArgs = useArgsDefaultsButton.getSelection();
-			args = extractText(argsText);
-		}
-
-		@Override
-		protected void copyToFields() {
-			applyText(argsText, args);
-			useArgsDefaultsButton.setSelection(useDefArgs);
-		}
-
-		@Override
-		protected void copyToStorage() {
-			getConfigurationWorkingCopy().setAttribute(
-					MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-					useDefArgs);
-			getConfigurationWorkingCopy().setAttribute(
-					MPICH2LaunchConfiguration.ATTR_ARGUMENTS, args);
-		}
-
-		@Override
-		protected void loadDefault() {
-			args = MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS;
-			useDefArgs = MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS;
-
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			try {
-				args = getConfiguration().getAttribute(
-						MPICH2LaunchConfiguration.ATTR_ARGUMENTS,
-						MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
-				useDefArgs = getConfiguration()
-				.getAttribute(
-						MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-						MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
-			} catch (CoreException e) {
-				// TODO handle exception?
-				MPICH2UIPlugin.log(e);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (!useDefArgs && args == null) {
-				throw new ValidationException(
-						Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments);
-			}
-		}
-
-		/**
-		 * Convert a comma separated list into one host per line
-		 * 
-		 * @param list
-		 * @return
-		 */
-		private String hostListToText(String list) {
-			if (list == null)
-				return ""; //$NON-NLS-1$
-			String result = ""; //$NON-NLS-1$
-			String[] values = list.split(","); //$NON-NLS-1$
-			for (int i = 0; i < values.length; i++) {
-				if (!values[i].equals("")) { //$NON-NLS-1$
-					if (i > 0) {
-						result += "\r"; //$NON-NLS-1$
-					}
-					result += values[i];
-				}
-			}
-			return result;
-		}
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
-		return new WidgetListener(this);
-	}
-
-	@Override
-	public Image getImage() {
-		return null;
-	}
-
-	@Override
-	public String getText() {
-		return Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title;
-	}
-
-	public void createControl(Composite parent, IResourceManager rm,
-			IPQueue queue) throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		control.setLayout(new GridLayout());
-
-		final Group argumentsGroup = new Group(control, SWT.NONE);
-		argumentsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,
-				false));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		argumentsGroup.setLayout(layout);
-		argumentsGroup
-		.setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments);
-
-		useArgsDefaultsButton = new Button(argumentsGroup, SWT.CHECK);
-		useArgsDefaultsButton
-		.setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments);
-		// useArgsDefaultsButton.setSelection(true);
-		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-		useArgsDefaultsButton.setLayoutData(gd);
-		useArgsDefaultsButton.addSelectionListener(getListener());
-
-		Label label = new Label(argumentsGroup, SWT.NONE);
-		label.setLayoutData(new GridData());
-		label
-		.setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments);
-
-		argsText = new Text(argumentsGroup, SWT.BORDER);
-		argsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-	}
-
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
-			IPQueue queue, ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-		return null;
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation setDefaults(
-			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-			IPQueue queue) {
-		configuration.setAttribute(
-				MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-				MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_ARGUMENTS,
-				MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
-		return new RMLaunchValidation(true, null);
-	}
-
-	@Override
-	public void updateControls() {
-		argsText.setEnabled(!useArgsDefaultsButton.getSelection());
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index ea739cb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2LaunchAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.ptp.utils.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class BasicMPICH2RMLaunchConfigurationDynamicTab extends AbstractRMLaunchConfigurationDynamicTab {
-
-	Composite control;
-	Spinner numProcsSpinner;
-	Button noLocalButton;
-	Button usePrefixButton;
-	Text prefixText;
-	Text hostFileText;
-	Button hostFileButton;
-	Text hostListText;
-	Button hostListButton;
-	Button browseButton;
-
-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener {
-		public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		@Override
-		protected void doModifyText(ModifyEvent e) {
-			if (e.getSource() == numProcsSpinner || e.getSource() == prefixText || e.getSource() == hostFileText || e.getSource() == hostListText) {
-				//				getDataSource().justValidate();
-			} else{
-				super.doModifyText(e);
-			}
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			if (e.getSource() == noLocalButton || e.getSource() == usePrefixButton) {
-				//				getDataSource().justValidate();
-			} else if (e.getSource() == usePrefixButton || e.getSource() == hostFileButton || e.getSource() == hostListButton) {
-				//				getDataSource().justValidate();
-				updateControls();
-			} else {
-				super.doWidgetSelected(e);
-			}
-		}
-	}
-
-	class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
-
-		private int numProcs;
-		private boolean noLocal;
-		private boolean usePrefix;
-		private String prefix;
-		private boolean useHostFile;
-		private String hostFile;
-		private boolean useHostList;
-		private String hostList;
-
-		protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
-			super(page);
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			numProcs = numProcsSpinner.getSelection();
-			noLocal = noLocalButton.getSelection();
-			usePrefix = usePrefixButton.getSelection();
-			prefix = extractText(prefixText);
-			useHostFile = hostFileButton.getSelection();
-			hostFile = extractText(hostFileText);
-			useHostList = hostListButton.getSelection();
-			hostList = extractText(hostListText);
-		}
-
-		@Override
-		protected void copyToFields() {
-			numProcsSpinner.setSelection(numProcs);
-			noLocalButton.setSelection(noLocal);
-			usePrefixButton.setSelection(usePrefix);
-			applyText(prefixText, prefix);
-			applyText(hostFileText, hostFile);
-			hostFileButton.setSelection(useHostFile);
-			applyText(hostListText, hostListToText(hostList));
-			hostListButton.setSelection(useHostList);
-		}
-
-		@Override
-		protected void copyToStorage() {
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, numProcs);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, noLocal);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, usePrefix);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, prefix);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, useHostFile);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, hostFile);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, useHostList);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, hostList);
-		}
-
-		@Override
-		protected void loadDefault() {
-			numProcs = MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS;
-			noLocal = MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL;
-			usePrefix = MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX;
-			prefix = MPICH2LaunchConfigurationDefaults.ATTR_PREFIX;
-			hostFile = MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE;
-			useHostFile = MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE;
-			hostList = MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST;
-			useHostList = MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST;
-
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			try {
-				numProcs = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
-				noLocal = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL);
-				usePrefix = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX);
-				prefix = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX);
-				hostFile = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE);
-				useHostFile = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE);
-				hostList = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST);
-				useHostList = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST);
-			} catch (CoreException e) {
-				// TODO handle exception?
-				MPICH2UIPlugin.log(e);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (numProcs < 1) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess);
-			}
-			if (usePrefix && prefix == null) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix);
-			}
-			if (useHostFile && hostFile == null) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile);
-			}
-			if (useHostList && hostList == null) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList);
-			}
-		}
-
-		/**
-		 * Convert a comma separated list into one host per line
-		 *
-		 * @param list
-		 * @return
-		 */
-		private String hostListToText(String list) {
-			if (list == null) {
-				return ""; //$NON-NLS-1$
-			}
-			String result = ""; //$NON-NLS-1$
-			String[] values = list.split(","); //$NON-NLS-1$
-			for (int i = 0; i < values.length; i++) {
-				if (!values[i].equals("")) { //$NON-NLS-1$
-					if (i > 0) {
-						result += "\r"; //$NON-NLS-1$
-					}
-					result += values[i];
-				}
-			}
-			return result;
-		}
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
-		return new WidgetListener(this);
-	}
-
-	@Override
-	public Image getImage() {
-		return null;
-	}
-
-	@Override
-	public String getText() {
-		return Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title;
-	}
-
-	public void createControl(Composite parent, IResourceManager rm, IPQueue queue) throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		control.setLayout(layout);
-
-		Label label  = new Label(control, SWT.NONE);
-		label.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses);
-
-		numProcsSpinner = new Spinner(control, SWT.BORDER);
-		numProcsSpinner.addModifyListener(getListener());
-		numProcsSpinner.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
-
-		final Group optionsGroup = new Group(control, SWT.NONE);
-		optionsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-		optionsGroup.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		optionsGroup.setLayout(layout);
-
-		noLocalButton = new Button(optionsGroup, SWT.CHECK);
-		noLocalButton.addSelectionListener(getListener());
-		noLocalButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal);
-
-		usePrefixButton = new Button(optionsGroup, SWT.CHECK);
-		usePrefixButton.addSelectionListener(getListener());
-		usePrefixButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix);
-
-		prefixText = new Text(optionsGroup, SWT.BORDER);
-		prefixText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-		prefixText.addModifyListener(getListener());
-
-		final Group hostGroup = new Group(control, SWT.NONE);
-		hostGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-		hostGroup.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		hostGroup.setLayout(layout);
-
-		hostFileButton = new Button(hostGroup, SWT.CHECK);
-		hostFileButton.addSelectionListener(getListener());
-		hostFileButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile);
-
-		hostFileText = new Text(hostGroup, SWT.BORDER);
-		hostFileText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		hostFileText.addModifyListener(getListener());
-
-		browseButton = new Button(hostGroup, SWT.NONE);
-		browseButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-		browseButton.addSelectionListener(getListener());
-		PixelConverter pixelconverter = new PixelConverter(control);
-		GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
-		gd.widthHint = pixelconverter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		browseButton.setLayoutData(gd);
-		browseButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse);
-
-		hostListButton = new Button(hostGroup, SWT.CHECK);
-		hostListButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
-		hostListButton.addSelectionListener(getListener());
-		hostListButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList);
-
-		hostListText = new Text(hostGroup, SWT.V_SCROLL | SWT.BORDER);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		gd.heightHint = 20;
-		hostListText.setLayoutData(gd);
-		hostListText.addModifyListener(getListener());
-	}
-
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
-			IPQueue queue, ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-
-		List<IAttribute<?,?,?>> attrs = new ArrayList<IAttribute<?,?,?>>();
-
-		int numProcs = configuration.getAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
-		try {
-			attrs.add(JobAttributes.getNumberOfProcessesAttributeDefinition().create(numProcs));
-		} catch (IllegalValueException e) {
-			throw new CoreException(new Status(IStatus.ERROR, MPICH2UIPlugin.getDefault().getBundle().getSymbolicName(), Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration, e));
-		}
-
-		attrs.add(MPICH2LaunchAttributes.getLaunchArgumentsAttributeDefinition().create(MPICH2LaunchConfiguration.calculateArguments(configuration)));
-
-		return attrs.toArray(new IAttribute<?,?,?>[attrs.size()]);
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration,
-			IResourceManager rm, IPQueue queue) {
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST);
-		return new RMLaunchValidation(true, null);
-	}
-
-	@Override
-	public void updateControls() {
-		prefixText.setEnabled(usePrefixButton.getSelection());
-		browseButton.setEnabled(hostFileButton.getSelection());
-		hostFileText.setEnabled(hostFileButton.getSelection());
-		hostListText.setEnabled(hostListButton.getSelection());
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
deleted file mode 100644
index f0b325d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2LaunchConfiguration {
-	public static final String ATTR_BASE = MPICH2UIPlugin.PLUGIN_ID + ".launchAttributes"; //$NON-NLS-1$
-	public static final String ATTR_NUMPROCS = ATTR_BASE + ".numProcs"; //$NON-NLS-1$
-	public static final String ATTR_NOLOCAL = ATTR_BASE + ".noLocal"; //$NON-NLS-1$
-	public static final String ATTR_PREFIX = ATTR_BASE + ".prefix"; //$NON-NLS-1$
-	public static final String ATTR_USEPREFIX = ATTR_BASE + ".usePrefix"; //$NON-NLS-1$
-	public static final String ATTR_HOSTFILE = ATTR_BASE + ".hostFile"; //$NON-NLS-1$
-	public static final String ATTR_USEHOSTFILE = ATTR_BASE + ".useHostFile"; //$NON-NLS-1$
-	public static final String ATTR_HOSTLIST = ATTR_BASE + ".hostList"; //$NON-NLS-1$
-	public static final String ATTR_USEHOSTLIST = ATTR_BASE + ".useHostList"; //$NON-NLS-1$
-	public static final String ATTR_ARGUMENTS = ATTR_BASE + ".arguments"; //$NON-NLS-1$
-	public static final String ATTR_USEDEFAULTARGUMENTS = ATTR_BASE + ".useDefaultArguments"; //$NON-NLS-1$
-	public static final String ATTR_PARAMETERS = ATTR_BASE + ".parameters"; //$NON-NLS-1$
-	public static final String ATTR_USEDEFAULTPARAMETERS = ATTR_BASE + ".useDefaultParameters"; //$NON-NLS-1$
-
-	static String calculateArguments(ILaunchConfiguration configuration) throws CoreException {
-		if (configuration.getAttribute(ATTR_USEDEFAULTARGUMENTS, MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS)) {
-			String launchArgs = "-np " + Integer.toString(configuration.getAttribute(ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS)); //$NON-NLS-1$
-			if (configuration.getAttribute(ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL)) {
-				launchArgs += " -nolocal"; //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX)) {
-				launchArgs += " --prefix " + fixString(configuration.getAttribute(ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX)); //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE)) {
-				launchArgs += " -hostfile " + fixString(configuration.getAttribute(ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE)); //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST)) {
-				launchArgs += " -host " + fixString(configuration.getAttribute(ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST)); //$NON-NLS-1$
-			}
-
-			if (! configuration.getAttribute(ATTR_USEDEFAULTPARAMETERS, MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS)) {
-				Map<String, String> params = configuration.getAttribute(ATTR_PARAMETERS, MPICH2LaunchConfigurationDefaults.ATTR_PARAMETERS);
-				for (Entry<String, String> param : params.entrySet()) {
-					launchArgs += " -mca " + param.getKey() + " " + fixString(param.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			return launchArgs;
-		} else {
-			String launchArgs = configuration.getAttribute(ATTR_ARGUMENTS, MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
-			return launchArgs;
-		}
-	}
-
-	/**
-	 * Make string suitable for passing as an argument
-	 *
-	 * @param s
-	 * @return
-	 */
-	static private String fixString(String s) {
-		// TODO is that right and escaped correctly?
-		if (s == null) {
-			return "\"\""; //$NON-NLS-1$
-		}
-		return "\"" + s + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
deleted file mode 100644
index 71c12be..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.osgi.framework.Bundle;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2LaunchConfigurationDefaults {
-	public static int ATTR_NUMPROCS;
-	public static boolean ATTR_NOLOCAL;
-	public static String ATTR_PREFIX;
-	public static boolean ATTR_USEPREFIX;
-	public static String ATTR_HOSTFILE;
-	public static boolean ATTR_USEHOSTFILE;
-	public static String ATTR_HOSTLIST;
-	public static boolean ATTR_USEHOSTLIST;
-	public static String ATTR_ARGUMENTS;
-	public static boolean ATTR_USEDEFAULTARGUMENTS;
-	public static HashMap<String, String> ATTR_PARAMETERS = new HashMap<String, String>();
-	public static boolean ATTR_USEDEFAULTPARAMETERS;
-
-	private static String defaultsResourcePath = "/data/launch-defaults.properties"; //$NON-NLS-1$
-
-	public static void loadDefaults() throws CoreException {
-		Path defaultsPropertiesPath = new Path(defaultsResourcePath);
-		Bundle bundle = MPICH2UIPlugin.getDefault().getBundle();
-		Properties properties = read(defaultsPropertiesPath, bundle);
-
-		ATTR_NUMPROCS = getInteger(bundle, properties, "NUMPROCS"); //$NON-NLS-1$
-		ATTR_NOLOCAL = getBoolean(bundle, properties, "NOLOCAL"); //$NON-NLS-1$
-		ATTR_PREFIX = getString(bundle, properties, "PREFIX"); //$NON-NLS-1$
-		ATTR_USEPREFIX = getBoolean(bundle, properties, "USEPREFIX"); //$NON-NLS-1$
-		ATTR_HOSTFILE = getString(bundle, properties, "HOSTFILE"); //$NON-NLS-1$
-		ATTR_USEHOSTFILE = getBoolean(bundle, properties, "USEHOSTFILE"); //$NON-NLS-1$
-		ATTR_ARGUMENTS = getString(bundle, properties, "ARGUMENTS"); //$NON-NLS-1$
-		ATTR_USEDEFAULTARGUMENTS = getBoolean(bundle, properties, "USEDEFAULTARGUMENTS"); //$NON-NLS-1$
-		ATTR_USEDEFAULTPARAMETERS = getBoolean(bundle, properties, "USEDEFAULTPARAMETERS"); //$NON-NLS-1$
-
-		assert ATTR_PREFIX != null;
-		assert ATTR_HOSTFILE != null;
-		assert ATTR_ARGUMENTS != null;
-		// TODO: read ATTR_PARAMETERS
-	}
-
-	public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
-	throws CoreException {
-		InputStream inStream;
-		Properties properties = new Properties();
-		try {
-			inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
-			properties.load(inStream);
-		} catch (IOException e) {
-			throw MPICH2UIPlugin.coreErrorException(Messages.MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile, e);
-		}
-		return properties;
-	}
-
-	public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = properties.getProperty(key);
-		if (value == null) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2LaunchConfigurationDefaults_MissingValue, key)));
-		}
-		return value;
-	}
-
-	public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2LaunchConfigurationDefaults_FailedParseInteger, key)));
-		}
-	}
-
-	public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		return Boolean.parseBoolean(value);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
deleted file mode 100644
index 13bab6a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManager;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RMLaunchConfigurationFactory extends AbstractRMLaunchConfigurationFactory {
-
-	@Override
-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {
-		return new NewMPICH2RMLaunchConfigurationDynamicTab(rm);
-	}
-
-	@Override
-	public Class<? extends IResourceManager> getResourceManagerClass() {
-		return MPICH2ResourceManager.class;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 0aa4bde..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rm.ui.launch.ExtendableRMLaunchConfigurationDynamicTab;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class NewMPICH2RMLaunchConfigurationDynamicTab extends ExtendableRMLaunchConfigurationDynamicTab {
-
-	public NewMPICH2RMLaunchConfigurationDynamicTab(IResourceManager rm) {
-		super();
-		addDynamicTab(new BasicMPICH2RMLaunchConfigurationDynamicTab());
-		addDynamicTab(new AdvancedMPICH2RMLaunchConfigurationDynamicTab());
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
deleted file mode 100644
index 35c8a55..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.mpich2.ui.messages.messages"; //$NON-NLS-1$
-	public static String MPICH2UIPlugin_Exception_InternalError;
-	
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_MCAParameters;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_PArameterTable_Column_Name;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_ParameterTable_Column_Value;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyParameter;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_BySlot;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoOversubscribe;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess;
-	public static String MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile;
-	public static String MPICH2LaunchConfigurationDefaults_FailedParseInteger;
-	public static String MPICH2LaunchConfigurationDefaults_MissingValue;
-	
-	public static String MPICH2PreferencePage_Title;
-
-	public static String MPICH2ConfigurationWizardPage_Description;
-	public static String MPICH2ConfigurationWizardPage_Label_Version;
-	public static String MPICH2ConfigurationWizardPage_Name;
-	public static String MPICH2ConfigurationWizardPage_Title;
-	public static String MPICH2ConfigurationWizardPage_Validation_NoVersionSelected;
-	public static String MPICH2ConfigurationWizardPage_VersionCombo_Version12;
-	public static String MPICH2ConfigurationWizardPage_VersionCombo_Version13;
-	public static String MPICH2RMConfigurationWizardPage_Description;
-	public static String MPICH2RMConfigurationWizardPage_Title;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
deleted file mode 100644
index 7867ffa..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
+++ /dev/null

@@ -1,43 +0,0 @@
-MPICH2UIPlugin_Exception_InternalError=Internal error
-
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments=Arguments:
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments=Use default arguments
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters=Use default parameters
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments=Launch arguments
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_MCAParameters=MCA Parameters
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_PArameterTable_Column_Name=Name
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_ParameterTable_Column_Value=Value
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title=Advanced MPICH2
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments=Arguments cannot be empty
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyParameter=Parameter value cannot be empty
-BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration=Invalid configuration
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse=Browse
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_BySlot=By slot
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile=Host file:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal=No local
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoOversubscribe=No oversubscribe
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses=Number of processes:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix=Prefix:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title=Basic MPICH2
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup=Hosts
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList=Host list:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup=Options
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile=Must provide a host file
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList=Must provide at least one host name
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix=Prefix cannot be empty
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess=Must specify at least one process
-MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH2LaunchConfigurationDefaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH2LaunchConfigurationDefaults_MissingValue=Missing default value for {0}
-
-MPICH2PreferencePage_Title=MPICH2 preferences
-
-MPICH2ConfigurationWizardPage_Description=Enter information to configure the MPICH2 tool
-MPICH2ConfigurationWizardPage_Label_Version=MPICH2 version:
-MPICH2ConfigurationWizardPage_Name=MPICH2
-MPICH2ConfigurationWizardPage_Title=MPICH2 tool configuration
-MPICH2ConfigurationWizardPage_Validation_NoVersionSelected=No MPICH2 version selected
-MPICH2ConfigurationWizardPage_VersionCombo_Version12=MPICH2
-MPICH2ConfigurationWizardPage_VersionCombo_Version13=MPICH2
-MPICH2RMConfigurationWizardPage_Description=Enter MPICH2 connection information
-MPICH2RMConfigurationWizardPage_Title=MPICH2 connection configuration

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/EmptyPage.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/EmptyPage.java
deleted file mode 100644
index fb6ad4c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/EmptyPage.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class EmptyPage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	public EmptyPage() {
-		super();
-		noDefaultAndApplyButton();
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		return parent;
-	}
-
-	public void init(IWorkbench workbench) {
-		// Empty
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/MPICH2PreferencePage.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/MPICH2PreferencePage.java
deleted file mode 100644
index 800bdb9..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/preferences/MPICH2PreferencePage.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.rm.mpi.mpich2.ui.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.preferences.AbstractToolsPreferencePage;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2PreferencePage extends AbstractToolsPreferencePage {
-
-	public MPICH2PreferencePage() {
-		super(MPICH2PreferenceManager.PREFIX, MPICH2ResourceManagerConfiguration.MPICH2_CAPABILITIES, Messages.MPICH2PreferencePage_Title);
-	}
-
-	@Override
-	public Preferences getPreferences() {
-		return MPICH2PreferenceManager.getPreferences();
-	}
-
-	@Override
-	public void savePreferences() {
-		MPICH2PreferenceManager.savePreferences();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java
deleted file mode 100644
index aed5602..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.wizards.AbstractConfigurationWizardPage;
-import org.eclipse.ptp.rm.ui.wizards.AbstractToolRMConfigurationWizardPage;
-import org.eclipse.ptp.rm.ui.wizards.WizardPageDataSource;
-import org.eclipse.ptp.rm.ui.wizards.WizardPageWidgetListener;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ConfigurationWizardPage extends AbstractToolRMConfigurationWizardPage {
-
-	String versionIds[] = new String[] { };
-	String versionsNames[] = new String[] { Messages.MPICH2ConfigurationWizardPage_VersionCombo_Version12, Messages.MPICH2ConfigurationWizardPage_VersionCombo_Version13};
-
-	protected Combo versionCombo;
-
-	protected class WidgetListener extends AbstractToolRMConfigurationWizardPage.WidgetListener {
-		@Override
-		protected void doModifyText(ModifyEvent evt) {
-			super.doModifyText(evt);
-		}
-
-		@Override
-		public void doWidgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == versionCombo) {
-				handleVersionSelected();
-				updateControls();
-				getDataSource().storeAndValidate();
-			} else {
-				super.doWidgetSelected(e);
-			}
-		}
-	}
-
-	protected class DataSource extends AbstractToolRMConfigurationWizardPage.DataSource {
-		protected DataSource(AbstractConfigurationWizardPage page) {
-			super(page);
-		}
-
-		private MPICH2ResourceManagerConfiguration config;
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			super.copyFromFields();
-		}
-
-		@Override
-		protected void copyToFields() {
-			super.copyToFields();
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			super.loadFromStorage();
-		}
-
-		@Override
-		protected void copyToStorage() {
-			super.copyToStorage();
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			super.validateLocal();
-		}
-
-
-		@Override
-		public void setConfig(IResourceManagerConfiguration configuration) {
-			this.config = (MPICH2ResourceManagerConfiguration) configuration;
-			super.setConfig(configuration);
-		}
-	}
-
-	@Override
-	protected WizardPageWidgetListener createListener() {
-		return new WidgetListener();
-	}
-
-	@Override
-	protected WizardPageDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	public MPICH2ConfigurationWizardPage(RMConfigurationWizard wizard) {
-		super(wizard, MPICH2ResourceManagerConfiguration.MPICH2_CAPABILITIES, 
-				Messages.MPICH2ConfigurationWizardPage_Name, 
-				Messages.MPICH2ConfigurationWizardPage_Title, 
-				Messages.MPICH2ConfigurationWizardPage_Description);
-	}
-
-	@Override
-	protected Composite doCreateContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginBottom = 0;
-		layout.marginTop = 0;
-		layout.marginRight = 0;
-		layout.marginLeft = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		contents.setLayout(layout);
-
-		createContents(contents);
-
-		return contents;
-	}
-
-	protected void createVersionContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		contents.setLayout(layout);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		contents.setLayoutData(gd);
-
-		/*
-		 * Selection for openmpi version.
-		 */
-
-		Label label = new Label(contents, SWT.NONE);
-		label.setText(Messages.MPICH2ConfigurationWizardPage_Label_Version);
-
-		versionCombo = new Combo(contents, SWT.DROP_DOWN | SWT.READ_ONLY);
-		for (int i = 0; i < versionsNames.length; i++) {
-			versionCombo.add(versionsNames[i]);
-		}
-		versionCombo.addSelectionListener(getWidgetListener());
-	}
-
-	public void handleVersionSelected() {
-		getWidgetListener().disable();
-		DataSource dataSource = (DataSource) this.getDataSource();
-		dataSource.justValidate();
-		String launchCmd = null;
-		String debugCmd = null;
-		String discoverCmd = null;
-		String remoteInstallPath = null;
-		Preferences preferences = MPICH2PreferenceManager.getPreferences();
-		launchCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD);
-		debugCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD);
-		discoverCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD);
-		remoteInstallPath = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_REMOTE_INSTALL_PATH);
-		resetErrorMessages();
-		dataSource.setCommandFields(launchCmd, debugCmd, discoverCmd, null, 0, null, dataSource.getRemoteInstallPath());
-		dataSource.setUseDefaults(true);
-		dataSource.copyToFields();
-		getWidgetListener().enable();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java
deleted file mode 100644
index ee6b30b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public final class MPICH2RMConfigurationWizardPage extends AbstractRemoteResourceManagerConfigurationWizardPage {
-
-	public MPICH2RMConfigurationWizardPage(RMConfigurationWizard wizard) {
-		super(wizard, Messages.MPICH2RMConfigurationWizardPage_Title);
-		setTitle(Messages.MPICH2RMConfigurationWizardPage_Title);
-		setDescription(Messages.MPICH2RMConfigurationWizardPage_Description);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
deleted file mode 100644
index 7fe3a97..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RMConfigurationWizardPageFactory extends RMConfigurationWizardPageFactory {
-
-	public MPICH2RMConfigurationWizardPageFactory() {
-		// no-op
-	}
-
-	protected RMConfigurationWizardPage[] getMPICH2ConfigurationWizardPages(RMConfigurationWizard wizard) {
-		return new RMConfigurationWizardPage[] {
-				new MPICH2ConfigurationWizardPage(wizard)
-		};
-	}
-
-	//	@Override
-	@Override
-	public RMConfigurationWizardPage[] getPages(RMConfigurationWizard wizard) {
-		List<RMConfigurationWizardPage> list = new ArrayList<RMConfigurationWizardPage>();
-		list.add(new MPICH2RMConfigurationWizardPage(wizard));
-		list.addAll(Arrays.asList(getMPICH2ConfigurationWizardPages(wizard)));
-		return list.toArray(new RMConfigurationWizardPage[list.size()]);
-	}
-
-	//	@Override
-	@Override
-	public Class<? extends IResourceManagerFactory> getRMFactoryClass() {
-		return MPICH2ResourceManagerFactory.class;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.classpath b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.project b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.project
deleted file mode 100644
index c1c1959..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpi.openmpi.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 90b3585..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.mpi.openmpi.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.core,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.remote.core,
- org.eclipse.core.filesystem,
- org.eclipse.ui,
- org.eclipse.search
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.mpi.openmpi.core,
- org.eclipse.ptp.rm.mpi.openmpi.core.messages,
- org.eclipse.ptp.rm.mpi.openmpi.core.parameters,
- org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem,
- org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem
-Bundle-Vendor: %pluginProvider

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

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.ini b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.ini
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.mappings b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.properties
deleted file mode 100644
index 3eb8ef5..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/about.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/build.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/build.properties
deleted file mode 100644
index f921f89..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               data/,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.2.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.2.properties
deleted file mode 100644
index f55473b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.2.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-LAUNCH_CMD=mpirun -display-map ${Open_MPI_args} ${Open_MPI_env} ${execPath}/${execName} ${progArgs}
-DEBUG_CMD=mpirun -display-map ${Open_MPI_args} ${Open_MPI_env} ${debugExecPath}/${debugExecName} ${debugArgs}
-DISCOVER_CMD=ompi_info -a --parseable
-PATH=
-USE_DEFAULTS=true

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.3.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.3.properties
deleted file mode 100644
index d4e43f2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/data/defaults-OpenMPI-1.3.properties
+++ /dev/null

@@ -1,5 +0,0 @@
-LAUNCH_CMD=mpirun -mca orte_show_resolved_nodenames 1 -xml -display-map ${Open_MPI_args} ${Open_MPI_env} ${execPath}/${execName} ${progArgs}
-DEBUG_CMD=mpirun -mca orte_show_resolved_nodenames 1 -xml -display-map ${Open_MPI_args} ${Open_MPI_env} ${debugExecPath}/${debugExecName} ${debugArgs}
-DISCOVER_CMD=ompi_info -a --parseable
-PATH=
-USE_DEFAULTS=true

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/eclipse32.png b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.properties
deleted file mode 100644
index ce669df..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Open MPI Support
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.xml b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.xml
deleted file mode 100644
index 8985a8c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/plugin.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.core.resourceManagers">
-      <resourceManager
-            class="org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerFactory"
-            id="org.eclipse.ptp.openmpi.core.resourcemanager"/>
-   </extension>
-
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12Defaults.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12Defaults.java
deleted file mode 100644
index ae41e8f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12Defaults.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.osgi.framework.Bundle;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPI12Defaults {
-
-	public static String LAUNCH_CMD = null;
-	public static String DEBUG_CMD = null;
-	public static String DISCOVER_CMD = null;
-	public static String PATH = null;
-	public static boolean USE_DEFAULTS = false;
-
-	private static String defaultsResourcePath = "/data/defaults-OpenMPI-1.2.properties"; //$NON-NLS-1$
-
-	public static void loadDefaults() throws CoreException {
-		Path defaultsPropertiesPath = new Path(defaultsResourcePath);
-		Bundle bundle = OpenMPIPlugin.getDefault().getBundle();
-		Properties properties = read(defaultsPropertiesPath, bundle);
-
-		LAUNCH_CMD = getString(bundle, properties, "LAUNCH_CMD"); //$NON-NLS-1$
-		DEBUG_CMD = getString(bundle, properties, "DEBUG_CMD"); //$NON-NLS-1$
-		DISCOVER_CMD = getString(bundle, properties, "DISCOVER_CMD"); //$NON-NLS-1$
-		PATH = getString(bundle, properties, "PATH"); //$NON-NLS-1$
-		USE_DEFAULTS = getBoolean(bundle, properties, "USE_DEFAULTS"); //$NON-NLS-1$
-
-		assert LAUNCH_CMD != null;
-		assert DEBUG_CMD != null;
-		assert DISCOVER_CMD != null;
-		assert PATH != null;
-	}
-
-	public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
-	throws CoreException {
-		InputStream inStream;
-		Properties properties = new Properties();
-		try {
-			inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
-			properties.load(inStream);
-
-
-		} catch (IOException e) {
-			throw OpenMPIPlugin.coreErrorException(Messages.OpenMPI12Defaults_Exception_FailedReadFile, e);
-		}
-		return properties;
-	}
-
-	public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = properties.getProperty(key);
-		if (value == null)
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.OpenMPI12Defaults_MissingValue, key)));
-		else
-			return value;
-	}
-
-	public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.OpenMPI12Defaults_FailedParseInteger, key)));
-		}
-	}
-
-	public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		return Boolean.parseBoolean(value);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12PreferenceManager.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12PreferenceManager.java
deleted file mode 100644
index 9ab1b24..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI12PreferenceManager.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.AbstractToolsPreferenceManager;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPI12PreferenceManager extends AbstractToolsPreferenceManager {
-	public static final String PREFIX = "openmpi-1.2-"; //$NON-NLS-1$
-
-	public static Preferences getPreferences() {
-		return OpenMPIPlugin.getDefault().getPluginPreferences();
-	}
-
-	public static void savePreferences() {
-		OpenMPIPlugin.getDefault().savePluginPreferences();
-	}
-
-	public static void initializePreferences() {
-		Preferences preferences = OpenMPIPlugin.getDefault().getPluginPreferences();
-		// Initialize only preferences as in OpenMpiResourceManagerConfiguration.OPENMPI_CAPABILITIES
-		preferences.setDefault(PREFIX + PREFS_LAUNCH_CMD, OpenMPI12Defaults.LAUNCH_CMD);
-		preferences.setDefault(PREFIX + PREFS_DEBUG_CMD, OpenMPI12Defaults.DEBUG_CMD);
-		preferences.setDefault(PREFIX + PREFS_DISCOVER_CMD, OpenMPI12Defaults.DISCOVER_CMD);
-		preferences.setDefault(PREFIX + PREFS_REMOTE_INSTALL_PATH, OpenMPI12Defaults.PATH);
-		//		preferences.setDefault(PREFIX + PREFS_USE_DEFAULTS, OpenMPI12Defaults.USE_DEFAULTS);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13Defaults.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13Defaults.java
deleted file mode 100644
index 6ab065e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13Defaults.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.osgi.framework.Bundle;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPI13Defaults {
-
-	public static String LAUNCH_CMD = null;
-	public static String DEBUG_CMD = null;
-	public static String DISCOVER_CMD = null;
-	public static String PATH = null;
-	public static boolean USE_DEFAULTS = false;
-
-	private static String defaultsResourcePath = "/data/defaults-OpenMPI-1.3.properties"; //$NON-NLS-1$
-
-	public static void loadDefaults() throws CoreException {
-		Path defaultsPropertiesPath = new Path(defaultsResourcePath);
-		Bundle bundle = OpenMPIPlugin.getDefault().getBundle();
-		Properties properties = read(defaultsPropertiesPath, bundle);
-
-		LAUNCH_CMD = getString(bundle, properties, "LAUNCH_CMD"); //$NON-NLS-1$
-		DEBUG_CMD = getString(bundle, properties, "DEBUG_CMD"); //$NON-NLS-1$
-		DISCOVER_CMD = getString(bundle, properties, "DISCOVER_CMD"); //$NON-NLS-1$
-		PATH = getString(bundle, properties, "PATH"); //$NON-NLS-1$
-		USE_DEFAULTS = getBoolean(bundle, properties, "USE_DEFAULTS"); //$NON-NLS-1$
-
-		assert LAUNCH_CMD != null;
-		assert DEBUG_CMD != null;
-		assert DISCOVER_CMD != null;
-		assert PATH != null;
-	}
-
-	public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
-	throws CoreException {
-		InputStream inStream;
-		Properties properties = new Properties();
-		try {
-			inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
-			properties.load(inStream);
-
-
-		} catch (IOException e) {
-			throw OpenMPIPlugin.coreErrorException(Messages.OpenMPI13Defaults_Exception_FailedReadFile, e);
-		}
-		return properties;
-	}
-
-	public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = properties.getProperty(key);
-		if (value == null) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.OpenMPI13Defaults_MissingValue, key)));
-		} else
-			return value;
-	}
-
-	public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.OpenMPI13Defaults_FailedParseInteger, key)));
-		}
-	}
-
-	public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		return Boolean.parseBoolean(value);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13PreferenceManager.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13PreferenceManager.java
deleted file mode 100644
index 5fa9438..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPI13PreferenceManager.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.AbstractToolsPreferenceManager;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPI13PreferenceManager extends AbstractToolsPreferenceManager {
-	public static final String PREFIX = "openmpi-1.3-"; //$NON-NLS-1$
-
-	public static Preferences getPreferences() {
-		return OpenMPIPlugin.getDefault().getPluginPreferences();
-	}
-
-	public static void savePreferences() {
-		OpenMPIPlugin.getDefault().savePluginPreferences();
-	}
-
-	public static void initializePreferences() {
-		Preferences preferences = OpenMPIPlugin.getDefault().getPluginPreferences();
-		// Initialize only preferences as in OpenMpiResourceManagerConfiguration.OPENMPI_CAPABILITIES
-		preferences.setDefault(PREFIX + PREFS_LAUNCH_CMD, OpenMPI13Defaults.LAUNCH_CMD);
-		preferences.setDefault(PREFIX + PREFS_DEBUG_CMD, OpenMPI13Defaults.DEBUG_CMD);
-		preferences.setDefault(PREFIX + PREFS_DISCOVER_CMD, OpenMPI13Defaults.DISCOVER_CMD);
-		preferences.setDefault(PREFIX + PREFS_REMOTE_INSTALL_PATH, OpenMPI13Defaults.PATH);
-		//		preferences.setDefault(PREFIX + PREFS_USE_DEFAULTS, OpenMPI13Defaults.USE_DEFAULTS);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIApplicationAttributes.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIApplicationAttributes.java
deleted file mode 100644
index b7f7320..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIApplicationAttributes.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIApplicationAttributes {
-	private static final String EFFECTIVE_OPEN_MPI_ENV_ATTR_ID = "Open_MPI_env"; //$NON-NLS-1$
-	private static final String EFFECTIVE_OPEN_MPI_PROG_ARGS_ATTR_ID = "Open_MPI_progArgs"; //$NON-NLS-1$
-	private static final String EFFECTIVE_OPEN_MPI_WORKING_DIR_ATTR_ID = "Open_MPI_workingDir"; //$NON-NLS-1$
-
-	private final static ArrayAttributeDefinition<String> effectiveOpenMPIEnvAttrDef =
-		new ArrayAttributeDefinition<String>(EFFECTIVE_OPEN_MPI_ENV_ATTR_ID, Messages.OpenMPIApplicationAttributes_effectiveOpenMPIEnvAttrDef_title,
-				Messages.OpenMPIApplicationAttributes_effectiveOpenMPIEnvAttrDef_description, true, null);
-
-	private final static ArrayAttributeDefinition<String> effectiveOpenMPIProgArgsAttrDef =
-		new ArrayAttributeDefinition<String>(EFFECTIVE_OPEN_MPI_PROG_ARGS_ATTR_ID, Messages.OpenMPIApplicationAttributes_effectiveOpenMPIProgArgsAttrDef_title,
-				Messages.OpenMPIApplicationAttributes_effectiveOpenMPIProgArgsAttrDef_description, true, null);
-
-	private final static StringAttributeDefinition effectiveOpenMPIWorkingDirAttrDef =
-		new StringAttributeDefinition(EFFECTIVE_OPEN_MPI_WORKING_DIR_ATTR_ID, Messages.OpenMPIApplicationAttributes_effectiveOpenMPIWorkingDirAttrDef_title,
-				Messages.OpenMPIApplicationAttributes_effectiveOpenMPIWorkingDirAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 * Environment variables that Open MPI has passed to the processes.
-	 * <p>
-	 * openmpi 1.2 only.
-	 */
-	public static ArrayAttributeDefinition<String> getEffectiveOpenMPIEnvAttributeDefinition() {
-		return effectiveOpenMPIEnvAttrDef;
-	}
-
-	/**
-	 * Program arguments that Open MPI has passed to the processes.
-	 * <p>
-	 * openmpi 1.2 only.
-	 */
-	public static ArrayAttributeDefinition<String> getEffectiveOpenMPIProgArgsAttributeDefinition() {
-		return effectiveOpenMPIProgArgsAttrDef;
-	}
-
-	/**
-	 * Working directory where Open MPI has started the processes.
-	 * <p>
-	 * openmpi 1.2 only.
-	 */
-	public static StringAttributeDefinition getEffectiveOpenMPIWorkingDirAttributeDefinition() {
-		return effectiveOpenMPIWorkingDirAttrDef;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIJobAttributes.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIJobAttributes.java
deleted file mode 100644
index af4880b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIJobAttributes.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.EnumeratedAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-
-
-/**
- * Node attributes.
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIJobAttributes {
-
-	public enum MappingMode {
-		UNKNOWN,
-		BY_NODE,
-		BY_SLOT
-	}
-
-	//	private static final String NUM_MAPPED_NODES_ATTR_ID = "Open_MPI_NumMappedNodes";
-	private static final String MPI_JOB_ID_ATTR_ID = "Open_MPI_MpiJobId"; //$NON-NLS-1$
-	private static final String VPID_START_ATTR_ID = "Open_MPI_VpidStart"; //$NON-NLS-1$
-	private static final String VPID_RANGE_ATTR_ID = "Open_MPI_VpidRange"; //$NON-NLS-1$
-	private static final String MAPPING_MODE_ATTR_ID = "Open_MPI_MappingMode"; //$NON-NLS-1$
-	private static final String HOSTNAME_ATTR_ID = "Open_MPI_HostName"; //$NON-NLS-1$
-
-	//	private final static IntegerAttributeDefinition numMappedNodesDef =
-	//		new IntegerAttributeDefinition(NUM_MAPPED_NODES_ATTR_ID, "Mapped nodes",
-	//				"Number of mapped nodes", true, 0);
-
-	private final static IntegerAttributeDefinition mpiJobIdAttrDef =
-		new IntegerAttributeDefinition(MPI_JOB_ID_ATTR_ID, Messages.OpenMPIJobAttributes_mpiJobIdAttrDef_title,
-				Messages.OpenMPIJobAttributes_mpiJobIdAttrDef_description, true, new Integer(0));
-
-	private final static IntegerAttributeDefinition vpidStartAttrDef =
-		new IntegerAttributeDefinition(VPID_START_ATTR_ID, Messages.OpenMPIJobAttributes_vpidStartAttrDef_title,
-				Messages.OpenMPIJobAttributes_vpidStartAttrDef_description, true, new Integer(0));
-
-	private final static IntegerAttributeDefinition vpidRangeAttrDef =
-		new IntegerAttributeDefinition(VPID_RANGE_ATTR_ID, Messages.OpenMPIJobAttributes_vpidRangeAttrDef_title,
-				Messages.OpenMPIJobAttributes_vpidRangeAttrDef_description, true, new Integer(0));
-
-	private final static EnumeratedAttributeDefinition<MappingMode> mappingModeAttrDef =
-		new EnumeratedAttributeDefinition<MappingMode>(MAPPING_MODE_ATTR_ID, Messages.OpenMPIJobAttributes_mappingModeAttrDef_title, Messages.OpenMPIJobAttributes_mappingModeAttrDef_description,
-				true, MappingMode.UNKNOWN);
-
-	private final static StringAttributeDefinition hostnameAttrDef =
-		new StringAttributeDefinition(HOSTNAME_ATTR_ID, Messages.OpenMPIJobAttributes_hostnameAttrDef_title, Messages.OpenMPIJobAttributes_hostnameAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 * <p>
-	 * openmpi 1.2 and 1.3
-	 */
-	//	public static IntegerAttributeDefinition getNumMappedNodesDefinition() {
-	//		return numMappedNodesDef;
-	//	}
-
-	/**
-	 * <p>
-	 * openmpi 1.2 only.
-	 */
-	public static IntegerAttributeDefinition getMpiJobIdAttributeDefinition() {
-		return mpiJobIdAttrDef;
-	}
-
-	/**
-	 * <p>
-	 * openmpi 1.2 only.
-	 */
-	public static IntegerAttributeDefinition getVpidStartAttributeDefinition() {
-		return vpidStartAttrDef;
-	}
-
-	/**
-	 * <p>
-	 * openmpi 1.2 only.
-	 */
-	public static IntegerAttributeDefinition getVpidRangeAttributeDefinition() {
-		return vpidRangeAttrDef;
-	}
-
-	/**
-	 * <p>
-	 * openmpi 1.2 and 1.3
-	 */
-	public static EnumeratedAttributeDefinition<MappingMode> getMappingModeAttributeDefinition() {
-		return mappingModeAttrDef;
-	}
-
-	/**
-	 * <p>
-	 * openmpi 1.2 only.
-	 */
-	public static StringAttributeDefinition getHostnameAttributeDefinition() {
-		return hostnameAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{mpiJobIdAttrDef,vpidStartAttrDef,vpidRangeAttrDef,mappingModeAttrDef};
-	}
-
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPILaunchAttributes.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPILaunchAttributes.java
deleted file mode 100644
index 5484706..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPILaunchAttributes.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-
-
-/**
- * OMPI-specific attributes
- * 
- * @author Daniel Felix Ferber
- */
-public class OpenMPILaunchAttributes {
-	private static final String LAUNCH_ARGS_ATTR_ID = "Open_MPI_args"; //$NON-NLS-1$
-	private static final String ENV_KEYS_ATTR_ID = "Open_MPI_envKeys"; //$NON-NLS-1$
-	private static final String ENV_ARGS_ATTR_ID = "Open_MPI_env"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition launchArgsAttrDef =
-		new StringAttributeDefinition(LAUNCH_ARGS_ATTR_ID, Messages.OpenMPILaunchAttributes_launchArgsAttrDef_title,
-				Messages.OpenMPILaunchAttributes_launchArgsAttrDef_description, false, ""); //$NON-NLS-1$
-
-	private final static ArrayAttributeDefinition<String> environmentKeyAttrDef = new ArrayAttributeDefinition<String>(
-			ENV_KEYS_ATTR_ID, Messages.OpenMPILaunchAttributes_environmentKeyAttrDef_title,
-			Messages.OpenMPILaunchAttributes_environmentKeyAttrDef_description, false,
-			new String[0]);
-
-	private final static StringAttributeDefinition environmentArgsAttrDef = new StringAttributeDefinition(
-			ENV_ARGS_ATTR_ID, Messages.OpenMPILaunchAttributes_environmentArgsAttrDef_title, Messages.OpenMPILaunchAttributes_environmentArgsAttrDef_description, false,
-	"${Open_MPI_envKeys:: -x ::-x :}"); //$NON-NLS-1$
-
-	/**
-	 * List of names of environment variables for the application.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static ArrayAttributeDefinition<String> getEnvironmentKeysAttributeDefinition() {
-		return environmentKeyAttrDef;
-	}
-
-	/**
-	 * Environment variables for the application, as expected by openmpi command line.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static StringAttributeDefinition getEnvironmentArgsAttributeDefinition() {
-		return environmentArgsAttrDef;
-	}
-
-	/**
-	 * Arguments for the application, as expected by openmpi command line.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static StringAttributeDefinition getLaunchArgumentsAttributeDefinition() {
-		return launchArgsAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				launchArgsAttrDef,environmentArgsAttrDef,environmentKeyAttrDef
-		};
-	}
-
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIMachineAttributes.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIMachineAttributes.java
deleted file mode 100644
index c238a80..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIMachineAttributes.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class OpenMPIMachineAttributes {
-
-	private static final String STATUS_MESSAGE = "Open_MPI_statusMessage"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition statusMessageAttrDef =
-		new StringAttributeDefinition(STATUS_MESSAGE, Messages.OpenMPIMachineAttributes_statusMessageAttrDef_title,
-				Messages.OpenMPIMachineAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 * Status message if it was not possible to discover the machine.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
-		return statusMessageAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{statusMessageAttrDef};
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPINodeAttributes.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPINodeAttributes.java
deleted file mode 100644
index dfa7a68..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPINodeAttributes.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class OpenMPINodeAttributes {
-
-	private static final String NUM_NODES_ID = "Open_MPI_numNodes"; //$NON-NLS-1$
-	private static final String MAX_NUM_NODES_ID = "Open_MPI_maxNumNodes"; //$NON-NLS-1$
-	private static final String STATUS_MESSAGE = "Open_MPI_statusMessage"; //$NON-NLS-1$
-	private static final String OVERSUBSCRIBED = "Open_MPI_oversubscribed"; //$NON-NLS-1$
-
-	private final static IntegerAttributeDefinition numNodesAttrDef =
-		new IntegerAttributeDefinition(NUM_NODES_ID, Messages.OpenMPINodeAttributes_numNodesAttrDef_title,
-				Messages.OpenMPINodeAttributes_numNodesAttrDef_description, true, new Integer(0));
-
-	private final static IntegerAttributeDefinition maxNumNodesAttrDef =
-		new IntegerAttributeDefinition(MAX_NUM_NODES_ID, Messages.OpenMPINodeAttributes_maxNumNodesAttrDef_title,
-				Messages.OpenMPINodeAttributes_maxNumNodesAttrDef_description, true, new Integer(0));
-
-	private final static StringAttributeDefinition statusMessageAttrDef =
-		new StringAttributeDefinition(STATUS_MESSAGE, Messages.OpenMPINodeAttributes_statusMessageAttrDef_title,
-				Messages.OpenMPINodeAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
-	private final static BooleanAttributeDefinition oversubscribedAttrDef =
-		new BooleanAttributeDefinition(OVERSUBSCRIBED, Messages.OpenMPINodeAttributes_oversubscribedAttrDef_title,
-				Messages.OpenMPINodeAttributes_oversubscribedAttrDef_description, true, new Boolean(false));
-
-	/**
-	 * Number of slots suggested on the node.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static IntegerAttributeDefinition getNumberOfNodesAttributeDefinition() {
-		return numNodesAttrDef;
-	}
-
-	/**
-	 * Maximal number of slots on the node. Zero if not set.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static IntegerAttributeDefinition getMaximalNumberOfNodesAttributeDefinition() {
-		return maxNumNodesAttrDef;
-	}
-
-	/**
-	 * Status message if it was not possible to discover the node.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
-		return statusMessageAttrDef;
-	}
-
-	/**
-	 * If node is oversubscribed.
-	 * <p>
-	 * Note: openmpi 1.2 and 1.3
-	 */
-	public static BooleanAttributeDefinition getOversubscribedAttributeDefinition() {
-		return oversubscribedAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{numNodesAttrDef,maxNumNodesAttrDef,statusMessageAttrDef};
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIPlugin.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIPlugin.java
deleted file mode 100644
index 3b9f0a8..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/OpenMPIPlugin.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class OpenMPIPlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.openmpi.core"; //$NON-NLS-1$
-
-	// The shared instance
-	private static OpenMPIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public OpenMPIPlugin() {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		OpenMPI12Defaults.loadDefaults();
-		OpenMPI13Defaults.loadDefaults();
-		OpenMPI12PreferenceManager.initializePreferences();
-		OpenMPI13PreferenceManager.initializePreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static OpenMPIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 * 
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 * 
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 * 
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.OpenMPIPlugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/Messages.java
deleted file mode 100644
index 9abe7de..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/Messages.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.openmpi.core.messages.messages"; //$NON-NLS-1$
-	public static String OpenMPI12Defaults_Exception_FailedReadFile;
-	public static String OpenMPI12Defaults_FailedParseInteger;
-	public static String OpenMPI12Defaults_MissingValue;
-	
-	public static String OpenMPI13Defaults_Exception_FailedReadFile;
-	public static String OpenMPI13Defaults_FailedParseInteger;
-	public static String OpenMPI13Defaults_MissingValue;
-	
-	public static String OpenMPIApplicationAttributes_effectiveOpenMPIEnvAttrDef_description;
-	public static String OpenMPIApplicationAttributes_effectiveOpenMPIEnvAttrDef_title;
-	public static String OpenMPIApplicationAttributes_effectiveOpenMPIProgArgsAttrDef_description;
-	public static String OpenMPIApplicationAttributes_effectiveOpenMPIProgArgsAttrDef_title;
-	public static String OpenMPIApplicationAttributes_effectiveOpenMPIWorkingDirAttrDef_description;
-	public static String OpenMPIApplicationAttributes_effectiveOpenMPIWorkingDirAttrDef_title;
-	
-	public static String OpenMPIJobAttributes_hostnameAttrDef_description;
-	public static String OpenMPIJobAttributes_hostnameAttrDef_title;
-	public static String OpenMPIJobAttributes_mappingModeAttrDef_description;
-	public static String OpenMPIJobAttributes_mappingModeAttrDef_title;
-	public static String OpenMPIJobAttributes_mpiJobIdAttrDef_description;
-	public static String OpenMPIJobAttributes_mpiJobIdAttrDef_title;
-	public static String OpenMPIJobAttributes_vpidRangeAttrDef_description;
-	public static String OpenMPIJobAttributes_vpidRangeAttrDef_title;
-	public static String OpenMPIJobAttributes_vpidStartAttrDef_description;
-	public static String OpenMPIJobAttributes_vpidStartAttrDef_title;
-	
-	public static String OpenMPILaunchAttributes_environmentArgsAttrDef_description;
-	public static String OpenMPILaunchAttributes_environmentArgsAttrDef_title;
-	public static String OpenMPILaunchAttributes_environmentKeyAttrDef_description;
-	public static String OpenMPILaunchAttributes_environmentKeyAttrDef_title;
-	public static String OpenMPILaunchAttributes_launchArgsAttrDef_description;
-	public static String OpenMPILaunchAttributes_launchArgsAttrDef_title;
-	
-	public static String OpenMPIMachineAttributes_statusMessageAttrDef_description;
-	public static String OpenMPIMachineAttributes_statusMessageAttrDef_title;
-	
-	public static String OpenMPINodeAttributes_maxNumNodesAttrDef_description;
-	public static String OpenMPINodeAttributes_maxNumNodesAttrDef_title;
-	public static String OpenMPINodeAttributes_numNodesAttrDef_description;
-	public static String OpenMPINodeAttributes_numNodesAttrDef_title;
-	public static String OpenMPINodeAttributes_oversubscribedAttrDef_description;
-	public static String OpenMPINodeAttributes_oversubscribedAttrDef_title;
-	public static String OpenMPINodeAttributes_statusMessageAttrDef_description;
-	public static String OpenMPINodeAttributes_statusMessageAttrDef_title;
-	
-	public static String OpenMPIPlugin_Exception_InternalError;
-
-	public static String OpenMPIResourceManagerConfiguration_defaultDescription;
-	public static String OpenMPIResourceManagerConfiguration_defaultName;
-	public static String OpenMPIResourceManagerFactory_ResourceManagerName;
-
-	public static String OpenMPIDiscoverJob_defaultQueueName;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandFailed;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandFailedParseHostFile;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandFailedReadHostFile;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandHostFileEmpty;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandHostFileNotFound;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandInternalError;
-	public static String OpenMPIDiscoverJob_Exception_DiscoverCommandMissingHostFilePath;
-	public static String OpenMPIDiscoverJob_Exception_HostFileErrors;
-	public static String OpenMPIDiscoverJob_Exception_HostFileParseError;
-	public static String OpenMPIDiscoverJob_Exception_HostnameCommandFailed;
-	public static String OpenMPIDiscoverJob_Exception_HostnameCommandFailedParse;
-	public static String OpenMPIDiscoverJob_Exception_HostnameCommandFailedParseOutput;
-	public static String OpenMPIDiscoverJob_Exception_HostnameCommandFailedWithCode;
-	public static String OpenMPIDiscoverJob_Exception_IgnoredInvalidParameter;
-	public static String OpenMPIDiscoverJob_Exception_InvalidMaxSlotsParameter;
-	public static String OpenMPIDiscoverJob_Exception_InvalidSlotsParameter;
-	public static String OpenMPIDiscoverJob_interruptedErrorMessage;
-	public static String OpenMPIDiscoverJob_name;
-	public static String OpenMPIDiscoverJob_parsingErrorMessage;
-	public static String OpenMPIDiscoverJob_processErrorMessage;
-	
-	public static String OpenMPIProcessMapText12Parser_Exception_InvalidLine;
-	public static String OpenMPIProcessMapText12Parser_Exception_MissingDisplayMapInformation;
-	public static String OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation;
-	
-	public static String OpenMPIProcessMapXml13Parser_Exception_AttributeNotInteger;
-	public static String OpenMPIProcessMapXml13Parser_Exception_MissingAttribute;
-	public static String OpenMPIProcessMapXml13Parser_Exception_UnknownAttribute;
-	public static String OpenMPIProcessMapXml13Parser_Exception_UnknownElement;
-	
-	public static String OpenMPIRuntimeSystem_JobName;
-	public static String OpenMPIRuntimeSystemJob_Exception_FailedParse;
-	public static String OpenMPIRuntimeSystemJob_Exception_HostnamesDoNotMatch;
-	public static String OpenMPIRuntimeSystemJob_Exception_FailedExecute0;
-	public static String OpenMPIRuntimeSystemJob_ProcessName;
-	public static String OpenMPIRuntimeSystemJob_Exception_ExecutionFailedWithExitValue;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/messages.properties
deleted file mode 100644
index 1a10ef4..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/messages/messages.properties
+++ /dev/null

@@ -1,89 +0,0 @@
-OpenMPI12Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-OpenMPI12Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-OpenMPI12Defaults_MissingValue=Missing default value for {0}
-
-OpenMPI13Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-OpenMPI13Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-OpenMPI13Defaults_MissingValue=Missing default value for {0}
-
-OpenMPIApplicationAttributes_effectiveOpenMPIEnvAttrDef_description=Effective environment supplied by Open MPI to executable on launch
-OpenMPIApplicationAttributes_effectiveOpenMPIEnvAttrDef_title=Environment for Open MPI processes
-OpenMPIApplicationAttributes_effectiveOpenMPIProgArgsAttrDef_description=Effective command-line arguments by OpenMPI supplied to executable
-OpenMPIApplicationAttributes_effectiveOpenMPIProgArgsAttrDef_title=Program Arguments for Open MPI processes
-OpenMPIApplicationAttributes_effectiveOpenMPIWorkingDirAttrDef_description=Effective working directory where Open MPI launched the processes
-OpenMPIApplicationAttributes_effectiveOpenMPIWorkingDirAttrDef_title=Working Directory for Open MPI processes
-
-OpenMPIJobAttributes_hostnameAttrDef_description=Open MPI job hostname
-OpenMPIJobAttributes_hostnameAttrDef_title=Open MPI hostname
-OpenMPIJobAttributes_mappingModeAttrDef_description=Open MPI mapping mode
-OpenMPIJobAttributes_mappingModeAttrDef_title=Open MPI mapping mode
-OpenMPIJobAttributes_mpiJobIdAttrDef_description=Open MPI job id
-OpenMPIJobAttributes_mpiJobIdAttrDef_title=Open MPI job id
-OpenMPIJobAttributes_vpidRangeAttrDef_description=Open MPI vpid range
-OpenMPIJobAttributes_vpidRangeAttrDef_title=Open MPI vpid range
-OpenMPIJobAttributes_vpidStartAttrDef_description=Open MPI vpid start
-OpenMPIJobAttributes_vpidStartAttrDef_title=Open MPI vpid start
-
-OpenMPILaunchAttributes_environmentArgsAttrDef_description=Command line arguments to set environment variables for each Open MPI processes
-OpenMPILaunchAttributes_environmentArgsAttrDef_title=Open MPI Environment arguments
-OpenMPILaunchAttributes_environmentKeyAttrDef_description=Name of environment variables supplied to the each Open MPI processes
-OpenMPILaunchAttributes_environmentKeyAttrDef_title=Open MPI environment variables
-OpenMPILaunchAttributes_launchArgsAttrDef_description=Command line arguments for Open MPI
-OpenMPILaunchAttributes_launchArgsAttrDef_title=Open MPI arguments
-
-OpenMPIMachineAttributes_statusMessageAttrDef_description=Open MPI status message
-OpenMPIMachineAttributes_statusMessageAttrDef_title=Open MPI status message
-
-OpenMPINodeAttributes_maxNumNodesAttrDef_description=Open MPI maximal number of nodes on the host
-OpenMPINodeAttributes_maxNumNodesAttrDef_title=Open MPI maximal number of nodes
-OpenMPINodeAttributes_numNodesAttrDef_description=Open MPI number of nodes on the host
-OpenMPINodeAttributes_numNodesAttrDef_title=Open MPI number of nodes
-OpenMPINodeAttributes_oversubscribedAttrDef_description=Open MPI oversubscribed node (more processes than available)
-OpenMPINodeAttributes_oversubscribedAttrDef_title=Open MPI oversubscribed
-OpenMPINodeAttributes_statusMessageAttrDef_description=Open MPI status message
-OpenMPINodeAttributes_statusMessageAttrDef_title=Open MPI status message
-
-OpenMPIPlugin_Exception_InternalError=Internal error
-
-OpenMPIResourceManagerConfiguration_defaultDescription=Open MPI Resource Manager
-OpenMPIResourceManagerConfiguration_defaultName=Open_MPI
-OpenMPIResourceManagerFactory_ResourceManagerName=Open MPI
-
-OpenMPIDiscoverJob_defaultQueueName=default
-OpenMPIDiscoverJob_Exception_DiscoverCommandFailed=Error while running discover command: {0}.
-OpenMPIDiscoverJob_Exception_DiscoverCommandFailedParseHostFile=Failed to parse hostfile ({0}).
-OpenMPIDiscoverJob_Exception_DiscoverCommandFailedReadHostFile=Failed read hostfile ({0}).
-OpenMPIDiscoverJob_Exception_DiscoverCommandHostFileEmpty=Empty hostfile is not allowed ({0}).
-OpenMPIDiscoverJob_Exception_DiscoverCommandHostFileNotFound=Failed find hostfile ({0}).
-OpenMPIDiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute=Discover command informed a path to hostfile that is not an absolute path ({0}).
-OpenMPIDiscoverJob_Exception_DiscoverCommandInternalError=Internal error while running discover command: {0}
-OpenMPIDiscoverJob_Exception_DiscoverCommandMissingHostFilePath=Discover command did not inform path to default hostfile. If necessary, set MCA parameters to define default hostfile path.
-OpenMPIDiscoverJob_Exception_HostFileErrors=There are errors in the hostfile.
-OpenMPIDiscoverJob_Exception_HostFileParseError=Parse error(s) in hostfile.
-OpenMPIDiscoverJob_Exception_HostnameCommandFailed=Failed to run command to get hostname.
-OpenMPIDiscoverJob_Exception_HostnameCommandFailedParse=Failed to parse command for hostname.
-OpenMPIDiscoverJob_Exception_HostnameCommandFailedParseOutput=Failed to parse output of discover command.
-OpenMPIDiscoverJob_Exception_HostnameCommandFailedWithCode=Command to get hostname failed with exit code {0}
-OpenMPIDiscoverJob_Exception_IgnoredInvalidParameter=Invalid parameter was ignored for this host.
-OpenMPIDiscoverJob_Exception_InvalidMaxSlotsParameter=Invalid 'max-slots' parameter was ignored for this host.
-OpenMPIDiscoverJob_Exception_InvalidSlotsParameter=Invalid 'slots/cpus/count' parameter was ignored for this host.
-OpenMPIDiscoverJob_interruptedErrorMessage=Interrupted while running Open MPI discover command.
-OpenMPIDiscoverJob_name=Discover Open MPI on {0}
-OpenMPIDiscoverJob_parsingErrorMessage=Failed to parse output of Open MPI discover command.
-OpenMPIDiscoverJob_processErrorMessage=Failed to create remote process for Open MPI discover command.
-
-OpenMPIProcessMapText12Parser_Exception_InvalidLine=Invalid output from Open MPI: {0}
-OpenMPIProcessMapText12Parser_Exception_MissingDisplayMapInformation=Output from Open MPI has no information about processes and nodes.
-OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation=Incomplete output from Open MPI.
-
-OpenMPIProcessMapXml13Parser_Exception_AttributeNotInteger=Attribute {0} is not an valid integer ({1})
-OpenMPIProcessMapXml13Parser_Exception_MissingAttribute=Missing XML attribute: {0}
-OpenMPIProcessMapXml13Parser_Exception_UnknownAttribute=Unknown XML attribute: {0}
-OpenMPIProcessMapXml13Parser_Exception_UnknownElement=Unknown XML element: {0}
-
-OpenMPIRuntimeSystem_JobName=Open Mpi Job
-OpenMPIRuntimeSystemJob_Exception_FailedParse=Failed to parse Open Mpi run command output.
-OpenMPIRuntimeSystemJob_Exception_HostnamesDoNotMatch=Hostnames from Open MPI output do not match expected hostname.
-OpenMPIRuntimeSystemJob_Exception_FailedExecute0=Command failed. See output for more information.
-OpenMPIRuntimeSystemJob_ProcessName=Open MPI run
-OpenMPIRuntimeSystemJob_Exception_ExecutionFailedWithExitValue=Open MPI application terminated with exit value {0}.

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/OmpiInfo.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/OmpiInfo.java
deleted file mode 100644
index 1972ea5..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/OmpiInfo.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.parameters;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ptp.rm.mpi.openmpi.core.parameters.Parameters.Parameter;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class OmpiInfo implements Cloneable {
-
-	private Map<String, String> kvs = new HashMap<String, String>();
-	private Parameters params = new Parameters();
-
-	/**
-	 * @param name
-	 */
-	public void add(String key, String value) {
-		kvs.put(key, value);
-	}
-
-	public Parameter addParameter(String name) {
-		return params.addParameter(name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#clone()
-	 */
-	@Override
-	public OmpiInfo clone() throws CloneNotSupportedException {
-		OmpiInfo newInfo = new OmpiInfo();
-		newInfo.kvs = new HashMap<String, String>(kvs);
-		newInfo.params = params.clone();
-		return newInfo;
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	public String get(String key) {
-		return kvs.get(key);
-	}
-
-	public Parameters.Parameter getParameter(String name) {
-		return params.getParameter(name);
-	}
-	
-	public Parameter[] getParameters() {
-		return params.getParameters();
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/Parameters.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/Parameters.java
deleted file mode 100644
index c09ef8a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/parameters/Parameters.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.parameters;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class Parameters implements Cloneable {
-	public class Parameter implements Cloneable {
-		private String name;
-		private String value = ""; //$NON-NLS-1$
-		private String help = ""; //$NON-NLS-1$
-		private boolean readOnly = false;
-
-		public Parameter(String name) {
-			this.name = name;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#clone()
-		 */
-		@Override
-		public Parameter clone() throws CloneNotSupportedException {
-			Parameter param = new Parameter(name);
-			param.setValue(value);
-			param.setHelp(help);
-			param.setReadOnly(readOnly);
-			return param;
-		}
-
-		/**
-		 * @return the help
-		 */
-		public String getHelp() {
-			return help;
-		}
-
-		/**
-		 * @return
-		 */
-		public String getName() {
-			return name;
-		}
-
-		/**
-		 * @return
-		 */
-		public String getValue() {
-			return value;
-		}
-
-		/**
-		 * @return the readOnly
-		 */
-		public boolean isReadOnly() {
-			return readOnly;
-		}
-
-		/**
-		 * @param help the help to set
-		 */
-		public void setHelp(String help) {
-			this.help = help;
-		}
-
-		/**
-		 * @param name the name to set
-		 */
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		/**
-		 * @param readOnly the readOnly to set
-		 */
-		public void setReadOnly(boolean readOnly) {
-			this.readOnly = readOnly;
-		}
-
-		/**
-		 * @param value
-		 */
-		public void setValue(String value) {
-			this.value = value;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		@Override
-		public String toString() {
-			return getName();
-		}
-	}
-
-	private Map<String, Parameter> params = new HashMap<String, Parameter>();
-
-	/**
-	 * @param name
-	 */
-	public Parameter addParameter(Parameter param) {
-		params.put(param.getName(), param);
-		return param;
-	}
-
-	/**
-	 * @param name
-	 */
-	public Parameter addParameter(String name) {
-		Parameter param = new Parameter(name);
-		params.put(name, param);
-		return param;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#clone()
-	 */
-	@Override
-	public Parameters clone() throws CloneNotSupportedException {
-		Parameters newParams = new Parameters();
-		for (Parameter param : getParameters()) {
-			newParams.addParameter(param.clone());
-		}
-		return newParams;
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	public Parameter getParameter(String name) {
-		return params.get(name);
-	}
-
-	/**
-	 * @return
-	 */
-	public int getParameterCount() {
-		return params.size();
-	}
-
-	/**
-	 * @return
-	 */
-	public Parameter[] getParameters() {
-		return params.values().toArray(new Parameter[params.size()]);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/EffectiveOpenMPIResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/EffectiveOpenMPIResourceManagerConfiguration.java
deleted file mode 100644
index 2a136b6..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/EffectiveOpenMPIResourceManagerConfiguration.java
+++ /dev/null

@@ -1,46 +0,0 @@
-package org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPI12PreferenceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPI13PreferenceManager;
-
-public class EffectiveOpenMPIResourceManagerConfiguration extends
-AbstractEffectiveToolRMConfiguration {
-
-	public EffectiveOpenMPIResourceManagerConfiguration(
-			AbstractToolRMConfiguration configuration) {
-		super(configuration);
-		OpenMPIResourceManagerConfiguration openMPIconfiguration = (OpenMPIResourceManagerConfiguration)configuration;
-		String launchCmd = null;
-		String debugCmd = null;
-		String discoverCmd = null;
-		String remoteInstallPath = null;
-		if (openMPIconfiguration.useToolDefaults()) {
-			if (openMPIconfiguration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_12)) {
-				Preferences preferences = OpenMPI12PreferenceManager.getPreferences();
-				launchCmd = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_LAUNCH_CMD);
-				debugCmd = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_DEBUG_CMD);
-				discoverCmd = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_DISCOVER_CMD);
-				// remoteInstallPath = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_REMOTE_INSTALL_PATH);
-			} else if (openMPIconfiguration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_13)) {
-				Preferences preferences = OpenMPI13PreferenceManager.getPreferences();
-				launchCmd = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_LAUNCH_CMD);
-				debugCmd = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_DEBUG_CMD);
-				discoverCmd = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_DISCOVER_CMD);
-				// remoteInstallPath = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_REMOTE_INSTALL_PATH);
-			} else {
-				assert false;
-			}
-		} else {
-			launchCmd = openMPIconfiguration.getLaunchCmd();
-			debugCmd = openMPIconfiguration.getDebugCmd();
-			discoverCmd = openMPIconfiguration.getDiscoverCmd();
-			// remoteInstallPath = openMPIconfiguration.getRemoteInstallPath();
-		}
-		remoteInstallPath = openMPIconfiguration.getRemoteInstallPath();
-		applyValues(launchCmd, debugCmd, discoverCmd, null, 0, null, remoteInstallPath);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManager.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManager.java
deleted file mode 100755
index 5265122..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManager.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem;
-
-
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.rm.core.AbstractToolsAttributes;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolResourceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.core.parameters.OmpiInfo;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem.OpenMPIRuntimeSystem;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIResourceManager extends AbstractToolResourceManager {
-
-	private Integer OPENMPI_RMID;
-	private OpenMPIRuntimeSystem rts = null;
-
-	public OpenMPIResourceManager(Integer id, IPUniverseControl universe, IResourceManagerConfiguration config) {
-		super(id.toString(), universe, config);
-		OPENMPI_RMID = id;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateRuntimeSystem()
-	 */
-	@Override
-	protected IRuntimeSystem doCreateRuntimeSystem() {
-		OpenMPIResourceManagerConfiguration config = (OpenMPIResourceManagerConfiguration) getConfiguration();
-		AttributeDefinitionManager attrDefMgr = getAttributeDefinitionManager();
-		attrDefMgr.setAttributeDefinitions(AbstractToolsAttributes.getDefaultAttributeDefinitions());
-		rts = new OpenMPIRuntimeSystem(OPENMPI_RMID, config, attrDefMgr);
-		return rts;
-	}
-
-	/**
-	 * Get OpenMPI info
-	 * 
-	 * @return OmpiInfo
-	 */
-	public OmpiInfo getOmpiInfo() {
-		if (rts == null)
-			return null;
-		try {
-			return rts.getOmpiInfo().clone();
-		} catch (CloneNotSupportedException e) {
-			return null;
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerConfiguration.java
deleted file mode 100755
index 959257f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerConfiguration.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-/**
- *
- */
-package org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPI13PreferenceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIResourceManagerConfiguration extends
-AbstractToolRMConfiguration implements Cloneable {
-
-	public static int OPENMPI_CAPABILITIES = CAP_LAUNCH | CAP_DISCOVER | CAP_REMOTE_INSTALL_PATH;
-
-	private static final String TAG_VERSION_ID = "versionId"; //$NON-NLS-1$
-
-	public static final String VERSION_12 = "openmpi-1.2"; //$NON-NLS-1$
-	public static final String VERSION_13 = "openmpi-1.3"; //$NON-NLS-1$
-
-
-	/**
-	 * Static class to hold openmpi configuration information
-	 *
-	 * @author dfferber
-	 */
-	static public class OpenMpiConfig {
-
-		private ToolsConfig toolsConfig;
-		private String versionId;
-
-		public OpenMpiConfig() {
-			this(new ToolsConfig(), null);
-		}
-
-		public OpenMpiConfig(ToolsConfig toolsConfig, String versionId) {
-			super();
-			this.toolsConfig = toolsConfig;
-			this.versionId = versionId;
-		}
-
-		public ToolsConfig getToolsConfig() {
-			return toolsConfig;
-		}
-
-		public void setToolsConfig(ToolsConfig toolsConfig) {
-			this.toolsConfig = toolsConfig;
-		}
-
-		public String getVersionId() {
-			return versionId;
-		}
-
-		public void setVersionId(String versionId) {
-			this.versionId = versionId;
-		}
-	}
-
-	private String versionId;
-
-	public static OpenMpiConfig loadOpenMpiConfig(IResourceManagerFactory factory,
-			IMemento memento) {
-		ToolsConfig toolsConfig = loadTool(factory, memento);
-
-		String versionId = memento.getString(TAG_VERSION_ID);
-
-		OpenMpiConfig config = new OpenMpiConfig(toolsConfig, versionId);
-		return config;
-	}
-
-	public static OpenMPIResourceManagerConfiguration load(
-			OpenMPIResourceManagerFactory factory, IMemento memento) {
-		OpenMpiConfig openMpiConfig = loadOpenMpiConfig(factory, memento);
-		OpenMPIResourceManagerConfiguration config = new OpenMPIResourceManagerConfiguration(factory, openMpiConfig);
-		return config;
-	}
-
-	public OpenMPIResourceManagerConfiguration(OpenMPIResourceManagerFactory factory) {
-		super(OPENMPI_CAPABILITIES, new ToolsConfig(), factory);
-
-		/*
-		 * By default, assume openmpi 1.3 configuration.
-		 */
-		Preferences prefs = OpenMPI13PreferenceManager.getPreferences();
-		setLaunchCmd(prefs.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_LAUNCH_CMD));
-		setDebugCmd(prefs.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_DEBUG_CMD));
-		setDiscoverCmd(prefs.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_DISCOVER_CMD));
-		setRemoteInstallPath(prefs.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_REMOTE_INSTALL_PATH));
-		//		setUseToolDefaults(prefs.getBoolean(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_USE_DEFAULTS));
-		setVersionId(VERSION_13);
-	}
-
-	public OpenMPIResourceManagerConfiguration(OpenMPIResourceManagerFactory factory,
-			OpenMpiConfig config) {
-		/*
-		 * By default, assume openmpi 1.3 configuration.
-		 */
-		super(OPENMPI_CAPABILITIES, config.getToolsConfig(), factory);
-		setVersionId(config.getVersionId());
-	}
-
-	@Override
-	public Object clone() {
-		CommonConfig commonConf = new CommonConfig(getName(),
-				getDescription(), getUniqueName());
-		RemoteConfig remoteConf = new RemoteConfig(commonConf,
-				getRemoteServicesId(), getConnectionName(),
-				getProxyServerPath(), getLocalAddress(),
-				getInvocationOptionsStr(), getOptions());
-		ToolsConfig toolsConfig = new ToolsConfig(
-				remoteConf,
-				getLaunchCmd(),
-				getDebugCmd(),
-				getDiscoverCmd(),
-				getPeriodicMonitorCmd(),
-				getPeriodicMonitorTime(),
-				getContinuousMonitorCmd(),
-				getRemoteInstallPath(),
-				useToolDefaults());
-		OpenMpiConfig openMpiConfig = new OpenMpiConfig(toolsConfig, getVersionId());
-
-		return new OpenMPIResourceManagerConfiguration(
-				(OpenMPIResourceManagerFactory) getFactory(), openMpiConfig);
-	}
-
-	@Override
-	public void save(IMemento memento) {
-		super.save(memento);
-		memento.putString(TAG_VERSION_ID, versionId);
-	}
-
-	@Override
-	public void setDefaultNameAndDesc() {
-		String name = Messages.OpenMPIResourceManagerConfiguration_defaultName;
-		String conn = getConnectionName();
-		if (conn != null && !conn.equals(EMPTY_STRING)) {
-			name += "@" + conn; //$NON-NLS-1$
-		}
-		setName(name);
-		setDescription(Messages.OpenMPIResourceManagerConfiguration_defaultDescription);
-	}
-
-	public String getVersionId() {
-		return versionId;
-	}
-
-	public void setVersionId(String versionId) {
-		this.versionId = versionId;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerFactory.java
deleted file mode 100755
index 50118da..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rmsystem/OpenMPIResourceManagerFactory.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem;
-
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIResourceManagerFactory extends AbstractResourceManagerFactory {
-
-	public OpenMPIResourceManagerFactory() {
-		// QUESTION: Wouldnt it be better to take name from extension point?
-		// Extension point already has a name.
-		super(Messages.OpenMPIResourceManagerFactory_ResourceManagerName);
-	}
-
-	protected OpenMPIResourceManagerFactory(String name) {
-		super(name);
-	}
-
-	public IResourceManagerConfiguration copyConfiguration(
-			IResourceManagerConfiguration configuration) {
-		return (IResourceManagerConfiguration)configuration.clone();
-	}
-
-	@Override
-	public IResourceManagerControl create(IResourceManagerConfiguration confIn) {
-		OpenMPIResourceManagerConfiguration configuration = (OpenMPIResourceManagerConfiguration) confIn;
-		PTPCorePlugin plugin = PTPCorePlugin.getDefault();
-		IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
-		return new OpenMPIResourceManager(universe.getNextResourceManagerId(), universe, configuration);
-	}
-
-	public IResourceManagerConfiguration createConfiguration() {
-		OpenMPIResourceManagerConfiguration conf = new OpenMPIResourceManagerConfiguration(this);
-
-		return conf;
-	}
-
-	public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
-		return OpenMPIResourceManagerConfiguration.load(this, memento);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIDiscoverJob.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIDiscoverJob.java
deleted file mode 100644
index a087e2a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIDiscoverJob.java
+++ /dev/null

@@ -1,384 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.text.MessageFormat;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteProcess;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteCommandJob;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIMachineAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPINodeAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.eclipse.ptp.rm.mpi.openmpi.core.parameters.OmpiInfo;
-import org.eclipse.ptp.rm.mpi.openmpi.core.parameters.Parameters;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem.OpenMPIHostMap.Host;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIDiscoverJob extends AbstractRemoteCommandJob {
-	OpenMPIRuntimeSystem rts;
-
-	public OpenMPIDiscoverJob(OpenMPIRuntimeSystem rts) {
-		super(rts,
-				NLS.bind(Messages.OpenMPIDiscoverJob_name, rts.getRmConfiguration().getName()),
-				rts.retrieveEffectiveToolRmConfiguration().getDiscoverCmd(),
-				Messages.OpenMPIDiscoverJob_interruptedErrorMessage,
-				Messages.OpenMPIDiscoverJob_processErrorMessage,
-				Messages.OpenMPIDiscoverJob_parsingErrorMessage);
-		this.rts = rts;
-	}
-
-	@Override
-	protected void parse(BufferedReader output) throws CoreException {
-		/*
-		 * Local copy of attributes from the RuntimeSystem
-		 */
-		IRemoteConnection connection = rts.getConnection();
-		assert connection != null;
-		IRemoteServices remoteServices = rts.getRemoteServices();
-		assert remoteServices != null;
-		IRemoteFileManager fileMgr = remoteServices.getFileManager(connection);
-		OmpiInfo info = rts.getOmpiInfo();
-		OpenMPIResourceManagerConfiguration rmConfiguration = (OpenMPIResourceManagerConfiguration) rts.getRmConfiguration();
-		assert fileMgr != null;
-
-		/*
-		 * MPI resource manager have only one machine and one queue.
-		 * There they are implicitly "discovered".
-		 */
-		IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rts.getRmID());
-		String machineID = rts.createMachine(rm.getName());
-		rts.setMachineID(machineID);
-		String queueID = rts.createQueue(Messages.OpenMPIDiscoverJob_defaultQueueName);
-		rts.setQueueID(queueID);
-
-		IPMachine machine = rm.getMachineById(machineID);
-		assert machine != null;
-
-		/*
-		 * Any exception from now on is caught in order to add the error message as an attribute to the machine.
-		 * Then, the exception is re-thrown.
-		 */
-		try {
-			/*
-			 * STEP 1:
-			 * Parse output of command.
-			 * TODO: validate lines and write to log if invalid lines were found.
-			 */
-			parseOmpiInfo(output, info);
-
-			/*
-			 * STEP 2:
-			 * Read file that describes machine geography.
-			 * If no nodes are given, then we assume MPI default when host are not configured: there is only one node on the machine.
-			 * This part is a bit tricky.
-			 * OpenMPI 1.2 has a RDS (resource discovery system) that knows the default hostfile as rds_hostfile_path parameter.
-			 * But the RDS was dropped by version 1.3.
-			 * Then the orte_default_hostfile parameter might be used instead, as long as it was defined in the system wide MCA parameters.
-			 */
-			OpenMPIHostMap hostMap = readHostFile(connection, remoteServices, fileMgr, info, rmConfiguration);
-
-			/*
-			 * Create model according to data from discover.
-			 */
-			int rankCounter = 0;
-			boolean hasSomeError = false;
-			assert hostMap != null;
-
-			for (OpenMPIHostMap.Host host : hostMap.getHosts()) {
-
-				// Add node to model
-				String nodeId = rts.createNode(machineID, host.getName(), rankCounter++);
-				IPNode node = machine.getNodeById(nodeId);
-				rts.setNodeIDForName(host.getName(), nodeId);
-
-				// Add processor information to node.
-				AttributeManager attrManager = new AttributeManager();
-				if (host.getNumProcessors() != 0) {
-					try {
-						attrManager.addAttribute(OpenMPINodeAttributes.getNumberOfNodesAttributeDefinition().create(host.getNumProcessors()));
-					} catch (IllegalValueException e) {
-						// This situation is not possible since host.getNumProcessors() is always valid.
-						assert false;
-					}
-				}
-				if (host.getMaxNumProcessors() != 0) {
-					try {
-						attrManager.addAttribute(OpenMPINodeAttributes.getMaximalNumberOfNodesAttributeDefinition().create(host.getMaxNumProcessors()));
-					} catch (IllegalValueException e) {
-						// This situation is not possible since host.getMaxNumProcessors() is always valid.
-						assert false;
-					}
-				}
-				if (host.getErrors() != 0) {
-					if ((host.getErrors() & Host.ERR_MAX_NUM_SLOTS) != 0) {
-						attrManager.addAttribute(OpenMPINodeAttributes.getStatusMessageAttributeDefinition().create(Messages.OpenMPIDiscoverJob_Exception_InvalidMaxSlotsParameter));
-					} else if ((host.getErrors() & Host.ERR_NUM_SLOTS) != 0) {
-						attrManager.addAttribute(OpenMPINodeAttributes.getStatusMessageAttributeDefinition().create(Messages.OpenMPIDiscoverJob_Exception_InvalidSlotsParameter));
-					} else if ((host.getErrors() & Host.ERR_UNKNOWN_ATTR) != 0) {
-						attrManager.addAttribute(OpenMPINodeAttributes.getStatusMessageAttributeDefinition().create(Messages.OpenMPIDiscoverJob_Exception_IgnoredInvalidParameter));
-					}
-					attrManager.addAttribute(NodeAttributes.getStateAttributeDefinition().create(NodeAttributes.State.UP));
-					hasSomeError = true;
-				}
-				rts.changeNode(nodeId, attrManager);
-			}
-			if (hostMap.hasErrors) {
-				machine.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				machine.addAttribute(OpenMPIMachineAttributes.getStatusMessageAttributeDefinition().create(Messages.OpenMPIDiscoverJob_Exception_HostFileParseError));
-			}
-			if (hostMap.hasParseErrors() || hasSomeError)
-				throw new CoreException(new Status(IStatus.WARNING, OpenMPIPlugin.getDefault().getBundle().getSymbolicName(), Messages.OpenMPIDiscoverJob_Exception_HostFileErrors));
-
-		} catch (CoreException e) {
-			/*
-			 * Show message of core exception and change machine status to error.
-			 */
-			if (e.getStatus().getSeverity() == IStatus.ERROR) {
-				AttributeManager attrManager = new AttributeManager();
-				attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				attrManager.addAttribute(OpenMPIMachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandFailed, e.getMessage())));
-				rts.changeMachine(machineID, attrManager);
-				rm.addAttribute(ResourceManagerAttributes.getStateAttributeDefinition().create(ResourceManagerAttributes.State.ERROR));
-			}
-			throw e;
-		} catch (Exception e) {
-			/*
-			 * Show message of all other exceptions and change machine status to error.
-			 */
-			AttributeManager attrManager = new AttributeManager();
-			attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-			attrManager.addAttribute(OpenMPIMachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandInternalError, e.getMessage())));
-			rts.changeMachine(machineID, attrManager);
-			rm.addAttribute(ResourceManagerAttributes.getStateAttributeDefinition().create(ResourceManagerAttributes.State.ERROR));
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.getUniqueIdentifier(), NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandInternalError, e.getMessage()), e));
-		}
-	}
-
-	private OpenMPIHostMap readHostFile(IRemoteConnection connection,
-			IRemoteServices remoteServices, IRemoteFileManager fileMgr,
-			OmpiInfo info,
-			OpenMPIResourceManagerConfiguration rmConfiguration)
-	throws CoreException, IOException {
-
-		/*
-		 * OpenMpi 1.2 uses rds_hostfile_path. Open 1.3 uses orte_default_hostfile.
-		 * For 1.2, path must not be empty. For 1.3 it may be empty and default host is assumed.
-		 */
-		OpenMPIHostMap hostMap = null;
-		String hostFile = null;
-		IPath hostFilePath = null;
-
-		Parameters.Parameter rds_param = info.getParameter("rds_hostfile_path"); //$NON-NLS-1$
-		Parameters.Parameter orte_param = info.getParameter("orte_default_hostfile"); //$NON-NLS-1$
-		String prefix = info.get("path:prefix"); //$NON-NLS-1$
-
-		DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "rds_hostfile_path: {0}", (rds_param==null?"null":rds_param.getValue())); //$NON-NLS-1$  //$NON-NLS-2$
-		DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "orte_default_hostfile: {0}", (orte_param==null?"null":orte_param.getValue())); //$NON-NLS-1$  //$NON-NLS-2$
-		DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "prefix: {0}", (prefix==null?"null":prefix)); //$NON-NLS-1$  //$NON-NLS-2$
-
-		if (rds_param != null) {
-			hostFile = rds_param.getValue();
-			if (hostFile.trim().length() != 0) {
-				hostFilePath = new Path(hostFile);
-			}
-		}
-		
-		if (hostFilePath == null && orte_param != null) {
-			hostFile = orte_param.getValue();
-			if (hostFile.trim().length() != 0) {
-				hostFilePath = new Path(hostFile);
-			}
-		}
-		
-		if (hostFilePath == null) {
-			if (rmConfiguration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_12)) {
-				DebugUtil.error(DebugUtil.RTS_DISCOVER_TRACING, "Missing mandatory hostfile for Open MPI 1.2."); //$NON-NLS-1$
-				throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandMissingHostFilePath));
-			}
-			
-			hostMap = new OpenMPIHostMap();
-			String hostname = getRemoteHostname(connection, remoteServices);
-			hostMap.addDefaultHost(hostname);
-			DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "Missing optional hostfile. Assuming {0} as default host.", hostname); //$NON-NLS-1$
-			return hostMap;
-		}
-		
-		DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "Found hostfile for Open MPI"); //$NON-NLS-1$
-		DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "hostFilePath: {0}", hostFilePath); //$NON-NLS-1$
-
-		if (!hostFilePath.isAbsolute()) {
-			if (rmConfiguration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_12)) {
-				throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute, hostFilePath)));
-			}
-			
-			hostMap = new OpenMPIHostMap();
-			String hostname = getRemoteHostname(connection, remoteServices);
-			hostMap.addDefaultHost(hostname);
-			DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "Bad hostfile specification. Assuming {0} as default host.", hostname); //$NON-NLS-1$
-			return hostMap;
-		}
-		
-		// Try to read.
-		DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "Opening hostfile."); //$NON-NLS-1$
-		IProgressMonitor monitor = new NullProgressMonitor();
-		IFileStore hostfile;
-		try {
-			hostfile = fileMgr.getResource(hostFilePath, monitor);
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandHostFileNotFound, hostFilePath), e));
-		}
-
-		InputStream is = null;
-		try {
-			is = hostfile.openInputStream(EFS.NONE, monitor);
-		} catch (CoreException e) {
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandFailedReadHostFile, hostfile), e));
-		}
-
-		DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "Parsing hostfile."); //$NON-NLS-1$
-		try {
-			BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-			hostMap = OpenMPIHostMapParser.parse(reader);
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandFailedParseHostFile, hostfile), e));
-		}
-		
-		/*
-		 * If no host information was found in the hostfile, add default.
-		 * Only for Open MPI 1.2. On 1.3, there is no default host file assumed.
-		 */
-		if (hostMap.count() == 0) {
-			if (rmConfiguration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_12)) {
-				// This was not correct for remote hosts. Worked only for local hosts.
-				//					try {
-				//						InetAddress localhost = InetAddress.getLocalHost();
-				//						hostMap.addDefaultHost(localhost.getHostName());
-				//					} catch (UnknownHostException e) {
-				//						throw new CoreException(new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), "Cannot retrive network information for local machine. Check network configuration."));
-				//					}
-				String hostname = getRemoteHostname(connection, remoteServices);
-				hostMap.addDefaultHost(hostname);
-				DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "Hostfile is empty. Added default host {0} for Open MPI 1.2.", hostname); //$NON-NLS-1$
-			} 
-			
-			DebugUtil.error(DebugUtil.RTS_DISCOVER_TRACING, "Empty hostfile is not allowed."); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, NLS.bind(Messages.OpenMPIDiscoverJob_Exception_DiscoverCommandHostFileEmpty, hostfile)));
-		}
-		return hostMap;
-	}
-
-	private String getRemoteHostname(IRemoteConnection connection,
-			IRemoteServices remoteServices) throws CoreException, IOException {
-		IRemoteProcessBuilder processBuilder = remoteServices.getProcessBuilder(connection, "hostname"); //$NON-NLS-1$
-		IRemoteProcess process = null;
-		try {
-			process = processBuilder.start();
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, Messages.OpenMPIDiscoverJob_Exception_HostnameCommandFailed, e));
-		}
-		BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
-		try {
-			process.waitFor();
-		} catch (InterruptedException e) {
-			// Ignore
-		}
-		if (process.exitValue() != 0)
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, NLS.bind(Messages.OpenMPIDiscoverJob_Exception_HostnameCommandFailedWithCode, process.exitValue())));
-		String hostname = br.readLine();
-		if (hostname == null)
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.PLUGIN_ID, Messages.OpenMPIDiscoverJob_Exception_HostnameCommandFailedParse));
-		return hostname;
-	}
-
-	private void parseOmpiInfo(BufferedReader output, OmpiInfo info)
-	throws CoreException {
-
-		try {
-			String line;
-			while ((line = output.readLine()) != null) {
-				if (line.indexOf("mca:") == 0) { //$NON-NLS-1$
-					int nameStart = line.indexOf(":param:"); //$NON-NLS-1$
-					if (nameStart >= 0) {
-						nameStart += 7;
-						int pos = line.indexOf(":", nameStart); //$NON-NLS-1$
-						if (pos >= 0) {
-							/*
-							 * If parameter is already in list, then update, otherwise add.
-							 */
-							String name = line.substring(nameStart, pos);
-							Parameters.Parameter param = info.getParameter(name);
-							if (param == null) {
-								param = info.addParameter(name);
-							}
-							int pos2;
-							if ((pos2 = line.indexOf(":value:", pos)) >= 0) { //$NON-NLS-1$
-								param.setValue(line.substring(pos2 + 7));
-							} else if ((pos2 = line.indexOf(":status:", pos)) >= 0) { //$NON-NLS-1$
-								if (line.substring(pos2 + 8).equals("read-only")) { //$NON-NLS-1$
-									param.setReadOnly(true);
-								}
-							} else if ((pos2 = line.indexOf(":help:", pos)) >= 0) { //$NON-NLS-1$
-								param.setHelp(line.substring(pos2 + 6));
-							}
-						}
-					}
-				} else {
-					int valStart = line.lastIndexOf(":"); // will fail if value contains a colon! //$NON-NLS-1$
-					if (valStart >= 0) {
-						info.add(line.substring(0, valStart), line.substring(valStart+1));
-					}
-				}
-			}
-			if (DebugUtil.RTS_DISCOVER_TRACING) {
-				System.out.println("Open MPI parameters:"); //$NON-NLS-1$
-				for (Parameters.Parameter param : info.getParameters()) {
-					System.out.println(MessageFormat.format("  {0}={1}", param.getName(), param.getValue())); //$NON-NLS-1$
-				}
-			}
-		} catch (IOException e) {
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIPlugin.getDefault().getBundle().getSymbolicName(), Messages.OpenMPIDiscoverJob_Exception_HostnameCommandFailedParseOutput, e));
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMap.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMap.java
deleted file mode 100644
index c3b731c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMap.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIHostMap {
-	public static class Host {
-		public final static int NO_ERRORS = 0;
-		public final static int ERR_NUM_SLOTS = 1 << 1;
-		public final static int ERR_MAX_NUM_SLOTS = 1 << 2;
-		public final static int ERR_UNKNOWN_ATTR = 1 << 3;
-
-		private String name = null;
-		private int numProcessors = 0;
-		private int maxNumProcessors = 0;
-		private int errors = NO_ERRORS;
-
-		public Host(String hostname) {
-			this.name = hostname;
-		}
-
-		public int getNumProcessors() {
-			return numProcessors;
-		}
-
-		public int getMaxNumProcessors() {
-			return maxNumProcessors;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public int getErrors() {
-			return errors;
-		}
-
-		public void setNumProcessors(int numProcessors) {
-			this.numProcessors = numProcessors;
-		}
-
-		public void setMaxNumProcessors(int maxNumProcessors) {
-			this.maxNumProcessors = maxNumProcessors;
-		}
-
-		public void addErrors(int errors) {
-			this.errors |= errors;
-		}
-	}
-
-	List<Host> hosts = new ArrayList<Host>();
-	Map<String, Host> hostNameToHost = new HashMap<String, Host>();
-	boolean hasErrors = false;
-
-	protected void addHost(Host host) {
-		hosts.add(host);
-		hostNameToHost.put(host.getName(), host);
-	}
-
-	public Host[] getHosts() {
-		return hosts.toArray(new Host[hosts.size()]);
-	}
-
-	public Iterator<Host> getHostIterator() {
-		return hosts.listIterator();
-	}
-
-	public Host getHostByName(String name) {
-		return hostNameToHost.get(name);
-	}
-
-	public void addDefaultHost(String name) {
-		OpenMPIHostMap.Host host = new OpenMPIHostMap.Host(name);
-		host.numProcessors = 1;
-		host.maxNumProcessors = 0;
-		addHost(host);
-	}
-
-	public int count() {
-		return hosts.size();
-	}
-
-	public boolean hasParseErrors() {
-		return hasErrors;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMapParser.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMapParser.java
deleted file mode 100644
index ca9f9ba..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIHostMapParser.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem.OpenMPIHostMap.Host;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIHostMapParser {
-	private OpenMPIHostMapParser() {
-		// Do not allow instances.
-	}
-
-	OpenMPIHostMap map = new OpenMPIHostMap();
-	//	boolean hasErrors = false;
-
-	static Pattern pattern = Pattern.compile("\\s*(\\S+)((?:\\s+\\S+=\\d+)*)\\s*"); //$NON-NLS-1$
-	static Pattern paramPattern = Pattern.compile("\\s*(\\S+)=(\\d+)"); //$NON-NLS-1$
-	//	static Pattern hostnamePattern = Pattern.compile("\\s*(\\S+)");
-	//	static Pattern slotsPattern = Pattern.compile("\\s+(?:slots|cpus|count)\\s*=\\s*(\\d+)", Pattern.CASE_INSENSITIVE);
-	//	static Pattern maxSlotsPattern = Pattern.compile("\\s+max-slots\\s*=\\s*(\\d+)", Pattern.CASE_INSENSITIVE);
-	/*
-	 * Some very advanced regex. Maches a line that does NOT contain a valid parameter.
-	 * In other words, matches a line with any invalid parameter.
-	 * ^ - match beginning of line
-	 * (! ) - match string that does not satisfy the enclosed regex
-	 * (.*\\s(?:count|cpus|slots)\\s*= - matches the words count,cpus or slots starting anywhere,
-	 *     with a space before, and followed by equal with optional interleaving space.
-	 */
-	//	static Pattern othersPattern = Pattern.compile("^(?!.*\\s(?:count|cpus|slots|max-slots)\\s*=)", Pattern.CASE_INSENSITIVE);
-
-	public static OpenMPIHostMap parse(BufferedReader reader) throws IOException {
-		OpenMPIHostMapParser parser = new OpenMPIHostMapParser();
-		String line;
-		while ((line = reader.readLine()) != null) {
-			/*
-			 * Remove comments from line.
-			 */
-			int index = line.indexOf('#');
-			if (index != -1) {
-				line = line.substring(0, index);
-			}
-			line = line.trim();
-
-			if (line.length()==0) {
-				// Ignore empty line
-				continue;
-			}
-
-			Matcher matcher = pattern.matcher(line);
-			if (! matcher.matches()) {
-				// Ignore the line
-				parser.map.hasErrors = true;
-				DebugUtil.error(DebugUtil.RTS_DISCOVER_TRACING, "Ignoring invalid line: '{0}'", line); //$NON-NLS-1$
-				continue;
-			}
-
-			/*
-			 * Add host. According to MacOS X man page for mpirun:
-			 * - If the number of slots and max-slots are omitted, then openmpi understands that the host accepts
-			 * only one process and that oversubscribing is allowed. This is assumed as default.
-			 * - If number of slots is omitted, but not max-slots, the it is assumed that slots=max-slots.
-			 * - If both number of slots and max-slots are give, then their values are kept, as long as slots<=max-slots.
-			 */
-			OpenMPIHostMap.Host host = new OpenMPIHostMap.Host(matcher.group(1));
-			parser.map.hosts.add(host);
-			host.setNumProcessors(0);
-			host.setMaxNumProcessors(0);
-
-			String parameters = matcher.group(2);
-			matcher = paramPattern.matcher(parameters);
-			/*
-			 * Try to get slots and max-slots information.
-			 */
-			while (matcher.find()) {
-				//			for (int i = 2; i <= matcher.groupCount(); i+=2) {
-				String key = matcher.group(1);
-				String value = matcher.group(2);
-
-				if (key.equalsIgnoreCase("slots") || key.equalsIgnoreCase("cpus") || key.equalsIgnoreCase("count")) {   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
-					/*
-					 * On failure to parse, assume 0 processors (no info available).
-					 */
-					try {
-						host.setNumProcessors(Integer.parseInt(value));
-						if (host.getNumProcessors() <= 1) {
-							host.setNumProcessors(0);
-						}
-					} catch (NumberFormatException e) {
-						host.addErrors(OpenMPIHostMap.Host.ERR_NUM_SLOTS);
-						host.setNumProcessors(1);
-					}
-				} else if (key.equalsIgnoreCase("max-slots")) { //$NON-NLS-1$
-					try {
-						/*
-						 * On failure to parse, assume 0 (no information available).
-						 */
-						host.setMaxNumProcessors(Integer.parseInt(value));
-						if (host.getMaxNumProcessors() <= 1) {
-							host.setMaxNumProcessors(0);
-						}
-					} catch (NumberFormatException e) {
-						host.addErrors(Host.ERR_MAX_NUM_SLOTS);
-						host.setMaxNumProcessors(0);
-					}
-				} else {
-					DebugUtil.error(DebugUtil.RTS_DISCOVER_TRACING, "Invalud attribute: '{0}'", matcher.group()); //$NON-NLS-1$
-					host.addErrors(OpenMPIHostMap.Host.ERR_UNKNOWN_ATTR);
-				}
-			}
-			/*
-			 * Validate numbers.
-			 */
-			if (host.getNumProcessors() == 0) {
-				if (host.getMaxNumProcessors() == 0) {
-					host.setNumProcessors(1);
-				} else {
-					host.setNumProcessors(host.getMaxNumProcessors());
-				}
-			} else {
-				if (host.getMaxNumProcessors() > 0) {
-					if (host.getNumProcessors() > host.getMaxNumProcessors()) {
-						host.addErrors(Host.ERR_MAX_NUM_SLOTS);
-						host.setNumProcessors(host.getMaxNumProcessors());
-					}
-				}
-			}
-			DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "  {0} slots={1} max-slots={2}", host.getName(), host.getNumProcessors(), host.getMaxNumProcessors()); //$NON-NLS-1$
-		}
-
-		return parser.map;
-	}
-	public static void main(String[] args) {
-		Pattern pattern = Pattern.compile("\\s*(\\S+)(?:\\s+(\\S+)\\s*=\\s*(\\d+))*"); //$NON-NLS-1$
-		Matcher m = pattern.matcher("e slots=3 max-slots=4 r=5"); //$NON-NLS-1$
-		if (!m.matches()) {
-			System.out.println("no"); //$NON-NLS-1$
-			return;
-		}
-		for(int i = 1; i <= m.groupCount(); i++) {
-			System.out.println(m.group(i));
-		}
-	}
-}
-

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMap.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMap.java
deleted file mode 100644
index 0d08884..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMap.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIProcessMap {
-
-	/**
-	 * An application launched by mpirun.
-	 * 
-	 * @author dfferber
-	 */
-	static public class Application {
-		private int index;
-		private String name = new String();
-		final private AttributeManager attributeManager = new AttributeManager();
-		private int numberOfProcessors;
-
-		public Application(int index, String applicationName, int numberOfProcessors) {
-			super();
-			this.index = index;
-			this.name = applicationName;
-			this.numberOfProcessors = numberOfProcessors;
-		}
-
-		public int getIndex() {
-			return index;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public int getNumberOfProcessors() {
-			return numberOfProcessors;
-		}
-
-		public AttributeManager getAttributeManager() {
-			return attributeManager;
-		}
-	}
-
-	/**
-	 * A host that is executing processes from mpirun.
-	 * 
-	 * @author dfferber
-	 */
-	static public class Node {
-		// Information provided by openmpi 1.2 and 1.3
-		private String name = null;
-		private List<String> resolvedNames = new ArrayList<String>();
-		private Iterator<String> iterator = null;
-
-		final private AttributeManager attributeManager = new AttributeManager();
-
-		// References to processes.
-		private List<Process> processes = new ArrayList<Process>();
-
-		public Node(String name) {
-			super();
-			this.name = name;
-		}
-
-		public String getName() {
-			return name;
-		}
-		
-		public String getResolvedName() {
-			if (iterator == null || !iterator.hasNext()) {
-				iterator = resolvedNames.listIterator();
-			}
-			if (!iterator.hasNext()) {
-				return name;
-			}
-			return iterator.next();
-		}
-		
-		public void addResolvedName(String name) {
-			if (!resolvedNames.contains(name)) {
-				resolvedNames.add(name);
-			}
-		}
-
-		public AttributeManager getAttributeManager() {
-			return attributeManager;
-		}
-
-		//		public void addProcessor(Process process) {
-		//			processes.add(process);
-		//		}
-
-		public List<Process> getProcesses() {
-			return Collections.unmodifiableList(processes);
-		}
-
-	}
-
-	/**
-	 * A process spawned by mpirun for a certain application on a certain node.
-	 */
-	static public class Process {
-		private String name;
-		private int index;
-		private int applicationIndex;
-		private Node node;
-
-		final private AttributeManager attributeManager = new AttributeManager();
-
-		public Process(Node node, int index, String name, int applicationIndex) {
-			super();
-			this.node = node;
-			this.name = name;
-			this.index = index;
-			this.applicationIndex = applicationIndex;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public int getIndex() {
-			return index;
-		}
-
-		public int getApplicationIndex() {
-			return applicationIndex;
-		}
-
-		public AttributeManager getAttributeManager() {
-			return attributeManager;
-		}
-
-		public Node getNode() {
-			return node;
-		}
-	}
-
-	final private AttributeManager attributeManager = new AttributeManager();
-	final private List<Application> applications = new ArrayList<Application>();
-	final private Map<String,Node> nodes = new HashMap<String,Node>();
-	final private List<Process> processes = new ArrayList<Process>();
-
-	public OpenMPIProcessMap() {
-		// Nothing.
-	}
-
-	public List<Process> getProcesses() {
-		return Collections.unmodifiableList(processes);
-	}
-
-	public List<Node> getNodes() {
-		return Collections.unmodifiableList(new ArrayList<Node>(nodes.values()));
-	}
-
-	public List<Application> getAppContexts() {
-		return Collections.unmodifiableList(applications);
-	}
-
-	public AttributeManager getAttributeManager() {
-		return attributeManager;
-	}
-
-	public void addApplication(Application application) {
-		this.applications.add(application);
-	}
-
-	public void addNode(Node node) {
-		nodes.put(node.getName(), node);
-	}
-	
-	public Node getNode(String name) {
-		return nodes.get(name);
-	}
-
-	public void addProcess(Process process) {
-		processes.add(process);
-		process.node.processes.add(process);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapText12Parser.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapText12Parser.java
deleted file mode 100644
index 85cca64..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapText12Parser.java
+++ /dev/null

@@ -1,494 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIApplicationAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIJobAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPINodeAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIJobAttributes.MappingMode;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIProcessMapText12Parser {
-	private OpenMPIProcessMapText12Parser() {
-		// Do not allow instances.
-	}
-
-	OpenMPIProcessMap map = new OpenMPIProcessMap();
-	int numApplications;
-	int numNodes;
-
-	public static OpenMPIProcessMap parse(InputStream is) throws IOException {
-		OpenMPIProcessMapText12Parser parser = new OpenMPIProcessMapText12Parser();
-		BufferedReader reader = new BufferedReader(new InputStreamReader(is), 1);
-
-		parser.readStart(reader);
-		parser.readVpid(reader);
-		for (int i = 0; i < parser.numApplications; i++) {
-			parser.readAppContext(reader);
-		}
-		parser.readNumElements(reader);
-		for (int i = 0; i < parser.numNodes; i++) {
-			parser.readMappedNode(reader, i);
-		}
-
-		return parser.map;
-	}
-
-	/*
-	 * Find mapped node information, ignoring anything else. Format should be:
-	 * 
-	 * 		Mapped node:
-	 * 			Cell: 0 Nodename: dyn531995.br.ibm.com Launch id: -1 Username: NULL
-	 * 			Daemon name:
-	 * 				Data type: ORTE_PROCESS_NAME Data Value: NULL
-	 * 			Oversubscribed: True Num elements in procs list: 6
-	 * 			Mapped proc:
-	 * 				Proc Name:
-	 * 				Data type: ORTE_PROCESS_NAME Data Value: [0,1,0]
-	 * 				Proc Rank: 0 Proc PID: 0 App_context index: 0
-	 */
-	private void readMappedNode(BufferedReader reader, int nodeCounter) throws IOException {
-		Pattern p = Pattern.compile("\\s*Mapped node:"); //$NON-NLS-1$
-		String line;
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				break;
-			}
-		}
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-
-		p = Pattern.compile("\\s*Cell:\\s*(\\S*)\\s*Nodename:\\s*(\\S*)\\s*Launch id:\\s*(\\S*)\\s*Username:\\s*(\\S*)"); //$NON-NLS-1$
-		String nodeName = ""; //$NON-NLS-1$
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				try {
-					nodeName = m.group(2);
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-				
-				break;
-			}
-		}
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-		
-		OpenMPIProcessMap.Node node = new OpenMPIProcessMap.Node(nodeName);
-		map.addNode(node);
-
-		p = Pattern.compile("\\s*Daemon name:"); //$NON-NLS-1$
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				break;
-			}
-		}
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-		
-		p = Pattern.compile("\\s*Data type:\\s*\\S*\\s*Data Value:\\s*\\S*"); //$NON-NLS-1$
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				break;
-			}
-		}
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-		
-		p = Pattern.compile("\\s*Oversubscribed:\\s*(\\S*)\\s*Num elements in procs list:\\s*(\\d*)"); //$NON-NLS-1$
-		
-		int numProcesses = 0;
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				try {
-					String s = m.group(1);
-					if (s.equalsIgnoreCase("true")) { //$NON-NLS-1$
-						node.getAttributeManager().addAttribute(OpenMPINodeAttributes.getOversubscribedAttributeDefinition().create(true));
-					} else if (s.equalsIgnoreCase("false")) { //$NON-NLS-1$
-						node.getAttributeManager().addAttribute(OpenMPINodeAttributes.getOversubscribedAttributeDefinition().create(false));
-					} else {
-						throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-					}
-					s = m.group(2);
-					numProcesses = Integer.parseInt(s);
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-				
-				break;
-			}
-		}
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-
-		p = Pattern.compile("\\s*Mapped proc:"); //$NON-NLS-1$
-		Pattern p2 = Pattern.compile("\\s*Proc Name:\\s*(\\S*)"); //$NON-NLS-1$
-		Pattern p3 = Pattern.compile("\\s*Data type:\\s*\\S*\\s*Data Value:\\s*\\S*"); //$NON-NLS-1$
-		Pattern p4 = Pattern.compile("\\s*Proc Rank:\\s*(\\d*)\\s*Proc PID:\\s*(\\d*)\\s*App_context index:\\s*(\\d*)"); //$NON-NLS-1$
-
-		for (int i = 0; i < numProcesses; i ++) {
-			String processName = ""; //$NON-NLS-1$
-			int processIndex = 0;
-			int processPid = 0;
-			int applicationIndex = 0;
-
-			// Mapped proc:
-			while ((line = reader.readLine()) != null) {
-				Matcher m = p.matcher(line);
-				if (m.matches()) {
-					break;
-				}
-			}
-			if (line == null) {
-				throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-			}
-			
-			// Proc Name:
-			while ((line = reader.readLine()) != null) {
-				Matcher m = p2.matcher(line);
-				if (m.matches()) {
-					processName = m.group(1);
-					break;
-				}
-			}
-			if (line == null) {
-				throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-			}
-
-			// Data type:
-			while ((line = reader.readLine()) != null) {
-				Matcher m = p3.matcher(line);
-				if (m.matches()) {
-					break;
-				}
-			}
-			if (line == null) {
-				throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-			}
-			
-			// Proc Rank:
-			while ((line = reader.readLine()) != null) {
-				Matcher m = p4.matcher(line);
-				if (m.matches()) {
-					try {
-						String s = m.group(1);
-						processIndex = Integer.parseInt(s);
-						s = m.group(2);
-						processPid = Integer.parseInt(s);
-						s = m.group(3);
-						applicationIndex = Integer.parseInt(s);
-					} catch (NumberFormatException e) {
-						throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-					}
-					
-					break;
-				}
-			}
-			if (line == null) {
-				throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-			}
-
-			OpenMPIProcessMap.Process proc = new OpenMPIProcessMap.Process(node, processIndex, processName, applicationIndex);
-			map.addProcess(proc);
-			try {
-				proc.getAttributeManager().addAttribute(ProcessAttributes.getPIDAttributeDefinition().create(processPid));
-			} catch (IllegalValueException e) {
-				// This is not possible.
-				assert false;
-			}
-		}
-	}
-
-	/*
-	 * Find num elements line, ignoring anything else. Format should be:
-	 *
-	 *		Num elements in nodes list: 1
-	 */
-	private void readNumElements(BufferedReader reader) throws IOException {
-		Pattern p = Pattern.compile("\\s*Num elements in nodes list:\\s*(\\d*)"); //$NON-NLS-1$
-		String line;
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				try {
-					String s = m.group(1);
-					numNodes = Integer.parseInt(s);
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-				
-				break;
-			}
-		}
-		
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-	}
-	
-	/*
-	 * Find app context, ignoring anything else. Format should be:
-	 * 
-	 * 		Data for app_context: index 0 app: hello
-	 * 			Num procs: 4
-	 * 			Argv[0]: hello
-	 * 			Env[0]: OMPI_MCA_rmaps_base_display_map=1
-	 *			Env[1]: OMPI_MCA_orte_precondition_transports=e91ae2fd9a00796a-e5685cefcdbaa089
-	 *			...
-	 *			Working dir: /home/dfferber/EclipseWorkspaces/runtime-New_configuration/hello/Debug (user: 0)
-	 *			Num maps: 0
-	 *			
-	 */
-	private void readAppContext(BufferedReader reader) throws IOException {
-		String line;
-		int applicationIndex = 0;
-		String applicationName = ""; //$NON-NLS-1$
-		int numberOfProcessors = 0;
-
-		Pattern p = Pattern.compile("\\s*Data for app_context:\\s*\\w*\\s*(\\d*)[^:]*:\\s*(.*)"); //$NON-NLS-1$
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-	
-			if (m.matches()) {
-				try {
-					String s = m.group(1);
-					applicationIndex = Integer.parseInt(s);
-					s = m.group(2);
-					applicationName = s;
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-			}
-			
-			break;
-		}
-		
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-		
-		p = Pattern.compile("\\s*Num procs:\\s*(\\d*)"); //$NON-NLS-1$
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				try {
-					String s = m.group(1);
-					numberOfProcessors = Integer.parseInt(s);
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-				
-				break;
-			}
-		}
-		
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-
-		OpenMPIProcessMap.Application application = new OpenMPIProcessMap.Application(applicationIndex, applicationName, numberOfProcessors);
-		map.addApplication(application);
-
-		/*
-		 * Collect Argv and Env lines until we match Working Dir
-		 */
-		Pattern p1 = Pattern.compile("\\s*Argv\\[\\d*\\]\\s*:\\s*(.*)"); //$NON-NLS-1$
-		Pattern p2 = Pattern.compile("\\s*Env\\[\\d*\\]\\s*:\\s*(.*)"); //$NON-NLS-1$
-		p = Pattern.compile("\\s*Working dir:\\s*(.*)"); //$NON-NLS-1$
-
-		List<String> arguments = new ArrayList<String>();
-		List<String> environment = new ArrayList<String>();
-
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				String s = m.group(1).trim();
-				application.getAttributeManager().addAttribute(OpenMPIApplicationAttributes.getEffectiveOpenMPIWorkingDirAttributeDefinition().create(s));
-				break;
-			}
-			
-			m = p1.matcher(line);
-			if (m.matches()) {
-				arguments.add(m.group(1));
-			} else {
-				m = p2.matcher(line);
-				if (m.matches()) {
-					environment.add(m.group(1));
-				}
-			}
-		}
-		
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-		
-		application.getAttributeManager().addAttribute(OpenMPIApplicationAttributes.getEffectiveOpenMPIProgArgsAttributeDefinition().create(arguments.toArray(new String[arguments.size()])));
-		application.getAttributeManager().addAttribute(OpenMPIApplicationAttributes.getEffectiveOpenMPIEnvAttributeDefinition().create(environment.toArray(new String[environment.size()])));
-
-		int num_maps = 0;
-		p = Pattern.compile("\\s*Num maps:\\s*(\\d*).*"); //$NON-NLS-1$
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				try {
-					String s = m.group(1);
-					num_maps = Integer.parseInt(s);
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-				
-				break;
-			}
-		}
-		
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-		
-		/*
-		 * Skip map information
-		 */
-		for (int i = 0; i < num_maps; i++) {
-			line = reader.readLine();
-		}
-	}
-
-	/*
-	 * Find second line, ignoring anything else. Format should be:
-	 * 
-	 * 		Starting vpid: 0 Vpid range: 6 Num app_contexts: 2
-	 */
-	private void readVpid(BufferedReader reader) throws IOException {
-		Pattern p = Pattern.compile("\\s*Starting vpid:\\s*(\\d*)\\s*Vpid range:\\s*(\\w*)\\s*Num app_contexts:\\s*(\\w*).*"); //$NON-NLS-1$
-		String line;
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				try {
-					String s = m.group(1);
-					try {
-						map.getAttributeManager().addAttribute(OpenMPIJobAttributes.getVpidStartAttributeDefinition().create(Integer.parseInt(s)));
-					} catch (IllegalValueException e) {
-						// This is not possible.
-						assert false;
-					}
-					s = m.group(2);
-					try {
-						map.getAttributeManager().addAttribute(OpenMPIJobAttributes.getVpidRangeAttributeDefinition().create(Integer.parseInt(s)));
-					} catch (IllegalValueException e) {
-						// This is not possible.
-						assert false;
-					}
-					s = m.group(3);
-					numApplications = Integer.parseInt(s);
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-				
-				break;
-			}
-		}
-		
-		if (line == null) {		
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_BrokenDisplayMapInformation);
-		}
-	}
-	
-	/*
-	 * Find start of map output. This is a line formatted like the one below. Ignore everything
-	 * before this line.
-	 * 
-	 *		[dyn531995.br.ibm.com:12281] Map for job: 1 Generated by mapping mode: bynode
-	 * 
-	 */
-	private void readStart(BufferedReader reader) throws IOException {
-		Pattern p = Pattern.compile("\\[([^:]*):(\\d*)\\]\\s*Map for job:\\s*(\\d*)[^:]*:\\s*(\\w*).*"); //$NON-NLS-1$
-		String line;
-		
-		while ((line = reader.readLine()) != null) {
-			Matcher m = p.matcher(line);
-			if (m.matches()) {
-				try {
-					map.getAttributeManager().addAttribute(OpenMPIJobAttributes.getHostnameAttributeDefinition().create(m.group(1)));
-					try {
-						map.getAttributeManager().addAttribute(OpenMPIJobAttributes.getMpiJobIdAttributeDefinition().create(Integer.parseInt(m.group(3))));
-					} catch (IllegalValueException e) {
-						// This is not possible.
-						assert false;
-					}
-					String mode = m.group(4);
-					if (mode.equalsIgnoreCase("bynode")) { //$NON-NLS-1$
-						map.getAttributeManager().addAttribute(OpenMPIJobAttributes.getMappingModeAttributeDefinition().create(MappingMode.BY_NODE));
-					} else if (mode.equalsIgnoreCase("byslot")) { //$NON-NLS-1$
-						map.getAttributeManager().addAttribute(OpenMPIJobAttributes.getMappingModeAttributeDefinition().create(MappingMode.BY_SLOT));
-					} else {
-						throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-					}
-				} catch (NumberFormatException e) {
-					throw new IOException(NLS.bind(Messages.OpenMPIProcessMapText12Parser_Exception_InvalidLine, line));
-				}
-				
-				break;
-			}
-		}
-		
-		if (line == null) {
-			throw new IOException(Messages.OpenMPIProcessMapText12Parser_Exception_MissingDisplayMapInformation);
-		}
-	}
-	
-	public static void main(String[] args) {
-		try {
-			FileInputStream is = new FileInputStream("test.txt"); //$NON-NLS-1$
-			OpenMPIProcessMapText12Parser.parse(is);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapXml13Parser.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapXml13Parser.java
deleted file mode 100644
index e39b69f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIProcessMapXml13Parser.java
+++ /dev/null

@@ -1,574 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPINodeAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem.OpenMPIProcessMap.Node;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIProcessMapXml13Parser {
-	private OpenMPIProcessMapXml13Parser() {
-		// Do not allow instances.
-	}
-	
-	/*
-	 * Attempt to clean up quasi-XML output by 1.3.0 
-	 * 
-	 * We know the following:
-	 * - the XML is malformed because it doesn't include a root element
-	 * - XML between the <map> and </map> tags should be well formed
-	 * - <noderesolve> elements precede the <map>
-	 * - there may be garbage preceding the first <noderesolve> and after the </map>
-	 * 
-	 * We need to:
-	 * - inject a root element
-	 * - ignore anything prior to the first and after the last XML tags
-	 * 
-	 * To simplify the parsing (so we don't need to build a full XML parser) we assume
-	 * that:
-	 * - the XML begins with 0 or more <noderesolve> elements followed by a <map> element
-	 * - <noderesolve> elements are always empty-element tags
-	 * - there is only one <map> element
-	 * - the final XML tag is </map>
-	 */
-	private class OpenMPI130InputStream extends FilterInputStream {
-		private final static int PROLOG = 0;
-		private final static int START_TAG = 1;
-		private final static int XML = 2;
-		private final static int EPILOG = 3;
-	
-		private int state = PROLOG;
-		//private Queue<Integer> saved = new ConcurrentLinkedQueue<Integer>();
-		private StringBuffer prolog = new StringBuffer();
-		private StringBuffer epilog = new StringBuffer(6);
-		
-		protected OpenMPI130InputStream(InputStream in) {
-			super(in);
-		}
-
-		/* (non-Javadoc)
-		 * @see java.io.FilterInputStream#read()
-		 */
-		@Override
-		public int read() throws IOException {
-			while (state != EPILOG) {
-				int ch = super.read();
-				if (ch < 0) {
-					return -1;
-				}
-				switch (state) {
-				case PROLOG:
-					// Ignore anything except a less-than
-					if (ch == '<') {
-						state = START_TAG;
-						prolog.append((char)ch);
-					}
-					break;
-					
-				case START_TAG:
-					// Find matching greater-than. If we encounter
-					// another less-than, assume that this is the new 
-					// starting point
-					switch (ch) {
-					case '<':
-						prolog.delete(0, prolog.length());
-						break;
-						
-					case '>':
-						state = XML;
-						prolog.insert(0, "<ompi>"); //$NON-NLS-1$
-						break;
-					}
-					prolog.append((char)ch);
-					break;
-				
-				case XML:
-					epilog.append((char)ch);
-					ch = epilog.charAt(0);
-					if (epilog.length() >= 6) {
-						if (epilog.substring(epilog.length()-6).equals("</map>")) { //$NON-NLS-1$
-							epilog.append("</ompi>"); //$NON-NLS-1$
-							state = EPILOG;
-							break;
-						}
-					}
-					if (prolog.length() > 0) {
-						ch = prolog.charAt(0);
-						prolog.deleteCharAt(0);
-						return ch;
-					}
-					epilog.deleteCharAt(0);
-					return ch;
-				}
-			}
-			
-			if (prolog.length() > 0) {
-				int ch = prolog.charAt(0);
-				prolog.deleteCharAt(0);
-				return ch;
-			}
-			if (epilog.length() > 0) {
-				int ch = epilog.charAt(0);
-				epilog.deleteCharAt(0);
-				return ch;
-			}
-			return -1;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.io.FilterInputStream#read(byte[], int, int)
-		 */
-		@Override
-		public int read(byte[] b, int off, int len) throws IOException {
-			if (len == 0) {
-				return 0;
-			}
-
-			int pos = off;
-			
-			for (int i = 0; i < len && available() > 0; i++) {
-				int ch = read();
-				if (ch < 0) {
-					return -1;
-				}
-				b[pos++] = (byte) (ch & 0xff);
-			}
-			
-			return pos - off;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.io.FilterInputStream#markSupported()
-		 */
-		@Override
-		public boolean markSupported() {
-			return false;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.io.FilterInputStream#available()
-		 */
-		@Override
-		public int available() throws IOException {
-			return state == PROLOG ? 1 : prolog.length() + epilog.length();
-		}
-		
-	}
-
-	private class StackContextHandler extends DefaultHandler {
-		Stack<ContextHandler> handlers = new Stack<ContextHandler>();
-
-		public StackContextHandler(ContextHandler documentHandler) {
-			handlers.push(documentHandler);
-		}
-
-		@Override
-		public void startDocument() throws SAXException {
-			super.startDocument();
-			// Notify listeners that parsing has started
-			for (Object listener : listeners.getListeners()) {
-				try {
-					((IOpenMpiProcessMapXml13ParserListener ) listener).startDocument();
-				} catch (Exception e) {
-					OpenMPIPlugin.log(e);
-				}
-			}
-		}
-
-		@Override
-		public void endDocument() throws SAXException {
-			super.endDocument();
-		}
-
-		@Override
-		public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException {
-			super.startElement(uri, localName, name, attributes);
-			//			System.out.println("Start element: "+name);
-			ContextHandler handler = handlers.peek();
-			ContextHandler childHandler = null;
-			if (handler != null) {
-				childHandler = handler.newElement(name);
-				if (childHandler != null) {
-					childHandler.start();
-					for (int i = 0; i < attributes.getLength(); i++) {
-						String attr_name = attributes.getQName(i);
-						String attr_value = attributes.getValue(i);
-						childHandler.setAttribute(attr_name, attr_value);
-					}
-					childHandler.prepare();
-				}
-			}
-			handlers.push(childHandler);
-		}
-
-		@Override
-		public void endElement(String uri, String localName, String name) throws SAXException {
-			super.endElement(uri, localName, name);
-			//			System.out.println("End element: "+name);
-			ContextHandler handler = handlers.pop();
-			if (handler != null) {
-				handler.finish();
-			}
-		}
-
-		@Override
-		public void error(SAXParseException e) throws SAXException {
-			super.error(e);
-		}
-
-		@Override
-		public void fatalError(SAXParseException e) throws SAXException {
-			super.fatalError(e);
-		}
-	}
-
-	protected final OpenMPIProcessMap map = new OpenMPIProcessMap();
-	protected final StackContextHandler handler = new StackContextHandler(new DocumentHandler());
-	protected final ListenerList listeners = new ListenerList();
-
-	public static interface IOpenMpiProcessMapXml13ParserListener {
-		void startDocument();
-		void endDocument();
-	}
-
-	public class UnknownElementException extends SAXException {
-		private static final long serialVersionUID = 1L;
-
-		public UnknownElementException(String name) {
-			super(NLS.bind(Messages.OpenMPIProcessMapXml13Parser_Exception_UnknownElement, name));
-		}
-	}
-
-	public class UnknownAttributeException extends SAXException {
-		private static final long serialVersionUID = 1L;
-
-		public UnknownAttributeException(String name) {
-			super(NLS.bind(Messages.OpenMPIProcessMapXml13Parser_Exception_UnknownAttribute, name));
-		}
-	}
-
-	public class MissingAttributeException extends SAXException {
-		private static final long serialVersionUID = 1L;
-
-		public MissingAttributeException(String name) {
-			super(NLS.bind(Messages.OpenMPIProcessMapXml13Parser_Exception_MissingAttribute, name));
-		}
-	}
-
-	public class InvalidIntegerAttributeException extends SAXException {
-		private static final long serialVersionUID = 1L;
-
-		public InvalidIntegerAttributeException(String name, String value) {
-			super(NLS.bind(Messages.OpenMPIProcessMapXml13Parser_Exception_AttributeNotInteger, name, value));
-		}
-	}
-
-	public class ParseInterruptedException extends SAXException {
-		private static final long serialVersionUID = 1L;
-	}
-
-	public abstract class ContextHandler {
-		public ContextHandler newElement(String name) throws SAXException {
-			throw new UnknownElementException(name);
-		}
-		/** Called when reading the beginning of the tag. */
-		public void start() throws SAXException {
-			// Empty
-		}
-		/** Called for each argument found at the beginning of the tag. */
-		public void setAttribute(String name, String value) throws SAXException {
-			throw new UnknownAttributeException(name);
-		}
-		/** Called when all attributes have been read and tag content is going to be read. */
-		public void prepare() throws SAXException {
-			// Empty
-		}
-		/** Called when finished reading the end of the tag. */
-		public void finish() throws SAXException {
-			// Empty
-		}
-	}
-
-	public class DocumentHandler extends ContextHandler {
-		@Override
-		public ContextHandler newElement(String name) throws SAXException {
-			if (name.equalsIgnoreCase("ompi")) { //$NON-NLS-1$
-				return new OmpiHandler();
-			}
-			return super.newElement(name);
-		}
-	}
-
-	public class OmpiHandler extends ContextHandler {
-		@Override
-		public ContextHandler newElement(String name) throws SAXException {
-			if (name.equalsIgnoreCase("map")) { //$NON-NLS-1$
-				return new MapHandler();
-			} else if (name.equalsIgnoreCase("noderesolve")) { //$NON-NLS-1$
-				return new NodeResolveHandler();
-			} else if (name.equalsIgnoreCase("allocation")) { //$NON-NLS-1$
-				return null; // ignore
-			} else {
-				return super.newElement(name);
-			}
-		}
-
-		@Override
-		public void finish() throws SAXException {
-			super.finish();
-			// Notify listeners that end has been reached.
-			for (Object listener : listeners.getListeners()) {
-				try {
-					((IOpenMpiProcessMapXml13ParserListener ) listener).endDocument();
-				} catch (Exception e) {
-					OpenMPIPlugin.log(e);
-				}
-			}
-
-			// Throw exception to force stop parsing.
-			// Or else, the parser would complain about content not allows after in trailing section.
-			throw new ParseInterruptedException();
-		}
-
-	}
-	
-	public class MapHandler extends ContextHandler {
-		@Override
-		public ContextHandler newElement(String name) throws SAXException {
-			if (name.equalsIgnoreCase("host")) { //$NON-NLS-1$
-				return new HostHandler();
-			}
-			return super.newElement(name);
-		}
-	}
-
-	public class NodeResolveHandler extends ContextHandler {
-		private String nodeName = null;
-		private String resolvedName = null;
-		
-		@Override
-		public void setAttribute(String name, String value) throws SAXException {
-			if (name.equalsIgnoreCase("name")) { //$NON-NLS-1$
-				nodeName = value;
-			} else if (name.equalsIgnoreCase("resolved")) { //$NON-NLS-1$
-				resolvedName = value;
-			} else {
-				super.setAttribute(name, value);
-			}
-		}
-
-		@Override
-		public void finish() throws SAXException {
-			if (nodeName == null) {
-				throw new MissingAttributeException("name"); //$NON-NLS-1$
-			}
-			if (resolvedName == null) {
-				throw new MissingAttributeException("resolved"); //$NON-NLS-1$
-			}
-			
-			Node node = map.getNode(resolvedName);
-			if (node == null) {
-				node = new Node(resolvedName);
-				map.addNode(node);
-			}
-			node.addResolvedName(nodeName);
-			super.finish();
-		}
-	}
-
-	public class HostHandler extends ContextHandler {
-		private String name;
-		private boolean has_num_slots = false;
-		private boolean has_max_slots = false;
-		private int num_slots = 0;
-		private int max_slots = 0;
-
-		private Node node;
-		private List<OpenMPIProcessMap.Process> processes = new ArrayList<OpenMPIProcessMap.Process>();
-
-		@Override
-		public ContextHandler newElement(String name) throws SAXException {
-			if (name.equalsIgnoreCase("process")) { //$NON-NLS-1$
-				return new ProcessHandler(node);
-			}
-			return super.newElement(name);
-		}
-
-		@Override
-		public void setAttribute(String name, String value) throws SAXException {
-			if (name.equalsIgnoreCase("name")) { //$NON-NLS-1$
-				this.name = value;
-			} else if (name.equalsIgnoreCase("slots")) { //$NON-NLS-1$
-				try {
-					num_slots = Integer.parseInt(value);
-					if (num_slots < 0)
-						throw new InvalidIntegerAttributeException(name, value);
-					has_num_slots = true;
-				} catch (NumberFormatException e) {
-					throw new InvalidIntegerAttributeException(name, value);
-				}
-			} else if (name.equalsIgnoreCase("max_slots")) { //$NON-NLS-1$
-				try {
-					max_slots = Integer.parseInt(value);
-					if (max_slots < 0)
-						throw new InvalidIntegerAttributeException(name, value);
-					if (max_slots != 0) {
-						has_max_slots = true;
-					}
-				} catch (NumberFormatException e) {
-					throw new InvalidIntegerAttributeException(name, value);
-				}
-			} else {
-				super.setAttribute(name, value);
-			}
-		}
-
-		@Override
-		public void prepare() throws SAXException {
-			if (name == null) {
-				throw new MissingAttributeException("name"); //$NON-NLS-1$
-			}
-			if (! has_num_slots) {
-				throw new MissingAttributeException("slots"); //$NON-NLS-1$
-			}
-			node = map.getNode(name);
-			if (node == null) {
-				node = new Node(name);
-				map.addNode(node);
-			}
-			try {
-				node.getAttributeManager().addAttribute(OpenMPINodeAttributes.getNumberOfNodesAttributeDefinition().create(num_slots));
-			} catch (IllegalValueException e) {
-				// This is not possible
-				OpenMPIPlugin.log(e);
-			}
-			if (has_max_slots) {
-				try {
-					node.getAttributeManager().addAttribute(OpenMPINodeAttributes.getMaximalNumberOfNodesAttributeDefinition().create(max_slots));
-				} catch (IllegalValueException e) {
-					// This is not possible
-					OpenMPIPlugin.log(e);
-				}
-			}
-			super.prepare();
-		}
-		@Override
-		public void finish() throws SAXException {
-			/*
-			 * Count how many processes are running on the host and check if the number is greater than the allowed one.
-			 * If yes, then the node is oversubscribed.
-			 */
-			assert node != null;
-			node.getAttributeManager().addAttribute(OpenMPINodeAttributes.getOversubscribedAttributeDefinition().create(processes.size() > num_slots));
-			super.finish();
-		}
-	}
-
-	public class ProcessHandler extends ContextHandler {
-		private Node node;
-		private int rank;
-
-		public ProcessHandler(Node node) {
-			this.node = node;
-		}
-
-		@Override
-		public void setAttribute(String name, String value) throws SAXException {
-			if (name.equalsIgnoreCase("rank")) { //$NON-NLS-1$
-				try {
-					rank = Integer.parseInt(value);
-					if (rank < 0)
-						throw new InvalidIntegerAttributeException(name, value);
-				} catch (NumberFormatException e) {
-					throw new InvalidIntegerAttributeException(name, value);
-				}
-			} else {
-				super.setAttribute(name, value);
-			}
-		}
-
-		@Override
-		public void finish() throws SAXException {
-			OpenMPIProcessMap.Process process = new OpenMPIProcessMap.Process(node, rank, Integer.toString(rank), 1);
-			map.addProcess(process);
-			super.finish();
-		}
-	}
-
-	public static OpenMPIProcessMap parse(InputStream is) throws IOException {
-		return parse(is, null);
-	}
-
-	public static OpenMPIProcessMap parse(InputStream is, IOpenMpiProcessMapXml13ParserListener listener) throws IOException {
-		OpenMPIProcessMapXml13Parser parser = new OpenMPIProcessMapXml13Parser();
-		if (listener != null) {
-			parser.addListener(listener);
-		}
-		try {
-			OpenMPI130InputStream ois = parser.new OpenMPI130InputStream(is);
-			BufferedInputStream bis = new BufferedInputStream(ois);
-			SAXParserFactory factory = SAXParserFactory.newInstance();
-			SAXParser saxParser = factory.newSAXParser();
-			saxParser.parse(bis, parser.handler);
-		} catch (ParseInterruptedException e) {
-			// this is ok and expected
-		} catch (SAXException e) {
-			throw new IOException(e.getMessage());
-		} catch (ParserConfigurationException e) {
-			throw new RuntimeException(e);
-		}
-		return parser.map;
-	}
-
-	public void addListener(IOpenMpiProcessMapXml13ParserListener listener) {
-		listeners.add(listener);
-	}
-
-	public void removeListener(IOpenMpiProcessMapXml13ParserListener listener) {
-		listeners.remove(listener);
-	}
-
-	public static void main(String[] args) {
-		try {
-			FileInputStream is = new FileInputStream("xml_sample.txt"); //$NON-NLS-1$
-			OpenMPIProcessMap map = OpenMPIProcessMapXml13Parser.parse(is);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystem.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystem.java
deleted file mode 100644
index 72c9f29..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystem.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.eclipse.ptp.rm.mpi.openmpi.core.parameters.OmpiInfo;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.EffectiveOpenMPIResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerConfiguration;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIRuntimeSystem extends AbstractToolRuntimeSystem {
-
-	private OmpiInfo info = new OmpiInfo();
-
-	/** The machine where open mpi is running on. */
-	private String machineID;
-	/** The queue that dispatches jobs to mpi. */
-	private String queueID;
-	/** Mapping of discovered hosts and their ID for IPNode elements. */
-	private Map<String,String> nodeToIDMap = new HashMap<String, String>();
-
-	public OpenMPIRuntimeSystem(Integer openmpi_rmid,
-			OpenMPIResourceManagerConfiguration config,
-			AttributeDefinitionManager attrDefMgr) {
-		super(openmpi_rmid, config, attrDefMgr);
-	}
-
-	protected void setMachineID(String machineID) {
-		this.machineID = machineID;
-	}
-
-	protected void setQueueID(String queueID) {
-		this.queueID = queueID;
-	}
-
-	public String getMachineID() {
-		return machineID;
-	}
-
-	public String getQueueID() {
-		return queueID;
-	}
-
-	public OmpiInfo getOmpiInfo() {
-		return info;
-	}
-
-	public String getNodeIDforName(String hostname) {
-		return nodeToIDMap.get(hostname);
-	}
-
-	public void setNodeIDForName(String name, String id) {
-		nodeToIDMap.put(name, id);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doShutdown(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	protected void doShutdown(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartEvents()
-	 */
-	@Override
-	protected void doStartEvents() throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartup(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	protected void doStartup(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStopEvents()
-	 */
-	@Override
-	protected void doStopEvents() throws CoreException {
-		// Nothing to do
-	}
-
-	@Override
-	protected Job createDiscoverJob() {
-		if (! rmConfiguration.hasDiscoverCmd())
-			return null;
-		Job job = new OpenMPIDiscoverJob(this);
-		job.setPriority(Job.INTERACTIVE);
-		job.setSystem(false);
-		job.setUser(false);
-		return job;
-	}
-
-	@Override
-	protected Job createPeriodicMonitorJob() {
-		return null;
-	}
-
-	@Override
-	protected Job createContinuousMonitorJob() {
-		return null;
-	}
-
-	@Override
-	public Job createRuntimeSystemJob(String jobID, String queueID, AttributeManager attrMgr) {
-		return new OpenMPIRuntimeSystemJob(jobID, queueID, Messages.OpenMPIRuntimeSystem_JobName, this, attrMgr);
-	}
-
-
-	@Override
-	public AbstractEffectiveToolRMConfiguration retrieveEffectiveToolRmConfiguration() {
-		return new EffectiveOpenMPIResourceManagerConfiguration(getRmConfiguration());
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystemJob.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystemJob.java
deleted file mode 100644
index 1e63ceb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.core/src/org/eclipse/ptp/rm/mpi/openmpi/core/rtsystem/OpenMPIRuntimeSystemJob.java
+++ /dev/null

@@ -1,553 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystemJob;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.rm.core.utils.InputStreamListenerToOutputStream;
-import org.eclipse.ptp.rm.core.utils.InputStreamObserver;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPILaunchAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPIPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.core.messages.Messages;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem.OpenMPIProcessMap.Process;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rtsystem.OpenMPIProcessMapXml13Parser.IOpenMpiProcessMapXml13ParserListener;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIRuntimeSystemJob extends AbstractToolRuntimeSystemJob {
-	Object lock1 = new Object();
-
-	private InputStreamObserver stderrObserver;
-	private InputStreamObserver stdoutObserver;
-
-	/** Information parsed from launch command. */
-	OpenMPIProcessMap map;
-
-	/**
-	 * Process IDs created by this job. The first process (zero index) is special,
-	 * because it is always created.
-	 */
-	String processIDs[];
-
-	/** Exception raised while parsing mpi map information. */
-	IOException parserException = null;
-
-	public OpenMPIRuntimeSystemJob(String jobID, String queueID, String name, AbstractToolRuntimeSystem rtSystem, AttributeManager attrMgr) {
-		super(jobID, queueID, name, rtSystem, attrMgr);
-	}
-
-	@Override
-	protected void doExecutionStarted(IProgressMonitor monitor) throws CoreException {
-		/*
-		 * Create a zero index job.
-		 */
-		final OpenMPIRuntimeSystem rtSystem = (OpenMPIRuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-		final String zeroIndexProcessID = rtSystem.createProcess(getJobID(), Messages.OpenMPIRuntimeSystemJob_ProcessName, 0);
-		processIDs = new String[] { zeroIndexProcessID } ;
-
-		/*
-		 * Listener that saves stdout.
-		 */
-		final PipedOutputStream stdoutOutputStream = new PipedOutputStream();
-		final PipedInputStream stdoutInputStream = new PipedInputStream();
-		try {
-			stdoutInputStream.connect(stdoutOutputStream);
-		} catch (IOException e) {
-			assert false; // This exception is not possible
-		}
-		final InputStreamListenerToOutputStream stdoutPipedStreamListener = new InputStreamListenerToOutputStream(stdoutOutputStream);
-
-		Thread stdoutThread = new Thread() {
-			@Override
-			public void run() {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: started", jobID); //$NON-NLS-1$
-				BufferedReader stdoutBufferedReader = new BufferedReader(new InputStreamReader(stdoutInputStream));
-				IPProcess ipProc = ipJob.getProcessById(zeroIndexProcessID);
-				try {
-					String line = stdoutBufferedReader.readLine();
-					while (line != null) {
-						synchronized (lock1) {
-							ipProc.addAttribute(ProcessAttributes.getStdoutAttributeDefinition().create(line));
-							DebugUtil.trace(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", jobID, line); //$NON-NLS-1$
-						}
-						line = stdoutBufferedReader.readLine();
-					}
-				} catch (IOException e) {
-					DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: {0}", e); //$NON-NLS-1$
-					OpenMPIPlugin.log(e);
-				} finally {
-					stdoutPipedStreamListener.disable();
-					//					if (stdoutObserver != null) {
-					//						stdoutObserver.removeListener(stdoutPipedStreamListener);
-					//					}
-					//					try {
-					//						stdoutOutputStream.close();
-					//					} catch (IOException e) {
-					//						PTPCorePlugin.log(e);
-					//					}
-					//					try {
-					//						stdoutInputStream.close();
-					//					} catch (IOException e) {
-					//						PTPCorePlugin.log(e);
-					//					}
-				}
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: finished", jobID); //$NON-NLS-1$
-			}
-		};
-
-		/*
-		 * Listener that saves stderr.
-		 */
-		final PipedOutputStream stderrOutputStream = new PipedOutputStream();
-		final PipedInputStream stderrInputStream = new PipedInputStream();
-		try {
-			stderrInputStream.connect(stderrOutputStream);
-		} catch (IOException e) {
-			assert false; // This exception is not possible
-		}
-		final InputStreamListenerToOutputStream stderrPipedStreamListener = new InputStreamListenerToOutputStream(stderrOutputStream);
-		Thread stderrThread = new Thread() {
-			@Override
-			public void run() {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: started", jobID); //$NON-NLS-1$
-				final BufferedReader stderrBufferedReader = new BufferedReader(new InputStreamReader(stderrInputStream));
-				IPProcess ipProc = ipJob.getProcessById(zeroIndexProcessID);
-				try {
-					String line = stderrBufferedReader.readLine();
-					while (line != null) {
-						synchronized (lock1) {
-							ipProc.addAttribute(ProcessAttributes.getStderrAttributeDefinition().create(line));
-							ipProc.addAttribute(ProcessAttributes.getStdoutAttributeDefinition().create(line));
-							DebugUtil.error(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", jobID, line); //$NON-NLS-1$
-						}
-						line = stderrBufferedReader.readLine();
-					}
-				} catch (IOException e) {
-					DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: {0}", e); //$NON-NLS-1$
-					OpenMPIPlugin.log(e);
-				} finally {
-					stderrPipedStreamListener.disable();
-					//					if (stderrObserver != null) {
-					//						stderrObserver.removeListener(stderrPipedStreamListener);
-					//					}
-					//					try {
-					//						stderrOutputStream.close();
-					//					} catch (IOException e) {
-					//						PTPCorePlugin.log(e);
-					//					}
-					//					try {
-					//						stderrInputStream.close();
-					//					} catch (IOException e) {
-					//						PTPCorePlugin.log(e);
-					//					}
-				}
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: finished", jobID); //$NON-NLS-1$
-			}
-		};
-
-		/*
-		 * Thread that parses map information.
-		 */
-		final PipedOutputStream parserOutputStream = new PipedOutputStream();
-		final PipedInputStream parserInputStream = new PipedInputStream();
-		try {
-			parserInputStream.connect(parserOutputStream);
-		} catch (IOException e) {
-			assert false; // This exception is not possible
-		}
-		final InputStreamListenerToOutputStream parserPipedStreamListener = new InputStreamListenerToOutputStream(parserOutputStream);
-		Thread parserThread = new Thread() {
-			@Override
-			public void run() {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: display-map parser thread: started", jobID); //$NON-NLS-1$
-				OpenMPIResourceManagerConfiguration configuration = (OpenMPIResourceManagerConfiguration) getRtSystem().getRmConfiguration();
-				try {
-					// Parse stdout or stderr, depending on mpi 1.2 or 1.3
-					if (configuration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_12)) {
-						map = OpenMPIProcessMapText12Parser.parse(parserInputStream);
-					} else if (configuration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_13)) {
-						map = OpenMPIProcessMapXml13Parser.parse(parserInputStream, new IOpenMpiProcessMapXml13ParserListener() {
-							public void startDocument() {
-								// Empty
-							}
-							public void endDocument() {
-								/*
-								 * Turn of listener that generates input for parser when parsing finishes.
-								 * If not done, the parser will close the piped inputstream, making the listener
-								 * get IOExceptions for closed stream.
-								 */
-								if (stderrObserver != null) {
-									parserPipedStreamListener.disable();
-									stderrObserver.removeListener(parserPipedStreamListener);
-								}
-							}
-						});
-					} else {
-						assert false;
-					}
-				} catch (IOException e) {
-					/*
-					 * If output could not be parsed, the kill the mpi process.
-					 */
-					parserException = e;
-//					process.destroy();
-					DebugUtil.error(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: display-map parser thread: {0}", e); //$NON-NLS-1$
-				} finally {
-					parserPipedStreamListener.disable();
-					if (stderrObserver != null) {
-						stderrObserver.removeListener(parserPipedStreamListener);
-					}
-				}
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: display-map parser thread: finished", jobID); //$NON-NLS-1$
-			}
-		};
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: starting all threads", jobID); //$NON-NLS-1$
-		/*
-		 * Create and start listeners.
-		 */
-		stdoutThread.start();
-		stderrThread.start();
-		parserThread.start();
-
-		stderrObserver = new InputStreamObserver(process.getErrorStream());
-		stdoutObserver = new InputStreamObserver(process.getInputStream());
-
-		stdoutObserver.addListener(stdoutPipedStreamListener);
-		stderrObserver.addListener(stderrPipedStreamListener);
-
-		// Parse stdout or stderr, depending on mpi 1.2 or 1.3
-		OpenMPIResourceManagerConfiguration configuration = (OpenMPIResourceManagerConfiguration) getRtSystem().getRmConfiguration();
-		if (configuration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_12)) {
-			 /* 
-			  * Fix for bug #271810 
-			  */
-			if (!rtSystem.getRemoteServices().getId().equals("org.eclipse.ptp.remote.RSERemoteServices")) { //$NON-NLS-1$
-				stderrObserver.addListener(parserPipedStreamListener);
-			} else {
-				stdoutObserver.addListener(parserPipedStreamListener);
-			}
-		} else if (configuration.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_13)) {
-			stdoutObserver.addListener(parserPipedStreamListener);
-		} else {
-			assert false;
-		}
-
-		stderrObserver.start();
-		stdoutObserver.start();
-
-		try {
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting for display-map parser thread to finish", jobID); //$NON-NLS-1$
-			parserThread.join();
-		} catch (InterruptedException e) {
-			// Do nothing.
-		}
-
-		if (parserException != null) {
-			/*
-			 * If process completed with error, then it display map parsing failed because of the error message.
-			 * If process did not complete, the destroy it.
-			 */
-//			synchronized (this) {
-//				try {
-//					wait(1000);
-//				} catch (InterruptedException e) {
-//					// Ignore
-//				}
-//			}
-			boolean parseError = true;
-//			if (!process.isCompleted()) {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: destroy process due to error while parsing display map", jobID); //$NON-NLS-1$
-//				process.destroy();
-//			} else {
-//				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: process terminated with no valid display map", jobID); //$NON-NLS-1$
-//				if (process.exitValue() != 0) {
-//					parseError = false;
-//				}
-//			}
-			/*
-			 * Wait until both stdout and stderr stop because stream are closed.
-			 * Error messages may be still queued in the stream.
-			 */
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stderr thread to finish", jobID); //$NON-NLS-1$
-			try {
-				stderrObserver.join();
-			} catch (InterruptedException e1) {
-				// Ignore
-			}
-
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stdout thread to finish", jobID); //$NON-NLS-1$
-			try {
-				stdoutObserver.join();
-			} catch (InterruptedException e1) {
-				// Ignore
-			}
-			if (parseError) {
-				throw OpenMPIPlugin.coreErrorException("Failed to parse output of Open MPI command. Check output for errors.", parserException); //$NON-NLS-1$
-			} else {
-				throw OpenMPIPlugin.coreErrorException("Open MPI failed to launch parallel application. Check output for errors."); //$NON-NLS-1$
-			}
-		}
-
-		/*
-		 * Copy job attributes from map.
-		 */
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: updating model with display-map information", jobID); //$NON-NLS-1$
-		rtSystem.changeJob(getJobID(), map.getAttributeManager());
-
-		/*
-		 * Copy process attributes from map.
-		 */
-		List<Process> newProcesses = map.getProcesses();
-		processIDs = new String[newProcesses.size()];
-		IPMachine ipMachine = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getMachineById(rtSystem.getMachineID());
-		for (Process newProcess : newProcesses) {
-			String nodename = newProcess.getNode().getResolvedName();
-			String nodeID = rtSystem.getNodeIDforName(nodename);
-			if (nodeID == null) {
-				process.destroy();
-				throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.OpenMPIRuntimeSystemJob_Exception_HostnamesDoNotMatch, parserException));
-			}
-			
-			String processName = newProcess.getName();
-			int processIndex = newProcess.getIndex();
-			String processID = null;
-			if (processIndex == 0) {
-				processID = zeroIndexProcessID;
-			} else {
-				processID = rtSystem.createProcess(getJobID(), processName, processIndex);
-			}
-			processIDs[processIndex] = processID;
-
-			AttributeManager attrMgr = new AttributeManager();
-			attrMgr.addAttribute(ElementAttributes.getNameAttributeDefinition().create(processName));
-			attrMgr.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create(nodeID));
-			attrMgr.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(ProcessAttributes.State.RUNNING));
-			try {
-				attrMgr.addAttribute(ProcessAttributes.getIndexAttributeDefinition().create(newProcess.getIndex()));
-			} catch (IllegalValueException e) {
-				// Is always valid.
-				assert false;
-			}
-			attrMgr.addAttributes(newProcess.getAttributeManager().getAttributes());
-			rtSystem.changeProcess(processID, attrMgr);
-
-			IPProcessControl processControl = (IPProcessControl) ipJob.getProcessById(processID);
-			IPNode node = ipMachine.getNodeById(nodeID);
-
-			/*
-			 * Although one could call processControl.addNode(node) to assign the process to the node, this does not work.
-			 * It is necessary to call nodeControl.addProcesses(processControl) instead.
-			 */
-			IPNodeControl nodeControl = (IPNodeControl) node;
-			nodeControl.addProcesses(Arrays.asList(new IPProcessControl[] {processControl} ));
-		}
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: finished updating model", jobID); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void doWaitExecution(IProgressMonitor monitor) throws CoreException {
-		/*
-		 * Wait until both stdout and stderr stop because stream are closed.
-		 * This means that the process has finished.
-		 */
-		if (!rtSystem.getRemoteServices().getId().equals("org.eclipse.ptp.remote.RSERemoteServices")) { //$NON-NLS-1$
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stderr thread to finish", jobID); //$NON-NLS-1$
-			try {
-				stderrObserver.join();
-			} catch (InterruptedException e1) {
-				// Ignore
-			}
-		}
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stdout thread to finish", jobID); //$NON-NLS-1$
-		try {
-			stdoutObserver.join();
-		} catch (InterruptedException e1) {
-			// Ignore
-		}
-
-		/*
-		 * Still experience has shown that remote process might not have yet terminated, although stdout and stderr is closed.
-		 */
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting mpi process to finish completely", jobID); //$NON-NLS-1$
-		try {
-			process.waitFor();
-		} catch (InterruptedException e) {
-			// Ignore
-		}
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: completely finished", jobID); //$NON-NLS-1$
-	}
-
-	@Override
-	protected void doTerminateJob() {
-		// Empty implementation.
-	}
-
-	@Override
-	protected void doExecutionFinished(IProgressMonitor monitor) throws CoreException {
-		if (process.exitValue() != 0) {
-			changeJobState(JobAttributes.State.ERROR);
-			if (! terminateJobFlag) {
-				throw OpenMPIPlugin.coreErrorException(NLS.bind(Messages.OpenMPIRuntimeSystemJob_Exception_ExecutionFailedWithExitValue, process.exitValue()));
-			} else {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING, "RTS job #{0}: ignoring exit value {1} because job was forced to terminate by user", jobID, process.exitValue()); //$NON-NLS-1$
-			}
-		}
-		changeAllProcessesStatus(ProcessAttributes.State.EXITED);
-	}
-
-	private void changeAllProcessesStatus(State newState) {
-		final OpenMPIRuntimeSystem rtSystem = (OpenMPIRuntimeSystem) getRtSystem();
-		final IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID());
-		if (rm != null) {
-			final IPQueue queue = rm.getQueueById(getQueueID());
-			if (queue != null) {
-				final IPJob ipJob = queue.getJobById(getJobID());
-				if (ipJob != null) {
-
-					/*
-					 * Mark all running and starting processes as finished.
-					 */
-					List<String> ids = new ArrayList<String>();
-					for (IPProcess ipProcess : ipJob.getProcesses()) {
-						switch (ipProcess.getState()) {
-						case EXITED:
-						case ERROR:
-						case EXITED_SIGNALLED:
-							break;
-						case RUNNING:
-						case STARTING:
-						case SUSPENDED:
-						case UNKNOWN:
-							ids.add(ipProcess.getID());
-							break;
-						}
-					}
-			
-					AttributeManager attrMrg = new AttributeManager();
-					attrMrg.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(newState));
-					for (String processId : ids) {
-						rtSystem.changeProcess(processId, attrMrg);
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	protected void doExecutionCleanUp(IProgressMonitor monitor) {
-		if (process != null) {
-			process.destroy();
-			process = null;
-		}
-		if (stderrObserver != null) {
-			stderrObserver.kill();
-			stderrObserver = null;
-		}
-		if (stdoutObserver != null) {
-			stdoutObserver.kill();
-			stdoutObserver = null;
-		}
-		// TODO: more cleanup?
-		changeAllProcessesStatus(ProcessAttributes.State.EXITED);
-	}
-
-	@Override
-	protected void doBeforeExecution(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolBaseSubstitutionAttributes() throws CoreException {
-		// TODO make macros available for environment variables and work directory.
-		return null;
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolCommandSubstitutionAttributes(
-			AttributeManager baseSubstitutionAttributeManager,
-			String directory, Map<String, String> environment) {
-
-		List<IAttribute<?, ?, ?>> newAttributes = new ArrayList<IAttribute<?,?,?>>();
-
-		/*
-		 * An OpenMPI specific attribute.
-		 * Attribute that contains a list of names of environment variables.
-		 */
-		int p = 0;
-		String keys[] = new String[environment.size()];
-		for (String key : environment.keySet()) {
-			keys[p++] = key;
-		}
-		newAttributes.add(OpenMPILaunchAttributes.getEnvironmentKeysAttributeDefinition().create(keys));
-
-		/*
-		 * An OpenMPI specific attribute.
-		 * A shortcut that generates arguments for the OpenMPI run command.
-		 */
-		newAttributes.add(OpenMPILaunchAttributes.getEnvironmentArgsAttributeDefinition().create());
-		return newAttributes.toArray(new IAttribute<?, ?, ?>[newAttributes.size()]);
-	}
-
-	@Override
-	protected HashMap<String, String> doRetrieveToolEnvironment()
-	throws CoreException {
-		// No extra environment variables needs to be set for OpenMPI.
-		return null;
-	}
-
-	@Override
-	protected void doPrepareExecution(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.classpath b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.classpath
deleted file mode 100644
index 1fa3e68..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.project b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.project
deleted file mode 100644
index 45548be..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpi.openmpi.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7e446a3..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.mpi.openmpi.ui;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.mpi.openmpi.ui.OpenMPIUIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.launch,
- org.eclipse.debug.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.rm.ui,
- org.eclipse.ptp.rm.mpi.openmpi.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.rm.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.mpi.openmpi.ui,
- org.eclipse.ptp.rm.mpi.openmpi.ui.launch,
- org.eclipse.ptp.rm.mpi.openmpi.ui.messages,
- org.eclipse.ptp.rm.mpi.openmpi.ui.preferences,
- org.eclipse.ptp.rm.mpi.openmpi.ui.wizards
-Bundle-Vendor: %pluginProvider

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/about.html b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/build.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/build.properties
deleted file mode 100644
index dfa3b91..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/build.properties
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/data/launch-defaults.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/data/launch-defaults.properties
deleted file mode 100644
index debdce7..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/data/launch-defaults.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-NUMPROCS=1
-BYNODE=false
-BYSLOT=false
-NOOVERSUBSCRIBE=false
-NOLOCAL=false
-PREFIX=
-USEPREFIX=false
-HOSTFILE=
-USEHOSTFILE=false
-HOSTLIST=
-USEHOSTLIST=false
-ARGUMENTS=
-USEDEFAULTARGUMENTS=true
-USEDEFAULTPARAMETERS=true
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.properties
deleted file mode 100644
index 04c4155..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Open MPI UI
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.xml b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.xml
deleted file mode 100644
index 316dbf4..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/plugin.xml
+++ /dev/null

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-<extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage.OpenMPI"
-            class="org.eclipse.ptp.rm.mpi.openmpi.ui.preferences.OpenMPI12PreferencePage"
-            id="org.eclipse.ptp.rm.openmpi.ui.preferences.OpenMPI12"
-            name="Open MPI 1.2">
-      </page>
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage"
-            class="org.eclipse.ptp.rm.mpi.openmpi.ui.preferences.EmptyPage"
-            id="org.eclipse.ptp.ui.preferences.rmPreferencesPage.OpenMPI"
-            name="Open MPI">
-      </page>
-      <page
-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage.OpenMPI"
-            class="org.eclipse.ptp.rm.mpi.openmpi.ui.preferences.OpenMPI13PreferencePage"
-            id="org.eclipse.ptp.rm.openmpi.ui.preferences.OpenMPI13"
-            name="Open MPI 1.3">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.ui.rmConfigurations">
-      <configurationWizard
-            class="org.eclipse.ptp.rm.mpi.openmpi.ui.wizards.OpenMPIRMConfigurationWizardPageFactory"
-            id="org.eclipse.ptp.rm.openmpi.ui.configurationWizard"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.launch.rmLaunchConfigurations">
-      <launchConfiguration
-            class="org.eclipse.ptp.rm.mpi.openmpi.ui.launch.OpenMPIRMLaunchConfigurationFactory"
-            id="org.eclipse.ptp.rm.openmpi.ui.launchConfiguration"/>
-   </extension>
-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/OpenMPIUIPlugin.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/OpenMPIUIPlugin.java
deleted file mode 100644
index fa70317..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/OpenMPIUIPlugin.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.launch.OpenMPILaunchConfigurationDefaults;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class OpenMPIUIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.openmpi.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static OpenMPIUIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public OpenMPIUIPlugin() {
-		// Empty implementation.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		OpenMPILaunchConfigurationDefaults.loadDefaults();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static OpenMPIUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 *
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 *
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 *
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.OpenMPIUIPlugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 *
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/AdvancedOpenMpiRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/AdvancedOpenMpiRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index bf656a6..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/AdvancedOpenMpiRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,520 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.launch;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TableViewerEditor;
-import org.eclipse.jface.viewers.TableViewerFocusCellManager;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.openmpi.core.parameters.OmpiInfo;
-import org.eclipse.ptp.rm.mpi.openmpi.core.parameters.Parameters.Parameter;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.OpenMPIUIPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class AdvancedOpenMpiRMLaunchConfigurationDynamicTab extends
-AbstractRMLaunchConfigurationDynamicTab {
-
-	protected Composite control;
-	protected Button useArgsDefaultsButton;
-	protected Text argsText;
-	protected Button useParamsDefaultsButton;
-	protected CheckboxTableViewer paramsViewer;
-	protected Table paramsTable;
-
-	protected OmpiInfo info;
-
-	public AdvancedOpenMpiRMLaunchConfigurationDynamicTab(IResourceManager rm) {
-		info = ((OpenMPIResourceManager) rm).getOmpiInfo();
-	}
-
-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener
-	implements ICheckStateListener {
-		public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			if (e.getSource() == paramsViewer || e.getSource() == useArgsDefaultsButton) {
-				updateControls();
-			} else {
-				super.doWidgetSelected(e);
-			}
-		}
-
-		public void checkStateChanged(CheckStateChangedEvent event) {
-			if (isEnabled()) {
-				Object source = event.getSource();
-				if (source == paramsViewer) {
-					fireContentsChanged();
-					updateControls();
-				}
-			}
-		}
-	}
-
-	class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
-		private boolean useDefArgs;
-		private String args;
-		private boolean useDefParams;
-		private Map<String, String> params;
-
-		protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
-			super(page);
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			useDefArgs = useArgsDefaultsButton.getSelection();
-			args = extractText(argsText);
-
-			useDefParams = useParamsDefaultsButton.getSelection();
-			params.clear();
-			for (Object object : paramsViewer.getCheckedElements()) {
-				if (object instanceof Parameter) {
-					Parameter param = (Parameter) object;
-					params.put(param.getName(), param.getValue());
-				}
-			}
-		}
-
-		@Override
-		protected void copyToFields() {
-			applyText(argsText, args);
-			useArgsDefaultsButton.setSelection(useDefArgs);
-			useParamsDefaultsButton.setSelection(useDefParams);
-
-			if (info != null) {
-				for (Entry<String, String> param : params.entrySet()) {
-					Parameter p = info.getParameter(param.getKey());
-					if (p != null) {
-						p.setValue(param.getValue());
-						paramsViewer.setChecked(p, true);
-						paramsViewer.update(p, null);
-					}
-				}
-			}
-		}
-
-		@Override
-		protected void copyToStorage() {
-			getConfigurationWorkingCopy().setAttribute(
-					OpenMPILaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-					useDefArgs);
-			getConfigurationWorkingCopy().setAttribute(
-					OpenMPILaunchConfiguration.ATTR_ARGUMENTS, args);
-			getConfigurationWorkingCopy().setAttribute(
-					OpenMPILaunchConfiguration.ATTR_USEDEFAULTPARAMETERS,
-					useDefParams);
-			getConfigurationWorkingCopy().setAttribute(
-					OpenMPILaunchConfiguration.ATTR_PARAMETERS, params);
-		}
-
-		@Override
-		protected void loadDefault() {
-			args = OpenMPILaunchConfigurationDefaults.ATTR_ARGUMENTS;
-			useDefArgs = OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS;
-			useDefParams = OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS;
-			params = OpenMPILaunchConfigurationDefaults.ATTR_PARAMETERS;
-
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			try {
-				args = getConfiguration().getAttribute(
-						OpenMPILaunchConfiguration.ATTR_ARGUMENTS,
-						OpenMPILaunchConfigurationDefaults.ATTR_ARGUMENTS);
-				useDefArgs = getConfiguration()
-				.getAttribute(
-						OpenMPILaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-						OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
-				useDefParams = getConfiguration()
-				.getAttribute(
-						OpenMPILaunchConfiguration.ATTR_USEDEFAULTPARAMETERS,
-						OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS);
-				params = getConfiguration().getAttribute(
-						OpenMPILaunchConfiguration.ATTR_PARAMETERS,
-						OpenMPILaunchConfigurationDefaults.ATTR_PARAMETERS);
-			} catch (CoreException e) {
-				// TODO handle exception?
-				OpenMPIUIPlugin.log(e);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (!useDefArgs && args == null)
-				throw new ValidationException(
-						Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyArguments);
-			if (!useDefParams) {
-				for (Object object : paramsViewer.getCheckedElements()) {
-					if (object instanceof Parameter) {
-						Parameter param = (Parameter) object;
-						if (param.getValue().equals("")) //$NON-NLS-1$
-							throw new ValidationException(
-									Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyParameter);
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
-		return new WidgetListener(this);
-	}
-
-	@Override
-	public Image getImage() {
-		return null;
-	}
-
-	@Override
-	public String getText() {
-		return Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Title;
-	}
-
-	public void createControl(Composite parent, IResourceManager rm,
-			IPQueue queue) throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		control.setLayout(new GridLayout());
-
-		final Group argumentsGroup = new Group(control, SWT.NONE);
-		argumentsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,
-				false));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		argumentsGroup.setLayout(layout);
-		argumentsGroup
-		.setText(Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_LaunchArguments);
-
-		useArgsDefaultsButton = new Button(argumentsGroup, SWT.CHECK);
-		useArgsDefaultsButton
-		.setText(Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_DefaultArguments);
-		// useArgsDefaultsButton.setSelection(true);
-		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-		useArgsDefaultsButton.setLayoutData(gd);
-		useArgsDefaultsButton.addSelectionListener(getListener());
-
-		Label label = new Label(argumentsGroup, SWT.NONE);
-		label.setLayoutData(new GridData());
-		label
-		.setText(Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_Arguments);
-
-		argsText = new Text(argumentsGroup, SWT.BORDER);
-		argsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		// argsText.setEnabled(false);
-
-		final Group ompiParameteresGroup = new Group(control, SWT.NONE);
-		ompiParameteresGroup
-		.setText(Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_MCAParameters);
-		layout = new GridLayout();
-		layout.numColumns = 2;
-		ompiParameteresGroup.setLayout(layout);
-		ompiParameteresGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
-				true, true));
-
-		useParamsDefaultsButton = new Button(ompiParameteresGroup, SWT.CHECK);
-		useParamsDefaultsButton.addSelectionListener(getListener());
-		useParamsDefaultsButton
-		.setText(Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters);
-		gd = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-		useParamsDefaultsButton.setLayoutData(gd);
-		// useParamsDefaultsButton.setSelection(true);
-
-		paramsViewer = CheckboxTableViewer.newCheckList(ompiParameteresGroup,
-				SWT.CHECK | SWT.FULL_SELECTION);
-		paramsViewer.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {
-				// Empty implementation.
-			}
-
-			public Object[] getElements(Object inputElement) {
-				if (inputElement != null && inputElement instanceof OmpiInfo) {
-					OmpiInfo info = (OmpiInfo) inputElement;
-					return info.getParameters();
-				}
-				return null;
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-				// Empty implementation.
-			}
-		});
-		paramsViewer.setSorter(new ViewerSorter() {
-			@Override
-			public int compare(Viewer viewer, Object j1, Object j2) {
-				return ((Parameter) j1).getName().compareTo(
-						((Parameter) j2).getName());
-			}
-		});
-		paramsViewer.addCheckStateListener(getLocalListener());
-		paramsViewer.setAllChecked(false);
-
-		// Enable cursor keys in table
-		TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(
-				paramsViewer, new FocusCellOwnerDrawHighlighter(paramsViewer));
-		ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(
-				paramsViewer) {
-			@Override
-			protected boolean isEditorActivationEvent(
-					ColumnViewerEditorActivationEvent event) {
-				return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
-				|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
-				|| (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR)
-				|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
-			}
-		};
-		TableViewerEditor.create(paramsViewer, focusCellManager, actSupport,
-				ColumnViewerEditor.TABBING_HORIZONTAL
-				| ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
-				| ColumnViewerEditor.TABBING_VERTICAL
-				| ColumnViewerEditor.KEYBOARD_ACTIVATION);
-
-		paramsTable = paramsViewer.getTable();
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.heightHint = 100;
-		paramsTable.setLayoutData(gd);
-		paramsTable.setLinesVisible(true);
-		paramsTable.setHeaderVisible(true);
-		paramsTable.setEnabled(false);
-		// Disable cell item selection
-		paramsTable.addListener(SWT.EraseItem, new Listener() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see
-			 * org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.
-			 * widgets.Event)
-			 */
-			public void handleEvent(Event event) {
-				event.detail &= ~SWT.SELECTED;
-			}
-		});
-
-		addColumns();
-
-		if (info != null) {
-			paramsViewer.setInput(info);
-		}
-
-	}
-
-	/**
-	 * Add columns to the table viewer
-	 */
-	private void addColumns() {
-		/*
-		 * Name column
-		 */
-		final TableViewerColumn column1 = new TableViewerColumn(paramsViewer,
-				SWT.NONE);
-		column1.setLabelProvider(new ColumnLabelProvider() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see
-			 * org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang
-			 * .Object)
-			 */
-			@Override
-			public String getText(Object element) {
-				if (element instanceof Parameter) {
-					String name = ((Parameter) element).getName();
-					return name;
-				}
-				return null;
-			}
-
-		});
-		column1.getColumn().setResizable(true);
-		column1
-		.getColumn()
-		.setText(
-				Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_PArameterTable_Column_Name);
-
-		/*
-		 * Value column
-		 */
-		final TableViewerColumn column2 = new TableViewerColumn(paramsViewer,
-				SWT.NONE);
-		column2.setLabelProvider(new ColumnLabelProvider() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see
-			 * org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang
-			 * .Object)
-			 */
-			@Override
-			public String getText(Object element) {
-				if (element instanceof Parameter)
-					return ((Parameter) element).getValue();
-				return null;
-			}
-
-		});
-		column2.setEditingSupport(new EditingSupport(paramsViewer) {
-			@Override
-			protected boolean canEdit(Object element) {
-				return !((Parameter) element).isReadOnly()
-				&& paramsViewer.getChecked(element);
-			}
-
-			@Override
-			protected CellEditor getCellEditor(Object element) {
-				return new TextCellEditor(paramsTable);
-			}
-
-			@Override
-			protected Object getValue(Object element) {
-				return ((Parameter) element).getValue();
-			}
-
-			@Override
-			protected void setValue(Object element, Object value) {
-				((Parameter) element).setValue((String) value);
-				getViewer().update(element, null);
-				fireContentsChanged();
-				updateControls();
-			}
-		});
-		column2.getColumn().setResizable(true);
-		column2
-		.getColumn()
-		.setText(
-				Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_ParameterTable_Column_Value);
-
-		paramsTable.addControlListener(new ControlAdapter() {
-			@Override
-			public void controlResized(ControlEvent e) {
-				Rectangle area = paramsTable.getClientArea();
-				// Point size = paramsTable.computeSize(SWT.DEFAULT,
-				// SWT.DEFAULT);
-				ScrollBar vBar = paramsTable.getVerticalBar();
-				int width = area.width
-				- paramsTable.computeTrim(0, 0, 0, 0).width
-				- vBar.getSize().x;
-				paramsTable.getColumn(1).setWidth(width / 3);
-				paramsTable.getColumn(0).setWidth(
-						width - paramsTable.getColumn(1).getWidth());
-			}
-		});
-
-	}
-
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
-			IPQueue queue, ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-		return null;
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation setDefaults(
-			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-			IPQueue queue) {
-		configuration.setAttribute(
-				OpenMPILaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-				OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_ARGUMENTS,
-				OpenMPILaunchConfigurationDefaults.ATTR_ARGUMENTS);
-		configuration.setAttribute(
-				OpenMPILaunchConfiguration.ATTR_USEDEFAULTPARAMETERS,
-				OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_PARAMETERS,
-				OpenMPILaunchConfigurationDefaults.ATTR_PARAMETERS);
-		return new RMLaunchValidation(true, null);
-	}
-
-	@Override
-	public void updateControls() {
-		argsText.setEnabled(!useArgsDefaultsButton.getSelection());
-		paramsTable.setEnabled(!useParamsDefaultsButton.getSelection());
-		if (getLocalDataSource().useDefArgs) {
-			String launchArgs = ""; //$NON-NLS-1$
-			try {
-				launchArgs = OpenMPILaunchConfiguration.calculateArguments(getLocalDataSource().getConfiguration());
-			} catch (CoreException e) {
-				// ignore
-			}
-			argsText.setText(launchArgs);
-		}
-	}
-
-	private DataSource getLocalDataSource() {
-		return (DataSource) super.getDataSource();
-	}
-
-	private WidgetListener getLocalListener() {
-		return (WidgetListener) super.getListener();
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/BasicOpenMpiRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/BasicOpenMpiRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 345c4fa..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/BasicOpenMpiRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.launch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPILaunchAttributes;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.OpenMPIUIPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.ptp.utils.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class BasicOpenMpiRMLaunchConfigurationDynamicTab extends
-AbstractRMLaunchConfigurationDynamicTab {
-
-	Composite control;
-	Spinner numProcsSpinner;
-	Button byNodeButton;
-	Button bySlotButton;
-	Button noOversubscribeButton;
-	Button noLocalButton;
-	Button usePrefixButton;
-	Text prefixText;
-	Text hostFileText;
-	Button hostFileButton;
-	Text hostListText;
-	Button hostListButton;
-	Button browseButton;
-
-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener {
-		public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		@Override
-		protected void doModifyText(ModifyEvent e) {
-			if (e.getSource() == numProcsSpinner 
-					|| e.getSource() == prefixText 
-					|| e.getSource() == hostFileText 
-					|| e.getSource() == hostListText) {
-				//				getDataSource().justValidate();
-			} else{
-				super.doModifyText(e);
-			}
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			if (e.getSource() == byNodeButton 
-					|| e.getSource() == bySlotButton 
-					|| e.getSource() == noOversubscribeButton 
-					|| e.getSource() == noLocalButton 
-					|| e.getSource() == usePrefixButton) {
-				//				getDataSource().justValidate();
-			} else if (e.getSource() == usePrefixButton 
-					|| e.getSource() == hostFileButton 
-					|| e.getSource() == hostListButton) {
-				//				getDataSource().justValidate();
-				updateControls();
-			} else {
-				super.doWidgetSelected(e);
-			}
-		}
-	}
-
-	class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
-
-		private int numProcs;
-		private boolean byNode;
-		private boolean bySlot;
-		private boolean noOversubscribe;
-		private boolean noLocal;
-		private boolean usePrefix;
-		private String prefix;
-		private boolean useHostFile;
-		private String hostFile;
-		private boolean useHostList;
-		private String hostList;
-
-		protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
-			super(page);
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			numProcs = numProcsSpinner.getSelection();
-			byNode = byNodeButton.getSelection();
-			bySlot = bySlotButton.getSelection();
-			noOversubscribe = noOversubscribeButton.getSelection();
-			noLocal = noLocalButton.getSelection();
-			usePrefix = usePrefixButton.getSelection();
-			prefix = extractText(prefixText);
-			useHostFile = hostFileButton.getSelection();
-			hostFile = extractText(hostFileText);
-			useHostList = hostListButton.getSelection();
-			hostList = extractText(hostListText);
-		}
-
-		@Override
-		protected void copyToFields() {
-			numProcsSpinner.setSelection(numProcs);
-			byNodeButton.setSelection(byNode);
-			bySlotButton.setSelection(bySlot);
-			noOversubscribeButton.setSelection(noOversubscribe);
-			noLocalButton.setSelection(noLocal);
-			usePrefixButton.setSelection(usePrefix);
-			applyText(prefixText, prefix);
-			applyText(hostFileText, hostFile);
-			hostFileButton.setSelection(useHostFile);
-			applyText(hostListText, hostListToText(hostList));
-			hostListButton.setSelection(useHostList);
-		}
-
-		@Override
-		protected void copyToStorage() {
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_NUMPROCS, numProcs);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_BYNODE, byNode);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_BYSLOT, bySlot);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_NOOVERSUBSCRIBE, noOversubscribe);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_NOLOCAL, noLocal);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_USEPREFIX, usePrefix);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_PREFIX, prefix);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_USEHOSTFILE, useHostFile);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_HOSTFILE, hostFile);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_USEHOSTLIST, useHostList);
-			getConfigurationWorkingCopy().setAttribute(OpenMPILaunchConfiguration.ATTR_HOSTLIST, hostList);
-		}
-
-		@Override
-		protected void loadDefault() {
-			numProcs = OpenMPILaunchConfigurationDefaults.ATTR_NUMPROCS;
-			byNode = OpenMPILaunchConfigurationDefaults.ATTR_BYNODE;
-			bySlot = OpenMPILaunchConfigurationDefaults.ATTR_BYSLOT;
-			noOversubscribe = OpenMPILaunchConfigurationDefaults.ATTR_NOOVERSUBSCRIBE;
-			noLocal = OpenMPILaunchConfigurationDefaults.ATTR_NOLOCAL;
-			usePrefix = OpenMPILaunchConfigurationDefaults.ATTR_USEPREFIX;
-			prefix = OpenMPILaunchConfigurationDefaults.ATTR_PREFIX;
-			hostFile = OpenMPILaunchConfigurationDefaults.ATTR_HOSTFILE;
-			useHostFile = OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTFILE;
-			hostList = OpenMPILaunchConfigurationDefaults.ATTR_HOSTLIST;
-			useHostList = OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTLIST;
-
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			try {
-				numProcs = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_NUMPROCS, OpenMPILaunchConfigurationDefaults.ATTR_NUMPROCS);
-				byNode = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_BYNODE, OpenMPILaunchConfigurationDefaults.ATTR_BYNODE);
-				bySlot = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_BYSLOT, OpenMPILaunchConfigurationDefaults.ATTR_BYSLOT);
-				noOversubscribe = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_NOOVERSUBSCRIBE, OpenMPILaunchConfigurationDefaults.ATTR_NOOVERSUBSCRIBE);
-				noLocal = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_NOLOCAL, OpenMPILaunchConfigurationDefaults.ATTR_NOLOCAL);
-				usePrefix = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_USEPREFIX, OpenMPILaunchConfigurationDefaults.ATTR_USEPREFIX);
-				prefix = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_PREFIX, OpenMPILaunchConfigurationDefaults.ATTR_PREFIX);
-				hostFile = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_HOSTFILE, OpenMPILaunchConfigurationDefaults.ATTR_HOSTFILE);
-				useHostFile = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_USEHOSTFILE, OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTFILE);
-				hostList = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_HOSTLIST, OpenMPILaunchConfigurationDefaults.ATTR_HOSTLIST);
-				useHostList = getConfiguration().getAttribute(OpenMPILaunchConfiguration.ATTR_USEHOSTLIST, OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTLIST);
-			} catch (CoreException e) {
-				// TODO handle exception?
-				OpenMPIUIPlugin.log(e);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (numProcs < 1) {
-				throw new ValidationException(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_NoProcess);
-			}
-			if (usePrefix && prefix == null) {
-				throw new ValidationException(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyPrefix);
-			}
-			if (useHostFile && hostFile == null) {
-				throw new ValidationException(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyHostfile);
-			}
-			if (useHostList && hostList == null) {
-				throw new ValidationException(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyHostList);
-			}
-		}
-
-		/**
-		 * Convert a comma separated list into one host per line
-		 *
-		 * @param list
-		 * @return
-		 */
-		private String hostListToText(String list) {
-			if (list == null) {
-				return ""; //$NON-NLS-1$
-			}
-			String result = ""; //$NON-NLS-1$
-			String[] values = list.split(","); //$NON-NLS-1$
-			for (int i = 0; i < values.length; i++) {
-				if (!values[i].equals("")) { //$NON-NLS-1$
-					if (i > 0) {
-						result += "\r"; //$NON-NLS-1$
-					}
-					result += values[i];
-				}
-			}
-			return result;
-		}
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
-		return new WidgetListener(this);
-	}
-
-	@Override
-	public Image getImage() {
-		return null;
-	}
-
-	@Override
-	public String getText() {
-		return Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Title;
-	}
-
-	public void createControl(Composite parent, IResourceManager rm, IPQueue queue) throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		control.setLayout(layout);
-
-		Label label  = new Label(control, SWT.NONE);
-		label.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NumberProcesses);
-
-		numProcsSpinner = new Spinner(control, SWT.BORDER);
-		numProcsSpinner.addModifyListener(getListener());
-		numProcsSpinner.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
-
-		final Group optionsGroup = new Group(control, SWT.NONE);
-		optionsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-		optionsGroup.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_OptionsGroup);
-		layout = new GridLayout();
-		layout.numColumns = 4;
-		optionsGroup.setLayout(layout);
-
-		byNodeButton = new Button(optionsGroup, SWT.CHECK);
-		byNodeButton.addSelectionListener(getListener());
-		byNodeButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_ByNode);
-
-		bySlotButton = new Button(optionsGroup, SWT.CHECK);
-		bySlotButton.addSelectionListener(getListener());
-		bySlotButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_BySlot);
-
-		noOversubscribeButton = new Button(optionsGroup, SWT.CHECK);
-		noOversubscribeButton.addSelectionListener(getListener());
-		noOversubscribeButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NoOversubscribe);
-
-		noLocalButton = new Button(optionsGroup, SWT.CHECK);
-		noLocalButton.addSelectionListener(getListener());
-		noLocalButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NoLocal);
-
-		usePrefixButton = new Button(optionsGroup, SWT.CHECK);
-		usePrefixButton.addSelectionListener(getListener());
-		usePrefixButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_Prefix);
-
-		prefixText = new Text(optionsGroup, SWT.BORDER);
-		prefixText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-		prefixText.addModifyListener(getListener());
-
-		final Group hostGroup = new Group(control, SWT.NONE);
-		hostGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-		hostGroup.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_HostGroup);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		hostGroup.setLayout(layout);
-
-		hostFileButton = new Button(hostGroup, SWT.CHECK);
-		hostFileButton.addSelectionListener(getListener());
-		hostFileButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_HostFile);
-
-		hostFileText = new Text(hostGroup, SWT.BORDER);
-		hostFileText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		hostFileText.addModifyListener(getListener());
-
-		browseButton = new Button(hostGroup, SWT.NONE);
-		browseButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-		browseButton.addSelectionListener(getListener());
-		PixelConverter pixelconverter = new PixelConverter(control);
-		GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
-		gd.widthHint = pixelconverter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		browseButton.setLayoutData(gd);
-		browseButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_Browse);
-
-		hostListButton = new Button(hostGroup, SWT.CHECK);
-		hostListButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
-		hostListButton.addSelectionListener(getListener());
-		hostListButton.setText(Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_HostList);
-
-		hostListText = new Text(hostGroup, SWT.V_SCROLL | SWT.BORDER);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		gd.heightHint = 20;
-		hostListText.setLayoutData(gd);
-		hostListText.addModifyListener(getListener());
-
-
-	}
-
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
-			IPQueue queue, ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-
-		List<IAttribute<?,?,?>> attrs = new ArrayList<IAttribute<?,?,?>>();
-
-		int numProcs = configuration.getAttribute(OpenMPILaunchConfiguration.ATTR_NUMPROCS, OpenMPILaunchConfigurationDefaults.ATTR_NUMPROCS);
-		try {
-			attrs.add(JobAttributes.getNumberOfProcessesAttributeDefinition().create(numProcs));
-		} catch (IllegalValueException e) {
-			throw new CoreException(new Status(IStatus.ERROR, OpenMPIUIPlugin.getDefault().getBundle().getSymbolicName(), Messages.BasicOpenMpiRMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration, e));
-		}
-
-		attrs.add(OpenMPILaunchAttributes.getLaunchArgumentsAttributeDefinition().create(OpenMPILaunchConfiguration.calculateArguments(configuration)));
-
-		return attrs.toArray(new IAttribute<?,?,?>[attrs.size()]);
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration,
-			IResourceManager rm, IPQueue queue) {
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_NUMPROCS, OpenMPILaunchConfigurationDefaults.ATTR_NUMPROCS);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_BYNODE, OpenMPILaunchConfigurationDefaults.ATTR_BYNODE);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_BYSLOT, OpenMPILaunchConfigurationDefaults.ATTR_BYSLOT);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_NOOVERSUBSCRIBE, OpenMPILaunchConfigurationDefaults.ATTR_NOOVERSUBSCRIBE);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_NOLOCAL, OpenMPILaunchConfigurationDefaults.ATTR_NOLOCAL);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_USEPREFIX, OpenMPILaunchConfigurationDefaults.ATTR_USEPREFIX);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_PREFIX, OpenMPILaunchConfigurationDefaults.ATTR_PREFIX);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_USEHOSTFILE, OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTFILE);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_HOSTFILE, OpenMPILaunchConfigurationDefaults.ATTR_HOSTFILE);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_USEHOSTLIST, OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTLIST);
-		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_HOSTLIST, OpenMPILaunchConfigurationDefaults.ATTR_HOSTLIST);
-		return new RMLaunchValidation(true, null);
-	}
-
-	private DataSource getBasicDataSource() {
-		return (DataSource)getDataSource();
-	}
-
-	@Override
-	public void updateControls() {
-		prefixText.setEnabled(usePrefixButton.getSelection());
-		browseButton.setEnabled(hostFileButton.getSelection());
-		hostFileText.setEnabled(hostFileButton.getSelection());
-		hostListText.setEnabled(hostListButton.getSelection());
-	}
-
-	private DataSource getLocalDataSource() {
-		return (DataSource)super.getDataSource();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/NewOpenMPIRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/NewOpenMPIRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 1a4960e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/NewOpenMPIRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.launch;
-
-
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rm.ui.launch.ExtendableRMLaunchConfigurationDynamicTab;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class NewOpenMPIRMLaunchConfigurationDynamicTab extends
-ExtendableRMLaunchConfigurationDynamicTab {
-
-	public NewOpenMPIRMLaunchConfigurationDynamicTab(IResourceManager rm) {
-		super();
-		addDynamicTab(new BasicOpenMpiRMLaunchConfigurationDynamicTab());
-		addDynamicTab(new AdvancedOpenMpiRMLaunchConfigurationDynamicTab(rm));
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfiguration.java
deleted file mode 100644
index c8e8e6e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfiguration.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.launch;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.OpenMPIUIPlugin;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPILaunchConfiguration {
-	public static final String ATTR_BASE = OpenMPIUIPlugin.PLUGIN_ID + ".launchAttributes"; //$NON-NLS-1$
-	public static final String ATTR_NUMPROCS = ATTR_BASE + ".numProcs"; //$NON-NLS-1$
-	public static final String ATTR_BYNODE = ATTR_BASE + ".byNode"; //$NON-NLS-1$
-	public static final String ATTR_BYSLOT = ATTR_BASE + ".bySlot"; //$NON-NLS-1$
-	public static final String ATTR_NOOVERSUBSCRIBE = ATTR_BASE + ".noOversubscribe"; //$NON-NLS-1$
-	public static final String ATTR_NOLOCAL = ATTR_BASE + ".noLocal"; //$NON-NLS-1$
-	public static final String ATTR_PREFIX = ATTR_BASE + ".prefix"; //$NON-NLS-1$
-	public static final String ATTR_USEPREFIX = ATTR_BASE + ".usePrefix"; //$NON-NLS-1$
-	public static final String ATTR_HOSTFILE = ATTR_BASE + ".hostFile"; //$NON-NLS-1$
-	public static final String ATTR_USEHOSTFILE = ATTR_BASE + ".useHostFile"; //$NON-NLS-1$
-	public static final String ATTR_HOSTLIST = ATTR_BASE + ".hostList"; //$NON-NLS-1$
-	public static final String ATTR_USEHOSTLIST = ATTR_BASE + ".useHostList"; //$NON-NLS-1$
-	public static final String ATTR_ARGUMENTS = ATTR_BASE + ".arguments"; //$NON-NLS-1$
-	public static final String ATTR_USEDEFAULTARGUMENTS = ATTR_BASE + ".useDefaultArguments"; //$NON-NLS-1$
-	public static final String ATTR_PARAMETERS = ATTR_BASE + ".parameters"; //$NON-NLS-1$
-	public static final String ATTR_USEDEFAULTPARAMETERS = ATTR_BASE + ".useDefaultParameters"; //$NON-NLS-1$
-
-	static String calculateArguments(ILaunchConfiguration configuration) throws CoreException {
-		if (configuration.getAttribute(ATTR_USEDEFAULTARGUMENTS, OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS)) {
-			String launchArgs = "-np " + Integer.toString(configuration.getAttribute(ATTR_NUMPROCS, OpenMPILaunchConfigurationDefaults.ATTR_NUMPROCS)); //$NON-NLS-1$
-			if (configuration.getAttribute(ATTR_BYNODE, OpenMPILaunchConfigurationDefaults.ATTR_BYNODE)) {
-				launchArgs += " -bynode"; //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_BYSLOT, OpenMPILaunchConfigurationDefaults.ATTR_BYSLOT)) {
-				launchArgs += " -byslot"; //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_NOOVERSUBSCRIBE, OpenMPILaunchConfigurationDefaults.ATTR_NOOVERSUBSCRIBE)) {
-				launchArgs += " -nooversubscribe"; //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_NOLOCAL, OpenMPILaunchConfigurationDefaults.ATTR_NOLOCAL)) {
-				launchArgs += " -nolocal"; //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEPREFIX, OpenMPILaunchConfigurationDefaults.ATTR_USEPREFIX)) {
-				launchArgs += " --prefix " + fixString(configuration.getAttribute(ATTR_PREFIX, OpenMPILaunchConfigurationDefaults.ATTR_PREFIX)); //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEHOSTFILE, OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTFILE)) {
-				launchArgs += " -hostfile " + fixString(configuration.getAttribute(ATTR_HOSTFILE, OpenMPILaunchConfigurationDefaults.ATTR_HOSTFILE)); //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEHOSTLIST, OpenMPILaunchConfigurationDefaults.ATTR_USEHOSTLIST)) {
-				launchArgs += " -host " + fixString(configuration.getAttribute(ATTR_HOSTLIST, OpenMPILaunchConfigurationDefaults.ATTR_HOSTLIST)); //$NON-NLS-1$
-			}
-
-			if (! configuration.getAttribute(ATTR_USEDEFAULTPARAMETERS, OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS)) {
-				Map<String, String> params = configuration.getAttribute(ATTR_PARAMETERS, OpenMPILaunchConfigurationDefaults.ATTR_PARAMETERS);
-				for (Entry<String, String> param : params.entrySet()) {
-					launchArgs += " -mca " + param.getKey() + " " + fixString(param.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			return launchArgs;
-		}
-
-		return configuration.getAttribute(ATTR_ARGUMENTS, OpenMPILaunchConfigurationDefaults.ATTR_ARGUMENTS);
-	}
-
-	/**
-	 * Make string suitable for passing as an argument
-	 *
-	 * @param s
-	 * @return
-	 */
-	static private String fixString(String s) {
-		// TODO is that right and escaped correctly?
-		if (s == null) {
-			return "\"\""; //$NON-NLS-1$
-		}
-		return "\"" + s + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfigurationDefaults.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfigurationDefaults.java
deleted file mode 100644
index 909a804..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPILaunchConfigurationDefaults.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.launch;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.OpenMPIUIPlugin;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.osgi.framework.Bundle;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPILaunchConfigurationDefaults {
-	public static int ATTR_NUMPROCS;
-	public static boolean ATTR_BYNODE;
-	public static boolean ATTR_BYSLOT;
-	public static boolean ATTR_NOOVERSUBSCRIBE;
-	public static boolean ATTR_NOLOCAL;
-	public static String ATTR_PREFIX;
-	public static boolean ATTR_USEPREFIX;
-	public static String ATTR_HOSTFILE;
-	public static boolean ATTR_USEHOSTFILE;
-	public static String ATTR_HOSTLIST;
-	public static boolean ATTR_USEHOSTLIST;
-	public static String ATTR_ARGUMENTS;
-	public static boolean ATTR_USEDEFAULTARGUMENTS;
-	public static HashMap<String, String> ATTR_PARAMETERS = new HashMap<String, String>();
-	public static boolean ATTR_USEDEFAULTPARAMETERS;
-
-	private static String defaultsResourcePath = "/data/launch-defaults.properties"; //$NON-NLS-1$
-
-	public static void loadDefaults() throws CoreException {
-		Path defaultsPropertiesPath = new Path(defaultsResourcePath);
-		Bundle bundle = OpenMPIUIPlugin.getDefault().getBundle();
-		Properties properties = read(defaultsPropertiesPath, bundle);
-
-		ATTR_NUMPROCS = getInteger(bundle, properties, "NUMPROCS"); //$NON-NLS-1$
-		ATTR_BYNODE = getBoolean(bundle, properties, "BYNODE"); //$NON-NLS-1$
-		ATTR_BYSLOT = getBoolean(bundle, properties, "BYSLOT"); //$NON-NLS-1$
-		ATTR_NOOVERSUBSCRIBE = getBoolean(bundle, properties, "NOOVERSUBSCRIBE"); //$NON-NLS-1$
-		ATTR_NOLOCAL = getBoolean(bundle, properties, "NOLOCAL"); //$NON-NLS-1$
-		ATTR_PREFIX = getString(bundle, properties, "PREFIX"); //$NON-NLS-1$
-		ATTR_USEPREFIX = getBoolean(bundle, properties, "USEPREFIX"); //$NON-NLS-1$
-		ATTR_HOSTFILE = getString(bundle, properties, "HOSTFILE"); //$NON-NLS-1$
-		ATTR_USEHOSTFILE = getBoolean(bundle, properties, "USEHOSTFILE"); //$NON-NLS-1$
-		ATTR_ARGUMENTS = getString(bundle, properties, "ARGUMENTS"); //$NON-NLS-1$
-		ATTR_USEDEFAULTARGUMENTS = getBoolean(bundle, properties, "USEDEFAULTARGUMENTS"); //$NON-NLS-1$
-		ATTR_USEDEFAULTPARAMETERS = getBoolean(bundle, properties, "USEDEFAULTPARAMETERS"); //$NON-NLS-1$
-
-		assert ATTR_PREFIX != null;
-		assert ATTR_HOSTFILE != null;
-		assert ATTR_ARGUMENTS != null;
-		// TODO: read ATTR_PARAMETERS
-	}
-
-	public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
-	throws CoreException {
-		InputStream inStream;
-		Properties properties = new Properties();
-		try {
-			inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
-			properties.load(inStream);
-		} catch (IOException e) {
-			throw OpenMPIUIPlugin.coreErrorException(Messages.OpenMPILaunchConfigurationDefaults_Exception_FailedReadFile, e);
-		}
-		return properties;
-	}
-
-	public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = properties.getProperty(key);
-		if (value == null) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.OpenMPILaunchConfigurationDefaults_MissingValue, key)));
-		} else {
-			return value;
-		}
-	}
-
-	public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.OpenMPILaunchConfigurationDefaults_FailedParseInteger, key)));
-		}
-	}
-
-	public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		return Boolean.parseBoolean(value);
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPIRMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPIRMLaunchConfigurationFactory.java
deleted file mode 100644
index 7d9a03d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/launch/OpenMPIRMLaunchConfigurationFactory.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManager;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIRMLaunchConfigurationFactory extends
-AbstractRMLaunchConfigurationFactory {
-
-	@Override
-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {
-		return new NewOpenMPIRMLaunchConfigurationDynamicTab(rm);
-	}
-
-	@Override
-	public Class<? extends IResourceManager> getResourceManagerClass() {
-		return OpenMPIResourceManager.class;
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/Messages.java
deleted file mode 100644
index eb38b1e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/Messages.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.rm.mpi.openmpi.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.openmpi.ui.messages.messages"; //$NON-NLS-1$
-	public static String OpenMPIUIPlugin_Exception_InternalError;
-
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_Arguments;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_DefaultArguments;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_LaunchArguments;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_MCAParameters;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_PArameterTable_Column_Name;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_ParameterTable_Column_Value;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Title;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyArguments;
-	public static String AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyParameter;
-
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_Browse;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_ByNode;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_BySlot;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_HostFile;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NoLocal;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NoOversubscribe;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NumberProcesses;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_Prefix;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Title;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_HostGroup;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_HostList;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_OptionsGroup;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyHostfile;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyHostList;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyPrefix;
-	public static String BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_NoProcess;
-
-	public static String OpenMPILaunchConfigurationDefaults_Exception_FailedReadFile;
-	public static String OpenMPILaunchConfigurationDefaults_FailedParseInteger;
-	public static String OpenMPILaunchConfigurationDefaults_MissingValue;
-
-	public static String OpenMPI12PreferencePage_Title;
-	public static String OpenMPI13PreferencePage_Title;
-
-	public static String OpenMPIConfigurationWizardPage_Description;
-	public static String OpenMPIConfigurationWizardPage_Label_Version;
-	public static String OpenMPIConfigurationWizardPage_Name;
-	public static String OpenMPIConfigurationWizardPage_Title;
-	public static String OpenMPIConfigurationWizardPage_Validation_NoVersionSelected;
-	public static String OpenMPIConfigurationWizardPage_VersionCombo_Version12;
-	public static String OpenMPIConfigurationWizardPage_VersionCombo_Version13;
-	public static String OpenMPIRMConfigurationWizardPage_Description;
-	public static String OpenMPIRMConfigurationWizardPage_Title;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/messages.properties
deleted file mode 100644
index 5181603..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/messages/messages.properties
+++ /dev/null

@@ -1,47 +0,0 @@
-OpenMPIUIPlugin_Exception_InternalError=Internal error
-
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_Arguments=Arguments:
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_DefaultArguments=Use default arguments
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters=Use default parameters
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_LaunchArguments=Launch arguments
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Label_MCAParameters=MCA Parameters
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_PArameterTable_Column_Name=Name
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_ParameterTable_Column_Value=Value
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Title=Advanced Open MPI
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyArguments=Arguments cannot be empty
-AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyParameter=Parameter value cannot be empty
-
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration=Invalid configuration
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_Browse=Browse
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_ByNode=By node
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_BySlot=By slot
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_HostFile=Host file:
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NoLocal=No local
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NoOversubscribe=No oversubscribe
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_NumberProcesses=Number of processes:
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Label_Prefix=Prefix:
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Title=Basic Open MPI
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_HostGroup=Hosts
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_HostList=Host list:
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Title_OptionsGroup=Options
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyHostfile=Must provide a host file
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyHostList=Must provide at least one host name
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyPrefix=Prefix cannot be empty
-BasicOpenMpiRMLaunchConfigurationDynamicTab_Validation_NoProcess=Must specify at least one process
-
-OpenMPILaunchConfigurationDefaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-OpenMPILaunchConfigurationDefaults_FailedParseInteger=Failed to parse integer default value for {0}
-OpenMPILaunchConfigurationDefaults_MissingValue=Missing default value for {0}
-
-OpenMPI12PreferencePage_Title=Open MPI 1.2 preferences
-OpenMPI13PreferencePage_Title=Open MPI 1.3 preferences
-
-OpenMPIConfigurationWizardPage_Description=Enter information to configure the Open MPI tool
-OpenMPIConfigurationWizardPage_Label_Version=Open MPI version:
-OpenMPIConfigurationWizardPage_Name=Open MPI
-OpenMPIConfigurationWizardPage_Title=Open MPI tool configuration
-OpenMPIConfigurationWizardPage_Validation_NoVersionSelected=No Open MPI version selected
-OpenMPIConfigurationWizardPage_VersionCombo_Version12=Open MPI 1.2
-OpenMPIConfigurationWizardPage_VersionCombo_Version13=Open MPI 1.3
-OpenMPIRMConfigurationWizardPage_Description=Enter Open MPI connection information
-OpenMPIRMConfigurationWizardPage_Title=Open MPI connection configuration

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/EmptyPage.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/EmptyPage.java
deleted file mode 100644
index 830ed97..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/EmptyPage.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class EmptyPage extends PreferencePage implements
-IWorkbenchPreferencePage {
-
-	public EmptyPage() {
-		super();
-		noDefaultAndApplyButton();
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		return parent;
-	}
-
-	public void init(IWorkbench workbench) {
-		// Empty
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI12PreferencePage.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI12PreferencePage.java
deleted file mode 100644
index 002439e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI12PreferencePage.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.rm.mpi.openmpi.ui.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPI12PreferenceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.preferences.AbstractToolsPreferencePage;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPI12PreferencePage extends AbstractToolsPreferencePage {
-
-	public OpenMPI12PreferencePage() {
-		super(OpenMPI12PreferenceManager.PREFIX, OpenMPIResourceManagerConfiguration.OPENMPI_CAPABILITIES, Messages.OpenMPI12PreferencePage_Title);
-	}
-
-	@Override
-	public Preferences getPreferences() {
-		return OpenMPI12PreferenceManager.getPreferences();
-	}
-
-	@Override
-	public void savePreferences() {
-		OpenMPI12PreferenceManager.savePreferences();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI13PreferencePage.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI13PreferencePage.java
deleted file mode 100644
index 74588cb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/preferences/OpenMPI13PreferencePage.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.rm.mpi.openmpi.ui.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPI13PreferenceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.preferences.AbstractToolsPreferencePage;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPI13PreferencePage extends AbstractToolsPreferencePage {
-
-	public OpenMPI13PreferencePage() {
-		super(OpenMPI13PreferenceManager.PREFIX, OpenMPIResourceManagerConfiguration.OPENMPI_CAPABILITIES, Messages.OpenMPI13PreferencePage_Title);
-	}
-
-	@Override
-	public Preferences getPreferences() {
-		return OpenMPI13PreferenceManager.getPreferences();
-	}
-
-	@Override
-	public void savePreferences() {
-		OpenMPI13PreferenceManager.savePreferences();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIConfigurationWizardPage.java
deleted file mode 100644
index f7c23af..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIConfigurationWizardPage.java
+++ /dev/null

@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.wizards;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPI12PreferenceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.core.OpenMPI13PreferenceManager;
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.wizards.AbstractConfigurationWizardPage;
-import org.eclipse.ptp.rm.ui.wizards.AbstractToolRMConfigurationWizardPage;
-import org.eclipse.ptp.rm.ui.wizards.WizardPageDataSource;
-import org.eclipse.ptp.rm.ui.wizards.WizardPageWidgetListener;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIConfigurationWizardPage extends
-AbstractToolRMConfigurationWizardPage {
-
-	String versionIds[] = new String[] { OpenMPIResourceManagerConfiguration.VERSION_12, OpenMPIResourceManagerConfiguration.VERSION_13 };
-	String versionsNames[] = new String[] { Messages.OpenMPIConfigurationWizardPage_VersionCombo_Version12, Messages.OpenMPIConfigurationWizardPage_VersionCombo_Version13};
-
-	protected Combo versionCombo;
-
-	protected class WidgetListener extends AbstractToolRMConfigurationWizardPage.WidgetListener {
-		@Override
-		protected void doModifyText(ModifyEvent evt) {
-			super.doModifyText(evt);
-		}
-
-		@Override
-		public void doWidgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == versionCombo) {
-				handleVersionSelected();
-				updateControls();
-				getDataSource().storeAndValidate();
-			} else {
-				super.doWidgetSelected(e);
-			}
-		}
-	}
-
-	protected class DataSource extends AbstractToolRMConfigurationWizardPage.DataSource {
-		protected DataSource(AbstractConfigurationWizardPage page) {
-			super(page);
-		}
-
-		private OpenMPIResourceManagerConfiguration config;
-		private String versionId = null;
-
-		public String getVersionId() {
-			return versionId;
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			if (versionCombo.getSelectionIndex() == -1) {
-				versionIds = null;
-			} else {
-				versionId = versionIds[versionCombo.getSelectionIndex()];
-			}
-			super.copyFromFields();
-		}
-
-		@Override
-		protected void copyToFields() {
-			if (versionId == null) {
-				versionCombo.select(-1);
-			} else {
-				for (int i = 0; i < versionIds.length; i++) {
-					if (versionId.equals(versionIds[i])) {
-						versionCombo.select(i);
-					}
-				}
-			}
-			super.copyToFields();
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			versionId = config.getVersionId();
-			super.loadFromStorage();
-		}
-
-		@Override
-		protected void copyToStorage() {
-			config.setVersionId(versionId);
-			super.copyToStorage();
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (versionId == null)
-				throw new ValidationException(Messages.OpenMPIConfigurationWizardPage_Validation_NoVersionSelected);
-			super.validateLocal();
-		}
-
-
-		@Override
-		public void setConfig(IResourceManagerConfiguration configuration) {
-			this.config = (OpenMPIResourceManagerConfiguration) configuration;
-			super.setConfig(configuration);
-		}
-	}
-
-	@Override
-	protected WizardPageWidgetListener createListener() {
-		return new WidgetListener();
-	}
-
-	@Override
-	protected WizardPageDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	public OpenMPIConfigurationWizardPage(RMConfigurationWizard wizard) {
-		super(wizard, OpenMPIResourceManagerConfiguration.OPENMPI_CAPABILITIES , Messages.OpenMPIConfigurationWizardPage_Name, Messages.OpenMPIConfigurationWizardPage_Title, Messages.OpenMPIConfigurationWizardPage_Description);
-	}
-
-	@Override
-	protected Composite doCreateContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginBottom = 0;
-		layout.marginTop = 0;
-		layout.marginRight = 0;
-		layout.marginLeft = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		contents.setLayout(layout);
-
-		createVersionContents(contents);
-		createContents(contents);
-
-		return contents;
-	}
-
-	protected void createVersionContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		contents.setLayout(layout);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		contents.setLayoutData(gd);
-
-		/*
-		 * Selection for openmpi version.
-		 */
-
-		Label label = new Label(contents, SWT.NONE);
-		label.setText(Messages.OpenMPIConfigurationWizardPage_Label_Version);
-
-		versionCombo = new Combo(contents, SWT.DROP_DOWN | SWT.READ_ONLY);
-		for (int i = 0; i < versionsNames.length; i++) {
-			versionCombo.add(versionsNames[i]);
-		}
-		versionCombo.addSelectionListener(getWidgetListener());
-	}
-
-	public void handleVersionSelected() {
-		getWidgetListener().disable();
-		DataSource dataSource = (DataSource) this.getDataSource();
-		dataSource.justValidate();
-		String launchCmd = null;
-		String debugCmd = null;
-		String discoverCmd = null;
-		String remoteInstallPath = null;
-		if (dataSource.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_12)) {
-			Preferences preferences = OpenMPI12PreferenceManager.getPreferences();
-			launchCmd = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_LAUNCH_CMD);
-			debugCmd = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_DEBUG_CMD);
-			discoverCmd = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_DISCOVER_CMD);
-			remoteInstallPath = preferences.getString(OpenMPI12PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_REMOTE_INSTALL_PATH);
-		} else if (dataSource.getVersionId().equals(OpenMPIResourceManagerConfiguration.VERSION_13)) {
-			Preferences preferences = OpenMPI13PreferenceManager.getPreferences();
-			launchCmd = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_LAUNCH_CMD);
-			debugCmd = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_DEBUG_CMD);
-			discoverCmd = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI13PreferenceManager.PREFS_DISCOVER_CMD);
-			remoteInstallPath = preferences.getString(OpenMPI13PreferenceManager.PREFIX + OpenMPI12PreferenceManager.PREFS_REMOTE_INSTALL_PATH);
-		} else {
-			assert false;
-		}
-		resetErrorMessages();
-		dataSource.setCommandFields(launchCmd, debugCmd, discoverCmd, null, 0, null, dataSource.getRemoteInstallPath());
-		dataSource.setUseDefaults(true);
-		dataSource.copyToFields();
-		getWidgetListener().enable();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPage.java
deleted file mode 100644
index 2f63739..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPage.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.wizards;
-
-import org.eclipse.ptp.rm.mpi.openmpi.ui.messages.Messages;
-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public final class OpenMPIRMConfigurationWizardPage extends AbstractRemoteResourceManagerConfigurationWizardPage {
-
-	public OpenMPIRMConfigurationWizardPage(RMConfigurationWizard wizard) {
-		super(wizard, Messages.OpenMPIRMConfigurationWizardPage_Title);
-		setTitle(Messages.OpenMPIRMConfigurationWizardPage_Title);
-		setDescription(Messages.OpenMPIRMConfigurationWizardPage_Description);
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPageFactory.java
deleted file mode 100644
index 2e7b084..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.openmpi.ui/src/org/eclipse/ptp/rm/mpi/openmpi/ui/wizards/OpenMPIRMConfigurationWizardPageFactory.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.openmpi.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ptp.rm.mpi.openmpi.core.rmsystem.OpenMPIResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class OpenMPIRMConfigurationWizardPageFactory extends
-RMConfigurationWizardPageFactory {
-
-	public OpenMPIRMConfigurationWizardPageFactory() {
-		// no-op
-	}
-
-	protected RMConfigurationWizardPage[] getOpenMPIConfigurationWizardPages(RMConfigurationWizard wizard) {
-		return new RMConfigurationWizardPage[] {
-				new OpenMPIConfigurationWizardPage(wizard)
-		};
-	}
-
-	//	@Override
-	@Override
-	public RMConfigurationWizardPage[] getPages(RMConfigurationWizard wizard) {
-		List<RMConfigurationWizardPage> list = new ArrayList<RMConfigurationWizardPage>();
-		list.add(new OpenMPIRMConfigurationWizardPage(wizard));
-		list.addAll(Arrays.asList(getOpenMPIConfigurationWizardPages(wizard)));
-		return list.toArray(new RMConfigurationWizardPage[list.size()]);
-	}
-
-	//	@Override
-	@Override
-	public Class<? extends IResourceManagerFactory> getRMFactoryClass() {
-		return OpenMPIResourceManagerFactory.class;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/.classpath b/rms/org.eclipse.ptp.rm.ui/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.ui/.options b/rms/org.eclipse.ptp.rm.ui/.options
deleted file mode 100644
index e8e460d..0000000
--- a/rms/org.eclipse.ptp.rm.ui/.options
+++ /dev/null

@@ -1,7 +0,0 @@
-org.eclipse.ptp.rm.ui/debug=true
-
-# Trace events on data source of GUI
-org.eclipse.ptp.rm.ui/debug/dataSource=true
-
-# Trace events on widget listener of GUI
-org.eclipse.ptp.rm.ui/debug/widgetListener=true

diff --git a/rms/org.eclipse.ptp.rm.ui/.project b/rms/org.eclipse.ptp.rm.ui/.project
deleted file mode 100644
index 892b9b6..0000000
--- a/rms/org.eclipse.ptp.rm.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.ui/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/rms/org.eclipse.ptp.rm.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0219c4b..0000000
--- a/rms/org.eclipse.ptp.rm.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.ui
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.ui.ToolsRMUIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.launch,
- org.eclipse.debug.core
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.rm.ui,
- org.eclipse.ptp.rm.ui.launch,
- org.eclipse.ptp.rm.ui.preferences,
- org.eclipse.ptp.rm.ui.utils,
- org.eclipse.ptp.rm.ui.wizards
-Bundle-Vendor: %pluginProvider

diff --git a/rms/org.eclipse.ptp.rm.ui/about.html b/rms/org.eclipse.ptp.rm.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.ui/about.html
+++ /dev/null

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

diff --git a/rms/org.eclipse.ptp.rm.ui/build.properties b/rms/org.eclipse.ptp.rm.ui/build.properties
deleted file mode 100644
index c1a06f6..0000000
--- a/rms/org.eclipse.ptp.rm.ui/build.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties

diff --git a/rms/org.eclipse.ptp.rm.ui/plugin.properties b/rms/org.eclipse.ptp.rm.ui/plugin.properties
deleted file mode 100644
index d918560..0000000
--- a/rms/org.eclipse.ptp.rm.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Resource Manager UI
-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/ToolsRMUIPlugin.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/ToolsRMUIPlugin.java
deleted file mode 100644
index dfdc595..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/ToolsRMUIPlugin.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.utils.DebugUtil;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ToolsRMUIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static ToolsRMUIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public ToolsRMUIPlugin() {
-		// Nothing to do.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		DebugUtil.configurePluginDebugOptions();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static ToolsRMUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 * 
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 * 
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 * 
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.ToolsRMUIPlugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/AbstractRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/AbstractRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 76c2642..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/AbstractRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.launch;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationContentsChangedListener;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Control;
-
-public abstract class AbstractRMLaunchConfigurationDynamicTab implements
-IRMLaunchConfigurationDynamicTab {
-
-	private final ListenerList listenerList = new ListenerList();
-
-	private final RMLaunchConfigurationDynamicTabDataSource dataSource = createDataSource();
-	private final RMLaunchConfigurationDynamicTabWidgetListener widgetListener = createListener();
-
-	/**
-	 * Create listener for the tab. The listener must extend {@link RMLaunchConfigurationDynamicTabWidgetListener} and add
-	 * specific behavior for widgets of the the tab.
-	 * @return the listener
-	 */
-	protected abstract RMLaunchConfigurationDynamicTabWidgetListener createListener();
-
-	/**
-	 * Create data source to handle tab content. The listener must extend {@link RMLaunchConfigurationDynamicTabDataSource} and add
-	 * specific behavior for widgets of the the tab.
-	 * @return the listener
-	 */
-	protected abstract RMLaunchConfigurationDynamicTabDataSource createDataSource();
-
-	protected RMLaunchConfigurationDynamicTabWidgetListener getListener() {
-		return widgetListener;
-	}
-
-	protected RMLaunchConfigurationDynamicTabDataSource getDataSource() {
-		return dataSource;
-	}
-
-	public void addContentsChangedListener(IRMLaunchConfigurationContentsChangedListener listener) {
-		listenerList.add(listener);
-	}
-
-	public void removeContentsChangedListener(IRMLaunchConfigurationContentsChangedListener listener) {
-		listenerList.remove(listener);
-	}
-
-	/**
-	 * This should be called when GUI elements are modified by the user,
-	 * e.g. a Text widget should have its ModifyListener's
-	 * modifyText method set up to notify all of the contents
-	 * changed listeners.
-	 */
-	protected void fireContentsChanged() {
-		Object[] listeners = listenerList.getListeners();
-		for (Object listener : listeners) {
-			((IRMLaunchConfigurationContentsChangedListener) listener).handleContentsChanged(this);
-		}
-	}
-
-	public RMLaunchValidation canSave(Control control,
-			IResourceManager rm, IPQueue queue) {
-		if (dataSource.canSave())
-			return new RMLaunchValidation(true, null);
-		else
-			return new RMLaunchValidation(false, dataSource.getErrorMessage());
-	}
-
-	public RMLaunchValidation isValid(ILaunchConfiguration launchConfig,
-			IResourceManager rm, IPQueue queue) {
-		if (dataSource.canAccept())
-			return new RMLaunchValidation(true, null);
-		else
-			return new RMLaunchValidation(false, dataSource.getErrorMessage());
-	}
-
-	public RMLaunchValidation initializeFrom(Control control,
-			IResourceManager rm, IPQueue queue,
-			ILaunchConfiguration configuration) {
-		dataSource.setResourceManager(rm);
-		dataSource.setQueue(queue);
-		dataSource.setConfiguration(configuration);
-		widgetListener.disable();
-		dataSource.loadAndUpdate();
-		widgetListener.enable();
-		if (dataSource.getErrorMessage() == null)
-			return new RMLaunchValidation(true, null);
-		else
-			return new RMLaunchValidation(false, dataSource.getErrorMessage());
-	}
-
-	public RMLaunchValidation performApply(
-			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-			IPQueue queue) {
-		dataSource.setResourceManager(rm);
-		dataSource.setQueue(queue);
-		dataSource.setConfigurationWorkingCopy(configuration);
-		dataSource.storeAndValidate();
-		if (dataSource.getErrorMessage() == null)
-			return new RMLaunchValidation(true, null);
-		else
-			return new RMLaunchValidation(false, dataSource.getErrorMessage());
-	}
-
-	//	public RMLaunchValidation setDefaults(
-	//			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-	//			IPQueue queue) {
-	//		dataSource.setResourceManager(rm);
-	//		dataSource.setQueue(queue);
-	//		dataSource.setConfigurationWorkingCopy(configuration);
-	//		dataSource.storeDefaults();
-	//		if (dataSource.getErrorMessage() == null) {
-	//			return new RMLaunchValidation(true, null);
-	//		} else {
-	//			return new RMLaunchValidation(false, dataSource.getErrorMessage());
-	//		}
-	//	}
-
-	public abstract Image getImage();
-
-	public abstract String getText();
-
-	abstract public void updateControls();
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/ExtendableRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/ExtendableRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 745aba2..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/ExtendableRMLaunchConfigurationDynamicTab.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.launch;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationContentsChangedListener;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-public abstract class ExtendableRMLaunchConfigurationDynamicTab
-extends
-org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationDynamicTab
-implements IRMLaunchConfigurationContentsChangedListener {
-
-	private final List<AbstractRMLaunchConfigurationDynamicTab> tabControllers = new ArrayList<AbstractRMLaunchConfigurationDynamicTab>();
-	private Composite control;
-
-	protected void addDynamicTab(AbstractRMLaunchConfigurationDynamicTab tabController) {
-		tabControllers.add(tabController);
-		tabController.addContentsChangedListener(this);
-	}
-
-	public RMLaunchValidation canSave(Control control, IResourceManager rm, IPQueue queue) {
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			RMLaunchValidation validation = tabControl.canSave(control, rm, queue);
-			if (! validation.isSuccess())
-				return validation;
-		}
-		return new RMLaunchValidation(true, null);
-	}
-
-	public RMLaunchValidation isValid(ILaunchConfiguration launchConfig, IResourceManager rm, IPQueue queue) {
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			RMLaunchValidation validation = tabControl.isValid(launchConfig, rm, queue);
-			if (! validation.isSuccess())
-				return validation;
-		}
-		return new RMLaunchValidation(true, null);
-	}
-
-	public void createControl(Composite parent, IResourceManager rm, IPQueue queue)
-	throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		control.setLayout(layout);
-
-		final TabFolder tabFolder = new TabFolder(control, SWT.NONE);
-		tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			final TabItem simpleTabItem = new TabItem(tabFolder, SWT.NONE);
-			tabControl.createControl(tabFolder, rm, queue);
-			simpleTabItem.setText(tabControl.getText());
-			simpleTabItem.setImage(tabControl.getImage());
-			simpleTabItem.setControl(tabControl.getControl());
-		}
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation initializeFrom(Control control, IResourceManager rm, IPQueue queue,
-			ILaunchConfiguration configuration) {
-		RMLaunchValidation resultValidation = new RMLaunchValidation(true, null);
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			RMLaunchValidation validation = tabControl.initializeFrom(control, rm, queue, configuration);
-			if (! validation.isSuccess()) {
-				resultValidation = validation;
-			}
-		}
-		return resultValidation;
-	}
-
-	public RMLaunchValidation performApply(ILaunchConfigurationWorkingCopy configuration, IResourceManager rm, IPQueue queue) {
-		RMLaunchValidation resultValidation = new RMLaunchValidation(true, null);
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			RMLaunchValidation validation = tabControl.performApply(configuration, rm, queue);
-			if (! validation.isSuccess()) {
-				resultValidation = validation;
-			}
-		}
-		return resultValidation;
-	}
-
-	public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration, IResourceManager rm, IPQueue queue) {
-		RMLaunchValidation resultValidation = new RMLaunchValidation(true, null);
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			RMLaunchValidation validation = tabControl.setDefaults(configuration, rm, queue);
-			if (! validation.isSuccess()) {
-				resultValidation = validation;
-			}
-		}
-		return resultValidation;
-	}
-
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm, IPQueue queue, ILaunchConfiguration configuration,
-			String mode) throws CoreException {
-		List<IAttribute<?, ?, ?>> attributes = new ArrayList<IAttribute<?, ?, ?>>();
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			IAttribute<?, ?, ?> attributeArray[] = tabControl.getAttributes(rm, queue, configuration, mode);
-			if (attributeArray != null) {
-				List<IAttribute<?, ?, ?>> attributesList = Arrays.asList(attributeArray);
-				attributes.addAll(attributesList);
-			}
-		}
-		return attributes.toArray(new IAttribute<?, ?, ?>[attributes.size()]);
-	}
-
-	public void updateControls() {
-		for (AbstractRMLaunchConfigurationDynamicTab tabControl : tabControllers) {
-			tabControl.updateControls();
-		}
-	}
-
-	public void handleContentsChanged(IRMLaunchConfigurationDynamicTab factory) {
-		fireContentsChanged();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabDataSource.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabDataSource.java
deleted file mode 100644
index c4d7694..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabDataSource.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.launch;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rm.ui.utils.DataSource;
-
-public abstract class RMLaunchConfigurationDynamicTabDataSource extends DataSource {
-	private final AbstractRMLaunchConfigurationDynamicTab page;
-	private IPQueue queue;
-	private IResourceManager resourceManager;
-	private ILaunchConfiguration configuration;
-	private ILaunchConfigurationWorkingCopy configurationWorkingCopy;
-
-	protected RMLaunchConfigurationDynamicTabDataSource(AbstractRMLaunchConfigurationDynamicTab page) {
-		this.page = page;
-	}
-
-	@Override
-	protected void setErrorMessage(ValidationException e) {
-//		page.setErrorMessage(e.getLocalizedMessage());
-//		page.setValid(false);
-	}
-
-	@Override
-	protected void update() {
-		page.updateControls();
-	}
-
-	public void setQueue(IPQueue queue) {
-		this.queue = queue;
-	}
-
-	public IPQueue getQueue() {
-		return queue;
-	}
-
-	public void setResourceManager(IResourceManager resourceManager) {
-		this.resourceManager = resourceManager;
-	}
-
-	public IResourceManager getResourceManager() {
-		return resourceManager;
-	}
-
-	public void setConfiguration(ILaunchConfiguration configuration) {
-		this.configuration = configuration;
-	}
-
-	public ILaunchConfiguration getConfiguration() {
-		return configuration;
-	}
-
-	public void setConfigurationWorkingCopy(
-			ILaunchConfigurationWorkingCopy configurationWorkingCopy) {
-		this.configurationWorkingCopy = configurationWorkingCopy;
-	}
-
-	public ILaunchConfigurationWorkingCopy getConfigurationWorkingCopy() {
-		return configurationWorkingCopy;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabWidgetListener.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabWidgetListener.java
deleted file mode 100644
index 38611d7..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/launch/RMLaunchConfigurationDynamicTabWidgetListener.java
+++ /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
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.launch;
-
-import org.eclipse.ptp.rm.ui.utils.WidgetListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-
-public abstract class RMLaunchConfigurationDynamicTabWidgetListener extends WidgetListener {
-	private final AbstractRMLaunchConfigurationDynamicTab dynamicTab;
-
-	public RMLaunchConfigurationDynamicTabWidgetListener(
-			AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
-		super();
-		this.dynamicTab = dynamicTab;
-	}
-
-	@Override
-	public void modifyText(ModifyEvent e) {
-		super.modifyText(e);
-		if (isEnabled()) {
-			dynamicTab.fireContentsChanged();
-		}
-	}
-
-	@Override
-	public void widgetSelected(SelectionEvent e) {
-		super.widgetSelected(e);
-		if (isEnabled()) {
-			dynamicTab.fireContentsChanged();
-		}
-	}
-
-	@Override
-	public void widgetDefaultSelected(SelectionEvent e) {
-		super.widgetDefaultSelected(e);
-		if (isEnabled()) {
-			dynamicTab.fireContentsChanged();
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/Messages.java
deleted file mode 100644
index 82c7ae1..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/Messages.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.ui.messages.messages"; //$NON-NLS-1$
-
-	public static String AbstractToolRMConfigurationWizardPage_Exception_ConnectionError;
-	public static String AbstractToolRMConfigurationWizardPage_Exception_ConnectionErrorDescription;
-	public static String AbstractToolRMConfigurationWizardPage_Label_ContinuousMinitorCommand;
-	public static String AbstractToolRMConfigurationWizardPage_Label_DebugCommand;
-	public static String AbstractToolRMConfigurationWizardPage_Label_DiscoverCommand;
-	public static String AbstractToolRMConfigurationWizardPage_Label_LaunchCommand;
-	public static String AbstractToolRMConfigurationWizardPage_Label_PathInstallation;
-	public static String AbstractToolRMConfigurationWizardPage_Label_PeriodicMonitorCommand;
-	public static String AbstractToolRMConfigurationWizardPage_Label_PeriodicMonitorCommandPeriod;
-	public static String AbstractToolRMConfigurationWizardPage_Label_UseDefaultSettings;
-	public static String AbstractToolRMConfigurationWizardPage_Title_PathSelectionDialog;
-	public static String AbstractToolRMConfigurationWizardPage_Validation_InvalidPeriodicMonitorCommandTimeRange;
-	public static String AbstractToolRMConfigurationWizardPage_Validation_MissingDebugCommand;
-	public static String AbstractToolRMConfigurationWizardPage_Validation_MissingDiscoverCommand;
-	public static String AbstractToolRMConfigurationWizardPage_Validation_MissingLaunchCommand;
-
-	public static String AbstractToolsPreferencePage_Label_ContinuosMonitorCommand;
-	public static String AbstractToolsPreferencePage_Label_DebugCommand;
-	public static String AbstractToolsPreferencePage_Label_DiscoverCommand;
-	public static String AbstractToolsPreferencePage_Label_InstallationPath;
-	public static String AbstractToolsPreferencePage_Label_LaunchCommand;
-	public static String AbstractToolsPreferencePage_Label_PeriodicMonitorCommand;
-	public static String AbstractToolsPreferencePage_Label_PeriodicMonitorCommandPeriod;
-	public static String AbstractToolsPreferencePage_Validation_InvalidPeriodicMonitorCommandTimeRange;
-	public static String AbstractToolsPreferencePage_Validation_MissingDiscoverCommand;
-	public static String AbstractToolsPreferencePage_Validation_MissingLaunchCommand;
-	public static String AbstractToolsPreferencePage_Validation_MissingMissingDebugCommand;
-
-	public static String ToolsRMUIPlugin_Exception_InternalError;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/messages.properties
deleted file mode 100644
index 6b1ed0e..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/messages/messages.properties
+++ /dev/null

@@ -1,29 +0,0 @@
-AbstractToolRMConfigurationWizardPage_Exception_ConnectionError=Connection Error
-AbstractToolRMConfigurationWizardPage_Exception_ConnectionErrorDescription=Could not open connection
-AbstractToolRMConfigurationWizardPage_Label_ContinuousMinitorCommand=Continuous monitor command:
-AbstractToolRMConfigurationWizardPage_Label_DebugCommand=Debug command:
-AbstractToolRMConfigurationWizardPage_Label_DiscoverCommand=Discover command:
-AbstractToolRMConfigurationWizardPage_Label_LaunchCommand=Launch command:
-AbstractToolRMConfigurationWizardPage_Label_PathInstallation=Path to installation:
-AbstractToolRMConfigurationWizardPage_Label_PeriodicMonitorCommand=Monitor command:
-AbstractToolRMConfigurationWizardPage_Label_PeriodicMonitorCommandPeriod=Period:
-AbstractToolRMConfigurationWizardPage_Label_UseDefaultSettings=Use default settings
-AbstractToolRMConfigurationWizardPage_Title_PathSelectionDialog=Select path to installation
-AbstractToolRMConfigurationWizardPage_Validation_InvalidPeriodicMonitorCommandTimeRange=Time period must be an integer greater than 0
-AbstractToolRMConfigurationWizardPage_Validation_MissingDebugCommand=Debug command is missing
-AbstractToolRMConfigurationWizardPage_Validation_MissingDiscoverCommand=Discover command is missing
-AbstractToolRMConfigurationWizardPage_Validation_MissingLaunchCommand=Launch command is missing
-
-AbstractToolsPreferencePage_Label_ContinuosMonitorCommand=Continuous monitor command:
-AbstractToolsPreferencePage_Label_DebugCommand=Debug command:
-AbstractToolsPreferencePage_Label_DiscoverCommand=Discover command:
-AbstractToolsPreferencePage_Label_InstallationPath=Path to installation:
-AbstractToolsPreferencePage_Label_LaunchCommand=Launch command:
-AbstractToolsPreferencePage_Label_PeriodicMonitorCommand=Monitor command:
-AbstractToolsPreferencePage_Label_PeriodicMonitorCommandPeriod=Period:
-AbstractToolsPreferencePage_Validation_InvalidPeriodicMonitorCommandTimeRange=Time period must be an integer greater than 0
-AbstractToolsPreferencePage_Validation_MissingDiscoverCommand=Discover command is missing
-AbstractToolsPreferencePage_Validation_MissingLaunchCommand=Launch command is missing
-AbstractToolsPreferencePage_Validation_MissingMissingDebugCommand=Debug command is missing
-
-ToolsRMUIPlugin_Exception_InternalError=Internal Error

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractPreferencePage.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractPreferencePage.java
deleted file mode 100644
index 4621b4a..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractPreferencePage.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A preference page already prepared to inter-operate with {@link PreferenceDataSource} and {@link PreferenceWidgetListener}.
- * @author dfferber
- *
- */
-public abstract class AbstractPreferencePage extends PreferencePage {
-
-	private final PreferenceWidgetListener listener = createListener();
-	private final PreferenceDataSource dataSource = createDataSource();
-
-	public AbstractPreferencePage() {
-		super();
-	}
-
-	public AbstractPreferencePage(String title) {
-		super(title);
-	}
-
-	public AbstractPreferencePage(String title, ImageDescriptor image) {
-		super(title, image);
-	}
-
-	protected PreferenceWidgetListener getListener() {
-		return listener;
-	}
-
-	protected PreferenceDataSource getDataSource() {
-		return dataSource;
-	}
-
-	/**
-	 * Get storage for preferences.
-	 * @return The storage for preferences.
-	 */
-	public abstract Preferences getPreferences();
-
-	/**
-	 * Called when the preferences storage should be saved.
-	 */
-	public abstract void savePreferences();
-
-	/**
-	 * Create listener for the preference page. The listener must extend {@link PreferenceWidgetListener} and add
-	 * specific behavior for widgets of the the preference page.
-	 * @return the listener
-	 */
-	protected abstract PreferenceWidgetListener createListener();
-
-	/**
-	 * Create data source to handle page content. The listener must extend {@link PreferenceDataSource} and add
-	 * specific behavior for widgets of the the preference page.
-	 * @return the listener
-	 */
-	protected abstract PreferenceDataSource createDataSource();
-
-	@Override
-	public boolean performOk() {
-			resetErrorMessages();
-			dataSource.storeAndValidate();
-			return true;
-	//		return super.performOk();
-		}
-
-	@Override
-	protected void performDefaults() {
-			resetErrorMessages();
-			listener.disable();
-			dataSource.loadDefaultsAndUpdate();
-			listener.enable();
-	//		super.performDefaults();
-		}
-
-	@Override
-	protected void performApply() {
-			resetErrorMessages();
-			dataSource.storeAndValidate();
-	//		super.performApply();
-		}
-
-	protected void resetErrorMessages() {
-		setErrorMessage(null);
-		setMessage(null);
-		setValid(true);
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		listener.disable();
-		Composite contents = doCreateContents(parent);
-		resetErrorMessages();
-		dataSource.loadAndUpdate();
-		listener.enable();
-		updateControls();
-		return contents;
-	}
-
-	abstract protected void updateControls();
-
-	/**
-	 * Create contents for the preference page.
-	 * @param parent
-	 * @return
-	 */
-	abstract protected Composite doCreateContents(Composite parent);
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractToolsPreferencePage.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractToolsPreferencePage.java
deleted file mode 100644
index fc8c7b5..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/AbstractToolsPreferencePage.java
+++ /dev/null

@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.rm.core.AbstractToolsPreferenceManager;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/*
- * TODO: make this class expansible for preference pages for tools.
- * One might want to extend this class and add more fields.
- * - Make listener extensible
- * - Make data source extensible
- * - Make createContents extensible
- */
-public abstract class AbstractToolsPreferencePage extends AbstractPreferencePage implements IWorkbenchPreferencePage {
-
-	class WidgetListener extends PreferenceWidgetListener implements ModifyListener {
-		@Override
-		public void doModifyText(ModifyEvent evt) {
-			Object source = evt.getSource();
-			if(source == launchCmdText ||
-					source == debugCmdText ||
-					source == discoverCmdText ||
-					source == periodicMonitorCmdText ||
-					source == continuousMonitorCmdText ||
-					source == periodicMonitorTimeSpinner ||
-					source == remoteInstallPathText) {
-				resetErrorMessages();
-				getDataSource().justValidate();
-			} else {
-				assert false;
-			}
-		}
-	}
-
-	class DataSource extends PreferenceDataSource {
-		DataSource(AbstractPreferencePage page) {
-			super(page);
-		}
-
-		String launchCmd = null;
-		String debugCmd = null;
-		String discoverCmd = null;
-		String periodicMonitorCmd = null;
-		int periodicMonitorTime = 0;
-		String continuousMonitorCmd = null;
-		String remoteInstallPath = null;
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			if (launchCmdText != null) {
-				launchCmd = extractText(launchCmdText);
-			}
-			if (debugCmdText != null) {
-				debugCmd = extractText(debugCmdText);
-			}
-			if (discoverCmdText != null) {
-				discoverCmd = extractText(discoverCmdText);
-			}
-			if (periodicMonitorCmdText != null) {
-				periodicMonitorCmd = extractText(periodicMonitorCmdText);
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				periodicMonitorTime = periodicMonitorTimeSpinner.getSelection();
-			}
-			if (continuousMonitorCmdText != null) {
-				continuousMonitorCmd = extractText(continuousMonitorCmdText);
-			}
-			if (remoteInstallPathText != null) {
-				remoteInstallPath = extractText(remoteInstallPathText);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (launchCmdText != null && launchCmd == null) {
-				throw new ValidationException(Messages.AbstractToolsPreferencePage_Validation_MissingLaunchCommand);
-			}
-			if (debugCmdText != null && debugCmd == null) {
-				throw new ValidationException(Messages.AbstractToolsPreferencePage_Validation_MissingMissingDebugCommand);
-			}
-			if (discoverCmdText != null) {
-				if (discoverCmd == null) {
-					throw new ValidationException(Messages.AbstractToolsPreferencePage_Validation_MissingDiscoverCommand);
-				}
-			}
-			if (periodicMonitorCmdText != null) {
-				//				if (periodicMonitorCmd == null) {
-				//					throw new ValidationException("Periodic monitor command is missing");
-				//				}
-				if (periodicMonitorTimeSpinner != null && periodicMonitorTime < 1) {
-					throw new ValidationException(Messages.AbstractToolsPreferencePage_Validation_InvalidPeriodicMonitorCommandTimeRange);
-				}
-			}
-		}
-
-		@Override
-		protected void copyToStorage() {
-			Preferences config = getPreferences();
-			if (launchCmdText != null) {
-				config.setValue(prefix + AbstractToolsPreferenceManager.PREFS_LAUNCH_CMD, toPreference(launchCmd));
-			}
-			if (debugCmdText != null) {
-				config.setValue(prefix + AbstractToolsPreferenceManager.PREFS_DEBUG_CMD, toPreference(debugCmd));
-			}
-			if (discoverCmdText != null) {
-				config.setValue(prefix + AbstractToolsPreferenceManager.PREFS_DISCOVER_CMD, toPreference(discoverCmd));
-			}
-			if (periodicMonitorCmdText != null) {
-				config.setValue(prefix + AbstractToolsPreferenceManager.PREFS_PERIODIC_MONITOR_CMD, toPreference(periodicMonitorCmd));
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				config.setValue(prefix + AbstractToolsPreferenceManager.PREFS_PERIODIC_MONITOR_TIME, periodicMonitorTime);
-			}
-			if (continuousMonitorCmdText != null) {
-				config.setValue(prefix + AbstractToolsPreferenceManager.PREFS_CONTINUOUS_MONITOR_CMD, toPreference(continuousMonitorCmd));
-			}
-			if (remoteInstallPathText != null) {
-				config.setValue(prefix + AbstractToolsPreferenceManager.PREFS_REMOTE_INSTALL_PATH, toPreference(remoteInstallPath));
-			}
-			savePreferences();
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			Preferences config = getPreferences();
-			if (launchCmdText != null) {
-				launchCmd = fromPreference(config.getString(prefix + AbstractToolsPreferenceManager.PREFS_LAUNCH_CMD));
-			}
-			if (debugCmdText != null) {
-				debugCmd = fromPreference(config.getString(prefix + AbstractToolsPreferenceManager.PREFS_DEBUG_CMD));
-			}
-			if (discoverCmdText != null) {
-				discoverCmd = fromPreference(config.getString(prefix + AbstractToolsPreferenceManager.PREFS_DISCOVER_CMD));
-			}
-			if (periodicMonitorCmdText != null) {
-				periodicMonitorCmd = fromPreference(config.getString(prefix + AbstractToolsPreferenceManager.PREFS_PERIODIC_MONITOR_CMD));
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				periodicMonitorTime = config.getInt(prefix + AbstractToolsPreferenceManager.PREFS_PERIODIC_MONITOR_TIME);
-			}
-			if (continuousMonitorCmdText != null) {
-				continuousMonitorCmd = fromPreference(config.getString(prefix + AbstractToolsPreferenceManager.PREFS_CONTINUOUS_MONITOR_CMD));
-			}
-			if (remoteInstallPathText != null) {
-				remoteInstallPath = fromPreference(config.getString(prefix + AbstractToolsPreferenceManager.PREFS_REMOTE_INSTALL_PATH));
-			}
-		}
-
-		@Override
-		protected void loadDefault() {
-			Preferences config = getPreferences();
-			if (launchCmdText != null) {
-				launchCmd = fromPreference(config.getDefaultString(prefix + AbstractToolsPreferenceManager.PREFS_LAUNCH_CMD));
-			}
-			if (debugCmdText != null) {
-				debugCmd = fromPreference(config.getDefaultString(prefix + AbstractToolsPreferenceManager.PREFS_DEBUG_CMD));
-			}
-			if (discoverCmdText != null) {
-				discoverCmd = fromPreference(config.getDefaultString(prefix + AbstractToolsPreferenceManager.PREFS_DISCOVER_CMD));
-			}
-			if (periodicMonitorCmdText != null) {
-				periodicMonitorCmd = fromPreference(config.getDefaultString(prefix + AbstractToolsPreferenceManager.PREFS_PERIODIC_MONITOR_CMD));
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				periodicMonitorTime = config.getDefaultInt(prefix + AbstractToolsPreferenceManager.PREFS_PERIODIC_MONITOR_TIME);
-			}
-			if (continuousMonitorCmdText != null) {
-				continuousMonitorCmd = fromPreference(config.getDefaultString(prefix + AbstractToolsPreferenceManager.PREFS_CONTINUOUS_MONITOR_CMD));
-			}
-			if (remoteInstallPathText != null) {
-				remoteInstallPath = fromPreference(config.getDefaultString(prefix + AbstractToolsPreferenceManager.PREFS_REMOTE_INSTALL_PATH));
-			}
-		}
-
-		@Override
-		protected void copyToFields() {
-			if (launchCmdText != null) {
-				applyText(launchCmdText, launchCmd);
-			}
-			if (debugCmdText != null) {
-				applyText(debugCmdText, debugCmd);
-			}
-			if (discoverCmdText != null) {
-				applyText(discoverCmdText, discoverCmd);
-			}
-			if (periodicMonitorCmdText != null) {
-				applyText(periodicMonitorCmdText, periodicMonitorCmd);
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				periodicMonitorTimeSpinner.setSelection(periodicMonitorTime);
-			}
-			if (continuousMonitorCmdText != null) {
-				applyText(continuousMonitorCmdText, continuousMonitorCmd);
-			}
-			if (remoteInstallPathText != null) {
-				applyText(remoteInstallPathText, remoteInstallPath);
-			}
-		}
-	}
-
-	public static final String EMPTY_STRING = "";  //$NON-NLS-1$
-	Text launchCmdText = null;
-	Text debugCmdText = null;
-	Text discoverCmdText = null;
-	Text continuousMonitorCmdText = null;
-	Text periodicMonitorCmdText = null;
-	Spinner periodicMonitorTimeSpinner = null;
-	Text remoteInstallPathText = null;
-
-	private int capabilities = AbstractToolRMConfiguration.NO_CAP_SET;
-	final String prefix; // to get preferences
-
-	public AbstractToolsPreferencePage(String prefix, int capabilities) {
-		super();
-		this.capabilities = capabilities;
-		this.prefix = prefix;
-	}
-
-	public AbstractToolsPreferencePage(String prefix, int capabilities, String title, ImageDescriptor image) {
-		super(title, image);
-		this.capabilities = capabilities;
-		this.prefix = prefix;
-	}
-
-	public AbstractToolsPreferencePage(String prefix, int capabilities, String title) {
-		super(title);
-		this.capabilities = capabilities;
-		this.prefix = prefix;
-	}
-
-	@Override
-	protected PreferenceDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	@Override
-	protected PreferenceWidgetListener createListener() {
-		return new WidgetListener();
-	}
-
-	public void init(IWorkbench workbench) {
-		// Nothing to do.
-	}
-
-	@Override
-	protected Composite doCreateContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 4;
-		contents.setLayout(layout);
-
-		/*
-		 * launch cmd
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_LAUNCH) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolsPreferencePage_Label_LaunchCommand);
-
-			launchCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			launchCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			launchCmdText.addModifyListener(getListener());
-
-			label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolsPreferencePage_Label_DebugCommand);
-
-			debugCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			debugCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			debugCmdText.addModifyListener(getListener() );
-		}
-
-		/*
-		 * discover cmd
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_DISCOVER) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolsPreferencePage_Label_DiscoverCommand);
-
-			discoverCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			discoverCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			discoverCmdText.addModifyListener(getListener());
-		}
-
-		/*
-		 * Periodic monitor cmd and time
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_PERIODIC_MONITOR) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolsPreferencePage_Label_PeriodicMonitorCommand);
-
-			periodicMonitorCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			periodicMonitorCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 1, 1));
-			periodicMonitorCmdText.addModifyListener(getListener() );
-
-			label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolsPreferencePage_Label_PeriodicMonitorCommandPeriod);
-			periodicMonitorTimeSpinner = new Spinner(contents, SWT.SINGLE | SWT.BORDER);
-			periodicMonitorCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, false, false, 1, 1));
-			periodicMonitorTimeSpinner.addModifyListener(getListener());
-		}
-
-		/*
-		 * Continuous monitor cmd
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_CONTINUOUS_MONITOR) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolsPreferencePage_Label_ContinuosMonitorCommand);
-
-			continuousMonitorCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			continuousMonitorCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			continuousMonitorCmdText.addModifyListener(getListener());
-		}
-
-		/*
-		 * Installation path
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_REMOTE_INSTALL_PATH) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolsPreferencePage_Label_InstallationPath);
-
-			remoteInstallPathText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 3;
-			gd.widthHint = 60;
-			remoteInstallPathText.setLayoutData(gd);
-			remoteInstallPathText.addModifyListener(getListener());
-		}
-		return contents;
-	}
-
-	@Override
-	protected void updateControls() {
-		// Nothing to do.
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceDataSource.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceDataSource.java
deleted file mode 100644
index f1647f9..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceDataSource.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.preferences;
-
-import org.eclipse.ptp.rm.ui.utils.DataSource;
-
-public abstract class PreferenceDataSource extends DataSource {
-	private AbstractPreferencePage page;
-
-	protected PreferenceDataSource(AbstractPreferencePage page) {
-		this.page = page;
-	}
-
-	/**
-	 * Facility to convert string value to a value that can be stored in preference storage.
-	 * Null values cannot be stored, therefore, they are converted to empty string.
-	 * @param The string to be stored
-	 * @return The converted string.
-	 */
-	protected String toPreference(String s) {
-		return (s == null ? "" : s); //$NON-NLS-1$
-	}
-
-	/**
-	 * Facility to convert a string read from storage of preference page to a string value.
-	 * Empty string is converted to null, to indicate that the value is missing.
-	 * @param The string from preference storage
-	 * @return The converted string.
-	 */
-	protected String fromPreference(String s) {
-		return (s.equals(EMPTY_STRING) ? null : s);
-	}
-
-	@Override
-	protected void setErrorMessage(ValidationException e) {
-		page.setErrorMessage(e.getLocalizedMessage());
-		page.setValid(false);
-	}
-
-	@Override
-	protected void update() {
-		page.updateControls();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceWidgetListener.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceWidgetListener.java
deleted file mode 100644
index 4d52fa4..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/preferences/PreferenceWidgetListener.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.preferences;
-
-import org.eclipse.ptp.rm.ui.utils.WidgetListener;
-
-public abstract class PreferenceWidgetListener extends WidgetListener {
-	// Nothing to add or extend
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DataSource.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DataSource.java
deleted file mode 100644
index ab8e976..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DataSource.java
+++ /dev/null

@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.utils;
-
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Common features for a intermediary buffer, to load and store content of
- * widget on dialog pages and to validate their content.
- * <p>
- * This class eases reading/writing values from storage and setting/getting them
- * to/from input widgets of the dialog page.
- * <p>
- * For that purpose, the class assumes a intermediary storage (implemented by
- * extending class) that buffers the values when getting from widgets and
- * writing them to storage storage. The same intermediary storage is used to
- * buffer values when reading values from storage storage and setting them to
- * widgets. While in intermediary buffer, values are validated.
- * <p>
- * Each step is performed by a specific abstract method that is implemented by
- * the extending class. Methods are provided for a complete sequence of
- * operations (eg. getting from widgets, validating, writing to storage). The
- * class controls the validity state of the dialog page and its error/warning
- * message.
- *
- * @author Daniel Felix Ferber
- */
-public abstract class DataSource {
-	/**
-	 * Exception raised by validation methods when input of a field is invalid.
-	 * The message of the exception is displayed on the preference page.
-	 */
-	public class ValidationException extends Exception {
-		private static final long serialVersionUID = 1L;
-		private boolean canSave = false;
-		private boolean canAccept = false;
-
-		public ValidationException(String message) {
-			super(message);
-			canSave = false;
-			canAccept = false;
-		}
-
-		public ValidationException(String message, boolean canAccept,
-				boolean canSave) {
-			super(message);
-			this.canAccept = canAccept;
-			this.canSave = canSave;
-		}
-
-		public boolean canAccept() {
-			return canAccept;
-		}
-
-		public boolean canSave() {
-			return canSave;
-		}
-	}
-
-	private ValidationException firstException = null;
-	private boolean canSave = false;
-	private boolean canAccept = false;
-
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	/**
-	 * Update the page with the error message and status.
-	 *
-	 * @param e
-	 *            Exception raised while validating the intermediate storage.
-	 */
-	abstract protected void setErrorMessage(ValidationException e);
-
-	/**
-	 * Facility to get string value of a {@link Text} widget, or null if the
-	 * widget is empty.
-	 *
-	 * @param text
-	 *            The widget
-	 * @return The string value of widget or null widget is empty.
-	 */
-	protected String extractText(Text text) {
-		assert text != null;
-		String s = text.getText().trim();
-		return (s.length() == 0 ? null : s);
-	}
-
-	/**
-	 * Facility to get string value of a {@link Combo} widget, or null if the
-	 * widget is empty.
-	 *
-	 * @param text
-	 *            The widget
-	 * @return The string value of widget or null widget is empty.
-	 */
-	protected String extractText(Combo text) {
-		assert text != null;
-		String s = text.getText().trim();
-		return (s.length() == 0 ? null : s);
-	}
-
-	/**
-	 * Facility to set the string value of a {@link Text} widget.
-	 *
-	 * @param t
-	 *            The {@link Text} widget.
-	 * @param s
-	 *            The new string value.
-	 */
-	protected void applyText(Text t, String s) {
-		assert t != null;
-		if (s == null) {
-			t.setText(EMPTY_STRING);
-		} else {
-			t.setText(s);
-		}
-	}
-
-	/**
-	 * Facility to set the string value of a {@link Text} widget.
-	 *
-	 * @param t
-	 *            The {@link Text} widget.
-	 * @param s
-	 *            The new string value.
-	 */
-	protected void applyText(Combo t, String s) {
-		assert t != null;
-		if (s == null) {
-			t.setText(EMPTY_STRING);
-		} else {
-			t.setText(s);
-		}
-	}
-
-	/**
-	 * Called to individually validate each value in intermediary storage.
-	 * Should be used to test format and range of values.
-	 *
-	 * @throws ValidationException
-	 *             A value in intermediary storage is invalid. The message of
-	 *             the exception is shown as error message in the preference
-	 *             page.
-	 */
-	abstract protected void validateLocal() throws ValidationException;
-
-	/**
-	 * Called to validate the intermediary storage as a whole. Should be used to
-	 * test values make sense with each other.
-	 *
-	 * @throws ValidationException
-	 *             A value in intermediary storage is invalid. The message of
-	 *             the exception is shown as error message in the preference
-	 *             page.
-	 */
-	protected void validateGlobal() throws ValidationException {
-		// By default, there is no global validation.
-	}
-
-	/**
-	 * Called to write the intermediary storage into storage.
-	 */
-	abstract protected void copyToStorage();
-
-	/**
-	 * Called to read the intermediary storage from storage.
-	 */
-	abstract protected void loadFromStorage();
-
-	/**
-	 * Called to assign default values to intermediary storage.
-	 */
-	abstract protected void loadDefault();
-
-	/**
-	 * Copy values from the intermediary storage to the widgets.
-	 */
-	abstract protected void copyToFields();
-
-	/**
-	 * Copy values from the widgets to intermediary storage.
-	 *
-	 * @throws ValidationException
-	 *             A widget cannot be read because it contains an invalid value
-	 *             that cannot be parsed to intermediary storage.
-	 */
-	abstract protected void copyFromFields() throws ValidationException;
-
-	/**
-	 * Update visibility and 'enablebility' of widgets.
-	 */
-	abstract protected void update();
-
-	protected void addException(ValidationException e) {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: Add Exception: {0}", e.getMessage()); //$NON-NLS-1$
-		if (firstException == null) {
-			firstException = e;
-			canAccept = e.canAccept();
-			canSave = e.canSave();
-		} else {
-			if (canSave && ! e.canSave()) {
-				firstException = e;
-			}
-			canAccept = canAccept && e.canAccept();
-			canSave = canSave && e.canSave();
-		}
-	}
-
-	protected void resetExceptions() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: Reset exceptions"); //$NON-NLS-1$
-		firstException = null;
-		canAccept = true;
-		canSave = true;
-	}
-
-	public boolean canAccept() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: canAccept={0}", canAccept); //$NON-NLS-1$
-		return canAccept;
-	}
-
-	public boolean canSave() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: canSave={0}", canSave); //$NON-NLS-1$
-		return canSave;
-	}
-
-	public boolean summarizeExceptions() {
-		if (! canAccept || ! canSave) {
-			setErrorMessage(firstException);
-			return false;
-		}
-		return true;
-	}
-
-	public String getErrorMessage() {
-		if (firstException == null)
-			return null;
-		else
-			return firstException.getMessage();
-	}
-
-	/**
-	 * Get values from widgets into intermediary storage and validate them.
-	 */
-	final public boolean justValidate() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: justValidate()"); //$NON-NLS-1$
-		try {
-			resetExceptions();
-			copyFromFields();
-			validateLocal();
-		} catch (ValidationException e) {
-			addException(e);
-		}
-		update();
-		return summarizeExceptions();
-	}
-
-	/**
-	 * Put values from intermediary storage into widgets and update visibility and 'enablebility' of widgets.
-	 */
-	final public void justUpdate() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: justUpdate()"); //$NON-NLS-1$
-		copyToFields();
-		try {
-			resetExceptions();
-			validateLocal();
-			validateGlobal();
-			summarizeExceptions();
-		} catch (ValidationException e) {
-			addException(e);
-			summarizeExceptions();
-		}
-		update();
-	}
-
-	/**
-	 * Get values from widgets, validate them and, if validations was
-	 * successful, store them to preferences.
-	 *
-	 * @return true if could store to preferences, false otherwise.
-	 */
-	final public boolean storeAndValidate() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: storeAndValidate()"); //$NON-NLS-1$
-		try {
-			resetExceptions();
-			copyFromFields();
-			validateLocal();
-			validateGlobal();
-			copyToStorage();
-		} catch (ValidationException e) {
-			addException(e);
-		}
-		update();
-		return summarizeExceptions();
-	}
-
-	/**
-	 * Get values from input fields, validates them and stores them to
-	 * preferences.
-	 */
-	final public void loadAndUpdate() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: loadAndUpdate()"); //$NON-NLS-1$
-		loadFromStorage();
-		copyToFields();
-		try {
-			resetExceptions();
-			validateLocal();
-			validateGlobal();
-			summarizeExceptions();
-		} catch (ValidationException e) {
-			addException(e);
-			summarizeExceptions();
-		}
-		update();
-	}
-
-	/**
-	 * Get default values from preferences storage and put them into widgets.
-	 * Values are also validated.
-	 */
-	final public void loadDefaultsAndUpdate() {
-		DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "DataSource: loadDefaultsAndUpdate()"); //$NON-NLS-1$
-		loadDefault();
-		copyToFields();
-		try {
-			resetExceptions();
-			validateLocal();
-			validateGlobal();
-			summarizeExceptions();
-		} catch (ValidationException e) {
-			addException(e);
-			summarizeExceptions();
-		}
-		update();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DebugUtil.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DebugUtil.java
deleted file mode 100644
index 41ab89f..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/DebugUtil.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.utils;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.core.PTPCorePlugin;
-
-public class DebugUtil {
-	private static final String DATASOURCE_OPTION = "org.eclipse.ptp.rm.ui/debug/dataSource"; //$NON-NLS-1$
-	private static final String LISTENER_OPTION = "org.eclipse.ptp.rm.core/debug/widgetListener"; //$NON-NLS-1$
-
-	public static boolean DATASOURCE_TRACING = false;
-	public static boolean LISTENER_TRACING = false;
-
-	public static void configurePluginDebugOptions() {
-		if (PTPCorePlugin.getDefault().isDebugging()) {
-			String option = Platform.getDebugOption(DATASOURCE_OPTION);
-			if (option != null) {
-				DATASOURCE_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-			option = Platform.getDebugOption(LISTENER_OPTION);
-			if (option != null) {
-				LISTENER_TRACING = option.equalsIgnoreCase("true") ; //$NON-NLS-1$
-			}
-		}
-	}
-
-	public static void trace(boolean option, String pattern, Object ... arguments) {
-		trace(option, MessageFormat.format(pattern, arguments));
-	}
-
-	public static void trace(boolean option, String message) {
-		if (option) {
-			System.out.println(message);
-			System.out.flush();
-		}
-	}
-
-	public static void error(boolean option, String pattern, Object ... arguments) {
-		error(option, MessageFormat.format(pattern, arguments));
-	}
-
-	public static void error(boolean option, String message) {
-		if (option) {
-			System.err.println(message);
-		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/WidgetListener.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/WidgetListener.java
deleted file mode 100644
index 0a60add..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/utils/WidgetListener.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.utils;
-
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TypedEvent;
-
-/**
- * Common features useful for widget event listeners on PreferencePages.
- * <p>
- * At the moment, only enable/disable feature is provided. The listener must be
- * disabled before updating contents of input widgets. When content of SWT
- * widgets is changed by code, some of the widgets do dispatch events as if they
- * were user events.
- *
- * @author Daniel Felix Ferber
- */
-public abstract class WidgetListener implements SelectionListener,
-ModifyListener {
-	/** State of the listener (enabled/disabled). */
-	private boolean listenerEnabled = true;
-
-	/** Enable the listener to handle events. */
-	public synchronized void enable() {
-		listenerEnabled = true;
-	}
-
-	/** Disable listener, received events shall be ignored. */
-	public synchronized void disable() {
-		listenerEnabled = false;
-	}
-
-	/** Test if the listener is enabled. */
-	public synchronized boolean isEnabled() {
-		return listenerEnabled;
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-		if (isEnabled()) {
-			DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "Widget listener: widgetDefaultSelected on {0}", calculareSource(e)); //$NON-NLS-1$
-			doWidgetDefaultSelected(e);
-		} else {
-			DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "Widget listener: ignored widgetDefaultSelected on {0}", calculareSource(e)); //$NON-NLS-1$
-		}
-	}
-
-	protected void doWidgetDefaultSelected(SelectionEvent e) {
-		// Default empty implementation.
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (isEnabled()) {
-			DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "Widget listener: widgetSelected on {0}", calculareSource(e)); //$NON-NLS-1$
-			doWidgetSelected(e);
-		} else {
-			DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "Widget listener: ignored widgetSelected on {0}", calculareSource(e)); //$NON-NLS-1$
-		}
-	}
-
-	protected void doWidgetSelected(SelectionEvent e) {
-		// Default empty implementation.
-	}
-
-	public void modifyText(ModifyEvent e) {
-		if (isEnabled()) {
-			DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "Widget listener: modifyText on {0}", calculareSource(e)); //$NON-NLS-1$
-			doModifyText(e);
-		} else {
-			DebugUtil.trace(DebugUtil.DATASOURCE_TRACING, "Widget listener: ignored modifyText on {0}", calculareSource(e)); //$NON-NLS-1$
-		}
-	}
-
-	protected void doModifyText(ModifyEvent e) {
-		// Default empty implementation.
-	}
-
-	static private String calculareSource(TypedEvent e) {
-		Object source = e.getSource();
-		return source.getClass().getName();
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractConfigurationWizardPage.java
deleted file mode 100644
index 6921221..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractConfigurationWizardPage.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.wizards;
-
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public abstract class AbstractConfigurationWizardPage extends
-RMConfigurationWizardPage {
-
-	private final WizardPageWidgetListener listener = createListener();
-	private final WizardPageDataSource dataSource = createDataSource();
-
-	public AbstractConfigurationWizardPage(RMConfigurationWizard wizard, String pageName) {
-		super(wizard, pageName);
-	}
-
-	/**
-	 * Create listener for the wizard page. The listener must extend {@link WizardPageWidgetListener} and add
-	 * specific behavior for widgets of the the preference page.
-	 * @return the listener
-	 */
-	protected abstract WizardPageWidgetListener createListener();
-
-	/**
-	 * Create data source to handle page content. The listener must extend {@link WizardPageDataSource} and add
-	 * specific behavior for widgets of the the preference page.
-	 * @return the listener
-	 */
-	protected abstract WizardPageDataSource createDataSource();
-
-	protected WizardPageWidgetListener getWidgetListener() {
-		return listener;
-	}
-
-	protected WizardPageDataSource getDataSource() {
-		return dataSource;
-	}
-
-	@Override
-	public void setVisible(boolean visible) {
-		if (visible) {
-			resetErrorMessages();
-			listener.disable();
-			dataSource.setConfig(getConfigurationWizard().getConfiguration());
-			dataSource.loadAndUpdate();
-			listener.enable();
-			updateControls();
-		}
-		super.setVisible(visible);
-	}
-
-	abstract protected void updateControls();
-
-	/**
-	 * Convenience method for creating a button widget.
-	 *
-	 * @param parent
-	 * @param label
-	 * @param type
-	 * @return the button widget
-	 */
-	protected Button createButton(Composite parent, String label, int type) {
-		Button button = new Button(parent, type);
-		button.setText(label);
-		GridData data = new GridData();
-		button.setLayoutData(data);
-		return button;
-	}
-
-	/**
-	 * Convenience method for creating a check button widget.
-	 *
-	 * @param parent
-	 * @param label
-	 * @return the check button widget
-	 */
-	protected Button createCheckButton(Composite parent, String label) {
-		return createButton(parent, label, SWT.CHECK | SWT.LEFT);
-	}
-
-	protected void resetErrorMessages() {
-		setPageComplete(true);
-		setErrorMessage(null);
-		setMessage(null);
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		listener.disable();
-		Composite composite = doCreateContents(parent);
-		//		doCreateContents(composite);
-		setControl(composite);
-		listener.enable();
-	}
-
-	abstract protected Composite doCreateContents(Composite composite);
-
-}
\ No newline at end of file

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractToolRMConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractToolRMConfigurationWizardPage.java
deleted file mode 100644
index c260d6e..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/AbstractToolRMConfigurationWizardPage.java
+++ /dev/null

@@ -1,539 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rm.ui.ToolsRMUIPlugin;
-import org.eclipse.ptp.rm.ui.messages.Messages;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.utils.ui.swt.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/*
- * TODO: make this class expansible for preference pages for tools.
- * One might want to extend this class and add more fields.
- * - Make listener extensible
- * - Make data source extensible
- * - Make createContents extensible
- */
-/**
- *
- */
-public class AbstractToolRMConfigurationWizardPage extends AbstractConfigurationWizardPage {
-
-	//	protected boolean listenerEnabled = false;
-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	private IRemoteServices remoteServices = null;
-	private IRemoteConnection connection = null;
-
-	protected Text launchCmdText = null;
-	protected Text debugCmdText = null;
-	protected Text discoverCmdText = null;
-	protected Text continuousMonitorCmdText = null;
-	protected Text periodicMonitorCmdText = null;
-	protected Spinner periodicMonitorTimeSpinner = null;
-	protected Text remoteInstallPathText = null;
-	protected Button browseButton = null;
-	protected Button defaultButton = null;
-
-	protected int capabilities = AbstractToolRMConfiguration.NO_CAP_SET;
-
-	protected class WidgetListener extends WizardPageWidgetListener {
-		@Override
-		protected void doModifyText(ModifyEvent evt) {
-			Object source = evt.getSource();
-			if(source == launchCmdText ||
-					source == debugCmdText ||
-					source == discoverCmdText ||
-					source == periodicMonitorCmdText ||
-					source == continuousMonitorCmdText ||
-					source == periodicMonitorTimeSpinner ||
-					source == remoteInstallPathText) {
-				resetErrorMessages();
-				getDataSource().storeAndValidate();
-			} else {
-				assert false;
-			}
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == browseButton) {
-				handlePathBrowseButtonSelected();
-			} else if (source == defaultButton)  {
-				resetErrorMessages();
-				getDataSource().storeAndValidate();
-				updateControls();
-			} else {
-				assert false;
-			}
-		}
-	}
-
-	protected  class DataSource extends WizardPageDataSource {
-		protected DataSource(AbstractConfigurationWizardPage page) {
-			super(page);
-		}
-
-		private AbstractToolRMConfiguration config = null;
-
-		private boolean useToolDefaults = false;
-		private String launchCmd = null;
-		private String debugCmd = null;
-		private String discoverCmd = null;
-		private String periodicMonitorCmd = null;
-		private int periodicMonitorTime = 0;
-		private String continuousMonitorCmd = null;
-		private String remoteInstallPath = null;
-
-		public void setCommandFields(String launchCmd, String debugCmd, String discoverCmd, String periodicMonitorCmd, int periodicMonitorTime, String continuousMonitorCmd, String remoteInstallPath) {
-			this.launchCmd = launchCmd;
-			this.debugCmd = debugCmd;
-			this.discoverCmd = discoverCmd;
-			this.periodicMonitorCmd = periodicMonitorCmd;
-			this.periodicMonitorTime = periodicMonitorTime;
-			this.continuousMonitorCmd = continuousMonitorCmd;
-			this.remoteInstallPath = remoteInstallPath;
-		}
-
-		public void setUseDefaults(boolean useToolDefaults) {
-			this.useToolDefaults = useToolDefaults;
-		}
-
-		public boolean isUseDefaults() {
-			return useToolDefaults;
-		}
-
-		public String getLaunchCmd() {
-			return launchCmd;
-		}
-
-		public String getDebugCmd() {
-			return debugCmd;
-		}
-
-		public String getDiscoverCmd() {
-			return discoverCmd;
-		}
-
-		public String getPeriodicMonitorCmd() {
-			return periodicMonitorCmd;
-		}
-
-		public int getPeriodicMonitorTime() {
-			return periodicMonitorTime;
-		}
-
-		public String getContinuousMonitorCmd() {
-			return continuousMonitorCmd;
-		}
-
-		public String getRemoteInstallPath() {
-			return remoteInstallPath;
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			useToolDefaults = defaultButton.getSelection();
-
-			if (launchCmdText != null) {
-				launchCmd = extractText(launchCmdText);
-			}
-			if (debugCmdText != null) {
-				debugCmd = extractText(debugCmdText);
-			}
-			if (discoverCmdText != null) {
-				discoverCmd = extractText(discoverCmdText);
-			}
-			if (periodicMonitorCmdText != null) {
-				periodicMonitorCmd = extractText(periodicMonitorCmdText);
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				periodicMonitorTime = periodicMonitorTimeSpinner.getSelection();
-			}
-			if (continuousMonitorCmdText != null) {
-				continuousMonitorCmd = extractText(continuousMonitorCmdText);
-			}
-			if (remoteInstallPathText != null) {
-				remoteInstallPath = extractText(remoteInstallPathText);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (! useToolDefaults) {
-				if (launchCmdText != null && launchCmd == null) {
-					throw new ValidationException(Messages.AbstractToolRMConfigurationWizardPage_Validation_MissingLaunchCommand);
-				}
-				if (debugCmdText != null && debugCmd == null) {
-					throw new ValidationException(Messages.AbstractToolRMConfigurationWizardPage_Validation_MissingDebugCommand);
-				}
-				if (discoverCmdText != null) {
-					if (discoverCmd == null) {
-						throw new ValidationException(Messages.AbstractToolRMConfigurationWizardPage_Validation_MissingDiscoverCommand);
-					}
-					if (periodicMonitorTimeSpinner != null && periodicMonitorTime < 1) {
-						throw new ValidationException(Messages.AbstractToolRMConfigurationWizardPage_Validation_InvalidPeriodicMonitorCommandTimeRange);
-					}
-				}
-			}
-		}
-
-		@Override
-		protected void copyToStorage() {
-			if (launchCmdText != null) {
-				config.setLaunchCmd(launchCmd);
-			}
-			if (debugCmdText != null) {
-				config.setDebugCmd(debugCmd);
-			}
-			if (discoverCmdText != null) {
-				config.setDiscoverCmd(discoverCmd);
-			}
-			if (periodicMonitorCmdText != null) {
-				config.setPeriodicMonitorCmd(periodicMonitorCmd);
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				config.setPeriodicMonitorTime(periodicMonitorTime);
-			}
-			if (continuousMonitorCmdText != null) {
-				config.setContinuousMonitorCmd(continuousMonitorCmd);
-			}
-			if (remoteInstallPathText != null) {
-				config.setRemoteInstallPath(remoteInstallPath);
-			}
-			config.setUseToolDefaults(useToolDefaults);
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			if (launchCmdText != null) {
-				launchCmd = config.getLaunchCmd();
-			}
-			if (debugCmdText != null) {
-				debugCmd = config.getDebugCmd();
-			}
-			if (discoverCmdText != null) {
-				discoverCmd = config.getDiscoverCmd();
-			}
-			if (periodicMonitorCmdText != null) {
-				periodicMonitorCmd = config.getPeriodicMonitorCmd();
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				periodicMonitorTime = config.getPeriodicMonitorTime();
-			}
-			if (continuousMonitorCmdText != null) {
-				continuousMonitorCmd = config.getContinuousMonitorCmd();
-			}
-			if (remoteInstallPathText != null) {
-				remoteInstallPath = config.getRemoteInstallPath();
-			}
-			useToolDefaults = config.useToolDefaults();
-		}
-
-		@Override
-		protected void copyToFields() {
-			if (launchCmdText != null) {
-				applyText(launchCmdText, launchCmd);
-			}
-			if (debugCmdText != null) {
-				applyText(debugCmdText, debugCmd);
-			}
-			if (discoverCmdText != null) {
-				applyText(discoverCmdText, discoverCmd);
-			}
-			if (periodicMonitorCmdText != null) {
-				applyText(periodicMonitorCmdText, periodicMonitorCmd);
-			}
-			if (periodicMonitorTimeSpinner != null) {
-				periodicMonitorTimeSpinner.setSelection(periodicMonitorTime);
-			}
-			if (continuousMonitorCmdText != null) {
-				applyText(continuousMonitorCmdText, continuousMonitorCmd);
-			}
-			if (remoteInstallPathText != null) {
-				applyText(remoteInstallPathText, remoteInstallPath);
-			}
-			defaultButton.setSelection(useToolDefaults);
-		}
-
-		@Override
-		protected void validateGlobal() throws ValidationException {
-			// Nothing yet. Would validate the entire GenericMPIResourceManagerConfiguration.
-		}
-
-		@Override
-		public void setConfig(IResourceManagerConfiguration configuration) {
-			super.setConfig(configuration);
-			// Store a local reference to the configuration
-			this.config = (AbstractToolRMConfiguration) configuration;
-		}
-
-		@Override
-		protected void loadDefault() {
-			// not available
-		}
-	}
-
-	public AbstractToolRMConfigurationWizardPage(RMConfigurationWizard wizard, int capabilities, String pageName, String title, String description) {
-		super(wizard, pageName);
-		this.capabilities = capabilities;
-		setTitle(title);
-		setDescription(description);
-	}
-
-	@Override
-	protected WizardPageWidgetListener createListener() {
-		return new WidgetListener();
-	}
-
-	@Override
-	protected WizardPageDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-
-	@Override
-	protected Composite doCreateContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginBottom = 0;
-		layout.marginTop = 0;
-		layout.marginRight = 0;
-		layout.marginLeft = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		contents.setLayout(layout);
-
-		createContents(contents);
-
-		return contents;
-	}
-
-	protected void createContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 4;
-		contents.setLayout(layout);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		contents.setLayoutData(gd);
-
-		/*
-		 * Default button
-		 */
-		defaultButton = createCheckButton(contents, Messages.AbstractToolRMConfigurationWizardPage_Label_UseDefaultSettings);
-		defaultButton.addSelectionListener(getWidgetListener());
-		defaultButton.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 4, 1));
-
-		/*
-		 * launch cmd
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_LAUNCH) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolRMConfigurationWizardPage_Label_LaunchCommand);
-
-			launchCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			launchCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			launchCmdText.addModifyListener(getWidgetListener());
-
-			label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolRMConfigurationWizardPage_Label_DebugCommand);
-
-			debugCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			debugCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			debugCmdText.addModifyListener(getWidgetListener());
-		}
-
-		/*
-		 * discover cmd
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_DISCOVER) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolRMConfigurationWizardPage_Label_DiscoverCommand);
-
-			discoverCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			discoverCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			discoverCmdText.addModifyListener(getWidgetListener());
-		}
-
-		/*
-		 * Periodic monitor cmd and time
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_PERIODIC_MONITOR) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolRMConfigurationWizardPage_Label_PeriodicMonitorCommand);
-
-			periodicMonitorCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			periodicMonitorCmdText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-			periodicMonitorCmdText.addModifyListener(getWidgetListener());
-
-			label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolRMConfigurationWizardPage_Label_PeriodicMonitorCommandPeriod);
-
-			periodicMonitorTimeSpinner = new Spinner(contents, SWT.SINGLE | SWT.BORDER);
-			periodicMonitorCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, false, false));
-			periodicMonitorTimeSpinner.addModifyListener(getWidgetListener());
-		}
-
-		/*
-		 * Continuous monitor cmd
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_CONTINUOUS_MONITOR) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolRMConfigurationWizardPage_Label_ContinuousMinitorCommand);
-
-			continuousMonitorCmdText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			continuousMonitorCmdText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
-			continuousMonitorCmdText.addModifyListener(getWidgetListener());
-		}
-
-		/*
-		 * Installation path
-		 */
-		if ((capabilities & AbstractToolRMConfiguration.CAP_REMOTE_INSTALL_PATH) != 0) {
-			Label label = new Label(contents, SWT.NONE);
-			label.setText(Messages.AbstractToolRMConfigurationWizardPage_Label_PathInstallation);
-
-			remoteInstallPathText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-			remoteInstallPathText.addModifyListener(getWidgetListener());
-			remoteInstallPathText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
-			browseButton = SWTUtil.createPushButton(contents, "Browse", null); //$NON-NLS-1$
-			browseButton.addSelectionListener(getWidgetListener());
-			browseButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
-		}
-	}
-
-	/**
-	 * Show a dialog that lets the user select a file.
-	 */
-	protected void handlePathBrowseButtonSelected() {
-		/*
-		 * Need to do this here because the connection may have been changed
-		 * by the previous wizard page
-		 */
-
-		IRemoteUIServices remUIServices = null;
-		AbstractRemoteResourceManagerConfiguration config = (AbstractRemoteResourceManagerConfiguration)getDataSource().getConfig();
-		String rmID = config.getRemoteServicesId();
-		if (rmID != null) {
-			remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(rmID);
-			String conn = config.getConnectionName();
-			if (remoteServices != null && conn != null) {
-				connection = remoteServices.getConnectionManager().getConnection(conn);
-			}
-			remUIServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(remoteServices);
-		}
-
-		if (remUIServices != null && connection != null) {
-			if (!connection.isOpen()) {
-				IRunnableWithProgress op = new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor)
-					throws InvocationTargetException,
-					InterruptedException {
-						try {
-							connection.open(monitor);
-						} catch (RemoteConnectionException e) {
-							ErrorDialog.openError(getShell(), Messages.AbstractToolRMConfigurationWizardPage_Exception_ConnectionError,
-									Messages.AbstractToolRMConfigurationWizardPage_Exception_ConnectionErrorDescription,
-									new Status(IStatus.ERROR, ToolsRMUIPlugin.PLUGIN_ID, e.getMessage()));
-						}
-					}
-
-				};
-				try {
-					new ProgressMonitorDialog(getShell()).run(true, true, op);
-				} catch (InvocationTargetException e) {
-					ErrorDialog.openError(getShell(), Messages.AbstractToolRMConfigurationWizardPage_Exception_ConnectionError,
-							Messages.AbstractToolRMConfigurationWizardPage_Exception_ConnectionErrorDescription,
-							new Status(IStatus.ERROR, ToolsRMUIPlugin.PLUGIN_ID, e.getMessage()));
-				} catch (InterruptedException e) {
-					ErrorDialog.openError(getShell(), Messages.AbstractToolRMConfigurationWizardPage_Exception_ConnectionError,
-							Messages.AbstractToolRMConfigurationWizardPage_Exception_ConnectionErrorDescription,
-							new Status(IStatus.ERROR, ToolsRMUIPlugin.PLUGIN_ID, e.getMessage()));
-				}
-			}
-			IRemoteUIFileManager fileMgr = remUIServices.getUIFileManager();
-			fileMgr.setConnection(connection);
-
-			String initialPath = "//"; // Start at root since OMPI is probably installed in the system somewhere //$NON-NLS-1$
-			IPath selectedPath = fileMgr.browseDirectory(getControl().getShell(), Messages.AbstractToolRMConfigurationWizardPage_Title_PathSelectionDialog, initialPath);
-			if (selectedPath != null) {
-				remoteInstallPathText.setText(selectedPath.toString());
-			}
-		}
-	}
-
-	/**
-	 * Update wizard UI selections from settings. This should be called whenever any
-	 * settings are changed.
-	 */
-	@Override
-	protected void updateControls() {
-		boolean enabled = ! defaultButton.getSelection();
-
-		if (launchCmdText != null) {
-			launchCmdText.setEnabled(enabled);
-		}
-		if (debugCmdText != null) {
-			debugCmdText.setEnabled(enabled);
-		}
-		if (discoverCmdText != null) {
-			discoverCmdText.setEnabled(enabled);
-		}
-		if (periodicMonitorCmdText != null) {
-			periodicMonitorCmdText.setEnabled(enabled);
-		}
-		if (periodicMonitorTimeSpinner != null) {
-			periodicMonitorTimeSpinner.setEnabled(enabled);
-		}
-		if (continuousMonitorCmdText != null) {
-			continuousMonitorCmdText.setEnabled(enabled);
-		}
-		//		if (remoteInstallPathText != null) {
-		//			remoteInstallPathText.setEnabled(enabled);
-		//		}
-		//		if (browseButton != null) {
-		//			browseButton.setEnabled(enabled);
-		//		}
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageDataSource.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageDataSource.java
deleted file mode 100644
index 3a3ae56..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageDataSource.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.wizards;
-
-import org.eclipse.ptp.rm.ui.utils.DataSource;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public abstract class WizardPageDataSource extends DataSource {
-	private AbstractConfigurationWizardPage page;
-	private IResourceManagerConfiguration config;
-
-	protected WizardPageDataSource(AbstractConfigurationWizardPage page) {
-		this.page = page;
-	}
-
-	@Override
-	protected void setErrorMessage(ValidationException e) {
-		page.setErrorMessage(e.getLocalizedMessage());
-		page.setPageComplete(false);
-	}
-
-	@Override
-	protected void update() {
-		page.updateControls();
-	}
-
-	public IResourceManagerConfiguration getConfig() {
-		return config;
-	}
-
-	public void setConfig(IResourceManagerConfiguration config) {
-		this.config = config;
-	}
-}

diff --git a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageWidgetListener.java b/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageWidgetListener.java
deleted file mode 100644
index 99582aa..0000000
--- a/rms/org.eclipse.ptp.rm.ui/src/org/eclipse/ptp/rm/ui/wizards/WizardPageWidgetListener.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.ui.wizards;
-
-import org.eclipse.ptp.rm.ui.utils.WidgetListener;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public abstract class WizardPageWidgetListener extends WidgetListener  {
-	// Nothing to add or to extend.
-}

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="org/eclipse/ptp/pldt/common/actions/TryJob.java" 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.common/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.common/.cvsignore
deleted file mode 100644
index c8a772f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/.cvsignore
+++ /dev/null

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

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.common</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.common/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.common/META-INF/MANIFEST.MF
deleted file mode 100644
index 9def54f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.common; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.common.CommonPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.search,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.ui.editors,
- org.eclipse.help,
- org.eclipse.text,
- org.eclipse.ui.forms
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.pldt.common,
- org.eclipse.ptp.pldt.common.actions,
- org.eclipse.ptp.pldt.common.analysis,
- org.eclipse.ptp.pldt.common.editorHelp,
- org.eclipse.ptp.pldt.common.util,
- org.eclipse.ptp.pldt.common.views
-Bundle-ClassPath: .
-Bundle-Vendor: %pluginProvider

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

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

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/about.ini b/tools/pldt/org.eclipse.ptp.pldt.common/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/about.ini
+++ /dev/null

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

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/about.mappings b/tools/pldt/org.eclipse.ptp.pldt.common/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools Core
-pluginProvider=Eclipse.org

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

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

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

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

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

@@ -1,155 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
-
-/**
- * Manage the artifacts: be able to retrieve an artifact from the id in a marker, for example.
- * <p>
- * Note that there can be more than one ArtifactManager, distinguished by 
- * an ID, probably a markerID.  That is, all artifacts of the same markerID
- * (probably shown in the same view) are managed by the same (distinct) ArtifactManager.
- * 
- * TODO Question: why can't we just store the objects in an attribute?? 
- * @author Beth Tibbitts
- * 
- * 
- */
-public class ArtifactManager {
-
-
-	/** to be able to look up artifacts by unique ID */
-	static HashMap hashMap = new HashMap();  
-
-	/** ID for this registry */
-	private String id_;
-
-	/**
-	 * Registry of artifact managers. IDs are probably markerIDs for the type of
-	 * artifacts that this ArtifactManager holds.
-	 */
-	public static HashMap registry = new HashMap();
-
-	public ArtifactManager(String id) {
-		this.id_ = id;
-		registry.put(id, this);
-
-	}
-
-	/** disallow default ctor */
-	@SuppressWarnings("unused")
-	private ArtifactManager() {
-	}
-
-	/**
-	 * return the ArtifactManager used for managing artifacts of type "id"
-	 * (probably a marker id)
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public static ArtifactManager getManager(String id) {
-        Object o = (Object)registry.get(id);
-        if (o==null)
-            new ArtifactManager(id);
-		return (ArtifactManager) registry.get(id);
-	}
-	/**
-	 * return the artifact for a marker; involves looking up the
-	 * Artifact Manager, then the Artifact within that.
-	 * 
-	 * Maybe we just need a big hashtable or other big Map instead???
-	 * 
-	 * @param marker
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IArtifact getArtifact(IMarker marker) throws CoreException{
-		String id = (String) marker.getAttribute(IDs.UNIQUE_ID);
-		String markerID=marker.getAttribute(IDs.ID).toString();
-		ArtifactManager aMgr=getManager(markerID);
-		IArtifact a =  aMgr.getArtifact(id);
-		
-		return a;
-	}
-
-
-
-	/**
-	 * Add an artifact to the hashtable for future lookup
-	 * 
-	 * @param artifact
-	 */
-	public void addArtifactToHash(IArtifact a) {
-		String id = a.getId(); // for debugging access only
-		hashMap.put(id, a);
-	}
-
-	/**
-	 * retrieve artifact by unique ID. Used for retrieving artifacts when needed
-	 * from the Markers - since markers can't hold on to them
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public IArtifact getArtifact(String id) {
-		IArtifact artifact = (Artifact) hashMap.get(id);
-		return artifact;
-	}
-
-	public Object[] getArtifacts() {
-		Object[] artifacts = hashMap.values().toArray();
-		return artifacts;
-	}
-
-	public HashMap getArtifactMap() {
-		return hashMap;
-	}
-	/**
-	 * Remove artifact by artifact object
-	 * @param a
-	 * @return true if it was removed
-	 */
-	public boolean removeArtifact(IArtifact a){
-		return removeArtifact(a.getId());
-	}
-	/**
-	 * Remove artifact by key
-	 * @param key
-	 * @return
-	 */
-	public boolean removeArtifact(String key){
-		if(hashMap.containsKey(key)){
-			hashMap.remove(key);
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * Remove all the artifacts
-	 *
-	 */
-	public void clear(){
-		hashMap.clear();
-	}
-	public String toString(){
-		return "ArtifactManager for "+id_;
-	}
-
-
-
-}

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

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

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

@@ -1,189 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plugin class for PLDT (PTP's Parallel Language Development Tools)
- * @author Beth Tibbitts
- */
-public class CommonPlugin extends AbstractUIPlugin {
-
-	/** The shared instance. */
-	private static CommonPlugin plugin;
-	/** Resource bundle */
-	private ResourceBundle resourceBundle;
-
-	private static boolean eclipseTraceOn = false;
-	private static boolean haveReadTraceStatus = false;
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.common";
-	
-  /**
-   * To use dynamic tracing (User instructions):
-   * Create a file ".options" in the
-   * same directory as your eclipse executable. Put this in the file:
-   * 
-   * <pre>
-   *  org.eclipse.ptp.pldt.common/debug = true
-   *  org.eclipse.ptp.pldt.common/debug/pldtTrace = true
-   * </pre>
-   * 
-   * Then launch eclipse in debug mode using the -debug option, and mirror the
-   * Console view output to the command line console using the -consoleLog
-   * option. (Maybe Linux already spits out the console, not sure.)
-   * 
-   * <pre>
-   * eclipse - debug - consoleLog
-   * </pre>
-   * 
-   * When you run with this tracing enabled, it will print out a bunch of
-   * trace information to the console. At least MPI artifact analysis has been
-   * enabled for user-directed tracing.
-   * 
-   * @return
-   */
-	public static boolean getTraceOn() {
-		if (!haveReadTraceStatus) {
-			String traceFilter = Platform.getDebugOption("org.eclipse.ptp.pldt.common/debug/pldtTrace");
-			if (traceFilter != null) {
-				System.out.println("CommonPlugin.getTraceOn(): pldtTrace trace filtering is on; traceFilter= " + traceFilter);
-				eclipseTraceOn = true;
-			}
-			haveReadTraceStatus = true;
-		}
-		return eclipseTraceOn;
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public CommonPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		// there's probably a better place to put this, but...
-		getPreferenceStore().setDefault(IDs.SHOW_ANALYSIS_CONFIRMATION, true);
-		
-		Bundle cdtBundle=Platform.getBundle("org.eclipse.cdt.core");
-		String version = (String) cdtBundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);
-		System.out.println("CDT version: "+version);
-		boolean versOK = version.startsWith("4.0.2")|| version.startsWith("4.0.3") || version.startsWith("5");
-		if(!versOK){
-			System.out.println("**Warning, wrong version of CDT.  Version 4.0.2 or higher is required with PLDT 2.0");
-			String msg="This is PLDT 2.0 which requires CDT Version 4.0.2 or higher.";
-				msg+="\nThis eclipse installation contains CDT version "+version;
-			MessageDialog.openError(null, "Version mismatch", msg);
-		}		
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CommonPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-	
-    /**
-     * Returns the standard display to be used. The method first checks, if the thread calling this method has an
-     * associated display. If so, this display is returned. Otherwise the method returns the default display.
-     */
-    public static Display getStandardDisplay()
-    {
-        Display display;
-        display = Display.getCurrent();
-        if (display == null) display = Display.getDefault();
-        return display;
-    }
-    /**
-     * Returns the plugin's resource bundle,
-     */
-    public ResourceBundle getResourceBundle()
-    {
-        try {
-            if (resourceBundle == null)
-                resourceBundle = ResourceBundle.getBundle("org.ptp.pldt.common.CommonPluginResources");
-        } catch (MissingResourceException x) {
-            resourceBundle = null;
-        }
-        return resourceBundle;
-    }
-
-    /**
-     * Returns the string from the plugin's resource bundle, or 'key' if not found.
-     */
-    public static String getResourceString(String key)
-    {
-        ResourceBundle bundle = CommonPlugin.getDefault().getResourceBundle();
-        try {
-            return (bundle != null) ? bundle.getString(key) : key;
-        } catch (MissingResourceException e) {
-            return key;
-        }
-    }
-
-    /**
-     * Write to the ".log" file
-     * @param type type of log entry, e.g. IStatus.ERROR, IStatus.WARNING, etc.
-     * @param msg the message to be displayed
-     */
-    public static void log(int type, String msg) {
-    	String pluginID=getDefault().getBundle().getSymbolicName();
-    	Exception exc = null;// ignore exception for now
-		IStatus status = new Status(type, pluginID, type, msg,exc);
-		getDefault().getLog().log(status);
-
-    }
-    /**
-     * Write to the ".log" file with default status type of IStatus.INFO
-     * @param msg the message to be displayed.
-     */
-    public static void log(String msg){
-    	log(IStatus.INFO, msg);
-    }
-}

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

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

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

@@ -1,50 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common;
-
-/**
- * Misc. IDs for preferences, markers, etc.
- * 
- * @author tibbitts
- * 
- */
-public interface IDs
-{
-    String P_RUN_ANALYSIS  = "runAnalysis";
-    String P_ECHO_FORCE    = "forceEcho";
-//    String MARKER_ERROR_ID = "org.eclipse.ptp.pldt.mpi.core.mpiErrorMarker";
-//    String MARKER_ID       = "org.eclipse.ptp.pldt.mpi.core.mpiMarker";
-    String FILENAME        = "filename";
-    String NAME            = "name";
-    String DESCRIPTION     = "description";
-    String ID              = "uniqueID";
-
-    // note built-in marker id too... not sure this is used,
-    // compare with IMarker.LINE_NUMBER which is probably used instead.
-    String LINE            = "theLineNo";
-    String NEWLINE         = "theNewLineNo";
-
-    // preference page name for MPI Includes field label
-//    static public final String MPI_INCLUDES    = "MPI Includes";
-
-    // marker attribute for the extra info saved for each marker/artifact
-    String CONSTRUCT_TYPE  = "constructType";
-    /**
-	 * Key for storing preference of whether or not to show popup confirmation
-	 * dialog when analysis is complete.
-	 */
-	String SHOW_ANALYSIS_CONFIRMATION = "showAnalysisConfirmation";
-	String UNIQUE_ID = "uniqueID";
-    
-    // id for MPI Artifact view
-//    String MPI_VIEW_ID = "org.eclipse.ptp.pldt.mpi.core.views.MPITableView";
-}

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

@@ -1,50 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This object represents the collection of  artifacts (e.g. MPI or OpenMP artifacts) returned from analysis, 
- * which will eventually be displayed in
- * the associated view, etc. <br>
- * It can also contain other information such as return codes, generalized analysis results, parameters, etc. <br>
- * 
- * @author Beth Tibbitts
- * 
- */
-public class ScanReturn
-{
-
-    private List<Artifact> artifacts = new ArrayList<Artifact>();
-    
-    public ScanReturn()
-    {      
-    }
-
-    public boolean wasError()
-    {
-        return false;
-    }
-
-    public List<Artifact> getArtifactList()
-    {
-        return artifacts;
-    }
-
-    public void addArtifact(Artifact a)
-    {
-        artifacts.add(a);
-    }
-
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,112 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.editorHelp;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
-
-/**
- * C Help Book implementation for hover help, etc. etc.
- * @author beth
- *
- */
-public class CHelpBookImpl implements ICHelpBook {
-	private String title = "Generic C Help Book";
-	private static final boolean traceOn=false;
-
-	private String pluginId;
-
-	protected Map<String,IFunctionSummary> funcName2FuncInfo = new HashMap<String, IFunctionSummary>();
-
-	/**
-	 * Disallow default ctor; must provide plugin id
-	 */
-	@SuppressWarnings("unused")
-	private CHelpBookImpl() {
-	}
-
-	public CHelpBookImpl(String pluginId) {
-		this.pluginId = pluginId;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	protected void setTitle(String title) {
-		this.title = title;
-	}
-
-	public int getCHelpType() {
-		return ICHelpBook.HELP_TYPE_C;
-	}
-
-	public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context,
-			String name) {
-		IFunctionSummary fs = funcName2FuncInfo.get(name);
-		if(traceOn){
-			
-			String cn=this.getClass().getSimpleName();
-			String finfo=(fs!=null)?(fs.toString().substring(0,25)):null;
-			if(finfo!=null)
-				System.out.println("CHelpBookImpl "+cn+" getFunctionInfo for "+name+ "= "+finfo);
-		}
-		return fs;
-	}
-
-	public IFunctionSummary[] getMatchingFunctions(
-			ICHelpInvocationContext context, String prefix) {
-		List<IFunctionSummary> functionSummaryList = new ArrayList<IFunctionSummary>();
-		for (Iterator<String> it = funcName2FuncInfo.keySet().iterator(); it.hasNext();) {
-			String funcName = it.next();
-			if (funcName != null
-					&& funcName.toUpperCase().startsWith(prefix.toUpperCase())) {
-				functionSummaryList.add(funcName2FuncInfo.get(funcName));
-			}
-		}
-
-		IFunctionSummary[] functionSummaryArray = null;
-
-		// populate array
-		if (!functionSummaryList.isEmpty()) {
-			functionSummaryArray = new IFunctionSummary[functionSummaryList
-					.size()];
-			int i = 0;
-			for (Iterator<IFunctionSummary> it = functionSummaryList.iterator(); it.hasNext(); i++) {
-				functionSummaryArray[i] = it.next();
-			}
-		}
-
-		return functionSummaryArray;
-	}
-
-	public ICHelpResourceDescriptor[] getHelpResources(
-			ICHelpInvocationContext context, String name) {
-		IFunctionSummary functionSummary = getFunctionInfo(context, name);
-		if (functionSummary == null)
-			return null;
-
-		ICHelpResourceDescriptor resourceDescriptor[] = new ICHelpResourceDescriptor[1];
-		CHelpResourceDescriptorImpl hrd = new CHelpResourceDescriptorImpl(this,
-				functionSummary, this.pluginId);
-		resourceDescriptor[0] = hrd; // html file path is in here
-		return resourceDescriptor;
-	}
-}

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

@@ -1,57 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.editorHelp;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.cdt.ui.ICHelpProvider;
-import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
-
-/**
- * 
- * This class implements ICHelpProvider and provides help information
- */
-public abstract class CHelpProviderImpl implements ICHelpProvider
-{
-    protected CHelpBookImpl helpBook;
-    
-
-
-    public ICHelpBook[] getCHelpBooks()
-    {
-        return new ICHelpBook[] {helpBook};
-    }
-
-    /**
-     * called on hover
-     */
-    public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name)
-    {
-        return (helpBooks.length == 0) ? null : helpBook.getFunctionInfo(context, name);
-    }
-
-    public IFunctionSummary[] getMatchingFunctions(ICHelpInvocationContext context, ICHelpBook[] helpBooks,
-            String prefix)
-    {
-        return (helpBooks.length == 0) ? null : helpBook.getMatchingFunctions(context, prefix);
-    }
-
-    /**
-     * called on F1
-     */
-    public ICHelpResourceDescriptor[] getHelpResources(ICHelpInvocationContext context, ICHelpBook[] helpBooks,
-            String name)
-    {
-        return (helpBooks.length == 0) ? null : helpBook.getHelpResources(context, name);
-    }
-}

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

@@ -1,70 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.editorHelp;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.help.IHelpResource;
-
-public class CHelpResourceDescriptorImpl implements ICHelpResourceDescriptor
-{
-    ICHelpBook  book;
-    String        name;
-    String        label;
-    String        href;
-    IHelpResource [] resources;
-
-    /**
-     * This is where the location of the html help file (to be displayed for an API) is located
-     * @param helpBook
-     * @param functionSummary
-     * @param pluginId
-     */
-    public CHelpResourceDescriptorImpl(ICHelpBook helpBook, IFunctionSummary functionSummary, String pluginId)
-    {
-        book = helpBook;
-        name = functionSummary.getName();
-        //href = "/"+pluginId + "/html/" + name + ".html";
-        StringBuffer buf=new StringBuffer();
-        buf.append("/").append(pluginId).append("/html/").append(name).append(".html");
-        href=buf.toString();
-        //System.out.println("looking for help file: "+href);
-        // href="file://c:/temp/foo.html";      
-        label = functionSummary.getPrototype().getPrototypeString(false);
-        resources = new IHelpResource[1];
-        resources[0] = new IHelpResource() {
-            public String getHref()
-            {
-                return href;
-            }
-
-            public String getLabel()
-            {
-                return label;
-            }
-        };
-    }
-
-    public ICHelpBook getCHelpBook()
-    {
-        return book;
-    }
-
-    public IHelpResource[] getHelpResources()
-    {
-        return resources;
-    }
-    public String toString() {
-    	return name+" -> "+href;
-    }
-}

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

@@ -1,66 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.editorHelp;
-
-import org.eclipse.cdt.ui.IFunctionSummary.IFunctionPrototypeSummary;
-
-public class FunctionPrototypeSummaryImpl implements IFunctionPrototypeSummary
-{
-    private String name;
-    private String returnType; // "void";
-    private String arguments; // "int argc, char** argv";
-
-    public FunctionPrototypeSummaryImpl()
-    {
-    	
-    }
-    
-    public FunctionPrototypeSummaryImpl(String name, String returnType, String arguments)
-    {
-        this.name = name;
-        this.returnType = returnType;
-        this.arguments = arguments;
-    }
-
-    public String getName()
-    {
-        return this.name;
-    }
-
-    public String getReturnType()
-    {
-        return returnType;
-    }
-
-    public String getArguments()
-    {
-        return arguments;
-    }
-
-    public String getPrototypeString(boolean namefirst)
-    {
-        return namefirst ? name + "(" + arguments + ") " + returnType : returnType + " "
-                + name + "(" + arguments + ")";
-    }
-
-	public void setArguments(String arguments) {
-		this.arguments = arguments;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setReturnType(String returnType) {
-		this.returnType = returnType;
-	}
-}
\ No newline at end of file

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

@@ -1,103 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.editorHelp;
-
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.IRequiredInclude;
-
-/**
- * Used by all four PLDT types MPI, OpenMP, LAPI and UPC, to create the structures that hover help needs
- * @author Beth Tibbitts
- *
- */
-public class FunctionSummaryImpl implements IFunctionSummary
-{
-    private String                    name;
-    private String                    namespace;
-    private String                    description;
-    private IFunctionPrototypeSummary prototype;
-    private IRequiredInclude[]        includes;
-
-    public FunctionSummaryImpl()
-    {
-    	
-    }
-    public FunctionSummaryImpl(String name, String namespace, String description,
-            IFunctionPrototypeSummary prototype, IRequiredInclude[] includes)
-    {
-        this.name = name;
-        this.namespace = namespace;
-        this.description = description;
-        this.prototype = prototype;
-        this.includes = includes;
-    }
-
-    public String getName()
-    {
-        return this.name;
-    }
-
-    public String getNamespace()
-    {
-        return this.namespace;
-    }
-
-    public String getDescription()
-    {
-        return this.description;
-    }
-
-    public IFunctionPrototypeSummary getPrototype()
-    {
-        return this.prototype;
-    }
-
-    public IRequiredInclude[] getIncludes()
-    {
-        return this.includes;
-    }
-
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
-
-    public void setIncludes(IRequiredInclude[] includes)
-    {
-        this.includes = includes;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public void setNamespace(String namespace)
-    {
-        this.namespace = namespace;
-    }
-
-    public void setPrototype(IFunctionPrototypeSummary prototype)
-    {
-        this.prototype = prototype;
-    }
-    
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        buf.append("name=").append(this.getName()).append('\n');
-        buf.append("namespace=").append(this.getNamespace()).append('\n');
-        buf.append("desc=").append(this.getDescription()).append('\n');
-        buf.append("...");
-        return buf.toString();
-    }
-}

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

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

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

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.pldt.common.prefs;
-
-/**
- * Constant definitions for plug-in preferences
- */
-public class PreferenceConstants {
-
-	public static final String P_PATH = "pathPreference";
-
-	public static final String P_BOOLEAN = "booleanPreference";
-
-	public static final String P_CHOICE = "choicePreference";
-
-	public static final String P_STRING = "stringPreference";
-	
-}

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

@@ -1,21 +0,0 @@
-package org.eclipse.ptp.pldt.common.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-
-/**
- * Class used to initialize default preference values.
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-//		IPreferenceStore store = CommonPlugin.getDefault()
-//				.getPreferenceStore();
-
-	}
-
-}

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

@@ -1,83 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.util;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.content.IContentType;
-
-/**
- * Various utility methods for project
- * 
- * @author Beth Tibbitts
- * 
- * 
- */
-public class AnalysisUtil {
- 
-	private AnalysisUtil() {
-		super();
-	}
-
-	/**
-	 * Is the given filename a valid file for analysis processing? <br>
-	 * Currently this means, is it a .c or .cpp etc file, or .h or .hpp? <br>
-	 * Don't pollute this with fortran info - currently fortran processing is in
-	 * a completely different action.
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	public static boolean validForAnalysis(String filename, boolean isCPP) {
-		int loc = filename.lastIndexOf(".");
-		if (loc <= 0) // if no dot, or filename is ".foo", not valid for
-						// analysis.
-			return false;
-		String ext = filename.substring(loc + 1);
-		ext = ext.toLowerCase();
-		boolean result = false;
-		if (ext.startsWith("c")/* ||ext.startsWith("f") */) // c or fortran
-			result = true;
-		else
-			if(isCPP && ext.startsWith("h")) // C++ can have code in header files
-			  result=true;
-		return result;
-	}
-
-	/**
-	 * Given a C/C++ source, decide if it is C or C++.
-	 * 
-	 * @param file
-	 *            must be either C or CPP file
-	 * @return
-	 */
-	public static ParserLanguage getLanguageFromFile(IFile file) {
-		if (file == null) { // assume CPP
-			return ParserLanguage.CPP;
-		}
-
-		IProject project = file.getProject();
-		String lid = null;
-		IContentType type = CCorePlugin.getContentType(project, file.getFullPath().lastSegment());
-		if (type != null) {
-			lid = type.getId();
-		}
-		if (lid != null
-				&& (lid.equals(CCorePlugin.CONTENT_TYPE_CXXSOURCE) || lid.equals(CCorePlugin.CONTENT_TYPE_CXXHEADER))) {
-			return ParserLanguage.CPP;
-		}
-
-		return ParserLanguage.C;
-	}
-}

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

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

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

@@ -1,152 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.common.util;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.editors.text.ILocationProvider;
-import org.eclipse.ui.ide.ResourceUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Various function/methods of use, Originally in OpenMP analysis but used more generally now
- * 
- * @author pazel
- *
- */
-public class Utility
-{
-    
-    
-    /**
-     * compute the location relative to file, ignoring includes
-     * @param node - IASTNode
-     * @return Location
-     */
-    @SuppressWarnings("restriction")// need getLength() from ASTNode (as opposed to IASTNode)
-	public static Location getLocation(IASTNode node)
-    {
-        ASTNode astnode = (node instanceof ASTNode ? (ASTNode)node : null);
-        if (astnode==null)  return null;
-
-        IASTFileLocation ifl         = node.getFileLocation();
-        // offset calculation is tricky - we used the following since it seems to cover the most cases
-        int offset = 0;
-        int length = 0;
-        if (ifl!=null) {
-            offset = ifl.getNodeOffset();   
-            length = ifl.getNodeLength();
-        }
-        else {  // this happens in "omp sections", apparently due to pragmas splitting the region
-            IASTNodeLocation [] locs = node.getNodeLocations(); 
-            if (locs==null || locs.length==0)  return null;
-            offset = locs[0].getNodeOffset();
-            length = astnode.getLength();
-        }
-        return new Location(node, offset, offset+length-1);
-    }
-
-    //-------------------------------------------------------------------------
-    // Member
-    //-------------------------------------------------------------------------
-    public static class Location
-    {
-        public IASTNode node_ = null;
-        public int low_=0;
-        public int high_=0;
-    
-        public Location(IASTNode node, int low, int high)
-        {
-            node_ = node;
-            low_  = low;
-            high_ = high;
-        }
-        
-        public int getLow()  { return low_;  }
-        public int getHigh() { return high_; }
-    }
-    
- 
-    
-    /**
-     * get document using full path name
-     * @param fullPathName - String
-     * @return IDocument
-     */
-    public static IDocument getDocument(String fullPathName)
-    {
-        IResource r = ParserUtil.getResourceForFilename(fullPathName);
-        IFile     f = (r instanceof IFile ? (IFile)r : null);
-        if (f==null)  return null;
-        return getDocument(f);
-    }
-    
-    /**
-     * getDocument - get document using IFile
-     * @param file - IFile
-     * @return IDocument
-     */
-    public static IDocument getDocument(IFile file)
-    {
-        ITextFileBufferManager bufferManager= FileBuffers.getTextFileBufferManager();
-        ITextFileBuffer textFileBuffer= bufferManager.getTextFileBuffer(file.getFullPath());
-        IDocument document = null;
-        if (textFileBuffer != null) {
-            document= textFileBuffer.getDocument();
-        }
-        return document;
-    }
-	/**
-	 * From an editor, determine the file (absolute path name) open in the editor.
-	 * @param editor
-	 * @return null if none, but the string of the absolute file system location if available
-	 * 
-	 */
-    //cdt40 since editor.getInputFile() is now missing, this compensates
-	public static String getInputFile(ITextEditor editor) {
-		IEditorInput input= editor.getEditorInput();
-		if (input == null) {
-			return null;
-		}
-		IFile file= ResourceUtil.getFile(input);
-		if (file != null) {
-			return file.getLocation().toOSString();
-		}
-		if (input instanceof IPathEditorInput) {
-			IPath location= ((IPathEditorInput)input).getPath();
-			if (location != null) {
-				return location.toOSString();
-			}
-		}
-		ILocationProvider locationProvider= (ILocationProvider)input.getAdapter(ILocationProvider.class);
-		if (locationProvider != null) {
-			IPath location= locationProvider.getPath(input);
-			if (location != null) {
-				return location.toOSString();
-			}
-		}
-		return null;
-	}
-
-
-}

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

@@ -1,39 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.util;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * 
- */
-public class ViewActivater
-{
-    /**
-     * Activate the view identified by the view id.
-     * 
-     * @param strViewId
-     */
-    public static void activateView(String strViewId)
-    {
-        assert strViewId!=null;
-        IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        try {
-            page.showView(strViewId);
-        } catch (PartInitException e) {
-            e.printStackTrace();
-        }
-        // page.activate(page.findView(strViewId));
-    }
-}

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

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

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

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

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath b/tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath
deleted file mode 100644
index 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 ca83254..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: %pluginName
-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: %pluginProvider
-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 a3302f4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/build.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-bin.includes = plugin.xml,\
-               html/,\
-               toc.xml,\
-               .,\
-               META-INF/,\
-               intro/,\
-               plugin.properties,\
-               about.html
-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/barrier.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html
deleted file mode 100644
index e9f8299..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html
+++ /dev/null

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,105 +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.1
-<p>The PTP Parallel Language Development Tools (PLDT) provide
-tools to aid in MPI, OpenMP, UPC 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 artifacts (APIs and other appropriate items in code) for the following parallel programming systems:
-<ul>
-<li>MPI
-<li>OpenMP
-<li>LAPI
-<li>UPC
-</ul>
-<li>"Artifact View" indicates locations of Artifacts found
-in source code
-<li>Navigation to source code location of artifacts
-<li>Content assist via Cntl-Space completes API names
-while typing, and fills in arguments too.
-<li>Hover help shows API names, arguments, and descriptions.
-<li>Reference information about APIs via F1 (Cntl-F1 on Linux; Help key on Mac)
-<li>MPI Barrier Analysis detects potential deadlocks in MPI applications,
-and shows barrier matches, barrier errors, and paths of all barrier
-matching sets.  Includes detections across multiple functions and source files.
-<li>OpenMP problems view of common errors, OpenMP "show #pragma region" action,
-OpenMP "Show Concurrency" action.
-
-
-
-<li>CDT "New C Project" wizard includes a  wizard page that can 
-automatically add in the include paths etc. for MPI and OpenMP projects.
-<li>New project wizard can include sample MPI and OpenMP source files 
-and set up the projects to save time.
-<li>Welcome pages introduce new Eclipse users to PLDT.
-<li>Single-menu UI for PLDT analysis features simplifies the editor toolbar.
-<br><img src="images/pldt-menu.png">
-<br>&nbsp;
-<p>The features added in PLDT 2.1 include:
-<li>Support for Eclipse 3.4 and CDT 5.0
-<li>UPC support
-<li>MPI code templates
-</ul>
-See also <a href="whatsnew.html">New and Noteworthy </a> - what's new in PLDT 2.1
-<h2>
-Pre-requisites:
-</h2>
-<p>PLDT 2.1 requires the base Eclipse platform, the CDT, and MPI and/or OpenMP.
-<ul>
-<li><b>Eclipse</b> platform: Version  3.4 or later
-<li><b>CDT:</b>
-Version 5.0.1 or later for C/C++ files.  (Wherever CDT is mentioned, Photran projects and files,
-for C/C++, if based on Eclipse 3.4/CDT 5.0.1 or later, should also work, but not much testing has yet been done.)
-
-<li><b>MPI:</b>
-Get MPI and its header file, a version that runs on
-your system (e.g. OpenMPI for Linux/Mac; MPICH2 for win32)
-<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.
-<li><b>UPC:</b>
-Header file required
-<li><b>LAPI:</b>
-Header file required
-
-</ul>
-<p>Note that <i>running</i> MPI or OpenMP (or UPC, or LAPI) is not really required for the PLDT
-to function and provide analysis and help with 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.1, October 2008) this includes OpenMPI, which is available for Linux and Mac Only, but via PTP Remote Tools and/or RDT (Remote Development Tools),
-other  systems can be accessed remotely, and don't need to be installed on the same machine where Eclipse is installed.
-<p>For PLDT, a runtime system is not required, and PLDT will work (e.g. for development and analysis only) on Windows as well.
-
-<h2>Miscellaneous Topics</h2>
-<h3>Misplaced icon?</h3>
-<p>Note: if, after installing PLDT, the PLDT menu icon is misplaced over on the left side
-of the Eclipse toolbar:
-<br><img src="images/pldtIconMisplaced.gif">
-<br>You can put it in its proper place by selecting Window > Reset Perspective.
-<p>&nbsp;
-<li>Eclipse Welcome page includes pointers to information for PLDT.
-<br><img src="images/welcomeOverview.gif">
-<br><img src="images/welcomeC-pldt.gif">
-<br>&nbsp;
-<h3>Tracing in PLDT</h3>
-<p>Tracing is enabled for some parts of PLDT.  <a href="tracing.html">See tracing instructions for how to turn this on.</a>
-<p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-</body>
-</html>
\ No newline at end of file

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

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

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

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

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

@@ -1,39 +0,0 @@
-<html>
-<head>
-<title>
-Running PTP UPC Tools 
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> Running PTP UPC Tools Plug-in</h1>
-
-<p>The basic instructions for running the UPC tools 
-(finding UPC artifacts, navigating to source code, using Help)
-are the same
-as for <a href="run.html">running the MPI tools.</a>.
-
-<p>Set up UPC Preferences
-<br><img src="images/upcPrefs.png">
-<br>&nbsp;
-
-<p>Set up UPC project include paths, compiler options, etc. in Project Properties
-<br><img src="images/upcProperties.png">
-<br>&nbsp;
-
-<p>Finding UPC artifacts:
-<br><img src="images/menuShowUPCartifacts.png">
-<p>UPC artifacts found and shown in the UPC Artifact View:
-<p><img src="images/upc_editorAndArtifacts.png">
-<p>Note that currently only UPC APIs (function calls) are identified as artifacts.
-UPC language features are highlighted by CDT.
-<p><img src="images/upc_editorVsArtifacts.png">
-
-
-
-<p>&nbsp;<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 b124cb1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setup.html
+++ /dev/null

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

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

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

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

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

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

@@ -1,16 +0,0 @@
-
-// Javascript to provide a convenient way to show a thumbnail of an image, with a link to the full-size image
-// Default height is 120 if the second arg is omitted
-//Note that IE uses the alt tag for hover but Firefox more correctly uses the title tag for hover text.
-//Usage: <script> thumb("images/foo.gif")</script>
-function thumb(url,height){
-   if (!height) {height=120;}
-   document.write ("<a href='"+url+"'><img src='"+url+"' height="+height+" title='Click for a full-size image' alt='Click for a full-size image'></a>");
-}
-// simple imbedding of image, in default full size, with break preceeding
-// (easy to replace the above with this one)
-//Usage: <script> full("images/foo.gif")</script>
-function full(url){
-   document.write ("<img src='"+url+"'>");
-}
-

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

@@ -1,51 +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.1
-
-<h2>Help Topics</h2>
-<a href="overview.html">PLDT Overview, pre-requisites, etc.</a>
-<p><a href="http://wiki.eclipse.org/PTP/release_notes/2.1">Basic instructions on installing Eclipse, CDT, PTP, and PLDT</a>
-from the Eclipse PTP web site.
-<p>The following instructions describe setup and run information.
-<h3>MPI</h3>
-<ul><li>
-<a href="setup.html">Setup for building and running PTP MPI Tools</a>
-</li>
-<li>
-<a href="run.html">Running PTP MPI Tools</a></li>
-<li><a href="barrier.html">MPI Barrier Analysis</a></li>
-<li><a href="mpiTemplates.html">MPI Templates</a></li>
-</ul>
-<p>
-<h3>OpenMP</h3>
-<ul><li>
-<a href="setupOMP.html">Setup for building and running PTP OpenMP Tools</a>
-</li>
-<li>
-<a href="runOMP.html">Running PTP OpenMP Tools</a></li>
-<li>
-<a href="openMPextra.html">Additional OpenMP Tools </a>
-</li>
-</ul>
-<h3>UPC</h3>
-<ul>
-<li>
-<a href="runUPC.html">Setting up and Running UPC Tools</a></li>
-</li>
-</ul>
-<h3>Makefile vs. Managed Build projects</h3>
-<ul>
-<li><a href="setupMakefileProject.html">Setting up Makefile projects</a></li>
-</ul>
-<a href="whatsnew.html">New and Noteworthy </a></li> - what's new in PLDT 2.1
-
-</body>
-</html>
\ No newline at end of file

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

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

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

@@ -1,24 +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>Smarter New Project Wizards set up more options, and prompt to set up
-PLDT preferences if needed.
-<li><a href="mpiTemplates.html">MPI Templates</a>
-<li><a href="runUPC.html">UPC assistance tools</a>
-</ul>
-
-
-</ul>
-<p>&nbsp;
-<p><a href="toc.html">Back to Table of Contents</a>
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/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.properties b/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.properties
deleted file mode 100644
index 64eddbf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools User Guide
-pluginProvider=Eclipse.org

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 0cb4fdb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/toc.xml
+++ /dev/null

@@ -1,19 +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 href="html/overview.html" label="Overview"/>
-      <topic label="Setup for PTP MPI tools"  href="html/setup.html"/> 
-      <topic label="Running PTP MPI tools"  href="html/run.html"/> 
-           <topic label="Setup for PTP OpenMP tools"  href="html/setupOMP.html"/> 
-      <topic label="Running PTP OpenMP tools"  href="html/runOMP.html"/> 
-   <topic href="html/barrier.html" label="MPI Barrier Analysis">
-   </topic> 
-      <topic href="html/runUPC.html" label="UPC tools"/>
-   <topic href="html/whatsnew.html" label="New and Noteworthy"/>
-
-
-
-
-
-</toc>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/.classpath b/tools/pldt/org.eclipse.ptp.pldt.lapi/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.lapi/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.lapi/.cvsignore
deleted file mode 100644
index 2cc8dd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/.cvsignore
+++ /dev/null

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

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.lapi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.lapi/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.lapi/META-INF/MANIFEST.MF
deleted file mode 100644
index a106519..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.lapi; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.lapi.LapiPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.common,
- org.eclipse.help,
- org.eclipse.cdt.doc.user
-Eclipse-AutoStart: true
-Bundle-ClassPath: .

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.ini b/tools/pldt/org.eclipse.ptp.pldt.lapi/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.ini
+++ /dev/null

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

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.mappings b/tools/pldt/org.eclipse.ptp.pldt.lapi/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.xml
deleted file mode 100644
index 2770da8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/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.lapi.prefs.LAPIPreferencePage"
-            id="org.eclipse.ptp.pldt.lapi.prefpage"
-            category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            name="LAPI"/>
-         
-   </extension>
-
-   <!--  LAPI markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="lapiMarker"
-        name="LAPI 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.lapi.lapiMarker"
-            name="org.eclipse.ptp.pldt.lapi.lapiMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.lapi.lapiMarkerAnnotation"
-            icon="icons/lapi.gif" 
-            
-            presentationLayer="3"
-            label="LAPI Annotation Marker"
-            
-            textPreferenceKey="lapiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="128,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%viewcat.name"
-            id="org.eclipse.ptp.pldt.lapi">
-      </category>
-      <view
-            name="%view.name"
-            icon="icons/lapi.gif"
-            category="org.eclipse.ptp.pldt.lapi"
-            class="org.eclipse.ptp.pldt.lapi.views.LapiArtifactView"
-            id="org.eclipse.ptp.pldt.lapi.views.LapiArtifactView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.lapi.editorHelp.LapiCHelpInfoProvider"
-            id="org.eclipse.ptp.pldt.lapi.editorHelp.LapiCHelpInfoProvider"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ptp.pldt.lapi.actions.RunAnalyseLAPIcommandHandler"
-            id="org.eclipse.ptp.pldt.lapi.command2"
-            name="find lapi artifacts">
-      </command>
-   </extension>
-      <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1 ">
-         <command
-               commandId="org.eclipse.ptp.pldt.lapi.command2"
-               icon="icons/lapi.gif"
-               label="Show LAPI Artifacts">
-         </command>
-      </menuContribution>
-   </extension>
-</plugin>

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

@@ -1,21 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-public class LAPIArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public LAPIArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}

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

@@ -1,26 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi;
-
-/**
- * LAPI Plugin constants
- */
-public interface LapiIDs
-{
-    // preference page name for LAPI
-    String LAPI_INCLUDES    = "LAPI Includes";
-    
-    String MARKER_ID       = "org.eclipse.ptp.pldt.lapi.lapiMarker";
-    String MARKER_ERROR_ID = "org.eclipse.ptp.lap.lapiErrorMarker";
-    
-    // artifact view id
-    String LAPI_VIEW_ID = "org.eclipse.ptp.pldt.lapi.views.LapiArtifactView";
-}

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

@@ -1,90 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi;
-
-import 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 LapiPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static LapiPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public LapiPlugin() {
-		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 LapiPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.lapi", path);
-	}
-    
-    /**
-     * Returns the preference setting for LAPI include paths
-     * 
-     * @return
-     */
-    public List<String> getLapiIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(LapiIDs.LAPI_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-    
-    public static String getPluginId()
-    {
-        return "org.eclipse.ptp.pldt.lapi";
-    }
-}

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

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

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

@@ -1,78 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi.analysis;
-
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-
-/**
- * This dom-walker collects "artifacts" related to the specific domain <br>
- * (e.g. LAPI). Currently these artifacts include function calls
- * and constants. It add markers to the source file for C code, marking the
- * position of the artifacts found.
- * 
- * This version extends PldtAstVisitor instead of delegating to<br>
- * MpiGeneralASTVisitorBehavior.
- *
- * @author tibbitts
- * 
- */
-public class LapiCASTVisitor extends PldtAstVisitor 
-{
-    private static final String PREFIX="LAPI_";
-
-    {
-        this.shouldVisitExpressions = true;
-        this.shouldVisitStatements = true;
-        this.shouldVisitDeclarations = true;
-        this.shouldVisitTranslationUnit = true;
-    }
-
-    public LapiCASTVisitor(List mpiIncludes, String fileName, ScanReturn msr)
-    {
-        super(mpiIncludes, fileName, msr);
-		ARTIFACT_CALL = "LAPI Call";
-		ARTIFACT_CONSTANT="LAPI Constant";
-    }
-
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-     */
-    public int visit(IASTExpression expression)
-    {
-        if (expression instanceof IASTFunctionCallExpression) {
-            IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-            String signature = astExpr.getRawSignature();
-            //System.out.println("func signature=" + signature);
-            if (signature.startsWith(PREFIX)) {
-                if (astExpr instanceof IASTIdExpression) {
-                    IASTName funcName = ((IASTIdExpression) astExpr).getName();
-                    processFuncName(funcName, astExpr);
-                }
-            }
-        } else if (expression instanceof IASTLiteralExpression) {
-            processMacroLiteral((IASTLiteralExpression) expression);
-        }
-        return PROCESS_CONTINUE;
-    }
-}
\ No newline at end of file

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

@@ -1,94 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.lapi.LapiPlugin;
-
-
-public class LapiCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = "LAPI C Help Book";
-
-	@SuppressWarnings("unchecked")
-	public LapiCHelpBook() {
-        super(LapiPlugin.getPluginId());
-		// populate func map
-        funcName2FuncInfo.put("LAPI_Addr_get", new FunctionSummaryImpl("LAPI_Addr_get", "", "Retrieves a function address that was previously registered using LAPI_Addr_set.",
-                new FunctionPrototypeSummaryImpl("LAPI_Addr_get", "int", "lapi_handle_t hndl, void **addr, int addr_hndl"), null));
-        funcName2FuncInfo.put("LAPI_Addr_set", new FunctionSummaryImpl("LAPI_Addr_set", "", "Registers the address of a function.",
-                new FunctionPrototypeSummaryImpl("LAPI_Addr_set", "int", "lapi_handle_t hndl, void **addr, int addr_hndl"), null));
-        funcName2FuncInfo.put("LAPI_Address", new FunctionSummaryImpl("LAPI_Address", "", "Returns an unsigned long value for a specified user address.",
-                new FunctionPrototypeSummaryImpl("LAPI_Address", "int", "void  *my_addr, ulong *ret_addr"), null));
-        funcName2FuncInfo.put("LAPI_Address_init", new FunctionSummaryImpl("LAPI_Address_init", "", "Creates a remote address table.",
-                new FunctionPrototypeSummaryImpl("LAPI_Address_init", "int", "lapi_handle_t  hndl, void *my_addr, void *add_tab[ ]"), null));
-        funcName2FuncInfo.put("LAPI_Address_init64", new FunctionSummaryImpl("LAPI_Address_init64", "", "Creates a 64-bit remote address table.",
-                new FunctionPrototypeSummaryImpl("LAPI_Address_init64", "int", "lapi_handle_t  hndl, lapi_long_t my_addr, lapi_long_t *add_tab"), null));
-        funcName2FuncInfo.put("LAPI_Amsend", new FunctionSummaryImpl("LAPI_Amsend", "", "Transfers a user message to a remote task, obtaining the target address on the remote task from a user-specified header handler.",
-                new FunctionPrototypeSummaryImpl("LAPI_Amsend", "int", "lapi_handle_t hndl, uint tgt, void *hdr_hdl, void *uhdr, uint uhdr_len, void *udata, ulong udata_len, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Amsendv", new FunctionSummaryImpl("LAPI_Amsendv", "", "Transfers a user vector to a remote task, obtaining the target address on the remote task from a user-specified header handler.",
-                new FunctionPrototypeSummaryImpl("LAPI_Amsendv", "int", "lapi_handle_t hndl, uint tgt, void *hdr_hdl, void *uhdr, uint uhdr_len, lapi_vec_t *org_vec, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Fence", new FunctionSummaryImpl("LAPI_Fence", "", "Enforces order on LAPI calls.",
-                new FunctionPrototypeSummaryImpl("LAPI_Fence", "int", "lapi_handle_t hndl"), null));
-        funcName2FuncInfo.put("LAPI_Get", new FunctionSummaryImpl("LAPI_Get", "", "Copies data from a remote task to a local task.",
-                new FunctionPrototypeSummaryImpl("LAPI_Get", "int", "lapi_handle_t hndl, uint tgt, ulong len, void *tgt_addr, void *org_addr, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Getcntr", new FunctionSummaryImpl("LAPI_Getcntr", "", "Gets the integer value of a specified LAPI counter.",
-                new FunctionPrototypeSummaryImpl("LAPI_Getcntr", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int *val"), null));
-        funcName2FuncInfo.put("LAPI_Getv", new FunctionSummaryImpl("LAPI_Getv", "", "Copies vectors of data from a remote task to a local task.",
-                new FunctionPrototypeSummaryImpl("LAPI_Getv", "int", "lapi_handle_t hndl, uint tgt, lapi_vec_t *tgt_vec, lapi_vec_t *org_vec, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Gfence", new FunctionSummaryImpl("LAPI_Gfence", "", "Enforces order on LAPI calls across all tasks and provides barrier synchronization among them.",
-                new FunctionPrototypeSummaryImpl("LAPI_Gfence", "int", "lapi_handle_t hndl"), null));
-        funcName2FuncInfo.put("LAPI_Init", new FunctionSummaryImpl("LAPI_Init", "", "Initializes a LAPI context.",
-                new FunctionPrototypeSummaryImpl("LAPI_Init", "int", "lapi_handle_t *hndl, lapi_info_t *lapi_info"), null));
-        funcName2FuncInfo.put("LAPI_Msg_string", new FunctionSummaryImpl("LAPI_Msg_string", "", "Retrieves the message that is associated with a subroutine return code.",
-                new FunctionPrototypeSummaryImpl("LAPI_Msg_string", "int", "int error_code, void *buf"), null));
-        funcName2FuncInfo.put("LAPI_Msgpoll", new FunctionSummaryImpl("LAPI_Msgpoll", "", "Allows the calling thread to check communication progress.",
-                new FunctionPrototypeSummaryImpl("LAPI_Msgpoll", "int", "lapi_handle_t hndl, uint cnt, lapi_msg_info_t  *info"), null));
-        funcName2FuncInfo.put("LAPI_Probe", new FunctionSummaryImpl("LAPI_Probe", "", "Transfers control to the communication subsystem to check for arriving messages and to make progress in polling mode.",
-                new FunctionPrototypeSummaryImpl("LAPI_Probe", "int", "lapi_handle_t hndl"), null));
-        funcName2FuncInfo.put("LAPI_Put", new FunctionSummaryImpl("LAPI_Put", "", "Transfers data from a local task to a remote task.",
-                new FunctionPrototypeSummaryImpl("LAPI_Put", "int", "lapi_handle_t hndl, uint tgt, ulong len, void *tgt_addr, void *org_addr, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Putv", new FunctionSummaryImpl("LAPI_Putv", "", "Transfers vectors of data from a local task to a remote task.",
-                new FunctionPrototypeSummaryImpl("LAPI_Putv", "int", "lapi_handle_t hndl, uint tgt, lapi_vec_t *tgt_vec, lapi_vec_t *org_vec, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Qenv", new FunctionSummaryImpl("LAPI_Qenv", "", "Used to query LAPI for runtime task information.",
-                new FunctionPrototypeSummaryImpl("LAPI_Qenv", "int", "lapi_handle_t hndl, lapi_query_t query, int *ret_val"), null));
-        funcName2FuncInfo.put("LAPI_Rmw", new FunctionSummaryImpl("LAPI_Rmw", "", "Provides data synchronization primitives.",
-                new FunctionPrototypeSummaryImpl("LAPI_Rmw", "int", "lapi_handle_t hndl, RMW_ops_t op, uint tgt, int *tgt_var, int *in_val, int *prev_tgt_val, lapi_cntr_t *org_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Rmw64", new FunctionSummaryImpl("LAPI_Rmw64", "", "Provides data synchronization primitives for 64-bit applications.",
-                new FunctionPrototypeSummaryImpl("LAPI_Rmw64", "int", "lapi_handle_t hndl, Rmw_ops_t op, uint tgt, long long *tgt_var, long long *in_val, long long *prev_tgt_val, lapi_cntr_t *org_cntr"), null));
-        funcName2FuncInfo.put("LAPI_Senv", new FunctionSummaryImpl("LAPI_Senv", "", "Used to set a runtime variable.",
-                new FunctionPrototypeSummaryImpl("LAPI_Senv", "int", "lapi_handle_t hndl, lapi_query_t query, int set_val"), null));
-        funcName2FuncInfo.put("LAPI_Setcntr", new FunctionSummaryImpl("LAPI_Setcntr", "", "Used to set a counter to a specified value.",
-                new FunctionPrototypeSummaryImpl("LAPI_Setcntr", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int val"), null));
-        funcName2FuncInfo.put("LAPI_Term", new FunctionSummaryImpl("LAPI_Term", "", "Terminates and cleans up a LAPI context.",
-                new FunctionPrototypeSummaryImpl("LAPI_Term", "int", "lapi_handle_t hndl"), null));
-        funcName2FuncInfo.put("LAPI_Util", new FunctionSummaryImpl("LAPI_Util", "", "DESC",
-                new FunctionPrototypeSummaryImpl("LAPI_Util", "int", "lapi_handle_t hndl, lapi_util_t *util_cmd"), null));
-        funcName2FuncInfo.put("LAPI_Waitcntr", new FunctionSummaryImpl("LAPI_Waitcntr", "", "Waits until a specified counter reaches the value specified.",
-    		  	new FunctionPrototypeSummaryImpl("LAPI_Waitcntr", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int val, int *cur_cntr_val"), null));
-        funcName2FuncInfo.put("LAPI_Xfer", new FunctionSummaryImpl("LAPI_Xfer", "", "Serves as a wrapper function for LAPI data transfer functions.",
-    		  	new FunctionPrototypeSummaryImpl("LAPI_Xfer", "int", "lapi_handle_t hndl, lapi_xfer_t *xfer_cmd"), null));
-        funcName2FuncInfo.put("LAPI_Nopoll_wait", new FunctionSummaryImpl("LAPI_Nopoll_wait", "", "Waits for a counter update without polling.",
-                new FunctionPrototypeSummaryImpl("LAPI_Nopoll_wait", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr_ptr, int val, int *cur_cntr_val"), null));
-        funcName2FuncInfo.put("LAPI_Purge_totask", new FunctionSummaryImpl("LAPI_Purge_totask", "", "Allows a task to cancel messages to a given destination.",
-                new FunctionPrototypeSummaryImpl("LAPI_Purge_totask", "int", "lapi_handle_t hndl, uint dest"), null));
-        funcName2FuncInfo.put("LAPI_Resume_totask", new FunctionSummaryImpl("LAPI_Resume_totask", "", "Re-enables the sending of messages to the task.",
-                new FunctionPrototypeSummaryImpl("LAPI_Resume_totask", "int", "lapi_handle_t hndl, uint dest"), null));
-        funcName2FuncInfo.put("LAPI_Setcntr_wstatus", new FunctionSummaryImpl("LAPI_Setcntr_wstatus", "", "Used to set a counter to a specified value and to set the associated destination list array and destination status array to the counter.",
-                new FunctionPrototypeSummaryImpl("LAPI_Setcntr_wstatus", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int num_dest, uint *dest_list, int *dest_status"), null));
-//        funcName2FuncInfo.put("LAPI_Fence", new FunctionSummary("LAPI_Fence", "", "DESC",
-//                new FunctionPrototypeSummary("LAPI_Fence", "int", "ARGS"), null));
-
-        // set title
-        setTitle(TITLE);
-	}
-}

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

@@ -1,33 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-/**
- * 
- * This class implements ICHelpProvider and provides LAPI information <br>
- * (F1, hover, content assist, etc.)
- * 
- */
-
-public class LapiCHelpInfoProvider extends CHelpProviderImpl {
-
-	public LapiCHelpInfoProvider() {
-		// for debug use only, to see where it's called..
-		//System.out.println("LapiCHelpInfoProvider ctor()...");
-	}
-
-	public void initialize() {
-		helpBook = new LapiCHelpBook();
-		//System.out.println("LapiCHelpInfoProvider initialize()...");
-	}
-}

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

@@ -1,116 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi.prefs;
-
-
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.preference.RadioGroupFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.lapi.LapiIDs;
-import org.eclipse.ptp.pldt.lapi.LapiPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Preference page based on FieldEditorPreferencePage
- * 
- * @author xue
- */
-
-public class LAPIPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String INCLUDES_PREFERENCE_LABEL  = "LAPI include paths:";
-    private static final String INCLUDES_PREFERENCE_BROWSE = "Please choose a directory for LAPI includes:";
-    private static final String LAPI_HELP="Location of LAPI help files:";
-    private static final String LAPI_HELP_DEFAULT="Use default";
-    private static final String LAPI_HELP_DEFAULT_ID="lapiHelpUseDefault";
-    private static final String LAPI_HELP_LINUX="Use Linux location: ";
-    private static final String LAPI_HELP_AIX="Use AIX location: ";
-    private static final String LAPI_HELP_OTHER="Other:";
-    private static final String LAPI_HELP_OTHER_ID="lapiHelpOther";
-    
-    private static final String LAPI_LOCATION_AIX="/opt/rsct/lapi/eclipse/help";
-    private static final String LAPI_LOCATION_LINUX="opt/ibmhpc/lapi/eclipse/help";
-    
-    private static final String LAPI_WHICH_HELP_ID="default";  // alternatives are: default, aix, linux, other
-
-    public LAPIPreferencePage()
-    {
-        super(FLAT);
-        initPreferenceStore();
-    }
-
-    public LAPIPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public LAPIPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public LAPIPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = LapiPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-        PathEditor pathEditor = new PathEditor(LapiIDs.LAPI_INCLUDES, INCLUDES_PREFERENCE_LABEL,
-                INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-
-        //"Use default?"
-//        BooleanFieldEditor bed = new BooleanFieldEditor(LAPI_HELP_DEFAULT_ID,LAPI_HELP_DEFAULT,getFieldEditorParent());
-//        addField(bed);
-  /*      
-        int numCol=1;
-    	RadioGroupFieldEditor choiceFE = new RadioGroupFieldEditor(LAPI_WHICH_HELP_ID, LAPI_HELP, numCol, new String[][] {
-				{ LAPI_HELP_DEFAULT, "choice1" }, 
-				{ LAPI_HELP_AIX+LAPI_LOCATION_AIX, "choice2" }, 
-				{ LAPI_HELP_LINUX+LAPI_LOCATION_LINUX, "Choice3" },
-				{ LAPI_HELP_OTHER, "Choice4" }},
-				getFieldEditorParent());
-    	addField(choiceFE);
-    	
-    	StringFieldEditor otherLoc=new StringFieldEditor(LAPI_HELP_OTHER_ID, LAPI_HELP_OTHER,getFieldEditorParent());
-    	addField(otherLoc);
-    	*/
-    	
-    }
-    
-}

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

@@ -1,31 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi.views;
-
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.lapi.LapiIDs;
-import org.eclipse.ptp.pldt.lapi.LapiPlugin;
-
-
-
-/**
- * A LAPI artifact view based on SimpleTableView Note that the ID must be unique.
- * 
- */
-public class LapiArtifactView extends SimpleTableMarkerView
-{
-    public LapiArtifactView()
-    {
-        // if you need to read icon images, etc. from the plug-in, be sure to pass
-        // in an actual Plugin class instance for first arg
-        super(LapiPlugin.getDefault(), "LAPI Artifact", "LAPI Artifacts", "Construct", LapiIDs.MARKER_ID);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.classpath b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.mpi.analysis.cdt/.project b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.project
deleted file mode 100644
index 6afb3da..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.mpi.analysis.cdt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.mpi.analysis.cdt/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/META-INF/MANIFEST.MF
deleted file mode 100644
index c5a0be1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.mpi.analysis.cdt
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.mpi.analysis.cdt.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.core.resources
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs,
- org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl
-Bundle-Vendor: %pluginProvider

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

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties

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

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools CDT Analysis
-pluginProvider=Eclipse.org

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

@@ -1,61 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.mpi.analysis.cdt";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

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

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

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

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

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

@@ -1,88 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-
-/**
- * A call graph is a directed graph which represents the calling relation
- * among subroutines in a program. In CDT, it is partially determined
- * by static analysis.
- * 
- * @author Yuan Zhang
- *
- */
-public interface ICallGraph {
-	
-	/**
-	 * @return all functions in the call graph
-	 */
-	public List<ICallGraphNode> getAllNodes();
-	
-	/**
-	 * @return all global variables
-	 */
-	public List<String> getEnv();
-	
-	/**
-	 * @return one root function. A root function is never called by 
-	 * other functions. There may be multiple root functions in a call
-	 * graph. 
-	 */
-	public ICallGraphNode topEntry();
-	public void setTopEntry(ICallGraphNode node);
-	
-	/**
-	 * @return one leaf function. A leaf function never calls any other
-	 * functions. There may be multiple leaf functions in a call graph.
-	 */
-	public ICallGraphNode botEntry();
-	public void setBotEntry(ICallGraphNode node);
-	
-	/**
-	 * @return list of recursive function calls
-	 */
-	public List<List<ICallGraphNode>> getCycles();
-	
-	/**
-	 * Search for a function according to its filename and function name.
-	 * @param fileName
-	 * @param funcName
-	 * @return its call graph node if it is found; null otherwise.
-	 */
-	public ICallGraphNode getNode(String fileName, String funcName);
-	
-	/**
-	 * Search for a function according to its declaration.
-	 * @param fdef
-	 * @return its call graph node if it is found; null otherwise.
-	 */
-	public ICallGraphNode getNode(IASTFunctionDefinition fdef);
-	
-	/**
-	 * Add a function node to the call graph. Its calling relation
-	 * is not constructed yet.
-	 * @param node
-	 */
-	public void addNode(ICallGraphNode node);
-	
-	/**
-	 * Build the calling relations. This method is not reponsible for
-	 * collecting functions in a program.
-	 */
-	public void buildCG();
-	
-	public void print();
-	
-}

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

@@ -1,80 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.core.resources.IResource;
-
-/**
- * A call graph node corresponds to a user-defined function.
- * 
- * @author Yuan Zhang
- *
- */
-public interface ICallGraphNode {
-	
-	/**
-	 * @return the function name
-	 */
-	public String getFuncName();
-	
-	/**
-	 * @return the enclosing file name
-	 */
-	public String getFileName();
-	
-	public IResource getResource();
-	
-	/**
-	 * @return the function declaration
-	 */
-	public IASTFunctionDefinition getFuncDef();
-	
-	/**
-	 * @return the set of functions that call this function
-	 */
-	public List<ICallGraphNode> getCallers();
-	public void addCaller(ICallGraphNode caller);
-	
-	/**
-	 * @return the set of functions that are called by this function
-	 */
-	public List<ICallGraphNode>	getCallees();
-	public void addCallee(ICallGraphNode callee);
-
-	/**
-	 * @return the control flow graph of this function
-	 */
-	public IControlFlowGraph getCFG();
-	public void setCFG(IControlFlowGraph cfg);
-	
-	/**
-	 * @return the next function according to the topological order
-	 */
-	public ICallGraphNode topNext();
-	public void setTopNext(ICallGraphNode node);
-	
-	/**
-	 * @return the next function according to the reverse topological order
-	 */
-	public ICallGraphNode botNext();
-	public void setBotNext(ICallGraphNode node);
-	
-	public void setAttr(String name, Object attr);
-	public Object getAttr(String name);
-	public void removeAttr(String name);
-	
-	public void setRecursive(boolean val);
-	public boolean isRecursive();
-}

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

@@ -1,63 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-
-/**
- * A control flow graph is directed graph. Each node is a block, and
- * each edge represents the jump in the control flow.
- * 
- * @author Yuan Zhang
- *
- */
-
-public interface IControlFlowGraph {
-
-	/**
-	 * @return the entry block
-	 */
-	public IBlock getEntry();
-	
-	/**
-	 * @return the exit block
-	 */
-	public IBlock getExit();
-	
-	
-	/** Search for the block which contains the statement <stmt>
-	 */
-	public IBlock getBlock(IASTStatement stmt);
-	/**
-	 * Search for the block which contains the condition expression
-	 * <expr>, and <expr> is the predicate of statement <parent>
-	 * @return
-	 */
-	public IBlock getBlock(IASTExpression expr, IASTStatement parent);
-	
-	/**
-	 * Search for the block which contains the <label> 
-	 * @return
-	 */
-	public IBlock getBlock(IASTName label);
-	
-	public void addBlock(IBlock bb);
-	
-	/**
-	 * Build the control flow relation
-	 */
-	public void buildCFG();
-	
-	public void print();
-}

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

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

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

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

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

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

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

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

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

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

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.classpath b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.mpi.analysis/.project b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.project
deleted file mode 100644
index c579d4c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.mpi.analysis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.mpi.analysis/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/META-INF/MANIFEST.MF
deleted file mode 100644
index 379982c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.mpi.analysis; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.mpi.analysis.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.pldt.mpi.analysis,
- org.eclipse.ptp.pldt.mpi.analysis.actions,
- org.eclipse.ptp.pldt.mpi.analysis.analysis,
- org.eclipse.ptp.pldt.mpi.analysis.view
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.ptp.pldt.common,
- org.eclipse.jface.text,
- org.eclipse.cdt.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- com.ibm.icu,
- org.eclipse.ui.ide,
- org.eclipse.ptp.pldt.mpi.analysis.cdt
-Eclipse-LazyStart: true
-Bundle-ClassPath: .

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

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

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

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

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

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

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools MPI Barrier Analysis
-pluginProvider=Eclipse.org

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

@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="PTP MPI Views"
-            id="org.eclipse.ptp.pldt.mpi">
-      </category>
-      <view
-            name="MPI Barriers"
-            icon="icons/barrier.gif"
-            category="org.eclipse.ptp.pldt.mpi"
-            class="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierView"
-            id="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierTableView">
-      </view>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="PTP MPI Views"
-            id="org.eclipse.ptp.pldt.mpi">
-      </category>
-      <view
-            name="Barrier Matches"
-            icon="icons/barrier.gif"
-            category="org.eclipse.ptp.pldt.mpi"
-            class="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierMatchingSetView"
-            id="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierMatchingSetTableView">
-      </view>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="PTP MPI Views"
-            id="org.eclipse.ptp.pldt.mpi">
-      </category>
-      <view
-            name="Barrier Errors"
-            icon="icons/barrier.gif"
-            category="org.eclipse.ptp.pldt.mpi"
-            class="org.eclipse.ptp.pldt.mpi.analysis.view.MPIErrorView"
-            id="org.eclipse.ptp.pldt.mpi.analysis.view.MPIErrorView">
-      </view>
-   </extension>
-
-   <!--  MPI Barrier markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiBarrierMarker"
-        name="MPI Barrier Artifact Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarker"
-            name="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarkerAnnotation"
-            icon="icons/barrier.gif" 
-            
-            presentationLayer="3"
-            label="MPI Barrier Annotation Marker"
-            
-            textPreferenceKey="mpiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-
-	
-   <!-- Matching Set Artifacts -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiBarrierMatchingSetMarker"
-        name="MPI Barrier Matching Set Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarker"
-            name="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarkerAnnotation"
-            icon="icons/barrier.gif" 
-            
-            presentationLayer="3"
-            label="MPI Barrier Matching Set Annotation Marker"
-            
-            textPreferenceKey="mpiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-
-   <!-- Barrier Error Artifacts -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiErrorMarker"
-        name="MPI Barrier Error Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierErrorMarker"
-            name="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierErrorMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierErrorMarkerAnnotation"
-            icon="icons/barrier.gif" 
-            
-            presentationLayer="3"
-            label="MPI Barrier Error Annotation Marker"
-            
-            textPreferenceKey="mpiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="org.eclipse.ptp.pldt.mpi.analysis.actions.RunAnalyseMPIAnalysiscommandHandler"
-               id="org.eclipse.ptp.pldt.mpi.analysis.command2"
-               name="MPI Barrier Analysis">
-         </command>
-      </extension>
-      <extension point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1?after=separator4.barrier">
-            <command
-                  commandId="org.eclipse.ptp.pldt.mpi.analysis.command2"
-                  icon="icons/barrier.gif"
-                  label="MPI Barrier Analysis"
-                  style="push"
-                  tooltip="Run MPI Barrier Analysis on selected project, folder, or file">
-            </command>
-         </menuContribution>
-
-      </extension>
-
-</plugin>

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

@@ -1,72 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.mpi.analysis";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}

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

@@ -1,46 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis;
-
-/**
- * ID values shared by several classes in this plug-in
- * 
- * @author Beth Tibbitts
- *
- */
-public class IDs {
-	public static final String barrierMarkerID = "org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarker";
-
-	/**
-	 * The marker id for barrier matching sets
-	 */
-	public static final String matchingSetMarkerID = "org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarker";
-	/**
-	 * the marker attribute name for a parent node.
-	 * All markers with the same parent value are considered part of
-	 * the same Barrier matching set.
-	 */
-	public static final String parentAttribName="parent";
-	public static final String parentName = "parentName";
-	
-    public static final String matchingSetViewID="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierMatchingSetTableView";
-    public static final String errorViewID =     "org.eclipse.ptp.pldt.mpi.analysis.view.MPIErrorView";
-    public static final String barrierViewID="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierTableView";
-    
-    /* For error counter examples */
-    public static final String errorMarkerID = "org.eclipse.ptp.pldt.mpi.analysis.errorMarker";
-    public static final String parentIDAttr = "parentID";
-    public static final String myIDAttr = "myID";
-    public static final String myNameAttr = "myName";
-    public static final String myIndexAttr = "myIndex";
-// test    
-}

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

@@ -1,104 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,2008  IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.actions;
-
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierAnalysisResults;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierExpr;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierMatching;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICFGBuilder;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIDUChain;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIMVAnalysis;
-import org.eclipse.ptp.pldt.mpi.analysis.view.BarrierArtifacts;
-import org.eclipse.ptp.pldt.mpi.analysis.view.MPIArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.mpi.analysis.view.MatchingSet;
-import org.eclipse.ptp.pldt.mpi.analysis.view.ShowErrors;
-
-public class MPIAnalysisManager{
-	protected BarrierTable btable_;
-	protected MPICallGraph cg_;
-	private static final boolean traceOn=false;
-	
-	
-	public MPIAnalysisManager(MPICallGraph cg)
-	{
-		cg_ = cg;
-	}
-	
-	/**
-	 * Runs analysis and returns true if any errors were found
-	 * @return
-	 */
-	public boolean run()
-	{	
-	  if(traceOn)System.out.println("MPI AM: 1. build CG");
-		cg_.buildCG();
-		//cg_.print();
-		/*
-		if(cg_.hasError()){
-			String markerID = IDs.barrierMarkerID;
-			MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(markerID);
-			BarrierArtifacts ba = new BarrierArtifacts(cg_, visitor);
-			ba.run();
-			return;
-		}
-		*/
-    
-		btable_ = cg_.getBarrierTable();
-		if(traceOn)System.out.println("2. Call Graph finished !");
-		
-		MPIBarrierExpr BE = new MPIBarrierExpr(btable_, cg_); 
-		BE.run();
-		if(traceOn)System.out.println("3. Barrier Expression Construction finished !");
-		
-		MPICFGBuilder cfg = new MPICFGBuilder(cg_);
-		cfg.run();
-		if(traceOn)System.out.println("4. Control Flow Graph Construction finished !");
-		
-		MPIDUChain rd = new MPIDUChain(cg_);
-		rd.run();
-		if(traceOn)System.out.println("5. Reaching Definition and Phi Placement finished !");
-		
-		MPIMVAnalysis mva = new MPIMVAnalysis(cg_);
-		mva.run();
-		if(traceOn)System.out.println("6. Multi-valued Analysis finished !");
-		
-		MPIBarrierMatching bm = new MPIBarrierMatching(cg_, btable_);
-		bm.run();
-		if(traceOn)System.out.println("7. Barrier Matching finished! ");
-				
-		MPIBarrierAnalysisResults results = new MPIBarrierAnalysisResults();
-		results.setBarrierTable(btable_);
-		if(traceOn)System.out.println("8. ...got barrier table ");
-		
-		String markerID = IDs.barrierMarkerID;
-		MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(markerID);
-		BarrierArtifacts ba = new BarrierArtifacts(cg_, visitor);
-		ba.run();
-		if(traceOn)System.out.println("9. ... got barrier artifacts ");
-		
-		MatchingSet msv = new MatchingSet(btable_);
-		msv.run();
-		if(traceOn)System.out.println("10. ...got matching set ");
-		
-		ShowErrors se = new ShowErrors(bm.getErrors());
-		boolean foundError = se.run();	
-		if(traceOn)System.out.println("11.  ... got errors (if any) ");
-
-		return foundError;
-		
-	}
-
-}

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

@@ -1,178 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.pldt.common.actions.AnalysisDropdownHandler;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandler;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIResourceCollector;
-
-
-/**
- * Do MPI barrier analysis from dropdown toolbar menu
- * @author Beth Tibbitts
- *
- */
-public class RunAnalyseMPIAnalysiscommandHandler extends RunAnalyseHandler  {
-	protected MPICallGraph callGraph_;
-	boolean traceOn=false;
-	
-	public RunAnalyseMPIAnalysiscommandHandler(){ 
-		callGraph_ = null;
-	}
-
-	/** 
-	 * Execute the action for MPI barrier analysis
-	 */
-	@SuppressWarnings("unchecked")
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		boolean foundError=false;
-		getSelection(event);
-		AnalysisDropdownHandler.setLastHandledAnalysis(this,selection);
-		if ((selection == null) || selection.isEmpty()) {
-			MessageDialog
-					.openWarning(null, "No files selected for analysis.",
-							"Please select a source file  or container (folder or project) to analyze.");
-			return null;
-		} else {
-			callGraph_ = new MPICallGraph();
-			//int numFiles=this.countFilesSelected();
-			// BRT use numfiles for a progress monitor?
-
-			for(Iterator iter = selection.iterator(); iter.hasNext();){
-				Object obj =  iter.next();
-				// It can be a Project, Folder, File, etc...
-				if (obj instanceof IAdaptable) {
-					final IResource res = (IResource) ((IAdaptable) obj)
-							.getAdapter(IResource.class);
-					if(traceOn)System.out.println("resourceCollector on "+res.getName());
-					// FIXME put this in a runnable to batch resource changes?
-					if (res != null) {
-						resourceCollector(res);
-					}
-				}
-			} // end for
-			MPIAnalysisManager manager = new MPIAnalysisManager(callGraph_);
-			foundError=manager.run();
-		}
-		ViewActivater.activateView(IDs.matchingSetViewID);
-		ViewActivater.activateView(IDs.barrierViewID);
-		// if error found, assure its view has focus
-		if(foundError) {
-			ViewActivater.activateView(IDs.errorViewID);
-		}
-		return null;
-	}
-	
-/*	//ProgressMonitorDialog example?
-public Object execute2(ExecutionEvent event) throws ExecutionException {
-		int numFiles=this.countFilesSelected();
-		// batch ws modifications *and* report progress
-		WorkspaceModifyOperation wmo = new WorkspaceModifyOperation() {
-			@Override
-			protected void execute(IProgressMonitor monitor)
-					throws CoreException, InvocationTargetException,
-					InterruptedException {
-				err = runResources(monitor, indent, includes);
-			}
-		};
-		ProgressMonitorDialog pmdialog = new ProgressMonitorDialog(
-				shell);
-		try {
-			pmdialog.run(true, true, wmo); // fork=true; if false, not
-											// cancelable
-
-		} catch (InvocationTargetException e) {
-			err = true;
-			System.out.println("Error running analysis: ITE: "
-					+ e.getMessage());
-			System.out.println("  cause: " + e.getCause() + " - "
-					+ e.getCause().getMessage());
-			Throwable th = e.getCause();
-			th.printStackTrace();
-		} catch (InterruptedException e) {
-			cancelledByUser = true;
-		}
-	}
-	*/
-	/**
-	 * Run analysis (collect resource info in the call graph) on a resource (e.g. File or Folder) 
-	 * <br>Will descend to members of folder
-	 * 
-	 * @param resource
-	 *            the resource upon which barrier analysis was initiated: file, folder, or project
-	 * @return
-	 */
-	protected boolean resourceCollector(IResource resource) {
-
-		boolean foundError = false;
-
-		if (resource instanceof IFile) {
-			try{
-				// BRT barrierMarker change to non-problem marker here?
-				resource.deleteMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
-				//resource.deleteMarkers(IDs.errorMarkerID,true,IResource.DEPTH_INFINITE);
-			} catch(CoreException e){
-				//System.out.println("RM: exception deleting markers.");
-				//e.printStackTrace();
-			}
-			IFile file = (IFile) resource;
-			String filename = file.getName();
-			if(filename.endsWith(".c")){
-			  if(traceOn)System.out.println("resourceCollector on c file: "+file.getName());
-				MPIResourceCollector rc = new MPIResourceCollector(callGraph_, file); // BRT why 'new' each time?
-				rc.run();
-			}
-			return true;
-		}
-		else if (resource instanceof IContainer) {
-			IContainer container = (IContainer) resource;
-			try {
-				IResource[] mems = container.members();
-				for (int i = 0; i < mems.length; i++) {
-				  if(traceOn)System.out.println("descend to "+mems[i].getName());
-					boolean err = resourceCollector(mems[i]);
-					foundError = foundError || err;
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		else {
-			String name = "";
-			if (resource instanceof IResource) {
-				IResource res = (IResource) resource;
-				// name=res.getName(); // simple filename only, no path info
-				IPath path = res.getProjectRelativePath();
-				name = path.toString();
-			}
-			System.out.println("Cancelled by User, aborting analysis on subsequent files... " + name);
-		}
-
-		return foundError;
-	}
-
-}

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

@@ -1,123 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.Block;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.ControlFlowGraph;
-
-public class BarrierCFG extends ControlFlowGraph {
-	
-	public BarrierCFG(IASTStatement prog){
-		super(prog);
-	}
-	
-	protected void collectBlocks(){
-		entry_ = new Block();
-		exit_ = new Block();
-		BarrierCFGBlockCollector bc = new BarrierCFGBlockCollector();
-		bc.run();
-	}
-	
-	class BarrierCFGBlockCollector extends ASTVisitor{
-
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			prog_.accept(this);
-		}
-		
-		/*
-		public int visit(IASTStatement stmt) 
-		{
-			IBlock block;
-			if(stmt instanceof IASTBreakStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCaseStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCompoundStatement){
-			} 
-			else if(stmt instanceof IASTContinueStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDeclarationStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDefaultStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDoStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-				return PROCESS_SKIP;
-			} 
-			else if(stmt instanceof IASTExpressionStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTForStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTGotoStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTIfStatement){
-				IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-				block = new Block(ifStmt.getConditionExpression(), stmt);
-				addBlock(block);
-				IBlock join = new Block(null, stmt);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTLabelStatement){
-				IASTLabelStatement label = (IASTLabelStatement)stmt;
-				block = new Block(label.getName(), stmt, Block.label_type);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTNullStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTProblemStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			}
-			else if(stmt instanceof IASTReturnStatement){
-				IASTReturnStatement rtStmt = (IASTReturnStatement)stmt;
-				block = new Block(rtStmt.getReturnValue(), stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTSwitchStatement){
-				IASTSwitchStatement swStmt = (IASTSwitchStatement)stmt;
-				block = new Block(swStmt.getControllerExpression(), stmt);
-				addBlock(block);
-				IBlock join = new Block(null, stmt);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTWhileStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			return PROCESS_CONTINUE;
-		} */
-	}
-}

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

@@ -1,28 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.Block;
-
-public class BarrierCFGBlock extends Block {
-	protected BarrierExpression BE_;
-	
-	public BarrierCFGBlock(IASTNode content, IASTStatement parent, int type){
-		super(content, parent, type);
-		BE_ = null;
-	}
-	
-	public BarrierExpression getBE(){return BE_;}
-	public void setBE(BarrierExpression be) {BE_ = be;}
-}

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

@@ -1,237 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-
-public class BarrierExpression {
-	protected BarrierExpressionOP op_;
-	protected BarrierExpression operand1_;
-	protected BarrierExpression operand2_;
-	
-	protected int length;
-	public static final int TOP = -3;
-	
-	/* For instrumentation */
-	public static int count_branch = 0;
-	public static int count_repeat = 0;
-	public static int count_node = 0;
-	
-	boolean visited;
-	boolean ceVisited; // visited in counter example construction
-	
-	/* There are four terminals: 
-	 * barrier id(int > 0)
-	 * function name (String)
-	 * \top -- undecidable
-	 * \bot -- no barrier
-	 */  
-	public static final int BE_bot = 1;
-	public static final int BE_ID = 2;
-	public static final int BE_func = 3;
-	protected int type;
-	
-	protected int barrierID;
-	protected String funcName_; 
-	
-	protected BarrierExpression parent_;
-	
-	/* Has the mismatching error already reported? */
-	protected boolean error = false;
-	
-	public BarrierExpression(){
-		init();
-	}
-	
-	public BarrierExpression(int operator, IASTExpression cond, 
-			IASTStatement stmt){
-		init();
-		op_ = new BarrierExpressionOP(operator, cond, stmt);
-		if(op_.getOperator() == BarrierExpressionOP.op_branch)
-			count_branch ++;
-		else if(op_.getOperator() == BarrierExpressionOP.op_repeat)
-			count_repeat ++;
-	}
-	
-	public BarrierExpression(String func){
-		init();
-		type = BE_func;
-		funcName_ = func;
-		count_node ++;
-	}
-	
-	public BarrierExpression(int id){
-		init();
-		if(id == BE_bot) type = id;
-		else {
-			type = BE_ID;
-			barrierID = id;
-		}
-		count_node ++;
-	}
-	
-	
-	private void init(){
-		op_ = null;
-		operand1_ = null;
-		operand2_ = null;
-		length = -1;
-		type = -1;
-		barrierID = 0;
-		funcName_ = null;
-		parent_ = null;
-		visited = false;
-		ceVisited = false;
-	}
-	
-	public void setOperand1(BarrierExpression op1){
-		op1.setParent(this);
-		operand1_ = op1;
-	}
-	
-	public void setOperand2(BarrierExpression op2){
-		op2.setParent(this);
-		operand2_ = op2;
-	}
-	
-	public BarrierExpression getOP1(){return operand1_;}
-	public BarrierExpression getOP2(){return operand2_;}
-	public BarrierExpression getParent(){return parent_;}
-	
-	public int getLength() {return length;}
-	public void setLength(int l){length = l;} 
-	
-	public void setParent(BarrierExpression parent){
-		this.parent_ = parent;
-	}
-	
-	public boolean isBot() {return type == BE_bot;}
-	public boolean isBarrier() {return type == BE_ID;}
-	public boolean isFunc() {return type == BE_func;}
-	
-	public BarrierExpressionOP getOP(){return op_;}
-	public int getBarrierID() {return barrierID;}
-	public String getFuncName() {return funcName_;}
-	
-	public void setErrorFlag(boolean val) {error = val;}
-	public boolean getErrorFlag() {return error;}
-	
-	/*
-	 * @return: BE = BE1.BE2
-	 */
-	public static BarrierExpression concatBE(BarrierExpression BE1, BarrierExpression BE2){
-		BarrierExpression be = null;
-		if(BE1.isBot()){
-			be = BE2;
-		} else if(BE2.isBot()){
-			be = BE1;
-		} else{
-			be = new BarrierExpression(BarrierExpressionOP.op_concat, null, null);
-			be.setOperand1(BE1);
-			be.setOperand2(BE2);
-		} 
-		return be;
-	}
-	
-	public static BarrierExpression concatBE(BarrierExpression BE1, 
-											 BarrierExpression BE2,
-											 BarrierExpression BE3){
-		return concatBE(concatBE(BE1, BE2), BE3);
-	}
-
-	/*
-	 * @return: BE' = BE*
-	 */
-	public static BarrierExpression repeatBE(BarrierExpression BE, 
-			IASTExpression cond, IASTStatement stmt){
-		BarrierExpression be = null;
-		if(BE.isBot()){
-			be = BE;
-		} else {
-			be = new BarrierExpression(
-					BarrierExpressionOP.op_repeat, cond, stmt);
-			be.setOperand1(BE);
-		}
-		return be;
-	}
-	
-	/*
-	 * @return: BE = BE1 | BE2
-	 */
-	public static BarrierExpression branchBE(BarrierExpression BE1, 
-												BarrierExpression BE2, 
-												IASTExpression cond, 
-												IASTStatement stmt){
-		BarrierExpression be = null;
-		if(BE1.isBot() && BE2.isBot()){
-			be = BE2;
-		} else{
-			be = new BarrierExpression(
-					BarrierExpressionOP.op_branch, cond, stmt);
-			be.setOperand1(BE1);
-			be.setOperand2(BE2);
-		}
-		return be;			
-	}
-	
-	public String prettyPrinter(){
-		if(op_ != null && op_.operator == BarrierExpressionOP.op_concat){
-			return operand1_.prettyPrinter() + "." + operand2_.prettyPrinter();
-		} else if(op_ != null && op_.operator == BarrierExpressionOP.op_repeat){
-			return "(" + operand1_.prettyPrinter() + ")*";
-		} else if(op_ != null && op_.operator == BarrierExpressionOP.op_branch){
-			return "((" + operand1_.prettyPrinter() + ") | (" + operand2_.prettyPrinter() + "))";
-		} else if(type == BE_ID){
-			Integer i = new Integer(barrierID);
-			return i.toString();
-		} else if(type == BE_func){
-			return funcName_;
-		} else if(type == BE_bot){
-			return "(\bot)";
-		}
-		return null;
-	}
-	
-	/*
-	 * Barrier Expression Operator
-	 */
-	public class BarrierExpressionOP
-	{
-		public static final int op_concat = 1;
-		public static final int op_repeat = 2;
-		public static final int op_branch = 3;
-		private int operator;
-		private IASTExpression condition_;
-		private IASTStatement condStmt_;
-		
-		public BarrierExpressionOP(){
-			operator = 0;
-			condition_ = null;
-		}
-		
-		public BarrierExpressionOP(int op, IASTExpression cond, IASTStatement stmt){
-			operator = op;
-			condition_ = cond;
-			condStmt_ = stmt;
-		}
-		
-		public boolean withCondition(){ 
-			return operator == op_branch | operator == op_repeat ;
-		}
-		
-		public int getOperator() {return operator;}
-		public IASTExpression getCondition() {return condition_;}
-		public IASTStatement getStatement() {return condStmt_;}
-	}
-
-}

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

@@ -1,201 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-public class BarrierTable {
-	/** 
-	 * Set of barriers for a communicator.
-	 * Key: <String>communicator, Value: set of <BarrierInfo>barriers 
-	 */
-	protected Hashtable<String,List<BarrierInfo>> table_; 
-	protected int commCounter = 0;
-	
-	public BarrierTable(){
-		table_ = new Hashtable<String,List<BarrierInfo>>();
-	}
-	
-	public Hashtable<String,List<BarrierInfo>> getTable(){
-		return table_;
-	}
-	public boolean isEmpty() {return table_.isEmpty();}
-	
-	public BarrierInfo addBarrier(IASTFunctionCallExpression barE, 
-			int id, IResource res, String func){
-		BarrierInfo bar = new BarrierInfo(barE, id, res, func);
-		if(table_.containsKey(bar.getComm())){
-			List<BarrierInfo> list = table_.get(bar.getComm());
-			list.add(bar);
-		} else {
-			List<BarrierInfo> list = new ArrayList<BarrierInfo>();
-			list.add(bar);
-			table_.put(bar.getComm(), list);
-		}
-		return bar;
-	}
-	
-	/*
-	 * @return: barrier ID if it is a barrier; -1 otherwise
-	 */ 
-	public int isBarrier(IASTFunctionCallExpression funcE){
-		IASTExpression funcname = funcE.getFunctionNameExpression();
-		String signature = funcname.getRawSignature();
-		if(!signature.equals("MPI_Barrier")) return -1;
-		for(Enumeration e = table_.elements(); e.hasMoreElements();){
-			ArrayList list = (ArrayList)e.nextElement();
-			for(Iterator i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = (BarrierInfo)i.next();
-				if(bar.getFunc() == funcE)
-					return bar.getID();
-			}
-		}
-		return -1;
-	}
-
-	public String getComm(int id){
-		for(Enumeration e = table_.elements(); e.hasMoreElements();){
-			ArrayList list = (ArrayList)e.nextElement();
-			for(Iterator i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = (BarrierInfo)i.next();
-				if(bar.getID() == id)
-					return bar.getComm();
-			}
-		}
-		return null;
-	}
-	
-	public BarrierInfo searchBarrierbyID(int id){
-		for(Enumeration e = table_.elements(); e.hasMoreElements();){
-			ArrayList list = (ArrayList)e.nextElement();
-			for(Iterator i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = (BarrierInfo)i.next();
-				if(bar.getID() == id)
-					return bar;
-			}
-		}
-		return null;
-	}
-	
-	
-	
-	public class BarrierInfo{
-		protected String comm_ = null;
-		protected IASTFunctionCallExpression barrier_ = null;
-		protected int id = -1;
-		protected String fileName_ = null;
-		protected SourceInfo sourceInfo_ = null;
-		protected List<BarrierInfo> matchingSet_ = null;
-		protected IResource resource_ = null;
-		protected String enclosingFunc_ = null;
-		
-		public BarrierInfo(IASTFunctionCallExpression funcE, int id, IResource res, String func){
-			barrier_ = funcE;
-			this.id = id;
-			setComm();
-			setSourceInfo();
-			matchingSet_ = new ArrayList<BarrierInfo>();
-			resource_ = res;
-			enclosingFunc_ = func;
-		}
-		
-		/**
-		 * Determine the communicator from the the barrier function call
-		 * ("MPI_Barrier(communicator)"). <br>
-		 * If the communicator is the default (MPI_COMM_WORLD), then the type of
-		 * the returned object from getOperand() depends on how the header file
-		 * defines it (In windows, it is IASTLiteralExpression, and in Linux, it
-		 * becomes IASTIdExpression). So we account for that here.
-		 */
-		protected void setComm() { 
-			IASTExpression parameter = barrier_.getParameterExpression();
-
-			if (parameter instanceof IASTUnaryExpression) {
-				IASTUnaryExpression commExpr = (IASTUnaryExpression) parameter;
-				if (commExpr.getOperand() instanceof IASTUnaryExpression) {
-					IASTUnaryExpression commOprd = (IASTUnaryExpression) commExpr
-							.getOperand();
-					if (commOprd.getOperand() instanceof IASTLiteralExpression) {
-						IASTLiteralExpression comm = (IASTLiteralExpression) commOprd.getOperand();
-						comm_ = comm.toString();
-					} else if (commOprd.getOperand() instanceof IASTIdExpression) {
-						IASTIdExpression comm = (IASTIdExpression) commOprd.getOperand();
-						comm_ = comm.getName().toString();
-					} else if (commOprd.getOperand() instanceof IASTName) {
-						comm_ = commOprd.getOperand().toString();
-					} else {
-						comm_ = "COMM_" + commCounter;
-						commCounter++;
-					}
-				} else {
-					comm_ = "COMM_" + commCounter;
-					commCounter++;
-				}
-			} else if (parameter instanceof IASTIdExpression) {
-				IASTIdExpression idE = (IASTIdExpression) parameter;
-				comm_ = idE.getName().toString();
-				if (!comm_.equals("MPI_COMM_WORLD")) {
-					comm_ = "COMM_" + commCounter;
-					commCounter++;
-				}
-			} else {
-				comm_ = "COMM_" + commCounter;
-				commCounter++;
-			}
-		}
-	
-		
-		protected void setSourceInfo() {
-			IASTExpression funcNameE = barrier_.getFunctionNameExpression();
-			IASTNodeLocation[] locations = funcNameE.getNodeLocations();
-			if (locations.length == 1) {
-				IASTFileLocation astFileLocation = null;
-				if (locations[0] instanceof IASTFileLocation) {
-					astFileLocation = (IASTFileLocation) locations[0];
-					fileName_ = astFileLocation.getFileName();
-					//System.out.println(fileName_);
-					sourceInfo_ = new SourceInfo();
-					sourceInfo_.setStartingLine(astFileLocation.getStartingLineNumber());
-					sourceInfo_.setStart(astFileLocation.getNodeOffset());
-					sourceInfo_.setEnd(astFileLocation.getNodeOffset() + astFileLocation.getNodeLength());
-					sourceInfo_.setConstructType(Artifact.FUNCTION_CALL);
-				}
-			}
-		}
-		
-		public String getComm() {return comm_;}
-		public IASTFunctionCallExpression getFunc() {return barrier_;}
-		public int getID() {return id;}
-		public String getFileName() {return fileName_;}
-		public SourceInfo getSourceInfo() {return sourceInfo_;}
-		public List<BarrierInfo> getMatchingSet() {return matchingSet_;}
-		public IResource getResource() {return resource_;}
-		public String getEnclosingFunc() {return enclosingFunc_;}
-	}
-	
-}

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

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

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

@@ -1,34 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-public class MPIBarrierAnalysisResults {
-	protected BarrierTable barrierTable_ = null;
-	
-	protected static MPIBarrierAnalysisResults results_ = null;
-	
-	public MPIBarrierAnalysisResults(){
-		results_ = this;
-	}
-	
-	public static MPIBarrierAnalysisResults getAnalysisResults(){
-		return results_;
-	}
-	
-	public void setBarrierTable(BarrierTable table){
-		barrierTable_ = table;
-	}
-	
-	public BarrierTable getBarrierTable(){
-		return barrierTable_;
-	}
-}

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

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

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-public class MPICFGBuilder {
-	protected ICallGraph cg_;
-	
-	public MPICFGBuilder(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			//if(node.getFuncName().equals("yyparse"))
-				//System.out.println(node.getFuncName());
-			MPIControlFlowGraph cfg = new MPIControlFlowGraph(node.getFuncDef().getBody());
-			cfg.buildCFG();
-			n.setCFG(cfg);
-			//cfg.print();
-		}
-		MPIBlock.clean();
-	}
-}

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

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

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

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

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

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

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

@@ -1,150 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IControlFlowGraph;
-
-/**
- * Calculate the DUchain -- data dependence
- * @author Yuan Zhang
- *
- */
-public class MPIDUChain{
-	protected ICallGraph cg_;
-	
-	protected Hashtable<String,List<IBlock>> defTable_;
-	protected IControlFlowGraph cfg_;
-	
-	public MPIDUChain(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	/**
-	 * The DUchain calculation contains three steps:<br>
-	 * (1) Calculate the set of used and defined variables in each block<br>
-	 * (2) Add \phi functions<br>
-	 * (3) Construct the DUchain
-	 */
-	public void run(){
-		UseDefBuilder ud = new UseDefBuilder(cg_);
-		ud.run();
-		MPISSA ssa = new MPISSA(cg_);
-		ssa.run();
-		DUChain();
-	}
-
-	/** Calculate the Gen and Kill sets for each block */
-	protected void GenKillSet(){
-		for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			for(Enumeration<String> e = defTable_.keys(); e.hasMoreElements();){
-				String var = e.nextElement();
-				block.getGen().put(var, new ArrayList<IBlock>());
-				block.getKill().put(var, new ArrayList<IBlock>());
-				block.getIn().put(var, new ArrayList<IBlock>());
-				block.getOut().put(var, new ArrayList<IBlock>());
-				block.getDUPred().put(var, new ArrayList<IBlock>());
-				block.getDUSucc().put(var, new ArrayList<IBlock>());
-			}
-			List<String> def = block.getDef();
-			for(Iterator<String> i = def.iterator(); i.hasNext();){
-				String var = i.next();
-				List<IBlock> genlist = new ArrayList<IBlock>();
-				genlist.add(block);
-				block.getGen().put(var, genlist);
-				List<IBlock> killlist = (List<IBlock>)((ArrayList<IBlock>)defTable_.get(var)).clone();
-				killlist.remove(block);
-				block.getKill().put(var, killlist);
-			}
-		}
-	}
-	
-	/** Calculate the reaching definition */
-	protected void ReachingDefinition(){
-		for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			block.setOut((Hashtable<String,List<IBlock>>)block.getGen().clone());
-		}
-		boolean change = true;
-		while(change){
-			change = false;
-			for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-				MPIBlock block = (MPIBlock)b;
-				Hashtable<String,List<IBlock>> in = block.getIn();
-				for(Iterator<IBlock> i = block.getPreds().iterator(); i.hasNext();){
-					MPIBlock pred = (MPIBlock)i.next();
-					for(Enumeration<String> e = in.keys(); e.hasMoreElements();){
-						String var = e.nextElement();
-						in.put(var, Util.Union(in.get(var), pred.getOut().get(var)));
-					}
-				}
-				Hashtable<String,List<IBlock>> out = block.getOut();
-				for(Enumeration<String> e = out.keys(); e.hasMoreElements();){
-					String var = e.nextElement();
-					List outlist = Util.Union(block.getGen().get(var), 
-							Util.Minus(in.get(var), 
-									block.getKill().get(var)));
-					if(!Util.equals(outlist, out.get(var))){ 
-						change = true;
-						out.put(var, outlist);
-					}
-				}
-			}
-		}
-	}
-	
-	/** Construct the DUchain */
-	protected void FlowDependence(){
-		for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			Hashtable<String,List<IBlock>> in = block.getIn();
-			for(Enumeration<String> e = in.keys(); e.hasMoreElements();){
-				String var = e.nextElement();
-				if(!block.getUse().contains(var)) continue;
-				List<IBlock> pred = block.getDUPred().get(var);
-				for(Iterator<IBlock> i = in.get(var).iterator(); i.hasNext();){
-					MPIBlock rd = (MPIBlock)i.next();
-					List<IBlock> succ = rd.getDUSucc().get(var);
-					pred.add(rd);
-					succ.add(block);
-				}
-			}
-		}
-	}
-	
-	protected void DUChain(){
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			if(node.getFuncName().equals("Moc_KWayFM"))
-				System.out.println("MPIDUChain.DUChain(): Moc_KWayFM "+node.getFuncName());
-			cfg_ = node.getCFG();
-			defTable_ = node.getDefTable();
-			GenKillSet();
-			ReachingDefinition();
-			FlowDependence();
-			//((MPIControlFlowGraph)cfg_).print();
-		}
-	}
-	
-	
-
-}

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

@@ -1,1220 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.cdt.core.dom.ast.c.ICASTTypeIdInitializerExpression;
-import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
-import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousExpression;
-import org.eclipse.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;
-
-/**
- * 
- * @author zhangyua
- *
- */
-public class MPIMVAnalysis{
-	protected ICallGraph cg_;
-	protected MPICallGraphNode currentNode_;
-	
-	protected final int lhs = 0;
-	protected final int rhs = 1;
-	
-	protected boolean changed = false;
-	
-	public MPIMVAnalysis(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		init();
-		SeedsCollector sc = new SeedsCollector();
-		sc.run();
-		functionMVSummary();
-		functionSlicing();
-		exprMVAnalysis();
-		
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			IControlFlowGraph cfg = node.getCFG();
-			for(IBlock b = cfg.getEntry(); b != null; b = b.topNext()){
-				MPIBlock block = (MPIBlock)b;
-				if(block.getMV() && (block.withBreak || block.withContinue))
-					System.out.println("************  Multi-valued branch with Break/Continue in " + 
-							node.getFuncName() + "(" + node.getFileName() + ")");
-			}
-		}
-	}
-
-	/** Initialize all parameters of a function as single-valued; 
-	 * Initialize its MV and SV summary as empty
-	 */
-	private void init(){
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			IASTFunctionDefinition fd = node.getFuncDef();
-			IASTFunctionDeclarator fdecl = fd.getDeclarator();
-			if(fdecl instanceof IASTStandardFunctionDeclarator){
-				IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-				IASTParameterDeclaration[] params = sfunc.getParameters();
-				for(int i = 0; i < params.length; i++){
-					IASTName param = params[i].getDeclarator().getName();
-					if(param.toString().equals("")) continue; //void parameter
-					node.getParamMV().put(param.toString(), new Boolean(false));
-					node.getMVSummary().put(param.toString(), new ArrayList<String>());
-				}
-			} else {
-				ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-				IASTName[] params = krfunc.getParameterNames();
-				for(int i=0; i<params.length; i++){
-					node.getParamMV().put(params[i].toString(), new Boolean(false));
-					node.getMVSummary().put(params[i].toString(), new ArrayList<String>());
-				}
-			}
-			for(Iterator<String> i = node.getGlobalUse().iterator(); i.hasNext();){
-				String var = i.next();
-				node.getMVSummary().put(var, new ArrayList<String>());
-			}
-			/* Another entry if (1) the function has no parameter and no global use;
-			 * (2) all parameters and global uses are SV. 
-			 * (We call this function(context) as "empty MV input" function(context).)
-			 * Use the function name as the key in these cases
-			 */ 
-			node.getMVSummary().put(node.getFuncName(), new ArrayList<String>());
-		}
-	}
-	
-	private void functionMVSummary(){
-		changed = true;
-		while(changed){
-			changed = false;
-			for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-				MPICallGraphNode node = (MPICallGraphNode)n;
-				if(!node.marked) continue;
-				currentNode_ = node;
-				for(Enumeration<String> e = node.getMVSummary().keys(); e.hasMoreElements();){
-					String var = e.nextElement();
-					singleVariableSlicing(var);
-					/*
-					System.out.print("Summary: ");
-					for(Iterator i = ((ArrayList)node.getMVSummary().get(var)).iterator(); i.hasNext();){
-						System.out.print((String)i.next() + ", ");
-					}
-					System.out.println(" ");
-					*/
-					clean();
-				}
-			}
-		}
-	}
-	
-	/**
-	 *  For each function, assume all parameters are MV, find out which global
-	 * variables (and passable parameters) are MV
-	 */
-	private void singleVariableSlicing(String var){
-		IControlFlowGraph cfg = currentNode_.getCFG();
-		
-		WorkListCollector wlc = new WorkListCollector(currentNode_);
-		LinkedList<IBlock> seeds = wlc.getWorkList();
-		if(!var.equals(currentNode_.getFuncName())){
-			seeds.add(cfg.getEntry());
-			((MPIBlock)cfg.getEntry()).getMVvar().add(var);
-		}
-		
-		while(!seeds.isEmpty()){
-			MPIBlock block = (MPIBlock)seeds.remove();
-			if(block.sliced) continue;
-			block.sliced = true;
-			
-			if(block.getContent() == null) continue;
-			
-			Hashtable<String,List<IBlock>> DUSucc = block.getDUSucc();
-			List<String> mv = block.getMVvar();
-			List<String> newMV = new ArrayList<String>();
-			
-			handlePointers(block, mv);
-			
-			if(!block.getPhiVar().isEmpty()){
-				List<IBlock> cond = block.getCond();
-				int blockcase = 0;
-				for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-					if(blockcase == 2) break;
-					MPIBlock condblock = (MPIBlock)i.next();
-					IASTStatement parent = condblock.getParent();
-					if(parent instanceof IASTIfStatement || 
-							parent instanceof IASTSwitchStatement)
-						blockcase = 1;
-					else if(parent instanceof IASTForStatement ||
-							parent instanceof IASTDoStatement ||
-							parent instanceof IASTWhileStatement){
-						if(block.getType() == MPIBlock.exit_join_type)
-							blockcase = 1;
-						else if(block.getType() == MPIBlock.expr_type)
-							blockcase = 2;
-					}
-				}
-				if(blockcase == 1){
-					newMV = Util.Union(newMV, block.getPhiVar());
-				}
-				else if(blockcase == 2){
-					for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-						MPIBlock condblock = (MPIBlock)i.next();
-						for(Iterator<String> ii = condblock.getUsedPhiVar().iterator();
-								ii.hasNext();){
-							String v = ii.next();
-							if(mv.contains(v))
-								newMV.add(v);
-						}
-					}
-				}
-			}	
-			
-			/** Intra-block slicing (Case #1) --- 
-			 * Given MV/SV used variable, determine whether defined variables
-			 * are MV or SV.  
-			 */
-			
-			IASTNode content = block.getContent();
-			ExprMVAnalyzer emva = new ExprMVAnalyzer(content, mv, block);
-			emva.run();
-			newMV = Util.Union(newMV, emva.getMVList());
-			
-			/** Intra-block slicing (Case #3) -- 
-			 *  any used only multi-valued variable is still multi-valued
-			 */
-			for(Iterator<String> i = mv.iterator(); i.hasNext();){
-				String v = i.next();
-				if(block.getUse().contains(v) && !block.getDef().contains(v)){
-					if(!newMV.contains(v))
-						newMV.add(v);
-				}
-			}
-			
-			handlePointers(block, newMV);
-			handleBroadCast(block, newMV);
-			block.setMVvar(newMV);
-			
-			/** Inter-block slicing based on data dependences */
-			for(Iterator<String> i = newMV.iterator(); i.hasNext();){
-				String MVvar = i.next();
-				List<IBlock> DUnext = DUSucc.get(MVvar);
-				if(DUnext != null){
-					for(Iterator<IBlock> ii = DUnext.iterator(); ii.hasNext();){
-						MPIBlock b = (MPIBlock)ii.next();
-						if(b.sliced == true) continue;
-						if(!seeds.contains(b)){
-							seeds.add(b);
-							//System.out.println("block " + b.getID() + " is added to seeds");
-						}
-						if(!b.getMVvar().contains(MVvar))
-							b.getMVvar().add(MVvar);
-					}
-				}
-			}
-			
-			/** Inter-block slicing based on \Phi edges */
-			for(Iterator<IBlock> i = block.getJoin().iterator(); i.hasNext();){
-				MPIBlock join = (MPIBlock)i.next();
-				if(!seeds.contains(join) && !join.sliced) 
-					seeds.add(join);
-			}
-		}
-		
-		List<String> MVlist = currentNode_.getMVSummary().get(var);
-		for(Iterator<String> i = currentNode_.getGlobalDef().iterator(); i.hasNext();){
-			String v = i.next();
-			if(((MPIBlock)cfg.getExit()).getMVvar().contains(v)){
-				if(!MVlist.contains(v)) MVlist.add(v);
-			}
-		}
-		for(Iterator<String> i = currentNode_.getParamDef().iterator(); i.hasNext();){
-			String v = (String)i.next();
-			if(((MPIBlock)cfg.getExit()).getMVvar().contains(v)){
-				if(!MVlist.contains(v)) MVlist.add(v);
-			}
-		}
-		
-
-		if(returnMV())
-			if(!MVlist.contains(currentNode_.getFuncName()))
-				MVlist.add(currentNode_.getFuncName());
-	}
-
-	/** The return value of a function is multi-valued if any of its 
-	 * return statement is multi-valued.
-	 */
-	private boolean returnMV(){
-		boolean returnmv = false;
-		for(Iterator<IBlock> i = ((MPIControlFlowGraph)currentNode_.getCFG()).getReturnBlocks().iterator(); 
-			i.hasNext();){
-			MPIBlock returnBlock = (MPIBlock)i.next();
-			ExprMVAnalyzer ema = new ExprMVAnalyzer(returnBlock.getContent(), 
-												returnBlock.getMVvar(), returnBlock);
-			ema.run();
-			returnmv = returnmv | ema.isMV();
-			returnBlock.setMV(false); //reset it
-		}
-		return returnmv;
-	}
-
-	
-	private void handlePointers(MPIBlock block, List<String> set){
-		PointerAnalyzer pa = new PointerAnalyzer(block);
-		pa.run();
-		for(Iterator<String> i = pa.getAddr().iterator(); i.hasNext();){
-			String var = i.next();
-			if(block.getUse().contains(var)){
-				if(!set.contains(var)) set.add(var);
-			}
-		}
-		for(Iterator<String> i = pa.getDeref().iterator(); i.hasNext();){
-			String var = i.next();
-			if(block.getUse().contains(var)){
-				if(!set.contains(var)) set.add(var);
-			}
-		}
-	}
-	
-	private void handleBroadCast(MPIBlock block, List<String> set){
-		BroadCastAnalyzer bca = new BroadCastAnalyzer(block);
-		bca.run();
-		String bcdata = bca.getBCdata();
-		if(bcdata != null){
-			if(set.contains(bcdata))
-				set.remove(bcdata);
-		}
-		block.setMVvar(set);
-	}
-	
-	
-	private void clean(){
-		for(IBlock b = currentNode_.getCFG().getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			block.sliced = false;
-			block.setMVvar(new ArrayList<String>());
-		}
-	}
-	
-	
-	class ExprMVAnalyzer{
-		private IASTStatement stmt_;
-		private IASTExpression expr_;
-		private List<String> context_;
-		private MPIBlock currentBlock_;
-
-		private List<String> MVvar_;
-		private Stack<boolean[]> exprListMVContext_;
-		
-		private boolean value;
-	
-		public ExprMVAnalyzer(IASTStatement stmt, List<String> context, MPIBlock block){
-			stmt_ = stmt;
-			expr_ = null;
-			context_ = context;
-			currentBlock_ = block;
-			MVvar_ = new ArrayList<String>();
-			exprListMVContext_ = new Stack<boolean[]>();
-			value = false;
-		}
-	
-		public ExprMVAnalyzer(IASTExpression expr, List<String> context, MPIBlock block){
-			stmt_ = null;
-			expr_ = expr;
-			context_ = context;
-			currentBlock_ = block;
-			MVvar_ = new ArrayList<String>();
-			exprListMVContext_ = new Stack<boolean[]>();
-			value = false;
-		}
-		
-		public ExprMVAnalyzer(IASTNode node, List<String> context, MPIBlock block){
-			if(node instanceof IASTExpression){
-				stmt_ = null;
-				expr_ = (IASTExpression)node;
-			} 
-			else if(node instanceof IASTStatement){
-				stmt_ = (IASTStatement)node;
-				expr_ = null;
-			}
-			context_ = context;
-			currentBlock_ = block;
-			MVvar_ = new ArrayList<String>();
-			exprListMVContext_ = new Stack<boolean[]>();
-			value = false;
-		}
-		
-		public void run(){
-			if(stmt_ != null){
-				value = UseDefMVMapping(stmt_);
-			}
-			else if(expr_ != null){
-				List<String> defset = new ArrayList<String>();
-				value = useDefMVMapping(expr_, rhs, null, defset);
-			}
-		}
-		
-		public boolean isMV(){return value;}
-		public List<String> getMVList() {return MVvar_;}
-		
-		private boolean UseDefMVMapping(IASTStatement stmt){
-			if(stmt instanceof IASTDeclarationStatement){
-				boolean value = false;
-				IASTDeclarationStatement declStmt = (IASTDeclarationStatement)stmt;
-				IASTDeclaration decl = declStmt.getDeclaration();
-				if(decl instanceof IASTSimpleDeclaration){
-					IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration)decl;
-					IASTDeclarator[] declarators = simpleDecl.getDeclarators();
-					for(int i=0; i<declarators.length; i++){
-						boolean v1 = false;
-						IASTInitializer init = declarators[i].getInitializer();
-						if(init != null){
-							IASTName name = declarators[i].getName();
-							v1 = handleInitializer(init);
-							if(v1){
-								if(!MVvar_.contains(name.toString()))
-									MVvar_.add(name.toString());
-							}
-						}
-						value = value | v1;
-					}
-				}
-				return value;
-			}
-			else if(stmt instanceof IASTExpressionStatement){
-				IASTExpressionStatement exprS = (IASTExpressionStatement)stmt;
-				IASTExpression expr = exprS.getExpression();
-				List<String> mvlist = new ArrayList<String>();
-				value = useDefMVMapping(expr, rhs, null, mvlist);
-			}
-			return false;
-		}
-		
-		private boolean handleInitializer(IASTInitializer init){
-			if(init instanceof IASTInitializerExpression){
-				IASTInitializerExpression initE = (IASTInitializerExpression)init;
-				IASTExpression expr = initE.getExpression();
-				List<String> mvlist = new ArrayList<String>();
-				return useDefMVMapping(expr, rhs, null, mvlist);
-			}
-			else if(init instanceof IASTInitializerList){
-				IASTInitializerList initList = (IASTInitializerList)init;
-				IASTInitializer[] list = initList.getInitializers();
-				boolean listvalue = false;
-				for(int i=0; i<list.length; i++){
-					listvalue = listvalue | handleInitializer(list[i]);
-				}
-				return listvalue;
-			}
-			return false;
-		}
-		
-		
-		/** Return true if "expr" is multi_valued.
-		 * "set" contains all defined variables in "expr" through assignment
-		 */
-		private boolean useDefMVMapping(IASTExpression expr, int side, 
-				IASTFunctionCallExpression func, List<String> set){
-			boolean v1 = false, v2 = false, v3 = false;
-			List<String> l1 = new ArrayList<String>(); 
-			List<String> l2 = new ArrayList<String>();
-			List<String> l3 = new ArrayList<String>();
-			if(expr == null) return false; 
-			if(expr instanceof IASTAmbiguousExpression){
-			}
-			else if(expr instanceof IASTArraySubscriptExpression){
-				IASTArraySubscriptExpression asE = (IASTArraySubscriptExpression)expr;
-				if(side == rhs){
-					// = a[index_expr]
-					v1 = useDefMVMapping(asE.getArrayExpression(), rhs, func, l1); 
-					v2 = useDefMVMapping(asE.getSubscriptExpression(), rhs, func, l2);
-				} else { //lhs
-					// a[b[i]] = ... , a is defined, b and i are used
-					v1 = useDefMVMapping(asE.getSubscriptExpression(), rhs, func, l1);
-					v2 = useDefMVMapping(asE.getArrayExpression(), lhs, func, l2);
-				}
-				Util.addAll(set, l1);
-				Util.addAll(set, l2);
-				return v1 | v2;
-			}
-			else if(expr instanceof IASTBinaryExpression){
-				IASTBinaryExpression biE = (IASTBinaryExpression)expr;
-				int op = biE.getOperator();
-				if(op == IASTBinaryExpression.op_assign){
-					// x = y = z is right associative --> x = (y = z)
-					// So the "side" will be always rhs
-					v1 = useDefMVMapping(biE.getOperand1(), lhs, func, l1);
-					v2 = useDefMVMapping(biE.getOperand2(), rhs, func, l2);
-					if(v2){
-						Util.addAll(MVvar_, l1);
-					}
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-				}
-				else if( op == IASTBinaryExpression.op_multiplyAssign ||
-						 op == IASTBinaryExpression.op_divideAssign ||
-						 op == IASTBinaryExpression.op_moduloAssign ||
-						 op == IASTBinaryExpression.op_plusAssign ||
-						 op == IASTBinaryExpression.op_minusAssign ||
-						 op == IASTBinaryExpression.op_shiftLeftAssign ||
-						 op == IASTBinaryExpression.op_shiftRightAssign ||
-						 op == IASTBinaryExpression.op_binaryAndAssign ||
-						 op == IASTBinaryExpression.op_binaryXorAssign ||
-						 op == IASTBinaryExpression.op_binaryOrAssign){
-					v1 = useDefMVMapping(biE.getOperand1(), rhs, func, l1);
-					v2 = useDefMVMapping(biE.getOperand2(), rhs, func, l2);
-					v3 = useDefMVMapping(biE.getOperand1(), lhs, func, l3);
-					if(v1 | v2){
-						Util.addAll(MVvar_, l3);
-					}
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-					Util.addAll(set, l3);
-				} 
-				else {
-					v1 = useDefMVMapping(biE.getOperand1(), rhs, func, l1);
-					v2 = useDefMVMapping(biE.getOperand2(), rhs, func, l2);
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-				}
-				return v1 | v2 | v3;
-			}
-			else if(expr instanceof IASTCastExpression){
-				IASTCastExpression castE = (IASTCastExpression)expr;
-				v1 = useDefMVMapping(castE.getOperand(), side, func, l1);
-				Util.addAll(set, l1);
-				return v1;
-			}
-			else if(expr instanceof IASTConditionalExpression){
-				IASTConditionalExpression condE = (IASTConditionalExpression)expr;
-				if(side == rhs){
-					v1 = useDefMVMapping(condE.getLogicalConditionExpression(), rhs, func, l1); 
-					v2 = useDefMVMapping(condE.getPositiveResultExpression(), rhs, func, l2); 
-					v3 = useDefMVMapping(condE.getNegativeResultExpression(), rhs, func, l3);
-				} else {
-					// eg. (x > y ? x : y) = 1
-					v1 = useDefMVMapping(condE.getLogicalConditionExpression(), rhs, func, l1); 
-					v2 = useDefMVMapping(condE.getPositiveResultExpression(), lhs, func, l2); 
-					v3 = useDefMVMapping(condE.getNegativeResultExpression(), lhs, func, l3);
-				}
-				Util.addAll(set, l1);
-				Util.addAll(set, l2);
-				Util.addAll(set, l3);
-				return v1 | v2 | v3;
-			}
-			else if(expr instanceof IASTExpressionList){
-				IASTExpressionList exprList = (IASTExpressionList)expr;
-				IASTExpression[] exprs = exprList.getExpressions();
-				boolean[] newContext_ = new boolean[exprs.length];
-				for(int i = 0; i<exprs.length; i++){
-					v1 = v1 | useDefMVMapping(exprs[i], side, func, l1);
-					newContext_[i] = v1;
-					Util.addAll(set, l1);
-				}
-				if(func != null) 
-					exprListMVContext_.push(newContext_);
-				return v1;
-			}
-			else if(expr instanceof IASTFieldReference){
-				IASTFieldReference frE = (IASTFieldReference)expr;
-				v1 = useDefMVMapping(frE.getFieldOwner(), side, func, l1);
-				Util.addAll(set, l1);
-				return v1;
-			}
-			else if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				IASTExpression parameter = funcE.getParameterExpression();
-				MPICallGraphNode n = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-				if(n != null){
-					/* 1. Determine whether each parameter is MV or SV
-					 * 2. Refer to the MVsummary, find the set of MV variables 
-					 * according to the parameter MV context, and find out 
-					 * whether the return value is MV or SV
-					 */
-					boolean returnval = false;
-					if(parameter != null){
-						v1 = useDefMVMapping(parameter, side, funcE, l1);
-						if(parameter instanceof IASTExpressionList){ // >1 parameter
-							boolean[] paramContext = (boolean[])exprListMVContext_.pop();
-							for(int i=0; i<paramContext.length; i++){
-								if(paramContext[i]){
-									String param = getFormalParamName(n, i);
-									if(param != null){
-										List<String> mvlist = n.getMVSummary().get(param);
-										Util.addAll(MVvar_, mvlist);
-										if(mvlist.contains(n.getFuncName())){ //return MV value
-											MVvar_.remove(n.getFuncName());
-											returnval = true;
-										}
-									}
-								}
-							}
-						} else { // single parameter
-							String param = getFormalParamName(n, 0);
-							if(param != null){
-								List<String> mvlist = n.getMVSummary().get(param);
-								Util.addAll(MVvar_, mvlist);
-								if(mvlist.contains(n.getFuncName())){ //return MV value
-									MVvar_.remove(n.getFuncName());
-									returnval = true;
-								}
-							}
-						}
-					}
-					for(Iterator<String> i = n.getGlobalUse().iterator(); i.hasNext();){
-						String guse = i.next();
-						if(context_.contains(guse)){
-							List<String> mvlist = n.getMVSummary().get(guse);
-							Util.addAll(MVvar_, mvlist);
-							if(mvlist.contains(n.getFuncName())){ //return MV value
-								MVvar_.remove(n.getFuncName());
-								returnval = true;
-							}
-						}
-					}
-					if(n.getMVSummary().size() == 1){//no parameter, no global use
-						List<String> mvlist = n.getMVSummary().get(n.getFuncName());
-						if(mvlist.size() == 1 && mvlist.contains(n.getFuncName()))
-							returnval = true;
-						else
-							returnval = false;
-					}
-					return returnval;
-				}
-				else{ 
-					if(parameter != null){
-						v1 = useDefMVMapping(parameter, side, funcE, l1);
-						if(parameter instanceof IASTExpressionList)
-							exprListMVContext_.pop();
-						Util.addAll(set, l1);
-						return v1;
-					}
-					else 
-						return false;
-				}
-			}
-			else if(expr instanceof IASTIdExpression){
-				IASTIdExpression id = (IASTIdExpression)expr;
-				IASTName name = id.getName();
-				String var = name.toString();
-				if(var.startsWith("MPI_")) return false;
-				if(side == rhs){
-					if(func != null){ //function parameter
-						IASTExpression funcname = func.getFunctionNameExpression();
-						String signature = funcname.getRawSignature();
-						ICallGraphNode n = cg_.getNode(currentNode_.getFileName(), signature);
-						if(n == null) { //library function call
-							if(currentBlock_.getDef().contains(var)){
-								if(!set.contains(var)) set.add(var);
-								if(context_.contains(var) && !MVvar_.contains(var))
-									MVvar_.add(var);
-							}
-						}
-					}
-					if(context_.contains(var)) 
-						return true;
-				} else { //lhs
-					if(!set.contains(var))
-						set.add(var);
-					return false;
-				}
-			}
-			else if(expr instanceof IASTLiteralExpression){
-			}
-			else if(expr instanceof IASTProblemExpression){
-			}
-			else if(expr instanceof IASTTypeIdExpression){
-			}
-			else if(expr instanceof IASTUnaryExpression){
-				IASTUnaryExpression uE = (IASTUnaryExpression)expr;
-				int op = uE.getOperator();
-				if(op == IASTUnaryExpression.op_prefixIncr ||
-					  op == IASTUnaryExpression.op_prefixDecr ||
-					  op == IASTUnaryExpression.op_postFixIncr ||
-					  op == IASTUnaryExpression.op_postFixDecr) {
-					v1 = useDefMVMapping(uE.getOperand(), rhs, func, l1);
-					v2 = useDefMVMapping(uE.getOperand(), lhs, func, l2);
-					if(v1){
-						Util.addAll(MVvar_, l2);
-					}
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-				} else {
-					v1 = useDefMVMapping(uE.getOperand(), side, func, l1);
-					Util.addAll(set, l1);
-				}
-				return v1 | v2;
-			}
-			else if(expr instanceof ICASTTypeIdInitializerExpression){
-			}
-			else{
-			}
-			return false;
-		}
-	}
-	
-	private String getFormalParamName(ICallGraphNode func, int index){
-		IASTFunctionDefinition fd = func.getFuncDef();
-		IASTFunctionDeclarator fdecl = fd.getDeclarator();
-		if(fdecl instanceof IASTStandardFunctionDeclarator){
-			IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-			IASTParameterDeclaration[] params = sfunc.getParameters();
-			if(index >= params.length) // additional parameters
-				return null;
-			IASTName param = params[index].getDeclarator().getName();
-			return param.toString();
-		} else {
-			ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-			IASTName[] params = krfunc.getParameterNames();
-			if(index >= params.length)
-				return null;
-			return params[index].toString();
-		}
-	}
-	
-	/** Determines a set of multi-valued "VARIABLES" (local and global) 
-	 * in each program point 
-	 */
-	private void functionSlicing(){
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			currentNode_ = node;
-			//System.out.println(node.getFuncName());
-			IControlFlowGraph cfg = node.getCFG();
-			
-			/** The initial worklist contains seeds blocks in this function and 
-			 * the entry block if any of its parameters is multi-valued. 
-			 */
-			WorkListCollector wlc = new WorkListCollector(currentNode_);
-			LinkedList<IBlock> seeds = wlc.getWorkList();
-			boolean hasMVparam = false;
-			for(Enumeration<String> e = node.getParamMV().keys(); e.hasMoreElements();){
-				String param = e.nextElement();
-				boolean val = node.getParamMV().get(param).booleanValue();
-				if(val){ // multi-valued parameter
-					((MPIBlock)cfg.getEntry()).getMVvar().add(param);
-					hasMVparam = true;
-				}
-			}
-			if(hasMVparam) seeds.add(cfg.getEntry());
-			
-			/** Slicing */
-			while(!seeds.isEmpty()){
-				MPIBlock block = (MPIBlock)seeds.remove();
-				if(block.sliced) continue;
-				block.sliced = true;
-
-				//System.out.println("current seed is " + block.getID());
-				Hashtable<String,List<IBlock>> DUSucc = block.getDUSucc();
-				List<String> mv = block.getMVvar();
-				List<String> newMV = new ArrayList<String>();
-				
-				handlePointers(block, mv);
-
-				/* Intra-block slicing (Case #1) ---
-				 * If there is a \phi function in this block, consider two cases:
-				 * (1) If this block is a join block for If statement or Switch
-				 * statement, or if this block is break exit join block of a loop,
-				 * then all \phi variables in this block are multi-valued;
-				 * (2) If this block is a join block (i.e., cond block) for For 
-				 * statement, While statement or Do statement, then its multi-valued 
-				 * \phi variables have been already marked through data dependences, 
-				 * and all used \phi variables are kept multi-valued.
-				 * Note: a block falls into one and only one of these two cases.
-				 */
-				if(!block.getPhiVar().isEmpty()){
-					List<IBlock> cond = block.getCond();
-					int blockcase = 0;
-					for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-						if(blockcase == 2) break;
-						MPIBlock condblock = (MPIBlock)i.next();
-						IASTStatement parent = condblock.getParent();
-						if(parent instanceof IASTIfStatement || 
-								parent instanceof IASTSwitchStatement)
-							blockcase = 1;
-						else if(parent instanceof IASTForStatement ||
-								parent instanceof IASTDoStatement ||
-								parent instanceof IASTWhileStatement){
-							if(block.getType() == MPIBlock.exit_join_type)
-								blockcase = 1;
-							else if(block.getType() == MPIBlock.expr_type)
-								blockcase = 2;
-						}
-					}
-					if(blockcase == 1){
-						newMV = Util.Union(newMV, block.getPhiVar());
-					}
-					else if(blockcase == 2){
-						for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-							MPIBlock condblock = (MPIBlock)i.next();
-							for(Iterator<String> ii = condblock.getUsedPhiVar().iterator();
-									ii.hasNext();){
-								String var = ii.next();
-								if(mv.contains(var))
-									newMV.add(var);
-							}
-						}
-					}
-				}	
-				
-				/** Intra-block slicing (Case #1) --- 
-				 * Given MV/SV used variable, determine whether defined variables
-				 * are MV or SV.  
-				 */
-				
-				IASTNode content = block.getContent();
-				ExprMVAnalyzer emva = new ExprMVAnalyzer(content, mv, block);
-				emva.run();
-				newMV = Util.Union(newMV, emva.getMVList());
-				
-				/** Intra-block slicing (Case #3) -- 
-				 *  any used only multi-valued variable is still multi-valued
-				 */
-				for(Iterator<String> i = mv.iterator(); i.hasNext();){
-					String var = i.next();
-					if(block.getUse().contains(var) && !block.getDef().contains(var)){
-						if(!newMV.contains(var))
-							newMV.add(var);
-					}
-				}
-				
-				handlePointers(block, newMV);
-				handleBroadCast(block, newMV);
-				block.setMVvar(newMV);
-				
-				/** Inter-block slicing based on data dependences */
-				for(Iterator<String> i = newMV.iterator(); i.hasNext();){
-					String MVvar = i.next();
-					List<IBlock> DUnext = DUSucc.get(MVvar);
-					if(DUnext != null){
-						for(Iterator<IBlock> ii = DUnext.iterator(); ii.hasNext();){
-							MPIBlock b = (MPIBlock)ii.next();
-							if(b.sliced == true) continue;
-							if(!seeds.contains(b)){
-								seeds.add(b);
-								//System.out.println("block " + b.getID() + " is added to seeds");
-							}
-							if(!b.getMVvar().contains(MVvar))
-								b.getMVvar().add(MVvar);
-						}
-					}
-				}
-				
-				/** Inter-block slicing based on \Phi edges */
-				for(Iterator<IBlock> i = block.getJoin().iterator(); i.hasNext();){
-					MPIBlock join = (MPIBlock)i.next();
-					if(!seeds.contains(join) && !join.sliced) 
-						seeds.add(join);
-				}
-			}
-			
-			/* Function Multi-valued Summary --- (1) whether a function's REAL
-			 * paramters are multi-valued (A real parameter of function foo is 
-			 * multi-valued if in any of foo's call sites the parameter is 
-			 * multi-valued)
-			 */
-			for(IBlock block = cfg.getEntry(); block != null; block = block.topNext()){
-				FuncParamMVChecker fpc = new FuncParamMVChecker(node, (MPIBlock)block);
-				fpc.run();
-			}
-		}
-	}
-	
-	class SeedsCollector extends ASTVisitor{	
-		private MPICallGraphNode currentFunc_;
-		
-		public void run(){
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			
-			for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-				MPICallGraphNode node = (MPICallGraphNode)n;
-				if(!node.marked) continue;
-				currentFunc_ = node;
-				IControlFlowGraph cfg = node.getCFG();
-				for(IBlock b = cfg.getEntry(); b != null; b = b.topNext()){
-					IASTNode content = b.getContent();
-					if(content != null) 
-						content.accept(this);
-				}
-			}
-			for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-				MPICallGraphNode node = (MPICallGraphNode)n;
-				if(!node.marked) continue;
-				if(node.hasSeed()){
-					for(Iterator<ICallGraphNode> i = node.getCallers().iterator(); i.hasNext();){
-						MPICallGraphNode caller = (MPICallGraphNode)i.next();
-						caller.setSeed(true);
-					}
-				}
-			}
-		}
-	
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Comm_rank")){
-					currentFunc_.setSeed(true);
-				} 
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	
-	/** Work list contains two kinds of blocks:
-	 * (1) where MPI_Comm_rank() is directly or indirectly called; 
-	 * (2) the entry block of a function that has some MV real parameters;
-	 * 
-	 * (1) is marked in SeedsCollector and collected in WorkListCollector 
-	 * (2) is collected in the slicing function. 
-	 */
-	class WorkListCollector extends ASTVisitor{	
-		private ICallGraphNode func_;
-		private boolean inRankFunc;
-		private IASTExpressionList params;
-		private LinkedList<IBlock> wlist;
-		private MPIBlock currentBlock_;
-		
-		public WorkListCollector(ICallGraphNode func){
-			func_ = func;
-			inRankFunc = false;
-			wlist = new LinkedList<IBlock>();
-		}
-		
-		public LinkedList<IBlock> getWorkList(){
-			if(!((MPICallGraphNode)func_).hasSeed())  return wlist;
-			
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			for(IBlock b = func_.getCFG().getEntry(); b != null; b = b.topNext()){
-				currentBlock_ = (MPIBlock)b;
-				IASTNode content = b.getContent();
-				if(content != null) 
-					content.accept(this);
-			}
-			return wlist;
-		}
-	
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Comm_rank")){
-					inRankFunc = true;
-				} else {
-					MPICallGraphNode n = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-					if(n != null && n.hasSeed()){
-						if(!wlist.contains(currentBlock_))
-							wlist.add(currentBlock_);
-						List<String> genMV = n.getMVSummary().get(signature);
-						Util.addAll(currentBlock_.getMVvar(), genMV);
-						if(currentBlock_.getMVvar().contains(n.getFuncName()))
-							currentBlock_.getMVvar().remove(n.getFuncName());
-					}
-				}
-			} else if(expr instanceof IASTIdExpression){
-				if(inRankFunc){
-					IASTNode me = expr;
-					IASTNode parent = me.getParent();
-					while(true){
-						if(parent == params) break;
-						else if(parent instanceof IASTFunctionCallExpression) break;
-						else{
-							me = parent;
-							parent = parent.getParent();
-						}
-					}
-					if(!(parent instanceof IASTExpressionList))
-						return PROCESS_CONTINUE;
-					IASTExpression[] rankParams = params.getExpressions();
-					int index;
-					for(index=0; index<rankParams.length; index++){
-						if(me == rankParams[index]) break;
-					}
-					if(index == 1){
-						IASTIdExpression id = (IASTIdExpression)expr;
-						String var = id.getName().toString();
-						//if(var.equals("MPI_Comm_rank")) return PROCESS_CONTINUE;
-						if(!currentBlock_.getMVvar().contains(var))
-							currentBlock_.getMVvar().add(var);
-						if(!wlist.contains(currentBlock_)) wlist.add(currentBlock_);
-					}
-				}
-			} else if(expr instanceof IASTExpressionList){
-				if(inRankFunc){
-					params = (IASTExpressionList)expr;
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		public int leave(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Comm_rank")){
-					inRankFunc = false;
-				}
-			}
-			else if(expr instanceof IASTExpressionList){
-				params = null;
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	class BroadCastAnalyzer extends ASTVisitor{
-		private IBlock block_;
-		private String var;
-		
-		public BroadCastAnalyzer(IBlock block){
-			block_ = block;
-			var = null;
-		}
-		public String getBCdata() {return var;}
-		
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitExpressions = true;
-			IASTNode content = block_.getContent();
-			if(content != null) 
-				content.accept(this);
-		}
-		
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Bcast")){
-					IASTExpression paramE = funcE.getParameterExpression();
-					IASTExpression[] params = ((IASTExpressionList)paramE).getExpressions();
-					IASTExpression dataE = params[0];
-					if(dataE instanceof IASTIdExpression){
-						IASTIdExpression ID = (IASTIdExpression)dataE;
-						var = ID.getName().toString();
-					}
-					else if(dataE instanceof IASTUnaryExpression){
-						IASTUnaryExpression uE = (IASTUnaryExpression)dataE;
-						if(uE.getOperator() == IASTUnaryExpression.op_amper &&
-								uE.getOperand() instanceof IASTIdExpression){
-							IASTIdExpression ID = (IASTIdExpression)uE.getOperand();
-							var = ID.getName().toString();
-						}
-					}
-				}
-				return PROCESS_SKIP;
-			}
-			return PROCESS_CONTINUE;
-		}
-
-	}
-	
-	class PointerAnalyzer extends ASTVisitor{
-		protected IBlock block_;
-		protected List<String> deref_;
-		protected List<String> addr_;
-		
-		public PointerAnalyzer(IBlock b){
-			block_ = b;
-			deref_ = new ArrayList<String>();
-			addr_ = new ArrayList<String>();
-		}
-		
-		public List<String> getDeref() {return deref_;}
-		public List<String> getAddr() {return addr_;}
-		
-		public void run(){
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			IASTNode content = block_.getContent();
-			if(content != null) 
-				content.accept(this);
-		}
-		
-		public int visit(IASTExpression expr){
-			visitor(expr, false, false);
-			return PROCESS_SKIP;
-		}
-		
-		private void visitor(IASTExpression expr, boolean inDeref, boolean inAddr){
-			if(expr instanceof IASTArraySubscriptExpression){
-				IASTArraySubscriptExpression arrayE = (IASTArraySubscriptExpression)expr;
-				visitor(arrayE.getArrayExpression(), inDeref, inAddr);
-				visitor(arrayE.getSubscriptExpression(), false, false);
-			}
-			else if(expr instanceof IASTBinaryExpression){
-				IASTBinaryExpression biE = (IASTBinaryExpression)expr;
-				visitor(biE.getOperand1(), inDeref, inAddr);
-				visitor(biE.getOperand2(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTConditionalExpression){
-				IASTConditionalExpression condE = (IASTConditionalExpression)expr;
-				visitor(condE.getLogicalConditionExpression(), inDeref, inAddr);
-				visitor(condE.getPositiveResultExpression(), inDeref, inAddr);
-				visitor(condE.getNegativeResultExpression(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTExpressionList){
-				IASTExpressionList listE = (IASTExpressionList)expr;
-				IASTExpression[] exprs = listE.getExpressions();
-				for(int i=0; i<exprs.length; i++){
-					visitor(exprs[i], inDeref, inAddr);
-				}
-			}
-			else if(expr instanceof IASTFieldReference){
-				IASTFieldReference fr = (IASTFieldReference)expr;
-				visitor(fr.getFieldOwner(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				ICallGraphNode n = cg_.getNode(currentNode_.getFileName(), signature);
-				if(n != null) return;
-				visitor(funcE.getFunctionNameExpression(), false, false);
-				visitor(funcE.getParameterExpression(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTIdExpression){
-				IASTIdExpression ID = (IASTIdExpression)expr;
-				String var = ID.getName().toString();
-				if(inDeref){
-					if(!deref_.contains(var)) 
-						deref_.add(var);
-				} 
-				if(inAddr){
-					if(!addr_.contains(var))
-						addr_.add(var);
-				}
-			}
-			else if(expr instanceof IASTUnaryExpression){
-				IASTUnaryExpression uE = (IASTUnaryExpression)expr;
-				int op = uE.getOperator();
-				boolean addrflag = inAddr;
-				boolean derefflag = inDeref;
-				if(op == IASTUnaryExpression.op_amper){ // &E
-					addrflag = true;
-				} else if(op == IASTUnaryExpression.op_star){ // *E
-					derefflag = true;
-				}
-				visitor(uE.getOperand(), addrflag, derefflag);
-			}
-		}
-	}
-	
-	class FuncParamMVChecker extends ASTVisitor{
-		protected MPICallGraphNode currentNode_;
-		protected MPIBlock block_;
-		protected MPICallGraphNode func;
-		
-		public FuncParamMVChecker(MPICallGraphNode func, MPIBlock block){
-			currentNode_ = func;
-			block_ = block;
-			func = null;
-		}
-		
-		public void run(){
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			
-			IASTNode content = block_.getContent();
-			if(content != null) 
-				content.accept(this);
-		}
-	
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				func = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-				if(func != null){
-					IASTExpression parameter = funcExpr.getParameterExpression();
-					if(parameter instanceof IASTExpressionList){
-						IASTExpressionList paramListE = (IASTExpressionList)parameter;
-						IASTExpression[] params = paramListE.getExpressions();
-						for(int i=0; i<params.length; i++){
-							ExprMVAnalyzer ema = new ExprMVAnalyzer(params[i], 
-									block_.getMVvar(), block_);
-							ema.run();
-							if(ema.isMV()){
-								String paramName = getFormalParamName(func, i);
-								if(paramName != null)
-									func.getParamMV().put(paramName, new Boolean(true));
-							}
-						}
-					}
-					else if(parameter != null){
-						ExprMVAnalyzer ema = new ExprMVAnalyzer(parameter, 
-								block_.getMVvar(), block_);
-						ema.run();
-						if(ema.isMV()){
-							String paramName = getFormalParamName(func, 0);
-							if(paramName != null)
-								func.getParamMV().put(paramName, new Boolean(true));
-						}
-					}
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		public int leave(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(cg_.getNode(currentNode_.getFileName(), signature) == func){
-					func = null;
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	/** Determine whether an "EXPRESSION" is multi-valued */
-	private void exprMVAnalysis(){
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			IControlFlowGraph cfg = node.getCFG();
-			for(IBlock b = cfg.getEntry(); b != null; b = b.topNext()){
-				MPIBlock block = (MPIBlock)b;
-				//System.out.println("Block " + block.getID());
-				ExprMVAnalyzer EA = new ExprMVAnalyzer(block.getContent(), block.getMVvar(), block);
-				EA.run();
-				block.setMV(EA.isMV());
-			}
-		}
-	}
-	
-}

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

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

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

@@ -1,190 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IControlFlowGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.Block;
-
-public class MPISSA {
-	protected ICallGraph cg_;
-	protected MPICallGraphNode currentFunc_;
-	protected Hashtable<String,List<IBlock>> defTable_;
-	protected IControlFlowGraph cfg_;
-	
-	public MPISSA(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			//System.out.println(node.getFuncName());
-			if(!node.marked) continue;
-			currentFunc_ = node;
-			cfg_ = node.getCFG();
-			defTable_ = node.getDefTable();
-			domFrontier();
-			placePHI();
-			ExitBlockPhi ebp = new ExitBlockPhi();
-			ebp.run();
-		}
-	}
-	
-	public void domFrontier(){
-		for(IBlock bx = cfg_.getEntry(); bx != null; bx = bx.topNext()){
-			MPIBlock x = (MPIBlock)bx;
-			List<IBlock> DF = new ArrayList<IBlock>();
-			for(IBlock by = cfg_.getEntry(); by != null; by = by.topNext()){
-				MPIBlock y = (MPIBlock)by;
-				for(Iterator<IBlock> i = y.getPreds().iterator(); i.hasNext();){
-					MPIBlock pred = (MPIBlock)i.next();
-					if(pred.getDOM().contains(x) && !(y.getDOM().contains(x) && x != y)){
-						if(!DF.contains(y)) DF.add(y);
-					}
-				}
-			}
-			x.setDF(DF);
-		}
-	}
-	
-	public void placePHI(){
-		int iterCount = 0;
-		for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			block.hasAlready = 0;
-			block.work = 0;
-		}
-		LinkedList<IBlock> W = new LinkedList<IBlock>();
-		for(Enumeration<String> e = defTable_.keys(); e.hasMoreElements();){
-			String var = e.nextElement();
-			iterCount ++;
-			List<IBlock> defs = defTable_.get(var);
-			for(Iterator<IBlock> i = defs.iterator(); i.hasNext();){
-				MPIBlock defblock = (MPIBlock)i.next();
-				defblock.work = iterCount;
-				W.add(defblock);
-			}
-			while(!W.isEmpty()){
-				MPIBlock next = (MPIBlock)W.remove();
-				for(Iterator<IBlock> i = next.getDF().iterator(); i.hasNext();){
-					MPIBlock df = (MPIBlock)i.next();
-					if(df.hasAlready < iterCount){
-						if(df.getCond() == null && df != cfg_.getExit()){ 
-							//no associated condition?
-							System.out.println("Error: phi Node has no condition!" + 
-									currentFunc_.getFuncName() + " Block " + df.getID());
-							//return;
-						}
-						df.setPhi();
-						if(!df.getDef().contains(var)) df.getDef().add(var);
-						//if(!df.getUse().contains(var)) df.getUse().add(var);
-						if(df.getUse().contains(var) && !df.getUsedPhiVar().contains(var))
-							df.getUsedPhiVar().add(var);
-						if(!df.getPhiVar().contains(var)) df.getPhiVar().add(var);
-						if(!defs.contains(df)) defs.add(df);
-						updateDefTable(df, var);
-						//System.out.println("Block " + df.getID() + " has Phi for " + var);
-						df.hasAlready = iterCount;
-						if(df.work < iterCount){
-							df.work = iterCount;
-							W.add(df);
-						}
-					}
-				}
-			}
-		}
-		for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			if(block.hasPhi())
-				for(Iterator<String> i = block.getPhiVar().iterator(); i.hasNext();){
-					String var = i.next();
-					if(!block.getUse().contains(var))
-						block.getUse().add(var);
-				}
-		}
-	}
-	
-	protected void updateDefTable(IBlock block, String var){
-		List<IBlock> list = defTable_.get(var);
-		if(list == null){
-			System.out.print("Error in SSA!");
-			return;
-		}
-		if(!list.contains(block))
-			list.add(block);
-	}
-	
-	class ExitBlockPhi extends ASTVisitor{
-		
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			currentFunc_.getFuncDef().accept(this);
-		}
-		
-		public int visit(IASTStatement stmt){
-			MPIBlock condblock = null;
-			if(stmt instanceof IASTDoStatement){
-				IASTDoStatement doS = (IASTDoStatement)stmt;
-				condblock = (MPIBlock)cfg_.getBlock(doS.getCondition(), stmt);
-			}
-			else if(stmt instanceof IASTForStatement){
-				IASTForStatement forS = (IASTForStatement)stmt;
-				condblock = (MPIBlock)cfg_.getBlock(forS.getConditionExpression(), stmt);
-			}
-			else if(stmt instanceof IASTWhileStatement){
-				IASTWhileStatement whileS = (IASTWhileStatement)stmt;
-				condblock = (MPIBlock)cfg_.getBlock(whileS.getCondition(), stmt);
-			} 
-			else {
-				return PROCESS_CONTINUE;
-			}
-			
-			MPIBlock exitblock = null;
-			for(Iterator<IBlock> i = condblock.getSuccs().iterator(); i.hasNext();){
-				MPIBlock succ = (MPIBlock)i.next();
-				if(succ.getType() == Block.exit_join_type)
-					exitblock = succ;
-			}
-			
-			exitblock.setPhi();
-			for(Iterator<String> i = condblock.getPhiVar().iterator(); i.hasNext();){
-				String phivar = i.next();
-				if(!exitblock.getDef().contains(phivar))
-					exitblock.getDef().add(phivar);
-				if(!exitblock.getUse().contains(phivar))
-					exitblock.getUse().add(phivar);
-				if(!exitblock.getPhiVar().contains(phivar))
-					exitblock.getPhiVar().add(phivar);
-				updateDefTable(exitblock, phivar);
-			}
-			
-			return PROCESS_CONTINUE;
-		}
-	}
-
-}

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

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

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

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

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

@@ -1,87 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class Util {
-	
-	public static List Intersect(List A, List B){
-		if(A == null || B == null) return null;
-		List list = new ArrayList();
-		for(Iterator i = A.iterator(); i.hasNext();){
-			Object o = i.next();
-			if(B.contains(o)) list.add(o);
-		}
-		return list;
-	}
-	
-	public static boolean equals(List A, List B){
-		if(A == null && B == null) return true;
-		if(A == null && B != null) return false;
-		if(A != null && B == null) return false;
-		if(A.size() != B.size()) return false;
-		for(Iterator i = A.iterator(); i.hasNext();){
-			if(!B.contains(i.next())) return false;
-		}
-		return true;
-	}
-	
-	public static List Union(List A, List B){
-		if(A == null) return B;
-		if(B == null) return A;
-		List list = new ArrayList(A);
-		for(Iterator i = B.iterator(); i.hasNext();){
-			Object o = i.next();
-			if(!list.contains(o)) list.add(o);
-		}
-		return list;
-	}
-	
-	public static List Union(List A, List B, List C){
-		return Union(Union(A, B), C);
-	}
-	
-	/* 
-	 * @ return: A - B 
-	 */
-	public static List Minus(List A, List B){
-		if(B.isEmpty()) return A;
-		List list = new ArrayList();
-		for(Iterator i = A.iterator(); i.hasNext();){
-			Object o = i.next();
-			if(!B.contains(o)) list.add(o);
-		}
-		return list;
-	}
-	
-	/* to = Union(to, from) */
-	public static void addAll(List to, List from){
-		if(from == null) return;
-		if(from.size() == 0) return;
-		for(Iterator i = from.iterator(); i.hasNext();){
-			String s = (String)i.next();
-			if(!to.contains(s))
-				to.add(s);
-		}
-	}
-	
-	public static List copy(List oldlist){
-		List list = new ArrayList();
-		for(Iterator i = oldlist.iterator(); i.hasNext();){
-			list.add(i.next());
-		}
-		return list;
-	}
-}

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

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

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

@@ -1,48 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-public class ArtifactWithParent extends Artifact {
-	private int parentID;
-	private int myID;
-	private String name;
-	private int index;
-
-	public ArtifactWithParent(String fileName, int line, int column, String funcName, String desc,  /*String primaryFileName,*/
-			SourceInfo sourceInfo, int parentID, int myID, String name, int index) {
-		super(fileName, line, column, funcName, desc, sourceInfo);
-		this.parentID = parentID;
-		this.myID = myID;
-		this.name = name;
-		this.index = index;
-	}
-
-	public int getParentID() {
-		return parentID;
-	}
-	
-	public int getMyID(){
-		return myID;
-	}
-	
-	public String getMyName() {
-		return name;
-	}
-	
-	public int getIndex(){
-		return index;
-	}
-}

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

@@ -1,67 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-public class BarrierArtifacts {
-	private ICallGraph CG_;
-	private ScanReturn scanReturn_;
-	private MPIArtifactMarkingVisitor visitor_;
-	private String markerID = IDs.barrierMarkerID;
-	public BarrierArtifacts(ICallGraph cg, MPIArtifactMarkingVisitor visitor){
-		CG_ = cg;
-		visitor_ = visitor;
-	}
-	
-	public void run(){
-		/* first clear all existing markers */
-		IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			int depth = IResource.DEPTH_INFINITE;
-			wsResource.deleteMarkers(markerID, false, depth);
-
-        } catch (CoreException e) {
-            System.out.println("RM: exception deleting markers.");
-            e.printStackTrace();
-        }
-        
-		for(ICallGraphNode n =  CG_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			List<BarrierInfo> barriers = node.getAllBarriers();
-			scanReturn_ = new ScanReturn();
-			for(Iterator<BarrierInfo> i = barriers.iterator(); i.hasNext();){
-				BarrierInfo bar = i.next();
-				SourceInfo sourceInfo = bar.getSourceInfo();
-				ArtifactWithParent awp = new ArtifactWithParent(node.getFileName(), 
-						sourceInfo.getStartingLine(), 1, node.getFuncName(), 
-						"Artifact Call", sourceInfo, 0, 0, "",
-						bar.getID()-4);
-				scanReturn_.addArtifact(awp);
-			}
-			visitor_.visitFile(node.getResource(), scanReturn_.getArtifactList());
-		}
-	}
-}

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

@@ -1,91 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-public class MPIArtifactMarkingVisitor extends ArtifactMarkingVisitor{
-
-	protected static final boolean traceOn = false;
-	
-	public MPIArtifactMarkingVisitor(String markerID){
-		super(markerID);
-	}
-	
-	public String getMarkerID() {return markerID_;}
-	
-	/**
-	 *  Visit file, but don't remove existing markers 
-	 *  */
-    public boolean visitFile(IResource resource, Artifact[] artifacts)
-    {
-        try {
-            if(traceOn) System.out.println("ArtifactMarkingVisitor.visitFile: " + resource.getName());
-            //removeMarkers(resource, this.markerID_);
-            int numArtifacts=artifactManager_.getArtifacts().length;
-            if(traceOn)System.out.println("numArtifacts: "+numArtifacts);
-            
-            String fn = resource.getProjectRelativePath().toString();
-
-            if (artifacts != null) {
-                createMarkers(resource, fn, artifacts);
-            }
-        } catch (CoreException e) {
-            e.printStackTrace();
-        }
-        return true;
-
-    }
-
-	/**
-	 * Create the marker for the artifact; like the super class 
-     * version of this, but also adds the parent name from ArtifactWithParent - for use in the tree view
-	 * @param resource
-	 * @param artifact
-	 * @param fn
-	 * @throws CoreException
-	 */
-	protected void createArtifactMarker(IResource resource, Artifact artifact, String fn) throws CoreException
-	{
-	    if (traceOn) System.out.println("Artifact desc=" + artifact.getShortName() + "  fn=" + fn);
-	    Map attrs = createCommonMarkerAttrs(resource, artifact, fn);
-	    // message attribute will be used for hover over editor location
-	    attrs.put(IMarker.MESSAGE, artifact.getShortName());
-	    
-	    // Get the parent name out of the artifact, to place in the marker
-	    ArtifactWithParent awp=(ArtifactWithParent)artifact;
-	    String parentAttr=IDs.parentAttribName;
-	    //String parentName=awp.getParentName();
-	    //attrs.put(parentAttr, parentName);
-    	attrs.put(IDs.parentIDAttr, new Integer(awp.getParentID()));
-    	attrs.put(IDs.myIDAttr, new Integer(awp.getMyID()));
-    	attrs.put(IDs.myNameAttr, awp.getMyName());
-    	attrs.put(IDs.myIndexAttr, new Integer(awp.getIndex()));
-	    
-	    // create the marker all at once, so get ONLY a single resourceChange event.
-	    MarkerUtilities.createMarker(resource, attrs, this.markerID_);  // 154
-	    if (traceOn)
-	        System.out.println("marker created: for " + fn + " - " + artifact.getShortName() + " line "
-	                + artifact.getLine() + " start " + artifact.getSourceInfo().getStart() + " end "
-	                + artifact.getSourceInfo().getEnd());
-	    
-	    artifactManager_.addArtifactToHash(artifact);
-	}
-}

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

@@ -1,30 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-//import org.eclipse.ptp.pldt.common.views.SimpleTreeTableMarkerView;
-import org.eclipse.ptp.pldt.mpi.analysis.Activator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-
-
-/**
- * Show the members of a barrier matching set, in a tree table view.
- * 
- * TODO: try to use  class from 'common' package instead
- */
-public class MPIBarrierMatchingSetView extends SimpleTreeTableMarkerView {
-	public MPIBarrierMatchingSetView() {
-
-		super(Activator.getDefault(), "FunctionName", "Matching Set Artifacts", 
-				"IndexNum", IDs.matchingSetMarkerID /*,  common ver needs:"parent"*/ );
-	}
-}

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

@@ -1,33 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-//import org.eclipse.ptp.pldt.common.views.SimpleTableView;
-import org.eclipse.ptp.pldt.mpi.analysis.Activator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
- /**
-  * View to show list of barriers 
-  * 
-  * TODO: this should use the SimpleTableView from the 'common' package,
-  * which I'm hoping the other view can eventually do as well (reuse view
-  * classes from that package)
-  * TODO: replace column header from 'common' package view class
-  */
-//public class MPIBarrierView extends SimpleTableView {// use common class
-public class MPIBarrierView extends SimpleTableBarrierView {//original
-	public MPIBarrierView() {
-
-		super(Activator.getDefault(), "Function", "Barrier Artifacts",
-				"IndexNo", IDs.barrierMarkerID);
-	}
-
-}

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

@@ -1,31 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-//import org.eclipse.ptp.pldt.common.views.SimpleTreeTableMarkerView;
-import org.eclipse.ptp.pldt.mpi.analysis.Activator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-
-//public class MPIErrorView extends SimpleTreeTableErrorView {
-/**
- * View to show list of barrier errors [new view architecture]
- * 
- * TODO: try to replace with view class from 'common' package
- */
-public class MPIErrorView extends SimpleTreeTableMarkerView {
-	public MPIErrorView() {
-
-		super(Activator.getDefault(), "FunctionName", "Matching Set Artifacts", "IndexNum",
-				IDs.errorMarkerID/* common needs:, IDs.parentIDAttr*/);
-	}
-
-}

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

@@ -1,106 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-
-public class MatchingSet {
-	protected BarrierTable btable_ = null;
-	
-	public MatchingSet(BarrierTable table){
-		btable_ = table;
-	}
-	
-	public void run(){
-		IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			int depth = IResource.DEPTH_INFINITE;
-			wsResource.deleteMarkers(IDs.matchingSetMarkerID, false, depth);
-
-        } catch (CoreException e) {
-            System.out.println("RM: exception deleting markers.");
-            e.printStackTrace();
-        }
-		
-		MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(IDs.matchingSetMarkerID);
-		int count = 0;
-		
-		// create the markers for all the matched barriers
-		for(Enumeration e = btable_.getTable().elements(); e.hasMoreElements();){
-			ArrayList barrierList = (ArrayList)e.nextElement();
-			for(Iterator ii = barrierList.iterator(); ii.hasNext();){
-				BarrierInfo barrier = (BarrierInfo)ii.next();
-				count ++;
-				int parentID = count;
-				String name = "Barrier " + (barrier.getID()-4) + " (" + barrier.getMatchingSet().size() + ")";
-				// create a marker for each parent(barrier)
-				ScanReturn sr = new ScanReturn();
-	        	SourceInfo sourceInfo = barrier.getSourceInfo();
-	        	String filename = barrier.getFileName();
-	        	int line = sourceInfo.getStartingLine();
-	        	String fn = barrier.getEnclosingFunc();
-	        	ArtifactWithParent a = new ArtifactWithParent(filename, line, 1, fn,
-	        			"Artifact Call", sourceInfo, 0, parentID, name, barrier.getID()-4);
-	        	sr.addArtifact(a);
-	        	visitor.visitFile(barrier.getResource(), sr.getArtifactList());
-				
-				for(Iterator i = barrier.getMatchingSet().iterator(); i.hasNext();){
-					BarrierInfo matchedBar = (BarrierInfo)i.next();
-					count ++;
-					int myID = count;
-					name = "Barrier " + (matchedBar.getID()-4);
-					sr = new ScanReturn();
-		        	sourceInfo = matchedBar.getSourceInfo();
-		        	filename = matchedBar.getFileName();
-		        	line = sourceInfo.getStartingLine();
-		        	fn = matchedBar.getEnclosingFunc();
-		        	a = new ArtifactWithParent(filename, line, 1, fn,"Artifact Call",
-		        			sourceInfo, parentID, myID, name, matchedBar.getID()-4);
-		        	sr.addArtifact(a);
-		        	visitor.visitFile(matchedBar.getResource(), sr.getArtifactList());
-		        }
-		        
-			}
-		}
-        // Done creating markers, now show the view
-        ViewActivater.activateView(IDs.matchingSetViewID);
-	}
-	
-	/*
-	   protected void showNode(IASTNode node, String markerType)
-	    {
-	        Utility.Location l = Utility.getLocation(node);
-	        
-	        IAnnotationModel am = editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput());
-	        
-	        // We need to add an annotation type to the annotation painter (see SourceViewerDecorationSupport)
-	        Annotation a = new Annotation(markerType, true, "Hi");
-	        int end = l.high_-l.low_+1;
-	        Position   p = new Position(l.low_, end);
-	        am.addAnnotation(a, p);
-	    }
-	*/
-	
-}

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

@@ -1,173 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.view;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierMatching.ErrorMessage;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierMatching.PathNode;
-
-/**
- * For the list of ErrorMessage objects given to this class,
- * iterate through them and create parent and child node groups of
- * markers for each error.
- *
- */
-public class ShowErrors {
-	protected List<ErrorMessage> errors_;
-	protected int counter = 0;
-	
-	public ShowErrors(List<ErrorMessage> errors){
-		this.errors_ = errors;
-	}
-	/**
-	 * 
-	 * @return true if errors found
-	 */
-
-	public boolean run(){
-		boolean foundErrors=false;
-		IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			int depth = IResource.DEPTH_INFINITE;
-			wsResource.deleteMarkers(IDs.errorMarkerID, false, depth);
-
-        } catch (CoreException e) {
-            System.out.println("RM: exception deleting markers.");
-            e.printStackTrace();
-        }
-		
-        //TODO: change this visitor
-		MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(IDs.errorMarkerID);
-		
-		/* Two kinds of Artifacts: 
-		 * (1) errorous conditions
-		 * (2) barriers in counter examples
-		 */
-		
-		for(Iterator<ErrorMessage> i = errors_.iterator(); i.hasNext();){
-			ErrorMessage err = i.next();
-			
-			/* Error condition */
-			counter ++;
-			int condID = counter;
-			ScanReturn sr = new ScanReturn();
-			String funcName = err.getFuncName();
-			String fileName = err.getFileName();
-			SourceInfo sourceInfo = err.getSourceInfo();
-			ArtifactWithParent ea = new ArtifactWithParent(fileName, 
-					sourceInfo.getStartingLine(), 1, 
-					funcName, "Erroneous Condition", sourceInfo, 0, condID, "Error", 0);
-			sr.addArtifact(ea);
-        	visitor.visitFile(err.getResource(), sr.getArtifactList());
-        	
-        	/* Path 1 (and 2) */
-        	counter ++;
-        	int path1ID = counter;
-        	String path1name = (String)null;
-        	if(err.getLength1() == -1){
-        		if(err.getPath2() != null)
-        			path1name = "Path 1 (dynamic number of barriers)";
-        		else
-        			path1name = "Loop (dynamic number of barriers)";
-        	} else {
-        		path1name = "Path 1 (" + err.getLength1() + " barrier(s))";
-        	}
-        	sr = new ScanReturn();
-        	ea = new ArtifactWithParent("", 0, 0, "", "Counter Example",
-        			err.getPath1SourceInfo(), condID, path1ID, path1name, 0);
-        	sr.addArtifact(ea);
-        	
-        	int path2ID = 0;
-        	if(err.getPath2() != null){
-	    		counter ++;
-	    		path2ID = counter;
-	           	String path2name = (String)null;
-	        	if(err.getLength2() == -1){
-	        		path2name = "Path 2 (dynamic number of barriers)";
-	        	} else {
-	        		path2name = "Path 2 (" + err.getLength2() + " barrier(s))";
-	        	}
-	    		ea = new ArtifactWithParent("", 0, 0, "", "Counter Example",
-	    				err.getPath2SourceInfo(), condID, path2ID, path2name, 0);
-	    		sr.addArtifact(ea);
-	        	}
-        	visitor.visitFile(err.getResource(), sr.getArtifactList());
-
-        	/* Counter example content */
-        	for(Iterator<PathNode> ii = err.getPath1().iterator(); ii.hasNext();){
-        		PathNode pn = ii.next();
-        		BarrierInfo barrier = pn.getBarrier();
-        		counter ++;
-				sr = new ScanReturn();
-	        	sourceInfo = barrier.getSourceInfo();
-	        	fileName = barrier.getFileName();
-	        	funcName = barrier.getEnclosingFunc();
-	        	String barrierName = (String)null;
-	        	// BRT Note! This is where the barrier matching set labels are.
-	        	// Consider changing the parent node to "Barrier Set"
-	        	if(pn.isRepeat())
-	        		barrierName = "Barrier " + (barrier.getID() -4) + "(*)";
-	        	else
-	        		barrierName = "Barrier " + (barrier.getID() -4);
-	        	ArtifactWithParent a = new ArtifactWithParent(fileName,
-	        			sourceInfo.getStartingLine(), 1, funcName, 
-	        			"Barrier", sourceInfo, path1ID, counter, barrierName, 
-	        			barrier.getID()-4);
-	        	sr.addArtifact(a);
-	        	visitor.visitFile(barrier.getResource(), sr.getArtifactList());
-        	}
-        	
-        	if(err.getPath2() == null) continue;
-        	for(Iterator<PathNode> ii = err.getPath2().iterator(); ii.hasNext();){
-        		PathNode pn = ii.next();
-        		BarrierInfo barrier = pn.getBarrier();
-        		counter ++;
-				sr = new ScanReturn();
-	        	sourceInfo = barrier.getSourceInfo();
-	        	fileName = barrier.getFileName();
-	        	funcName = barrier.getEnclosingFunc();
-	        	String barrierName = (String)null;
-	        	if(pn.isRepeat())
-	        		barrierName = "Barrier " + (barrier.getID() -4) + "(*)";
-	        	else
-	        		barrierName = "Barrier " + (barrier.getID() -4);
-	        	ArtifactWithParent a = new ArtifactWithParent(fileName,
-	        			sourceInfo.getStartingLine(), 1, funcName,
-	        			"Barrier", sourceInfo, path2ID, counter, barrierName,
-	        			barrier.getID()-4);
-	        	sr.addArtifact(a);
-	        	visitor.visitFile(barrier.getResource(), sr.getArtifactList());
-        	}
-		}
-
-        // Done creating markers, now show the views
-        ViewActivater.activateView(IDs.matchingSetViewID);
-        if(errors_.size()>0) {
-        	ViewActivater.activateView(IDs.errorViewID);
-        	foundErrors=true;
-        }
-        return foundErrors;
-        
-	}
-
-}

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

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

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

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

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

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

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.classpath b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.mpi.core/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.cvsignore
deleted file mode 100644
index cd73485..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.cvsignore
+++ /dev/null

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

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.mpi.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.mpi.core/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 6ef00c5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.mpi.core; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.ptp.pldt.mpi.core.MpiPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.pldt.mpi.core,
- org.eclipse.ptp.pldt.mpi.core.actions,
- org.eclipse.ptp.pldt.mpi.core.analysis,
- org.eclipse.ptp.pldt.mpi.core.editorHelp,
- org.eclipse.ptp.pldt.mpi.core.prefs,
- org.eclipse.ptp.pldt.mpi.core.views
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.search,
- org.eclipse.help,
- org.eclipse.cdt.doc.user,
- org.eclipse.ptp.pldt.common
-Eclipse-AutoStart: true

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_keyval</title>
-<body>
-<H3>MPI_Type_create_keyval</H3>
-<PRE>
-int MPI_Type_create_keyval(MPI_Type_copy_attr_function *, MPI_Type_delete_attr_function *, int *, void *);
-</PRE>
-<DL><DD>
-Generates a new attribute key for a datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_resized</title>
-<body>
-<H3>MPI_Type_create_resized</H3>
-<PRE>
-int MPI_Type_create_resized(MPI_Datatype, MPI_Aint, MPI_Aint, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Duplicates a datatype and changes the upper bound, lower bound, and extent.
-<P></DL></font></body></html>

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

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

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_subarray</title>
-<body>
-<H3>MPI_Type_create_subarray</H3>
-<PRE>
-int MPI_Type_create_subarray(int, int [], int [], int [], int, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that represents anndims-dimensional subarray of anndims-dimensional array.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_delete_attr</title>
-<body>
-<H3>MPI_Type_delete_attr</H3>
-<PRE>
-int MPI_Type_delete_attr(MPI_Datatype, int);
-</PRE>
-<DL><DD>
-Deletes an attribute from a datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_dup</title>
-<body>
-<H3>MPI_Type_dup</H3>
-<PRE>
-int MPI_Type_dup(MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Duplicates the existing type with associated key values.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_extent</title>
-<body>
-<H3>MPI_Type_extent</H3>
-<PRE>
-int MPI_Type_extent(MPI_Datatype, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the extent of any defined datatype.
-<P></DL></font></body></html>

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

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

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_free</title>
-<body>
-<H3>MPI_Type_free</H3>
-<PRE>
-int MPI_Type_free(MPI_Datatype *);
-</PRE>
-<DL><DD>
-Marks a derived datatype for deallocation and sets its handle to MPI_DATATYPE_NULL.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_free_keyval</title>
-<body>
-<H3>MPI_Type_free_keyval</H3>
-<PRE>
-int MPI_Type_free_keyval(int *);
-</PRE>
-<DL><DD>
-Frees a datatype key value.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_attr</title>
-<body>
-<H3>MPI_Type_get_attr</H3>
-<PRE>
-int MPI_Type_get_attr(MPI_Datatype, int, void *, int *);
-</PRE>
-<DL><DD>
-Attaches an attribute to a datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_contents</title>
-<body>
-<H3>MPI_Type_get_contents</H3>
-<PRE>
-int MPI_Type_get_contents(MPI_Datatype, int, int, int, int [], MPI_Aint [], MPI_Datatype []);
-</PRE>
-<DL><DD>
-Obtains the arguments used in the creation of the datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_envelope</title>
-<body>
-<H3>MPI_Type_get_envelope</H3>
-<PRE>
-int MPI_Type_get_envelope(MPI_Datatype, int *, int *, int *, int *);
-</PRE>
-<DL><DD>
-Determines the constructor that was used to create the datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_extent</title>
-<body>
-<H3>MPI_Type_get_extent</H3>
-<PRE>
-int MPI_Type_get_extent(MPI_Datatype, MPI_Aint *, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the lower bound and the extent of any defined datatype.
-<P></DL></font></body></html>

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

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

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_true_extent</title>
-<body>
-<H3>MPI_Type_get_true_extent</H3>
-<PRE>
-int MPI_Type_get_true_extent(MPI_Datatype, MPI_Aint *, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the true extent of any defined datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_hindexed</title>
-<body>
-<H3>MPI_Type_hindexed</H3>
-<PRE>
-int MPI_Type_hindexed(int, int *, MPI_Aint *, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount distinct blocks with offsets expressed in bytes.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_hvector</title>
-<body>
-<H3>MPI_Type_hvector</H3>
-<PRE>
-int MPI_Type_hvector(int, int, MPI_Aint, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype of count blocks with stride expressed in bytes.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_indexed</title>
-<body>
-<H3>MPI_Type_indexed</H3>
-<PRE>
-int MPI_Type_indexed(int, int *, int *, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount blocks with stride in terms of defining type.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_lb</title>
-<body>
-<H3>MPI_Type_lb</H3>
-<PRE>
-int MPI_Type_lb(MPI_Datatype, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the lower bound of a datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_match_size</title>
-<body>
-<H3>MPI_Type_match_size</H3>
-<PRE>
-int MPI_Type_match_size( int, int, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a reference (handle) to one of the predefined named datatypes, not a duplicate.
-<P></DL></font></body></html>

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

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

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

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

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_size</title>
-<body>
-<H3>MPI_Type_size</H3>
-<PRE>
-int MPI_Type_size(MPI_Datatype, int *);
-</PRE>
-<DL><DD>
-Returns the number of bytes represented by any defined datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_struct</title>
-<body>
-<H3>MPI_Type_struct</H3>
-<PRE>
-int MPI_Type_struct(int, int *, MPI_Aint *, MPI_Datatype *, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount blocks, each with a distinct format and offset.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_ub</title>
-<body>
-<H3>MPI_Type_ub</H3>
-<PRE>
-int MPI_Type_ub(MPI_Datatype, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the upper bound of a datatype.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_vector</title>
-<body>
-<H3>MPI_Type_vector</H3>
-<PRE>
-int MPI_Type_vector(int, int, int, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that represents equally-spaced blocks of replicated data.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Unpack</title>
-<body>
-<H3>MPI_Unpack</H3>
-<PRE>
-int MPI_Unpack(void*, int, int *, void *, int, MPI_Datatype, MPI_Comm);
-</PRE>
-<DL><DD>
-Unpacks the message into the specified receive buffer from the specified packed buffer.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Unpack_external</title>
-<body>
-<H3>MPI_Unpack_external</H3>
-<PRE>
-int MPI_Unpack_external(char *, void *, MPI_Aint, MPI_Aint *, void *, int, MPI_Datatype);int MPI_Win_create_errhandler(MPI_Win_errhandler_fn *, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Unpacks the message into the specified receive buffer from the specified packed buffer, using the external32 data format.
-<P></DL></font></body></html>

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

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

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

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

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Waitany</title>
-<body>
-<H3>MPI_Waitany</H3>
-<PRE>
-int MPI_Waitany(int, MPI_Request *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Waits for any specified non-blocking operation to complete.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Waitsome</title>
-<body>
-<H3>MPI_Waitsome</H3>
-<PRE>
-int MPI_Waitsome(int, MPI_Request *, int *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Waits for at least one of a list of non-blocking operations to complete.
-<P></DL></font></body></html>

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

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_c2f</title>
-<body>
-<H3>MPI_Win_c2f</H3>
-<PRE>
-MPI_Fint MPI_Win_c2f(MPI_Win);
-</PRE>
-<DL><DD>
-Translates a C window handle into a FORTRAN handle to the same window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html
deleted file mode 100644
index 428e9b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_call_errhandler</title>
-<body>
-<H3>MPI_Win_call_errhandler</H3>
-<PRE>
-int MPI_Win_call_errhandler(MPI_Win, int);
-</PRE>
-<DL><DD>
-Calls the error handler assigned to the window with the error code supplied.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html
deleted file mode 100644
index 57d225d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_complete</title>
-<body>
-<H3>MPI_Win_complete</H3>
-<PRE>
-int MPI_Win_complete(MPI_Win);
-</PRE>
-<DL><DD>
-Completes an RMA access epoch on a window object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html
deleted file mode 100644
index a47ac7f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_create</title>
-<body>
-<H3>MPI_Win_create</H3>
-<PRE>
-int MPI_Win_create(void *, MPI_Aint, int, MPI_Info, MPI_Comm, MPI_Win *);
-</PRE>
-<DL><DD>
-Allows each task in an intra-communicator group to specify a "window" in its memory that is made accessible to accesses by remote tasks.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html
deleted file mode 100644
index 5d907b7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_create_errhandler</title>
-<body>
-<H3>MPI_Win_create_errhandler</H3>
-<PRE>
-int MPI_Win_create_errhandler(MPI_Win_errhandler_fn *, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Creates an error handler that can be attached to windows.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html
deleted file mode 100644
index b4f056b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_create_keyval</title>
-<body>
-<H3>MPI_Win_create_keyval</H3>
-<PRE>
-int MPI_Win_create_keyval(MPI_Win_copy_attr_function *, MPI_Win_delete_attr_function *, int *, void *);
-</PRE>
-<DL><DD>
-Generates a new window attribute key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html
deleted file mode 100644
index 4d8d1e9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_delete_attr</title>
-<body>
-<H3>MPI_Win_delete_attr</H3>
-<PRE>
-int MPI_Win_delete_attr(MPI_Win, int);
-</PRE>
-<DL><DD>
-Deletes an attribute from a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html
deleted file mode 100644
index e396dce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_f2c</title>
-<body>
-<H3>MPI_Win_f2c</H3>
-<PRE>
-MPI_Win MPI_Win_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html
deleted file mode 100644
index 645864a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_fence</title>
-<body>
-<H3>MPI_Win_fence</H3>
-<PRE>
-int MPI_Win_fence(int, MPI_Win);
-</PRE>
-<DL><DD>
-Synchronizes RMA calls on a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html
deleted file mode 100644
index 58794e2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_free</title>
-<body>
-<H3>MPI_Win_free</H3>
-<PRE>
-int MPI_Win_free(MPI_Win *);
-</PRE>
-<DL><DD>
-Frees the window object and returns a null handle (equal to MPI_WIN_NULL).
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html
deleted file mode 100644
index a2f3d3e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_free_keyval</title>
-<body>
-<H3>MPI_Win_free_keyval</H3>
-<PRE>
-int MPI_Win_free_keyval(int *);
-</PRE>
-<DL><DD>
-Marks a window attribute key for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html
deleted file mode 100644
index c67bcdc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_attr</title>
-<body>
-<H3>MPI_Win_get_attr</H3>
-<PRE>
-int MPI_Win_get_attr(MPI_Win, int, void *, int *);
-</PRE>
-<DL><DD>
-Retrieves the window attribute value identified by the key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html
deleted file mode 100644
index 184d1bb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_errhandler</title>
-<body>
-<H3>MPI_Win_get_errhandler</H3>
-<PRE>
-int MPI_Win_get_errhandler(MPI_Win, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Retrieves the error handler currently associated with a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html
deleted file mode 100644
index cd7d92c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_group</title>
-<body>
-<H3>MPI_Win_get_group</H3>
-<PRE>
-int MPI_Win_get_group(MPI_Win, MPI_Group *);
-</PRE>
-<DL><DD>
-Returns a duplicate of the group of the communicator used to create a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html
deleted file mode 100644
index 529cb6f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_name</title>
-<body>
-<H3>MPI_Win_get_name</H3>
-<PRE>
-int MPI_Win_get_name(MPI_Win, char *, int *);
-</PRE>
-<DL><DD>
-Returns the name that was last associated with a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html
deleted file mode 100644
index 3e2dad6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_lock</title>
-<body>
-<H3>MPI_Win_lock</H3>
-<PRE>
-int MPI_Win_lock(int, int, int, MPI_Win);
-</PRE>
-<DL><DD>
-Starts an RMA access epoch at the target task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html
deleted file mode 100644
index 3b770ab..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_post</title>
-<body>
-<H3>MPI_Win_post</H3>
-<PRE>
-int MPI_Win_post(MPI_Group, int, MPI_Win);
-</PRE>
-<DL><DD>
-Starts an RMA exposure epoch for a local window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html
deleted file mode 100644
index 0d59083..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_set_attr</title>
-<body>
-<H3>MPI_Win_set_attr</H3>
-<PRE>
-int MPI_Win_set_attr(MPI_Win, int, void *);
-</PRE>
-<DL><DD>
-Attaches the window attribute value to the window and associates it with the key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html
deleted file mode 100644
index 83aa106..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_set_errhandler</title>
-<body>
-<H3>MPI_Win_set_errhandler</H3>
-<PRE>
-int MPI_Win_set_errhandler(MPI_Win, MPI_Errhandler);
-</PRE>
-<DL><DD>
-Attaches a new error handler to a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html
deleted file mode 100644
index a5e6f41..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_set_name</title>
-<body>
-<H3>MPI_Win_set_name</H3>
-<PRE>
-int MPI_Win_set_name(MPI_Win, char *);
-</PRE>
-<DL><DD>
-Associates a name string with a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html
deleted file mode 100644
index ae31b05..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_start</title>
-<body>
-<H3>MPI_Win_start</H3>
-<PRE>
-int MPI_Win_start(MPI_Group, int, MPI_Win);
-</PRE>
-<DL><DD>
-Starts an RMA access epoch for a window object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html
deleted file mode 100644
index 0d2921d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_test</title>
-<body>
-<H3>MPI_Win_test</H3>
-<PRE>
-int MPI_Win_test(MPI_Win, int *);
-</PRE>
-<DL><DD>
-Tries to complete an RMA exposure epoch.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html
deleted file mode 100644
index 5dc4e45..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_unlock</title>
-<body>
-<H3>MPI_Win_unlock</H3>
-<PRE>
-int MPI_Win_unlock(int, MPI_Win);
-</PRE>
-<DL><DD>
-Completes an RMA access epoch at the target task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html
deleted file mode 100644
index 6816c8c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_wait</title>
-<body>
-<H3>MPI_Win_wait</H3>
-<PRE>
-int MPI_Win_wait(MPI_Win);
-</PRE>
-<DL><DD>
-Completes an RMA exposure epoch.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html
deleted file mode 100644
index d4c0e0d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Wtick</title>
-<body>
-<H3>MPI_Wtick</H3>
-<PRE>
-double MPI_Wtick(void);
-</PRE>
-<DL><DD>
-Returns the resolution of MPI_WTIME in seconds.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html
deleted file mode 100644
index c530a20..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Wtime</title>
-<body>
-<H3>MPI_Wtime</H3>
-<PRE>
-double MPI_Wtime(void);
-</PRE>
-<DL><DD>
-Returns the current value of time as a floating-point value.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore
deleted file mode 100644
index 32f2eb8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-pspbrwse.jbf

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif
deleted file mode 100644
index 1a2b28a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml
deleted file mode 100644
index 2fee68c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml
+++ /dev/null

@@ -1,3097 +0,0 @@
-<?xml version="1.0"?>
-<allFunctions>
-<function>
-<cname>MPI_Abort</cname>
-<cppname>MPI::Comm::Abort</cppname>
-<fname>MPI_ABORT</fname>
-<namespace></namespace>
-<description>Forces all tasks of an MPI job to terminate.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Abort</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Accumulate</cname>
-<cppname>MPI::Win::Accumulate</cppname>
-<fname>MPI_ACCUMULATE</fname>
-<namespace></namespace>
-<description>Accumulates, according to the specified reduction operation, the contents of the origin buffer to the specified target buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Accumulate</name>
-<arguments>void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype,  MPI_Op, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Add_error_class</cname>
-<cppname>MPI::Add_error_class</cppname>
-<fname>MPI_ADD_ERROR_CLASS</fname>
-<namespace></namespace>
-<description>Creates a new error class and returns the value for it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Add_error_class</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Add_error_code</cname>
-<cppname>MPI::Add_error_code</cppname>
-<fname>MPI_ADD_ERROR_CODE</fname>
-<namespace></namespace>
-<description>Creates a new error code and returns the value for it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Add_error_code</name>
-<arguments>int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Add_error_string</cname>
-<cppname>MPI::Add_error_string</cppname>
-<fname>MPI_ADD_ERROR_STRING</fname>
-<namespace></namespace>
-<description>Associates an error string with an error code or class.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Add_error_string</name>
-<arguments>int, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Address</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ADDRESS</fname>
-<namespace></namespace>
-<description>Returns the address of a location in memory.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Address</name>
-<arguments>void*, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Allgather</cname>
-<cppname>MPI::Comm::Allgather</cppname>
-<fname>MPI_ALLGATHER</fname>
-<namespace></namespace>
-<description>Collects messages from each task and distributes the resulting message to each.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Allgather</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Allgatherv</cname>
-<cppname>MPI::Comm::Allgatherv</cppname>
-<fname>MPI_ALLGATHERV</fname>
-<namespace></namespace>
-<description>Collects messages from each task and distributes the resulting message to all tasks. Messages can have variable sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Allgatherv</name>
-<arguments>void* , int, MPI_Datatype, void*, int *, int *, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alloc_mem</cname>
-<cppname>MPI::Alloc_mem</cppname>
-<fname>MPI_ALLOC_MEM</fname>
-<namespace></namespace>
-<description>Allocates storage and returns a pointer to it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alloc_mem</name>
-<arguments>MPI_Aint, MPI_Info info, void *baseptr</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Allreduce</cname>
-<cppname>MPI::Comm::Allreduce</cppname>
-<fname>MPI_ALLREDUCE</fname>
-<namespace></namespace>
-<description>Applies a reduction operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Allreduce</name>
-<arguments>void* , void*, int, MPI_Datatype, MPI_Op, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alltoall</cname>
-<cppname>MPI::Comm::Alltoall</cppname>
-<fname>MPI_ALLTOALL</fname>
-<namespace></namespace>
-<description>Sends a distinct message from each task to every task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alltoall</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alltoallv</cname>
-<cppname>MPI::Comm::Alltoallv</cppname>
-<fname>MPI_ALLTOALLV</fname>
-<namespace></namespace>
-<description>Sends a distinct message from each task to every task. Messages can have different sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alltoallv</name>
-<arguments>void* , int *, int *, MPI_Datatype, void*, int *, int *, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alltoallw</cname>
-<cppname>MPI::Comm::Alltoallw</cppname>
-<fname>MPI_ALLTOALLW</fname>
-<namespace></namespace>
-<description>Sends a distinct message from each task to every task. Messages can have different datatypes, sizes, and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alltoallw</name>
-<arguments>void *, int [], int [], MPI_Datatype [], void *, int [], int [], MPI_Datatype [], MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Attr_delete</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ATTR_DELETE</fname>
-<namespace></namespace>
-<description>Removes an attribute value from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Attr_delete</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Attr_get</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ATTR_GET</fname>
-<namespace></namespace>
-<description>Retrieves an attribute value from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Attr_get</name>
-<arguments>MPI_Comm, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Attr_put</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ATTR_PUT</fname>
-<namespace></namespace>
-<description>Associates an attribute value with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Attr_put</name>
-<arguments>MPI_Comm, int, void*</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Barrier</cname>
-<cppname>MPI::Comm::Barrier</cppname>
-<fname>MPI_BARRIER</fname>
-<namespace></namespace>
-<description>Blocks each task until all tasks have called it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Barrier</name>
-<arguments>MPI_Comm </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Bcast</cname>
-<cppname>MPI::Comm::Bcast</cppname>
-<fname>MPI_BCAST</fname>
-<namespace></namespace>
-<description>Broadcasts a message from root to all tasks in the group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Bcast</name>
-<arguments>void*, int, MPI_Datatype, int, MPI_Comm </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Bsend</cname>
-<cppname>MPI::Comm::Bsend</cppname>
-<fname>MPI_BSEND</fname>
-<namespace></namespace>
-<description>Performs a blocking buffered mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Bsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Bsend_init</cname>
-<cppname>MPI::Comm::Bsend_init</cppname>
-<fname>MPI_BSEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent buffered mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Bsend_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Buffer_attach</cname>
-<cppname>MPI::Attach_buffer</cppname>
-<fname>MPI_BUFFER_ATTACH</fname>
-<namespace></namespace>
-<description>Provides MPI with a message buffer for sending.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Buffer_attach</name>
-<arguments> void*, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Buffer_detach</cname>
-<cppname>MPI::Detach_buffer</cppname>
-<fname>MPI_BUFFER_DETACH</fname>
-<namespace></namespace>
-<description>Detaches the current buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Buffer_detach</name>
-<arguments> void*, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cancel</cname>
-<cppname>MPI::Request::Cancel</cppname>
-<fname>MPI_CANCEL</fname>
-<namespace></namespace>
-<description>Marks a non-blocking operation for cancellation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cancel</name>
-<arguments>MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_coords</cname>
-<cppname>MPI::Cartcomm::Get_coords</cppname>
-<fname>MPI_CART_COORDS</fname>
-<namespace></namespace>
-<description>Translates task rank in a communicator into Cartesian task coordinates.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_coords</name>
-<arguments>MPI_Comm, int, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_create</cname>
-<cppname>MPI::Intracomm::Create_cart</cppname>
-<fname>MPI_CART_CREATE</fname>
-<namespace></namespace>
-<description>Creates a communicator containing topology information.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_create</name>
-<arguments>MPI_Comm, int, int *, int *, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_get</cname>
-<cppname>MPI::Cartcomm::Get_topo</cppname>
-<fname>MPI_CART_GET</fname>
-<namespace></namespace>
-<description>Retrieves Cartesian topology information from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_get</name>
-<arguments>MPI_Comm, int, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_map</cname>
-<cppname>MPI::Cartcomm::Map</cppname>
-<fname>MPI_CART_MAP</fname>
-<namespace></namespace>
-<description>Computes placement of tasks on the physical processor.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_map</name>
-<arguments>MPI_Comm, int, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_rank</cname>
-<cppname>MPI::Cartcomm::Get_cart_rank</cppname>
-<fname>MPI_CART_RANK</fname>
-<namespace></namespace>
-<description>Translates task coordinates into a task rank.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_rank</name>
-<arguments>MPI_Comm, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_shift</cname>
-<cppname>MPI::Cartcomm::Shift</cppname>
-<fname>MPI_CART_SHIFT</fname>
-<namespace></namespace>
-<description>Returns shifted source and destination ranks for a task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_shift</name>
-<arguments>MPI_Comm, int, int, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_sub</cname>
-<cppname>MPI::Cartcomm::Sub</cppname>
-<fname>MPI_CART_SUB</fname>
-<namespace></namespace>
-<description>Partitions a Cartesian communicator into lower-dimensional subgroups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_sub</name>
-<arguments>MPI_Comm, int *, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cartdim_get</cname>
-<cppname>MPI::Cartcomm::Get_dim</cppname>
-<fname>MPI_CARTDIM_GET</fname>
-<namespace></namespace>
-<description>Retrieves the number of Cartesian dimensions from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cartdim_get</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C communicator handle into a FORTRAN handle to the same communicator.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Comm_c2f</name>
-<arguments>MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_call_errhandler</cname>
-<cppname>MPI::Comm::Call_errhandler</cppname>
-<fname>MPI_COMM_CALL_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Calls the error handler assigned to the communicator with the error code supplied.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_call_errhandler</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_compare</cname>
-<cppname>MPI::Comm::Compare</cppname>
-<fname>MPI_COMM_COMPARE</fname>
-<namespace></namespace>
-<description>Compares the groups and contexts of two communicators.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_compare</name>
-<arguments>MPI_Comm, MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_create</cname>
-<cppname>MPI::Intercomm::Create,</cppname>
-<fname>MPI::Intracomm::Create</fname>
-<namespace></namespace>
-<description>Creates a new communicator with a given group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_create</name>
-<arguments>MPI_Comm, MPI_Group, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_create_errhandler</cname>
-<cppname>MPI::Comm::Create_errhandler</cppname>
-<fname>MPI_COMM_CREATE_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Creates an error handler that can be attached to communicators.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_create_errhandler</name>
-<arguments>MPI_Comm_errhandler_fn *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_create_keyval</cname>
-<cppname>MPI::Comm::Create_keyval</cppname>
-<fname>MPI_COMM_CREATE_KEYVAL</fname>
-<namespace></namespace>
-<description>Generates a new communicator attribute key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_create_keyval</name>
-<arguments>MPI_Comm_copy_attr_function *, MPI_Comm_delete_attr_function *, int *, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_delete_attr</cname>
-<cppname>MPI::Comm::Delete_attr</cppname>
-<fname>MPI_COMM_DELETE_ATTR</fname>
-<namespace></namespace>
-<description>Removes an attribute value from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_delete_attr</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_dup</cname>
-<cppname>MPI::Cartcomm::Dup,</cppname>
-<fname>MPI::Graphcomm::Dup,</fname>
-<namespace></namespace>
-<description>Creates a new communicator that is a duplicate of an existing communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_dup</name>
-<arguments>MPI_Comm, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a communicator.</description>
-<prototype>
-<returnType>MPI_Comm</returnType>
-<name>MPI_Comm_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_free</cname>
-<cppname>MPI::Comm::Free</cppname>
-<fname>MPI_COMM_FREE</fname>
-<namespace></namespace>
-<description>Marks a communicator for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_free</name>
-<arguments>MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_free_keyval</cname>
-<cppname>MPI::Comm::Free_keyval</cppname>
-<fname>MPI_COMM_FREE_KEYVAL</fname>
-<namespace></namespace>
-<description>Marks a communicator attribute key for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_free_keyval</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_get_attr</cname>
-<cppname>MPI::Comm::Get_attr</cppname>
-<fname>MPI_COMM_GET_ATTR</fname>
-<namespace></namespace>
-<description>Retrieves the communicator attribute value identified by the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_get_attr</name>
-<arguments>MPI_Comm, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_get_errhandler</cname>
-<cppname>MPI::Comm::Get_errhandler</cppname>
-<fname>MPI_COMM_GET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Retrieves the error handler currently associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_get_errhandler</name>
-<arguments>MPI_Comm, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_get_name</cname>
-<cppname>MPI::Comm::Get_name</cppname>
-<fname>MPI_COMM_GET_NAME</fname>
-<namespace></namespace>
-<description>Returns the name that was last associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_get_name</name>
-<arguments>MPI_Comm, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_group</cname>
-<cppname>MPI::Comm::Get_group</cppname>
-<fname>MPI_COMM_GROUP</fname>
-<namespace></namespace>
-<description>Returns the group handle associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_group</name>
-<arguments>MPI_Comm, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_rank</cname>
-<cppname>MPI::Comm::Get_rank</cppname>
-<fname>MPI_COMM_RANK</fname>
-<namespace></namespace>
-<description>Returns the rank of the local task in the group associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_rank</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_remote_group</cname>
-<cppname>MPI::Intercomm::Get_remote_group</cppname>
-<fname>MPI_COMM_REMOTE_GROUP</fname>
-<namespace></namespace>
-<description>Returns the handle of the remote group of an inter-communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_remote_group</name>
-<arguments>MPI_Comm, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_remote_size</cname>
-<cppname>MPI::Intercomm::Get_remote_size</cppname>
-<fname>MPI_COMM_REMOTE_SIZE</fname>
-<namespace></namespace>
-<description>Returns the size of the remote group of an inter-communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_remote_size</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_set_attr</cname>
-<cppname>MPI::Comm::Set_attr</cppname>
-<fname>MPI_COMM_SET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches the communicator attribute value to the communicator and associates it with the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_set_attr</name>
-<arguments>MPI_Comm, int, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_set_errhandler</cname>
-<cppname>MPI::Comm::Set_errhandler</cppname>
-<fname>MPI_COMM_SET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Attaches a new error handler to a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_set_errhandler</name>
-<arguments>MPI_Comm, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_set_name</cname>
-<cppname>MPI::Comm::Set_name</cppname>
-<fname>MPI_COMM_SET_NAME</fname>
-<namespace></namespace>
-<description>Associates a name string with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_set_name</name>
-<arguments>MPI_Comm, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_size</cname>
-<cppname>MPI::Comm::Get_size</cppname>
-<fname>MPI_COMM_SIZE</fname>
-<namespace></namespace>
-<description>Returns the size of the group associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_size</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_split</cname>
-<cppname>MPI::Intercomm::Split,</cppname>
-<fname>MPI::Intracomm::Split</fname>
-<namespace></namespace>
-<description>Splits a communicator into multiple communicators based on color andkey.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_split</name>
-<arguments>MPI_Comm, int, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_test_inter</cname>
-<cppname>MPI::Comm::Is_inter</cppname>
-<fname>MPI_COMM_TEST_INTER</fname>
-<namespace></namespace>
-<description>Returns the type of a communicator (intra-communicator or inter-communicator).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_test_inter</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Dims_create</cname>
-<cppname>MPI::Compute_dims</cppname>
-<fname>MPI_DIMS_CREATE</fname>
-<namespace></namespace>
-<description>Defines a Cartesian grid to balance tasks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Dims_create</name>
-<arguments>int, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_create</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ERRHANDLER_CREATE</fname>
-<namespace></namespace>
-<description>Registers a user-defined error handler.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_create</name>
-<arguments>MPI_Handler_function *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_free</cname>
-<cppname>MPI::Errhandler::Free</cppname>
-<fname>MPI_ERRHANDLER_FREE</fname>
-<namespace></namespace>
-<description>Marks an error handler for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_free</name>
-<arguments>MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_get</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ERRHANDLER_GET</fname>
-<namespace></namespace>
-<description>Gets an error handler associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_get</name>
-<arguments>MPI_Comm, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_set</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ERRHANDLER_SET</fname>
-<namespace></namespace>
-<description>Associates a new error handler with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_set</name>
-<arguments>MPI_Comm, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Error_class</cname>
-<cppname>MPI::Get_error_class</cppname>
-<fname>MPI_ERROR_CLASS</fname>
-<namespace></namespace>
-<description>Returns the error class for the corresponding error code.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Error_class</name>
-<arguments>int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Error_string</cname>
-<cppname>MPI::Get_error_string</cppname>
-<fname>MPI_ERROR_STRING</fname>
-<namespace></namespace>
-<description>Returns the error string for a given error code.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Error_string</name>
-<arguments>int, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Exscan</cname>
-<cppname>MPI::Intracomm::Exscan</cppname>
-<fname>MPI_EXSCAN</fname>
-<namespace></namespace>
-<description>Performs a prefix reduction on data distributed across the group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Exscan</name>
-<arguments>void *, void *, int, MPI_Datatype, MPI_Op, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C file handle into a FORTRAN handle to the same file.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_File_c2f</name>
-<arguments>MPI_File</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_call_errhandler</cname>
-<cppname>MPI::File::Call_errhandler</cppname>
-<fname>MPI_FILE_CALL_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Calls the error handler assigned to the file with the error code supplied.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_call_errhandler</name>
-<arguments>MPI_File, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_create_errhandler</cname>
-<cppname>MPI::File::Create_errhandler</cppname>
-<fname>MPI_FILE_CREATE_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Registers a user-defined error handler that you can associate with an open file.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_create_errhandler</name>
-<arguments>MPI_File_errhandler_fn *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a file.</description>
-<prototype>
-<returnType>MPI_File</returnType>
-<name>MPI_File_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_get_errhandler</cname>
-<cppname>MPI::File::Get_errhandler</cppname>
-<fname>MPI_FILE_GET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Retrieves the error handler currently associated with a file handle.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_get_errhandler</name>
-<arguments>MPI_File, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_set_errhandler</cname>
-<cppname>MPI::File::Set_errhandler</cppname>
-<fname>MPI_FILE_SET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Associates a new error handler with a file.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_set_errhandler</name>
-<arguments>MPI_File, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Finalize</cname>
-<cppname>MPI::Finalize</cppname>
-<fname>MPI_FINALIZE</fname>
-<namespace></namespace>
-<description>Terminates all MPI processing.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Finalize</name>
-<arguments>void</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Finalized</cname>
-<cppname>MPI::Is_finalized</cppname>
-<fname>MPI_FINALIZED</fname>
-<namespace></namespace>
-<description>Returns true if MPI_FINALIZE has completed.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Finalized</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Free_mem</cname>
-<cppname>MPI::Free_mem</cppname>
-<fname>MPI_FREE_MEM</fname>
-<namespace></namespace>
-<description>Frees a block of storage.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Free_mem</name>
-<arguments>void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Gather</cname>
-<cppname>MPI::Comm::Gather</cppname>
-<fname>MPI_GATHER</fname>
-<namespace></namespace>
-<description>Collects individual messages from each task in a group at the root task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Gather</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Gatherv</cname>
-<cppname>MPI::Comm::Gatherv</cppname>
-<fname>MPI_GATHERV</fname>
-<namespace></namespace>
-<description>Collects individual messages from each task incomm at the root task. Messages can have different sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Gatherv</name>
-<arguments>void* , int, MPI_Datatype, void*, int *, int *, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get</cname>
-<cppname>MPI::Win::Get</cppname>
-<fname>MPI_GET</fname>
-<namespace></namespace>
-<description>Transfers data from a window at the target task to the origin task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get</name>
-<arguments>void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_address</cname>
-<cppname>MPI::Get_address</cppname>
-<fname>MPI_GET_ADDRESS</fname>
-<namespace></namespace>
-<description>Returns the address of a location in memory.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_address</name>
-<arguments>void *, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_count</cname>
-<cppname>MPI::Status::Get_count</cppname>
-<fname>MPI_GET_COUNT</fname>
-<namespace></namespace>
-<description>Returns the number of elements in a message.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_count</name>
-<arguments>MPI_Status *, MPI_Datatype, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_elements</cname>
-<cppname>MPI::Status::Get_elements</cppname>
-<fname>MPI_GET_ELEMENTS</fname>
-<namespace></namespace>
-<description>Returns the number of basic elements in a message.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_elements</name>
-<arguments>MPI_Status *, MPI_Datatype, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_processor_name</cname>
-<cppname>MPI::Get_processor_name</cppname>
-<fname>MPI_GET_PROCESSOR_NAME</fname>
-<namespace></namespace>
-<description>Returns the name of the local processor.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_processor_name</name>
-<arguments>char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_version</cname>
-<cppname>MPI::Get_version</cppname>
-<fname>MPI_GET_VERSION</fname>
-<namespace></namespace>
-<description>Returns the version of the MPI standard supported.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_version</name>
-<arguments>int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_create</cname>
-<cppname>MPI::Intracomm::Create_graph</cppname>
-<fname>MPI_GRAPH_CREATE</fname>
-<namespace></namespace>
-<description>Creates a new communicator containing graph topology information.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_create</name>
-<arguments>MPI_Comm, int, int *, int *, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_get</cname>
-<cppname>MPI::Graphcomm::Get_topo</cppname>
-<fname>MPI_GRAPH_GET</fname>
-<namespace></namespace>
-<description>Retrieves graph topology information from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_get</name>
-<arguments>MPI_Comm, int, int, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_map</cname>
-<cppname>MPI::Graphcomm::Map</cppname>
-<fname>MPI_GRAPH_MAP</fname>
-<namespace></namespace>
-<description>Computes placement of tasks on the physical processor.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_map</name>
-<arguments>MPI_Comm, int, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_neighbors</cname>
-<cppname>MPI::Graphcomm::Get_neighbors</cppname>
-<fname>MPI_GRAPH_NEIGHBORS</fname>
-<namespace></namespace>
-<description>Returns the neighbors of the given task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_neighbors</name>
-<arguments>MPI_Comm, int, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_neighbors_count</cname>
-<cppname>MPI::Graphcomm::Get_neighbors_count</cppname>
-<fname>MPI_GRAPH_NEIGHBORS_COUNT</fname>
-<namespace></namespace>
-<description>Returns the number of neighbors of the given task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_neighbors_count</name>
-<arguments>MPI_Comm, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graphdims_get</cname>
-<cppname>MPI::Graphcomm::Get_dims</cppname>
-<fname>MPI_GRAPHDIMS_GET</fname>
-<namespace></namespace>
-<description>Retrieves graph topology information from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graphdims_get</name>
-<arguments>MPI_Comm, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Grequest_complete</cname>
-<cppname>MPI::Grequest::Complete</cppname>
-<fname>MPI_GREQUEST_COMPLETE</fname>
-<namespace></namespace>
-<description>Marks the generalized request complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Grequest_complete</name>
-<arguments>MPI_Request</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Grequest_start</cname>
-<cppname>MPI::Grequest::Start</cppname>
-<fname>MPI_GREQUEST_START</fname>
-<namespace></namespace>
-<description>Initializes a generalized request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Grequest_start</name>
-<arguments>MPI_Grequest_query_function *, MPI_Grequest_free_function *,MPI_Grequest_cancel_function *, void *, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C group handle into a FORTRAN handle to the same group.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Group_c2f</name>
-<arguments>MPI_Group</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_compare</cname>
-<cppname>MPI::Group::Compare</cppname>
-<fname>MPI_GROUP_COMPARE</fname>
-<namespace></namespace>
-<description>Compares the contents of two task groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_compare</name>
-<arguments>MPI_Group, MPI_Group, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_difference</cname>
-<cppname>MPI::Group::Difference</cppname>
-<fname>MPI_GROUP_DIFFERENCE</fname>
-<namespace></namespace>
-<description>Creates a new group that is the difference of two existing groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_difference</name>
-<arguments>MPI_Group, MPI_Group, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_excl</cname>
-<cppname>MPI::Group::Excl</cppname>
-<fname>MPI_GROUP_EXCL</fname>
-<namespace></namespace>
-<description>Removes selected tasks from an existing group to create a new group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_excl</name>
-<arguments>MPI_Group, int, int *, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a group.</description>
-<prototype>
-<returnType>MPI_Group</returnType>
-<name>MPI_Group_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_free</cname>
-<cppname>MPI::Group::Free</cppname>
-<fname>MPI_GROUP_FREE</fname>
-<namespace></namespace>
-<description>Marks a group for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_free</name>
-<arguments>MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_incl</cname>
-<cppname>MPI::Group::Incl</cppname>
-<fname>MPI_GROUP_INCL</fname>
-<namespace></namespace>
-<description>Creates a new group consisting of selected tasks from an existing group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_incl</name>
-<arguments>MPI_Group, int, int *, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_intersection</cname>
-<cppname>MPI::Group::Intersect</cppname>
-<fname>MPI_GROUP_INTERSECTION</fname>
-<namespace></namespace>
-<description>Creates a new group that is the intersection of two existing groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_intersection</name>
-<arguments>MPI_Group, MPI_Group, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_range_excl</cname>
-<cppname>MPI::Group::Range_excl</cppname>
-<fname>MPI_GROUP_RANGE_EXCL</fname>
-<namespace></namespace>
-<description>Creates a new group by excluding selected tasks of an existing group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_range_excl</name>
-<arguments>MPI_Group, int, int [][3], MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_range_incl</cname>
-<cppname>MPI::Group::Range_incl</cppname>
-<fname>MPI_GROUP_RANGE_INCL</fname>
-<namespace></namespace>
-<description>Creates a new group consisting of selected ranges of tasks from an existing group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_range_incl</name>
-<arguments>MPI_Group, int, int [][3], MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_rank</cname>
-<cppname>MPI::Group::Get_rank</cppname>
-<fname>MPI_GROUP_RANK</fname>
-<namespace></namespace>
-<description>Returns the rank of the local task with respect to group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_rank</name>
-<arguments>MPI_Group, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_size</cname>
-<cppname>MPI::Group::Get_size</cppname>
-<fname>MPI_GROUP_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of tasks in a group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_size</name>
-<arguments>MPI_Group, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_union</cname>
-<cppname>MPI::Group::Union</cppname>
-<fname>MPI_GROUP_UNION</fname>
-<namespace></namespace>
-<description>Creates a new group that is the union of two existing groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_union</name>
-<arguments>MPI_Group, MPI_Group, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Ibsend</cname>
-<cppname>MPI::Comm::Ibsend</cppname>
-<fname>MPI_IBSEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking buffered send.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Ibsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C Info object handle into a FORTRAN handle to the same Info object.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Info_c2f</name>
-<arguments>MPI_Info</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_create</cname>
-<cppname>MPI::Info::Create</cppname>
-<fname>MPI_INFO_CREATE</fname>
-<namespace></namespace>
-<description>Creates a new, empty Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_create</name>
-<arguments>MPI_Info *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_delete</cname>
-<cppname>MPI::Info::Delete</cppname>
-<fname>MPI_INFO_DELETE</fname>
-<namespace></namespace>
-<description>Deletes a (key, value) pair from an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_delete</name>
-<arguments>MPI_Info, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_dup</cname>
-<cppname>MPI::Info::Dup</cppname>
-<fname>MPI_INFO_DUP</fname>
-<namespace></namespace>
-<description>Duplicates an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_dup</name>
-<arguments>MPI_Info, MPI_Info *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to an Info object.</description>
-<prototype>
-<returnType>MPI_Info</returnType>
-<name>MPI_Info_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_free</cname>
-<cppname>MPI::Info::Free</cppname>
-<fname>MPI_INFO_FREE</fname>
-<namespace></namespace>
-<description>Frees an Info object and sets its handle to MPI_INFO_NULL.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_free</name>
-<arguments>MPI_Info *info</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get</cname>
-<cppname>MPI::Info::Get</cppname>
-<fname>MPI_INFO_GET</fname>
-<namespace></namespace>
-<description>Retrieves the value associated withkey in an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get</name>
-<arguments>MPI_Info, char *, int, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get_nkeys</cname>
-<cppname>MPI::Info::Get_nkeys</cppname>
-<fname>MPI_INFO_GET_NKEYS</fname>
-<namespace></namespace>
-<description>Returns the number of keys defined in an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get_nkeys</name>
-<arguments>MPI_Info, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get_nthkey</cname>
-<cppname>MPI::Info::Get_nthkey</cppname>
-<fname>MPI_INFO_GET_NTHKEY</fname>
-<namespace></namespace>
-<description>Retrieves the nth key defined in an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get_nthkey</name>
-<arguments>MPI_Info, int, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get_valuelen</cname>
-<cppname>MPI::Info::Get_valuelen</cppname>
-<fname>MPI_INFO_GET_VALUELEN</fname>
-<namespace></namespace>
-<description>Retrieves the length of the value associated with a key of an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get_valuelen</name>
-<arguments>MPI_Info, char *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_set</cname>
-<cppname>MPI::Info::Set</cppname>
-<fname>MPI_INFO_SET</fname>
-<namespace></namespace>
-<description>Adds a (key, value) pair to an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_set</name>
-<arguments>MPI_Info, char *, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Init</cname>
-<cppname>MPI::Init</cppname>
-<fname>MPI_INIT</fname>
-<namespace></namespace>
-<description>Initializes MPI.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Init</name>
-<arguments>int *, char ***</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Init_thread</cname>
-<cppname>MPI::Init_thread</cppname>
-<fname>MPI_INIT_THREAD</fname>
-<namespace></namespace>
-<description>Initializes MPI and the MPI threads environment.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Init_thread</name>
-<arguments>int *, char ***, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Initialized</cname>
-<cppname>MPI::Is_initialized</cppname>
-<fname>MPI_INITIALIZED</fname>
-<namespace></namespace>
-<description>Determines if MPI is initialized.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Initialized</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Intercomm_create</cname>
-<cppname>MPI::Intracomm::Create_intercomm</cppname>
-<fname>MPI_INTERCOMM_CREATE</fname>
-<namespace></namespace>
-<description>Creates an inter-communicator from two intra-communicators.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Intercomm_create</name>
-<arguments>MPI_Comm, int, MPI_Comm, int, int, MPI_Comm * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Intercomm_merge</cname>
-<cppname>MPI::Intercomm::Merge</cppname>
-<fname>MPI_INTERCOMM_MERGE</fname>
-<namespace></namespace>
-<description>Creates an intra-communicator by merging the local and remote groups of an inter-communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Intercomm_merge</name>
-<arguments>MPI_Comm, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Iprobe</cname>
-<cppname>MPI::Comm::Iprobe</cppname>
-<fname>MPI_IPROBE</fname>
-<namespace></namespace>
-<description>Checks to see if a message matchingsource, tag, andcomm has arrived.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Iprobe</name>
-<arguments>int, int, MPI_Comm, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Irecv</cname>
-<cppname>MPI::Comm::Irecv</cppname>
-<fname>MPI_IRECV</fname>
-<namespace></namespace>
-<description>Performs a non-blocking receive operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Irecv</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Irsend</cname>
-<cppname>MPI::Comm::Irsend</cppname>
-<fname>MPI_IRSEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking ready send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Irsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Is_thread_main</cname>
-<cppname>MPI::Is_thread_main</cppname>
-<fname>MPI_IS_THREAD_MAIN</fname>
-<namespace></namespace>
-<description>Determines whether the calling thread is the thread that called MPI_INIT or MPI_INIT_THREAD.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Is_thread_main</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Isend</cname>
-<cppname>MPI::Comm::Isend</cppname>
-<fname>MPI_ISEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking standard mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Isend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Issend</cname>
-<cppname>MPI::Comm::Issend</cppname>
-<fname>MPI_ISSEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking synchronous mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Issend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Keyval_create</cname>
-<cppname>(none)</cppname>
-<fname>MPI_KEYVAL_CREATE</fname>
-<namespace></namespace>
-<description>Generates a new communicator attribute key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Keyval_create</name>
-<arguments>MPI_Copy_function *, MPI_Delete_function *, int *, void*</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Keyval_free</cname>
-<cppname>(none)</cppname>
-<fname>MPI_KEYVAL_FREE</fname>
-<namespace></namespace>
-<description>Marks a communicator attribute key for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Keyval_free</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C reduction operation handle into a FORTRAN handle to the same operation.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Op_c2f</name>
-<arguments>MPI_Op</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_create</cname>
-<cppname>MPI::Op::Init</cppname>
-<fname>MPI_OP_CREATE</fname>
-<namespace></namespace>
-<description>Binds a user-defined reduction operation to anop handle.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Op_create</name>
-<arguments>MPI_User_function *, int, MPI_Op *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C reduction operation handle to an operation.</description>
-<prototype>
-<returnType>MPI_Op</returnType>
-<name>MPI_Op_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_free</cname>
-<cppname>MPI::Op::Free</cppname>
-<fname>MPI_OP_FREE</fname>
-<namespace></namespace>
-<description>Marks a user-defined reduction operation for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Op_free</name>
-<arguments> MPI_Op *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack</cname>
-<cppname>MPI::Datatype::Pack</cppname>
-<fname>MPI_PACK</fname>
-<namespace></namespace>
-<description>Packs the message in the specified send buffer into the specified buffer space.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack</name>
-<arguments>void*, int, MPI_Datatype, void *, int, int *,  MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack_external</cname>
-<cppname>MPI::Datatype::Pack_external</cppname>
-<fname>MPI_PACK_EXTERNAL</fname>
-<namespace></namespace>
-<description>Packs the message in the specified send buffer into the specified buffer space, using the external32 data format.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack_external</name>
-<arguments>char *, void *, int, MPI_Datatype, void *, MPI_Aint, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack_external_size</cname>
-<cppname>MPI::Datatype::Pack_external_size</cppname>
-<fname>MPI_PACK_EXTERNAL_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of bytes required to hold the data, using the external32 data format.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack_external_size</name>
-<arguments>char *, int, MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack_size</cname>
-<cppname>MPI::Datatype::Pack_size</cppname>
-<fname>MPI_PACK_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of bytes required to hold the data.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack_size</name>
-<arguments>int, MPI_Datatype, MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pcontrol</cname>
-<cppname>MPI::Pcontrol</cppname>
-<fname>MPI_PCONTROL</fname>
-<namespace></namespace>
-<description>Provides profile control.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pcontrol</name>
-<arguments>const int, ...</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Probe</cname>
-<cppname>MPI::Comm::Probe</cppname>
-<fname>MPI_PROBE</fname>
-<namespace></namespace>
-<description>Waits until a message matching source, tag, and comm arrives.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Probe</name>
-<arguments>int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Put</cname>
-<cppname>MPI::Win::Put</cppname>
-<fname>MPI_PUT</fname>
-<namespace></namespace>
-<description>Transfers data from the origin task to a window at the target task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Put</name>
-<arguments>void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Query_thread</cname>
-<cppname>MPI::Query_thread</cppname>
-<fname>MPI_QUERY_THREAD</fname>
-<namespace></namespace>
-<description>Returns the current level of threads support.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Query_thread</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Recv</cname>
-<cppname>MPI::Comm::Recv</cppname>
-<fname>MPI_RECV</fname>
-<namespace></namespace>
-<description>Performs a blocking receive operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Recv</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Recv_init</cname>
-<cppname>MPI::Comm::Recv_init</cppname>
-<fname>MPI_RECV_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent receive request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Recv_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Reduce</cname>
-<cppname>MPI::Comm::Reduce</cppname>
-<fname>MPI_REDUCE</fname>
-<namespace></namespace>
-<description>Applies a reduction operation to the vectorsendbuf over the set of tasks specified bycomm and places the result in recvbuf on root.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Reduce</name>
-<arguments>void* , void*, int, MPI_Datatype, MPI_Op, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Reduce_scatter</cname>
-<cppname>MPI::Comm::Reduce_scatter</cppname>
-<fname>MPI_REDUCE_SCATTER</fname>
-<namespace></namespace>
-<description>Applies a reduction operation to the vectorsendbuf over the set of tasks specified bycomm and scatters the result according to the values in recvcounts.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Reduce_scatter</name>
-<arguments>void* , void*, int *, MPI_Datatype, MPI_Op, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C request handle into a FORTRAN handle to the same request.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Request_c2f</name>
-<arguments>MPI_Request</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a request.</description>
-<prototype>
-<returnType>MPI_Request</returnType>
-<name>MPI_Request_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_free</cname>
-<cppname>MPI::Request::Free</cppname>
-<fname>MPI_REQUEST_FREE</fname>
-<namespace></namespace>
-<description>Marks a request for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Request_free</name>
-<arguments>MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_get_status</cname>
-<cppname>MPI::Request::Get_status</cppname>
-<fname>MPI_REQUEST_GET_STATUS</fname>
-<namespace></namespace>
-<description>Accesses the information associated with a request, without freeing the request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Request_get_status</name>
-<arguments>MPI_Request, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Rsend</cname>
-<cppname>MPI::Comm::Rsend</cppname>
-<fname>MPI_RSEND</fname>
-<namespace></namespace>
-<description>Performs a blocking ready mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Rsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Rsend_init</cname>
-<cppname>MPI::Comm::Rsend_init</cppname>
-<fname>MPI_RSEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent ready mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Rsend_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Scan</cname>
-<cppname>MPI::Intracomm::Scan</cppname>
-<fname>MPI_SCAN</fname>
-<namespace></namespace>
-<description>Performs a parallel prefix reduction on data distributed across a group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Scan</name>
-<arguments>void* , void*, int, MPI_Datatype, MPI_Op, MPI_Comm </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Scatter</cname>
-<cppname>MPI::Comm::Scatter</cppname>
-<fname>MPI_SCATTER</fname>
-<namespace></namespace>
-<description>Distributes individual messages fromroot to each task in comm.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Scatter</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Scatterv</cname>
-<cppname>MPI::Comm::Scatterv</cppname>
-<fname>MPI_SCATTERV</fname>
-<namespace></namespace>
-<description>Distributes individual messages fromroot to each task in comm. Messages can have different sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Scatterv</name>
-<arguments>void* , int *, int *,  MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Send</cname>
-<cppname>MPI::Comm::Send</cppname>
-<fname>MPI_SEND</fname>
-<namespace></namespace>
-<description>Blocking standard mode send.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Send</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Send_init</cname>
-<cppname>MPI::Comm::Send_init</cppname>
-<fname>MPI_SEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent standard mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Send_init</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Sendrecv</cname>
-<cppname>MPI::Comm::Sendrecv</cppname>
-<fname>MPI_SENDRECV</fname>
-<namespace></namespace>
-<description>Performs a blocking send and receive operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Sendrecv</name>
-<arguments>void *, int, MPI_Datatype,int, int, void *, int, MPI_Datatype, int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Sendrecv_replace</cname>
-<cppname>MPI::Comm::Sendrecv_replace</cppname>
-<fname>MPI_SENDRECV_REPLACE</fname>
-<namespace></namespace>
-<description>Performs a blocking send and receive operation using a common buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Sendrecv_replace</name>
-<arguments>void*, int, MPI_Datatype, int, int, int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Ssend</cname>
-<cppname>MPI::Comm::Ssend</cppname>
-<fname>MPI_SSEND</fname>
-<namespace></namespace>
-<description>Performs a blocking synchronous mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Ssend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Ssend_init</cname>
-<cppname>MPI::Comm::Ssend_init</cppname>
-<fname>MPI_SSEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent synchronous mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Ssend_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Start</cname>
-<cppname>MPI::Prequest::Start</cppname>
-<fname>MPI_START</fname>
-<namespace></namespace>
-<description>Activates a persistent request operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Start</name>
-<arguments>MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Startall</cname>
-<cppname>MPI::Prequest::Startall</cppname>
-<fname>MPI_STARTALL</fname>
-<namespace></namespace>
-<description>Activates a collection of persistent request operations.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Startall</name>
-<arguments>int, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C status object into a FORTRAN status object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_c2f</name>
-<arguments>MPI_Status *, MPI_Fint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Converts a FORTRAN status object into a C status object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_f2c</name>
-<arguments>MPI_Fint *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_set_cancelled</cname>
-<cppname>MPI::Status::Set_cancelled</cppname>
-<fname>MPI_STATUS_SET_CANCELLED</fname>
-<namespace></namespace>
-<description>Defines cancellation information for a request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_set_cancelled</name>
-<arguments>MPI_Status *, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_set_elements</cname>
-<cppname>MPI::Status::Set_elements</cppname>
-<fname>MPI_STATUS_SET_ELEMENTS</fname>
-<namespace></namespace>
-<description>Defines element information for a request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_set_elements</name>
-<arguments>MPI_Status *, MPI_Datatype, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Test</cname>
-<cppname>MPI::Request::Test</cppname>
-<fname>MPI_TEST</fname>
-<namespace></namespace>
-<description>Checks to see if a non-blocking operation has completed.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Test</name>
-<arguments>MPI_Request *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Test_cancelled</cname>
-<cppname>MPI::Status::Is_cancelled</cppname>
-<fname>MPI_TEST_CANCELLED</fname>
-<namespace></namespace>
-<description>Tests whether a non-blocking operation was cancelled.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Test_cancelled</name>
-<arguments>MPI_Status *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Testall</cname>
-<cppname>MPI::Request::Testall</cppname>
-<fname>MPI_TESTALL</fname>
-<namespace></namespace>
-<description>Tests a collection of non-blocking operations for completion.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Testall</name>
-<arguments>int, MPI_Request *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Testany</cname>
-<cppname>MPI::Request::Testany</cppname>
-<fname>MPI_TESTANY</fname>
-<namespace></namespace>
-<description>Tests for the completion of any specified non-blocking operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Testany</name>
-<arguments>int, MPI_Request *, int *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Testsome</cname>
-<cppname>MPI::Request::Testsome</cppname>
-<fname>MPI_TESTSOME</fname>
-<namespace></namespace>
-<description>Tests a collection of non-blocking operations for completion.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Testsome</name>
-<arguments>int, MPI_Request *, int *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Topo_test</cname>
-<cppname>MPI::Comm::Get_topology</cppname>
-<fname>MPI_TOPO_TEST</fname>
-<namespace></namespace>
-<description>Returns the type of virtual topology associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Topo_test</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C datatype handle into a FORTRAN handle to the same datatype.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Type_c2f</name>
-<arguments>MPI_Datatype</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_commit</cname>
-<cppname>MPI::Datatype::Commit</cppname>
-<fname>MPI_TYPE_COMMIT</fname>
-<namespace></namespace>
-<description>Makes a datatype ready for use in communication.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_commit</name>
-<arguments>MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_contiguous</cname>
-<cppname>MPI::Datatype::Create_contiguous</cppname>
-<fname>MPI_TYPE_CONTIGUOUS</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents the concatenation of count instances ofoldtype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_contiguous</name>
-<arguments>int, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_darray</cname>
-<cppname>MPI::Datatype::Create_darray</cppname>
-<fname>MPI_TYPE_CREATE_DARRAY</fname>
-<namespace></namespace>
-<description>Generates the datatypes corresponding to an HPF-like distribution of an ndims-dimensional array of oldtype elements onto anndims-dimensional grid of logical tasks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_darray</name>
-<arguments>int, int, int, int [], int [], int [], int [], int,MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_f90_complex</cname>
-<cppname>MPI::Datatype::Create_f90_complex</cppname>
-<fname>MPI_TYPE_CREATE_F90_COMPLEX</fname>
-<namespace></namespace>
-<description>Returns a predefined MPI datatype that matches a COMPLEX variable of KIND selected_real_kind(p, r).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_f90_complex</name>
-<arguments> int, int, MPI_Datatype * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_f90_integer</cname>
-<cppname>MPI::Datatype::Create_f90_integer</cppname>
-<fname>MPI_TYPE_CREATE_F90_INTEGER</fname>
-<namespace></namespace>
-<description>Returns a predefined MPI datatype that matches an INTEGER variable of KIND selected_integer_kind(r).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_f90_integer</name>
-<arguments> int, MPI_Datatype * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_f90_real</cname>
-<cppname>MPI::Datatype::Create_f90_real</cppname>
-<fname>MPI_TYPE_CREATE_F90_REAL</fname>
-<namespace></namespace>
-<description>Returns a predefined MPI datatype that matches a REAL variable of KIND selected_real_kind(p, r).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_f90_real</name>
-<arguments> int, int, MPI_Datatype * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_hindexed</cname>
-<cppname>MPI::Datatype::Create_hindexed</cppname>
-<fname>MPI_TYPE_CREATE_HINDEXED</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks. Each block is defined by an entry in array_of_blocklengths andarray_of_displacements. Displacements are expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_hindexed</name>
-<arguments>int, int [], MPI_Aint [], MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_hvector</cname>
-<cppname>MPI::Datatype::Create_hvector</cppname>
-<fname>MPI_TYPE_CREATE_HVECTOR</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents equally-spaced blocks. The spacing between the start of each block is given in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_hvector</name>
-<arguments>int, int, MPI_Aint, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_indexed_block</cname>
-<cppname>MPI::Datatype::Create_indexed_block</cppname>
-<fname>MPI_TYPE_CREATE_INDEXED_BLOCK</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_indexed_block</name>
-<arguments>int, int, int [], MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_keyval</cname>
-<cppname>MPI::Datatype::Create_keyval</cppname>
-<fname>MPI_TYPE_CREATE_KEYVAL</fname>
-<namespace></namespace>
-<description>Generates a new attribute key for a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_keyval</name>
-<arguments>MPI_Type_copy_attr_function *, MPI_Type_delete_attr_function *, int *, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_resized</cname>
-<cppname>MPI::Datatype::Create_resized</cppname>
-<fname>MPI_TYPE_CREATE_RESIZED</fname>
-<namespace></namespace>
-<description>Duplicates a datatype and changes the upper bound, lower bound, and extent.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_resized</name>
-<arguments>MPI_Datatype, MPI_Aint, MPI_Aint, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_struct</cname>
-<cppname>MPI::Datatype::Create_struct</cppname>
-<fname>MPI_TYPE_CREATE_STRUCT</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks. Each block is defined by an entry in array_of_blocklengths,array_of_displacements, and array_of_types. Displacements are expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_struct</name>
-<arguments>int, int [], MPI_Aint [], MPI_Datatype [], MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_subarray</cname>
-<cppname>MPI::Datatype::Create_subarray</cppname>
-<fname>MPI_TYPE_CREATE_SUBARRAY</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents anndims-dimensional subarray of anndims-dimensional array.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_subarray</name>
-<arguments>int, int [], int [], int [], int, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_delete_attr</cname>
-<cppname>MPI::Datatype::Delete_attr</cppname>
-<fname>MPI_TYPE_DELETE_ATTR</fname>
-<namespace></namespace>
-<description>Deletes an attribute from a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_delete_attr</name>
-<arguments>MPI_Datatype, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_dup</cname>
-<cppname>MPI::Datatype::Dup</cppname>
-<fname>MPI_TYPE_DUP</fname>
-<namespace></namespace>
-<description>Duplicates the existing type with associated key values.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_dup</name>
-<arguments>MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_extent</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_EXTENT</fname>
-<namespace></namespace>
-<description>Returns the extent of any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_extent</name>
-<arguments>MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a datatype.</description>
-<prototype>
-<returnType>MPI_Datatype</returnType>
-<name>MPI_Type_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_free</cname>
-<cppname>MPI::Datatype::Free</cppname>
-<fname>MPI_TYPE_FREE</fname>
-<namespace></namespace>
-<description>Marks a derived datatype for deallocation and sets its handle to MPI_DATATYPE_NULL.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_free</name>
-<arguments>MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_free_keyval</cname>
-<cppname>MPI::Datatype::Free_keyval</cppname>
-<fname>MPI_TYPE_FREE_KEYVAL</fname>
-<namespace></namespace>
-<description>Frees a datatype key value.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_free_keyval</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_attr</cname>
-<cppname>MPI::Datatype::Get_attr</cppname>
-<fname>MPI_TYPE_GET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches an attribute to a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_attr</name>
-<arguments>MPI_Datatype, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_contents</cname>
-<cppname>MPI::Datatype::Get_contents</cppname>
-<fname>MPI_TYPE_GET_CONTENTS</fname>
-<namespace></namespace>
-<description>Obtains the arguments used in the creation of the datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_contents</name>
-<arguments>MPI_Datatype, int, int, int, int [], MPI_Aint [], MPI_Datatype []</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_envelope</cname>
-<cppname>MPI::Datatype::Get_envelope</cppname>
-<fname>MPI_TYPE_GET_ENVELOPE</fname>
-<namespace></namespace>
-<description>Determines the constructor that was used to create the datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_envelope</name>
-<arguments>MPI_Datatype, int *, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_extent</cname>
-<cppname>MPI::Datatype::Get_extent</cppname>
-<fname>MPI_TYPE_GET_EXTENT</fname>
-<namespace></namespace>
-<description>Returns the lower bound and the extent of any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_extent</name>
-<arguments>MPI_Datatype, MPI_Aint *, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_name</cname>
-<cppname>MPI::Datatype::Get_name</cppname>
-<fname>MPI_TYPE_GET_NAME</fname>
-<namespace></namespace>
-<description>Returns the name that was last associated with a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_name</name>
-<arguments>MPI_Datatype, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_true_extent</cname>
-<cppname>MPI::Datatype::Get_true_extent</cppname>
-<fname>MPI_TYPE_GET_TRUE_EXTENT</fname>
-<namespace></namespace>
-<description>Returns the true extent of any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_true_extent</name>
-<arguments>MPI_Datatype, MPI_Aint *, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_hindexed</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_HINDEXED</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount distinct blocks with offsets expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_hindexed</name>
-<arguments>int, int *, MPI_Aint *, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_hvector</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_HVECTOR</fname>
-<namespace></namespace>
-<description>Returns a new datatype of count blocks with stride expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_hvector</name>
-<arguments>int, int, MPI_Aint, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_indexed</cname>
-<cppname>MPI::Datatype::Create_indexed</cppname>
-<fname>MPI_TYPE_INDEXED</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks with stride in terms of defining type.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_indexed</name>
-<arguments>int, int *, int *, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_lb</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_LB</fname>
-<namespace></namespace>
-<description>Returns the lower bound of a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_lb</name>
-<arguments>MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_match_size</cname>
-<cppname>MPI::Datatype::Match_size</cppname>
-<fname>MPI_TYPE_CREATE_MATCH_SIZE</fname>
-<namespace></namespace>
-<description>Returns a reference (handle) to one of the predefined named datatypes, not a duplicate.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_match_size</name>
-<arguments> int, int, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_set_attr</cname>
-<cppname>MPI::Datatype::Set_attr</cppname>
-<fname>MPI_TYPE_SET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches the datatype attribute value to the datatype and associates it with the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_set_attr</name>
-<arguments>MPI_Datatype, int, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_set_name</cname>
-<cppname>MPI::Datatype::Set_name</cppname>
-<fname>MPI_TYPE_SET_NAME</fname>
-<namespace></namespace>
-<description>Associates a name string with a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_set_name</name>
-<arguments>MPI_Datatype, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_size</cname>
-<cppname>MPI::Datatype::Get_size</cppname>
-<fname>MPI_TYPE_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of bytes represented by any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_size</name>
-<arguments>MPI_Datatype, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_struct</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_STRUCT</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks, each with a distinct format and offset.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_struct</name>
-<arguments>int, int *, MPI_Aint *, MPI_Datatype *, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_ub</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_UB</fname>
-<namespace></namespace>
-<description>Returns the upper bound of a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_ub</name>
-<arguments>MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_vector</cname>
-<cppname>MPI::Datatype::Create_vector</cppname>
-<fname>MPI_TYPE_VECTOR</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents equally-spaced blocks of replicated data.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_vector</name>
-<arguments>int, int, int, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Unpack</cname>
-<cppname>MPI::Datatype::Unpack</cppname>
-<fname>MPI_UNPACK</fname>
-<namespace></namespace>
-<description>Unpacks the message into the specified receive buffer from the specified packed buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Unpack</name>
-<arguments>void*, int, int *, void *, int, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Unpack_external</cname>
-<cppname>MPI::Datatype::Unpack_external</cppname>
-<fname>MPI_UNPACK_EXTERNAL</fname>
-<namespace></namespace>
-<description>Unpacks the message into the specified receive buffer from the specified packed buffer, using the external32 data format.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Unpack_external</name>
-<arguments>char *, void *, MPI_Aint, MPI_Aint *, void *, int, MPI_Datatype</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Wait</cname>
-<cppname>MPI::Request::Wait</cppname>
-<fname>MPI_WAIT</fname>
-<namespace></namespace>
-<description>Waits for a non-blocking operation to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Wait</name>
-<arguments>MPI_Request *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Waitall</cname>
-<cppname>MPI::Request::Waitall</cppname>
-<fname>MPI_WAITALL</fname>
-<namespace></namespace>
-<description>Waits for a collection of non-blocking operations to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Waitall</name>
-<arguments>int, MPI_Request *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Waitany</cname>
-<cppname>MPI::Request::Waitany</cppname>
-<fname>MPI_WAITANY</fname>
-<namespace></namespace>
-<description>Waits for any specified non-blocking operation to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Waitany</name>
-<arguments>int, MPI_Request *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Waitsome</cname>
-<cppname>MPI::Request::Waitsome</cppname>
-<fname>MPI_WAITSOME</fname>
-<namespace></namespace>
-<description>Waits for at least one of a list of non-blocking operations to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Waitsome</name>
-<arguments>int, MPI_Request *, int *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C window handle into a FORTRAN handle to the same window.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Win_c2f</name>
-<arguments>MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_call_errhandler</cname>
-<cppname>MPI::Win::Call_errhandler</cppname>
-<fname>MPI_WIN_CALL_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Calls the error handler assigned to the window with the error code supplied.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_call_errhandler</name>
-<arguments>MPI_Win, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_complete</cname>
-<cppname>MPI::Win::Complete</cppname>
-<fname>MPI_WIN_COMPLETE</fname>
-<namespace></namespace>
-<description>Completes an RMA access epoch on a window object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_complete</name>
-<arguments>MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_create</cname>
-<cppname>MPI::Win::Create</cppname>
-<fname>MPI_WIN_CREATE</fname>
-<namespace></namespace>
-<description>Allows each task in an intra-communicator group to specify a "window" in its memory that is made accessible to accesses by remote tasks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_create</name>
-<arguments>void *, MPI_Aint, int, MPI_Info, MPI_Comm, MPI_Win *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_create_errhandler</cname>
-<cppname>MPI::Win::Create_errhandler</cppname>
-<fname>MPI_WIN_CREATE_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Creates an error handler that can be attached to windows.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_create_errhandler</name>
-<arguments>MPI_Win_errhandler_fn *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_create_keyval</cname>
-<cppname>MPI::Win::Create_keyval</cppname>
-<fname>MPI_WIN_CREATE_KEYVAL</fname>
-<namespace></namespace>
-<description>Generates a new window attribute key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_create_keyval</name>
-<arguments>MPI_Win_copy_attr_function *, MPI_Win_delete_attr_function *, int *, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_delete_attr</cname>
-<cppname>MPI::Win::Delete_attr</cppname>
-<fname>MPI_WIN_DELETE_ATTR</fname>
-<namespace></namespace>
-<description>Deletes an attribute from a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_delete_attr</name>
-<arguments>MPI_Win, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a window.</description>
-<prototype>
-<returnType>MPI_Win</returnType>
-<name>MPI_Win_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_fence</cname>
-<cppname>MPI::Win::Fence</cppname>
-<fname>MPI_WIN_FENCE</fname>
-<namespace></namespace>
-<description>Synchronizes RMA calls on a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_fence</name>
-<arguments>int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_free</cname>
-<cppname>MPI::Win::Free</cppname>
-<fname>MPI_WIN_FREE</fname>
-<namespace></namespace>
-<description>Frees the window object and returns a null handle (equal to MPI_WIN_NULL).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_free</name>
-<arguments>MPI_Win *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_free_keyval</cname>
-<cppname>MPI::Win::Free_keyval</cppname>
-<fname>MPI_WIN_FREE_KEYVAL</fname>
-<namespace></namespace>
-<description>Marks a window attribute key for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_free_keyval</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_attr</cname>
-<cppname>MPI::Win::Get_attr</cppname>
-<fname>MPI_WIN_GET_ATTR</fname>
-<namespace></namespace>
-<description>Retrieves the window attribute value identified by the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_attr</name>
-<arguments>MPI_Win, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_errhandler</cname>
-<cppname>MPI::Win::Get_errhandler</cppname>
-<fname>MPI_WIN_GET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Retrieves the error handler currently associated with a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_errhandler</name>
-<arguments>MPI_Win, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_group</cname>
-<cppname>MPI::Win::Get_group</cppname>
-<fname>MPI_WIN_GET_GROUP</fname>
-<namespace></namespace>
-<description>Returns a duplicate of the group of the communicator used to create a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_group</name>
-<arguments>MPI_Win, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_name</cname>
-<cppname>MPI::Win::Get_name</cppname>
-<fname>MPI_WIN_GET_NAME</fname>
-<namespace></namespace>
-<description>Returns the name that was last associated with a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_name</name>
-<arguments>MPI_Win, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_lock</cname>
-<cppname>MPI::Win::Lock</cppname>
-<fname>MPI_WIN_LOCK</fname>
-<namespace></namespace>
-<description>Starts an RMA access epoch at the target task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_lock</name>
-<arguments>int, int, int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_post</cname>
-<cppname>MPI::Win::Post</cppname>
-<fname>MPI_WIN_POST</fname>
-<namespace></namespace>
-<description>Starts an RMA exposure epoch for a local window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_post</name>
-<arguments>MPI_Group, int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_set_attr</cname>
-<cppname>MPI::Win::Set_attr</cppname>
-<fname>MPI_WIN_SET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches the window attribute value to the window and associates it with the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_set_attr</name>
-<arguments>MPI_Win, int, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_set_errhandler</cname>
-<cppname>MPI::Win::Set_errhandler</cppname>
-<fname>MPI_WIN_SET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Attaches a new error handler to a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_set_errhandler</name>
-<arguments>MPI_Win, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_set_name</cname>
-<cppname>MPI::Win::Set_name</cppname>
-<fname>MPI_WIN_SET_NAME</fname>
-<namespace></namespace>
-<description>Associates a name string with a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_set_name</name>
-<arguments>MPI_Win, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_start</cname>
-<cppname>MPI::Win::Start</cppname>
-<fname>MPI_WIN_START</fname>
-<namespace></namespace>
-<description>Starts an RMA access epoch for a window object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_start</name>
-<arguments>MPI_Group, int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_test</cname>
-<cppname>MPI::Win::Test</cppname>
-<fname>MPI_WIN_TEST</fname>
-<namespace></namespace>
-<description>Tries to complete an RMA exposure epoch.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_test</name>
-<arguments>MPI_Win, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_unlock</cname>
-<cppname>MPI::Win::Unlock</cppname>
-<fname>MPI_WIN_UNLOCK</fname>
-<namespace></namespace>
-<description>Completes an RMA access epoch at the target task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_unlock</name>
-<arguments>int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_wait</cname>
-<cppname>MPI::Win::Wait</cppname>
-<fname>MPI_WIN_WAIT</fname>
-<namespace></namespace>
-<description>Completes an RMA exposure epoch.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_wait</name>
-<arguments>MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Wtick</cname>
-<cppname>MPI::Wtick</cppname>
-<fname>MPI_WTICK</fname>
-<namespace></namespace>
-<description>Returns the resolution of MPI_WTIME in seconds.</description>
-<prototype>
-<returnType>double</returnType>
-<name>MPI_Wtick</name>
-<arguments>void</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Wtime</cname>
-<cppname>MPI::Wtime</cppname>
-<fname>MPI_WTIME</fname>
-<namespace></namespace>
-<description>Returns the current value of time as a floating-point value.</description>
-<prototype>
-<returnType>double</returnType>
-<name>MPI_Wtime</name>
-<arguments>void</arguments>
-</prototype>
-</function>
-
-</allFunctions>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties
deleted file mode 100644
index 672cfac..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools MPI Support
-pluginProvider=Eclipse.org

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml
deleted file mode 100644
index 804a720..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml
+++ /dev/null

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="PTP MPI Views"
-            id="org.eclipse.ptp.pldt.mpi">
-      </category>
-      <view
-            name="MPI Artifact View"
-            icon="icons/mpi.gif"
-            category="org.eclipse.ptp.pldt.mpi"
-            class="org.eclipse.ptp.pldt.mpi.core.views.MPITableView"
-            id="org.eclipse.ptp.pldt.mpi.core.views.MPITableView">
-      </view>
-
-   </extension>
-   <!--  MPI markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiMarker"
-        name="MPI Artifact Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.mpi.core.mpiMarker"
-            name="org.eclipse.ptp.pldt.mpi.core.mpiMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.core.mpiMarkerAnnotation"
-            icon="icons/mpi.gif" 
-            
-            presentationLayer="3"
-            label="MPI Annotation Marker"
-            
-            textPreferenceKey="mpiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-  
-   
-   <extension
-         point="org.eclipse.ui.preferencePages">
-
-     <page
-            class="org.eclipse.ptp.pldt.mpi.core.prefs.MPIPreferencePage"
-            id="org.eclipse.ptp.pldt.mpi.core.prefpage"
-            name="MPI"
-            category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            />
- <!--          category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage/org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
- -->
-   </extension>
-   
-   <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCHelpProvider"
-            id="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCHelpProvider"/>
-      <provider
-            class="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCPPHelpProvider"
-            id="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCPPHelpProvider">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-               <initializer
-            class="org.eclipse.ptp.pldt.mpi.core.prefs.MPIPreferenceInitializer">
-      </initializer>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ptp.pldt.mpi.core.actions.RunAnalyseMPIcommandHandler"
-            id="org.eclipse.ptp.pldt.mpi.core.command2"
-            name="find mpi artifacts">
-      </command>
-   </extension>
-   <!-- these go under the dropdown menu; could come from another plugin -->
-   <extension
-         id="tempID"
-         name="tempNAME"
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1?after=separator1.mpi">
-         <command
-               commandId="org.eclipse.ptp.pldt.mpi.core.command2"
-               icon="icons/mpi.gif"
-               label="Show MPI Artifacts"
-               style="push">
-         </command>
-        
-      </menuContribution>
-   </extension>
-     <!-- Code templates -->
-   <extension point="org.eclipse.ui.editors.templates">
-   <include file="templates/mpi_templates.xml" />
-
-   </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/testMPI.c b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/testMPI.c
deleted file mode 100644
index 1abdcd3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/testMPI.c
+++ /dev/null

@@ -1,47 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-int main(int argc, char* argv[]){
-	printf("Hello MPI World the original.\n");	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-	}
-	else{
-		printf("From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java
deleted file mode 100644
index 2944352..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.mpi.core;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-/**
- * 
- * @author tibbitts
- *
- */
-public class MPIArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public MPIArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java
deleted file mode 100644
index 943ac67..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package org.eclipse.ptp.pldt.mpi.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.mpi.core.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java
deleted file mode 100644
index 43fa62e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.ptp.pldt.common.Artifact;
-
-/**
- * @author Beth Tibbitts
- * 
- * 
- */
-public class MpiArtifactManager
-{
-    static List    repository;
-    static HashMap hashMap = new HashMap(); // to be able to look up by unique ID (finding
-    static String  inputFileName;
-
-    /**
-     * Add an MPI artifact to the repository
-     * 
-     * @param pi
-     */
-    public static void addMpiArtifact(Artifact pi)
-    {
-        repository.add(pi);
-    }
-
-    /**
-     * Add an MPI artifact to the hashtable for future lookup
-     * 
-     * @param pi
-     */
-    public static void addMpiArtifactToHash(Artifact pi)
-    {
-        String id = pi.getId(); // for debugging access only
-        hashMap.put(id, pi);
-    }
-
-    /**
-     * retrieve MPI artifact by unique ID. Used for retrieving artifacts when needed from the Markers - since markers
-     * can't hold on to them
-     * 
-     * @param id
-     * @return
-     */
-    public static Artifact getMpiArtifact(String id)
-    {
-        Artifact pi = (Artifact) hashMap.get(id);
-        return pi;
-    }
-
-    public static Object[] getMpiArtifacts()
-    {
-        Object[] pis = hashMap.values().toArray();
-        return pis;
-    }
-
-    public static HashMap getMpiArtifactMap()
-    {
-        return hashMap;
-    }
-
-    /**
-     * getList - get the list of mpi artifacts
-     */
-    public static List getList()
-    {
-        return repository;
-    }
-
-    /**
-     * getInputFile - get the input file ( on which analysis is invoked )
-     * 
-     */
-    public static String getInputFile()
-    {
-        return inputFileName;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java
deleted file mode 100644
index 8275d7e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core;
-
-/**
- * Misc. IDs for preferences, markers, etc.
- * 
- * @author tibbitts
- * 
- */
-public interface MpiIDs
-{
-    public static final String P_RUN_ANALYSIS  = "runAnalysis";
-    public static final String P_ECHO_FORCE    = "forceEcho";
-    public static final String MARKER_ERROR_ID = "org.eclipse.ptp.pldt.mpi.core.mpiErrorMarker";
-    public static final String MARKER_ID       = "org.eclipse.ptp.pldt.mpi.core.mpiMarker";
-    public static final String FILENAME        = "filename";
-    public static final String NAME            = "name";
-    public static final String DESCRIPTION     = "description";
-    public static final String ID              = "uniqueID";
-
-    // note built-in marker id too... not sure this is used,
-    // compare with IMarker.LINE_NUMBER which is probably used instead.
-    public static final String LINE            = "theLineNo";
-    public static final String NEWLINE         = "theNewLineNo";
-
-    /** Preference page name for MPI Includes field label */
-    static public final String MPI_INCLUDES    = "MPI Includes";
-    /** Preference setting for default mpi build command */
-	public static final String MPI_BUILD_CMD = "mpiBuildCommand";
-	/** Preference setting for default c++ mpi build command */
-	public static final String MPI_CPP_BUILD_CMD = "mpiCppBuildCommand";
-	/** Preference setting for whether or not to prompt the user when MPI apis are found in other locations */
-	public static final String MPI_PROMPT_FOR_OTHER_INCLUDES="mpiPromptForOtherIncludes";
-
-    /** Marker attribute for the extra info saved for each marker/artifact */
-    public static final String CONSTRUCT_TYPE  = "constructType";
-    
-    /** id for MPI Artifact view */
-    public static final String MPI_VIEW_ID = "org.eclipse.ptp.pldt.mpi.core.views.MPITableView";
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java
deleted file mode 100644
index cf7dfc3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java
+++ /dev/null

@@ -1,161 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used for MPI development Tools.
- */
-public class MpiPlugin extends AbstractUIPlugin
-{
-    /** The shared instance */
-    private static MpiPlugin plugin;
-    /** Resource bundle */
-    private ResourceBundle   resourceBundle;
-    protected static final boolean traceOn=false;
-    
-    private static final String PLUGIN_ID = "org.eclipse.ptp.pldt.mpi.core"; //$NON-NLS-1$
-
-    /**
-     * The constructor.
-     */
-    public MpiPlugin()
-    {
-        super();
-        plugin = this;
-    }
-
-    /**
-     * This method is called upon plug-in activation
-     */
-    public void start(BundleContext context) throws Exception
-    {
-        super.start(context);
-    }
-
-    /**
-     * This method is called when the plug-in is stopped
-     */
-    public void stop(BundleContext context) throws Exception
-    {
-        super.stop(context);
-        plugin = null;
-        resourceBundle = null;
-    }
-
-    /**
-     * Returns the shared instance.
-     */
-    public static MpiPlugin getDefault()
-    {
-        return plugin;
-    }
-
-    /**
-     * Returns the string from the plugin's resource bundle, or 'key' if not found.
-     */
-    public static String getResourceString(String key)
-    {
-        ResourceBundle bundle = MpiPlugin.getDefault().getResourceBundle();
-        try {
-            return (bundle != null) ? bundle.getString(key) : key;
-        } catch (MissingResourceException e) {
-            return key;
-        }
-    }
-
-    /**
-     * Returns the plugin's resource bundle,
-     */
-    public ResourceBundle getResourceBundle()
-    {
-        try {
-            if (resourceBundle == null)
-                resourceBundle = ResourceBundle.getBundle("org.eclipse.ptp.pldt.mpi.core.MpiPluginResources"); //$NON-NLS-1$
-        } catch (MissingResourceException x) {
-            resourceBundle = null;
-        }
-        return resourceBundle;
-    }
-
-    /**
-     * Returns an image descriptor for the image file at the given plug-in relative path.
-     * 
-     * @param path the path
-     * @return the image descriptor
-     */
-    public static ImageDescriptor getImageDescriptor(String path)
-    {
-        return AbstractUIPlugin.imageDescriptorFromPlugin(MpiIDs.MPI_VIEW_ID, path);
-    }
-    /**
-     * so that other plugins can access the icon that represents this plugin
-     * @return
-     */
-    public ImageDescriptor getIconImageDescriptor(){
-    	ImageDescriptor id = getImageDescriptor("icons/mpi.gif");
-    	return id;
-    }
-
-    /**
-     * Returns the workspace instance.
-     */
-    public static IWorkspace getWorkspace()
-    {
-        return ResourcesPlugin.getWorkspace();
-    }
-
-    /**
-     * Returns the standard display to be used. The method first checks, if the thread calling this method has an
-     * associated display. If so, this display is returned. Otherwise the method returns the default display.
-     */
-    public static Display getStandardDisplay()
-    {
-        Display display;
-        display = Display.getCurrent();
-        if (display == null) display = Display.getDefault();
-        return display;
-    }
-    /**
-     * Returns the preference setting for MPI include paths
-     * 
-     * @return
-     */
-    public List<String> getMpiIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(MpiIDs.MPI_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-    
-    public static String getPluginId()
-    {
-        return PLUGIN_ID;
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java
deleted file mode 100644
index e4495f4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.actions;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage;
-import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.mpi.core.MPIArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ptp.pldt.mpi.core.analysis.MpiCASTVisitor;
-import org.eclipse.ptp.pldt.mpi.core.analysis.MpiCPPASTVisitor;
-
-/**
- * @author tibbitts
- *
- */
-public class RunAnalyseMPIcommandHandler extends RunAnalyseHandlerBase
-{
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseMPIcommandHandler() {
-		super("MPI", new MPIArtifactMarkingVisitor(MpiIDs.MARKER_ID), MpiIDs.MARKER_ID); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns MPI analysis artifacts for file
-	 * 
-	 * @param file
-	 * @param includes
-	 *            MPI include paths
-	 * @return
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu,	final List<String> includes) {
-		final ScanReturn msr = new ScanReturn();
-		final String fileName = tu.getElementName();
-		ILanguage lang;
-		try {
-			lang = tu.getLanguage(); 
-            
-			//long startTime = System.currentTimeMillis();
-      IASTTranslationUnit atu = getAST(tu); // use index; was tu.getAST();
-			//long endTime = System.currentTimeMillis();
-			//System.out.println("RunAnalyseMPICommandHandler: time to build AST for "+tu+": "+(endTime-startTime)/1000.0+" sec");
-			String languageID=lang.getId();
-			if (languageID.equals(GCCLanguage.ID)) {// C
-				atu.accept(new MpiCASTVisitor(includes, fileName, msr));
-			}
-			else if (languageID.equals(GPPLanguage.ID)) { // C++
-			  atu.accept(new MpiCPPASTVisitor(includes, fileName, msr));
-			}
-
-		} catch (CoreException e) {
-			e.printStackTrace();
-			CommonPlugin.log(IStatus.ERROR,"RunAnalyseMPICommandHandler.getAST():Error setting up visitor for project "+tu.getCProject()+" error="+e.getMessage());
-		}
-		return msr;
-	}
-
-
-	@Override
-	protected List<String> getIncludePath() {
-		return MpiPlugin.getDefault().getMpiIncludeDirs();
-	}
-    @Override
-	protected void activateArtifactView() {
-		ViewActivater.activateView(MpiIDs.MPI_VIEW_ID);
-	}
-
-	
-	 
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java
deleted file mode 100644
index 92e1b9a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.mpi.core.analysis;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * This dom-walker collects "artifacts" related to the specific domain <br>
- * (e.g. MPI, OpenMP, etc.). Currently these artifacts include function calls
- * and constants. It adds markers to the source file for C code, marking the
- * position of the artifacts found.
- * 
- * @author Beth Tibbitts
- * 
- */
-public class MpiCASTVisitor extends PldtAstVisitor {
-	private static final String PREFIX = "MPI_"; //$NON-NLS-1$
-
-	private static/* final */boolean traceOn = false;
-
-	{
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		this.shouldVisitDeclarations = true;
-		this.shouldVisitTranslationUnit = true;
-	}
-
-	@SuppressWarnings("unchecked")
-	public MpiCASTVisitor(List mpiIncludes, String fileName, ScanReturn msr) {
-		super(mpiIncludes, fileName, msr);
-		ARTIFACT_CALL = Messages.getString("MpiCASTVisitor.mpiCall"); //$NON-NLS-1$
-		ARTIFACT_CONSTANT = Messages.getString("MpiCASTVisitor.mpiConstant"); //$NON-NLS-1$
-		ARTIFACT_NAME="MPI";
-
-		traceOn = CommonPlugin.getTraceOn();
-		if (traceOn)
-			System.out.println("MpiCASTVisitor.ctor: traceOn=" + traceOn); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Visit an expression node.
-	 * 
-	 * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-	 */
-	public int visit(IASTExpression expression) {
-		if (expression instanceof IASTFunctionCallExpression) {
-			// in stdmake this is a CASTFunctionCallExpression but implements
-			// IASTFUnctionCallExpr, so ok
-			IASTExpression astExpr = ((IASTFunctionCallExpression) expression)
-					.getFunctionNameExpression();
-			String signature = astExpr.getRawSignature();
-			// note: getRawSig is the name BEFORE being processed by
-			// preprocessor!
-			// but it seems to be empty if it's different.
-			// IASTFunctionCallExpression
-			// fce=(IASTFunctionCallExpression)expression;
-			// IASTExpression fne=fce.getFunctionNameExpression();
-
-			// can we get post-pre-processor name here?
-			if (astExpr instanceof IASTIdExpression) {
-				IASTName tempFN = ((IASTIdExpression) astExpr).getName();
-				IBinding tempBIND = tempFN.resolveBinding();
-				String tempNAME = tempBIND.getName();
-				if (traceOn)
-					System.out
-							.println("MCAV name: " + tempNAME + " rawsig: " + signature); //$NON-NLS-1$ //$NON-NLS-2$
-				// if e.g. preprocessor substitution used, use that for function
-				// name
-				boolean preProcUsed = !signature.equals(tempNAME);
-				if (preProcUsed) {
-					signature = tempNAME;
-				}
-			}
-			if (signature.startsWith(PREFIX)) {
-				if (astExpr instanceof IASTIdExpression) {
-					IASTName funcName = ((IASTIdExpression) astExpr).getName();
-					// IBinding binding = funcName.resolveBinding();
-					// String name=binding.getName();// name ok for stdMake
-					processFuncName(funcName, astExpr);
-				}
-			}
-		} else if (expression instanceof IASTLiteralExpression) {
-			processMacroLiteral((IASTLiteralExpression) expression);
-		} else {
-			// Other possibilities? Do we care? Assume not.
-			// if(expression instanceof CASTUnaryExpression)
-			// if(expression instanceof CASTIdExpression)
-
-		}
-		return PROCESS_CONTINUE;
-	}
-
-	/**
-	 * allow dynamic adding to include path?
-	 * <br>Note: if this returns true, be certain to override getIncludesPrefID() and
-	 * getPreferenceStore() which will be needed by the implementation to do this
-	 * 
-	 * @return
-	 */
-	@Override
-	public boolean allowIncludePathAdd() {
-		boolean canAsk = getPreferenceStore().getBoolean(MpiIDs.MPI_PROMPT_FOR_OTHER_INCLUDES);
-		return canAsk;
-	}
-	/**
-	 * needs to be overridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path
-	 * @return
-	 */
-	@Override
-	protected String getIncludesPrefID() {
-		return MpiIDs.MPI_INCLUDES;
-	}
-	/**
-	 * needs to be overridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path
-	 * @return
-	 */
-	@Override
-	protected IPreferenceStore getPreferenceStore() {
-		return MpiPlugin.getDefault().getPreferenceStore();
-	}
-
-	/**
-	 * needs to be overridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path.  This type name is used for messages, etc.
-	 * @return artifact type name such as "MPI", "OpenMP" etc.
-	 */	
-	@Override
-	protected String getTypeName() {
-		return ARTIFACT_NAME;
-	}
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java
deleted file mode 100644
index a13979a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.analysis;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTFieldReference;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTIdExpression;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTLinkageSpecification;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTUsingDirective;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-
-/**
- * This dom-walker collects artifacts (currently function calls and constants),
- * and adds markers to the source file for C++ code.
- * 
- */
-public class MpiCPPASTVisitor extends PldtAstVisitor {
-	private static final boolean traceOn = false;
-
-	private static final String PREFIX1 = "MPI_"; //$NON-NLS-1$
-
-	private static final String PREFIX2 = "MPI::"; //$NON-NLS-1$
-
-	{
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		this.shouldVisitDeclarations = true;
-		this.shouldVisitTranslationUnit = true;
-	}
-
-	private boolean usingNamespaceMPI;
-
-	public MpiCPPASTVisitor(List mpiIncludes, String fileName, ScanReturn msr) {
-		super(mpiIncludes, fileName, msr);
-		usingNamespaceMPI = false;
-		ARTIFACT_CALL = Messages.getString("MpiCPPASTVisitor.mpiCall"); //$NON-NLS-1$
-		ARTIFACT_CONSTANT = Messages.getString("MpiCPPASTVisitor.mpiConstant"); //$NON-NLS-1$
-	}
-
-	public int visit(IASTDeclaration declaration) {
-		if (declaration instanceof CPPASTUsingDirective) {
-			CPPASTUsingDirective cppASTUsingDirective = (CPPASTUsingDirective) declaration;
-			if ("MPI".equals(cppASTUsingDirective.getQualifiedName().getRawSignature())) { //$NON-NLS-1$
-				usingNamespaceMPI = true;
-			}
-		}
-
-		// Workaround of a CDT problem where declaration for [extern "C"...] in
-		// C++ code has null file location
-		if ((declaration instanceof CPPASTLinkageSpecification) && (declaration.getFileLocation() == null))
-			return PROCESS_CONTINUE;
-
-		if (declaration.getFileLocation() == null) {
-			if (traceOn)
-				System.out.println("MpiCPPASTVisitor.visit(decl): null decl"); //$NON-NLS-1$
-		}
-
-		return super.visit(declaration);
-	}
-
-	/**
-	 * Visit an expression node
-	 * 
-	 * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-	 */
-	public int visit(IASTExpression expression) {
-
-		if (expression instanceof IASTFunctionCallExpression) {
-			IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-			String signature = astExpr.getRawSignature();
-			// note: getRawSig is BEFORE processed by preprocessor!
-
-			// System.out.println("func signature=" + signature);
-			// since all MPI symbols start with a certain prefix,
-			// we'll do a quick test to cull the search
-			if (usingNamespaceMPI || signature.startsWith(PREFIX1) || signature.startsWith(PREFIX2)) {
-				IASTName funcName = null;
-				if (astExpr instanceof CPPASTFieldReference) {
-					// This is method call through C++ member functions (e.g.
-					// MPI::COMM_WORLD.Get_size)
-					CPPASTFieldReference cppFieldReference = (CPPASTFieldReference) astExpr;
-					funcName = cppFieldReference.getFieldName();
-
-				} else if (astExpr instanceof IASTIdExpression) {
-					// This is C-style direct method call (e.g. MPI_Init, or
-					// MPI::Init)
-
-					// IASTName tempFN = ((IASTIdExpression) astExpr).getName();
-					// IBinding tempBIND = tempFN.resolveBinding();
-					// String tempNAME=tempBIND.getName(); //
-					// signature="MPI::Init" but this is "Init"
-
-					funcName = ((IASTIdExpression) astExpr).getName();
-					// String funcNameString=funcName.toString();//MPI::Init
-				}
-				processFuncName(funcName, astExpr);
-			}
-		} else if ((expression instanceof CPPASTIdExpression)
-				&& !(expression.getParent() instanceof IASTFunctionCallExpression)) { // this
-			// excludes a CPPASTIdExpression acting as method call (e.g.
-			// MPI_Init)
-			processIdExprAsLiteral((CPPASTIdExpression) expression);
-		} else if (expression instanceof IASTLiteralExpression) {
-			processMacroLiteral((IASTLiteralExpression) expression);
-		}
-
-		return PROCESS_CONTINUE;
-	}
-	@Override
-	protected String chooseName(String bindingName, String rawSignature){
-		String name=bindingName;
-		if(bindingName.length()==0) {
-			name=rawSignature;
-		}
-		if(rawSignature.startsWith(PREFIX2)){
-			name=rawSignature;
-		}
-		return name;
-	}
-	/**
-	 * Don't allow dynamic include path adding for C++ -- too complicated to know if something is an MPI artifact.
-	 * Consider implementing this later.
-	 */
-	@Override
-	 public boolean allowIncludePathAdd() {
-	    return false;
-	  }
-	@Override
-  public boolean addIncludePath( IPath path,  String name, boolean dontAskAgain) {
-	  return false;
-	}
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java
deleted file mode 100644
index 4f698cb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.editorHelp;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- */
-public class MPIDocXMLParser {
-	
-	public static void main(String [] args)
-	{
-		File file = new File(args[0]);
-		try {
-			List<FunctionSummaryImpl> functions = parseDOM(new FileInputStream(file), "cname");
-			System.out.println("num of functions gathered: "+functions.size());
-            System.out.println("first function summary:");
-            System.out.println((FunctionSummaryImpl)(functions.iterator().next()));
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * 
-	 * @param xmlIn input stream for XML file
-	 * @param cOrCppName the name of the 'name' node: "cname" for C, "cppName" for C++
-	 * @return
-	 */
-	public static List<FunctionSummaryImpl> parseDOM(InputStream xmlIn, String cOrCppName) {
-		List<FunctionSummaryImpl> mpiFuncList = new ArrayList<FunctionSummaryImpl>();
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		Document document = null;
-		try {
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			if (xmlIn != null)
-				document = builder.parse(xmlIn);
-		} catch (ParserConfigurationException e) {
-			e.printStackTrace();
-		} catch (SAXException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		if (document != null) {
-			NodeList functionList = document.getElementsByTagName("function");
-			for (int i = 0; i < functionList.getLength(); i++) {
-				Node func = functionList.item(i);
-				NodeList child = func.getChildNodes();
-				String cname = null;
-				String desc = null;
-				FunctionPrototypeSummaryImpl prototypeSummary = null;
-				for (int j = 0; j < child.getLength(); j++) {
-					Node sub = child.item(j);
-					if (sub.getNodeName().equals(cOrCppName)) {
- 						cname = sub.getTextContent(); // java 5 
-//                        cname = sub.getFirstChild().getNodeValue();
-					} else if (sub.getNodeName().equals("description")) {
-						desc = sub.getTextContent(); // java 5
-//                     desc = sub.getFirstChild().getNodeValue();
-					} else if (sub.getNodeName().equals("prototype")) {
-						NodeList protoSub = sub.getChildNodes();
-                        // java 5
-						prototypeSummary = new FunctionPrototypeSummaryImpl(
-								protoSub.item(3).getTextContent(), protoSub
-										.item(1).getTextContent(), protoSub
-										.item(5).getTextContent());
-//                        prototypeSummary = new FunctionPrototypeSummaryImpl(
-//                              protoSub.item(3).getFirstChild().getNodeValue(), protoSub
-//                                      .item(1).getFirstChild().getNodeValue(), protoSub
-//                                      .item(5).getFirstChild().getNodeValue());
-					}
-				}
-				FunctionSummaryImpl functionSummary = new FunctionSummaryImpl(cname,
-						"", desc, prototypeSummary, null);
-				mpiFuncList.add(functionSummary);
-			}
-		}
-		return mpiFuncList;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java
deleted file mode 100644
index c42ca07..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.editorHelp;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Help book for C MPI functions
- * @author tibbitts
- *
- */
-public class MpiCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = "MPI C Help Book";
-    
-	/**
-	 * builds the list of function summaries by parsing an XML file
-	 */
-	public MpiCHelpBook() {
-		super(MpiPlugin.getPluginId());
-		// populate func map
-		Bundle bundle = Platform.getBundle(MpiPlugin.getPluginId());
-		Path path = new Path("mpiref.xml");
-		////
-		//URL fileURL = Platform.find(bundle, path); // old
-		URL fileURL = FileLocator.find(bundle, path, null);
-		InputStream xmlIn = null;
-		try {
-			xmlIn = fileURL.openStream();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		List<FunctionSummaryImpl> mpiFuncList = MPIDocXMLParser.parseDOM(xmlIn, "cname");
-		for (Iterator<FunctionSummaryImpl> it = mpiFuncList.iterator(); it.hasNext();) {
-			FunctionSummaryImpl functionSummary = it.next();
-			funcName2FuncInfo.put(functionSummary.getName(), functionSummary);
-		}
-		
-		// set title
-		setTitle(TITLE);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java
deleted file mode 100644
index 8e8fb7c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-
-/**
- * 
- * Provides help information for MPI APIs for C (F1, hover, content assist, etc.)
- */
-public class MpiCHelpProvider extends CHelpProviderImpl
-{    
-	/**
-	 * Default ctor required, or else for some reason this
-	 * class never gets instantiated.
-	 *
-	 */
-	public MpiCHelpProvider() {
-		// default ctor for testing that it gets called
-	    //   System.out.println("MpiCHelpProvider ctor()...");
-
-	}
-    public void initialize()
-    {
-        helpBook = new MpiCHelpBook();
-        //System.out.println("MpiCHelpProvider initialize()...");
-    }
-}
-
- 
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java
deleted file mode 100644
index a67c133..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.editorHelp;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Help book for C++ MPI functions
- * @author tibbitts
- *
- */
-public class MpiCPPHelpBook extends CHelpBookImpl
-{
-    private static final String TITLE = "MPI C++ Help Book";
-    private static final boolean traceOn=false;
-
-    public MpiCPPHelpBook()
-    {
-		super(MpiPlugin.getPluginId());
-		if(traceOn)System.out.println("MPI CPP help book ctor()...");
-		// populate func map
-		Bundle bundle = Platform.getBundle(MpiPlugin.getPluginId());
-		Path path = new Path("mpiref.xml");
-
-		URL fileURL = FileLocator.find(bundle, path, null);
-		InputStream xmlIn = null;
-		try {
-			xmlIn = fileURL.openStream();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		List<FunctionSummaryImpl> mpiFuncList = MPIDocXMLParser.parseDOM(xmlIn, "cppname");
-		int temp=0;
-		for (Iterator<FunctionSummaryImpl> it = mpiFuncList.iterator(); it.hasNext();) {
-			FunctionSummaryImpl functionSummary = it.next();
-			if(traceOn)if(2>temp++)System.out.println("  "+functionSummary.getName()+"-"+functionSummary.getDescription());
-			funcName2FuncInfo.put(functionSummary.getName(), functionSummary);
-		};
-    	// set title
-    	setTitle(TITLE);
-
-    }
-    
-    public int getCHelpType()
-    {
-        return ICHelpBook.HELP_TYPE_CPP;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java
deleted file mode 100644
index 48d5d27..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-
-/**
- * 
- * Provides help information for MPI APIs for C++(F1, hover, content assist, etc.)
- */
-public class MpiCPPHelpProvider extends CHelpProviderImpl
-{    
-	/**
-	 * Default ctor required, or else for some reason this
-	 * class never gets instantiated.
-	 *
-	 */
-	public MpiCPPHelpProvider() {
-		// default ctor for testing that it gets called
-	    //   System.out.println("MpiCHelpProvider ctor()...");
-
-	}
-    public void initialize()
-    {
-        helpBook = new MpiCPPHelpBook();
-        //System.out.println("MpiCHelpProvider initialize()...");
-    }
-}
-
- 
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties
deleted file mode 100644
index 7621dfa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties
+++ /dev/null

@@ -1,9 +0,0 @@
-MpiCASTVisitor.mpiCall=MPI Call
-MpiCASTVisitor.mpiConstant=MPI Constant
-MpiCPPASTVisitor.mpiCall=MPI Call
-MpiCPPASTVisitor.mpiConstant=MPI Constant
-MPIPreferencePage.mpiIncludePaths=MPI include paths:
-MPIPreferencePage.pleaseChooseAdirectory=Please choose a directory for MPI includes:
-MPIPreferencePage.mpiBuildCommand=MPI build command (C):
-MPIPreferencePage.mpiCppBuildCommand=MPI build command (C++):
-MPIPreferencePage.promptToIncludeOtherLocations=Prompt to include MPI APIs found in other locations (C only)?

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java
deleted file mode 100644
index 96fe194..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/package org.eclipse.ptp.pldt.mpi.core.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * Class used to initialize default preference values.
- * @author Beth Tibbitts
- */
-public class MPIPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/**
-	 * Initialize default MPI preferences
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = MpiPlugin.getDefault()
-				.getPreferenceStore();
-    	store.setDefault(MpiIDs.MPI_BUILD_CMD, "mpicc");
-    	store.setDefault(MpiIDs.MPI_CPP_BUILD_CMD, "mpic++");
-    	store.setDefault(MpiIDs.MPI_PROMPT_FOR_OTHER_INCLUDES, true);
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java
deleted file mode 100644
index 24b3540..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.prefs;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Preference page for MPI settings
- * <br>
- * Note that "Prompt to include MPI APIs found in other locations" is only applicable
- * to C code, not C++: because C++ MPI APIs are not as easily recognizable - when
- * discovered via CDT AST, they sometimes do not have the "MPI" prefix.
- * C++ MPI APIs include e.g. MPI_Bcast, MPI::Init, and Get_size (coded as "MPI::COMM_WORLD.Get_size()")
- * thus we don't cull by excluding all APIs for C++ code that don't start with a prefix.
- * That said, since we do this, we end up looking at all variables and functions including
- * those found only in user code, e.g. argc and argv.  If we asked the user about all of these,
- * it would be annoying and too slow.
- * <p>This should probably be re-evaluated in the future.
- * An alternative might be a "don't ask me again during this run" checkbox
- * on the popup asking to add the API, that appears during execution.
- * That would remove the annoying part; but performance may still suffer from this extra test?
- * <p>Crude workaround: Run MPI analysis at least once on plain C code, to assure it's finding the
- * header files in the same place that are specified here in the preferences.
- * 
- */
-
-public class MPIPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String MPI_INCLUDES_PREFERENCE_LABEL  = Messages.getString("MPIPreferencePage.mpiIncludePaths"); //$NON-NLS-1$
-    private static final String MPI_INCLUDES_PREFERENCE_BROWSE = Messages.getString("MPIPreferencePage.pleaseChooseAdirectory"); //$NON-NLS-1$
-    private static final String MPI_BUILD_COMMAND_LABEL = Messages.getString("MPIPreferencePage.mpiBuildCommand"); //$NON-NLS-1$
-    private static final String MPI_CPP_BUILD_COMMAND_LABEL = Messages.getString("MPIPreferencePage.mpiCppBuildCommand"); //$NON-NLS-1$
-    private static final String PROMPT_FOR_OTHERS_LABEL=Messages.getString("MPIPreferencePage.promptToIncludeOtherLocations");
-
-    public MPIPreferencePage()
-    {
-        super(FLAT);
-        initPreferenceStore();
-    }
-
-    public MPIPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public MPIPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public MPIPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = MpiPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-        PathEditor pathEditor = new PathEditor(MpiIDs.MPI_INCLUDES, MPI_INCLUDES_PREFERENCE_LABEL,
-                MPI_INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-        
-        StringFieldEditor sed = new StringFieldEditor(MpiIDs.MPI_BUILD_CMD, MPI_BUILD_COMMAND_LABEL,getFieldEditorParent());
-        addField(sed);
-        
-        StringFieldEditor sedCpp = new StringFieldEditor(MpiIDs.MPI_CPP_BUILD_CMD, MPI_CPP_BUILD_COMMAND_LABEL,getFieldEditorParent());
-        addField(sedCpp);
-        
-        BooleanFieldEditor bed = new BooleanFieldEditor(MpiIDs.MPI_PROMPT_FOR_OTHER_INCLUDES, PROMPT_FOR_OTHERS_LABEL, getFieldEditorParent());
-        addField(bed);
-        
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java
deleted file mode 100644
index 5260227..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package org.eclipse.ptp.pldt.mpi.core.views;
-
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * An MPI artifact view based on SimpleTableView <br>
- * Note that the ID must be unique.
- * <p>
- * If you need to read icon images, etc. from the plug-in, be sure to pass in an
- * actual Plugin class instance for first arg
- */
-public class MPITableView extends SimpleTableMarkerView {
-	public MPITableView() {
-
-		super(MpiPlugin.getDefault(), "Artifact", "Artifacts",
-				"Construct", MpiIDs.MARKER_ID);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml
deleted file mode 100644
index 0eb2bf9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-<template name="mpiif" 
-          id="org.eclipse.ptp.pldt.mpi.templates.c.mpiif"
-          autoinsert="true" context="org.eclipse.cdt.ui.text.templates.c" deleted="false" 
-          description="MPI_Init and Finalize" enabled="true" >
-MPI_Init(&amp;argc, &amp;argv);
-
-MPI_Finalize();
-</template>
-<template name="mpisr"
-    id="org.eclipse.ptp.pldt.mpi.templates.c.mpisr"
-	autoinsert="true" context="org.eclipse.cdt.ui.text.templates.c" deleted="false" 
-	description="MPI Send Receive" enabled="true" >
-MPI_Comm_rank(${MPI_COMM_WORLD}, &amp;${rank}); 
-MPI_Comm_size(${MPI_COMM_WORLD}, &amp;${p}); 	
-
-if (${rank} == 0){ // the master task
-		${cursor}printf("Hello From process 0: Num processes: %d\n",${p});
-	    for (${source} = 1; ${source} &lt; p; ${source}++) {
-		    MPI_Recv(${message}, 100, ${MPI_CHAR}, ${source}, ${tag},
-		          ${MPI_COMM_WORLD}, &amp;status);
-		    printf("%s\n",${message});
-	    }
-	}
-	else{  // worker tasks
-		/* create message */
-			sprintf(${message}, "Hello from process %d!", ${rank});
-			dest = 0;
-			/* use strlen+1 so that '\0' get transmitted */
-			MPI_Send(${message}, strlen(${message})+1, ${MPI_CHAR},
-			   dest, ${tag}, ${MPI_COMM_WORLD});
-	}</template></templates>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.classpath b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.openmp.analysis/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.cvsignore
deleted file mode 100644
index 47e3103..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-@dot

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project
deleted file mode 100644
index 21b5dc0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.openmp.analysis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.openmp.analysis/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/META-INF/MANIFEST.MF
deleted file mode 100644
index 824a76b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.openmp.analysis; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.pldt.openmp.analysis,
- org.eclipse.ptp.pldt.openmp.analysis.PAST,
- org.eclipse.ptp.pldt.openmp.analysis.dictionary,
- org.eclipse.ptp.pldt.openmp.analysis.ompcfg,
- org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory,
- org.eclipse.ptp.pldt.openmp.analysis.parser,
- org.eclipse.ptp.pldt.openmp.analysis.textview
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.ui.workbench,
- org.eclipse.jface,
- org.eclipse.cdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ptp.pldt.common
-Eclipse-AutoStart: true

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/about.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/build.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/build.properties
deleted file mode 100644
index 7e0e9f1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties
deleted file mode 100644
index 85bfd61..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools OpenMP Analysis
-pluginProvider=Eclipse.org

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml
deleted file mode 100644
index 58da9dd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml
+++ /dev/null

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            id="org.eclipse.ptp.pldt.openmp.analysis.CEditorContribution"
-            targetID="#CEditorContext">
-         <action
-               class="org.eclipse.ptp.pldt.openmp.analysis.textview.ShowConcurrencyAction"
-               id="org.eclipse.ptp.pldt.openmp.analysis.showConcurrency"
-               label="Show Concurrency"
-               menubarPath="additions"/>
-      </viewerContribution>
-   </extension>
-   <extension
-         id="openMPConcurrencyMarker"
-         name="openMPConcurrencyMarker"
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.openmp.analysis.concurrency"
-            colorPreferenceKey="concurrencyIndicationColor"
-            colorPreferenceValue="250,230,110"
-            contributesToHeader="false"
-            highlightPreferenceKey="concurrencyHighlighting"
-            highlightPreferenceValue="true"
-            includeOnPreferencePage="true"
-            isGoToNextNavigationTarget="false"
-            isGoToNextNavigationTargetKey="isConcurrencyRecordGoToNextNavigationTarget"
-            label="Concurrency Marker"
-            overviewRulerPreferenceKey="concurrencyIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="5"
-            showInNextPrevDropdownToolbarAction="false"
-            showInNextPrevDropdownToolbarActionKey="showConcurrencyInNextPrevDropdownToolbarAction"
-            textPreferenceKey="concurrencyIndication"
-            textPreferenceValue="true"
-            verticalRulerPreferenceKey="concurrencyIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="false"/>
-      <specification
-            annotationType="org.eclipse.ptp.pldt.openmp.analysis.nonconcurrency"
-            colorPreferenceKey="nonConcurrencyIndicationColor"
-            colorPreferenceValue="250,150,140"
-            contributesToHeader="false"
-            highlightPreferenceKey="nonConcurrencyHighlighting"
-            highlightPreferenceValue="true"
-            includeOnPreferencePage="true"
-            isGoToNextNavigationTarget="false"
-            label="NonConcurrency Marker"
-            overviewRulerPreferenceKey="nonConcurrencyIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="5"
-            showInNextPrevDropdownToolbarAction="false"
-            textPreferenceKey="nonConcurrencyIndication"
-            textPreferenceValue="true"
-            verticalRulerPreferenceKey="nonConcurrencyIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="false"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.core.resources.problemmarker"
-            name="org.eclipse.ptp.pldt.openmp.analysis.concurrency"/>
-      <type
-            markerType="org.eclipse.core.resources.problemmarker"
-            name="org.eclipse.ptp.pldt.openmp.analysis.nonconcurrency"/>
-   </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java
deleted file mode 100644
index 1b2ff84..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis;
-/**
- * @author pazel
- */
-public class OpenMPAnalysisException extends Exception 
-{
-    public OpenMPAnalysisException(String text)
-    {
-    	super(text);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java
deleted file mode 100644
index ff3b71b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java
+++ /dev/null

@@ -1,509 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis;
-
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.CDOM;
-import org.eclipse.cdt.core.dom.IASTServiceProvider;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ptp.pldt.common.util.Utility;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTElif;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTElse;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTEndif;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTFactory;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTIf;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTIfdef;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTIfndef;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPFactory;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.Dictionary;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.DictionaryFactory;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.FileConcurrencyAnalysis;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.FileStatementMap;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.FunctionConcurrencyAnalysis;
-
-/**
- * @author pazel
- */
-public class OpenMPAnalysisManager 
-{
-	protected IASTTranslationUnit         astTransUnit_ = null;
-	protected IFile                       iFile_        = null;
-	protected PASTNode []                 past_         = null;
-    protected PASTOMPPragma []            ompPragmas_   = null; 
-    
-    protected FileConcurrencyAnalysis     fileAnalysis_ = null;
-    protected FunctionConcurrencyAnalysis   [] analyses_     = null;
-    
-    protected FileStatementMap            fileMap_      = null;
-	private static final boolean          traceOn       = false;
-    
-    protected Dictionary                  dictionary_   = null;
-    protected OpenMPErrorManager          errorManager_ = new OpenMPErrorManager();
-    
-        protected static OpenMPAnalysisManager   currentManager_ = null;
-    
-
-    /**
-     * Constructor called by eclipse
-     * @param file
-     * @throws OpenMPAnalysisException
-     */
-	public OpenMPAnalysisManager(final IFile iFile) throws OpenMPAnalysisException
-	{
-		try {
-	       astTransUnit_ = CDOM.getInstance().getASTService().getTranslationUnit(iFile, 
-			   CDOM.getInstance().getCodeReaderFactory(CDOM.PARSE_SAVED_RESOURCES));
-		}
-		catch(IASTServiceProvider.UnsupportedDialectException e) {
-		  throw new OpenMPAnalysisException(e.toString());	
-		}
-		iFile_ = iFile;
-        init();
-        
-        currentManager_ = this;
-    }
-    
-    /**
-     * Constructor used by testing mechanism
-     * @param astTransUnit
-     */
-    public OpenMPAnalysisManager(IASTTranslationUnit astTransUnit, IFile iFile)
-    {
-        astTransUnit_ = astTransUnit;
-        iFile_    = iFile;
-        init();
-        currentManager_ = this;
-    }
-    
-    /**
-     * Get the last analysis manager built
-     * @return OpenMPAnalysisManager
-     */
-    public static OpenMPAnalysisManager getCurrentManager()
-    {
-        return currentManager_;
-    }
-    
-    /**
-     * main logic invoked by both constructors
-     *
-     */
-    private void init()
-    {
-        // Note: throughout all this, it is best to use the same AST instance, i.e.
-        //       don't re-gen it, as references to nodes may be made by various components
-        //       that should hold up under equality.
-        buildPreprocessorAST();
-        
-        buildDictionary();
-        
-        buildOMPPragmas();
-        
-        buildOMPConcurrencyAnalysis();
-        
-        buildFileMap();
-        
-        //buildDomoCDT();
-    }
-	
-    /**
-     * Build all the nodes, compute which compiled
-     *
-     */
-	private void buildPreprocessorAST()
-	{
-        IASTPreprocessorStatement[] plist = astTransUnit_.getAllPreprocessorStatements();
-        
-        past_ = new PASTNode[plist.length];
-        
-        for(int i=0; i<plist.length; i++) 
-          past_[i] = PASTFactory.PASTFactoryMake(plist[i]);	
-        
-        // Set the compiled flags to show live and dead preprocessor statements
-        computeCompiled();
-        
-	}
-    
-    /**
-     * Build the "variable" dictionary
-     *
-     */
-    private void buildDictionary()
-    {
-        dictionary_ = DictionaryFactory.buildDictionary(astTransUnit_);
-    }
-    
-//    private void buildDomoCDT()
-//    {
-//        CDTTranslateToCAst ctrans = new CDTAST2CAstTranslator(new IASTNodeFactory_c());
-//        CAstEntity entity = ctrans.translate(astTransUnit_);
-//
-//        PrintWriter printWriter= new PrintWriter(System.out);
-//
-//        CAstPrinter.printTo(entity, printWriter);
-//        printWriter.flush();
-//
-//    }
-    
-    /**
-     * Build the OMP style pragmas
-     *
-     */
-    private void buildOMPPragmas()
-    {
-        int        pCount   = 0;
-        IDocument  pragmaDoc = null;
-        String     filename  = "";
-        
-        for(int i=0; i<past_.length; i++) {
-           if (past_[i] instanceof PASTPragma) {
-               PASTPragma pragma = (PASTPragma)past_[i];
-               //
-               // For each of these, get the content
-               //
-               String newFileName = ((PASTPragma)past_[i]).getContainingFilename();
-               if (!filename.equals(newFileName)) {
-                   filename = newFileName;
-                   pragmaDoc = Utility.getDocument(filename);
-               }
-               if (pragmaDoc!=null) {
-                   try {
-                     String content = pragmaDoc.get(pragma.getLocalOffset(), pragma.getLength());
-                     pragma.setContent(content);
-                   }
-                   catch(Exception e) {}
-               }
-               
-               past_[i] = PASTOMPFactory.makePASTOMP((PASTPragma)past_[i], astTransUnit_, dictionary_);
-               // if successful, would be an omp
-               if (past_[i] instanceof PASTOMPPragma)
-                 pCount++;
-           }
-        }
-        
-        // build the pragma list
-        int  index = 0;
-        ompPragmas_ = new PASTOMPPragma[pCount];
-        for(int i=0; i<past_.length; i++) {
-            if (past_[i] instanceof PASTOMPPragma) 
-                ompPragmas_[index++] = (PASTOMPPragma)past_[i];
-        }
-        
-        if(traceOn)printPASTResults();
-    }
-    
-    /**
-     * Build concurrency analysis
-     *
-     */
-    private void buildOMPConcurrencyAnalysis()
-    {
-        fileAnalysis_ = new FileConcurrencyAnalysis(astTransUnit_,
-                                                    iFile_,
-                                                    getOMPPragmas());
-        /*DefVisitor dv = new DefVisitor(astTransUnit_, iFile_, getOMPPragmas());
-        analyses_ = dv.buildAnalyses();
-        
-        // build the phase analysis
-        for(int i=0; i<analyses_.length; i++) {
-            FunctionConcurrencyAnalysis oca = analyses_[i];
-            oca.doPhaseAnalysis();
-            if (traceOn) oca.printAnalysis(System.out);
-        }*/
-    }
-
-    /**
-     * Build the location-->stmt/expr map
-     *
-     */
-    protected void buildFileMap()
-    {
-        // Note - important that we use SAME AST for all analysis and lookup
-        fileMap_ = new FileStatementMap(astTransUnit_); 
-        fileMap_.buildMap();
-    }
-    
-    /**
-     * Get the pragma AST tree
-     * @return PASTNode []
-     */
-    public PASTNode [] getPAST()
-    {
-        return past_;
-    }
-    
-    /**
-     * Return a list of PASTOMPPragmas
-     * @return
-     */
-    public PASTOMPPragma [] getOMPPragmas()
-    {
-        return ompPragmas_;
-    }
-    
-    /**
-     * Return IASTTranslationUnit
-     * @return IASTTranslationUnit
-     */
-    public IASTTranslationUnit getTU()
-    {
-        return astTransUnit_;
-    }
-    
-    /**
-     * Accessor to the file map for analyzed file
-     * @return FileStatementMap
-     */
-    public FileStatementMap getFileMap()
-    {
-        return fileMap_;
-    }
-    
-    /**
-     * Get the analysis for each function
-     * @return FunctionConcurrencyAnalysis []
-     */
-    public FunctionConcurrencyAnalysis [] getAnalyses() 
-    { return analyses_; }
-    
-    
-    /**
-     * Get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        return fileAnalysis_.getNodesConcurrentTo(node);
-    }
-   
-    /**
-     * Prints out results for debugging
-     *
-     */
-    protected void printPASTResults()
-    {
-        // output the results
-        for(int i=0; i<past_.length; i++) {
-            System.out.print(past_[i].getType()+" "+(past_[i].isCompiled() ? "compiled": "not compiled"));
-            System.out.print(" at ("+ past_[i].getFilename()+","+past_[i].getStartingLine()+","+
-                    past_[i].getStartLocation()+","+past_[i].getEndLocation()+") ");
-            if (past_[i] instanceof PASTOMPPragma) {
-                int t = ((PASTOMPPragma)past_[i]).getOMPType();
-                System.out.println(" OMPPragma type="+t);
-            }
-            else System.out.println("");
-        }
-    }
-	
-    /**
-     * Compute which statements compiled
-     *
-     */
-	private void computeCompiled()
-	{
-		Stack   context = new Stack();
-        boolean currentEvaluation = true;
-        int     currentLevel      = 0;
-        int     lastNonIgnoredIf  = currentLevel;
-		context.push(new CompiledContext(currentLevel, currentEvaluation));
-        
-        int   ifcount=0;
-        int   endifcount=0;
-
-        int i=0;
-        for(i=0; i<past_.length; i++) {
-        	PASTNode node = past_[i];
-        	if(node==null){
-        		int stopHere=0;
-        	}
-        	if (currentEvaluation) {
-        		if (isIf(node)) {
-        			currentEvaluation = ifDecision(node);
-        			currentLevel++;  lastNonIgnoredIf++;
-        			context.push(new CompiledContext(currentLevel, currentEvaluation));
-                    ifcount++;
-        		}
-        		else if (isElse(node)) {
-       				currentEvaluation = false;
-                    if (context.empty())  break;
-      				((CompiledContext)(context.peek())).setEvaluation(currentEvaluation);
-        		}
-                else if (isElseif(node)) {
-                    CompiledContext cc = ((CompiledContext)(context.peek()));
-                    cc.setWasTrue(true);
-                    currentEvaluation = false;
-                    // Don't bump the level
-                    cc.setEvaluation(false);
-                }
-        		else if (isEnd(node)) {
-                    if (context.empty()) break;
-      				context.pop();
-       				currentLevel--;  lastNonIgnoredIf--;
-                    if (context.empty())  break;
-       				currentEvaluation = ((CompiledContext)(context.peek())).getEvaluation();
-                    endifcount++;
-        		}
-        		node.setCompiled(true);
-        	}
-        	else { // current evaluation == false
-        		if (currentLevel==lastNonIgnoredIf) {
-                    if (isIf(node)) {
-                        currentLevel++;
-                        node.setCompiled(false);
-                        ifcount++;
-                    }
-                    else if (isElse(node)) {
-                        CompiledContext cc = ((CompiledContext)(context.peek()));
-                        if (cc.wasTrue())
-                            currentEvaluation = false;
-                        else
-        				  currentEvaluation = true;
-                        if (context.empty()) break;
-        				((CompiledContext)(context.peek())).setEvaluation(currentEvaluation);
-                        node.setCompiled(true);  // means was not ignored - had effect
-        			}
-                    else if (isElseif(node)) {
-                        CompiledContext cc = ((CompiledContext)(context.peek()));
-                        if (cc.wasTrue())
-                          currentEvaluation = false;
-                        else {
-                          currentEvaluation = ifDecision(node);
-                          if (currentEvaluation) cc.setWasTrue(true);
-                        }
-                        // Don't bump the level
-                        cc.setEvaluation(currentEvaluation);
-                    }
-        			else if (isEnd(node)) {
-        				context.pop();
-        				currentLevel--;  lastNonIgnoredIf--;
-                        if (context.empty()) break;
-        				currentEvaluation = ((CompiledContext)(context.peek())).getEvaluation();
-                        node.setCompiled(currentEvaluation);
-                        endifcount++;
-        			}
-                    else
-            		  node.setCompiled(false);
-        		}
-                else {
-                	if (isIf(node)) {
-                		currentLevel++;
-                		ifcount++;
-                	}
-                	else if (isEnd(node)) {
-                        currentLevel--;
-                        endifcount++;
-                    }
-                    node.setCompiled(false);
-                }
-        	}
-
-        }
-	}
-	
-    /**
-     * Determine if node is a branch
-     * @param node
-     * @return
-     */
-	private boolean isIf(PASTNode node)
-	{
-		return (node instanceof PASTIf) || (node instanceof PASTIfdef) || (node instanceof PASTIfndef);
-	}
-	
-    /**
-     * Retrieve the compile decision of the 'if' condition
-     * @param node
-     * @return
-     */
-	private boolean ifDecision(PASTNode node)
-	{
-		if (node instanceof PASTIf) return ((PASTIf)node).taken();
-		else if (node instanceof PASTIfdef) return ((PASTIfdef)node).taken();
-		else if (node instanceof PASTIfndef) return ((PASTIfndef)node).taken();
-		else
-			return false;
-	}
-	
-    /**
-     * Determine if the node is of 'else' kind
-     * @param node
-     * @return
-     */
-	private boolean isElse(PASTNode node)
-	{
-		return (node instanceof PASTElse);
-	}
-    
-    /**
-     * Determine if the node is of 'elseif' kind
-     * @param node
-     * @return
-     */
-    private boolean isElseif(PASTNode node)
-    {
-        return (node instanceof PASTElif);
-    }
-	
-    /**
-     * Determine if node is of 'end' kind
-     * @param node
-     * @return
-     */
-	private boolean isEnd(PASTNode node)
-	{
-		return (node instanceof PASTEndif);
-	}
-	
-	
-    /**
-    * Stack object used for evaluating "compiled" state of PP's
-    */
-	private static class CompiledContext
-	{
-		private boolean evaluation_  = false;
-		private int     nestedLevel_ = 0;
-        private boolean wasTrue_     = false;  // used for elif situations
-		
-		public CompiledContext(int nestedLevel, boolean evaluation)
-		{
-			evaluation_  = evaluation;
-			nestedLevel_ = nestedLevel;
-		}
-		
-		public boolean getEvaluation()
-		{
-			return evaluation_;
-		}
-		
-		public void setEvaluation(boolean evaluation)
-		{
-			evaluation_ = evaluation;
-		}
-		
-		public int getNestedLevel()
-		{
-			return nestedLevel_;
-		}
-        
-        public boolean wasTrue()              { return wasTrue_; }
-        public void    setWasTrue(boolean tf) { wasTrue_=tf; }
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java
deleted file mode 100644
index 3d54309..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis;
-/**
- * @author pazel
- */
-public class OpenMPError
-{
-    protected String description_ = "";
-    protected String filename_    = "";
-    protected String path_        = "";
-    protected int    lineno_      = 0;
-    protected int    severity_    = INFO;
-    
-    // severity codes
-    public static final int INFO    = 0;
-    public static final int WARN    = 1;
-    public static final int ERROR   = 2;
-    
-    /**
-     * OpenMPError - holds error information
-     * @param description - of problem
-     * @param filename    - of problem
-     * @param path        - of filename
-     * @param lineno      - of problem
-     * @param severity    - of problem
-     */
-    public OpenMPError(String description, String filename, String path, int lineno, int severity)
-    {
-        description_ = description;
-        filename_    = filename;
-        path_        = path;
-        lineno_      = lineno;
-        severity_    = severity;
-    }
-    
-    /**
-     * OpenMPError - holds error information
-     * @param description - String
-     * @param fqn         - String (path+filename)
-     * @param lineno      - of problem
-     * @param severity    - of problem
-     */
-    public OpenMPError(String description, String fqn, int lineno, int severity)
-    {
-        description_ = description;
-        
-        int l1 = fqn.lastIndexOf('/');   int l2 = fqn.lastIndexOf('\\');
-        int lastIndex = Math.max(l1, l2);
-        if (lastIndex==-1 || lastIndex>fqn.length()+1) 
-            filename_=fqn;
-        else {
-            filename_=fqn.substring(lastIndex+1);
-            path_=fqn.substring(0, lastIndex);
-        }
-        
-        lineno_      = lineno;
-        severity_    = severity;
-    }
-
-    
-    // accessors
-    
-    public String getDescription() { return description_; }
-    public String getFilename()    { return filename_;    }
-    public String getPath()        { return path_;        }
-    public int    getLineno()      { return lineno_;      }
-    public int    getSeverity()    { return severity_;    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java
deleted file mode 100644
index 8bdb950..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis;
-
-import java.util.LinkedList;
-
-/**
- * Holds all the errors encountered during analysis, ref. OpenMPAnalysisManager
- * 
- * @author pazel
- *
- */
-public class OpenMPErrorManager
-{
-    protected LinkedList errors_ = new LinkedList();    // holds the errors
-    
-    protected static OpenMPErrorManager currentManager_ = null;
-    
-    /**
-     * OpenMPErrorManager - constructor
-     *
-     */
-    public OpenMPErrorManager()
-    {
-        currentManager_ = this;
-    }
-    
-    /**
-     * Get the current error manager
-     * @return OpenMPErrorManager
-     */
-    public static OpenMPErrorManager getCurrentErrorManager()
-    {
-        return currentManager_;
-    }
-    
-    /**
-     * Add an error
-     * @param error - OpenMPError
-     */
-    public void addError(OpenMPError error)
-    {
-        errors_.add(error);
-    }
-    
-    /**
-     * Return an list of all errors
-     * @return LinkedList
-     */
-    public LinkedList getErrors()
-    {
-        return errors_;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java
deleted file mode 100644
index 1e6c56f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis;
-
-/**
- * IDs e.g. for markers
- * 
- * @author tibbitts
- * 
- */
-public class OpenMpIDs {
-	/**
-	 * These are the marker type used for showing concurrency
-	 */
-
-	public static final String ConcurrencyType = "org.eclipse.ptp.pldt.openmp.analysis.concurrency";
-	/**
-	 * These are the marker type used for showing non-concurrency
-	 */
-	public static final String NonConcurrencyType = "org.eclipse.ptp.pldt.openmp.analysis.nonconcurrency";
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java
deleted file mode 100644
index 656ee84..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * @author pazel
- */
-public class PASTElif extends PASTNode  implements IASTPreprocessorElifStatement
-{
-	protected IASTPreprocessorElifStatement elif_ = null;
-	
-    /**
-     * PASTElif - Elif preprocessor statement (constructor)
-     * @param elif: ASTElif
-     */
-	public PASTElif(IASTPreprocessorElifStatement elif)
-	{
-		super((ASTNode)elif);
-		elif_ = elif;
-	}
-    
-    public String getType()
-    {
-        return "#elif";
-    }
-
-    /**
-     * taken - reflects ASTElif choice
-     */
-	public boolean taken() {
-		return elif_.taken();
-	}
-
-	public char[] getCondition() {
-		return elif_.getCondition();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return elif_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java
deleted file mode 100644
index df255be..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTElse extends PASTNode implements IASTPreprocessorElseStatement
-{
-	protected IASTPreprocessorElseStatement else_ = null;
-	
-    /**
-     * PASTElse - Else preprocessor statement (Constructor)
-     * @param elsee
-     */
-	public PASTElse(IASTPreprocessorElseStatement elsee)
-	{
-		super((ASTNode)elsee);
-		else_ = elsee;
-	}
-    
-    public String getType()
-    {
-        return "#else";
-    }
-
-    /**
-     * taken - reflects ASTElse choice
-     */
-	public boolean taken() {
-		return else_.taken();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return else_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java
deleted file mode 100644
index 56c5242..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorEndifStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTEndif extends PASTNode implements IASTPreprocessorEndifStatement
-{
-	private IASTPreprocessorEndifStatement   endif_ = null;
-	
-    /**
-     * PASTEndif - Endif proprocessor statment (Constructor)
-     * @param endif: ASTEndif
-     */
-    public PASTEndif(IASTPreprocessorEndifStatement endif)
-    {
-    	super((ASTNode)endif);
-    	endif_ = endif;
-    }
-     
-    public String getType()
-    {
-        return "#endif";
-    }
-
-	public boolean isPartOfTranslationUnitFile() {
-		return endif_.isPartOfTranslationUnitFile();
-	}
-
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java
deleted file mode 100644
index b48dc8d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorErrorStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTError extends PASTNode implements IASTPreprocessorErrorStatement
-{
-	protected IASTPreprocessorErrorStatement error_ = null;
-	
-    /**
-     * PASTError - Error preprocessor statment (Constructor)
-     * @param error: ASTError
-     */
-	public PASTError(IASTPreprocessorErrorStatement error)
-	{
-		super((ASTNode)error);
-		error_ = error;
-	}
-    
-    public String getType()
-    {
-        return "#error";
-    }
-
-	public char[] getMessage() {
-		return error_.getMessage();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return error_.isPartOfTranslationUnitFile();
-	}
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java
deleted file mode 100644
index 7b6d99e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorEndifStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorErrorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorFunctionStyleMacroDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfndefStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorObjectStyleMacroDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorPragmaStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorUndefStatement;
-
-
-
-/**
- * Create our new PAST types from old AST types
- * @author pazel
- */
-public class PASTFactory 
-{
-    /**
-     * PASTFactoryMake - Conversion from AST to PAST
-     * @param node: IASTPreprocessorStatement
-     * @return PASTNode
-     */
-    public static PASTNode PASTFactoryMake(IASTPreprocessorStatement node)
-    {
-    	if (node instanceof IASTPreprocessorEndifStatement)
-    		return new PASTEndif((IASTPreprocessorEndifStatement)node);
-    	else if (node instanceof IASTPreprocessorElifStatement)
-    		return new PASTElif((IASTPreprocessorElifStatement)node);
-    	else if (node instanceof IASTPreprocessorElseStatement)
-    		return new PASTElse((IASTPreprocessorElseStatement)node);
-    	else if (node instanceof IASTPreprocessorIfndefStatement)
-    		return new PASTIfndef((IASTPreprocessorIfndefStatement)node);
-    	else if (node instanceof IASTPreprocessorIfdefStatement)
-    		return new PASTIfdef((IASTPreprocessorIfdefStatement)node);
-    	else if (node instanceof IASTPreprocessorIfStatement)
-    		return new PASTIf((IASTPreprocessorIfStatement)node);
-    	else if (node instanceof IASTPreprocessorErrorStatement)
-    		return new PASTError((IASTPreprocessorErrorStatement)node);
-    	else if (node instanceof IASTPreprocessorPragmaStatement)
-    		return new PASTPragma((IASTPreprocessorPragmaStatement)node);
-    	else if (node instanceof IASTPreprocessorUndefStatement)
-    		return new PASTUndef((IASTPreprocessorUndefStatement)node);
-    	else if (node instanceof IASTPreprocessorIncludeStatement)
-    		return new PASTInclusionStatement((IASTPreprocessorIncludeStatement)node);
-    	else if (node instanceof IASTPreprocessorFunctionStyleMacroDefinition)
-    		return new PASTFunctionMacro((IASTPreprocessorFunctionStyleMacroDefinition)node);
-        else if (node instanceof IASTPreprocessorObjectStyleMacroDefinition)
-            return new PASTObjectMacro((IASTPreprocessorObjectStyleMacroDefinition)node);
-        else{
-        	return null;//what is node?   LocationMap$ASTWarning.
-        }
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java
deleted file mode 100644
index 5ace67b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionStyleMacroParameter;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorFunctionStyleMacroDefinition;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTFunctionMacro extends PASTNode implements IASTPreprocessorFunctionStyleMacroDefinition
-{
-	protected IASTPreprocessorFunctionStyleMacroDefinition macro_ = null;
-	
-    /**
-     * PASTFunctionMacro - "define" function macro (Constructor)
-     * @param macro
-     */
-	public PASTFunctionMacro(IASTPreprocessorFunctionStyleMacroDefinition macro)
-	{
-		super((ASTNode)macro);
-		macro_ = macro;
-	}
-    
-    public String getType()
-    {
-        return "#define";
-    }
-
-    /**
-     * Delegated methods for interface IASTPreprocessorFunctionStyleMacroDefinition
-     */
-	public String getExpansion() {
-		return macro_.getExpansion();
-	}
-
-	public IASTName getName() {
-		return macro_.getName();
-	}
-
-	public void setExpansion(String exp) {
-	  macro_.setExpansion(exp);	
-	}
-
-	public void setName(IASTName name) {
-      macro_.setName(name);		
-	}
-
-	public void addParameter(IASTFunctionStyleMacroParameter parm) {
-      macro_.addParameter(parm);		
-	}
-
-	public IASTFunctionStyleMacroParameter[] getParameters() {
-		return macro_.getParameters();
-	}
-
-	public int getRoleForName(IASTName n) {
-		return macro_.getRoleForName(n);
-	}
-
-	public IASTFileLocation getExpansionLocation() {
-		return macro_.getExpansionLocation();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return macro_.isPartOfTranslationUnitFile();
-	}
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java
deleted file mode 100644
index 38e2acf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTIf extends PASTNode implements IASTPreprocessorIfStatement
-{
-	protected IASTPreprocessorIfStatement if_ = null;
-	
-    /**
-     * PASTIf - constructor
-     * @param ifx
-     */
-	public PASTIf(IASTPreprocessorIfStatement ifx)
-	{
-		super((ASTNode)ifx);
-		if_ = ifx;
-	}
-    
-    public String getType()
-    {
-        return "#if";
-    }
-
-	public boolean taken() {
-		return if_.taken();
-	}
-
-	//cdt40
-	public char[] getCondition() {
-		return if_.getCondition();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return if_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java
deleted file mode 100644
index 6325ca8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTIfdef extends PASTNode implements IASTPreprocessorIfdefStatement
-{
-	protected IASTPreprocessorIfdefStatement ifdef_ = null;
-	
-    /**
-     * PASTIfdef - constructor
-     * @param ifdef
-     */
-	public PASTIfdef(IASTPreprocessorIfdefStatement ifdef)
-	{
-		super((ASTNode)ifdef);
-		ifdef_ = ifdef;
-	}
-    
-    public String getType()
-    {
-        return "#ifdef";
-    }
-
-
-	public boolean taken() {
-		return ifdef_.taken();
-	}
-
-	public char[] getCondition() {
-		return ifdef_.getCondition();
-	}
-
-	public IASTName getMacroReference() {
-		return ifdef_.getMacroReference();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return ifdef_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java
deleted file mode 100644
index 58f9a5c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfndefStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTIfndef extends PASTNode implements IASTPreprocessorIfndefStatement
-{
-	protected IASTPreprocessorIfndefStatement ifndef_ = null;
-	
-    /**
-     * PASTIfndef - constructor
-     * @param ifndef
-     */
-	public PASTIfndef(IASTPreprocessorIfndefStatement ifndef)
-	{
-		super((ASTNode)ifndef);
-		ifndef_ = ifndef;
-	}
-    
-    public String getType()
-    {
-        return "#ifndef";
-    }
-
-
-	public boolean taken() {
-		return ifndef_.taken();
-	}
-
-	public char[] getCondition() {
-		return ifndef_.getCondition();
-	}
-
-	public IASTName getMacroReference() {
-		return ifndef_.getMacroReference();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return ifndef_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java
deleted file mode 100644
index fb4e7b7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTInclusionStatement extends PASTNode implements IASTPreprocessorIncludeStatement
-{
-	protected IASTPreprocessorIncludeStatement incl_ = null;
-	
-    /**
-     * PASTInclusionStatement - constructor
-     * @param incl: ASTInclusionStatement
-     */
-	public PASTInclusionStatement(IASTPreprocessorIncludeStatement incl)
-	{
-		super((ASTNode)incl);
-		incl_ = incl;
-	}
-    
-    public String getType()
-    {
-        return "#include";
-    }
-
-
-	public String getPath() {
-		return incl_.getPath();
-	}
-
-	// cdt40
-	public IASTName getName() {
-		return incl_.getName();
-	}
-
-	// cdt40
-	public boolean isSystemInclude() {
-		return incl_.isSystemInclude();
-	}
-	// cdt40
-	public boolean isActive() {
-		return incl_.isActive();
-	}
-	// cdt40
-	public boolean isResolved() {
-		return incl_.isResolved();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return incl_.isPartOfTranslationUnitFile();
-	}
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java
deleted file mode 100644
index 10314ff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * Preprocessor node, pseudo for IASTNode, used for analysis
- * 
- * @author pazel
- *
- */
-public abstract class PASTNode implements IASTNode 
-{
-
-    protected ASTNode   astNode_  = null;
-    protected boolean                      compiled_ = false;
-    
-    // Location information
-    protected int startingLine_     = -1;
-    protected int startLocation_    = -1;
-    protected int endLocation_      = -1;
-    protected String filename_      = "";
-    
-    /**
-     * PASTNode - Constructor
-     * @param astNode: LocationMap.ScannerASTNode
-     */
-    public PASTNode(ASTNode astNode)
-    {
-    	astNode_ = astNode;
-        
-        getLocationInfo();
-    }
-    
-    /**
-     * PASTNode - Copy Constructor
-     * @param n
-     */
-    public PASTNode(PASTNode n)
-    {
-       astNode_       = n.astNode_;
-       compiled_      = n.compiled_;
-       startingLine_  = n.startingLine_;
-       startLocation_ = n.startLocation_;
-       filename_      = n.filename_;
-    }
-    
-    /**
-     * getLocationInfo - Line number, offset, etc
-     *
-     */
-    protected void getLocationInfo()
-    {
-        IASTNodeLocation[] locations = astNode_.getNodeLocations();
-        filename_ = astNode_.getContainingFilename();
-        if (locations.length == 1) {
-            IASTFileLocation astFileLocation = null;
-            if (locations[0] instanceof IASTFileLocation) {
-                astFileLocation = (IASTFileLocation) locations[0];
-                startingLine_  = astFileLocation.getStartingLineNumber();
-                startLocation_ = astFileLocation.getNodeOffset();
-                endLocation_   = astFileLocation.getNodeOffset() + astFileLocation.getNodeLength();
-            }
-        }
-    }
-    
-    /**
-     * getFilename - accessor
-     * @return String
-     */
-    public String getFilename() { return filename_; }
-    
-    /**
-     * getStartingLine - accessor
-     * @return int
-     */
-    public int    getStartingLine() { return startingLine_; }
-    
-    /**
-     * getStartLocation - accessor
-     * @return int
-     */
-    public int    getStartLocation() { return startLocation_; }
-    
-    /**
-     * getEndLocation - accessor
-     * @return int
-     */
-    public int    getEndLocation()   { return endLocation_; }
-    
-    /**
-     * getType - descriptive text for type of node
-     * @return String
-     */
-    public abstract String getType();
-    
-    /**
-     * setCompiled - setter
-     * @param compiled: boolean
-     */
-    public void setCompiled(boolean compiled)
-    {
-    	compiled_ = compiled;
-    }
-    
-    /**
-     * isCompiled - accessor
-     * @return boolean
-     */
-    public boolean isCompiled()
-    {
-    	return compiled_;
-    }
-
-    /**
-     * delegated methods for interface IASTNode
-     */
-	public boolean accept(ASTVisitor visitor) {
-		return astNode_.accept(visitor);
-	}
-	/**  @since cdt40*/
-    public boolean contains(IASTNode node) {
-    	return astNode_.contains(node);
-    }
-
-
-	public String getContainingFilename() {
-		return astNode_.getContainingFilename();
-	}
-
-	public IASTFileLocation getFileLocation() {
-		return astNode_.getFileLocation();
-	}
-
-	public IASTNodeLocation[] getNodeLocations() {
-		return astNode_.getNodeLocations();
-	}
-
-	public IASTNode getParent() {
-		return astNode_.getParent();
-	}
-
-	public ASTNodeProperty getPropertyInParent() {
-		return astNode_.getPropertyInParent();
-	}
-
-	public String getRawSignature() {
-		return astNode_.getRawSignature();
-	}
-
-	public IASTTranslationUnit getTranslationUnit() {
-		return astNode_.getTranslationUnit();
-	}
-
-	public void setParent(IASTNode node) {
-		astNode_.setParent(node);
-	}
-
-	public void setPropertyInParent(ASTNodeProperty property) {
-		astNode_.setPropertyInParent(property);
-	}
-	
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java
deleted file mode 100644
index 37dbf4a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java
+++ /dev/null

@@ -1,1171 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.core.parser.IToken;
-import org.eclipse.cdt.internal.core.dom.parser.ASTInternal;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.cdt.internal.core.dom.parser.c.CScope;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPScope;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ptp.pldt.common.util.Utility;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPErrorManager;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.Dictionary;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.Symbol;
-import org.eclipse.ptp.pldt.openmp.analysis.parser.OpenMPScanner;
-import org.eclipse.ptp.pldt.openmp.analysis.parser.OpenMPToken;
-
-/**
- * Factory to convert PASTPragma-->PASTOMPPragma
- * @author pazel
- *
- */
-public class PASTOMPFactory
-{
-    protected PASTPragma          pragma_       = null;
-    protected PASTOMPPragma       ompPragma_    = null;
-    protected IASTTranslationUnit ast_          = null;
-    protected Dictionary          dictionary_   = null;
-    
-    protected static boolean      traceOn_      = false;
-    private static final boolean traceOn=false;
-    
-    protected OpenMPScanner scanner_ = null;
-    protected OpenMPToken   token_   = null;
-    
-    //protected ScannerCallbackManager callbackManager_ = null;
-    
-    /**
-     * Factory used only by this class
-     * @param pragma - PASTPragma
-     */
-    protected PASTOMPFactory(PASTPragma          pragma, 
-                             IASTTranslationUnit ast,
-                             Dictionary          dictionary)
-    {
-        pragma_     = pragma;
-        scanner_    = new OpenMPScanner(pragma_.getContent());
-        ast_        = ast;
-        dictionary_ = dictionary;
-        
-        //experiment();
-        
-        if (traceOn_)
-          readTokens();
-        
-        //otherinit(null);
-    }
-    
-    private void experiment()
-    {
-        IASTFileLocation loc = pragma_.getFileLocation();
-        if (loc!=null) {
-            IDocument document = Utility.getDocument(loc.getFileName());
-            if (document != null) {
-                try {
-                  String txt = document.get(pragma_.getLocalOffset(), pragma_.getLength());
-                  System.out.println(txt);
-                }
-                catch(Exception e) {}
-            }
-        }
-    }
-
-    
-    /**
-     * Return either omp or non-omp pragma
-     * @return
-     */
-    protected PASTPragma retrievePragma()
-    {
-        return (ompPragma_!=null ? ompPragma_ : pragma_);
-    }
-    
-    /**
-     * Factory for making the PASTOMPPragma structure
-     *               if possible
-     * @param pragma     : PASTPragma 
-     * @param ast        : IASTTranslationUnit
-     * @param dictionary : Dictionary
-     * @return: PASTPragma (or PASTOMPPragma if do-able)
-     */
-    public static PASTPragma makePASTOMP(PASTPragma          pragma, 
-                                         IASTTranslationUnit ast, 
-                                         Dictionary          dictionary)
-    {
-        PASTOMPFactory factory = new PASTOMPFactory(pragma, ast, dictionary);
-        factory.parse();
-        factory.locateRegion();
-        return factory.retrievePragma();
-    }
-    
-    /**
-     * Parse the pragma context for OMP
-     * @return boolean
-     */
-    protected boolean parse() 
-    {
-        // The first two tokens should be # and pragma
-    	OpenMPToken tok=nextToken();
-    	if(tok==null){
-    		if(traceOn)System.out.println("PASTOMPFactory.parser()..null token, ignored.");
-    		return false; //robustly handle empty tokens
-    	}
-        if (tok.getType()!=OpenMPScanner.mpPound) return false;
-        tok=nextToken();
-        if (tok.getType()!=OpenMPScanner.mpPragma) return false;
-        
-        // if next is not omp - this is not an openmp directive
-        if (nextToken().getType()!=OpenMPScanner.mpOmp) 
-            return false;
-        
-        // Construct the OpenMP pragma
-        ompPragma_ = new PASTOMPPragma(pragma_);
-        
-        // The next token sets the type
-        nextToken();
-        OpenMPToken typeToken = token_;   // determines type, used for error message
-        if (token_==null)  return false;
-        ompPragma_.setOMPType(setOMPType(token_.getType()));
-        
-        if (token_==null)  return false;
-        
-        switch(ompPragma_.getOMPType()) {
-            case PASTOMPPragma.OmpParallel:
-                completeParallel();
-                break;
-            case PASTOMPPragma.OmpFor:
-                completeFor();
-                break;
-            case PASTOMPPragma.OmpParallelFor:
-                completeParallelFor();
-                break;
-            case PASTOMPPragma.OmpSections:
-                completeSections();
-                break;
-            case PASTOMPPragma.OmpParallelSections:
-                completeParallelSections();
-                break;
-            case PASTOMPPragma.OmpSingle:
-                completeSingle();
-                break;
-            case PASTOMPPragma.OmpMaster:
-                break;
-            case PASTOMPPragma.OmpCritical:
-                break;
-            case PASTOMPPragma.OmpBarrier:
-                break;
-            case PASTOMPPragma.OmpAtomic:
-                break;
-            case PASTOMPPragma.OmpSection:
-                break;
-            case PASTOMPPragma.OmpFlush:
-                completeFlush();
-                break;
-            case PASTOMPPragma.OmpOrdered:
-                break;
-            case PASTOMPPragma.OmpThreadPrivate:
-                completeThreadPrivate();
-                break;
-            case PASTOMPPragma.OmpUnknown:
-                String typeString = (typeToken!=null ? typeToken.getImage(): "");
-                handleProblem("Unexpected token '"+typeString+"'", OpenMPError.ERROR);
-                break;
-        }
-        
-        // all remaining tokens are bogus
-        while(token_!=null) {
-            handleProblem("Unexpected token '"+token_.getImage()+"'", OpenMPError.ERROR);
-            nextToken();
-        }
-        
-        return true;
-    }
-    
-    /**
-     * Set the type of OpenMP statement based on keyword
-     * @param t
-     * @return
-     *    Note: always exit with the current token being the next to process, i.e.
-     *          call nextToken()
-     */
-    protected int setOMPType(int t)
-    {
-       nextToken();    // advance to next token 
-       switch(t) {
-           case OpenMPScanner.mpParallel:
-               if (token_==null) return PASTOMPPragma.OmpParallel;
-               if (token_.getType()==OpenMPScanner.mpFor) {
-                   nextToken(); return PASTOMPPragma.OmpParallelFor;
-               }
-               else if (token_.getType()==OpenMPScanner.mpSections) {
-                   nextToken(); return PASTOMPPragma.OmpParallelSections;
-               }
-               return PASTOMPPragma.OmpParallel;
-           case OpenMPScanner.mpFor:
-               return PASTOMPPragma.OmpFor;
-           case OpenMPScanner.mpSections:
-               return PASTOMPPragma.OmpSections;
-           case OpenMPScanner.mpSection:
-               return PASTOMPPragma.OmpSection;
-           case OpenMPScanner.mpSingle:
-               return PASTOMPPragma.OmpSingle;
-           case OpenMPScanner.mpMaster:
-               return PASTOMPPragma.OmpMaster;
-           case OpenMPScanner.mpCritical:
-               return PASTOMPPragma.OmpCritical;
-           case OpenMPScanner.mpBarrier:
-               return PASTOMPPragma.OmpBarrier;
-           case OpenMPScanner.mpAtomic:
-               return PASTOMPPragma.OmpAtomic;
-           case OpenMPScanner.mpFlush:
-               return PASTOMPPragma.OmpFlush;
-           case OpenMPScanner.mpOrdered:
-               return PASTOMPPragma.OmpOrdered;
-           case OpenMPScanner.mpThreadPrivate:
-               return PASTOMPPragma.OmpThreadPrivate;
-       }
-       return PASTOMPPragma.OmpUnknown;
-    }
-    
-    /**
-     * Parse a list of identifiers, e.g. as from shared(...)
-     * @return OpenMPToken []
-     */
-    protected OpenMPToken [] getIdentifierList()
-    {
-        LinkedList l = new LinkedList();
-        
-        if (token_==null)  return null;
-        //if (token_.getType()!=IToken.tLPAREN) return null;
-        
-        // look for lists like a,b,c
-        boolean commaNext = false;
-        nextToken();
-        while(token_!=null) {
-           if (commaNext) {
-               if (token_.getType()!=IToken.tCOMMA)   break; 
-               else  { commaNext=false;  nextToken(); continue; }
-           }
-           // whatever it is, add to the list
-           l.add(token_);
-           commaNext=true;
-           nextToken();
-        }
-        
-        // build the list
-        OpenMPToken [] ompl = new OpenMPToken[l.size()];
-        int count=0;
-        for(Iterator i = l.iterator(); i.hasNext();) {
-            ompl[count++] = (OpenMPToken)i.next();
-            // check to see if in dictionary
-            Symbol [] symbols = dictionary_.getSymbolsFor(ompl[count-1].getImage());
-            if (symbols.length==0) {
-                handleProblem("Undefined symbol '"+ompl[count-1].getImage()+"'", OpenMPError.ERROR);  
-            }
-            else {
-                // try to find at least one (non-global that is in same scope as pragma
-                boolean found=false;
-                for(int j=0; j<symbols.length; j++) {
-                    IASTNode fctn = symbols[j].getDefiningFunction();
-                    if (fctn==null || !(fctn instanceof IASTFunctionDefinition)) continue;
-                    if (isSymbolRelevant(symbols[j])) { found=true; break; }
-                }
-                if (!found)
-                    handleProblem("Symbol out of scope: '"+ompl[count-1].getImage()+"'", OpenMPError.ERROR); 
-            }
-        }
-        
-        // rule: always leave one ahead
-        nextToken();
-        
-        return ompl;
-    }
-    
-    /**
-     * See if symbol is a local variable in scope to pragma
-     * @param symbol - Symbol
-     * @return boolean
-     */
-    protected boolean isSymbolRelevant(Symbol symbol)
-    {   
-    	if(traceOn)System.out.println("Symbol: "+symbol.getName()+"  PASTOMPFactory.isSymbolRelevant()");
-        IASTNode node = null;
-        IASTNode parent,gp=null;
-		try {
-			// node=symbol.getScope().getPhysicalNode(); // no longer in CDT 4.0
-			// BRT replacement for getPhysicalNode() for CDT 4.0
-			// The following probably isn't an ideal solution (using Discouraged access methods)
-			// but seems to work for now. 
-			// alternatively I tried implementing: symbol.getPhysicalNode() but could not get the same answer from there.
-			
-			IScope scope=symbol.getScope();
-			// see: http://dev.eclipse.org/mhonarc/lists/cdt-dev/msg08653.html
-			// Another alternative would be to cast to CScope and do cScope.getPhysicalNode() from there.
-			node = ASTInternal.getPhysicalNodeOfScope(scope);
-
-		} catch (Exception e) {
-			return false;
-		}
-        
-        Utility.Location l = Utility.getLocation(node);
-        int nodeOffset = (l!=null ? l.getLow()  : 0);     //728
-        int nodeEndset = (l!=null ? l.getHigh() : 0);       //745
-        if(traceOn)System.out.println("node: "+node.getRawSignature()+" nodeOffset: "+nodeOffset+" nodeEndset= "+nodeEndset);
-        
-        int pOffset = pragma_.getLocalOffset();            //822
-        int pEndset = pOffset+pragma_.getLength()-1;       //864
-        if(traceOn)System.out.println(("pragma pOffset= "+pOffset+" pEndset= "+pEndset));
-        
-        boolean tf = ((nodeEndset<pOffset || pEndset<nodeOffset) ? false : true);  //false
-        if (!tf)  return tf;
-        
-        // See if the declaration succeeds the pragma
-        Utility.Location dl = Utility.getLocation(symbol.getDeclarator());
-        if (dl==null)  return false;
-        if(traceOn)System.out.println("dl.getLow()="+dl.getLow()+" pOffset="+pOffset+
-        		" > is: "+(dl.getLow()>pOffset));
-        
-        return (dl.getLow()>pOffset ? false : true);
-    }
-    
-    /**
-     * Acquire the next token
-     * @return OpenMPToken
-     */
-    protected OpenMPToken nextToken()
-    {
-        // Following in case of backup
-        if (token_!=null && token_.getNext()!=null) {
-            token_ = token_.getNext();
-            return token_;
-        }
-        
-        // chain to last one and move on
-        OpenMPToken token = scanner_.nextToken();
-        if (token_!=null)
-            token_.setNext(token);
-        token_ = token;
-        return token_;
-    }
-    
-    /**
-     * Get current token so as to mark (in code) where we were
-     * @return OpenMPToken
-     */
-    protected OpenMPToken mark()
-    {
-        if (token_==null)
-            token_ = nextToken();
-        return token_;
-    }
-    
-    /**
-     * Reset token queue (nextToken() get one after this one)
-     * @param token
-     */
-    protected void backupTo(OpenMPToken token)
-    {
-        token_ = token;
-    }
-    
-    /**
-     * Test the parser
-     *
-     */
-    private void readTokens()
-    {
-        OpenMPScanner scanner = new OpenMPScanner(pragma_.getContent());
-        
-        OpenMPToken token = null;
-        do {
-            token = scanner.nextToken();
-            if (token!=null)
-              System.out.println("Token:"+token.getImage()+" type="+token.getType());
-         } while(token!=null);
-    }
-    
-    /**
-     * Complete the parsing of #pragma omp parallel
-     *
-     */
-    private void completeParallel()
-    {
-        boolean bShared       = false;
-        boolean bPrivate      = false;
-        boolean bFirstPrivate = false;
-        boolean bDefault      = false;
-        boolean bReduction    = false;
-        boolean bCopyin       = false;
-        boolean bIf           = false;
-        boolean bNumthreads   = false;
-        
-        while(token_!=null) {
-            switch(token_.getType()){
-                case OpenMPScanner.mpShared:
-                    if (!bShared) 
-                        bShared = setShared();
-                    break;
-                case OpenMPScanner.mpPrivate:
-                    if (!bPrivate) 
-                        bPrivate = setPrivate();
-                    break;
-                case OpenMPScanner.mpFirstprivate:
-                    if (!bFirstPrivate) 
-                        bFirstPrivate = setFirstPrivate();
-                    break;
-               case OpenMPScanner.mpDefault:
-                    if (!bDefault)
-                        bDefault = setDefault();
-                    break;
-               case OpenMPScanner.mpReduction:
-                   if (!bReduction)
-                       bReduction = setReduction();
-                   break;
-               case OpenMPScanner.mpCopyin:
-                   if (!bCopyin) 
-                       bCopyin = setCopyin();
-                   break;
-               case OpenMPScanner.mpIf:
-                   if (!bIf)  
-                       bIf = setIf();
-                   break;
-               case OpenMPScanner.mpNumthreads:
-                   if (!bNumthreads)
-                       bNumthreads = setNumThreads();
-                   break;
-               default:
-                   handleProblem("Unexpected token "+token_.getImage(), OpenMPError.ERROR);
-                   nextToken();
-                   break;
-            }
-        }
-    }
-    
-    /**
-     * Complete parsing #paragma omp for
-     *
-     */
-    private void completeFor()
-    {
-        boolean bPrivate      = false;
-        boolean bFirstPrivate = false;
-        boolean bLastPrivate  = false;
-        boolean bReduction    = false;
-        boolean bOrdered      = false;
-        boolean bSchedule     = false;
-        boolean bNowait       = false;
-        
-        while(token_!=null) {
-            switch(token_.getType()){
-                case OpenMPScanner.mpPrivate:
-                    if (!bPrivate)
-                        bPrivate = setPrivate();
-                    break;
-                case OpenMPScanner.mpFirstprivate:
-                    if (!bFirstPrivate) 
-                        bFirstPrivate = setFirstPrivate();
-                    break;
-                case OpenMPScanner.mpLastprivate:
-                    if (!bLastPrivate)  
-                        bLastPrivate = setLastPrivate(); 
-                    break;
-                case OpenMPScanner.mpReduction:
-                    if (!bReduction)
-                        bReduction = setReduction();
-                  break;
-                case OpenMPScanner.mpOrdered:
-                    if (!bOrdered) {
-                      ompPragma_.setOrdered(true);  bOrdered=true; }
-                    nextToken();
-                    break;
-                case OpenMPScanner.mpSchedule:
-                    if (!bSchedule)
-                        bSchedule = setSchedule();
-                    break;
-                case OpenMPScanner.mpNowait:
-                    if (!bNowait) {
-                        ompPragma_.setNoWait(true);  bNowait=true;  }
-                    nextToken();
-                    break;
-                default:
-                    handleProblem("Unexpected token "+token_.getImage(), OpenMPError.ERROR);
-                    nextToken();
-                    break;
-            }
-        }
-    }
-    
-    
-    /**
-     * Complete parsing #paragma omp parallel for
-     *
-     */
-    private void completeParallelFor()
-    {
-        boolean bShared       = false;
-        boolean bPrivate      = false;
-        boolean bFirstPrivate = false;
-        boolean bLastPrivate  = false;
-        boolean bDefault      = false;
-        boolean bReduction    = false;
-        boolean bCopyin       = false;
-        boolean bIf           = false;
-        boolean bOrdered      = false;
-        boolean bSchedule     = false;
-        
-        while(token_!=null) {
-            switch(token_.getType()){
-                case OpenMPScanner.mpShared:
-                    if (!bShared) 
-                        bShared = setShared();
-                    break;
-                case OpenMPScanner.mpPrivate:
-                    if (!bPrivate)
-                        bPrivate = setPrivate();
-                    break;
-                case OpenMPScanner.mpFirstprivate:
-                    if (!bFirstPrivate) 
-                        bFirstPrivate = setFirstPrivate();
-                    break;
-                case OpenMPScanner.mpLastprivate:
-                    if (!bLastPrivate)  
-                        bLastPrivate = setLastPrivate(); 
-                    break;
-                case OpenMPScanner.mpDefault:
-                    if (!bDefault)
-                        bDefault = setDefault();
-                    break;
-                case OpenMPScanner.mpReduction:
-                    if (!bReduction)
-                        bReduction = setReduction();
-                  break;
-                case OpenMPScanner.mpCopyin:
-                    if (!bCopyin) 
-                        bCopyin = setCopyin();
-                    break;
-                case OpenMPScanner.mpIf:
-                    if (!bIf)  
-                        bIf = setIf();
-                    break;
-                case OpenMPScanner.mpOrdered:
-                    if (!bOrdered) {
-                      ompPragma_.setOrdered(true);  bOrdered=true; }
-                    nextToken();
-                    break;
-                case OpenMPScanner.mpSchedule:
-                    if (!bSchedule)
-                        bSchedule = setSchedule();
-                    break;
-                default:
-                    handleProblem("Unexpected token "+token_.getImage(), OpenMPError.ERROR);
-                    nextToken();
-                    break;
-            }
-        }
-    }
-    
-    
-    /**
-     * Complete parsing #pragma omp parallel sections
-     *
-     */
-    private void completeParallelSections()
-    {
-        boolean bShared       = false;
-        boolean bPrivate      = false;
-        boolean bFirstPrivate = false;
-        boolean bLastPrivate  = false;
-        boolean bDefault      = false;
-        boolean bReduction    = false;
-        boolean bCopyin       = false;
-        boolean bIf           = false;
-        
-        while(token_!=null) {
-            switch(token_.getType()){
-                case OpenMPScanner.mpShared:
-                    if (!bShared) 
-                        bShared = setShared();
-                    break;
-                case OpenMPScanner.mpPrivate:
-                    if (!bPrivate)
-                        bPrivate = setPrivate();
-                    break;
-                case OpenMPScanner.mpFirstprivate:
-                    if (!bFirstPrivate) 
-                        bFirstPrivate = setFirstPrivate();
-                    break;
-                case OpenMPScanner.mpLastprivate:
-                    if (!bLastPrivate)  
-                        bLastPrivate = setLastPrivate(); 
-                    break;
-                case OpenMPScanner.mpDefault:
-                    if (!bDefault)
-                        bDefault = setDefault();
-                    break;
-                case OpenMPScanner.mpReduction:
-                    if (!bReduction)
-                        bReduction = setReduction();
-                  break;
-                case OpenMPScanner.mpCopyin:
-                    if (!bCopyin) 
-                        bCopyin = setCopyin();
-                    break;
-                case OpenMPScanner.mpIf:
-                    if (!bIf)  
-                        bIf = setIf();
-                    break;
-                default:
-                    handleProblem("Unexpected token "+token_.getImage(), OpenMPError.ERROR);
-                    nextToken();
-                    break;
-            }
-        }
-    }
-
-    
-    /**
-     * Complete parse of #pragma omp sections
-     *
-     */
-    private void completeSections()
-    {
-        boolean bPrivate      = false;
-        boolean bFirstPrivate = false;
-        boolean bLastPrivate  = false;
-        boolean bReduction    = false;
-        boolean bNowait       = false;
-        
-        while(token_!=null) {
-            switch(token_.getType()){
-                case OpenMPScanner.mpPrivate:
-                    if (!bPrivate)
-                        bPrivate = setPrivate();
-                     break;
-                case OpenMPScanner.mpFirstprivate:
-                    if (!bFirstPrivate) 
-                        bFirstPrivate = setFirstPrivate();
-                   break;
-                case OpenMPScanner.mpLastprivate:
-                    if (!bLastPrivate)  
-                        bLastPrivate = setLastPrivate(); 
-                    break;
-                case OpenMPScanner.mpReduction:
-                    if (!bReduction)
-                        bReduction = setReduction();
-                    break;
-                case OpenMPScanner.mpNowait:
-                    if (!bNowait) {
-                        ompPragma_.setNoWait(true);  bNowait=true;  }
-                    nextToken();
-                    break;
-                 default:
-                    handleProblem("Unexpected token "+token_.getImage(), OpenMPError.ERROR);
-                    nextToken();
-                    break;
-            }
-        }
-        
-    }
-    
-    /**
-     * Complete options for the #pragma omp single
-     *
-     */
-    private void completeSingle()
-    {
-        boolean bPrivate      = false;
-        boolean bFirstPrivate = false;
-        boolean bCopyPrivate  = false;
-        boolean bNowait       = false;
-        
-        while(token_!=null) {
-            switch(token_.getType()){
-                case OpenMPScanner.mpPrivate:
-                    if (!bPrivate)
-                        bPrivate = setPrivate();
-                   break;
-                case OpenMPScanner.mpFirstprivate:
-                    if (!bFirstPrivate) 
-                        bFirstPrivate = setFirstPrivate();
-                    break;
-                case OpenMPScanner.mpCopyprivate:
-                    if (!bCopyPrivate) 
-                       bCopyPrivate = setCopyPrivate();
-                    break;
-                case OpenMPScanner.mpNowait:
-                    if (!bNowait) {
-                        ompPragma_.setNoWait(true);  bNowait=true;  }
-                    nextToken();
-                    break;
-                default:
-                    handleProblem("Unexpected token "+token_.getImage(), OpenMPError.ERROR);
-                    nextToken();
-                    break;
-            }
-        }
-        
-    }
-    
-    /**
-     * Complete the options for the #pragma omp flush
-     *
-     */
-    private void completeFlush()
-    {
-        if (token_==null || token_.getType()!=IToken.tLPAREN)  return;
-        
-        OpenMPToken []   list = getIdentifierList();
-        
-        ompPragma_.setPrivateList(list);
-    }
-
-    
-    /**
-     * Complete the options for the #pragma omp threadprivate
-     *
-     */
-    private void completeThreadPrivate()
-    {
-        if (token_==null || token_.getType()!=IToken.tLPAREN)  return;
-        
-        OpenMPToken []   list = getIdentifierList();
-        
-        ompPragma_.setThreadPrivateList(list);
-    }
-    
-    /**
-     * Translate the type of reduction operato
-     * @return int (that PASTOMPPragma understands)
-     */
-    private int getReductionOperator()
-    {
-        switch(token_.getType()) {
-            case IToken.tPLUS:
-                return PASTOMPPragma.OmpOpPlus;
-            case IToken.tSTAR:
-                return PASTOMPPragma.OmpOpMult;
-            case IToken.tMINUS:
-                return PASTOMPPragma.OmpOpMinus;
-            case IToken.tAMPER:
-                return PASTOMPPragma.OmpOpBAnd;
-            case IToken.tXOR:
-                return PASTOMPPragma.OmpOpBXor;
-            case IToken.tBITOR:
-                return PASTOMPPragma.OmpOpBOr;
-            case IToken.tAND:
-                return PASTOMPPragma.OmpOpLAnd;
-            case IToken.tOR:
-                return PASTOMPPragma.OmpOpLOr;
-            default:
-                return PASTOMPPragma.OmpOpUnknown;
-        }
-    }
-    
-    /**
-     * Translate the kind of schedule
-     * @return int (that PASTOMPPragma understands)
-     */
-    private int getScheduleKind()
-    {
-        switch(token_.getType()) {
-            case OpenMPScanner.mpStatic:
-                return PASTOMPPragma.OmpSKStatic;
-            case OpenMPScanner.mpDynamic:
-                return PASTOMPPragma.OmpSKDynamic;
-            case OpenMPScanner.mpGuided:
-                return PASTOMPPragma.OmpSKGuided;
-            case OpenMPScanner.mpRuntime:
-                return PASTOMPPragma.OmpSKRuntime;
-            default:
-                return PASTOMPPragma.OmpSKUnknown;
-        }
-    }
-    
-    /**
-     * Get the schedule expression
-     * @return OpenMPToken []
-     */
-    private OpenMPToken [] getExpression()
-    {
-        LinkedList l = new LinkedList();
-        int        parenCt=1;
-        
-        nextToken();
-        while(token_!=null) {
-            if (token_.getType()==IToken.tRPAREN){
-                parenCt--;  if (parenCt==0)  break;  
-                            else {l.add(token_); }  // end of schedule clause
-            }
-            else if (token_.getType()==IToken.tCOMMA) {
-                if (parenCt==1)  break; else l.add(token_);               // another way to exit
-            }
-            else if (token_.getType()==IToken.tLPAREN) 
-            { parenCt++;  l.add(token_);  }
-            else 
-                l.add(token_);
-            nextToken();
-        }
-        
-        OpenMPToken [] list = new OpenMPToken[l.size()];
-        for(int i=0; i<l.size(); i++)
-            list[i] = (OpenMPToken)l.get(i);
-        
-        nextToken();   // move ahead
-        return list;
-    }
-    
-    private boolean setIf()
-    {
-        nextToken();
-        OpenMPToken [] list = getExpression();
-        ompPragma_.setIfExpression(list); 
-        return true;
-    }
-    
-    
-    private boolean setPrivate()
-    {
-        nextToken();
-        OpenMPToken [] list = getIdentifierList();
-        ompPragma_.setPrivateList(list); 
-        return true;
-    }
-    
-    private boolean setFirstPrivate()
-    {
-        nextToken();
-        OpenMPToken [] list = getIdentifierList();
-        ompPragma_.setFirstPrivateList(list); 
-        return true;
-    }
-    
-    private boolean setLastPrivate()
-    {
-        nextToken();
-        OpenMPToken [] list = getIdentifierList();
-        ompPragma_.setLastPrivateList(list); 
-        return true;
-    }
-   
-    private boolean setShared()
-    {
-        nextToken();
-        OpenMPToken [] list = getIdentifierList();
-        ompPragma_.setSharedList(list); 
-        return true;
-    }
-    
-    private boolean setCopyin()
-    {
-       nextToken();
-       OpenMPToken [] list = getIdentifierList();
-       ompPragma_.setCopyinList(list); 
-       return true;
-    }
-    
-    
-    private boolean setCopyPrivate()
-    {
-       nextToken();
-       OpenMPToken [] list = getIdentifierList();
-       ompPragma_.setCopyPrivateList(list); 
-       return true;
-    }
-
-    
-    private boolean setDefault()
-    {
-        boolean shared = false;
-        nextToken();
-        if (token_.getType()==IToken.tLPAREN) {
-            nextToken();
-            if (token_.getType()==OpenMPScanner.mpShared)    shared=true;
-            else if (token_.getType()==OpenMPScanner.mpNone) shared=false;
-            else return false;
-            nextToken();  // get the paren
-            if (token_==null || token_.getType()!=IToken.tRPAREN)  return false;
-            ompPragma_.setDefault(shared ? PASTOMPPragma.OmpShared : 
-                                           PASTOMPPragma.OmpNone);
-            nextToken();
-            return true;
-        }
-        return false;
-    }
-    
-    private boolean setReduction()
-    {
-        nextToken();
-        if (token_.getType()==IToken.tLPAREN) {
-            nextToken();
-            int ro = getReductionOperator();
-            nextToken();
-            if (token_!=null && token_.getType()==IToken.tCOLON) {
-                OpenMPToken [] rlist = getIdentifierList();
-                ompPragma_.setReductionOperator(ro);
-                ompPragma_.setReductionList(rlist);  
-                return true;
-            }
-            return false;
-        }
-        return false;
-    }
-    
-    private boolean setNumThreads()
-    {
-        nextToken();
-        if (token_.getType()==IToken.tLPAREN) {
-            OpenMPToken [] expr = getExpression();
-            if (token_==null || token_.getType()!=IToken.tRPAREN) return false;
-            ompPragma_.setNumThreadsExpr(expr);
-            return true;
-        }
-        return false;
-    }
-    
-    private boolean setSchedule()
-    {
-        nextToken();
-        if (token_.getType()==IToken.tLPAREN) {
-            nextToken();
-            int kind = getScheduleKind();
-            nextToken();
-            if (token_!=null && token_.getType()==IToken.tCOMMA) {
-                OpenMPToken [] expr = getExpression();
-                ompPragma_.setScheduleKind(kind);
-                ompPragma_.setChunkExpression(expr);
-                return true;
-            }
-            return false;
-        }
-        return false;
-    }
-    
-    
-    // We are presently unsure of what to do with all the following stuff:
-//    protected static final ScannerProblemFactory spf = new ScannerProblemFactory();
-//    protected ScannerCallbackManager callbackManager;
-//    protected static char[] EMPTY_CHAR_ARRAY = new char[0];
-//    
-//    protected void otherinit(ISourceElementRequestor requestor)
-//    {
-//        callbackManager = new ScannerCallbackManager(new NullSourceElementRequestor());
-//    }
-    
-    /**
-     * handleProblem
-     * @param description - String
-     * @param severity    - int
-     */
-    protected void handleProblem(String  description, int severity)
-    {
-        OpenMPError error = new OpenMPError(description, 
-                                            pragma_.getContainingFilename(),
-                                            pragma_.getStartingLine(),
-                                            severity);
-        OpenMPErrorManager.getCurrentErrorManager().addError(error);
-        ompPragma_.addProblem(error);  // we really don't need this, but may be useful later
-    }
-    
-    /**
-     * lFind the associated region to the current pragma
-     *
-     */
-    private void locateRegion()
-    {
-        if (ompPragma_==null)  return;
-        
-        switch (ompPragma_.getOMPType()) {
-            // followed by structured region
-            case PASTOMPPragma.OmpParallel:
-            case PASTOMPPragma.OmpSections:
-            case PASTOMPPragma.OmpSection:
-            case PASTOMPPragma.OmpParallelSections:
-            case PASTOMPPragma.OmpSingle:
-            case PASTOMPPragma.OmpMaster:
-            case PASTOMPPragma.OmpCritical:
-            case PASTOMPPragma.OmpOrdered:
-                determineRegion(STRUCTURED_BLOCK, ompPragma_);
-                break;
-                
-            // Must be followed by FOR
-            case PASTOMPPragma.OmpFor:
-            case PASTOMPPragma.OmpParallelFor:
-                determineRegion(FOR_BLOCK, ompPragma_);
-                break;
-
-            // Stands alone
-            case PASTOMPPragma.OmpBarrier:
-            case PASTOMPPragma.OmpFlush:
-            case PASTOMPPragma.OmpThreadPrivate:
-                determineRegion(LOCATION_ONLY, ompPragma_);
-                break;
-            
-            // Followed by expression
-            case PASTOMPPragma.OmpAtomic:
-                determineRegion(EXPRESSION_BLOCK, ompPragma_);
-                break;
-            case PASTOMPPragma.OmpUnknown:
-                break;
-        }
-    }
-    
-    public static final int STRUCTURED_BLOCK   = RegionDeterminationVisitor.STRUCTURED_BLOCK;
-    public static final int FOR_BLOCK          = RegionDeterminationVisitor.FOR_BLOCK;
-    public static final int EXPRESSION_BLOCK   = RegionDeterminationVisitor.EXPRESSION_BLOCK;
-    public static final int LOCATION_ONLY      = RegionDeterminationVisitor.LOCATION_ONLY;
-    
-    /**
-     * Determine that code region affilated with a pragma & the peer node
-     * @param type - int (see constatns above)
-     * @param ompPragma - PASTOMPPragma
-     */
-    protected void determineRegion(int type, PASTOMPPragma ompPragma)
-    {
-        RegionDeterminationVisitor rdv = new RegionDeterminationVisitor(type, ompPragma);
-        ast_.accept(rdv);
-        
-        // Ensure that region for structured block is a compound statement
-        if (type==STRUCTURED_BLOCK) {
-            IASTNode region = ompPragma.getRegion();
-            if (region==null || !(region instanceof IASTCompoundStatement))
-                handleProblem("Pragma expects structured block to follow it", OpenMPError.ERROR);
-        }
-        else if (type==FOR_BLOCK) {
-            IASTNode region = ompPragma.getRegion();
-            if (region==null || !(region instanceof IASTForStatement))
-                handleProblem("Pragma expects for loop to follow it", OpenMPError.ERROR);
-        }
-    }
-    
-   
-    /**
-     * RegionDeterminationVisitor is used to traverse AST to find region
-     */
-    protected class RegionDeterminationVisitor extends ASTVisitor
-    {
-        protected int           searchType_        = STRUCTURED_BLOCK;
-        protected PASTOMPPragma oPragma_           = null; 
-        protected int           pragmaLine_        = 0;
-        protected int           pragmaLocation_    = 0;
-        protected int           pragmaLength_      = 0;
-        
-        protected int           closeness_         = -1;
-        
-        // for statement location
-        //protected IASTStatement lastStatement_ = null;
-        
-        public final static int STRUCTURED_BLOCK   = 0;
-        public final static int FOR_BLOCK          = 1;
-        public final static int EXPRESSION_BLOCK   = 2;
-        public final static int LOCATION_ONLY      = 3;  // tell me what immediately precedes
-        
-        public RegionDeterminationVisitor(int type, PASTOMPPragma ompPragma)
-        {
-            searchType_ = type; 
-            switch(searchType_) {
-                case STRUCTURED_BLOCK:
-                    shouldVisitStatements = true;
-                    break;
-                case FOR_BLOCK:
-                    shouldVisitStatements = true;                    
-                    break;
-                case EXPRESSION_BLOCK:
-                    shouldVisitStatements = true;    // we want an expression statement
-                    break;
-                case LOCATION_ONLY:
-                    shouldVisitStatements = true;
-                    break;
-            }
-            
-            oPragma_        = ompPragma;
-            pragmaLine_     = oPragma_.getStartingLine();
-            pragmaLocation_ = oPragma_.getOffset(); //oPragma_.getStartLocation();
-            pragmaLength_   = oPragma_.getLength();
-        }
-        
-        /**
-         * override function to visit statements implementation
-         *         NOTE: Region is first statement following pragma
-         * 
-         * @param statement - IASTStatement
-         * @return int
-         */
-        public int visit(IASTStatement statement) {
-            ASTNode node = (statement instanceof ASTNode ? (ASTNode)statement : null);
-            if (node==null)  return PROCESS_CONTINUE;
-            
-            // ensure the node is in the same file as the pragma
-            if (node.getContainingFilename().equals(oPragma_.getFileLocation().getFileName())) {
-              int              totalOffset = node.getOffset();
-              Utility.Location loc = Utility.getLocation(node);
-              assert(loc!=null);
-              int localOffset = loc.getLow();  // this is the offset local to the file
-              int length      = loc.getHigh()-loc.getLow()+1;
-              
-              // We look at all nodes that occur before the pragma - 2 cases
-              // 1) if the node scope encompases the pragam, pragma is a child of node
-              // 2) otherwise we call it a peer (even when it isn't)
-              // Corrections occur by continuing for the tightest fit
-              if (totalOffset<pragmaLocation_) {
-                  if (pragmaLocation_+pragmaLength_<totalOffset+length) { // encompassing
-                      oPragma_.setLocation(statement, PASTOMPPragma.ChildProximity);
-                  }
-                  else {
-                      if (totalOffset+length<pragmaLocation_) {
-                        int closeness = pragmaLocation_-(totalOffset+length);
-                        if (closeness_==-1 || closeness<closeness_)   {  // get closest statement
-                          oPragma_.setLocation(statement, PASTOMPPragma.NeighborProximity);
-                          closeness_ = closeness;
-                        }
-                      }
-                  }
-                  // keep going to find tightest fit
-              }
-
-              // Check if this is the first node after the pragma - if so, could be our region
-              if (totalOffset>pragmaLocation_) {
-                if (searchType_!=LOCATION_ONLY) {
-                  // With this we got to the next stmt:
-                  if (searchType_==FOR_BLOCK && !(statement instanceof IASTForStatement))
-                      return PROCESS_ABORT;  // error handled in determineRegion
-                  // Set region information (ref. OpenMPArtifactView to see how used)
-                  oPragma_.setRegionFilename(node.getContainingFilename()); 
-                  oPragma_.setRegionLength(length);
-                  oPragma_.setRegionOffset(localOffset);
-                  oPragma_.setRegion(statement);
-                  if (traceOn_)
-                    System.out.println((searchType_==FOR_BLOCK ? "(for)" : "(region)") + "pragma at "+ pragmaLocation_+
-                        " has statement at "+ localOffset);
-                }
-                return PROCESS_ABORT;
-              }
-            }
-            return PROCESS_CONTINUE;
-        }
-
-    }
-
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java
deleted file mode 100644
index de98009..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java
+++ /dev/null

@@ -1,375 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorPragmaStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.parser.OpenMPToken;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTOMPPragma extends PASTPragma
-{
-    protected int ompType_ = OmpUnknown;
-    
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] sharedList_        = null;
-    // OmpParallel, OmpFor, OmpSections, OmpSingle, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] privateList_       = null;
-    // OmpParallel, OmpFor, OmpSections, OmpSingle, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] firstPrivateList_  = null;
-    // OmpFor, OmpSections, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] lastPrivateList_   = null;
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected int            default_           = OmpShared;  // or OmpNone
-    // OmpParallel, OmpFor, OmpSections, OmpParallelFor, OmpParallelSections
-    protected int            reductionOperator_ = OmpOpUnknown;
-    protected OpenMPToken [] reductionList_     = null;
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] copyinList_        = null;
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] ifExpression_            = null;
-    // OmpFor, OmpParallelFor
-    protected boolean        ordered_           = false;
-    // OmpFor, OmpParallelFor
-    protected int            scheduleKind_      = OmpSKUnknown;
-    protected OpenMPToken [] chunkExpression_   = null;
-    // OmpFor, OmpSections, OmpSingle
-    protected boolean        nowait_            = false;
-
-    // OmpThreadPrivate
-    protected OpenMPToken [] threadPrivateList_ = null;
-    // OmpParallel
-    protected OpenMPToken [] numThreadsExpr_    = null;
-    // OmpSingle
-    protected OpenMPToken [] copyPrivateList_   = null;
-    // OmpFlush
-    protected OpenMPToken [] flushList_         = null;
-    // Region
-    protected IASTNode      region_  = null;
-    protected String        regionFilename_ = null;
-    protected int           regionOffset_   = 0;     // local to file (not acctg for includes)
-    protected int           regionLength_   = 0;
-    // Problem list for this omp pragma
-    protected LinkedList    problemList_  = new LinkedList();  // of OpenMPError's
-    
-    protected IASTStatement locationNode_ = null;   // just preceding stmt - if cmpd stmt
-    protected int           locationProximity_ = NoProximity;
-    
-    public static final int NoProximity       = -1;
-    public static final int NeighborProximity = 0;  // cst indicating pragma at same level and succeeding pragma
-    public static final int ChildProximity    = 1;  // cst indicating pragma is child of ast node
-
-    
-    public static final int OmpUnknown  = -1;
-    public static final int OmpParallel = 0;
-    public static final int OmpFor      = 1;
-    public static final int OmpSection  = 2;
-    public static final int OmpSections = 3;
-    public static final int OmpSingle   = 4;
-    public static final int OmpParallelFor      = 5;
-    public static final int OmpParallelSections = 6;
-    public static final int OmpMaster   = 7;
-    public static final int OmpCritical = 8;
-    public static final int OmpBarrier  = 9;
-    public static final int OmpAtomic   = 10;
-    public static final int OmpFlush    = 11;
-    public static final int OmpOrdered  = 12;
-    public static final int OmpThreadPrivate = 13;
-    
-    public static final int OmpShared   = 0;
-    public static final int OmpNone     = 1;
-    
-    public static final int OmpOpUnknown = -1;
-    public static final int OmpOpPlus    = 0;
-    public static final int OmpOpMult    = 1;
-    public static final int OmpOpMinus   = 2;
-    public static final int OmpOpBAnd    = 3;
-    public static final int OmpOpBXor    = 4;
-    public static final int OmpOpBOr     = 5;
-    public static final int OmpOpLAnd    = 6;
-    public static final int OmpOpLOr     = 7;
-    
-    public static final int OmpSKUnknown = -1;
-    public static final int OmpSKStatic  = 0;
-    public static final int OmpSKDynamic = 1;
-    public static final int OmpSKGuided  = 2;
-    public static final int OmpSKRuntime = 3;
-	
-    /**
-     * PASTOMPPragma - constructor using ASTPragma
-     * @param pragma - ASTPragma
-     */
-	public PASTOMPPragma(IASTPreprocessorPragmaStatement pragma)
-	{
-		super(pragma);
-		//pragma_ = pragma;
-	}
-    
-    /**
-     * PASTOMPPragma - constructor using PASTPragma
-     * @param pragma - PASTPragma
-     */
-    public PASTOMPPragma(PASTPragma pragma)
-    {
-        super(pragma);
-    }
-    
-    public String getType()
-    {
-        String t = "";
-        switch(ompType_) {
-            case OmpUnknown:
-                t="--unknown==";
-                break;
-            case OmpParallel:
-                t="parallel";
-                break;
-            case OmpFor:
-                t="for";
-                break;
-            case OmpSections:
-                t="sections";
-                break;
-            case OmpSection:
-                t="section";
-                break;
-            case OmpSingle:
-                t="single";
-                break;
-            case OmpParallelFor:
-                t="parallel for";
-                break;
-            case OmpParallelSections:
-                t="parallel sections";
-                break;
-            case OmpMaster:
-                t="master";
-                break;
-            case OmpCritical:
-                t="critical";
-                break;
-            case OmpBarrier:
-                t="barrier";
-                break;
-            case OmpAtomic:
-                t="atomic";
-                break;
-            case OmpFlush:
-                t="flush";
-                break;
-            case OmpOrdered:
-                t="ordered";
-                break;
-            case OmpThreadPrivate:
-                t="thread private";
-                break;
-        }
-        return "#pragma omp "+t;
-    }
-    
-    /**
-     * getOMPType - get the type code for the OpenMP directive
-     * @return
-     */
-    public int getOMPType()
-    {
-        return ompType_;
-    }
-    
-    public OpenMPToken [] getThreadPrivateList()
-    {
-        return threadPrivateList_;
-    }
-    
-    public OpenMPToken [] getIfExpression()
-    {
-        return ifExpression_;
-    }
-    
-    public OpenMPToken [] getPrivateList()
-    {
-        return privateList_;
-    }
-    
-    public OpenMPToken [] getFirstPrivateList()
-    {
-        return firstPrivateList_;
-    }
-    
-    public int getDefault()
-    {
-        return default_;
-    }
-    
-    public OpenMPToken [] getSharedList()
-    {
-        return sharedList_;
-    }
-
-    
-    public OpenMPToken [] getCopyinList()
-    {
-        return copyinList_;
-    }
-    
-    public int getReductionOperator()
-    {
-        return reductionOperator_;
-    }
-    
-    public OpenMPToken [] getReductionList()
-    {
-        return reductionList_;
-    }
-    
-    public boolean getOrdered()
-    {
-        return ordered_;
-    }
-    
-    public boolean getNoWait()
-    {
-        return nowait_;
-    }
-    
-    public int getScheduleKind()
-    {
-        return scheduleKind_;
-    }
-    
-    public OpenMPToken [] getChunkExpression()
-    {
-        return chunkExpression_;
-    }
-    
-    public OpenMPToken [] getCopyPrivateList()
-    {
-        return copyPrivateList_;
-    }
-    
-    public OpenMPToken [] getFlushList()
-    {
-        return flushList_;
-    }
-    
-    public OpenMPToken [] getNumThreadsExpr()
-    {
-        return numThreadsExpr_;
-    }
-    
-    public OpenMPToken [] getLastPrivateList()
-    {
-        return lastPrivateList_;
-    }
-    
-    /**
-     * getRegion - accessor
-     * @return IASTNode
-     */
-    public IASTNode getRegion()
-    {
-        return region_;
-    }
-    
-    public String getRegionFilename()
-    { return regionFilename_; }
-    
-    public int getRegionOffset()
-    {
-        return regionOffset_;
-    }
-    
-    public int getRegionLength()
-    {
-        return regionLength_;
-    }
-    
-    public LinkedList getProblems()
-    {
-        return problemList_;
-    }
-    
-    public IASTStatement getLocation()
-    {
-        return locationNode_;
-    }
-
-    public int getProximity()
-    {
-        return locationProximity_;
-    }
-    
-    /**
-     * setOMPType - set the OMP type code
-     * @param type
-     */
-    protected void setOMPType(int type) { ompType_ = type; }
-    
-    /**
-     * setThreadPrivateList - set the threadprivate list of variables
-     * @param l
-     */
-    protected void setThreadPrivateList(OpenMPToken [] l) { threadPrivateList_ = l; }
-
-    protected void setIfExpression(OpenMPToken [] l) { ifExpression_ = l; }
-    
-    protected void setPrivateList(OpenMPToken [] l) { privateList_ = l; }
-    
-    protected void setFirstPrivateList(OpenMPToken [] l) { firstPrivateList_ = l; }
-    
-    protected void setDefault(int sn) { default_ = sn; }
-    
-    protected void setSharedList(OpenMPToken [] l) { sharedList_ = l; }
-    
-    protected void setCopyinList(OpenMPToken [] l) { copyinList_ = l; }
-    
-    protected void setReductionOperator(int op) { reductionOperator_ = op; }
-
-    protected void setReductionList(OpenMPToken [] l) { reductionList_ = l; }
-    
-    protected void setOrdered(boolean tf) { ordered_ = tf; }
-    
-    protected void setNoWait(boolean tf) { nowait_ = tf; }
-    
-    protected void setScheduleKind(int kind) { scheduleKind_ = kind; }
-    
-    protected void setChunkExpression(OpenMPToken [] expression) { chunkExpression_ = expression; }
-    
-    protected void setCopyPrivateList(OpenMPToken [] l) { copyPrivateList_ = l; }
-    
-    protected void setFlushList(OpenMPToken [] l) { flushList_ = l; }
-    
-    protected void setNumThreadsExpr(OpenMPToken [] l) { numThreadsExpr_ = l; }
-    
-    protected void setLastPrivateList(OpenMPToken [] l) { lastPrivateList_ = l; }
-    
-    protected void setRegion(IASTNode region) { region_ = region;  }
-    
-    protected void setRegionFilename(String filename) { regionFilename_ = filename; }
-    
-    protected void setRegionOffset(int offset)  { regionOffset_ = offset;  }
-    
-    protected void setRegionLength(int length)  { regionLength_ = length;  }
-    
-    public void addProblem(OpenMPError error)
-    { problemList_.add(error); }
-
-    public void setLocation(IASTStatement location, int proximity) 
-    { locationNode_=location;   locationProximity_=proximity;  }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java
deleted file mode 100644
index 8c7b6b3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorObjectStyleMacroDefinition;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author  pazel
- *
- */
-public class PASTObjectMacro extends PASTNode implements IASTPreprocessorObjectStyleMacroDefinition
-{
-    protected IASTPreprocessorObjectStyleMacroDefinition objMacro_ = null;
-    
-    /**
-     * PASTObjectMacro - constructor
-     * @param objMacro: ASTObjectMacro
-     */
-    public PASTObjectMacro(IASTPreprocessorObjectStyleMacroDefinition objMacro)
-    {
-        super((ASTNode)objMacro);
-        objMacro_ = objMacro;
-    }
-    
-    public String getType()
-    {
-        return "#define";
-    }
-
-    /**
-     * Delegated methods for interface IASTPreprocessorObjectStyleMacroDefinition
-     */
-    public int getRoleForName(IASTName n)
-    {
-        return objMacro_.getRoleForName(n);
-    }
-
-    public String getExpansion()
-    {
-        return objMacro_.getExpansion();
-    }
-
-    public IASTName getName()
-    {
-        return objMacro_.getName();
-    }
-
-    public void setExpansion(String exp)
-    {
-        objMacro_.setExpansion(exp);        
-    }
-
-    public void setName(IASTName name)
-    {
-        objMacro_.setName(name);        
-    }
-
-	public IASTFileLocation getExpansionLocation() {
-		return objMacro_.getExpansionLocation();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return objMacro_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java
deleted file mode 100644
index 8f5b5f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorPragmaStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.ptp.pldt.common.util.Utility;
-
-/**
- * Pseudo node for IAST pragma nodes
- * @author pazel
- *
- */
-public class PASTPragma extends PASTNode implements IASTPreprocessorPragmaStatement
-{
-	protected IASTPreprocessorPragmaStatement pragma_ = null;
-    protected String    content_ = "";
-	
-    /**
-     * PASTPragma - constructor
-     * @param pragma
-     */
-	public PASTPragma(IASTPreprocessorPragmaStatement pragma)
-	{
-		super((ASTNode)pragma);
-		pragma_ = pragma;
-	}
-    
-    /**
-     * PASTPragma - Copy constructor
-     * @param pPragma: PASTPragma
-     */
-    public PASTPragma(PASTPragma pPragma)
-    {
-        super(pPragma);
-        pragma_  = pPragma.getASTPragma();
-        content_ = pPragma.getContent();
-    }
-    
-    protected IASTPreprocessorPragmaStatement getASTPragma()
-    {
-        return pragma_;
-    }
-    
-    public String getType()
-    {
-        return "#pragma";
-    }
-
-	/**
-	 * *NOTE* must get Don's CDT parser changes
-	 * for this to compile successfully!
-	 * 
-	 * @return
-	 */
-	public String getContent()
-	{
-		//return pragma_.getContent();
-		return content_;
-	}
-    
-    /**
-     * getOffset - relative to the AST, i.e. include files factored into offset
-     * @return int
-     */
-    public int getOffset()
-    {
-        return getStartLocation();
-    }
-    
-    /**
-     * getLength - get the length of the pragma 
-     * @return int
-     */
-    public int getLength()
-    {
-        return getEndLocation() - getStartLocation();
-    }
-    
-    /**
-     * getLocalOffset - relative to containing file, i.e. include files factored out offset
-     * @return int
-     */
-    public int getLocalOffset()
-    {
-        Utility.Location l = Utility.getLocation(pragma_);
-        return l.low_;
-    }
-    
-    public void setContent(String content) { content_ = content; }
-
-	public char[] getMessage() {
-		return pragma_.getMessage();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return pragma_.isPartOfTranslationUnitFile();
-	}
-	
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java
deleted file mode 100644
index 13cc242..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorUndefStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTUndef extends PASTNode implements IASTPreprocessorUndefStatement
-{
-	protected IASTPreprocessorUndefStatement undef_ = null;
-	
-    /**
-     * PASTUndef - constructor
-     * @param undef
-     */
-	public PASTUndef(IASTPreprocessorUndefStatement undef)
-	{
-		super((ASTNode)undef);
-		undef_ = undef;
-	}
-    
-    public String getType()
-    {
-        return "#undef";
-    }
-
-    /**
-     * Delegate methods for IASTPreprocessorUndefStatement 
-     */
-	public IASTName getMacroName() {
-		return undef_.getMacroName();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return undef_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java
deleted file mode 100644
index 7982900..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java
+++ /dev/null

@@ -1,231 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.dictionary;
-import java.util.Hashtable;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.DOMException;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IScope;
-
-
-/**
- * Dictionary for entire file - global scope and function scopes
- * <br>
- *  The dictionary is mainly used to query for symbols within certain scopes
- * and each symbol tells where it is defined, see getSymbolsFor().<br>
- * Would be good to develop further with "where used" information
- * 
- * @author pazel
- */
-public class Dictionary
-{
-    // maps string to linked list of symbols having the same name
-    protected Hashtable     textToSymbols_          = new Hashtable(); 
-    // maps function (or ast for globals) to linked list of all symbols defined in that function
-    protected Hashtable     functionToSymbols_      = new Hashtable(); 
-    
-    protected Hashtable     stringScopeKeyToSymbol_ = new Hashtable();
-    
-    protected IASTTranslationUnit   ast_ = null;
-    
-    /**
-     * Dictionary - File dictionary
-     * @param ast - IASTTranslationUnit
-     */
-    public Dictionary(IASTTranslationUnit ast)
-    {
-        ast_ = ast;
-        
-        functionToSymbols_.put(ast_, new LinkedList());
-    }
-    
-    /**
-     * insert - insert a set of symbol specifications using a simple declartion
-     * @param decl    - IASTSimpleDeclaration
-     */
-    public void insert(IASTSimpleDeclaration decl)
-    {
-        IASTDeclarator [] decls = decl.getDeclarators();
-        for(int i=0; i<decls.length; i++)
-            insert(decls[i], decl);
-    }
-    
-    /**
-     * insert - insert a declarator into the dictionaries
-     * @param declarator - IASTDeclarator
-     * @param decl       - IASTDeclaration
-     */
-    public void insert(IASTDeclarator declarator, IASTDeclaration decl){
-        Symbol symbol = new Symbol(declarator, decl);
-        insertMember(symbol);
-    }
-    
-    
-    /**
-     * insert - insert a declarator into the dictionaries
-     * @param declarator - IASTDeclarator
-     * @param decl       - IASTDeclaration
-     */
-    public void insert(IASTDeclarator declarator, IASTParameterDeclaration decl){
-        Symbol symbol = new Symbol(declarator, decl);
-        insertMember(symbol);
-    }
-
-    
-    protected void insertMember(Symbol symbol)
-    {
-        IASTNode node   = symbol.getDefiningFunction();
-        
-        // add to string/scope
-        try {
-          StringScopeKey sskey = new StringScopeKey(symbol.getName());
-          stringScopeKeyToSymbol_.put(sskey, symbol);
-        }
-        catch(DOMException e) {
-            System.out.println("Dictionary.insert exception "+e);
-        }
-        
-        // Add to function global lists
-        if (node==null) node = ast_;  // ?? maybe should exit instead??
-        LinkedList ll = (LinkedList)functionToSymbols_.get(node);
-        if (ll==null) {
-            ll = new LinkedList();
-            functionToSymbols_.put(node, ll);
-        }
-        ll.add(symbol);
-        
-        // Add to text list
-        String strname = symbol.getName().toString();
-        LinkedList nl = (LinkedList)textToSymbols_.get(strname);
-        if (nl==null) {
-            nl = new LinkedList();  // definitions for this text name
-            textToSymbols_.put(strname, nl);
-        }
-        nl.add(symbol);
-    }
-    
-    /**
-     * getSymbolsFor - for a name string, using the global dicationary
-     * @param text - String
-     * @return Symbol []
-     */
-    public Symbol [] getSymbolsFor(String text)
-    {
-        LinkedList ll = (LinkedList)textToSymbols_.get(text);
-        if (ll==null)  return new Symbol[0];
-        Symbol [] ans = new Symbol[ll.size()];
-        for(int i=0; i<ll.size(); i++)  ans[i] = (Symbol)ll.get(i);
-        return ans;
-    }
-    
-    /**
-     * getSymbolsFor - using a given function scope
-     * @param fctnDef - IASTFunctionDefinition
-     * @return Symbol []
-     */
-    public Symbol [] getSymbolsFor(IASTFunctionDefinition fctnDef)
-    {
-        LinkedList ll = (LinkedList)functionToSymbols_.get(fctnDef);
-        if (ll==null)  return new Symbol[0];
-        Symbol [] ans = new Symbol[ll.size()];
-        for(int i=0; i<ll.size(); i++)  ans[i] = (Symbol)ll.get(i);
-        return ans;
-    }
-    
-    /**
-     * getSymbolsFor - using the global scope
-     * @return Symbol []
-     */
-    public Symbol [] getSymbolsFor()
-    {
-        LinkedList ll = (LinkedList)functionToSymbols_.get(ast_);
-        if (ll==null)  return new Symbol[0];
-        Symbol [] ans = new Symbol[ll.size()];
-        for(int i=0; i<ll.size(); i++)  ans[i] = (Symbol)ll.get(i);
-        return ans;
-    }
-    
-    /**
-     * find - given an IASTName (references, for example)
-     * @param name - IASTName
-     * @return Symbol
-     * @throws DOMException
-     */
-    public Symbol find(IASTName name) throws DOMException
-    {
-        StringScopeKey key = new StringScopeKey(name);
-        
-        return (Symbol)stringScopeKeyToSymbol_.get(key);
-    }
-    
-    //-------------------------------------------------------------------------
-    // Class: StringScopeKey - binding identity of name and scope where defined
-    //-------------------------------------------------------------------------
-    protected static class StringScopeKey
-    {
-        public String stringKey_ = "";
-        public IScope scopeKey_ = null;
-        
-        public StringScopeKey(String stringKey, IScope scopeKey)
-        {
-            stringKey_ = stringKey;
-            scopeKey_  = scopeKey;
-        }
-        
-        public StringScopeKey(IASTName nameNode) throws DOMException
-        {
-            stringKey_ = nameNode.toString();
-            //IBinding b = nameNode.resolveBinding();
-            //if (b instanceof IVariable) {
-            //   IVariable biv = (IVariable)b; 
-            //   IType t = biv.getType();
-            //   t=null;
-            //}
-            IBinding binding=nameNode.resolveBinding();//cdt40 fix: was getBinding(); could have been null
-            scopeKey_ = binding.getScope();
-        }
-        
-        /**
-         * equals
-         *    NOTE - This is what makes the stringScopeKeyToSymbol_ hashtable work.
-         *           allowing two StringScopeKeys with identical data fields to be "identified"
-         *           by the hashtable.
-         */
-        public boolean equals(Object that) 
-        {
-            if ( this == that ) return true;
-            if ( !(that instanceof StringScopeKey) ) return false;
-            StringScopeKey thatStringScopeKey =  (StringScopeKey)that;
-            if (thatStringScopeKey.stringKey_.equals(stringKey_) && thatStringScopeKey.scopeKey_==scopeKey_)  return true;
-            return false;
-        }
-
-        /**
-         * equals
-         *    NOTE - This is what makes the stringScopeKeyToSymbol_ hashtable work
-         */
-        public int hashCode() {
-            return stringKey_.hashCode();
-        }
-
-
-    }
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java
deleted file mode 100644
index e8a29cb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.dictionary;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTStandardFunctionDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-
-/**
- * The DictionaryFactory visits an AST and build Symbols for all variables
- * 
- * @author pazel
- *
- */
-public class DictionaryFactory extends ASTVisitor 
-{
-    protected IASTTranslationUnit    ast_   = null;
-    protected Dictionary             fDict_ = null;
-    
-    /**
-     * buildDictionary - static method to build dictionary
-     * @param ast - IASTTranslationUnit
-     * @return Dictionary
-     */
-	public static Dictionary buildDictionary(IASTTranslationUnit ast)
-	{
-		DictionaryFactory df = new DictionaryFactory(ast);
-		df.buildDictionary();
-		return df.getDictionary();
-	}
-	
-	/**
-	 * DictionaryFactory - constructor
-	 * @param ast - IASTTranslationUnit
-	 */
-	protected DictionaryFactory(IASTTranslationUnit ast)
-	{
-		ast_ = ast;
-		
-		fDict_ = new Dictionary(ast_);
-	}
-	
-	/**
-	 * Dictionary - accessor to Dictionary
-	 * @return Dictionary
-	 */
-	public Dictionary getDictionary()
-	{
-		return fDict_;
-	}
-	
-	/**
-	 * buildDictionary - build the dictionary
-	 *
-	 */
-	protected void buildDictionary()
-	{
-		shouldVisitDeclarations = true;
-		ast_.accept(this);
-	}
-	
-	/**
-	 * visit - ASTVisitor method capture to feed information into dicationary
-	 * @param declaration - IASTDeclaration
-	 * @return int
-	 */
-    public int visit(IASTDeclaration declaration) 
-    {
-        // If this is a function definition, acct for the parameters
-        if (declaration instanceof IASTFunctionDefinition) {
-            IASTFunctionDeclarator ifd = ((IASTFunctionDefinition)declaration).getDeclarator();
-            if (ifd instanceof IASTStandardFunctionDeclarator) {
-                IASTStandardFunctionDeclarator ifdc = (IASTStandardFunctionDeclarator)ifd;
-                IASTParameterDeclaration [] params = ifdc.getParameters();
-                for(int i=0; i<params.length; i++) {
-                    IASTDeclarator id = params[i].getDeclarator();
-                    fDict_.insert(id, params[i]);
-                }
-            }
-            //CFG cfg = CFGFactory.buildCFG((IASTFunctionDefinition)declaration);
-        }
-        else if (declaration instanceof IASTSimpleDeclaration)
-    	{
-    		fDict_.insert((IASTSimpleDeclaration)declaration);
-    	}
-    	return PROCESS_CONTINUE;
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java
deleted file mode 100644
index a306c38..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.dictionary;
-
-import org.eclipse.cdt.core.dom.ast.DOMException;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.internal.core.dom.parser.ASTInternal;
-
-/**
- * Holds a symbol definition
- * 
- * @author pazel
- * 
- */
-
-public class Symbol {
-	/** what is being defined */
-	protected IASTDeclarator declarator_ = null;
-	/**
-	 * declaration can be either IASTDeclaration or IASTParameterDeclaration;
-	 * this is the broader containing statement
-	 */
-	protected IASTNode declaration_ = null;
-	private static final boolean traceOn = false;
-
-	/**
-	 * constructor
-	 * 
-	 * @param declarator -
-	 *            IASTDeclarator
-	 * @param declaration -
-	 *            IASTDeclartion (for this declarator - and possibly others
-	 */
-	public Symbol(IASTDeclarator declarator, IASTDeclaration declaration) {
-		declarator_ = declarator;
-		declaration_ = declaration;
-	}
-
-	/**
-	 * constructor
-	 * 
-	 * @param declarator -
-	 *            IASTDeclarator
-	 * @param declaration -
-	 *            IASTParameterDeclartion (for this declarator - and possibly
-	 *            others
-	 */
-	public Symbol(IASTDeclarator declarator,
-			IASTParameterDeclaration declaration) {
-		declarator_ = declarator;
-		declaration_ = declaration;
-	}
-
-	/**
-	 * getName - get the name of the declarator
-	 * 
-	 * @return IASTName
-	 */
-	public IASTName getName() {
-		return declarator_.getName();
-	}
-
-	/**
-	 * getDeclarator - accessor to declarator
-	 * 
-	 * @return - IASTDeclarator
-	 */
-	public IASTDeclarator getDeclarator() {
-		return declarator_;
-	}
-
-	/**
-	 * getDeclaration - get the related declaration
-	 * 
-	 * @return - IASTNode (can be IASTDeclaration or IASTParameterDeclaration)
-	 */
-	public IASTNode getDeclaration() {
-		return declaration_;
-	}
-
-	/**
-	 * getScope - get the scope for this declarator
-	 * 
-	 * @return IScope
-	 */
-	public IScope getScope() {
-		// find the unique scope for this name
-		IASTName name = declarator_.getName();
-		IBinding binding = name.resolveBinding();
-		//IBinding binding = name.getBinding();
-		if (binding == null)
-			return null;
-
-		IScope scope = null;
-		try {
-			scope = binding.getScope();
-		} catch (DOMException e) {
-			System.out.println("SymbolBucket.find: exception " + e);
-			return null;
-		}
-
-		return scope;
-	}
-
-    /**
-     * getDefiningFunction - get the function in which declartor is defined
-     * @return IASTNode - either IASTTranslationUnit or IASTFunctionDefinition
-     */
-    public IASTNode getDefiningFunction()
-    {
-        IScope scope = getScope();
-        
-        if (scope==null)  return null;
-        
-        IASTNode node = null;
-        try {
-            //node = scope.getPhysicalNode(); // cdt 3.1
-            node = ASTInternal.getPhysicalNodeOfScope(scope); // cdt40
-        }
-        catch(DOMException e) { 
-            System.out.println("Symbol.getDefiningFunction exception "+e);
-            return null;
-        }
-        
-        // keep moving up the tree until we find the node
-        while(true) {
-            if (node==null)  return null;
-            if (node instanceof IASTTranslationUnit) return node;      // global dict
-            if (node instanceof IASTFunctionDefinition)  return node;  // our function
-            node = node.getParent();
-        }
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java
deleted file mode 100644
index 6cd4080..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java
+++ /dev/null

@@ -1,251 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-
-
-
-/**
- * Holds a consolidated (coarse) basic block for concurrency analysis
- * @author pazel
- */
-public class OMPBasicBlock extends OMPCFGNode
-{
-    protected LinkedList     statements_ = new LinkedList();  // contained stmts 
-    
-    protected IASTName       label_      = null;   // non-null if labeled block
-    
-    protected IASTExpression branchingExpression_ = null;
-    protected int            branchingType_       = NoBranch;
-    
-    public static final int NoBranch      = -1;
-    public static final int IfBranch      = 0;
-    public static final int SwitchBranch  = 1;
-    public static final int WhileBranch   = 2;
-    public static final int DoBranch      = 3;
-    public static final int ForBranch     = 4;
-    
-    /**
-     * OMPBasicBlock - Basic block for OMP CFG
-     *
-     */
-    public OMPBasicBlock()
-    {
-        super();
-    }
-    
-    /**
-     * addStatement - add an element to this basic block
-     * @param element - IASTNode
-     */
-    public void addStatement(IASTStatement element)
-    {
-        statements_.add(element);
-    }
-    
-    public IASTName getLabel()
-    {
-        return label_;
-    }
-    
-    /**
-     * isCase - informs if first statement is a CASE 
-     * @return boolean
-     */
-    public boolean isCase()
-    {
-        if (statements_.isEmpty())  return false;
-        IASTStatement statement = ((IASTStatement)statements_.getFirst());
-        return (statement instanceof IASTCaseStatement);
-    }
-
-    
-    public void setBranchingExpression(IASTExpression branch, int type)
-    {
-        branchingExpression_ = branch;
-        branchingType_       = type;
-    }
-    
-    /**
-     * getStatements - get the current list of statement for the node
-     * @return IASTStatement []
-     */
-    public IASTStatement [] getStatements()
-    {
-        IASTStatement [] list = new IASTStatement[statements_.size()];
-        int count = 0;
-        for(Iterator i=statements_.iterator(); i.hasNext();)
-            list[count++] = (IASTStatement)i.next();
-        return list;
-    }
-    
-    public IASTExpression getBranchingExpression() { return branchingExpression_; }
-    public int            getBranchingType()       { return branchingType_;       }
-    
-    protected LinkedList fundStmtsExprs_ = null; 
-    
-    /**
-     * getFundamentals - break down all statements/exprs to basics for concurrency map
-     * @return
-     */
-    public LinkedList getFundamentals()
-    {
-        if (fundStmtsExprs_!=null) return fundStmtsExprs_;
-        fundStmtsExprs_ = new LinkedList();
-        
-        for(Iterator i=statements_.iterator(); i.hasNext();) {
-            IASTStatement stmt = (IASTStatement)i.next();
-            FundVisitor fv = new FundVisitor(fundStmtsExprs_);
-            stmt.accept(fv);
-        }
-        
-        return fundStmtsExprs_;
-    }
-    
-    //-------------------------------------------------------------------------
-    // FundVisitor
-    //-------------------------------------------------------------------------
-    protected class FundVisitor extends ASTVisitor
-    {
-        protected LinkedList list_ = null;
-        
-        public FundVisitor(LinkedList list)
-        {
-            list_ = list;
-            shouldVisitStatements = true;
-        }
- 
-        public int visit(IASTStatement statement) {
-            
-            if (statement instanceof IASTIfStatement) {
-                processIfStatement((IASTIfStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTSwitchStatement) {
-                processSwitchStatement((IASTSwitchStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCaseStatement) {
-                processCaseStatement((IASTCaseStatement)statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTForStatement) {
-                processForStatement((IASTForStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTWhileStatement) {
-                processWhileStatement((IASTWhileStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTDoStatement) {
-                processDoStatement((IASTDoStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCompoundStatement) {
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTBreakStatement) {
-                list_.add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTContinueStatement) {
-                list_.add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTReturnStatement) {
-                list_.add(statement);
-                return PROCESS_CONTINUE;
-            }
-             
-            list_.add(statement);
-            return PROCESS_CONTINUE;
-        }
-        
-        
-        protected void processIfStatement(IASTIfStatement statement)
-        {
-            list_.add(statement.getConditionExpression());
-            if (statement.getThenClause()!=null) {
-                FundVisitor thenVisitor = new FundVisitor(list_);
-                statement.getThenClause().accept(thenVisitor);
-            }
-            if (statement.getElseClause()!=null) {
-                FundVisitor elseVisitor = new FundVisitor(list_);
-                statement.getElseClause().accept(elseVisitor);
-            }
-        }
-        
-        protected void processSwitchStatement(IASTSwitchStatement statement)
-        {
-            list_.add(statement.getControllerExpression());
-            FundVisitor  bodyVisitor = new FundVisitor(list_);
-            statement.getBody().accept(bodyVisitor);
-        }
-        
-        protected void processCaseStatement(IASTCaseStatement statement)
-        {
-            list_.add(statement.getExpression());
-        }
-        
-        protected void processForStatement(IASTForStatement statement)
-        {
-            list_.add(statement.getConditionExpression());
-            list_.add(statement.getIterationExpression());
-            if (statement.getInitializerStatement()!=null) {
-                FundVisitor  initVisitor = new FundVisitor(list_);
-                statement.getInitializerStatement().accept(initVisitor);
-            }
-            if (statement.getBody()!=null) {
-                FundVisitor  bodyVisitor = new FundVisitor(list_);
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processWhileStatement(IASTWhileStatement statement)
-        {
-            list_.add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                FundVisitor bodyVisitor = new FundVisitor(list_);
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processDoStatement(IASTDoStatement statement)
-        {
-            list_.add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                FundVisitor bodyVisitor = new FundVisitor(list_);
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-
-
-    }
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java
deleted file mode 100644
index 21d8219..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.io.PrintStream;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.OMPCFGResult;
-
-/**
- * Control Flow Graph related to OMP Analysis
- * @author pazel
- *
- */
-public class OMPCFG
-{
-	private static final boolean traceOn=false;
-    protected PASTOMPPragma          pragma_        = null;
-    protected IASTStatement          statement_     = null;
-    protected OMPCFGNode             rootNode_      = null;
-    protected OMPCFGNode             termNode_      = null;
-    
-    protected OMPCFGResult.Chain     rootChain_ = null;
-    protected LinkedList             unconnectedChains_ = null;
-    protected LinkedList             unresolvedChains_  = null;
-    protected Hashtable              labelMap_          = null;
-    
-    public OMPCFG(PASTOMPPragma      pragma, 
-                  IASTStatement      statement, 
-                  OMPCFGResult.Chain rootChain,
-                  LinkedList         unconnectedChains, 
-                  LinkedList         unresolvedChains, 
-                  Hashtable          labelMap)
-    {
-        pragma_        = pragma;
-        statement_     = statement;
-        rootNode_      = rootChain.getHeadNode();
-        termNode_      = rootChain.getTailNode();
-        
-        rootChain_         = rootChain;
-        unconnectedChains_ = unconnectedChains;
-        unresolvedChains_  = unresolvedChains;
-        labelMap_          = labelMap;
-        
-        numberNodes();
-    }
-    
-    /**
-     * getStatement - accessor to statement for this cfg
-     * @return IASTStatement
-     */
-    public IASTStatement getStatement()
-    {
-        return statement_;
-    }
-    
-    /**
-     * getPragma - get the pragme for the cfg
-     * @return PASTOMPPragma
-     */
-    public PASTOMPPragma getPragma()
-    {
-        return pragma_;
-    }
-    
-    /**
-     * getRoot - access the root of the cfg
-     * @return - OMPCFGNode
-     */
-    public OMPCFGNode getRoot()
-    {
-        return rootNode_;
-    }
-    
-    /**
-     * getTermNode - get the terminal node (assuming one)
-     * @return OMPCFGNode
-     */
-    public OMPCFGNode getTermNode()
-    {
-        return termNode_;
-    }
-    
-    // The following for printing out the graph
-    
-    protected Stack       graphStack_    = new Stack();
-    protected HashSet     usedNodes_     = new HashSet();
-    protected PrintStream graphOut_      = null;
-    protected int         currentNumber_ = 0;
-    
-    public void printCFG(PrintStream printOut)
-    {
-        graphOut_ = printOut;
-
-        usedNodes_.clear();
-        
-        numberNodes();
-        
-        visitGraph();
-    }
-    
-    private void numberNodes()
-    {
-        currentNumber_ = 0;
-        graphStack_.clear();
-        graphStack_.push(rootNode_);
-        while(!graphStack_.isEmpty()) {
-            OMPCFGNode node = (OMPCFGNode)graphStack_.pop();
-            node.setId(currentNumber_++);
-            // Add in other nodes
-            OMPCFGNode [] nodes = node.getOutNodes();
-            for(int i=0; i<nodes.length; i++) {
-                if (nodes[i].getId()==-1)  // only if not assigned number
-                    graphStack_.push(nodes[i]);
-            }
-        }
-    }
-    
-    private void visitGraph()
-    {
-        graphStack_.clear();
-        graphStack_.push(rootNode_);
-        while(!graphStack_.isEmpty()) {
-            OMPCFGNode node = (OMPCFGNode)graphStack_.pop();
-            printNode(node);
-            usedNodes_.add(node);
-            // Add in other nodes
-            OMPCFGNode [] nodes = node.getOutNodes();
-            for(int i=0; i<nodes.length; i++) {
-                if (!(nodes[i] instanceof OMPCFGNode)) {
-                    if(traceOn)System.out.println("Node " + nodes[i].getId() + 
-                            " has out node of type: "+nodes[i].getClass());
-                    continue;
-                }
-                if (!usedNodes_.contains(nodes[i]))  // only if not processed
-                    graphStack_.push(nodes[i]);
-            }
-            
-        }
-    }
-    
-    private void printNode(OMPCFGNode node)
-    {
-        int num = node.getId();
-        if(traceOn)graphOut_.println("Node "+num+" ------------------ "+getShortClassName(node.getClass()));
-        
-        // some contents of the node
-        if (node instanceof OMPBasicBlock) {
-            OMPBasicBlock obb = (OMPBasicBlock)node;
-            IASTStatement [] stmts = obb.getStatements();
-            for(int i=0; i<stmts.length; i++)
-                if(traceOn)System.out.println("       -------- "+getShortClassName(stmts[i].getClass()));
-        }
-        
-        
-        
-        OMPCFGNode [] nodes = node.getOutNodes();
-        if(traceOn)graphOut_.print("      out to the following "+nodes.length+" nodes:");
-        for(int i=0; i<nodes.length; i++) {
-            int index = nodes[i].getId();
-            if(traceOn)graphOut_.print(" "+index);
-        }
-        if(traceOn)System.out.println();
-        OMPCFGNode [] inodes = node.getInNodes();
-        if(traceOn)graphOut_.print("      in from the following "+inodes.length+" nodes:");
-        for(int i=0; i<inodes.length; i++) {
-            int index = inodes[i].getId();
-            if(traceOn)graphOut_.print(" "+index);
-        }
-        if(traceOn)System.out.println();
-
-    }
-    
-    private String getShortClassName(Class c)
-    {
-        String n = c.toString();
-        int lastIndex = n.lastIndexOf('.');
-        return n.substring(lastIndex+1);
-    }
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java
deleted file mode 100644
index e7b5b11..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-/**
- * Base class of OMP CFG
- * @author pazel
- *
- */
-public class OMPCFGNode
-{
-    // Use these while being built
-    protected LinkedList inNodes_  = new LinkedList();
-    protected LinkedList outNodes_ = new LinkedList();
-    
-    protected int        id_       = -1;   // useful for correlating phase displays
-    
-    protected OMPPragmaNode  pragmaContext_ = null;   // pragma chain head for this node
-
-    /**
-     * OMPCFGNode - constructor
-     *
-     */
-    public OMPCFGNode()
-    {
-        
-    }
-     
-    /**
-     * connectTo - make "this" point forward to input node (forward control flow)
-     * @param node - OMPCFGNode (that succeeds this in control flow
-     */
-    public void connectTo(OMPCFGNode node)
-    {
-        if (node==null) return;
-        addOutNode(node);
-        node.addInNode(this);
-    }
-    
-    /**
-     * addInNode - add an input node
-     * @param inNode - OMPCFGNode
-     */
-    public void addInNode(OMPCFGNode inNode)
-    {
-        if (!inNodes_.contains(inNode))
-            inNodes_.add(inNode);
-    }
-    
-    /**
-     * addOutNode - add an output node
-     * @param outNode - OMPCFGNode
-     */
-    public void addOutNode(OMPCFGNode outNode)
-    {
-        if (!outNodes_.contains(outNode))
-            outNodes_.add(outNode);
-    }
-    
-    /**
-     * getSuccessor - useful function to be used when it is known that there is 1 successor
-     *                no check made for more than 1 - used in following chains
-     * @return OMPCFGNode
-     */
-    public OMPCFGNode getSuccessor()
-    {
-        if (outNodes_.size()!=0)
-            return (OMPCFGNode)(outNodes_.get(0));
-        return null;
-    }
-    
-    /**
-     * hasPredecessors - tell if node has predecessors
-     * @return boolean
-     */
-    public boolean hasPredecessors()
-    {
-        return (inNodes_.size()!=0);
-    }
-    
-    /**
-     * getInNodes - accessor to input nodes
-     * @return OMPCFGNode []
-     */
-    public OMPCFGNode [] getInNodes()
-    {
-       OMPCFGNode [] inNodesArray = new OMPCFGNode[inNodes_.size()];
-       int count=0;
-       for(Iterator i=inNodes_.iterator(); i.hasNext();)
-       { inNodesArray[count++] = (OMPCFGNode)i.next();  }
-       return inNodesArray;
-    }
-    
-    /**
-     * getOutNodes - accessor to output nodes
-     * @return OMPCFGNode []
-     */
-    public OMPCFGNode [] getOutNodes()
-    {
-        OMPCFGNode [] outNodesArray = new OMPCFGNode[outNodes_.size()];
-        int count=0;
-        for(Iterator i=outNodes_.iterator(); i.hasNext();)
-        { outNodesArray[count++] = (OMPCFGNode)i.next();  }
-        return outNodesArray;
-    }
-
-
-    public void setId(int id)
-    {
-        id_ = id;
-    }
-    
-    public int getId() { return id_; }
-    
-    public void setPragmaContext(OMPPragmaNode pNode) { pragmaContext_ = pNode; }
-    
-    public OMPPragmaNode getPragmaContext() { return pragmaContext_; }
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java
deleted file mode 100644
index d5b991f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Stack;
-
-/**
- * Does a depth first search through an OMPCFG,
- * given the initial node
- * @author pazel
- *
- */
-public abstract class OMPDFS
-{
-    protected OMPCFGNode    startNode_    = null;
-    protected HashSet       visited_      = new HashSet();
-    
-    protected Stack         currentNodes_ = new Stack();
-    
-    public static final int CONTINUE   = 0;
-    public static final int SKIP       = 1;  // SKIP following current node further
-    public static final int ABORT      = 2;  // abord DFS
-    
-    /**
-     * OMPDFS - constructor
-     * @param startNode - OMPCFGNode
-     */
-    public OMPDFS(OMPCFGNode startNode)
-    {
-        startNode_ = startNode;
-    }
-    
-    /**
-     * startWalking - method to start the dfs walking
-     *
-     */
-    public void startWalking()
-    {
-        walkDFS(startNode_);
-    }
-    
-    /**
-     * walkDFS - recursively walk the tree visiting each node 1 time
-     *           NOTE: only connected component to start node
-     * @param node - OMPCFGNode
-     * @return int    (code to continue, skip, or abort)
-     */
-    protected int walkDFS(OMPCFGNode node)
-    {
-        if (visited_.contains(node))  return CONTINUE;
-        
-        currentNodes_.push(node);  // sets the new context on the stack
-        int code = visit(node);
-        visited_.add(node);
-        
-        if (code==SKIP)  { currentNodes_.pop();  return CONTINUE; }  // we only skip this level, continue others
-        if (code==ABORT) { currentNodes_.pop();  return ABORT;    }
-        
-        OMPCFGNode [] outNodes = node.getOutNodes();
-        for(int i=0; i<outNodes.length; i++) {
-           int iCode = walkDFS(outNodes[i]);
-           if (iCode==ABORT) { currentNodes_.pop();  return ABORT;  } // code cannot be skip
-        }
-        currentNodes_.pop();
-        
-        return CONTINUE;
-    }
-    
-    /**
-     * getNodeStack - get the current node stack context
-     * @return OMPCFGNode []
-     */
-    public OMPCFGNode [] getNodeStack()
-    {
-        OMPCFGNode [] l = new OMPCFGNode[currentNodes_.size()];
-        int count=0;
-        for(Iterator i=currentNodes_.iterator(); i.hasNext();) 
-            l[count++] = (OMPCFGNode)i.next();
-        return l;
-    }
-    
-    /**
-     * getNodeStackSize - get the size of the stack
-     * @return int
-     */
-    public int getNodeStackSize()
-    {
-        return currentNodes_.size();
-    }
-    
-    /**
-     * isVisited - determine if node has been visited on walk
-     * @param node - OMPCFGNode
-     * @return boolean
-     */
-    public boolean isVisited(OMPCFGNode node)
-    {
-        return visited_.contains(node);
-    }
-    
-    /**
-     * visit - visit method - what the user usually overrides
-     * @param node - OMPCFGNode
-     */
-    public abstract int visit(OMPCFGNode node);
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java
deleted file mode 100644
index 7e3788f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionList;
-/**
- * Holds a consolidated (coarse) basic block for concurrency analysis
- * @author pazel
- *
- */
-public class OMPExpressionBlock extends OMPCFGNode
-{
-    /** Use this while building */
-    protected LinkedList expressions_ = new LinkedList(); // of IASTExpressions (for now)
-
-    public OMPExpressionBlock()
-    {
-        super();
-    }
-    
-    /**
-     * addExpression - add a statement to the basic block
-     * @param expression - IASTExpression
-     */
-    public void addExpression(IASTExpression expression)
-    {
-        expressions_.add(expression);
-    }
-    
-    /**
-     * addExpression - but for an expression list
-     * @param expression - IASTExpressionList
-     */
-    public void addExpression(IASTExpressionList expression)
-    {
-        IASTExpression [] list = expression.getExpressions();
-        for(int i=0; i<list.length; i++) {
-            if (list[i] instanceof IASTExpressionList)
-                addExpression((IASTExpressionList)list[i]);
-            else
-                addExpression(list[i]);
-        }
-    }
-    
-    /**
-     * getExpressions - accessor to array of statements
-     * @return IASTExpression []
-     */
-    public IASTExpression [] getExpressions()
-    {
-       IASTExpression [] list = new IASTExpression[expressions_.size()];
-       int count = 0;
-       for(Iterator i=expressions_.iterator(); i.hasNext();)
-           list[count++] = (IASTExpression)i.next();
-       return list;
-    }
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java
deleted file mode 100644
index 19efafe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-
-
-/**
- * 
- * @author pazel
- *
- */
-public class OMPPragmaNode extends OMPCFGNode
-{
-    protected PASTOMPPragma     pragma_          = null;   // pragma we are holding
-    protected OMPPragmaNode     contextPred_     = null;   // backward chain of context
-    
-    protected boolean           implicitBarrier_ = false;   // used to tie parallel/for/sections end
-    
-    /**
-     * OMPPragmaNode - Constructor
-     * @param pragma - PASTOMPPragma
-     * @param contextPredecessor - OMPPragmaNode
-     */
-    public OMPPragmaNode(PASTOMPPragma pragma, OMPPragmaNode contextPredecessor)
-    {
-        super();
-        pragma_       = pragma;
-        contextPred_ = contextPredecessor;
-    }
-    
-    /**
-     * OMPPragmaNode - constructor
-     * @param pragma - PASTOMPPragma
-     */
-    public OMPPragmaNode(PASTOMPPragma pragma)
-    {
-        super();
-        pragma_     = pragma;
-    }
-    
-    public OMPPragmaNode()
-    {
-        super();
-        implicitBarrier_ = true;
-    }
-    
-    /**
-     * getPragma - accessor to pragma
-     * @return PASTOMPPragma
-     */
-    public PASTOMPPragma getPragma()
-    {
-        return pragma_;
-    }
-    
-    /**
-     * isImplicitBarrier - returns whether if is implicit barrier
-     * @return boolean
-     */
-    public boolean isImplicitBarrier()
-    {
-        return implicitBarrier_;
-    }
-    
-    /**
-     * getContextPredecessor - get the pragma context predecessor
-     * @return
-     */
-    public OMPPragmaNode getContextPredecessor()
-    {
-        return contextPred_;
-    }
-    
-    /**
-     * getContext - get the list of related pragma - most recent to oldest [0--N]
-     * @return OMPPragmaNode []
-     */
-    public OMPPragmaNode [] getContext()
-    {
-        int count = 0;
-        OMPPragmaNode pred = this;
-        while(pred!=null) {
-            count++;
-            pred=pred.getContextPredecessor();  
-        }
-        
-        OMPPragmaNode [] list = new OMPPragmaNode[count];
-        int i = 0;
-        pred = this;
-        while(pred!=null) {
-            list[i++] = pred;
-            pred=pred.getContextPredecessor();
-        }
-        
-        return list;
-    }
-    
-    public String getType()
-    {
-        if (pragma_!=null)  return pragma_.getType();
-        else {
-            if (implicitBarrier_)  return "implicit barrier";
-        }
-        return "";
-    }
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java
deleted file mode 100644
index 7402ef7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java
+++ /dev/null

@@ -1,142 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-
-
-/**
- * Build an analysis for a given file
- * @author pazel
- *
- */
-public class FileConcurrencyAnalysis
-{
-    protected IASTTranslationUnit         astTransUnit_ = null;
-    protected IFile                       iFile_        = null;
-    protected PASTOMPPragma     []        pragmas_      = null;
-    protected FunctionConcurrencyAnalysis   [] analyses_     = null;
-    
-    protected static final boolean traceOn = false;
-    
-    /**
-     * FileConcurrencyAnalysis - Holds analysis for an entire file
-     * @param astTransUnit
-     * @param iFile
-     * @param ompPragmas
-     */
-    public FileConcurrencyAnalysis(IASTTranslationUnit astTransUnit, 
-                                   IFile               iFile,
-                                   PASTOMPPragma []    ompPragmas)
-    {
-        astTransUnit_   = astTransUnit;
-        iFile_          = iFile;
-        pragmas_        = ompPragmas;
-        buildFileAnalysis();
-    }
-    
-    /**
-     * getNodesConcurrentTo - get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        // designed so we use the 1st non-null. 
-        for(int i=0; i<analyses_.length; i++) {
-            Set s = analyses_[i].getNodesConcurrentTo(node);
-            if (s!=null)  return s;
-        }
-        return new HashSet();
-    }
-
-    
-    /**
-     * buildFileAnalysis - concurrency analysis
-     *
-     */
-    protected void buildFileAnalysis()
-    {
-        DefVisitor dv = new DefVisitor(astTransUnit_, iFile_, pragmas_);
-        analyses_ = dv.buildAnalyses();
-        
-        // build the phase analysis
-        for(int i=0; i<analyses_.length; i++) {
-            FunctionConcurrencyAnalysis oca = analyses_[i];
-            oca.doPhaseAnalysis();
-            if (traceOn) oca.printAnalysis(System.out);
-        }
-    }
-
-    //-------------------------------------------------------------------------
-    // Class: DefVisitor - used to locate functions within file, for 
-    //        concurrency analysis
-    //-------------------------------------------------------------------------
-    private static class DefVisitor extends ASTVisitor
-    {
-        private IASTTranslationUnit     transUnit_    = null;
-        private IFile                   iFile_        = null;
-        private PASTOMPPragma       []  pList_        = null;
-        private LinkedList              analysisList_ = new LinkedList();
-        
-        public DefVisitor(IASTTranslationUnit transUnit, IFile iFile, PASTOMPPragma [] pList)
-        { transUnit_ = transUnit; pList_ = pList; iFile_=iFile; }
-        
-        /**
-         * buildAnalyses - build one analysis object per function found in file
-         * @return
-         */
-        public FunctionConcurrencyAnalysis [] buildAnalyses()
-        {
-            shouldVisitDeclarations = true;
-            transUnit_.accept(this);
-            
-            FunctionConcurrencyAnalysis [] list = new FunctionConcurrencyAnalysis[analysisList_.size()];
-            int count = 0;
-            for(Iterator i=analysisList_.iterator(); i.hasNext();)
-                list[count++] = (FunctionConcurrencyAnalysis)i.next();
-            return list;
-        }
-        
-        /**
-         * visit - ASTVisitor method capture to feed information into analysis
-         * @param declaration - IASTDeclaration
-         * @return int
-         */
-        public int visit(IASTDeclaration declaration) 
-        {
-            if (declaration instanceof IASTFunctionDefinition) {
-                IASTFunctionDefinition fDef = (IASTFunctionDefinition)declaration;
-                String str1 = fDef.getContainingFilename();
-                String str2 = iFile_.getRawLocation().toFile().getAbsolutePath();
-                if (str1.equals(str2)) {
-                    FunctionConcurrencyAnalysis analysis = new FunctionConcurrencyAnalysis(fDef, pList_);
-                    analysisList_.add(analysis);
-                }
-            }
-            return PROCESS_CONTINUE;
-        }
-
-    }
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java
deleted file mode 100644
index 10caca4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java
+++ /dev/null

@@ -1,211 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.io.PrintStream;
-
-import org.eclipse.cdt.core.dom.CDOM;
-import org.eclipse.cdt.core.dom.IASTServiceProvider.UnsupportedDialectException;
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-import org.eclipse.core.resources.IFile;
-
-/**
- * Builds and interfaces map from file location to statement
- * @author pazel
- *
- */
-public class FileStatementMap extends StatementMap
-{
-    protected IASTTranslationUnit tu_       = null;
-    protected String              filename_ = "";
-
-    /**
-     * FileStatementMap - constructor
-     * @param file   - IFile
-     * @throws UnsupportedDialectException
-     */
-    public FileStatementMap(IFile file) throws UnsupportedDialectException
-    {
-        tu_ = CDOM.getInstance().getTranslationUnit(file);
-        filename_=tu_.getFilePath();
-    }
-    
-    /**
-     * FileStatementMap - constructor
-     * @param tu - IASTTranslationUnit
-     */
-    public FileStatementMap(IASTTranslationUnit tu)
-    {
-        tu_ = tu;
-        filename_=tu_.getFilePath();
-    }
-    
-    /**
-     * buildMap - build the actual map
-     *
-     */
-    public void buildMap()
-    {
-        Visitor v = new Visitor();
-        tu_.accept(v);
-    }
-    
-    
-    private String getShortClassName(Class c)
-    {
-        String n = c.toString();
-        int lastIndex = n.lastIndexOf('.');
-        return n.substring(lastIndex+1);
-    }
-
-    
-    //-------------------------------------------------------------------------
-    // Visitor - to visit all statements and some expressions
-    //-------------------------------------------------------------------------
-    protected class Visitor extends ASTVisitor
-    {
-        
-        public Visitor()
-        {
-            shouldVisitStatements  = true;
-        }
-
-        public int visit(IASTStatement statement) 
-        {
-            
-            if (filename_==null || !(filename_.equals(statement.getContainingFilename())))
-                return PROCESS_CONTINUE;
-            
-            if (statement instanceof IASTIfStatement) {
-                processIfStatement((IASTIfStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTSwitchStatement) {
-                processSwitchStatement((IASTSwitchStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCaseStatement) {
-                processCaseStatement((IASTCaseStatement)statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTForStatement) {
-                processForStatement((IASTForStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTWhileStatement) {
-                processWhileStatement((IASTWhileStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTDoStatement) {
-                processDoStatement((IASTDoStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCompoundStatement) {
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTBreakStatement) {
-                add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTContinueStatement) {
-                add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTReturnStatement) {
-                add(statement);
-                return PROCESS_CONTINUE;
-            }
-            
-            add(statement);
-            return PROCESS_CONTINUE;
-        }
-        
-        protected void processIfStatement(IASTIfStatement statement)
-        {
-            add(statement.getConditionExpression());
-            if (statement.getThenClause()!=null) {
-              Visitor thenVisitor = new Visitor();
-              statement.getThenClause().accept(thenVisitor);
-            }
-            if (statement.getElseClause()!=null) {
-              Visitor elseVisitor = new Visitor();
-              statement.getElseClause().accept(elseVisitor);
-            }
-        }
-        
-        protected void processSwitchStatement(IASTSwitchStatement statement)
-        {
-            add(statement.getControllerExpression());
-            Visitor  bodyVisitor = new Visitor();
-            statement.getBody().accept(bodyVisitor);
-        }
-        
-        protected void processCaseStatement(IASTCaseStatement statement)
-        {
-            add(statement.getExpression());
-        }
-        
-        protected void processForStatement(IASTForStatement statement)
-        {
-            add(statement.getConditionExpression());
-            add(statement.getIterationExpression());
-            if (statement.getInitializerStatement()!=null) {
-              Visitor initVisitor = new Visitor();
-              statement.getInitializerStatement().accept(initVisitor);
-            }
-            if (statement.getBody()!=null) {
-                Visitor bodyVisitor = new Visitor();
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processWhileStatement(IASTWhileStatement statement)
-        {
-            add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                Visitor bodyVisitor = new Visitor();
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processDoStatement(IASTDoStatement statement)
-        {
-            add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                Visitor bodyVisitor = new Visitor();
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void printInformation(IASTNode node, PrintStream out)
-        {
-            Location l=getLocation(node);
-            System.out.println("Statement: "+getShortClassName(node.getClass())+
-                    " loc=("+l.low_+","+l.high_+")   file="+node.getContainingFilename());
-             
-        }
-
-    }
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java
deleted file mode 100644
index 8e55106..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-
-
-/**
- * Concurrency Analysis for a given function
- * 
- * @author pazel
- */
-public class FunctionConcurrencyAnalysis extends ASTVisitor
-{
-    protected IASTFunctionDefinition fDef_              = null;
-    protected Hashtable              pragmaRegionMap_   = null;  // maps region to omp pragma
-    protected Hashtable              pragmaLocationMap_ = null;  // maps stmt to set of pragmas
-    protected LinkedList             components_        = new LinkedList();   // of RegionConcurrencyAnalysis's
-
-    public FunctionConcurrencyAnalysis(IASTFunctionDefinition fDef, PASTOMPPragma [] pList)
-    {
-        fDef_    = fDef;
-        pragmaRegionMap_   = buildRegionMap(pList);
-        pragmaLocationMap_ = buildLocationMap(pList);
-        
-        shouldVisitStatements   = true;
-        fDef_.accept(this);
-    }
-     
-    /**
-     * addComponent - add a component to this analysis
-     * @param component - RegionConcurrencyAnalysis
-     */
-    private void addComponent(RegionConcurrencyAnalysis component)
-    {
-        if (!components_.contains(component)) {
-            components_.add(component);
-            component.setParent(this);
-        }
-    }
-    
-    /**
-     * getComponents - get the list of existing components
-     * @return RegionConcurrencyAnalysis
-     */
-    public RegionConcurrencyAnalysis [] getComponents()
-    {
-        RegionConcurrencyAnalysis [] list = new RegionConcurrencyAnalysis[components_.size()];
-        for(int i=0; i<list.length; i++)
-            list[i] = (RegionConcurrencyAnalysis)components_.get(i);
-        return list;
-    }
-    
-    /**
-     * doPhaseAnalysis - for each component
-     *
-     */
-    public void doPhaseAnalysis()
-    {
-        for(Iterator i=components_.iterator(); i.hasNext();) {
-           RegionConcurrencyAnalysis occ = (RegionConcurrencyAnalysis)i.next();
-           occ.doPhaseAnalysis();
-        }
-    }
-    
-    
-    /**
-     * getNodesConcurrentTo - get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        // designed so we use the 1st non-null.  Components are assumed disjoint now.
-        for(Iterator i=components_.iterator(); i.hasNext();) {
-            RegionConcurrencyAnalysis component = (RegionConcurrencyAnalysis)i.next();
-            Set s = component.getNodesConcurrentTo(node);
-            if (s!=null)  return s;
-        }
-        return null;
-    }
-
-    
-    public void printAnalysis(PrintStream ps)
-    {
-        int count=0;
-        for(Iterator i=components_.iterator(); i.hasNext();) {
-            RegionConcurrencyAnalysis occ = (RegionConcurrencyAnalysis)i.next();
-            ps.println("Component "+count+" ----------------------------------");
-            occ.printComponent(ps);
-            count++;
-         }
-    }
-    
-    
-    /**
-     * buildRegionMap - build the region-->pragma map for this function
-     * @param pList - PASTPragma [] pList [obtainable from OpenMPAnalysisManager]
-     * @return Hashtable (mapping IASTNode-->PASTOMPPragma for this function)
-     */
-    protected Hashtable buildRegionMap(PASTPragma [] pList) 
-    {
-        Hashtable map = new Hashtable();
-        
-        for(int i=0; i<pList.length; i++) {
-            if (pList[i] instanceof PASTOMPPragma) {
-                PASTOMPPragma pragma = (PASTOMPPragma)pList[i];
-                IASTNode      region = pragma.getRegion();
-                if (region!=null && pragma.isCompiled() && isRegionDefinedInFctn(region))
-                    map.put(region, pragma);  // add to the map
-            }
-        }
-        
-        return map;
-    }
-    
-    /**
-     * buildLocationMap - build a map from location to set of pragmas "following" it
-     * @param pList
-     * @return
-     */
-    protected Hashtable buildLocationMap(PASTPragma [] pList)
-    {
-        Hashtable map = new Hashtable();
-        
-        for(int i=0; i<pList.length; i++) {
-            if (pList[i] instanceof PASTOMPPragma) {
-                PASTOMPPragma pragma = (PASTOMPPragma)pList[i];
-                IASTNode      location = pragma.getLocation();
-                if (location!=null && pragma.isCompiled() && isRegionDefinedInFctn(location)) {
-                    LinkedList l = (LinkedList)map.get(location);
-                    if (l==null) {
-                        l = new LinkedList();
-                        map.put(location, l);
-                    }
-                    l.add(pragma);
-                }
-            }
-        }
-        
-        return map;
-        
-    }
-    
-    /**
-     * isRegionDefinedInFctn - determines in node in scope of function
-     * @param node - IASTNode
-     * @return boolean
-     */
-    public boolean isRegionDefinedInFctn(IASTNode node)
-    {
-        while(node!=null) {
-            if (node==fDef_)  return true;
-            node = node.getParent();
-        }
-        return false;
-    }
-    
-
-    /**
-     * visit - visit statements
-     *         NOTE: we keep looking for stmts associated with pragmas - to build a new RegionConcurrencyAnalysis
-     * @param statement - IASTStatement
-     */
-    public int visit(IASTStatement statement) 
-    {
-        PASTOMPPragma pragma = (PASTOMPPragma)pragmaRegionMap_.get(statement);
-        if (pragma!=null) {
-            buildRegionAnalysis(pragma, statement);
-            return PROCESS_SKIP;   // Skip the part that will be handled in more detail
-        }
-        return PROCESS_CONTINUE;
-    }
-    
-    /**
-     * buildRegionAnalysis - build an analysis of this "pragma" region of the program
-     * @param pragma    - PASTOMPPragma
-     * @param statement - IASTStatement;
-     */
-    protected void buildRegionAnalysis(PASTOMPPragma pragma, IASTStatement statement)
-    {
-        // build the cfg
-        OMPCFG cfg = OMPCFGMaker.constructCFG(pragma, statement, pragmaRegionMap_, pragmaLocationMap_);
-       
-        cfg.printCFG(System.out);
-
-        addComponent(new RegionConcurrencyAnalysis(cfg));
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java
deleted file mode 100644
index 1625554..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java
+++ /dev/null

@@ -1,685 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPBasicBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPExpressionBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.OMPCFGResult.Chain;
-
-
-/**
- * Builds a section of the control flow graph (like CFGMaker)
- * @author pazel
- *
- */
-public class OMPCFGMaker extends ASTVisitor
-{
-    protected IASTNode      tNode_       = null;
-    
-    // This is the return structure
-    protected OMPCFGResult  result_      = new OMPCFGResult();
-
-    
-    // These get passed down to each level - 
-    //     pragmaRegionMap_ never changes
-    //     pragmaContext increases/decreases on encountering pragma statements 
-    protected static Hashtable  pragmaRegionMap_   = null;  // maps IASTNode to pragma, if node is a pragma region
-    protected static Hashtable  pragmaLocationMap_ = null;  // maps IASTnode to list of pragmas that may immed. succeed it
-    protected static Stack      pragmaContext_     = null;  // stack of pragma - indicating depth of OMP control
-    
-    // Again the perspective is that we are building a list of a mix of 
-    //     basic blocks and pragma nodes - nested processing done recursively
-    // This two items manage the progress on the current chain
-    protected OMPCFGNode    firstNode_   = null;
-    protected OMPCFGNode    currentNode_ = null;
-    
-    protected static boolean  traceOn_     = false;
-    
-    /**
-     * constructCFG - static method to build the cfg
-     * @param pragma                - PASTOMPPragma (focus pragma for this graph
-     * @param statement             - IASTStatement (region for pragma)
-     * @param pragmaRegionMap       - Hashtable (mapping region to pragma)
-     * @param pragmaLocationMap     - Hashtable (mapping IASTNode to list of immed. succ. pragmas)
-     * @return OMPCFG
-     */
-    public static OMPCFG constructCFG(PASTOMPPragma pragma, IASTStatement statement, Hashtable pragmaRegionMap, Hashtable pragmaLocationMap)
-    {
-        pragmaRegionMap_   = pragmaRegionMap;
-        pragmaLocationMap_ = pragmaLocationMap;
-        pragmaContext_     = new Stack();
-        
-        OMPCFGMaker maker = new OMPCFGMaker(statement);
-        maker.buildCFG();
-        OMPCFGResult result = maker.getResult();
-        result.resolve();
-        
-        OMPCFG cfg = new OMPCFG(pragma, 
-                                statement, 
-                                result.getFirstChain(), 
-                                result.getUnconnectedChains(), 
-                                result.getUnresolvedControlFlow(), 
-                                result.getLabelMap());
-
-        
-        pragmaRegionMap_   = null;
-        pragmaLocationMap_ = null;
-        pragmaContext_     = null;
-        return cfg;
-    }
-
-    /**
-     * OMOPCFGMaker - constructor
-     * @param tNode - IASTNode
-     */
-    protected OMPCFGMaker(IASTStatement tNode)
-    {
-        tNode_     = tNode;
-        shouldVisitStatements   = true;
-        shouldVisitDeclarations = true;
-    }
-    
-    /**
-     * OMPCFGMaker  - constructor
-     * @param tNode - IASTNode
-     */
-    protected OMPCFGMaker(IASTExpression tNode)
-    {
-        tNode_                   = tNode;
-        shouldVisitExpressions   = true;
-    }
-    
-    /**
-     * buildCFG - method to initiate building tree using tree walker
-     *
-     */
-    public void buildCFG()
-    {
-        if (tNode_==null)   // this can occur, e.g. blank else part of if
-            firstNode_=currentNode_=new OMPBasicBlock();   // with nothing in it
-        else 
-          tNode_.accept(this);
-        
-        // put the last chain on the list
-        if (currentNode_!=null) {
-            result_.addChain(firstNode_, currentNode_, OMPCFGResult.TermForward, null);
-            currentNode_ = null;
-            firstNode_   = null;
-        }
-
-    }
-    
-    public OMPCFGResult getResult() { return result_;  }
-    
-    /**
-     * visit - for an expression block
-     * @param expression - IASTExpression
-     */
-    public int visit(IASTExpression expression)
-    {
-        // simple for now - may need to drill down later
-        OMPExpressionBlock b = new OMPExpressionBlock();
-        b.setPragmaContext(getLastPragma());
-        b.addExpression(expression);
-        firstNode_=currentNode_=b;
-
-        return PROCESS_CONTINUE;
-    }
-    
-    public int visit(IASTDeclaration declaration)
-    {
-        return PROCESS_CONTINUE;
-    }
-    
-
-    public int visit(IASTStatement statement) 
-    {
-        // first, check if statement is a region for a pragma
-        int checkValue = pragmaRegionCheck(statement);
-        if (checkValue!=-1)  return checkValue;  // -1 means carry foward in this code
-        
-        if (statement instanceof IASTIfStatement) {
-            processIfStatement((IASTIfStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTSwitchStatement) {
-            processSwitchStatement((IASTSwitchStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTCaseStatement) {
-            processCaseStatement((IASTCaseStatement)statement);
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTForStatement) {
-            processForStatement((IASTForStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTWhileStatement) {
-            processWhileStatement((IASTWhileStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTDoStatement) {
-            processDoStatement((IASTDoStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTCompoundStatement) {
-            pragmaRegionlessCheck(statement, PASTOMPPragma.ChildProximity);
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTBreakStatement) {
-            addToBasicBlockAndChain(statement, OMPCFGResult.TermBreak);
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTContinueStatement) {
-            addToBasicBlockAndChain(statement, OMPCFGResult.TermContinue); 
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTReturnStatement) {
-            addToBasicBlockAndChain(statement, OMPCFGResult.TermReturn); 
-            return PROCESS_CONTINUE;
-        }
-        
-        // just add to the current basic block if there is one
-        addToBasicBlock(statement);
-        pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-        
-        return PROCESS_CONTINUE;
-
-    }
-    
-    /**
-     * pragmaRegionCheck - if stmt is region for a preceding pragma, add pragma 
-     * @param statement - IASTStatement
-     * @return int  (-1 means nothing done)
-     */
-    protected int pragmaRegionCheck(IASTStatement statement)
-    {
-        PASTOMPPragma pragma = (PASTOMPPragma)pragmaRegionMap_.get(statement);
-        
-        // The following avoids a nasty recursion loop, resulting from
-        //    the recursion we invest on the following lines, i.e.
-        //    we keep building makers for the same statement
-        if (pragmaContext_.size()!=0 && ((OMPPragmaNode)pragmaContext_.peek()).getPragma()==pragma)
-            return -1;
-        
-        if (pragma!=null) {
-            OMPCFGNode pNode = new OMPPragmaNode(pragma, getLastPragma());
-            pNode.setPragmaContext(getLastPragma());
-            addToChain(pNode);
-            
-            // TODO: Analyse the context here to see if legal OMP pragma makes sense (ret -1)
-             
-            pragmaContext_.push(pNode);   // bump the context
-            
-            // Do a 1 level recursion to process this statement - so we can pop this context
-            OMPCFGMaker maker = new OMPCFGMaker(statement);
-            maker.buildCFG();
-            pragmaContext_.pop();
-            
-            result_.merge(maker.getResult());
-            // in the case of null compound statements, there is nothing here
-            if (maker.getResult().getFirstChain()!=null) {
-              pNode.connectTo(maker.getResult().getFirstChain().getHeadNode());
-              currentNode_ = maker.getResult().getFirstChain().getTailNode();
-            }
-            
-            // For certain pragmas, we will append an implicit barrier
-            int type = pragma.getOMPType();
-            if ((type==PASTOMPPragma.OmpParallel || type==PASTOMPPragma.OmpParallelFor ||
-                type==PASTOMPPragma.OmpParallelSections || type==PASTOMPPragma.OmpSingle) &&
-                pragma.getNoWait()==false) {
-                addToChain(new OMPPragmaNode(), true);  // constructor set implicit barrier
-            }
-                    
-            return PROCESS_SKIP;
-        }
-        
-        return -1;
-    }
-    
-    /**
-     * pragmaRegionlessCheck - add things like barrier, etc. as a separate node
-     * @param statement   - IASTStatement (preceeding the pragma)
-     * @param proximity   - int (see PASTOMPPragma constants, child, neighbor)
-     */
-    protected void pragmaRegionlessCheck(IASTStatement statement, int proximity)
-    {
-        LinkedList l = (LinkedList)pragmaLocationMap_.get(statement);
-        if (l==null)
-            return;
-        
-        for(Iterator i=l.iterator(); i.hasNext();) {
-            PASTOMPPragma oPragma = (PASTOMPPragma)i.next();
-            if (oPragma.getProximity()==proximity && oPragma.getRegion()==null) {
-                OMPCFGNode pNode = new OMPPragmaNode(oPragma, getLastPragma());
-                pNode.setPragmaContext(getLastPragma());
-                addToChain(pNode);
-                // no pop nor push needs to be done here
-            }
-        }
-    }
-    
-    /**
-     * processIfStatement - process the the then and else into a unified result
-     * @param ifs - IASATIfStatement
-     */
-    private void processIfStatement(IASTIfStatement ifs)
-    {
-
-        OMPCFGMaker  ift = new OMPCFGMaker(ifs.getThenClause());
-        OMPCFGMaker  ife = new OMPCFGMaker(ifs.getElseClause());
-        ift.buildCFG();
-        //System.out.println("OMPCFGMaker-----------------------------Else");
-        ife.buildCFG();
-        //System.out.println("OMPCFGMaker-----------------------------Endif");
-        Chain thenChain = ift.getResult().getFirstChain();
-        Chain elseChain = ife.getResult().getFirstChain();
-        
-        // The OMP CFG elides a lot of conditionals to save expense in analysis
-        // See if there is any reason to retain the structure, if not just add
-        // the statement to the current basic block
-        if (!getRelevance(ift.getResult()) && !getRelevance(ife.getResult())) {
-               addToBasicBlock(ifs);
-               return;
-        }
-        
-        addBasicBlockBranch(ifs.getConditionExpression(), OMPBasicBlock.IfBranch);
-        if (traceOn_)
-            System.out.println("CFGFactory: Create IF BranchNode");
-        
-        currentNode_.connectTo(thenChain.getHeadNode());
-        currentNode_.connectTo(elseChain.getHeadNode());
-        // Build a join node to collect results - makes things easier
-        OMPBasicBlock jn = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        if (traceOn_)
-            System.out.println("CFGFactory: Create JoinNode");
-        // connect what they go through
-        if (thenChain.getTerminationReason()==OMPCFGResult.TermForward)
-          thenChain.getTailNode().connectTo(jn);
-        if (elseChain.getTerminationReason()==OMPCFGResult.TermForward)
-          elseChain.getTailNode().connectTo(jn);
-       
-        // merge the nested results into the higher results
-        // note that IF does not settle any unresolved issues
-        result_.merge(ift.getResult());
-        result_.merge(ife.getResult());
-        
-        // add the join to the chain
-        if (jn.hasPredecessors())  // only if used
-          addToChain(jn, false);
-    }
-    
-    
-    /**
-     * processSwitchStatement - build the cfg for a switch statement
-     * @param iss - IASTSwitchStatement
-     */
-    private void processSwitchStatement(IASTSwitchStatement iss)
-    {
-        IASTStatement body = iss.getBody();
-        
-        OMPCFGMaker caseBodyFactory = new OMPCFGMaker(body);
-        caseBodyFactory.buildCFG();
-        OMPCFGResult cBody = caseBodyFactory.getResult();
-        
-        // We try to complete the structure to get rid of all breakages
-        // If there are none, and no barriers, we can just fold the whole switch into the case statement.
-        //    otherwise, we attach the whole mess to the cfg.
-        //
-        // We expect a set of chains.
-        // In each chain, we will look for nodes that begin with a case statement.
-        // If they end in a break or return, they are distinct paths in the case
-        //    otherwise they merge into each other.
-        // 
-        // Build first, token basic blocks for the split and join
-        OMPBasicBlock  bn = new OMPBasicBlock();
-        bn.setPragmaContext(getLastPragma());
-        OMPBasicBlock  jn = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        bn.setBranchingExpression(iss.getControllerExpression(), OMPBasicBlock.SwitchBranch);
-        LinkedList chains      = cBody.getChains();
-        for(Iterator i=chains.iterator(); i.hasNext();) {
-            Chain   chain = (Chain)i.next();
-            OMPCFGNode p  = chain.getHeadNode();
-            while(p!=null) {
-                if (p instanceof OMPBasicBlock) {
-                    if (((OMPBasicBlock)p).isCase())
-                      bn.connectTo(p);
-                }
-                p = p.getSuccessor();
-            }
-        }
-        
-        // for all the breaks, look at unresolved control flow list and deal with it
-        LinkedList ucf = cBody.getUnresolvedControlFlow();
-        Object    [] ucfList = ucf.toArray();  // need this form instead of iterator, due to removal conflict
-        for(int i=0; i<ucfList.length; i++) {
-            Chain urcf = (Chain)ucfList[i];
-            if (urcf.getTerminationReason()==OMPCFGResult.TermBreak) {
-                urcf.getTailNode().connectTo(jn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-         }
-        
-        // Now we see if we have anything of interest in this statement, if not, just fold it into the BB
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(iss);
-            return;
-         }
-        
-        // We need this structure, fold into the exising block structure
-        // merge results for all chains
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(bn, true);
-        // the join does not follow the branch directly - there is stuff inbetween, make it the current node
-        addToChain(jn, false);
-    }
-    
-    /**
-     * processWhileStatement - process the while statement into cfg
-     * @param whileStmt - IASTWhileStatement
-     */
-    private void processWhileStatement(IASTWhileStatement whileStmt)
-    {
-        IASTExpression condition = whileStmt.getCondition();
-        IASTStatement  body      = whileStmt.getBody();
-        
-        OMPCFGMaker       bodyBuilder = new OMPCFGMaker(body);
-        bodyBuilder.buildCFG();
-        OMPCFGResult      cBody       = bodyBuilder.getResult();
-        
-        // As in other stmts, build it all, do a check if we should fold in,
-        //    otherwise, use the nodes
-        OMPBasicBlock  bn        = new OMPBasicBlock();
-        bn.setPragmaContext(getLastPragma());
-        bn.setBranchingExpression(condition, OMPBasicBlock.WhileBranch);
-        OMPBasicBlock  jn        = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        
-        // Build the control flow
-        bn.connectTo(jn);
-        bn.connectTo(cBody.getFirstChain().getHeadNode());
-        cBody.getLastChain().getTailNode().connectTo(bn);
-        
-        // for all the breaks and continues, look at unresolved control flow list and deal with it
-        LinkedList ucf = cBody.getUnresolvedControlFlow();
-        for(Iterator i=ucf.iterator(); i.hasNext();) {
-            Chain urcf = (Chain)i.next();
-            if (urcf.getTerminationReason()==OMPCFGResult.TermBreak) {
-                urcf.getTailNode().connectTo(jn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-            else if (urcf.getTerminationReason()==OMPCFGResult.TermContinue) {
-                urcf.getTailNode().connectTo(bn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-         }
-        
-        // Now we see if we have anything of interest in this statement, if not, just fold it into the BB
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(whileStmt);
-            return;
-        }
-        
-        // merge results for all chains
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(bn, true);
-        addToChain(jn, false);
-    }
-    
-    /**
-     * processDoStatement - process Do statement into cfg
-     * @param doStmt - IASTDoStatement
-     */
-    private void processDoStatement(IASTDoStatement doStmt)
-    {
-        IASTExpression condition = doStmt.getCondition();
-        IASTStatement  body      = doStmt.getBody();
-        
-        OMPBasicBlock  bn   = new OMPBasicBlock();
-        bn.setPragmaContext(getLastPragma());
-        bn.setBranchingExpression(condition, OMPBasicBlock.DoBranch);
-        OMPBasicBlock  jn   = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        
-        OMPCFGMaker       bodyBuilder = new OMPCFGMaker(body);
-        bodyBuilder.buildCFG();
-        OMPCFGResult      cBody       = bodyBuilder.getResult();
- 
-        // Build the graph  [ we still put the join right after branch, to have a "break" target
-        cBody.getLastChain().getTailNode().connectTo(bn);
-        bn.connectTo(cBody.getFirstChain().getHeadNode());
-        bn.connectTo(jn);
-        
-        // Now we see if we have anything of interest in this statement, if not, just fold it into the BB
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(doStmt);
-            return;
-        }
- 
-        
-        // merge results for all chains
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(cBody.getFirstChain().getHeadNode(), true);
-        addToChain(jn, true);
-    }
-    
-    
-    /**
-     * processCaseStatement - Start a new basic block beginning with this case
-     * @param ics - IASTCaseStatement
-     */
-    private void processCaseStatement(IASTCaseStatement ics)
-    {
-        // Create a new basic block; but not a new chain
-        OMPBasicBlock b = new OMPBasicBlock();
-        b.setPragmaContext(getLastPragma());
-        addToChain(b);
-        if (traceOn_)
-            System.out.println("CFGFactory: Create BasicBlock due to case statement");
-        ((OMPBasicBlock)currentNode_).addStatement(ics);
-    }
-    
-    /**
-     * processForStatement - build the graph for the For statement
-     * @param ifs
-     */
-    private void processForStatement(IASTForStatement forStmt)
-    {
-        // TODO: there are cases where any of the following can be empty - to handle
-        IASTStatement  initializer = forStmt.getInitializerStatement();
-        IASTExpression condition   = forStmt.getConditionExpression();
-        IASTExpression iteration   = forStmt.getIterationExpression();
-        IASTStatement  body        = forStmt.getBody();
-        
-        // We will build the final result, than analyse if we actually need this
-        OMPBasicBlock       bn = new OMPBasicBlock();
-        bn.setBranchingExpression(condition, OMPBasicBlock.ForBranch);
-        OMPBasicBlock       jn = new OMPBasicBlock();
-       
-        OMPCFGMaker  initBuilder = new OMPCFGMaker(initializer);
-        initBuilder.buildCFG();
-        OMPCFGResult cInit = initBuilder.getResult(); 
-        
-        OMPCFGMaker forBodyFactory = new OMPCFGMaker(body);
-        forBodyFactory.buildCFG();
-        OMPCFGResult cBody = forBodyFactory.getResult();
-        
-        OMPCFGMaker iterBodyFactory = new OMPCFGMaker(iteration);
-        iterBodyFactory.buildCFG();
-        OMPCFGResult cIter = iterBodyFactory.getResult();
-        
-        // Build the primary structure of the loop
-        cInit.getLastChain().getTailNode().connectTo(bn);
-        bn.connectTo(jn);
-        bn.connectTo(cBody.getFirstChain().getHeadNode());
-        cBody.getLastChain().getTailNode().connectTo(cIter.getFirstChain().getHeadNode());
-        cIter.getLastChain().getTailNode().connectTo(bn);
-        
-        // for all the breaks and continues, look at unresolved control flow list and deal with it
-        LinkedList ucf = cBody.getUnresolvedControlFlow();
-        Object [] uList = ucf.toArray();
-        for(int i=0; i<uList.length; i++) {
-            Chain urcf = (Chain)uList[i];
-            if (urcf.getTerminationReason()==OMPCFGResult.TermBreak) {
-                urcf.getTailNode().connectTo(jn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-            else if (urcf.getTerminationReason()==OMPCFGResult.TermContinue) {
-                urcf.getTailNode().connectTo(cIter.getFirstChain().getHeadNode());
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-         }
-        
-        // Now we check if we are all resolved - only check the body
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(forStmt);
-            return;
-         }
-        
-        // Otherwise we add all this into the control flow graph
-        
-        // merge results for all chains
-        result_.merge(cInit);
-        result_.merge(cIter);
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(cInit.getFirstChain().getHeadNode(), true);
-        addToChain(bn, true);
-        addToChain(jn, false);    // bn already connected to jn
-    }
-    
-    /**
-     * getRelevance - Look at result for existence of pragmas, or 
-     *                of labels, or of unresolved control flow
-     * @param result - OMPCFGResult
-     * @return - boolean (true means any of the above exist
-     */
-    protected boolean getRelevance(OMPCFGResult result)
-    {
-        boolean tf = (result.getNumberOfPragmas()!=0 ||
-                      result.getNumberOfLabels()!=0  ||
-                      result.getUnresolvedControlFlow().size()!=0);
-        return tf;
-    }
-    
-    protected OMPPragmaNode getLastPragma()
-    {
-        return (pragmaContext_.isEmpty() ? null : (OMPPragmaNode)pragmaContext_.peek());
-    }
-    
-    /**
-     * addToBasicBlock - add a statement to the basic block
-     * @param statement - IASTStatement
-     */
-    private void addToBasicBlock(IASTStatement statement)
-    {
-        // default case, we are either adding a statement to a current basic block
-        if (currentNode_==null || !(currentNode_ instanceof OMPBasicBlock)) {
-            OMPBasicBlock b = new OMPBasicBlock();
-            b.setPragmaContext(getLastPragma());
-            addToChain(b);
-           // currentNode_ = new BasicBlock();
-            if (traceOn_)
-                System.out.println("CFGFactory: Create BasicBlock");
-            //firstNode_   = currentNode_;
-        }
-        ((OMPBasicBlock)currentNode_).addStatement(statement);
-     }
-    
-    private void addBasicBlockBranch(IASTExpression expression, int type)
-    {
-        // Add a new BB if the current is null, or is not a basic block
-        if (currentNode_==null || !(currentNode_ instanceof OMPBasicBlock)) {
-            addToChain(new OMPBasicBlock(), true);
-            if (traceOn_)
-                System.out.println("CFGFactory: Create BasicBlock");
-       }
-        assert(((OMPBasicBlock)currentNode_).getBranchingExpression()==null);
-       ((OMPBasicBlock)currentNode_).setBranchingExpression(expression, type);
-    }
-
-    /**
-     * addToCurrentChain - add the CFGNode to the current chain
-     * @param node - OMPCFGNode
-     * @param connect - connect to prior node
-     */
-    private void addToChain(OMPCFGNode node, boolean connect)
-    {
-        if (firstNode_==null) {
-            firstNode_   = node;
-            currentNode_ = node;
-        }
-        else {
-            if (connect)
-              currentNode_.connectTo(node);
-            currentNode_ = node;
-        }
-    }
-
-    /**
-     * addToChain - short hand to add and connect to chain
-     * @param node
-     */
-    private void addToChain(OMPCFGNode node) { addToChain(node, true); }
-     
-    private void addToBasicBlockAndChain(IASTStatement statement, int termReason)
-    {
-        addToBasicBlock(statement);
-        Chain chain = result_.addChain(firstNode_, currentNode_, termReason, statement);
-        if (termReason==OMPCFGResult.TermBreak || termReason==OMPCFGResult.TermContinue ||
-            termReason==OMPCFGResult.TermReturn)
-            result_.addUnresolvedControlFlow(chain);
-        currentNode_ = null;
-        firstNode_   = null;
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java
deleted file mode 100644
index 768f7ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java
+++ /dev/null

@@ -1,249 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.IASTGotoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPBasicBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Collects information about each pass of OMPCFGmaker
- * 
- * @author pazel
- *
- */
-public class OMPCFGResult
-{
-    /** List of sequential chains in 1-level pass: the control flow between
-    * chains is broken by continue, break, return, or goto
-    */
-    protected LinkedList chains_            = new LinkedList();  // of Chain
-    /** List of chains with no sequential flow to entry point - these get 
-    * aggregated.   Could be dead code, but could be branched into.
-    */
-    protected LinkedList unconnectedChains_ = new LinkedList();  // of Chain
-    /** List of blocks ending in continue, break, return, or goto whose further
-    * continuation needs to be resolved
-    */
-    protected LinkedList unresolvedControlFlow_ = new LinkedList();  // of Chain
-    /** list of labeled blocks (and related chain) */
-    protected Hashtable labelMap_              = new Hashtable();  // IASTName->LabeledBlock
-    /** list of pragma nodes encountered */
-    protected LinkedList pragmaNodeList_       = new LinkedList();
-    
-    /** block termination reason - unknown */
-    public static final int TermUnknown = -1;
-    /** block termination reason - no termination */
-    public static final int TermForward = 0;    // no termination
-    /** block termination reason - continue */
-    public static final int TermContinue = 1;   // continue
-    /** block termination reason - break */
-    public static final int TermBreak    = 2;   // break
-    /** block termination reason - return */
-    public static final int TermReturn   = 3;   // return
-    /** block termination reason - goto */
-    public static final int TermGoto     = 4;   // goto
-    
-    /**
-     * OMPCFGResult - constructor
-     *
-     */
-    public OMPCFGResult() { }
-    
-    /**
-     * addChain - add a chain to the chainList
-     * @param headNode
-     * @param tailNode
-     * @param terminationReason
-     * @param termStmt
-     */
-    public Chain addChain(OMPCFGNode headNode, 
-                          OMPCFGNode tailNode, 
-                          int terminationReason,
-                          IASTStatement termStmt)
-    {
-        Chain chain = new Chain(headNode, tailNode, terminationReason, termStmt);
-        chains_.add(chain);
-        
-        // run through chain to find all labeled blocks and add to labelmap
-        addLabels(chain);
-        addPragmas(chain);
-        return chain;
-    }
-    
-    /**
-     * addChain - add a chain to this result
-     * @param chain - Chain
-     * @return Chain
-     */
-    public Chain addChain(Chain chain)
-    {
-        chains_.add(chain);
-        addLabels(chain);
-        addPragmas(chain);
-        return chain;
-    }
-    
-    private void addLabels(Chain chain)
-    {
-        OMPCFGNode node = chain.getHeadNode();
-        while(node!=null) {
-            if (node instanceof OMPBasicBlock) {
-                IASTName label = ((OMPBasicBlock)node).getLabel();
-                if (label!=null) {
-                    if (!labelMap_.containsKey(label))
-                       labelMap_.put(label, new LabeledBlock(node, chain));
-                }
-            }
-            node=node.getSuccessor();  // use this knowing each node has a follower
-        }
-    }
-    
-    private void addPragmas(Chain chain)
-    {
-        OMPCFGNode node = chain.getHeadNode();
-        while(node!=null) {
-            if (node instanceof OMPPragmaNode) {
-                if (!pragmaNodeList_.contains(node))
-                   pragmaNodeList_.add(node);
-            }
-            node=node.getSuccessor();  // use this knowing each node has a follower
-        }
-    }
-    
-    public void merge(OMPCFGResult result)
-    {
-        // we don't merge chains_;
-        
-        // we merge all the others
-        unconnectedChains_.addAll(result.getUnconnectedChains());
-        unresolvedControlFlow_.addAll(result.getUnresolvedControlFlow());
-        labelMap_.putAll(result.getLabelMap());
-        pragmaNodeList_.addAll(result.getPragmaNodeList());
-    }
-    
-    public void resolve()
-    {
-        // Usually done to the final cfg results
-        // we try to resolve all unresolved control flow (goto's) and 
-        // return/exit nodes (sink)
-        // and maybe flag all unconnected chains as dead code
-        
-        for(Iterator i=unresolvedControlFlow_.iterator(); i.hasNext(); ) {
-            Chain uChain = (Chain)i.next();
-            if (uChain.getTerminationReason()==TermGoto) {
-                IASTStatement tStmt = uChain.getTerminationStmt();
-                if (tStmt!=null && (tStmt instanceof IASTGotoStatement)) {
-                    IASTName targetLabel = ((IASTGotoStatement)tStmt).getName();
-                    OMPCFGNode lNode = (OMPCFGNode)labelMap_.get(targetLabel);
-                    if (lNode!=null) {
-                        uChain.getTailNode().connectTo(lNode);
-                        removeUnresolvedControlFlow(uChain);
-                    }
-                }
-            }
-        }
-    }
-    
-    public void addUnconnectedChain(Chain chain)
-    {
-        unconnectedChains_.add(chain);
-    }
-    
-    public void addUnresolvedControlFlow(Chain chain)
-    {
-        unresolvedControlFlow_.add(chain);
-    }
-    
-    public void removeUnresolvedControlFlow(Chain chain)
-    {
-        unresolvedControlFlow_.remove(chain);
-    }
-    
-    public int getNumberOfLabels()
-    {
-        return labelMap_.size();
-    }
-    
-    public int getNumberOfPragmas()
-    {
-        return pragmaNodeList_.size();
-    }
-    
-    // accessors
-    public LinkedList getChains()  {  return chains_;  }
-    public LinkedList getUnconnectedChains() { return unconnectedChains_; }
-    public LinkedList getUnresolvedControlFlow() { return unresolvedControlFlow_; }
-    public Hashtable  getLabelMap() { return labelMap_; }
-    public LinkedList getPragmaNodeList() { return pragmaNodeList_; }
-    
-    /**
-     * Get the very first chain - a common want in the code (other are dead code)
-     * @return Chain
-     */
-    public Chain      getFirstChain() { return (chains_.size()>0 ? (Chain)(chains_.getFirst()) : null); }
-    /**
-     * Get the very last chain - a common want in the code (other are dead code)
-     * @return Chain
-     */
-    public Chain      getLastChain()  { return (chains_.size()>0 ? (Chain)(chains_.getLast())  : null);  }
-    
-    
-    /**
-     *  Chain - qualifies a code chain
-     *
-     */
-    static public class Chain
-    {
-        protected OMPCFGNode    headNode_ = null;
-        protected OMPCFGNode    tailNode_ = null;
-        protected int           terminationReason_ = TermUnknown;
-        protected IASTStatement terminationStmt_  = null;
-        
-        public Chain(OMPCFGNode headNode, OMPCFGNode tailNode, int terminationReason, IASTStatement termStatement)
-        {
-            headNode_=headNode;  tailNode_=tailNode;  
-            terminationReason_ = terminationReason; terminationStmt_ = termStatement;
-        }
-        
-        /** Get head node in the Chain */
-        public OMPCFGNode getHeadNode() { return headNode_; }
-        
-        /** Get tail node in the Chain */
-        public OMPCFGNode getTailNode() { return tailNode_; }
-        public int     getTerminationReason() { return terminationReason_; }
-        public IASTStatement getTerminationStmt() { return terminationStmt_; }
-    }
-    
-    /** LabeledBlock - qualifies a block with a label */
-    static public class LabeledBlock
-    {
-        protected OMPCFGNode labeledBlock_ = null;
-        protected Chain      relatedChain_ = null;  // chain holding block
-        
-        public LabeledBlock(OMPCFGNode labeledBlock, Chain relatedChain)
-        {
-            labeledBlock_ = labeledBlock;
-            relatedChain_ = relatedChain;
-        }
-        
-        public OMPCFGNode getLabeledBlock()  { return labeledBlock_; }
-        public Chain      getRelatedChain()  { return relatedChain_; }
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java
deleted file mode 100644
index 3e91fee..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java
+++ /dev/null

@@ -1,294 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPErrorManager;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPDFS;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Look for common semantic errors
- * 
- * @author pazel
- *
- */
-public class PASTSemanticCheck
-{
-    protected int numErrors_ = 0;
-    
-    protected PASTSemanticCheck(OMPCFG cfg)
-    {
-        SemanticDFS dfs = new SemanticDFS(cfg.getRoot());
-        dfs.startWalking();
-        
-    }
-
-    public static boolean checkSemantics(OMPCFG cfg)
-    {
-        PASTSemanticCheck psc = new PASTSemanticCheck(cfg);
-        return psc.getNumErrors()==0 ? true : false;
-    }
-    
-    public int getNumErrors()
-    {
-        return numErrors_;
-    }
-    
-    private void checkPragmaSemantics(OMPPragmaNode pnode)
-    {
-        PASTOMPPragma pragma = pnode.getPragma();
-        if (pragma==null)  // implicit barrier
-            return;
-        
-        switch(pragma.getOMPType()) {
-            // followed by structured region
-            case PASTOMPPragma.OmpParallel:
-               parallelCheck(pnode);
-               break;
-            case PASTOMPPragma.OmpSections:
-            case PASTOMPPragma.OmpSection:
-            case PASTOMPPragma.OmpParallelSections:
-            case PASTOMPPragma.OmpSingle:
-                break;
-            case PASTOMPPragma.OmpMaster:
-                masterCheck(pnode);
-                break;
-            case PASTOMPPragma.OmpCritical:
-                break;
-            case PASTOMPPragma.OmpOrdered:
-                orderedCheck(pnode);
-                break;
-                
-            // Must be followed by FOR
-            case PASTOMPPragma.OmpFor:
-            case PASTOMPPragma.OmpParallelFor:
-                forCheck(pnode);
-                break;
-
-            // Stands alone
-            case PASTOMPPragma.OmpBarrier:
-                barrierCheck(pnode);
-                break;
-            case PASTOMPPragma.OmpFlush:
-            case PASTOMPPragma.OmpThreadPrivate:
-                break;
-            
-            // Followed by expression
-            case PASTOMPPragma.OmpAtomic:
-                break;
-            case PASTOMPPragma.OmpUnknown:
-                return;  
-        }
-        return;
-    }
-    
-    /**
-     * parallelCheck - semantic check for Parallel statements
-     * @param pnode - OMPPragmaNode
-     */
-    private void parallelCheck(OMPPragmaNode pnode)
-    {
-        // A parallel directive dynamically inside another parallel
-        // logically etablishes a new team which is composed of only the current thread,
-        // unless nested parallelism is enabled.
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpParallel ||
-                pType==PASTOMPPragma.OmpParallelFor ||
-                pType==PASTOMPPragma.OmpParallelSections) {
-                handleProblem(pnode.getPragma(), 
-                        "Parallel directive dynamically inside another parallel, establishes single thread context",
-                        OpenMPError.WARN);
-                numErrors_++;
-                break;
-            }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * forCheck - Semantic check for For/parallelFor semantic mistakes
-     * @param pnode - OMPPragmaNode (for for/parallelFor)
-     */
-    private void forCheck(OMPPragmaNode pnode)
-    {
-        // A for directive is not allowed to nest with another for, sections, 
-        // and single directive bound to the same parallel 
-        // neither for ritical, ordered, and master regions
-        PASTOMPPragma pragma = pnode.getPragma();
-        boolean       isParallel = (pragma.getOMPType()==PASTOMPPragma.OmpParallelFor);
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        boolean       errorFound=false;
-        while(parent!=null) {
-            int parentType = parent.getPragma().getOMPType();
-            if (!errorFound) { 
-               if (parentType==PASTOMPPragma.OmpFor ||
-                   parentType==PASTOMPPragma.OmpSections ||
-                   parentType==PASTOMPPragma.OmpSingle) {
-                 errorFound=true; 
-               }
-               else if (parentType==PASTOMPPragma.OmpCritical ||
-                        parentType==PASTOMPPragma.OmpOrdered  ||
-                        parentType==PASTOMPPragma.OmpMaster) {
-                   handleProblem(pnode.getPragma(), 
-                           "For directive embedded within critical, ordered, or master extents",
-                           OpenMPError.ERROR);
-                   numErrors_++;
-                   errorFound=true;
-                   break;
-                }
-               else if (parentType==PASTOMPPragma.OmpParallelFor ||
-                        parentType==PASTOMPPragma.OmpParallelSections) {
-                   handleProblem(pnode.getPragma(), 
-                           "For directive embedded within another parallel for or parallel sections",
-                           OpenMPError.ERROR);
-                   numErrors_++;
-                   errorFound=true;
-                   break;
-               }
-               else if (isParallel && parentType==PASTOMPPragma.OmpParallel) {
-                   handleProblem(pnode.getPragma(), 
-                           "Parallel directive dynamically inside another parallel, establishes single thread context",
-                           OpenMPError.WARN);
-                   numErrors_++;
-                   break;                 
-               }
-            }
-            if (errorFound && (parentType==PASTOMPPragma.OmpParallel ||
-                               parentType==PASTOMPPragma.OmpParallelFor ||
-                               parentType==PASTOMPPragma.OmpParallelSections))
-            {
-                handleProblem(pnode.getPragma(), 
-                        "For directive embedded within another for, sections, or single directive",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-             }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * barrierCheck - semantic check on barrier statement
-     * @param pnode - OMPPragmaNode
-     */
-    private void barrierCheck(OMPPragmaNode pnode)
-    {
-        // Barrier directives are not permitted in the dynamic extent of for, ordered, sections, single,
-        // master, and critical regions
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpFor || pType==PASTOMPPragma.OmpParallelFor ||
-                pType==PASTOMPPragma.OmpOrdered || pType==PASTOMPPragma.OmpSections ||
-                pType==PASTOMPPragma.OmpSingle  || pType==PASTOMPPragma.OmpMaster ||
-                pType==PASTOMPPragma.OmpCritical) {
-                handleProblem(pnode.getPragma(), 
-                        "Barrier directive not permitted in region extent of for, ordered, sections, single, master, and critical",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-             }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * masterCheck - semantic check for use of master directive
-     * @param pnode - OMPPragmaNode
-     */
-    private void masterCheck(OMPPragmaNode pnode)
-    {
-        // Master directives are not permitted in the dynamic extent of 
-        // for, sections, and single
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpFlush || pType==PASTOMPPragma.OmpParallelFor ||
-                pType==PASTOMPPragma.OmpSections || pType==PASTOMPPragma.OmpParallelSections ||
-                pType==PASTOMPPragma.OmpSingle) {
-                handleProblem(pnode.getPragma(), 
-                        "Master directive not permitted in dynamic extent of for, sections, or single directives",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-            }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * orderedCheck - semantic check on ordered directive
-     * @param pnode - OMPPragmaNode
-     */
-    private void orderedCheck(OMPPragmaNode pnode)
-    {
-        // Ordered directives are not permitted in the dynamic extend of critical regions 
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpCritical) {
-                handleProblem(pnode.getPragma(), 
-                        "Ordered directive not permitted in dynamic extent of critical region",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-            }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    
-    /**
-     * handleProblem
-     * @param description - String
-     * @param severity    - int
-     */
-    private void handleProblem(PASTOMPPragma pragma, String  description, int severity)
-    {
-        OpenMPError error = new OpenMPError(description, 
-                                            pragma.getContainingFilename(),
-                                            pragma.getStartingLine(),
-                                            severity);
-        OpenMPErrorManager.getCurrentErrorManager().addError(error);
-        pragma.addProblem(error);  // we really don't need this, but may be useful later
-    }
-
-    
-    
-    private class SemanticDFS extends OMPDFS
-    {
-        
-        public SemanticDFS(OMPCFGNode startNode)
-        {
-            super(startNode);
-        }
-
-
-        public int visit(OMPCFGNode node)
-        {
-            if (node instanceof OMPPragmaNode) 
-                checkPragmaSemantics((OMPPragmaNode)node);
-            return 0;
-        }
-        
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java
deleted file mode 100644
index 50d114d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java
+++ /dev/null

@@ -1,263 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Stack;
-
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPDFS;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Main Algorithm - 
- * 
- * Given: the start node of a control flow graph (OMPCFG)
- * Output: a set of barrier phases
- * 
- * 1) Start the algorithm using the start node of the cfg
- * 2) For each barrier reached by a DFS, said barrier neither prior processed 
- *    nor on the stack, push onto stack, and start fresh DFS on new barrier
- * 3) For each node encountered
- *    a) if node is in a phase having its initial barrier match with top barrier
- *       on the stack, add all nodes after that top barrier to that phase.
- *    b) if node is a barrier, build phase, add nodes on stack from penultimate 
- *       barrier
- * 4) When a DFS completes, pop the stack
- * 5) Terminate when the stack is empty            
- * 
- */
-
-public class PhaseAnalysisFactory
-{
-    protected OMPCFG     cfg_              = null;
-    protected OMPCFGNode termNode_         = null;
-    
-    protected Stack      barrierStack_     = new Stack();       // of DFSWalk's
-    protected HashSet    finishedBarriers_ = new HashSet();     // of barriers that are finished being 
-                                                                //   traversed from
-    protected LinkedList phases_           = new LinkedList();  // of PhaseConcurrencyAnalysis's
-    
-    // A common search we do is, for a given node, and a given barrier, find all 
-    // phases that 
-    //   a) contain that node
-    //   b) have that barrier as the starting barrier of the phase
-    // Solution: map each node to a list of phases to which it belongs.
-    //           The list should be sparse, for filtering out the phases that 
-    //           begin with a particular barrier should be inexpensive.
-    protected Hashtable  nodeToPhases_ = new Hashtable();
-
-    /**
-     * PhaseAnalysisFactory - Constructor
-     * @param cfg - OMPCFG
-     */
-    public PhaseAnalysisFactory(OMPCFG cfg)
-    {
-        cfg_      = cfg;
-        termNode_ = cfg_.getTermNode();
-    }
-    
-    public void buildPhases()
-    {
-        // Set up the first statement
-        OMPCFGNode node = cfg_.getRoot();
-        if (!(node instanceof OMPPragmaNode))  return;   // required
-        DFSWalk pc = new DFSWalk((OMPPragmaNode)node);
-        barrierStack_.push(pc);
-        pc.trigger();
-    }
-    
-    /**
-     * findPhase - find a specified phase and add it
-     * @param bNode - OMPPragmaNode
-     * @param eNode - OMPPragmaNode
-     * @param addNew - boolean
-     * @return PhaseConcurrencyAnalysis
-     */
-    protected PhaseConcurrencyAnalysis findPhase(OMPPragmaNode bNode, OMPPragmaNode eNode, boolean addNew)
-    {
-        // Find the phase that starts and ends with these TODO: make more efficient
-        for(Iterator i=phases_.iterator(); i.hasNext();) {
-            PhaseConcurrencyAnalysis phase = (PhaseConcurrencyAnalysis)i.next();
-            if (phase.getBeginNode()==bNode && phase.getEndNode()==eNode)
-                return phase;
-        }
-        if (!addNew) return null;
-        
-        PhaseConcurrencyAnalysis phase = new PhaseConcurrencyAnalysis(bNode, eNode);
-        phases_.add(phase);
-        return phase;
-    }
-    
-    /**
-     * addNodesToPhase - add a list of nodes to a specific phase
-     * @param phase - PhaseConcurrencyAnalysis
-     * @param nodes - OMPCFGNode []
-     */
-    protected void addNodesToPhase(PhaseConcurrencyAnalysis phase, OMPCFGNode [] nodes)
-    {
-        for(int i=0; i<nodes.length; i++) {
-            phase.add(nodes[i]);
-            mapNodeToPhase(nodes[i], phase);
-        }
-    }
-    
-    protected boolean isFinished(OMPPragmaNode pNode)
-    {
-        return finishedBarriers_.contains(pNode);
-    }
-    
-    protected boolean isOnBarrierStack(OMPPragmaNode pNode)
-    {
-        for(Iterator i=barrierStack_.iterator(); i.hasNext();) {
-            DFSWalk dw = (DFSWalk)i.next();
-            if (dw.getPragmaNode()==pNode)  return true;
-        }
-        return false;
-    }
-    
-    protected LinkedList memberPhases(OMPCFGNode node)
-    {
-        return (LinkedList)nodeToPhases_.get(node);
-    }
-    
-    
-    /**
-     * mapNodeToPhase - map a given node to a given phase in the node-phase map
-     * @param node   - OMPCFGNode
-     * @param phase  - PhaseConcurrencyAnalysis
-     */
-    protected void mapNodeToPhase(OMPCFGNode node, PhaseConcurrencyAnalysis phase)
-    {
-        LinkedList l = (LinkedList)nodeToPhases_.get(node);
-        if (l==null) {
-            l= new LinkedList();
-            nodeToPhases_.put(node, l);
-        }
-        if (!l.contains(phase))
-          l.add(phase);
-    }
-    
-    /**
-     * getPhases - produce a list of all phases produced from this analysis
-     * @return PhaseConcurrencyAnalysis []
-     */
-    public PhaseConcurrencyAnalysis [] getPhases()
-    {
-        PhaseConcurrencyAnalysis [] l = new PhaseConcurrencyAnalysis[phases_.size()];
-        int count = 0;
-        for(Iterator i=phases_.iterator(); i.hasNext();)
-            l[count++] = (PhaseConcurrencyAnalysis)i.next();
-        return l;
-    }
-    
-    //*************************************************************************
-    // DFSWalk
-    //*************************************************************************
-    protected class DFSWalk extends OMPDFS
-    {
-        protected OMPPragmaNode    phaseBeginNode_ = null;
-        
-        public DFSWalk(OMPPragmaNode phaseBeginNode)
-        {
-            super(phaseBeginNode);
-            phaseBeginNode_ = phaseBeginNode;
-        }
-        
-        public OMPPragmaNode getPragmaNode()
-        {
-            return phaseBeginNode_;
-        }
-        
-        /**
-         * trigger - begin the process of walking the graph
-         *
-         */
-        public void trigger()
-        {
-            this.startWalking();
-        }
-        
-        /**
-         * visit - visit method - what the user usually overrides
-         * @param node - OMPCFGNode
-         * @return int  (see OMPDFS codes)
-         */
-        public int visit(OMPCFGNode node)
-        {
-            if (node instanceof OMPPragmaNode) { 
-                OMPPragmaNode pragmaNode = (OMPPragmaNode)node;
-                if (pragmaNode.getPragma()!=null && pragmaNode.getPragma().getOMPType()!=PASTOMPPragma.OmpBarrier)
-                    return OMPDFS.CONTINUE;
-                // If at beginning of stack again, keep moving on
-                if (getNodeStackSize()==1)  return OMPDFS.CONTINUE;
-                // If necessary, create a new phase and add to list of phases
-                PhaseConcurrencyAnalysis phase = findPhase(phaseBeginNode_, pragmaNode, true);
-                addNodesToPhase(phase, getNodeStack());
-                // If barrier is completed or is on stack, we skip searching forward
-                if (isFinished(pragmaNode) || isOnBarrierStack(pragmaNode)) 
-                    return OMPDFS.SKIP;
-                // Create a new walk to the next segments - increase the stack
-                // NOTE: we may have to skip the followin for implict barrier
-                DFSWalk pc = new DFSWalk(pragmaNode);
-                barrierStack_.push(pc);
-                pc.trigger();
-                // above finished walking, pop the stack, and skip on this level
-                barrierStack_.pop();
-                return OMPDFS.SKIP;
-            }
-            else if (node==termNode_) {  // this is an implicit barrier, but not further dfs
-                if (getNodeStackSize()==1)  return OMPDFS.CONTINUE;
-                return OMPDFS.CONTINUE;
-            }
-            
-            // For each visited successor node, add node stack to all phases the successor
-            //    belongs to, said successor phase beginning with phaseBeginNode_
-            // Note: we should not bother with phases that begin with other than phaseBeginNode_ - 
-            //       as then we would have to account for partial paths from other such phases,
-            //       which we do not have (we glom all nodes together, no paths).  That was why
-            //       we do fresh searches starting at new barriers.
-            OMPCFGNode [] nodes = node.getOutNodes();
-            for(int i=0; i<nodes.length; i++) {
-                if (isVisited(nodes[i])) {
-                    LinkedList l = memberPhases(nodes[i]);
-                    OMPCFGNode [] nodeStack = getNodeStack();
-                    Object [] listArray = l.toArray();  // safer to use this, l may get modified
-                    for(int j=0; j<listArray.length; j++) {
-                        PhaseConcurrencyAnalysis phase = (PhaseConcurrencyAnalysis)listArray[j];
-                        if (phase.getBeginNode()==phaseBeginNode_) 
-                            addNodesToPhase(phase, nodeStack);
-                    }
-                }
-            }
-            
-            return OMPDFS.CONTINUE;
-        }
-        
-        /**
-         * atStartNode - check if we are at the 1st node of the search
-         * @param node
-         * @return
-         */
-        protected boolean atStartNode(OMPCFGNode node)
-        {
-            return (node==phaseBeginNode_ && getNodeStackSize()==1);
-        }
-
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java
deleted file mode 100644
index 9e1668a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import java.io.PrintStream;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Identifies a pair of barriers, and a set of all nodes in-between
-
- * @author pazel
- *
- */
-public class PhaseConcurrencyAnalysis
-{
-    // The bounds of this phase
-    protected OMPPragmaNode    beginNode_ = null;
-    protected OMPPragmaNode    endNode_   = null;
-    // The following are the concurrent OMPCFGnode's to this phase
-    protected LinkedHashSet    nodes_ = new LinkedHashSet();
-   
-    /**
-     * PhaseConcurrencyAnalysis - constructor
-     * @param beginNode - OMPPragmaNode
-     * @param endNode   - OMPPragmaNode
-     */
-    public PhaseConcurrencyAnalysis(OMPPragmaNode beginNode, OMPPragmaNode endNode)
-    {
-        beginNode_ = beginNode;
-        endNode_   = endNode;
-    }
-     
-    /**
-     * getBeginNode - get the first delimiting barrier node
-     * @return OMPPragmaNode
-     */
-    public OMPPragmaNode getBeginNode()
-    {
-        return beginNode_;
-    }
-    
-    /**
-     * getEndNode - get the end delimiting barrier node
-     * @return
-     */
-    public OMPPragmaNode getEndNode()
-    {
-        return endNode_;
-    }
-    
-    /**
-     * add - add a node to the phase
-     * @param node - OMPCFGNode
-     */
-    public void add(OMPCFGNode node)
-    {
-        if (!nodes_.contains(node))
-            nodes_.add(node);
-    }
-    
-    /**
-     * getNodes - get the set of nodes
-     * @return Set
-     */
-    public Set getNodes()
-    {
-        return nodes_;
-    }
-    
-    public void printPhase(PrintStream ps)
-    {
-        ps.println("Begin pragma ("+beginNode_.getId()+")="+beginNode_.getType());
-        ps.println("End   pragma ("+endNode_.getId()+")="+endNode_.getType());
-        ps.print("   nodes=");
-        for(Iterator i=nodes_.iterator(); i.hasNext();) {
-            OMPCFGNode n = (OMPCFGNode)i.next();
-            ps.print(n.getId()+" ");
-        }
-        ps.println();
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java
deleted file mode 100644
index 3e39f6f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.io.PrintStream;
-import java.util.Set;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-
-/**
- * Holds the analysis for a portion of a function defined by an omp pragma
- * 
- * @author pazel
- * 
- */
-public class RegionConcurrencyAnalysis {
-	protected FunctionConcurrencyAnalysis analysis_ = null; // owning analysis
-
-	protected OMPCFG cfg_ = null;
-
-	protected PhaseConcurrencyAnalysis[] phases_ = null;
-
-	protected RegionConcurrencyMap cMap_ = null;
-
-	/**
-	 * RegionConcurrencyAnalysis - Constructor
-	 * 
-	 * @param cfg -
-	 *            OMPCFG
-	 */
-	public RegionConcurrencyAnalysis(OMPCFG cfg) {
-		cfg_ = cfg;
-
-		semanticCheck();
-	}
-
-	/**
-	 * setParent - set the FunctionConcurrencyAnalysis for this cfg
-	 * 
-	 * @param analysis
-	 */
-	public void setParent(FunctionConcurrencyAnalysis analysis) {
-		analysis_ = analysis;
-	}
-
-	/**
-	 * getCFG - accessor the OMPCFG
-	 * 
-	 * @return OMPCFG
-	 */
-	public OMPCFG getCFG() {
-		return cfg_;
-	}
-
-	/**
-	 * getPhases - get all the phases of this component
-	 * 
-	 * @return PhaseConcurrencyAnalysis []
-	 */
-	public PhaseConcurrencyAnalysis[] getPhases() {
-		return phases_;
-	}
-
-	/**
-	 * doPhaseAnalysis - analyse for phases
-	 * 
-	 */
-	public void doPhaseAnalysis() {
-		PhaseAnalysisFactory paf = new PhaseAnalysisFactory(cfg_);
-		paf.buildPhases();
-		phases_ = paf.getPhases();
-
-		cMap_ = new RegionConcurrencyMap(this);
-		cMap_.buildMap();
-	}
-
-	/**
-	 * getNodesConcurrentTo - get all nodes concurrent to given node
-	 * 
-	 * @param node -
-	 *            IASTNode
-	 * @return Set
-	 */
-	public Set getNodesConcurrentTo(IASTNode node) {
-		return cMap_.getNodesConcurrentTo(node);
-	}
-
-	/**
-	 * printPhases - print out all the phases
-	 * 
-	 * @param ps
-	 */
-	public void printComponent(PrintStream ps) {
-		for (int i = 0; i < phases_.length; i++) {
-			ps.println("Component Phase " + i
-					+ " ----------------------------------");
-			phases_[i].printPhase(ps);
-		}
-	}
-
-	/**
-	 * semanticCheck - check for semantic mistakes using pragmas
-	 * 
-	 */
-	private void semanticCheck() {
-		PASTSemanticCheck.checkSemantics(cfg_);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java
deleted file mode 100644
index fcef0a0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPBasicBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPDFS;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPExpressionBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Builds the concurrency map and provides access to it 
- * @author pazel
- *
- */
-public class RegionConcurrencyMap
-{
-
-    protected RegionConcurrencyAnalysis region_ = null;
-    protected OMPCFG                    cfg_       = null;
-    
-    protected PhaseConcurrencyAnalysis []  phases_    = null;
-    
-    // The actual map
-    protected ArrayList               indexMap_ = new ArrayList(); // index->stmt
-    protected Hashtable               stmtMap_  = new Hashtable(); // stmt->index
-    // stmt to BitSet, representing all statments concurrent to stmt
-    protected Hashtable               concurrencyMap_ = new Hashtable();
-    
-    // Used in each phase process to list all nodes found
-    protected LinkedList              phaseStmts_ = new LinkedList();
-    
-    
-    // Some sub-regions need to exclude within themselves.  To help with this,
-    // we build a iastnode-->OMPPragmaNode hashmap, used by the second part of processConcurrency
-    protected Hashtable               exclusionMap_ = new Hashtable();
-    
-    /**
-     * RegionConcurrencyMap - constructor
-     * @param component - RegionConcurrencyAnalysis
-     */
-    public RegionConcurrencyMap(RegionConcurrencyAnalysis region)
-    {
-        region_    = region;
-        cfg_       = region_.getCFG();
-        phases_    = region_.getPhases();
-    }
-    
-    /**
-     * buildMap - build the concurrencyMap_ and other artifacts for the map
-     *
-     */
-    public void buildMap()
-    {
-        for(int i=0; i<phases_.length; i++) 
-            processPhase(phases_[i]);
-    }
-    
-    /**
-     * processPhase - process given phase into the concurrency map
-     * @param phase - PhaseConcurrencyAnalysis
-     */
-    protected void processPhase(PhaseConcurrencyAnalysis phase)
-    {
-        Set nodes = phase.getNodes();  // of OMPCFGNode's
-        phaseStmts_.clear();
-        exclusionMap_.clear();
-        
-        OMPPragmaNode ePragma = null;    // exclusion pragma
-        
-        for(Iterator i=nodes.iterator(); i.hasNext();) {
-            OMPCFGNode node = (OMPCFGNode)i.next();
-            
-            // Establish the exclusion context if any
-            ePragma = node.getPragmaContext();
-            if (ePragma!=null && ePragma.getPragma()!=null) {
-                int pType = ePragma.getPragma().getOMPType();
-                // if none of these situations, all the stmts in the node can execute concurrently to each other
-                // (note: if single and has barrier free path to self, stmts can execute concurrently to each other
-                if (!((pType==PASTOMPPragma.OmpSingle && !hasBarrierFreePathToSelf((OMPBasicBlock)node)) || 
-                      pType==PASTOMPPragma.OmpMaster ||
-                      pType==PASTOMPPragma.OmpOrdered || 
-                      pType==PASTOMPPragma.OmpCritical || 
-                      pType==PASTOMPPragma.OmpSection))
-                    ePragma=null;
-            }
-            else 
-                ePragma=null;
-            
-            if (node instanceof OMPBasicBlock) {
-                LinkedList stmts = ((OMPBasicBlock)node).getFundamentals();
-                for(Iterator j=stmts.iterator(); j.hasNext();) {
-                    IASTNode n = (IASTNode)j.next();
-                    indexNode(n, ePragma);
-                }
-                indexNode(((OMPBasicBlock)node).getBranchingExpression(), ePragma);
-            }
-            else if (node instanceof OMPExpressionBlock) {
-                IASTExpression [] eList = ((OMPExpressionBlock)node).getExpressions();
-                for(int j=0; j<eList.length; j++)
-                    indexNode(eList[j], ePragma);
-            }
-        }
-        
-        // Go though the list of phase nodes, and 
-        //    ASSUMING THEY ARE ALL CONCURRENT WITH EACH OTHER (will change later)
-        // make them all concurrent to each other
-        for(Iterator i=phaseStmts_.iterator(); i.hasNext();) {
-            IASTNode  n = (IASTNode)i.next();
-            OMPPragmaNode ePragmaS = (OMPPragmaNode)exclusionMap_.get(n);
-            int       nIndex = ((Integer)(stmtMap_.get(n))).intValue();
-            for(Iterator j=phaseStmts_.iterator(); j.hasNext();) {
-                IASTNode m = (IASTNode)j.next();
-                OMPPragmaNode ePragmaT = (OMPPragmaNode)exclusionMap_.get(m);
-                
-                // stmts in the same exclusion cannot be concurrent
-                if (!(ePragmaT==ePragmaS && ePragmaT!=null)) {
-                  BitSet   b = (BitSet)(concurrencyMap_.get(m));
-                  b.set(nIndex);
-                }
-                
-            }
-        }
-    }
-    
-    /**
-     * indexNode - index a node if node not seen to this process
-     * @param n - IASTNode
-     */
-    protected void indexNode(IASTNode n, OMPPragmaNode ePragma)
-    {
-        if (n==null)  return;
-        if (!stmtMap_.containsKey(n)) {
-            indexMap_.add(n);
-            stmtMap_.put(n, new Integer(indexMap_.indexOf(n)));
-            concurrencyMap_.put(n, new BitSet());
-        }
-        if (!phaseStmts_.contains(n))
-            phaseStmts_.add(n);
-        // Set up the exclusion map
-        if (ePragma!=null && !exclusionMap_.contains(n))
-            exclusionMap_.put(n, ePragma);
-    }
-    
-    /**
-     * getNodesConcurrentTo - get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        BitSet b = (BitSet)concurrencyMap_.get(node);
-        if (b==null)  return null;    // stmt never registered - ind. called for wrong component
-        
-        HashSet ans = new HashSet();
-        for(int i=b.nextSetBit(0); i>=0; i=b.nextSetBit(i+1)) 
-           ans.add(indexMap_.get(i));
-        return ans;
-    }
-    
-    private boolean hasBarrierFreePathToSelf(OMPBasicBlock singleBlock)
-    {
-        BarrierPathDFS  dfs = new BarrierPathDFS(singleBlock);
-        dfs.startWalking();
-        
-        return dfs.hasBarrierFreePath();
-    }
-    
-    //-------------------------------------------------------------------------
-    //  BarrierPathDFS - find barrier free path to pragma
-    //-------------------------------------------------------------------------
-    private class BarrierPathDFS extends OMPDFS
-    {
-        // find a barrier free path to this node
-        protected OMPPragmaNode target_            = null;
-        protected boolean       barrierFreeExists_ = false;
-        
-        public BarrierPathDFS(OMPBasicBlock block)
-        {
-            super(block);
-            target_ = block.getPragmaContext();
-        }
-        
-        public boolean hasBarrierFreePath()
-        {
-            return barrierFreeExists_;
-        }
-        
-        /**
-         * visit - visit method - what the user usually overrides
-         * @param node - OMPCFGNode
-         */
-        public int visit(OMPCFGNode node)
-        {
-            if (node instanceof OMPPragmaNode) {
-                OMPPragmaNode thisNode = (OMPPragmaNode)node;
-                if (thisNode.isImplicitBarrier() || thisNode.getPragma().getOMPType()==PASTOMPPragma.OmpBarrier)
-                    return SKIP;
-                else if (thisNode==target_) {
-                    barrierFreeExists_=true;
-                    return ABORT;
-                }
-            }
-            return CONTINUE;
-        }
-    }
-    
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java
deleted file mode 100644
index fcaaed3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java
+++ /dev/null

@@ -1,433 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import java.util.Hashtable;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.ptp.pldt.common.util.Utility;
-
-/**
- * Interval tree, mapping statement (position, length)->statement
- * @author pazel
- *
- */
-public class StatementMap
-{
-    protected Member     root_             = null;
-    protected Hashtable  iastnodeToMember_ = new Hashtable();
-    
-    public StatementMap()
-    {
-        
-    }
-    
-    public boolean add(IASTNode   node)
-    {
-        if (node==null) return false;
-        
-        Member m = new Member(node);
-        RBInsert(m);
-        
-        iastnodeToMember_.put(node, m);
-
-        return true;
-    }
-    
-    /**
-     * getLocation - get offset/length relative to containing file
-     * @param node - IASTNode
-     * @return Location
-     */
-    public Location getLocation(IASTNode node)
-    {
-        Utility.Location  l = Utility.getLocation(node);  // Use common function
-        return new Location(l.low_, l.high_);
-        /*ASTNode astnode = (node instanceof ASTNode ? (ASTNode)node : null);
-        if (astnode==null)  return null;
-
-        IASTFileLocation ifl         = node.getFileLocation();
-        // offset calculation is tricky - we used the following since it seems to cover the most cases
-        int offset = 0;
-        int length = 0;
-        if (ifl!=null) {
-            offset = ifl.getNodeOffset();   
-            length = ifl.getNodeLength();
-        }
-        else {  // this happens in "omp sections", apparently due to pragmas splitting the region
-            IASTNodeLocation [] locs = node.getNodeLocations(); 
-            if (locs==null || locs.length==0)  return null;
-            offset = locs[0].getNodeOffset();
-            length = astnode.getLength();
-        }
-        return new Location(offset, offset+length-1); */
-    }
-    
-    public void remove(IASTNode   node)
-    {
-        Member m = (Member)iastnodeToMember_.get(node);
-        if (m==null) return;
-        
-        RBDelete(m);
-        
-        iastnodeToMember_.remove(node);
-    }
-
-    public IASTNode find(int offset, int length)
-    {
-        return findInterval(offset, offset+length-1);
-    }
-    
-    public IASTNode findInterval(int offset, int endset)
-    {
-        Member x=findIntervalMember(offset, endset);
-        if (x!=null)
-            return x.node_;
-        return null;
-    }
-    
-    protected Member findIntervalMember(int offset, int endset)
-    {
-        Member x=root_;
-        while(x!=null && !overlap(x.low_, x.high_, offset, endset)) {
-            if (x.left_!=null && x.left_.max_>=offset)
-                x=x.left_;
-            else
-                x=x.right_;
-        }
-        return x;       
-    }
-    
-    protected boolean overlap(int offset1, int endset1, int offset2, int endset2)
-    {
-        if (endset1<offset2 || endset2<offset1) return false;
-        return true;
-    }
-    
-    // NOTE: do not use until we understand
-    //   1) if null should be replaced by a NIL object
-    //   2) where/how to do the max update corrections
-    protected void RBDelete(Member z)
-    {
-        Member y=null, x=null;
-        
-        y=((z.left_==null || z.right_==null) ? z : treeSuccessor(z));
-        x= (y.left_!=null ? y.left_ : y.right_);
-        x.parent_=y.parent_;
-        if (y.parent_==null)
-            root_=x;
-        else {
-            if (y==y.parent_.left_)
-                y.parent_.left_=x;
-            else
-                y.parent_.right_=x;
-        }
-        if (y!=z)
-            z.copyFrom(y);
-        if (y.color_==Member.BLACK)
-            RBDeleteFixup(x);
-    }
-    
-    protected void RBDeleteFixup(Member x)
-    {
-        Member w=null;
-        while(x!=root_ && x.color_==Member.BLACK) {
-            if (x==x.parent_.left_) {
-                w=x.parent_.right_;
-                if (w.color_==Member.RED) {
-                    w.color_=Member.BLACK;
-                    x.parent_.color_=Member.RED;
-                    x.parent_.leftRotate();
-                    w=x.parent_.right_;
-                }
-                if (w.left_.color_==Member.BLACK && w.right_.color_==Member.BLACK){
-                    w.color_=Member.RED;
-                    x=x.parent_;
-                }
-                else { 
-                    if (w.right_.color_==Member.BLACK) {
-                      w.left_.color_=Member.BLACK;
-                      w.color_=Member.RED;
-                      w.rightRotate();
-                      w=x.parent_.right_;
-                    }
-                    w.color_=x.parent_.color_;
-                    x.parent_.color_=Member.BLACK;
-                    w.right_.color_=Member.BLACK;
-                    x.parent_.leftRotate();
-                    x=root_;
-                }
-             }
-            else {
-                // same with left/right exchanged
-                w=x.parent_.left_;
-                if (w.color_==Member.RED) {
-                    w.color_=Member.BLACK;
-                    x.parent_.color_=Member.RED;
-                    x.parent_.rightRotate();
-                    w=x.parent_.left_;
-                }
-                if (w.right_.color_==Member.BLACK && w.left_.color_==Member.BLACK){
-                    w.color_=Member.RED;
-                    x=x.parent_;
-                }
-                else { 
-                    if (w.left_.color_==Member.BLACK) {
-                      w.right_.color_=Member.BLACK;
-                      w.color_=Member.RED;
-                      w.leftRotate();
-                      w=x.parent_.left_;
-                    }
-                    w.color_=x.parent_.color_;
-                    x.parent_.color_=Member.BLACK;
-                    w.left_.color_=Member.BLACK;
-                    x.parent_.rightRotate();
-                    x=root_;
-                }
-            }
-        }
-        x.color_=Member.BLACK;
-    }
-    
-    protected void RBInsert(Member x)
-    {
-        Member y=null;
-        treeInsert(x);
-        x.updateMax();
-        x.color_=Member.RED;
-        while(x!=root_ && x.parent_.color_==Member.RED) {
-            if (x.parent_==x.parent_.parent_.left_) {
-                y=x.parent_.parent_.left_;
-                if (y.color_==Member.RED) {
-                    x.parent_.color_=Member.BLACK;
-                    y.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x=x.parent_.parent_;
-                }
-                else {
-                    if (x==x.parent_.right_) {
-                        x=x.parent_;
-                        x.leftRotate();
-                    }
-                    x.parent_.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x.parent_.parent_.rightRotate();
-                }
-            }
-            else {
-                y=x.parent_.parent_.right_;
-                if (y.color_==Member.RED) {
-                    x.parent_.color_=Member.BLACK;
-                    y.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x=x.parent_.parent_;
-                }
-                else {
-                    if (x==x.parent_.left_) {
-                        x=x.parent_;
-                        x.rightRotate();
-                    }
-                    x.parent_.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x.parent_.parent_.leftRotate();
-                }
-             }
-        }  // end while
-        root_.color_=Member.BLACK;
-    }
-    
-    protected void treeInsert(Member z)
-    {
-        Member y=null;
-        Member x=root_;
-        
-        while(x!=null) {
-            y=x;
-            x=(z.low_<x.low_ ? x.left_ : x.right_);
-        }
-        z.parent_=y;
-        if (y==null)
-            root_=z;
-        else {
-            if (z.low_<y.low_)
-                y.left_=z;
-            else
-                y.right_=z;
-        }
-    }
-    
-    protected Member treeSuccessor(Member x)
-    {
-        if (x.right_!=null)
-            return treeMinimum(x.right_);
-        Member y=x.parent_;
-        while(y!=null && x==y.right_) {
-            x=y;
-            y=y.parent_;
-        }
-        return y;
-    }
-    
-    protected Member treeMaximum(Member x)
-    {
-        while(x.right_!=null)
-            x=x.right_;
-        return x;
-    }
-    
-    protected Member treeMinimum(Member x)
-    {
-        while(x.left_!=null)
-            x=x.left_;
-        return x;
-    }
-    
-    // for testing
-    protected void add(int offset, int endset)
-    {
-        Member m = new Member(offset, endset);
-        RBInsert(m);
-    }
-    
-    //-------------------------------------------------------------------------
-    // Member
-    //-------------------------------------------------------------------------
-    public class Member
-    {
-        protected int    low_  = 0;
-        protected int    high_ = 0;
-        protected int    max_  = 0;
-        protected int    color_ = 0;
-        protected IASTNode node_ = null;
-        protected Member left_   = null;
-        protected Member right_  = null;
-        protected Member parent_ = null;
-        
-        public static final int RED    = 0;
-        public static final int BLACK  = 1;
-        
-        public Member(int low, int high)
-        {
-            low_  = low;
-            high_ = high;
-        }
-        
-        public Member(Location l, IASTNode node)
-        {
-            low_  = l.low_;
-            high_ = l.high_;
-            node_ = node;
-        }
-        
-        public Member(IASTNode node)
-        {
-            this(getLocation(node), node);
-        }
-        
-        public void copyFrom(Member y)
-        {
-            low_  = y.low_;
-            high_ = y.high_;
-            node_ = y.node_;   // is this right?
-            // TODO: compute max
-        }
-        
-        public void leftRotate()
-        {
-            Member y = this.right_;   //assumed to be non-null;
-            this.right_ = y.left_;
-            if (y.left_!=null)
-                y.left_.parent_ = this;
-            y.parent_ = this.parent_;
-            if (this.parent_==null) 
-                root_=y;
-            else {
-                if (this==this.parent_.left_)
-                    this.parent_.left_=y;
-                else
-                    this.parent_.right_=y;
-            }
-            y.left_=this;
-            this.parent_=y;
-            
-            // Set the max's - order is important
-            this.updateMax();
-            y.updateMax();
-        }
-        
-        public void rightRotate()
-        {
-            Member x = this.left_;   //assumed to be non-null;
-            this.left_ = x.right_;
-            if (x.right_!=null)
-                x.right_.parent_ = this;
-            x.parent_ = this.parent_;
-            if (this.parent_==null) 
-                root_=x;
-            else {
-                if (this==this.parent_.left_)
-                    this.parent_.left_=x;
-                else
-                    this.parent_.right_=x;
-            }
-            x.right_=this;
-            this.parent_=x;
-            
-            // Set the max's - order is important
-            this.updateMax();
-            x.updateMax();
-        }
-        
-        protected void updateMax()
-        {
-            int l = (left_!=null ? left_.max_ : 0);
-            int r = (right_!=null ? right_.max_ : 0);
-            max_ = Math.max(high_, Math.max(l, r));
-        }
-
-    }
-    
-    //-------------------------------------------------------------------------
-    // Member
-    //-------------------------------------------------------------------------
-    protected static class Location
-    {
-        public int low_=0;
-        public int high_=0;
-        
-        public Location(int low, int high)
-        {
-            low_  = low;
-            high_ = high;
-        }
-    }
-    
-    public static void main(String [] args)
-    {
-        StatementMap sm = new StatementMap();
-        
-        sm.add(12, 15);
-        sm.add(1, 6);
-        sm.add(14, 24);
-        
-        Member m = sm.findIntervalMember(12,12);
-        if (m==null)
-            System.out.println("could not find 12");
-        else {
-            System.out.println("found in "+m.low_+":"+m.high_);
-        }
-        
-        
-        return;
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java
deleted file mode 100644
index 02a14a3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.parser;
-/**
- * OpenMP keywords
- * @author pazel
- *
- */
-public class OpenMPKeywords
-{
-    public static final char[] ATOMIC = "atomic".toCharArray(); //$NON-NLS-1$
-    public static final char[] BARRIER = "barrier".toCharArray(); //$NON-NLS-1$
-    public static final char[] COPYIN = "copyin".toCharArray(); //$NON-NLS-1$
-    public static final char[] COPYPRIVATE = "copyprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] CRITICAL = "critical".toCharArray(); //$NON-NLS-1$
-    public static final char[] DEFAULT = "default".toCharArray(); //$NON-NLS-1$
-    public static final char[] FIRSTPRIVATE = "firstprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] FLUSH = "flush".toCharArray(); //$NON-NLS-1$
-    public static final char[] FOR = "for".toCharArray(); //$NON-NLS-1$
-    public static final char[] IF = "if".toCharArray(); //$NON-NLS-1$
-    public static final char[] LASTPRIVATE = "lastprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] MASTER = "master".toCharArray(); //$NON-NLS-1$
-    public static final char[] NONE       = "none".toCharArray(); //$NON-NLS-1$
-    public static final char[] NOWAIT = "nowait".toCharArray(); //$NON-NLS-1$
-    public static final char[] NUMTHREADS = "num_threads".toCharArray(); //$NON-NLS-1$
-    public static final char[] OMP = "omp".toCharArray(); //$NON-NLS-1$
-    public static final char[] ORDERED = "ordered".toCharArray(); //$NON-NLS-1$
-    public static final char[] PARALLEL = "parallel".toCharArray(); //$NON-NLS-1$
-    public static final char[] PRIVATE = "private".toCharArray(); //$NON-NLS-1$
-    public static final char[] REDUCTION = "reduction".toCharArray(); //$NON-NLS-1$
-    public static final char[] SCHEDULE = "schedule".toCharArray(); //$NON-NLS-1$
-    public static final char[] SECTION = "section".toCharArray(); //$NON-NLS-1$
-    public static final char[] SECTIONS = "sections".toCharArray(); //$NON-NLS-1$
-    public static final char[] SHARED = "shared".toCharArray(); //$NON-NLS-1$
-    public static final char[] SINGLE = "single".toCharArray(); //$NON-NLS-1$
-    public static final char[] THREADPRIVATE = "threadprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] DYNAMIC = "dynamic".toCharArray();  // $NON-NLS-1$
-    public static final char[] STATIC  = "static".toCharArray();   // $NON-NLS-1$
-    
-    public static final char[] POUND = "#".toCharArray();       // $NON-NLS-1$
-    public static final char[] PRAGMA = "pragma".toCharArray();       // $NON-NLS-1$
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java
deleted file mode 100644
index 716c285..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java
+++ /dev/null

@@ -1,979 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis.parser;
-
-import java.util.Arrays;
-
-import org.eclipse.cdt.core.parser.IGCCToken;
-import org.eclipse.cdt.core.parser.IToken;
-import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
-import org.eclipse.cdt.core.parser.util.CharArrayUtils;
-
-
-/**
- * Class to scan #pragma string for OpenMP syntax (adapted from cdt's BaseScanner)
- * 
- * @author Pazel
- * 
- */
-
-public class OpenMPScanner
-{
-    //  Char buffer
-    private char [] inputBuffer_ = null;
-    //  Current position into buffer
-    private int    currentPos_   = -1;
-    private int    endPos_       = 0;   // index just past last char
-    
-    // These need to be set
-    protected final boolean supportMinAndMax = true;
-    protected final boolean support$Initializers = true;
-    
-    protected static char[] EMPTY_CHAR_ARRAY = new char[0];
-    
-    //protected ScannerCallbackManager callbackManager_ = null;  // unused; removed for CDT5.0
-    
-    //**
-    //  OpenMPScanner - Object to scan OpenMP pragma line
-    //**
-    public OpenMPScanner(String inputBuffer)
-    {
-       inputBuffer_ = inputBuffer.toCharArray(); 
-       endPos_      = inputBuffer.length();
-    }
-    
-    public OpenMPToken nextToken() 
-    {
-        
-      return fetchToken();
-    }
-    
-    protected OpenMPToken fetchToken()
-    {
-        
-        while (currentPos_<endPos_)  {
-
-          skipOverWhiteSpace();
-          
-          currentPos_++;
-          
-          if (currentPos_>=endPos_)
-              return null;
-   
-          switch (inputBuffer_[currentPos_]) {
-          case '\r':
-          case '\n':
-              continue;
-
-          case 'L':
-              if (currentPos_ + 1 < endPos_ && inputBuffer_[currentPos_ + 1] == '"')
-                  return scanString();
-              if (currentPos_ + 1 < endPos_ && inputBuffer_[currentPos_ + 1] == '\'')
-                  return scanCharLiteral();
-
-              return scanIdentifier();
-
-          case '"':
-              return scanString();
-
-        case '\'':
-            return scanCharLiteral();
-
-        case 'a':
-        case 'b':
-        case 'c':
-        case 'd':
-        case 'e':
-        case 'f':
-        case 'g':
-        case 'h':
-        case 'i':
-        case 'j':
-        case 'k':
-        case 'l':
-        case 'm':
-        case 'n':
-        case 'o':
-        case 'p':
-        case 'q':
-        case 'r':
-        case 's':
-        case 't':
-        case 'u':
-        case 'v':
-        case 'w':
-        case 'x':
-        case 'y':
-        case 'z':
-        case 'A':
-        case 'B':
-        case 'C':
-        case 'D':
-        case 'E':
-        case 'F':
-        case 'G':
-        case 'H':
-        case 'I':
-        case 'J':
-        case 'K':
-        case 'M':
-        case 'N':
-        case 'O':
-        case 'P':
-        case 'Q':
-        case 'R':
-        case 'S':
-        case 'T':
-        case 'U':
-        case 'V':
-        case 'W':
-        case 'X':
-        case 'Y':
-        case 'Z':
-        case '_':
-            return  scanIdentifier();
-
-        case '\\':
-            if (currentPos_ + 1 < endPos_
-                    && (inputBuffer_[currentPos_ + 1] == 'u' || 
-                        inputBuffer_[currentPos_ + 1] == 'U')) {
-                return scanIdentifier();
-            }
-            //handleProblem(IProblem.SCANNER_BAD_CHARACTER,
-            //        bufferPos[bufferStackPos], new char[] { '\\' });
-            continue;
-
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            return scanNumber();
-
-        case '.':
-            if (currentPos_ + 1 < endPos_) {
-                switch (inputBuffer_[currentPos_ + 1]) {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                    return scanNumber();
-
-                case '.':
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '.') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tELLIPSIS);
-                        }
-                    }
-                case '*':
-                    ++currentPos_;
-                    return newToken(IToken.tDOTSTAR);
-                }
-            }
-            return newToken(IToken.tDOT);
-
-        case '#':
-            if (currentPos_ + 1 < endPos_ && inputBuffer_[currentPos_ + 1] == '#') {
-                currentPos_++;
-                return newToken(IToken.tPOUNDPOUND);
-            }
-            return newToken(mpPound);
-
-        case '{':
-            currentPos_++;
-            return newToken(IToken.tLBRACE);
-
-        case '}':
-            currentPos_++;
-            return newToken(IToken.tRBRACE);
-
-        case '[':
-            currentPos_++;
-            return newToken(IToken.tLBRACKET);
-
-        case ']':
-            currentPos_++;
-            return newToken(IToken.tRBRACKET);
-
-        case '(':
-            return newToken(IToken.tLPAREN);
-
-        case ')':
-            return newToken(IToken.tRPAREN);
-
-        case ';':
-            return newToken(IToken.tSEMI);
-
-        case ':':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == ':') {
-                    ++currentPos_;
-                    return newToken(IToken.tCOLONCOLON);
-                }
-            }
-            return newToken(IToken.tCOLON);
-
-        case '?':
-            return newToken(IToken.tQUESTION);
-
-        case '+':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '+') {
-                    ++currentPos_;
-                    return newToken(IToken.tINCR);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tPLUSASSIGN);
-                }
-            }
-            return newToken(IToken.tPLUS);
-
-        case '-':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '>') {
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '*') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tARROWSTAR);
-                        }
-                    }
-                    ++currentPos_;
-                    return newToken(IToken.tARROW);
-                } else if (inputBuffer_[currentPos_ + 1] == '-') {
-                    ++currentPos_;
-                    return newToken(IToken.tDECR);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tMINUSASSIGN);
-                }
-            }
-            return newToken(IToken.tMINUS);
-
-        case '*':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tSTARASSIGN);
-                }
-            }
-            return newToken(IToken.tSTAR);
-
-        case '/':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tDIVASSIGN);
-                }
-            }
-            return newToken(IToken.tDIV);
-
-        case '%':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tMODASSIGN);
-                }
-            }
-            return newToken(IToken.tMOD);
-
-        case '^':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tXORASSIGN);
-                }
-            }
-            return newToken(IToken.tXOR);
-
-        case '&':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '&') {
-                    ++currentPos_;
-                    return newToken(IToken.tAND);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tAMPERASSIGN);
-                }
-            }
-            return newToken(IToken.tAMPER);
-
-        case '|':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '|') {
-                    ++currentPos_;
-                    return newToken(IToken.tOR);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tBITORASSIGN);
-                }
-            }
-            return newToken(IToken.tBITOR);
-
-        case '~':
-            return newToken(IToken.tCOMPL);
-
-        case '!':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tNOTEQUAL);
-                }
-            }
-            return newToken(IToken.tNOT);
-
-        case '=':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tEQUAL);
-                }
-            }
-            return newToken(IToken.tASSIGN);
-
-        case '<':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tLTEQUAL);
-                } else if (inputBuffer_[currentPos_ + 1] == '<') {
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '=') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tSHIFTLASSIGN);
-                        }
-                    }
-                    ++currentPos_;
-                    return newToken(IToken.tSHIFTL);
-                } else if (inputBuffer_[currentPos_ + 1] == '?' && supportMinAndMax) {
-                    ++currentPos_;
-                    return newToken(CharArrayUtils.extract(
-                            inputBuffer_, currentPos_, 2), IGCCToken.tMIN);
-                }
-            }
-            return newToken(IToken.tLT);
-
-        case '>':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tGTEQUAL);
-                } else if (inputBuffer_[currentPos_ + 1] == '>') {
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '=') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tSHIFTRASSIGN);
-                        }
-                    }
-                    ++currentPos_;
-                    return newToken(IToken.tSHIFTR);
-                } else if (inputBuffer_[currentPos_ + 1] == '?' && supportMinAndMax) {
-                    ++currentPos_;
-                    return newToken(CharArrayUtils.extract(
-                            inputBuffer_, currentPos_, 2), IGCCToken.tMAX);
-                }
-
-            }
-            return newToken(IToken.tGT);
-
-        case ',':
-            return newToken(IToken.tCOMMA);
-
-        default:
-            if (Character.isLetter(inputBuffer_[currentPos_]) || inputBuffer_[currentPos_] == '_'
-                    || (support$Initializers && inputBuffer_[currentPos_] == '$')) {
-                return scanIdentifier();
-            }
-
-        // skip over anything we don't handle
-            //char [] x = new char [1];
-            //x[0] = buffer[pos];
-            //handleProblem( IASTProblem.SCANNER_BAD_CHARACTER, pos, x );
-        }
-        }
-
-    // We've run out of contexts, our work is done here
-    //return contentAssistMode ? eocToken : null;
-        return null;
-    }
-
-
-  protected OpenMPToken scanString() 
-  {
-    char[] buffer = inputBuffer_;
-
-    int tokenType = IToken.tSTRING;
-    if (buffer[currentPos_] == 'L') {
-        ++currentPos_;
-        tokenType = IToken.tLSTRING;
-    }
-
-    int stringStart = currentPos_ + 1;
-    int stringLen = 0;
-    boolean escaped = false;
-    boolean foundClosingQuote = false;
-    loop: while (++currentPos_ < endPos_) {
-        ++stringLen;
-        char c = buffer[currentPos_];
-        if (c == '"') {
-            if (!escaped) {
-                foundClosingQuote = true;
-                break;
-            }
-        } else if (c == '\\') {
-            escaped = !escaped;
-            continue;
-        } else if (c == '\n') {
-            //unescaped end of line before end of string
-            if (!escaped)
-                break;
-        } else if (c == '\r') {
-            if (currentPos_ + 1 < endPos_
-                    && buffer[currentPos_ + 1] == '\n') {
-                ++currentPos_;
-                if (!escaped)
-                    break;
-            }
-        }
-        escaped = false;
-    }
-    --stringLen;
-
-    // We should really throw an exception if we didn't get the terminating
-    // quote before the end of buffer
-    char[] result = CharArrayUtils.extract(buffer, stringStart, stringLen);
-    //if (!foundClosingQuote) {
-    //    handleProblem(IProblem.SCANNER_UNBOUNDED_STRING, stringStart,
-    //            result);
-    //}
-    return newToken(result, tokenType);
-  }
-
-  protected OpenMPToken scanCharLiteral() 
-  {
-    char[] buffer = inputBuffer_;
-    int start = currentPos_;
-    int limit = endPos_;
-
-    int tokenType = IToken.tCHAR;
-    int length = 1;
-    if (inputBuffer_[currentPos_] == 'L') {
-        ++currentPos_;
-        tokenType = IToken.tLCHAR;
-        ++length;
-    }
-
-    if (start >= limit) {
-        return newToken(EMPTY_CHAR_ARRAY, tokenType);
-    }
-
-    boolean escaped = false;
-    while (++currentPos_ < endPos_) {
-        ++length;
-        int pos = currentPos_;
-        if (buffer[pos] == '\'') {
-            if (!escaped)
-                break;
-        } else if (buffer[pos] == '\\') {
-            escaped = !escaped;
-            continue;
-        }
-        escaped = false;
-    }
-
-    if (currentPos_ == endPos_) {
-        //handleProblem(IProblem.SCANNER_BAD_CHARACTER, start, CharArrayUtils
-        //        .extract(buffer, start, length));
-        return newToken(EMPTY_CHAR_ARRAY, tokenType);
-    }
-
-    char[] image = length > 0 ? CharArrayUtils.extract(buffer, start,
-            length) : EMPTY_CHAR_ARRAY;
-
-    return newToken(image, tokenType);
-}
-
-  protected OpenMPToken scanNumber()
-  {
-      char[] buffer = inputBuffer_;
-      int start = currentPos_;
-      int limit = endPos_;
-
-      boolean isFloat = buffer[start] == '.';
-      boolean hasExponent = false;
-
-      boolean isHex = false;
-      boolean isOctal = false;
-      boolean isMalformedOctal = false;
-
-      if (buffer[start] == '0' && start + 1 < limit) {
-          switch (buffer[start + 1]) {
-          case 'x':
-          case 'X':
-              isHex = true;
-              ++currentPos_;
-              break;
-          default:
-              if (buffer[start + 1] > '0' && buffer[start + 1] < '7')
-                  isOctal = true;
-              else if (buffer[start + 1] == '8' || buffer[start + 1] == '9') {
-                  isOctal = true;
-                  isMalformedOctal = true;
-              }
-          }
-      }
-
-      while (++currentPos_ < limit) {
-          int pos = currentPos_;
-          switch (buffer[pos]) {
-          case '0':
-          case '1':
-          case '2':
-          case '3':
-          case '4':
-          case '5':
-          case '6':
-          case '7':
-          case '8':
-          case '9':
-              if ((buffer[pos] == '8' || buffer[pos] == '9') && isOctal) {
-                  isMalformedOctal = true;
-                  break;
-              }
-
-              continue;
-
-          case '.':
-              //if (isLimitReached())
-              //    handleNoSuchCompletion();
-
-              if (isFloat) {
-                  // second dot
-                  //handleProblem(IProblem.SCANNER_BAD_FLOATING_POINT, start,
-                  //        null);
-                  break;
-              }
-
-              isFloat = true;
-              continue;
-
-          case 'E':
-          case 'e':
-              if (isHex)
-                  // a hex 'e'
-                  continue;
-
-              if (hasExponent)
-                  // second e
-                  break;
-
-              if (pos + 1 >= limit)
-                  // ending on the e?
-                  break;
-
-              switch (buffer[pos + 1]) {
-              case '+':
-              case '-':
-              case '0':
-              case '1':
-              case '2':
-              case '3':
-              case '4':
-              case '5':
-              case '6':
-              case '7':
-              case '8':
-              case '9':
-                  // looks like a good exponent
-                  isFloat = true;
-                  hasExponent = true;
-                  ++currentPos_;
-                  continue;
-              default:
-                  // no exponent number?
-                  break;
-              }
-              break;
-
-          case 'a':
-          case 'A':
-          case 'b':
-          case 'B':
-          case 'c':
-          case 'C':
-          case 'd':
-          case 'D':
-              if (isHex)
-                  continue;
-
-              // not ours
-              break;
-
-          case 'f':
-          case 'F':
-              if (isHex)
-                  continue;
-
-              // must be float suffix
-              ++currentPos_;
-
-              if (currentPos_ < buffer.length
-                      && buffer[currentPos_] == 'i')
-                  continue; // handle GCC extension 5.10 Complex Numbers
-
-              break; // fix for 77281 (used to be continue)
-
-          case 'p':
-          case 'P':
-              // Hex float exponent prefix
-              if (!isFloat || !isHex) {
-                  --currentPos_;
-                  break;
-              }
-
-              if (hasExponent)
-                  // second p
-                  break;
-
-              if (pos + 1 >= limit)
-                  // ending on the p?
-                  break;
-
-              switch (buffer[pos + 1]) {
-              case '+':
-              case '-':
-              case '0':
-              case '1':
-              case '2':
-              case '3':
-              case '4':
-              case '5':
-              case '6':
-              case '7':
-              case '8':
-              case '9':
-                  // looks like a good exponent
-                  isFloat = true;
-                  hasExponent = true;
-                  ++currentPos_;
-                  continue;
-              default:
-                  // no exponent number?
-                  break;
-              }
-              break;
-
-          case 'u':
-          case 'U':
-          case 'L':
-          case 'l':
-              // unsigned suffix
-              suffixLoop: while (++currentPos_ < limit) {
-                  switch (buffer[currentPos_]) {
-                  case 'U':
-                  case 'u':
-                  case 'l':
-                  case 'L':
-                      break;
-                  default:
-
-                      break suffixLoop;
-                  }
-              }
-              break;
-
-          default:
-              /*boolean success = false;
-              for (int iter = 0; iter < suffixes.length; iter++)
-                  if (buffer[pos] == suffixes[iter]) {
-                      success = true;
-                      break;
-                  }
-              if (success)
-                  continue; */
-          }
-
-          // If we didn't continue in the switch, we're done
-          break;
-      }
-
-      --currentPos_;
-
-      char[] result = CharArrayUtils.extract(buffer, start,
-              currentPos_ - start + 1);
-      int tokenType = isFloat ? IToken.tFLOATINGPT : IToken.tINTEGER;
-
-      //if (tokenType == IToken.tINTEGER && isHex && result.length == 2) {
-      //    handleProblem(IProblem.SCANNER_BAD_HEX_FORMAT, start, result);
-      //} else if (tokenType == IToken.tINTEGER && isOctal && isMalformedOctal) {
-      //    handleProblem(IProblem.SCANNER_BAD_OCTAL_FORMAT, start, result);
-      //}
-
-      return newToken(result, tokenType);
-  }
-
-
-    //**
-    //  skipOverWhiteSpace - based on org.eclipse.cdt.internal.parser.scanner2.BaseScanner
-    //**
-    protected void skipOverWhiteSpace() {
-
-        char[] buffer = inputBuffer_;
-
-         while (++currentPos_ < endPos_) {
-            switch (buffer[currentPos_]) {
-            case ' ':
-            case '\t':
-            case '\r':
-                continue;
-            case '/':
-                if (currentPos_ + 1 < endPos_) {
-                    if (buffer[currentPos_ + 1] == '/') {
-                        // C++ comment, skip rest of line
-                        currentPos_ = endPos_;
-                        return;
-                    } else if (buffer[currentPos_ + 1] == '*') {
-                        // C comment, find closing */
-                        boolean foundEnd = false;
-                        for (currentPos_ += 2; currentPos_ < endPos_; ++currentPos_) {
-                            if (buffer[currentPos_] == '*' && currentPos_ + 1 < endPos_
-                                    && buffer[currentPos_ + 1] == '/') {
-                                currentPos_+=2;
-                                foundEnd = true;
-                                break;
-                            }
-                        }
-                        if (!foundEnd)  // we are at end of line  - nothing to do (odd case)
-                            return;
-                        continue;
-                    }
-                }
-                break;
-            case '\\':
-                if (currentPos_ + 1 < endPos_ && buffer[currentPos_ + 1] == '\n') {
-                    // \n is a whitespace
-                    ++currentPos_;
-                    continue;
-                }
-                if (currentPos_ + 1 < endPos_ && buffer[currentPos_ + 1] == '\r') {
-                    if (currentPos_ + 2 < endPos_ && buffer[currentPos_ + 2] == '\n') {
-                        currentPos_ += 2;
-                        continue;
-                    }
-                }
-                break;
-            }
-
-            // fell out of switch without continuing, we're done
-            --currentPos_;
-            return;
-        }
-        
-        
-        --currentPos_;
-        return;
-    }
-    
-    protected OpenMPToken scanIdentifier() 
-    {
-        char[] buffer = inputBuffer_;
-        boolean escapedNewline = false;
-        int     start          = currentPos_;
-        int len = 1;
-
-        while (++currentPos_ < endPos_) {
-            char c = buffer[currentPos_];
-            if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_'
-                    || (c >= '0' && c <= '9')
-                    || Character.isUnicodeIdentifierPart(c)) {
-                ++len;
-                continue;
-            } else if (c == '\\' && currentPos_ + 1 < endPos_
-                    && buffer[currentPos_ + 1] == '\n') {
-                // escaped newline
-                ++endPos_;
-                len += 2;
-                escapedNewline = true;
-                continue;
-            } else if (c == '\\' && (currentPos_ + 1 < endPos_)) {
-                if ((buffer[currentPos_ + 1] == 'u')
-                        || buffer[currentPos_ + 1] == 'U') {
-                    ++currentPos_;
-                    len += 2;
-                    continue;
-                }
-            }
-            //} else if ((support$Initializers && c == '$')) {
-            //    ++len;
-            //    continue;
-            //}
-            break;
-        }
-
-        --currentPos_;
-
-        char[] result = escapedNewline ? removedEscapedNewline(buffer, start,
-                len) : CharArrayUtils.extract(buffer, start, len);
-        int tokenType = escapedNewline ? mpKeywords.get(result, 0, result.length)
-                : mpKeywords.get(buffer, start, len);
-
-        /*if (tokenType == CharArrayIntMap.undefined) {
-            tokenType = escapedNewline ? additionalKeywords.get(result, 0,
-                    result.length) : additionalKeywords.get(buffer, start, len);
-
-            if (tokenType == additionalKeywords.undefined) {
-                result = (result != null) ? result : CharArrayUtils.extract(
-                        buffer, start, len);
-                return newToken(IToken.tIDENTIFIER, result);
-            }
-            result = (result != null) ? result : CharArrayUtils.extract(buffer,
-                    start, len);
-            return newToken(result, tokenType);
-        }*/
-        return newToken(result, tokenType);
-    }
-
-    /**
-     * @return
-     */
-    protected OpenMPToken newToken(int signal) {
-        return new OpenMPToken(signal, currentPos_);
-    }
-    
-
-    /**
-     * @return
-     */
-    protected OpenMPToken newToken(char [] image, int signal) {
-        return new OpenMPToken(new String(image), currentPos_, signal);
-    }
-
-
-    /**
-     * @param text
-     * @return
-     */
-    protected char[] removedEscapedNewline(char[] text, int start, int len) {
-        if (CharArrayUtils.indexOf('\n', text, start, len) == -1)
-            return text;
-        char[] result = new char[text.length];
-        Arrays.fill(result, ' ');
-        int counter = 0;
-        for (int i = 0; i < text.length; ++i) {
-            if (text[i] == '\\' && i + 1 < text.length && text[i + 1] == '\n')
-                ++i;
-            else if (text[i] == '\\' && i + 1 < text.length
-                    && text[i + 1] == '\r' && i + 2 < text.length
-                    && text[i + 2] == '\n')
-                i += 2;
-            else
-                result[counter++] = text[i];
-        }
-        return CharArrayUtils.trim(result);
-    }
-    
-    /**
-     * handleProblem - will create problems to report through eclipse
-     * @param id
-     * @param startOffset
-     */
-    private void handleProblem(int id, int startOffset) 
-    {
-       // TBD
-    }
-
-
-    public static final int mpAtomic  = 0;
-    public static final int mpBarrier = 1;
-    public static final int mpCopyin  = 2;
-    public static final int mpCopyprivate  = 3;
-    public static final int mpCritical     = 4;
-    public static final int mpDefault      = 5;
-    public static final int mpFirstprivate = 6;
-    public static final int mpFlush  = 7;
-    public static final int mpFor    = 8;
-    public static final int mpIf     = 9;
-    public static final int mpLastprivate  = 10;
-    public static final int mpMaster       = 11;
-    public static final int mpNone         = 12;
-    public static final int mpNowait       = 13;
-    public static final int mpNumthreads   = 14;
-    public static final int mpOmp      = 15;
-    public static final int mpOrdered  = 16;
-    public static final int mpParallel = 17;
-    public static final int mpPrivate  = 18;
-    public static final int mpReduction  = 19;
-    public static final int mpSchedule   = 20;
-    public static final int mpSection    = 21;
-    public static final int mpSections   = 22;
-    public static final int mpShared  = 23;
-    public static final int mpSingle  = 24;
-    public static final int mpThreadPrivate = 25;
-    public static final int mpPound   = 26;
-    public static final int mpPragma  = 27;
-    public static final int mpDynamic = 28;
-    public static final int mpGuided  = 29;
-    public static final int mpRuntime = 30;
-    public static final int mpStatic  = 31;
-    
-    public static final CharArrayIntMap mpKeywords;
-    
-    static {
-        mpKeywords = new CharArrayIntMap(16, -1);
-
-        // Common keywords
-        mpKeywords.put(OpenMPKeywords.ATOMIC,  mpAtomic); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.BARRIER, mpBarrier); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.COPYIN,  mpCopyin); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.COPYPRIVATE,  mpCopyprivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.CRITICAL,  mpCritical); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.DEFAULT,  mpDefault); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.FIRSTPRIVATE,  mpFirstprivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.FLUSH,  mpFlush); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.FOR,  mpFor); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.IF,  mpIf); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.LASTPRIVATE,  mpLastprivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.MASTER,  mpMaster); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.NONE,  mpNone); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.NOWAIT,  mpNowait); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.NUMTHREADS,  mpNumthreads); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.OMP,  mpOmp); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.ORDERED,  mpOrdered); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.PARALLEL,  mpParallel); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.PRIVATE,  mpPrivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.REDUCTION,  mpReduction); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SCHEDULE,  mpSchedule); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SECTION,  mpSection); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SECTIONS,  mpSections); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SHARED,  mpShared); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SINGLE,  mpSingle); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.POUND, mpPound);
-        mpKeywords.put(OpenMPKeywords.PRAGMA, mpPragma);
-        mpKeywords.put(OpenMPKeywords.THREADPRIVATE, mpThreadPrivate);
-        mpKeywords.put(OpenMPKeywords.DYNAMIC, mpDynamic);
-        mpKeywords.put(OpenMPKeywords.STATIC,  mpStatic);   // not sure of this - DPP
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java
deleted file mode 100644
index 4577c91..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.parser;
-
-
-/**
- * Token used in parsing OpenMP pragma line
- * 
- * @author pazel
- */
-public class OpenMPToken
-{
-    private int    type_  = tUNDEFINED;
-    private String image_ = "";
-    private int    onset_ = -1;
-    
-    // for backtracking
-    private OpenMPToken next_ = null;
-    
-    /**
-     * OpenMPToken - constructor
-     * @param image: String
-     * @param onset: int
-     * @param type:  int
-     */
-    public OpenMPToken(String image, int onset, int type)
-    {
-        image_ = image;
-        onset_ = onset;
-        type_  = type;
-    }
-    
-    /**
-     * OpenMPToken - constructor
-     * @param type:  int
-     * @param onset: int
-     */
-    public OpenMPToken(int type, int onset)
-    {
-        type_  = type;
-        onset_ = onset;
-    }
-
-    public int getType()
-    {
-        return type_;
-    }
-    
-    public String getImage()
-    {
-        return image_;
-    }
-    
-    public int getOnset()
-    {
-        return onset_;
-    }
-    
-    public int getLength()
-    {
-        return image_.length();
-    }
-    
-    public int getEndOnset()
-    {
-        return onset_+getLength()-1;
-    }
-    
-    public void setNext(OpenMPToken next)
-    {
-        next_ = next;
-    }
-    
-    public OpenMPToken getNext()
-    {
-        return next_;
-    }
-    
-    
-    
-    // Token types
-    static public final int tUNDEFINED  = -1;
-    
-    static public final int tIDENTIFIER = 1;
-
-    static public final int tINTEGER = 2;
-
-    static public final int tCOLONCOLON = 3;
-
-    static public final int tCOLON = 4;
-
-    static public final int tSEMI = 5;
-
-    static public final int tCOMMA = 6;
-
-    static public final int tQUESTION = 7;
-
-    static public final int tLPAREN = 8;
-
-    static public final int tRPAREN = 9;
-
-    static public final int tLBRACKET = 10;
-
-    static public final int tRBRACKET = 11;
-
-    static public final int tLBRACE = 12;
-
-    static public final int tRBRACE = 13;
-
-    static public final int tPLUSASSIGN = 14;
-
-    static public final int tINCR = 15;
-
-    static public final int tPLUS = 16;
-
-    static public final int tMINUSASSIGN = 17;
-
-    static public final int tDECR = 18;
-
-    static public final int tARROWSTAR = 19;
-
-    static public final int tARROW = 20;
-
-    static public final int tMINUS = 21;
-
-    static public final int tSTARASSIGN = 22;
-
-    static public final int tSTAR = 23;
-
-    static public final int tMODASSIGN = 24;
-
-    static public final int tMOD = 25;
-
-    static public final int tXORASSIGN = 26;
-
-    static public final int tXOR = 27;
-
-    static public final int tAMPERASSIGN = 28;
-
-    static public final int tAND = 29;
-
-    static public final int tAMPER = 30;
-
-    static public final int tBITORASSIGN = 31;
-
-    static public final int tOR = 32;
-
-    static public final int tBITOR = 33;
-
-    static public final int tCOMPL = 34;
-
-    static public final int tNOTEQUAL = 35;
-
-    static public final int tNOT = 36;
-
-    static public final int tEQUAL = 37;
-
-    static public final int tASSIGN = 38;
-
-    static public final int tSHIFTL = 40;
-
-    static public final int tLTEQUAL = 41;
-
-    static public final int tLT = 42;
-
-    static public final int tSHIFTRASSIGN = 43;
-
-    static public final int tSHIFTR = 44;
-
-    static public final int tGTEQUAL = 45;
-
-    static public final int tGT = 46;
-
-    static public final int tSHIFTLASSIGN = 47;
-
-    static public final int tELLIPSIS = 48;
-
-    static public final int tDOTSTAR = 49;
-
-    static public final int tDOT = 50;
-
-    static public final int tDIVASSIGN = 51;
-
-    static public final int tDIV = 52;
-
-    static public final int t_and = 54;
-
-    static public final int t_and_eq = 55;
-
-    static public final int t_asm = 56;
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java
deleted file mode 100644
index cb44510..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.textview;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ptp.pldt.common.util.Utility;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPAnalysisManager;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMpIDs;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionDelegate;
-
-/**
- * Action to Select a line and show the concurrency
- * @author pazel
- *
- */
-public class ShowConcurrencyAction extends ActionDelegate 
-                                   implements IEditorActionDelegate
-{
-    protected CEditor  editor_ = null;
-    
-    protected static final String TITLE = "Show Concurrency";
-    
-    /**
-     * Sets the active editor for the delegate.  
-     * Implementors should disconnect from the old editor, connect to the 
-     * new editor, and update the action to reflect the new editor.
-     *
-     * @param action the action proxy that handles presentation portion of the action
-     * @param targetEditor the new editor target
-     */
-    public void setActiveEditor(IAction action, IEditorPart targetEditor)
-    {
-        if (targetEditor instanceof CEditor)
-            editor_ = (CEditor)targetEditor;
-    }
-    
-
-    /**
-     * The <code>ActionDelegate</code> implementation of this
-     * <code>IActionDelegate2</code> method redirects to the <code>run</code>
-     * method. Subclasses may reimplement.
-     */
-    public void runWithEvent(IAction action, Event event) {
-        TextSelection selection = null;
-        if (editor_!=null && 
-            editor_.getSelectionProvider().getSelection() instanceof TextSelection) {
-            selection = (TextSelection)editor_.getSelectionProvider().getSelection();
-        }
-        if (selection!=null) {
-            showConcurrency(selection);
-        }
-        else 
-            showMessage(TITLE, "No selections made");
-    }
-    
-    protected void showMessage(String title, String message)
-    {
-        MessageDialog.openInformation(getStandardDisplay().getActiveShell(), title, message);
-    }
-    
-    public static Display getStandardDisplay() {
-        Display display= Display.getCurrent();
-        if (display == null) {
-            display= Display.getDefault();
-        }
-        return display;     
-    }
-    
-    /**
-     * showConcurrency - triggered by the context menu action
-     * @param selection - TextSelection
-     */
-    protected void showConcurrency(TextSelection selection)
-    {
-        if (selection.getOffset()==0 && selection.getLength()==0) {
-            showMessage(TITLE, "No selections made");
-            return;
-        }
-
-        // Get the last analysis
-        OpenMPAnalysisManager oam = OpenMPAnalysisManager.getCurrentManager();
-        if (oam==null) {
-            showMessage(TITLE, "No OpenMP Analysis has been performed");
-            return;
-        }
-        
-        // Now we check if the analysis is for this file
-        if (oam.getTU()==null ) {
-            showMessage(TITLE, "Error in last OpenMP Analysis");
-            return;
-        }
-        //String f1 = oam.getTU().getFilePath();
-        //String f2 = editor_.getInputFile().getLocation().toOSString();
-        IEditorInput ieu = editor_.getEditorInput();
-        IFile inputFile=null;
-        if(ieu instanceof IFileEditorInput){
-        	inputFile = ((IFileEditorInput)ieu).getFile();//cdt40
-        }
-        else{
-        	showMessage(TITLE, "Cannot locate file in editor");//cdt40
-        	return;
-        }
-
-        if (!oam.getTU().getFilePath().equals(inputFile.getLocation().toOSString())) {//cdt40
-            showMessage(TITLE, "OpenMP analysis required on editor file");
-            return;
-        }
-        
-        if (oam.getFileMap()==null) {
-            showMessage(TITLE, "Internal Error: no file map");
-            return;
-        }
-        
-        IASTNode node = oam.getFileMap().find(selection.getOffset(), 1);  // only 1 - where we are
-        if (node==null) {
-            showMessage(TITLE, "Cannot locate statement at given selection point");
-            return;
-        }
-        
-        removeConcurrencyMarkers(editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput()));
-        
-        Set cSet = oam.getNodesConcurrentTo(node);
-        
-        // Display all concurrent statements
-        for(Iterator i=cSet.iterator(); i.hasNext();) {
-            IASTNode n = (IASTNode)i.next();
-            showNode(n, OpenMpIDs.ConcurrencyType);
-        }
-        
-        // If node is not concurrent to itself, we adopt a different marker color
-        if (!cSet.contains(node))
-           showNode(node, OpenMpIDs.NonConcurrencyType); 
-        
-        // select the key stmt
-        Utility.Location l = Utility.getLocation(node);
-        editor_.selectAndReveal(l.low_, l.high_-l.low_+1); 
-
-    }
-    
-    /**
-     * showNode - Show the node of the right marker type
-     * @param node       - IASTNode
-     * @param markerType - String 
-     */
-    protected void showNode(IASTNode node, String markerType)
-    {
-        Utility.Location l = Utility.getLocation(node);
-
-        
-        IAnnotationModel am = editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput());
-        
-        // We need to add an annotation type to the annotation painter (see SourceViewerDecorationSupport)
-        Annotation a = new Annotation(markerType, true, "Hi");
-        int end = l.high_-l.low_+1;
-        Position   p = new Position(l.low_, end);
-        am.addAnnotation(a, p);
-        
-        //System.out.println("annotate node="+node.getClass().toString()+" begin="+l.low_+" end="+end);
-    }
-    
-    /**
-     * remove the concurrency markers from the screen
-     * @param am - IAnnotationModel
-     */
-    public static void removeConcurrencyMarkers(IAnnotationModel am)
-    {
-        LinkedList ais = new LinkedList();
-        for(Iterator ai=am.getAnnotationIterator(); ai.hasNext();) { ais.add(ai.next()); }
-        for(Iterator it=ais.iterator(); it.hasNext();) {
-            Annotation a = (Annotation)it.next();
-            if (a.getType().equals(OpenMpIDs.ConcurrencyType) || a.getType().equals(OpenMpIDs.NonConcurrencyType)) {
-                am.removeAnnotation(a);
-            }
-        }
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.classpath b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.openmp.core/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.cvsignore
deleted file mode 100644
index 47e3103..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-@dot

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project
deleted file mode 100644
index a431dd5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.openmp.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.openmp.core/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 3a4e382..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.openmp.core; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.common,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ptp.pldt.openmp.analysis,
- org.eclipse.ptp.pldt.openmp.ui.pv
-Eclipse-AutoStart: true
-Bundle-ClassPath: .
-Export-Package: org.eclipse.ptp.pldt.openmp.core,
- org.eclipse.ptp.pldt.openmp.core.prefs

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties
deleted file mode 100644
index ab455eb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               samples/,\
-               plugin.properties,\
-               html/
-bin.excludes = icons/.cvsignore

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html
deleted file mode 100644
index 1b9fb95..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>get_num_procs</title>
-<body>
-<H3>get_num_procs</H3>
-<PRE>
-int get_num_procs(void)
-</PRE>
-<DL><DD>
-This function returns the maximum number of processors that could be assigned to the program.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html
deleted file mode 100644
index 7e6d454..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>get_thread_num</title>
-<body>
-<H3>get_thread_num</H3>
-<PRE>
-int get_thread_num(void)
-</PRE>
-<DL><DD>
-This function returns the thread number, within its team, of the thread executing the function. The thread number lies between 0 and omp_get_num_threads()-1, inclusive. The master thread of the team is thread 0.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html
deleted file mode 100644
index d047792..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_destroy_lock</title>
-<body>
-<H3>omp_destroy_lock</H3>
-<PRE>
-void omp_destroy_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-Ensures that the specified lock variable lock is uninitialized.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html
deleted file mode 100644
index 58a4513..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_destroy_nest_lock</title>
-<body>
-<H3>omp_destroy_nest_lock</H3>
-<PRE>
-void omp_destroy_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Ensures that the specified lock variable lock is uninitialized.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html
deleted file mode 100644
index 16ccccc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<html><head><title>omp_get_dynamic</title>
-<body>
-<H3>omp_get_dynamic</H3>
-<PRE>
-int omp_get_dynamic(void)
-</PRE>
-<DL><DD>
-This function returns non-zero if dynamic thread adjustments 
-are enabled and returns 0 otherwise.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html
deleted file mode 100644
index 06acf7a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_max_threads</title>
-<body>
-<H3>omp_get_max_threads</H3>
-<PRE>
-int omp_get_max_threads(void)
-</PRE>
-<DL><DD>
-This function returns the maximum value that can be returned by calls to omp_get_num_threads.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html
deleted file mode 100644
index 62d7db3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_nested</title>
-<body>
-<H3>omp_get_nested</H3>
-<PRE>
-int This function returns non-zero if nested parallelism is enabled and 0 if it is disabled.(void)
-</PRE>
-<DL><DD>
-omp_get_nested description
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html
deleted file mode 100644
index b7d4e62..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_num_threads</title>
-<body>
-<H3>omp_get_num_threads</H3>
-<PRE>
-int omp_get_num_threads(int num_threads)
-</PRE>
-<DL><DD>
-This function returns the number of threads currently in the team executing the parallel region from which it is called.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html
deleted file mode 100644
index 767d869..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_wtick</title>
-<body>
-<H3>omp_get_wtick</H3>
-<PRE>
-double omp_get_wtick(void)
-</PRE>
-<DL><DD>
-Returns the number of seconds between clock ticks.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html
deleted file mode 100644
index 70fc71d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_wtime</title>
-<body>
-<H3>omp_get_wtime</H3>
-<PRE>
-double omp_get_wtime(void)
-</PRE>
-<DL><DD>
-Returns the time elapsed from a fixed starting time. The value of the fixed starting time is determined at the start of the current program, and remains constant throughout program execution.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html
deleted file mode 100644
index 5006835..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_in_parallel</title>
-<body>
-<H3>omp_in_parallel</H3>
-<PRE>
-int omp_in_parallel(void)
-</PRE>
-<DL><DD>
-This function returns non-zero if it is called within the dynamic extent of a parallel region executing in parallel; otherwise, it returns 0.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html
deleted file mode 100644
index 5de7496..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_init_lock</title>
-<body>
-<H3>omp_init_lock</H3>
-<PRE>
-void omp_init_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-These functions (this and omp_init_nest_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html
deleted file mode 100644
index ed5c683..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_init_nest_lock</title>
-<body>
-<H3>omp_init_nest_lock</H3>
-<PRE>
-void omp_init_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-These functions (this and omp_init_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html
deleted file mode 100644
index 777e2b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_dynamic</title>
-<body>
-<H3>omp_set_dynamic</H3>
-<PRE>
-void omp_set_dynamic(int dynamic_threads)
-</PRE>
-<DL><DD>
-This function enables or disables dynamic adjustment of the number of threads available for execution of parallel regions.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html
deleted file mode 100644
index 746309c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html
+++ /dev/null

@@ -1,13 +0,0 @@
-<html><head><title>omp_set_lock</title>
-<body>
-<H3>omp_set_lock</H3>
-<PRE>
-void omp_set_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-Blocks the thread executing the function until the 
-specified lock is available and then sets the lock. 
-A simple lock is available if it is unlocked. 
-A nestable lock is available if it is unlocked or if it is 
-already owned by the thread executing the function.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html
deleted file mode 100644
index 2ed4e87..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_nest_lock</title>
-<body>
-<H3>omp_set_nest_lock</H3>
-<PRE>
-void omp_set_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Blocks the thread executing the function until the specified lock is available and then sets the lock. A simple lock is available if it is unlocked. A nestable lock is available if it is unlocked or if it is already owned by the thread executing the function.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html
deleted file mode 100644
index 6100cfd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_nested</title>
-<body>
-<H3>omp_set_nested</H3>
-<PRE>
-void omp_set_nested(int nested)
-</PRE>
-<DL><DD>
-This function enables or disables nested parallelism.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html
deleted file mode 100644
index ad7f71d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_num_threads</title>
-<body>
-<H3>omp_set_num_threads</H3>
-<PRE>
-void omp_set_num_threads(int num_threads)
-</PRE>
-<DL><DD>
-Sets the number of threads that will be used in the next parallel region
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html
deleted file mode 100644
index 1a0ce49..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<html><head><title>omp_test_lock</title>
-<body>
-<H3>omp_test_lock</H3>
-<PRE>
-int omp_test_lock(omp_lock_t *lock2)
-</PRE>
-<DL><DD>
-Attempts to set a lock but does not block execution of the thread.
-<!--  BRT return value? -->
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html
deleted file mode 100644
index 1df8e60..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<html><head><title>omp_test_nest_lock</title>
-<body>
-<H3>omp_test_nest_lock</H3>
-<PRE>
-int omp_test_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Attempts to set a lock but does not block execution of the thread.
-<!--  BRT return value? -->
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html
deleted file mode 100644
index f4427db..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_unset_lock</title>
-<body>
-<H3>omp_unset_lock</H3>
-<PRE>
-void omp_unset_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-Provides the means of releasing ownership of a lock.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html
deleted file mode 100644
index 3f9722c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_unset_nest_lock</title>
-<body>
-<H3>omp_unset_nest_lock</H3>
-<PRE>
-void omp_unset_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Provides the means of releasing ownership of a lock.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore
deleted file mode 100644
index 1e6043c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore
+++ /dev/null

@@ -1,11 +0,0 @@
-compunity_logo2.gif
-lll.gif
-noLLL.gif
-openmp_logo.gif
-openmp_logoTemp.gif
-openMPI-icon.gif
-openMPwebLogo.gif
-pspbrwse.jbf
-temp.gif
-zznoOpenMP.gif
-zzopenMP.gif

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif
deleted file mode 100644
index 2d8d5ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif
deleted file mode 100644
index 02e0993..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif
deleted file mode 100644
index 6786012..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif
deleted file mode 100644
index 16bdc3f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif
deleted file mode 100644
index 40ef930..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h
deleted file mode 100644
index f40b0a0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h
+++ /dev/null

@@ -1,32 +0,0 @@
-// from http://docs.hp.com/en/B3901-90015/ch08s03.html (good docs here too)
-#ifndef _OPENMP_H
-#define _OPENMP_H 
-
-void omp_set_num_threads(int num_threads);
-int omp_get_num_threads(void);
-int omp_get_max_threads(void);
-int omp_get_thread_num(void);
-int omp_get_num_procs(void);
-int omp_in_parallel(void);
-void omp_set_dynamic(int dynamic_threads);
-int omp_get_dynamic(void);
-void omp_set_nested(int nested);
-int omp_get_nested(void);
-
-// typedef to quiet the errors only. TESTING ONLY
-typedef int omp_lock_t;
-typedef int omp_nest_lock_t;
-
-void omp_init_lock(omp_lock_t *lock);
-void omp_init_nest_lock(omp_nest_lock_t *lock);
-void omp_destroy_lock(omp_lock_t *lock);
-void omp_destroy_nest_lock(omp_nest_lock_t *lock);
-void omp_set_lock(omp_lock_t *lock);
-void omp_set_nest_lock(omp_nest_lock_t *lock);
-void omp_unset_lock(omp_lock_t *lock);
-void omp_unset_nest_lock(omp_nest_lock_t *lock);
-int omp_test_lock(omp_lock_t *lock);
-int omp_test_nest_lock(omp_nest_lock_t *lock);
-double omp_get_wtime(void);
-double omp_get_wtick(void);
-#endif

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.properties
deleted file mode 100644
index b5927ee..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-#    test plugin.properties
-# These names will be used in plugin.xml 
-#
-
-pluginName=PTP Parallel Language Development Tools OpenMP Core
-pluginProvider=Eclipse.org
-
-OpenMP.name=OpenMP
-
-view.name=OpenMP Artifact View
-viewcat.name=PTP OpenMP Views
-run.label=Run OpenMP Analysis
-run.tooltip=Run OpenMP Analysis on selected file, folder, or project to find  Artifacts
-
-#need to add more
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.xml
deleted file mode 100644
index bbe9cbd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.xml
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%viewcat.name"
-            id="org.eclipse.ptp.pldt.openmp">
-      </category>
-      <view
-            name="%view.name"
-            icon="icons/openMP.gif"
-            category="org.eclipse.ptp.pldt.openmp"
-            class="org.eclipse.ptp.pldt.openmp.core.views.OpenMPArtifactView"
-            id="org.eclipse.ptp.pldt.openmp.core.views.OpenMPArtifactView">
-      </view>
-
-   </extension>
-   <!--  openMP markers -->
-   <!-- MARKER_ID       = "org.eclipse.ptp.pldt.openmp.core.openMPMarker" -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="openMPMarker"
-        name="OpenMP Artifact Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.openmp.core.openMPMarker"
-            name="org.eclipse.ptp.pldt.openmp.core.openMPMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.openmp.core.openMPMarkerAnnotation"
-            icon="icons/openMP.gif" 
-            
-            presentationLayer="5"
-            label="OpenMP Annotation Marker"
-            
-            textPreferenceKey="openopenmpndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showOpenopenmpnNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOpldt.verviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isopenmpGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isopenmpRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   <extension
-      point="org.eclipse.ui.preferencePages">
-          <page id="org.eclipse.ptp.pldt.openmp.core.prefpage"
-            class="org.eclipse.ptp.pldt.openmp.core.prefs.OpenMPPreferencePage"
-            name="OpenMP"
-           category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-  />
-   </extension>
-      <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.openmp.core.editorHelp.OpenMPCHelpProvider"
-            id="org.eclipse.ptp.pldt.openmp.core.editorHelp.OpenMPCHelpProvider"/>
-   </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="org.eclipse.ptp.pldt.openmp.core.actions.RunAnalyseOpenMPcommandHandler"
-               id="org.eclipse.ptp.pldt.openmp.core.command2"
-               name="Show OpenMP artifacts">
-         </command>
-      </extension>
-      <extension
-            id="teopenmpD"
-            name="tempNAME"
-            point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1?after=separator2.openmp">
-            <command
-                  commandId="org.eclipse.ptp.pldt.openmp.core.command2"
-                  icon="icons/openMP.gif"
-                  label="Show OpenMP Artifacts"
-                  style="push">
-            </command>
-         </menuContribution>
-      </extension>
-      <extension
-            point="org.eclipse.core.runtime.preferences">
-         <initializer
-               class="org.eclipse.ptp.pldt.openmp.core.prefs.OpenMPPreferenceInitializer">
-         </initializer>
-      </extension>
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c
deleted file mode 100644
index 54fbbf7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c
+++ /dev/null

@@ -1,26 +0,0 @@
-
-
-void computeFunction(double [][] value, int m, int n)
-{
-  int i,j,maxiter,x,y;
-  double total_iters=0;
-#pragma omp parallel for private(j, x, y) reduction(+:total_iters)
-  for(i=0; i<m; i++)   {
-  	for(j=0; j<n; j++) {
-  		x = i/(double)m;
-  		y = j/(double)n;
-  		value[i,j] = mandel_val(x,y,maxiter);
-  		total_iters = total_iters+value[i,j];
-  	}
-  }
-  
-  #pragma omp sections
-  {
-  	#pragma omp section
-    {  i=total_iters; }
-  	
-  	#pragma omp section
-  	{  j=total_iters+m*n; }
-  }
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c
deleted file mode 100644
index 3f9aaaa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c
+++ /dev/null

@@ -1,34 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>  // for omp sample
-#include <math.h>    // for omp
-#include "omp.h"
-
-
-// Sample dummy OpenMP program
-
-
-int main(int argc, char* argv[]){
-	int    i,arraySize;
-	double *x, *y;     /* the arrays                 */
-	printf("Hello OpenMP World.\n");
-
-// sample openMP API
-	if (omp_in_parallel()){
-		printf("true");
-	}
-	  /* Allocate memory for the arrays. */
-  x = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-  y = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-
-  /* Here's the OpenMP pragma that parallelizes the for-loop. */
-#pragma omp parallel for
-  for ( i = 0; i < arraySize; i++ )
-    {
-      y[i] = sin( exp( cos( - exp( sin(x[i]) ) ) ) );
-    }
-
-
-	return 0;
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java
deleted file mode 100644
index 39093cf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-
-
-public class OpenMPArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public OpenMPArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java
deleted file mode 100644
index 7abf659..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core;
-
-/**
- * @author tibbitts
- *
- */
-public class OpenMPIDs {
- 
-	public static final String OpenMP_INCLUDES = "OpenMP Includes";
-	public static final String OpenMP_BUILD_CMD = "gcc";
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java
deleted file mode 100644
index ce2949e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class OpenMPPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static OpenMPPlugin plugin;
-    public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.openmp.core";
-	
-    // Constants
-    // preference page name for OpenMP
-    public static final String OPEN_MP_INCLUDES    = "OpenMP Includes";
-    
-    public static final String MARKER_ID       = "org.eclipse.ptp.pldt.openmp.core.openMPMarker";
-   
-    // artifact view id
-    public static final String VIEW_ID = "org.eclipse.ptp.pldt.openmp.core.views.OpenMPArtifactView";
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.openmp.core.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	/**
-	 * The constructor.
-	 */
-	public OpenMPPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static OpenMPPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.openmp.core", path);
-	}
-    /**
-     * Returns the preference setting for OpenMP include paths
-     * 
-     * @return
-     */
-    public List<String> getIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(OPEN_MP_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-	public static String getResourceString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-    public static String getPluginId()
-    {
-        return PLUGIN_ID;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java
deleted file mode 100644
index 2c82790..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.core;
-
-
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-
-/**
- * Save specific information on OpenMP artifacts and problems
- * 
- * @author Donald P Pazel
- */
-public class OpenMPScanReturn extends ScanReturn
-{
-    private LinkedList<OpenMPError> problems_ = new LinkedList<OpenMPError>();  
-    
-    /**
-     * OpenMPScanReturn - constructor
-     *
-     */
-    public OpenMPScanReturn()
-    {
-       super();   
-    }
-
-    /**
-     * addOpenMPArtifact - add a pragma to the pragma list
-     * @param a
-     */
-    public void addOpenMPArtifact(Artifact a)
-    {
-        addArtifact(a);
-    }
-
-    /**
-     * getOpenMPList - get the pragma list
-     * @return
-     */
-    public List<Artifact> getOpenMPList()
-    {
-        return getArtifactList();
-    }
-    
-
-    /**
-     * addProblemst - add a set of problems to the list
-     * @param errors - LinkedList
-     */
-    public void addProblems(LinkedList<OpenMPError> errors)
-    {
-        if (errors.size()>0)  // 0 sized appends seem to add junk to problems_
-          problems_.addAll(errors);
-    }
-
-    /**
-     * getProblems - accessor to problems list
-     * @return
-     */
-    public LinkedList<OpenMPError> getProblems()
-    {
-        return problems_;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java
deleted file mode 100644
index 2f92617..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java
+++ /dev/null

@@ -1,240 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.core.actions;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPAnalysisManager;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPErrorManager;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPScanReturn;
-import org.eclipse.ptp.pldt.openmp.core.analysis.OpenMPCASTVisitor;
-import org.eclipse.ptp.pldt.openmp.ui.pv.PvPlugin;
-import org.eclipse.ptp.pldt.openmp.ui.pv.views.ProblemMarkerAttrIds;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-/**
- * @author tibbitts
- *
- */
-public class RunAnalyseOpenMPcommandHandler extends RunAnalyseHandlerBase {
-	private static final String OPENMP_DIRECTIVE = "OpenMP directive";
-	private static final boolean traceOn=false;
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseOpenMPcommandHandler() {
-		super("OpenMP", new OpenMPArtifactMarkingVisitor(OpenMPPlugin.MARKER_ID), OpenMPPlugin.MARKER_ID); //$NON-NLS-1$
-	}
-	/**
-	 * Returns OpenMP analysis artifacts for file
-	 * 
-	 * @param file
-	 * @param includes
-	 *            OpenMP include paths
-	 * @return
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu,
-			final List<String> includes) {
-		OpenMPScanReturn msr = new OpenMPScanReturn();
-		final String fileName = tu.getElementName();
-		IASTTranslationUnit atu = null;
-		ILanguage lang;
-		try {
-			lang = tu.getLanguage();
-
-			atu = tu.getAST();
-			if (lang.getId().equals(GCCLanguage.ID)) {// cdt40
-				atu.accept(new OpenMPCASTVisitor(includes, fileName, msr));
-			}
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		IResource res = tu.getResource();
-		IFile file = null;
-		if (res instanceof IFile) {
-			file = (IFile) res;
-		}
-		else{ 
-			System.out.println("RunAnalyseOpenMP.doArtifactAnalysis, file cast won't work...");
-		}
-		// Find the OpenMP #pragmas
-		processOpenMPPragmas(msr, atu, file);
-		return msr;
-	}
-	/**
-	 * Special processing to find #pragmas, since the CDT AST
-	 * does not normally include them.<br>
-	 * Also adds the "OpenMP Problems"  
-	 * @param msr
-	 * @param astTransUnit
-	 * @param iFile
-	 */
-	protected void processOpenMPPragmas(OpenMPScanReturn msr,
-			IASTTranslationUnit astTransUnit, IFile iFile) {
-		OpenMPAnalysisManager omgr = new OpenMPAnalysisManager(astTransUnit,
-				iFile);
-		PASTNode[] pList = omgr.getPAST();
-
-		for (int i = 0; i < pList.length; i++) {
-			if (pList[i] instanceof PASTOMPPragma) {
-				PASTOMPPragma pop = (PASTOMPPragma) pList[i];
-				SourceInfo si = getSourceInfo(pop, 0);
-				Artifact a = new Artifact(pop.getFilename(), pop
-						.getStartingLine(), pop.getStartLocation(), pop
-						.getContent(), OPENMP_DIRECTIVE, si, pop);
-				msr.addArtifact(a);
-			}
-		}
-
-		msr.addProblems(OpenMPErrorManager.getCurrentErrorManager()
-						.getErrors());
-	}
-	/**
-	 * Get exact source locational info for a function call
-	 * 
-	 * @param pastNode
-	 * @param constructType
-	 * @return
-	 */
-	private SourceInfo getSourceInfo(PASTNode pastNode, int constructType) {
-		SourceInfo sourceInfo = null;
-		IASTNodeLocation[] locations = pastNode.getNodeLocations();
-		if (locations.length == 1) {
-			IASTFileLocation astFileLocation = null;
-			if (locations[0] instanceof IASTFileLocation) {
-				astFileLocation = (IASTFileLocation) locations[0];
-				sourceInfo = new SourceInfo();
-				sourceInfo.setStartingLine(astFileLocation
-						.getStartingLineNumber());
-				sourceInfo.setStart(astFileLocation.getNodeOffset());
-				sourceInfo.setEnd(astFileLocation.getNodeOffset()
-						+ astFileLocation.getNodeLength());
-				sourceInfo.setConstructType(constructType);
-			}
-		}
-		return sourceInfo;
-	}
-	/**
-	 * processResults - override from RunAnalyse base, to process both pragma
-	 * artifacts and problems
-	 */
-	@Override
-	protected void processResults(ScanReturn results, IResource resource) {
-		assert (results instanceof OpenMPScanReturn);
-
-		OpenMPScanReturn osr = (OpenMPScanReturn) results;
-
-		// This is for the openmp pragma view
-		List<Artifact> artifacts = osr.getOpenMPList();
-		visitor.visitFile(resource, artifacts);
-
-		// remove problems
-		removeProblemMarkers(resource);
-
-		// DPP - put in stuff for problems view
-		// Just subclass scanreturn and create markers for problems view here
-		List<OpenMPError> problems = osr.getProblems();
-		if(traceOn)System.out.println("RunAnalyseOpenMP.processResults, have "+problems.size()+ " problems.");
-		try {
-			for (Iterator<OpenMPError> i = problems.iterator(); i.hasNext();)
-				processProblem((OpenMPError) i.next(), resource);
-		} catch (CoreException e) {
-			System.out.println("RunAnalysisOpenMP.processResults exception: "
-					+ e);
-			e.printStackTrace();
-		}
-	}
-	/**
-	 * Create problem marker which will put a problem on the OpenMP problems view
-	 * 
-	 * @param problem -
-	 *            OpenMPError
-	 * @param resource -
-	 *            IResource
-	 * @throws CoreException
-	 */
-	private void processProblem(OpenMPError problem, IResource resource)
-			throws CoreException {
-		// build all the attributes
-		Map attrs = new HashMap();
-		attrs.put(ProblemMarkerAttrIds.DESCRIPTION, problem.getDescription());
-		attrs.put(ProblemMarkerAttrIds.RESOURCE, problem.getFilename());
-		attrs.put(ProblemMarkerAttrIds.INFOLDER, problem.getPath());
-		attrs.put(ProblemMarkerAttrIds.LOCATION, new Integer(problem
-				.getLineno()));
-		// used to reference problem if need
-		attrs.put(ProblemMarkerAttrIds.PROBLEMOBJECT, problem);
-
-		// create the marker all at once, so get ONLY a single resourceChange
-		// event.
-		MarkerUtilities.createMarker(resource, attrs,
-				ProblemMarkerAttrIds.MARKER_ERROR_ID);
-
-	}
-	/**
-	 * Remove the OpenMP problem markers currently set on a resource.
-	 * 
-	 * @param resource -
-	 *            IResource
-	 */
-	private void removeProblemMarkers(IResource resource) {
-		try {
-			resource.deleteMarkers(ProblemMarkerAttrIds.MARKER_ERROR_ID, false,
-					IResource.DEPTH_INFINITE);
-		} catch (CoreException e) {
-			System.out.println(e);
-			System.out.println(e.toString());
-			System.out.println("Problem deleting markers on OMP Problems: "
-					+ resource.getProjectRelativePath());
-		}
-	}
-
-
-	protected List<String> getIncludePath() {
-		return OpenMPPlugin.getDefault().getIncludeDirs();
-	}
-
-	protected void activateArtifactView() {
-		ViewActivater.activateView(OpenMPPlugin.VIEW_ID);
-	}
-
-	protected void activateProblemsView() {
-		ViewActivater.activateView(PvPlugin.VIEW_ID);
-	}	
-	 
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java
deleted file mode 100644
index b9ef03a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java
+++ /dev/null

@@ -1,71 +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.openmp.core.analysis;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-
-
-/**
- * This dom-walker collects OpenMP related constructs (currently function calls and constants), and add markers to the
- * source file for C code. Currently, it delegates work to MpiGeneralASTVisitorBehavior.
- * 
- */
-public class OpenMPCASTVisitor extends PldtAstVisitor
-{
-    {
-        this.shouldVisitExpressions = true;
-        this.shouldVisitStatements = true;
-        this.shouldVisitDeclarations = true;
-        this.shouldVisitTranslationUnit = true;
-    }
-
-
-    public OpenMPCASTVisitor(List<String> includes, String fileName, ScanReturn msr)
-    {
-        super(includes, fileName, msr);
-        ARTIFACT_CALL = "OpenMP Call";
-		ARTIFACT_CONSTANT="OpenMP Constant";
-    }
-
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-     */
-    private static final String PREFIX="omp_";
-    public int visit(IASTExpression expression)
-    {
-        if (expression instanceof IASTFunctionCallExpression) {
-            IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-            String signature = astExpr.getRawSignature();
-            //System.out.println("func signature=" + signature);
-            if (signature.startsWith(PREFIX)) {
-                if (astExpr instanceof IASTIdExpression) {
-                    IASTName funcName = ((IASTIdExpression) astExpr).getName();
-                    processFuncName(funcName, astExpr);
-                }
-            }
-        } else if (expression instanceof IASTLiteralExpression) {
-            processMacroLiteral((IASTLiteralExpression) expression);
-        }
-        return PROCESS_CONTINUE;
-    }
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java
deleted file mode 100644
index 8487c05..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core.editorHelp;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.cdt.ui.IFunctionSummary.IFunctionPrototypeSummary;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-
-/**
- * Provide help for OpenMP APIs.<br>
- * This includes hover help, F1 help, and content assist (ctrl-space)
- * @author tibbitts
- *
- */
-public class OpenMPCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = "OpenMP C and Fortran Help Book";
-
-	public OpenMPCHelpBook() {
-		super(OpenMPPlugin.getPluginId());
-		// populate func map
-		funcName2FuncInfo=makeFunctionMap();
-
-		// set title
-		setTitle(TITLE);
-	}
-
-	/**
-	 * Make function map of API names and info.<br>
-	 * Note this is also used for (one-time) generation of the html
-	 * files by the main() and generateHTML() methods below.
-	 * @return hashmap of the function names and associated info
-	 */
-	private static Map makeFunctionMap() {
-		Map funcMap= new HashMap();
-		funcMap.put("omp_set_num_threads",
-						new FunctionSummaryImpl("omp_set_num_threads","",
-								"Sets the number of threads that will be used in the next parallel region",
-								new FunctionPrototypeSummaryImpl(
-										"omp_set_num_threads", "void",
-										"int num_threads"), null));
-
-		funcMap.put("omp_get_num_threads", new FunctionSummaryImpl(
-				"omp_get_num_threads", "", "This function returns the number of threads currently in the team executing the parallel region from which it is called.",
-				new FunctionPrototypeSummaryImpl("omp_get_num_threads",
-						"int", "int num_threads"), null));
-		
-		funcMap.put("omp_get_max_threads", new FunctionSummaryImpl(
-				"omp_get_max_threads", "", "This function returns the maximum value that can be returned by calls to omp_get_num_threads.",
-				new FunctionPrototypeSummaryImpl("omp_get_max_threads",
-						"int", "void"), null));
-		funcMap.put("omp_get_thread_num", new FunctionSummaryImpl(
-				"get_thread_num", "", "This function returns the thread number, within its team, of the thread executing the function. The thread number lies between 0 and omp_get_num_threads()-1, inclusive. The master thread of the team is thread 0.",
-				new FunctionPrototypeSummaryImpl("get_thread_num",
-						"int", "void"), null));
-		funcMap.put("omp_get_num_procs", new FunctionSummaryImpl(
-				"get_num_procs", "", "This function returns the maximum number of processors that could be assigned to the program.",
-				new FunctionPrototypeSummaryImpl("get_num_procs", "int",
-						"void"), null));
-		funcMap.put("omp_in_parallel", new FunctionSummaryImpl(
-				"omp_in_parallel", "",
-				"This function returns non-zero if it is called within the dynamic extent of a parallel region executing in parallel; otherwise, it returns 0.",
-				new FunctionPrototypeSummaryImpl("omp_in_parallel", "int",
-						"void"), null));
-
-		funcMap.put("omp_set_dynamic", new FunctionSummaryImpl(
-				"omp_set_dynamic", "", "This function enables or disables dynamic adjustment of the number of threads available for execution of parallel regions.",
-				new FunctionPrototypeSummaryImpl("omp_set_dynamic",
-						"void", "int dynamic_threads"), null));
-		funcMap.put("omp_get_dynamic", new FunctionSummaryImpl(
-				"omp_get_dynamic", "", "This function returns non-zero if dynamic thread adjustments enabled and returns 0 otherwise.",
-				new FunctionPrototypeSummaryImpl("omp_get_dynamic",
-						"int", "void"), null));
-
-		funcMap.put("omp_set_nested", new FunctionSummaryImpl(
-				"omp_set_nested", "", "This function enables or disables nested parallelism.",
-				new FunctionPrototypeSummaryImpl("omp_set_nested",
-						"void", "int nested"), null));
-		funcMap.put("omp_get_nested", new FunctionSummaryImpl(
-				"omp_get_nested", "", "omp_get_nested description",
-				new FunctionPrototypeSummaryImpl("This function returns non-zero if nested parallelism is enabled and 0 if it is disabled.",
-						"int", "void"), null));
-		funcMap.put("omp_init_lock", new FunctionSummaryImpl(
-				"omp_init_lock", "", "These functions (this and omp_init_nest_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.",
-				new FunctionPrototypeSummaryImpl("omp_init_lock", "void",
-						"omp_lock_t *lock"), null));
-		funcMap.put("omp_init_nest_lock", new FunctionSummaryImpl(
-				"omp_init_nest_lock", "", "These functions (this and omp_init_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.",
-				new FunctionPrototypeSummaryImpl("omp_init_nest_lock", "void",
-						"omp_nest_lock_t *lock"), null));
-		
-		funcMap.put("omp_destroy_lock", new FunctionSummaryImpl(
-				"omp_destroy_lock", "", "Ensures that the specified lock variable lock is uninitialized.",
-				new FunctionPrototypeSummaryImpl("omp_destroy_lock",
-						"void", "omp_lock_t *lock"), null));
-		funcMap.put("omp_destroy_nest_lock", new FunctionSummaryImpl(
-				"omp_destroy_nest_lock", "", "Ensures that the specified lock variable lock is uninitialized.",
-				new FunctionPrototypeSummaryImpl("omp_destroy_nest_lock",
-						"void", "omp_nest_lock_t *lock"), null));
-		
-		funcMap.put("omp_set_lock", new FunctionSummaryImpl(
-				"omp_set_lock", "", "Blocks the thread executing the function until the specified lock is available and then sets the lock. A simple lock is available if it is unlocked. A nestable lock is available if it is unlocked or if it is already owned by the thread executing the function.",
-				new FunctionPrototypeSummaryImpl("omp_set_lock", "void",
-						"omp_lock_t *lock"), null));
-		funcMap.put("omp_set_nest_lock", new FunctionSummaryImpl(
-				"omp_set_nest_lock", "", "Blocks the thread executing the function until the specified lock is available and then sets the lock. A simple lock is available if it is unlocked. A nestable lock is available if it is unlocked or if it is already owned by the thread executing the function.",
-				new FunctionPrototypeSummaryImpl("omp_set_nest_lock", "void",
-						"omp_nest_lock_t *lock"), null));
-		
-		funcMap.put("omp_test_lock", new FunctionSummaryImpl(
-				"omp_test_lock", "", "Attempts to set a lock but do not block execution of the thread.",
-				new FunctionPrototypeSummaryImpl("omp_test_lock", "int",
-						"omp_lock_t *lock2"), null));
-		funcMap.put("omp_test_nest_lock", new FunctionSummaryImpl(
-				"omp_test_nest_lock", "", "Attempts to set a lock but do not block execution of the thread.",
-				new FunctionPrototypeSummaryImpl("omp_test_nest_lock", "int",
-						"omp_nest_lock_t *lock"), null));
-		
-		funcMap.put("omp_unset_lock", new FunctionSummaryImpl(
-				"omp_unset_lock", "", "Provides the means of releasing ownership of a lock.",
-				new FunctionPrototypeSummaryImpl("omp_unset_lock",
-						"void", "omp_lock_t *lock"), null));
-		funcMap.put("omp_unset_nest_lock", new FunctionSummaryImpl(
-				"omp_unset_nest_lock", "", "Provides the means of releasing ownership of a lock.",
-				new FunctionPrototypeSummaryImpl("omp_unset_nest_lock",
-						"void", "omp_nest_lock_t *lock"), null));
-		
-		funcMap.put("omp_get_wtime", new FunctionSummaryImpl(
-				"omp_get_wtime", "", "Returns the time elapsed from a fixed starting time. The value of the fixed starting time is determined at the start of the current program, and remains constant throughout program execution.",
-				new FunctionPrototypeSummaryImpl("omp_get_wtime", "double",
-						"void"), null));
-		funcMap.put("omp_get_wtick", new FunctionSummaryImpl(
-				"omp_get_wtick", "", "Returns the number of seconds between clock ticks.",
-				new FunctionPrototypeSummaryImpl("omp_get_wtick", "double",
-						"void"), null));
-
-		// try to define constants too...
-//		funcMap.put("OMP_DYNAMIC", new FunctionSummaryImpl(
-//				"OMP_DYNAMIC", "", "OMP_DYNAMIC description",
-//				new FunctionPrototypeSummaryImpl("OMP_DYNAMIC", "ret",
-//						"int arg1, int arg2"), null));
-		
-		return funcMap;
-		}
-	
-	private static final String HTML_DIR = "C:\\ews\\ptpJan06\\org.eclipse.ptp.pldt.openmp.core\\html\\";
-
-	/**
-	 * generate html documents (one-time)
-	 */
-	public static void generateHTML(Map fMap) {
-		int count=0;
-		Collection fColl = fMap.values();
-		for (Iterator iter = fColl.iterator(); iter.hasNext();) {
-			FunctionSummaryImpl fsi = (FunctionSummaryImpl) iter.next();
-			IFunctionPrototypeSummary fspi = fsi.getPrototype();
-			String proto = fspi.getPrototypeString(false);
-			String args = fspi.getArguments();
-			String rt = fspi.getReturnType();
-
-			if (fsi != null) {
-				PrintStream html = null;
-				String filename=HTML_DIR+fsi.getName() + ".html";
-				try {
-					html = new PrintStream(new FileOutputStream(filename));
-					html.print("<html><head><title>");
-					html.print(fsi.getName());
-					html.println("</title>");
-					html.println("<body>");
-					html.print("<H3>");
-					html.print(fsi.getName());
-					html.println("</H3>");
-					html.println("<PRE>");
-					html.println(fspi.getPrototypeString(false));
-					html.println("</PRE>");
-					html.println("<DL><DD>");
-					html.println(fsi.getDescription());
-					html.println("<P></DL></body></html>");
-				} catch (IOException e) {
-					e.printStackTrace();
-				} finally {
-					if (html != null)
-						html.close();
-					System.out.println("wrote "+filename);
-					count++;
-				}
-			}
-		}
-		System.out.println("Wrote "+count+" html files.");
-	}
-	/**
-	 * Run as Java app to generate the HTML files that will be used
-	 * for F1 help.
-	 * @param args unused
-	 */
-	public static void main(String[] args) {
-		Map map = makeFunctionMap();
-		generateHTML(map);
-		
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java
deleted file mode 100644
index abd27a2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-/**
- * 
- * This class implements ICHelpProvider and provides OpenMP information <br>
- * (F1, hover, content assist, etc.)
- * 
- * @author tibbitts
- */
-
-public class OpenMPCHelpProvider extends CHelpProviderImpl {
-
-	public void initialize() {
-		helpBook = new OpenMPCHelpBook();
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages.properties
deleted file mode 100644
index 39a8fe7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages.properties
+++ /dev/null

@@ -1,28 +0,0 @@
-#properties strings used by plugin.getResourceString("key")
-#where the following are the key=value pairs
-
-OpenMPArtifactView.thingname=OpenMP Artifact
-OpenMPArtifactView.thingnames=OpenMP Artifacts
-OpenMPArtifactView.extraColName=Construct
-
-#the following are probably not used (yet)
-OpenMPArtifactView.valueIs=value is 
-OpenMPArtifactView.OpenMPpragma=OpenMP Pragma
-OpenMPArtifactView.functionCall=Function Call
-OpenMPPlugin.preferencePageName=OpenMP Includes
-RunAnalyseOpenMP.OpenMPdirective=OpenMP directive
-RunAnalyseOpenMP.OpenMP=OpenMP
-
-RemoveMarkerAction.OpenMPartifactsCleared=OpenMP artifacts cleared
-RemoveMarkerAction.thingname=\ OpenMP Artifact
-RemoveMarkerAction.and=\ and 
-RemoveMarkerAction.OpenMPArtifactError=\ OpenMP Artifact Error
-RemoveMarkerAction.haveBeenRemoved=have been removed.\n
-
-RunAnalyseOpenMP.OpenMPdirective=OpenMP directive
-RunAnalyseOpenMP.OpenMP=OpenMP
-
-OpenMPPreferencePage.OpenMPincludePaths=OpenMP include paths:
-OpenMPPreferencePage.pleaseChooseDirectory=Please choose a directory:
-
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java
deleted file mode 100644
index f761662..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPIDs;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-
-/**
- * Class used to initialize default preference values.
- */
-public class OpenMPPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/**
-	 * Initialize default MPI preferences
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = OpenMPPlugin.getDefault()
-				.getPreferenceStore();
-    	store.setDefault(OpenMPIDs.OpenMP_BUILD_CMD, "gcc");
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java
deleted file mode 100644
index 6195e39..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core.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.openmp.core.OpenMPPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Preference page based on FieldEditorPreferencePage
- * 
- */
-
-public class OpenMPPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String INCLUDES_PREFERENCE_LABEL  = "OpenMP include paths:";
-    private static final String INCLUDES_PREFERENCE_BROWSE = "Please choose a directory for OpenMP includes:";
-
-    public OpenMPPreferencePage()
-    {
-        super(GRID);
-        initPreferenceStore();
-    }
-
-    public OpenMPPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public OpenMPPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public OpenMPPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = OpenMPPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-        PathEditor pathEditor = new PathEditor(OpenMPPlugin.OPEN_MP_INCLUDES, INCLUDES_PREFERENCE_LABEL,
-                INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java
deleted file mode 100644
index da2dc1c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java
+++ /dev/null

@@ -1,141 +0,0 @@
-package org.eclipse.ptp.pldt.openmp.core.views;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ArtifactManager;
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.cdt.internal.ui.util.EditorUtility;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
-/**
- * An OpenMP artifact view based on SimpleTableView <br>
- * Note that the ID must be unique.
- * 
- */
-public class OpenMPArtifactView extends SimpleTableMarkerView {
-	public OpenMPArtifactView() {
-		// if you need to read icon images, etc. from the plug-in, be sure to
-		// pass in an actual Plugin class instance for first arg
-		// super(OpenMPPlugin.getDefault(), "OpenMP Artifact", "OpenMP Artifacts", "Construct", OpenMPPlugin.MARKER_ID);
-		super(
-				OpenMPPlugin.getDefault(),
-				OpenMPPlugin.getResourceString("OpenMPArtifactView.thingname"),
-				OpenMPPlugin.getResourceString("OpenMPArtifactView.thingnames"),
-				OpenMPPlugin.getResourceString("OpenMPArtifactView.extraColName"),
-				OpenMPPlugin.MARKER_ID);
-
-	}
-
-	/**
-	 * Provide custom info for filling in the last column
-	 */
-	protected String getConstructStr(IMarker marker) throws CoreException {
-		Integer temp = (Integer) marker.getAttribute(columnID_);
-		if (temp != null) {
-			Integer constructType = (Integer) temp;
-			int i = constructType.intValue();
-			String val;// = CONSTRUCT_TYPE_NAMES[i];
-			val = "value is " + i; // BRT need a more robust lookup
-			if (i == 0)
-				val = "OpenMP Pragma";
-			if (i == 1)
-				val = "Function Call";
-
-			return val;
-		} else
-			return " ";
-	}
-    
-
-    /**
-     * Make "show info" action to display artifact information
-     */
-    protected void makeShowInfoAction()
-    {
-        infoAction = new Action() {
-
-            /* (non-Javadoc)
-             * @see org.eclipse.jface.action.IAction#run()
-             */
-            @SuppressWarnings("restriction")
-            public void run()
-            {
-                ISelection selection = viewer.getSelection();
-                Object obj = ((IStructuredSelection) selection).getFirstElement();
-                IMarker marker = (IMarker) obj;
-                if(marker==null){
-                	MessageDialog.openInformation(null, "No selection", "No artifact selected");
-                	return;
-                }
-
-                try {
-                    //Object o = artifactManager_.getArtifact((String)marker.getAttribute(IDs.ID));
-                    Object o = ArtifactManager.getArtifact(marker);
-                    if (o==null || !(o instanceof Artifact))  return;
-                    Artifact artifact = (Artifact)o;
-                    Object p = artifact.getArtifactAssist();
-                    if (p==null || !(p instanceof PASTOMPPragma))  return;
-                    PASTOMPPragma ompPragma = (PASTOMPPragma)p;
-                    IASTNode      iRegion    = ompPragma.getRegion();
-                    ASTNode       region     = (iRegion instanceof ASTNode ? (ASTNode)iRegion : null);
-                    if (region==null)  return;
-                    
-                    // determine if we collected location information for this omp pragma
-                    String filename = ompPragma.getRegionFilename(); //region.getContainingFilename(); 
-                    if (filename==null)  return;
-                    
-                    IResource r = ParserUtil.getResourceForFilename(filename);
-                    
-                    IEditorPart aPart = null;
-                    if (r!=null) {
-                        try{
-                            aPart = EditorUtility.openInEditor(r);
-                        }
-                        catch(PartInitException pie) { return; }
-                        catch(CModelException e)     { return; }
-                    }
-                    else {
-                        return;
-                    }
-                    
-                    if (aPart instanceof AbstractTextEditor) 
-                    {
-                        int offset = ompPragma.getRegionOffset(); //ifl.getNodeOffset();  //locs[0].getNodeOffset();
-                        int length = ompPragma.getRegionLength(); //ifl.getNodeLength();  //region.getLength(); 
-                         ((AbstractTextEditor)aPart).selectAndReveal( offset, length);
-                    }  
-                     
-                    
-                } catch (Exception e) {
-                    System.out.println("ATV.doubleclickAction: Error positioning editor page from marker line number");
-                    //showStatusMessage("Error positioning editor from marker line number", "error marker goto");
-                    e.printStackTrace();
-                }
-                 
-            }
-        };
-        infoAction.setText("Show pragma region");
-        infoAction.setToolTipText("Show region for selected " + thingname_);
-        infoAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
-                ISharedImages.IMG_OBJS_INFO_TSK));
-
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.classpath b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.openmp.ui.pv/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.cvsignore
deleted file mode 100644
index 47e3103..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-@dot

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project
deleted file mode 100644
index 419bfb1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.openmp.ui.pv</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.openmp.ui.pv/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/META-INF/MANIFEST.MF
deleted file mode 100644
index 8bf19e8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.openmp.ui.pv; singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.openmp.ui.pv.PvPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt,
- org.eclipse.cdt.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ptp.pldt.openmp.analysis,
- org.eclipse.cdt.core,
- org.eclipse.ui.ide,
- org.eclipse.ptp.pldt.common
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.ptp.pldt.openmp.ui.pv,
- org.eclipse.ptp.pldt.openmp.ui.pv.views
-Bundle-ClassPath: .
-Bundle-Vendor: %pluginProvider

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/about.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/build.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/build.properties
deleted file mode 100644
index c88359b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               plugin.properties

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif
deleted file mode 100644
index 16bdc3f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties
deleted file mode 100644
index 51ee894..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools OpenMP Problems View
-pluginProvider=Eclipse.org

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml
deleted file mode 100644
index 89ada90..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml
+++ /dev/null

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="PTP OpenMP Views"
-            id="org.eclipse.ptp.pldt.openmp.ui.pv">
-      </category>
-      <view
-            name="OpenMP Problems"
-            icon="icons/openMPproblem.gif"
-            category="org.eclipse.ptp.pldt.openmp" 
-            class="org.eclipse.ptp.pldt.openmp.ui.pv.views.OpenMPProblemsView"
-            id="org.eclipse.ptp.pldt.openmp.ui.pv.views.OpenMPProblemsView">
-      </view>
-   </extension>
-   <!--  openMP markers -->
-   <!-- MARKER_ID       = "org.eclipse.ptp.pldt.openmp.ui.pv.openMPProblemMarker" -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="openMPProblemMarker"
-        name="OpenMP Problem Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="description"/>
-      <attribute name="resource"/>
-      <attribute name="infoldername"/>
-      <attribute name="location"/>
-      <attribute name="problem"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.ui.resourcePerspective">
-         <view
-               ratio="0.5"
-               relative="org.eclipse.ui.views.TaskList"
-               relationship="right"
-               id="org.eclipse.ptp.pldt.openmp.ui.pv.views.OpenMPProblemsView">
-         </view>
-      </perspectiveExtension>
-   </extension>   
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java
deleted file mode 100644
index 2bddb3d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java
+++ /dev/null

@@ -1,58 +0,0 @@
-package org.eclipse.ptp.pldt.openmp.ui.pv;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PvPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static PvPlugin plugin;
-    
-    public static final String MARKER_ID       = "org.eclipse.ptp.pldt.openmp.ui.pv.openMPProblemMarker";
-    
-    public static final String VIEW_ID         = "org.eclipse.ptp.pldt.openmp.ui.pv.views.OpenMPProblemsView";
-	
-	/**
-	 * The constructor.
-	 */
-	public PvPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PvPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.openmp.ui.pv", path);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java
deleted file mode 100644
index 83e761c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java
+++ /dev/null

@@ -1,556 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2007 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.ui.pv.views;
-
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.*;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.SWT;
-
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.ptp.pldt.openmp.ui.pv.PvPlugin;
-import org.eclipse.ptp.pldt.openmp.ui.pv.views.ProblemMarkerAttrIds;
-
-/**
- * OpenMP Problems View
- * <p>
- */
-
-public class OpenMPProblemsView extends ViewPart {
-	private TableViewer viewer;
-	private Action action1;
-	//private Action action2;
-	private Action doubleClickAction;
-	private Action removeMarkerAction;
-    
-    private   String                  markerID_   = PvPlugin.MARKER_ID;
-    protected UpdateVisitor           visitor_    = new UpdateVisitor();
-    
-    private String                    iconName_          = "icons/openMPproblem.gif";
-    private AbstractUIPlugin          thePlugin_;
-    
-    protected boolean                 traceOn     = false;
-    
-    private static final String [] columns_ = {" ",
-                                               "Description",
-                                               "Resource",
-                                               "In Folder",
-                                               "Location"
-    };
-
-    /**
-     * OpenMPProblemsView - Constructor
-     *
-     */
-    public OpenMPProblemsView() {
-        thePlugin_ = PvPlugin.getDefault(); 
-    }
-
-    /**
-     * This is a callback that will allow us
-     * to create the viewer and initialize it.
-     */
-    public void createPartControl(Composite parent) {
-        Table       table  = new Table(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-        TableLayout layout = new TableLayout();
-        table.setLayout(layout);
-        table.setLinesVisible(true);
-        table.setHeaderVisible(true);
-        
-        for(int i=0; i<columns_.length; i++) {
-            layout.addColumnData(new ColumnWeightData(columns_[i].length(), columns_[i].length(), true));
-            TableColumn tc = new TableColumn(table, SWT.NONE);
-            tc.setText(columns_[i]);
-            tc.setAlignment(SWT.LEFT);
-            tc.setResizable(true);
-        }
-         
-        viewer = new TableViewer(table); //new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-        viewer.setContentProvider(new ViewContentProvider());
-        viewer.setLabelProvider(new ViewLabelProvider());
-        viewer.setSorter(new NameSorter());
-        viewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
-        // markers from workspace
-        
-        makeActions();
-        hookContextMenu();
-        hookDoubleClickAction();
-        contributeToActionBars();
-    }
-   
-
-    /**
-     * It might be useful for subclasses to override this, to say which filenames should allow the action "run analysis"  to create
-     * new artifacts and thus new markers. <br>
-     * This is a default implementation
-     * 
-     * @param filename
-     * @return
-     */
-    public boolean validForAnalysis(String filename)
-    {
-        //return MpiUtil.validForAnalysis(filename);
-        return true;
-
-    }
-
-
-	/*
-	 * The content provider class is responsible for providing objects to the view. It can wrap
-	 * existing objects in adapters or simply return objects as-is. These objects may be sensitive
-	 * to the current input of the view, or ignore it and always show the same content 
-	 * (like Task List, for example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider, IResourceChangeListener {
-        private IResource    input         = null;
-        private boolean      hasRegistered = false;
-        
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-              if (!hasRegistered) {
-                  // add me as a resource change listener so i can refresh at
-                  // least when markers are changed
-                  ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-                  hasRegistered = true;
-              }
-              if (newInput instanceof IResource)
-                  input = (IResource)newInput;
-		}
-        
-		public void dispose() {
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		}
-        
-		public Object[] getElements(Object parent) 
-        {
-            Object [] objs = null;
-            try {
-                String id = markerID_;
-                if (input!=null) {
-                     // use the cached input object instead of querying from workspace
-                     objs = input.findMarkers(id, false, IResource.DEPTH_INFINITE);
-                }
-            }
-            catch(CoreException e) {
-                System.out.println("OpenMPProblemsView exception gettting model elements (markers");
-                e.printStackTrace();
-            }
-            return objs;
-		}
-        
-        /**
-         *  resourceChanged - react to a resource change event
-         */
-        public void resourceChanged(IResourceChangeEvent event)
-        {
-            final IResourceDelta delta = event.getDelta();
-            Control              ctrl  = viewer.getControl();
-            if (ctrl!=null && !ctrl.isDisposed()) {
-                ctrl.getDisplay().syncExec(new Runnable()  {
-                    public void run() 
-                    {
-                        processResourceChangeDelta(delta);
-                        // we should have updated the indiv. rows we care about.
-                        // but need this for Marker display after initial analysis,
-                        // and for markers deleted, etc.  Can remove when we more completely
-                        // handle things in processResourceChangeDelta
-                        viewer.refresh();
-                    }
-                });
-            }
-        }
-        
-        protected void processResourceChangeDelta(IResourceDelta delta)
-        {
-            try {
-                delta.accept(visitor_);
-            }
-            catch(CoreException e) {
-                System.out.println("OpenMPProblemsView error in processResoruceChangeDelta");
-                e.printStackTrace();
-            }
-        }
-	}
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-        private HashMap   iconHash = new HashMap();
-        
-        public Image getColumnImage(Object obj, int index)
-        {
-            // we only put image icon in the first column
-            switch (index) {
-                case 0:
-                    return getCustomImage(obj);
-                default:
-                    return null;
-            }
-        }
-        protected Image getCustomImage(Object obj)
-        {
-            // if we've already created one of this type of icon, reuse it.
-            Image img = (Image) iconHash.get(iconName_);
-            if (img == null) {
-                Path path= new Path(iconName_);
-                // BRT make sure the specific plugin is being used here to find its OWN icons
-                URL url = thePlugin_.find(path);
-                ImageDescriptor id = ImageDescriptor.createFromURL(url);
-                img = id.createImage();
-                if (traceOn) System.out.println("ATV: ***** created image for " + iconName_);
-                iconHash.put(iconName_, img);// save for reuse
-            }
-            return img;
-        }
-        
-        public void dispose()
-        {
-            if (traceOn) System.out.println("ATV.ViewLabelProvider.dispose(); dispose of icon images");
-            for (Iterator iter = iconHash.values().iterator(); iter.hasNext();) {
-                Image img = (Image) iter.next();
-                img.dispose();
-            }
-            super.dispose();
-        }
-
-
-        /**
-         * Determine the text to go in each column
-         * 
-         * @param obj the Marker (we hope) that goes on the current row
-         * @param index the column number in the table
-         * 
-         */
-        public String getColumnText(Object obj, int index)
-        {
-            if (obj == null) {
-                System.out.println("ATV: LabelProv obj is null; index=" + index);
-                return "ATV obj null";
-            }
-            IMarker marker = (IMarker) obj;
-            try {
-                switch (index) {
-                    case 0:
-                        return "";
-                    case 1:
-                        String id = (String) marker.getAttribute(ProblemMarkerAttrIds.DESCRIPTION);
-                        return id;
-                    case 2:
-                        return (String) marker.getAttribute(ProblemMarkerAttrIds.RESOURCE);
-                    case 3:
-                        return (String) marker.getAttribute(ProblemMarkerAttrIds.INFOLDER);
-                    case 4:
-                        return ((Integer) marker.getAttribute((ProblemMarkerAttrIds.LOCATION))).toString();
-                    default:
-                        return "";
-                }
-            } catch (CoreException ce) {
-                return ("ViewLabelProvider.getColumnText error: "+ce);
-            }
-        }
-
-	}
-	class NameSorter extends ViewerSorter {
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				OpenMPProblemsView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(action1);
-		manager.add(new Separator());
-		//manager.add(action2);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(action1);
-		//manager.add(action2);
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-	
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(action1);
-		manager.add(removeMarkerAction);
-
-	}
-
-	private void makeActions() {
-        //makeShowInfoAction();
-		action1 = new Action() {
-			public void run() {
-				showMessage("Action 1 executed");
-			}
-		};
-		action1.setText("Action 1");
-		action1.setToolTipText("Action 1 tooltip");
-		action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-			getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-        
-        doubleClickAction = new GotoLineAction(this, viewer);
-        makeRemoveMarkerAction();
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-	/**
-	 * Make "remove marker" action to display artifact information
-	 */
-	protected void makeRemoveMarkerAction() {
-		removeMarkerAction = new Action() {
-			public void run() {
-				// batch changes so we get only one resource change event
-				final IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-				
-				IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
-					public void run(IProgressMonitor monitor) throws CoreException {
-					try {
-						int depth = IResource.DEPTH_INFINITE;
-						wsResource.deleteMarkers(markerID_,false,depth);
-						if(traceOn)
-							System.out.println("markers removed id="+markerID_);
-					} catch (CoreException e) {
-						System.out.println("RM: exception deleting markers.");
-						// e.printStackTrace();
-					}
-					}};
-					try {
-						runnable.run(null);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-
-				 
-			}//end run()
-		};// end new action
-		removeMarkerAction.setText("Remove Markers");
-		removeMarkerAction.setToolTipText("Remove all markers");
-		removeMarkerAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_TOOL_DELETE));// nice "red X" image
-
-	}
-	private void showMessage(String message) {
-		MessageDialog.openInformation(
-			viewer.getControl().getShell(),
-			"Sample View",
-			message);
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-    
-
-    /**
-     * Visit the resource delta to look for the marker changes we are interested in
-     * 
-     * @author Beth Tibbitts
-     */
-    public class UpdateVisitor implements IResourceDeltaVisitor
-    {
-
-        /**
-         * Visit appropriate parts of the resource delta to find the markers that changed that we care about.
-         * 
-         * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-         */
-        public boolean visit(IResourceDelta delta) throws CoreException
-        {
-            IResource resource = delta.getResource();
-            //String name = resource.getName();
-            if (resource.getType() == IResource.FILE) {
-                if (delta.getKind() == IResourceDelta.CHANGED) {
-                    //if (traceOn) System.out.println("UpdateVisitor: file changed: " + name);
-
-                    // Handle file changes (saves) by reporting the changes
-                    // made to the file, to update backend analysis
-                    // representation
-                    IFile f = (IFile) resource;
-                    int flags = delta.getFlags();
-                    int contentChanged = flags & IResourceDelta.CONTENT;
-
-                    if (validForAnalysis(f.getName())) {
-                        if (traceOn)
-                            System.out.println("File " + f.getName() + " is valid for analysis so will process the change...");
-                        if (contentChanged != 0) {
-                            // do we need to tell back end (analysis engine) that file changed?
-                        }
-
-                        // refresh markers for that file?
-                        IMarkerDelta[] mDeltas = delta.getMarkerDeltas();
-                        int len = mDeltas.length;
-                        for (int j = 0; j < len; j++) {
-                            IMarkerDelta delta3 = mDeltas[j];
-                            if (traceOn) showMarkerDeltaKind(delta3);
-                            IMarker m = delta3.getMarker();
-                            String ln = IMarker.LINE_NUMBER;
-                            if (traceOn) System.out.println("---UpdateVisitor.visit():viewer update marker: (lineNo)");
-                            // showMarker(m);
-                            String[] props = new String[1]; // awkward. why???
-                            props[0] = ln;
-                            // just update viewer item, not the whole view
-                            // viewer.refresh();
-                            viewer.update(m, props);
-                        } // end loop
-                    } else {
-                        if (traceOn)
-                            System.out.println("File " + f.getName() + " is NOT valid for analysis so will ignore change...");
-
-                    }
-                } // end if CHANGED
-                else if (delta.getKind() == IResourceDelta.ADDED) {
-                    //System.out.println("Resource added.");
-                    checkMarkerDeltas(delta);
-                } else if (delta.getKind() == IResourceDelta.REPLACED) {
-                    //System.out.println("Resource replaced.");
-                    checkMarkerDeltas(delta);
-                } else if (delta.getKind() == IResourceDelta.REMOVED) {
-                    //System.out.println("Resource removed.");
-                    checkMarkerDeltas(delta);
-                }
-            } // end if FILE
-            return true; // keep going
-        }
-
-        private void checkMarkerDeltas(IResourceDelta delta)
-        {
-            IMarkerDelta[] md1 = delta.getMarkerDeltas();
-            int len = md1.length;
-            //System.out.println("       ... found " + len + " markerDeltas.");
-        }
-
-        /**
-         * Show info about the marker in the marker delta. This is just tracing the info available until we do something
-         * with it. For now, we're just doing a (big) viewer.refresh() to refresh all the markers. When we get more
-         * intelligent about just updating the ones that changed, we can remove that. Shouldn't make much different for
-         * small sets of markers, but for many markers, this could be a significant performance improvement.
-         * 
-         * @param delta3
-         */
-        private void showMarkerDeltaKind(IMarkerDelta delta3)
-        {
-
-            String mid = "", ml = "", mlpi = "";
-            try {
-                // note: we're getting marker deltas on ALL markers,
-                // not just artifact markers, which can throw us off.
-                // in particular, temp markers used by actions?
-
-                //mid = m.getAttribute(uniqueID_).toString();
-                //ml = m.getAttribute(IMarker.LINE_NUMBER).toString();
-                //mlpi = m.getAttribute(IDs.LINE).toString();
-            } catch (Exception e1) {
-                // ignore errors; only tracing for now.
-                System.out.println("ATV.UpdateVisitor error getting marker info ");
-                e1.printStackTrace();
-            }
-            if (traceOn) System.out.println("    markerID_=" + mid + "  lineNo(mkr-mpiA)=" + ml + "-" + mlpi);
-        }
-
-    } // end class UpdateVisitor
-    
-    
-    // Action for dblclick and go to line
-    public static class GotoLineAction extends Action
-    {
-        protected   ViewPart   viewPart_ = null;
-        protected   Viewer     viewer_   = null;
-        
-        public GotoLineAction(ViewPart viewPart, Viewer viewer)
-        {
-            viewPart_ = viewPart;
-            viewer_   = viewer;
-        }
-        
-        public void run()
-        {
-            ISelection selection = viewer_.getSelection();
-            Object obj = ((IStructuredSelection)selection).getFirstElement();
-            IMarker marker = (IMarker) obj;
-            try {
-                OpenMPError error = (OpenMPError)marker.getAttribute(ProblemMarkerAttrIds.PROBLEMOBJECT);
-                if (error==null) return;
-                String filename = error.getPath()+"/"+error.getFilename(); 
-                
-                IResource r = ParserUtil.getResourceForFilename(filename);
-                IFile     f = (r instanceof IFile ? (IFile)r : null);
-                if (f==null)  return;
-                // IFile fakefile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(fqstr));
-                
-                IWorkbenchPage wbp = viewPart_.getSite().getPage();
-                IEditorPart editor = IDE.openEditor(wbp, f);
-                String      markerID = "org.eclipse.core.resource.textmarker";
-                IMarker     marker1 = f.createMarker(markerID);
-                marker1.setAttribute(IMarker.LINE_NUMBER, error.getLineno());
-                marker1.setAttribute(IMarker.LOCATION, filename);
-                  
-                IDE.gotoMarker(editor, marker1);
-                marker1.delete();
-            }
-            catch(Exception e) {e.printStackTrace();}
-         }
-    }
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java
deleted file mode 100644
index 1c71d9b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2007 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.ui.pv.views;
-
-
-/**
- * IDs for OpenMP problem markers
- */
-public class ProblemMarkerAttrIds
-{
-    
-    /** identifies the OpenMP Error marker */
-    public static final String MARKER_ERROR_ID       = "org.eclipse.ptp.pldt.openmp.ui.pv.openMPProblemMarker";
- 
-    
-    /** Marker id for storage of additional information about the artifact */
-    public static final String   DESCRIPTION        = "description";
-    /** Marker ID for storage of the filename in which the artifact is found */
-    public static final String   RESOURCE           = "resource";
-    /** Marker ID for folder in which artifact is found */
-    public static final String   INFOLDER           = "infoldername";
-    /** Marker ID for location (line number) in which the artifact is found */
-    public static final String   LOCATION           = "location";
-    /** Marker ID that holds the problem object                           */
-    public static final String   PROBLEMOBJECT      = "problem";
-
-}

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/pldt/org.eclipse.ptp.pldt.wizards/.classpath b/tools/pldt/org.eclipse.ptp.pldt.wizards/.classpath
deleted file mode 100644
index a7d8b40..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/MPIProjectSetupRunnable.java" 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.wizards/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.wizards/.cvsignore
deleted file mode 100644
index fb97fc4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-@dot
-notes.txt

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/.project b/tools/pldt/org.eclipse.ptp.pldt.wizards/.project
deleted file mode 100644
index df257b3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.wizards</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</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.wizards/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.wizards/META-INF/MANIFEST.MF
deleted file mode 100644
index fd36b7d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.wizards;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.ptp.pldt.wizards.MpiWizardsPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.managedbuilder.ui,
- org.eclipse.cdt.managedbuilder.core,
- org.eclipse.cdt.core,
- org.eclipse.core.resources,
- org.eclipse.ptp.pldt.mpi.core,
- org.eclipse.ptp.pldt.common,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.openmp.core
-Eclipse-AutoStart: true
-Import-Package: org.eclipse.cdt.ui.wizards,
- org.eclipse.ui.wizards.newresource
-Export-Package: org.eclipse.ptp.pldt.wizards,
- org.eclipse.ptp.pldt.wizards.wizardPages

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/about.html b/tools/pldt/org.eclipse.ptp.pldt.wizards/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/about.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties
deleted file mode 100644
index 5a9a7c3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Texas Instruments Incorporated and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Texas Instruments - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               META-INF/,\
-               .,\
-               samples/,\
-               templates/,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.properties
deleted file mode 100644
index 28c7e24..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Parallel Language Development Tools New Project Wizards
-pluginProvider=Eclipse.org

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml
deleted file mode 100644
index c565667..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml
+++ /dev/null

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-      <extension point="org.eclipse.cdt.core.templates">
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.MPIhelloWorldCProject"
-            location="templates/MPIhelloWorldCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-                  filterPattern=".*"
-                  id="org.eclipse.ptp.pldt.projects.MPIpiCProject"
-                  location="templates/MPIpiCproject/template.xml"
-                  pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPages"
-                  projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-                  filterPattern=".*"
-                  id="org.eclipse.ptp.pldt.projects.MPIpiCPPproject"
-                  location="templates/MPIpiCPPproject/template.xml"
-                  pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPagesCPP"
-                  projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.MPIemptyCproject"
-            location="templates/MPIemptyCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.OpenMPhelloWorldCProject"
-            location="templates/OpenMPhelloWorldCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.OpenMPemptyCproject"
-            location="templates/OpenMPemptyCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-   
-   </extension>
-      <extension point="org.eclipse.cdt.core.templateProcessTypes">
-         <processType
-               name="mpiProjectProcess"
-               processRunner="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcess">
-         </processType>
-         <processType
-               name="openMPProjectProcess"
-               processRunner="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectProcess">
-         </processType>
-         <processType
-               name="mpiProjectProcessCPP"
-               processRunner="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessCPP">
-         </processType>
-      </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/samples/testMPI.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/samples/testMPI.c
deleted file mode 100644
index efa16ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/samples/testMPI.c
+++ /dev/null

@@ -1,47 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-int main(int argc, char* argv[]){
-	printf("Hello MPI PTP World!\n");	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-	}
-	else{
-		printf("From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java
deleted file mode 100644
index 829df64..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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 Research - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class for PLDT Wizards (MPI & OpenMP)
- * 
- * @author Beth Tibbitts
- */
-public class MpiWizardsPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static MpiWizardsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public MpiWizardsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static MpiWizardsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = MpiWizardsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.managedbuilder.ui.tests.TestsPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.cdt.managedbuilder.ui.tests", path);
-	}
-
-	public static String getPluginId() {
-		return "org.eclipse.ptp.pldt.wizards";
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java
deleted file mode 100644
index 3283cf2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corp. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.cdt.ui.templateengine.AbstractWizardDataPage;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Common behavior between the different PLDT new project wizard pages
- * @author beth
- *
- */
-public abstract class AbstractProjectWizardPage extends AbstractWizardDataPage{
-
-	protected IPreferenceStore preferenceStore;
-	protected IPreferencePage preferencePage;
-	protected String prefIDincludes;
-
-	public AbstractProjectWizardPage(String string) {
-		super(string);
-	}
-	/**
-	 * Inform the user that PLDT preferences have not been set, and offer to set them now,
-	 * and return the include path.
-	 * @param type - e.g. "MPI" or "OpenMP" the type of preferences that aren't set
-	 * @return
-	 */
-	protected  String showNoPrefs(String type, String prefID) {
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		
-		//IPreferencePage pp = new MPIPreferencePage();
-		//MessageDialogWithLink md = new MessageDialogWithLink(shell,"MPI", "MPI preferences have not been set. Click below to do it now.","Click here to add MPI preferencess now",pp);
-		//int result = md.open();
-		
-		String msg = type+" Preferences have not been set.  Do you want to set them now?";
-		boolean doit = MessageDialog.openQuestion(shell, "No "+type+" Preferences", msg);
-		if(doit) {
-			showPreferenceDialog(type);
-		}
-		String mip = preferenceStore.getString(prefID);
-		return mip;
-	}
-	private void showPreferenceDialog(String type) {
-		PreferenceManager mgr = new PreferenceManager();
-		IPreferencePage preferencePage = getPreferencePage();
-		preferencePage.setTitle(type);
-		IPreferenceNode node = new PreferenceNode("1", preferencePage);
-		mgr.addToRoot(node);
-		Shell shell = Display.getCurrent().getActiveShell();
-		PreferenceDialog dialog = new PreferenceDialog(shell, mgr);
-		dialog.create();
-		// must do dialog.create() before setting message
-		dialog.setMessage(preferencePage.getTitle()); 
-		dialog.open();
-	}
-	abstract IPreferencePage getPreferencePage();
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java
deleted file mode 100644
index fe1c43f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java
+++ /dev/null

@@ -1,540 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2008 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.cdt.core.templateengine.TemplateCore;
-import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
-import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
-import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
-import org.eclipse.cdt.managedbuilder.core.BuildException;
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.core.IOption;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.pldt.wizards.MpiWizardsPlugin;
-
-/**
- * 
- * After the MPIProjectWizardPage runs, and we get MPI include path from the user,
- * we have this opportunity to use that information to modify the include paths, build cmd,  etc.
- * in the project
- * 
- * <p>This handles plain C projects; MPIProjectProcessCPP extends this to handle C++ projects
- * 
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcess extends ProcessRunner {
-	private static final boolean traceOn=false;
-	private boolean wizTraceOn=MPIProjectWizardPage.wizardTraceOn;
-	//private static final templateID=
-
-	protected Map<String,String> valueStore;
-	
-	@Override
-	public void process(TemplateCore template, ProcessArgument[] args,
-			String processId, IProgressMonitor monitor)
-			throws ProcessFailureException {
-		if(wizTraceOn)System.out.println("MPIProjectProcess().run()...");
-		
-		valueStore= template.getValueStore();
-		String pageID = MPIProjectWizardPage.PAGE_ID;
-
-		Object obj = getNewPropValue(pageID, MPIProjectWizardPage.DO_MPI_INCLUDES, null);
-		// use the default value if nothing was set in the pageData by the user
-		boolean doMpiIncludes = MPIProjectWizardPage.getDefaultUseMpiIncludes();
-		if (obj != null)
-			doMpiIncludes = Boolean.valueOf((String) obj);
-		if (!doMpiIncludes) {
-			if (traceOn)
-				System.out.println("Do not save MPI info in this project.");
-			return;
-		}
-
- 		// this process must be executed after a separate process which creates the project
-		IProject proj= ResourcesPlugin.getWorkspace().getRoot().getProject(valueStore.get("projectName"));
-		if(!proj.exists()) {
-			System.out.println("Project does not exist!. Quitting. No MPI info added to project.");
-			return;	
-		}
-
-		if(traceOn)System.out.println("Project: " + proj.getName());
-
-		// Collect the values that the user entered on the wizard page
-		String propID = MPIProjectWizardPage.INCLUDE_PATH_PROP_ID;
-		String newIncludePath = getNewPropValue(pageID, propID,"c:/mpich2/include");
-		if(traceOn)System.out.println("Got prop: "+propID+"="+newIncludePath);
-		
-		propID = MPIProjectWizardPage.LIB_PROP_ID;
-		String newLib=getNewPropValue(pageID,propID,"lib");
-		
-		propID=MPIProjectWizardPage.LIBRARY_SEARCH_PATH_PROP_ID;
-		String newLibSearchPath=getNewPropValue(pageID,propID,"c:/mpich2/lib");
-		
-		propID=MPIProjectWizardPage.MPI_COMPILE_COMMAND_PROP_ID;
-		String mpiCompileCommand=getNewPropValue(pageID,propID,"mpicc");
-		
-		propID=MPIProjectWizardPage.MPI_LINK_COMMAND_PROP_ID;
-		String mpiLinkCommand=getNewPropValue(pageID,propID,"mpicc");
-
-		IManagedBuildInfo info = null;
-		try {
-			info = ManagedBuildManager.getBuildInfo(proj);
-			// note: assumed null if this is not a managed build project? will we get here in that case?
-			if(traceOn)System.out.println("Build info: " + info);
-		} catch (Exception e) {
-			System.out.println("MPIProjectProcess.run(), "+e.getMessage());
-			e.printStackTrace();
-			return;
-		}
-		assert(info!=null);
-		
-		IManagedProject mProj = info.getManagedProject();
-		if(traceOn)showOptions(mProj);
-		
-		// add the include path, linker, build cmd, etc.  values to all the configurations
-		IConfiguration[] configs = mProj.getConfigurations();
-		for (int i = 0; i < configs.length; i++) {
-			IConfiguration cf = configs[i];
-			if(traceOn)System.out.println("Config " + i + ": " + cf.getName());
-			addIncludePath(cf, newIncludePath);
-			addLinkerOpt(cf,newLib,newLibSearchPath);
-			setCompileCommand(cf,mpiCompileCommand);
-			setLinkCommand(cf,mpiLinkCommand);		
-		}
-		if(traceOn)System.out.println("MPIProjectProcess, newIncludePath: "+newIncludePath);
-		if(traceOn)System.out.println("   newLib: "+newLib+"  newLibSrchPth: "+newLibSearchPath);
-		if(traceOn)System.out.println("   compileCmd: "+mpiCompileCommand);
-		if(traceOn)System.out.println("   linkCmd: "+mpiLinkCommand);
-		// ManagedBuildManger.saveBuildInfo(...) assures that the
-		// values are persisted in the build model, otherwise they will
-		// be lost when you shut down Eclipse.
-		if(traceOn)System.out.println("ManagedBuildManager.saveBuildInfo...");
-		
-		ManagedBuildManager.saveBuildInfo(proj, true);
-
-	}
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = MpiWizardsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Get a value that was possibly obtained from the user on the associated wizard page.
-	 * @param pageID The pageID for our wizard page
-	 * @param propID The propID of the value we want
-	 * @param defaultVal The default value to use if the user didn't select anything,
-	 * or if we haven't gotten around to LETTING the user select anything yet.
-	 * @return
-	 */
-	protected String getNewPropValue(String pageID, String propID, String defaultVal) {
-		Object obj = valueStore.get(pageID+MPIProjectWizardPage.DOT+propID);
-		// if selection made on page, obj is non-null.
-		String newValue = defaultVal;
-		String msg=" ( used default value)";
-		if (obj != null) {
-			newValue = obj.toString();
-			msg="";
-		}
-		if(traceOn)System.out.println("propID=" + propID + "  value=" + newValue+msg);
-		return newValue;
-	}
-
-
-	/**
-	 * Add an include path for C compiling to the existing include paths of the given
-	 * Configuration.  XLC is handled as a special case to find its include path option;
-	 * for other tools, we assume there is a single option for include paths, so we take
-	 * the first one.
-	 * 
-	 * @param cf
-	 *            the configuration of the project (e.g. Release, Debug, etc.)
-	 * @param newIncludePath
-	 *            include path(s) to add.  If more than one, separate by
-	 *            java.io.File.pathSeparator, which is semicolon for Windows, colon for Mac/Linux
-	 */
-	protected void addIncludePath(IConfiguration cf, String newIncludePath) {
-		// note: could be > 1 path in 'newIncludePath'
-		String ext = "c";
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-
-		//String id = cfTool.getId(); // "cdt.managedbuild.tool.xlc.c.compiler.exe.debug.1423270745"
-		String name = cfTool.getName();// "XL C Compiler"
-		IOption option = null;
-		if (name.startsWith("XL C")) { // special case for XL C compiler
-			option = cfTool.getOptionById("xlc.c.compiler.option.include.paths");
-		} else { // otherwise we assume there is only one include path option.
-			option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-		}
-		if (option != null) {
-			String[] includePaths = null;
-			try {
-				includePaths = option.getIncludePaths();
-			} catch (BuildException e) {
-				e.printStackTrace();
-			}
-			String[] newIncludePaths = add(includePaths, newIncludePath);
-			if (traceOn)
-				System.out.println("        add " + newIncludePath + " to existing includePaths: "
-						+ unroll(includePaths));
-			ManagedBuildManager.setOption(cf, cfTool, option, newIncludePaths);
-		}
-		else{
-			System.out.println("MPIProjectProcess, no option for include paths found.");
-		}
-	}
-
-
-	/**
-	 * Add a new linker option.  Assumes that there is ONE instance of an option
-	 * of type <code>IOption.LIBRARY_PATHS</code> and <code>IOption.LIBRARIES</code>.
-	 * This method adds the libName and libPath to these two options.
-	 * @param cf the Configuration to which we want to add to linker options
-	 * @param libName the lib name (e.g. "lib")
-	 * @param libPath the library search path name (e.g. "c:/mypath/lib")
-	 * 
-	 */
-	protected void addLinkerOpt(IConfiguration cf, String libName, String libPath) {
-		String ext = "o";
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-
-		IOption lpOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARY_PATHS);
-		addOptionValue(cf, cfTool, lpOpt, libPath);
-
-		IOption libOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARIES);
-		addOptionValue(cf, cfTool, libOpt, libName);
-	}                                                                                                                     
-
-	
-	protected void setCompileCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("compile cmd: "+buildCmd);
-		ITool compiler = cf.getToolFromInputExtension("c");
-		compiler.setToolCommand(buildCmd);
-	}
-	
-	protected void setLinkCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("link cmd: "+buildCmd);
-		ITool linker=cf.getToolFromInputExtension("o");
-		linker.setToolCommand(buildCmd);
-		
-	}
-	
-	/**
-	 * Add a value to a multi-valued tool option<br>
-	 * (For example, add a path to include paths, or a lib to libraries list)
-	 * @param cf the Configuration
-	 * @param tool the tool in which to update the option
-	 * @param option the option to update 
-	 * @param value the new value to add to the list of existing values in the option
-	 */
-	protected void addOptionValue(IConfiguration cf, ITool tool, IOption option, String value) {
-		try {
-			int type = option.getValueType();
-			String[] valueList = null;
-			switch (type) {
-			case IOption.INCLUDE_PATH:
-				valueList = option.getIncludePaths();
-				valueList = add(valueList,value);
-				break;
-			case IOption.LIBRARIES:
-				valueList = option.getLibraries();
-				valueList=addNotPath(valueList, value);
-				break;
-			case IOption.LIBRARY_PATHS:// this is type for library search path cdt 4.0 
-				valueList=option.getBasicStringListValue();
-				valueList=addNotPath(valueList,value);
-				break;
-			
-			default:
-				System.out.println("MPIProjectWizard Process postprocessing (MPIProjectProcess), can't get type of option for " + option.getName());
-				return;
-			}
-			// update the option in the managed builder options
-			ManagedBuildManager.setOption(cf, tool, option, valueList);
-
-		} catch (BuildException e) {
-			System.out.println("MPIProjectProcess.addOptionValue(), "+e.getMessage());
-			System.out.println(e.getMessage());
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Print the options for a project.<br>
-	 * e.g. for Debug and Release configurations, get all the tools (compiler, linker etc.) then for each tool, 
-	 * get all the options and print them.
-	 * 
-	 * IResource resource= ... ;// can be any resource, I use project.
-     * IManagedBuildInfo mbo = ManagedBuildManager.getBuildInfo(resource);
-     * IManagedProject mp=mbo.getManagedProject();
-	 * <br>
-	 * This helps in figuring out what they are, and what you want to change.
-	 * Some sample output is at the bottom of this file.
-	 * 
-	 * @param proj the (managed) project for which print all this stuff.
-	 */
-	protected void showOptions(IManagedProject proj) {
-		if(traceOn)System.out.println("Managed Project: "+proj.getName());
-		if(traceOn)System.out.println("Path.SEPARATOR="+Path.SEPARATOR);
-		if(traceOn)System.out.println("Path.DEVICE_SEPARATOR="+Path.DEVICE_SEPARATOR);
-		IConfiguration[] configs = proj.getConfigurations();
-		try {
-			for (int i = 0; i < configs.length; i++) {
-				IConfiguration cf = configs[i];
-				ITool[] allTools = cf.getTools();
-
-				int numTools = allTools.length;
-				System.out.println("Config " + i + ": " + cf.getName()+ " has "+numTools+" tools.");
-
-				for (int k = 0; k < allTools.length; k++) {
-					ITool tool = allTools[k];
-					System.out.println("  Tool " + k + ": " + tool.getName());
-					//boolean rc=tool.setToolCommand("foo");
-					String toolCmd=tool.getToolCommand();
-					String toolID=tool.getId();
-					System.out.println("  cmd="+toolCmd+"  toolID="+toolID);
-					
-					
-					IOption[] options = tool.getOptions();
-
-					for (int j = 0; j < options.length; j++) {
-						IOption opt = options[j];
-						String foundOptionID = opt.getId();
-						int type=opt.getValueType();
-						System.out.println("    option " + j + " " + opt.getName() + " id="
-								+ foundOptionID+"  type="+showType(type));
-						if(opt.getValueType()==IOption.INCLUDE_PATH) {
-							showIncludePaths(opt);
-						}
-					}
-				}
-
-				System.out.println("Config " + i + ": " + cf.getName()
-						+ "======= End of ALL tools ");
-				
-				// another way to access Tool
-				String ext = "c";
-				ITool cfTool = cf.getToolFromInputExtension(ext);
-				System.out.println("Tool by ext: " + ext + " is: " + cfTool.getName());
-				
-				// Look for include path
-				IOption option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-				if (option != null) {
-					String oname = option.getName();
-					System.out.println("Option " + option.getId() + " is " + oname);
-					showIncludePaths(option);
-				}
-				else System.out.println("No include path option found. ");
-
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-	protected String showType(int type){
-		if(type==IOption.INCLUDE_PATH) return type+" (IOption.INCLUDE_PATH)";
-		if(type==IOption.LIBRARY_PATHS) return type+" (IOption.LIBRARY_PATHS)";
-		if(type==IOption.LIBRARIES)     return type+" (IOption.LIBRARIES)";
-		return type+" ";
-	}
-
-	/**
-	 * Display the list of include paths in an option which is presumed
-	 * to be the include paths option.
-	 * @param opt
-	 * @throws BuildException
-	 */
-	protected void showIncludePaths(IOption opt) throws BuildException {
-		assert opt.getValueType() == IOption.INCLUDE_PATH ;
-		// if the option is a list of include paths, display them.
-		String[] includePaths = opt.getIncludePaths();
-		for (int index = 0; index < includePaths.length; index++) {
-			String path = includePaths[index];
-			System.out.println("   include path " + index + ": " + path);
-		}
-
-	}
-
-	/**
-	 * Add one or more paths to the list of paths
-	 * 
-	 * @param existingPaths the existing list of paths to add to
-	 * @param newPath the new path to add; may be >1 directory, with path delimiter java.io.File.pathSeparator 
-	 * (usually semicolon or colon)
-	 * @return the merged list
-	 */
-	protected String[] add(String[] existingPaths, String newPath) {
-		String pathSep=java.io.File.pathSeparator;  // semicolon for windows, colon for Mac/Linux
-		List<String> newPathList = new ArrayList<String>();
-		String path;
-		for (int i = 0; i < existingPaths.length; i++) {
-			path = existingPaths[i];
-			newPathList.add(path);
-		}
-		String[] newPathArray=newPath.split(pathSep);
-		for (int i = 0; i < newPathArray.length; i++) {
-			path = newPathArray[i];
-			newPathList.add(path);
-		}
-		
-		String[] newArray=(String[])newPathList.toArray(new String[0]);
-		return newArray;
-	}
-
-	/**
-	 * Add a single string to an array of strings
-	 * @param strList
-	 * @param newStr
-	 * @return
-	 */
-	protected String[] addNotPath(String[] strList, String newStr) {
-		int len = strList.length;
-		String newList[] = new String[len + 1];
-		System.arraycopy(strList, 0, newList, 0, len);
-		newList[len] = newStr;
-		return newList;
-	}
-	/**
-	 * Simple string representation of items in a string array
-	 * @param list
-	 * @return
-	 */
-	protected String unroll (String[] list){
-		StringBuffer result=new StringBuffer();
-		//list = new String[]{"one","two"};
-		//System.out.println(list);
-		for (int i = 0; i < list.length; i++) {
-			String string = list[i];
-			result.append(string);
-			result.append(", ");
-		}
-		if (result.length() > 2) {
-			result.delete(result.length() - 2, result.length() - 1);
-		}
-		return result.toString();
-	}
-	/**
-	 * Get the options of a specific type.<br>
-	 * We really need an ITool.getOptionsByType(int) so we don't have to do
-	 * this.
-	 * 
-	 * @param cf
-	 *            the IConfiguration in which to search
-	 * @param cfTool
-	 *            the ITool whose options are being searched
-	 * @param optionType
-	 *            the option type we are looking for, e.g. IOption.SOMETHING
-	 * @return
-	 */
-	protected List<IOption> getOptionsByType(IConfiguration cf, ITool cfTool, int optionType) {
-
-		// run thru ALL options and check type for each, returning the ones that match
-		IOption[] allOptions = cfTool.getOptions();
-		List<IOption> foundOptions = new ArrayList<IOption>();
-
-		for (int i = 0; i < allOptions.length; i++) {
-			IOption option = allOptions[i];
-
-			int oType = 0;
-			try {
-				oType = option.getValueType();
-			} catch (BuildException e) {
-				e.printStackTrace();
-				continue;
-			}
-			if (optionType == oType) {
-				// add it to the list
-				foundOptions.add(option);
-			}
-
-		}
-		//IOption[] ret= foundOptions.toArray(new IOption[foundOptions.size()]);
-		return foundOptions;
-	}
-	/**
-	 * Returns the <i>first</i> option of the specified type from the tool
-	 * @param cf
-	 * @param cfTool
-	 * @param optionType
-	 * @return
-	 */
-	protected IOption getFirstOptionByType(IConfiguration cf, ITool cfTool, int optionType){
-		List<IOption> allOptions=getOptionsByType(cf,cfTool,optionType);
-		if(allOptions.size()>0){
-			return allOptions.get(0);
-		}
-		return null;
-	}
-}
-
-/**
- * 
- * Some sample tool data from showOptions() on Windows XP with cygwin Tool 1:
- * GCC C Compiler
- * <p>
- * 
- * option 0 Do not search system directories (-nostdinc)
- * id=gnu.c.compiler.option.preprocessor.nostdinc<br>
- * option 1 Preprocess only (-E)
- * id=gnu.c.compiler.option.preprocessor.preprocess<br>
- * option 2 Defined symbols (-D)
- * id=gnu.c.compiler.option.preprocessor.def.symbols<br>
- * option 3 Undefined symbols (-U)
- * id=gnu.c.compiler.option.preprocessor.undef.symbol<br>
- * option 4 Include paths (-I) id=gnu.c.compiler.option.include.paths<br>
- * option 5 Optimization Level
- * id=gnu.c.compiler.cygwin.exe.release.option.optimization.level<br>
- * option 6 Other optimization flags id=gnu.c.compiler.option.optimization.flags<br>
- * option 7 Debug Level
- * id=gnu.c.compiler.cygwin.exe.release.option.debugging.level<br>
- * option 8 Other debugging flags id=gnu.c.compiler.option.debugging.other<br>
- * option 9 Generate gprof information (-pg)
- * id=gnu.c.compiler.option.debugging.gprof<br>
- * option 10 Generate prof information (-p)
- * id=gnu.c.compiler.option.debugging.prof<br>
- * option 11 Check syntax only (-fsyntax-only)
- * id=gnu.c.compiler.option.warnings.syntax<br>
- * option 12 Pedantic (-pedantic) id=gnu.c.compiler.option.warnings.pedantic<br>
- * option 13 Pedantic warnings as errors (-pedantic-errors)
- * id=gnu.c.compiler.option.warnings.pedantic.error<br>
- * option 14 Inhibit all warnings (-w) id=gnu.c.compiler.option.warnings.nowarn<br>
- * option 15 All warnings (-Wall) id=gnu.c.compiler.option.warnings.allwarn<br>
- * option 16 Warnings as errors (-Werror)
- * id=gnu.c.compiler.option.warnings.toerrors<br>
- * option 17 Other flags id=gnu.c.compiler.option.misc.other<br>
- * option 18 Verbose (-v) id=gnu.c.compiler.option.misc.verbose<br>
- * option 19 Support ANSI programs (-ansi) id=gnu.c.compiler.option.misc.ansi<br>
- * 
- * Tool 2: GCC C Linker <br>
- * option 5 Libraries (-l) id=gnu.c.link.option.libs<br>
- * option 6 Library search path (-L) id=gnu.c.link.option.paths<br>
- * 
- */
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java
deleted file mode 100644
index 364bdd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * 
- * After the MPIProjectWizardPageCPP runs, and we get MPI include path from the user,
- * we have this opportunity to use that information to modify the include paths, build cmds etc.
- * in the project
- * 
- * <p>This handles the special differences for C++ projects, over and above plain C projects.
- * 
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcessCPP extends MPIProjectProcess {
-	
-	private static final boolean traceOn=false;
-
-	/**
-	 * Need to set both C and C++ build commands; the C++ build command is passed in as an arg.
-	 * The C build command was not solicited from the user on the wizard page, so we just
-	 * get the default value to use here.
-	 * <p>C++ projects use both a C build command and a C++ build command in their settings.
-	 */
-	protected void setCompileCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("compile cmd: "+buildCmd);
-		// access the preference store from the MPI plugin so we can get c compiler too
-		IPreferenceStore preferenceStore = MpiPlugin.getDefault().getPreferenceStore();
-		String c_build_cmd = preferenceStore.getString(MpiIDs.MPI_BUILD_CMD);
-		
-		// 'buildCmd' arg we assume to be the same as cpp_build_cmd unless the user changed it in the wizard page, so we use that
-		// and so we don't use this
-		//String cpp_build_cmd = preferenceStore.getString(MpiIDs.MPI_CPP_BUILD_CMD);
-		
-		ITool c_compiler = cf.getToolFromInputExtension("c");
-		ITool cpp_compiler = cf.getToolFromInputExtension("cpp");	
-		
-		c_compiler.setToolCommand(c_build_cmd);
-		cpp_compiler.setToolCommand(buildCmd);
-		if(traceOn)System.out.println("C compiler cmd: "+c_build_cmd+"  C++ compiler cmd: "+buildCmd);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java
deleted file mode 100644
index f27778d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *********************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider;
-import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * Wizard Pages for MPI C projects
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcessPages implements IPagesAfterTemplateSelectionProvider {
-	IWizardDataPage[] pages;
-	
-	public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard,
-			IWorkbench workbench, IStructuredSelection selection) {
-		try {
-			pages= new IWizardDataPage[] {new MPIProjectWizardPageC()};
-			// TODO - log error
-		} catch(CoreException ce) {
-			pages= new IWizardDataPage[0];
-		}
-		return pages;
-	}
-
-	public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) {
-		return pages;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java
deleted file mode 100644
index 08bb5bc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *********************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider;
-import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * Wizard Pages for MPI C++ projects as opposed to C projects
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcessPagesCPP implements IPagesAfterTemplateSelectionProvider {
-	IWizardDataPage[] pages;
-	
-	public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard,
-			IWorkbench workbench, IStructuredSelection selection) {
-		try {
-			pages= new IWizardDataPage[] {new MPIProjectWizardPageCPP()};
-			// TODO - log error
-		} catch(CoreException ce) {
-			pages= new IWizardDataPage[0];
-		}
-		return pages;
-	}
-
-	public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) {
-		return pages;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java
deleted file mode 100644
index c90306f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java
+++ /dev/null

@@ -1,713 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corp. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ptp.pldt.mpi.core.prefs.MPIPreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Wizard Page for collecting info about MPI project - appended to end of
- * "C project" or "C++ project" wizard.
- * 
- * Abstract class encapsulates common behavior between C and C++ 
- * <p>
- * TODO remove dup code, share MPI&OpenMP version in a common class etc.
- * @author Beth Tibbitts
- * 
- */
-public abstract class MPIProjectWizardPage extends AbstractProjectWizardPage {
-	public static final String DOT = ".";
-	private static final boolean traceOn=false;
-	public static final boolean wizardTraceOn=false;
-
-	private Composite composite;
-	public static final String PAGE_ID="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectWizardPage";
-
-	// The following are IDs for storing info in MBSPageData so it can be retrieved in MpiProjectProcess (ProcessRunner)
-	// when the wizard is done.
-	/**
-	 * Store in MBSPageData  (with this ID) whether user wants to include MPI info in the project.
-	 */
-	public static final String DO_MPI_INCLUDES = "doMPIincludes";
-	/**
-	 * store in MBSPageData (with this ID) what the include path to MPI will be.
-	 */
-	public static final String INCLUDE_PATH_PROP_ID = "includePath";
-	/**
-	 * store in MBSPageData (with this ID) what the library name for the linker is.
-	 */
-	public static final String LIB_PROP_ID = "lib";
-	/**
-	 * store in MBSPageData (with this ID) what the library search path is.
-	 */
-	public static final String LIBRARY_SEARCH_PATH_PROP_ID = "libPath";
-	
-	public static final String MPI_COMPILE_COMMAND_PROP_ID = "mpiCompileCommand";
-	public static final String MPI_LINK_COMMAND_PROP_ID = "mpiLinkCommand";
-
-	private String currentMpiIncludePath;
-	private String currentLibName;
-	private String currentLibPath;
-	private String currentMpiCompileCommand;
-	private String currentMpiLinkCommand;
-
-	private String defaultMpiIncludePath;
-	private String defaultMpiLibName;
-	private String defaultMpiLibPath;
-	private String defaultMpiBuildCommand;
-	
-	private Text includePathField;
-	private Text libNameField;
-	private Text libPathField;
-	private Text mpiCompileCommandField, mpiLinkCommandField;
-	
-	private Label includePathLabel, libLabel, libPathLabel, mpiCompileCommandLabel, mpiLinkCommandLabel;
-
-	private Button browseButton;
-	private Button browseButton2;
-
-	private Button useDefaultsButton;
-	private Button useMpiProjectSettingsButton;
-	private static boolean defaultUseMpiIncludes=true;
-	
-	private Button mpiSampleButton;
-
-
-
-	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-	/**
-	 * By default we DO use MPI project settings in this project.<br>
-	 */
-	private boolean useMpiProjectSettings=true;
-	private String desc = "MPI Project Page";
-	
-	public static final String MPI_PROJECT_TYPE_C="C";
-	public static final String MPI_PROJECT_TYPE_CPP="C++";
-	
-	/**
-	 * The CDT new project wizard page for MPI projects.  
-	 * Adds the include paths, library information, etc. for an MPI project.
-	 * @throws CoreException 
-	 * 
-	 */
-	public MPIProjectWizardPage() throws CoreException {
-		super("MPI Project Settings");
-		prefIDincludes=MpiIDs.MPI_INCLUDES;
-		if(wizardTraceOn)System.out.println("MPIProjectWizardPage().ctor...");
-
-		//CommonPlugin.log(IStatus.ERROR,"Test error");
-		//CommonPlugin.log(IStatus.WARNING,"Test warning");
-		
-		// access the preference store from the MPI plugin
-		preferenceStore = MpiPlugin.getDefault().getPreferenceStore();
-		String mip=preferenceStore.getString(prefIDincludes);
-		if(traceOn)System.out.println("Got mpi include pref from other plugin: "+mip);
-
-		// Set the defaults here in the wizard page constructor and just
-		// overwrite them if the user changes them.
-		defaultMpiIncludePath = mip;
-		if(defaultMpiIncludePath.length()==0) {
-			// warn if no MPI preferences have been set and allow user to set them right there
-			String newMip=showNoPrefs("MPI",prefIDincludes);
-			defaultMpiIncludePath=newMip;
-		}
-		setDefaultOtherNames(defaultMpiIncludePath);
-		// the following sets what will be remembered when we leave the page.
-		setCurrentMpiIncludePath(defaultMpiIncludePath);
-
-		// defaultMpiBuildCommand depends on project type (will be different for C vs C++ for example)
-		defaultMpiBuildCommand=getDefaultMpiBuildCommand();
-		setCurrentMpiCompileCommand(defaultMpiBuildCommand);
-		setCurrentMpiLinkCommand(defaultMpiBuildCommand);		
-	}
-
-	abstract protected String getDefaultMpiBuildCommand();
-
-	/**
-	 * Warn user that the MPI project preferences aren't set, and thus the new project wizard will not be very useful.
-	 * <br>
-	 */
-	private static boolean alreadyShown;
-	@SuppressWarnings("unused")
-	private static void showNoPrefs1() {
-		if(!alreadyShown) {
-			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			StringBuffer buf=new StringBuffer("No MPI Preferences set; ");
-			buf.append("Default project setting will be more useful if MPI preferences are set first. ");
-			buf.append("\nUse Window > Preferences and select Parallel Language Development Tools, which may be under PTP preferences.");
-			buf.append("You can cancel out of new project wizard to enter MPI preferences now.");
-			MessageDialog.openWarning(shell, "No MPI Preferences set", buf.toString());
-			alreadyShown= true;
-		}
-	}
-
-	/**
-	 * Set the default lib name and lib path based on what the 
-	 * include path is.  We assume something like
-	 * <code>mpiIncludepath=/my/path/include</code>
-	 * in which case we set
-	 * <code>libName="lib" </code>and <code> defaultMpiLibPath=/my/path/lib</code>.
-	 * <p>
-	 * Also, set the initial default values in the MBS page data,
-	 * so if user changes nothing on this page, the default values
-	 * will be picked up.
-	 * 
-	 * @param mpiIncludePath
-	 */
-	private void setDefaultOtherNames(String mpiIncludePath) {
-		defaultMpiLibName="mpi";
-		setCurrentMpiLibName(defaultMpiLibName);
-		
-		// if >1 path in mpi include path, use just the first
-		// one to guess at the libpath
-		String tempPath=mpiIncludePath;
-		int sepLoc=tempPath.indexOf(java.io.File.pathSeparatorChar);
-		if(-1!=sepLoc) {
-			tempPath=mpiIncludePath.substring(0, sepLoc);
-		}
-		IPath path = Path.fromOSString(tempPath);
-		path=path.removeLastSegments(1);
-		path=path.addTrailingSeparator();
-
-		defaultMpiLibPath=path.toString()+"lib";
-		//System.out.println("defaultMpiLibPath="+defaultMpiLibPath);
-		setCurrentMpiLibPath(defaultMpiLibPath);
-		
-		//standardize format for mpi include path, too
-		path = Path.fromOSString(mpiIncludePath);
-		String temp=path.toString();
-		temp=stripTrailingSeparator(temp);
-		defaultMpiIncludePath=temp;
-		setCurrentMpiIncludePath(defaultMpiIncludePath);	
-			
-		setCurrentMpiCompileCommand(defaultMpiBuildCommand);
-	}
-
-	/**
-	 * This sets what will be remembered for MPI include path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentMpiIncludePath(String path) {
-		currentMpiIncludePath = path;
-		pageData.put(PAGE_ID+DOT+INCLUDE_PATH_PROP_ID, path);
-	}
-	/**
-	 * This sets what will be remembered for library name when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentMpiLibName(String name) {
-		currentMpiIncludePath = name;
-		pageData.put(PAGE_ID+DOT+LIB_PROP_ID, name);
-	}
-	
-	Map<String, String> pageData= new HashMap<String, String>();
-	
-	/**
-	 * This sets what will be remembered for library search path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentMpiLibPath(String path) {
-		currentMpiIncludePath = path;
-		pageData.put(PAGE_ID+DOT+LIBRARY_SEARCH_PATH_PROP_ID, path);
-	}
-	private void setCurrentMpiCompileCommand(String buildCommand) {
-		currentMpiCompileCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+MPI_COMPILE_COMMAND_PROP_ID, buildCommand);
-	}
-	private void setCurrentMpiLinkCommand(String buildCommand) {
-		currentMpiLinkCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+MPI_LINK_COMMAND_PROP_ID, buildCommand);
-	}
-
-	public String getName() {
-		return new String(desc + " name");
-	}
-
-	/**
-	 * Return the path in one of the path fields.
-	 * 
-	 * @return String
-	 */
-	private String getPathFromPathField(Text textField) {
-		URI fieldURI;
-		try {
-			fieldURI = new URI(textField.getText());
-		} catch (URISyntaxException e) {
-			return textField.getText();
-		}
-		return fieldURI.getPath();
-	}
-
-	/**
-	 * Update the include path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateIncludePathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath);
-		includePathField.setText(selectedPath);
-	}
-	/**
-	 * Update the lib path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateLibPathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath);
-		libPathField.setText(selectedPath);
-	}
-
-	/**
-	 * Open an appropriate directory browser and get selected directory <br>
-	 * TODO: can we use the dialog that CDT uses here? Allows direct typing.
-	 */
-	private void handleLocationBrowseButtonPressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(includePathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(includePathField.getShell());
-		dialog.setMessage("MPI Include path:");
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateIncludePathField(selectedDirectory);
-
-			includePathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory);
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentMpiIncludePath(selectedDirectory);
-		}
-	}
-	private void handleLocationBrowseButton2Pressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(libPathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(libPathField.getShell());
-		dialog.setMessage("MPI library search path:");
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateLibPathField(selectedDirectory);
-
-			libPathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory);
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentMpiLibPath(selectedDirectory);
-		}
-	}
-
-	/**
-	 * Remove any trailing device separator characther (e.g. ; on windows or : on Linux)
-	 * @param str
-	 * @return the string without any trailing separator
-	 */
-	private String stripTrailingSeparator(String str) {
-		if(str.length()==0)return str;
-		char lastChar = str.charAt(str.length() - 1);
-		if (lastChar == java.io.File.pathSeparatorChar) {
-			String temp = str.substring(0, str.length() - 1);
-			return temp;
-		}
-		return str;
-
-	}
-
-	/**
-	 * Create the area in which the user can enter MPI include path and other information
-	 * 
-	 * @param composite to put it in
-	 * @param defaultEnabled indicates if the "use defaults" checkbox is to be initially selected.
-	 */
-	private void createUserEntryArea(Composite composite, boolean defaultEnabled) {
-		if(wizardTraceOn)System.out.println("MPIProjectWizardPage.createUserEntryArea() " );
-		
-		includePathLabel = new Label(composite, SWT.NONE);
-		includePathLabel.setText("Include path:");
-		includePathLabel.setToolTipText("Location of MPI include path(s)");
-
-		// Include path location  entry field
-		includePathField = new Text(composite, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		data.horizontalSpan = 2;
-		includePathField.setLayoutData(data);
-		includePathField.setText(defaultMpiIncludePath);
-		includePathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiIncludePath(includePathField.getText());
-				if(traceOn)System.out.println("locationField.modifyText(): " + currentMpiIncludePath);
-			}
-		});
-
-		// browse button
-		browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setText("Browse...");
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed.");
-				handleLocationBrowseButtonPressed();
-
-			}
-		});
-
-		// how do we know when next/finish button pushed? we don't.
-		// we just store all info where we can find it when the MPIProjectProcess (ProcessRunner) runs after all the wizard pages are done.
-		
-		libLabel=new Label(composite, SWT.NONE);
-		libLabel.setText("Library name:");
-		libLabel.setToolTipText("Library name:");
-		
-		libNameField=new Text(composite,SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd.horizontalSpan=2;
-		libNameField.setLayoutData(gd);
-		libNameField.setText(defaultMpiLibName);
-		libNameField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiLibName(libNameField.getText());
-				if(traceOn)System.out.println("libNameField.modifyText(): " + currentLibName);
-			}
-		});
-		
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer
-		
-		libPathLabel=new Label(composite, SWT.NONE);
-		libPathLabel.setText("Library search path:");
-		libPathLabel.setToolTipText("Library name:");
-		
-		
-		libPathField=new Text(composite,SWT.BORDER);
-		GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-		gd2.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd2.horizontalSpan=2;
-		libPathField.setLayoutData(gd2);
-		libPathField.setText(defaultMpiLibPath);
-		libPathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiLibPath(libPathField.getText());
-				if(traceOn)System.out.println("libPathField.modifyText(): " + currentLibPath);
-			}
-		});
-		
-//		 browse button
-
-		browseButton2 = new Button(composite, SWT.PUSH);
-		browseButton2.setText("Browse...");
-		browseButton2.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed. DO SOMETHING HERE.");
-				handleLocationBrowseButton2Pressed();
-
-			}
-		});
-		mpiCompileCommandLabel= new Label(composite,SWT.NONE);
-		mpiCompileCommandLabel.setText("MPI compile command: ");
-		mpiCompileCommandField=new Text(composite,SWT.BORDER);
-		GridData gd3 = new GridData(GridData.FILL_HORIZONTAL);
-		gd3.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd3.horizontalSpan=2;
-		mpiCompileCommandField.setLayoutData(gd3);
-		mpiCompileCommandField.setText(defaultMpiBuildCommand);
-		mpiCompileCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiCompileCommand(mpiCompileCommandField.getText());
-				if(traceOn)System.out.println("mpiCompileCommandField.modifyText(): " + currentMpiCompileCommand);
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer
-		
-		mpiLinkCommandLabel= new Label(composite,SWT.NONE);
-		mpiLinkCommandLabel.setText("MPI link command: ");
-		mpiLinkCommandField=new Text(composite,SWT.BORDER);
-		GridData gd4 = new GridData(GridData.FILL_HORIZONTAL);
-		gd4.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd4.horizontalSpan=2;
-		mpiLinkCommandField.setLayoutData(gd3);
-		mpiLinkCommandField.setText(defaultMpiBuildCommand);
-		mpiLinkCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiLinkCommand(mpiLinkCommandField.getText());
-				if(traceOn)System.out.println("mpiLinkCommandField.modifyText(): " + currentMpiLinkCommand);
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer
-
-		
-	}
-
-
-	/**
-	 * Create the contents of the wizard page.
-	 * 
-	 * @param composite parent composite in which these widgets will reside
-	 * 
-	 * @param defaultEnabled do we use default mpi include path?
-	 */
-	private void createContents(Composite composite, boolean defaultEnabled) {
-
-		int columns = 4;
-		Composite group = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = columns;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		useMpiProjectSettingsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useMpiProjectSettingsButton.setText("Add MPI project settings to this project");
-		GridData gd=new GridData();
-		gd.horizontalSpan=columns;
-		useMpiProjectSettingsButton.setLayoutData(gd);
-		useMpiProjectSettingsButton.setSelection(useMpiProjectSettings);
-		useMpiProjectSettingsButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				useMpiProjectSettings = useMpiProjectSettingsButton.getSelection();
-				// set value so we can read it later
-				pageData.put(PAGE_ID+DOT+DO_MPI_INCLUDES, Boolean.toString(useMpiProjectSettings));
-				
-				useDefaultsButton.setEnabled(useMpiProjectSettings);
-				if(mpiSampleButton!=null)
-				   mpiSampleButton.setEnabled(useMpiProjectSettings);
-				if(useMpiProjectSettings) {
-				  boolean useDefaults=useDefaultsButton.getSelection();
-				  setUserAreaEnabled(!useDefaults);
-				}
-				
-				else
-					setUserAreaEnabled(false);
-				
-			}
-		});
-
-		useDefaultsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useDefaultsButton.setText("Use default information");
-		useDefaultsButton.setSelection(defaultEnabled);
-		useDefaultsButton.setEnabled(useMpiProjectSettings);
-		GridData buttonData = new GridData();
-		buttonData.horizontalSpan = columns;
-		useDefaultsButton.setLayoutData(buttonData);
-		useDefaultsButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				boolean useDefaults = useDefaultsButton.getSelection();
-
-				if (useDefaults) { 
-					// reset all fields and values back to the defaults
-					includePathField.setText(defaultMpiIncludePath);
-					setCurrentMpiIncludePath(defaultMpiIncludePath);
-					
-					libPathField.setText(defaultMpiLibName);
-					setCurrentMpiLibName(defaultMpiLibName);
-					
-					libNameField.setText(defaultMpiLibName);
-					setCurrentMpiLibName(defaultMpiLibName);
-					
-					libPathField.setText(defaultMpiLibPath);
-					setCurrentMpiLibPath(defaultMpiLibPath);
-					
-					mpiCompileCommandField.setText(defaultMpiBuildCommand);
-					setCurrentMpiCompileCommand(defaultMpiBuildCommand);
-					
-					mpiLinkCommandField.setText(defaultMpiBuildCommand);
-					setCurrentMpiLinkCommand(defaultMpiBuildCommand);
-				}
-				setUserAreaEnabled(!useDefaults);
-			}
-		});
-
-		createUserEntryArea(group, defaultEnabled);
-		setUserAreaEnabled(!defaultEnabled);
-	}
-
-	public void createControl(Composite parent) {
-
-		composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		boolean defaultEnabled = true;
-		createContents(composite, defaultEnabled);
-	}
-
-	public Control getControl() {
-		return composite;
-	}
-
-	public String getDescription() {
-		String tmp="Select the MPI include path, lib name, library search path, and build command information to be automatically be added to the new project.";
-		return tmp;
-	}
-
-	public String getErrorMessage() {
-		return null;
-	}
-
-	public Image getImage() {
-		return getWizard().getDefaultPageImage();
-	}
-
-	public String getMessage() {
-		return null;
-	}
-
-	public String getTitle() {
-		return "MPI Project Settings";
-	}
-
-	public void performHelp() {
-		// do nothing
-
-	}
-
-	public void setDescription(String description) {
-		// do nothing
-
-	}
-
-	public void setImageDescriptor(ImageDescriptor image) {
-		// do nothing
-
-	}
-
-	public void setTitle(String title) {
-		// do nothing
-
-	}
-
-	/**
-	 * If you need to init data/widgets on the page when it is displayed based
-	 * on the data set in previous pages, you can override
-	 * IDialogPage.setVisible(boolean visible) and setup everything when visible ==
-	 * true.
-	 * 
-	 * Otherwise, do inits in the ctor.
-	 */
-	public void setVisible(boolean visible) {
-		composite.setVisible(visible);
-		if(traceOn)System.out.println("MPIProjectWizardPage.setVisible: " + visible);
-
-	}
-
-	/**
-	 * Determines the status of the wizard's finish button. If we don't want the
-	 * user to press finish yet, set this to false. <br>
-	 * The Next/Finish/Cancel methods belong to the wizard itself and not the
-	 * pages.
-	 * 
-	 * @return boolean true if finish button should be enabled; false otherwise.
-	 */
-	protected boolean isCustomPageComplete() {
-		// BRT if isDefaults is not checked then includePathField etc. should be
-		// filled in.
-		// BRT if isDefaults is checked then there should actually BE some
-		// defaults to use.
-		return true;
-	}
-
-	/**
-	 * Enable/disable "user area" which is the place user can type and make
-	 * changes (includePathField, its label and button, etc.)
-	 * 
-	 * @param enabled
-	 */
-	private void setUserAreaEnabled(boolean enabled) {
-		
-		includePathField.setEnabled(enabled);
-		browseButton.setEnabled(enabled);
-		browseButton2.setEnabled(enabled);
-		libNameField.setEnabled(enabled);
-		libPathField.setEnabled(enabled);
-		
-		includePathLabel.setEnabled(enabled);
-		libPathLabel.setEnabled(enabled);
-		libLabel.setEnabled(enabled);
-		
-		mpiCompileCommandLabel.setEnabled(enabled);
-		mpiCompileCommandField.setEnabled(enabled);
-		mpiLinkCommandLabel.setEnabled(enabled);
-		mpiLinkCommandField.setEnabled(enabled);
-	}
-	
-	/**
-	 * What's the default, do we include MPI includes or not?
-	 * If there is any difficulty getting information, use this default
-	 * setting.
-	 * @return
-	 */
-	public static boolean getDefaultUseMpiIncludes() {
-		return defaultUseMpiIncludes;
-	}
-
-	public Map<String,String> getPageData() {
-		return pageData;
-	}
-	
-	/**
-	 * Determines whether we are in a C or C++ project template
-	 * @return
-	 */
-	abstract protected String getMpiProjectType();
-	
-	@Override
-	protected IPreferencePage getPreferencePage() {
-		if(preferencePage == null) {
-			preferencePage = new MPIPreferencePage();
-		}
-		return preferencePage;
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java
deleted file mode 100644
index 6338eb4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,20078 IBM Corp. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-
-
-/**
- * Wizard Page for collecting info about MPI C project - specifics for C vs C++
- * 
- * @author Beth Tibbitts
- * 
- */
-public class MPIProjectWizardPageC extends MPIProjectWizardPage {
-
-	public MPIProjectWizardPageC() throws CoreException {
-		super();
-	}
-
-	@Override
-	protected String getMpiProjectType() {
-		return MPI_PROJECT_TYPE_C;
-	}
-
-	@Override
-	protected String getDefaultMpiBuildCommand() {
-		String cmd = preferenceStore.getString(MpiIDs.MPI_BUILD_CMD);
-		return cmd;
-	}
-	
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java
deleted file mode 100644
index 0c62ead..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2008 IBM Corp. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-
-
-/**
- * Wizard Page for collecting info about MPI C++ project 
- * 
- * @author Beth Tibbitts
- * 
- */
-public class MPIProjectWizardPageCPP extends MPIProjectWizardPage {
-
-	public MPIProjectWizardPageCPP() throws CoreException {
-		super();
-	}
-
-	@Override
-	protected String getMpiProjectType() {
-		return MPI_PROJECT_TYPE_CPP;
-	}
-	
-	@Override
-	protected String getDefaultMpiBuildCommand() {
-		String cmd = preferenceStore.getString(MpiIDs.MPI_CPP_BUILD_CMD);
-		return cmd;
-	}
-	
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java
deleted file mode 100644
index d7bd73c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java
+++ /dev/null

@@ -1,545 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2007 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.cdt.core.templateengine.TemplateCore;
-import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
-import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
-import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
-import org.eclipse.cdt.managedbuilder.core.BuildException;
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.core.IOption;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.pldt.wizards.MpiWizardsPlugin;
-
-/**
- * 
- * After the MPIProjectWizardPage runs, and we get MPI include path from the user,
- * we have this opportunity to use that information to modify the include paths etc.
- * in the project
- * 
- * 
- * @author Beth Tibbitts
- *
- */
-public class OpenMPProjectProcess extends ProcessRunner {
-	private static final boolean traceOn=false;
-	private boolean wizTraceOn=OpenMPProjectWizardPage.wizardTraceOn;
-
-	private Map<String,String> valueStore;
-	
-	@Override
-	public void process(TemplateCore template, ProcessArgument[] args,
-			String processId, IProgressMonitor monitor)
-			throws ProcessFailureException {
-		if(wizTraceOn)System.out.println("OpenMPProjectProcess().run()...");
-		
-		valueStore= template.getValueStore();
-		String pageID = OpenMPProjectWizardPage.PAGE_ID;
-		
-		Object obj = getNewPropValue(pageID, OpenMPProjectWizardPage.DO_OpenMP_INCLUDES, null);
-		boolean doOpenMPIncludes = OpenMPProjectWizardPage.getDefaultUseOpenMPIncludes();
-		if (obj != null)
-			doOpenMPIncludes = Boolean.valueOf((String) obj);
-		if (!doOpenMPIncludes) {
-			if (traceOn)
-				System.out.println("Do not save OpenMP info in this project.");
-			return;
-		}
- 		// this process must be executed after a separate process which creates the project
-		IProject proj= ResourcesPlugin.getWorkspace().getRoot().getProject(valueStore.get("projectName"));
-		if(!proj.exists()) {
-			System.out.println("Project does not exist!. Quitting. No OpenMP info added to project.");
-			return;	
-		}
-
-		if(traceOn)System.out.println("Project: " + proj.getName());
-
-		// Collect the values that the user entered on the wizard page
-		String propID = OpenMPProjectWizardPage.INCLUDE_PATH_PROP_ID;
-		String newIncludePath = getNewPropValue(pageID, propID,"c:/openmp/include");
-		if(traceOn)System.out.println("Got prop: "+propID+"="+newIncludePath);
-		
-		propID = OpenMPProjectWizardPage.LIB_PROP_ID;
-		String newLib=getNewPropValue(pageID,propID,"lib");
-		
-		propID=OpenMPProjectWizardPage.LIBRARY_SEARCH_PATH_PROP_ID;
-		String newLibSearchPath=getNewPropValue(pageID,propID,"c:/openmp/lib");
-		
-		propID=OpenMPProjectWizardPage.OpenMP_COMPILE_COMMAND_PROP_ID;
-		String OpenMPCompileCommand=getNewPropValue(pageID,propID,"gcc");
-		
-		propID=OpenMPProjectWizardPage.OpenMP_LINK_COMMAND_PROP_ID;
-		String OpenMPLinkCommand=getNewPropValue(pageID,propID,"gcccc");
-		
-		IManagedBuildInfo info = null;
-		try {
-			info = ManagedBuildManager.getBuildInfo(proj);
-			// note: assumed null if this is not a managed build project? will we get here in that case?
-			if(traceOn)System.out.println("Build info: " + info);
-		} catch (Exception e) {
-			System.out.println("OpenMPProjectProcess.run(), "+e.getMessage());
-			e.printStackTrace();
-			return;
-		}
-		assert(info!=null);
-		
-		IManagedProject mProj = info.getManagedProject();
-		if(traceOn)showOptions(mProj);
-		
-		// add the include path & linker values to all the configurations
-		IConfiguration[] configs = mProj.getConfigurations();
-		for (int i = 0; i < configs.length; i++) {
-			IConfiguration cf = configs[i];
-			if(traceOn)System.out.println("Config " + i + ": " + cf.getName());
-			addIncludePath(cf, newIncludePath);
-			addLinkerOpt(cf,newLib,newLibSearchPath);
-			setCompileCommand(cf,OpenMPCompileCommand);
-			setLinkCommand(cf,OpenMPLinkCommand);		
-		}
-		if(traceOn)System.out.println("OpenMPProjectProcess, newIncludePath: "+newIncludePath);
-		if(traceOn)System.out.println("   newLib: "+newLib+"  newLibSrchPth: "+newLibSearchPath);
-		if(traceOn)System.out.println("   compileCmd: "+OpenMPCompileCommand);
-		if(traceOn)System.out.println("   linkCmd: "+OpenMPLinkCommand);
-		// ManagedBuildManger.saveBuildInfo(...) assures that the
-		// values are persisted in the build model, otherwise they will
-		// be lost when you shut down Eclipse.
-		if(traceOn)System.out.println("ManagedBuildManager.saveBuildInfo...");
-	
-		ManagedBuildManager.saveBuildInfo(proj, true);
-
-	}
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = MpiWizardsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Get a value that was possibly obtained from the user on the associated wizard page.
-	 * @param pageID The pageID for our wizard page
-	 * @param propID The propID of the value we want
-	 * @param defaultVal The default value to use if the user didn't select anything,
-	 * or if we haven't gotten around to LETTING the user select anything yet.
-	 * @return
-	 */
-	private String getNewPropValue(String pageID, String propID, String defaultVal) {
-		Object obj = valueStore.get(pageID+MPIProjectWizardPage.DOT+propID);
-		// if selection made on page, obj is non-null.
-		String newValue = defaultVal;
-		String msg=" ( used default value)";
-		if (obj != null) {
-			newValue = obj.toString();
-			msg="";
-		}
-		if(traceOn)System.out.println("propID=" + propID + "  value=" + newValue+msg);
-		return newValue;
-	}
-
-
-	/**
-	 * Add an include path for C compiling to the existing include paths of the given
-	 * Configuration.  XLC is handled as a special case to find its include path option;
-	 * for other tools, we assume there is a single option for include paths, so we take
-	 * the first one.
-	 * 
-	 * @param cf
-	 *            the configuration of the project (e.g. Release, Debug, etc.)
-	 * @param newIncludePath
-	 *            include path(s) to add.  If more than one, separate by
-	 *            java.io.File.pathSeparator, which is semicolon for Windows, colon for Mac/Linux
-	 */
-	private void addIncludePath(IConfiguration cf, String newIncludePath) {
-		// note: could be > 1 path in 'newIncludePath'
-		String ext = "c";
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-		// do we need to also handle c++ case as well?
-
-		//String id = cfTool.getId(); // "cdt.managedbuild.tool.xlc.c.compiler.exe.debug.1423270745"
-		String name = cfTool.getName();// "XL C Compiler"
-		IOption option = null;
-		if (name.startsWith("XL C")) { // special case for XL C compiler
-			option = cfTool.getOptionById("xlc.c.compiler.option.include.paths");
-		} else { // otherwise we assume there is only one include path option.
-			option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-		}
-		if (option != null) {
-			String[] includePaths = null;
-			try {
-				includePaths = option.getIncludePaths();
-			} catch (BuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			String[] newIncludePaths = add(includePaths, newIncludePath);
-			if (traceOn)
-				System.out.println("        add " + newIncludePath + " to existing includePaths: "
-						+ unroll(includePaths));
-			ManagedBuildManager.setOption(cf, cfTool, option, newIncludePaths);
-		}
-		else{
-			System.out.println("MPIProjectProcess, no option for include paths found.");
-		}
-	}
-
-
-	/**
-	 * Add a new linker option.  Assumes that there is ONE instance of an option
-	 * of type <code>IOption.LIBRARY_PATHS</code> and <code>IOption.LIBRARIES</code>.
-	 * This method adds the libName and libPath to these two options.
-	 * @param cf the Configuration to which we want to add to linker options
-	 * @param libName the lib name (e.g. "lib")
-	 * @param libPath the library search path name (e.g. "c:/mypath/lib")
-	 * 
-	 */
-	private void addLinkerOpt(IConfiguration cf, String libName, String libPath) {
-		String ext = "o";
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-
-		IOption lpOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARY_PATHS);
-		addOptionValue(cf, cfTool, lpOpt, libPath);
-
-		IOption libOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARIES);
-		addOptionValue(cf, cfTool, libOpt, libName);
-	}                                                                                                                     
-
-	
-	private void setCompileCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("compile cmd: "+buildCmd);
-		ITool compiler = cf.getToolFromInputExtension("c");
-		compiler.setToolCommand(buildCmd);
-		
-	}
-	private void setLinkCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("link cmd: "+buildCmd);
-		ITool linker=cf.getToolFromInputExtension("o");
-		linker.setToolCommand(buildCmd);
-		
-	}
-	
-	/**
-	 * Add a value to a multi-valued tool option<br>
-	 * (For example, add a path to include paths, or a lib to libraries list)
-	 * @param cf the Configuration
-	 * @param tool the tool in which to update the option
-	 * @param option the option to update 
-	 * @param value the new value to add to the list of existing values in the option
-	 */
-	private void addOptionValue(IConfiguration cf, ITool tool, IOption option, String value) {
-		try {
-			int type = option.getValueType();
-			String[] valueList = null;
-			switch (type) {
-			case IOption.INCLUDE_PATH:
-				valueList = option.getIncludePaths();
-				valueList = add(valueList,value);
-				break;
-			case IOption.LIBRARIES:
-				valueList = option.getLibraries();
-				valueList=addNotPath(valueList, value);
-				break;
-			case IOption.LIBRARY_PATHS:// this is type for library search path cdt 4.0 
-				valueList=option.getBasicStringListValue();
-				valueList=addNotPath(valueList,value);
-				break;
-			
-			default:
-				System.out.println("OpenMPProjectWizard Process postprocessing (OpenMPProjectProcess), can't get type of option for " + option.getName());
-				return;
-			}
-			// update the option in the managed builder options
-			ManagedBuildManager.setOption(cf, tool, option, valueList);
-
-		} catch (BuildException e) {
-			System.out.println("OpenMPProjectProcess.addOptionValue(), "+e.getMessage());
-			System.out.println(e.getMessage());
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Print the options for a project.<br>
-	 * e.g. for Debug and Release configurations, get all the tools (compiler, linker etc.) then for each tool, 
-	 * get all the options and print them.
-	 * 
-	 * IResource resource= ... ;// can be any resource, I use project.
-     * IManagedBuildInfo mbo = ManagedBuildManager.getBuildInfo(resource);
-     * IManagedProject mp=mbo.getManagedProject();
-	 * <br>
-	 * This helps in figuring out what they are, and what you want to change.
-	 * Some sample output is at the bottom of this file.
-	 * 
-	 * @param proj the (managed) project for which print all this stuff.
-	 */
-	private void showOptions(IManagedProject proj) {
-		if(traceOn)System.out.println("Managed Project: "+proj.getName());
-		if(traceOn)System.out.println("Path.SEPARATOR="+Path.SEPARATOR);
-		if(traceOn)System.out.println("Path.DEVICE_SEPARATOR="+Path.DEVICE_SEPARATOR);
-		IConfiguration[] configs = proj.getConfigurations();
-		try {
-			for (int i = 0; i < configs.length; i++) {
-				IConfiguration cf = configs[i];
-				ITool[] allTools = cf.getTools();
-
-				int numTools = allTools.length;
-				System.out.println("Config " + i + ": " + cf.getName()+ " has "+numTools+" tools.");
-
-				for (int k = 0; k < allTools.length; k++) {
-					ITool tool = allTools[k];
-					System.out.println("  Tool " + k + ": " + tool.getName());
-					//boolean rc=tool.setToolCommand("foo");
-					String toolCmd=tool.getToolCommand();
-					String toolID=tool.getId();
-					System.out.println("  cmd="+toolCmd+"  toolID="+toolID);
-					
-					
-					IOption[] options = tool.getOptions();
-
-					for (int j = 0; j < options.length; j++) {
-						IOption opt = options[j];
-						String foundOptionID = opt.getId();
-						int type=opt.getValueType();
-						System.out.println("    option " + j + " " + opt.getName() + " id="
-								+ foundOptionID+"  type="+showType(type));
-						if(opt.getValueType()==IOption.INCLUDE_PATH) {
-							showIncludePaths(opt);
-						}
-					}
-				}
-
-				System.out.println("Config " + i + ": " + cf.getName()
-						+ "======= End of ALL tools ");
-				
-				// another way to access Tool
-				String ext = "c";
-				ITool cfTool = cf.getToolFromInputExtension(ext);
-				System.out.println("Tool by ext: " + ext + " is: " + cfTool.getName());
-				
-				// Look for include path
-				IOption option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-				if (option != null) {
-					String oname = option.getName();
-					System.out.println("Option " + option.getId() + " is " + oname);
-					showIncludePaths(option);
-				}
-				else System.out.println("No include path option found. ");
-
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-	private String showType(int type){
-		if(type==IOption.INCLUDE_PATH) return type+" (IOption.INCLUDE_PATH)";
-		if(type==IOption.LIBRARY_PATHS) return type+" (IOption.LIBRARY_PATHS)";
-		if(type==IOption.LIBRARIES)     return type+" (IOption.LIBRARIES)";
-		return type+" ";
-	}
-
-	/**
-	 * Display the list of include paths in an option which is presumed
-	 * to be the include paths option.
-	 * @param opt
-	 * @throws BuildException
-	 */
-	private void showIncludePaths(IOption opt) throws BuildException {
-		assert opt.getValueType() == IOption.INCLUDE_PATH ;
-		// if the option is a list of include paths, display them.
-		String[] includePaths = opt.getIncludePaths();
-		for (int index = 0; index < includePaths.length; index++) {
-			String path = includePaths[index];
-			System.out.println("   include path " + index + ": " + path);
-		}
-
-	}
-
-	/**
-	 * Add one or more paths to the list of paths
-	 * 
-	 * @param existingPaths the existing list of paths to add to
-	 * @param newPath the new path to add; may be >1 directory, with path delimiter java.io.File.pathSeparator 
-	 * (usually semicolon or colon)
-	 * @return the merged list
-	 */
-	private String[] add(String[] existingPaths, String newPath) {
-		String pathSep=java.io.File.pathSeparator;  // semicolon for windows, colon for Mac/Linux
-		List<String> newPathList = new ArrayList<String>();
-		String path;
-		for (int i = 0; i < existingPaths.length; i++) {
-			path = existingPaths[i];
-			newPathList.add(path);
-		}
-		String[] newPathArray=newPath.split(pathSep);
-		for (int i = 0; i < newPathArray.length; i++) {
-			path = newPathArray[i];
-			newPathList.add(path);
-		}
-		
-		String[] newArray=(String[])newPathList.toArray(new String[0]);
-		return newArray;
-		
-		/*
-
-		*/
-	}
-
-	/**
-	 * Add a single string to an array of strings
-	 * @param strList
-	 * @param newStr
-	 * @return
-	 */
-	private String[] addNotPath(String[] strList, String newStr) {
-		int len = strList.length;
-		String newList[] = new String[len + 1];
-		System.arraycopy(strList, 0, newList, 0, len);
-		newList[len] = newStr;
-		return newList;
-	}
-	/**
-	 * Simple string representation of items in a string array
-	 * @param list
-	 * @return
-	 */
-	private String unroll (String[] list){
-		StringBuffer result=new StringBuffer();
-		//list = new String[]{"one","two"};
-		//System.out.println(list);
-		for (int i = 0; i < list.length; i++) {
-			String string = list[i];
-			result.append(string);
-			result.append(", ");
-			
-			
-		}
-		if (result.length() > 2) {
-			result.delete(result.length() - 2, result.length() - 1);
-		}
-		return result.toString();
-	}
-	/**
-	 * Get the options of a specific type.<br>
-	 * We really need an ITool.getOptionsByType(int) so we don't have to do
-	 * this.
-	 * 
-	 * @param cf
-	 *            the IConfiguration in which to search
-	 * @param cfTool
-	 *            the ITool whose options are being searched
-	 * @param optionType
-	 *            the option type we are looking for, e.g. IOption.SOMETHING
-	 * @return
-	 */
-	private List<IOption> getOptionsByType(IConfiguration cf, ITool cfTool, int optionType) {
-
-		// run thru ALL options and check type for each, returning the ones that match
-		IOption[] allOptions = cfTool.getOptions();
-		List<IOption> foundOptions = new ArrayList<IOption>();
-
-		for (int i = 0; i < allOptions.length; i++) {
-			IOption option = allOptions[i];
-
-			int oType = 0;
-			try {
-				oType = option.getValueType();
-			} catch (BuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-				continue;
-			}
-			if (optionType == oType) {
-				// add it to the list
-				foundOptions.add(option);
-			}
-
-		}
-		//IOption[] ret= foundOptions.toArray(new IOption[foundOptions.size()]);
-		return foundOptions;
-	}
-	/**
-	 * Returns the <i>first</i> option of the specified type from the tool
-	 * @param cf
-	 * @param cfTool
-	 * @param optionType
-	 * @return
-	 */
-	private IOption getFirstOptionByType(IConfiguration cf, ITool cfTool, int optionType){
-		List<IOption> allOptions=getOptionsByType(cf,cfTool,optionType);
-		if(allOptions.size()>0){
-			return allOptions.get(0);
-		}
-		return null;
-	}
-}
-
-/**
- * 
- * Some sample tool data from showOptions() on Windows XP with cygwin Tool 1:
- * GCC C Compiler
- * <p>
- * 
- * option 0 Do not search system directories (-nostdinc)
- * id=gnu.c.compiler.option.preprocessor.nostdinc<br>
- * option 1 Preprocess only (-E)
- * id=gnu.c.compiler.option.preprocessor.preprocess<br>
- * option 2 Defined symbols (-D)
- * id=gnu.c.compiler.option.preprocessor.def.symbols<br>
- * option 3 Undefined symbols (-U)
- * id=gnu.c.compiler.option.preprocessor.undef.symbol<br>
- * option 4 Include paths (-I) id=gnu.c.compiler.option.include.paths<br>
- * option 5 Optimization Level
- * id=gnu.c.compiler.cygwin.exe.release.option.optimization.level<br>
- * option 6 Other optimization flags id=gnu.c.compiler.option.optimization.flags<br>
- * option 7 Debug Level
- * id=gnu.c.compiler.cygwin.exe.release.option.debugging.level<br>
- * option 8 Other debugging flags id=gnu.c.compiler.option.debugging.other<br>
- * option 9 Generate gprof information (-pg)
- * id=gnu.c.compiler.option.debugging.gprof<br>
- * option 10 Generate prof information (-p)
- * id=gnu.c.compiler.option.debugging.prof<br>
- * option 11 Check syntax only (-fsyntax-only)
- * id=gnu.c.compiler.option.warnings.syntax<br>
- * option 12 Pedantic (-pedantic) id=gnu.c.compiler.option.warnings.pedantic<br>
- * option 13 Pedantic warnings as errors (-pedantic-errors)
- * id=gnu.c.compiler.option.warnings.pedantic.error<br>
- * option 14 Inhibit all warnings (-w) id=gnu.c.compiler.option.warnings.nowarn<br>
- * option 15 All warnings (-Wall) id=gnu.c.compiler.option.warnings.allwarn<br>
- * option 16 Warnings as errors (-Werror)
- * id=gnu.c.compiler.option.warnings.toerrors<br>
- * option 17 Other flags id=gnu.c.compiler.option.misc.other<br>
- * option 18 Verbose (-v) id=gnu.c.compiler.option.misc.verbose<br>
- * option 19 Support ANSI programs (-ansi) id=gnu.c.compiler.option.misc.ansi<br>
- * 
- * Tool 2: GCC C Linker <br>
- * option 5 Libraries (-l) id=gnu.c.link.option.libs<br>
- * option 6 Library search path (-L) id=gnu.c.link.option.paths<br>
- * 
- */
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java
deleted file mode 100644
index 0953bf3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider;
-import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-
-public class OpenMPProjectProcessPages implements IPagesAfterTemplateSelectionProvider {
-	IWizardDataPage[] pages;
-	
-	public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard,
-			IWorkbench workbench, IStructuredSelection selection) {
-		try {
-			pages= new IWizardDataPage[] {new OpenMPProjectWizardPage()};
-			// TODO - log error
-		} catch(CoreException ce) {
-			pages= new IWizardDataPage[0];
-		}
-		return pages;
-	}
-
-	public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) {
-		return pages;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java
deleted file mode 100644
index b4dae5f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java
+++ /dev/null

@@ -1,726 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2008 IBM Corp. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPIDs;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Wizard Page for collecting info about OpenMP project - appended to end of
- * "New  C project" wizard
- * 
- * TODO remove dup code, share with MPI version in a common class etc.
- * @author Beth Tibbitts
- * 
- */
-public class OpenMPProjectWizardPage extends AbstractProjectWizardPage {
-	public static final String DOT = ".";
-	private static final boolean traceOn=false;
-	public static final boolean wizardTraceOn=false;
-
-	private Composite composite;
-	public static final String PAGE_ID="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectWizardPage";
-
-	// The following are IDs for storing info in MBSPageData so it can be retrieved in OpenMPProjectProcess (ProcessRunner)
-	// when the wizard is done.
-	/**
-	 * Store in MBSPageData  (with this ID) whether user wants to include OpenMP info in the project.
-	 */
-	public static final String DO_OpenMP_INCLUDES = "doOpenMPincludes";
-	/**
-	 * store in MBSPageData (with this ID) what the include path to OpenMP will be.
-	 */
-	public static final String INCLUDE_PATH_PROP_ID = "includePath";
-	/**
-	 * store in MBSPageData (with this ID) what the library name for the linker is.
-	 */
-	public static final String LIB_PROP_ID = "lib";
-	/**
-	 * store in MBSPageData (with this ID) what the library search path is.
-	 */
-	public static final String LIBRARY_SEARCH_PATH_PROP_ID = "libPath";
-	
-	public static final String OpenMP_COMPILE_COMMAND_PROP_ID = "OpenMPCompileCommand";
-	public static final String OpenMP_LINK_COMMAND_PROP_ID = "OpenMPLinkCommand";
-
-	private String currentOpenMPIncludePath;
-	private String currentLibName;
-	private String currentLibPath;
-	private String currentOpenMPCompileCommand;
-	private String currentOpenMPLinkCommand;
-
-	private String defaultOpenMPIncludePath;
-	private String defaultOpenMPLibName;
-	private String defaultOpenMPLibPath;
-	private String defaultOpenMPBuildCommand;
-	
-	private Text includePathField;
-	private Text libNameField;
-	private Text libPathField;
-	private Text openMPCompileCommandField, openMPLinkCommandField;
-	
-	private Label includePathLabel, libLabel, libPathLabel, openMPCompileCommandLabel, openMPLinkCommandLabel;
-
-	private Button browseButton;
-	private Button browseButton2;
-
-	private Button useDefaultsButton;
-	private Button useOpenMPProjectSettingsButton;
-	private static boolean defaultUseOpenMPIncludes=true;
-	
-	private Button OpenMPSampleButton;
-
-	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-	/**
-	 * By default we DO use OpenMP project settings in a new project.<br>
-	 */
-	private boolean useOpenMPProjectSettings=true;
-	private String desc = "OpenMP Project Page";
-	
-	/**
-	 * The CDT new project wizard page for OpenMP projects.  
-	 * Adds the include paths, library information, etc. for an MPI project.
-	 * @throws CoreException 
-	 * 
-	 */
-	public OpenMPProjectWizardPage() throws CoreException {
-		super("OpenMP Project Settings");
-		prefIDincludes=OpenMPIDs.OpenMP_INCLUDES;
-		if(wizardTraceOn)System.out.println("OpenMPProjectWizardPage().ctor...");
-
-		//CommonPlugin.log(IStatus.ERROR,"Test error");
-		//CommonPlugin.log(IStatus.WARNING,"Test warning");
-		
-		// access the preference store from the OpenMP plugin
-		preferenceStore = OpenMPPlugin.getDefault().getPreferenceStore();
-		String mip=preferenceStore.getString(prefIDincludes);
-		if(traceOn)System.out.println("Got OpenMP include pref from other plugin: "+mip);
-
-		// Set the defaults here in the wizard page constructor and just
-		// overwrite them if the user changes them.
-		defaultOpenMPIncludePath = preferenceStore.getString(prefIDincludes);
-		if(defaultOpenMPIncludePath.length()==0) {
-			// warn if no OpenMP preferences have been set
-			String newIncludePath=showNoPrefs("OpenMP",prefIDincludes);
-			defaultOpenMPIncludePath=newIncludePath;
-		}
-		setDefaultOtherNames(defaultOpenMPIncludePath);
-		// the following sets what will be remembered when we leave the page.
-		setCurrentOpenMPIncludePath(defaultOpenMPIncludePath);
-		
-		defaultOpenMPBuildCommand=preferenceStore.getString(OpenMPIDs.OpenMP_BUILD_CMD);
-		setCurrentOpenMPCompileCommand(defaultOpenMPBuildCommand);
-		setCurrentOpenMPLinkCommand(defaultOpenMPBuildCommand);		
-	}
-
-	/**
-	 * Warn user that the OpenMP project preferences aren't set, and thus the new project wizard will not be very useful.
-	 * <br>
-	 * TODO: do we need a "do not show this message again" setting? (af - yes please! ;)
-	 */
-	private static boolean alreadyShown;
-	@SuppressWarnings("unused")
-	private static void showNoPrefs1() {
-		if(!alreadyShown) {
-			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			StringBuffer buf=new StringBuffer("No OpenMP Preferences set; ");
-			buf.append("Default project setting will be more useful if OpenMP preferences are set first. ");
-			buf.append("\nUse Window > Preferences and select Parallel Language Development Tools, which may be under PTP preferences.");
-			buf.append("You can cancel out of new project wizard to enter OpenMP preferences now.");
-			MessageDialog.openWarning(shell, "No OpenMP Preferences set", buf.toString());
-			alreadyShown= true;
-		}
-	}
-
-	/**
-	 * Set the default lib name and lib path based on what the 
-	 * include path is.  We assume something like
-	 * <code>openMPIncludepath=/my/path/include</code>
-	 * in which case we set
-	 * <code>libName="lib" </code>and <code> defaultOpenMPLibPath=/my/path/lib</code>.
-	 * <p>
-	 * Also, set the initial default values in the MBS page data,
-	 * so if user changes nothing on this page, the default values
-	 * will be picked up.
-	 * 
-	 * @param openMPincludePath
-	 */
-	private void setDefaultOtherNames(String openMPincludePath) {
-		defaultOpenMPLibName="openmp";
-		setCurrentOpenMPLibName(defaultOpenMPLibName);
-		
-		// if >1 path in openmp include path, use just the first
-		// one to guess at the libpath
-		String tempPath=openMPincludePath;
-		int sepLoc=tempPath.indexOf(java.io.File.pathSeparatorChar);
-		if(-1!=sepLoc) {
-			tempPath=openMPincludePath.substring(0, sepLoc);
-		}
-		IPath path = Path.fromOSString(tempPath);
-		path=path.removeLastSegments(1);
-		path=path.addTrailingSeparator();
-
-		defaultOpenMPLibPath=path.toString()+"lib";
-		//System.out.println("defaultOpenMPLibPath="+defaultOpenMPLibPath);
-		setCurrentOpenMPLibPath(defaultOpenMPLibPath);
-		
-		//standardize format for openmp include path, too
-		path = Path.fromOSString(openMPincludePath);
-		String temp=path.toString();
-		temp=stripTrailingSeparator(temp);
-		defaultOpenMPIncludePath=temp;
-		setCurrentOpenMPIncludePath(defaultOpenMPIncludePath);	
-			
-		setCurrentOpenMPCompileCommand(defaultOpenMPBuildCommand);
-	}
-
-	/**
-	 * This sets what will be remembered for OpenMP include path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentOpenMPIncludePath(String path) {
-		currentOpenMPIncludePath = path;
-		pageData.put(PAGE_ID+DOT+INCLUDE_PATH_PROP_ID, path);
-	}
-	/**
-	 * This sets what will be remembered for library name when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentOpenMPLibName(String name) {
-		currentOpenMPIncludePath = name;
-		pageData.put(PAGE_ID+DOT+LIB_PROP_ID, name);
-	}
-	
-	Map<String, String> pageData= new HashMap<String, String>();
-	
-	/**
-	 * This sets what will be remembered for library search path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentOpenMPLibPath(String path) {
-		currentOpenMPIncludePath = path;
-		pageData.put(PAGE_ID+DOT+LIBRARY_SEARCH_PATH_PROP_ID, path);
-	}
-	private void setCurrentOpenMPCompileCommand(String buildCommand) {
-		currentOpenMPCompileCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+OpenMP_COMPILE_COMMAND_PROP_ID, buildCommand);
-	}
-	private void setCurrentOpenMPLinkCommand(String buildCommand) {
-		currentOpenMPLinkCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+OpenMP_LINK_COMMAND_PROP_ID, buildCommand);
-	}
-
-	public String getName() {
-		return new String(desc + " name");
-	}
-
-	/**
-	 * Return the path in one of the path fields.
-	 * 
-	 * @return String
-	 */
-	private String getPathFromPathField(Text textField) {
-		URI fieldURI;
-		try {
-			fieldURI = new URI(textField.getText());
-		} catch (URISyntaxException e) {
-			return textField.getText();
-		}
-		return fieldURI.getPath();
-	}
-
-	/**
-	 * Update the include path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateIncludePathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath);
-		includePathField.setText(selectedPath);
-	}
-	/**
-	 * Update the lib path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateLibPathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath);
-		libPathField.setText(selectedPath);
-	}
-
-	/**
-	 * Open an appropriate directory browser and get selected directory <br>
-	 * TODO: can we use the dialog that CDT uses here? Allows direct typing.
-	 */
-	private void handleLocationBrowseButtonPressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(includePathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(includePathField.getShell());
-		dialog.setMessage("OpenMP Include path:");
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateIncludePathField(selectedDirectory);
-
-			includePathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory);
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentOpenMPIncludePath(selectedDirectory);
-		}
-	}
-	private void handleLocationBrowseButton2Pressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(libPathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(libPathField.getShell());
-		dialog.setMessage("OpenMP library search path:");
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateLibPathField(selectedDirectory);
-
-			libPathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory);
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentOpenMPLibPath(selectedDirectory);
-		}
-	}
-
-	/**
-	 * Remove any trailing device separator characther (e.g. ; on windows or : on Linux)
-	 * @param str
-	 * @return the string without any trailing separator
-	 */
-	private String stripTrailingSeparator(String str) {
-		if(str.length()==0)return str;
-		char lastChar = str.charAt(str.length() - 1);
-		if (lastChar == java.io.File.pathSeparatorChar) {
-			String temp = str.substring(0, str.length() - 1);
-			return temp;
-		}
-		return str;
-
-	}
-
-	/**
-	 * Create the area in which the user can enter MPI include path and other information
-	 * 
-	 * @param composite to put it in
-	 * @param defaultEnabled indicates if the "use defaults" checkbox is to be initially selected.
-	 */
-	private void createUserEntryArea(Composite composite, boolean defaultEnabled) {
-		//?? err? causes things to happen in wrong order??   IProject project = this.getProject();
-		//String name = project.getName();
-		if(wizardTraceOn)System.out.println("OpenMPProjectWizardPage.createUserEntryArea() " );
-		
-		includePathLabel = new Label(composite, SWT.NONE);
-		includePathLabel.setText("Include path:");
-		includePathLabel.setToolTipText("Location of OpenMP include path(s)");
-
-		// Include path location  entry field
-		includePathField = new Text(composite, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		data.horizontalSpan = 2;
-		includePathField.setLayoutData(data);
-		includePathField.setText(defaultOpenMPIncludePath);
-		includePathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPIncludePath(includePathField.getText());
-				if(traceOn)System.out.println("locationField.modifyText(): " + currentOpenMPIncludePath);
-			}
-		});
-
-		// browse button
-		browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setText("Browse...");
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed.");
-				handleLocationBrowseButtonPressed();
-
-			}
-		});
-
-		// how do we know when next/finish button pushed? we don't.
-		// we just store all info where we can find it when the OpenMPProjectProcess(ProcessRunner) runs after all the wizard pages are done.
-		
-		libLabel=new Label(composite, SWT.NONE);
-		libLabel.setText("Library name:");
-		libLabel.setToolTipText("Library name:");
-		
-		libNameField=new Text(composite,SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd.horizontalSpan=2;
-		libNameField.setLayoutData(gd);
-		libNameField.setText(defaultOpenMPLibName);
-		libNameField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPLibName(libNameField.getText());
-				if(traceOn)System.out.println("libNameField.modifyText(): " + currentLibName);
-			}
-		});
-		
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer
-		
-		libPathLabel=new Label(composite, SWT.NONE);
-		libPathLabel.setText("Library search path:");
-		libPathLabel.setToolTipText("Library name:");
-		
-		
-		libPathField=new Text(composite,SWT.BORDER);
-		GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-		gd2.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd2.horizontalSpan=2;
-		libPathField.setLayoutData(gd2);
-		libPathField.setText(defaultOpenMPLibPath);
-		libPathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPLibPath(libPathField.getText());
-				if(traceOn)System.out.println("libPathField.modifyText(): " + currentLibPath);
-			}
-		});
-		
-//		 browse button
-
-		browseButton2 = new Button(composite, SWT.PUSH);
-		browseButton2.setText("Browse...");
-		browseButton2.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed. DO SOMETHING HERE.");
-				handleLocationBrowseButton2Pressed();
-
-			}
-		});
-		openMPCompileCommandLabel= new Label(composite,SWT.NONE);
-		openMPCompileCommandLabel.setText("OpenMP compile command: ");
-		openMPCompileCommandField=new Text(composite,SWT.BORDER);
-		GridData gd3 = new GridData(GridData.FILL_HORIZONTAL);
-		gd3.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd3.horizontalSpan=2;
-		openMPCompileCommandField.setLayoutData(gd3);
-		openMPCompileCommandField.setText(defaultOpenMPBuildCommand);
-		openMPCompileCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPCompileCommand(openMPCompileCommandField.getText());
-				if(traceOn)System.out.println("OpenMPCompileCommandField.modifyText(): " + currentOpenMPCompileCommand);
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer
-		
-		openMPLinkCommandLabel= new Label(composite,SWT.NONE);
-		openMPLinkCommandLabel.setText("OpenMP link command: ");
-		openMPLinkCommandField=new Text(composite,SWT.BORDER);
-		GridData gd4 = new GridData(GridData.FILL_HORIZONTAL);
-		gd4.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd4.horizontalSpan=2;
-		openMPLinkCommandField.setLayoutData(gd3);
-		openMPLinkCommandField.setText(defaultOpenMPBuildCommand);
-		openMPLinkCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPLinkCommand(openMPLinkCommandField.getText());
-				if(traceOn)System.out.println("OpenMPLinkCommandField.modifyText(): " + currentOpenMPLinkCommand);
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer
-
-		
-	}
-
-
-	/**
-	 * Create the contents of the wizard page.
-	 * 
-	 * @param composite parent composite in which these widgets will reside
-	 * 
-	 * @param defaultEnabled do we use default mpi include path?
-	 */
-	private void createContents(Composite composite, boolean defaultEnabled) {
-
-		int columns = 4;
-
-		Composite group = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = columns;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		useOpenMPProjectSettingsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useOpenMPProjectSettingsButton.setText("Add OpenMP project settings to this project");
-		GridData gd=new GridData();
-		gd.horizontalSpan=columns;
-		useOpenMPProjectSettingsButton.setLayoutData(gd);
-		useOpenMPProjectSettingsButton.setSelection(useOpenMPProjectSettings);
-		useOpenMPProjectSettingsButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				useOpenMPProjectSettings = useOpenMPProjectSettingsButton.getSelection();
-				// set value so we can read it later
-				pageData.put(PAGE_ID+DOT+DO_OpenMP_INCLUDES, Boolean.toString(useOpenMPProjectSettings));
-				
-				useDefaultsButton.setEnabled(useOpenMPProjectSettings);
-				if(OpenMPSampleButton!=null)
-				   OpenMPSampleButton.setEnabled(useOpenMPProjectSettings);
-				if(useOpenMPProjectSettings) {
-				  boolean useDefaults=useDefaultsButton.getSelection();
-				  setUserAreaEnabled(!useDefaults);
-				}
-				
-				else
-					setUserAreaEnabled(false);
-				
-			}
-		});
-
-		useDefaultsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useDefaultsButton.setText("Use default information");
-		useDefaultsButton.setSelection(defaultEnabled);
-		useDefaultsButton.setEnabled(false);
-		GridData buttonData = new GridData();
-		buttonData.horizontalSpan = columns;
-		useDefaultsButton.setLayoutData(buttonData);
-		useDefaultsButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				boolean useDefaults = useDefaultsButton.getSelection();
-
-				if (useDefaults) { 
-					// reset all fields and values back to the defaults
-					includePathField.setText(defaultOpenMPIncludePath);
-					setCurrentOpenMPIncludePath(defaultOpenMPIncludePath);
-					
-					libPathField.setText(defaultOpenMPLibName);
-					setCurrentOpenMPLibName(defaultOpenMPLibName);
-					
-					libNameField.setText(defaultOpenMPLibName);
-					setCurrentOpenMPLibName(defaultOpenMPLibName);
-					
-					libPathField.setText(defaultOpenMPLibPath);
-					setCurrentOpenMPLibPath(defaultOpenMPLibPath);
-					
-					openMPCompileCommandField.setText(defaultOpenMPBuildCommand);
-					setCurrentOpenMPCompileCommand(defaultOpenMPBuildCommand);
-					
-					openMPLinkCommandField.setText(defaultOpenMPBuildCommand);
-					setCurrentOpenMPLinkCommand(defaultOpenMPBuildCommand);
-				}
-				setUserAreaEnabled(!useDefaults);
-			}
-		});
-
-		createUserEntryArea(group, defaultEnabled);
-/*		
- 		// mpi sample file now provided by project template (also openmp)
-		OpenMPSampleButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		OpenMPSampleButton.setText("Include sample OpenMP source file?");
-		OpenMPSampleButton.setSelection(false);
-		OpenMPSampleButton.setEnabled(false);
-		GridData gdSample=new GridData();
-		gdSample.horizontalSpan = columns;
-		OpenMPSampleButton.setLayoutData(gdSample);
-		OpenMPSampleButton.addSelectionListener(new SelectionAdapter() {
-		
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				boolean doit=OpenMPSampleButton.getSelection();
-				setCurrentOpenMPSample(doit);
-			}
-		
-		});
-		*/
-		setUserAreaEnabled(!defaultEnabled);
-
-	}
-
-	public void createControl(Composite parent) {
-
-		composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		boolean defaultEnabled = true;
-		createContents(composite, defaultEnabled);
-	}
-
-	public void dispose() {
-		composite.dispose();
-
-	}
-
-	public Control getControl() {
-		return composite;
-	}
-
-	public String getDescription() {
-		String tmp="Select the OpenMP include path, lib name, library search path, and build command information to be automatically be added to the new project.";
-		return tmp;
-	}
-
-	public String getErrorMessage() {
-		return null;
-		// return new String("My error msg");
-	}
-
-	public Image getImage() {
-		return getWizard().getDefaultPageImage();
-	}
-
-	public String getMessage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getTitle() {
-		return "OpenMP Project Settings";
-	}
-
-	public void performHelp() {
-		// do nothing
-
-	}
-
-	public void setDescription(String description) {
-		// do nothing
-
-	}
-
-	public void setImageDescriptor(ImageDescriptor image) {
-		// do nothing
-
-	}
-
-	public void setTitle(String title) {
-		// do nothing
-
-	}
-
-	/**
-	 * If you need to init data/widgets on the page when it is displayed based
-	 * on the data set in previous pages, you can override
-	 * IDialogPage.setVisible(boolean visible) and setup everything when visible ==
-	 * true.
-	 * 
-	 * Otherwise, do inits in the ctor.
-	 */
-	public void setVisible(boolean visible) {
-		composite.setVisible(visible);
-		if(traceOn)System.out.println("OpenMPProjectWizardPage.setVisible: " + visible);
-
-	}
-
-	/**
-	 * Determines the status of the wizard's finish button. If we don't want the
-	 * user to press finish yet, set this to false. <br>
-	 * The Next/Finish/Cancel methods belong to the wizard itself and not the
-	 * pages.
-	 * 
-	 * @return boolean true if finish button should be enabled; false otherwise.
-	 */
-	protected boolean isCustomPageComplete() {
-		// BRT if isDefaults is not checked then includePathField etc. should be
-		// filled in.
-		// BRT if isDefaults is checked then there should actually BE some
-		// defaults to use.
-		return true;
-	}
-
-	/**
-	 * Enable/disable "user area" which is the place user can type and make
-	 * changes (includePathField, its label and button, etc.)
-	 * 
-	 * @param enabled
-	 */
-	private void setUserAreaEnabled(boolean enabled) {
-		
-		includePathField.setEnabled(enabled);
-		browseButton.setEnabled(enabled);
-		browseButton2.setEnabled(enabled);
-		libNameField.setEnabled(enabled);
-		libPathField.setEnabled(enabled);
-		
-		includePathLabel.setEnabled(enabled);
-		libPathLabel.setEnabled(enabled);
-		libLabel.setEnabled(enabled);
-		
-		openMPCompileCommandLabel.setEnabled(enabled);
-		openMPCompileCommandField.setEnabled(enabled);
-		openMPLinkCommandLabel.setEnabled(enabled);
-		openMPLinkCommandField.setEnabled(enabled);
-	}
-	
-	/**
-	 * What's the default, do we include OpenMP includes or not?
-	 * If there is any difficulty getting information, use this default
-	 * setting.
-	 * @return
-	 */
-	public static boolean getDefaultUseOpenMPIncludes() {
-		return defaultUseOpenMPIncludes;
-	}
-
-	public Map<String,String> getPageData() {
-		return pageData;
-	}
-	@Override
-	protected IPreferencePage getPreferencePage() {
-		if(preferencePage == null) {
-			preferencePage = new org.eclipse.ptp.pldt.openmp.core.prefs.OpenMPPreferencePage();
-		}
-		return preferencePage;
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml
deleted file mode 100644
index a11d7af..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="IBM Research"
-		copyright="Copyright (c) 2007 IBM Corp. and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
-		id="MPIemptyCproject" label="MPI Empty C Project" description="An empty MPI  project template"
-		 help="help.html">
-
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c
deleted file mode 100644
index 0f6c962..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c
+++ /dev/null

@@ -1,55 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Hello MPI World in C 
- ============================================================================
- */
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-
-int main(int argc, char* argv[]){
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "$(mpi.hello.message) from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-	}
-	else{
-		printf("$(mpi.hello.message) From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.properties
deleted file mode 100644
index 2566832..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-HelloWorld.CAnsitemplate.label=MPI Hello World C Project
-HelloWorld.CAnsitemplate.description=A skeletal Managed C Hello World project. Creates a folder for sources and another for include.
-HelloWorld.basics.label=Basic Settings
-HelloWorld.basics.description=Basic properties of a project
-HelloWorld.author.label=Author
-HelloWorld.author.description=Name of the author
-HelloWorld.copyright.label=Copyright notice
-HelloWorld.copyright.description=Your copyright notice
-HelloWorld.copyright.default=Your copyright notice
-HelloWorld.message.default.mpi=Hello MPI World
-HelloWorld.message.description=Your hello world greeting message
-HelloWorld.message.label=Hello world greeting
-HelloWorld.sourceDir.label=Source
-HelloWorld.sourceDir.description=Directory for hello world project source files
-HelloWorld.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml
deleted file mode 100644
index 9274e6a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="MPIhelloWorldCProject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
-		 help="help.html">
-	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%HelloWorld.author.label"
-			description="%HelloWorld.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%HelloWorld.copyright.label"
-			description="%HelloWorld.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="mpi.hello.message"
-			label="%HelloWorld.message.label"
-			description="%HelloWorld.message.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.message.default.mpi"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%HelloWorld.sourceDir.label"
-				description="%HelloWorld.sourceDir.description"
-				type="input"
-				default="%HelloWorld.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.c"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-	
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp
deleted file mode 100644
index 983a0cb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp
+++ /dev/null

@@ -1,57 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Compute Pi in MPI C++
- ============================================================================
- */
-#include <math.h> 
-#include "mpi.h" 
-#include <iostream>
-using namespace std;
- 
-int main(int argc, char *argv[]) 
-{ 
-    int n, rank, size, i; 
-    double PI25DT = 3.141592653589793238462643; 
-    double mypi, pi, h, sum, x; 
- 
-    MPI::Init(argc, argv); 
-    size = MPI::COMM_WORLD.Get_size(); 
-    rank = MPI::COMM_WORLD.Get_rank(); 
- 
-    while (1) { 
-	if (rank == 0) { 
-	   
-		 cout << "Enter the number of intervals: (0 quits)" 
-				 << endl; 
-			    cin >> n; 
-			    
-	} 
- 
-	MPI::COMM_WORLD.Bcast(&n, 1, MPI::INT, 0); 
-	if (n==0) 
-	    break; 
-	else { 
-	    h = 1.0 / (double) n; 
-	    sum = 0.0; 
-	    for (i = rank + 1; i <= n; i += size) { 
-		x = h * ((double)i - 0.5); 
-		sum += (4.0 / (1.0 + x*x)); 
-	    } 
-	    mypi = h * sum; 
- 
-	    MPI::COMM_WORLD.Reduce(&mypi, &pi, 1, MPI::DOUBLE, 
-				   MPI::SUM, 0); 
-	    if (rank == 0) 
-		cout << "pi is approximately " << pi 
-		     << ", Error is " << fabs(pi - PI25DT) 
-		     << endl; 
-	} 
-    } 
-    MPI::Finalize(); 
-    return 0; 
-} 
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.properties
deleted file mode 100644
index 6cff9a2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-MPIcppPi.CAnsitemplate.label=MPI Pi C++ Project
-MPIcppPi.CAnsitemplate.description=A skeletal Managed CPP  project. Creates a folder for sources and another for include.
-MPIcppPi.basics.label=Basic Settings
-MPIcppPi.basics.description=Basic properties of a project
-MPIcppPi.author.label=Author
-MPIcppPi.author.description=Name of the author
-MPIcppPi.copyright.label=Copyright notice
-MPIcppPi.copyright.description=Your copyright notice
-MPIcppPi.copyright.default=Your copyright notice
-MPIcppPi.message.default.mpi=Hello MPI C++ Pi World
-MPIcppPi.message.description=Your  greeting message
-MPIcppPi.message.label=Hello world greeting
-MPIcppPi.sourceDir.label=Source
-MPIcppPi.sourceDir.description=Directory for  project source files
-MPIcppPi.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml
deleted file mode 100644
index 7c79651..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="MPIcppPiProject" label="%MPIcppPi.CAnsitemplate.label" description="%MPIcppPi.CAnsitemplate.description"
-		 help="help.html">
-	<property-group id="basics" label="%MPIcppPi.basics.label" description="%MPIcppPi.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%MPIcppPi.author.label"
-			description="%MPIcppPi.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%MPIcppPi.copyright.label"
-			description="%MPIcppPi.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%MPIcppPi.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="mpi.hello.message"
-			label="%MPIcppPi.message.label"
-			description="%MPIcppPi.message.description"
-			type="input"
-			pattern=".*"
-			default="%MPIcppPi.message.default.mpi"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%MPIcppPi.sourceDir.label"
-				description="%MPIcppPi.sourceDir.description"
-				type="input"
-				default="%MPIcppPi.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.cpp"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).cpp"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-	
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcessCPP">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c
deleted file mode 100644
index 9646bb5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c
+++ /dev/null

@@ -1,106 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Calculate Pi in MPI
- ============================================================================
- */
-#include <mpi.h>
-#include <stdio.h>
-#include <string.h>
-
-void
-calc_pi(int rank, int num_procs)
-{
-	int		i;
-	int		num_intervals;
-	double	h;
-	double	mypi;
-	double	pi;
-	double	sum;
-	double	x;
-
-	/* set number of intervals to calculate */
-	if (rank == 0) {
-		num_intervals = 100000000;
-	}
-
-	/* tell other tasks how many intervals */
-	MPI_Bcast(&num_intervals, 1, MPI_INT, 0, MPI_COMM_WORLD);
-
-	/* now everyone does their calculation */
-
-	h = 1.0 / (double) num_intervals; 
-	sum = 0.0;
-
-	for (i = rank + 1; i <= num_intervals; i += num_procs) { 
-		x = h * ((double)i - 0.5); 
-		sum += (4.0 / (1.0 + x*x)); 
-	} 
-
-	mypi = h * sum;
-
-	/* combine everyone's calculations */
-	MPI_Reduce(&mypi, &pi, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD);
-
-	if (rank == 0) {
-		printf("PI is approximately %.16f\n", pi);
-	}
-}
-
-int 
-main(int argc, char *argv[])
-{
-	int			my_rank;		/* rank of process */
-	int			num_procs;		/* number of processes */
-	int			source;			/* rank of sender */
-	int			dest = 0;		/* rank of receiver */
-	int			tag = 0;		/* tag for messages */
-	char		message[100];	/* storage for message */
-	MPI_Status	status ;		/* return status for receive */
-
-	/* start up MPI */
-
-	MPI_Init(&argc, &argv);
-
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &num_procs); 
-
-
-	if (my_rank != 0) {
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-				dest, tag, MPI_COMM_WORLD);
-	} else {
-		printf("Num processes: %d\n",num_procs);
-		for (source = 1; source < num_procs; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-					MPI_COMM_WORLD, &status);
-			printf("Process 0 received \"%s\"\n",message);
-		}
-
-		/* now return the compliment */
-		sprintf(message, "Hi, how are you?");
-	}
-
-	MPI_Bcast(message, strlen(message)+1, MPI_CHAR, dest, MPI_COMM_WORLD);
-
-	if (my_rank != 0) {
-		printf("Process %d received \"%s\"\n", my_rank, message);
-	}
-
-	/* calculate PI */
-	calc_pi(my_rank, num_procs);
-
-	/* shut down MPI */
-	MPI_Finalize(); 
-
-	return 0;
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties
deleted file mode 100644
index 3719c84..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-MPIpi.template.label=MPI Pi C Project
-MPIpi.CAnsitemplate.description=MPI project to calculate Pi. Employs a variety of MPI APIs.
-MPIpi.basics.label=Basic Settings
-MPIpi.basics.description=Basic properties of a project
-MPIpi.author.label=Author
-MPIpi.author.description=Name of the author
-MPIpi.copyright.label=Copyright notice
-MPIpi.copyright.description=Your copyright notice
-MPIpi.copyright.default=Your copyright notice
-MPIpi.message.default.mpipi=Hello MPI Pi World
-MPIpi.message.description=Your greeting message
-MPIpi.message.label=Greeting
-MPIpi.sourceDir.label=Source
-MPIpi.sourceDir.description=Directory for  project source files
-MPIpi.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml
deleted file mode 100644
index b008077..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="MPIpiCProject" label="%MPIpi.template.label" description="%MPIpi.template.description"
-		 help="help.html">
-	<property-group id="basics" label="%MPIpi.basics.label" description="%MPIpi.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%MPIpi.author.label"
-			description="%MPIpi.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%MPIpi.copyright.label"
-			description="%MPIpi.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%MPIpi.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="mpi.hello.message"
-			label="%MPIpi.message.label"
-			description="%MPIpi.message.description"
-			type="input"
-			pattern=".*"
-			default="%MPIpi.message.default.mpipi"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%MPIpi.sourceDir.label"
-				description="%MPIpi.sourceDir.description"
-				type="input"
-				default="%MPIpi.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.c"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-	
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml
deleted file mode 100644
index 3dd41bf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="IBM Research"
-		copyright="Copyright (c) 2007 IBM Corp. and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
-		id="OpenMPemptyCProject" label="OpenMP Empty C Project" description="An OpenMP MPI project template"
-		 help="help.html">
-
-	<process type="org.eclipse.ptp.pldt.wizards.openMPProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c
deleted file mode 100644
index 2793ee5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c
+++ /dev/null

@@ -1,40 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Hello OpenMP World in C
- ============================================================================
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include "omp.h"
-
-
-int main(int argc, char* argv[]){
-	int    i,arraySize;
-	double *x, *y;     /* the arrays                 */
-	printf("$(openmp.hello.message)\n");
-
-// sample openMP API
-	if (omp_in_parallel()){
-		printf("true");
-	}
-	  /* Allocate memory for the arrays. */
-  x = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-  y = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-
-  /* Here's the OpenMP pragma that parallelizes the for-loop. */
-#pragma omp parallel for
-  for ( i = 0; i < arraySize; i++ )
-    {
-      y[i] = sin( exp( cos( - exp( sin(x[i]) ) ) ) );
-    }
-
-
-	return 0;
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c
deleted file mode 100644
index de1bbbc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c
+++ /dev/null

@@ -1,34 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include "omp.h"
-
-
-// Sample dummy OpenMP program
-
-
-int main(int argc, char* argv[]){
-	int    i,arraySize;
-	double *x, *y;     /* the arrays                 */
-	printf("Hello OpenMP World.\n");
-
-// sample openMP API
-	if (omp_in_parallel()){
-		printf("true");
-	}
-	  /* Allocate memory for the arrays. */
-  x = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-  y = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-
-  /* Here's the OpenMP pragma that parallelizes the for-loop. */
-#pragma omp parallel for
-  for ( i = 0; i < arraySize; i++ )
-    {
-      y[i] = sin( exp( cos( - exp( sin(x[i]) ) ) ) );
-    }
-
-
-	return 0;
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.properties
deleted file mode 100644
index 62b68a7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-HelloWorld.CAnsitemplate.label=OpenMP Hello World C Project
-HelloWorld.CAnsitemplate.description=A skeletal Managed C Hello World project. Creates a folder for sources and another for include.
-HelloWorld.basics.label=Basic Settings
-HelloWorld.basics.description=Basic properties of a project
-HelloWorld.author.label=Author
-HelloWorld.author.description=Name of the author
-HelloWorld.copyright.label=Copyright notice
-HelloWorld.copyright.description=Your copyright notice
-HelloWorld.copyright.default=Your copyright notice
-HelloWorld.message.default.omp=Hello OpenMP World
-HelloWorld.message.description=Your hello world greeting message
-HelloWorld.message.label=Hello world greeting
-HelloWorld.sourceDir.label=Source
-HelloWorld.sourceDir.description=Directory for hello world project source files
-HelloWorld.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml
deleted file mode 100644
index 1ca0aac..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="OpenMPhelloWorldCproject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
-		 help="help.html">
-
-	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%HelloWorld.author.label"
-			description="%HelloWorld.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%HelloWorld.copyright.label"
-			description="%HelloWorld.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="openmp.hello.message"
-			label="%HelloWorld.message.label"
-			description="%HelloWorld.message.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.message.default.omp"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%HelloWorld.sourceDir.label"
-				description="%HelloWorld.sourceDir.description"
-				type="input"
-				default="%HelloWorld.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.c"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-
-	<process type="org.eclipse.ptp.pldt.wizards.openMPProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-</template>
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.core/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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/remotetools/org.eclipse.ptp.remotetools.core/.project b/tools/remotetools/org.eclipse.ptp.remotetools.core/.project
deleted file mode 100755
index df725c7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF
deleted file mode 100755
index 6b29e73..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.core;singleton:=true
-Bundle-Version: 2.1.9.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.RemotetoolsPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- com.jcraft.jsch,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.utils.core;bundle-version="1.0.0"
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.ptp.remotetools,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.ptp.remotetools.exception
-Bundle-ClassPath: 
- .

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini
+++ /dev/null

@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.mappings b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.mappings
+++ /dev/null

@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties
deleted file mode 100644
index 0674b9d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-blurb=PTP Remote Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2008 IBM Corporation, and others.  All rights reserved.\n\
-Visit http://www.eclipse.org/ptp\n
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties
deleted file mode 100755
index a179b11..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png b/tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.properties
deleted file mode 100644
index a3310e0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml
deleted file mode 100755
index 8e49b52..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java
deleted file mode 100755
index bbed882..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ptp.remotetools.core.AuthToken;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-import org.eclipse.ptp.remotetools.internal.ssh.CipherTypes;
-import org.eclipse.ptp.remotetools.internal.ssh.Connection;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plug-in class to be used in the desktop.
- */
-public class RemotetoolsPlugin extends Plugin {
-
-	//The shared instance.
-	private static RemotetoolsPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public RemotetoolsPlugin() {
-		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 RemotetoolsPlugin getDefault() {
-		return plugin;
-	}
-	
-	
-	/**
-	 * Returns an instance of {@link IRemoteConnection} using a ssh connection.
-	 */
-	public static IRemoteConnection createSSHConnection(AuthToken authToken, String hostname,
-			int port, String cipherType, int timeout)
-	{		
-		return new Connection(authToken, hostname, port, cipherType, timeout);
-	}
-
-	/**
-	 * Returns an instance of {@link IRemoteConnection} using a ssh connection.
-	 */
-	public static IRemoteConnection createSSHConnection(AuthToken authToken, String hostname,
-			int port, String cipherType)
-	{		
-		return new Connection(authToken, hostname, port, cipherType);
-	}
-	
-	/**
-	 * Returns an instance of {@link IRemoteConnection} using a ssh connection.
-	 */
-	public static IRemoteConnection createSSHConnection(AuthToken authToken, String hostname)
-	{		
-		return new Connection(authToken, hostname);
-	}
-
-	public static IRemoteConnection createSSHConnection(AuthToken authToken, String hostname, int port) {
-		return new Connection(authToken, hostname, port);
-	}
-	
-	/**
-	 * 3DES cipher type
-	 */
-	public static final String CIPHER_3DES = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_3DES;
-	/**
-	 * AES128 cipher type
-	 */
-	public static final String CIPHER_AES128 = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_AES128;
-	/**
-	 * AES192 cipher type
-	 */
-	public static final String CIPHER_AES192 = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_AES192;
-	/**
-	 * AES256 cipher type
-	 */
-	public static final String CIPHER_AES256 = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_AES256;
-	/**
-	 * Blowfish cipher type
-	 */
-	public static final String CIPHER_BLOWFISH = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_BLOWFISH;
-	/**
-	 * Default cipher type
-	 */
-	public static final String CIPHER_DEFAULT = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_DEFAULT;
-	
-	public static Map getCipherTypesMap() {
-		HashMap map = new HashMap(CipherTypes.getCipherTypesMap());
-		
-		return map;
-	}
-	
-	/**
-	 * Returns an instance of {@link IRemoteConnection} using a ssh connection.
-	 *//*
-	public static IRemoteConnection createSSHConnection(String username, String password, String hostname,
-			int port, int timeout)
-	{		
-		return new Connection(username, password, hostname, port, timeout);
-	}
-
-	*//**
-	 * Returns an instance of {@link IRemoteConnection} using a ssh connection.
-	 *//*
-	public static IRemoteConnection createSSHConnection(String username, String password, String hostname)
-	{		
-		return new Connection(username, password, hostname);
-	}
-
-	public static IRemoteConnection createSSHConnection(String username, String password, String hostname, int port) {
-		return new Connection(username, password, hostname, port);
-	}*/
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java
deleted file mode 100755
index ab14072..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * 
- * 
- * @author Richard Maciel
- *
- */
-public abstract class AuthToken {
-	private String username;
-
-	public AuthToken(String username) {
-		this.username = username;
-	}
-	
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java
deleted file mode 100644
index 899914c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * Represents a local port forwarding created by
- * {@link IRemotePortForwardingTools}.
- * <p>
- * The local port is forwarded to a host:port accessibly to the remote host.
- * <p>
- * Check inherited {@link IPortForwarding} for more methods.
- */
-public interface ILocalPortForwarding extends IPortForwarding {
-	/** The local port that is being forwarded. */
-	public abstract int getLocalPort();
-
-	/** The host where the local port is forwarded to. */
-	public abstract String getRemoteAddress();
-
-	/** The port on the host where the local port is forwarded to. */
-	public abstract int getRemotePort();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java
deleted file mode 100644
index 301e584..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * Represents a port forwarding created by {@link IRemotePortForwardingTools}.
- * <p>
- * In order to turn off port forwarding, call {@link #release()} or
- * {@link IRemotePortForwardingTools#releaseForwarding(IPortForwarding)}.
- * <p>
- * The information that describes the port forwarding is valid until the
- * forwarding is turned off. The check if the forwarding is active, call
- * {@link #isActive()}.
- * 
- * @author Daniel Felix Ferber
- */
-public interface IPortForwarding {
-	/** If the port forwarding is turned on. */
-	public abstract boolean isActive();
-
-	/**
-	 * Turn off the port forwarding. It is facility method that calls
-	 * {@link IRemotePortForwardingTools#releaseForwarding(IPortForwarding)}.
-	 * 
-	 * @throws RemoteConnectionException
-	 *             The connection is not in a valid state anymore.
-	 * @throws PortForwardingException
-	 *             Failed to turn off the remote port forwarding. The forwarding
-	 *             was already turned off before.
-	 * @throws CancelException 
-	 */
-	public abstract void release() throws RemoteConnectionException,
-			PortForwardingException, CancelException;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java
deleted file mode 100755
index 56c9de0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-/**
- * A connection to a remote host. Serves as a starting point for creating
- * {@link IRemoteExecutionManager}, that to operations on the remote host.
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.1
- * <b>Review OK</b>
- */
-public interface IRemoteConnection
-{
-	void connect() throws RemoteConnectionException;
-
-	/**
-	 * Terminate connection to remote machine.
-	 * <p>
-	 * TODO: Decide: Block until all pending operations are finished or cancels
-	 * pending operations?
-	 */
-	public void disconnect();
-
-	/**
-	 * Check if successfully connected with the remote host.
-	 * 
-	 * @return True if is connected with remote host
-	 */
-	public boolean isConnected();
-
-	/**
-	 * Create a proper instance of {@link IRemoteExecutionManager}.
-	 * 
-	 * @return the {@link IRemoteExecutionManager} for this connection
-	 * @throws RemoteConnectionException if the {@link IRemoteExecutionManager} could not be created.
-	 */
-	public IRemoteExecutionManager createRemoteExecutionManager() throws RemoteConnectionException;
-}	

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java
deleted file mode 100755
index 65e8a87..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-/**
- * Groups all operations that do data transference between remote and local
- * host.
- * 
- * @author Daniel Felix Ferber, Richard Maciel
- * 
- */
-public interface IRemoteCopyTools {
-	public IRemoteUploadExecution executeUpload(String remoteFile, InputStream source) throws RemoteConnectionException;
-
-	public IRemoteDownloadExecution executeDownload(String remoteFile, OutputStream sink) throws RemoteConnectionException;
-
-	public IRemoteUploadExecution executeUpload(String remoteFile) throws RemoteConnectionException;
-
-	public IRemoteDownloadExecution executeDownload(String remoteFile) throws RemoteConnectionException;
-
-	public void downloadFileToDir(String remotePath, File localDir) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void downloadFileToDir(String remotePath, String localPah) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void downloadFileToFile(String remotePath, File localFile) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void downloadFileToFile(String remotePath, String localPath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToDir(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToDir(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToFile(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToFile(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	/**
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void downloadDirToDir(String remotePath, File localDir, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-	/**
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void downloadDirToDir(String remotePath, String localPath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-	/**
-	 * @throws RemoteOperationException 
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void uploadDirToDir(File localDir, String remotePath, boolean recursive) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	/**
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void uploadDirToDir(String localPath, String remotePath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDirectory.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDirectory.java
deleted file mode 100755
index 80ea7a6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDirectory.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-/**
- * @author Richard Maciel
- *
- */
-public interface IRemoteDirectory extends IRemoteItem {
-	
-	public boolean isAccessible();
-	public void setAccessible(boolean flag) throws RemoteConnectionException, CancelException;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java
deleted file mode 100755
index 0ce92d0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public interface IRemoteDownloadExecution extends IRemoteOperation {
-	/**
-	 * Process return exit status.
-	 */
-	public int getReturnCode();
-	
-	/**
-	 * Get the output stream that writes to the remote file.
-	 */
-	public InputStream getInputStreamFromProcessRemoteFile() throws IOException;
-	
-	public String getErrorMessage();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java
deleted file mode 100755
index 7fc2710..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.LocalPortBoundException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-/**
- * Provides service to run commands on the remote host and to transfer files from/to the remote host. 
- * <p>>
- * Adds functionality for blocking operations until they finish execution.
- * Allows canceling the hole manager, that will cancel all current operation by raising CancelException
- * on each of them..
- * <p>
- * All paths MUST be specified as full absolute paths.
- * <p>
- * 
- * @author Richard Maciel, Daniel F. Ferber
- * @since 1.1
- */
-public interface IRemoteExecutionManager {
-	/**
-	 * Cancels the all current scripts on execution at the remote machine that were created by this manager.
-	 * Also cancels current file transfer operations.
-	 * Does not allow any further operations.
-	 */
-	public void cancel();
-	/**
-	 * Removes the cancel conditions and allows further operations again.
-	 */
-	public void resetCancel();
-	
-	/**
-	 * Free allocated resources for the execution.
-	 */
-	public void close();
-
-	public IRemoteFileTools getRemoteFileTools() throws RemoteConnectionException;
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException;
-	public IRemoteExecutionTools getExecutionTools() throws RemoteConnectionException;
-	
-	public IRemotePathTools getRemotePathTools();
-		
-	public IRemoteStatusTools getRemoteStatusTools() throws RemoteConnectionException;
-
-	public IRemotePortForwardingTools getPortForwardingTools() throws RemoteConnectionException;
-	
-	/**
-	 * Create and bind a tunnel from localhost port to a given remotehost port.
-	 * This methods allocs the localhost port automatically.
-	 * 
-	 * @param addressOnRemoteHost Remote Host address
-	 * @param portOnRemoteHost Remote Host port
-	 * @return An IRemoteTunnel object representing the created tunnel
-	 * @throws RemoteConnectionException
-	 * @throws LocalPortBoundException No local port available to connect.
-	 * @throws CancelException 
-	 * (this method should be deprecated in future and moved to IRemotePortForwardingTools)
-	 */
-	public IRemoteTunnel createTunnel(String addressOnRemoteHost, int portOnRemoteHost) throws RemoteConnectionException, LocalPortBoundException, CancelException;
-	/*
-	 * (this method should be deprecated in future and moved to IRemotePortForwardingTools)
-	 */
-	public IRemoteTunnel createTunnel(int localPort, String addressOnRemoteHost, int portOnRemoteHost) throws RemoteConnectionException, LocalPortBoundException, CancelException;
-	/*
-	 * (this method should be deprecated in future and moved to IRemotePortForwardingTools)
-	 */
-	public void releaseTunnel(IRemoteTunnel tunnel) throws RemoteConnectionException;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java
deleted file mode 100755
index e639c42..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-
-public interface IRemoteExecutionTools {
-	/**
-	 * Create a object that describes a bash script to be executed on the remote host.
-	 * @return a pre-configured instance of IRemoteScript
-	 */
-	public IRemoteScript createScript();
-
-	/**
-	 * Execute a bash script described by an {@link IRemoteScript}.
-	 * <p>
-	 * The script will start executing immediately, The method does not block.
-	 * <p>
-	 * The {@link IRemoteScriptExecution} instance returned by this method describes the
-	 * execution properties, completion status and its result (once finished).
-	 * The {@link IRemoteScriptExecution} has a method for blocking the current thread
-	 * until the script finishes execution and another to cancel the script individually.
-	 * 
-	 * @param remoteScript The {@link IRemoteScript} that describes the bash script to be executed
-	 * @return a proper instance of {@link IRemoteScriptExecution}. 
-	 * @throws RemoteConnectionException If not possible to request the execution on remote host. 
-	 * @throws  
-	 */
-	public IRemoteScriptExecution executeScript(IRemoteScript remoteScript) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	public RemoteProcess executeProcess(IRemoteScript remoteScript) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	/**
-	 * Run a command and wait until it finishes.
-	 * @return command exit status.
-	 */
-	public int executeWithExitValue(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	/**
-	 * Run a command and return its output.
-	 * @throws IOException 
-	 */
-	public String executeWithOutput(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	/**
-	 * Run a bash command. Assume that non zero exit status means error.
-	 */
-	public void executeBashCommand(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFile.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFile.java
deleted file mode 100755
index be42727..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFile.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-/**
- * @author Richard Maciel
- *
- */
-public interface IRemoteFile extends IRemoteItem {
-	
-	public boolean isExecutable();
-	public void setExecutable(boolean flag);
-	
-	public long getSize();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java
deleted file mode 100755
index 31c2e02..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.util.Enumeration;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-public interface IRemoteFileEnumeration extends Enumeration {
-	public IRemoteItem nextElementAsItem();
-	public Exception nextException();
-	public boolean hasMoreExceptions();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java
deleted file mode 100755
index 6ba01aa..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.util.Enumeration;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-/**
- * Groups all operations about files on the remote host.
- * 
- * @author Daniel Ferber, Richard Maciel
- */
-public interface IRemoteFileTools {
-
-	/**
-	 * Return an IRemoteCopyTools object
-	 * @throws RemoteConnectionException
-	 * @return IRemoteCopyTools
-	 */
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException;
-	
-	/**
-	 * Move a file on remote host.
-	 * <p>
-	 * Create (sub)directories as necessary for the new path.
-	 * 
-	 * @param from
-	 *            Absolute path to source on remote host.
-	 * @param to
-	 *            Absolute path to destination on remote host.
-	 * @throws RemoteExecutionException
-	 *             The file could not be moved.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The move operation was canceled by another thread. If the
-	 *             move involves several files, then the move may remain
-	 *             incomplete.
-	 */
-	public void moveFile(String from, String to)
-			throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	/**
-	 * Copy a file on remote host.
-	 * <p>
-	 * Create (sub)directories as necessary for the new path.
-	 * 
-	 * @param from
-	 *            Absolute path to source on remote host.
-	 * @param to
-	 *            Absolute path to destination on remote host.
-	 * @throws RemoteExecutionException
-	 *             The file could not be copied.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The copy operation was canceled by another thread. If the
-	 *             copy involves several files, then the copy may remain
-	 *             incomplete.
-	 */
-	public void copyFile(String from, String to) throws RemoteOperationException,
-		RemoteConnectionException, CancelException;
-	
-	/**
-	 * Delete a file or directory on remote host.
-	 * <p>
-	 * If the path is a directory, remove recursively.
-	 * 
-	 * @param file
-	 *            Absolute path of file or directory to be deleted.
-	 * @throws RemoteExecutionException
-	 *             The file could not be deleted.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The remove operation was canceled by another thread. The
-	 *             file(s) may have been all removed, partially not removed or
-	 *             not removed at all.
-	 */
-	public void removeFile(String file) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	
-	/**
-	 * Create a new directory.
-	 * <p>
-	 * If directory exists, nothings is done.
-	 * Create parent directories as necessary.
-	 * 
-	 * @param file
-	 *            Directory to be created.
-	 * @throws RemoteExecutionException
-	 *             The directory could not be created.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The operation was canceled by another thread.
-	 */
-	public void createDirectory(String file) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * Assure that a directory exists. 
-	 * <p>
-	 * Works like {@link #createDirectory(String)}, but may be more efficient.
-	 * 
-	 * @param directory
-	 *            Directory that must be guaranteed to exist
-	 * @throws RemoteExecutionException
-	 *             The directory could not be created.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public void assureDirectory(String directory)
-			throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	/**
-	 * Query if the path exists and is a directory on the remote host.
-	 * 
-	 * @param directory
-	 * @return
-	 * @throws RemoteExecutionException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public boolean hasDirectory(String directory)
-			throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	public boolean hasFile(String directory) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	public boolean canWrite(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException;
-
-	public boolean canRead(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException;
-
-	public boolean canExecute(String remotePath)
-			throws RemoteOperationException, RemoteConnectionException, CancelException;
-
-	/**
-	 * List all items from a given path on the remote host. 
-	 * If the item is a directory, it will
-	 * list all its files and directories. If the item is a file, only list 
-	 * itself.
-	 * The result is an array of objects that describe the propreties of
-	 * the items. The properties differ according to the nature of the item.
-	 * 
-	 * @param path
-	 *            string that represents the remote path
-	 * @return An array of items of the remote path. If the item is a directory
-	 * and it is empty, then the array is empty.
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public IRemoteItem[] listItems(String remotePath)
-			throws RemoteConnectionException, RemoteOperationException,
-			CancelException;
-
-	/**
-	 * Query properties of the given item on the remote host.
-	 * 
-	 * @param path
-	 *            string to a file
-	 * @return A {@link IRemoteFile} object
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host or is not a file.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public IRemoteItem getItem(String path) throws RemoteConnectionException,
-	RemoteOperationException, CancelException;
-
-	/**
-	 * Convenience method to query properties of the given file on the remote
-	 * host.
-	 * 
-	 * @param filePath
-	 *            Absolute path to a file
-	 * @return A {@link IRemoteFile} object
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host or is not a file.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @throws RemoteOperationException 
-	 */
-	public IRemoteFile getFile(String filePath)
-			throws RemoteConnectionException,
-			CancelException, RemoteOperationException;
-
-	/**
-	 * Convenience method to query properties of the given directory on the
-	 * remote host.
-	 * 
-	 * @param directoryPath
-	 *            Absolute path to a directory
-	 * @return A {@link IRemoteDirectory} object
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host or is not a file.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @throws RemoteOperationException 
-	 */
-	public IRemoteDirectory getDirectory(String directoryPath)
-			throws RemoteConnectionException,
-			CancelException, RemoteOperationException;
-	
-	public IRemoteFileEnumeration createFileEnumeration(String path) throws RemoteOperationException, RemoteConnectionException, CancelException;
-	public IRemoteFileEnumeration createRecursiveFileEnumeration(String path) throws RemoteOperationException, RemoteConnectionException, CancelException;
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java
deleted file mode 100755
index 6c30d55..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-/**
- * @author richardm
- *
- */
-public interface IRemoteItem {
-
-	public String getPath();
-	public boolean exists();
-	
-	/**
-	 * Returns true if the remote item has a permission that allows to read this
-	 * item. Several permissions are considered (user, group, others) to
-	 * calculate de effective permission.
-	 * 
-	 * @return true/false
-	 */
-	public boolean isReadable();
-	public void setReadable(boolean flag);
-	
-	/**
-	 * Returns true if the remote item has a permission that allows to write
-	 * this item. Several permissions are considered (user, group, others) to
-	 * calculate de effective permission.
-	 * 
-	 * @return false
-	 */
-	public boolean isWritable();
-	public void setWriteable(boolean flag);
-	
-//	public long getCreationTime();
-//	public void setCreationTime(long time);
-
-	public long getModificationTime();
-	public void setModificationTime(long time);
-
-	public long getAccessTime();
-//	public void setAccessTime(long time);
-
-//	public String getUserId();
-//	public String setUserId();
-//	
-//	public String getGroupId();
-//	public String setGroupId();
-	
-	/**
-	 * Fetch all the attributes from the item on remote host.
-	 * @throws RemoteOperationException 
-	 */
-	public void refreshAttributes() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-	/**
-	 * Apply all the attributes to the item on remote host.
-	 * For efficiency, only changed attributes may be written.
-	 */
-	public void commitAttributes() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java
deleted file mode 100755
index fcc4df6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-/**
- * The common interface to all operations that can be executed on the remote host and that
- * may require time to finish.
- * <p>
- * Allows to block the current thread until the operation finishes on the remote host.
- * Allows to cancel the operation on the remote host (not all operation may implement this).
- * @author Richard Maciel, Daniel Felix Ferber
- * <b>Review OK.</b>
- */
-public interface IRemoteOperation
-{	
-	/**
-	 * Wait until the operation is finished or until
-	 * Canceled by another thread.
-	 * if canceled, then the result of the execution will probably be undefined.
-	 * 
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The script execution was canceled by another thread.
-	 */
-	public void waitForEndOfExecution() throws RemoteConnectionException, CancelException, RemoteExecutionException;
-
-	/**
-	 * Check if the operation finished because it was canceled.
-	 * @return True if the last operation was canceled.
-	 */
-	public boolean wasCanceled();
-
-	/**
-	 * Use this method to verify if the operation on the remote host did already finish or not.
-	 * @return true if the operation finished execution.
-	 */
-	public boolean wasFinished();
-	
-	/**
-	 * Cancel the operation on the remote host.
-	 */
-	public void cancel();
-
-
-	/**
-	 * Free allocated resources for the execution.
-	 */
-	public void close();
-	
-	
-	/**
-	 * Return the meaning of the exit value.
-	 */
-	public int getFinishStatus();
-	
-	/**
-	 * Get a text that describes the finish status code.
-	 */
-	public String getFinishStatusText(int status);
-
-	public boolean isException(int status);
-	public boolean isOK(int status);
-	public boolean isExecutableError(int status);
-	
-	public boolean wasException();
-	public boolean wasOK();
-	public boolean wasCommandError();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java
deleted file mode 100755
index f79bf4f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-public interface IRemotePathTools {
-
-	public String rootPath();
-
-	public boolean isRoot(String path);
-
-	public boolean isAbsolute(String path);
-
-	public boolean isRelative(String path);
-
-	public boolean isLeave(String path);
-
-	public String leave(String path);
-
-	public String canonicalize(String path);
-
-	public String join(String base, String path);
-
-	public String parent(String path);
-	
-	public String quote(String path, boolean full);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java
deleted file mode 100644
index 862c8ea..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * Represents a remote port forwarding created by {@link IRemotePortForwardingTools}.
- * <p>
- * The remote port is forwarded to a host:port accessibly to the local host.
- * <p>
- * Check inherited {@link IPortForwarding} for more methods.
- */
-public interface IRemotePortForwarding extends IPortForwarding {
-	/** The port on the host where the remote port is forwarded to. */
-	public abstract int getLocalPort();
-
-	/** The host where the remote port is forwarded to. */
-	public abstract String getLocalAddress();
-
-	/** The remote port that is being forwarded. */
-	public abstract int getRemotePort();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java
deleted file mode 100644
index 285f9b9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-public interface IRemotePortForwardingTools {
-	public IRemotePortForwarding forwardRemotePort(int remotePort, int localPort) throws RemoteConnectionException, PortForwardingException, CancelException;
-	public IRemotePortForwarding forwardRemotePort(int remotePort, String localAddress, int localPort) throws RemoteConnectionException, PortForwardingException, CancelException;
-
-//	public LocalPortForwarding forwardLocalPort(int localPort, int remotePort) throws RemoteConnectionException;
-//	public LocalPortForwarding forwardLocalPort(int localPort, String remoteAddress, int remotePort) throws RemoteConnectionException;
-
-	public void releaseForwarding(IPortForwarding forwading) throws RemoteConnectionException, PortForwardingException;
-	
-	public IRemotePortForwarding getRemotePortForwarding(int remotePort) throws RemoteConnectionException, PortForwardingException;
-//	public LocalPortForwarding getLocalPortForwarding(int localPort);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java
deleted file mode 100755
index fb879f7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Bean that holds configuration for a script that is to run remotely.
- * @author Richard Maciel, Daniel Ferber
- * @since 1.1
- * <b>Review OK</b>.
- */
-public interface IRemoteScript
-{
-	/**
-	 * Add an environment variable to be used by the script..
-	 * @param variable Variable name and value, informed as string like "variable=value"
-	 */
-	public void addEnvironment(String variable);
-	public void addEnvironment(String[] environment);
-	
-	/**
-	 * Set process input stream. Process stdin will read from this stream.
-	 * <p>
-	 * If not set, or if set to <code>null</code>, then the remote execution
-	 * will create an outputstream where one may write data to the process stdin.
-	 * (see {@link IRemoteExecution.getOutputStreamToProcessInputStream()).
-	 * @param input Input stream or null to run without input.
-	 */
-	public void setProcessInputStream(InputStream input);
-
-	/**
-	 * Set process output stream. Process stdout will write to this stream.
-	 * <p>
-	 * If not set, or if set to <code>null</code>, then the remote execution
-	 * will create an inputstream where one may read data that the process has
-	 * written to stdout.
-	 * (see {@link IRemoteExecution.getInputStreamFromProcessOutputStream()).
-	 * @param input Input stream or null to run without input.
-	 */
-	public void setProcessOutputStream(OutputStream output);
-
-	/**
-	 * Set process error stream. Process stdout will write to this stream.
-	 * <p>
-	 * If not set, or if set to <code>null</code>, then the remote execution
-	 * will create an inputstream where one may read data that the process has
-	 * written to stderr.
-	 * (see {@link IRemoteExecution.getInputStreamFromProcessErrorStream()).
-	 * @param input Input stream or null to run without input.
-	 */
-	public void setProcessErrorStream(OutputStream output);
-
-	/**
-	 * Set if X11 of the script will be forwarded to local host.
-	 * @param willForward
-	 */
-	public void setForwardX11(boolean willForward);
-	
-	/**
-	 * Set a single bash command that will be run as script.
-	 * @param script A bash script command.
-	 */
-	public void setScript(String script);
-	
-	/**
-	 * Set a bash script (list of sequential commands) to be run.
-	 * The script may contain while/for/if/switch construction.
-	 * @param script An array of bash script lines.
-	 */
-	public void setScript(String [] script);
-	
-	public void setFetchProcessOutputStream(boolean flag);
-	public void setFetchProcessErrorStream(boolean flag);
-	public void setFetchProcessInputStream(boolean flag);
-	
-	public void setAllocateTerminal(boolean flag);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java
deleted file mode 100755
index 54b2d66..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-
-public interface IRemoteScriptExecution extends IRemoteOperation
-{	
-	/**
-	 * Process return exit status.
-	 */
-	public int getReturnCode();
-	
-	/**
-	 * Get the input stream (user's perspective)
-	 * @throws IOException 
-	 * 
-	 */
-	public InputStream getInputStreamFromProcessOutputStream() throws IOException;
-	
-	/**
-	 * Get the input stream (user's perspective)
-	 * @throws IOException 
-	 * 
-	 */
-	public InputStream getInputStreamFromProcessErrorStream() throws IOException;
-
-	/**
-	 * Get the output stream (user's perspective)
-	 * 
-	 */
-	public OutputStream getOutputStreamToProcessInputStream() throws IOException;
-	
-	/**
-	 * Free allocated resources for the execution.
-	 */
-	public void close();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java
deleted file mode 100755
index e487f9b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.util.Set;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-/**
- * Provides access to several status for the Host and Remote machines
- * 
- * @author Richard Maciel
- *
- */
-public interface IRemoteStatusTools {
-	/**
-	 * Verifies if the given address is being used in the remote host.
-	 * 
-	 * @param addr Address that will be checked
-	 * @return True if the address is being used, false otherwise.
-	 */
-//	 TODO: Create this method
-	//public boolean checkRemoteAddressUse(InetAddress addr);
-	
-	/**
-	 * Verifies if the given mac address is being used in the remote host.
-	 * 
-	 * @param macAddr Mac address to be checked
-	 * @return True if the mac address is in use, false otherwise.
-	 */
-	// TODO: Create this method
-	//public boolean checkRemoteMacAddressUse(MacAddress macAddr);
-	
-	/**
-	 * TCP protocol identification constant
-	 */
-	public static final int PROTO_TCP = 0;
-	/**
-	 * UDP protocol identification constant
-	 */
-	public static final int PROTO_UDP = 1;
-	
-	/**
-	 * Returns a @link{Set} containing alloc'ed port numbers for the given
-	 * protocol.
-	 * This method considers that hosts which support both ipv4 and ipv6 
-	 * has a single stack to handle both protocols.
-	 * 
-	 * @param protocol Transport protocol where the list of alloc'ed ports will come from 
-	 * @return True if the port is in use, false otherwise.
-	 * @throws RemoteConnectionException 
-	 * @throws RemoteExecutionException 
-	 * @throws RemoteOperationException 
-	 * @throws CancelException 
-	 */
-	public Set getRemotePortsInUse(int protocol) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-	/**
-	 * Return the username of the user who logged into the system.
-	 * 
-	 * @return String containing the username.
-	 * @throws CancelException 
-	 * @throws RemoteOperationException 
-	 * @throws RemoteConnectionException 
-	 */
-	public String getUsername() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-	/**
-	 * Return the user id of the user who logged into the system.
-	 * 
-	 * @return int containing the user id
-	 * @throws CancelException 
-	 * @throws RemoteOperationException 
-	 * @throws RemoteConnectionException 
-	 */
-	public int getUserID() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-	/**
-	 * Return a {@link Set} of group ids for which the user belongs
-	 *  
-	 * @return Set containing the group ids (stored as Integer)
-	 * @throws CancelException 
-	 * @throws RemoteOperationException 
-	 * @throws RemoteConnectionException 
-	 */
-	public Set getGroupIDSet() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-	public long getTime() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	/*
-	 * TODO: To the next version, add some methods to extract cpu info, memory size, disk size...
-	 * 
-	 * 
-	 */
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java
deleted file mode 100755
index 11827a4..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-public interface IRemoteTunnel {
-	public int getLocalPort();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java
deleted file mode 100755
index c32d7e2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public interface IRemoteUploadExecution extends IRemoteOperation {
-	/**
-	 * Process return exit status.
-	 */
-	public int getReturnCode();
-	
-	/**
-	 * Get the output stream that writes to the remote file.
-	 */
-	public OutputStream getOutputStreamToProcessRemoteFile() throws IOException;
-	
-	public String getErrorMessage();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java
deleted file mode 100755
index 85d2963..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.File;
-
-/**
- * @author Richard Maciel
- *
- */
-public class KeyAuthToken extends AuthToken {
-	private String passphrase;
-	private File keyPath;
-
-	public KeyAuthToken(String username, File keyPath, String passphrase) {
-		super(username);
-		this.passphrase = passphrase;
-		this.keyPath = keyPath;
-	}
-	
-	public String getPassphrase() {
-		return passphrase;
-	}
-
-	public void setPassphrase(String passphrase) {
-		this.passphrase = passphrase;
-	}
-
-	public File getKeyPath() {
-		return keyPath;
-	}
-
-	public void setKeyPath(File keyPath) {
-		this.keyPath = keyPath;
-	}
-	
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java
deleted file mode 100755
index 1eff0f7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * @author Richard Maciel
- *
- */
-public class PasswdAuthToken extends AuthToken {
-	private String password;
-	
-	public PasswdAuthToken(String username, String password) {
-		super(username);
-		this.password = password;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java
deleted file mode 100755
index 5e727bf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-
-public abstract class RemoteProcess extends Process {
-	public abstract IRemoteScriptExecution getRemoteExecution();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java
deleted file mode 100755
index 5216982..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-public class CancelException extends Exception {
-	private static final long serialVersionUID = 1L;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java
deleted file mode 100755
index c8d7107..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-/**
- * Specific RemoteOperationException that arises when creating a tunnel 
- * that binds to a local port that is already alloc'ed.
- * 
- * @author Richard Maciel
- *
- */
-public class LocalPortBoundException extends RemoteOperationException {
-	private static final long serialVersionUID = 5497137298332719485L;
-
-	/**
-	 * @param message
-	 * @param cause
-	 */
-	public LocalPortBoundException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	/**
-	 * @param message
-	 */
-	public LocalPortBoundException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param cause
-	 */
-	public LocalPortBoundException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/Messages.java
deleted file mode 100755
index 38d24a0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/Messages.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.exception.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java
deleted file mode 100644
index ba86ee5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-
-public class PortForwardingException extends RemoteException {
-	private static final long serialVersionUID = -2455858989206677165L;
-	
-	public static final int REMOTE_PORT_ALREADY_FORWARDED = 1;
-	public static final int REMOTE_FORWARDING_FAILED = 2;
-	public static final int INVALID_PARAMETERS = 3;
-	public static final int REMOTE_FORWARDING_NOT_ATIVE = 4;
-
-	int code;
-	
-	public PortForwardingException(int code) {
-		super();
-		this.code = code;
-	}
-	
-	public PortForwardingException(int code, Throwable e) {
-		super(e);
-		this.code = code;
-	}
-	
-	public String getMessage() {
-		switch (code) {
-		case REMOTE_PORT_ALREADY_FORWARDED:
-			return Messages.getString("PortForwardingException.REMOTE_PORT_ALREADY_FORWARDED"); //$NON-NLS-1$
-		case REMOTE_FORWARDING_FAILED:
-			return Messages.getString("PortForwardingException.REMOTE_FORWARDING_FAILED"); //$NON-NLS-1$
-		case INVALID_PARAMETERS:
-			return Messages.getString("PortForwardingException.INVALID_PARAMETERS"); //$NON-NLS-1$
-		case REMOTE_FORWARDING_NOT_ATIVE:
-			return Messages.getString("PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE"); //$NON-NLS-1$			
-		default:
-			assert false;
-			return null;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java
deleted file mode 100755
index 5e49589..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-import org.eclipse.osgi.util.NLS;
-
-public class RemoteConnectionException extends RemoteException {
-	private static final long serialVersionUID = 1L;
-
-	int errorCode = UNKNOWN;
-	public static final int UNKNOWN = 0;
-	public static final int LOST_CONNECTION = 1;
-	
-	public RemoteConnectionException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteConnectionException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteConnectionException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteConnectionException(int errorCode) {
-		super();
-		this.errorCode = errorCode;
-	}
-
-	public int getErrorCode() {
-		return errorCode;
-	}
-	
-	public String getLocalizedMessage() {
-		return super.getMessage();
-	}
-	
-//	public String getMessage() {
-//		String result = "";
-//		switch (errorCode) {
-//		case LOST_CONNECTION:
-//			result = "Connection to remote host was lost";
-//			break;
-//		default:
-//			result = NLS.bind("Unknown connection error, code {0}", Integer.toString(errorCode));
-//			break;
-//		}
-//		if (super.getMessage() != null) {
-//			NLS.bind("{0} ({1})", new Object [] { result, super.getMessage()});
-//		}
-//		return result;
-//	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java
deleted file mode 100755
index 5da16bb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-abstract public class RemoteException extends Exception
-{
-
-	public RemoteException() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java
deleted file mode 100755
index 279689b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-
-public class RemoteExecutionException extends RemoteException {
-	private static final long serialVersionUID = 1L;
-
-	private String resultmessage;
-
-	private String errormessage;
-
-	private int exitCode;
-
-	public RemoteExecutionException(String string) {
-		super(string);
-	}
-
-	public RemoteExecutionException(String string, Exception e) {
-		super(string, e);
-	}
-
-	public RemoteExecutionException(Exception e) {
-		super(e);
-	}
-
-	public RemoteExecutionException(String message, int exitcode, String resultmessage, String errormessage) {
-		super(message);
-		if (resultmessage.length() == 0)
-			resultmessage = null;
-		if (errormessage.length() == 0)
-			errormessage = null;
-		this.resultmessage = resultmessage;
-		this.errormessage = errormessage;
-		this.exitCode = exitcode;
-	}
-
-	public String getResultMessage() {
-		return resultmessage;
-	}
-
-	public String getErrorMessage() {
-		if (errormessage == null) {
-			return Messages.getString("RemoteExecutionException.GetErrorMessage_NoErrorInfoAvailable"); //$NON-NLS-1$
-		} else {
-			return errormessage;
-		}
-	}
-
-	public int getExitCode() {
-		return exitCode;
-	}
-
-	public String toString() {
-		if (exitCode != 0) {
-			return getMessage() + "\n" + Messages.getString("RemoteExecutionException.ToString_ExitCode") + exitCode + (resultmessage != null ? "\n" + resultmessage : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-					+ (errormessage != null ? "\n" + errormessage : ""); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			return super.toString();
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java
deleted file mode 100755
index aa4dcfd..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-/**
- * Describes remote operations errors. This do not include errors generated by a
- * user-generated remote command that failed.
- * 
- * @author Richard Maciel
- * 
- */
-public class RemoteOperationException extends RemoteException {
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * 
-	 */
-	public RemoteOperationException() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	/**
-	 * @param message
-	 */
-	public RemoteOperationException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param cause
-	 */
-	public RemoteOperationException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param message
-	 * @param cause
-	 */
-	public RemoteOperationException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/messages.properties
deleted file mode 100755
index 6e29422..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/messages.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-###############################################################################
-RemoteExecutionException.GetErrorMessage_NoErrorInfoAvailable=no error information available
-RemoteExecutionException.ToString_ExitCode=Exit code: 
-
-PortForwardingException.REMOTE_PORT_ALREADY_FORWARDED=Remote port is already forwarded on remote host.
-PortForwardingException.REMOTE_FORWARDING_FAILED=Failed to create port forwarding on remote host.
-PortForwardingException.INVALID_PARAMETERS=Invalid parameters for port forwarding.
-PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE=Failed to release remote port forwarding since it is not active.
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java
deleted file mode 100755
index 5c61e94..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-import org.eclipse.ptp.remotetools.core.IRemoteOperation;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.ssh.ExecutionManager;
-
-
-/**
- * @author Richard Maciel, Daniel Felix Ferber
- */
-public abstract class AbstractRemoteExecution implements IRemoteOperation {
-	/**
-	 * The execution manager that created the execution.
-	 */
-	private ExecutionManager executionManager;
-	/**
-	 * The execution was canceled by the manager.
-	 */
-	protected boolean cancelled;
-	/**
-	 * The execution finished by itself.
-	 */
-	protected boolean finished;
-
-	/**
-	 * Default constructor.
-	 * <p>
-	 * It is protected because only the RemoteExecutionManager can instantiate it and pass itself as the parameters to
-	 * the constructor.
-	 * 
-	 * @param remExecManager
-	 * @throws RemoteConnectionException
-	 */
-	public AbstractRemoteExecution(ExecutionManager executionManager) throws RemoteConnectionException {
-		this.executionManager = executionManager;
-		this.cancelled = false;
-		this.finished = false;
-	}
-	
-	public ExecutionManager getExecutionManager() {
-		return executionManager;
-	}
-
-	public synchronized boolean wasCanceled() {
-		return cancelled;
-	}
-
-	public synchronized boolean wasFinished() {
-		return finished;
-	}
-
-	public final synchronized void cancel() {
-		notifyCancel();
-	}
-
-	protected synchronized void notifyCancel() {
-		/*
-		 * By default, no logic is implemented to cancel the execution.
-		 * Only sets the cancel flag.
-		 * Notifies all waiting thread that the execution was canceled.
-		 */
-		cancelled = true;
-		this.notifyAll();
-	}
-
-	protected synchronized void notifyFinish() {
-		/*
-		 * By default, no logic is implemented to finish the execution.
-		 * Notifies all waiting thread that the execution finished by itself.
-		 */
-		finished = true;
-		this.notifyAll();
-	}
-
-	public synchronized void waitForEndOfExecution() throws RemoteConnectionException, CancelException {
-		/*
-		 * Block until the execution finishes or is canceled.
-		 */
-		if (!finished && !cancelled) {
-			try {
-				this.wait();
-			} catch (InterruptedException e) {
-				return;
-			}
-		}
-		if (wasCanceled()) {
-			throw new CancelException();
-		}
-	}
-	
-	public void close() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java
deleted file mode 100755
index 8c89e5e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-public class Debug {
-	public static void println(String s) {
-//		System.out.println(s);
-	}
-
-	public static void printErrorln(String s) {
-//		System.err.println(s);
-	}
-
-	public static void println2(String s) {
-//		System.out.println(s);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java
deleted file mode 100755
index 52a31bc..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-
-
-
-/**
- * Default implementation of <code>IRemoteScript</code>.
- * @author Richard Maciel
- * <b>Review OK</b>
- */
-public class RemoteScript implements IRemoteScript
-{
-	private List environment;
-	
-	private boolean willForwardX11;
-	
-	private InputStream inputStream = null;
-	private OutputStream outputStream = null;
-	private OutputStream errorStream = null;
-	
-	String [] script;
-
-	private boolean fetchProcessErrorStream = false;
-	private boolean fetchProcessInputStream = false;
-	private boolean fetchProcessOutputStream = false;
-	
-	private boolean allocateTerminal = false;
-	
-	public RemoteScript()
-	{
-		environment = new LinkedList();
-		inputStream = null;
-		outputStream = null;
-		willForwardX11 = false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.IRemoteScript#addEnvironment(java.lang.String)
-	 */
-	public void addEnvironment(String variable)
-	{
-		environment.add(variable);
-	}
-	
-	public void addEnvironment(String[] environment) {
-		this.environment.addAll(Arrays.asList(environment));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.IRemoteScript#setProcessInputStream(java.io.InputStream)
-	 */
-	public void setProcessInputStream(InputStream input)
-	{
-		inputStream = input;
-		fetchProcessInputStream = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.IRemoteScript#setProcessOutputStream(java.io.OutputStream)
-	 */
-	public void setProcessOutputStream(OutputStream output)
-	{
-		outputStream = output;
-		fetchProcessOutputStream = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteScript#setProcessErrorStream(java.io.OutputStream)
-	 */
-	public void setProcessErrorStream(OutputStream output) {
-		errorStream = output;
-		fetchProcessErrorStream = false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.IRemoteScript#setForwardX11(boolean)
-	 */
-	public void setForwardX11(boolean willForward)
-	{
-		this.willForwardX11 = willForward;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.IRemoteScript#setScript(java.lang.String)
-	 */
-	public void setScript(String script)
-	{
-		this.script = new String[1];
-		this.script[0] = script;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.IRemoteScript#setScript(java.lang.String[])
-	 */
-	public void setScript(String[] script)
-	{
-		this.script = script;
-	}
-
-	public String getScriptString()
-	{
-		if(script == null)
-		{
-			return null;
-		}
-
-		StringBuffer sb = new StringBuffer();
-				
-		Iterator it = environment.iterator();
-		if(environment.size() > 0)
-			sb.append("declare -x "); //$NON-NLS-1$
-		while (it.hasNext()) { 
-			sb.append("\"" + (String)it.next() + "\" "); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		if(environment.size() > 0)
-			sb.append("; "); //$NON-NLS-1$
-		
-		for(int i = 0; i < script.length; i++)
-			sb.append(script[i] + "; "); //$NON-NLS-1$
-		
-		return sb.toString();
-	}
-
-	public InputStream getInputStream()
-	{
-		return inputStream;
-	}
-
-	public OutputStream getOutputStream()
-	{
-		return outputStream;
-	}
-
-	public OutputStream getErrorStream()
-	{
-		return errorStream;
-	}
-
-	public boolean willForwardX11()
-	{
-		return willForwardX11;
-	}
-
-	public void setFetchProcessErrorStream(boolean flag) {
-		this.fetchProcessErrorStream = flag;
-		this.errorStream = null;
-	}
-
-	public void setFetchProcessInputStream(boolean flag) {
-		this.fetchProcessInputStream = flag;
-		this.inputStream = null;
-	}
-
-	public void setFetchProcessOutputStream(boolean flag) {
-		this.fetchProcessOutputStream = flag;
-		this.outputStream = null;
-	}
-	
-	public boolean getFetchProcessErrorStream() {
-		return fetchProcessErrorStream;
-	}
-	
-	public boolean getFetchProcessOutputStream() {
-		return fetchProcessOutputStream;
-	}
-
-	public boolean getFetchProcessInputStream() {
-		return fetchProcessInputStream;
-	}
-
-	public void setAllocateTerminal(boolean flag) {
-		this.allocateTerminal = flag;	
-	}
-	
-	public boolean getAllocateTerminal() {
-		return allocateTerminal;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java
deleted file mode 100755
index c378e65..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-import org.eclipse.ptp.remotetools.core.IRemoteTunnel;
-
-/**
- * Default implementation of <code>IRemoteTunnel</code>
- * @author Daniel Felix Ferber
- *
- */
-public class RemoteTunnel implements IRemoteTunnel {
-	int localPort;
-	int portOnRemoteHost;
-	String addressOnRemoteHost;
-	
-	public RemoteTunnel(int localPort, int portOnRemoteHost, String addressOnRemoteHost) {
-		super();
-		this.localPort = localPort;
-		this.portOnRemoteHost = portOnRemoteHost;
-		this.addressOnRemoteHost = addressOnRemoteHost;
-	}
-	
-	public String getAddressOnRemoteHost() {
-		return addressOnRemoteHost;
-	}
-	public int getLocalPort() {
-		return localPort;
-	}
-	public int getPortOnRemoteHost() {
-		return portOnRemoteHost;
-	}
-	public boolean equals(Object obj) {
-		RemoteTunnel other = (RemoteTunnel) obj;
-		return (other.localPort == this.localPort)
-		&& (other.addressOnRemoteHost == this.addressOnRemoteHost) 
-		&& (other.portOnRemoteHost == this.portOnRemoteHost);
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties
deleted file mode 100755
index ca95d19..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-multipleConnection=true
-maxChannelsPerConnection=6
-initialDefaultSessionLoad = 3
-
-longDutyCycle = 1000
-fastDutyCycle = 100
-inactivityThreashold = 5
-
-defaultTimeout = 10000
-defaultPort = 22
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java
deleted file mode 100755
index 2790cd7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.core;
-
-import java.util.ResourceBundle;
-
-/**
- * @author laggarcia
- * @since 1.3.2
- */
-public class ConnectionProperties {
-
-	private static final String ATTR_BUNDLE_ID = "org.eclipse.ptp.remotetools.internal.core.Connection"; //$NON-NLS-1$
-	private static final String ATTR_MULTIPLE_CONNECTION_PROPERTY = "multipleConnection"; //$NON-NLS-1$
-	private static final String ATTR_MAX_CHANNELS_PER_CONNECTION_PROPERTY = "maxChannelsPerConnection"; //$NON-NLS-1$
-	private static final String ATTR_LONG_DUTY_CYCLE = "longDutyCycle"; //$NON-NLS-1$
-	private static final String ATTR_FAST_DUTY_CYCLE = "fastDutyCycle"; //$NON-NLS-1$
-	private static final String ATTR_INACTIVITY_THREASHOLD = "inactivityThreashold"; //$NON-NLS-1$
-	private static final String ATTR_DEFAULT_PORT = "defaultPort";
-	private static final String ATTR_DEFAULT_TIMEOUT = "defaultTimeout";
-	private static final String ATTR_INITIAL_DEFAULT_SESSION_LOAD = "initialDefaultSessionLoad";
-	
-	public static boolean multipleConnection;
-	public static int maxChannelsPerConnection;
-	public static int initialDefaultSessionLoad;
-	
-	public static int longDutyCycle = 1000;
-	public static int fastDutyCycle = 100;
-	public static int inactivityThreashold = 5;
-	
-	public static int defaultTimeout = 10000;
-	public static int defaultPort = 22;
-	
-	static {
-		// load message values from bundle file
-		ResourceBundle bundle = ResourceBundle.getBundle(ATTR_BUNDLE_ID);
-		multipleConnection = new Boolean(bundle
-				.getString(ATTR_MULTIPLE_CONNECTION_PROPERTY)).booleanValue();
-		maxChannelsPerConnection = new Integer(bundle
-				.getString(ATTR_MAX_CHANNELS_PER_CONNECTION_PROPERTY)).intValue();
-		initialDefaultSessionLoad = new Integer(bundle.getString(ATTR_INITIAL_DEFAULT_SESSION_LOAD)).intValue();
-		longDutyCycle = new Integer(bundle.getString(ATTR_LONG_DUTY_CYCLE)).intValue();
-		fastDutyCycle = new Integer(bundle.getString(ATTR_FAST_DUTY_CYCLE)).intValue();
-		inactivityThreashold = new Integer(bundle.getString(ATTR_INACTIVITY_THREASHOLD)).intValue();
-		defaultPort = new Integer(bundle.getString(ATTR_DEFAULT_PORT)).intValue();
-		defaultTimeout = new Integer(bundle.getString(ATTR_DEFAULT_TIMEOUT)).intValue();		
-	}
-
-	private ConnectionProperties() {
-		// cannot create new instance
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java
deleted file mode 100755
index 647e901..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Available cipher types and associated information. 
- * To add another cipher type, it's necessary that two attributes of the String type are created: first one
- * returns the id of the cipher type and must have its name in the format CIPHER_<cipher attributes' name>. Second one
- * must return the return the cipher's name and must have its name in the format NAME_CIPHER_<cipher attributes' name>
- * 
- * @author Richard Maciel
- *
- */
-public class CipherTypes {
-//	Available JSch cipher types: blowfish-cbc, 3des-cbc, aes128-cbc,aes192-cbc,aes256-cbc
-	public static final String CIPHER_BLOWFISH = CipherTypesMessages.getString("KEY_BLOWFISH"); //$NON-NLS-1$
-	public static final String CIPHER_3DES = CipherTypesMessages.getString("KEY_3DES"); //$NON-NLS-1$
-	public static final String CIPHER_AES128 = CipherTypesMessages.getString("KEY_AES128"); //$NON-NLS-1$
-	public static final String CIPHER_AES192 = CipherTypesMessages.getString("KEY_AES192"); //$NON-NLS-1$
-	public static final String CIPHER_AES256 = CipherTypesMessages.getString("KEY_AES256"); //$NON-NLS-1$
-//	 Use the default JSch cipher
-	public static final String CIPHER_DEFAULT = CipherTypesMessages.getString("KEY_DEFAULT"); //$NON-NLS-1$
-	
-	public static final String NAME_CIPHER_BLOWFISH = CipherTypesMessages.getString("NAME_BLOWFISH"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_3DES = CipherTypesMessages.getString("NAME_3DES"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_AES128 = CipherTypesMessages.getString("NAME_AES128"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_AES192 = CipherTypesMessages.getString("NAME_AES192"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_AES256 = CipherTypesMessages.getString("NAME_AES256"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_DEFAULT = CipherTypesMessages.getString("NAME_DEFAULT"); // Use the default JSch cipher //$NON-NLS-1$
-	
-	
-	private static Map cipherTypesMap = null;
-	
-	/**
-	 * Creates a map containing tuples CipherTypeId and CipherTypeName
-	 * from the declared attributes.
-	 * @return Map created
-	 */
-	private static Map createCipherTypesMap() {
-		Field [] fields = CipherTypes.class.getDeclaredFields();
-		List fieldList = new ArrayList(Arrays.asList(fields));
-		
-		Map cipherMap = new HashMap();
-		
-//		 Get the tuples of attributes from the fieldList and put them in the cipherMap
-		for(Iterator it = fieldList.iterator(); it.hasNext(); ) {
-//			 Look for a attribute whose prefix is CIPHER and fetch its value
-			Field f = (Field)it.next();
-			if(f.getName().startsWith("CIPHER_")) { //$NON-NLS-1$
-				Field ciphField = f;
-				// Found one. Now concat the NAME_ prefix into the choosen name string and
-				// look for an attribute with that name.
-				try {
-					Field nameCiphField = (Field)CipherTypes.class.getField("NAME_" + ciphField.getName()); //$NON-NLS-1$
-					try {
-						// Add field values to map.
-						cipherMap.put(ciphField.get(null), nameCiphField.get(null));
-					} catch (IllegalArgumentException e) {
-						// Will not occur, since we use null as argument
-						e.printStackTrace();
-						throw new RuntimeException(e);
-					} catch (IllegalAccessException e) {
-						// Will not occur since outside try already treat this case.
-						e.printStackTrace();
-						throw new RuntimeException(e);
-					}
-				} catch (SecurityException e) {
-					// Ignore protected and private fields
-				} catch (NoSuchFieldException e) {
-					// No equivalent name field. Throw a RuntimeException
-					e.printStackTrace();
-					//"Did not find " + "NAME_" + ciphField.getName() + " to match"
-					throw new RuntimeException(
-							NLS.bind(CipherTypesMessages.getString("CipherTypes.AttributeNameExceptionMsg2"), 
-									 ciphField.getName())); //$NON-NLS-1$
-				}
-				
-			}
-		}
-		
-		return cipherMap;
-	}
-	
-	/**
-	 * Get the map containing tuples CipherTypeId and CipherTypeName
-	 *  
-	 * @return Map
-	 */
-	static public Map getCipherTypesMap() {
-		// Return the value of the singleton
-		if(cipherTypesMap == null)
-			cipherTypesMap = createCipherTypesMap();
-		
-		return cipherTypesMap;
-	}
-	
-	/**
-	 * Class should not be created.
-	 */
-	protected CipherTypes() {
-	}
-}	

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java
deleted file mode 100755
index 91661b7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class CipherTypesMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.internal.ssh.ciphertypesmessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private CipherTypesMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java
deleted file mode 100755
index fc00a16..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java
+++ /dev/null

@@ -1,692 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.remotetools.core.AuthToken;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteOperation;
-import org.eclipse.ptp.remotetools.core.KeyAuthToken;
-import org.eclipse.ptp.remotetools.core.PasswdAuthToken;
-import org.eclipse.ptp.remotetools.exception.LocalPortBoundException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.RemoteTunnel;
-import org.eclipse.ptp.remotetools.internal.core.ConnectionProperties;
-
-import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.UIKeyboardInteractive;
-import com.jcraft.jsch.UserInfo;
-
-/**
- * The connection to a remote host.
- * Manages a pool of connection used to open execution channels, since some SSH server
- * showed to impose a limit of execution channels per connection.
- *
- * @author Richard Maciel and Daniel Felix Ferber.
- */
-public class Connection implements IRemoteConnection {
-	/**
-	 * Data structure to access the ssh library.
-	 */
-	private JSch jsch;
-
-	/**
-	 * A connection to the remote host. The default connections is always created, but more
-	 * connections may be added to the pool on demand.
-	 */
-	Session defaultSession;
-	private AuthToken authToken;
-	//private String password;
-	private String username;
-	private String hostname;
-	private int port;
-	private int timeout;
-	private String cipherType;
-	private SSHUserInfo sshuserinfo = new SSHUserInfo();
-
-	/**
-	 * All executions managers created for this connection.
-	 */
-	private ArrayList executionManagers;
-	/**
-	 * Tunnels to remote host.
-	 */
-	Set tunnels;
-
-	/**
-	 * Executions on remote host.
-	 */
-	Set executions;
-	/**
-	 * Default sftp channel shared by all executions managers and file tools.
-	 */
-	ChannelSftp sftpChannel;
-	/**
-	 * Hashtable that keeps all remote executions that can be killed.
-	 * The table is indexed by Internal PID.
-	 */
-	Hashtable activeProcessTable;
-	/**
-	 * The internal identification number for the next remote execution.
-	 */
-	private int nextInternalPID;
-	/**
-	 * The control connection.
-	 */
-	private ControlChannel controlChannel;
-	/**
-	 * A job that watches for finished executions.
-	 */
-	private ExecutionObserver executionObserver;
-
-	/**
-	 * Array of all connections and how many pty channels were used.
-	 */
-	ArrayList connectionPool = new ArrayList();
-	private class ConnectionSlot {
-		Session session = null;
-		int numberUsedChannels = 0;
-		ConnectionSlot(Session session) {
-			this.session = session;
-		}
-		ConnectionSlot(Session session, int initialLoad) {
-			this.session = session;
-			this.numberUsedChannels = initialLoad;
-		}
-	}
-	/**
-	 * Maps a channel to the connection where it was created.
-	 */
-	HashMap channelToConnectioPool;
-
-	/**
-	 * Locks used on synchronized operations.
-	 */
-	protected ConnectionLocks connectionLocks;
-
-	RemotePortForwardingPool forwardingPool;
-
-	/**
-	 * Default constructor
-	 *
-	 * @param authToken
-	 * @param hostname
-	 * @param port
-	 * @param timeout
-	 * @param cipherType
-	 */
-	public Connection(AuthToken authToken, String hostname, int port, String cipherType, int timeout) {
-		this.jsch = new JSch();
-		this.authToken = authToken;
-		this.username = authToken.getUsername();
-		this.hostname = hostname;
-		this.port = port;
-		this.timeout = timeout;
-		this.cipherType = cipherType;
-
-		// Convert information for the UserInfo class used by JSch
-		if(authToken instanceof PasswdAuthToken) {
-			sshuserinfo.isPasswdBased = true;
-			sshuserinfo.password = ((PasswdAuthToken)authToken).getPassword();
-		} else if(authToken instanceof KeyAuthToken) {
-			KeyAuthToken token = (KeyAuthToken)authToken;
-			sshuserinfo.isPasswdBased = false;
-			sshuserinfo.passphrase = token.getPassphrase();
-		} else {
-			throw new RuntimeException(Messages.Connection_AuthenticationTypeNotSupported);
-		}
-	}
-
-	public Connection(AuthToken authToken, String hostname, int port, String cipherType) {
-		this(authToken, hostname, port, CipherTypes.CIPHER_DEFAULT, ConnectionProperties.defaultTimeout);
-	}
-
-	public Connection(AuthToken authToken, String hostname) {
-		this(authToken, hostname, ConnectionProperties.defaultPort,
-				CipherTypes.CIPHER_DEFAULT, ConnectionProperties.defaultTimeout);
-	}
-
-	public Connection(AuthToken authToken, String hostname, int port) {
-		this(authToken, hostname, port, CipherTypes.CIPHER_DEFAULT, ConnectionProperties.defaultTimeout);
-	}
-
-	public synchronized void connect() throws RemoteConnectionException {
-		this.nextInternalPID = 0;
-
-		/*
-		 * Insert key information if necessary
-		 */
-		if(authToken instanceof KeyAuthToken) {
-			KeyAuthToken token = (KeyAuthToken)authToken;
-			try {
-				jsch.addIdentity(token.getKeyPath().getAbsolutePath());
-			} catch (JSchException e) {
-				throw new RemoteConnectionException(Messages.Connection_Connect_InvalidPrivateKey, e);
-			}
-		}
-
-		/*
-		 * Create session.
-		 */
-		try {
-			defaultSession = jsch.getSession(username, hostname, port);
-			defaultSession.setUserInfo(sshuserinfo);
-		} catch (JSchException e) {
-			disconnect();
-			throw new RemoteConnectionException(Messages.Connection_Connect_FailedCreateSession, e);
-		}
-
-		setSessionCipherType(defaultSession);
-
-		/*
-		 * Connect to remote host.
-		 */
-		try {
-			defaultSession.connect(timeout);
-		} catch (JSchException e) {
-			disconnect();
-			throw new RemoteConnectionException(Messages.Connection_Connect_FailedConnect, e);
-		} catch (Exception e) {
-			disconnect();
-			throw new RemoteConnectionException(Messages.Connection_Connect_FailedUnsupportedKeySize, e);
-		}
-
-		/*
-		 * Create control execution channel.
-		 */
-		try {
-			controlChannel = new ControlChannel(this);
-			controlChannel.open();
-		} catch (RemoteConnectionException e) {
-			disconnect();
-			throw new RemoteConnectionException(Messages.Connection_Connect_FailedCreateControlChannel, e);
-		}
-
-		/*
-		 * Create convenience sftp channel.
-		 */
-		try {
-			sftpChannel = (ChannelSftp) defaultSession.openChannel("sftp"); //$NON-NLS-1$
-			sftpChannel.connect();
-		} catch (JSchException e) {
-			disconnect();
-			throw new RemoteConnectionException(Messages.Connection_Connect_FailedCreateSFTPConnection, e);
-		}
-
-		/*
-		 * Create observer job but do not schedule it
-		 */
-		executionObserver = new ExecutionObserver(this);
-		executionObserver.setPriority(Job.DECORATE);
-		executionObserver.setSystem(true);
-
-		/*
-		 * The default session cannot be fully used for connection pool,
-		 * since some channels are already using pty.
-		 */
-		connectionPool = new ArrayList();
-		ConnectionSlot slot = new ConnectionSlot(defaultSession, ConnectionProperties.initialDefaultSessionLoad);
-		connectionPool.add(slot);
-
-		executionManagers = new ArrayList();
-		tunnels = new HashSet();
-		executions = new HashSet();
-		activeProcessTable = new Hashtable();
-		channelToConnectioPool = new HashMap();
-		forwardingPool = new RemotePortForwardingPool(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.remotetools.IRemoteConnection#getRemoteExecutionManager()
-	 */
-	public synchronized IRemoteExecutionManager createRemoteExecutionManager() throws RemoteConnectionException {
-		ExecutionManager e =  new ExecutionManager(this);
-		executionManagers.add(e);
-		return e;
-	}
-
-	synchronized protected void releaseExcutionManager(ExecutionManager manager) {
-		executionManagers.remove(manager);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.remotetools.IRemoteConnection#disconnect()
-	 */
-	public synchronized void disconnect() {
-		/*
-		 * First, cancel all ongoing executions and tunnels created by managers, by closing their execution managers.
-		 */
-		if (executionManagers != null) {
-			Iterator iterator = executionManagers.iterator();
-			while (iterator.hasNext()) {
-				ExecutionManager manager = (ExecutionManager) iterator.next();
-				manager.close();
-				iterator = executionManagers.iterator();
-			}
-		}
-		if (executionObserver != null) {
-			executionObserver.cancel();
-		}
-
-		/*
-		 * Then, close channels created by the connection.
-		 */
-		if (controlChannel != null) {
-			controlChannel.close();
-		}
-		if (sftpChannel != null) {
-			sftpChannel.disconnect();
-		}
-
-		/*
-		 * Close all connections from the pool.
-		 */
-		if (connectionPool != null) {
-			Iterator iterator = connectionPool.iterator();
-			while (iterator.hasNext()) {
-				ConnectionSlot slot = (ConnectionSlot) iterator.next();
-				slot.session.disconnect();
-			}
-		}
-
-		/*
-		 * Reset internal state variables.
-		 */
-		defaultSession = null;
-		sftpChannel = null;
-		controlChannel = null;
-		connectionPool = null;
-		executionObserver = null;
-		executions = null;
-		executionManagers = null;
-		tunnels = null;
-		if (forwardingPool != null) {
-			forwardingPool.disconnect();
-			forwardingPool = null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ptp.remotetools.IRemoteConnection#isConnected()
-	 */
-	public synchronized boolean isConnected() {
-		if (defaultSession == null) {
-			return false;
-		} else {
-			return defaultSession.isConnected();
-		}
-	}
-
-	public String getHostname() {
-		return hostname;
-	}
-
-	/*public String getPassword() {
-		return password;
-	}*/
-
-	public int getPort() {
-		return port;
-	}
-
-	public int getTimeout() {
-		return timeout;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	/**
-	 * This class is required by the jsch library.
-	 *
-	 * @author Richard Maciel
-	 *
-	 */
-	private class SSHUserInfo implements UserInfo, UIKeyboardInteractive {
-		public String password;
-		public String passphrase;
-		public boolean isPasswdBased;
-
-		private SSHUserInfo() { }
-
-		public String getPassword() {
-			return password;
-		}
-
-		public boolean promptYesNo(String str) {
-			// Always accept host identity
-			return true;
-		}
-
-		public String getPassphrase() {
-			return passphrase;
-		}
-
-		public boolean promptPassphrase(String message) {
-			return !isPasswdBased;
-		}
-
-		public boolean promptPassword(String message) {
-			return isPasswdBased;
-		}
-
-		public void showMessage(String message) {
-		}
-
-		public String[] promptKeyboardInteractive(final String destination,
-				final String name, final String instruction,
-				final String[] prompt, final boolean[] echo) {
-			if (prompt.length != 1
-					|| echo[0] != false
-					|| password == null) {
-				return null;
-			}
-			String[] response = new String[1];
-			response[0] = password;
-			return response;
-		}
-
-	}
-
-	/**
-	 * Creates a new execution channel. The channel may or may not be managed by the connection pool.
-	 * All execution channels that require PTY must be managed by the pool, except really special cases,
-	 * like the control channel and default SFTP channel.
-	 * Channels without PTY may be managed, by it is recommended no to be. This will allocate them into the
-	 * default session, since an unlimited number of not PTY channels can be allocated into the default session.
-	 * @param isInConnectionPool As described.
-	 * @return The requested execution channel.
-	 * @throws RemoteConnectionException If the allocation of new channel failed of if it was not possible
-	 * to create a new ssh session for the new channel.
-	 */
-	protected ChannelExec createExecChannel(boolean isInConnectionPool) throws RemoteConnectionException {
-		if (isInConnectionPool) {
-			/*
-			 * Search for the first available connection slot or create a new one if all are full.
-			 */
-			ConnectionSlot suggestedSlot = null;
-			Iterator iterator = connectionPool.iterator();
-			while (iterator.hasNext()) {
-				ConnectionSlot slot = (ConnectionSlot) iterator.next();
-				if (slot.numberUsedChannels < ConnectionProperties.maxChannelsPerConnection) {
-					suggestedSlot = slot;
-					break;
-				}
-			}
-			if (suggestedSlot == null) {
-				suggestedSlot = createConnecitonSlot();
-			}
-			/*
-			 * Create the channel and update the pool.
-			 */
-			ChannelExec channel;
-			try {
-				channel = (ChannelExec) suggestedSlot.session.openChannel("exec"); //$NON-NLS-1$
-			} catch (JSchException e) {
-				throw new RemoteConnectionException(Messages.Connection_CreateExecChannel_FailedCreateNewExecChannel, e);
-			}
-			suggestedSlot.numberUsedChannels++;
-			channelToConnectioPool.put(channel, suggestedSlot);
-			return channel;
-		} else {
-			/*
-			 * Create a channel on the default channel.
-			 */
-			try {
-				return (ChannelExec) defaultSession.openChannel("exec"); //$NON-NLS-1$
-			} catch (JSchException e) {
-				throw new RemoteConnectionException(Messages.Connection_CreateExecChannel_FailedCreateNewExecChannel, e);
-			}
-		}
-	}
-
-	/**
-	 * Remove a channel from the pool, leaving the slot available for another channel.
-	 * @param channel
-	 */
-	protected void releaseChannel(Channel channel) {
-		/*
-		 * The channel may or may not be in the connection pool, depending how it was created.
-		 * Ant any case, always disconnect the channel.
-		 */
-		channel.disconnect();
-		ConnectionSlot slot = (ConnectionSlot) channelToConnectioPool.remove(channel);
-		if (slot != null) {
-			slot.numberUsedChannels--;
-		}
-	}
-
-	/**
-	 * Create a forwarding from a remote port to a local port.
-	 * @param localPort
-	 * @param addressOnRemoteHost
-	 * @param portOnRemoteHost
-	 * @return
-	 * @throws RemoteConnectionException
-	 */
-	protected RemoteTunnel createTunnel(int localPort, String addressOnRemoteHost, int portOnRemoteHost)
-			throws RemoteConnectionException, LocalPortBoundException {
-		RemoteTunnel tunnel = new RemoteTunnel(localPort, portOnRemoteHost, addressOnRemoteHost);
-		if (tunnels.contains(tunnel)) {
-			throw new LocalPortBoundException(Messages.Connection_CreateTunnel_TunnelPortAlreadyAlloced);
-		}
-
-		try {
-			defaultSession.setPortForwardingL(tunnel.getLocalPort(), tunnel.getAddressOnRemoteHost(), tunnel
-					.getPortOnRemoteHost());
-		} catch (JSchException e) {
-			if(e.getMessage().matches("PortForwardingL: local port .* is already registered.")) { //$NON-NLS-1$
-				// Selected local port is already bound.
-				throw new LocalPortBoundException(Messages.Connection_CreateTunnel_TunnelPortAlreadyAlloced);
-			}
-			throw new RemoteConnectionException(Messages.Connection_CreateTunnel_FailedCreateTunnel, e);
-		}
-
-		tunnels.add(tunnel);
-		return tunnel;
-	}
-
-	/**
-	 * Release the forwarding of the remote port.
-	 * @param tunnel
-	 * @throws RemoteConnectionException
-	 */
-	protected void releaseTunnel(RemoteTunnel tunnel) throws RemoteConnectionException {
-		if (!tunnels.contains(tunnel)) {
-			throw new RemoteConnectionException(Messages.Connection_ReleaseTunnel_PortNotAllocedForTunnel);
-		}
-
-		try {
-			RemoteTunnel remoteTunnel = tunnel;
-			defaultSession.delPortForwardingL(remoteTunnel.getLocalPort());
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.Connection_ReleaseTunnel_FailedRemoveTunnel, e);
-		}
-
-		tunnels.remove(tunnel);
-	}
-
-	/**
-	 * Gets the SFTP channel that may be used by the internal implementation to do file system operations
-	 * on the remote host.
-	 * @return
-	 */
-	protected ChannelSftp getDefaultSFTPChannel() {
-		return sftpChannel;
-	}
-
-
-	protected synchronized int createNextPIID() {
-		return ++nextInternalPID % Integer.MAX_VALUE;
-	}
-
-	protected synchronized void setPID(int piid, int pid) {
-		// Look for the object which key is PIID.
-		KillableExecution rce = (KillableExecution) activeProcessTable.get(new Integer(piid));
-		if (rce != null) {
-			// Process could be already finished and removed fro mthe table.
-			rce.setPID(pid);
-		}
-	}
-
-	protected synchronized void registerObservedExecution(IRemoteOperation operation) {
-		if (operation instanceof KillableExecution) {
-			KillableExecution killableExecution = (KillableExecution) operation;
-			activeProcessTable.put(new Integer(killableExecution.getInternaID()), killableExecution);
-			executionObserver.newCommand();
-		}
-	}
-
-	protected synchronized void unregisterObservedExecution(IRemoteOperation operation) {
-		if (operation instanceof KillableExecution) {
-			KillableExecution killableExecution = (KillableExecution) operation;
-			activeProcessTable.remove(new Integer(killableExecution.getInternaID()));
-		}
-	}
-
-	protected String getKillablePrefix(KillableExecution execution) {
-		return controlChannel.getKillablePrefix(execution.getInternaID());
-	}
-
-	/**
-	 * Sends a KILL signal to the remote killable execution.
-	 * @param execution
-	 */
-	protected void killExecution(KillableExecution execution) {
-		controlChannel.killRemoteProcess(execution.getPID());
-	}
-
-	/**
-	 * Open a new connection to the remote host and add this connection to the pool.
-	 * @return A pool entry.
-	 * @throws RemoteConnectionException
-	 */
-	private ConnectionSlot createConnecitonSlot() throws RemoteConnectionException {
-
-		/*
-		 * Create a Jsch session, with the same authentication values as the default session.
-		 */
-		Session newSession = null;
-		try {
-			newSession = jsch.getSession(username, hostname, port);
-			newSession.setUserInfo(sshuserinfo);
-			setSessionCipherType(newSession);
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.Connection_CreateConnectionSlot_FailedCreateNewSession, e);
-		}
-
-		/*
-		 * Connect to remote host.
-		 */
-		try {
-			newSession.connect(timeout);
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.Connection_CreateConnectionSlot_FailedConnectNewSession, e);
-		}
-
-		/*
-		 * Create slot and add to the pool.
-		 */
-		ConnectionSlot slot = new ConnectionSlot(newSession);
-		connectionPool.add(slot);
-		return slot;
-	}
-
-	/**
-	 * Select a cipher for the session based on the cipherType attribute
-	 *
-	 * @param session Session that will have its cipher altered.
-	 */
-	private void setSessionCipherType(Session session) {
-		/*
-		 * If the user selected a cipher other than the default, setup the cipher
-		 *
-		 */
-		// TODO: Let the user select a list of ciphers, instead of only one
-		if(!cipherType.equals(CipherTypes.CIPHER_DEFAULT)) {
-
-			// Verify if the cipher is supported. Throw an exception if it isnt.
-			if(!CipherTypes.getCipherTypesMap().containsKey(cipherType)) {
-				// TODO: Throw a real exception, not a runtime one
-				throw new RuntimeException(Messages.Connection_SetCipherType_CipherNotSupported);
-			}
-
-			// Set the session's cipher
-			Hashtable config=new Hashtable();
-			config.put("cipher.s2c", cipherType); //$NON-NLS-1$
-			config.put("cipher.c2s", cipherType); //$NON-NLS-1$
-
-			session.setConfig(config);
-		}
-	}
-
-	/**
-	 * Performs a sanity test to make sure that the connection is alive and has a valid state.
-	 * <p>
-	 * The connection may get dropped due some external interference, like loosing physical
-	 * access to the remote machine.
-	 * Or the connection may drop some channel, as it may be caused by a misbehavior
-	 * of the remote SSH server or by a bug in the local SSH implementation.
-	 * <p>
-	 * If some problem is detected, then an {@link RemoteConnectionException} is thrown.
-	 * Else, the method returns.
-	 *
-	 * @throws RemoteConnectionException The connection was entirely dropped or some channel got lost.
-	 */
-	protected void test() throws RemoteConnectionException {
-		/*
-		 * Check all SSH sessions
-		 */
-		Iterator iterator = connectionPool.iterator();
-		while (iterator.hasNext()) {
-			ConnectionSlot slot = (ConnectionSlot) iterator.next();
-			if (! slot.session.isConnected()) {
-				throw new RemoteConnectionException("SSH connection to remote host was lost");
-			}
-		}
-
-		/*
-		 * Check SFTP channel.
-		 */
-		if (! sftpChannel.isConnected()) {
-			throw new RemoteConnectionException("SFTP connection to remote host was lost");
-		}
-
-		/*
-		 * Check control channel.
-		 */
-		if (! controlChannel.shell.isConnected()) {
-			throw new RemoteConnectionException("Control channel connection to remote host was lost");
-		}
-
-	}
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java
deleted file mode 100644
index 35ce87b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-import sun.awt.datatransfer.DataTransferer.ReencodingInputStream;
-
-public class ConnectionLocks {
-	protected ReentrantLock remotePortForwarding = new ReentrantLock();
-	protected ReentrantLock localPortForwarding = new ReentrantLock();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java
deleted file mode 100755
index 2e0dc4e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-import org.eclipse.ptp.remotetools.utils.stream.ILineStreamListener;
-import org.eclipse.ptp.remotetools.utils.stream.TextStreamObserver;
-
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.JSchException;
-
-public class ControlChannel implements ILineStreamListener {
-	/*
-	 * Patterns recognized by the observer.
-	 */
-	final static String marker = "//"; //$NON-NLS-1$
-	final static String markerPID = "PID:"; //$NON-NLS-1$
-	final static String markerPIID = "PIID:"; //$NON-NLS-1$
-	final static String markerSSH = "SSH_TTY:"; //$NON-NLS-1$
-	final Pattern pidPattern = Pattern.compile("^" + marker + markerPID + "\\p{Digit}+" + marker + markerPIID //$NON-NLS-1$ //$NON-NLS-2$
-			+ "\\p{Digit}+" + marker + "$"); //$NON-NLS-1$ //$NON-NLS-2$
-	final Pattern pidFilterPattern = Pattern.compile("\\p{Digit}+"); //$NON-NLS-1$
-	final Pattern terminalPathPattern = Pattern.compile("^" + marker + markerSSH + ".+" + marker + "$"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-	// OutputStream that sends input to remote process input stream.
-	OutputStream outputToControlTerminalInput;
-	InputStream inputFromControlTerminalOutput;
-
-	// Control channel
-	ChannelExec shell;
-
-	// Control terminal path.
-	String controlTerminalPath;
-
-	// Control terminal observer thread.
-	TextStreamObserver controlTerminalObserver;
-
-	/**
-	 * Parent execution manager who will be notified about events from the control channel.
-	 */
-	private Connection connection;
-
-	public ControlChannel(Connection connection) {
-		this.connection = connection;
-	}
-	
-	public void open() throws RemoteConnectionException {
-		try{
-			// Open exec channel and alloc terminal
-			shell = connection.createExecChannel(false);
-			shell.setPty(true);
-			shell.setCommand("/bin/bash"); //$NON-NLS-1$
-			inputFromControlTerminalOutput = shell.getInputStream();
-			outputToControlTerminalInput = shell.getOutputStream();
-			shell.connect();
-		} catch (JSchException e) {
-			close();
-			throw new RemoteConnectionException(Messages.ControlChannel_Open_FailedCreateAuxiliaryShell, e);
-		} catch (IOException e) {
-			close();
-			throw new RemoteConnectionException(Messages.ControlChannel_Open_FailedCreateIOStream, e);
-		}
-		
-		// Create stream observer and start it
-		controlTerminalObserver = new TextStreamObserver(inputFromControlTerminalOutput, this);
-		controlTerminalObserver.start();
-		
-		try {
-			// Clean shell prompt.
-			outputToControlTerminalInput.write("export PS1=\n".getBytes()); //$NON-NLS-1$
-			
-			// Write terminal path on control channel, to be read by the observer
-			// "//SSH_TTY: $SSH_TTY//\"\n"
-			outputToControlTerminalInput.write(new String("echo \"" + marker + markerSSH + "$SSH_TTY" + marker + "\"\n").getBytes()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			//outputToControlTerminalInput.write(new String("echo helloworld > /tmp/helloworld\n").getBytes());
-			outputToControlTerminalInput.flush();
-		} catch (IOException e) {
-			throw new RemoteConnectionException(Messages.ControlChannel_Open_FailedSendInitCommands, e);
-		}
-		
-		// Wait until the channel answers the terminal path
-		Debug.println2(Messages.ControlChannel_Debug_StartedWaitingControlTerminalPath);
-		synchronized (this) {
-			while (controlTerminalPath == null) {
-				try {
-					this.wait(200);
-				} catch (InterruptedException e) {
-					throw new RemoteConnectionException(Messages.ControlChannel_Open_WaitControlTerminalPathInterrupted, e);
-				}
-			}
-		}
-		Debug.println2(Messages.ControlChannel_Debug_ReceivedControlTerminalPath + controlTerminalPath);
-	}
-
-	public void newLine(String line) {
-		Debug.println2(Messages.ControlChannel_Debug_ControlConnectionReceived + line);
-		/*
-		 * Test if the line contains a PID.
-		 */
-		Matcher pidmatch = pidPattern.matcher(line);
-		if (pidmatch.find()) {
-			Matcher pidmatch2 = pidFilterPattern.matcher(line);
-			pidmatch2.find();
-			String temppid = pidmatch2.group();
-			pidmatch2.find();
-			String temppiid = pidmatch2.group();
-			connection.setPID(Integer.parseInt(temppiid), Integer.parseInt(temppid));
-			return;
-		}
-
-		Matcher terminalPathMatcher = terminalPathPattern.matcher(line);
-		if (terminalPathMatcher.find()) {
-			int pre = new String(marker + markerSSH).length();
-			int pos = marker.length();
-
-			synchronized (this) {
-				controlTerminalPath = line.substring(pre, line.length() - pos);
-				this.notifyAll();
-			}
-		}
-
-	}
-
-	public void streamClosed() {
-	}
-
-	public void streamError(Exception e) {
-		Debug.println2(Messages.ControlChannel_Debug_ControlConnectionReceived + e); //$NON-NLS-1$
-	}
-
-	public synchronized String getControlTerminalPath() {
-		return controlTerminalPath;
-	}
-
-	public void killRemoteProcess(int pid) {
-		try {
-			outputToControlTerminalInput.write(new String("kill -9 " + pid + "\n").getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
-			outputToControlTerminalInput.flush();
-		} catch (IOException e) {
-		}
-	}
-
-	public synchronized String getKillablePrefix(int internaID) {
-		return "echo " + marker + markerPID + "$$" + marker + markerPIID + Integer.toString(internaID) + marker + " > " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				+ controlTerminalPath;
-	}
-
-	public void close() {
-		if (controlTerminalObserver != null) { 
-			controlTerminalObserver.kill();
-		}
-		controlTerminalObserver = null;
-		outputToControlTerminalInput = null;
-		inputFromControlTerminalOutput = null;
-		if (shell != null) {
-			shell.disconnect();
-		}
-		shell = null;
-		connection = null;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java
deleted file mode 100755
index e5b5574..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java
+++ /dev/null

@@ -1,262 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.RemotetoolsPlugin;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteDownloadExecution;
-import org.eclipse.ptp.remotetools.core.IRemoteUploadExecution;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-import org.eclipse.ptp.utils.core.file.FileEnumeration;
-import org.eclipse.ptp.utils.core.file.FileRecursiveEnumeration;
-
-public class CopyTools implements IRemoteCopyTools {
-	
-	ExecutionManager manager;
-	FileTools remoteFileTools;
-	
-	public CopyTools(ExecutionManager manager) {
-		this.manager = manager;
-		remoteFileTools = new FileTools(manager);
-	}
-
-	public IRemoteDownloadExecution executeDownload(String remoteFile, OutputStream sink) throws RemoteConnectionException {
-		DownloadExecution execution = new DownloadExecution(manager, remoteFile, sink);
-		execution.startExecution();
-		return execution;
-	}
-
-	public IRemoteDownloadExecution executeDownload(String remoteFile) throws RemoteConnectionException {
-		return executeDownload(remoteFile, null);
-	}
-
-	public IRemoteUploadExecution executeUpload(String remoteFile, InputStream source) throws RemoteConnectionException {
-		UploadExecution execution = new UploadExecution(manager, remoteFile, source);
-		execution.startExecution();
-		return execution;
-	}
-
-	public IRemoteUploadExecution executeUpload(String remoteFile) throws RemoteConnectionException {
-		return executeUpload(remoteFile, null);
-	}
-
-	public void downloadFileToDir(String remotePath, File localDir) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		remoteFileTools.validateRemotePath(remotePath);
-		File localFile = new File(localDir, remoteFileTools.suffixOfRemotePath(remotePath));
-		if (!localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				throw new RemoteOperationException(NLS.bind("Failed to create local directory {0}", localDir.getAbsolutePath()));
-			}
-		}
-		doDownloadFileToFile(remotePath, localFile);
-	}
-
-	public void downloadFileToDir(String remotePath, String localPath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localDir = new File(localPath);
-		downloadFileToDir(remotePath, localDir);
-	}
-
-	public void downloadFileToFile(String remotePath, File localFile) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		remoteFileTools.validateRemotePath(remotePath);
-		File localDir = localFile.getParentFile();
-		if (!localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				throw new RemoteOperationException(NLS.bind("Failed to create local directory {0}", localDir.getAbsolutePath()));
-			}
-		}
-		doDownloadFileToFile(remotePath, localFile);
-	}
-
-	public void downloadFileToFile(String remotePath, String localPath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localFile = new File(localPath);
-		downloadFileToFile(remotePath, localFile);
-	}
-
-	public void uploadFileToDir(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-//		remoteFileTools.validateRemotePath(localFile);
-		remoteFileTools.validateRemotePath(remotePath);
-		remoteFileTools.assureDirectory(remotePath);
-		remotePath = remoteFileTools.concatenateRemotePath(remotePath, localFile.getName());
-		doUploadFileToFile(localFile, remotePath);
-	}
-
-	public void uploadFileToDir(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localFile = new File(localPath);
-		uploadFileToDir(localFile, remotePath);
-	}
-
-	public void uploadFileToFile(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		remoteFileTools.validateRemotePath(remotePath);
-		remoteFileTools.assureDirectory(remoteFileTools.parentOfRemotePath(remotePath));
-		doUploadFileToFile(localFile, remotePath);
-	}
-
-	public void uploadFileToFile(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localFile = new File(localPath);
-		uploadFileToFile(localFile, remotePath);
-	}
-
-	private void doDownloadFileToFile(String remotePath, File localFile) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		FileOutputStream sink;
-		try {
-			sink = new FileOutputStream(localFile);
-		} catch (FileNotFoundException e) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doDownloadFileToFile_CannotWriteFile, e.getMessage()), e);
-		}
-		IRemoteDownloadExecution execution = executeDownload(remotePath, sink);
-		try {
-			execution.waitForEndOfExecution();
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doDownloadFileToFile_ExecutionFailed, e.getMessage()), e);
-		}
-		if (execution.getReturnCode() != 0) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doDownloadFileToFile_CommandFailes, Integer.toString(execution.getReturnCode())));
-		}
-		execution.close();
-	}
-
-	private void doUploadFileToFile(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		FileInputStream source;
-		try {
-			source = new FileInputStream(localFile); 
-		} catch (FileNotFoundException e) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doUploadFileFromFile_CannotReadFile, e.getMessage()), e);
-		}
-		IRemoteUploadExecution execution = executeUpload(remotePath, source);
-		try {
-			execution.waitForEndOfExecution();
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doUploadFileFromFile_ExecutionFailed, e.getMessage()), e);
-		}
-		if (execution.getReturnCode() != 0) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doUploadFileFromFile_CommandFailed, Integer.toString(execution.getReturnCode())));
-		}
-		execution.close();
-	}
-	
-	public void downloadDirToDir(String remotePath, File localDir, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		remoteFileTools.validateRemotePath(remotePath);
-//		remoteFileTools.validateRemoteDir(remotePath);
-		remotePath = remoteFileTools.addTrailingSlash(remotePath);
-		if (!localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				throw new RemoteOperationException(NLS.bind("Failed to create local directory {0}", localDir.getAbsolutePath()));
-			}
-		}
-	
-		Enumeration enumeration;
-		try {
-			if (recursive) {
-				enumeration = new RemoteFileRecursiveEnumeration(remoteFileTools, remoteFileTools.removeTrailingSlash(remotePath));
-			} else {
-				enumeration = new RemoteFileEnumeration(remoteFileTools, remoteFileTools.removeTrailingSlash(remotePath));
-			}
-		} catch (IllegalArgumentException e) {
-			throw new RemoteOperationException(e.getMessage());
-		}
-		
-		while (enumeration.hasMoreElements()) {
-			String remoteFilePath = (String) enumeration.nextElement();
-			String relativePath = remoteFilePath.substring(remotePath.length());
-			File localFile = new File(localDir, relativePath);
-		
-			if (remoteFileTools.hasDirectory(remoteFilePath)) {
-				// Create directory on the remote host
-				Debug.println("Create: " + remoteFilePath);
-				if (!localFile.exists()) {
-					if (! localDir.mkdirs()) {
-						throw new RemoteOperationException(NLS.bind("Failed to create local directory {0}", localFile.getAbsolutePath()));
-					}
-				}
-			} else {
-				// Copy to the remote host
-				Debug.println(relativePath + " -> " + remoteFilePath);
-				doDownloadFileToFile(remoteFilePath, localFile);
-			}
-		}
-	
-	}
-
-	public void downloadDirToDir(String remotePath, String localPath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		File localDir = new File(localPath);
-		downloadDirToDir(remotePath, localDir, recursive);
-	}
-	
-	public void uploadDirToDir(File localDir, String remotePath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-//		remoteFileTools.validateLocalDir(localDir);
-		remoteFileTools.validateRemotePath(remotePath);
-		remoteFileTools.assureDirectory(remotePath);
-		
-		Enumeration enumeration;
-		try {
-			if (recursive) {
-				enumeration = new FileRecursiveEnumeration(localDir);
-			} else {
-				enumeration = new FileEnumeration(localDir);
-			}
-		} catch (IOException e) {
-			throw new RemoteOperationException(e.getMessage());
-		}		
-	
-		String rootPath;
-		try {
-			rootPath = localDir.getCanonicalPath();
-		} catch (IOException e) {
-			throw new RemoteOperationException(e);			
-		}
-		
-		while (enumeration.hasMoreElements()) {
-			File file = (File) enumeration.nextElement();
-			String relativePath;
-			try {
-				relativePath = file.getCanonicalPath().substring(rootPath.length()+1).replace('\\', '/');
-			} catch (IOException e) {
-				throw new RemoteOperationException(e);
-			}
-	
-			String remoteFilePath = remoteFileTools.concatenateRemotePath(remotePath, relativePath);
-			
-			if (file.isDirectory()) {
-				// Create directory on the remote host
-				Debug.println("Create: " + remoteFilePath);
-				remoteFileTools.assureDirectory(remoteFilePath);
-				remoteFileTools.uploadPermissions(file.getAbsoluteFile(), remoteFilePath);
-			} else {
-				// Copy to the remote host
-				Debug.println(relativePath + " -> " + remoteFilePath);
-				doUploadFileToFile(file, remoteFilePath);
-			}
-		}
-		
-	}
-
-	public void uploadDirToDir(String localPath, String remotePath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		File localFile = new File(localPath);
-		uploadDirToDir(localFile, remotePath, recursive);
-	}
-
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java
deleted file mode 100755
index 978bc02..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteDownloadExecution;
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-
-import com.jcraft.jsch.ChannelExec;
-
-public class DownloadExecution extends KillableExecution implements IRemoteDownloadExecution {
-
-	String remoteFile;
-	OutputStream sinkStream;
-	ByteArrayOutputStream errorStream;
-	InputStream inputStream;
-	
-	public DownloadExecution(ExecutionManager executionManager, String remoteFile, OutputStream sink) throws RemoteConnectionException {
-		super(executionManager);
-		this.remoteFile = remoteFile;
-		this.sinkStream = sink;
-		errorStream = new ByteArrayOutputStream();
-	}
-
-	public InputStream getInputStreamFromProcessRemoteFile() throws IOException {
-		if (sinkStream != null) {
-			throw new IllegalStateException();
-		}
-		return inputStream;
-	}
-
-	public void startExecution() throws RemoteConnectionException {
-		ChannelExec channel = createChannel(false);
-		IRemotePathTools pathTool = getExecutionManager().getRemotePathTools();
-		setCommandLine("cat " + pathTool.quote(remoteFile, true)); //$NON-NLS-1$
-		
-		if (sinkStream != null) {
-			channel.setOutputStream(sinkStream);
-			inputStream = null;
-		} else {
-			try {
-				inputStream = channel.getInputStream();
-			} catch (IOException e) {
-				throw new RemoteConnectionException(Messages.DownloadExecution_DownloadExecution_FailedCreateDownload, e);
-			}
-		}
-		channel.setErrStream(errorStream);
-		
-		super.startExecution();
-		Debug.println("Downloading " + remoteFile); //$NON-NLS-1$
-	}
-	
-	public String getErrorMessage() {
-		return errorStream.toString();
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java
deleted file mode 100755
index 715ecb1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java
+++ /dev/null

@@ -1,318 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools;
-import org.eclipse.ptp.remotetools.core.IRemoteOperation;
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.core.IRemoteTunnel;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.LocalPortBoundException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.RemoteTunnel;
-
-
-/**
- * @author Richard Maciel
- */
-public class ExecutionManager implements IRemoteExecutionManager {
-	/**
-	 * Tunnels created by this manager.
-	 */
-	Set tunnels = new HashSet();
-
-	/**
-	 * Remote executions created by this manager.
-	 */
-	Set executions = new HashSet();
-	
-	/**
-	 * Connection created the execution manager.
-	 */
-	protected Connection connection;
-
-	/**
-	 * The instance that provides execution facility methods.
-	 */
-	protected IRemoteExecutionTools executionTools;
-
-	/**
-	 * The instance that provides file manipulation facility methods.
-	 */
-	protected IRemoteFileTools fileTools;
-
-	/**
-	 * The instance that provides file transfer facility methods.
-	 */
-	protected IRemoteCopyTools copyTools;
-	
-	/**
-	 * The instance that provides the path converter tool.
-	 */
-	protected IRemotePathTools pathTools;
-
-	/**
-	 * The instance that provides the status tool.
-	 */
-	protected IRemoteStatusTools statusTools;
-
-	/**
-	 * The instance that provides the port forwarding.
-	 */
-	protected IRemotePortForwardingTools portForwardingTools;
-
-	/**
-	 * Automatic-generated port attribute
-	 */
-	private static final int minPort = 10000;
-	private static final int maxPort = 65000;
-	private static int autoActualPort = minPort;
-
-	/**
-	 * Cancel flag. If true, no more operations are allowed on the this execution manager.
-	 */
-	private boolean cancelFlag = false;
-
-	
-	/**
-	 * Method that updates and return a new port number
-	 */
-	private synchronized static int getNewPortNumber() {
-		if(autoActualPort == maxPort)
-			autoActualPort = minPort;
-		
-		return autoActualPort++;
-	}
-	
-	/**
-	 * Class constructor. This method initializes control data and allocs a control terminal.
-	 * 
-	 * @throws RemoteCommandException The manager could not be created.
-	 * 
-	 */
-	protected ExecutionManager(Connection connection) throws RemoteConnectionException {
-		this.connection = connection;
-		this.fileTools = new FileTools(this);
-		this.executionTools = new ExecutionTools(this);
-		this.copyTools = new CopyTools(this);
-		this.pathTools = new PathTools(this);
-		this.statusTools = new StatusTools(this);
-		this.portForwardingTools = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.IRemoteExecutionManager#cancel()
-	 */
-	public synchronized void cancel() {
-		/*
-		 * Cancel all operations. Each operation implements its own
-		 * logic how to cancel. This simply broadcasts the cancel to
-		 * all running operations.
-		 */
-		Iterator operationEnum = executions.iterator();
-		while (operationEnum.hasNext()) {
-			IRemoteOperation operation = (IRemoteOperation) operationEnum.next();
-			operation.cancel();
-		}
-		cancelFlag = true;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#resetCancel()
-	 */
-	public synchronized void resetCancel() { 
-		cancelFlag = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#close()
-	 */
-	public synchronized void close() {
-		/*
-		 * Mark manager as canceled and interrupt ongoing operations.
-		 */
-		cancel();
-
-		/*
-		 * Close all tunnels.
-		 */
-		while (tunnels.size() > 0) {
-			Iterator iterator = tunnels.iterator();
-			IRemoteTunnel tunnel = (IRemoteTunnel) iterator.next();
-			try {
-				// releaseTunnel() already removes the entry from the list.
-				releaseTunnel(tunnel);
-			} catch (RemoteConnectionException e) {
-			}
-		}
-		tunnels = null;
-		connection.forwardingPool.disconnect(this);
-		
-		/*
-		 * Close all channels for remote executions.
-		 */
-		Iterator iterator = executions.iterator();
-		while (iterator.hasNext()) {
-			IRemoteOperation operation = (IRemoteOperation) iterator.next();
-			operation.close();
-		}
-		executions.clear();
-		executions = null;
-		
-		/*
-		 * Unregister execution manager (callback).
-		 */
-		connection.releaseExcutionManager(this);
-		
-		this.fileTools = null;
-		this.executionTools = null;
-		this.copyTools = null;
-		this.pathTools = null;
-		this.statusTools = null;
-
-	}
-	
-	/**
-	 * Get the connection used by the execution manager.
-	 */
-	protected Connection getConnection() {
-		return connection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getExecutionTools()
-	 */
-	public IRemoteExecutionTools getExecutionTools() throws RemoteConnectionException {
-		return executionTools;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemoteFileTools()
-	 */
-	public IRemoteFileTools getRemoteFileTools() throws RemoteConnectionException {
-		return fileTools;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemoteCopyTools()
-	 */
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException {
-		return copyTools;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemotePathTools()
-	 */
-	public IRemotePathTools getRemotePathTools() {
-		return pathTools;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemoteStatusTools()
-	 */
-	public IRemoteStatusTools getRemoteStatusTools() throws RemoteConnectionException {
-		return statusTools ;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#createTunnel(int, java.lang.String, int)
-	 */
-	public synchronized IRemoteTunnel createTunnel(int localPort, String addressOnRemoteHost, int portOnRemoteHost)
-			throws RemoteConnectionException, LocalPortBoundException, CancelException {
-		test();
-		testCancel();
-		RemoteTunnel tunnel = connection.createTunnel(localPort, addressOnRemoteHost, portOnRemoteHost);
-		tunnels.add(tunnel);
-		return tunnel;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#createTunnel(java.lang.String, int)
-	 */
-	public synchronized IRemoteTunnel createTunnel(String addressOnRemoteHost, int portOnRemoteHost) 
-		throws RemoteConnectionException, LocalPortBoundException, CancelException {
-		// Generate a local port automatically, before calling the createTunnel method passing it as parameter.
-		test();
-		testCancel();
-		int storedPort = getNewPortNumber();
-		int newGeneratedPort = storedPort;
-		while(true) {
-			try {
-				IRemoteTunnel tunnel = createTunnel(newGeneratedPort, addressOnRemoteHost, portOnRemoteHost);
-				return tunnel;
-			} catch(LocalPortBoundException e) {
-				// If the new port generated is equal the port we stored before the loop, all ports are probably busy
-				// so, generate an exception.
-				newGeneratedPort = getNewPortNumber();
-				if(newGeneratedPort == storedPort)
-					throw new LocalPortBoundException(Messages.ExecutionManager_CreateTunnel_AllLocalPortsBusy);
-			}
-		}
-		
-	}
-
-	public synchronized void releaseTunnel(IRemoteTunnel tunnel) throws RemoteConnectionException {
-		test();
-		connection.releaseTunnel((RemoteTunnel) tunnel);
-		tunnels.remove(tunnel);
-	}
-	
-	protected synchronized void registerOperation(IRemoteOperation operation) {
-		executions.add(operation);
-	}
-
-	protected synchronized void unregisterOperation(IRemoteOperation operation) {
-		executions.remove(operation);
-	}
-
-	/**
-	 * Throw an exception if the manager cannot execute commands.
-	 * @throws RemoteConnectionException The connection was lost.
-	 * @throws CancelException The manager is canceled.
-	 */
-	protected void test() throws RemoteConnectionException {
-		connection.test();
-	}
-	
-	protected void testCancel() throws CancelException {
-		if (cancelFlag) {
-			throw new CancelException();
-		}
-	}
-
-	public IRemotePortForwardingTools getPortForwardingTools()
-			throws RemoteConnectionException {
-		if (this.portForwardingTools == null) {
-			this.portForwardingTools = new PortForwardingTools(this);
-		}
-		return this.portForwardingTools;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java
deleted file mode 100755
index a12c8af..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.remotetools.internal.core.ConnectionProperties;
-
-
-/**
- * Observer responsible for updating the list of running process.
- * 
- * @author Richard Maciel
- * @since 1.1
- */
-class ExecutionObserver extends Job {
-	int inactivity;
-	Connection connection;
-
-	public ExecutionObserver(Connection connection) {
-		super(Messages.ExecutionObserver_ExecutionObserver_RemoteCommandObserver);
-		this.connection = connection;
-	}
-
-	/**
-	 * (re)Enable polling for finished operations.
-	 */
-	public void newCommand() {
-		inactivity = 0;
-		schedule(ConnectionProperties.fastDutyCycle);
-	}
-
-	/**
-	 * Check for process that finished and remove then from the table until there are no more process.
-	 * 
-	 * @param monitor
-	 * @return Status of the run.
-	 */
-	protected IStatus run(IProgressMonitor monitor) {
-		// In case of cancel...
-		if (monitor.isCanceled()) {
-			return Status.CANCEL_STATUS;
-		}
-
-		synchronized (connection) {
-			Iterator operationEnum = connection.activeProcessTable.entrySet().iterator();
-
-			while (operationEnum.hasNext()) {
-				Object o = operationEnum.next();
-				Entry e = (Entry) o;
-				
-				
-				if (e.getValue() instanceof KillableExecution) {
-					KillableExecution operation = (KillableExecution) e.getValue();
-
-					if (!operation.isRunning()) {
-						operationEnum.remove();
-	
-						// Notify threads that were
-						operation.notifyFinish();
-	
-						inactivity = 0;
-					}
-				}
-			}
-
-			// Only schedules it if there exists more items in the table.
-			if (connection.activeProcessTable.size() > 0) {
-				if (inactivity > ConnectionProperties.inactivityThreashold) {
-					schedule(ConnectionProperties.longDutyCycle);
-				} else {
-					schedule(ConnectionProperties.fastDutyCycle);
-					inactivity++;
-				}
-			}
-		}
-
-		return Status.OK_STATUS;
-	}
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java
deleted file mode 100755
index 80c35de..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.ByteArrayOutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.internal.common.RemoteScript;
-
-
-/**
- * A set of facility methods for common execution patterns.
- * 
- * @author Richard Maciel
- */
-public class ExecutionTools implements IRemoteExecutionTools {
-	ExecutionManager manager;
-
-	protected ExecutionTools(ExecutionManager manager) {
-		this.manager = manager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#createScript()
-	 */
-	public IRemoteScript createScript() {
-		return new RemoteScript();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#executeScript(org.eclipse.ptp.remotetools.core.IRemoteScript)
-	 */
-	public IRemoteScriptExecution executeScript(IRemoteScript remoteScript) throws RemoteConnectionException {
-		if (!(remoteScript instanceof RemoteScript)) {
-			throw new IllegalArgumentException();
-		}
-
-		
-		ScriptExecution actualExecution = new ScriptExecution(manager, (RemoteScript) remoteScript);
-		actualExecution.startExecution();
-
-
-		return actualExecution;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#executeCommand(java.lang.String)
-	 */
-	public int executeWithExitValue(String command) throws RemoteExecutionException, RemoteConnectionException, CancelException {
-		IRemoteScript script = createScript();
-		script.setScript(command);
-	
-		IRemoteScriptExecution execution = executeScript(script);
-		execution.waitForEndOfExecution();
-		int returncode = execution.getReturnCode();
-		execution.close();
-
-		return returncode;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#executeCommandWithOutput(java.lang.String)
-	 */
-	public String executeWithOutput(String command) throws RemoteExecutionException, RemoteConnectionException, CancelException {
-		IRemoteScript script = createScript();
-		script.setScript(command);
-		
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		script.setProcessOutputStream(baos);
-		
-		IRemoteScriptExecution execution = executeScript(script);
-		execution.waitForEndOfExecution();
-		execution.close();
-
-		return baos.toString();
-	}
-
-	public void executeBashCommand(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException {
-		IRemoteScript script = createScript();
-		script.setScript(command);
-	
-		ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
-		script.setProcessOutputStream(baos1);
-		ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
-		script.setProcessErrorStream(baos2);
-		
-		IRemoteScriptExecution execution = executeScript(script);
-		execution.waitForEndOfExecution();
-		
-		int returncode = execution.getReturnCode();
-		execution.close();
-		
-		if (returncode != 0) {
-			throw new RemoteExecutionException(Messages.ExecutionTools_ExecuteBashCommand_FailedRunBashCommand, returncode, baos1.toString(), baos2.toString());
-		}
-	}
-
-	public RemoteProcess executeProcess(IRemoteScript remoteScript) throws RemoteExecutionException, CancelException, RemoteConnectionException {
-		remoteScript.setFetchProcessErrorStream(true);
-		remoteScript.setFetchProcessInputStream(true);
-		remoteScript.setFetchProcessOutputStream(true);
-		IRemoteScriptExecution execution = executeScript(remoteScript);
-		SSHRemoteProcess process = new SSHRemoteProcess(execution);
-		return process;
-	}
-
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java
deleted file mode 100755
index 0d49bf9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java
+++ /dev/null

@@ -1,368 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteDirectory;
-import org.eclipse.ptp.remotetools.core.IRemoteFile;
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.SftpATTRS;
-import com.jcraft.jsch.SftpException;
-import com.jcraft.jsch.ChannelSftp.LsEntry;
-
-/**
- * @author Richard Maciel, Daniel Ferber
- * 
- */
-public class FileTools implements IRemoteFileTools {
-	protected ExecutionManager manager;
-	public int cachedUserID;
-	public Set cachedGroupIDSet;
-
-	protected FileTools(ExecutionManager manager) {
-		this.manager = manager;
-	}
-
-	public void moveFile(String from, String to) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(from);
-		validateRemotePath(to);
-		IRemotePathTools pathTool = manager.getRemotePathTools();
-		try {
-			executeCommand("mv -f " + pathTool.quote(from, true) + " " + pathTool.quote(to, true)); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-	}
-
-	public void copyFile(String from, String to) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(from);
-		validateRemotePath(to);
-		
-		IRemotePathTools pathTool = manager.getRemotePathTools();
-		try {
-			executeCommand("cp -f " + pathTool.quote(from, true) + " " + pathTool.quote(to, true));//$NON-NLS-1$ //$NON-NLS-2$
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		} 
-	}
-	
-	public void removeFile(String file) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(file);
-		IRemotePathTools pathTool = manager.getRemotePathTools();
-		try {
-			executeCommand("rm -rf " + pathTool.quote(file, true)); //$NON-NLS-1$
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		} 
-	}
-
-	public void createDirectory(String file) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(file);
-		IRemotePathTools pathTool = manager.getRemotePathTools();
-		try {
-			executeCommand("mkdir -p " + pathTool.quote(file, true)); //$NON-NLS-1$
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		} 
-	}
-	
-	public void assureDirectory(String directory) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(directory);
-		if (! hasDirectory(directory)) {
-			createDirectory(directory);
-		}
-	}
-	
-	protected void test() throws RemoteConnectionException, CancelException {
-		manager.test();
-		manager.testCancel();
-	}
-	
-	/**
-	 * Read attributes of the remote file.
-	 * @param path
-	 * @return A Jsch data structure with attributes or null if path does not exist.
-	 * @throws RemoteExecutionException
-	 */
-	protected SftpATTRS fetchRemoteAttr(String path) throws RemoteOperationException {
-		SftpATTRS attrs;
-		try {
-			attrs = manager.getConnection().getDefaultSFTPChannel().stat(path);
-			return attrs;
-		} catch (SftpException e) {
-			if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
-				return null;
-			}
-			throw new RemoteOperationException(Messages.RemoteFileTools_FetchRemoteAttr_FailedFetchAttr);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.internal.ssh.teste#hasDirectory(java.lang.String)
-	 */
-	public boolean hasDirectory(String directory) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(directory);
-		RemoteItem item = (RemoteItem) getItem(directory);
-		if (item == null) {
-			return false;
-		}
-		if (! item.exists()) {
-			return false;
-		}
-		if (! item.isDirectory()) {
-			return false;
-		}		
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.internal.ssh.teste#hasFile(java.lang.String)
-	 */
-	public boolean hasFile(String file) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(file);
-		RemoteItem item = (RemoteItem) getItem(file);
-		if (item == null) {
-			return false;
-		}
-		if (! item.exists()) {
-			return false;
-		}
-		if (! item.isFile()) {
-			return false;
-		}		
-		return true;
-	}
-	
-	public boolean hasItem(String path) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(path);
-		RemoteItem item = (RemoteItem) getItem(path);
-		if (item == null) {
-			return false;
-		}
-		if (! item.exists()) {
-			return false;
-		}
-		return true;
-	}
-	
-	public boolean canExecute(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(remotePath);
-		RemoteItem item = (RemoteItem) getItem(remotePath);
-		return item.isExecutable();
-	}
-	
-	public boolean canRead(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(remotePath);
-		RemoteItem item = (RemoteItem) getItem(remotePath);
-		return item.isReadable();
-	}
-
-	public boolean canWrite(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(remotePath);
-		RemoteItem item = (RemoteItem) getItem(remotePath);
-		return item.isWritable();
-	}
-
-	protected void executeCommand(String command) throws RemoteConnectionException, RemoteExecutionException, CancelException {
-		manager.executionTools.executeBashCommand(command);
-	}
-
-	void validateRemotePath(String path) throws RemoteOperationException {
-		if (! path.startsWith("/")) {
-			throw new RemoteOperationException(path + Messages.RemoteFileTools_ValidateRemotePath_NotValid);
-		}
-	}
-
-	String concatenateRemotePath(String p1, String p2) {
-		if (p1.endsWith("/")) { //$NON-NLS-1$
-			return p1 + p2;
-		} else {
-			return p1 + "/" + p2; //$NON-NLS-1$
-		}
-	}
-	
-	String parentOfRemotePath(String path) {
-		path = removeTrailingSlash(path);
-		int index = path.lastIndexOf('/');
-		if (index == -1) return null;
-		return removeTrailingSlash(path.substring(0, index));
-	}
-	
-	String suffixOfRemotePath(String path) {
-		path = removeTrailingSlash(path);
-		int index = path.lastIndexOf('/');
-		if (index == -1) return null;
-		return removeTrailingSlash(path.substring(index+1));
-	}
-	
-	String addTrailingSlash(String path) {
-		if (path.endsWith("/")) { //$NON-NLS-1$
-			return path;
-		} else {
-			return path + "/"; //$NON-NLS-1$
-		}
-	}
-
-	String removeTrailingSlash(String path) {
-		if (!path.equals("/") && path.endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$
-			return path.substring(0, path.length() - 1);
-		} else {
-			return path;
-		}
-	}
-
-
-	public IRemoteItem [] listItems(String root) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		validateRemotePath(root);
-		Vector files;
-		try { 
-			files = manager.getConnection().getDefaultSFTPChannel().ls(root);
-		} catch (SftpException e) {
-			throw new RemoteOperationException(Messages.RemoteFileTools_ListFiles_FailedListRemote, e);
-		}
-		
-		cacheUserData();
-		
-		List result = new ArrayList();
-		Enumeration enumeration = files.elements();
-		while (enumeration.hasMoreElements()) {
-			LsEntry entry = (LsEntry) enumeration.nextElement();
-			String fileName = entry.getFilename();
-			String pathName = concatenateRemotePath(root, fileName);
-			if (fileName.equals(".") || fileName.equals("..")) { //$NON-NLS-1$ //$NON-NLS-2$
-				// Ignore parent and current dir entry.
-				continue;
-			}
-			if (entry.getAttrs().isDir()) {
-				result.add(new RemoteDirectory(this, pathName, entry.getAttrs()));
-			} else {
-				result.add(new RemoteFile(this, pathName, entry.getAttrs()));
-			}
-		}
-		
-		IRemoteItem [] resultArray = new IRemoteItem[result.size()];
-		result.toArray(resultArray);
-		return resultArray;
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileTools#getFile(java.lang.String)
-	 */
-	public IRemoteFile getFile(String filePath) throws RemoteOperationException, RemoteConnectionException, CancelException, RemoteOperationException {
-		test();
-		validateRemotePath(filePath);
-		filePath = removeTrailingSlash(filePath);
-		cacheUserData();
-				
-		RemoteFile remfile = new RemoteFile(this, filePath);
-		remfile.refreshAttributes();
-		if (! remfile.isFile()) {
-			throw new RemoteOperationException("Not a file");
-		}
-		return remfile;
-	}
-
-	private void cacheUserData() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		if (cachedGroupIDSet == null) {
-			cachedGroupIDSet = manager.getRemoteStatusTools().getGroupIDSet();
-			cachedUserID = manager.getRemoteStatusTools().getUserID();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileTools#getDirectory(java.lang.String)
-	 */
-	public IRemoteDirectory getDirectory(String directoryPath) throws RemoteOperationException, RemoteConnectionException, CancelException, RemoteOperationException {
-		test();
-		validateRemotePath(directoryPath);
-		directoryPath = removeTrailingSlash(directoryPath);
-		cacheUserData();
-				
-		RemoteDirectory remfile = new RemoteDirectory(this, directoryPath);
-		remfile.refreshAttributes();
-		if (! remfile.isDirectory()) {
-			throw new RemoteOperationException("Not a directory");
-		}
-		return remfile;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileTools#getItem(java.lang.String)
-	 */
-	public IRemoteItem getItem(String path) throws RemoteConnectionException, RemoteOperationException, CancelException, RemoteOperationException {
-		test();
-		validateRemotePath(path);
-		path = removeTrailingSlash(path);
-		cacheUserData();
-
-		RemoteItem newitem = new RemoteItem(this, path);
-		newitem.refreshAttributes();
-		if (newitem.isDirectory()) {
-			newitem = new RemoteDirectory(newitem);
-		} else {
-			newitem = new RemoteFile(newitem);
-		}
-		return newitem;
-	}
-
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException {
-		return manager.getRemoteCopyTools();
-	}
-
-	public IRemoteFileEnumeration createFileEnumeration(String path) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		return new RemoteFileEnumeration(this, path);
-	}
-
-	public IRemoteFileEnumeration createRecursiveFileEnumeration(String path) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		return new RemoteFileRecursiveEnumeration(this, path);
-	}
-
-	/**
-	 * @throws CancelException 
-	 * @throws RemoteOperationException 
-	 * @throws RemoteConnectionException 
-	 * @deprecated
-	 */
-	void uploadPermissions(File file, String remoteFilePath) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		IRemoteItem item = getItem(remoteFilePath);
-		item.setReadable(file.canRead());
-		item.setWriteable(file.canWrite());
-		item.commitAttributes();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java
deleted file mode 100755
index 93aa434..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java
+++ /dev/null

@@ -1,350 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.AbstractRemoteExecution;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.JSchException;
-
-/**
- * A remote execution that can be canceled by killing the running bash command.
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public abstract class KillableExecution extends AbstractRemoteExecution {
-
-	private ChannelExec channel;
-	/**
-	 * Internal process identifier.
-	 */
-	private int PIID;
-	/**
-	 * Process id on the remote host.
-	 */
-	private int PID;
-
-	public KillableExecution(ExecutionManager executionManager) throws RemoteConnectionException {
-		super(executionManager);
-	}
-
-	public void startExecution() throws RemoteConnectionException {
-		try {
-			getExecutionManager().registerOperation(this);
-			getExecutionManager().getConnection().registerObservedExecution(this);
-			channel.connect();
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.KillableExecution_ScriptExecutionConnectionException, e);
-		}
-	}
-
-	protected void notifyCancel() {
-		/*
-		 * Stop observing this channel.
-		 */
-		getExecutionManager().unregisterOperation(this);
-		getExecutionManager().getConnection().unregisterObservedExecution(this);
-		/*
-		 * Force the end of the execution by closing the channel and killing (SIGHUP or something simular) on the remote
-		 * host. Remote the channel from the connection pool.
-		 */
-		getExecutionManager().getConnection().killExecution(this);
-		getExecutionManager().getConnection().releaseChannel(channel);
-		super.notifyCancel();
-	}
-
-	protected void notifyFinish() {
-		/*
-		 * Stop observing this channel.
-		 * Remote the channel from the connection pool
-		 */
-		getExecutionManager().unregisterOperation(this);
-		getExecutionManager().getConnection().unregisterObservedExecution(this);
-		getExecutionManager().getConnection().releaseChannel(channel);
-		super.notifyFinish();
-	}
-
-	public void close() {
-		/*
-		 * Cancel execution, if still not finished. 
-		 * Then, make sure the channel is closed and released from the execution manager.
-		 */
-		if (isRunning()) {
-			cancel();
-		}
-		super.close();
-	}
-
-	protected ChannelExec createChannel(boolean hasPTY) throws RemoteConnectionException {
-		/*
-		 * Get a channel from the connection pool.
-		 * Channels with PTY must be managed by the pool.
-		 */
-		channel = getExecutionManager().getConnection().createExecChannel(hasPTY);
-		channel.setPty(hasPTY);
-		return channel;
-	}
-
-	protected void setCommandLine(String commandLine) {
-		PIID = getExecutionManager().getConnection().createNextPIID();
-		String newCommandLine = getExecutionManager().getConnection().getKillablePrefix(this) + "; " + commandLine; //$NON-NLS-1$
-		Debug.println2(Messages.KillableExecution_Debug_1 + newCommandLine);
-		channel.setCommand(newCommandLine);
-	}
-
-	public int getReturnCode() {
-		if (wasCanceled()) {
-			return -1;
-		} else if (!wasFinished()) {
-			throw new IllegalStateException();
-		}
-		return channel.getExitStatus();
-	}
-
-	public int getPID() {
-		return PID;
-	}
-
-	public void setPID(int pid) {
-		PID = pid;
-	}
-
-	public int getInternaID() {
-		return PIID;
-	}
-
-	public boolean isRunning() {
-		return !channel.isClosed();
-	}
-
-	public int getFinishStatus() {
-		int code = getReturnCode();
-
-		if (code == 0) {
-			return SUCCESS_OK;
-		} else if (code <= 125) {
-			return SUCCESS_ERROR;
-		} else if (code == 126) {
-			return ERROR_NOT_EXECUTABLE;
-		} else if (code == 127) {
-			return ERROR_NOT_FOUND;
-		} else if (code == 128) {
-			return UNKNOWN;
-		} else if (code == 255) {
-			return INVALID_EXIT_CODE;
-		} else if (code == 128 + 1) {
-			return SIGHUP;
-		} else if (code == 128 + 2) {
-			return SIGINT;
-		} else if (code == 128 + 3) {
-			return SIGQUIT;
-		} else if (code == 128 + 4) {
-			return SIGILL;
-		} else if (code == 128 + 5) {
-			return SIGTRAP;
-		} else if (code == 128 + 6) {
-			return SIGIOT;
-		} else if (code == 128 + 7) {
-			return SIGBUS;
-		} else if (code == 128 + 8) {
-			return SIGFPE;
-		} else if (code == 128 + 9) {
-			return SIGKILL;
-		} else if (code == 128 + 10) {
-			return SIGUSR1;
-		} else if (code == 128 + 11) {
-			return SIGSEGV;
-		} else if (code == 128 + 12) {
-			return SIGUSR2;
-		} else if (code == 128 + 13) {
-			return SIGPIPE;
-		} else if (code == 128 + 14) {
-			return SIGALRM;
-		} else if (code == 128 + 15) {
-			return SIGTERM;
-		} else if (code == 128 + 16) {
-			return SIGSTKFLT;
-		} else if (code == 128 + 17) {
-			return SIGCHLD;
-		} else if (code == 128 + 18) {
-			return SIGCONT;
-		} else if (code == 128 + 19) {
-			return SIGSTOP;
-		} else if (code == 128 + 20) {
-			return SIGTSTP;
-		} else if (code == 128 + 21) {
-			return SIGTTIN;
-		} else if (code == 128 + 22) {
-			return SIGTTOU;
-		} else if (code == 128 + 23) {
-			return SIGURG;
-		} else if (code == 128 + 24) {
-			return SIGXCPU;
-		} else if (code == 128 + 25) {
-			return SIGXFSZ;
-		} else if (code == 128 + 26) {
-			return SIGVTALRM;
-		} else if (code == 128 + 27) {
-			return SIGPROF;
-		} else if (code == 128 + 28) {
-			return SIGWINCH;
-		} else if (code == 128 + 29) {
-			return SIGIO;
-		} else if (code == 128 + 30) {
-			return SIGPWR;
-		} else {
-			return UNKNOWN;
-		}
-	}
-
-	public String getFinishStatusText(int status) {
-		switch (status) {
-		case SUCCESS_OK:
-			return Messages.KillableExecution_FinishStatus_Ok;
-		case SUCCESS_ERROR:
-			return Messages.KillableExecution_FinishStatus_Error;
-		case ERROR_NOT_EXECUTABLE:
-			return Messages.KillableExecution_FinishStatus_NotExecutable;
-		case ERROR_NOT_FOUND:
-			return Messages.KillableExecution_FinishStatus_CommandNotFound;
-		case INVALID_EXIT_CODE:
-			return Messages.KillableExecution_FinishStatus_InvalidExitCode;
-		case SIGHUP:
-			return Messages.KillableExecution_FinishStatus_Hangup;
-		case SIGINT:
-			return Messages.KillableExecution_FinishStatus_TerminalInterrupt;
-		case SIGQUIT:
-			return Messages.KillableExecution_FinishStatus_TerminalQuit;
-		case SIGILL:
-			return Messages.KillableExecution_FinishStatus_IllegalInstruction;
-		case SIGTRAP:
-			return Messages.KillableExecution_FinishStatus_TraceTrap;
-		case SIGIOT:
-			return Messages.KillableExecution_FinishStatus_IOTTrap;
-		case SIGBUS:
-			return Messages.KillableExecution_FinishStatus_BUSError;
-		case SIGFPE:
-			return Messages.KillableExecution_FinishStatus_FloatingPointException;
-		case SIGKILL:
-			return Messages.KillableExecution_FinishStatus_Kill;
-		case SIGUSR1:
-			return Messages.KillableExecution_FinishStatus_UserDefinedSignal1;
-		case SIGSEGV:
-			return Messages.KillableExecution_FinishStatus_InvalidMemorySegmentAccess;
-		case SIGUSR2:
-			return Messages.KillableExecution_FinishStatus_UserDefinedSignal2;
-		case SIGPIPE:
-			return Messages.KillableExecution_FinishStatus_BrokenPipe;
-		case SIGALRM:
-			return Messages.KillableExecution_FinishStatus_AlarmClock;
-		case SIGTERM:
-			return Messages.KillableExecution_FinishStatus_Termination;
-		case SIGSTKFLT:
-			return Messages.KillableExecution_FinishStatus_StackFault;
-		case SIGCHLD:
-			return Messages.KillableExecution_FinishStatus_ChildProcessStoppedOrExited;
-		case SIGCONT:
-			return Messages.KillableExecution_FinishStatus_ContinueExecuting;
-		case SIGSTOP:
-			return Messages.KillableExecution_FinishStatus_StopExecuting;
-		case SIGTSTP:
-			return Messages.KillableExecution_FinishStatus_TerminalStopSignal;
-		case SIGTTIN:
-			return Messages.KillableExecution_FinishStatus_BackgroundProcessReadTTY;
-		case SIGTTOU:
-			return Messages.KillableExecution_FinishStatus_BackgroundWriteTTY;
-		case SIGURG:
-			return Messages.KillableExecution_FinishStatus_UrgentConditionSocket;
-		case SIGXCPU:
-			return Messages.KillableExecution_FinishStatus_CPULimitExceeded;
-		case SIGXFSZ:
-			return Messages.KillableExecution_FinishStatus_FileSizeLimitExceeded;
-		case SIGVTALRM:
-			return Messages.KillableExecution_FinishStatus_VirtualAlarmClock;
-		case SIGPROF:
-			return Messages.KillableExecution_FinishStatus_ProfilingAlarmClock;
-		case SIGWINCH:
-			return Messages.KillableExecution_FinishStatus_WindowSizeChange;
-		case SIGIO:
-			return Messages.KillableExecution_FinishStatus_IOPossible;
-		case SIGPWR:
-			return Messages.KillableExecution_FinishStatus_PowerFailureRestart;
-		default:
-			return Messages.KillableExecution_FinishStatus_Unknown;
-		}
-	}
-
-	public boolean isException(int status) {
-		return (status >= 129) && (status <= 158);
-	}
-
-	public boolean isOK(int status) {
-		return status <= 125;
-	}
-
-	public boolean isExecutableError(int status) {
-		return (status >= 126) && (status <= 128);
-	}
-
-	public boolean wasException() {
-		return isException(getReturnCode());
-	}
-
-	public boolean wasOK() {
-		return isOK(getReturnCode());
-	}
-
-	public boolean wasCommandError() {
-		return isExecutableError(getReturnCode());
-	}
-
-	public static final int UNKNOWN = 0;
-	public static final int SUCCESS_OK = 1;
-	public static final int SUCCESS_ERROR = 2;
-	public static final int ERROR_NOT_EXECUTABLE = 126;
-	public static final int ERROR_NOT_FOUND = 127;
-	public static final int INVALID_EXIT_CODE = 128;
-	public static final int SIGHUP = 129;
-	public static final int SIGINT = 130;
-	public static final int SIGQUIT = 131;
-	public static final int SIGILL = 132;
-	public static final int SIGTRAP = 133;
-	public static final int SIGIOT = 134;
-	public static final int SIGBUS = 135;
-	public static final int SIGFPE = 136;
-	public static final int SIGKILL = 137;
-	public static final int SIGUSR1 = 138;
-	public static final int SIGSEGV = 139;
-	public static final int SIGUSR2 = 140;
-	public static final int SIGPIPE = 141;
-	public static final int SIGALRM = 142;
-	public static final int SIGTERM = 143;
-	public static final int SIGSTKFLT = 144;
-	public static final int SIGCHLD = 145;
-	public static final int SIGCONT = 146;
-	public static final int SIGSTOP = 147;
-	public static final int SIGTSTP = 148;
-	public static final int SIGTTIN = 149;
-	public static final int SIGTTOU = 150;
-	public static final int SIGURG = 151;
-	public static final int SIGXCPU = 152;
-	public static final int SIGXFSZ = 153;
-	public static final int SIGVTALRM = 154;
-	public static final int SIGPROF = 155;
-	public static final int SIGWINCH = 156;
-	public static final int SIGIO = 157;
-	public static final int SIGPWR = 158;
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Messages.java
deleted file mode 100755
index 6ffb8db..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Messages.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.internal.ssh.messages"; //$NON-NLS-1$
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-
-	public static String Connection_AuthenticationTypeNotSupported;
-	public static String Connection_Connect_FailedConnect;
-	public static String Connection_Connect_FailedUnsupportedKeySize;
-	public static String Connection_Connect_FailedCreateControlChannel;
-	public static String Connection_Connect_FailedCreateSession;
-	public static String Connection_Connect_FailedCreateSFTPConnection;
-	public static String Connection_Connect_InvalidPrivateKey;
-	public static String Connection_CreateConnectionSlot_FailedConnectNewSession;
-	public static String Connection_CreateConnectionSlot_FailedCreateNewSession;
-	public static String Connection_CreateExecChannel_FailedCreateNewExecChannel;
-	public static String Connection_CreateTunnel_FailedCreateTunnel;
-	public static String Connection_CreateTunnel_TunnelPortAlreadyAlloced;
-	public static String Connection_ReleaseTunnel_FailedRemoveTunnel;
-	public static String Connection_ReleaseTunnel_PortNotAllocedForTunnel;
-	public static String Connection_SetCipherType_CipherNotSupported;
-	public static String ControlChannel_Debug_ControlConnectionReceived;
-	public static String ControlChannel_Debug_ReceivedControlTerminalPath;
-	public static String ControlChannel_Debug_StartedWaitingControlTerminalPath;
-	public static String ControlChannel_Open_FailedCreateAuxiliaryShell;
-	public static String ControlChannel_Open_FailedCreateIOStream;
-	public static String ControlChannel_Open_FailedSendInitCommands;
-	public static String ControlChannel_Open_WaitControlTerminalPathInterrupted;
-	public static String CopyTools_doDownloadFileToFile_CannotWriteFile;
-	public static String CopyTools_doDownloadFileToFile_CommandFailes;
-	public static String CopyTools_doDownloadFileToFile_ExecutionFailed;
-	public static String CopyTools_doUploadFileFromFile_CannotReadFile;
-	public static String CopyTools_doUploadFileFromFile_CommandFailed;
-	public static String CopyTools_doUploadFileFromFile_ExecutionFailed;
-	public static String DownloadExecution_DownloadExecution_FailedCreateDownload;
-	public static String ExecutionManager_CreateTunnel_AllLocalPortsBusy;
-	public static String ExecutionObserver_ExecutionObserver_RemoteCommandObserver;
-	public static String ExecutionTools_ExecuteBashCommand_FailedRunBashCommand;
-	public static String KillableExecution_Debug_1;
-	public static String KillableExecution_FinishStatus_AlarmClock;
-	public static String KillableExecution_FinishStatus_BackgroundProcessReadTTY;
-	public static String KillableExecution_FinishStatus_BackgroundWriteTTY;
-	public static String KillableExecution_FinishStatus_BrokenPipe;
-	public static String KillableExecution_FinishStatus_BUSError;
-	public static String KillableExecution_FinishStatus_ChildProcessStoppedOrExited;
-	public static String KillableExecution_FinishStatus_CommandNotFound;
-	public static String KillableExecution_FinishStatus_ContinueExecuting;
-	public static String KillableExecution_FinishStatus_CPULimitExceeded;
-	public static String KillableExecution_FinishStatus_Error;
-	public static String KillableExecution_FinishStatus_FileSizeLimitExceeded;
-	public static String KillableExecution_FinishStatus_FloatingPointException;
-	public static String KillableExecution_FinishStatus_Hangup;
-	public static String KillableExecution_FinishStatus_IllegalInstruction;
-	public static String KillableExecution_FinishStatus_InvalidExitCode;
-	public static String KillableExecution_FinishStatus_InvalidMemorySegmentAccess;
-	public static String KillableExecution_FinishStatus_IOPossible;
-	public static String KillableExecution_FinishStatus_IOTTrap;
-	public static String KillableExecution_FinishStatus_Kill;
-	public static String KillableExecution_FinishStatus_NotExecutable;
-	public static String KillableExecution_FinishStatus_Ok;
-	public static String KillableExecution_FinishStatus_PowerFailureRestart;
-	public static String KillableExecution_FinishStatus_ProfilingAlarmClock;
-	public static String KillableExecution_FinishStatus_StackFault;
-	public static String KillableExecution_FinishStatus_StopExecuting;
-	public static String KillableExecution_FinishStatus_TerminalInterrupt;
-	public static String KillableExecution_FinishStatus_TerminalQuit;
-	public static String KillableExecution_FinishStatus_TerminalStopSignal;
-	public static String KillableExecution_FinishStatus_Termination;
-	public static String KillableExecution_FinishStatus_TraceTrap;
-	public static String KillableExecution_FinishStatus_Unknown;
-	public static String KillableExecution_FinishStatus_UrgentConditionSocket;
-	public static String KillableExecution_FinishStatus_UserDefinedSignal1;
-	public static String KillableExecution_FinishStatus_UserDefinedSignal2;
-	public static String KillableExecution_FinishStatus_VirtualAlarmClock;
-	public static String KillableExecution_FinishStatus_WindowSizeChange;
-	public static String KillableExecution_ScriptExecutionConnectionException;
-	public static String PathTools_47;
-	public static String RemoteFileTools_FailedSetPermission;
-	public static String RemoteFileTools_FetchRemoteAttr_FailedFetchAttr;
-	public static String RemoteFileTools_GetItem_PathNotExist;
-	public static String RemoteFileTools_GetItemsPath_FailedListRemoteFiles;
-	public static String RemoteFileTools_ListFiles_FailedListRemote;
-	public static String RemoteFileTools_UploadPermissions_FailedSetPermissions;
-	public static String RemoteFileTools_ValidateLocalDir_NotValid;
-	public static String RemoteFileTools_ValidateLocalFile_NotValid;
-	public static String RemoteFileTools_ValidateLocalItem_DoesNotExist;
-	public static String RemoteFileTools_ValidateRemoteDir_NotValid;
-	public static String RemoteFileTools_ValidateRemoteFile_NotValid;
-	public static String RemoteFileTools_ValidateRemotePath_NotValid;
-	public static String RemoteStatusTools_GetPasswdFields_NoUsernameInPasswdFile;
-	public static String ScriptExecution_StartExecution_FailedInitStreams;
-	public static String UploadExecution_StartExecution_FailedCreateUpload;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java
deleted file mode 100755
index 8382c2d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java
+++ /dev/null

@@ -1,342 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.awt.geom.IllegalPathStateException;
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-
-
-public class PathTools implements IRemotePathTools {
-	private static final String rootPath = "/"; //$NON-NLS-1$
-	ExecutionManager executionManager;
-	
-	public PathTools(ExecutionManager manager) {
-		this.executionManager = manager;
-	}
-
-	public String rootPath() {
-		return new String(rootPath);
-	}
-
-	public boolean isRoot(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return path.equals(rootPath);
-	}
-
-	public boolean isAbsolute(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return path.startsWith("/"); //$NON-NLS-1$
-	}
-
-	public boolean isRelative(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return ! path.startsWith("/"); //$NON-NLS-1$
-	}
-	
-	public boolean isLeave(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return ! (isRoot(path) || path.endsWith("/")); //$NON-NLS-1$
-	}
-	
-	public String leave(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		if (isRoot(path)) return rootPath();
-		if (isLeave(path)) {
-			return path.substring(0, path.length()-1);
-		} else {
-			return new String(path);
-		}
-	}
-
-	public String canonicalize(String path) {
-		/*
-		 * Remove "." (current directory)
-		 * Remove "a/.." (parent directory)
-		 * Remove "//" (empty directory)
-		 */
-		if (path == null) throw new IllegalPathStateException();
-		if (isRoot(path)) return rootPath();
-		
-		/*
-		 * Split the path an remeber properties.
-		 */
-		String segments[] = split(path);
-		boolean absolute = isAbsolute(path);
-		boolean leave = isLeave(path);
-		
-		return canonicalize(segments, absolute, leave);
-	}
-		
-	private String canonicalize(String segments[], boolean absolute, boolean leave) {
-		int lastPosition = 0;
-		int currentPosition = 0;
-		int currentSize = segments.length;
-		while (currentPosition < segments.length) {
-			String segment = segments[currentPosition];
-			if (segment.equals(".") || segment.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-				// Skip segment
-				currentPosition++;
-				continue;
-			} else if (segment.equals("..")) { //$NON-NLS-1$
-				if (lastPosition == 0) {
-					if (absolute) {
-						// Ignore, the parent of the root is the root itself.
-						currentPosition++;				
-					} else {
-						// Keep, since the path is relative.
-						if (currentPosition > lastPosition) {
-							segments[lastPosition] = segments[currentPosition];
-						}
-						lastPosition++;
-						currentPosition++;				
-					}
-				} else {
-					// Remove the segment and the parent, if the parent is not already ".."
-					String segment2 = segments[lastPosition-1];
-					if (segment2.equals("..")) { //$NON-NLS-1$
-						// Keep
-						if (currentPosition > lastPosition) {
-							segments[lastPosition] = segments[currentPosition];
-						}
-						lastPosition++;
-						currentPosition++;				
-					} else {
-						// Remove parent
-						lastPosition--;
-						currentPosition++;
-					}
-				}
-			} else {
-				// Keep
-				if (currentPosition > lastPosition) {
-					segments[lastPosition] = segments[currentPosition];
-				}
-				lastPosition++;
-				currentPosition++;
-			}
-		}
-		currentSize = lastPosition;
-				
-		/*
-		 * Rebuild the path as a string.
-		 */
-		return unsplit(segments, 0, currentSize-1, absolute, leave);
-	}
-	
-	public String join(String base, String path) {
-		if (base == null) throw new IllegalPathStateException();
-		if (path == null) throw new IllegalPathStateException();
-		if (isAbsolute(path)) return canonicalize(path);
-		String s1[] = split(base);
-		String s2[] = split(path);
-		String s[] = new String[s1.length + s2.length];
-		System.arraycopy(s1, 0, s, 0, s1.length);
-		System.arraycopy(s2, 0, s, s1.length, s2.length);
-		boolean absolute = isAbsolute(base);
-		boolean leave = isLeave(path);
-		return canonicalize(s,absolute,leave);
-	}
-	
-	public String parent(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		if (isRoot(path)) return rootPath();
-		return join(path, ".."); //$NON-NLS-1$
-	}
-	
-	private String [] split (String path) {
-		if (isRoot(path)) {
-			return new String[0];
-		}
-		int start = 0;
-		int end = path.length();
-		if (isAbsolute(path)) {
-			// Ignore trailing "/"
-			start++;
-		}
-		if (! isLeave(path)) {
-			// Ignore ending "/"
-			end--;
-		}
-		return path.substring(start, end).split("/"); //$NON-NLS-1$
-	}
-
-	private String unsplit(String[] segments, int start, int end, boolean absolute, boolean leave) {
-		String result = null;
-		int segmentCount = end-start+1;
-		if (segmentCount <= 0) {
-			if (absolute) {
-				return rootPath;
-			} else {
-				return ""; //$NON-NLS-1$
-			}
-		}
-		if (absolute) {
-			result = "/"; //$NON-NLS-1$
-		} else {
-			result = ""; //$NON-NLS-1$
-		}
-		for (int i = start; i <= end; i++) {
-			if (i != start) {
-				result += "/"; //$NON-NLS-1$
-			}
-			result += segments[i];
-		}
-		if (! leave) {
-			if (segmentCount > 0) {
-				result += "/"; //$NON-NLS-1$
-			}
-		}
-		return result;
-	}
-	
-	public String quote(String path, boolean full) {
-		StringBuffer buffer = new StringBuffer();
-		StringCharacterIterator iter = new StringCharacterIterator(path);
-		for (char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) {
-			switch (c) {
-			case '(':
-			case ')':
-			case '[':
-			case ']':
-			case '{':
-			case '}':
-			case '|':
-			case '\\':
-			case '*':
-			case '&':
-			case '^':
-			case '%':
-			case '$':
-			case '#':
-			case '@':
-			case '!':
-			case '~':
-			case '`':
-			case '\'':
-			case '"':
-			case ':':
-			case ';':
-			case '?':
-			case '<':
-			case '>':
-			case ',':
-			case '\n':
-				if (full) {
-					buffer.append('\\');
-				}
-				buffer.append(c);
-				continue;
-			case ' ':
-				buffer.append('\\');
-				buffer.append(c);
-				continue;
-			default:
-				buffer.append(c);
-				continue;
-			}
-		}
-		return buffer.toString();
-	}
-
-	public static void main(String[] args) {
-		IRemotePathTools tools = new PathTools(null);
-		System.out.println(tools.rootPath());
-		System.out.println();
-		System.out.println(tools.isRoot("/")); //$NON-NLS-1$
-		System.out.println(tools.isRoot("/a")); //$NON-NLS-1$
-		System.out.println(tools.isRoot("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isRoot("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.isAbsolute("/")); //$NON-NLS-1$
-		System.out.println(tools.isAbsolute("/a")); //$NON-NLS-1$
-		System.out.println(tools.isAbsolute("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isAbsolute("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.isRelative("/")); //$NON-NLS-1$
-		System.out.println(tools.isRelative("/a")); //$NON-NLS-1$
-		System.out.println(tools.isRelative("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isRelative("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.isLeave("/")); //$NON-NLS-1$
-		System.out.println(tools.isLeave("/a")); //$NON-NLS-1$
-		System.out.println(tools.isLeave("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isLeave("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.parent("/")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a//")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b/")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b//")); //$NON-NLS-1$
-		System.out.println(tools.parent("/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("/.")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.parent("")); //$NON-NLS-1$
-		System.out.println(tools.parent("a")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b")); //$NON-NLS-1$
-		System.out.println(tools.parent(Messages.PathTools_47));
-		System.out.println(tools.parent("a/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("a//")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b/")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b//")); //$NON-NLS-1$
-		System.out.println(tools.parent("..")); //$NON-NLS-1$
-		System.out.println(tools.parent(".")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.join("b", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join("b/", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join(".", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join("..", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join("", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java
deleted file mode 100644
index e988c97..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.HashSet;
-import java.util.Hashtable;
-
-import org.eclipse.ptp.remotetools.core.IPortForwarding;
-import org.eclipse.ptp.remotetools.core.IRemotePortForwarding;
-import org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * Implementation of {@link IRemotePortForwardingTools} for SSH.
- * It simply redirects requests to the {@link RemotePortForwardingPool} managed by the {@link Connection}, but filtering the forwardings for the execution manager.
- * @author Daniel Felix Ferber
- */
-public class PortForwardingTools implements IRemotePortForwardingTools {
-	ExecutionManager executionManager;
-	
-	PortForwardingTools(ExecutionManager executionManager) {
-		this.executionManager = executionManager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#forwardRemotePort(int, int)
-	 */
-	public IRemotePortForwarding forwardRemotePort(int remotePort, int localPort)
-			throws RemoteConnectionException, PortForwardingException, CancelException {
-		this.executionManager.test();
-		this.executionManager.testCancel();
-		
-		RemotePortForwarding forwarding = this.executionManager.connection.forwardingPool.createRemotePortForwarding(this.executionManager, remotePort,
-						null, localPort);
-		return forwarding;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#forwardRemotePort(int, java.lang.String, int)
-	 */
-	public IRemotePortForwarding forwardRemotePort(int remotePort,
-			String localAddress, int localPort)
-			throws RemoteConnectionException, PortForwardingException, CancelException {
-		this.executionManager.test();
-		this.executionManager.testCancel();
-
-		RemotePortForwarding forwarding = this.executionManager.connection.forwardingPool
-		.createRemotePortForwarding(this.executionManager, remotePort,
-				localAddress, localPort);
-		return forwarding;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#getRemotePortForwarding(int)
-	 */
-	public IRemotePortForwarding getRemotePortForwarding(int remotePort) throws RemoteConnectionException, PortForwardingException {
-		this.executionManager.test();
-
-		RemotePortForwarding forwarding = this.executionManager.connection.forwardingPool.getRemotePortForwarding(remotePort);
-		
-		/* Return null if there is no forwarding for the remote port. */
-		if (forwarding == null) {
-			return null;
-		}
-
-		/* Return null if there is forwarding for the remote port, but it does not belong the the ExecutionManager. */
-		if (forwarding.owner != this.executionManager) {
-			return null;
-		}
-		
-		return forwarding;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#releaseForwarding(org.eclipse.ptp.remotetools.core.IPortForwarding)
-	 */
-	public void releaseForwarding(IPortForwarding forwarding)
-			throws RemoteConnectionException, PortForwardingException {
-		assert forwarding != null;
-		this.executionManager.test();
-
-		if (forwarding instanceof RemotePortForwarding) {
-			this.executionManager.connection.forwardingPool.releaseRemotePortForwarding((RemotePortForwarding) forwarding, this.executionManager);
-		} else {
-			/* Forwarding is not a valid instance. */
-			assert false;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java
deleted file mode 100755
index 416c054..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-class RegexFileNameFilter implements FilenameFilter {
-	Pattern pattern;
-	Matcher matcher;
-	RegexFileNameFilter(String regex) {
-		this.pattern = Pattern.compile(regex);
-	}
-	public boolean accept(File dir, String name) {
-		this.matcher = pattern.matcher(name);			
-		return matcher.matches();
-	}
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteDirectory.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteDirectory.java
deleted file mode 100755
index c6d288b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteDirectory.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import org.eclipse.ptp.remotetools.core.IRemoteDirectory;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-import com.jcraft.jsch.SftpATTRS;
-import com.jcraft.jsch.ChannelSftp.LsEntry;
-
-/**
- * @author Richard Maciel
- *
- */
-public class RemoteDirectory extends RemoteItem implements
-		IRemoteDirectory {
-
-	RemoteDirectory(FileTools fileTools, String path) {
-		super(fileTools, path);
-	}
-	
-	public RemoteDirectory(RemoteItem item) {
-		super();
-		copyAttributesFrom(item);
-	}
-
-	RemoteDirectory(FileTools fileTools, String path, SftpATTRS attrs) {
-		super(fileTools, path, attrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteDirectory#isAccessible()
-	 */
-	public boolean isAccessible() {
-		return super.isExecutable();
-	}
-	
-	public void setAccessible(boolean flag) throws RemoteConnectionException, CancelException {
-		super.setExecutable(flag);
-	}
-
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFile.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFile.java
deleted file mode 100755
index f59db50..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFile.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-
-import org.eclipse.ptp.remotetools.core.IRemoteFile;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-import com.jcraft.jsch.SftpATTRS;
-import com.jcraft.jsch.ChannelSftp.LsEntry;
-
-/**
- * @author Richard Maciel
- *
- */
-public class RemoteFile extends RemoteItem implements IRemoteFile {
-
-	RemoteFile(FileTools fileTools, String path, SftpATTRS attrs) {
-		super(fileTools, path, attrs);
-	}
-
-	RemoteFile(FileTools fileTools, String path) {
-		super(fileTools, path);
-	}
-	
-	public RemoteFile(RemoteItem item) {
-		super();
-		copyAttributesFrom(item);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFile#getSize()
-	 */
-	public long getSize() {
-		return size;
-	}
-
-	public boolean isExecutable() {
-		return super.isExecutable();
-	}
-	
-	public void setExecutable(boolean flag) {
-		super.setExecutable(flag);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java
deleted file mode 100755
index 89d9a0f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-/**
- * Enumeration of files on the remote host.
- * The enumeration stops when:
- * <ul>
- * <li>All files have been enumerated.
- * <li>The execution manager gets canceled.
- * <li>The connection fails
- * </ul>
- * If an element fails to be retrieved, an exception is returned instead of the element.
- * 
- * Instead of {@link #nextElement()}, one may call {@link #nextRemoteItem()}.
- * 
- * @author Daniel Ferber
- */
-public class RemoteFileEnumeration implements IRemoteFileEnumeration {
-
-	IRemoteItem[] items = null;
-	int currentItem = 0;
-	FileTools fileTools = null;
-	
-	/**
-	 * Enumerates all files on a given root directory.
-	 * 
-	 * @param fileTools
-	 * @param directoryPath The remote directory. Must be a valid existing directory.
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException The root directory does not exist or is not a directory.
-	 * @throws CancelException
-	 */
-	RemoteFileEnumeration(FileTools fileTools, String directoryPath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		// dont need, listItems(root) will test
-		// fileTools.test();
-
-		this.fileTools = fileTools;
-		this.items = fileTools.listItems(directoryPath);
-		this.currentItem = 0;
-	}
-	
-	public boolean hasMoreElements() {
-		return currentItem < items.length;
-	}
-
-	public Object nextElement() {
-		return nextElementAsItem();
-	}
-	
-	public IRemoteItem nextElementAsItem() {
-		if (currentItem >= items.length) {
-			throw new NoSuchElementException();
-		}
-		return items[currentItem++];
-	}
-
-	public Exception nextException() {
-		return null; // always nulls
-	}
-
-	public boolean hasMoreExceptions() {
-		return false;
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java
deleted file mode 100755
index 1df33ea..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Stack;
-
-import org.eclipse.ptp.remotetools.core.IRemoteDirectory;
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-
-public class RemoteFileRecursiveEnumeration implements IRemoteFileEnumeration {
-
-	Stack directories;
-	RemoteFileEnumeration currentItems;
-	FileTools fileTools;
-	LinkedList currentExceptions = new LinkedList();
-	IRemoteItem nextRemoteItem;
-	
-	public RemoteFileRecursiveEnumeration(FileTools fileTools, String root) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		this.fileTools = fileTools;
-		// dont need, getItem(root) will test
-		// fileTools.test();
-		directories = new Stack();
-		directories.add(root);
-		prefetchNextRemoteItem();
-	}
-	
-	private void prefetchNextRemoteItem() {
-		if (directories == null) {
-			// Enumeration stopped due to error.
-			nextRemoteItem = null;
-			return;
-		}
-		
-		nextRemoteItem = null;
-		while (currentItems == null || ! currentItems.hasMoreElements()) {
-			if (directories.empty()) {
-				// No more directories are in stack. Terminate without any item.
-				return;
-			}
-			String root = (String)directories.pop();
-			try {
-				currentItems = new RemoteFileEnumeration(fileTools, root);
-			} catch (CancelException e) {
-				currentExceptions = new LinkedList();
-				currentExceptions.addLast(e);
-				return;
-			} catch (RemoteConnectionException e) {
-				currentExceptions = new LinkedList();
-				currentExceptions.addLast(e);
-				return;
-			} catch (RemoteOperationException e) {
-				currentExceptions.addLast(e);
-				continue;
-			}
-		}
-			
-		IRemoteItem item = currentItems.nextElementAsItem();
-		if (item instanceof IRemoteDirectory) {
-			IRemoteDirectory directory = (IRemoteDirectory) item;
-			directories.add(directory.getPath());
-		}
-		nextRemoteItem = item;
-	}
-
-	public boolean hasMoreElements() {
-		return nextRemoteItem != null;
-	}
-
-	public Exception nextException() {
-		if (currentExceptions.size() == 0) {
-			return null;
-		}
-		return (Exception) currentExceptions.removeFirst();
-	}
-	
-	public boolean hasMoreExceptions() {
-		return currentExceptions.size() > 0;
-	}
-
-	public IRemoteItem nextElementAsItem() {
-		if (nextRemoteItem == null) {
-			throw new NoSuchElementException();
-		}
-		IRemoteItem returnItem = nextRemoteItem;
-		prefetchNextRemoteItem();
-		return returnItem;
-	}
-
-	public Object nextElement() {
-		return nextElementAsItem();
-	}
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java
deleted file mode 100755
index 95e0a52..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java
+++ /dev/null

@@ -1,312 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.Set;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-import com.jcraft.jsch.SftpATTRS;
-import com.jcraft.jsch.SftpException;
-import com.jcraft.jsch.ChannelSftp.LsEntry;
-
-/**
- * @author Richard Maciel
- *
- */
-class RemoteItem implements IRemoteItem {
-
-	String path;
-	boolean isReadable;
-	boolean isWritable;
-	boolean isExecutable;
-	boolean exist;
-	FileTools fileTools;
-	int userID;
-	int permissions;
-	long size;
-	int accessTime;
-	int modificationTime;
-	protected int groupID;
-	protected int changes;
-	boolean isDirectory;
-	
-	final protected int PERMISSION = 1;
-	final protected int MODIFICATION_TIME = 2;
-	
-	RemoteItem(FileTools fileTools, String path)	{
-		this.fileTools = fileTools;
-		this.path = path;
-	}
-	
-	RemoteItem(FileTools fileTools, String path, SftpATTRS attrs) {
-		this.fileTools = fileTools;
-		this.path = path;
-		
-		parseAttrs(attrs);
-	}
-	
-	protected RemoteItem() {
-	}
-
-	protected void copyAttributesFrom(RemoteItem other) {
-		this.path = other.path;
-		this.isReadable = other.isReadable;
-		this.isWritable = other.isWritable;
-		this.isExecutable = other.isExecutable;
-		this.exist = other.exist;
-		this.fileTools = other.fileTools;
-		this.userID = other.userID;
-		this.permissions = other.permissions;
-		this.size = other.size;
-		this.accessTime = other.accessTime;
-		this.modificationTime = other.modificationTime;
-		this.groupID = other.groupID;
-		this.changes = other.changes;
-		this.isDirectory = other.isDirectory;
-	}
-	
-	public boolean exists() {
-		return exist;
-	}
-	
-	public void refreshAttributes() throws RemoteConnectionException, RemoteOperationException, CancelException, RemoteOperationException {
-		fileTools.test();
-		SftpATTRS attrs = fileTools.fetchRemoteAttr(path);
-		
-		parseAttrs(attrs);
-	}
-
-	private void parseAttrs(SftpATTRS attrs) {
-		/*
-		 * No file found.
-		 */
-		if (attrs == null) {
-			exist = false;
-			return;
-		} 
-		
-		exist = true;
-		changes = 0;
-
-		isDirectory = attrs.isDir();
-		
-		userID = attrs.getUId();
-		groupID = attrs.getGId();
-		permissions = attrs.getPermissions();
-		
-		isReadable = false;
-		isWritable = false;
-		isExecutable = false;
-		
-		if(userID == fileTools.cachedUserID) {
-			if ((permissions & 0400) != 0) {
-				isReadable = true;
-			}
-			if ((permissions & 0200) != 0) {
-				isWritable = true;
-			} 
-			if ((permissions & 0100) != 0) {
-				isExecutable = true;
-			}
-		} 
-				
-		Set groupIDSet = fileTools.cachedGroupIDSet;
-		if(groupIDSet.contains(new Integer(groupID))) {
-			if ((permissions & 0040) != 0) {
-				isReadable = true;
-			}
-			if ((permissions & 0020) != 0) {
-				isWritable = true;
-			} 
-			if ((permissions & 0010) != 0) {
-				isExecutable = true;
-			}
-		}
-			
-		if ((permissions & 0004) != 0) {
-			isReadable = true;
-		}
-		if ((permissions & 0002) != 0) {
-			isWritable = true;
-		} 
-		if ((permissions & 0001) != 0) {
-			isExecutable = true;
-		}
-		
-		size = attrs.getSize();
-		accessTime = attrs.getATime();
-		modificationTime = attrs.getMTime();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItemProperties#getPathname()
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItemProperties#isReadableByUser()
-	 */
-	public boolean isReadable() {
-		return isReadable;
-	}
-	
-	public void setReadable(boolean flag) {
-		int oldPermissions = permissions;
-		if (userID == fileTools.cachedUserID) {
-			if (flag) {
-				permissions |= 0400;
-			} else {
-				permissions &= ~0400;
-			}
-		}
-		Set groupIDSet = fileTools.cachedGroupIDSet;
-		if(groupIDSet.contains(new Integer(groupID))) {
-			if (flag) {
-				permissions |= 0040;
-			} else {
-				permissions &= ~0040;
-			}
-		}
-		if (flag) {
-			permissions |= 0004;
-		} else {
-			permissions &= ~0004;
-		}
-		if (oldPermissions != permissions) {
-			changes |= PERMISSION;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItemProperties#isWritableByUser()
-	 */
-	public boolean isWritable() {
-		return isWritable;
-	}
-	
-	public void setWriteable(boolean flag) {
-		int oldPermissions = permissions;
-		if (userID == fileTools.cachedUserID) {
-			if (flag) {
-				permissions |= 0200;
-			} else {
-				permissions &= ~0200;
-			}
-		}
-		Set groupIDSet = fileTools.cachedGroupIDSet;
-		if(groupIDSet.contains(new Integer(groupID))) {
-			if (flag) {
-				permissions |= 0020;
-			} else {
-				permissions &= ~0020;
-			}
-		}
-		if (flag) {
-			permissions |= 0002;
-		} else {
-			permissions &= ~0002;
-		}
-		if (oldPermissions != permissions) {
-			changes |= PERMISSION;
-		}
-	}
-	
-	public long getAccessTime() {
-		return (long)accessTime*1000;
-	}
-	
-	public long getModificationTime() {
-		return (long)modificationTime*1000;
-	}
-	
-	public void setModificationTime(long time) {
-		int oldModificationTime = modificationTime;
-		modificationTime = (int)(time/1000);
-		if (oldModificationTime != modificationTime) {
-			changes |= MODIFICATION_TIME;
-		}
-	}
-	
-	public void commitAttributes() throws RemoteConnectionException, CancelException, RemoteOperationException {
-		fileTools.test();
-		if ((changes & PERMISSION) != 0) {
-			try {
-				fileTools.manager.connection.sftpChannel.chmod(permissions, path);
-				changes &= ~PERMISSION;
-			} catch (SftpException e) {
-				throw new RemoteOperationException(NLS.bind("Failed to set permission of remote file {0} ({1})", new String[] {path, e.getMessage()}), e);
-			}
-		}
-		if ((changes & MODIFICATION_TIME) != 0) {
-			try {
-				fileTools.manager.connection.sftpChannel.setMtime(path, modificationTime);
-				changes &= ~MODIFICATION_TIME;
-			} catch (SftpException e) {
-				throw new RemoteOperationException(NLS.bind("Failed to set modification fime of remote file {0} ({1})", new Object[] {path, e}), e);
-			}
-		}
-//		changes = 0;
-	}
-
-	protected boolean isExecutable() {
-		return isExecutable;
-	}
-
-	protected void setExecutable(boolean flag) {
-		int oldPermissions = permissions;
-		if (userID == fileTools.cachedUserID) {
-			if (flag) {
-				permissions |= 0100;
-			} else {
-				permissions &= ~0100;
-			}
-		}
-		if(fileTools.cachedGroupIDSet.contains(new Integer(groupID))) {
-			if (flag) {
-				permissions |= 0010;
-			} else {
-				permissions &= ~0010;
-			}
-		}
-		if (flag) {
-			permissions |= 0001;
-		} else {
-			permissions &= ~0001;
-		}
-		if (oldPermissions != permissions) {
-			changes |= PERMISSION;
-		}
-	}
-
-	public boolean isDirectory() {
-		return isDirectory;
-	}
-	
-	public boolean isFile() {
-		return ! isDirectory;
-	}
-	
-	public String toString() {
-		if (exist) {
-			return path + (isDirectory ? "(d)" : "(f)");
-		} else {
-			return "does not exit";
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java
deleted file mode 100644
index da66d28..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.text.MessageFormat;
-
-import org.eclipse.ptp.remotetools.core.IRemotePortForwarding;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * Implementation of {@link IRemotePortForwarding} for SSH. Contains information
- * about from and to where the port forwarding was established. The information
- * is valid while the forwarding is active.
- * 
- * When creating the forwarding, the constructor assigns an execution manager as
- * owner of the port forwarding. When the port forwarding is turned off, then it
- * will is considered "inactive", it will have no execution manager anymore as
- * owner and the information won't be valid anymore.
- * The forwarding must be notified by that it was turned off by Remote Tools calling {@link #releaseOwner()}.
- * 
- * If the owner wasn't removed when turning off the connection, the an
- * application that stores a reference to the forwarding, would also indirectly
- * reference the execution manager, the connection and all data structure.
- * This would prevent garbage collection of connections that are not used anymore.
- * 
- * All methods have package visibility to allows internal access without getter/setters.
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public class RemotePortForwarding implements IRemotePortForwarding {
-	/**
-	 * The execution manager that created and owns the port forwarding.
-	 * When <code>null</code>, signals that the forwarding was turned off and that the data is not valid anymore.
-	 */
-	ExecutionManager owner;
-	
-	/** The port on the host where the remote port is forwarded to. */
-	int localPort;
-	/** The host where the remote port is forwarded to. */
-	String localAddress;
-	/** The remote port that is being forwarded. */
-	int remotePort;
-	
-	/**
-	 * Creates a remote port forwarding that is owned by the execution manager.
-	 * <p>
-	 * Used by the SSH implementation of Remote Tools.
-	 * 
-	 * @param owner
-	 *            The execution manager that owns the port forwarding.
-	 * @param localPort
-	 *            The port on the host where the remote port is forwarded to.
-	 * @param localAddress
-	 *            The host where the remote port is forwarded to.
-	 * @param remotePort
-	 *            The remote port that is being forwarded.
-	 */
-	RemotePortForwarding(ExecutionManager owner, int localPort,
-			String localAddress, int remotePort) {
-		super();
-		this.owner = owner;
-		this.localPort = localPort;
-		this.localAddress = localAddress;
-		this.remotePort = remotePort;
-	}
-
-	/**
-	 * Notifies that the forwarding was turned off.
-	 * <p>
-	 * Used by the SSH implementation of Remote Tools.
-	 */
-	void releaseOwner() {
-		this.owner = null;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#getLocalPort()
-	 */
-	public int getLocalPort() {
-		return localPort;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#getLocalAddress()
-	 */
-	public String getLocalAddress() {
-		return localAddress;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#getRemotePort()
-	 */
-	public int getRemotePort() {
-		return remotePort;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#release()
-	 */
-	public void release() throws RemoteConnectionException,
-			PortForwardingException, CancelException {
-		if (owner == null) {
-			throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE);
-		}
-		owner.getPortForwardingTools().releaseForwarding(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return MessageFormat.format("remote port {0} to local {1}:{2}", new Object[] { new Integer(remotePort), localAddress, new Integer(localPort)});
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IPortForwarding#isActive()
-	 */
-	public boolean isActive() {
-		return owner != null;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java
deleted file mode 100644
index b72cfe3..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-import com.jcraft.jsch.JSchException;
-
-/**
- * Keeps references to all active port forwardings of a connection.
- * This forwardings are shared by all execution managers, since it is a ressource that applies only to the connection.
- * 
- * @author dfferber
- *
- */
-public class RemotePortForwardingPool {
-	/**
-	 * Remote port to local forwarding that are active on the Connection.
-	 */
-	HashMap<Integer, RemotePortForwarding> remotePortForwardings = new HashMap<Integer, RemotePortForwarding>();;
-	
-	/**
-	 * Connection
-	 */
-	Connection connection;
-	
-	RemotePortForwardingPool(Connection connection) {
-		assert connection != null;
-		
-		this.connection = connection;
-	}
-	
-	RemotePortForwarding createRemotePortForwarding(ExecutionManager owner, int remotePort, String localAddress, int localPort) throws RemoteConnectionException, PortForwardingException {
-		assert (remotePort > 0);
-		assert (localPort > 0) ;
-		assert (owner != null);
-		assert (connection.defaultSession != null);
-		
-		synchronized (remotePortForwardings) {
-			/* 
-			 * Test if the forwarding is not already active. 
-			 */
-			Integer remotePortInteger = new Integer(remotePort);
-			RemotePortForwarding remotePortForwarding =  (RemotePortForwarding) remotePortForwardings.get(remotePortInteger);
-			if (remotePortForwarding != null) {
-				throw new PortForwardingException(PortForwardingException.REMOTE_PORT_ALREADY_FORWARDED);
-			}
-			
-			/*
-			 * Create a port forwarding in Jsch.
-			 */
-			try {
-				this.connection.defaultSession.setPortForwardingR(remotePort, localAddress, localPort);
-			} catch (JSchException e) {
-				throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_FAILED, e);
-			}
-			
-			/*
-			 * Create new forwarding instance and add it to the table.
-			 */
-			remotePortForwarding = new RemotePortForwarding(owner, localPort, localAddress, remotePort);
-			remotePortForwardings.put(remotePortInteger, remotePortForwarding);
-			
-			return remotePortForwarding;
-		}
-	}
-	
-	void releaseRemotePortForwarding(RemotePortForwarding remoteForwarding, ExecutionManager owner)  throws RemoteConnectionException, PortForwardingException {
-		assert remoteForwarding != null;
-		assert (connection.defaultSession != null);
-		
-		synchronized (remotePortForwardings) {
-			/*
-			 * Assure the port forwarding that is still active.
-			 */
-			if (! remoteForwarding.isActive()) {
-				throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE);
-			}
-			
-			/*
-			 * If a execution manager is given as owner, then assure the port forwarding belongs to it.
-			 */
-			if (owner != null) {
-				if (remoteForwarding.owner != owner) {
-					throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE);
-				}
-			}
-			
-			Integer remotePortInteger = new Integer(remoteForwarding.remotePort);
-			assert remotePortForwardings.containsKey(remotePortInteger);
-			
-			turnOffRemotePortForwarding(remoteForwarding);
-			remotePortForwardings.remove(remotePortInteger);
-		}
-	}
-	
-	RemotePortForwarding getRemotePortForwarding(int remotePort) throws RemoteConnectionException, PortForwardingException {
-		assert remotePort > 0;
-		assert (connection.defaultSession != null);
-
-		synchronized (remotePortForwardings) {
-			Integer remotePortInteger = new Integer(remotePort);
-			return (RemotePortForwarding) remotePortForwardings.get(remotePortInteger);
-		}
-		
-	}
-
-	void disconnect() {
-		Iterator<RemotePortForwarding> iterator = remotePortForwardings.values().iterator();
-		while (iterator.hasNext()) {
-			RemotePortForwarding forwarding = iterator.next();
-				turnOffRemotePortForwarding(forwarding);
-				iterator.remove();
-		}
-	}
-
-	
-	void disconnect(ExecutionManager executionManager) {
-		Iterator<RemotePortForwarding> iterator = remotePortForwardings.values().iterator();
-		while (iterator.hasNext()) {
-			RemotePortForwarding forwarding = iterator.next();
-			if (forwarding.owner == executionManager) {
-				turnOffRemotePortForwarding(forwarding);
-				iterator.remove();
-			}
-		}
-	}
-	
-	/**
-	 * Auxiliary method used by other methods to turn off a port forwarding.
-	 * @param forwarding The port remote forwarding to be turned off.
-	 */
-	private void turnOffRemotePortForwarding(RemotePortForwarding forwarding) {
-		forwarding.releaseOwner();
-		try {
-			connection.defaultSession.delPortForwardingR(forwarding.remotePort);
-		} catch (JSchException e) {
-			// No possible exceptions are known.
-			assert false;
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java
deleted file mode 100755
index ff2183e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-
-public class SSHRemoteProcess extends RemoteProcess {
-	
-	IRemoteScriptExecution execution;
-	private InputStream errorStream;
-	private InputStream inputStream;
-	private OutputStream outputStream;
-	
-	class ExecutionCloser extends Thread {
-		public void run() {
-			try {
-				execution.waitForEndOfExecution();
-			} catch (RemoteConnectionException e) {
-			} catch (RemoteExecutionException e) {
-			} catch (CancelException e) {
-			}
-			execution.close();
-		}
-	}
-	
-	public SSHRemoteProcess(IRemoteScriptExecution execution) {
-		this.execution = execution;
-		try {
-			this.errorStream = execution.getInputStreamFromProcessErrorStream();
-			this.outputStream = execution.getOutputStreamToProcessInputStream();
-			this.inputStream = execution.getInputStreamFromProcessOutputStream();
-		} catch (IOException e) {
-			throw new IllegalArgumentException(e.getLocalizedMessage());
-		}
-		new ExecutionCloser().start();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#destroy()
-	 */
-	public void destroy() {
-		if (! execution.wasFinished()) {
-			execution.cancel();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#exitValue()
-	 */
-	public int exitValue() {
-		if (execution.wasCanceled()) {
-			return -1;
-		} else if (execution.wasFinished()) {
-			return execution.getReturnCode();
-		} else {
-			throw new IllegalThreadStateException();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getErrorStream()
-	 */
-	public InputStream getErrorStream() {
-		return errorStream;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getInputStream()
-	 */
-	public InputStream getInputStream() {
-		return inputStream;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getOutputStream()
-	 */
-	public OutputStream getOutputStream() {
-		return outputStream;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#waitFor()
-	 */
-	public int waitFor() throws InterruptedException {
-		try {
-			execution.waitForEndOfExecution();			
-		} catch (RemoteConnectionException e) {
-			return -1;
-		} catch (CancelException e) {
-			return -1;
-		}  catch (RemoteExecutionException e) {
-			return -1;
-		}
-		return exitValue();
-	}
-
-	public IRemoteScriptExecution getRemoteExecution()
-	{
-		return execution;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java
deleted file mode 100755
index 70ffe2a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-import org.eclipse.ptp.remotetools.internal.common.RemoteScript;
-
-import com.jcraft.jsch.ChannelExec;
-
-/**
- * @author richardm
- * 
- */
-public class ScriptExecution extends KillableExecution implements IRemoteScriptExecution {
-
-	protected RemoteScript remoteScript;
-	
-	protected InputStream fromProcessOutput;
-	protected InputStream fromProcessError;
-	protected OutputStream toProcessInput;
-
-
-	protected ScriptExecution(ExecutionManager executionManager, RemoteScript remoteScript)
-			throws RemoteConnectionException {
-		super(executionManager);
-		this.remoteScript = remoteScript;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.internal.ssh.KillableExecution#startExecution()
-	 */
-	public void startExecution() throws RemoteConnectionException {
-		String commandline = getRemoteScript().getScriptString();
-		ChannelExec channel = createChannel(getRemoteScript().getAllocateTerminal());
-		setCommandLine(commandline);
-
-		try {
-			if (remoteScript.getInputStream() != null) {
-				channel.setInputStream(remoteScript.getInputStream());
-			} else if (remoteScript.getFetchProcessInputStream()) {
-				toProcessInput = channel.getOutputStream();
-			}
-		
-			if (remoteScript.getOutputStream() != null) {
-				channel.setOutputStream(remoteScript.getOutputStream());
-			} else if (remoteScript.getFetchProcessOutputStream()) {
-				fromProcessOutput = channel.getInputStream();
-			}
-			
-			if (remoteScript.getErrorStream() != null) {
-				channel.setErrStream(remoteScript.getErrorStream());
-			} else if (remoteScript.getFetchProcessErrorStream()) {
-				fromProcessError = channel.getErrStream();
-			}
-		} catch (IOException e) {
-			throw new RemoteConnectionException(Messages.ScriptExecution_StartExecution_FailedInitStreams, e);
-		}
-		channel.setXForwarding(remoteScript.willForwardX11());
-
-		super.startExecution();
-		Debug.println("Executing " + commandline); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteCommandExecution#getInputStreamFromProcessOutputStream()
-	 */
-	public InputStream getInputStreamFromProcessOutputStream() throws IOException {
-		if (fromProcessOutput == null) {
-			throw new IllegalStateException();
-		}
-		return fromProcessOutput;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteCommandExecution#getInputStreamFromProcessErrorStream()
-	 */
-	public InputStream getInputStreamFromProcessErrorStream() throws IOException {
-		if (fromProcessError == null) {
-			throw new IllegalStateException();
-		}
-		return fromProcessError;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteCommandExecution#getOutputStreamFromProcessInputStream()
-	 */
-	public OutputStream getOutputStreamToProcessInputStream() throws IOException {
-		if (toProcessInput == null) {
-			throw new IllegalStateException();
-		}
-		return toProcessInput;
-	}
-
-	public RemoteScript getRemoteScript() {
-		return (RemoteScript) remoteScript;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java
deleted file mode 100755
index d324e99..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java
+++ /dev/null

@@ -1,430 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteDownloadExecution;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-import org.eclipse.ptp.remotetools.utils.network.MacAddress;
-
-
-/**
- * Concrete class responsible for returning status data from the remote host
- * 
- * @author Richard Maciel
- *
- */
-public class StatusTools implements IRemoteStatusTools {
-	ExecutionManager manager;
-	UserInformation userInfoCache;
-	
-	/**
-	 * This class is responsible for caching information that is "stable" enough to be stored and retrieved
-	 * instead of generated every time.  
-	 *
-	 * @author Richard Maciel
-	 *
-	 */
-	class UserInformation {
-		Integer userID;
-		Set groupIDSet;
-		String username;
-		
-		public UserInformation(Integer userID, Set groupIDSet, String username) {
-			this.userID = userID;
-			this.groupIDSet = groupIDSet;
-			this.username = username;
-		}
-		
-		
-	}
-	
-	protected StatusTools(ExecutionManager manager) {
-		this.manager = manager;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#checkRemoteAddressUse(java.net.InetAddress)
-	 */
-	public boolean checkRemoteAddressUse(InetAddress addr) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean checkRemoteMacAddressUse(MacAddress macAddr) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public Set getRemotePortsInUse(int protocol) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		// Uses the following shell script to get a list of used ports in the
-		// remote host:
-		// cat /proc/net/<transport protocol>
-		// Then, the data coming from the command is filtered using java commands equivalent to the
-		// following shell command:
-		// cat /proc/net/tcp | tail -n +2 | sed -r 's/^\s+//g' | cut -d ' ' -f 2 | cut -d ':' -f 2
-
-		
-		HashSet portSet = new HashSet(); 
-		String protoStr = null, protoStr6 = null;
-		if(protocol == IRemoteStatusTools.PROTO_UDP) {
-			protoStr = "cat /proc/net/udp"; //$NON-NLS-1$
-			protoStr6 = "cat /proc/net/udp6"; //$NON-NLS-1$
-		} else if (protocol == IRemoteStatusTools.PROTO_TCP){
-			protoStr = "cat /proc/net/tcp"; //$NON-NLS-1$
-			protoStr6 = "cat /proc/net/tcp6"; //$NON-NLS-1$
-		} 
-		
-		try {
-			IRemoteExecutionTools remExecTools = manager.getExecutionTools(); 
-			
-			// Filter information from files.
-			/*
-			 * "protoOutput" and "proto6Output" are the 
-			 * outputs of the above commands, WITHOUT the header 
-			 * that is being wiped out by the "replaceFirst" 
-			 * method. Thus, the resulting string
-			 * "rawProcOutput" contains only valid connection
-			 * entries for both ipv4 and ipv6 and must be
-			 * totally processed on the following loop.
-			 * 
-			 */
-			String protoOutput = remExecTools.executeWithOutput(protoStr).
-				replaceFirst("^\\p{Space}*sl.*inode\\p{Space}*\\n", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			String proto6Output = remExecTools.executeWithOutput(protoStr6).
-				replaceFirst("^\\p{Space}*sl.*inode\\p{Space}*\\n", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			String rawProcOutput = protoOutput.concat(proto6Output); 
-			
-			String [] rawProcLines = rawProcOutput.split("\n"); //$NON-NLS-1$
-			
-			for(int i=0; i < rawProcLines.length; i++) {
-				// Trim the beginning of each line, and split the string using
-				// whitespace as separator.
-				String [] procFields = rawProcLines[i].trim().split(" "); //$NON-NLS-1$
-
-				// Get the second field and split it using ':' as separator.
-				// Get the second field.
-				String [] addrFields = procFields[1].split(":"); //$NON-NLS-1$
-				String allocedPort = addrFields[1];
-
-				// Convert the value to an integer (it's on base 16) 
-				// and put it into the set.
-				portSet.add(Integer.valueOf(allocedPort, 16));
-			}
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-		
-		return portSet;
-	}
-
-	private static int PASSWD_USERNAME_FIELD = 0;
-	private static int PASSWD_USERID_FIELD = 2;
-	private static int PASSWD_GROUPID_FIELD = 3;
-	private static int PASSWD_HOMEDIR_FIELD = 5;
-	
-	private static int GROUP_GROUPID_FIELD = 2;
-	private static int GROUP_USERLIST_FIELD = 3;
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#getGroupIDSet()
-	 */
-	public Set getGroupIDSet() throws RemoteConnectionException, RemoteOperationException, CancelException {
-//		 If there's already information on cache, use it
-		if(userInfoCache == null) {
-			userInfoCache = fetchRemoteUserInfo();
-		}			
-		return userInfoCache.groupIDSet;
-	}
-
-	/**
-	 * An implementation of the {@link getGroupIDSet} method that only uses the cat command on the remote machine
-	 * to extract desired data. Specifically, it retrieves information from the /etc/passwd looking and /etc/group files
-	 * and extract the information about the groups of the user whose username comes from the {@link getUsername} method
-	 * 
-	 * @return
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 */
-	private Set getGroupIDSet_CatBased() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		String [] passwdFields = getPasswdFields(); 
-		String username = passwdFields[PASSWD_USERNAME_FIELD].trim();
-		String strPasswdGroupID = passwdFields[PASSWD_GROUPID_FIELD].trim();
-		Set groupIDSet = new HashSet();
-		
-		// Put the the group from the passd file into the list (if not blank)
-		if(!strPasswdGroupID.trim().equals("")) { //$NON-NLS-1$
-			groupIDSet.add(new Integer(Integer.parseInt(strPasswdGroupID)));
-		}
-		
-		/*
-		 * Get the group file and search for the groups that the user belongs
-		 * to.
-		 */
-		// Cat the /etc/group file and split it in lines
-		IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-		try {
-			String rawGroup = remExecTools.executeWithOutput("cat /etc/group"); //$NON-NLS-1$
-			String [] rawGroupLines = rawGroup.split("\\n"); //$NON-NLS-1$
-			
-			for(int i=0; i < rawGroupLines.length; i++) {
-				// Last field can be non-existant, so use a negative parameter in split to
-				// make sure it becomes a field
-				String [] groupFields = rawGroupLines[i].split(":", -1); //$NON-NLS-1$
-				// Search for the username in the list of users of the group.
-				// IF the username belongs to the group, insert it into the list.
-				if(isUsernameInList(username, groupFields[GROUP_USERLIST_FIELD].split(","))) { //$NON-NLS-1$
-					groupIDSet.add(new Integer(Integer.parseInt(groupFields[GROUP_GROUPID_FIELD].trim())));
-				}
-			}
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-		// Returns the set
-		return groupIDSet;
-	}
-	
-	/**
-	 * Given a list of usernames, verifies if user belongs to it.
-	 * 
-	 * @param username
-	 * @param usernameList
-	 * @return
-	 */
-	private boolean isUsernameInList(String username, String [] usernameList) {
-		for(int i=0; i < usernameList.length; i++) {
-			if(usernameList[i].trim().equals(username)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#getUserID()
-	 */
-	public int getUserID() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		// If there's already information on cache, use it
-		if(userInfoCache == null) {
-			userInfoCache = fetchRemoteUserInfo();
-		}			
-		return userInfoCache.userID.intValue();
-	}
-	
-	/**
-	 * An implementation of the {@link getUserID} method that only uses the cat command on the remote machine
-	 * to extract desired data. Specifically it reads information from the /etc/passwd file and parses it to
-	 * retrieve the user id.
-	 * 
-	 * @return
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 */
-	public int getUserID_CatBased() throws RemoteConnectionException, RemoteOperationException, CancelException {
-//		 Get the field userid from the result of the getPasswdFields method
-		// and return it.
-		String strUserID = getPasswdFields()[PASSWD_USERID_FIELD]; 
-		return Integer.parseInt(strUserID);
-	}
-	
-	/**
-	 * Get the line that has the user information from the passwd file
-	 * 
-	 * @return String [] A vector containing the fields or null if no user matches
-	 * @throws RemoteOperationException 
-	 * @throws CancelException 
-	 * @throws RemoteConnectionException 
-	 */
-	private String [] getPasswdFields() throws RemoteOperationException, RemoteConnectionException, CancelException {
-		String currentUsername = getUsername_WhoamiBased();
-		IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-		
-		try {
-			// Get lines from the passwd
-			String rawPasswd = remExecTools.executeWithOutput("cat /etc/passwd"); //$NON-NLS-1$
-			String [] rawPasswdLines = rawPasswd.split("\\n"); //$NON-NLS-1$
-			
-			// Look for the string that matches the value from the currentUsername
-			// That string is on the first line 
-			for(int i=0; i < rawPasswdLines.length; i++) {
-				// Make sure it includes the last field even if it's blank.
-				String [] passwdFields = rawPasswdLines[i].split(":", -1); //$NON-NLS-1$
-				if(passwdFields[PASSWD_USERNAME_FIELD].equals(currentUsername))
-					return passwdFields;
-			}
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-		
-		throw new RuntimeException(Messages.RemoteStatusTools_GetPasswdFields_NoUsernameInPasswdFile);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#getUsername()
-	 */
-	public String getUsername() throws RemoteConnectionException, RemoteOperationException,
-		CancelException {
-		if(userInfoCache == null) {
-			userInfoCache = fetchRemoteUserInfo();
-		}			
-		return userInfoCache.username;
-	}
-	
-	/**
-	 * * An implementation of the {@link getUsername} method that uses the whoami command on the remote machine
-	 * to extract username information. 
-	 * 
-	 * @return
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 */
-	private String getUsername_WhoamiBased() throws RemoteConnectionException, RemoteOperationException,
-	CancelException {
-//		 Get information from the whoami command
-		try {
-			IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-			String rawWhoAmI = remExecTools.executeWithOutput("whoami"); //$NON-NLS-1$
-			return rawWhoAmI.trim();
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-	}
-
-	/**
-	 * A method designed to parse the /etc/group file to find the list
-	 * of groups that a user is enrolled in. 
-	 * 
-	 * @param username The name of the user that we are searching for enrollments.
-	 * @return A list of groups that username belongs to.
-	 * @throws RemoteConnectionException 
-	 * @throws RemoteOperationException 
-	 */
-	private Set<Integer> readGroupList(String username) throws RemoteConnectionException, RemoteOperationException {
-		Set<Integer> groupList = new HashSet<Integer>();
-		IRemoteDownloadExecution downloadExecution = null;
-		
-		try {
-			IRemoteCopyTools ct = manager.getRemoteCopyTools();
-			downloadExecution = ct.executeDownload("/etc/group");
-			BufferedReader etcGroupFile = new BufferedReader(new InputStreamReader(downloadExecution.getInputStreamFromProcessRemoteFile() ));
-			
-			String line = etcGroupFile.readLine();
-
-			while (line != null) {
-				String[] fields = line.split(":");
-
-				if (fields[0].trim().compareTo(username) == 0) {
-					groupList.add(new Integer(fields[2]));
-				} else if (fields.length == 4) {
-
-					String[] users = fields[3].split(",");
-					for (int i = 0; i < users.length; i++) {
-
-						if (users[i].trim().compareTo(username) == 0) {
-							groupList.add(new Integer(fields[2]));
-						}
-					}
-				}
-
-				line = etcGroupFile.readLine();
-			}
-			
-			etcGroupFile.close();
-		} catch (IOException ioe) {
-			throw new RemoteOperationException(ioe);
-		} catch (NumberFormatException nfe) {
-			//Maybe the format of this /etc/group file put the fields in a
-			//different order.
-			throw new RemoteOperationException(nfe);
-		} catch (ArrayIndexOutOfBoundsException aioobe) {
-			//This case is going to happen if the format is not the expected one.
-			throw new RemoteOperationException(aioobe);
-		} finally {
-			if (downloadExecution != null) {
-				downloadExecution.close();
-			}
-		}
-
-		return groupList;
-	}
-	
-	/**
-	 * Return all the user information from the remote machine.
-	 * This operation is a bit slow and should be used only once per RemoteStatusTools object.
-	 * 
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 * @return 
-	 */
-	private UserInformation fetchRemoteUserInfo() throws RemoteConnectionException, RemoteOperationException,
-		CancelException {
-		try {
-			//Set of groups that this user belongs to.
-			Set<Integer> groupList;
-			
-			IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-			// Execute command to return the username, uid and the group list
-			String rawUserInfo = remExecTools.executeWithOutput("echo `id -un`:`id -u`:`id -G`");
-			
-			String [] userInfoFields = rawUserInfo.trim().split(":", -1); // 1st username, 2nd UID, 3rd list of groups
-			
-			//With systems using BusyBox, id has no argument -G
-			//so we must parse /etc/group in this case
-			if (userInfoFields[2].trim().equalsIgnoreCase("")) {
-				groupList = readGroupList(userInfoFields[0]);
-			} else {
-				String[] groupFields = userInfoFields[2].split(" ", -1);
-
-				groupList = new HashSet<Integer>();
-
-				for (int i = 0; i < groupFields.length; i++) {
-					// Convert groups to Integer and put into the Set
-					groupList.add(new Integer(groupFields[i]));
-				}
-			}
-			
-			return new UserInformation(new Integer(userInfoFields[1]), groupList, userInfoFields[0]);
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-	}
-	
-	public long getTime() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		try {
-			IRemoteExecutionTools execTools = manager.getExecutionTools();
-			String rawData = execTools.executeWithOutput("date +'%s'");
-			rawData = rawData.trim();
-			return Long.parseLong(rawData)*1000;
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java
deleted file mode 100755
index 167344d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.IRemoteUploadExecution;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-
-import com.jcraft.jsch.ChannelExec;
-
-public class UploadExecution extends KillableExecution implements IRemoteUploadExecution {
-
-	String remoteFile;
-	InputStream sourceStream;
-	ByteArrayOutputStream errorStream;
-	OutputStream outputStream;
-
-	public UploadExecution(ExecutionManager executionManager, String remoteFile, InputStream source) throws RemoteConnectionException {
-		super(executionManager);
-		this.sourceStream = source;
-		this.remoteFile = remoteFile;
-		errorStream = new ByteArrayOutputStream();
-	}
-
-	public OutputStream getOutputStreamToProcessRemoteFile() {
-		if (sourceStream != null) {
-			throw new IllegalStateException();
-		}
-		return outputStream;
-	}
-
-	@Override
-	public void startExecution() throws RemoteConnectionException {
-
-		ChannelExec channel = createChannel(false);
-		IRemotePathTools pathTool = getExecutionManager().getRemotePathTools();
-		setCommandLine("cat >" + pathTool.quote(remoteFile, true)); //$NON-NLS-1$
-
-		if (sourceStream != null) {
-			channel.setInputStream(sourceStream);
-			outputStream = null;
-		} else {
-			try {
-				outputStream = channel.getOutputStream();
-			} catch (IOException e) {
-				throw new RemoteConnectionException(Messages.UploadExecution_StartExecution_FailedCreateUpload, e);
-			}
-		}
-		channel.setErrStream(errorStream);
-
-		super.startExecution();
-		Debug.println("Uploading " + remoteFile); //$NON-NLS-1$
-	}
-
-	public String getErrorMessage() {
-		return errorStream.toString();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties
deleted file mode 100755
index 475a675..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-NAME_BLOWFISH=Blowfish (fastest)
-NAME_3DES=3DES
-NAME_AES128=AES128
-NAME_AES192=AES192
-NAME_AES256=AES256
-NAME_DEFAULT=Internal SSH client default
-
-KEY_BLOWFISH=blowfish-cbc
-KEY_3DES=3des-cbc
-KEY_AES128=aes128-cbc
-KEY_AES192=aes192-cbc
-KEY_AES256=aes256-cbc
-KEY_DEFAULT=default
-
-CipherTypes.AttributeNameExceptionMsg2=Did not find attribute NAME_ {0} to match

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/messages.properties
deleted file mode 100755
index 6a262f1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/messages.properties
+++ /dev/null

@@ -1,100 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-KillableExecution_ScriptExecutionConnectionException=Failed to start to execute script
-KillableExecution_Debug_1=Using command line: 
-KillableExecution_FinishStatus_Ok=Application finished successfully
-KillableExecution_FinishStatus_Error=Application finished with error code
-KillableExecution_FinishStatus_NotExecutable=Command is not an executable
-KillableExecution_FinishStatus_CommandNotFound=Command not found
-KillableExecution_FinishStatus_InvalidExitCode=Invalid exit code
-KillableExecution_FinishStatus_Hangup=Hangup (POSIX)
-KillableExecution_FinishStatus_TerminalInterrupt=Terminal interrupt (ANSI)
-KillableExecution_FinishStatus_TerminalQuit=Terminal quit (POSIX)
-KillableExecution_FinishStatus_IllegalInstruction=Illegal instruction (ANSI)
-KillableExecution_FinishStatus_TraceTrap=Trace trap (POSIX)
-KillableExecution_FinishStatus_IOTTrap=IOT Trap (4.2 BSD)
-KillableExecution_FinishStatus_BUSError=BUS error (4.2 BSD)
-KillableExecution_FinishStatus_FloatingPointException=Floating point exception (ANSI)
-KillableExecution_FinishStatus_Kill=Kill(can't be caught or ignored) (POSIX)
-KillableExecution_FinishStatus_UserDefinedSignal1=User defined signal 1 (POSIX)
-KillableExecution_FinishStatus_InvalidMemorySegmentAccess=Invalid memory segment access (ANSI)
-KillableExecution_FinishStatus_UserDefinedSignal2=User defined signal 2 (POSIX)
-KillableExecution_FinishStatus_BrokenPipe=Write on a pipe with no reader, Broken pipe (POSIX)
-KillableExecution_FinishStatus_AlarmClock=Alarm clock (POSIX)
-KillableExecution_FinishStatus_Termination=Termination (ANSI)
-KillableExecution_FinishStatus_StackFault=Stack fault
-KillableExecution_FinishStatus_ChildProcessStoppedOrExited=Child process has stopped or exited, changed (POSIX)
-KillableExecution_FinishStatus_ContinueExecuting=Continue executing, if stopped (POSIX)
-KillableExecution_FinishStatus_StopExecuting=Stop executing(can't be caught or ignored) (POSIX)
-KillableExecution_FinishStatus_TerminalStopSignal=Terminal stop signal (POSIX)
-KillableExecution_FinishStatus_BackgroundProcessReadTTY=Background process trying to read, from TTY (POSIX)
-KillableExecution_FinishStatus_BackgroundWriteTTY=Background process trying to write, to TTY (POSIX)
-KillableExecution_FinishStatus_UrgentConditionSocket=Urgent condition on socket (4.2 BSD)
-KillableExecution_FinishStatus_CPULimitExceeded=CPU limit exceeded (4.2 BSD)
-KillableExecution_FinishStatus_FileSizeLimitExceeded=File size limit exceeded (4.2 BSD)
-KillableExecution_FinishStatus_VirtualAlarmClock=Virtual alarm clock (4.2 BSD)
-KillableExecution_FinishStatus_ProfilingAlarmClock=Profiling alarm clock (4.2 BSD)
-KillableExecution_FinishStatus_WindowSizeChange=Window size change (4.3 BSD, Sun)
-KillableExecution_FinishStatus_IOPossible=I/O now possible (4.2 BSD)
-KillableExecution_FinishStatus_PowerFailureRestart=Power failure restart (System V)
-KillableExecution_FinishStatus_Unknown=Unknown
-
-Connection_AuthenticationTypeNotSupported=Authentication type not supported\!
-ControlChannel_Open_FailedCreateIOStream=Failed to create input/outputstream for auxiliary shell in ssh.ControlConnection
-Connection_Connect_InvalidPrivateKey=Invalid private key
-Connection_Connect_FailedCreateSession=Failed to create session
-Connection_Connect_FailedConnect=Failed to connect
-Connection_Connect_FailedCreateControlChannel=Failed to create control channel
-Connection_Connect_FailedCreateSFTPConnection=Failed to create SFTP connection for ssh.ExecutionManager
-Connection_Connect_FailedUnsupportedKeySize=Unsupported Keysize
-
-CopyTools_DownloadFileFile_FailedDownloadFile=Failed to download file: 
-CopyTools_doDownloadFileToFile_CannotWriteFile=Download cannot write to local file ({0})
-CopyTools_doDownloadFileToFile_ExecutionFailed=Execution of download failed ({0})
-CopyTools_doDownloadFileToFile_CommandFailes=Download command failed on remote host (exit value {0})
-CopyTools_doUploadFileFromFile_CannotReadFile=Upload cannot read local file ({0})
-CopyTools_doUploadFileFromFile_ExecutionFailed=Execution of upload failed ({0})
-CopyTools_doUploadFileFromFile_CommandFailed=Upload command failed on remote host (exit value {0})
-ControlChannel_Open_FailedCreateAuxiliaryShell=Failed to create auxiliary shell for ssh.ControlConnection
-ControlChannel_Debug_ControlConnectionReceived=Control connection received: 
-Connection_CreateExecChannel_FailedCreateNewExecChannel=Failed to create new execution channel
-Connection_CreateTunnel_TunnelPortAlreadyAlloced=Failed to create tunnel, since port is already allocated for a tunnel
-Connection_CreateTunnel_FailedCreateTunnel=Failed to create tunnel
-ControlChannel_Open_FailedSendInitCommands=Failed to send initialization commands to auxiliary shell
-Connection_ReleaseTunnel_PortNotAllocedForTunnel=Failed to remove tunnel, since port is not allocated for a tunnel
-ControlChannel_Debug_ReceivedControlTerminalPath=Received controlTerminalPath: 
-Connection_ReleaseTunnel_FailedRemoveTunnel=Failed to remove tunnel
-Connection_CreateConnectionSlot_FailedCreateNewSession=Failed to create new session for more execution channels
-ControlChannel_Debug_StartedWaitingControlTerminalPath=Started waiting for controlTerminalPath
-ControlChannel_Open_WaitControlTerminalPathInterrupted=Wait for controlTerminalPath was interrupted
-Connection_CreateConnectionSlot_FailedConnectNewSession=Failed to connect to new session for more execution channels
-Connection_SetCipherType_CipherNotSupported=Cipher not supported
-
-DownloadExecution_DownloadExecution_FailedCreateDownload=Failed to create download
-ExecutionManager_CreateTunnel_AllLocalPortsBusy=All local ports are busy.
-ExecutionObserver_ExecutionObserver_RemoteCommandObserver=RemoteCommandObserver
-ExecutionTools_ExecuteBashCommand_FailedRunBashCommand=Failed to run Bash command
-PathTools_47=a/
-RemoteFileTools_FetchRemoteAttr_FailedFetchAttr=Failed to fetch attributes from remote filedirectory
-RemoteFileTools_UploadPermissions_FailedSetPermissions=Failed to set permissions
-RemoteStatusTools_GetPasswdFields_NoUsernameInPasswdFile=Username does not exist in the passwd file\!
-RemoteFileTools_ValidateRemotePath_NotValid=\ is not a valid path on remote host
-RemoteFileTools_ValidateLocalFile_NotValid=\ is not a valid local file
-RemoteFileTools_ValidateLocalItem_DoesNotExist=\ does not exist
-RemoteFileTools_ValidateLocalDir_NotValid=\ is not a valid local directory
-RemoteFileTools_ValidateRemoteFile_NotValid=\ is not a valid remote file
-RemoteFileTools_ValidateRemoteDir_NotValid=\ is not a valid remote directory
-RemoteFileTools_ListFiles_FailedListRemote=Failed to list files on remote host
-RemoteFileTools_FailedSetPermission=Failed to set permission on remote file/directory
-RemoteFileTools_GetItemsPath_FailedListRemoteFiles=Failed to list files on remote host
-RemoteFileTools_GetItem_PathNotExist=Path does not exist
-ScriptExecution_StartExecution_FailedInitStreams=Failed to initialize streams for ssh.ScriptExecution
-UploadExecution_StartExecution_FailedCreateUpload=Failed to create upload

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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/remotetools/org.eclipse.ptp.remotetools.environment.core/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.project
deleted file mode 100755
index c82cc5c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/META-INF/MANIFEST.MF
deleted file mode 100755
index 507a404..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.environment.core;singleton:=true
-Bundle-Version: 1.3.3.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.EnvironmentPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.core.filesystem,
- org.eclipse.ptp.utils.core;bundle-version="1.0.0"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.remotetools.environment,
- org.eclipse.ptp.remotetools.environment.control,
- org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.ptp.remotetools.environment.extension,
- org.eclipse.ptp.remotetools.environment.wizard,
- org.eclipse.ptp.remotetools.utils.verification

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties
deleted file mode 100755
index 1ac9adf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               schema/,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.properties
deleted file mode 100644
index b51d868..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools Target Environments Core
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml
deleted file mode 100755
index b0782c3..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="remoteEnvironmentControlDelegate" name="Remote Environment Control Delegate" schema="schema/remoteEnvironmentControlDelegate.exsd"/>
-   <extension-point id="childrenProvider" name="Target Element Children Provider" schema="schema/childrenProvider.exsd"/>
-  
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd
deleted file mode 100644
index 9930a5a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.core" id="childrenProvider" name="Target Element Children Provider"/>
-      </appInfo>
-      <documentation>
-         Contributor contributes an instance of IChildrenProvider, which provides children to existing target elements. For contributing children of the target elements&apos; children, contributor should make them implementing INode.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="childrenProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="childrenProvider">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.remotetools.environment.extension.IChildrenProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd
deleted file mode 100755
index b3dd9c9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.core" id="remoteEnvironmentControlDelegate" name="Remote Environment Control Delegate"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="control" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="control">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java
deleted file mode 100755
index 127bba9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment;
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ChildrenProviderManager;
-import org.eclipse.ptp.remotetools.environment.core.TargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetEnvironmentManager;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-import org.eclipse.ptp.utils.core.extensionpoints.IProcessMemberVisitor;
-import org.eclipse.ptp.utils.core.extensionpoints.ProcessExtensions;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class EnvironmentPlugin extends Plugin {
-
-	final public static String FILENAME = "environments.xml"; //$NON-NLS-1$
-	final public static String EXT_CONTROLS_ID = "org.eclipse.ptp.remotetools.environment.core.remoteEnvironmentControlDelegate"; //$NON-NLS-1$
-	final private static String ID = "org.eclipse.ptp.remotetools.environment.core"; //$NON-NLS-1$
-
-	//The shared instance.
-	private static EnvironmentPlugin plugin;
-	private TargetEnvironmentManager manager;
-	private ChildrenProviderManager childrenProviderMgr;
-
-	/**
-	 * The constructor.
-	 */
-	public EnvironmentPlugin() {
-		plugin = this;
-	}
-
-	public Map getControls() {
-		final Map controls = new HashMap();
-		ProcessExtensions.process(EXT_CONTROLS_ID, new IProcessMemberVisitor() {
-
-			public Object process(IExtension extension, IConfigurationElement member) {
-				Object mprovider;
-				try {
-					
-					mprovider = member.createExecutableExtension("class"); //$NON-NLS-1$
-					if ( ITargetTypeExtension.class.isAssignableFrom(mprovider.getClass()) ) {
-						controls.put(member.getAttribute("name"),mprovider); //$NON-NLS-1$
-					}
-				} catch (CoreException e) {
-					mprovider = null;
-				}
-				
-				return mprovider;
-			}
-			
-		});
-		return controls;
-	}
-
-	public TargetEnvironmentManager getTargetsManager() {
-		if (manager == null)
-			manager = new TargetEnvironmentManager();
-		return manager;
-	}
-	
-	public ChildrenProviderManager getChildrenProviderManager() {
-		if (childrenProviderMgr == null) {
-			childrenProviderMgr = new ChildrenProviderManager();
-		}
-		return childrenProviderMgr;
-	}
-	
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		manager.writeToFile();
-		plugin = null;
-	}
-
-	/**
-	 * Notifies all target elements of the plugin that includes
-	 * the parameter class. This parameter class must implement the
-	 * ITargetTypeExtension interface.
-	 * 
-	 * @param Class The class that implements the ITargetTypeExtension interface
-	 */
-	public synchronized void destroyTypeElements(Class extensionClass) {
-		// Find the TargetTypeElement that contains an extension which class is
-		// equivalent to the argument.
-		List typeList = getTargetsManager().getTypeElements();
-		for(Iterator typeIt = typeList.iterator(); typeIt.hasNext();) {
-			TargetTypeElement typeElement = (TargetTypeElement)typeIt.next();
-			if(typeElement.getExtension().getClass().equals(extensionClass)) {
-				// NOTE: At this point the called plugin should not be closed, so
-				// its safe to play around with its values.
-				
-				// Call the destroy method of all elements of the given type
-				List elemList = typeElement.getElements();
-				for(Iterator elemIt = elemList.iterator(); elemIt.hasNext();) {
-					TargetElement el = (TargetElement)elemIt.next();		
-					try { // Errors could happen when disabling the environment. Just ignore.
-						ITargetControl ctl = el.getControl();
-						ctl.destroy();
-					} catch (Throwable t) {	}
-				}
-			}
-		}
-	}
-	
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static EnvironmentPlugin getDefault() {
-		return plugin;
-	}
-
-	public static String getUniqueIdentifier() {
-		
-		return ID;
-	}
-	
-	/*
-	 * Unique ID generation for environment instances
-	 * This ID is generation comes from the system's timestamp. 
-	 */
-	public String getEnvironmentUniqueID() {
-		long envID = System.currentTimeMillis();
-		return String.valueOf(envID);
-	}
-
-//	 Key that address the unique identifier of a given environment instance
-	public static final String ATTR_CORE_ENVIRONMENTID = "core-environmentid";
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java
deleted file mode 100755
index 7bf2109..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-
-
-/**
- * Controls an instance of a target created from the Environment.
- * @author Ricardo M. Matinata, Daniel Felix Ferber, Richard Maciel
- * @since 1.1
- */
-public interface ITargetControl {
-	/**
-	 * Called to create an instance of the target.
-	 * @param monitor
-	 * @return
-	 * @throws CoreException
-	 */
-	public boolean create(IProgressMonitor monitor) throws CoreException;
-	
-	/**
-	 * Called to halt the instance of the target.
-	 * @param monitor
-	 * @return
-	 * @throws CoreException
-	 */
-	public boolean kill(IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Called to remove information associated with the instance of the target
-	 * because the it was removed.
-	 * @throws CoreException
-	 */
-	public void destroy() throws CoreException;
-	
-	public int query();
-	
-	public boolean resume(IProgressMonitor monitor) throws CoreException;
-	
-	public boolean stop(IProgressMonitor monitor) throws CoreException;
-	
-	/**
-	 * This method is a callback called when the ITargetControl implementing class
-	 * must update its configuration because an external change occurred.
-	 * 
-	 * @throws CoreException
-	 */
-	public void updateConfiguration() throws CoreException;
-	
-	/**
-	 * @deprecated
-	 */
-	public boolean executeRemoteCommand(IProgressMonitor monitor, String command, String[] args) throws CoreException;
-
-	/**
-	 * Gets the execution framework.
-	 * @deprecated
-	 * @return
-	 */
-	public IRemoteConnection getConnection();
-	
-	/**
-	 * Adds a new job to the set of running jobs on the environment.
-	 * The job will begin execution as soon as possible after being added.
-	 * @param job The job to be added and executed.
-	 * @return The job encapsulated as a IRemoteControlledJob
-	 * @throws CoreException 
-	 */
-	public void startJob(ITargetJob job) throws CoreException;
-
-	/**
-	 * Returns how many jobs are being managed by the control. 
-	 */
-	public int getJobCount();
-	
-	/**
-	 * Returns an array of all jobs running remotely.
-	 * All jobs are returned, regardless if WAITING or RUNNING.
-	 * Finished jobs are automatically removed from the list.
-	 * 
-	 * @return The array of remote jobs.
-	 */
-	public ITargetJob [] getJobs();
-	
-	public class TargetSocket {
-		public String host;
-		public int port;
-	}
-	/**
-	 * Create a bridge to a listening socket on the target environment.
-	 * @throws CoreException 
-	 */
-	public TargetSocket createTargetSocket(int port) throws CoreException;
-
-	/**
-	 * Add a new job listener.
-	 */
-	public void addJobListener(ITargetControlJobListener listener);
-
-	/**
-	 * Remove a job listener.
-	 */
-	public void removeJobListener(ITargetControlJobListener listener);
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java
deleted file mode 100755
index bca71b1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-/**
- * Interface for target control event listeners. 
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- */
-public interface ITargetControlEventListener {
-
-	/**
-	 * Notifies the listener that the state change event has occurred.
-	 * 
-	 * @param event the event code as in {@link ITargetStatus}
-	 * @param from the originating control
-	 */
-	public void handleStateChangeEvent(int event, ITargetControl from);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java
deleted file mode 100755
index 75e46f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-/**
- * 
- * Interface definition of event providers for Target Controls.
- * {@link ITargetControl} instances can optionally provide an implementation of this interface thru the
- * IAdaptable mechanism.
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- */
-public interface ITargetControlEventProvider {
-
-	/**
-	 * Registers a listener to the event provider, keyed by a control instance.
-	 * 
-	 * @param control the control generating events
-	 * @param listener the interested listener
-	 */
-	public void registerControlAndListener(ITargetControl control, ITargetControlEventListener listener);
-	
-	/**
-	 * Unregisters a control,listener tuple from this event provider
-	 * 
-	 * @param control the control generating events
-	 * @param listener the interested listener
-	 */
-	public void unregisterControlAndListener(ITargetControl control, ITargetControlEventListener listener);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java
deleted file mode 100755
index b31a01c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.control;
-
-public interface ITargetControlJobListener {
-	public void beforeJobStart(ITargetJob job);
-	public void afterJobFinish(ITargetJob job);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java
deleted file mode 100755
index 2affa1d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-
-/**
- * Describes a job that will run on a remote host.
- * <p>
- * Job is a collection of sequential operations executed using the IRemoteExecutionManager
- * on the target environment.
- * <p> 
- * The ITargetJob be run as a thread inside the Job Controller.
- *
- * @author Daniel Felix Ferber
- * @since 1.1
- */
-public interface ITargetJob {
-	/**
-	 * Implementation of the job.
-	 * <p>
-	 * The IRemoteExecutionManager that is capable of doing the operations
-	 * will be provided automatically.
-	 */
-	void run(IRemoteExecutionManager manager);	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java
deleted file mode 100755
index eadb1ad..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public interface ITargetStatus {
-	
-	final public static int STARTED = 0;
-	final public static int STOPPED = 1;
-	final public static int RESUMED = 2;
-	final public static int PAUSED  = 3;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java
deleted file mode 100755
index 744e11b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventListener;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProvider;
-
-
-/**
- * Default implementation of the ITargetControlEventProvider interface, based
- * on a simple pooling algorithm.
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- *
- */
-public class PoolingTargetControlEventProvider  implements
-		ITargetControlEventProvider {
-
-	public Thread monitorThread = null;
-	private int monitorInterval = 4000; // milliseconds
-	private Map controls = new HashMap();
-	
-	class MonitorThread extends Thread {
-		
-		public MonitorThread() {
-			super("Target Control polling");
-		}
-		public void run() {
-			while (monitorThread == this)
-			{
-				synchronized (PoolingTargetControlEventProvider.this) {
-					Iterator ctrls = controls.keySet().iterator();
-					
-					while(ctrls.hasNext()) {
-		
-							ITargetControl control = (ITargetControl) ctrls.next();
-							int entryStatus = control.query();
-							TargetInfo info = (TargetInfo) controls.get(control);
-							
-							if (entryStatus != info.getStatus() ) {
-								info.setStatus(entryStatus);
-								controls.put(control,info);
-								fireEvent(entryStatus, control);
-							}
-						
-					}
-				}
-				
-				try {
-					sleep (monitorInterval);
-				} catch (InterruptedException e) {}
-			}
-		}
-		
-	}
-	
-	public void fireEvent(int status, ITargetControl control) {
-		
-		if (control != null && controls.containsKey (control))
-		{
-			TargetInfo info = (TargetInfo) controls.get(control);
-			ITargetControlEventListener listener = info.getListener();
-			listener.handleStateChangeEvent(status, control);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProviderw#registerControlAndListener()
-	 */
-	public void registerControlAndListener(ITargetControl control, ITargetControlEventListener listener) {
-		
-		if (control != null && !controls.containsKey (control))
-		{
-			synchronized(this) {
-				controls.put (control, new TargetInfo(listener,ITargetStatus.STOPPED));
-			}
-			
-			if (monitorThread == null) {
-				(monitorThread = new MonitorThread()).start();
-			}
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProviderw#unregisterControlAndListener()
-	 */
-	public void unregisterControlAndListener(ITargetControl control, ITargetControlEventListener listener) {
-		
-		if (control != null && controls.containsKey (control))
-		{
-			synchronized(this) {
-				controls.remove (control);
-			}
-			
-			if (controls.size() == 0)
-				monitorThread = null;
-		}
-		
-	}
-	
-	class TargetInfo {
-		
-		private int status;
-		private ITargetControlEventListener listener;
-		
-		public TargetInfo(ITargetControlEventListener listener, int status) {
-			this.listener = listener;
-			this.status = status;
-		}
-
-		public ITargetControlEventListener getListener() {
-			return listener;
-		}
-
-		public void setListener(ITargetControlEventListener listener) {
-			this.listener = listener;
-		}
-
-		public int getStatus() {
-			return status;
-		}
-
-		public void setStatus(int status) {
-			this.status = status;
-		}
-		
-	}
-		
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java
deleted file mode 100755
index 5fa9e0f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java
+++ /dev/null

@@ -1,499 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remotetools.RemotetoolsPlugin;
-import org.eclipse.ptp.remotetools.core.AuthToken;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.KeyAuthToken;
-import org.eclipse.ptp.remotetools.core.PasswdAuthToken;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-
-/**
- * Standard implementation of <code>IRemoteJobController</code>.
- * Presumes a target environment that accepts SSH connections.
- * 
- * @see ITargetJobController
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public abstract class SSHTargetControl implements ITargetControl {
-
-	/**
-	 * Set of jobs running on the remote target environment.
-	 */
-	private Map remoteJobs;
-
-	/**
-	 * A connection (using ssh) to the remote target environment.
-	 */
-	private IRemoteConnection remoteConnection;
-	
-	/**
-	 * Listeners notified when jobs ared added/removed from the target environment.
-	 */
-	private Set jobListeners = new HashSet();
-	
-	/**
-	 * Exception to terminate the environment.
-	 */
-	private CoreException pendingException =null;
-	
-	/**
-	 * Return a map containing the available cipher types ids and their respective names
-	 * @return a Map object containing cipher type ids and cipher type names
-	 */
-	public static Map getCipherTypesMap() {
-		// This method decouples the map from the RemotetoolsPlugin
-		// so its safe to use it on the interface of each environment
-		// that uses this plugin.
-		
-		HashMap cipherTypesMap = new HashMap(RemotetoolsPlugin.getCipherTypesMap());
-		
-		return cipherTypesMap;
-	}
-	
-	/**
-	 * A set of parameters used for authentication with SSH.
-	 * @author Daniel Felix Ferber
-	 * @since 1.2
-	 */
-	protected class SSHParameters {
-		public String hostname;
-		public int port;
-		public String user;
-		public String password;
-		public String keyPath;
-		public String passphrase;
-		public boolean isPasswdAuth;
-		public String cipherType;
-		public int timeout = 0;
-		
-		/**
-		 * Constructor for password based authentication and assuming timeout = 0
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 */
-		public SSHParameters(String hostname, int port, String user, String password) {
-			this(hostname, port, user, password, RemotetoolsPlugin.CIPHER_DEFAULT, 0);
-			/*super();
-			this.hostname = hostname;
-			this.port = port; 
-			this.user = user;
-			this.password = password;*/
-		}
-
-		/**
-		 * Constructor for password based authentication
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 * @param cipherType Choose among the supported ciphers
-		 * @param timeout
-		 */
-		public SSHParameters(String hostname, int port, String user, String password, String cipherType, int timeout) {
-			super();
-			this.hostname = hostname;
-			this.port = port;
-			this.user = user;
-			this.password = password;
-			this.timeout = timeout;
-			this.cipherType = cipherType;
-			isPasswdAuth = true;
-		}
-		
-		/**
-		 * Constructor for public/private key based authentication
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 * @param cipherType Choose among the supported ciphers
-		 * @param timeout
-		 */
-		public SSHParameters(String hostname, int port, String user, String keyPath, String passphrase, 
-				String cipherType, int timeout) {
-			super();
-			this.hostname = hostname;
-			this.port = port;
-			this.user = user;
-			this.keyPath = keyPath;
-			this.passphrase = passphrase;
-			this.timeout = timeout;
-			this.cipherType = cipherType;
-			isPasswdAuth = false;
-		}
-		
-		/**
-		 * Constructor for public/private key based authentication assuming timeout = 0
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 */
-		public SSHParameters(String hostname, int port, String user, String keyPath, String passphrase) {
-			this(hostname, port, user, keyPath, passphrase, RemotetoolsPlugin.CIPHER_DEFAULT, 0);
-		}
-	}
-	
-	/**
-	 * The parameters used by the connection to the remote target environment.
-	 */
-	SSHParameters sshParameters;
-	
-	/**
-	 * Facility method that raises a SimulatorException with the last error detected from and observing thread.
-	 * @throws SimulatorException
-	 */
-	protected synchronized void throwPendingException() throws CoreException {
-		if (pendingException != null) {
-			throw pendingException;
-		}
-	}
-	
-	protected synchronized void notifyException(CoreException e) {
-		pendingException = e;
-	}
-
-	
-	/**
-	 * Add a new job listener.
-	 */
-	public synchronized void addJobListener(ITargetControlJobListener listener) {
-		jobListeners.add(listener);
-	}
-	
-	/**
-	 * Remove a job listener.
-	 */
-	public synchronized void removeJobListener(ITargetControlJobListener listener) {
-		jobListeners.remove(listener);
-	}
-
-	/**
-	 * Create a waiting job on the 
-	 */
-	public synchronized void startJob(ITargetJob job) throws CoreException {
-		if ((query() != ITargetStatus.PAUSED) &&(query() != ITargetStatus.RESUMED)) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0, "Target not ready to execute jobs", null));
-		}
-		TargetControlledJob controlledJob = new TargetControlledJob(this, job);
-		remoteJobs.put(job, controlledJob);
-		controlledJob.start();
-	}
-
-	protected synchronized void notifyStartingJob(ITargetJob job) {
-		/** Notify listeners. */
-		for (Iterator listenerIterator = jobListeners.iterator(); listenerIterator.hasNext();) {
-			ITargetControlJobListener listener = (ITargetControlJobListener) listenerIterator.next();
-			listener.beforeJobStart(job);
-		}
-		/** Guarantee that the target is operational. */
-		try {
-			resume(null);
-		} catch (CoreException e) {
-			// Ignore
-		}
-	}
-
-	protected synchronized void notifyFinishedJob(ITargetJob job) {
-		/** Notify listeners. */
-		for (Iterator listenerIterator = jobListeners.iterator(); listenerIterator.hasNext();) {
-			ITargetControlJobListener listener = (ITargetControlJobListener) listenerIterator.next();
-			listener.afterJobFinish(job);
-		}
-		/** Remove job from list of jobs. */
-		if (remoteJobs == null) {
-			/* The method may be called by pending jobs that were canceled while disconnecting. */
-			return;
-		}
-		remoteJobs.remove(job);
-	}
-
-
-	/**
-	 * Returns the number of jobs running on the remote host.
-	 */
-	public synchronized int getJobCount() {
-		return remoteJobs.size();
-	}
-
-	/**
-	 * Returns a list of jobs running on the remote target environment.
-	 */
-	public synchronized ITargetJob[] getJobs() {
-		ITargetJob[] array = new ITargetJob[remoteJobs.size()];
-		remoteJobs.keySet().toArray(array);
-		return array;
-	}
-	
-	/**
-	 * Set the connection parameters to be used by {@link #create(IProgressMonitor)}.
-	 * @param parameters
-	 */
-	protected synchronized void setConnectionParameters(SSHParameters parameters) {
-		this.sshParameters = parameters;
-	}
-
-	/**
-	 * Create the remote target environment by opening a SSH connection to it.
-	 * First, {@link #setConnectionParameters(org.eclipse.ptp.remotetools.environment.control.SSHTargetControl.SSHParameters)
-	 * must be called.
-	 */
-	public boolean create(IProgressMonitor monitor) throws CoreException {
-		Assert.isNotNull(sshParameters, "missing ssh parameters");
-		while (true) {
-			try {
-				if (monitor.isCanceled()) {
-					disconnect();
-					throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0, "Connection to target canceled", null));
-				}
-				connect();
-				if (monitor.isCanceled()) {
-					disconnect();
-					throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0, "Connection to target canceled", null));
-				}
-				return true;
-			} catch (RemoteConnectionException e) {
-				monitor.subTask("Failed: " + e.getMessage());
-				/*
-				 * Ignore failure, unfortunately, it is not possible to know the reason.
-				 */
-				disconnect();
-			}
-			
-			try {
-				Thread.sleep(2000);
-			} catch (InterruptedException e) {
-				disconnect();
-				throw new CoreException(new Status(IStatus.CANCEL, getPluginId(), 0, "Connection to target canceled", null));
-			}
-		}
-	}
-
-	/**
-	 * Create the SSH connection to the remote target environment.
-	 * First, {@link #setConnectionParameters(org.eclipse.ptp.remotetools.environment.control.SSHTargetControl.SSHParameters)}
-	 * must be called.
-	 * @throws RemoteConnectionException
-	 */
-	protected synchronized void connect() throws RemoteConnectionException {
-		Assert.isNotNull(sshParameters, "missing ssh parameters");
-		/*
-		 * Try to connect, else undo the connection.
-		 */
-		AuthToken authToken;
-		if(sshParameters.isPasswdAuth) {
-			authToken = new PasswdAuthToken(sshParameters.user, sshParameters.password);
-		} else {
-			authToken = new KeyAuthToken(sshParameters.user, new File(sshParameters.keyPath),
-										sshParameters.passphrase);
-		}
-		
-		try {
-			if (sshParameters.timeout <= 0) {
-				remoteConnection = RemotetoolsPlugin.createSSHConnection(authToken, sshParameters.hostname, sshParameters.port, 
-						sshParameters.cipherType);
-			} else {
-				remoteConnection = RemotetoolsPlugin.createSSHConnection(authToken, sshParameters.hostname, sshParameters.port, 
-						sshParameters.cipherType, sshParameters.timeout);
-			}
-			remoteConnection.connect();
-			remoteJobs = new HashMap();
-		} catch (RemoteConnectionException e) {
-			disconnect();
-			throw e;
-		}
-	}
-	
-	/**
-	 * Convert the value of the cipher from the SSHParameter to the value used in the RemoteTools
-	 * 
-	 * @param Constant value used by SSHParameters
-	 * @return Constant value used by RemoteTools
-	 */
-	/*public String convertCipherConstant(String sshParamCipherType) {
-		switch(sshParamCipherType) {
-		case SSHParameters.CIPHER_3DES:
-			return RemotetoolsPlugin.CipherTypes.CIPHER_3DES;
-		case SSHParameters.CIPHER_AES128:
-			return CipherTypes.CIPHER_AES128;
-		case SSHParameters.CIPHER_AES192:
-			return CipherTypes.CIPHER_AES192;
-		case SSHParameters.CIPHER_AES256:
-			return CipherTypes.CIPHER_AES256;
-		case SSHParameters.CIPHER_BLOWFISH:
-			return CipherTypes.CIPHER_BLOWFISH;
-		default:
-			return CipherTypes.CIPHER_DEFAULT;
-		}
-	}*/
-
-	/**
-	 * Returns the plugin ID.
-	 * @return
-	 */
-	protected abstract  String getPluginId();
-
-	/**
-	 * Destroy the remote target environment, by closing the SSH connection to it.
-	 */
-	public boolean kill(IProgressMonitor monitor) throws CoreException {
-		/*
-		 * Try to gracefully terminate all running jobs. Might this fail, then guarantee to disconnect.
-		 */
-		try {
-			terminateJobs(monitor);
-		} finally {
-			disconnect();
-		}
-		remoteConnection = null;
-		return true;
-	}
-
-	public boolean executeRemoteCommand(IProgressMonitor monitor, String command, String[] args) throws CoreException {
-		for (int i = 0; i < args.length; i++) {
-			command += (" " + args[i]);
-		}
-
-		try {
-			IRemoteExecutionManager executionManager = remoteConnection.createRemoteExecutionManager();
-			executionManager.getExecutionTools().executeWithExitValue(command);
-			executionManager.close();
-			return true;
-		} catch (RemoteConnectionException e) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-					"Failed to connect with remote target environment", e));
-		} catch (CancelException e) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-					"Cancelled execution on remote target environment", e));
-		} catch (RemoteExecutionException e) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-					"Failed to execute on remote target environment", e));
-		}
-	}
-	
-	/**
-	 * Informs how to connect to a socket that is being listened on the remote 
-	 * target environment. If necessary, create a tunnel that forwards the remote
-	 * port.
-	 * @return A {@link TargetSocket} object that encapsulates information
-	 * where to connect in order to connect to the remote tunnel.
-	 */
-	public TargetSocket createTargetSocket(int port) throws CoreException {
-		/*
-		 * Dummy implementation that assumes that the remote port is mapped
-		 * to the same local port. 
-		 */
-		TargetSocket test = new TargetSocket();
-		test.host = "localhost";
-		test.port = port;
-		return test;
-	}
-
-	/**
-	 * Checks if the connection to the remote target environment is alive.
-	 * @return
-	 */
-	protected boolean isConnected() {
-		return (remoteConnection != null) && (remoteConnection.isConnected());
-	}
-	
-//	public IRemoteConnection getConnection() {
-//		return remoteConnection;
-//	}
-
-	protected synchronized void terminateJobs(IProgressMonitor monitor) {
-		/*
-		 * Issue each job to terminate gracefully.
-		 */
-		Iterator iterator = remoteJobs.keySet().iterator();
-		while (iterator.hasNext()) {
-			ITargetJob job = (ITargetJob) iterator.next();
-			TargetControlledJob controlledJob = (TargetControlledJob) remoteJobs.get(job);
-			controlledJob.cancelExecution();
-		}
-		
-		/*
-		 * Wait until all jobs have terminated.
-		 */
-		while (getJobCount() > 0) {
-			try {
-				wait(500);
-			} catch (InterruptedException e) {
-				return;
-			}
-			if (monitor != null) {
-				if (monitor.isCanceled()) {
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Guarantees that the connection to the remote host is closed and releases
-	 * ressources allocated to the connection.
-	 */
-	protected synchronized void disconnect() {
-		/*
-		 * Any still running jobs will fail.
-		 */
-		if (remoteJobs != null) {
-			remoteJobs.clear();
-			remoteJobs = null;
-		}
-		if (remoteConnection != null) {
-			remoteConnection.disconnect();
-			remoteConnection = null;
-		}
-	}
-
-	/**
-	 * Create a remote execution manager that may be used to do operations on the remote target
-	 * environment.
-	 * @return
-	 * @throws RemoteConnectionException
-	 */
-	protected IRemoteExecutionManager createRemoteExecutionManager() throws RemoteConnectionException {
-		return remoteConnection.createRemoteExecutionManager();
-	}
-	
-	public IRemoteConnection getConnection() {
-		Assert.isTrue(false, "this method is not supported");
-		return remoteConnection;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java
deleted file mode 100755
index e1f6949..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-/**
- * Standard implementation of <code>ITargetControlledJob</code>.
- * @see ITargetControlledJob
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-class TargetControlledJob {
-	
-	protected static final int UNDEFINED = 0;
-	protected static final int RUNNING = 1;
-	protected static final int FINISHED = 2;
-	
-	JobRunner jobRunner;
-	IRemoteExecutionManager executionManager;
-	ITargetJob job;
-	SSHTargetControl targetControl;
-	int status = UNDEFINED;
-	
-	public TargetControlledJob(SSHTargetControl controller, ITargetJob job) throws CoreException {
-		super();
-		this.targetControl = controller;
-		this.job = job;
-		try {
-			this.executionManager = controller.createRemoteExecutionManager();
-		} catch (RemoteConnectionException e) {
-			CoreException ce = new CoreException(new Status(IStatus.ERROR,
-					EnvironmentPlugin.getUniqueIdentifier(), 0, e
-							.getLocalizedMessage(), e));
-			throw ce;
-		}
-		this.jobRunner = new JobRunner(this);
-	}
-
-	protected void start() {
-		jobRunner.start();
-	}
-	
-	protected class JobRunner extends Thread {
-		private TargetControlledJob controller;
-		
-		protected JobRunner(TargetControlledJob controller) {
-			this.controller = controller;
-		}
-		public void run() {
-			controller.targetControl.notifyStartingJob(job);
-			synchronized (controller) {
-				controller.status = RUNNING;
-			}
-			try {
-				job.run(controller.executionManager);
-			} finally {
-				synchronized (controller) {
-					controller.status = FINISHED;
-					controller.executionManager.close();
-					controller.targetControl.notifyFinishedJob(job);
-				}
-			}
-		}
-	}
-
-	public ITargetJob getJob() {
-		return job;
-	}
-
-	public synchronized boolean isFinished() {
-		return status == FINISHED;
-	}
-	
-	public synchronized void cancelExecution() {
-		if (status != FINISHED) {
-			executionManager.cancel();
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java
deleted file mode 100644
index b2aff4f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.ptp.remotetools.environment.extension.IChildrenProvider;
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-import org.eclipse.ptp.utils.core.extensionpoints.IProcessMemberVisitor;
-import org.eclipse.ptp.utils.core.extensionpoints.ProcessExtensions;
-
-/**
- * Manage a list of <code>IChildrenProvider</code> contributed by extensions
- * 
- * @author Hong Chang Lin
- * 
- */
-public class ChildrenProviderManager {
-
-    private final static String EXT_PROVIDER_ID = "org.eclipse.ptp.remotetools.environment.core.childrenProvider";
-
-    private List<IChildrenProvider> providers;
-
-    public ChildrenProviderManager() {
-        processChildrenProviders();
-    }
-
-    public INode[] getChildren(ITargetElement targetElement) {
-        List<INode> children = new ArrayList<INode>();
-        for (IChildrenProvider provider : providers) {
-            INode[] objs = provider.getChildren(targetElement);
-            for (int i = 0; i < objs.length; i++) {
-                children.add(objs[i]);
-            }
-        }
-
-        return children.toArray(new INode[0]);
-    }
-    
-    private void processChildrenProviders() {
-        providers = new ArrayList<IChildrenProvider>();
-        ProcessExtensions.process(EXT_PROVIDER_ID, new IProcessMemberVisitor() {
-
-            public Object process(IExtension extension,
-                    IConfigurationElement member) {
-                Object mprovider;
-                try {
-
-                    mprovider = member.createExecutableExtension("class"); //$NON-NLS-1$
-                    if (IChildrenProvider.class.isAssignableFrom(mprovider
-                            .getClass())) {
-                        providers.add((IChildrenProvider) mprovider); //$NON-NLS-1$
-                    }
-                } catch (CoreException e) {
-                    mprovider = null;
-                }
-
-                return mprovider;
-            }
-
-        });
-    }
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java
deleted file mode 100755
index e6ef41c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-
-
-public interface ITargetElement {
-
-	public abstract Map getAttributes();
-
-	public abstract void setAttributes(Map attributes);
-
-	public abstract String getName();
-
-	public abstract void setName(String name);
-
-	public abstract ITargetControl getControl() throws CoreException;
-
-	public abstract TargetTypeElement getType();
-
-	public abstract int getStatus();
-
-	public abstract String toString();
-
-	public abstract String getId();
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java
deleted file mode 100755
index 5f2ae1b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-/**
- * External status code definition for target generated events.
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public interface ITargetElementStatus {
-	
-	/**
-	 * The element has been successfully configured and is available (conected)
-	 * to the host machine.
-	 */
-	final public static int STARTED = 0;
-	
-	/**
-	 * The element is not conected to the host machine
-	 */
-	final public static int STOPPED = 1;
-	
-	/**
-	 * The element is in a state that allows applications to be run in it.
-	 */
-	final public static int RESUMED = 2;
-	
-	/**
-	 * The element is in a state that does not allow applications to be run in it,
-	 * although is conected (live) to the host machine.
-	 */
-	final public static int PAUSED  = 3;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java
deleted file mode 100755
index 070694a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-/**
- * Interface definition for targets' changes listerners.
- * Two kinds of events can occur:
- * <ul>
- * <il> Add: Element was added to the pool of targets
- * <il> Remove: Element was removed from the pool of targets
- * </ul>
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.2
- *
- */
-public interface ITargetEnvironmentEventListener {
-	
-	public static int ADDED = 0;
-	
-	public static int REMOVED = 1;
-	
-	/**
-	 * Notifies that an element has just been added to the model
-	 * 
-	 * @param element the added element
-	 */
-	public void elementAdded(TargetElement element);
-	
-	/**
-	 * Notifies that an element has just been removed from the model
-	 * 
-	 * @param element the lement being removed
-	 */
-	public void elementRemoved(ITargetElement element);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java
deleted file mode 100755
index e92b298..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-/**
- * Interface definition for targets' event listeners.
- * Events are fired when a target state changes.
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public interface ITargetEventListener {
-
-	/**
-	 * Notifies the listener that the event has occured.
-	 * 
-	 * @param event the event code as in org.eclipse.ptp.remotetools.environment.model.ITargetElementStatus
-	 * @param from the originating target element
-	 */
-	void handleStateChangeEvent(int event, ITargetElement from);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java
deleted file mode 100755
index 63d4fe8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-
-
-/**
- * 
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class TargetElement implements ITargetElement {
-
-	private TargetTypeElement type;
-	private Map attributes;
-	private String name;
-	private String id;
-	private ITargetControl control;
-	private int status = ITargetStatus.STOPPED;
-	private boolean dirty = false;
-	
-	public TargetElement(TargetTypeElement type, String id) {
-		super();
-		this.type = type;
-		this.id = id;
-	}
-	
-	public TargetElement(TargetTypeElement type, String name, Map attrs, String id) {
-		this(type, id);
-		this.attributes = attrs;
-		this.name = name;
-		this.type = type;
-	}
-	
-	public void update(Map attr) {
-		try {
-			ITargetControl ctrl = getControl();
-			if (attr == null) {
-				ctrl.updateConfiguration();
-			} else {
-				ctrl.updateConfiguration();
-			}
-			dirty = false;
-		} catch (CoreException e) {
-			dirty = true;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getAttributes()
-	 */
-	public Map getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#setAttributes(java.util.Map)
-	 */
-	public void setAttributes(Map attributes) {
-		this.attributes = attributes;
-		if (getStatus() == ITargetStatus.STOPPED) {
-			update(attributes);
-		} else 
-			dirty = true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#setName(java.lang.String)
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getControl()
-	 */
-	public ITargetControl getControl() throws CoreException {
-		if (control == null) {
-			control = type.getExtension().controlFactory(this);
-		}
-		return control;
-	}
-
-	public void setControl(ITargetControl control) {
-		this.control = control;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getType()
-	 */
-	public TargetTypeElement getType() {
-		return type;
-	}
-
-	public void setType(TargetTypeElement type) {
-		this.type = type;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getStatus()
-	 */
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-		if (status == ITargetStatus.STOPPED && dirty) {
-			update(getAttributes());
-			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#toString()
-	 */
-	public String toString() {
-		
-		return this.getName() != null ? this.getName() : super.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getId()
-	 */
-	public String getId() {
-		return id;
-	}
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java
deleted file mode 100755
index 6d70dc2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventListener;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProvider;
-import org.eclipse.ptp.remotetools.environment.control.PoolingTargetControlEventProvider;
-
-
-/**
- * Manager class to support different event provider per each 
- * target control instance.
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- *
- */
-public class TargetEnvironmentEventManager implements ITargetControlEventListener, ITargetEnvironmentEventListener {
-	
-	private TargetEnvironmentManager model = null;
-	private ITargetControlEventProvider defaultProvider = new PoolingTargetControlEventProvider();
-	private Map controls = new HashMap();
-	
-	/**
-	 * Constructor
-	 */
-	public TargetEnvironmentEventManager(TargetEnvironmentManager model) {
-		this.model = model;
-		model.addModelChangedListener(this);
-	}
-	
-
-	public void handleStateChangeEvent(int event, ITargetControl from) {
-		
-		ControlInfo info = (ControlInfo) controls.get(from);
-		model.fireElementEvent(event, info.getElement());
-		
-	}
-	
-	public void elementAdded(TargetElement element) {
-		
-		try {
-			ITargetControl control = element.getControl();
-			ITargetControlEventProvider provider = null;
-			
-			if(IAdaptable.class.isAssignableFrom(control.getClass())) {
-				provider = (ITargetControlEventProvider) ((IAdaptable)control).getAdapter(ITargetControlEventProvider.class);
-			}
-			
-			if (provider == null) {
-				provider = defaultProvider;
-			}
-			
-			controls.put(control, new ControlInfo(element,provider));
-			provider.registerControlAndListener(control,this);
-			
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		
-	}
-
-
-	public void elementRemoved(ITargetElement element) {
-		
-		try {
-			
-			ITargetControl control = element.getControl();
-			ControlInfo info = (ControlInfo) controls.get(control);
-			ITargetControlEventProvider provider = info.getProvider();
-			provider.unregisterControlAndListener(control,this);
-			controls.remove(control);
-			
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-	}
-	
-	class ControlInfo {
-		
-		private TargetElement element;
-		private ITargetControlEventProvider provider;
-		
-		public ControlInfo(TargetElement element, ITargetControlEventProvider provider) {
-			this.element = element;
-			this.provider = provider;
-		}
-		
-		public TargetElement getElement() {
-			return element;
-		}
-		
-		public void setElement(TargetElement element) {
-			this.element = element;
-		}
-		
-		public ITargetControlEventProvider getProvider() {
-			return provider;
-		}
-		
-		public void setProvider(ITargetControlEventProvider provider) {
-			this.provider = provider;
-		}
-		
-	}
-
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java
deleted file mode 100755
index 519218d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java
+++ /dev/null

@@ -1,424 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.XMLMemento;
-
-/**
- * Class responsible for managing all Targets available. Its managing tasks consist on:
- * <ul>
- * <li> Read/write targets information from/to disk (sensitive data is written to a secure container)
- * <li> Keep a list of all target types elements based on extension point information. Each target type can reference a list of target elements
- * <li> Insert/remove listeners for targets events.
- * <li> Fire events for the listeners
- * <li> Provides getters for configs
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public class TargetEnvironmentManager {
-
-	private static String ENVIRONMENTS = "Environments";
-	private static String ENVIRONMENTS_TYPE = "Type";
-	private static String ENVIRONMENTS_TYPE_NAME = "Name";
-	private static String ENVIRONMENTS_TYPE_CONFIG = "Configuration";
-	private static String ENVIRONMENTS_TYPE_CONFIG_NAME = "CfgName";
-	
-	private List targetTypeElements;
-	private List eventListeners = new ArrayList();
-	private List modelChangedListeners = new ArrayList();
-	
-	private TargetEnvironmentEventManager manager;
-	
-	private Map storedCypherEnvToKeyMap;
-	
-	public TargetEnvironmentManager() {
-		
-		super();
-		Map targets = EnvironmentPlugin.getDefault().getControls();
-		targetTypeElements = new ArrayList();
-		manager = new TargetEnvironmentEventManager(this);
-		
-		URL pluginURL = EnvironmentPlugin.getDefault().getBundle().getEntry("/");
-		Map cypherEnvTypeMap = Platform.getAuthorizationInfo(pluginURL, "", "");
-		
-		// Create a map that contains (environment type name, cipher key set) tuples
-		 storedCypherEnvToKeyMap = new HashMap();
-			
-		File file = EnvironmentPlugin.getDefault().getStateLocation().append(EnvironmentPlugin.FILENAME).toFile();
-		XMLMemento memento;
-		try {		
-			if (!file.exists()) file.createNewFile();
-			FileReader reader = new FileReader(file);
-			try {
-				memento = XMLMemento.createReadRoot(reader);
-				targets = initContentFromFile(memento,targets,cypherEnvTypeMap);
-			}
-			catch (WorkbenchException exc) {
-				memento = XMLMemento.createWriteRoot(ENVIRONMENTS);
-			}
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		Iterator keys = targets.keySet().iterator();
-		Set cipherKeySet = new HashSet();
-		while (keys.hasNext()) {
-			String name = (String)keys.next();
-			ITargetTypeExtension env = (ITargetTypeExtension) targets.get(name);
-			targetTypeElements.add(new TargetTypeElement(name,env,this));
-			
-			// Also save the ciphered key names
-			// Get cryptographed keys
-			String [] controlKeysCypher = env.getControlAttributeNamesForCipheredKeys();
-			
-			// Add all key names to the set
-			if(controlKeysCypher != null) {
-				List keyList = Arrays.asList(controlKeysCypher);
-				cipherKeySet.addAll(keyList);
-			}
-			
-//			 Add set to the map (save it)
-			storedCypherEnvToKeyMap.put(name, cipherKeySet);
-		}
-		
-	}
-	
-	public Map initContentFromFile(XMLMemento memento,Map targets, Map cypherEnvTypeMap) {
-		
-		IMemento[] children = memento.getChildren(ENVIRONMENTS_TYPE);
-		for (int i = 0; i < children.length; i++) {
-			String name = children[i].getString(ENVIRONMENTS_TYPE_NAME);
-			ITargetTypeExtension env = (ITargetTypeExtension) targets.get(name);
-			// Get config name map from the given type name.
-			Map cypherConfigNameMap = null;
-			// Set null if the parent map is null.
-			if(cypherEnvTypeMap != null) cypherConfigNameMap = (Map)cypherEnvTypeMap.get(name);
-			if (env != null) {
-//				 Create cipher key set that will contain the name of the keys that are ciphered
-				Set cipherKeySet = new HashSet();
-				
-//				 Get cryptographed keys
-				String [] controlKeysCypher = env.getControlAttributeNamesForCipheredKeys();
-				
-				// Add all key names to the set
-				if(controlKeysCypher != null) {
-					List keyList = Arrays.asList(controlKeysCypher);
-					cipherKeySet.addAll(keyList);
-				}
-				
-//				 Add set to the map
-				storedCypherEnvToKeyMap.put(name, cipherKeySet);
-				
-				TargetTypeElement typeElement = new TargetTypeElement(name,env,this);
-				IMemento[] childrenElements = children[i].getChildren(ENVIRONMENTS_TYPE_CONFIG);
-				for (int j = 0; j < childrenElements.length; j++) {
-					String nameElement = childrenElements[j].getString(ENVIRONMENTS_TYPE_CONFIG_NAME);
-					
-					Map attrsElement = new HashMap();
-					String[] controlKeys = env.getControlAttributeNames();
-					for (int k = 0; k < controlKeys.length; k++) {
-						attrsElement.put(controlKeys[k],childrenElements[j].getString(controlKeys[k]));
-					}
-					
-					// Get password key map from the given configuration name
-					Map cypherPasswdKeyMap = null;
-					// Set null if the parent map is null
-					if(cypherConfigNameMap != null) cypherPasswdKeyMap = (Map)cypherConfigNameMap.get(nameElement);
-					
-					if(controlKeysCypher != null) {
-						for(int k=0; k < controlKeysCypher.length; k++) {
-							// Insert into key into the hash set to f
-	//						// Get the passwords or set them to empty string, if map not available.
-							if(cypherPasswdKeyMap == null) {
-								attrsElement.put(controlKeysCypher[k], "");
-							} else {
-								attrsElement.put(controlKeysCypher[k], cypherPasswdKeyMap.get(controlKeysCypher[k]));
-							}
-							// Include key name in the set
-							cipherKeySet.add(controlKeysCypher[k]);
-						}
-					}
-					
-					// Finally insert the identifier of the environment
-					// Create it, if necessary.
-					String id;
-					if(childrenElements[j].getString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID) == null) {
-						id = EnvironmentPlugin.getDefault().getEnvironmentUniqueID();
-						/*attrsElement.put(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID, 
-								EnvironmentPlugin.getDefault().getEnvironmentUniqueID());*/
-					} else {
-						id = childrenElements[j].getString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID);
-						/*attrsElement.put(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID, 
-							childrenElements[j].getString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID));*/
-					}
-					
-					typeElement.addElement(new TargetElement(typeElement,nameElement,attrsElement, id));
-				}
-				
-				targetTypeElements.add(typeElement);
-				targets.remove(name);
-			}
-		}
-		
-		return targets;
-		
-	}
-	
-	public void writeToFile() {
-		
-		// Create new ciphered Environment type map
-		Map cypherEnvTypeMap = new HashMap();
-		
-		File file = EnvironmentPlugin.getDefault().getStateLocation().append(EnvironmentPlugin.FILENAME).toFile();
-		Iterator iterator = targetTypeElements.iterator();
-		XMLMemento memento = XMLMemento.createWriteRoot(ENVIRONMENTS);		
-		while (iterator.hasNext()) {
-			TargetTypeElement type = ((TargetTypeElement)iterator.next());
-		    IMemento typeMemento = memento.createChild(ENVIRONMENTS_TYPE);
-		    typeMemento.putString(ENVIRONMENTS_TYPE_NAME, type.getName());
-			
-		    // Create new ciphered configuration map
-		    Map cypherConfigNameMap = new HashMap();
-		    
-		    // Get set of ciphered keys for this environment type name
-		    Set cypherKeySet = (Set)storedCypherEnvToKeyMap.get(type.getName());
-		    
-			Iterator elements = type.getElements().iterator();
-			while (elements.hasNext()) {
-				ITargetElement element = (ITargetElement) elements.next();
-				IMemento elementMemento = typeMemento.createChild(ENVIRONMENTS_TYPE_CONFIG);
-				elementMemento.putString(ENVIRONMENTS_TYPE_CONFIG_NAME,element.getName());
-				
-				Map elementAttr = element.getAttributes();
-				
-				// Create new ciphered password key map
-				Map cypherPasswdKeyMap = new HashMap();
-				
-				Iterator attrKeys = elementAttr.keySet().iterator();
-				while (attrKeys.hasNext()) {
-					String key = (String) attrKeys.next();
-					
-					// If is ciphered put it as a value to the ciphered password key map
-					if(cypherKeySet.contains(key)) {
-						cypherPasswdKeyMap.put(key, (String) elementAttr.get(key));
-					} else {
-						elementMemento.putString(key,(String) elementAttr.get(key));
-					}
-				}
-				
-				// Save the Target id from the Target Element.
-				elementMemento.putString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID,
-						element.getId());
-			
-				// Fill ciphered configuration map with (configuration name, ciph passwd key map) tuples
-				cypherConfigNameMap.put(element.getName(), cypherPasswdKeyMap);
-			}
-			// Fill ciphered environment type map with (environment type name, ciph config map) tuples
-			cypherEnvTypeMap.put(type.getName(), cypherConfigNameMap);
-		}
-		
-		URL pluginURL = EnvironmentPlugin.getDefault().getBundle().getEntry("/");
-		try {
-			Platform.addAuthorizationInfo(pluginURL, "", "", cypherEnvTypeMap);
-		} catch (CoreException e1) {
-			// Generates a runtime exception containing the CoreException
-			throw new RuntimeException(e1);
-		}
-		
-		Writer writer;
-		try {
-			writer = new FileWriter(file);
-			memento.save(writer);
-		} catch (IOException e) {
-			// This should not happen. Throw a runtime exception
-			throw new RuntimeException(e);
-		}
-		
-	}
-
-	public List getTypeElements() {
-		return targetTypeElements;
-	}
-	
-	public synchronized ITargetElement[] getConfigElements() {
-		List rsp = new ArrayList();
-		Iterator i = targetTypeElements.iterator();
-		while (i.hasNext()) {
-			rsp.addAll( ((TargetTypeElement)i.next()).getElements() );
-		}
-		
-		ITargetElement[] rspObj = null;
-		
-		if (rsp.size() > 0) {
-			rspObj = (ITargetElement[])rsp.toArray(new ITargetElement[]{});
-		}
-		return rspObj;
-		
-	}
-	
-	/**
-	 * Registers a model event listener. If the listener argument is null or already registered, this 
-	 * method has no effect.
-	 */
-	
-	public synchronized void addModelEventListener (ITargetEventListener listener)
-	{
-		if (listener != null && !eventListeners.contains (listener))
-		{
-			eventListeners.add (listener);
-		}
-	}
-	
-	/**
-	 * De-registers a model event listener. If the listener argument is null or not already registered, this 
-	 * method has no effect.
-	 */
-
-	public synchronized void removeModelEventListener (ITargetEventListener listener)
-	{
-		if (listener != null && eventListeners.contains(listener))
-		{
-			eventListeners.remove (listener);
-		}
-	}
-	
-	/**
-	 * Registers a model changed listener. If the listener argument is null or already registered, this 
-	 * method has no effect.
-	 */
-	
-	public synchronized void addModelChangedListener (ITargetEnvironmentEventListener listener)
-	{
-		if (listener != null && !modelChangedListeners.contains (listener))
-		{
-			modelChangedListeners.add (listener);
-		}
-	}
-	
-	/**
-	 * De-registers a model changed listener. If the listener argument is null or not already registered, this 
-	 * method has no effect.
-	 */
-
-	public synchronized void removeModelChangedListener (ITargetEnvironmentEventListener listener)
-	{
-		if (listener != null && modelChangedListeners.contains(listener))
-		{
-			modelChangedListeners.remove (listener);
-		}
-	}
-
-	public void fireModelChanged(int action,ITargetElement oldElement,TargetElement newElement) {
-		
-		Iterator i = modelChangedListeners.iterator();
-		
-		if (oldElement == null && newElement != null) {
-			while (i.hasNext()) {
-				ITargetEnvironmentEventListener listener = (ITargetEnvironmentEventListener) i.next();
-				listener.elementAdded(newElement);
-			}
-		} else if (oldElement != null && newElement == null) {
-			while (i.hasNext()) {
-				ITargetEnvironmentEventListener listener = (ITargetEnvironmentEventListener) i.next();
-				listener.elementRemoved(oldElement);
-			}
-		}
-		
-	}
-	
-	public synchronized void fireElementEvent(int event,TargetElement element) {
-
-		int status = ITargetElementStatus.STOPPED;
-		switch (event) {
-			case ITargetStatus.STARTED:
-				status = ITargetElementStatus.STARTED;
-				break;
-			case ITargetStatus.STOPPED:
-				status = ITargetElementStatus.STOPPED;
-				break;
-			case ITargetStatus.RESUMED:
-				status = ITargetElementStatus.RESUMED;
-				break;
-			case ITargetStatus.PAUSED:
-				status = ITargetElementStatus.PAUSED;
-				break;
-		}
-		element.setStatus(status);
-		
-		Iterator i = eventListeners.iterator();
-		while (i.hasNext()) {
-			ITargetEventListener listener = (ITargetEventListener) i.next();
-			listener.handleStateChangeEvent(status, element);
-		}
-		
-	}
-	
-	// Implementation of methods from the ITargetProvider
-	
-	public ITargetControl selectControl(String id) {
-		ITargetElement[] elements = getConfigElements();
-		if (elements != null) {
-			for (int i = 0; i < elements.length; i++)
-			{
-				ITargetElement element = elements [i];
-				if (element.getName().equals(id)) {
-					try {
-						return element.getControl();
-					} catch (CoreException e) {
-						
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public String[] getAllConfigNames() {
-		ITargetElement[] elements = getConfigElements();
-		List names = new ArrayList();
-		if (elements != null) {
-			for (int i = 0; i < elements.length; i++)
-			{
-				ITargetElement element = elements [i];
-				names.add(element.getName());
-			}
-		}
-		
-		return (String[]) names.toArray(new String[]{});
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java
deleted file mode 100755
index fe5af53..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class TargetTypeElement {
-
-	private String name;
-	private TargetEnvironmentManager manager;
-	private ITargetTypeExtension extension;
-	private List elements;
-	
-	public TargetTypeElement(String name,ITargetTypeExtension env,TargetEnvironmentManager model) {
-		super();
-		this.name = name;
-		this.extension = env;
-		this.elements = new ArrayList();
-		this.manager = model;
-		
-	}
-
-	public List getElements() {
-		return elements;
-	}
-
-	public void addElement(TargetElement element) {
-		this.elements.add(element);
-		manager.fireModelChanged(ITargetEnvironmentEventListener.ADDED, null, element);
-	}
-	
-	public void removeElement(ITargetElement element) {
-		this.elements.remove(element);
-		manager.fireModelChanged(ITargetEnvironmentEventListener.REMOVED, element, null);
-	}
-
-	public ITargetTypeExtension getExtension() {
-		return extension;
-	}
-
-	public void setExtension(ITargetTypeExtension extension) {
-		this.extension = extension;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String toString() {
-		
-		return this.getName() != null ? this.getName() : super.toString();
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java
deleted file mode 100644
index dcd2170..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.extension;
-
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-
-/**
- * The interface to manage the children hierarchies of a target element
- * 
- * @author Hong Chang Lin
- * 
- */
-public interface IChildrenProvider {
-
-    /**
-     * Return all the child objects of an ITargetElement
-     * 
-     * @param
-     * @return
-     */
-    public INode[] getChildren(ITargetElement targetElement);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java
deleted file mode 100644
index 764cc74..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.extension;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Represents the children of the ITargetElement's children on
- * RemoteToolsEnvironmentView
- * 
- * @author Hong Chang Lin
- * 
- */
-public interface INode {
-
-    /**
-     * @return all the children element
-     */
-    public INode[] getChildren();
-
-    /**
-     * @return the parent element
-     */
-    public Object getParent();
-
-    /**
-     * @return the display icon
-     */
-    public Image getIcon();
-
-    /**
-     * @return the display name
-     */
-    public String getDisplayText();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java
deleted file mode 100755
index 4f9ef9e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.extension;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-
-
-
-/**
- * Provides an interface that is an extension of a target type. This extension
- * must be implemented by each plugin that extends the 
- * Environment Control Delegate extension point, in order to define
- * a new target type. 
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public interface ITargetTypeExtension {
-	
-	/**
-	 * Given the attributes, produces a fresh new control instance.
-	 * @param element TODO
-	 * 
-	 * @return the control instance
-	 */
-	ITargetControl controlFactory(ITargetElement element) throws CoreException;
-	
-	/**
-	 * Provides an array with all the attributes' name needed by the
-	 * associated controlFactory. Only non-ciphered attributes are listed here.
-	 * 
-	 * @return an array of attributes' name
-	 */
-	String[] getControlAttributeNames();
-	
-	/**
-	 * Provides a Dialog Page to edit the associated control's
-	 * attributes
-	 * This should be used to edit an existent target environment
-	 * 
-	 * @param attributes the attributes' map. May be null in the case of a new configuration.
-	 * @param name the configuration's key name. May be null in the case of a new configuration.
-	 * @return an wizard page
-	 */
-	AbstractEnvironmentDialogPage dialogPageFactory(ITargetElement targetElement);
-	
-	/**
-	 * Provides a Dialog Page to edit the associated control's
-	 * attributes
-	 * This should be used when a new Target Environment is created
-	 * 
-	 * @return an wizard page
-	 */
-	AbstractEnvironmentDialogPage dialogPageFactory();
-
-	/**
-	 * Provides an array with all the attributes' name needed by the
-	 * associated controlFactory. Only ciphered attributes are listed here.
-	 * 
-	 * @return an array of attributes' name
-	 */
-	String[] getControlAttributeNamesForCipheredKeys();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java
deleted file mode 100755
index ddb1cf8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.extension;
-
-/**
- * Interface that provides support for resolution
- * of variables on each environment type. This interface must
- * be implemented by each plugin that extends the 
- * <extension point name here> extension point
- * 
- * @author Richard Maciel
- *
- */
-public interface ITargetVariables {
-	public String getSystemWorkspace();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java
deleted file mode 100755
index d7b1918..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.wizard;
-
-import java.util.Map;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public abstract class AbstractEnvironmentDialogPage extends WizardPage {
-
-	public AbstractEnvironmentDialogPage(String pageName) {
-		super(pageName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	abstract public void createControl(Composite parent);
-
-	final public boolean canFinish() {
-		String name = getName();
-		if (name != null) {
-			if (!name.equals("")) {  //$NON-NLS-1$
-				return isValid();
-			}
-
-		}
-		return false;
-	}
-
-	/**
-	 * Should return the configuration's map derived from populating this own
-	 * page. null is not allowed.
-	 * 
-	 * @return the configuration attributes map
-	 */
-	abstract public Map getAttributes();
-
-	/**
-	 * Provides this configuration instance key name.
-	 * 
-	 * @returns the configuration's name
-	 */
-	abstract public String getName();
-
-	/**
-	 * Returns weather this current page information represents a valid state of
-	 * configuration.
-	 * 
-	 * @return true if valid, false otherwise.
-	 */
-	abstract public boolean isValid();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java
deleted file mode 100755
index efe828d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.wizard;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.3
- */
-public class DialogMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.wizard.DialogMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private DialogMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties
deleted file mode 100755
index fb552b5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-###############################################################################
-
-EnvironmentWizard.0=Target Environment Configuration
-EnvironmentWizard.1=Configuration name already exists
-EnvironmentWizard.2=Invalid configuration name

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java
deleted file mode 100755
index 10ecc9e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.wizard;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class EnvironmentWizard extends Wizard {
-
-	TargetTypeElement typeElement;
-	ITargetElement targetElement;
-	String originalKey = ""; //$NON-NLS-1$
-	boolean cancel = false;
-	/**
-	 * 
-	 */
-	public EnvironmentWizard(TargetTypeElement element) {
-		super();
-		this.typeElement = element;
-	}
-	
-	public EnvironmentWizard(ITargetElement element) {
-		super();
-		this.typeElement = element.getType();
-		this.targetElement = element;
-	}
-	
-	/**
-	 * 
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
-	public void addPages() {
-		super.addPages();
-		this.setWindowTitle(DialogMessages.getString("EnvironmentWizard.0")); //$NON-NLS-1$
-		//Map attributes = null;
-		if (targetElement != null) {
-			//attributes =  new HashMap(targetElement.getAttributes());
-			originalKey = targetElement.getName();
-		}
-		//AbstractEnvironmentDialogPage page = typeElement.getExtension().dialogPageFactory(attributes,originalKey);
-		AbstractEnvironmentDialogPage page;
-		if(targetElement != null) {
-			page = typeElement.getExtension().dialogPageFactory(targetElement);
-		} else {
-			page = typeElement.getExtension().dialogPageFactory();
-		}
-		addPage(page);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		if (!cancel) {
-			AbstractEnvironmentDialogPage page = ((AbstractEnvironmentDialogPage)getStartingPage());
-			Map attributes = page.getAttributes();
-			
-			if (attributes == null)
-				return false;
-			
-			if (targetElement == null) {
-				String id = EnvironmentPlugin.getDefault().getEnvironmentUniqueID();
-				typeElement.addElement(new TargetElement(typeElement,page.getName(),attributes, id));
-			} else {
-				targetElement.setAttributes(attributes);
-				targetElement.setName(page.getName());
-			}
-		}
-		return true;
-	}
-	
-	public boolean performCancel() {
-		this.cancel = true;
-        return true;
-    }
-	
-	/** 
-	 * 
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	public boolean canFinish() {
-		
-		AbstractEnvironmentDialogPage page = ((AbstractEnvironmentDialogPage)getStartingPage());
-		page.setErrorMessage(null);
-		if (!page.getName().equals(originalKey)) {
-			if (page.getName() != null) {
-				if (!(EnvironmentPlugin.getDefault().getTargetsManager().selectControl(
-						page.getName() ) == null)) {
-					page.setErrorMessage(DialogMessages.getString("EnvironmentWizard.1")); //$NON-NLS-1$
-					return false;
-				} 
-			} else {
-				page.setErrorMessage(DialogMessages.getString("EnvironmentWizard.2")); //$NON-NLS-1$
-				return false;
-			}
-		}
-		
-		return page.canFinish();
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java
deleted file mode 100644
index 35b48c0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java
+++ /dev/null

@@ -1,294 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.verification;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.URIUtil;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-
-public class AttributeVerification {
-	
-	public static IStatus createStatus(String pluginID, Throwable e, int severity,
-			String attributeName, String message, String value) {
-		if (value == null) {
-			value = Messages.AttributeVerification_NoValue;
-		}
-		String errorMessage = NLS.bind(Messages.AttributeVerification_ErrorMessage, new String[] { attributeName, message, value});
-		return new Status(IStatus.ERROR, pluginID, 0,
-				errorMessage, e);
-	}
-	
-	/**
-	 * Generic convenience method for raising core exception for errors.
-	 * 
-	 * @param pluginID
-	 *            see CoreException
-	 * @param e
-	 *            see CoreException
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 */
-	public static void throwAttributeException(String pluginID, Throwable e,
-			String attributeName, String message, String value)
-			throws CoreException {
-		throw new CoreException(createStatus(pluginID, e, IStatus.ERROR, attributeName, message, value));
-	}
-
-	/**
-	 * Generic convenience method for raising core exception for errors.
-	 * 
-	 * @param pluginID
-	 *            see CoreException
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 */
-	public static void throwAttributeException(String pluginID,
-			String attributeName, String message, String value)
-			throws CoreException {
-		throwAttributeException(pluginID, (Throwable) null, attributeName,
-				message, value);
-	}
-
-	String pluginID = null;
-
-	public AttributeVerification(String pluginID) {
-		super();
-		this.pluginID = pluginID;
-	}
-
-	/**
-	 * Throws a CoreException for the plug-in associated with this instance of
-	 * AttributeVerification.
-	 * 
-	 * @param e
-	 *            see CoreException
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 *             see CoreException
-	 */
-	public void throwAttributeException(Throwable e,
-			String attributeName, String message, String value)
-			throws CoreException {
-		if (value == null) {
-			value = Messages.AttributeVerification_NoValue;
-		}
-		String errorMessage = NLS.bind(Messages.AttributeVerification_ErrorMessage, new String[] { attributeName, message, value});
-		throw new CoreException(new Status(IStatus.ERROR, pluginID, 0,
-				errorMessage, e));
-	}
-
-	/**
-	 * Throws a CoreException for the plug-in associated with this instance of
-	 * AttributeVerification.
-	 * 
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 *             see CoreException
-	 */
-	public void throwAttributeException(String attributeName, String message, String value) throws CoreException {
-		throwAttributeException((Throwable)null, attributeName, message, value);
-	}
-
-	/**
-	 * If the string represents a valid parsable path, returns this path.
-	 * @param attributeName Name of the attribute
-	 * @param stringValue String that represents the path
-	 * @param pathType Class used to create path
-	 * @return The path represented by the string
-	 * @throws CoreException
-	 */
-	public IPath verifyPath(String attributeName, String stringValue) throws CoreException {
-		IPath path = new Path(stringValue);
-		
-		// Verify path
-		// Very strange design for IPath interface for testing validity.
-		if (! path.isValidPath(stringValue)) {
-			throwAttributeException(attributeName, Messages.AttributeVerification_InvalidPath, stringValue);
-		}
-		
-		return path;
-	}
-	
-	public static final int EXIST = 1;
-	public static final int WRITEABLE = 2;
-	public static final int DIRECTORY = 4;
-	public static final int EXECUTABLE = 8;
-	public static final int FILE = 16;
-	public static final int EXISTING_FILE = EXIST | FILE;
-	public static final int EXISTING_EXECUTABLE = EXIST | FILE | EXECUTABLE;
-	public static final int EXISTING_DIRECTORY = EXIST | DIRECTORY;
-	
-	public IStatus checkPath(String attributeName, IPath path) {
-		return checkPath(attributeName, path, IStatus.ERROR, EXIST);
-	}
-			
-	public IStatus checkPath(String attributeName, IPath path, int severity) {
-		return checkPath(attributeName, path, severity, EXIST);
-	}
-	
-	public IStatus checkPath(String attributeName, IPath path, int severity, int options) {
-		/*
-		 * Path must be absolute for safe check, if not, would check against
-		 * some unknown current working directory.
-		 */
-		if (! path.isAbsolute()) {
-			return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_NotAnAbsolutePath, path.toOSString());
-		}
-
-		URI uri = URIUtil.toURI(path);
-		IFileStore file;
-		try {
-			file = EFS.getStore(uri);
-		} catch (CoreException e) {
-			return e.getStatus();
-		}
-		
-		IFileInfo info = file.fetchInfo();
-		
-		if ((options & EXIST) != 0) {
-			if (! info.exists()) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathDoesNotExist, path.toOSString());
-			}
-		}
-		
-		if ((options & DIRECTORY) != 0) {
-			if (! info.isDirectory()) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotDir, path.toOSString());			
-			}
-		}
-
-		if ((options & EXECUTABLE) != 0) {
-			/*
-			 * On PPC, it is known that the EFS.ATTRIBUTE_EXECUTABLE is never set,
-			 * event if the path is an executable fiel.
-			 */
-			if (Platform.getOSArch().equals(Platform.ARCH_PPC)) {
-				// Simple ignore and assume it is an executable.
-			} else {
-				if (! info.getAttribute(EFS.ATTRIBUTE_EXECUTABLE)) {
-					return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotExecutableFile, path.toOSString());
-				}
-			}
-		}
-
-		if ((options & WRITEABLE) != 0) {
-			if (info.getAttribute(EFS.ATTRIBUTE_READ_ONLY)) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotWritable, path.toOSString());
-			}
-		}
-		
-		if ((options & FILE) != 0) {
-			if (info.isDirectory()) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotFile, path.toOSString());
-			}
-		}
-		
-		return null;
-	}
-	
-	public IPath verifyPluginRelativePath(String attributeName, Plugin plugin, IPath path) throws CoreException {
-		if (path.isAbsolute()) {
-			return path;
-		} else {
-			URL url = FileLocator.find(plugin.getBundle(), path, null);
-			if (url == null) {
-				throwAttributeException(attributeName, Messages.AttributeVerification_PathNotFound, path.toOSString());
-			}
-			try {
-				url = FileLocator.resolve(url);
-				URI uri = new URI(url.toString());
-				File file = new File(uri);
-				return new Path(file.getAbsolutePath());
-			} catch (IOException e1) {
-				throwAttributeException(attributeName, Messages.AttributeVerification_PathNotFound, path.toOSString());
-			} catch (URISyntaxException e) {
-				throwAttributeException(attributeName, Messages.AttributeVerification_MustBeLocalFile, path.toOSString());
-			}
-		}
-		return null;
-	}
-	
-//	public IPath verifyWorkspaceRelativePath(String attributeName, Plugin plugin, IPath path) {
-//		// TODO: Implement
-//
-//	}
-
-	public IStatus createResultStatus(List errors) {
-		/*
-		 * Remove null elements from list.
-		 */
-		List oldList = errors;
-		errors = new ArrayList();
-		Iterator iterator = oldList.iterator(); 
-		while (iterator.hasNext()) {
-			Object object = iterator.next();
-			if (object != null) {
-				errors.add(object);
-			}
-		}
-	
-		if (errors.isEmpty()) {
-			return new Status(IStatus.OK, pluginID, 0, Messages.AttributeVerification_ConfigurationOK, null);
-		} else {
-			/*
-			 * TODO: make code better, without iterator
-			 */ 
-			MultiStatus result = new MultiStatus(pluginID, 0, Messages.AttributeVerification_InvalidConfiguration, null);
-			Iterator iterator2 = errors.iterator(); 
-			while (iterator2.hasNext()) {
-				IStatus object = (IStatus) iterator2.next();
-				result.add(object);
-			}
-			return result;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java
deleted file mode 100644
index 78c53a6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java
+++ /dev/null

@@ -1,365 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.verification;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-public class ControlAttributes implements Cloneable {
-
-	Map currentMap = null;
-
-	Map defaultMap = null;
-
-	/** Create an instance without default values. */
-	public ControlAttributes(Map config) {
-		super();
-		this.currentMap = config;
-		this.defaultMap = new HashMap();
-	}
-
-	/** Create an instance with default values. */
-	public ControlAttributes(Map currentMap, Map defaultMap) {
-		super();
-		this.currentMap = currentMap;
-		this.defaultMap = defaultMap;
-	}
-
-	/** Return the current value of an attribute, if available. */
-	private String getCurrent(String attributeName) {
-		if (currentMap == null) {
-			return null;
-		}
-		return (String) currentMap.get(attributeName);
-	}
-
-	/** Return the default value of an attribute, if available. */
-	private String getDefault(String attributeName) {
-		if (defaultMap == null) {
-			return null;
-		}
-		return (String) defaultMap.get(attributeName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() throws CloneNotSupportedException {
-		ControlAttributes newObject = new ControlAttributes(null);
-		if (currentMap != null) {
-			newObject.currentMap = new HashMap(currentMap);
-		}
-		if (defaultMap != null) {
-			newObject.defaultMap = new HashMap(defaultMap);
-		}
-		return newObject;
-	}
-
-	/***************************************************************************
-	 * Safe GETTERS The safe getters return the current value, if available and
-	 * parseable. Otherwise, return the default value, if available and
-	 * parseable. Otherwise, return some hard-coded fallback value. If the
-	 * current value cannot be parsed, no exception is thrown, but the default
-	 * value is used.
-	 **************************************************************************/
-	/**
-	 * Get the attribute as string. If not available or not parseable, get
-	 * default. If default not available, get <code>null</code>.
-	 */
-	public String getAttributeOrDefault(String attributeName) {
-		String value = getCurrent(attributeName);
-		if (value == null) {
-			return getDefault(attributeName);
-		} else {
-			return value;
-		}
-	}
-
-	/**
-	 * Get the attribute as string. If not available or not parseable, get
-	 * default. If default not available or not parseable, get empty string.
-	 */
-	public String getString(String attributeKey) {
-		return getString(attributeKey, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the attribute as string. If not available or not parseable, get
-	 * default. If default not available or not parseable, get parameter default
-	 * value.
-	 */
-	public String getString(String attributeKey, String defaultValue) {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null)
-			return defaultValue;
-		return stringValue;
-	}
-
-	/**
-	 * Get the attribute as text (multi line string). If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * empty string.
-	 */
-	public String getText(String attributeKey) {
-		return getText(attributeKey, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the attribute as text (multi line string). If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public String getText(String attributeKey, String defaultValue) {
-		String textValue = getAttributeOrDefault(attributeKey);
-		if (textValue == null)
-			textValue = defaultValue;
-		textValue = textValue.replaceAll("\\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		textValue = textValue.replaceAll("\\\\", "\\"); //$NON-NLS-1$ //$NON-NLS-2$
-		return textValue;
-	}
-
-	/**
-	 * Get the attribute as boolean. If not available or not parseable, get
-	 * default. If default not available or not parseable, get false.
-	 */
-	public boolean getBoolean(String attributeKey) {
-		return getBoolean(attributeKey, false);
-	}
-
-	/**
-	 * Get the attribute as boolean. If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public boolean getBoolean(String attributeKey, boolean defaultValue) {
-		String string = getAttributeOrDefault(attributeKey);
-		if (string == null) {
-			return defaultValue;
-		} else {
-			return Boolean.valueOf(string).booleanValue();
-		}
-	}
-
-	/**
-	 * Get the attribute as integer. If not available or not parseable, get
-	 * default. If default not available or not parseable, get zero.
-	 */
-	public int getInteger(String attributeKey) {
-		return getInteger(attributeKey, 0);
-	}
-
-	/**
-	 * Get the attribute as integer. If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public int getInteger(String attributeKey, int defaultValue) {
-		String string = getAttributeOrDefault(attributeKey);
-		if (string == null) {
-			return defaultValue;
-		}
-		try {
-			return Integer.parseInt(string);
-		} catch (NumberFormatException e1) {
-			try {
-				string = getDefault(attributeKey);
-				if (string == null) {
-					return defaultValue;
-				} else {
-					return Integer.parseInt(string);
-				}
-			} catch (NumberFormatException e2) {
-				return defaultValue;
-			}
-		}
-	}
-
-	/**
-	 * Get the attribute as double. If not available or not parseable, get
-	 * default. If default not available or not parseable, get zero.
-	 */
-	public double getDouble(String attributeKey) {
-		return getDoubleAttribute(attributeKey, 0.0);
-	}
-
-	/**
-	 * Get the attribute as double. If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public double getDouble(String attributeKey, double defaultValue) {
-		String string = getAttributeOrDefault(attributeKey);
-		if (string == null) {
-			return defaultValue;
-		}
-		try {
-			return Double.parseDouble(string);
-		} catch (NumberFormatException e1) {
-			try {
-				string = getDefault(attributeKey);
-				if (string == null) {
-					return defaultValue;
-				} else {
-					return Double.parseDouble(string);
-				}
-			} catch (NumberFormatException e2) {
-				return defaultValue;
-			}
-		}
-	}
-
-	/***************************************************************************
-	 * Old GETTERS They are deprecated.
-	 **************************************************************************/
-	/** @deprecated */
-	public boolean getBooleanAttribute(String attributeKey, boolean defaultValue) {
-		return getBoolean(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public int getIntegerAttribute(String attributeKey, int defaultValue) {
-		return getInteger(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public double getDoubleAttribute(String attributeKey, double defaultValue) {
-		return getDouble(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public String getStringAttribute(String attributeKey, String defaultValue) {
-		return getString(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public String getTextAttribute(String attributeKey, String defaultValue) {
-		return getText(attributeKey, defaultValue);
-	}
-
-	/***************************************************************************
-	 * Verifying GETTERS
-	 **************************************************************************/
-	/**
-	 * @deprecated
-	 */
-	public int verifyIntAttribute(String attributeName, String attributeKey,
-			int defaultValue) throws IllegalAttributeException {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null) {
-			return defaultValue;
-		}
-		try {
-			return Integer.parseInt(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidIntegerNumber, stringValue);
-		}
-	}
-
-	public int verifyInt(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = verifyString(attributeName, attributeKey);
-		try {
-			return Integer.parseInt(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidIntegerNumber, stringValue);
-		}
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public double verifyDoubleAttribute(String attributeName,
-			String attributeKey, double defaultValue)
-			throws IllegalAttributeException {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null)
-			return defaultValue;
-		try {
-			return Double.parseDouble(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidDecimalNumber, stringValue);
-		}
-	}
-
-	public double verifyDouble(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = verifyString(attributeName, attributeKey);
-		try {
-			return Double.parseDouble(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidDecimalNumber, stringValue);
-		}
-	}
-
-	public IPath verifyPath(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = verifyString(attributeName, attributeKey);
-
-		// TODO: Implement a proper checking
-		Path path = new Path(""); //$NON-NLS-1$
-		if (!path.isValidPath(stringValue)) {
-			throw new IllegalAttributeException(attributeName,
-					Messages.ControlAttributes_InvalidPath, stringValue);
-		}
-		return new Path(stringValue);
-	}
-
-	public String verifyString(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null) {
-			throw new IllegalAttributeException(attributeName,
-					Messages.ControlAttributes_MustNotBeEmpty);
-		}
-		return stringValue;
-	}
-
-	/***************************************************************************
-	 * SETTERS
-	 **************************************************************************/
-	public void setAttribute(String attributeKey, String value) {
-		currentMap.put(attributeKey, value);
-	}
-
-	public void setStringAttribute(String attributeKey, String value) {
-		setAttribute(attributeKey, value);
-	}
-
-	public void setIntAttribute(String attributeKey, int value) {
-		setAttribute(attributeKey, Integer.toString(value));
-	}
-
-	public void setDoubleAttribute(String attributeKey, double value) {
-		setAttribute(attributeKey, Double.toString(value));
-	}
-
-	public void setBooleanAttribute(String attributeKey, boolean value) {
-		setAttribute(attributeKey, Boolean.toString(value));
-	}
-
-	public void setTextAttribute(String attributeKey, String value) {
-		String textValue = value;
-		textValue = textValue.replaceAll("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
-		textValue = textValue.replaceAll("\n", "\\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		setAttribute(attributeKey, textValue);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java
deleted file mode 100644
index 4ad9da2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.verification;
-
-public class IllegalAttributeException extends Exception {
-
-	String name;
-	String value;
-	
-	public IllegalAttributeException() {
-	}
-
-	public IllegalAttributeException(String arg0) {
-		super(arg0);
-	}
-
-	public IllegalAttributeException(Throwable arg0) {
-		super(arg0);
-	}
-
-	public IllegalAttributeException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
-
-	public IllegalAttributeException(String message, String name) {
-		super(name + ": " + message); //$NON-NLS-1$
-		this.name = name;
-	}
-
-	public IllegalAttributeException(String message, String name, String value) {
-		super(name + ": " + message + "( " + value + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		this.value = value;
-		this.name = name;
-	}
-
-	public IllegalAttributeException(Exception e, String name, String message, String value) {
-		super(name + ": " + message + "( " + value + ")", e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		this.value = value;
-		this.name = name;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return value;
-	}
-	
-	
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java
deleted file mode 100644
index 2c782e0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package org.eclipse.ptp.remotetools.utils.verification;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.cell.utils.verification.messages"; //$NON-NLS-1$
-	public static String AttributeVerification_ConfigurationOK;
-	public static String AttributeVerification_ErrorMessage;
-	public static String AttributeVerification_InvalidConfiguration;
-	public static String AttributeVerification_InvalidPath;
-	public static String AttributeVerification_MustBeLocalFile;
-	public static String AttributeVerification_NotAnAbsolutePath;
-	public static String AttributeVerification_NoValue;
-	public static String AttributeVerification_PathDoesNotExist;
-	public static String AttributeVerification_PathIsNotDir;
-	public static String AttributeVerification_PathIsNotExecutableFile;
-	public static String AttributeVerification_PathIsNotFile;
-	public static String AttributeVerification_PathIsNotWritable;
-	public static String AttributeVerification_PathNotFound;
-	public static String ControlAttributes_InvalidDecimalNumber;
-	public static String ControlAttributes_InvalidIntegerNumber;
-	public static String ControlAttributes_InvalidPath;
-	public static String ControlAttributes_MustNotBeEmpty;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties
deleted file mode 100644
index 0f18702..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-AttributeVerification_NoValue=no value
-AttributeVerification_ErrorMessage={0}: {1} ({2})
-AttributeVerification_InvalidPath=is not a valid path
-AttributeVerification_NotAnAbsolutePath=is not an absolute path
-AttributeVerification_PathDoesNotExist=Path does not exist
-AttributeVerification_PathIsNotDir=Path is not a directory
-AttributeVerification_PathIsNotExecutableFile=Path is not an executable file
-AttributeVerification_PathIsNotWritable=Path is not writable
-AttributeVerification_PathIsNotFile=Path is not a file
-AttributeVerification_PathNotFound=Path not found in plug-in
-AttributeVerification_MustBeLocalFile=Must be a local file
-AttributeVerification_ConfigurationOK=Configuration is OK
-AttributeVerification_InvalidConfiguration=Configuration contains invalid values
-ControlAttributes_InvalidIntegerNumber=is not valid integer number
-ControlAttributes_InvalidDecimalNumber=is not valid decimal number
-ControlAttributes_InvalidPath=is not valid path
-ControlAttributes_MustNotBeEmpty=must not be empty

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project
deleted file mode 100755
index 756b046..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.generichost</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF
deleted file mode 100755
index bf80e01..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.environment.generichost;singleton:=true
-Bundle-Version: 1.3.3.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.generichost.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.ui,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.remotetools.preferences,
- org.eclipse.ptp.utils.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.remotetools.environment.generichost

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties
deleted file mode 100755
index e398e4e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.properties
deleted file mode 100644
index 7efebb8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools Generic Host
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml
deleted file mode 100755
index e5d1725..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.remotetools.environment.core.remoteEnvironmentControlDelegate">
-      <control
-            class="org.eclipse.ptp.remotetools.environment.generichost.core.Environment"
-            name="Generic Host"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage.EnvironmentPreferencePage"
-            class="org.eclipse.ptp.remotetools.environment.generichost.preferences.ui.PreferencePage"
-            id="org.eclipse.ptp.remotetools.environment.generichost.GenericHostPreferencePage"
-            name="Generic Host"/>      
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.ptp.remotetools.environment.generichost.preferences.ui.PreferenceInitializer"/>
-   </extension>
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java
deleted file mode 100755
index 33ae0aa..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost;
-
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.generichost.core.Environment;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-//	public static final String PLUGIN_ID = "org.eclipse.ptp.remotetools.environment.genericohost";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// Notifies the core plugin to destroy all environments.
-		EnvironmentPlugin corePlugin = EnvironmentPlugin.getDefault();
-		corePlugin.destroyTypeElements(Environment.class);
-		
-		plugin = null;
-		super.stop(context);
-	}
-	
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java
deleted file mode 100755
index a6a73b8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.generichost.conf;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Defines names of attributes. Intended for an uniform and consistent use of names for
- * attributes in GUI, error messages and configuration files across plugins.
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public class AttributeNames extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.generichost.conf.attribute_names"; //$NON-NLS-1$
-
-	public static String CONNECTION_ADDRESS;
-	public static String CONNECTION_PORT;
-	public static String CONNECTION_TIMEOUT;
-	public static String KEY_PASSPHRASE;
-	public static String KEY_PATH;
-	public static String LOGIN_PASSWORD;
-	public static String LOGIN_USERNAME;
-	public static String SYSTEM_WORKSPACE;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, AttributeNames.class);
-	}
-
-	private AttributeNames() {
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java
deleted file mode 100755
index def5ceb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.conf;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Richard Maciel
- *
- * @since 1.2.1
- */
-public class DefaultValues extends NLS
-{
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remotetools.environment.generichost.conf.defaults"; //$NON-NLS-1$
-
-
-	public static String LOCALHOST_SELECTION;
-	public static String LOGIN_USERNAME;
-	public static String LOGIN_PASSWORD;
-	public static String CONNECTION_ADDRESS;
-	public static String CONNECTION_PORT;
-	public static String CONNECTION_TIMEOUT;
-	public static String KEY_PATH;
-	public static String KEY_PASSPHRASE;
-	public static String IS_PASSWORD_AUTH;
-	public static String SYSTEM_WORKSPACE;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, DefaultValues.class);
-	}
-
-	private DefaultValues() {
-		// cannot create new instance
-	}
-}
-
-	

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties
deleted file mode 100755
index 751f96d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LOGIN_USERNAME=User name remote connection
-LOGIN_PASSWORD=Password remote connection
-CONNECTION_ADDRESS=Address for remote connection
-CONNECTION_PORT=Port for remote connection
-KEY_PATH=Path to file with private key for remote connection
-KEY_PASSPHRASE=Passphrase to open private key for remote connection
-CONNECTION_TIMEOUT=Timeout for remote connection
-SYSTEM_WORKSPACE=Launch base directory

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties
deleted file mode 100755
index a71bfde..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LOCALHOST_SELECTION=true
-LOGIN_USERNAME=
-LOGIN_PASSWORD=
-CONNECTION_ADDRESS=
-CONNECTION_PORT=22
-CONNECTION_TIMEOUT=5
-KEY_PATH=
-KEY_PASSPHRASE=
-IS_PASSWORD_AUTH=true
-SYSTEM_WORKSPACE=/tmp/remotetools
-CIPHER_TYPE=

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java
deleted file mode 100755
index a37596d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-import org.eclipse.ptp.remotetools.environment.generichost.conf.AttributeNames;
-import org.eclipse.ptp.remotetools.environment.generichost.conf.DefaultValues;
-import org.eclipse.ptp.remotetools.utils.verification.ControlAttributes;
-import org.eclipse.ptp.remotetools.utils.verification.IllegalAttributeException;
-
-
-/**
- * Defines rules to build the target configuration from an attribute hash map.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class ConfigFactory {
-	Map currentMap = null;
-	Map defaultMap = null;
-	
-	ControlAttributes attributes = null;
-	
-	private static final String PREFIX = "org.eclipse.ptp.remotetools.environment.generichost.."; //$NON-NLS-1$
-	public static final String ATTR_LOCALHOST_SELECTION = PREFIX + "localhost-selection"; //$NON-NLS-1$
-	public static final String ATTR_LOGIN_USERNAME = PREFIX + "login-username"; //$NON-NLS-1$
-	public static final String ATTR_LOGIN_PASSWORD = PREFIX + "login-password"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_ADDRESS = PREFIX + "connection-address"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_PORT = PREFIX + "connection-port"; //$NON-NLS-1$
-	public static final String ATTR_KEY_PATH = PREFIX + "key-path"; //$NON-NLS-1$
-	public static final String ATTR_KEY_PASSPHRASE = PREFIX + "key-passphrase"; //$NON-NLS-1$
-	public static final String ATTR_IS_PASSWORD_AUTH = PREFIX + "is-passwd-auth"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_TIMEOUT = PREFIX + "connection-timeout"; //$NON-NLS-1$
-	public static final String ATTR_SYSTEM_WORKSPACE = PREFIX + "system-workspace-dir"; //$NON-NLS-1$
-	public static final String ATTR_CIPHER_TYPE = PREFIX + "cipher-type"; //$NON-NLS-1$
-	
-	public final static String[] KEY_ARRAY = { ATTR_LOCALHOST_SELECTION,
-			ATTR_LOGIN_USERNAME, ATTR_CONNECTION_PORT, ATTR_CONNECTION_ADDRESS,
-			ATTR_KEY_PATH, ATTR_IS_PASSWORD_AUTH, ATTR_CONNECTION_TIMEOUT,
-			ATTR_SYSTEM_WORKSPACE, ATTR_CIPHER_TYPE};
-	
-	public final static String[] KEY_CIPHERED_ARRAY = { ATTR_KEY_PASSPHRASE,
-			ATTR_LOGIN_PASSWORD };
-	
-	public ConfigFactory() {
-		createDefaultMap();
-		createCurrentMapFromPreferences();
-		attributes = new ControlAttributes(currentMap, defaultMap);
-	}
-	
-	public ConfigFactory(Map newMap) {
-		createDefaultMap();
-		if (newMap == null) {
-			createCurrentMapFromPreferences();
-		} else {
-			currentMap = new HashMap(newMap);
-		}
-		attributes = new ControlAttributes(currentMap, defaultMap);
-	}
-	
-	public Map getMap() {
-		return currentMap;
-	}
-	
-	public ControlAttributes getAttributes() {
-		return attributes;
-	}
-	
-	private void createDefaultMap() {
-		defaultMap = new HashMap();
-		defaultMap.put(ATTR_LOCALHOST_SELECTION, DefaultValues.LOCALHOST_SELECTION);
-		defaultMap.put(ATTR_LOGIN_USERNAME, DefaultValues.LOGIN_USERNAME);
-		defaultMap.put(ATTR_LOGIN_PASSWORD, DefaultValues.LOGIN_PASSWORD);
-		defaultMap.put(ATTR_CONNECTION_PORT, DefaultValues.CONNECTION_PORT);
-		defaultMap.put(ATTR_CONNECTION_ADDRESS, DefaultValues.CONNECTION_ADDRESS);
-		defaultMap.put(ATTR_KEY_PATH, DefaultValues.KEY_PATH);
-		defaultMap.put(ATTR_KEY_PASSPHRASE, DefaultValues.KEY_PASSPHRASE);
-		defaultMap.put(ATTR_IS_PASSWORD_AUTH, DefaultValues.IS_PASSWORD_AUTH);
-		defaultMap.put(ATTR_CONNECTION_TIMEOUT, DefaultValues.CONNECTION_TIMEOUT);
-		defaultMap.put(ATTR_SYSTEM_WORKSPACE, DefaultValues.SYSTEM_WORKSPACE);
-		defaultMap.put(ATTR_CIPHER_TYPE, TargetControl.DEFAULT_CIPHER);
-	}
-	
-	private void createCurrentMapFromPreferences() {
-		currentMap = new HashMap();
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		currentMap.put(ATTR_LOGIN_USERNAME, store.getString(ATTR_LOGIN_USERNAME));
-		currentMap.put(ATTR_CONNECTION_ADDRESS, store.getString(ATTR_CONNECTION_ADDRESS));
-		currentMap.put(ATTR_CONNECTION_PORT, store.getString(ATTR_CONNECTION_PORT));
-		currentMap.put(ATTR_SYSTEM_WORKSPACE, store.getString(ATTR_SYSTEM_WORKSPACE));
-	}
-	
-	public TargetConfig createTargetConfig() throws CoreException {
-		try {
-			TargetConfig config = new TargetConfig();
-			config.setLoginUserName(attributes.getString(ATTR_LOGIN_USERNAME));
-			config.setLoginPassword(attributes.getString(ATTR_LOGIN_PASSWORD));
-			config.setConnectionPort(attributes.verifyInt(AttributeNames.CONNECTION_PORT, ATTR_CONNECTION_PORT));
-			if (attributes.getBoolean(ATTR_LOCALHOST_SELECTION)) {
-				config.setConnectionAddress("localhost"); //$NON-NLS-1$
-			} else {
-				config.setConnectionAddress(attributes.getString(ATTR_CONNECTION_ADDRESS));
-			}
-			config.setConnectionTimeout(attributes.verifyInt(AttributeNames.CONNECTION_TIMEOUT, ATTR_CONNECTION_TIMEOUT));
-			config.setKeyPassphrase(attributes.getString(ATTR_KEY_PASSPHRASE));
-			config.setKeyPath(attributes.getString(ATTR_KEY_PATH));
-			config.setIsPasswordAuth(attributes.getBoolean(ATTR_IS_PASSWORD_AUTH));
-			config.setSystemWorkspace(attributes.getString(ATTR_SYSTEM_WORKSPACE));
-			config.setCipherType(attributes.getString(ATTR_CIPHER_TYPE));
-			return config;
-		} catch (IllegalAttributeException e) {
-			throw new CoreException(new Status(Status.ERROR, Activator.getDefault().getBundle().getSymbolicName(), 0, e.getMessage(), e));
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java
deleted file mode 100755
index ea91da2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-import org.eclipse.ptp.remotetools.environment.generichost.ui.ConfigurationPage;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-
-
-/**
- * Factory for the environment.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class Environment implements ITargetTypeExtension {
-	
-	public Environment() {
-		super();
-	}
-
-	public ITargetControl controlFactory(ITargetElement element) throws CoreException {
-		return new TargetControl(element);
-	}
-
-	public String[] getControlAttributeNames() {
-		return ConfigFactory.KEY_ARRAY;
-	}
-
-	public AbstractEnvironmentDialogPage dialogPageFactory(ITargetElement targetElement) {
-		return new ConfigurationPage(targetElement.getName(), targetElement.getAttributes());
-	}
-	
-	public AbstractEnvironmentDialogPage dialogPageFactory() {
-		return new ConfigurationPage();
-	}
-	
-	public String[] getControlAttributeNamesForCipheredKeys() {
-		return ConfigFactory.KEY_CIPHERED_ARRAY;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Messages.java
deleted file mode 100755
index 990ead1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Messages.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Daniel Felix Ferber
- *
- * @since 3.0
- */
-public class Messages extends NLS
-{
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remotetools.environment.generichost.core.messages"; //$NON-NLS-1$
-
-	public static String TargetControl_create_MonitorConnecting;
-	public static String TargetControl_resume_CannotResume;
-	public static String TargetControl_stop_CannotPause;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, Messages.class);
-	}
-
-	private Messages() {
-		// cannot create new instance
-	}
-}
-
-	

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java
deleted file mode 100755
index ceec343..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-/**
- * Describes a target created from the environment.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class TargetConfig {
-	private String loginUserName;
-	private String loginPassword;
-	private int connectionPort;
-	private String connectionAddress;
-	private int connectionTimeout;
-	private String keyPath;
-	private String keyPassphrase;
-	private boolean isPasswordAuth;
-	private String systemWorkspace;
-	private String cipherType;
-	
-	public String getConnectionAddress() {
-		return connectionAddress;
-	}
-	public void setConnectionAddress(String connectionAddress) {
-		this.connectionAddress = connectionAddress;
-	}
-	public int getConnectionPort() {
-		return connectionPort;
-	}
-	public void setConnectionPort(int connectionPort) {
-		this.connectionPort = connectionPort;
-	}
-	public String getLoginPassword() {
-		return loginPassword;
-	}
-	public void setLoginPassword(String loginPassword) {
-		this.loginPassword = loginPassword;
-	}
-	public String getLoginUserName() {
-		return loginUserName;
-	}
-	public void setLoginUserName(String loginUserName) {
-		this.loginUserName = loginUserName;
-	}
-	public void setKeyPath(String keyPath) {
-		this.keyPath = keyPath;
-	}
-	public void setKeyPassphrase(String keyPassphrase) {
-		this.keyPassphrase = keyPassphrase;
-	}
-	public void setIsPasswordAuth(boolean isPasswordAuth) {
-		this.isPasswordAuth = isPasswordAuth; 
-		
-	}
-	public int getConnectionTimeout() {
-		return connectionTimeout;
-	}
-	public void setConnectionTimeout(int connectionTimeout) {
-		this.connectionTimeout = connectionTimeout;
-	}
-	public boolean isPasswordAuth() {
-		return isPasswordAuth;
-	}
-	public void setPasswordAuth(boolean isPasswordAuth) {
-		this.isPasswordAuth = isPasswordAuth;
-	}
-	public String getKeyPassphrase() {
-		return keyPassphrase;
-	}
-	public String getKeyPath() {
-		return keyPath;
-	}
-	public void setSystemWorkspace(String systemWorkspace) {
-		this.systemWorkspace = systemWorkspace;
-	}
-	public String getSystemWorkspace() {
-		return systemWorkspace;
-	}
-	public void setCipherType(String cipherType) {
-		this.cipherType = cipherType;
-	}
-	public String getCipherType() {
-		return cipherType;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java
deleted file mode 100755
index a6c63c9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java
+++ /dev/null

@@ -1,214 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remotetools.RemotetoolsPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-import org.eclipse.ptp.remotetools.environment.control.SSHTargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetVariables;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-
-/**
- * Controls an instance of a target created from the Environment.
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class TargetControl extends SSHTargetControl implements ITargetControl, ITargetVariables {
-
-	/**
-	 * Configuration provided to the target control.
-	 */
-	ConfigFactory configFactory;
-	TargetConfig currentTargetConfig;
-	
-	/**
-	 * Name of the target.
-	 */
-	//String name;
-	
-	/**
-	 * BackReference to the target element
-	 */
-	ITargetElement targetElement;
-	
-	/**
-	 * Current connection state.
-	 */
-	private int state;
-	private static final int NOT_OPERATIONAL = 1;
-	private static final int CONNECTING = 2;
-	private static final int CONNECTED = 3;
-	private static final int DISCONNECTING = 4;
-	
-	/**
-	 * Default cipher id
-	 */
-	public static final String DEFAULT_CIPHER = RemotetoolsPlugin.CIPHER_DEFAULT;
-	
-	/**
-	 * Creates a target control.
-	 * 
-	 * @param attributes
-	 *            Configuration attributes
-	 * @param element
-	 *            Name for the target (displayed in GUI)
-	 * @throws CoreException
-	 *             Some attribute is not valid
-	 */
-	public TargetControl(ITargetElement element) throws CoreException {
-		super();
-		state = NOT_OPERATIONAL;
-		targetElement = element;
-		configFactory = new ConfigFactory(targetElement.getAttributes());
-		currentTargetConfig = configFactory.createTargetConfig();
-	}
-
-	/**
-	 * Connect to the remote target.. On every error or possible failure, an exception
-	 * (CoreException) is thrown, whose (multi)status describe the error(s) that prevented creating the target control.
-	 * 
-	 * @param monitor
-	 *            Progress indicator or <code>null</code>
-	 * @return Always true.
-	 * @throws CoreException
-	 *             Some attribute is not valid, the simulator cannot be launched, the ssh failed to connect.
-	 */
-	public boolean create(IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(Messages.TargetControl_create_MonitorConnecting, 1);
-		/*
-		 *  Connect to the remote temote target
-		 */
-		if(currentTargetConfig.isPasswordAuth()) {
-			setConnectionParameters(
-					new SSHParameters(
-							currentTargetConfig.getConnectionAddress(),
-							currentTargetConfig.getConnectionPort(),
-							currentTargetConfig.getLoginUserName(),
-							currentTargetConfig.getLoginPassword(),
-							currentTargetConfig.getCipherType(),
-							currentTargetConfig.getConnectionTimeout()*1000
-					)
-				);
-		} else {
-			setConnectionParameters(
-					new SSHParameters(
-							currentTargetConfig.getConnectionAddress(),
-							currentTargetConfig.getConnectionPort(),
-							currentTargetConfig.getLoginUserName(),
-							currentTargetConfig.getKeyPath(),
-							currentTargetConfig.getKeyPassphrase(),
-							currentTargetConfig.getCipherType(),
-							currentTargetConfig.getConnectionTimeout()*1000
-					)
-				);
-		}
-		
-		try {
-			setState(CONNECTING);
-			super.create(monitor);
-			setState(CONNECTED);
-			monitor.worked(1);
-		} catch (CoreException e) {
-			disconnect();
-			setState(NOT_OPERATIONAL);
-		}
-		monitor.done();
-		return true;
-	}
-
-	private synchronized void setState(int state) {
-		this.state = state;
-	}
-
-	public boolean kill(IProgressMonitor monitor) throws CoreException {
-		try {
-			setState(DISCONNECTING);
-			super.kill(monitor);
-		} finally {
-			setState(NOT_OPERATIONAL);
-		}
-		return true;
-	}
-
-	public synchronized int query() {
-		switch (state) {
-		case NOT_OPERATIONAL:
-			return ITargetStatus.STOPPED;
-		case CONNECTING:
-		case DISCONNECTING:
-			return ITargetStatus.STARTED;
-		case CONNECTED:
-			if (isConnected()) {
-				return ITargetStatus.RESUMED;
-			} else {
-				return ITargetStatus.STARTED;
-			}
-		default:
-			return ITargetStatus.STOPPED;
-		}
-	}
-
-	public boolean resume(IProgressMonitor monitor) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-				Messages.TargetControl_resume_CannotResume, null));
-	}
-
-	public boolean stop(IProgressMonitor monitor) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-				Messages.TargetControl_stop_CannotPause, null));
-	}
-
-	public void updateConfiguration() throws CoreException {
-		//targetElement.setName(name);
-		configFactory = new ConfigFactory(targetElement.getAttributes());
-		currentTargetConfig = configFactory.createTargetConfig();
-	}
-
-	public String getName() {
-		return targetElement.getName();
-	}
-
-	protected String getPluginId() {
-		return Activator.getDefault().getBundle().getSymbolicName();
-	}
-	
-	public TargetSocket createTargetSocket(int port) {
-		Assert.isTrue(isConnected());
-		TargetSocket socket = new TargetSocket();
-		socket.host = currentTargetConfig.getConnectionAddress();
-		socket.port = port;
-		return socket;
-	}
-
-	public String getSystemWorkspace() {
-		return currentTargetConfig.getSystemWorkspace();
-	}
-
-	public void destroy() throws CoreException {
-		// End all jobs, if possible, then disconnect
-		try {
-			terminateJobs(null);
-		} finally {
-			disconnect();
-		}
-		
-		//setState(NOT_OPERATIONAL);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/messages.properties
deleted file mode 100755
index e4be912..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/messages.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-TargetControl_create_MonitorConnecting=Connecting to a generic remote host
-TargetControl_resume_CannotResume=A generic remote host cannot be resumed from pause
-TargetControl_stop_CannotPause=A generic remote host cannot be paused

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/Messages.java
deleted file mode 100755
index 123e1e0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/Messages.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.generichost.preferences.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Daniel Felix Ferber
- */
-public class Messages {
-	public static String PreferencePage_HeaderConnection;
-	public static String PreferencePage_LabelConnectionPort;
-	public static String PreferencePage_LabelConnectionAddress;
-	public static String PreferencePage_LabelLoginUserName;
-	public static String PreferencePage_HeaderLaunch;
-	public static String PreferencePage_LabelSystemWorkspace;
-	public static String PreferencePage_Description;
-	public static String PreferencePage_Title;
-
-	static {
-		NLS.initializeMessages("org.eclipse.ptp.remotetools.environment.generichost.preferences.ui.messages", Messages.class);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java
deleted file mode 100755
index e6e8aeb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.preferences.ui;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-import org.eclipse.ptp.remotetools.environment.generichost.conf.DefaultValues;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-
-
-/**
- * Initializes preference values
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.2.1
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = Activator.getDefault()//PreferencesPlugin.getDefault()
-				.getPreferenceStore();
-		store.setDefault(ConfigFactory.ATTR_LOGIN_USERNAME, DefaultValues.LOGIN_USERNAME);
-		store.setDefault(ConfigFactory.ATTR_CONNECTION_ADDRESS, DefaultValues.CONNECTION_ADDRESS);
-		store.setDefault(ConfigFactory.ATTR_CONNECTION_PORT, DefaultValues.CONNECTION_PORT);
-		store.setDefault(ConfigFactory.ATTR_SYSTEM_WORKSPACE, DefaultValues.SYSTEM_WORKSPACE);
-	}
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java
deleted file mode 100755
index 60ed5f0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.preferences.ui;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-import org.eclipse.ptp.remotetools.preferences.ui.AbstractBaseFieldEditorPreferencePage;
-import org.eclipse.ptp.remotetools.preferences.ui.LabelFieldEditor;
-import org.eclipse.ptp.remotetools.preferences.ui.SpacerFieldEditor;
-import org.eclipse.ui.IWorkbench;
-
-
-/**
- * Preference page for the remote target default values for new targets.
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.2.1
- */
-public class PreferencePage extends AbstractBaseFieldEditorPreferencePage {
-
-	public PreferencePage() {
-		super(GRID);
-
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		setPreferenceStore(store);
-		
-		// setDescription must be called here or it wont work
-		setDescription(Messages.PreferencePage_Description);
-	}
-
-	protected void createFieldEditors() {
-		// setTitle must be called here or it wont work
-		setTitle(Messages.PreferencePage_Title);
-		
-		addField(new LabelFieldEditor(Messages.PreferencePage_HeaderConnection, getFieldEditorParent()));
-
-		StringFieldEditor addrfield = new StringFieldEditor(ConfigFactory.ATTR_CONNECTION_ADDRESS,
-				Messages.PreferencePage_LabelConnectionAddress, getFieldEditorParent());
-		addrfield.setEmptyStringAllowed(true);
-		addField(addrfield);
-
-		IntegerFieldEditor portfield = new IntegerFieldEditor(ConfigFactory.ATTR_CONNECTION_PORT,
-				Messages.PreferencePage_LabelConnectionPort, getFieldEditorParent());
-		portfield.setEmptyStringAllowed(false);
-		addField(portfield);
-
-		StringFieldEditor userfield = new StringFieldEditor(ConfigFactory.ATTR_LOGIN_USERNAME,
-				Messages.PreferencePage_LabelLoginUserName, getFieldEditorParent());
-		userfield.setEmptyStringAllowed(true);
-		addField(userfield);
-
-		addField(new LabelFieldEditor(Messages.PreferencePage_HeaderLaunch, getFieldEditorParent()));
-		
-		StringFieldEditor systemWorkspaceDir = new StringFieldEditor(ConfigFactory.ATTR_SYSTEM_WORKSPACE,
-				Messages.PreferencePage_LabelSystemWorkspace, getFieldEditorParent());
-		systemWorkspaceDir.setEmptyStringAllowed(false);
-		addField(systemWorkspaceDir);
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-	void addSpace() {
-		SpacerFieldEditor spacer1 = new SpacerFieldEditor(getFieldEditorParent());
-		addField(spacer1);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/messages.properties
deleted file mode 100755
index d2d11c2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/messages.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-PreferencePage_HeaderConnection=Connection to remote host:
-PreferencePage_LabelConnectionPort=Port number:
-PreferencePage_LabelConnectionAddress=Address:
-PreferencePage_LabelLoginUserName=User name:
-PreferencePage_HeaderLaunch=C/C++ generic host target launch properties:
-PreferencePage_LabelSystemWorkspace=Launch base directory:
-PreferencePage_Description=Default properties for new generic host Targets
-PreferencePage_Title=Generic Host

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java
deleted file mode 100755
index c67193a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java
+++ /dev/null

@@ -1,220 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.ui;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-import org.eclipse.ptp.remotetools.environment.generichost.core.TargetControl;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-import org.eclipse.ptp.remotetools.utils.verification.ControlAttributes;
-import org.eclipse.ptp.utils.ui.swt.AuthenticationFrame;
-import org.eclipse.ptp.utils.ui.swt.AuthenticationFrameMold;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboGroupItem;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.TextGroup;
-import org.eclipse.ptp.utils.ui.swt.TextMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-
-/**
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- *
- */
-public class ConfigurationPage extends AbstractEnvironmentDialogPage {
-	ConfigFactory configFactory = null;
-	
-	public ConfigurationPage(String targetName, Map attributesMap) {
-		super(targetName);
-		
-		/*if (targetName == null) {
-			this.targetName = Messages.ConfigurationPage_DefaultTargetName;
-		} else {*/
-		this.targetName = targetName;
-		//}
-
-		configFactory = new ConfigFactory(attributesMap);
-	}
-	
-	public ConfigurationPage() {
-		super(Messages.ConfigurationPage_DefaultTargetName);
-		this.targetName = Messages.ConfigurationPage_DefaultTargetName;
-		
-		configFactory = new ConfigFactory();
-	}
-
-	private String targetName;
-	private TextGroup targetNameGroup;
-	private AuthenticationFrame remoteAuthFrame;
-	private TextGroup systemWorkspaceGroup;
-	
-	class DataModifyListener implements ModifyListener {
-		int counter = 0;
-		public synchronized void enable() {
-			counter++;
-		}
-		public synchronized void disable() {
-			counter--;
-		}
-		public synchronized void modifyText(ModifyEvent e) {
-			if (counter < 0) {
-				return;
-			}
-			readControls();
-			
-			// updateButtons() will call is Valid(), that will call validateFields()
-			getContainer().updateButtons();
-		}
-	}
-	
-	private DataModifyListener dataModifyListener;
-	
-	public void createControl(Composite parent) {
-		
-		this.setDescription(Messages.ConfigurationPage_DialogDescription);
-		this.setTitle(Messages.ConfigurationPage_DialogTitle);
-		this.setErrorMessage(null);
-
-		GridLayout topLayout = new GridLayout();
-		final Composite topControl = new Composite(parent, SWT.NONE);
-		setControl(topControl);
-		topControl.setLayout(topLayout);
-
-		/*
-		 * Environment name Label and text controls.
-		 */
-//		TextGroupMold tmold = new TextGroupMold(TextGroupMold.GRID_DATA_ALIGNMENT_FILL
-//				| TextGroupMold.GRID_DATA_GRAB_EXCESS_SPACE, Messages.ConfigurationPage_LabelTargetName, TextGroup.MAX_SIZE);
-		TextMold mold = new TextMold(TextMold.GRID_DATA_ALIGNMENT_FILL | TextMold.GRID_DATA_GRAB_EXCESS_SPACE, Messages.ConfigurationPage_LabelTargetName);
-		targetNameGroup = new TextGroup(topControl, mold);
-		
-		createAuthControl(topControl);
-
-		/*
-		 * System workspace
-		 */
-		Frame frame = new Frame(topControl, "Remote application launcher:");
-		mold = new TextMold(TextMold.GRID_DATA_ALIGNMENT_FILL | TextMold.GRID_DATA_GRAB_EXCESS_SPACE, Messages.ConfigurationPage_LabelSystemWorkspace);
-		systemWorkspaceGroup = new TextGroup(frame.getTopUserReservedComposite(), mold);
-		
-		fillControls();
-		registerListeners();
-	}
-	
-	private void registerListeners() {
-		dataModifyListener = new DataModifyListener();
-		targetNameGroup.addModifyListener(dataModifyListener);
-		remoteAuthFrame.addModifyListener(dataModifyListener);
-		systemWorkspaceGroup.addModifyListener(dataModifyListener);
-	}
-	
-	private void fillControls() {
-		ControlAttributes attributes = configFactory.getAttributes();
-		targetNameGroup.setString(targetName);
-		remoteAuthFrame.setLocalhostSelected(attributes.getBoolean(ConfigFactory.ATTR_LOCALHOST_SELECTION));
-		remoteAuthFrame.setHostPort(attributes.getInteger(ConfigFactory.ATTR_CONNECTION_PORT));
-		remoteAuthFrame.setHostAddress(attributes.getString(ConfigFactory.ATTR_CONNECTION_ADDRESS));
-		remoteAuthFrame.setUserName(attributes.getString(ConfigFactory.ATTR_LOGIN_USERNAME));
-		remoteAuthFrame.setPassword(attributes.getString(ConfigFactory.ATTR_LOGIN_PASSWORD));
-		remoteAuthFrame.setPublicKeyPath(attributes.getString(ConfigFactory.ATTR_KEY_PATH));
-		remoteAuthFrame.setPassphrase(attributes.getString(ConfigFactory.ATTR_KEY_PASSPHRASE));
-		remoteAuthFrame.setTimeout(attributes.getInteger(ConfigFactory.ATTR_CONNECTION_TIMEOUT));
-		remoteAuthFrame.setPasswordBased(attributes.getBoolean(ConfigFactory.ATTR_IS_PASSWORD_AUTH));
-		systemWorkspaceGroup.setString(attributes.getString(ConfigFactory.ATTR_SYSTEM_WORKSPACE));
-		
-		// Fill the combobox with available cipher types
-		Map cipherMap = TargetControl.getCipherTypesMap();
-		Set cKeySet = cipherMap.keySet();
-		ComboGroup cipherGroup = remoteAuthFrame.getCipherTypeGroup();
-		for(Iterator it = cKeySet.iterator(); it.hasNext();) {
-			String key = (String)it.next();
-			String value = (String)cipherMap.get(key);
-			
-			cipherGroup.add(new ComboGroupItem(key, value));
-		}
-		// Select the cipher type based on the attributes map.
-		cipherGroup.selectIndexUsingID(attributes.getString(ConfigFactory.ATTR_CIPHER_TYPE));
-		
-		
-		//org.eclipse.ptp.remotetools.internal.ssh.systemWorkspaceGroup.setString(attributes.getString(ConfigFactory.ATTR_SYSTEM_WORKSPACE));
-	}
-	
-	private void readControls() {
-		ControlAttributes attributes = configFactory.getAttributes();
-		targetName = targetNameGroup.getString();
-		attributes.setBooleanAttribute(ConfigFactory.ATTR_LOCALHOST_SELECTION, remoteAuthFrame.isLocalhostSelected());
-		attributes.setStringAttribute(ConfigFactory.ATTR_LOGIN_USERNAME, remoteAuthFrame.getUserName());
-		attributes.setStringAttribute(ConfigFactory.ATTR_LOGIN_PASSWORD, remoteAuthFrame.getPassword());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_ADDRESS, remoteAuthFrame.getHostAddress());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_PORT, Integer.toString(remoteAuthFrame.getHostPort()));
-		attributes.setStringAttribute(ConfigFactory.ATTR_KEY_PATH, remoteAuthFrame.getPublicKeyPath());	
-		attributes.setStringAttribute(ConfigFactory.ATTR_KEY_PASSPHRASE, remoteAuthFrame.getPassphrase());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_TIMEOUT, Integer.toString(remoteAuthFrame.getTimeout()));
-		attributes.setBooleanAttribute(ConfigFactory.ATTR_IS_PASSWORD_AUTH, remoteAuthFrame.isPasswordBased());
-		attributes.setStringAttribute(ConfigFactory.ATTR_SYSTEM_WORKSPACE, systemWorkspaceGroup.getString());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CIPHER_TYPE, remoteAuthFrame.getSelectedCipherType().getId());
-	}
-
-	private void createAuthControl(Composite topControl) {
-		AuthenticationFrameMold amold = new AuthenticationFrameMold(Messages.ConfigurationPage_ConnectionFrameTitle);
-		amold.setBitmask(AuthenticationFrameMold.SHOW_HOST_TYPE_RADIO_BUTTON);
-		amold.setLabelLocalhost(Messages.ConfigurationPage_LabelLocalhost);
-		amold.setLabelRemoteHost(Messages.ConfigurationPage_LabelRemoteHost);
-		amold.setLabelHideAdvancedOptions(Messages.ConfigurationPage_LabelHideAdvancedOptions);
-		amold.setLabelHostAddress(Messages.ConfigurationPage_LabelHostAddress);
-		amold.setLabelHostPort(Messages.ConfigurationPage_LabelHostPort);
-		amold.setLabelIsPasswordBased(Messages.ConfigurationPage_LabelIsPasswordBased);
-		amold.setLabelIsPublicKeyBased(Messages.ConfigurationPage_LabelIsPublicKeyBased);
-		amold.setLabelPassphrase(Messages.ConfigurationPage_LabelPassphrase);
-		amold.setLabelPassword(Messages.ConfigurationPage_LabelPassword);
-		amold.setLabelPublicKeyPath(Messages.ConfigurationPage_LabelPublicKeyPath);
-		amold.setLabelPublicKeyPathButton(Messages.ConfigurationPage_LabelPublicKeyPathButton);
-		amold.setLabelPublicKeyPathTitle(Messages.ConfigurationPage_LabelPublicKeyPathTitle);
-		amold.setLabelShowAdvancedOptions(Messages.ConfigurationPage_LabelShowAdvancedOptions);
-		amold.setLabelTimeout(Messages.ConfigurationPage_LabelTimeout);
-		amold.setLabelCipherType(Messages.ConfigurationPage_CipherType);
-		amold.setLabelUserName(Messages.ConfigurationPage_LabelUserName);
-
-		this.remoteAuthFrame = new AuthenticationFrame(topControl, amold);
-//		remoteAuthFrame.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-//		remoteAuthFrame.addModifyListener(dataModifyListener);
-	}
-
-	public Map getAttributes() {
-		return configFactory.getMap();
-	}
-
-	public boolean isValid() {
-		try {
-			remoteAuthFrame.validateFields();
-			configFactory.createTargetConfig();
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-			return false;
-		}
-		return true;
-	}
-
-	public String getName() {
-	    return targetName;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/Messages.java
deleted file mode 100755
index ba22d13..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/Messages.java
+++ /dev/null

@@ -1,62 +0,0 @@
-package org.eclipse.ptp.remotetools.environment.generichost.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Daniel Felix Ferber
- */
-public class Messages extends NLS {
-	private static String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.generichost.ui.messages"; //$NON-NLS-1$
-
-	public static String ConfigurationPage_LabelLocalhost;
-	
-	public static String ConfigurationPage_LabelRemoteHost;
-	
-	public static String ConfigurationPage_LabelHideAdvancedOptions;
-
-	public static String ConfigurationPage_LabelHostAddress;
-
-	public static String ConfigurationPage_LabelHostPort;
-
-	public static String ConfigurationPage_LabelIsPasswordBased;
-
-	public static String ConfigurationPage_LabelIsPublicKeyBased;
-
-	public static String ConfigurationPage_LabelPassphrase;
-
-	public static String ConfigurationPage_LabelPassword;
-
-	public static String ConfigurationPage_LabelPublicKeyPath;
-
-	public static String ConfigurationPage_LabelPublicKeyPathButton;
-
-	public static String ConfigurationPage_LabelUserName;
-
-	public static String ConfigurationPage_LabelTimeout;
-
-	public static String ConfigurationPage_LabelShowAdvancedOptions;
-
-	public static String ConfigurationPage_LabelPublicKeyPathTitle;
-
-	public static String ConfigurationPage_ConnectionFrameTitle;
-
-	public static String ConfigurationPage_DefaultTargetName;
-
-	public static String ConfigurationPage_DialogDescription;
-
-	public static String ConfigurationPage_DialogTitle;
-
-	public static String ConfigurationPage_LabelTargetName;
-
-	public static String ConfigurationPage_LabelSystemWorkspace;
-
-	public static String ConfigurationPage_CipherType;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/messages.properties
deleted file mode 100755
index a12baa8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/messages.properties
+++ /dev/null

@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-ConfigurationPage_DefaultTargetName=Generic Host
-ConfigurationPage_DialogDescription=Properties for connecting to a generic host
-ConfigurationPage_DialogTitle=Generic Host
-ConfigurationPage_LabelTargetName=Target name:
-ConfigurationPage_ConnectionFrameTitle=Host Information
-ConfigurationPage_LabelLocalhost=Localhost
-ConfigurationPage_LabelRemoteHost=Remote host
-ConfigurationPage_LabelHideAdvancedOptions=Simplified
-ConfigurationPage_LabelHostAddress=Host:
-ConfigurationPage_LabelHostPort=Port:
-ConfigurationPage_LabelIsPasswordBased=Password based authentication
-ConfigurationPage_LabelIsPublicKeyBased=Public key based authentication
-ConfigurationPage_LabelPassphrase=Passphrase:
-ConfigurationPage_LabelPassword=Password:
-ConfigurationPage_LabelPublicKeyPath=File with private key:
-ConfigurationPage_LabelPublicKeyPathTitle=Select file with private key
-ConfigurationPage_LabelPublicKeyPathButton=Select
-ConfigurationPage_LabelUserName=User:
-ConfigurationPage_LabelTimeout=Timeout(sec):
-ConfigurationPage_LabelShowAdvancedOptions=Advanced
-ConfigurationPage_LabelSystemWorkspace=Base directory:
-ConfigurationPage_CipherType=Cipher Type:
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project
deleted file mode 100755
index 4d1122a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.launcher</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF
deleted file mode 100755
index 4581db2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.environment.launcher;singleton:=true
-Bundle-Version: 2.0.2.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.cdt.core,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.launch,
- org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.swt,
- org.eclipse.ui,
- org.eclipse.ui.console,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.core.variables,
- org.eclipse.cdt.managedbuilder.core,
- org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.utils.ui;bundle-version="1.0.0",
- org.eclipse.ptp.utils.core;bundle-version="1.0.0"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.remotetools.environment.launcher,
- org.eclipse.ptp.remotetools.environment.launcher.core,
- org.eclipse.ptp.remotetools.environment.launcher.data,
- org.eclipse.ptp.remotetools.environment.launcher.macros,
- org.eclipse.ptp.remotetools.environment.launcher.preferences,
- org.eclipse.ptp.remotetools.environment.launcher.ui,
- org.eclipse.ptp.remotetools.environment.launcher.variables

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties
deleted file mode 100755
index 647fcc0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif
deleted file mode 100755
index 4bb3ed5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png
deleted file mode 100755
index 107a6e9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png
deleted file mode 100755
index fc9be20..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png
deleted file mode 100755
index 3d5868f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties
deleted file mode 100755
index 1afc4d7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-
-pluginName=PTP Remote Tools Application Launcher
-pluginProvider=Eclipse.org
-
-# Eclipse variables description
-UserWorkspaceVariableDescription=A dynamic variable that indicates from where a connection to a remote system comes from/
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml
deleted file mode 100755
index 97bc93c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="observer" name="org.eclipse.ptp.remotetools.environment.launcher" schema="schema/launcherObserver.exsd"/>
-
-	<extension-point
-			id="launchConfigurationMacroSupplier"
-			name="Launch Configuration Macro Supplier"
-			schema="schema/launchConfigurationMacroSupplier.exsd">
-	</extension-point>
-   
-	<extension
-			point="org.eclipse.core.variables.dynamicVariables">
-		<variable
-				name="user_workspace"
-				description="%UserWorkspaceVariableDescription"
-				resolver="org.eclipse.ptp.remotetools.environment.launcher.variables.RemoteWorkspaceResolver">
-		</variable>
-	</extension>
- <extension
-       point="org.eclipse.core.runtime.preferences">
-    <initializer class="org.eclipse.ptp.remotetools.environment.launcher.preferences.PreferenceInitializer"/>
- </extension>
- <extension
-       point="org.eclipse.ui.preferencePages">
-    <page
-          category="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage"
-          class="org.eclipse.ptp.remotetools.environment.launcher.preferences.LauncherPreferencePage"
-          id="org.eclipse.ptp.remotetools.environment.launcher.LauncherPreferencePage"
-          name="Launcher"/>
- </extension>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd
deleted file mode 100755
index 4d17ec5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd
+++ /dev/null

@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.launcher">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.launcher" id="launchConfigurationMacroSupplier" name="Launch Configuration Macro Supplier"/>
-      </appInfo>
-      <documentation>
-         This extension point allows to contribute with new Launch Macro Suppliers to a specific Launcher Delegate.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="launchConfigurationMacroSupplier"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  An optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  An optional name of the extension instance.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="launchConfigurationMacroSupplier">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Id of this Launch Configuration Macro Supplier.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="configTypeId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Launch Configuration Type to which this Launch Configuration Macro Supplier is related to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchConfigurationMacroSupplier.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchConfigurationMacroSupplier"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The classes referenced by this extension point must implement the ILaunchConfigurationMacroSupplier.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006 IBM Corporation.&lt;br&gt;
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;&lt;br&gt;
-Contributors:&lt;br&gt;
-    IBM Corporation - initial implementation
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd
deleted file mode 100755
index 7493290..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd
+++ /dev/null

@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.launcher">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.launcher" id="observer" name="launcherObserver"/>
-      </appInfo>
-      <documentation>
-         Implements an observer that receives STDOUT from a remote application.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="observer"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="observer">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java
deleted file mode 100755
index b2efc63..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchIntegration;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.LaunchObserverIterator;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.RemoteLaunchProcess;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RemoteLauncherPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.remotetools.environment.launcher"; //$NON-NLS-1$
-	public static final String OBERVER_EXTENSION_ID = "org.eclipse.ptp.remotetools.environment.launcher.observer"; //$NON-NLS-1$
-
-	// The shared instance
-	private static RemoteLauncherPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public RemoteLauncherPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static RemoteLauncherPlugin getDefault() {
-		return plugin;
-	}
-
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-	
-	public static LaunchObserverIterator getLaunchObserverIterator() {
-		return new LaunchObserverIterator();
-	}
-	
-	public static ILaunchObserver getLaunchObserverByID(String id) {
-		if (id == null) return null;
-		LaunchObserverIterator iterator = getLaunchObserverIterator();
-		while (iterator.hasMoreElements()) {
-			iterator.nextElement();
-			if (iterator.getName().equals(id)) {
-				return iterator.getInstance();
-			}
-		}
-		return null;
-	}
-
-	public static void throwCoreException(String message) throws CoreException {
-		Status status = new Status(IStatus.ERROR, PLUGIN_ID, 0, message, null);
-		CoreException exception = new CoreException(status);
-		throw exception;
-	}
-
-	public static void throwCoreException(String message, int errorCode) throws CoreException {
-		Status status = new Status(IStatus.ERROR, PLUGIN_ID, errorCode, message, null);
-		CoreException exception = new CoreException(status);
-		throw exception;
-	}
-	
-	public static ILaunchProcess createRemoteLaunchProcess(ILaunch launch, ExecutionConfiguration configuration, ILaunchIntegration launchIntegration) {
-		return new RemoteLaunchProcess(launch, configuration, launchIntegration);
-	}
-
-	public static void throwCoreException(String message, RemoteConnectionException e) throws CoreException {
-		Status status = new Status(IStatus.ERROR, PLUGIN_ID, 0, message, e);
-		CoreException exception = new CoreException(status);
-		throw exception;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java
deleted file mode 100755
index 3cfe0ed..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-
-
-/**
- * Provides implementation of additional operations that are required to launch the application.
- * The most important purpose is to provide the command line(s) that launch the application.
- * It has the opportunity to collaborate with customization on any step of the launch.
- * @author Daniel Felix Ferber
- */
-public interface ILaunchIntegration {
-	public void prepareUploadWorkingDir() throws CoreException, CancelException;
-	public void finishUploadWorkingDir() throws CoreException, CancelException;
-	public void prepareApplication() throws CoreException, CancelException;
-	public void finalizeApplication() throws CoreException, CancelException;
-	public void finalizeWorkingDir() throws CoreException, CancelException;	
-	public void finalizeCleanup() throws CoreException, CancelException;	
-	
-	public void prepareLaunch() throws CoreException, CancelException;
-	public void finalizeLaunch() throws CoreException, CancelException;
-	
-	/**
-	 * The command line used to launch the application.
-	 * Used to customize how the application shall be launched.
-	 * Typically, the command line also launches a debugger or a profiler tool.
-	 * @param applicationFullPath Full path where the application executable is stored on the remote host.
-	 * @param arguments Parameters that shall be passed to the application.
-	 * @return An array of strings, each element is a line of the script.
-	 * @throws CoreException
-	 */
-	public String [] createLaunchScript(String applicationFullPath, String[] arguments) throws CoreException;
-	/**
-	 * Query if the application shall be launched. 
-	 * By default, the launcher uploads and executes the application.
-	 * Return false to implement an "attach to remote process" feature.
-	 * @return true/false
-	 * @throws CoreException
-	 */
-	public boolean getDoLaunchApplication() throws CoreException;
-	
-	/**
-	 * Notifies the launch integration that the lauch has just started.
-	 * @throws CoreException
-	 */
-	public void start() throws CoreException;
-	/**
-	 * Notifies the launch integration that the lauch is going to finish.
-	 * @throws CoreException
-	 */
-	public void finish() throws CoreException;
-	/**
-	 * Notifies the launch integration which execution manager is being used to
-	 * run commands on the remote host.
-	 * @throws CoreException
-	 */
-
-	public void setExecutionManager(IRemoteExecutionManager manager);
-	/**
-	 * Notifies the launch integration that the lauch is going to clean up the remote working directory.
-	 * @throws CoreException
-	 */
-
-	public void cleanup();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java
deleted file mode 100755
index 7f5360d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-/**
- * A listener that receives the application output and allows adding customization steps.
- * The launch observers are defined by extension points.
- * The user can select one launch observer to observer de application execution.
- * @author Daniel Felix Ferber
- */
-public interface ILaunchObserver extends ILaunchIntegration {
-	void receiveOutput(String text);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java
deleted file mode 100755
index fc0b063..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionResult;
-
-
-/**
- * Definition of the remote launch.
- * @author Daniel Felix Ferber
- *
- */
-public interface ILaunchProcess  {
-	public void addProgressListener(ILaunchProgressListener progressListener);
-	public void removeProgressListener(ILaunchProgressListener progressListener);
-	
-	public void setLaunchObserver(ILaunchObserver launchObserver);
-	
-	public ILaunchObserver getObserver();
-	public ILaunchIntegration getLaunchIntegration();
-	public ExecutionConfiguration getConfiguration();
-	public IRemoteExecutionManager getExecutionManager();
-	public ILaunchConfiguration getLaunchConfiguration();
-	
-	public int getCurrentProgress();
-	public ExecutionResult getFinalResult();
-
-	public ILaunch getLaunch();
-	
-	public void run(IRemoteExecutionManager manager);
-	public void markAsCanceled();
-	
-	public void showProcessConsole();
-	public void showLaunchConsole();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java
deleted file mode 100755
index 37fa60c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-/**
- * A listener that is called each time the launch advances one step.
- * Useful for updating the progress bar.
- * @author Daniel Felix Ferber
- */
-public interface ILaunchProgressListener {
-	// Launch progress
-	public static final int UNDEFINED = 0;
-	public static final int WAIT = 1;
-	public static final int PREPARE_WORKING_DIR1 = 2;
-	public static final int UPLOAD_WORKING_DIR = 3;
-	public static final int PREPARE_WORKING_DIR2 = 4;
-	public static final int UPLOAD_APPLICATION = 5;
-	public static final int PREPARE_APPLICATION = 6;
-	public static final int RUNNING = 7;
-	public static final int FINALIZE_APPLICATION = 8;
-	public static final int DOWNLOAD_WORKING_DIR = 9;
-	public static final int FINALIZE_WORKING_DIR2 = 10;
-	public static final int CLEANUP = 11;
-	public static final int FINALIZE_CLEANUP = 12;
-	public static final int FINISHED = 13;
-	void notifyProgress(int progress);
-	void notifyInterrupt();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java
deleted file mode 100755
index a423816..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-/**
- * Definition of key names and default values that are used by the launcher.
- * @author Daniel Felix Ferber
- */
-public interface IRemoteLaunchAttributes {
-	public static final String LAUNCH_ID = "org.eclipse.ptp.remotetools.environment.launcher.core"; //$NON-NLS-1$
-	
-	public static final String ATTR_AUTOMATIC_WORKING_DIRECTORY = LAUNCH_ID + ".AUTO_REMOTE_DIRECTORY"; //$NON-NLS-1$
-	public static final String ATTR_REMOTE_DIRECTORY = LAUNCH_ID + ".REMOTE_DIRECTORY"; //$NON-NLS-1$
-	/** @deprecated */
-	public static final String ATTR_LOCAL_DIRECTORY = LAUNCH_ID + ".LOCAL_DIRECTORY"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_BEFORE = LAUNCH_ID + ".SYNC_BEFORE"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_AFTER = LAUNCH_ID + ".SYNC_AFTER"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_CLEANUP = LAUNCH_ID + ".SYNC_CLEANUP"; //$NON-NLS-1$
-	public static final String ATTR_USE_FORWARDED_X11 = LAUNCH_ID + ".FORWARD_X11"; //$NON-NLS-1$
-	public static final String ATTR_OUTPUT_OBSERVER = LAUNCH_ID + ".OUTPUT_OBSERVER";  //$NON-NLS-1$
-	public static final String ATTR_BEFORE_COMMAND = LAUNCH_ID + ".BEFORE_COMMAND";  //$NON-NLS-1$
-	public static final String ATTR_AFTER_COMMAND = LAUNCH_ID + ".AFTER_COMMAND"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_RULES = LAUNCH_ID + ".SYNC_RULES"; //$NON-NLS-1$
-	
-	public static final boolean DEFAULT_AUTOMATIC_WORKING_DIRECTORY = true;
-	public static final String DEFAULT_LOCAL_DIRECTORY = ""; //$NON-NLS-1$
-	public static final boolean DEFAULT_SYNC_BEFORE = true;
-	public static final boolean DEFAULT_SYNC_AFTER = true;
-	public static final boolean DEFAULT_SYNC_CLEANUP = true;
-	public static final boolean DEFAULT_USE_FORWARDED_X11 = false;
-	public static final String DEFAULT_AFTER_COMMAND = null;
-	public static final String DEFAULT_BEFORE_COMMAND = null;
-	public static final String DEFAULT_OUTPUT_OBSERVER = null;
-	public static final String DEFAULT_BEFORE_FILES = ""; //$NON-NLS-1$
-	public static final String DEFAULT_AFTER_FILES = ""; //$NON-NLS-1$
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java
deleted file mode 100755
index 13ebbc3..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-public interface IRemoteLaunchErrors {
-	public static int INVALID_RULE = 1;
-	public static int INVALID_EXECUTION_CONFIGURATION = 2;
-	public static int ERROR_PARSING_RULE = 3;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java
deleted file mode 100755
index b48c380..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-public class LinuxPath {
-	public static String toString(IPath path) {
-		return path.toString();
-	}
-
-	public static IPath fromString(String location) {
-		return new Path(location);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java
deleted file mode 100755
index e91585a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.core.messages"; //$NON-NLS-1$
-
-	public static String RemoteLaunchDelegate_LocalDirectory_DoesNotExist;
-
-	public static String RemoteLaunchDelegate_LocalDirectory_IsNotADirectory;
-
-	public static String RemoteLaunchDelegate_LocalDirectory_Missing;
-
-	public static String RemoteLaunchDelegate_LocalDirectory_MustBeAbsolute;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MacroFailed;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MacroFailed_Unknown;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_Missing;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MissingInPreferences;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MustBeAbsolute;
-
-	public static String ExecutionConfiguration_Error_MissingExecutable;
-
-	public static String ExecutionConfiguration_Error_MissingLocalRemoteDirectory;
-
-	public static String ExecutionConfiguration_Error_MissingProject;
-
-	public static String ExecutionConfiguration_Error_MissingRemoteWorkingDirectory;
-
-	public static String RemoteLaunchDelegate_SynchronizationRules_InternalError;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java
deleted file mode 100755
index adaa5db..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.RemoteLaunchProcess;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-
-
-/**
- * A dummy void launch integration that can be used as base class for further specialization.
- * @author Daniel Felix Ferber
- */
-public class NullLaunchIntegration implements ILaunchIntegration {
-
-	public String[] createLaunchScript(String applicationFullPath, String[] arguments) throws CoreException {
-		String result [] = new String [1];
-		result[0] = RemoteLaunchProcess.createCommandLine(applicationFullPath, arguments);
-		return result;
-	}
-
-	public void cleanup() {
-	}
-
-	public void finalizeCleanup() throws CoreException, CancelException {
-	}
-
-	public void finalizeApplication() throws CoreException, CancelException {
-	}
-
-	public void finalizeWorkingDir() throws CoreException, CancelException {
-	}
-
-	public void finish() throws CoreException {
-	}
-
-	public void finishUploadWorkingDir() throws CoreException, CancelException {
-	}
-
-	public void prepareApplication() throws CoreException, CancelException {
-	}
-
-	public void prepareUploadWorkingDir() throws CoreException, CancelException {
-	}
-
-	public void setExecutionManager(IRemoteExecutionManager manager) {
-	}
-
-	public void start() throws CoreException {
-	}
-
-	public boolean getDoLaunchApplication() throws CoreException {
-		return true;
-	}
-
-	public void finalizeLaunch() throws CoreException, CancelException {
-	}
-
-	public void prepareLaunch() throws CoreException, CancelException {
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java
deleted file mode 100755
index 28d4272..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java
+++ /dev/null

@@ -1,492 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.RuleFactory;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.integration.NullLaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.macros.LaunchVariableManager;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableContextInfo;
-import org.eclipse.ptp.remotetools.environment.launcher.preferences.LaunchPreferences;
-
-/**
- * Implementation of utility methods to retrieve information from a remote launch configuration.
- * @author Daniel Felix Ferber
- */
-public abstract class RemoteLaunchDelegate extends
-		AbstractCLaunchDelegate {
-
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.launch.AbstractCLaunchDelegate#getPluginID()
-	 */
-	public String getPluginID() {
-		return RemoteLauncherPlugin.getUniqueIdentifier();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#finalLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean finalLaunchCheck(ILaunchConfiguration configuration,
-			String mode, IProgressMonitor monitor) throws CoreException {
-		return super.finalLaunchCheck(configuration, mode, monitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean preLaunchCheck(ILaunchConfiguration configuration,
-			String mode, IProgressMonitor monitor) throws CoreException {
-		return super.preLaunchCheck(configuration, mode, monitor);
-	}
-	
-	/**
-	 * Returns the <b>local</b> working directory of the launch
-	 * configuration. 
-	 * 
-	 * If the local working directory is not specified in the launch configuration,
-	 * the the project directory is assumed as fallback.
-	 * 
-	 * If the directory is not absolute, then it is interpreted as a directory
-	 * relative to the workspace.
-	 * 
-	 * Returns <code>null</code> if no fall back information is available.
-	 * 
-	 * @param configuration
-	 *            launch configuration.
-	 * @return an absolute path to a directory in the remote file system, or
-	 *         <code>null</code> if not available.
-	 * @throws CoreException
-	 *             On failre to retrieve the attributes
-	 *             
-	 * @deprecated This property was removed from the launcher tab.
-	 */
-	protected IPath getLocalDirectoryWithFallback(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String location = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_LOCAL_DIRECTORY, (String) null);
-		if (location != null || location.length() == 0) {
-			// Fallback to user project directory
-			ICProject cp = getCProject(configuration);
-			if (cp != null) {
-				IProject p = cp.getProject();
-				return p.getLocation();
-			}
-			return null;
-		}
-		
-		IPath path = new Path(location);
-		if (! path.isAbsolute()) {
-			IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
-			return folder.getLocation();
-		}
-		
-		return new Path(location);
-	}
-
-	/**
-	 * Returns the verified <b>local</b> working directory specified by the
-	 * given launch configuration.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the <b>local</b> working directory specified by the given
-	 *         launch configuration
-	 * @exception CoreException
-	 *                <ul>
-	 *                <li>On failure to retrieve the attribute.
-	 *                <li>If not absolute.
-	 *                <li>If the directory does not exist on the local file system.
-	 *                <li>If not a directory on the local file system.
-	 *                </ul>
-	 * @deprecated
-	 */
-	public File getValidatedLocalDirectory(ILaunchConfiguration configuration)
-			throws CoreException {
-		// ok
-		
-		IPath path = getLocalDirectoryWithFallback(configuration);
-		if (path == null) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_Missing, null, 0);
-		} 
-
-		if (! path.isAbsolute()) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_MustBeAbsolute, null, 0);
-		} 
-			
-		File directory = path.toFile();
-		if (! directory.exists()) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_DoesNotExist, null, 0);
-		}
-		if (! directory.isDirectory()) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_IsNotADirectory, null, 0);
-		}
-
-		return directory;
-	}
-
-	/**
-	 * Returns the <b>local</b> working directory attribute of the given launch
-	 * configuration. Returns <code>null</code> if a working directory is not
-	 * specified.
-	 * 
-	 * @param configuration
-	 *            launch configuration.
-	 * @return an absolute path to a directory in the remote file system, or
-	 *         <code>null</code> if unspecified.
-	 * @throws CoreException
-	 *             On failre to retrieve the attributes
-	 *             
-	 * @deprecated This property was removed from the launcher tab.
-	 */
-	public IPath getLocalDirectory(ILaunchConfiguration config)
-			throws CoreException {
-		// ok
-		return getLocalDirectoryWithFallback(config);
-	}
-	
-	/**
-	 * Returns the <b>remote</b> working directory of the launch
-	 * configuration.
-	 * No macros are expanded. To expand macros, use {@link #getValidatedRemoteDirectory(ILaunchConfiguration)}.
-	 * 
-	 * @param configuration
-	 *            The launch configuration.
-	 * @return path to a directory in the remote file system, or
-	 *         <code>null</code> if unspecified.
-	 * @throws CoreException
-	 *             On failure the get the attribute.
-	 */
-	public IPath getRemoteDirectory(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String location = null;
-		if (configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, false)) {
-			location = LaunchPreferences.getPreferenceStore().getString(LaunchPreferences.ATTR_WORKING_DIRECTORY);
-		} else {
-			location = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, (String)null);
-		}
-		
-		if (location == null) {
-			return null;
-		}
-		
-		try {
-			location = LaunchVariableManager.getDefault().resolveValue(location, EMPTY_STRING, EMPTY_STRING, ILaunchVariableContextInfo.CONTEXT_LAUNCH, configuration);
-		} catch (CoreException e) {
-			return null;
-		}
-		
-		if (location == null) {
-			return null;
-		}
-		return LinuxPath.fromString(location);
-	}
-	
-	/**
-	 * Returns the <b>remote</b> working directory of the launch
-	 * configuration.
-	 *
-	 * 
-	 * @param configuration
-	 *            The launch configuration.
-	 * @return path to a directory in the remote file system, or
-	 *         <code>null</code> if unspecified.
-	 * @throws CoreException 
-	 * @throws CoreException
-	 * <ul>
-	 * <li>On failure the get the attribute.
-	 * <li>On failure to resolve macros
-	 * <li>If the path is not absolure.
-	 * </ul>
-	 */
-	public IPath getValidatedRemoteDirectory(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String location = null;
-		if (configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, false)) {
-			location = LaunchPreferences.getPreferenceStore().getString(LaunchPreferences.ATTR_WORKING_DIRECTORY);
-			if (location == null || location.length() == 0) {
-				abort(Messages.RemoteLaunchDelegate_RemoteDirectory_MissingInPreferences, null, 0);
-			}
-		} else {
-			location = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, (String)null);
-			if (location == null || location.length() == 0) {
-				abort(Messages.RemoteLaunchDelegate_RemoteDirectory_Missing, null, 0);
-			}
-		}
-		try {
-			location = LaunchVariableManager.getDefault().resolveValue(location, EMPTY_STRING, EMPTY_STRING, ILaunchVariableContextInfo.CONTEXT_LAUNCH, configuration);
-		} catch (CoreException e) {
-			abort(NLS.bind(Messages.RemoteLaunchDelegate_RemoteDirectory_MacroFailed, e.getMessage()), e, 0);
-		}
-		if (location == null) {
-			abort(Messages.RemoteLaunchDelegate_RemoteDirectory_MacroFailed_Unknown, null, 0);
-		}
-		IPath path = LinuxPath.fromString(location);
-		if (! path.isAbsolute()) {
-			abort(Messages.RemoteLaunchDelegate_RemoteDirectory_MustBeAbsolute, null, 0);
-		}
-		return path;
-	}
-
-	/**
-	 * Return whether synchronization before launch is activated in the launch configuration.
-	 * 
-	 * @param configuration The launch configuration
-	 * @return True/False.
-	 * 
-	 * @throws CoreException On failure the get the attribute.
-	 */
-	public boolean getSynchronizeBefore(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_BEFORE, IRemoteLaunchAttributes.DEFAULT_SYNC_BEFORE);
-	}
-
-	/**
-	 * Return whether synchronization after launch is activated in the launch configuration.
-	 * 
-	 * @param configuration The launch configuration
-	 * @return True/False.
-	 * 
-	 * @throws CoreException On failure the get the attribute.
-	 */
-	public boolean getSynchronizeAfter(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_AFTER, IRemoteLaunchAttributes.DEFAULT_SYNC_AFTER);
-	}
-
-	/**
-	 * Return whether X11 forwarding is activated in the launch configuration.
-	 * 
-	 * @param configuration The launch configuration
-	 * @return True/False.
-	 * 
-	 * @throws CoreException On failure the get the attribute.
-	 */
-	public boolean getUseForwardedX11(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_USE_FORWARDED_X11, IRemoteLaunchAttributes.DEFAULT_USE_FORWARDED_X11);
-	}	
-
-	/**
-	 * Return the observer plug-in that will parse output of the launch configuration.
-	 * 
-	 * @param configuration
-	 *            The launch configuration.
-	 * @return The observer plug-in or a void observer if no was selected.
-	 * @throws CoreException
-	 *             If the given observer does not exist.  On failure the get the attribute.
-	 */
-	public ILaunchObserver getOutputObserver(
-			ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String id = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, (String)null);
-		if (id == null) {
-			return new NullLaunchObserver();
-		}
-		
-		ILaunchObserver launchObserver = RemoteLauncherPlugin.getLaunchObserverByID(id);
-		if (launchObserver == null) {
-			return new NullLaunchObserver();
-		}
-		return launchObserver;
-	}
-
-// not needed anymore.
-//	protected static void throwsCoreException(String message, Throwable exception, int code) throws CoreException {
-//		MultiStatus status = new MultiStatus(Activator.getUniqueIdentifier(), code, message, exception);
-//		status.add(new Status(IStatus.ERROR, Activator.getUniqueIdentifier(), code, exception == null ? "" : exception.getLocalizedMessage(), //$NON-NLS-1$
-//				exception));
-//		throw new CoreException(status);
-//	}
-	
-	public String getBeforeCommand(ILaunchConfiguration configuration) {
-		// ok
-		try {
-			return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, (String)null);
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-	public String getAfterCommand(ILaunchConfiguration configuration) {
-		// ok
-		try {
-			return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, (String)null);
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-	
-//	not used anymore
-//	protected String getRemoteRelativePath(ILaunchConfiguration configuration, String path) throws CoreException {
-//		IPath base = getRemoteDirectory(configuration);
-//		if (path == null) {
-//			return base.toString();
-//		} else if (isRemoteAbsolutePath(path)) {
-//			return path;
-//		} else {
-//			if (base == null) {
-//				abort(
-//						"Synchronization of remote files with relative paths are is not allowed without specifying remote working directory",
-//						new FileNotFoundException(base.toOSString()),
-//						ICDTLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST
-//				);
-//			}
-//			return  concatenateRemotePath(LinuxPath.toString(base), path);
-//		}
-//	}
-	
-//	protected String getLocalRelativePath(ILaunchConfiguration configuration, String path) throws CoreException {
-//		if (path == null) {
-//			return null;
-//		} else {
-//			return getLocalRelativePath(configuration, new Path(path));
-//		}
-//	}
-		
-//	protected String getLocalRelativePath(ILaunchConfiguration configuration, IPath path) throws CoreException {
-//		if (path == null) {
-//			return null;
-//		} else if (path.isAbsolute()) {
-//			return path.toOSString();
-//		} else {
-//			IPath base = getLocalDirectory(configuration);
-//			if (base == null) {
-//				abort(
-//						"Synchronization of local files with relative paths are is not allowed without specifying local working directory or project",
-//						new FileNotFoundException(base.toString()),
-//						ICDTLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST
-//				);
-//			}
-//			IPath basePath = new Path(base.toString());
-//			return basePath.append(path).toOSString();
-//		}
-//	}
-
-
-	protected boolean getSynchronizeCleanup(ILaunchConfiguration configuration) {
-		boolean result;
-		try {
-			result = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_CLEANUP, IRemoteLaunchAttributes.DEFAULT_SYNC_CLEANUP);
-			return result;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-	
-	protected static boolean getAllocateTerminal(ILaunchConfiguration configuration) {
-		boolean result;
-		try {
-			result = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT);
-			return result;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-	
-//	private String concatenateRemotePath(String sp1, String sp2) {
-//		IPath p = new Path(sp1);
-//		p = p.append(sp2);
-//
-//		return p.toOSString();
-//	}
-	
-//	private String parentOfRemotePath(String spath) {
-//		IPath p = new Path(spath);
-//		p = p.removeLastSegments(1);
-//		return p.toOSString();
-//	}
-//	
-//	private String suffixOfRemotePath(String path) {
-//		if (isRemoteDirectoryPath(path)) {
-//			return null;
-//		} else {
-//			int index = path.lastIndexOf('/');
-//			if (index == -1) return null;
-//			return removeTrailingSlash(path.substring(index));
-//		}		
-//	}
-//	
-//	private String addTrailingSlash(String path) {
-//		if (path.endsWith("/")) {
-//			return path;
-//		} else {
-//			return path + "/";
-//		}
-//	}
-
-//	private String removeTrailingSlash(String path) {
-//		if (path.endsWith("/")) {
-//			return path.substring(0, path.length() - 1);
-//		} else {
-//			return path;
-//		}
-//	}
-//
-//	private boolean isRemoteDirectoryPath(String path) {
-//		return path.endsWith("/");
-//	}
-//	
-//	private boolean isRemoteAbsolutePath(String path) {
-//		return path.startsWith("/");
-//	}
-
-//	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-//		
-//	}
-	/**
-	 * Returns the (possible empty) list of synchronization rule objects according to the rules described in the configuration.
-	 */
-	protected ISynchronizationRule[] getSynchronizeRules(ILaunchConfiguration configuration) throws CoreException {
-		List ruleStrings = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_RULES, new ArrayList());
-		List result = new ArrayList();
-		
-		for (Iterator iter = ruleStrings.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			try {
-				ISynchronizationRule rule = RuleFactory.createRuleFromString(element);
-				result.add(rule);
-			} catch (RuntimeException e) {
-				abort(Messages.RemoteLaunchDelegate_SynchronizationRules_InternalError, e, IRemoteLaunchErrors.ERROR_PARSING_RULE);
-			}
-		}
-		
-		return (ISynchronizationRule[]) result.toArray(new ISynchronizationRule[result.size()]);
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties
deleted file mode 100755
index e0867ef..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-RemoteLaunchDelegate_LocalDirectory_Missing=Missing value for local working directory.
-RemoteLaunchDelegate_RemoteDirectory_Missing=The value for remote working directory is missing.
-RemoteLaunchDelegate_LocalDirectory_MustBeAbsolute=The local working directory must be an absolute path.
-RemoteLaunchDelegate_LocalDirectory_DoesNotExist=The local working directory does not exist.
-RemoteLaunchDelegate_RemoteDirectory_MacroFailed=Failed to resolve macros for remote working directory
-RemoteLaunchDelegate_LocalDirectory_IsNotADirectory=The local working directory is not a path to a directory.
-RemoteLaunchDelegate_RemoteDirectory_MissingInPreferences=The default value for remote working directory is missing in the preferences for Remote Tools Application Launcher.
-RemoteLaunchDelegate_RemoteDirectory_MacroFailed_Unknown=Failed to resolve macros for remote working directory (unknown reason).
-RemoteLaunchDelegate_RemoteDirectory_MustBeAbsolute=The remote working directory must be an absolute path.
-ExecutionConfiguration_Error_MissingProject=No project specified for remote launch.
-ExecutionConfiguration_Error_MissingExecutable=No executable specified for remote launch.
-ExecutionConfiguration_Error_MissingRemoteWorkingDirectory=No remote working directory specified for remote launch.
-ExecutionConfiguration_Error_MissingLocalRemoteDirectory=No local working directory specified for remote launch.
-RemoteLaunchDelegate_SynchronizationRules_InternalError=Internal error while reading synchronization rule from launch configuration.

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java
deleted file mode 100755
index 93f0f18..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java
+++ /dev/null

@@ -1,399 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchErrors;
-
-/*
- * Represents an upload rule.
- * It describes how to copy a list of local files or local directories into a single remote directory.
- * A local file is copied into the remote directory.
- * A local directory has its content copied recursively into the remote directory.
- */
-public class DownloadRule implements ISynchronizationRule {
-	private int overwritePolicy = OverwritePolicies.UNKNOWN;
-
-	private boolean asReadOnly = false;
-	private boolean asExecutable = false;
-	private boolean preserveTimeStamp = false;
-	
-	/** Local destiny directory where the files are downloaded into. */
-	private String localDirectory = null;
-	
-	/**
-	 * List of remote source paths, represented as strings.
-	 * They may be files or directories.
-	 */
-	private List remoteFileList = new ArrayList();
-
-	/*
-	 * Default constructor.
-	 */
-	public DownloadRule() {
-
-	}
-
-	/*
-	 * Creates de rule from a serialized string.
-	 */
-	public DownloadRule(String data) {
-		/*
-		 * Split the string into lines.
-		 */
-		String list[] = data.split("\n"); //$NON-NLS-1$
-		/*
-		 * Check if the first token is the proper identifier. If not, the string does not represent a rule that
-		 * can be parsed by this class.
-		 */
-		{
-			if (list.length < 1) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-			String s = list[0];
-			if (! s.equalsIgnoreCase(SerializationKeys.TYPE_DOWNLOAD)) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-		}
-		for (int i = 1; i < list.length; i++) {
-			String s = list[i];
-			/*
-			 * Split key from data.
-			 */
-			int p = s.indexOf(' ');
-			if (p == -1) {
-				logError("Invalid rule entry: "+s); //$NON-NLS-1$
-				continue;
-			}
-			String key = s.substring(0, p);
-			String value = s.substring(p + 1);
-			parseEntry(key, value);
-		}
-	}
-	
-	public DownloadRule(DownloadRule rule) {
-		this.overwritePolicy = rule.overwritePolicy;
-		this.asReadOnly = rule.asReadOnly;
-		this.asExecutable = rule.asExecutable;
-		this.preserveTimeStamp = rule.preserveTimeStamp;
-		if (rule.localDirectory != null) {
-			this.localDirectory = new String(rule.localDirectory);
-		} else {
-			this.localDirectory = null;
-		}
-		this.remoteFileList = new ArrayList(rule.remoteFileList);
-	}
-
-	private void throwError(String string) {
-		throw new RuntimeException(string);		
-	}
-
-	private void parseEntry(String key, String value) {
-		if (key.equalsIgnoreCase(SerializationKeys.KEY_LOCAL_PATH)) {
-			localDirectory = value;
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY)) {
-			if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS)) {
-				overwritePolicy = OverwritePolicies.ALWAYS;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ASK)) {
-				overwritePolicy = OverwritePolicies.ASK;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_NEWER)) {
-				overwritePolicy = OverwritePolicies.NEWER;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_SKIP)) {
-				overwritePolicy = OverwritePolicies.SKIP;
-			} else {
-				logError("Unknown overwrite policy: "+value); //$NON-NLS-1$
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_FLAGS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_TIMESTAMP)) {
-					preserveTimeStamp = true;
-				} else {
-					logError("Unknown flag: "+flag); //$NON-NLS-1$
-				}
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_REMOTE_PATH)) {
-			remoteFileList.add(value);
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_EXECUTABLE)) {
-					asExecutable = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_READONLY)) {
-					asReadOnly = true;
-				} else {
-					logError("Unknown permission: "+flag); //$NON-NLS-1$
-				}
-			}			
-		} else {
-			logError("Unknown key: "+key); //$NON-NLS-1$
-		}
-	}
-
-	private void logError(String string) {
-		// TODO Auto-generated method stub
-	}
-
-	/*
-	 * The rule as a serialized string.
-	 */
-	public String toString() {
-		List l = new ArrayList();
-		if (localDirectory != null) {
-			l.add(SerializationKeys.KEY_LOCAL_PATH+" "+localDirectory.trim()); //$NON-NLS-1$
-		}
-		if (overwritePolicy == OverwritePolicies.ALWAYS) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.ASK) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ASK);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.NEWER) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_NEWER);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.SKIP) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_SKIP);			 //$NON-NLS-1$
-		}
-		if (asExecutable || asReadOnly) {
-			String s = SerializationKeys.KEY_PERMISSIONS;
-			if (asExecutable) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_EXECUTABLE; //$NON-NLS-1$
-			}
-			if (asReadOnly) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_READONLY; //$NON-NLS-1$
-			}
-			l.add(s);
-		}
-		if (preserveTimeStamp) {
-			String s = SerializationKeys.KEY_FLAGS;
-			if (preserveTimeStamp) {
-				s += " " + SerializationKeys.KEY_FLAGS_TIMESTAMP; //$NON-NLS-1$
-			}
-			l.add(s);			
-		}
-		for (Iterator iter = remoteFileList.iterator(); iter.hasNext();) {
-			String remotePath = (String) iter.next();
-			if (remotePath == null) continue;
-			if (remotePath.trim().length() == 0) continue;
-			
-			l.add(SerializationKeys.KEY_REMOTE_PATH+" "+remotePath.trim());  //$NON-NLS-1$
-		}
-		String result = new String(SerializationKeys.TYPE_DOWNLOAD);
-		for (Iterator iter = l.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			result += "\n" + element; //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public boolean isAsExecutable() {
-		return asExecutable;
-	}
-
-	public void setAsExecutable(boolean asExecutable) {
-		this.asExecutable = asExecutable;
-	}
-
-	public boolean isAsReadOnly() {
-		return asReadOnly;
-	}
-
-	public void setAsReadOnly(boolean asReadOnly) {
-		this.asReadOnly = asReadOnly;
-	}
-
-	public int getOverwritePolicy() {
-		return overwritePolicy;
-	}
-
-	public void setOverwritePolicy(int overwritePolicy) {
-		this.overwritePolicy = overwritePolicy;
-	}
-
-	public boolean isPreserveTimeStamp() {
-		return preserveTimeStamp;
-	}
-
-	public void setPreserveTimeStamp(boolean preserveTimeStamp) {
-		this.preserveTimeStamp = preserveTimeStamp;
-	}
-
-	public String getLocalDirectory() {
-		if (localDirectory != null) {
-			return localDirectory.trim();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setLocalDirectory(String localDirectory) {
-		if (localDirectory != null) {
-			this.localDirectory = localDirectory.trim();
-		} else {
-			this.localDirectory = null;
-		}
-	}
-	
-	public int getRemoteFileCount() {
-		return remoteFileList.size();
-	}
-	
-	public String [] getRemoteFilesAsStringArray() {
-		String result [] = new String [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = (String) remoteFileList.get(i);
-		}
-		return result;
-	}
-
-	public IPath [] getRemoteFilesAsPathArray() {
-		IPath result [] = new IPath [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new Path((String) remoteFileList.get(i));
-		}
-		return result;
-	}
-
-	public File [] getRemoteFilesAsFileArray() {
-		File result [] = new File [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new File((String) remoteFileList.get(i));
-		}
-		return result;
-	}
-	
-	public class RemoteFileIteratorAsString implements Iterator {
-		Iterator iteratorref = remoteFileList.iterator();
-		
-		public boolean hasNext() {
-			return iteratorref.hasNext();
-		}
-
-		public Object next() {
-			return iteratorref.next();
-		}
-
-		public void remove() {
-			iteratorref.remove();
-		}		
-	}
-
-	public class RemoteFileIteratorAsPath extends RemoteFileIteratorAsString {
-		public Object next() {
-			return new Path((String)iteratorref.next());
-		}
-	}
-
-	public Iterator remoteIteratorAsString() {
-		return new RemoteFileIteratorAsString();
-	}
-
-	public Iterator remoteIteratorAsPath() {
-		return new RemoteFileIteratorAsPath();
-	}
-
-	public void addRemoteFile(String string) {
-		if (string != null) {
-			remoteFileList.add(string);
-		}
-	}
-
-	public void addRemoteFile(IPath path) {
-		if (path != null) {
-			remoteFileList.add(path.toOSString());
-		}
-	}
-
-	public static void main(String[] args) {
-		DownloadRule r = new DownloadRule();
-		System.out.println(r);
-		r.setAsExecutable(true);
-		System.out.println(r);
-		r.setAsReadOnly(true);
-		System.out.println(r);
-		r.setLocalDirectory("/tmp/a"); //$NON-NLS-1$
-		System.out.println(r);
-		r.setOverwritePolicy(OverwritePolicies.ASK);
-		System.out.println(r);		
-	}
-
-	public void removeRemoteFile(String entry) {
-		for (Iterator iter = remoteFileList.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			if (element.equals(entry)) {
-				iter.remove();
-			}
-		}
-	}
-	
-	public void removeRemoteFile(IPath entry) {
-		removeRemoteFile(entry.toOSString());
-	}
-	
-	public void setRemoteFiles(String[] items) {
-		clearRemoteFiles();
-		for (int i = 0; i < items.length; i++) {
-			String string = items[i];
-			if (string != null) {
-				addRemoteFile(string.trim());
-			}
-		}
-	}
-	
-	public void setRemoteFiles(IPath[] items) {
-		clearRemoteFiles();
-		for (int i = 0; i < items.length; i++) {
-			IPath path = items[i];
-			if (path != null) {
-				addRemoteFile(path);
-			}
-		}
-	}
-	
-	public void clearRemoteFiles() {
-		remoteFileList.clear();
-	}
-
-	public boolean isActive() {
-		return true;
-	}
-
-	public boolean isDownloadRule() {
-		return true;
-	}
-
-	public boolean isUploadRule() {
-		return false;
-	}
-
-	public void validate() throws CoreException {
-		if (overwritePolicy == OverwritePolicies.UNKNOWN) {
-			RemoteLauncherPlugin.throwCoreException(Messages.DownloadRule_Validation_MissingOverwritePolicy, IRemoteLaunchErrors.INVALID_RULE);
-		}
-		if (localDirectory == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.DownloadRule_Validation_MissingRemoteDirectory, IRemoteLaunchErrors.INVALID_RULE);
-		}
-	}
-	
-	public String toLabel() {
-		String result = "DOWNLOAD "+Integer.toString(remoteFileList.size())+" item(s) back to "+localDirectory; //$NON-NLS-1$ //$NON-NLS-2$
-		return result;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java
deleted file mode 100755
index 4586c6b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java
+++ /dev/null

@@ -1,265 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchErrors;
-
-/**
- * Stores configuration how the remote launch it to be executed.
- * @author Daniel Felix Ferber
- */
-public class ExecutionConfiguration {
-
-	ICProject cProject = null; // required
-	File executable = null; // required
-	boolean doConnectStreams = true;
-	boolean doForwardX11 = false;
-	boolean doAllocateTerminal = true;
-	
-	IPath remoteDirectory = null; // required
-	File workingDirectory = null; // required
-	List arguments = new ArrayList();
-	
-	List environmentVariables = new ArrayList();
-	String beforeCommand = null; // defaults to nothing
-	String afterCommand = null; // defaults to nothing
-	boolean synchronizeAfter = false;
-	boolean synchronizeBefore = false;
-	boolean doCleanup = false;
-	
-	List synchronizationRules = new ArrayList();
-	
-	String label;
-	
-	public String getLabel() {
-		return label;
-	}
-	
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	public boolean getDoCleanup() {
-		return doCleanup;
-	}
-
-	public void setDoCleanup(boolean doCleanup) {
-		this.doCleanup = doCleanup;
-	}
-
-	public String[] getArgumentsArray() {
-		String [] array = new String[arguments.size()];
-		arguments.toArray(array);
-		return array;
-	}
-	
-	public void addArgument(String argument) {
-		arguments.add(argument);
-	}
-
-	public void addArguments(String[] argumentsArray) {
-		for (int i = 0; i < argumentsArray.length; i++) {
-			String argument = argumentsArray[i];
-			addArgument(argument);
-		}
-	}
-
-	public boolean getDoConnectStreams() {
-		return doConnectStreams;
-	}
-
-	public void setDoConnectStream(boolean doConnect) {
-		this.doConnectStreams = doConnect;
-	}
-	
-	public boolean getDoForwardX11() {
-		return doForwardX11;
-	}
-
-	public void setDoForwardX11(boolean doForward) {
-		this.doForwardX11 = doForward;
-	}
-
-	public ICProject getProject() {
-		return cProject;
-	}
-
-	public void setProject(ICProject project) {
-		cProject = project;
-	}
-
-	public String[] getEnvironmentVariablesArray() {
-		String [] array = new String[environmentVariables.size()];
-		environmentVariables.toArray(array);
-		return array;
-	}
-
-	public void addEnvironmentVariable(String variable) {
-		environmentVariables.add(variable);
-	}
-
-	public void addEnvironmentVariables(String[] environmentArray) {
-		for (int i = 0; i < environmentArray.length; i++) {
-			String string = environmentArray[i];
-			addEnvironmentVariable(string);
-		}
-	}	
-
-	public File getExecutableFile() {
-		return executable;
-	}
-
-	public void setExecutable(File executable) {
-		this.executable = executable;
-	}
-
-	public IPath getRemoteDirectoryPath() {
-		return remoteDirectory;
-	}
-
-	static int counter = 0;
-	
-	public void setRemoteDirectory(IPath remoteDirectory) {
-		//this.remoteDirectory = remoteDirectory.append(Integer.toString(counter++));
-		this.remoteDirectory = remoteDirectory;
-	}
-
-	public File getWorkingDirectoryFile() {
-		return workingDirectory;
-	}
-	
-	public void setWorkingDirectory(File workingDirectory) {
-		this.workingDirectory = workingDirectory;
-	}
-
-	public IPath getRemoteExecutablePath() {
-		IPath localExecutable = new Path(executable.getPath());
-		IPath remoteExecutable = remoteDirectory.append(localExecutable.lastSegment());
-		return remoteExecutable;
-	}
-	
-	public String getRemoteExecutableName() {
-		return getRemoteExecutablePath().lastSegment();
-	}
-
-	public void setBeforeCommand(String beforeCommand) {
-		this.beforeCommand = beforeCommand;
-	}
-
-	public void setAfterCommand(String afterCommand) {
-		this.afterCommand = afterCommand;		
-	}
-
-	public void setDoSynchronizeAfter(boolean synchronizeAfter) {
-		this.synchronizeAfter = synchronizeAfter;
-	}
-	
-	public void setDoSynchronizeBefore(boolean synchronizeBefore) {
-		this.synchronizeBefore = synchronizeBefore;
-	}
-
-	public String getAfterCommand() {
-		return afterCommand;
-	}
-
-	public String getBeforeCommand() {
-		return beforeCommand;
-	}
-
-	public boolean getDoSynchronizeAfter() {
-		return synchronizeAfter;
-	}
-
-	public boolean getDoSynchronizeBefore() {
-		return synchronizeBefore;
-	}
-
-	public ISynchronizationRule[] getSynchronizationRulesArray() {
-		ISynchronizationRule[] array = (ISynchronizationRule[]) synchronizationRules.toArray(new ISynchronizationRule[synchronizationRules.size()]);
-		return array;
-	}
-
-	public void addSynchronizationRule(ISynchronizationRule rule) {
-		synchronizationRules.add(rule);
-	}
-
-	public void addSynchronizationRules(ISynchronizationRule []rules) {
-		for (int i = 0; i < rules.length; i++) {
-			ISynchronizationRule rule = rules[i];
-			addSynchronizationRule(rule);
-		}
-	}	
-	
-	public int countSynchronizationRules() {
-		return synchronizationRules.size();
-	}
-	
-	public int countUploadRules() {
-		int result = 0;
-		for (Iterator iter = synchronizationRules.iterator(); iter.hasNext();) {
-			ISynchronizationRule element = (ISynchronizationRule) iter.next();
-			if (element.isUploadRule()) {
-				result++;
-			}
-		}
-		return result;
-	}
-	
-	public int countDownloadRules() {
-		int result = 0;
-		for (Iterator iter = synchronizationRules.iterator(); iter.hasNext();) {
-			ISynchronizationRule element = (ISynchronizationRule) iter.next();
-			if (element.isDownloadRule()) {
-				result++;
-			}
-		}
-		return result;
-	}
-
-	public void setDoAllocateTerminal(boolean allocateTerminal) {
-		this.doAllocateTerminal = allocateTerminal;
-	}
-	
-	public boolean getDoAllocateTerminal() {
-		return doAllocateTerminal;
-	}
-	
-	/**
-	 * Validate the configuration and raise a {@link CoreException} if some attribute is missing
-	 * or invalid.
-	 */
-	public void validate() throws CoreException {
-		if (cProject == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingProject, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		if (executable == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingExecutable, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		if (remoteDirectory == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingRemoteWorkingDirectory, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		if (workingDirectory == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingLocalRemoteDirectory, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java
deleted file mode 100755
index fcafc05..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-/**
- * Stores information about how the remote launch finished execution.
- * @author Daniel Felix Ferber
- */
-public class ExecutionResult {
-	int exitValue = 0;
-	int status = UNDEFINED;
-	
-	// Execution result status for remote application
-	/** The execution of application has noy yet finished. The execution resulta has not meaning yest. */
-	public static final int UNDEFINED = 0;
-	/** The execution of application has finished succesfully with zero as exit value. */
-	public static final int SUCCESS = 1;
-	/** The execution of application has finished succesfully, but with nonzero exit value. */
-	public static final int SUCCESS_WITH_CODE = 2;
-	/** The execution of the application was cancelled because the the user terminated/killed the process. */
-	public static final int CANCELLED = 3;
-	/** The execution of the application was terminated by the remote operating system. */
-	public static final int EXCEPTION = 4;
-	/** The command used to launch the application was not accepted by the remote operating system. */
-	public static final int COMMAND_ERROR = 5;
-	/** The execution of application failed, but no information is available. */
-	public static final int UNKNOWN = 6;
-	/** The launcher failed due an internal error. */
-	public static final int ERROR = 7;
-	
-	public int getExitValue() {
-		return exitValue;
-	}
-
-	public void setExitValue(int exitValue) {
-		this.exitValue = exitValue;
-	}
-	
-	public int getStatus() {
-		return status;
-	}
-	
-	public void setStatus(int status) {
-		this.status = status;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java
deleted file mode 100755
index 5fc502b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Identifies a synchronizatuion rule for the launch job.
- * @author Daniel Ferber
- *
- */
-
-public interface ISynchronizationRule {
-	/**
-	 * A label to show the rule for debug.
-	 * @return The label
-	 * @deprecated
-	 */
-	public String toLabel();
-	
-	/**
-	 * Query if the rule is active and has all required information to be applied.
-	 * @return
-	 */
-	public boolean isActive();
-	
-	/**
-	 * Validate the rule and raise a {@link CoreException} if some attribute is missing
-	 * or not valid. The validation does not include check for existing files.
-	 */
-	public void validate() throws CoreException;
-	
-	/**
-	 * Queries if the tule can be used by launch job after the application finishes execution on the remote host.
-	 * @author Daniel Ferber
-	 *
-	 */
-	public boolean isDownloadRule();
-
-	/**
-	 * Queries if the rule can be used by launch job before the application starts execution on the remote host.
-	 * @author Daniel Ferber
-	 *
-	 */
-	public boolean isUploadRule();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java
deleted file mode 100755
index f55a9a6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.data.messages"; //$NON-NLS-1$
-
-	public static String DownloadRule_Validation_MissingOverwritePolicy;
-
-	public static String DownloadRule_Validation_MissingRemoteDirectory;
-
-	public static String ExecutionConfiguration_Error_MissingExecutable;
-
-	public static String ExecutionConfiguration_Error_MissingLocalRemoteDirectory;
-
-	public static String ExecutionConfiguration_Error_MissingProject;
-
-	public static String ExecutionConfiguration_Error_MissingRemoteWorkingDirectory;
-
-	public static String UploadRule_Validate_MissingOverwritePolicy;
-
-	public static String UploadRule_Validate_MissingRemotedirectory;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java
deleted file mode 100755
index cbeb08c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-public interface OverwritePolicies {
-	
-	public static final int UNKNOWN = 0;
-	public static final int SKIP = 1;
-	public static final int ALWAYS = 2;
-	public static final int NEWER = 3;
-	public static final int ASK = 4;
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java
deleted file mode 100755
index a27778f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-
-public class RuleFactory {
-	
-	/**
-	 * Returns a new synchronization rule object for the serialized string.
-	 * @param string The serialized string
-	 * @return The rule or null if no rule is known for the string.
-	 */
-	public static ISynchronizationRule createRuleFromString(String string) {
-		String list[] = string.split("\n"); //$NON-NLS-1$
-		String first = list[0];
-		if (first.equalsIgnoreCase(SerializationKeys.TYPE_UPLOAD)) {
-			return new UploadRule(string);
-		} else if (first.equalsIgnoreCase(SerializationKeys.TYPE_DOWNLOAD)) {
-			return new DownloadRule(string);
-		} else {
-			return null;
-		}
-	}
-	
-	public static ISynchronizationRule duplicateRule(ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			return new DownloadRule(downloadRule);
-		} if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			return new UploadRule(uploadRule);
-		} else {
-			return null;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java
deleted file mode 100755
index 9d8b239..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-
-interface SerializationKeys {
-	public static String TYPE_UPLOAD = "upload"; //$NON-NLS-1$
-	public static String TYPE_DOWNLOAD = "download"; //$NON-NLS-1$
-	
-	public static String KEY_REMOTE_PATH = "remote-path"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY = "overwrite-policy"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_SKIP = "skip"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_ALWAYS = "always"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_NEWER = "newer"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_ASK = "ask"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS = "permissions"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS_READONLY = "readonly"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS_EXECUTABLE = "executable"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS = "flags"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_TIMESTAMP = "timestamp"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_DOWNLOAD_BACK = "download-back"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY = "default-remote-directory"; //$NON-NLS-1$
-
-	public static String KEY_LOCAL_PATH = "local-path"; //$NON-NLS-1$
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java
deleted file mode 100755
index 17ecb2b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java
+++ /dev/null

@@ -1,472 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchErrors;
-
-/*
- * Represents an upload rule.
- * It describes how to copy a list of local files or local directories into a single remote directory.
- * A local file is copied into the remote directory.
- * A local directory has its content copied recursively into the remote directory.
- */
-public class UploadRule implements ISynchronizationRule {
-	private int overwritePolicy = OverwritePolicies.UNKNOWN;
-
-	private boolean asReadOnly = false;
-
-	private boolean asExecutable = false;
-
-	private boolean preserveTimeStamp = false;
-	
-	private boolean downloadBack = false;
-
-	private boolean defaultRemoteDirectory = false;
-
-	private String remoteDirectory = null;
-
-	/*
-	 * List of local paths, represented as strings.
-	 * They may be files or directories.
-	 */
-	private List localFileList = new ArrayList();
-
-	/*
-	 * Default constructor.
-	 */
-	public UploadRule() {
-
-	}
-
-	/*
-	 * Creates de rule from a serialized string.
-	 */
-	public UploadRule(String data) {
-		/*
-		 * Split the string into lines.
-		 */
-		String list[] = data.split("\n"); //$NON-NLS-1$
-		/*
-		 * Check if the first token is the proper identifier. If not, the string does not represent a rule that
-		 * can be parsed by this class.
-		 */
-		{
-			if (list.length < 1) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-			String s = list[0];
-			if (! s.equalsIgnoreCase(SerializationKeys.TYPE_UPLOAD)) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-		}
-		for (int i = 1; i < list.length; i++) {
-			String s = list[i];
-			/*
-			 * Split key from data.
-			 */
-			int p = s.indexOf(' ');
-			if (p == -1) {
-				logError("Invalid rule entry: "+s); //$NON-NLS-1$
-				continue;
-			}
-			String key = s.substring(0, p);
-			String value = s.substring(p + 1);
-			parseEntry(key, value);
-		}
-	}
-	
-	public UploadRule(UploadRule rule) {
-		this.overwritePolicy = rule.overwritePolicy;
-		this.asReadOnly = rule.asReadOnly;
-		this.asExecutable = rule.asExecutable;
-		this.preserveTimeStamp = rule.preserveTimeStamp;
-		this.downloadBack = rule.downloadBack;
-		this.defaultRemoteDirectory = rule.defaultRemoteDirectory;
-		if (rule.remoteDirectory != null) {
-			this.remoteDirectory = new String(rule.remoteDirectory);
-		} else {
-			this.remoteDirectory = null;
-		}
-		this.localFileList = new ArrayList(rule.localFileList);
-	}
-
-	private void throwError(String string) {
-		throw new RuntimeException(string);		
-	}
-
-	private void parseEntry(String key, String value) {
-		if (key.equalsIgnoreCase(SerializationKeys.KEY_REMOTE_PATH)) {
-			remoteDirectory = value;
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY)) {
-			if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS)) {
-				overwritePolicy = OverwritePolicies.ALWAYS;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ASK)) {
-				overwritePolicy = OverwritePolicies.ASK;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_NEWER)) {
-				overwritePolicy = OverwritePolicies.NEWER;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_SKIP)) {
-				overwritePolicy = OverwritePolicies.SKIP;
-			} else {
-				logError("Unknown overwrite policy: "+value); //$NON-NLS-1$
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_FLAGS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY)) {
-					defaultRemoteDirectory = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_TIMESTAMP)) {
-					preserveTimeStamp = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_DOWNLOAD_BACK)) {
-					downloadBack = true;
-				} else {
-					logError("Unknown flag: "+flag); //$NON-NLS-1$
-				}
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_LOCAL_PATH)) {
-			localFileList.add(value);
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_EXECUTABLE)) {
-					asExecutable = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_READONLY)) {
-					asReadOnly = true;
-				} else {
-					logError("Unknown permission: "+flag); //$NON-NLS-1$
-				}
-			}			
-		} else {
-			logError("Unknown key: "+key); //$NON-NLS-1$
-		}
-	}
-
-	private void logError(String string) {
-		// TODO Auto-generated method stub
-	}
-
-	/*
-	 * The rule as a serialized string.
-	 */
-	public String toString() {
-		List l = new ArrayList();
-		if (remoteDirectory != null) {
-			l.add(SerializationKeys.KEY_REMOTE_PATH+" "+remoteDirectory.trim()); //$NON-NLS-1$
-		}
-		if (overwritePolicy == OverwritePolicies.ALWAYS) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.ASK) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ASK);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.NEWER) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_NEWER);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.SKIP) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_SKIP);			 //$NON-NLS-1$
-		}
-		if (asExecutable || asReadOnly) {
-			String s = SerializationKeys.KEY_PERMISSIONS;
-			if (asExecutable) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_EXECUTABLE; //$NON-NLS-1$
-			}
-			if (asReadOnly) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_READONLY; //$NON-NLS-1$
-			}
-			l.add(s);
-		}
-		if (preserveTimeStamp || defaultRemoteDirectory || downloadBack) {
-			String s = SerializationKeys.KEY_FLAGS;
-			if (defaultRemoteDirectory) {
-				s += " " + SerializationKeys.KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY; //$NON-NLS-1$
-			}
-			if (preserveTimeStamp) {
-				s += " " + SerializationKeys.KEY_FLAGS_TIMESTAMP; //$NON-NLS-1$
-			}
-			if (downloadBack) {
-				s += " " + SerializationKeys.KEY_FLAGS_DOWNLOAD_BACK;				 //$NON-NLS-1$
-			}
-			l.add(s);			
-		}
-		for (Iterator iter = localFileList.iterator(); iter.hasNext();) {
-			String localpath = (String) iter.next();
-			if (localpath == null) continue;
-			if (localpath.trim().length() == 0) continue;
-			
-			l.add(SerializationKeys.KEY_LOCAL_PATH+" "+localpath.trim());  //$NON-NLS-1$
-		}
-		String result = new String(SerializationKeys.TYPE_UPLOAD);
-		for (Iterator iter = l.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			result += "\n" + element; //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public boolean isAsExecutable() {
-		return asExecutable;
-	}
-
-	public void setAsExecutable(boolean asExecutable) {
-		this.asExecutable = asExecutable;
-	}
-
-	public boolean isAsReadOnly() {
-		return asReadOnly;
-	}
-
-	public void setAsReadOnly(boolean asReadOnly) {
-		this.asReadOnly = asReadOnly;
-	}
-
-	public boolean isDefaultRemoteDirectory() {
-		return defaultRemoteDirectory;
-	}
-
-	public void setDefaultRemoteDirectory(boolean defaultRemoteDirectory) {
-		this.defaultRemoteDirectory = defaultRemoteDirectory;
-	}
-
-	public int getOverwritePolicy() {
-		return overwritePolicy;
-	}
-
-	public void setOverwritePolicy(int overwritePolicy) {
-		this.overwritePolicy = overwritePolicy;
-	}
-
-	public boolean isPreserveTimeStamp() {
-		return preserveTimeStamp;
-	}
-
-	public void setPreserveTimeStamp(boolean preserveTimeStamp) {
-		this.preserveTimeStamp = preserveTimeStamp;
-	}
-
-	public String getRemoteDirectory() {
-		if (remoteDirectory != null) {
-				return remoteDirectory.trim();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setRemoteDirectory(String remoteDirectory) {
-		if (remoteDirectory != null) {
-			this.remoteDirectory = remoteDirectory.trim();
-		} else {
-			this.remoteDirectory = null;
-		}
-	}
-	
-	public void setDownloadBack(boolean downloadBack) {
-		this.downloadBack = downloadBack;
-	}
-	
-	public boolean isDownloadBack() {
-		return downloadBack;
-	}
-	
-	public int getRemoteFileCount() {
-		return localFileList.size();
-	}
-	
-	public String [] getLocalFilesAsStringArray() {
-		String result [] = new String [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = (String) localFileList.get(i);
-		}
-		return result;
-	}
-
-	public IPath [] getLocalFilesAsPathArray() {
-		IPath result [] = new IPath [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new Path((String) localFileList.get(i));
-		}
-		return result;
-	}
-
-	public File [] getLocalFilesAsFileArray() {
-		File result [] = new File [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new File((String) localFileList.get(i));
-		}
-		return result;
-	}
-	
-	public class LocalFileIteratorAsString implements Iterator {
-		Iterator iteratorref = localFileList.iterator();
-		
-		public boolean hasNext() {
-			return iteratorref.hasNext();
-		}
-
-		public Object next() {
-			return iteratorref.next();
-		}
-
-		public void remove() {
-			iteratorref.remove();
-		}		
-	}
-
-	public class LocalFileIteratorAsPath extends LocalFileIteratorAsString {
-		public Object next() {
-			return new Path((String)iteratorref.next());
-		}
-	}
-
-	public class LocalFileIteratorAsFile extends LocalFileIteratorAsString {
-		public Object next() {
-			return new File((String)iteratorref.next());
-		}
-	}
-
-	public Iterator localIteratorAsString() {
-		return new LocalFileIteratorAsString();
-	}
-
-	public Iterator localIteratorAsPath() {
-		return new LocalFileIteratorAsPath();
-	}
-
-	public Iterator localIteratorAsFile() {
-		return new LocalFileIteratorAsFile();
-	}
-
-	public void addLocalFile(String string) {
-		if (string != null) {
-			localFileList.add(string);
-		}
-	}
-
-	public void addLocalFile(IPath path) {
-		if (path != null) {
-			localFileList.add(path.toOSString());
-		}
-	}
-
-	public void addLocalFile(File file) {
-		if (file != null) {
-			localFileList.add(file.getPath());
-		}
-	}
-
-	public static void main(String[] args) {
-		UploadRule r = new UploadRule();
-		System.out.println(r);
-		r.setAsExecutable(true);
-		System.out.println(r);
-		r.setAsReadOnly(true);
-		System.out.println(r);
-		r.setRemoteDirectory("/tmp/a"); //$NON-NLS-1$
-		System.out.println(r);
-		r.setOverwritePolicy(OverwritePolicies.ASK);
-		System.out.println(r);
-		
-		String s = "upload\nremote-directory /tmp/a\npermissions executable readonly\nflags default-remote-directory"; //$NON-NLS-1$
-		r = new UploadRule(s);
-		System.out.println(r);
-		
-	}
-
-	public void removeLocalFile(String entry) {
-		for (Iterator iter = localFileList.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			if (element.equals(entry)) {
-				iter.remove();
-			}
-		}
-	}
-	
-	public void removeLocalFile(IPath entry) {
-		removeLocalFile(entry.toOSString());
-	}
-	
-	public void removeLocalFile(File entry) {
-		removeLocalFile(entry.getPath());
-	}
-
-	public void setLocalFiles(String[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			String string = items[i];
-			if (string != null) {
-				addLocalFile(string);
-			}
-		}
-	}
-	
-	public void setLocalFiles(IPath[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			IPath path = items[i];
-			if (path != null) {
-				addLocalFile(path);
-			}
-		}
-	}
-	
-	public void setLocalFiles(File[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			File file = items[i];
-			if (file != null) {
-				addLocalFile(file);
-			}
-		}
-	}
-
-	public void clearLocalFiles() {
-		localFileList.clear();
-	}
-
-	public boolean isActive() {
-		return true;
-	}
-
-	public boolean isDownloadRule() {
-		return false;
-	}
-
-	public boolean isUploadRule() {
-		return true;
-	}
-
-	public String toLabel() {
-		String result = "UPLOAD "+Integer.toString(localFileList.size())+" item(s) \nto "+remoteDirectory; //$NON-NLS-1$ //$NON-NLS-2$
-		return result;
-	}
-	
-	public void validate() throws CoreException {
-		if (overwritePolicy == OverwritePolicies.UNKNOWN) {
-			RemoteLauncherPlugin.throwCoreException(Messages.UploadRule_Validate_MissingOverwritePolicy, IRemoteLaunchErrors.INVALID_RULE);
-		}
-		if (defaultRemoteDirectory == false) {
-			if (remoteDirectory == null) {
-				RemoteLauncherPlugin.throwCoreException(Messages.UploadRule_Validate_MissingRemotedirectory, IRemoteLaunchErrors.INVALID_RULE);
-			}
-//			IPath remotePath = LinuxPath.fromString(remoteDirectory);
-//			if (! remotePath.isAbsolute()) {
-//				RemoteLauncherPlugin.throwCoreException("Remote directory must be an absolute path.", IRemoteLaunchErrors.INVALID_RULE);				
-//			}
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties
deleted file mode 100755
index b692c92..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-ExecutionConfiguration_Error_MissingProject=No project specified for remote launch.
-ExecutionConfiguration_Error_MissingExecutable=No executable specified for remote launch.
-ExecutionConfiguration_Error_MissingRemoteWorkingDirectory=No remote working directory specified for remote launch.
-ExecutionConfiguration_Error_MissingLocalRemoteDirectory=No local working directory specified for remote launch.
-UploadRule_Validate_MissingOverwritePolicy=No overwrite policy specified for upload rule.
-UploadRule_Validate_MissingRemotedirectory=No remote directory specified for upload rule.
-DownloadRule_Validation_MissingOverwritePolicy=No overwrite policy specified for download rule.
-DownloadRule_Validation_MissingRemoteDirectory=No remote directory specified for download rule.

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java
deleted file mode 100755
index dc172cb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.PrintWriter;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFile;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-public class DownloadBackAction implements IRuleAction {
-	
-	private ILaunchProcessCallback process;
-	private DownloadBackRule rule;
-	private ExecutionConfiguration configuration;
-	private PrintWriter outputWriter;
-	private PrintWriter errorWriter;
-	private IRemoteExecutionManager manager;
-
-	public DownloadBackAction(ILaunchProcessCallback process, DownloadBackRule downloadBackRule) {
-		super();
-		this.process = process;
-		this.rule = downloadBackRule;
-		configuration = process.getConfiguration();
-		outputWriter = process.getOutputWriter();
-		errorWriter = process.getErrorWriter();	
-		manager = process.getExecutionManager();
-	}
-
-	public void run() throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		Assert.isNotNull(outputWriter);
-		Assert.isNotNull(errorWriter);
-		Assert.isNotNull(manager);
-		
-		/*
-		 * Process files in list.
-		 */
-		for (int i = 0; i < rule.count(); i++) {
-			File localFile = rule.getLocalFile(i);
-			IPath remotePath = rule.getRemoteFile(i);
-			downloadFile(localFile, remotePath);
-		}
-	}
-
-	private void downloadFile(File localFile, IPath remotePath) throws CoreException, CancelException, RemoteConnectionException {
-		String remotePathAsString = LinuxPath.toString(remotePath);
-		
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-				
-		IRemoteFile remoteFile = null;
-		try {
-			remoteFile = fileTools.getFile(remotePathAsString);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedFetchRemoteProperties, e.getMessage()));
-			return;
-		}
-		
-		if (! remoteFile.exists()) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedFiledDoesNotExist, remotePathAsString));
-			return;			
-		}
-		
-		/*
-		 * Test if file has been changed.
-		 */
-		long difference = remoteFile.getModificationTime() - localFile.lastModified();
-		if (difference < 1000 && remoteFile.getSize() == localFile.length()) {
-			outputWriter.println(NLS.bind(Messages.DownloadBackAction_NotifyFileNotChanged, remotePath));
-			return;					
-		}
-		
-		/*
-		 * Download file
-		 */
-		try {
-			outputWriter.println(NLS.bind(Messages.DownloadBackAction_NotifyDonwloadBack, remotePathAsString));
-			copyTools.downloadFileToFile(remotePathAsString, localFile);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedDownloadBack, e.getMessage()));
-			return;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java
deleted file mode 100755
index 3f29fa2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-
-
-public class DownloadBackRule implements ISynchronizationRule {
-	List remoteFiles = new ArrayList();
-	List localFiles = new ArrayList();
-	
-	public DownloadBackRule() {
-	}
-	
-	public void add(File local, IPath remote) {
-		remoteFiles.add(remote);
-		localFiles.add(local);
-	}
-	
-	public File getLocalFile(int index) {
-		return (File) localFiles.get(index);
-	}
-		
-	public IPath getRemoteFile(int index) {
-		return (IPath) remoteFiles.get(index);
-	}
-	
-	public int count() {
-		return remoteFiles.size();
-	}
-
-	public boolean isActive() {
-		return remoteFiles.size() > 0;
-	}
-
-	public boolean isDownloadRule() {
-		return true; // by definition
-	}
-
-	public boolean isUploadRule() {
-		return false; // by definition
-	}
-
-	public String toLabel() {
-		return "Internal download back rule"; //$NON-NLS-1$
-	}
-
-	public void validate() throws CoreException {
-		// nothing to validate
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java
deleted file mode 100755
index 4b3129c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java
+++ /dev/null

@@ -1,353 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.PrintWriter;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.IFileSystem;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteDirectory;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFile;
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-public class DownloadRuleAction implements IRuleAction {
-
-	private ILaunchProcessCallback process;
-	private DownloadRule rule;
-	private ExecutionConfiguration configuration;
-	private PrintWriter outputWriter;
-	private PrintWriter errorWriter;
-	private IRemoteExecutionManager manager;
-
-	public DownloadRuleAction(ILaunchProcessCallback process, DownloadRule rule) {
-		super();
-		this.process = process;
-		this.rule = rule;
-		configuration = process.getConfiguration();
-		outputWriter = process.getOutputWriter();
-		errorWriter = process.getErrorWriter();	
-		manager = process.getExecutionManager();
-	}
-
-	public void run() throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		Assert.isNotNull(outputWriter);
-		Assert.isNotNull(errorWriter);
-		Assert.isNotNull(manager);
-		
-		/*
-		 * If overwrite policy depends on time, then get remote clock skew.
-		 */
-		long clockSkew = 0;
-		if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-			IRemoteStatusTools statusTools = manager.getRemoteStatusTools();
-			long localTime;
-			long remoteTime;
-			try {
-				localTime = System.currentTimeMillis();
-				remoteTime = statusTools.getTime();
-				clockSkew = localTime -remoteTime;
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCalculateClockDifference, e.getMessage()));			
-				errorWriter.println(Messages.DownloadRuleAction_FailedCalculateClockDifference2);
-				clockSkew = 0;
-			}
-			if (clockSkew < -15000) {
-				errorWriter.println(Messages.DownloadRuleAction_WarningClockForward);
-			} else if (clockSkew > 15000) {
-				errorWriter.println(Messages.DownloadRuleAction_WarningClockBackward);				
-			}
-		}
-		
-		/*
-		 * Determine local path. Make it absolute. Create if necessary
-		 */
-		IPath localPath = new Path(rule.getLocalDirectory());
-		if (! localPath.isAbsolute()) {
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			localPath = workspace.append(localPath);
-		}
-		Assert.isTrue(localPath.isAbsolute(), "localPath.isAbsolute()"); //$NON-NLS-1$
-		File localDir = localPath.toFile();
-		if (! localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCreateLocalDirectory, localPath.toString()));
-				return;								
-			}
-		} else if (! localDir.isDirectory()) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedLocalDiretoryIsNotDirectory, localPath.toString()));
-			return;											
-		}
-		
-		/*
-		 * Determine list of remote paths. Make them absolute.
-		 */
-		IPath remotePaths [] = rule.getRemoteFilesAsPathArray();
-		IPath remoteWorkingPath = configuration.getRemoteDirectoryPath();
-		for (int i = 0; i < remotePaths.length; i++) {
-			IPath remotePath = remotePaths[i];
-			if (! remotePath.isAbsolute()) {
-				remotePath = remoteWorkingPath.append(remotePath);
-			}
-			remotePath = remotePath.removeTrailingSeparator();
-			Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()"); //$NON-NLS-1$
-			remotePaths[i] = remotePath;
-		}
-
-		/*
-		 * Process paths.
-		 */
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		for (int i = 0; i < remotePaths.length; i++) {
-			IPath remotePath = remotePaths[i];
-			String remotePathAsString = LinuxPath.toString(remotePath);
-			IRemoteItem item = null;
-			try {
-				item = fileTools.getItem(remotePathAsString);
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchAttributes, remotePathAsString));
-				continue;
-			}
-			
-			if (! item.exists()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedRemotePathDoesNotExit, remotePathAsString));
-				continue;
-			} else if (item instanceof IRemoteDirectory) {
-				IRemoteDirectory remoteDirectory = (IRemoteDirectory) item;
-				downloadDirectory(remoteDirectory, localDir);
-			} else if (item instanceof IRemoteFile) {
-				IRemoteFile remoteFile = (IRemoteFile) item;
-				downloadFile(remoteFile, localDir);
-			} else {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedRemotePathNoDirectoryNorFile, remotePathAsString));
-				continue;				
-			}
-		}
-
-	}
-
-	private void downloadFile(IRemoteFile remoteFile, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()"); //$NON-NLS-1$
-		
-		IPath remoteFilePath = LinuxPath.fromString(remoteFile.getPath());
-		File localFile = new File(localDir, remoteFilePath.lastSegment());
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyFileDownload1, remoteFile.getPath()));
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyFileDownload2, localFile.getAbsolutePath()));
-
-		doFileDownload(remoteFile, localFile);	
-	}
-
-	private void downloadDirectory(IRemoteDirectory remoteDirectory, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()"); //$NON-NLS-1$
-
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyDirectoryDownload1, remoteDirectory.getPath()));
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyDirectoryDownload2, localDir.getAbsolutePath()));
-
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		
-		IRemoteFileEnumeration enumeration = null;
-		try {
-			enumeration = fileTools.createRecursiveFileEnumeration(remoteDirectory.getPath());
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, e.getMessage()));	
-			return;
-		}
-		
-		IPath remoteRootPath = LinuxPath.fromString(remoteDirectory.getPath());
-		IPath localRootPath = new Path(localDir.getAbsolutePath());
-		int remoteRootPathLength = remoteRootPath.segmentCount();
-		
-		while (enumeration.hasMoreElements()) {
-			while (enumeration.hasMoreExceptions()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, enumeration.nextException()));
-			}
-			/*
-			 * Calculate path relative to the remote root.
-			 * Generate path relative to the local root.
-			 */ 
-			IRemoteItem remoteItem = enumeration.nextElementAsItem();
-			IPath remotePath = LinuxPath.fromString(remoteItem.getPath());
-			IPath relativePath = remotePath.removeFirstSegments(remoteRootPathLength);
-			IPath localFilePath = localRootPath.append(relativePath);
-			File localFile = localFilePath.toFile();
-			if (remoteItem instanceof IRemoteDirectory) {
-				IRemoteDirectory directoryItem = (IRemoteDirectory) remoteItem;
-				doDirectoryDownload(directoryItem, localFile);
-			} else if (remoteItem instanceof IRemoteFile) {
-				IRemoteFile fileItem = (IRemoteFile) remoteItem;
-				doFileDownload(fileItem, localFile);
-			}
-		}
-		while (enumeration.hasMoreExceptions()) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, enumeration.nextException()));	
-		}
-	}
-	
-	private void doFileDownload(IRemoteFile remoteFile, File localFile) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		
-		String remoteFileAsString = remoteFile.getPath();
-
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-				
-		/*
-		 * Check if file exists and if file is newer, depending on overwrite policy.
-		 */
-		if (rule.getOverwritePolicy() == OverwritePolicies.ALWAYS) {
-			/*
-			 * File is always copied, no policy.
-			 */
-		} else {
-			/*
-			 * Policy needs to check remote file.
-			 */
-			if (rule.getOverwritePolicy() == OverwritePolicies.SKIP) {
-				if (localFile.exists()) {
-					outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotiftFileExistsLocally, localFile.getAbsolutePath()));
-					return;
-				}
-			} else if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-				long difference = remoteFile.getModificationTime() - localFile.lastModified();
-				if (difference < 1000) {
-					outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotiftNewerFileExistsLocally, localFile.getAbsolutePath()));
-					return;					
-				}
-			}
-		}  
-		
-		/*
-		 * Upload the file.
-		 */
-		try {
-			copyTools.downloadFileToFile(remoteFileAsString, localFile);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetDownloadFile, e.getMessage()));
-			return;
-		}
-	
-		/*
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 */
-//		boolean read = remoteFile.isReadable();
-		boolean write = remoteFile.isWritable();
-		boolean execute = remoteFile.isExecutable();
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		if (rule.isAsExecutable()) {
-			execute = true;
-		}
-		
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localFile.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, execute);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, ! write);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = remoteFile.getModificationTime();
-			fileInfo.setLastModified(timestamp);
-		}
-		
-		/*
-		 * Commit changes
-		 */
-		try {
-			fileStore.putInfo(fileInfo, EFS.SET_LAST_MODIFIED | EFS.SET_ATTRIBUTES, null);
-		} catch (CoreException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetLocalFileAttributes, localFile.getAbsolutePath()));
-			return;
-		}
-	}
-
-	private void doDirectoryDownload(IRemoteDirectory remoteDir, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		
-		/*
-		 * Create local directory, if not already exists.
-		 */
-		if (! localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCreateLocalDirectory, localDir.getAbsolutePath()));
-				return;
-			}
-		}
-	
-		/*
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 */
-//		boolean read = remoteDir.isReadable();
-		boolean write = remoteDir.isWritable();
-		boolean execute = true;
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localDir.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, execute);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, ! write);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = remoteDir.getModificationTime();
-			fileInfo.setLastModified(timestamp);
-		}
-		
-		/*
-		 * Commit changes
-		 */
-		try {
-			fileStore.putInfo(fileInfo, EFS.SET_LAST_MODIFIED | EFS.SET_ATTRIBUTES, null);
-		} catch (CoreException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetLocalDirectoryAttributes, localDir.getAbsolutePath()));
-			return;
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java
deleted file mode 100755
index 4e80efb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.PrintWriter;
-
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-
-
-
-public interface ILaunchProcessCallback {
-	public PrintWriter getOutputWriter();
-	public PrintWriter getErrorWriter();
-	public ExecutionConfiguration getConfiguration();
-	public IRemoteExecutionManager getExecutionManager();
-	public void addSynchronizationRule(ISynchronizationRule downloadBackRule);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java
deleted file mode 100755
index 7b1c26f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-public interface IRuleAction {
-	public void run() throws CoreException, CancelException, RemoteConnectionException;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java
deleted file mode 100755
index 82d6436..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.util.Enumeration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.utils.core.extensionpoints.ExtensionPointEnumeration;
-
-public class LaunchObserverIterator implements Enumeration {
-	
-	ExtensionPointEnumeration enumeration = new ExtensionPointEnumeration(RemoteLauncherPlugin.OBERVER_EXTENSION_ID);
-	IConfigurationElement current;
-	
-	public LaunchObserverIterator() {
-	}
-	
-	public String getID() {
-		if (current == null) return null;
-		return current.getAttribute("id"); //$NON-NLS-1$
-	}
-	
-	public String getName() {
-		if (current == null) return null;
-		return current.getAttribute("name");		 //$NON-NLS-1$
-	}
-	
-	public ILaunchObserver getInstance() {
-		if (current == null) return null;
-		try {
-			return (ILaunchObserver) current.createExecutableExtension("class"); //$NON-NLS-1$
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-
-	public boolean hasMoreElements() {
-		return enumeration.hasMoreElements();
-	}
-
-
-	public Object nextElement() {
-		current = (IConfigurationElement) enumeration.nextElement();
-		return current;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java
deleted file mode 100755
index be688bd..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.internal.messages"; //$NON-NLS-1$
-
-	public static String DownloadBackAction_FailedDownloadBack;
-
-	public static String DownloadBackAction_FailedFetchRemoteProperties;
-
-	public static String DownloadBackAction_FailedFiledDoesNotExist;
-
-	public static String DownloadBackAction_NotifyDonwloadBack;
-
-	public static String DownloadBackAction_NotifyFileNotChanged;
-
-	public static String DownloadRuleAction_FailedCalculateClockDifference;
-
-	public static String DownloadRuleAction_FailedCalculateClockDifference2;
-
-	public static String DownloadRuleAction_FailedCreateLocalDirectory;
-
-	public static String DownloadRuleAction_FailedFetchAttributes;
-
-	public static String DownloadRuleAction_FailedFetchRemoteAttributes;
-
-	public static String DownloadRuleAction_FailedLocalDiretoryIsNotDirectory;
-
-	public static String DownloadRuleAction_FailedRemotePathDoesNotExit;
-
-	public static String DownloadRuleAction_FailedRemotePathNoDirectoryNorFile;
-
-	public static String DownloadRuleAction_FailedSetDownloadFile;
-
-	public static String DownloadRuleAction_FailedSetLocalDirectoryAttributes;
-
-	public static String DownloadRuleAction_FailedSetLocalFileAttributes;
-
-	public static String DownloadRuleAction_NotiftFileExistsLocally;
-
-	public static String DownloadRuleAction_NotiftNewerFileExistsLocally;
-
-	public static String DownloadRuleAction_NotifyDirectoryDownload1;
-
-	public static String DownloadRuleAction_NotifyDirectoryDownload2;
-
-	public static String DownloadRuleAction_NotifyFileDownload1;
-
-	public static String DownloadRuleAction_NotifyFileDownload2;
-
-	public static String DownloadRuleAction_WarningClockBackward;
-
-	public static String DownloadRuleAction_WarningClockForward;
-
-	public static String RemoteLaunchProcess_All_FailedConnection;
-
-	public static String RemoteLaunchProcess_Failed;
-
-	public static String RemoteLaunchProcess_FailedPermissions;
-
-	public static String RemoteLaunchProcess_PrepareWorkingDir_Failed;
-
-	public static String RemoteLaunchProcess_PrepareWorkingDir_FailedCreate;
-
-	public static String RemoteLaunchProcess_PrepareWorkingDir_FailedCreateHint;
-
-	public static String RemoteLaunchProcess_PrepareWorkingDir_FailedPermissions;
-
-	public static String RemoteLaunchProcess_PrepareWorkingDir_NotRequired;
-
-	public static String RemoteLaunchProcess_PrepareWorkingDir_Title;
-
-	public static String RemoteLaunchProcess_RequestToCancelLaunch;
-
-	public static String RemoteLaunchProcess_UploadApplication_CompletedUpload;
-
-	public static String RemoteLaunchProcess_UploadApplication_FailedUpload;
-
-	public static String RemoteLaunchProcess_UploadApplication_Title;
-
-	public static String RemoteLaunchProcess_UploadApplication_TitleNoUpload;
-
-	public static String RemoteLaunchProcess_UploadApplication_UploadMessage;
-
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_FailedRule;
-
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive;
-
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInvalid;
-
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_NoRules;
-
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_Title;
-
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_TitleUploadDisabled;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_TitleDownloadDisabled;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_Title;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInactive;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInvalid;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_FailedRule;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java
deleted file mode 100755
index b6a82f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java
+++ /dev/null

@@ -1,797 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteDirectory;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteFile;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchIntegration;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.core.NullLaunchIntegration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionResult;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.integration.NullLaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.process.TargetProcess;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-import org.eclipse.ptp.utils.core.linux.ArgumentParser;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-
-
-public class RemoteLaunchProcess implements ILaunchProcess, ILaunchProcessCallback {
-
-	int currentProgress = ILaunchProgressListener.UNDEFINED;
-
-	public ILaunchObserver observer = new NullLaunchObserver();
-	public ILaunchIntegration launchIntegration = new NullLaunchIntegration();
-	public Set progressListeners = new HashSet();
-	
-	OutputStream launchProcessOutputStream = null;
-	OutputStream launchProcessErrorStream = null;
-	
-	PrintWriter launchProcessOutputWriter = null;
-	PrintWriter launchProcessErrorWriter = null;
-	
-	ExecutionConfiguration configuration = null;
-	ExecutionResult executionResult = null;
-	List extraSynchronizationRules = new ArrayList();
-	
-	IProcess applicationProgress;
-	TargetProcess targetProcess;
-	ILaunch launch;
-	IRemoteExecutionManager manager;
-
-	String[] launchScript;
-
-	public RemoteLaunchProcess(ILaunch launch, ExecutionConfiguration configuration, ILaunchIntegration launchIntegration) {
-		super();
-		this.launch = launch;
-		this.configuration = configuration;
-		this.currentProgress = ILaunchProgressListener.WAIT;
-		this.executionResult = null;
-		if (launchIntegration == null) {
-			this.launchIntegration = new NullLaunchIntegration();
-		} else {
-			this.launchIntegration = launchIntegration;
-		}
-	}
-
-	public synchronized void markAsCanceled() {
-		launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_RequestToCancelLaunch);
-		manager.cancel();
-	}
-	
-	public synchronized ILaunchObserver getObserver() {
-		return observer;
-	}
-
-	public synchronized ILaunchIntegration getLaunchIntegration() {
-		return launchIntegration;
-	}
-
-	protected synchronized void setCurrentProgress(int newProgress) {
-		this.currentProgress = newProgress;
-		Iterator iterator = progressListeners.iterator();
-		while (iterator.hasNext()) {
-			ILaunchProgressListener listener = (ILaunchProgressListener) iterator.next();
-			listener.notifyProgress(newProgress);
-		}
-	}
-	
-	protected synchronized void notifyInterrupt() {
-		Iterator iterator = progressListeners.iterator();
-		while (iterator.hasNext()) {
-			ILaunchProgressListener listener = (ILaunchProgressListener) iterator.next();
-			listener.notifyInterrupt();
-		}
-	}
-
-	public synchronized int getCurrentProgress() {
-		return currentProgress;
-	}
-
-	public synchronized ExecutionResult getFinalResult() {
-		return executionResult;
-	}
-	
-	public synchronized ExecutionConfiguration getConfiguration() {
-		return configuration;
-	}
-
-	protected void prepareWorkingDir() throws CoreException, CancelException {
-		/*
-		 * Only create the remote working directory if some step will require it.
-		 */
-		boolean doCreate = false;
-		if (configuration.getDoSynchronizeAfter() || configuration.getDoSynchronizeBefore()
-				|| configuration.getDoCleanup() || launchIntegration.getDoLaunchApplication()) {
-			doCreate = true;
-		}
-		if (! doCreate) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_PrepareWorkingDir_NotRequired);
-			return;
-		}
-		
-		/*
-		 * Assure that the remote working directory exists. Create if necessary.
-		 */
-		IPath remotePath = configuration.getRemoteDirectoryPath();
-		String remoteDirectoryAsPath = LinuxPath.toString(remotePath);
-		launchProcessOutputWriter.println(NLS.bind(Messages.RemoteLaunchProcess_PrepareWorkingDir_Title, remoteDirectoryAsPath));
-		try {
-			IRemoteFileTools fileTools = manager.getRemoteFileTools();
-			fileTools.createDirectory(remoteDirectoryAsPath);
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_PrepareWorkingDir_FailedCreate, e.getMessage()));
-			launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_PrepareWorkingDir_FailedCreateHint);
-			abortWithError(Messages.RemoteLaunchProcess_PrepareWorkingDir_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-		
-		/*
-		 * Assure permissions so that the user can enter and write the directory.
-		 */
-		try {
-			IRemoteFileTools fileTools = manager.getRemoteFileTools();
-			IRemoteDirectory remoteExecutable = fileTools.getDirectory(remoteDirectoryAsPath);
-			remoteExecutable.setAccessible(true);
-			remoteExecutable.setReadable(true);
-			remoteExecutable.setWriteable(true);
-			remoteExecutable.commitAttributes();
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_PrepareWorkingDir_FailedPermissions, e.getMessage()));
-			abortWithError(Messages.RemoteLaunchProcess_PrepareWorkingDir_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-	}
-
-	protected void uploadWorkingDirectory() throws CoreException, CancelException {
-		/*
-		 * Only run upload if this feature was enabled.
-		 */
-		if (! configuration.getDoSynchronizeBefore()) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_TitleUploadDisabled);
-			return;
-		}
-
-		launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_Title);
-		
-		/*
-		 * Only run upload if rules are available.
-		 */
-		if (configuration.countUploadRules() <= 0) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_NoRules);
-			return;
-		}
-		
-//		List rules_tmp = new ArrayList(Arrays.asList(configuration.getSynchronizationRulesArray()));
-//		rules_tmp.addAll(extraSynchronizationRules);
-//		ISynchronizationRule [] rules = (ISynchronizationRule[]) rules_tmp.toArray(new ISynchronizationRule[rules_tmp.size()]);
-		ISynchronizationRule [] rules = configuration.getSynchronizationRulesArray();
-		RuleActionFactory factory = new RuleActionFactory(this);
-		for (int i = 0; i < rules.length; i++) {
-			ISynchronizationRule rule = rules[i];
-			if (! rule.isUploadRule()) {
-				continue;
-			}
-			if (! rule.isActive()) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive, Integer.toString(i));
-				launchProcessOutputWriter.println(message);
-				continue;
-			}
-			try {
-				rule.validate();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInvalid, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessErrorWriter.println(message);
-				continue;
-			}
-			IRuleAction action = factory.getAction(rule);
-			try {
-				action.run();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_FailedRule, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessOutputWriter.println(message);
-			} catch (RemoteConnectionException e) {
-				abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-			}
-		}
-	}
-
-	protected void uploadApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) { 
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadApplication_TitleNoUpload);
-			return;
-		}
-		launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadApplication_Title);
-		
-		// Shortcut to often used values
-		IPath remoteDirectoryPath = configuration.getRemoteDirectoryPath();
-		IPath remoteExecutablePath = configuration.getRemoteExecutablePath();
-		String remoteDirectory = LinuxPath.toString(remoteDirectoryPath);
-		String remoteExecutable = LinuxPath.toString(remoteExecutablePath);
-		File executableFile = configuration.getExecutableFile();
-		
-		try {
-			launchProcessOutputWriter.println(NLS.bind(Messages.RemoteLaunchProcess_UploadApplication_UploadMessage, new Object [] {executableFile.getCanonicalPath(), remoteExecutable}));
-		} catch (IOException e) {
-			// Ignore
-		}
-		
-		/*
-		 * Copy executable to working directory
-		 */
-		try {
-			manager.getRemoteCopyTools().uploadFileToDir(executableFile, remoteDirectory);
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadApplication_CompletedUpload);
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_UploadApplication_FailedUpload, e.getMessage()));
-			abortWithError(Messages.RemoteLaunchProcess_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-
-		/*
-		 * Assure executable permissions.
-		 */
-		try {
-			IRemoteFileTools fileTools = manager.getRemoteFileTools();
-			IRemoteFile remoteFile = fileTools.getFile(remoteExecutable);
-			remoteFile.setReadable(true);
-			remoteFile.setExecutable(true);
-			remoteFile.commitAttributes();
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_FailedPermissions, e.getMessage()));
-			abortWithError(Messages.RemoteLaunchProcess_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-	}
-
-	protected void downloadWorkingDirectory() throws CoreException, CancelException {
-		/*
-		 * Only run download if this feature was enabled.
-		 */
-		if (! configuration.getDoSynchronizeAfter() && extraSynchronizationRules.size() == 0) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_TitleDownloadDisabled);
-			return;
-		}
-
-		launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_Title);
-		
-		/*
-		 * Only run download if rules are available.
-		 */
-		if (configuration.countDownloadRules() <= 0 && extraSynchronizationRules.size() == 0) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_NoRules);
-			return;
-		}
-		
-		List rules_tmp = new ArrayList(Arrays.asList(configuration.getSynchronizationRulesArray()));
-		rules_tmp.addAll(extraSynchronizationRules);
-		ISynchronizationRule [] rules = (ISynchronizationRule[]) rules_tmp.toArray(new ISynchronizationRule[rules_tmp.size()]);
-		RuleActionFactory factory = new RuleActionFactory(this);
-		for (int i = 0; i < rules.length; i++) {
-			ISynchronizationRule rule = rules[i];
-			if (! rule.isDownloadRule()) {
-				continue;
-			}
-			if (! rule.isActive()) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive, Integer.toString(i));
-				launchProcessOutputWriter.println(message);
-				continue;
-			}
-			try {
-				rule.validate();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInvalid, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessErrorWriter.println(message);
-				continue;
-			}
-			IRuleAction action = factory.getAction(rule);
-			try {
-				action.run();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_FailedRule, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessOutputWriter.println(message);
-			} catch (RemoteConnectionException e) {
-				abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-			}
-		}
-	}
-
-	protected void prepareApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) return;
-
-		try {
-			String command = configuration.getBeforeCommand();
-			if (command == null) {
-				launchProcessOutputWriter.println("* Launch configuration does not require running a bash script before launch.");
-				return;
-			}
-			command = command.trim();
-			if (command.length() == 0) {
-				launchProcessOutputWriter.println("* Launch configuration does not require running a bash script before launch.");
-				return;
-			}
-			
-			launchProcessOutputWriter.println("* Prepare launch by executing:");
-			launchProcessOutputWriter.println("   " + command);
-			
-			IRemoteExecutionTools ret = manager.getExecutionTools();
-			IRemoteScript script = ret.createScript();
-			String[] environmentVariables = configuration.getEnvironmentVariablesArray();
-			for (int i = 0; i < environmentVariables.length; i++) {
-				script.addEnvironment(environmentVariables[i]);
-			}
-						
-			/*
-			 * Change the current directory from home to the actual working directory.
-			 */
-			command = "cd " + configuration.getRemoteDirectoryPath() + "\n" + command + "\n";
-
-			script.setScript(command.split("\n"));
-			
-			IRemoteScriptExecution execution = ret.executeScript(script);
-			execution.waitForEndOfExecution();
-			if (execution.getReturnCode() == 0) {
-				launchProcessOutputWriter.println("   Script executed successfully.");
-			} else {
-				launchProcessErrorWriter.println("   Script returned " + Integer.toString(execution.getReturnCode()));
-			}
-			execution.close();			
-		} catch (RemoteExecutionException e) {
-			launchProcessOutputWriter.println("   Script failed: " + e.getErrorMessage());
-		} catch (RemoteConnectionException e) {
-			abortWithError("Connection to host failed.", e);
-		}		
-	}
-
-	protected void finalizeApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) return;
-
-		try {
-			String command = configuration.getAfterCommand();
-			if (command == null) {
-				launchProcessOutputWriter.println("* Launch configuration does not require running a bash script after launch.");
-				return;			
-			}
-			command = command.trim();
-			if (command.length() == 0) {
-				launchProcessOutputWriter.println("* Launch configuration does not require running a bash script after launch.");
-				return;
-			}
-			
-			launchProcessOutputWriter.println("* Finalize launch by executing:");
-			launchProcessOutputWriter.println("   " + command);
-			
-			IRemoteExecutionTools ret = manager.getExecutionTools();
-			IRemoteScript script = ret.createScript();
-			String[] environmentVariables = configuration.getEnvironmentVariablesArray();
-			for (int i = 0; i < environmentVariables.length; i++) {
-				script.addEnvironment(environmentVariables[i]);
-			}
-			
-			/*
-			 * Change the current directory from home to the actual working directory.
-			 */
-			command = "cd " + configuration.getRemoteDirectoryPath() + "\n" + command + "\n";
-			
-			script.setScript(command.split("\n"));
-			
-			IRemoteScriptExecution execution = ret.executeScript(script);
-			execution.waitForEndOfExecution();
-			if (execution.getReturnCode() == 0) {
-				launchProcessOutputWriter.println("   Script executed successfully.");
-			} else {
-				launchProcessErrorWriter.println("   Script returned " + Integer.toString(execution.getReturnCode()));
-			}
-			execution.close();			
-		} catch (RemoteExecutionException e) {
-			launchProcessOutputWriter.println("   Script failed: " + e.getErrorMessage());
-		} catch (RemoteConnectionException e) {
-			abortWithError("Connection to host failed.", e);
-		}		
-	}
-	
-	protected void runApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) {
-			launchProcessOutputWriter.println("* Launch configuration does not require running the executable.");
-			return;
-		}
-		
-		IRemoteExecutionTools iret = null;
-		IRemoteScript script = null;
-		try {
-			iret = manager.getExecutionTools();
-			script = iret.createScript();
-		} catch (RemoteConnectionException e) {
-			abortWithError("Connection to host failed.", e);
-		}
-		
-		String[] environmentVariables = configuration.getEnvironmentVariablesArray();
-		for (int i = 0; i < environmentVariables.length; i++) {
-			script.addEnvironment(environmentVariables[i]);
-		}
-		script.setForwardX11(configuration.getDoForwardX11());
-
-		ArrayList commandsList = new ArrayList(Arrays.asList(launchScript));
-		String remoteWorkingDirectory = LinuxPath.toString(configuration.getRemoteDirectoryPath());
-		IRemotePathTools pathTools = manager.getRemotePathTools();
-		commandsList.add(0, "cd " + pathTools.quote(remoteWorkingDirectory, true));
-		if (configuration.getDoAllocateTerminal()) {
-			// If terminal is allocated, then turn off echo, since Eclipse console already
-			// echo user input.
-			commandsList.add(0, "stty -echo");
-		}
-		String commands[] = new String[commandsList.size()];
-		commands = (String[]) commandsList.toArray(commands);
-		script.setScript(commands);
-		script.setFetchProcessErrorStream(true);
-		script.setFetchProcessInputStream(true);
-		script.setFetchProcessOutputStream(true);
-		script.setAllocateTerminal(configuration.getDoAllocateTerminal());
-		
-		RemoteProcess remoteProcess = null;
-		executionResult = new ExecutionResult();
-		try {
-			launchProcessOutputWriter.println("* Started application on target.");
-			
-			launchIntegration.prepareLaunch();
-			remoteProcess = manager.getExecutionTools().executeProcess(script);
-			applicationProgress = DebugPlugin.newProcess(launch, remoteProcess, "Remote process");
-			IStreamsProxy proxy = applicationProgress.getStreamsProxy();
-			if (proxy != null) {
-				/*
-				 * The proxy exists only when a console was created for the process.
-				 */
-				IStreamListener listener = new IStreamListener() {
-					public void streamAppended(String text, IStreamMonitor monitor) {
-						observer.receiveOutput(text);
-					}
-				};
-				applicationProgress.getStreamsProxy().getOutputStreamMonitor().addListener(listener );
-			}
-			launchIntegration.finalizeLaunch();
-			showProcessConsole();
-			remoteProcess.waitFor();
-			
-			IRemoteScriptExecution execution = remoteProcess.getRemoteExecution();
-			executionResult = new ExecutionResult();
-			executionResult.setExitValue(execution.getReturnCode());
-			
-			if (execution.wasCanceled()) {
-				launchProcessErrorWriter.println("   Execution was canceled");
-				executionResult.setStatus(ExecutionResult.CANCELLED);
-			} else if (execution.wasOK()) {
-				if (execution.getReturnCode() > 0) {
-					launchProcessOutputWriter.println("   Finished with exit code: " + Integer.toString(executionResult.getExitValue()));
-					executionResult.setStatus(ExecutionResult.SUCCESS_WITH_CODE);
-				} else {
-					launchProcessOutputWriter.println("   Finished successfully");
-					executionResult.setStatus(ExecutionResult.SUCCESS);
-				}
-			} else if (execution.wasException()) {
-				launchProcessErrorWriter.println("   Finished with exception: " + execution.getFinishStatusText(execution.getFinishStatus()));
-				executionResult.setStatus(ExecutionResult.EXCEPTION);				
-			} else if (execution.wasCommandError()) {
-				launchProcessErrorWriter.println("   Could not run application: " + execution.getFinishStatusText(execution.getFinishStatus()));
-				executionResult.setStatus(ExecutionResult.COMMAND_ERROR);								
-			} else {
-				launchProcessErrorWriter.println("   Failed.");
-				executionResult.setStatus(ExecutionResult.UNKNOWN);
-			}
-		} catch (CoreException e) {
-			launchProcessErrorWriter.println("   Failed: " + e.getMessage());
-			IStatus status = e.getStatus();
-			if (status.isMultiStatus()) {
-				launchProcessErrorWriter.println("     " + status.getException().getMessage());
-			}
-			executionResult.setStatus(ExecutionResult.ERROR);
-			throw e;
-		} catch (RemoteConnectionException e) {
-			executionResult.setStatus(ExecutionResult.ERROR);
-			abortWithError("Connection to host failed.", e);
-		} catch (RemoteExecutionException e) {
-			executionResult.setStatus(ExecutionResult.ERROR);
-			launchProcessErrorWriter.println("   Failed to execute: " + e.getErrorMessage());
-		} catch (InterruptedException e) {
-			executionResult.setStatus(ExecutionResult.ERROR);
-			// TODO Auto-generated catch block
-		} finally {
-			remoteProcess.destroy();
-		}
-	}
-
-	protected void cleanUp() throws CoreException, CancelException {
-		if (! configuration.getDoCleanup()) {
-			launchProcessOutputWriter.println("* Launch configuration does not require cleaning up remote working directory.");
-			return;
-		}
-
-		IPath remotePath = configuration.getRemoteDirectoryPath();
-		String remoteDirectory = LinuxPath.toString(remotePath);
-		try {
-			launchProcessOutputWriter.println("* Cleaning up remote working directory: " + remoteDirectory);
-			IRemoteFileTools irft = manager.getRemoteFileTools();
-			irft.removeFile(remoteDirectory);
-			launchProcessOutputWriter.println("   Clean up complete");
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println("   Clean up failed: " + e.getMessage());
-			abortWithError("Could not clean up target.", e);
-		} catch (RemoteConnectionException e) {
-			abortWithError("Connection to host failed.", e);
-		}
-	}
-
-	public static String createCommandLine(String remoteExecutableName, String[] argumentsArray) {
-//		String result = remoteExecutableName;
-//		for (int i = 0; i < argumentsArray.length; i++) {
-//			// TODO: which kind of quoting is needed?
-//			String argument = argumentsArray[i].replaceAll(" ", "\\ ");
-//			result += " " + argument;
-//		}
-//		return result;
-		ArgumentParser parser = new ArgumentParser(remoteExecutableName, argumentsArray);
-		return parser.getCommandLine(true);
-	}
-
-	public void run(IRemoteExecutionManager manager) {
-		this.manager = manager;
-		setCurrentProgress(ILaunchProgressListener.WAIT);
-		
-		/*
-		 * Create a job that represents the entire launch.
-		 */
-		targetProcess = new TargetProcess(launch, this);
-		addProgressListener(targetProcess);
-		launchProcessOutputWriter = new PrintWriter(targetProcess.getOutputStream(), true);
-		launchProcessErrorWriter = new PrintWriter(targetProcess.getErrorStream(), true);
-		targetProcess.start();
-
-		observer.setExecutionManager(manager);
-		launchIntegration.setExecutionManager(manager);
-
-		try {
-			observer.start();			
-			launchIntegration.start();
-			
-			String remexecpath = LinuxPath.toString(
-					configuration.getRemoteExecutablePath());
-			launchScript = launchIntegration.createLaunchScript(remexecpath, configuration.getArgumentsArray());
-			
-			setCurrentProgress(ILaunchProgressListener.PREPARE_WORKING_DIR1);
-			prepareWorkingDir();
-			launchIntegration.prepareUploadWorkingDir();
-
-			setCurrentProgress(ILaunchProgressListener.UPLOAD_WORKING_DIR);
-			uploadWorkingDirectory();
-
-			setCurrentProgress(ILaunchProgressListener.PREPARE_WORKING_DIR2);
-			launchIntegration.finalizeWorkingDir();
-
-			setCurrentProgress(ILaunchProgressListener.UPLOAD_APPLICATION);
-			uploadApplication();
-
-			setCurrentProgress(ILaunchProgressListener.PREPARE_APPLICATION);
-			prepareApplication();
-			launchIntegration.prepareApplication();
-			observer.prepareApplication();
-
-			setCurrentProgress(ILaunchProgressListener.RUNNING);
-			runApplication();
-			
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_APPLICATION);
-			observer.finalizeApplication();
-			launchIntegration.finalizeApplication();
-			finalizeApplication();
-			
-			setCurrentProgress(ILaunchProgressListener.DOWNLOAD_WORKING_DIR);
-			downloadWorkingDirectory();
-			
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_WORKING_DIR2);
-			launchIntegration.finalizeWorkingDir();
-			
-			setCurrentProgress(ILaunchProgressListener.CLEANUP);
-			cleanUp();
-
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_CLEANUP);
-			launchIntegration.finalizeCleanup();
-			
-			setCurrentProgress(ILaunchProgressListener.FINISHED);
-			observer.finish();
-			launchIntegration.finish();
-
-			if (executionResult.getStatus() == ExecutionResult.SUCCESS) {
-				showProcessConsole();
-			} else {
-				showLaunchConsole();
-			}
-			
-		} catch (CancelException e) {
-			if (executionResult == null) {
-				executionResult = new ExecutionResult();
-				executionResult.setStatus(ExecutionResult.CANCELLED);
-			}
-			forcedCleanUp(manager);
-//			notifyInterrupt();
-		} catch (CoreException e) {
-			if (executionResult == null) {
-				executionResult = new ExecutionResult();
-				executionResult.setStatus(ExecutionResult.ERROR);
-			}
-			forcedCleanUp(manager);
-			launchProcessErrorWriter.println();
-			launchProcessErrorWriter.println("*** The launch did not work correctly ***");
-			launchProcessErrorWriter.println("    An exception was thrown during the launch: " + e.getMessage());
-			launchProcessErrorWriter.println();
-			notifyInterrupt();
-		} finally {
-			setCurrentProgress(ILaunchProgressListener.FINISHED);
-			observer.cleanup();
-			launchIntegration.cleanup();
-		}
-	}
-
-	private void forcedCleanUp(IRemoteExecutionManager manager) {
-		if (getCurrentProgress() > ILaunchProgressListener.PREPARE_APPLICATION) {
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_APPLICATION);
-			try {
-				launchIntegration.finalizeApplication();
-			} catch (CancelException e) {
-			} catch (CoreException e) {
-			}
-		}
-		
-		setCurrentProgress(ILaunchProgressListener.FINALIZE_WORKING_DIR2);
-		try {
-			launchIntegration.finalizeCleanup();
-		} catch (CoreException e1) {
-		} catch (CancelException e1) {
-		}
-		
-		setCurrentProgress(ILaunchProgressListener.CLEANUP);
-		try {
-			cleanUp();
-		} catch (CancelException e) {
-		} catch (CoreException e) {
-		}
-
-		setCurrentProgress(ILaunchProgressListener.FINALIZE_CLEANUP);
-		try {
-			launchIntegration.finalizeCleanup();
-		} catch (CoreException e) {
-		} catch (CancelException e) {
-		}
-	}
-
-	protected void abortWithError(String message, Exception e) throws CoreException {
-		Status status = new Status(IStatus.ERROR, RemoteLauncherPlugin.getUniqueIdentifier(), 0, message, e);
-		throw new CoreException(status);
-	}
-	
-	public synchronized void addProgressListener(ILaunchProgressListener progressListener) {
-		progressListeners.add(progressListener);
-	}
-
-	public synchronized void removeProgressListener(ILaunchProgressListener progressListener) {
-		progressListeners.remove(progressListener);
-	}
-
-	public void setLaunchObserver(ILaunchObserver launchObserver) {
-		if (launchObserver == null) {
-			this.observer = new NullLaunchObserver();
-		} else {
-			this.observer = launchObserver;
-		}
-	}
-
-	public IRemoteExecutionManager getExecutionManager() {
-		return manager;
-	}
-
-	public ILaunch getLaunch() {
-		return launch;
-	}
-
-	public ILaunchConfiguration getLaunchConfiguration() {
-		return launch.getLaunchConfiguration();
-	}
-
-	public void showProcessConsole() {
-		if (applicationProgress == null) {
-			return;
-		}
-		IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-		IConsole[] consoles = consoleManager.getConsoles();
-		for (int i = 0; i < consoles.length; i++) {
-			IConsole console = consoles[i];
-			if (console instanceof org.eclipse.debug.ui.console.IConsole) {
-				org.eclipse.debug.ui.console.IConsole processConsole = (org.eclipse.debug.ui.console.IConsole) console;
-				IProcess process = processConsole.getProcess();
-				if (process == applicationProgress) {
-					consoleManager.showConsoleView(console);
-				}
-			}
-		}
-	}
-	
-	public void showLaunchConsole() {
-		if (applicationProgress == null) {
-			return;
-		}
-		IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-		IConsole[] consoles = consoleManager.getConsoles();
-		for (int i = 0; i < consoles.length; i++) {
-			IConsole console = consoles[i];
-			if (console instanceof org.eclipse.debug.ui.console.IConsole) {
-				org.eclipse.debug.ui.console.IConsole processConsole = (org.eclipse.debug.ui.console.IConsole) console;
-				IProcess process = processConsole.getProcess();
-				if (process == targetProcess) {
-					consoleManager.showConsoleView(console);
-				}
-			}
-		}
-	}
-
-	public PrintWriter getErrorWriter() {
-		return launchProcessErrorWriter;
-	}
-
-	public PrintWriter getOutputWriter() {
-		return launchProcessOutputWriter;
-	}
-
-	public void addSynchronizationRule(ISynchronizationRule rule) {
-		extraSynchronizationRules.add(rule);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java
deleted file mode 100755
index 03360fb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-
-
-public class RuleActionFactory {
-	
-	private ILaunchProcessCallback process;
-
-	public RuleActionFactory(ILaunchProcessCallback process) {
-		super();
-		this.process = process;
-	}
-
-	public IRuleAction getAction(ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			DownloadRuleAction action = new DownloadRuleAction(process, downloadRule);
-			return action;
-		} else if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			UploadRuleAction action = new UploadRuleAction(process, uploadRule);
-			return action;
-		} else if (rule instanceof DownloadBackRule) {
-			DownloadBackRule uploadRule = (DownloadBackRule) rule;
-			DownloadBackAction action = new DownloadBackAction(process, uploadRule);
-			return action;
-		} else {
-			Assert.isLegal(false);
-			return null;
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java
deleted file mode 100755
index a027b7e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java
+++ /dev/null

@@ -1,388 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.IFileSystem;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteDirectory;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFile;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-import org.eclipse.ptp.utils.core.file.FileRecursiveEnumeration;
-
-
-public class UploadRuleAction implements IRuleAction {
-	
-	private ILaunchProcessCallback process;
-	private UploadRule rule;
-	private ExecutionConfiguration configuration;
-	private PrintWriter outputWriter;
-	private PrintWriter errorWriter;
-	private IRemoteExecutionManager manager;
-	private DownloadBackRule downloadBackRule;
-	private long clockSkew;
-
-	public UploadRuleAction(ILaunchProcessCallback process, UploadRule uploadRule) {
-		super();
-		this.process = process;
-		this.rule = uploadRule;
-		configuration = process.getConfiguration();
-		outputWriter = process.getOutputWriter();
-		errorWriter = process.getErrorWriter();	
-		manager = process.getExecutionManager();
-	}
-
-	public void run() throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		Assert.isNotNull(outputWriter);
-		Assert.isNotNull(errorWriter);
-		Assert.isNotNull(manager);
-
-		/*
-		 * If overwrite policy depends on time, then get remote clock skew.
-		 */
-		if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-			IRemoteStatusTools statusTools = manager.getRemoteStatusTools();
-			long localTime;
-			long remoteTime;
-			try {
-				localTime = System.currentTimeMillis();
-				remoteTime = statusTools.getTime();
-				clockSkew = localTime -remoteTime;
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind("   Could not calculate clock difference with remote host: {0}", e.getMessage()));			
-				errorWriter.println("   Assuming same a remote clock synchronized with local clock.");
-				clockSkew = 0;
-			}
-			if (clockSkew < -15000) {
-				errorWriter.println("   Warning! Clock at remote target is more recent than local clock. File synchronization may not be correct.");
-			} else if (clockSkew > 15000) {
-				errorWriter.println("   Warning! Clock at remote target is older than local clock. File synchronization may not be correct.");				
-			}
-		}
-		
-		/*
-		 * Determine remote path. Make it absolute.
-		 */
-		IPath defaultRemotePath = configuration.getRemoteDirectoryPath();
-		IPath remotePath = null;
-		if (rule.isDefaultRemoteDirectory()) {
-			remotePath = defaultRemotePath;
-		} else {
-			remotePath = LinuxPath.fromString(rule.getRemoteDirectory());
-			if (! remotePath.isAbsolute()) {
-				remotePath = defaultRemotePath.append(remotePath);
-			}
-		}
-		remotePath = remotePath.removeTrailingSeparator();
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()");
-		
-		/*
-		 * Determine list of local paths. Make them absolute.
-		 */
-		IPath localPaths [] = rule.getLocalFilesAsPathArray();
-		IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		for (int i = 0; i < localPaths.length; i++) {
-			IPath localPath = localPaths[i];
-			if (!localPath.isAbsolute()) {
-				localPath = workspace.append(localPath);
-			}
-			localPath = localPath.removeTrailingSeparator();
-			Assert.isTrue(localPath.isAbsolute(), "localPath.isAbsolute()");
-			localPaths[i] = localPath;
-		}
-		
-		/*
-		 * Process paths.
-		 */
-		for (int i = 0; i < localPaths.length; i++) {
-			IPath localPath = localPaths[i];
-			
-			File localFile = localPath.toFile();
-			if (! localFile.exists()) {
-				errorWriter.println(NLS.bind("   Ignoring {0}: Path does not exist locally", localFile.toString()));
-				continue;
-			} else if (localFile.isDirectory()) {
-				uploadDirectory(localFile, remotePath);
-			} else if (localFile.isFile()) {
-				uploadFile(localFile, remotePath);
-			} else {
-				errorWriter.println(NLS.bind("   Ignoring {0}: Path is not a file nor directory", localFile.toString()));
-				continue;				
-			}
-		}
-		
-		/*
-		 * If a download back rule was created during the upload,
-		 * the add this rule the the list of synchronize rules.
-		 */
-		if (downloadBackRule != null) {
-			process.addSynchronizationRule(downloadBackRule);
-		}
-	}
-
-	private void uploadFile(File localFile, IPath remoteDirectoryPath) throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()");
-		Assert.isTrue(remoteDirectoryPath.isAbsolute(), "remoteDirectoryPath.isAbsolute()");
-		
-		IPath remoteFile = remoteDirectoryPath.append(localFile.getName());
-		outputWriter.println(NLS.bind("   Copying file {0} (local)", localFile.toString()));
-		outputWriter.println(NLS.bind("   to file {0} (remote)", LinuxPath.toString(remoteFile)));
-
-		doFileUpload(localFile, remoteFile);
-	}
-
-	private void doFileUpload(File localFile, IPath remotePath) throws CoreException, CancelException, RemoteConnectionException {		
-		if (! localFile.exists()) {
-			errorWriter.println(NLS.bind("   Ignoring {0}: File does not exist locally", localFile.toString()));
-			return;
-		}
-
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()");
-		Assert.isTrue(localFile.isFile(), "localFile.isFile()");
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()");
-		
-		String remotePathAsString = LinuxPath.toString(remotePath);
-
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-				
-		/*
-		 * Check if file exists and if file is newer, depending on overwrite policy.
-		 */
-		if (rule.getOverwritePolicy() == OverwritePolicies.ALWAYS) {
-			/*
-			 * File is always copied, no policy.
-			 */
-		} else {
-			/*
-			 * Policy needs to check remote file.
-			 */
-			IRemoteFile remoteFile = null;
-			try {
-				remoteFile = fileTools.getFile(remotePathAsString);
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind("   Could not fetch properties for remote file, ignoring it: {0}", e.getMessage()));
-				return;
-			}
-			if (rule.getOverwritePolicy() == OverwritePolicies.SKIP) {
-				if (remoteFile.exists()) {
-					outputWriter.println(NLS.bind("   File alredy exists on remote target, ignoring it: {0}", remotePath));
-					return;
-				}
-			} else if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-				long difference = localFile.lastModified() - remoteFile.getModificationTime();
-				if (difference < 1000) {
-					outputWriter.println(NLS.bind("   A newer file alredy exists on remote target, ignoring it: {0}", remotePath));
-					return;					
-				}
-			}
-		}  
-		
-		/*
-		 * Upload the file.
-		 */
-		try {
-			copyTools.uploadFileToFile(localFile, remotePathAsString);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not upload file: {0}", e.getMessage()));
-			return;
-		}
-	
-		/*
-		 * Add file to list of files to download back, if this feature was enabled.
-		 */
-		if (rule.isDownloadBack()) {
-			if (downloadBackRule == null) {
-				downloadBackRule = new DownloadBackRule();
-			}
-			downloadBackRule.add(localFile, remotePath);
-		}
-
-		/*
-		 * Fetch properties of file that was just uploaded.
-		 */
-		IRemoteFile remoteFile = null;
-		try {
-			remoteFile = fileTools.getFile(remotePathAsString);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not fetch properties for uploaded file: {0}", e.getMessage()));
-			return;
-		}
-		
-		/*
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 */
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localFile.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		boolean read = localFile.canRead();
-		boolean write = localFile.canWrite();
-		boolean execute = fileInfo.getAttribute(EFS.ATTRIBUTE_EXECUTABLE);
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		if (rule.isAsExecutable()) {
-			execute = true;
-		}
-		
-		remoteFile.setExecutable(execute);
-		remoteFile.setWriteable(write);
-		remoteFile.setReadable(read);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = localFile.lastModified();
-			remoteFile.setModificationTime(timestamp);
-		}
-
-		/*
-		 * Commit changes
-		 */
-		try {
-			remoteFile.commitAttributes();
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not write properties for uploaded file: {0}", e.getMessage()));
-			return;
-		}
-	}
-	
-	private void doDirectoryUpload(File localDir, IPath remotePath) throws RemoteConnectionException, CancelException {
-		if (! localDir.exists()) {
-			errorWriter.println(NLS.bind("   Ignoring {0}: Directory does not exist locally", localDir.toString()));
-			return;
-		}
-
-		Assert.isTrue(localDir.isDirectory(), "localFile.isDirectory()");
-		Assert.isTrue(localDir.isAbsolute(), "localFile.isAbsolute()");
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()");
-
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		
-		/*
-		 * Create remote directory if not already exists.
-		 */
-		try {
-			fileTools.assureDirectory(LinuxPath.toString(remotePath));
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not create remote directory: {0}", e.getMessage()));
-			return;
-		}
-	
-		/*
-		 * Fetch properties of directory that was just uploaded.
-		 */
-		IRemoteDirectory remoteDirectory = null;
-		try {
-			remoteDirectory = fileTools.getDirectory(LinuxPath.toString(remotePath));
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not fetch properties for created remote directory: {0}", e.getMessage()));
-			return;
-		}
-		
-		/*
-		 * Set file permissions.
-		 */
-		boolean read = localDir.canRead();
-		boolean write = localDir.canWrite();
-		boolean execute = true;
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		
-		remoteDirectory.setAccessible(execute);
-		remoteDirectory.setWriteable(write);
-		remoteDirectory.setReadable(read);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = localDir.lastModified();
-			remoteDirectory.setModificationTime(timestamp);
-		}
-
-		/*
-		 * Commit changes
-		 */
-		try {
-			remoteDirectory.commitAttributes();
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind("   Could not write properties for uploaded directory: {0}", e.getMessage()));
-			return;
-		}		
-	}
-
-
-	private void uploadDirectory(File localDir, IPath remotePath) throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()");
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()");
-
-		outputWriter.println(NLS.bind("   Copying contents of directory {0} (local)", localDir.toString()));
-		outputWriter.println(NLS.bind("   into directory {0} (remote)", LinuxPath.toString(remotePath)));
-
-		FileRecursiveEnumeration enumeration = null;
-		enumeration = new FileRecursiveEnumeration(localDir);
-		
-		IPath rootPath = new Path(localDir.getAbsolutePath());
-		int rootPathLength = rootPath.segmentCount();
-		while (enumeration.hasMoreElements()) {
-			while (enumeration.hasMoreExceptions()) {
-				errorWriter.println(NLS.bind("   Could not read file/directory: {0}", enumeration.nextException()));	
-			}
-			File file = (File) enumeration.nextElement();
-			IPath filePath = new Path(file.getAbsolutePath());
-			IPath relativePath = filePath.removeFirstSegments(rootPathLength);
-			IPath remoteFilePath = remotePath.append(relativePath);
-			if (file.isDirectory()) {
-				outputWriter.println(NLS.bind("   Create remote directory {0}", LinuxPath.toString(remoteFilePath)));
-				doDirectoryUpload(file, remoteFilePath);
-			} else {
-				outputWriter.println(NLS.bind("   Upload {0}", LinuxPath.toString(relativePath)));
-				doFileUpload(file, remoteFilePath);
-			}
-		}
-		while (enumeration.hasMoreExceptions()) {
-			errorWriter.println(NLS.bind("   Could not read file/directory: {0}", enumeration.nextException()));	
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java
deleted file mode 100755
index 5ff608f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.integration;
-
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.core.NullLaunchIntegration;
-
-public class NullLaunchObserver extends NullLaunchIntegration implements ILaunchObserver {
-	public void receiveOutput(String text) {
-		// TODO Auto-generated method stub
-		
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java
deleted file mode 100755
index 1d6c658..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.macros;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
-import org.eclipse.cdt.internal.core.cdtvariables.CoreMacroSupplierBase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchConfigurationVariableSupplier;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableContextInfo;
-import org.eclipse.ptp.utils.core.extensionpoints.IProcessMemberVisitor;
-import org.eclipse.ptp.utils.core.extensionpoints.ProcessExtensions;
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class LaunchMacroSupplier extends CoreMacroSupplierBase {
-
-	public static final String EXT_LAUNCH_CONFIGURATION_MACRO_SUPPLIER = "org.eclipse.ptp.remotetools.environment.launcher.launchConfigurationMacroSupplier"; //$NON-NLS-1$
-
-	private static LaunchMacroSupplier instance;
-
-	private final Map auxiliarySuppliers = new HashMap();
-
-	private static final String CONFIG_TYPE_ID = "configTypeId"; //$NON-NLS-1$
-
-	private static final String CLASS = "class"; //$NON-NLS-1$
-
-	private LaunchMacroSupplier() {
-	}
-
-	public static LaunchMacroSupplier getInstance() {
-		if (instance == null) {
-			instance = new LaunchMacroSupplier();
-		}
-		return instance;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String,
-	 *      int, java.lang.Object)
-	 */
-	public ICdtVariable getMacro(String macroName, int contextType,
-			Object contextData) {
-		switch (contextType) {
-		case ILaunchVariableContextInfo.CONTEXT_LAUNCH:
-			if (contextData instanceof ILaunchConfiguration) {
-				loadLaunchConfigurationMacroSuppliers();
-				try {
-					ILaunchConfigurationType launchConfigurationType = ((ILaunchConfiguration) contextData)
-							.getType();
-					ILaunchConfigurationVariableSupplier launchConfigurationMacroSupplier = (ILaunchConfigurationVariableSupplier) this.auxiliarySuppliers
-							.get(launchConfigurationType.getIdentifier());
-					return launchConfigurationMacroSupplier.getVariable(
-							macroName, (ILaunchConfiguration) contextData);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			break;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int,
-	 *      java.lang.Object)
-	 */
-	public ICdtVariable[] getMacros(int contextType, Object contextData) {
-		switch (contextType) {
-		case ILaunchVariableContextInfo.CONTEXT_LAUNCH:
-			if (contextData instanceof ILaunchConfiguration) {
-				loadLaunchConfigurationMacroSuppliers();
-				try {
-					ILaunchConfigurationType launchConfigurationType = ((ILaunchConfiguration) contextData)
-							.getType();
-					ILaunchConfigurationVariableSupplier launchConfigurationMacroSupplier = (ILaunchConfigurationVariableSupplier) this.auxiliarySuppliers
-							.get(launchConfigurationType.getIdentifier());
-					return launchConfigurationMacroSupplier
-							.getVariables((ILaunchConfiguration) contextData);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return null;
-	}
-
-	private void loadLaunchConfigurationMacroSuppliers() {
-		if (this.auxiliarySuppliers.isEmpty()) {
-			ProcessExtensions.process(EXT_LAUNCH_CONFIGURATION_MACRO_SUPPLIER,
-					new IProcessMemberVisitor() {
-						public Object process(IExtension extension,
-								IConfigurationElement member) {
-							try {
-								LaunchMacroSupplier.this.auxiliarySuppliers
-										.put(
-												member
-														.getAttribute(CONFIG_TYPE_ID),
-												member
-														.createExecutableExtension(CLASS));
-							} catch (Exception e) {
-								e.printStackTrace();
-							}
-							return null;
-						}
-					});
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java
deleted file mode 100755
index 085be12..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.macros;
-
-import org.eclipse.cdt.utils.cdtvariables.ICdtVariableSupplier;
-import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableContextInfo;
-
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class LaunchVariableContextInfo implements ILaunchVariableContextInfo {
-
-	private int type;
-
-	private Object data;
-
-	public LaunchVariableContextInfo(int type, Object data) {
-		this.type = type;
-		this.data = data;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getContextData()
-	 */
-	public Object getContextData() {
-		return this.data;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getContextType()
-	 */
-	public int getContextType() {
-		return this.type;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getNext()
-	 */
-	public IVariableContextInfo getNext() {
-		switch (this.type) {
-		case CONTEXT_LAUNCH:
-			if (this.data instanceof ILaunchConfiguration) {
-				IWorkspace wsp = ResourcesPlugin.getWorkspace();
-				if (wsp != null) {
-					return new LaunchVariableContextInfo(CONTEXT_WORKSPACE, wsp);
-				}
-			}
-			break;
-		case CONTEXT_WORKSPACE:
-			return null;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getSuppliers()
-	 */
-	public ICdtVariableSupplier[] getSuppliers() {
-		switch (this.type) {
-		case CONTEXT_LAUNCH:
-			if (this.data instanceof ILaunchConfiguration) {
-				return new ICdtVariableSupplier[] { LaunchVariableManager.launchMacroSupplier };
-			}
-			break;
-		case CONTEXT_WORKSPACE:
-			if (this.data instanceof IWorkspace) {
-				return new ICdtVariableSupplier[] { LaunchVariableManager.eclipseVariablesMacroSupplier };
-			}
-			break;
-		}
-		return null;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java
deleted file mode 100755
index 92258d9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.macros;
-
-import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
-import org.eclipse.cdt.internal.core.cdtvariables.CoreVariableSubstitutor;
-import org.eclipse.cdt.internal.core.cdtvariables.EclipseVariablesVariableSupplier;
-import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
-import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo;
-import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableManager;
-
-
-/**
- * This class is similar to
- * org.eclipse.cdt.internal.core.cdtvariables.CdtVariableManager
- * 
- * @author laggarcia
- * @since 3.0.0
- */
-public class LaunchVariableManager implements ILaunchVariableManager {
-
-	private static LaunchVariableManager instance;
-
-	public static LaunchMacroSupplier launchMacroSupplier = LaunchMacroSupplier
-			.getInstance();
-
-	public static EclipseVariablesVariableSupplier eclipseVariablesMacroSupplier = EclipseVariablesVariableSupplier
-			.getInstance();
-
-	public LaunchVariableManager() {
-	}
-
-	public static LaunchVariableManager getDefault() {
-		if (instance == null)
-			instance = new LaunchVariableManager();
-		return instance;
-	}
-
-	public String resolveValue(String value, String nonexistentMacrosValue,
-			String listDelimiter, int contextType, Object contextData)
-			throws CdtVariableException {
-
-		IVariableContextInfo info = getMacroContextInfo(contextType, contextData);
-		if (info != null)
-			return CdtVariableResolver.resolveToString(value, getMacroSubstitutor(
-					info, nonexistentMacrosValue, listDelimiter));
-		return null;
-
-	}
-
-	public IVariableContextInfo getMacroContextInfo(int contextType,
-			Object contextData) {
-		LaunchVariableContextInfo info = new LaunchVariableContextInfo(contextType,
-				contextData);
-		if (info.getSuppliers() != null)
-			return info;
-		return null;
-	}
-
-	public IVariableSubstitutor getMacroSubstitutor(IVariableContextInfo info,
-			String inexistentMacroValue, String listDelimiter) {
-		return new CoreVariableSubstitutor(info, inexistentMacroValue,
-				listDelimiter);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties
deleted file mode 100755
index bd883ac..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties
+++ /dev/null

@@ -1,60 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-RemoteLaunchProcess_RequestToCancelLaunch=Requested to cancel this launch.
-RemoteLaunchProcess_PrepareWorkingDir_NotRequired=* Launch configuration does not require creating remote directory.
-RemoteLaunchProcess_UploadWorkingDirectory_Title=* Synchronize before launch:
-RemoteLaunchProcess_UploadApplication_Title=* Upload application executable file.
-RemoteLaunchProcess_PrepareWorkingDir_Title=* Creating remote working directory: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedCreate=\ \ \ Failed to create remote working directory: {0}
-RemoteLaunchProcess_UploadWorkingDirectory_NoRules=\ \ \ No rules were specified for this launch.
-RemoteLaunchProcess_UploadApplication_TitleNoUpload=* Launch configuration does not require uploading the executable file.
-RemoteLaunchProcess_UploadApplication_UploadMessage=\ \ \ Upload executable {0}\n   to {1} (remote)
-RemoteLaunchProcess_UploadApplication_FailedUpload=\ \ \ Upload failed: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedCreateHint=\ \ \ Check if the directory already exists or is owned by another user.
-RemoteLaunchProcess_UploadWorkingDirectory_FailedRule=\ \ \ Rule {0} failed: {1}
-RemoteLaunchProcess_UploadApplication_CompletedUpload=\ \ \ Upload completed.
-RemoteLaunchProcess_PrepareWorkingDir_Failed=Could not prepare working directory.
-RemoteLaunchProcess_All_FailedConnection=Connection to host failed.
-RemoteLaunchProcess_Failed=Could not upload executable file.
-RemoteLaunchProcess_FailedPermissions=\ \ \ Failed to set permissions on executable file: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedPermissions=\ \ \ Failed to set permissions on remote working directory: {0}
-RemoteLaunchProcess_UploadWorkingDirectory_TitleUploadDisabled=* Launch configuration does not require synchronize before launch.
-RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive=\ \ \ Ignoring inactive rule {0}
-RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInvalid=\ \ \ Ignoring rule {0}: {1}
-RemoteLaunchProcess_DownloadWorkingDirectory_TitleDownloadDisabled=* Launch configuration does not require synchronize after launch.
-RemoteLaunchProcess_DownloadWorkingDirectory_Title=* Synchronize after launch:
-RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInactive=\ \ \ Ignoring inactive rule {0}
-RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInvalid=\ \ \ Ignoring rule {0}: {1}
-RemoteLaunchProcess_DownloadWorkingDirectory_FailedRule=\ \ \ Rule {0} failed: {1}
-DownloadBackAction_FailedFetchRemoteProperties=\ \ \ Could not fetch properties for remote file: {0}
-DownloadRuleAction_FailedCalculateClockDifference=\ \ \ Could not calculate clock difference with remote host: {0}
-DownloadRuleAction_FailedCalculateClockDifference2=\ \ \ Assuming same a remote clock synchronized with local clock.
-DownloadRuleAction_FailedCreateLocalDirectory=\ \ \ Cannot create local directory {0}
-DownloadRuleAction_FailedLocalDiretoryIsNotDirectory=\ \ \ Path {0} exists, but is not a directory
-DownloadRuleAction_FailedRemotePathDoesNotExit=\ \ \ Ignoring {0}: Path does not exist remotely
-DownloadRuleAction_FailedFetchRemoteAttributes=\ \ \ Could not fetch attributes of remote file/directory: {0}
-DownloadRuleAction_NotiftNewerFileExistsLocally=\ \ \ A newer file alredy exists locally, ignoring it: {0}
-DownloadRuleAction_FailedSetLocalFileAttributes=\ \ \ Failed to set attributes of local file: {0}
-DownloadRuleAction_FailedSetLocalDirectoryAttributes=\ \ \ Failed to set attributes of local directory: {0}
-DownloadBackAction_FailedFiledDoesNotExist=\ \ \ Remote file does not exist anymore: {0}
-DownloadRuleAction_NotifyDirectoryDownload1=\ \ \ Copying contents of directory {0} (remote)
-DownloadRuleAction_NotifyDirectoryDownload2=\ \ \ into directory {0} (local)
-DownloadRuleAction_NotiftFileExistsLocally=\ \ \ File alredy exists locally, ignoring it: {0}
-DownloadBackAction_NotifyFileNotChanged=\ \ \ File {0} was not changed on remote target.
-DownloadRuleAction_WarningClockBackward=\ \ \ Warning\! Clock at remote target is older than local clock. File synchronization may not be correct.
-DownloadRuleAction_FailedFetchAttributes=\ \ \ Ignoring {0}: Cannot fetch attributes
-DownloadRuleAction_FailedSetDownloadFile=\ \ \ Could not download file: {0}
-DownloadBackAction_NotifyDonwloadBack=\ \ \ Download back file {0}.
-DownloadBackAction_FailedDownloadBack=\ \ \ Could not download file: {0}
-DownloadRuleAction_WarningClockForward=\ \ \ Warning\! Clock at remote target is more recent than local clock. File synchronization may not be correct.
-DownloadRuleAction_FailedRemotePathNoDirectoryNorFile=\ \ \ Ignoring {0}: Path is not a remote file nor directory
-DownloadRuleAction_NotifyFileDownload1=\ \ \ Copying file {0} (remote)
-DownloadRuleAction_NotifyFileDownload2=\ \ \ to file {0} (local)

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java
deleted file mode 100755
index 4d382e9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IProcess;
-
-/**
- * A process that behaves as it were a real running process.
- * <p>
- * Used to test and understand Eclipse Debugger and Launch facilities.
- * @author Daniel Felix Ferber
- */
-public abstract class AbstractProcess extends PlatformObject implements IProcess {
-	
-	protected String label = Messages.AbstractProcess_DefaultLabel;
-	static int counter;
-	
-	/**
-	 * The launch this process is contained in
-	 */
-	protected ILaunch launch;
-	
-	/**
-	 * Table of client defined attributes
-	 */
-	protected Map attributes;
-		
-	/**
-	 * Whether output from the process should be captured or swallowed
-	 */
-	protected boolean captureOutput = true;
-	
-	public AbstractProcess(ILaunch launch, String label) {
-		super();
-		this.launch = launch;
-		
-		if (label == null) {
-			counter++;
-			this.label = "bogus "+Integer.toString(counter); //$NON-NLS-1$
-		} else {
-			this.label = label;
-		}
-		
-		String captureOutputValue = launch.getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT);
-		captureOutput = !("false".equals(captureOutputValue)); //$NON-NLS-1$
-	}
-	
-	public void start() {
-		launch.addProcess(this);
-		fireCreationEvent();
-		fireChangeEvent();
-	}
-	
-	public String getLabel() {
-		return label;
-	}
-
-	public ILaunch getLaunch() {
-		return launch;
-	}
-
-	public void setAttribute(String key, String value) {
-		if (attributes == null) {
-			attributes = new HashMap(5);
-		}
-		Object origVal = attributes.get(key);
-		if (origVal != null && origVal.equals(value)) {
-			return; //nothing changed.
-		}
-		
-		attributes.put(key, value);
-		fireChangeEvent();
-	}
-
-	public String getAttribute(String key) {
-		if (attributes == null) {
-			return null;
-		}
-		return (String)attributes.get(key);
-	}
-	
-	/**
-	 * Copy the attributes of this process to those in the given map.
-	 * 
-	 * @param attributes attribute map or <code>null</code> if none
-	 */
-	public void copyAttributes(Map attributes) {
-		if (attributes != null) {
-			Iterator keys = attributes.keySet().iterator();
-			while (keys.hasNext()) {
-				String key = (String)keys.next();
-				setAttribute(key, (String)attributes.get(key));
-			}	
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IProcess.class)) {
-			return this;
-		}
-		if (adapter.equals(IDebugTarget.class)) {
-			ILaunch launch = getLaunch();
-			IDebugTarget[] targets = launch.getDebugTargets();
-			for (int i = 0; i < targets.length; i++) {
-				if (this.equals(targets[i].getProcess())) {
-					return targets[i];
-				}
-			}
-			return null;
-		}
-		return super.getAdapter(adapter);
-	}
-
-	/**
-	 * Fires a creation event.
-	 */
-	protected void fireCreationEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.CREATE));
-	}
-
-	/**
-	 * Fires the given debug event.
-	 * 
-	 * @param event debug event to fire
-	 */
-	protected void fireEvent(DebugEvent event) {
-		DebugPlugin manager= DebugPlugin.getDefault();
-		if (manager != null) {
-			manager.fireDebugEventSet(new DebugEvent[]{event});
-		}
-	}
-
-	/**
-	 * Fires a terminate event.
-	 */
-	protected void fireTerminateEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.TERMINATE));
-	}
-
-	/**
-	 * Fires a change event.
-	 */	
-	protected void fireChangeEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.CHANGE));
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java
deleted file mode 100755
index ea3ffe5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.io.IOException;
-
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.debug.core.model.IStreamsProxy2;
-
-class ExecutionStreamsProxy implements IStreamsProxy, IStreamsProxy2 {
-	final IStreamMonitor errorStreamMonitor;
-	final IStreamMonitor outputStreamMonitor;
-	
-	public ExecutionStreamsProxy(final IStreamMonitor errorStreamMonitor, final IStreamMonitor outputStreamMonitor) {
-		super();
-		this.errorStreamMonitor = errorStreamMonitor;
-		this.outputStreamMonitor = outputStreamMonitor;
-	}
-
-	public IStreamMonitor getErrorStreamMonitor() {
-		return errorStreamMonitor;
-	}
-
-	public IStreamMonitor getOutputStreamMonitor() {
-		return outputStreamMonitor;
-	}
-
-	public void write(String input) throws IOException {
-		// Ignore, it is not possible to write to TargetProcess
-	}
-
-	public void closeInputStream() throws IOException {
-		// Ignore until deciding how to handle close
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java
deleted file mode 100755
index 874566d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.internal.process.messages"; //$NON-NLS-1$
-
-	public static String AbstractProcess_DefaultLabel;
-
-	public static String TargetProcess_Label;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java
deleted file mode 100755
index 73dbd1c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IStreamMonitor;
-
-class MonitorOutputStream extends OutputStream implements IStreamMonitor {
-	private Set listeners= new HashSet(1);
-	
-	public void addListener(IStreamListener listener) {
-		listeners.add(listener);
-	}
-
-	public String getContents() {
-		return null;
-	}
-
-	public void removeListener(IStreamListener listener) {
-		listeners.remove(listener);
-
-	}
-
-	public void write(int b) throws IOException {
-		Iterator iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			IStreamListener listener = (IStreamListener) iterator.next();
-			byte bytes [] = new byte[1];
-			bytes[0] = (byte)b;
-			String text = new String(bytes);
-			listener.streamAppended(text, this);
-		}
-	}
-	
-	public void write(byte[] b) throws IOException {
-		Iterator iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			IStreamListener listener = (IStreamListener) iterator.next();
-			String text = new String(b);
-			listener.streamAppended(text, this);
-		}
-	}
-
-	public void write(byte[] b, int off, int len) throws IOException {
-		Iterator iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			IStreamListener listener = (IStreamListener) iterator.next();
-			String text = new String(b, off, len);
-			listener.streamAppended(text, this);
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java
deleted file mode 100755
index 2b0bce0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.io.OutputStream;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener;
-
-
-public class TargetProcess extends AbstractProcess implements ILaunchProgressListener {
-
-	final ILaunchProcess executionJob;
-	boolean wasFinished = false;
-	
-	final MonitorOutputStream monitorOutputStream = new MonitorOutputStream();
-	final MonitorOutputStream monitorErrorStream = new MonitorOutputStream();
-	final ExecutionStreamsProxy streamsProxy = new ExecutionStreamsProxy(monitorErrorStream, monitorOutputStream);
-	
-	public TargetProcess(ILaunch launch, ILaunchProcess job) {
-		super(launch, Messages.TargetProcess_Label);
-		this.executionJob = job;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IProcess#getExitValue()
-	 */
-	public int getExitValue() throws DebugException {
-		return 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IProcess#getStreamsProxy()
-	 */
-	public IStreamsProxy getStreamsProxy() {
-		return streamsProxy;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
-	 */
-	public boolean canTerminate() {
-		return executionJob.getCurrentProgress() != ILaunchProgressListener.FINISHED;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
-	 */
-	public boolean isTerminated() {
-		return wasFinished || ! canTerminate();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#terminate()
-	 */
-	public void terminate() throws DebugException {
-		executionJob.markAsCanceled();
-	}
-
-	public OutputStream getOutputStream() {
-		return monitorOutputStream;
-	}
-
-	public OutputStream getErrorStream() {
-		return monitorErrorStream;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener#notifyProgress(int)
-	 */
-	public void notifyProgress(int progress) {
-		fireChangeEvent();
-		if (progress == ILaunchProgressListener.FINISHED) {
-			fireTerminateEvent();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener#notifyInterrupt()
-	 */
-	public void notifyInterrupt() {
-		wasFinished = true;
-		fireTerminateEvent();
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties
deleted file mode 100755
index 6bc8433..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-TargetProcess_Label=Connection to target
-AbstractProcess_DefaultLabel=no label

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java
deleted file mode 100755
index f56081b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.macros;
-
-import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
-import org.eclipse.debug.core.ILaunchConfiguration;
-
-/**
- * 
- * This interface is to be implemented by the launch-integrator
- * for supplying the configuration-specific macros
- * 
- * @author laggarcia
- * @since 3.0.0
- */
-public interface ILaunchConfigurationVariableSupplier {
-
-	/**
-	 *
-	 * @param variableName the variable name
-	 * @param launchConfiguration launch configuration
-	 * @return the reference to the ICdtVariable interface representing 
-	 * the variable of a given name or null if the variable of that name is not defined
-	 */
-	public ICdtVariable getVariable(String variableName,
-			ILaunchConfiguration launchConfiguration);
-
-	/**
-	 *
-	 * @param launchConfiguration launch configuration
-	 * @return the ICdtVariable[] array representing defined variables 
-	 */
-	public ICdtVariable[] getVariables(ILaunchConfiguration launchConfiguration);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java
deleted file mode 100755
index 0d19592..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.macros;
-
-import org.eclipse.cdt.internal.core.cdtvariables.ICoreVariableContextInfo;
-
-/**
- * @author laggarcia
- *
- */
-public interface ILaunchVariableContextInfo extends ICoreVariableContextInfo {
-
-	// The contexts defined by this interface must be consistent with the
-	// contexts defined in @see
-	// org.eclipse.cdt.core.cdtvariables.ICoreVariableContextInfo
-	public final static int CONTEXT_WORKSPACE = 5;
-
-	public final static int CONTEXT_LAUNCH = 9;
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java
deleted file mode 100755
index c4c0e90..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.macros;
-
-import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
-
-/**
- * This interface is similar to the one provided by
- * 
- * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider.
- * 
- * @author laggarcia
- * @since 3.0.0
- */
-public interface ILaunchVariableManager {
-
-	public String resolveValue(String value, String nonexistentMacrosValue,
-			String listDelimiter, int contextType, Object contextData)
-			throws CdtVariableException;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java
deleted file mode 100755
index 272bc9a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-
-public class LaunchPreferences {
-	public static final String PREFIX = "org.eclipse.ptp.remotetools.environment.launcher.preferences-"; //$NON-NLS-1$
-	public static final String ATTR_WORKING_DIRECTORY = PREFIX + "working-directory"; //$NON-NLS-1$
-	
-	public static String DEFAULT_WORKING_DIRECTORY;
-	
-	static {
-		NLS.initializeMessages("org.eclipse.ptp.remotetools.environment.launcher.preferences.launch_preferences", LaunchPreferences.class); //$NON-NLS-1$
-	}
-
-	public static IPreferenceStore getPreferenceStore() {
-		return RemoteLauncherPlugin.getDefault().getPreferenceStore();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java
deleted file mode 100755
index 92d3376..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class LauncherPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	IPreferenceStore store;
-	private StringFieldEditor workingDirectory;
-	
-	public LauncherPreferencePage() {
-		super(GRID);
-
-		store = LaunchPreferences.getPreferenceStore();
-		setPreferenceStore(store);
-		
-		setDescription(Messages.LauncherPreferencePage_Description);
-		setTitle(Messages.LauncherPreferencePage_Title);
-	}
-
-
-	protected void createFieldEditors() {
-		workingDirectory = new StringFieldEditor(LaunchPreferences.ATTR_WORKING_DIRECTORY, Messages.LauncherPreferencePage_RemoteWorkingDirectoryLabel, getFieldEditorParent());
-		addField(workingDirectory);
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java
deleted file mode 100755
index 815d31d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.preferences.messages"; //$NON-NLS-1$
-
-	public static String LauncherPreferencePage_Description;
-
-	public static String LauncherPreferencePage_RemoteWorkingDirectoryLabel;
-
-	public static String LauncherPreferencePage_Title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java
deleted file mode 100755
index d555dde..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	public PreferenceInitializer() {
-		super();
-	}
-
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = RemoteLauncherPlugin.getDefault().getPreferenceStore();
-		store.setDefault(LaunchPreferences.ATTR_WORKING_DIRECTORY, LaunchPreferences.DEFAULT_WORKING_DIRECTORY);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties
deleted file mode 100755
index 07f4826..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-DEFAULT_WORKING_DIRECTORY=${system_workspace}/${user_workspace}/${project_name}/${timestamp}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties
deleted file mode 100755
index 026d043..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LauncherPreferencePage_Description=Preferences for the Launcher
-LauncherPreferencePage_Title=Remote Tools Application Launcher
-LauncherPreferencePage_RemoteWorkingDirectoryLabel=Remote working directory

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java
deleted file mode 100755
index 8d5f349..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java
+++ /dev/null

@@ -1,490 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboMold;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-
-
-public class DownloadRuleDialog extends TitleAreaDialog implements IRuleDialog {
-
-	Composite content;
-
-	Text localDirectoryText;
-	Button localDirectoryButton;
-	Button localWorkspaceButton;
-
-	List fileList;
-	Button addFilesButton;
-	Button editFileButton;
-	Button removeFilesButton;
-	
-	Button asReadOnlyButton, asExecutableButton;
-	Button preserveTimeStampButton;
-	ComboGroup overwritePolicyCombo;
-	
-	DownloadRule downloadRule;
-	IPath lastSelectedDirectory = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-	
-	private int listenersEnabled = 0;
-	
-	public DownloadRuleDialog(Shell parentShell, DownloadRule rule) {
-		super(parentShell);
-		
-		downloadRule = rule;
-	}
-	
-	public DownloadRuleDialog(Shell shell) {
-		super(shell);
-		downloadRule = new DownloadRule();
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		content = new Composite(parent, SWT.BORDER);
-		GridLayout layout = new GridLayout();
-		content.setLayout(layout);
-//		Layout l = content.getParent().getLayout();
-		content.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		setTitle(Messages.DownloadRuleDialog_Title);
-		setMessage(Messages.DownloadRuleDialog_Message);
-		
-		createRemoteFilesComposite(content);
-		createLocalDirectoryComposite(content);
-		createOptionsComposite(content);
-		
-		putFieldContents();
-		
-		return content;
-	}
-
-	private void enableListeners() {
-		listenersEnabled ++;		
-	}
-	
-	private void disableListeners() {
-		listenersEnabled--;
-	}
-	
-	private void putFieldContents() {
-		disableListeners();
-		
-		if (downloadRule.getLocalDirectory() != null) {
-			localDirectoryText.setText(downloadRule.getLocalDirectory());
-		} else {
-			localDirectoryText.setText("");			 //$NON-NLS-1$
-		}
-		overwritePolicyCombo.selectIndexUsingID(Integer.toString(downloadRule.getOverwritePolicy()));
-		asExecutableButton.setSelection(downloadRule.isAsExecutable());
-		asReadOnlyButton.setSelection(downloadRule.isAsReadOnly());
-		preserveTimeStampButton.setSelection(downloadRule.isPreserveTimeStamp());
-		String items[] = downloadRule.getRemoteFilesAsStringArray();
-		Arrays.sort(items);
-		fileList.setItems(items);
-		
-		enableListeners();
-	}
-	
-	private void fetchFieldContents() {
-		disableListeners();
-		
-		String path = localDirectoryText.getText().trim();
-		if (path.length() > 0) {
-			downloadRule.setLocalDirectory(path);
-		} else {
-			downloadRule.setLocalDirectory(null);
-		}
-		downloadRule.setOverwritePolicy(Integer.parseInt(overwritePolicyCombo.getSelectionId()));
-		downloadRule.setAsExecutable(asExecutableButton.getSelection());
-		downloadRule.setAsReadOnly(asReadOnlyButton.getSelection());
-		downloadRule.setPreserveTimeStamp(preserveTimeStampButton.getSelection());
-		downloadRule.setRemoteFiles(fileList.getItems());
-		
-		enableListeners();
-	}
-
-	protected void okPressed() {
-		fetchFieldContents();
-		super.okPressed();
-	}
-
-	private Composite createLocalDirectoryComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(3);
-		frameMold.setTitle(Messages.DownloadRuleDialog_DestinationFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		Composite contents = frame.getComposite();
-		
-		GridData localDirectoryGridData = new GridData();
-		localDirectoryGridData.grabExcessHorizontalSpace = true;
-		localDirectoryGridData.horizontalSpan = 3;
-		localDirectoryGridData.horizontalAlignment = SWT.FILL;
-		localDirectoryText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-		localDirectoryText.setLayoutData(localDirectoryGridData);
-		
-		GridData skipperGridData = new GridData();
-		skipperGridData.grabExcessHorizontalSpace = true;
-		skipperGridData.horizontalSpan = 1;
-		skipperGridData.horizontalAlignment = SWT.FILL;
-		Label skipper = new Label(contents, SWT.NONE); // Just to skip one column
-		skipper.setLayoutData(skipperGridData);
-		
-		localDirectoryButton = new Button(contents, SWT.PUSH);
-		localDirectoryButton.setText(Messages.DownloadRuleDialog_DestinationFrame_FileSystemButton);
-		localDirectoryButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleLocalDirectoryButtonEvent();
-			}			
-		});
-		localWorkspaceButton = new Button(contents, SWT.PUSH);
-		localWorkspaceButton.setText(Messages.DownloadRuleDialog_DestinationFrame_WorkspaceButton);
-		localWorkspaceButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleLocalWorkspaceButtonEvent();
-			}			
-		});
-		
-		return frame;
-	}
-	
-	private Composite createOptionsComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(3);
-		frameMold.addOption(FrameMold.COLUMNS_EQUAL_WIDTH);
-		frameMold.setTitle(Messages.DownloadRuleDialog_OptionsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Composite contents = frame.getComposite();
-		asReadOnlyButton = new Button(contents, SWT.CHECK);
-		asReadOnlyButton.setText(Messages.DownloadRuleDialog_OptionsFrame_ReadonlyCheck);
-		asExecutableButton = new Button(contents, SWT.CHECK);
-		asExecutableButton.setText(Messages.DownloadRuleDialog_OptionsFrame_ExecutableCheck);
-		preserveTimeStampButton = new Button(contents, SWT.CHECK);
-		preserveTimeStampButton.setText(Messages.DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck);
-		
-		ComboMold mold = new ComboMold(ComboMold.GRID_DATA_SPAN);
-		mold.setLabel(Messages.DownloadRuleDialog_OptionsFrame_OverwriteLabel);
-		mold.setTextFieldWidth(40);
-		mold.addItem(Integer.toString(OverwritePolicies.SKIP), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption);
-		mold.addItem(Integer.toString(OverwritePolicies.ALWAYS), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption);
-		mold.addItem(Integer.toString(OverwritePolicies.NEWER), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption);
-		overwritePolicyCombo = new ComboGroup(contents, mold);
-		overwritePolicyCombo.getCombo().addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				disableListeners();
-				if (overwritePolicyCombo.getSelectionId().equals(Integer.toString(OverwritePolicies.NEWER))) {
-					preserveTimeStampButton.setEnabled(false);
-					preserveTimeStampButton.setSelection(true);
-				} else {
-					preserveTimeStampButton.setEnabled(true);					
-				}
-				enableListeners();
-			}
-			
-		});
-		return frame;
-	}
-	
-	private Composite createRemoteFilesComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.setTitle(Messages.DownloadRuleDialog_FileListFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Frame filesFrame = new Frame(frame.getComposite());
-		fileList = new List(filesFrame, SWT.MULTI | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=200;
-		fileList.setLayoutData(gridData);
-		fileList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				removeFilesButton.setEnabled(fileList.getSelectionCount() != 0);
-				editFileButton.setEnabled(fileList.getSelectionCount() == 1);
-			}
-		});
-		fileList.deselectAll();
-		
-		Frame buttonFrame = new Frame(frame.getComposite());
-		addFilesButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesButton.setText(Messages.DownloadRuleDialog_FileListFrame_AddButton);
-		addFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleaddFilesButtonEvent();
-			}			
-		});
-		editFileButton = new Button(buttonFrame, SWT.PUSH);
-		editFileButton.setText(Messages.DownloadRuleDialog_FileListFrame_EditButton);
-		editFileButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		editFileButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleEditFileButtonEvent();
-			}			
-		});
-		removeFilesButton = new Button(buttonFrame, SWT.PUSH);
-		removeFilesButton.setText(Messages.DownloadRuleDialog_FileListFrame_RemoveButton);
-		removeFilesButton.setEnabled(false);
-		removeFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleRemoveFilesButtonEvent();
-			}
-			
-		});
-		GridData gridData2 = new GridData();
-		gridData2.grabExcessVerticalSpace = true;
-		gridData2.verticalAlignment = SWT.TOP;
-		buttonFrame.setLayoutData(gridData2);
-		
-		return frame;
-	}
-
-	
-	private void handleLocalDirectoryButtonEvent() {
-		if (listenersEnabled < 0) return;
-
-		IPath selectedPath = null;
-		/*
-		 * First, try the current path.
-		 */
-		IPath workspacePath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		IPath currentPath = new Path(localDirectoryText.getText());
-		if (! currentPath.isAbsolute()) {
-			currentPath = workspacePath.append(currentPath).removeTrailingSeparator();
-		}
-		File file = new File(currentPath.toOSString());
-		if (file.isDirectory() && file.isDirectory()) {
-			selectedPath =  currentPath;
-		}
-		
-		/*
-		 * If not, try last directory.
-		 */
-		if (selectedPath == null) {
-			File file2 = new File(lastSelectedDirectory.toOSString());
-			if (file2.isDirectory() && file2.isDirectory()) {
-				selectedPath =  lastSelectedDirectory;
-			}
-		}
-		
-		/*
-		 * Otherwise, use workspace root.
-		 */
-		if (selectedPath == null) {
-			selectedPath = workspacePath;
-		}
-		
-		DirectoryDialog directoryDialog = new DirectoryDialog(getShell(), SWT.OPEN);
-		directoryDialog.setFilterPath(selectedPath.toOSString());
-		directoryDialog.setText(Messages.DownloadRuleDialog_DirectoryDialog_Title);
-		directoryDialog.setMessage(Messages.DownloadRuleDialog_DirectoryDialog_Message);
-
-		String newPath = directoryDialog.open();
-
-		if (newPath != null) {			
-			/*
-			 * If path is inside the workspace, then make it relative.
-			 */
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath path = new Path(newPath);
-			if (workspace.isPrefixOf(path)) {
-				path = path.removeFirstSegments(workspace.segmentCount());
-				path = path.makeRelative();
-			}
-			localDirectoryText.setText(path.toOSString());
-			
-			/*
-			 * Save lastSelectedDirectory. There is a bug in DirectoryDialog.
-			 * The method getFilterPath does not return the expected path.
-			 * The bug will be fixed in Eclipse 3.4.
-			 * The workarount takes the parent of the selected directory as lastSelectedDirectory.
-			 */
-			lastSelectedDirectory = new Path(newPath);
-			lastSelectedDirectory = lastSelectedDirectory.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-	
-	private void handleLocalWorkspaceButtonEvent() {
-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-		IContainer selectedContainer = null;
-	
-		/*
-		 * First, try the current content as initial selection.
-		 */
-		IPath currentPath = new Path(localDirectoryText.getText());
-		if (currentPath.isAbsolute()) {
-			// Absolute path if file system
-			IContainer currentContainer[] = workspace.findContainersForLocation(currentPath);
-			if (currentContainer != null) {
-				if (currentContainer.length == 1) {
-					selectedContainer = currentContainer[0];
-				}
-			}
-		} else {
-			// Path relative to workspace
-			IResource selectedResource = workspace.findMember(lastSelectedDirectory);
-			if (selectedResource != null) {
-				if (selectedResource instanceof IContainer) {
-					selectedContainer = (IContainer) selectedResource;
-				}
-			}
-		}
-		
-		/*
-		 * Otherwise, try the last selected path as initial selection.
-		 */
-		if (selectedContainer == null) {
-			IContainer lastContainer[] = workspace.findContainersForLocation(lastSelectedDirectory);
-			if (lastContainer != null) {
-				if (lastContainer.length == 1) {
-					selectedContainer = lastContainer[0];
-				}
-			}
-		}
-				
-		/*
-		 * If nothing matches, use the workspace root.
-		 */
-		if (selectedContainer == null) {
-			selectedContainer = workspace;
-		}
-		
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), workspace, true, Messages.DownloadRuleDialog_WorkspaceDialog_Title);
-		dialog.setBlockOnOpen(true);
-		dialog.setInitialSelections(new Object[] { selectedContainer });
-		
-		if (dialog.open() == Dialog.OK) {
-			/*
-			 * Although not documented, getResult returns an array with exactly
-			 * one element, that has type of IPath.
-			 * The path is relative to workspace.
-			 */
-			Object r[] = dialog.getResult();
-			IPath selectedPath = (IPath)r[0];
-			// The path is returned as absolute! Make it relative!
-			localDirectoryText.setText(selectedPath.makeRelative().toOSString());
-			
-			lastSelectedDirectory = selectedPath.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-
-	private void handleaddFilesButtonEvent() {
-		InputDialog inputDialog = new InputDialog(getShell(), Messages.DownloadRuleDialog_AddFileDialog_Title, Messages.DownloadRuleDialog_AddFileDialog_Message, "", null); //$NON-NLS-3$ //$NON-NLS-1$
-		inputDialog.setBlockOnOpen(true);
-		if (inputDialog.open() == Dialog.OK) {
-			ArrayList list = new ArrayList(Arrays.asList(fileList.getItems()));
-			list.add(inputDialog.getValue());
-			String s[] = new String[list.size()];
-			s = (String[]) list.toArray(s);
-			Arrays.sort(s);
-			fileList.setItems(s);
-		}
-	}
-	
-	private void handleEditFileButtonEvent() {
-		if (fileList.getSelectionCount() != 1) {
-			return;
-		}
-		int index = fileList.getSelectionIndex();
-		String selectedItem = fileList.getItem(index);
-		
-		InputDialog inputDialog = new InputDialog(getShell(), Messages.DownloadRuleDialog_EditFileDialog_Title, Messages.DownloadRuleDialog_EditFileDialog_Message, selectedItem, null);
-		inputDialog.setBlockOnOpen(true);
-		if (inputDialog.open() == Dialog.OK) {
-			String s[] = fileList.getItems();
-			s[index] = inputDialog.getValue();
-			Arrays.sort(s);
-			fileList.setItems(s);
-		}
-	}
-	
-	private void handleRemoveFilesButtonEvent() {
-		String selection [] = fileList.getSelection();
-		if (selection.length == 0) {
-			return;
-		}
-		
-		HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-		for (int i = 0; i < selection.length; i++) {
-			String string = selection[i];
-			fileSet.remove(string);
-		}
-		
-		String items[] = new String[fileSet.size()];
-		items = (String[]) fileSet.toArray(items);
-		Arrays.sort(items);
-		fileList.setItems(items);
-	}
-
-	public ISynchronizationRule getRuleWorkingCopy() {
-		return downloadRule;
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java
deleted file mode 100755
index 21f45c5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java
+++ /dev/null

@@ -1,439 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
-import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchAttributes;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.environment.launcher.data.RuleFactory;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.preferences.LaunchPreferences;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- * @since 1.1
- */
-public class EnhancedSynchronizeTab extends AbstractLaunchConfigurationTab {
-
-	protected Button addUploadRuleButton;
-	protected Button addDownloadRuleButton;
-	protected Button editRuleButton;
-	protected Button removeRuleButton;
-	protected List ruleList;
-	protected ListViewer ruleViewer;
-	
-	protected Button syncBeforeButton;
-	protected Button syncAfterButton;
-	
-	protected ArrayList rules = new ArrayList();
-	protected SynchronizationRuleLabelProvider ruleLabelProvider;
-
-	boolean dataChanged = false;
-	int eventHandlerEnabled = 0;
-	
-	Image tabImage;
-	
-	public EnhancedSynchronizeTab() {
-		super();
-		dataChanged = false;
-		URL url = RemoteLauncherPlugin.getDefault().getBundle().getEntry("/icons/sync.png"); //$NON-NLS-1$
-		if (url != null) {
-		    ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
-		    tabImage = imageDescriptor.createImage();
-		}
-	}
-
-	protected void enableEventHandlers() {
-		eventHandlerEnabled++;
-	}
-	
-	protected void disableEventHandlers() {
-		eventHandlerEnabled--;
-	}
-	
-	protected boolean isEventHandlerEnabled() {
-		return eventHandlerEnabled > 0;
-	}
-
-	protected class TabModifyListener implements ModifyListener, SelectionListener {
-		public void modifyText(ModifyEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-	}
-
-	protected TabModifyListener modifyListener;
-
-	public void createControl(Composite parent) {
-
-		this.setErrorMessage(null);
-		this.setMessage(Messages.EnhancedSynchronizeTab_Tab_Message);
-
-		Composite topControl = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topControl.setLayout(topLayout);
-
-		setControl(topControl);
-		
-		Frame frame = new Frame(topControl, Messages.EnhancedSynchronizeTab_RulesFrame_Title);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL | GridData.GRAB_VERTICAL));
-		Composite frameComposite = frame.getComposite();
-
-		modifyListener = new TabModifyListener();
-
-		createRuleListControl(frameComposite);
-		createOptionsControl(frameComposite);
-		createButtonControl(frameComposite);
-		
-		enableEventHandlers();
-		
-	}
-
-	protected Composite createRuleListControl(Composite parent) {
-		Frame frame = new Frame(parent, 1);
-		frame.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		Composite frameComposite = frame.getComposite();
-		
-		Label label = new Label(frameComposite, SWT.WRAP);
-		label.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Description);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		ruleList = new List(frameComposite, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=100;
-		ruleList.setLayoutData(gridData);
-		ruleList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				removeRuleButton.setEnabled(ruleList.getSelectionCount() != 0);
-				editRuleButton.setEnabled(ruleList.getSelectionCount() == 1);
-			}
-		});
-		ruleList.deselectAll();
-		ruleViewer = new ListViewer(ruleList);
-		ruleViewer.setContentProvider(new IStructuredContentProvider() {
-			public Object[] getElements(Object inputElement) {
-				return rules.toArray();
-			}
-
-			public void dispose() {
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-//				System.out.println(oldInput.toString());
-			}
-		});
-		
-		ruleLabelProvider = new SynchronizationRuleLabelProvider();
-		ruleViewer.setLabelProvider(ruleLabelProvider);
-		ruleViewer.setInput(rules);
-		return frame;		
-	}
-
-	protected Composite createOptionsControl(Composite parent) {
-		Frame frame = new Frame(parent, FrameMold.COLUMNS_EQUAL_WIDTH, 2);
-		Composite frameComposite = frame.getComposite();
-		
-		syncBeforeButton = createCheckButton(frameComposite, Messages.EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled);
-		syncBeforeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		syncBeforeButton.addSelectionListener(modifyListener);
-		syncAfterButton = createCheckButton(frameComposite, Messages.EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled);
-		syncAfterButton.addSelectionListener(modifyListener);
-		syncAfterButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		return frame;
-	}
-	
-	protected Composite createButtonControl(Composite parent) {
-		Frame frame = new Frame(parent, FrameMold.COLUMNS_EQUAL_WIDTH, 4);
-		Composite frameComposite = frame.getComposite();
-		
-		addUploadRuleButton = new Button(frameComposite, SWT.PUSH);
-		addUploadRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule);
-		addUploadRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addUploadRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleAddUploadRuleButtonPressed();
-			}
-		});
-		
-		addDownloadRuleButton = new Button(frameComposite, SWT.PUSH);
-		addDownloadRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule);
-		addDownloadRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addDownloadRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleAddDownloadRuleButtonPressed();
-			}
-		});
-
-		editRuleButton = new Button(frameComposite, SWT.PUSH);
-		editRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule);
-		editRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		editRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleEditRuleButtonPressed();
-			}
-		});
-		editRuleButton.setEnabled(false);
-		
-		removeRuleButton = new Button(frameComposite, SWT.PUSH);
-		removeRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules);
-		removeRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleRemoveRuleButtonPressed();
-			}
-		});
-		removeRuleButton.setEnabled(false);
-
-		return frame;
-	}
-	
-
-	public boolean isValid(ILaunchConfiguration config) {
-		return super.isValid(config);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#canSave()
-	 */
-	public boolean canSave() {
-		return super.canSave() || dataChanged;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_AFTER,
-				IRemoteLaunchAttributes.DEFAULT_SYNC_AFTER);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_BEFORE,
-				IRemoteLaunchAttributes.DEFAULT_SYNC_BEFORE);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_RULES, new ArrayList());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		dataChanged = false;
-		try {
-			syncAfterButton.setSelection(configuration.getAttribute(
-					IRemoteLaunchAttributes.ATTR_SYNC_AFTER,
-					IRemoteLaunchAttributes.DEFAULT_SYNC_AFTER));
-			syncBeforeButton.setSelection(configuration.getAttribute(
-					IRemoteLaunchAttributes.ATTR_SYNC_BEFORE,
-					IRemoteLaunchAttributes.DEFAULT_SYNC_BEFORE));
-			java.util.List list = configuration.getAttribute(
-					IRemoteLaunchAttributes.ATTR_SYNC_RULES,
-					new ArrayList());
-			rules.clear();
-			for (Iterator iter = list.iterator(); iter.hasNext();) {
-				String string = (String) iter.next();
-				ISynchronizationRule rule = RuleFactory.createRuleFromString(string);
-				rules.add(rule);
-			}
-
-//			RemoteLaunchDelegate delegate = new RemoteLaunchDelegate();
-//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getValidatedRemoteDirectory(configuration)));
-//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getRemoteDirectory(configuration)));
-			
-			String defaultRemoteWorkingDirectory = LaunchPreferences.getPreferenceStore().getString(
-					LaunchPreferences.ATTR_WORKING_DIRECTORY);
-			
-			if( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, IRemoteLaunchAttributes.DEFAULT_AUTOMATIC_WORKING_DIRECTORY)){
-				ruleLabelProvider.setRemoteWorkingDir( defaultRemoteWorkingDirectory );
-			} else {
-				ruleLabelProvider.setRemoteWorkingDir( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, defaultRemoteWorkingDirectory) );
-			}
-			
-			refreshRuleList();
-		} catch (CoreException e) {
-			setErrorMessage(LaunchMessages
-					.getFormattedString(
-							"Launch.common.Exception_occurred_reading_configuration_EXCEPTION", e.getStatus().getMessage())); //$NON-NLS-1$
-			LaunchUIPlugin.log(e);
-		}
-	}
-
-	private void refreshRuleList() {
-//		ruleList.removeAll();
-//		for (Iterator iter = rules.iterator(); iter.hasNext();) {
-//			ISynchronizationRule rule = (ISynchronizationRule) iter.next();
-//			ruleList.add(rule.toLabel());
-//		}
-//		IStructuredSelection selection = (IStructuredSelection) ruleViewer.getSelection();
-//		Object firstElement = selection.getFirstElement();
-		ruleViewer.refresh();
-//		if (firstElement != null) {
-//			selection = new StructuredSelection(new Object[] {firstElement});
-//			ruleViewer.setSelection(selection, true);
-//		}
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_AFTER, syncAfterButton.getSelection());
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_BEFORE, syncBeforeButton.getSelection());
-		ArrayList list = new ArrayList();
-		for (Iterator iter = rules.iterator(); iter.hasNext();) {
-			ISynchronizationRule rule = (ISynchronizationRule) iter.next();
-			list.add(rule.toString());
-		}
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_RULES, list);
-		dataChanged = false;
-	}
-
-	public String getName() {
-		return Messages.EnhancedSynchronizeTab_Tab_Title;
-	}
-
-	public Image getImage() {
-		return tabImage;
-	}
-
-	protected void handleAddUploadRuleButtonPressed() {
-		UploadRule uploadRule = new UploadRule();
-		uploadRule.setDefaultRemoteDirectory(true);
-		uploadRule.setRemoteDirectory(null);
-		uploadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-		newRuleDialog(uploadRule);
-	}
-	
-	protected void handleAddDownloadRuleButtonPressed() {
-		DownloadRule downloadRule = new DownloadRule();
-		downloadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-		newRuleDialog(downloadRule);
-	}
-	
-	protected void newRuleDialog(ISynchronizationRule rule) {
-		Dialog dialog = RuleDialogFactory.createDialogForRule(getShell(), rule);
-		if (dialog != null) {
-			if (dialog.open() == Dialog.OK) {
-				IRuleDialog ruleDialog = (IRuleDialog) dialog;
-				ISynchronizationRule newRule = RuleFactory.duplicateRule(ruleDialog.getRuleWorkingCopy());
-				rules.add(newRule);
-			}
-		} else {
-			MessageDialog.openError(getShell(), Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_Title,	Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType);
-		}
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-
-	protected void handleEditRuleButtonPressed() {
-		if (ruleList.getSelectionCount() != 1) return;
-		
-		int index = ruleList.getSelectionIndex();
-		ISynchronizationRule rule = (ISynchronizationRule) rules.get(index);
-		Dialog dialog = RuleDialogFactory.createDialogForRule(getShell(), rule);
-		if (dialog != null) {
-			if (dialog.open() == Dialog.OK) {
-				IRuleDialog ruleDialog = (IRuleDialog) dialog;
-				ISynchronizationRule newRule = RuleFactory.duplicateRule(ruleDialog.getRuleWorkingCopy());
-				rules.set(index, newRule);
-			}
-		} else {
-			MessageDialog.openError(getShell(), Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_Title,	Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType);
-		}
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-	
-	protected void handleRemoveRuleButtonPressed() {		
-		if (ruleList.getSelectionCount() == 0) return;
-
-		int indexes[] = ruleList.getSelectionIndices();
-		HashSet set = new HashSet();
-		for (int i = 0; i < indexes.length; i++) {
-			int index = indexes[i];
-			set.add(rules.get(index));
-		}
-		rules.removeAll(set);
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-	
-	public void dispose() {
-		super.dispose();
-
-		if (tabImage != null) tabImage.dispose();
-		tabImage = null;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java
deleted file mode 100755
index 7c13d14..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-
-public interface IRuleDialog {
-	public ISynchronizationRule getRuleWorkingCopy();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java
deleted file mode 100755
index 5c539e9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java
+++ /dev/null

@@ -1,274 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import java.util.ArrayList;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
-import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.cdt.launch.ui.CLaunchConfigurationTab;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchAttributes;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.LaunchObserverIterator;
-import org.eclipse.ptp.utils.ui.swt.ToolKit;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-
-
-public class LauncherExecutionTab extends CLaunchConfigurationTab {
-
-	protected Text programArgumentsText;
-
-	private Combo observerList;
-	private ArrayList observerIDs;
-	private Text beforeCommandText;
-	private Text afterCommandText;
-	
-	private boolean isValid;
-	
-	private class TabModifyListener implements ModifyListener, SelectionListener {
-		public void modifyText(ModifyEvent e) {
-			verifyContent();
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			verifyContent();
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-			verifyContent();
-			updateLaunchConfigurationDialog();
-		}
-	}
-	private TabModifyListener modifyListener;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-
-		this.setErrorMessage(null);
-
-		GridLayout topLayout = new GridLayout();
-		Composite topControl = new Composite(parent, SWT.NONE);
-		topControl.setLayout(topLayout);
-
-		setControl(topControl);
-		
-		//LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ARGUMNETS_TAB);
-
-		modifyListener = new TabModifyListener();
-
-		createArgumentGroup(topControl);
-		createTargetObserverGroup(topControl);
-		
-		verifyContent();
-	}
-
-	protected void createArgumentGroup(Composite comp) {
-		Group group = ToolKit.createGroup(comp, Messages.LauncherExecutionTab_ArgumentsFrame_Title);
-
-		programArgumentsText = ToolKit.createTextRow(group, Messages.LauncherExecutionTab_ArgumentsFrame_CommandLineLabel, null);
-		programArgumentsText.addModifyListener(modifyListener);
-	}	
-
-	protected void createTargetObserverGroup(Composite topControl) {
-		Group group = ToolKit.createGroup(topControl, Messages.LauncherExecutionTab_ObserverFrame_Title);
-
-		observerList = ToolKit.createShortDropDownRow(group, Messages.LauncherExecutionTab_ObserverFrame_ParserLabel);
-		observerList.addSelectionListener(modifyListener);
-		
-		beforeCommandText = ToolKit.createTextRow(group, Messages.LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel, null, 4);
-		beforeCommandText.addModifyListener(modifyListener);
-		
-		afterCommandText = ToolKit.createTextRow(group, Messages.LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel, null, 4);
-		afterCommandText.addModifyListener(modifyListener);
-	}
-
-	protected void verifyContent() {
-		isValid = true;
-		setErrorMessage(null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		/*
-		 * If a observer is selected, then the DebugPlugin.ATTR_CAPTURE_OUTPUT attribute must be true.
-		 */
-		int selection = observerList.getSelectionIndex();
-		if (selection == -1) {
-			selection = 0;
-		}
-		String selectedObserverID = (String)observerIDs.get(selection);
-		if (selectedObserverID != null) {
-			try {
-				if (! config.getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, false)) {
-					isValid = false;
-					setMessage(Messages.LauncherExecutionTab_Validation_ObserverAndNoConsole);
-				}
-			} catch (CoreException e) {
-				// Nothing
-			}
-		}
-		
-		return super.isValid(config) && isValid;
-	}
-	
-	/* (non-Javadoc)
-	 * @see ILaunchConfigurationTab#canSave()
-	 */
-	public boolean canSave() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
-
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, IRemoteLaunchAttributes.DEFAULT_AFTER_COMMAND);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, IRemoteLaunchAttributes.DEFAULT_BEFORE_COMMAND);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, IRemoteLaunchAttributes.DEFAULT_OUTPUT_OBSERVER);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_USE_FORWARDED_X11, IRemoteLaunchAttributes.DEFAULT_USE_FORWARDED_X11);
-}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			programArgumentsText.setText(configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "")); //$NON-NLS-1$
-			
-			/*
-			 * Generate list of all observer plug-ins 
-			 */
-			observerList.removeAll();
-			String current;
-			int selected;
-			try {
-				current = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, ""); //$NON-NLS-1$
-			} catch (CoreException e) {
-				current = ""; //$NON-NLS-1$
-			}
-			selected = 0;
-			observerList.add(Messages.LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption);
-			observerIDs = new ArrayList();
-			observerIDs.add(null);
-			LaunchObserverIterator iterator = RemoteLauncherPlugin.getLaunchObserverIterator();
-			int index = 0;
-			while (iterator.hasMoreElements()) {
-				iterator.nextElement();
-				String name = iterator.getName();
-				String id = iterator.getID();
-				if (name == null) continue;
-				if (id == null) continue;
-				observerList.add(name);
-				if (current.equals(id)) {
-					selected = index;
-				}
-				observerIDs.add(id);
-				index++;
-			}
-			observerList.select(selected);
-			
-			/*
-			 * Fill bash command fields
-			 */
-			try {
-				beforeCommandText.setText(configuration.getAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, "")); //$NON-NLS-1$
-			} catch (CoreException e) {
-				beforeCommandText.setText(null);
-			}
-			try {
-				afterCommandText.setText(configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, "")); //$NON-NLS-1$
-			} catch (CoreException e) {
-				afterCommandText.setText(null);
-			}
-
-			verifyContent();	
-		}
-		catch (CoreException e) {
-			setErrorMessage(LaunchMessages.getFormattedString("Launch.common.Exception_occurred_reading_configuration_EXCEPTION", e.getStatus().getMessage())); //$NON-NLS-1$
-			LaunchUIPlugin.log(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(
-			ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-			getAttributeValueFrom(programArgumentsText));
-
-		/*
-		 * Observer
-		 */
-		int selection = observerList.getSelectionIndex();
-		if (selection == -1) {
-			selection = 0;
-		}
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, (String)observerIDs.get(selection));
-		
-		/*
-		 * Bash command fields
-		 */
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, beforeCommandText.getText());
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, afterCommandText.getText());
-	}
-
-	/**
-	 * Returns the string in the text widget, or <code>null</code> if empty.
-	 * 
-	 * @return text or <code>null</code>
-	 */
-	protected String getAttributeValueFrom(Text text) {
-		String content = text.getText().trim();
-		if (content.length() > 0) {
-			return content;
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.LauncherExecutionTab_Tab_Title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java
deleted file mode 100755
index 630bf97..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.ui.messages"; //$NON-NLS-1$
-
-	public static String LauncherExecutionTab_ArgumentsFrame_CommandLineLabel;
-
-	public static String LauncherExecutionTab_ArgumentsFrame_Title;
-
-	public static String LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel;
-
-	public static String LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel;
-
-	public static String LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption;
-
-	public static String LauncherExecutionTab_ObserverFrame_ParserLabel;
-
-	public static String LauncherExecutionTab_ObserverFrame_Title;
-
-	public static String LauncherExecutionTab_Tab_Title;
-
-	public static String LauncherExecutionTab_Validation_ObserverAndNoConsole;
-
-	public static String DownloadRuleDialog_AddFileDialog_Message;
-
-	public static String DownloadRuleDialog_AddFileDialog_Title;
-
-	public static String DownloadRuleDialog_DestinationFrame_FileSystemButton;
-
-	public static String DownloadRuleDialog_DestinationFrame_Title;
-
-	public static String DownloadRuleDialog_DestinationFrame_WorkspaceButton;
-
-	public static String DownloadRuleDialog_DirectoryDialog_Message;
-
-	public static String DownloadRuleDialog_DirectoryDialog_Title;
-
-	public static String DownloadRuleDialog_EditFileDialog_Message;
-
-	public static String DownloadRuleDialog_EditFileDialog_Title;
-
-	public static String DownloadRuleDialog_FileListFrame_AddButton;
-
-	public static String DownloadRuleDialog_FileListFrame_EditButton;
-
-	public static String DownloadRuleDialog_FileListFrame_RemoveButton;
-
-	public static String DownloadRuleDialog_FileListFrame_Title;
-
-	public static String DownloadRuleDialog_Message;
-
-	public static String DownloadRuleDialog_OptionsFrame_ExecutableCheck;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteLabel;
-
-	public static String DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck;
-
-	public static String DownloadRuleDialog_OptionsFrame_ReadonlyCheck;
-
-	public static String DownloadRuleDialog_OptionsFrame_Title;
-
-	public static String DownloadRuleDialog_Title;
-
-	public static String DownloadRuleDialog_WorkspaceDialog_Title;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_DestinationLabel;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_DestinationMissing;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_FileListSeparator;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_FromLabel;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_MultipleFiles;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_NoFiles;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_OneFile;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_Executable;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_Readonly;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_OptionsLabel;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Type;
-
-	public static String EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType;
-
-	public static String EnhancedSynchronizeTab_ErrorMessage_NewRule_Title;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Description;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Title;
-
-	public static String EnhancedSynchronizeTab_Tab_Message;
-
-	public static String EnhancedSynchronizeTab_Tab_Title;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_DestinationLabel;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_DestinationSeparator;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_FileListSeparator;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_FromLabel;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_MultipleFiles;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_NoFiles;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_OneFile;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_Executable;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_Readonly;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_OptionsLabel;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Type;
-
-	public static String UploadRuleDialog_FileButtonsFrame_AddDirectoryButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_AddFilesButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_Description;
-
-	public static String UploadRuleDialog_FileButtonsFrame_RemoveButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel;
-
-	public static String UploadRuleDialog_FileButtonsFrame_Title;
-	
-	public static String UploadRuleDialog_Message;
-
-	public static String UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title;
-
-	public static String UploadRuleDialog_OptionsFrame_AddFileDialog_Description;
-
-	public static String UploadRuleDialog_OptionsFrame_AddFileDialog_Title;
-
-	public static String UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description;
-
-	public static String UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title;
-
-	public static String UploadRuleDialog_OptionsFrame_DownloadBackCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_ExecutableCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteLabel;
-
-	public static String UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_ReadonlyCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_Title;
-
-	public static String UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton;
-
-	public static String UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory;
-
-	public static String UploadRuleDialog_RemoteDirectoryFrame_Title;
-
-	public static String UploadRuleDialog_Title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java
deleted file mode 100755
index 408212e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class RuleDialogFactory {
-	
-	/**
-	 * Returns a new dialog that is able to edit a rule.
-	 * @param shell The SWT shell for the dialog
-	 * @param rule The rule to edit
-	 * @return The dialog or null if no dialog is known for the rule.
-	 */
-	public static Dialog createDialogForRule(Shell shell, ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			return new DownloadRuleDialog(shell, downloadRule);
-		} else if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			return new UploadRuleDialog(shell, uploadRule);
-		} else {
-			return null;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java
deleted file mode 100755
index 28787eb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java
+++ /dev/null

@@ -1,168 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.swt.graphics.Image;
-
-
-class SynchronizationRuleLabelProvider implements ILabelProvider {
-	Image uploadRuleImage = null;
-	Image downloadRuleImage = null;
-	
-	String remoteWorkingDir;
-
-	public SynchronizationRuleLabelProvider() {
-		super();
-	}
-
-	public String getRemoteWorkingDir() {
-		return remoteWorkingDir;
-	}
-
-	public void setRemoteWorkingDir(String remoteWorkingDir) {
-		this.remoteWorkingDir = remoteWorkingDir;
-	}
-
-	public Image getImage(Object element) {
-		if (element instanceof DownloadRule) {
-			return downloadRuleImage;
-		} else if (element instanceof DownloadRule) {
-			return uploadRuleImage;
-		} else {
-			return null;
-		}
-	}
-
-	public String getText(Object element) {
-		if (element instanceof DownloadRule) {
-			DownloadRule rule = (DownloadRule) element;
-			String result = Messages.EnhancedSynchronizeTab_DownloadLabel_Type;
-			if (rule.getRemoteFileCount() == 0) {
-				result += Messages.EnhancedSynchronizeTab_DownloadLabel_NoFiles;
-			} else if (rule.getRemoteFileCount() == 1) {
-				result += Messages.EnhancedSynchronizeTab_DownloadLabel_OneFile;
-			} else {
-				result += NLS.bind(Messages.EnhancedSynchronizeTab_DownloadLabel_MultipleFiles, new Integer(rule.getRemoteFileCount()));
-			}
-			if (rule.getRemoteFileCount() >= 1) {
-				result += '\n' + Messages.EnhancedSynchronizeTab_DownloadLabel_FromLabel;
-				String files[] = rule.getRemoteFilesAsStringArray();
-				for (int i = 0; i < files.length; i++) {
-					String file = files[i];
-					if (i != 0) file += Messages.EnhancedSynchronizeTab_DownloadLabel_FileListSeparator;
-					result += file;
-				}
-				result += '\n';
-				if (rule.getLocalDirectory() == null) {
-					result += Messages.EnhancedSynchronizeTab_DownloadLabel_DestinationMissing;
-				} else {
-					result += Messages.EnhancedSynchronizeTab_DownloadLabel_DestinationLabel + rule.getLocalDirectory();							
-				}
-				if (rule.isAsExecutable() || rule.isAsReadOnly() || rule.isPreserveTimeStamp()) {							result += '\n' + Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsLabel;			
-					boolean comma = false;
-					if (rule.isAsExecutable()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_Executable;
-					}
-					if (rule.isAsReadOnly()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_Readonly;								
-					}
-					if (rule.isPreserveTimeStamp()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp;
-					}
-				}
-			}
-			return result;
-		} else if (element instanceof UploadRule) {
-			UploadRule rule = (UploadRule) element;
-			String result = Messages.EnhancedSynchronizeTab_UploadLabel_Type;
-			if (rule.getRemoteFileCount() == 0) {
-				result += Messages.EnhancedSynchronizeTab_UploadLabel_NoFiles;
-			} else if (rule.getRemoteFileCount() == 1) {
-				result += Messages.EnhancedSynchronizeTab_UploadLabel_OneFile;
-			} else {
-				result += NLS.bind(Messages.EnhancedSynchronizeTab_UploadLabel_MultipleFiles, new Integer(rule.getRemoteFileCount()) );
-			}
-			if (rule.getRemoteFileCount() >= 1) {
-				result += '\n' + Messages.EnhancedSynchronizeTab_UploadLabel_FromLabel;
-				String files[] = rule.getLocalFilesAsStringArray();
-				for (int i = 0; i < files.length; i++) {
-					String file = files[i];
-					if (i != 0) file += Messages.EnhancedSynchronizeTab_UploadLabel_FileListSeparator;
-					result += file;
-				}
-				result += '\n';
-				if ((rule.getRemoteDirectory() == null) || rule.isDefaultRemoteDirectory()) {
-					result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationLabel+remoteWorkingDir;
-				} else {
-					IPath remoteWorkingPath = new Path(remoteWorkingDir);
-					IPath remotePath = new Path(rule.getRemoteDirectory());
-					if (! remotePath.isAbsolute()) {
-						remotePath = remoteWorkingPath.append(remotePath);
-					}
-					result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationLabel+LinuxPath.toString(remotePath);
-				}
-				if (rule.isAsExecutable() || rule.isAsReadOnly() || rule.isPreserveTimeStamp() || rule.isDownloadBack()) {
-					result += '\n' + Messages.EnhancedSynchronizeTab_UploadLabel_OptionsLabel;			
-					boolean comma = false;
-					if (rule.isAsExecutable()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_Executable;
-					}
-					if (rule.isAsReadOnly()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_Readonly;								
-					}
-					if (rule.isPreserveTimeStamp()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp;
-					}
-					if (rule.isDownloadBack()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack;
-					}
-				}
-			}
-			return result;					
-		} else {
-			return null;
-		}
-	}
-
-
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	public void dispose() {
-		if (uploadRuleImage != null) uploadRuleImage.dispose();
-		if (downloadRuleImage != null) downloadRuleImage.dispose();
-		uploadRuleImage = null;
-		downloadRuleImage = null;
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java
deleted file mode 100755
index d3eff3a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java
+++ /dev/null

@@ -1,518 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboMold;
-import org.eclipse.ptp.utils.ui.swt.ControlsRelationshipHandler;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.ptp.utils.ui.swt.TextGroup;
-import org.eclipse.ptp.utils.ui.swt.TextMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-
-
-public class UploadRuleDialog extends TitleAreaDialog implements IRuleDialog {
-
-	Composite content;
-	Button defaultRemoteDirectoryButton;
-	ControlsRelationshipHandler remoteDirectoryRelationshipHandler;
-	TextGroup remoteDirectoryText;
-	Button asReadOnlyButton, asExecutableButton;
-	Button downloadBackButton, preserveTimeStampButton;
-	ComboGroup overwritePolicyCombo;
-	Button removeFilesButton;
-	Button addFilesFromFilesystemButton;
-	Button addDirectoriesFromFilesystemButton;
-	Button addFilesFromWorkspaceButton;
-	List fileList;
-	
-	UploadRule uploadRule;
-	
-	IPath lastSelectedDirectory = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-	private int listenersEnabled = 0;
-	
-	public UploadRuleDialog(Shell parentShell, UploadRule rule) {
-		super(parentShell);
-		
-		uploadRule = rule;
-	}
-	
-//	public UploadRuleDialog(Shell shell) {
-//		super(shell);
-//		uploadRule = new UploadRule();
-//		// set defaults
-//		uploadRule.setDefaultRemoteDirectory(true);
-//		uploadRule.setRemoteDirectory(null);
-//		uploadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-//	}
-
-	protected Control createDialogArea(Composite parent) {
-		content = new Composite(parent, SWT.BORDER);
-		GridLayout layout = new GridLayout();
-		content.setLayout(layout);
-//		Layout l = content.getParent().getLayout();
-		content.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		setTitle(Messages.UploadRuleDialog_Title);
-		setMessage(Messages.UploadRuleDialog_Message);
-		
-		createRemoteDirectoryComposite(content);
-		createFilesComposite(content);
-		createOptionsComposite(content);
-		
-		putFieldContents();
-		
-		return content;
-	}
-
-	private void putFieldContents() {
-		disableListeners();
-		defaultRemoteDirectoryButton.setSelection(uploadRule.isDefaultRemoteDirectory());
-		remoteDirectoryRelationshipHandler.manageDependentControls(defaultRemoteDirectoryButton);
-		if (uploadRule.getRemoteDirectory() != null) {
-			remoteDirectoryText.setString(uploadRule.getRemoteDirectory());
-		} else {
-			remoteDirectoryText.setString(""); //$NON-NLS-1$
-		}
-		asReadOnlyButton.setSelection(uploadRule.isAsReadOnly()); 
-		asExecutableButton.setSelection(uploadRule.isAsExecutable());
-		downloadBackButton.setSelection(uploadRule.isDownloadBack()); 
-		preserveTimeStampButton.setSelection(uploadRule.isPreserveTimeStamp());
-		overwritePolicyCombo.selectIndexUsingID(Integer.toString(uploadRule.getOverwritePolicy()));
-		String items[] = uploadRule.getLocalFilesAsStringArray();
-		Arrays.sort(items);
-		fileList.setItems(items);
-		enableListeners();
-	}
-	
-	private void enableListeners() {
-		listenersEnabled ++;		
-	}
-
-	private void disableListeners() {
-		listenersEnabled--;
-	}
-
-	private void fetchFieldContents() {
-		disableListeners();
-		uploadRule.setDefaultRemoteDirectory(defaultRemoteDirectoryButton.getSelection());
-		uploadRule.setRemoteDirectory(remoteDirectoryText.getString());
-		uploadRule.setAsExecutable(asExecutableButton.getSelection());
-		uploadRule.setAsReadOnly(asReadOnlyButton.getSelection());
-		uploadRule.setDownloadBack(downloadBackButton.getSelection());
-		uploadRule.setPreserveTimeStamp(preserveTimeStampButton.getSelection());
-		uploadRule.setOverwritePolicy(Integer.parseInt(overwritePolicyCombo.getSelectionId()));
-		uploadRule.setLocalFiles(fileList.getItems());
-		String path =remoteDirectoryText.getString().trim();
-		if (path.length() > 0) {
-			uploadRule.setRemoteDirectory(path);
-		} else {
-			uploadRule.setRemoteDirectory(null);
-		}
-		enableListeners();
-	}
-	
-	protected void okPressed() {
-		fetchFieldContents();
-		super.okPressed();
-	}
-
-	private Composite createRemoteDirectoryComposite(Composite parent) {
-		Frame frame = new Frame(parent, Messages.UploadRuleDialog_RemoteDirectoryFrame_Title);
-		Composite contents = frame.getComposite();
-
-		defaultRemoteDirectoryButton = new Button(contents, SWT.CHECK);
-		defaultRemoteDirectoryButton.setText(Messages.UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton);
-		defaultRemoteDirectoryButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		TextMold mold = new TextMold(TextMold.GRID_DATA_GRAB_EXCESS_SPACE | TextMold.GRID_DATA_ALIGNMENT_FILL, Messages.UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory);
-		remoteDirectoryText = new TextGroup(contents, mold);
-
-		remoteDirectoryRelationshipHandler = new ControlsRelationshipHandler(defaultRemoteDirectoryButton, new Control[] {remoteDirectoryText}, false);
-		return remoteDirectoryText;
-	}
-
-	private Composite createFilesComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.setTitle(Messages.UploadRuleDialog_FileButtonsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Frame filesFrame = new Frame(frame.getComposite());
-		fileList = new List(filesFrame, SWT.MULTI | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=200;
-		fileList.setLayoutData(gridData);
-		fileList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				removeFilesButton.setEnabled(fileList.getSelectionCount() != 0);
-			}
-		});
-		fileList.deselectAll();
-		
-		Frame buttonFrame = new Frame(frame.getComposite());
-		Label label = new Label(buttonFrame, SWT.NONE);
-		label.setText(Messages.UploadRuleDialog_FileButtonsFrame_Description);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromFilesystemButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesFromFilesystemButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddFilesButton);
-		addFilesFromFilesystemButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromFilesystemButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleFilesFromFilesystemButtonEvent();
-			}			
-		});
-		addDirectoriesFromFilesystemButton = new Button(buttonFrame, SWT.PUSH);
-		addDirectoriesFromFilesystemButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddDirectoryButton);
-		addDirectoriesFromFilesystemButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addDirectoriesFromFilesystemButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleDirectoryFromFilesystemButtonEvent();
-			}			
-		});
-		addFilesFromWorkspaceButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesFromWorkspaceButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton);
-		addFilesFromWorkspaceButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromWorkspaceButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleFilesFromWorkspaceButtonEvent();
-			}
-		});
-		label = new Label(buttonFrame, SWT.NONE);
-		label.setText(Messages.UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton = new Button(buttonFrame, SWT.PUSH);
-		removeFilesButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_RemoveButton);
-		removeFilesButton.setEnabled(false);
-		removeFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				handleRemoveFilesButtonEvent();
-			}
-			
-		});
-		GridData gridData2 = new GridData();
-		gridData2.grabExcessVerticalSpace = true;
-		gridData2.verticalAlignment = SWT.TOP;
-		buttonFrame.setLayoutData(gridData2);
-		
-		return frame;
-	}
-
-	private Composite createOptionsComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.addOption(FrameMold.COLUMNS_EQUAL_WIDTH);
-		frameMold.setTitle(Messages.UploadRuleDialog_OptionsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Composite contents = frame.getComposite();
-		asReadOnlyButton = new Button(contents, SWT.CHECK);
-		asReadOnlyButton.setText(Messages.UploadRuleDialog_OptionsFrame_ReadonlyCheck);
-		asExecutableButton = new Button(contents, SWT.CHECK);
-		asExecutableButton.setText(Messages.UploadRuleDialog_OptionsFrame_ExecutableCheck);
-		downloadBackButton = new Button(contents, SWT.CHECK);
-		downloadBackButton.setText(Messages.UploadRuleDialog_OptionsFrame_DownloadBackCheck);
-		preserveTimeStampButton = new Button(contents, SWT.CHECK);
-		preserveTimeStampButton.setText(Messages.UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck);
-		
-		ComboMold mold = new ComboMold(ComboMold.GRID_DATA_SPAN);
-		mold.setLabel(Messages.UploadRuleDialog_OptionsFrame_OverwriteLabel);
-		mold.setTextFieldWidth(40);
-		mold.addItem(Integer.toString(OverwritePolicies.SKIP), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption);
-		mold.addItem(Integer.toString(OverwritePolicies.ALWAYS), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption);
-		mold.addItem(Integer.toString(OverwritePolicies.NEWER), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption);
-		overwritePolicyCombo = new ComboGroup(contents, mold);
-		overwritePolicyCombo.getCombo().addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				disableListeners();
-				if (overwritePolicyCombo.getSelectionId().equals(Integer.toString(OverwritePolicies.NEWER))) {
-					preserveTimeStampButton.setEnabled(false);
-					preserveTimeStampButton.setSelection(true);
-				} else {
-					preserveTimeStampButton.setEnabled(true);					
-				}
-				enableListeners();
-			}
-			
-		});
-		return frame;
-	}
-	
-	class PathIterator implements Iterator {
-		Iterator internalIterator;
-		
-		public PathIterator(Iterator internalIterator) {
-			this.internalIterator = internalIterator;
-		}
-		
-		public PathIterator(String [] array) {
-			this.internalIterator = Arrays.asList(array).iterator();
-		}
-
-		public PathIterator(java.util.List list) {
-			this.internalIterator = list.iterator();
-		}
-
-		public boolean hasNext() {
-			return internalIterator.hasNext();
-		}
-		
-		public Object next() {
-			return new Path((String)internalIterator.next());
-		}
-		
-		public void remove() {
-			internalIterator.remove();
-		}
-	}
-	
-	private void handleFilesFromFilesystemButtonEvent() {
-		FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN | SWT.MULTI);
-
-		/*
-		 * Filter path must be set to the directory that contains the file.
-		 */
-		fileDialog.setFilterPath(lastSelectedDirectory.toOSString());
-		fileDialog.setText(Messages.UploadRuleDialog_OptionsFrame_AddFileDialog_Title);
-				
-		String result = fileDialog.open();
-
-		if (result != null) {
-			lastSelectedDirectory = new Path(fileDialog.getFilterPath());
-			/*
-			 * Only add files that are not already in the list.
-			 * If file is inside the workspace, add relative path.
-			 */
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath fileRoot = new Path(fileDialog.getFilterPath());
-			HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-			for (Iterator iter = new PathIterator(fileDialog.getFileNames()); iter.hasNext();) {
-				/*
-				 * If not absolute, the make it absolute according to path in dialog.
-				 * This is due behaviour how FileDialog returns selected files.
-				 */
-				IPath path = (IPath) iter.next();
-				if (! path.isAbsolute()) {
-					path = fileRoot.append(path);
-				}
-				
-				/*
-				 * If path is inside the workspace, then make it relative.
-				 */
-				if (workspace.isPrefixOf(path)) {
-					path = path.removeFirstSegments(workspace.segmentCount());
-					path = path.makeRelative();
-				}
-				
-				/*
-				 * If already in the list, the ignore.
-				 */
-				String fullPath = path.toOSString();
-				if (! fileSet.contains(fullPath)) {
-					fileSet.add(fullPath);
-				}
-			}
-			
-			String items[] = new String[fileSet.size()];
-			items = (String[]) fileSet.toArray(items);
-			Arrays.sort(items);
-			fileList.setItems(items);
-		}
-	}
-
-	private void handleDirectoryFromFilesystemButtonEvent() {
-		DirectoryDialog directoryDialog = new DirectoryDialog(getShell(), SWT.OPEN);
-		
-		directoryDialog.setFilterPath(lastSelectedDirectory.toOSString());
-		directoryDialog.setText(Messages.UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title);
-		directoryDialog.setMessage(Messages.UploadRuleDialog_OptionsFrame_AddFileDialog_Description);
-
-		String newPath = directoryDialog.open();
-
-		if (newPath != null) {
-			HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath path = new Path(newPath);
-			
-			/*
-			 * If path is inside the workspace, then make it relative.
-			 */
-			if (workspace.isPrefixOf(path)) {
-				path = path.removeFirstSegments(workspace.segmentCount());
-				path = path.makeRelative();
-			}
-			
-			/*
-			 * If already in the list, the ignore.
-			 */
-			String fullPath = path.toOSString();
-			if (! fileSet.contains(fullPath)) {
-				fileSet.add(fullPath);
-				
-				String items[] = new String[fileSet.size()];
-				items = (String[]) fileSet.toArray(items);
-				Arrays.sort(items);
-				fileList.setItems(items);
-			}
-			
-			/*
-			 * Save lastSelectedDirectory. There is a bug in DirectoryDialog.
-			 * The method getFilterPath does not return the expected path.
-			 * The bug will be fixed in Eclipse 3.4.
-			 * The workarount takes the parent of the selected directory as lastSelectedDirectory.
-			 */
-			lastSelectedDirectory = new Path(newPath);
-			lastSelectedDirectory = lastSelectedDirectory.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-
-
-	ResourceSelectionDialog resourceDialog = null;
-	private void handleFilesFromWorkspaceButtonEvent() {
-		/*
-		 * Create a list a resource for all relative paths. The must be valid resources in the workspace.
-		 * Otherwise, they are ignored and removed.
-		 */
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		ArrayList resourceList = new ArrayList();
-		for (Iterator iter = new PathIterator(fileList.getItems()); iter.hasNext();) {
-			IPath path = (IPath) iter.next();
-			if (path.isAbsolute()) {
-				continue;
-			}
-			IResource resource = root.findMember(path);
-			if (resource != null) {
-				resourceList.add(resource);
-			}
-		}
-		Object initialSelection[] = resourceList.toArray();
-		
-		/*
-		 * Show the dialog.
-		 */
-		if (resourceDialog == null) {
-			resourceDialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), null);
-		}
-		resourceDialog.setInitialSelections( initialSelection );
-		resourceDialog.setBlockOnOpen(true);
-		resourceDialog.setMessage(Messages.UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description);
-		resourceDialog.setTitle(Messages.UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title);
-		resourceDialog.open();
-
-		/*
-		 * Get results and updated local files.
-		 */
-		Object[] results = resourceDialog.getResult();
-
-		if (results != null) {
-			/*
-			 * Filter only absolute path. Relative paths are removed.
-			 */
-			HashSet newFileList = new HashSet();
-			for (Iterator iter = new PathIterator(fileList.getItems()); iter.hasNext();) {
-				IPath path = (IPath) iter.next();
-				if (! path.isAbsolute()) {
-					continue;
-				}
-				newFileList.add(path.toOSString());
-			}
-
-			/*
-			 * Add items that a selected in the dialog but not in the file list.
-			 */
-			for (int i = 0; i < results.length; i++) {
-				IResource resource = (IResource) results[i];
-				String entry = resource.getFullPath().makeRelative().toOSString();
-				newFileList.add(entry);
-			}
-			
-			String items[] = new String[newFileList.size()];
-			items = (String[]) newFileList.toArray(items);
-			Arrays.sort(items);
-			fileList.setItems(items);
-		}
-	}
-	
-	private void handleRemoveFilesButtonEvent() {		
-		String selection [] = fileList.getSelection();
-		if (selection.length == 0) {
-			return;
-		}
-		
-		HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-		for (int i = 0; i < selection.length; i++) {
-			String string = selection[i];
-			fileSet.remove(string);
-		}
-		
-		String items[] = new String[fileSet.size()];
-		items = (String[]) fileSet.toArray(items);
-		Arrays.sort(items);
-		fileList.setItems(items);
-	}
-
-	public ISynchronizationRule getRuleWorkingCopy() {
-		return uploadRule;
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties
deleted file mode 100755
index 72e5dd0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties
+++ /dev/null

@@ -1,109 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-EnhancedSynchronizeTab_Tab_Message=Add synchronization rules to upload files before the launch or to download files after the application terminates.
-EnhancedSynchronizeTab_RulesFrame_Title=Synchronize rules:
-EnhancedSynchronizeTab_RulesFrame_Description=Upload rules are executed before application starts. Download rules are executed after application finishes.
-EnhancedSynchronizeTab_DownloadLabel_Type=DOWNLOAD 
-EnhancedSynchronizeTab_DownloadLabel_NoFiles=(no files/directories)
-EnhancedSynchronizeTab_DownloadLabel_OneFile=1 item 
-EnhancedSynchronizeTab_DownloadLabel_MultipleFiles={0} items 
-EnhancedSynchronizeTab_DownloadLabel_FromLabel=From: 
-EnhancedSynchronizeTab_DownloadLabel_FileListSeparator=; 
-EnhancedSynchronizeTab_DownloadLabel_DestinationMissing=To: <missing local destination>
-EnhancedSynchronizeTab_DownloadLabel_DestinationLabel=To: 
-EnhancedSynchronizeTab_DownloadLabel_OptionsLabel=Options: 
-EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator=; 
-EnhancedSynchronizeTab_DownloadLabel_Options_Executable=executable
-EnhancedSynchronizeTab_DownloadLabel_Options_Readonly=readonly
-EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp=preserve time/date
-EnhancedSynchronizeTab_UploadLabel_Type=UPLOAD 
-EnhancedSynchronizeTab_UploadLabel_NoFiles=(no files/directories)
-EnhancedSynchronizeTab_UploadLabel_OneFile=1 item 
-EnhancedSynchronizeTab_UploadLabel_MultipleFiles={0} items 
-EnhancedSynchronizeTab_UploadLabel_FromLabel=From: 
-EnhancedSynchronizeTab_UploadLabel_FileListSeparator=; 
-EnhancedSynchronizeTab_UploadLabel_DestinationLabel=To: 
-EnhancedSynchronizeTab_UploadLabel_OptionsLabel=Options: 
-EnhancedSynchronizeTab_UploadLabel_DestinationSeparator=; 
-EnhancedSynchronizeTab_UploadLabel_Options_Executable=executable
-EnhancedSynchronizeTab_UploadLabel_Options_Readonly=readonly
-EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp=preserve time/date
-EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack=download back changes
-EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled=Upload rules enabled
-EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled=Download rules enabled
-EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule=New upload rule
-EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule=New download rule
-EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule=Edit selected
-EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules=Remove selected
-EnhancedSynchronizeTab_Tab_Title=Synchronize
-EnhancedSynchronizeTab_ErrorMessage_NewRule_Title=New rule
-EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType=Launcher does not know how to edit this type of rule.
-
-UploadRuleDialog_Title=Upload Rule
-UploadRuleDialog_Message=Please specify the remote directory and a list of files that shall be uploaded.
-UploadRuleDialog_OptionsFrame_Title=Options for all selected file(s):
-UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton=Use directory from launch configuration
-UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption=Skip
-UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption=Overwrite
-UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption=Overwrite if newer
-UploadRuleDialog_OptionsFrame_AddFileDialog_Description=Select directory to add
-UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description=Select the ressources from workspace to add
-UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory=Remote directory:
-UploadRuleDialog_RemoteDirectoryFrame_Title=Remote directory:
-UploadRuleDialog_FileButtonsFrame_Title=Selected file(s):
-UploadRuleDialog_FileButtonsFrame_Description=Add files:
-UploadRuleDialog_FileButtonsFrame_AddFilesButton=File(s)
-UploadRuleDialog_FileButtonsFrame_AddDirectoryButton=Directory
-UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton=Workspace
-UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel=Remove files:
-UploadRuleDialog_FileButtonsFrame_RemoveButton=Remove selected
-UploadRuleDialog_OptionsFrame_ReadonlyCheck=Readonly
-UploadRuleDialog_OptionsFrame_ExecutableCheck=Executable
-UploadRuleDialog_OptionsFrame_DownloadBackCheck=Download back if changed
-UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck=Preserve time attributes
-UploadRuleDialog_OptionsFrame_OverwriteLabel=If file already exists:
-UploadRuleDialog_OptionsFrame_AddFileDialog_Title=Select file(s) to add
-UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title=Select directory to add
-UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title=Workspace resources
-LauncherExecutionTab_ArgumentsFrame_Title=Arguments:
-LauncherExecutionTab_ArgumentsFrame_CommandLineLabel=Command line arguments
-LauncherExecutionTab_ObserverFrame_Title=Customize application launch:
-LauncherExecutionTab_ObserverFrame_ParserLabel=Output parser:
-LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel=Bash commands, executed before application
-LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel=Bash commands, executed after application
-LauncherExecutionTab_Validation_ObserverAndNoConsole=Cannot set observer if no console is allocated (see Common Tab)
-LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption=none
-LauncherExecutionTab_Tab_Title=Launch
-
-DownloadRuleDialog_Title=Download Rule
-DownloadRuleDialog_Message=Please specify the remote files that shall be downloaded and a local directory.
-DownloadRuleDialog_DestinationFrame_Title=Local destination directory:
-DownloadRuleDialog_DestinationFrame_FileSystemButton=File system
-DownloadRuleDialog_DestinationFrame_WorkspaceButton=Workspace
-DownloadRuleDialog_OptionsFrame_Title=Options for all selected file(s):
-DownloadRuleDialog_OptionsFrame_ReadonlyCheck=Readonly
-DownloadRuleDialog_OptionsFrame_ExecutableCheck=Executable
-DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck=Preserve time attributes
-DownloadRuleDialog_OptionsFrame_OverwriteLabel=If file already exists:
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption=Skip
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption=Overwrite
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption=Overwrite if newer
-DownloadRuleDialog_FileListFrame_Title=Selected file(s):
-DownloadRuleDialog_FileListFrame_AddButton=Add new
-DownloadRuleDialog_FileListFrame_EditButton=Change selected
-DownloadRuleDialog_FileListFrame_RemoveButton=Remove selected
-DownloadRuleDialog_DirectoryDialog_Title=Select local destination
-DownloadRuleDialog_DirectoryDialog_Message=Select local destination directory
-DownloadRuleDialog_WorkspaceDialog_Title=Select folder:
-DownloadRuleDialog_AddFileDialog_Title=Add remote file/directoty
-DownloadRuleDialog_AddFileDialog_Message=Remote file or directory to be added:
-DownloadRuleDialog_EditFileDialog_Title=Add remote file/directoty
-DownloadRuleDialog_EditFileDialog_Message=Remote file or directory to be added:

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java
deleted file mode 100755
index 27ff829..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.variables;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.variables.messages"; //$NON-NLS-1$
-
-	public static String invalidEclipseVariableErrorMessage;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java
deleted file mode 100755
index fff3593..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.variables;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IDynamicVariable;
-import org.eclipse.core.variables.IDynamicVariableResolver;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class RemoteWorkspaceResolver implements IDynamicVariableResolver {
-
-	protected static final String USER_WORKSPACE_VARIABLE = "user_workspace"; //$NON-NLS-1$
-
-	protected static final String CONCATENATE_CHAR = "_"; //$NON-NLS-1$
-
-	protected static final String DEFAULT_USER_WORKSPACE = "generic_user_workspace"; //$NON-NLS-1$
-
-	public RemoteWorkspaceResolver() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable,
-	 *      java.lang.String)
-	 */
-	public String resolveValue(IDynamicVariable variable, String argument)
-			throws CoreException {
-
-		String variableName = variable.getName();
-
-		if (variableName.equals(USER_WORKSPACE_VARIABLE)) {
-			try {
-				String hostname = InetAddress.getLocalHost().getHostName();
-				String username = System.getProperty("user.name"); //$NON-NLS-1$
-				return hostname + CONCATENATE_CHAR + username;
-			} catch (UnknownHostException uhe) {
-				uhe.printStackTrace();
-				return DEFAULT_USER_WORKSPACE;
-			}
-		}
-		throw new CoreException(new Status(IStatus.ERROR, RemoteLauncherPlugin
-				.getUniqueIdentifier(), IStatus.OK,
-				Messages.invalidEclipseVariableErrorMessage, null));
-
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties
deleted file mode 100755
index e333b9d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-
-invalidEclipseVariableErrorMessage=Invalid Eclipse variable.
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project
deleted file mode 100755
index e9c67f6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 1775630..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.environment.ui;singleton:=true
-Bundle-Version: 1.3.2.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.ui.UIEnvironmentPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.ptp.remotetools.environment.ui,
- org.eclipse.ptp.remotetools.environment.ui.extension,
- org.eclipse.ptp.remotetools.environment.ui.views

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html
deleted file mode 100755
index 094b431..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html
+++ /dev/null

@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html lang="en">
-  <head>
-    <title>About</title>
-    <meta content="">
-    <style></style>
-  </head>
-
-<body>
-<h2>About This Content</h2>
-<h3>License</h3>
-<p>This plug-in is provided by IBM Corp. Your use of this plug-in is governed by the license that was agreed to when the plug-in was installed as part of a feature installation.</p>
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties
deleted file mode 100755
index 74f4c7d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif
deleted file mode 100755
index b0d072a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif
deleted file mode 100644
index 6fc8305..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif
deleted file mode 100755
index 7c6d735..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif
deleted file mode 100755
index fe85575..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif
deleted file mode 100755
index 7c135cf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif
deleted file mode 100755
index 16f4e25..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif
deleted file mode 100755
index b88fb72..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif
deleted file mode 100755
index 34fb3c9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif
deleted file mode 100755
index b51b80b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif
deleted file mode 100755
index dc47edf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties
deleted file mode 100644
index 25de2de..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools Target Environments UI
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml
deleted file mode 100755
index 315f5d6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml
+++ /dev/null

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="workloadController" name="Remote Environment Workload Controller" schema="schema/workloadController.exsd"/>
-   <extension-point id="doubleClickHandler" name="Double Click Handler" schema="schema/doubleClickHandler.exsd"/>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="Remote Tools"
-            id="org.eclipse.ptp.remotetools">
-      </category>
-      <view
-            name="Remote Environments"
-            icon="icons/iprocess.gif"
-            category="org.eclipse.ptp.remotetools"
-            class="org.eclipse.ptp.remotetools.environment.ui.views.RemoteToolsEnvironmentView"
-            id="org.eclipse.ptp.remotetools.environment.ui.views.RemoteEnvironmentsView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.cdt.ui.CPerspective">
-         <view
-               id="org.eclipse.ptp.remotetools.environment.ui.views.RemoteEnvironmentsView"
-               ratio="0.5"
-               relationship="stack"
-               relative="org.eclipse.ui.console.ConsoleView"
-               showTitle="true"
-               visible="true">
-         </view>
-      </perspectiveExtension>
-   </extension>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd
deleted file mode 100644
index 2cd6f66..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.ui" id="doubleClickHandler" name="Double Click Handler"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="doubleClickHandler"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="doubleClickHandler">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.remotetools.environment.ui.extension.IDoubleClickHandler"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd
deleted file mode 100644
index 4192fe9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.ui" id="workloadController" name="Remote Environment Workload Controller"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="controllerDelegate"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="controllerDelegate">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jface.action.Action:org.eclipse.jface.viewers.ISelectionChangedListener"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java
deleted file mode 100755
index 765a2e7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.remotetools.environment.ui.extension.DoubleClickHandlerManager;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class UIEnvironmentPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static UIEnvironmentPlugin plugin;
-	
-	private DoubleClickHandlerManager doubleClickHandlerMgr;
-	
-	/**
-	 * The constructor.
-	 */
-	public UIEnvironmentPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UIEnvironmentPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.remotetools.environment", path);
-	}
-	
-	public DoubleClickHandlerManager getDoubleClickHandlerManager() {
-	    if (doubleClickHandlerMgr == null) {
-	        doubleClickHandlerMgr = new DoubleClickHandlerManager();
-	    }
-	    return doubleClickHandlerMgr;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java
deleted file mode 100644
index 4595e86..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-
-package org.eclipse.ptp.remotetools.environment.ui.extension;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-
-/**
- * Manage a list of <code>IDoubleClickHandler</code> contributed by extensions
- * 
- * @author Hong Chang Lin
- * 
- */
-public class DoubleClickHandlerManager {
-
-    private final static String EXT_HANDLER_ID = "org.eclipse.ptp.remotetools.environment.ui.doubleClickHandler";
-
-    private List<IDoubleClickHandler> handlers;
-
-    public DoubleClickHandlerManager() {
-        processDoubleClickHandlers();
-    }
-
-    public boolean doubleClickExecute(INode node) {
-        for (IDoubleClickHandler handler : handlers) {
-            if (handler.handle(node)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void processDoubleClickHandlers() {
-        handlers = new ArrayList<IDoubleClickHandler>();
-
-        IExtensionRegistry registry = Platform.getExtensionRegistry();
-        IExtensionPoint extensionPoint = registry
-                .getExtensionPoint(EXT_HANDLER_ID);
-        IExtension[] extensions = extensionPoint.getExtensions();
-
-        try {
-            for (int i = 0; i < extensions.length; i++) {
-                IExtension extension = extensions[i];
-                IConfigurationElement[] elements = extension
-                        .getConfigurationElements();
-                IConfigurationElement element = elements[0];
-                if ("doubleClickHandler".equals(element.getName())) {
-                    handlers.add((IDoubleClickHandler) element
-                            .createExecutableExtension("class"));
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java
deleted file mode 100644
index 83a0770..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-
-package org.eclipse.ptp.remotetools.environment.ui.extension;
-
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-
-/**
- * The interface to handle the double click on an <code>INode</code>
- * 
- * @author Hong Chang Lin
- * 
- */
-public interface IDoubleClickHandler {
-
-    /**
-     * @param node
-     * @return true if the double click on the node can be handled
-     */
-    public boolean handle(INode node);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java
deleted file mode 100755
index 45462aa..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java
+++ /dev/null

@@ -1,929 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.ui.views;
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElementStatus;
-import org.eclipse.ptp.remotetools.environment.core.ITargetEventListener;
-import org.eclipse.ptp.remotetools.environment.core.TargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetEnvironmentManager;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-import org.eclipse.ptp.remotetools.environment.ui.UIEnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.wizard.EnvironmentWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.part.ViewPart;
-
-
-
-/**
- *
- * The view uses a label provider to define how model
- * objects should be presented in the view. Each
- * view can present the same model objects using
- * different labels and icons, if needed. Alternatively,
- * a single label provider can be shared between views
- * in order to ensure that objects of the same type are
- * presented in the same way everywhere.
- * <p>
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-
-public class RemoteToolsEnvironmentView extends ViewPart implements ISelectionChangedListener,ITargetEventListener {
-	
-	private TreeViewer viewer;
-	private Action startAction;
-	private Action stopAction;
-	private Action resumeAction;
-	private Action pauseAction;
-	private Action createAction;
-	private Action editAction;
-	private Action removeAction;
-	private Action doubleClickAction;
-	
-	private List<Action> workloadControllers = new ArrayList<Action>();
-	// Set the table column property names
-	private final String ENVIRONMENT_CONTROL_NAME		= "Target Environment";
-	private final String ENVIRONMENT_CONTROL_STATUS		= "Status";
-
-
-	// Set column names
-	private String[] columnNames = new String[] { 
-			ENVIRONMENT_CONTROL_NAME, 
-			ENVIRONMENT_CONTROL_STATUS
-			};
-	
-	// Model
-	TargetEnvironmentManager model = EnvironmentPlugin.getDefault().getTargetsManager();
-	ITargetElement currentElement = null;
-
-	/*
-	 * The content provider class is responsible for
-	 * providing objects to the view. It can wrap
-	 * existing objects in adapters or simply return
-	 * objects as-is. These objects may be sensitive
-	 * to the current input of the view, or ignore
-	 * it and always show the same content 
-	 * (like Task List, for example).
-	 */
-	
-	class ViewContentProvider implements ITreeContentProvider {
-	      private final Object[] EMPTY = new Object[] {};
-	      
-		  /**
-		   * Gets the children for a TargetEnvironmentTypeElement or TargetEnvironmentConfigElement
-		   * 
-		   * @param arg0
-		   *            the TargetEnvironmentTypeElement or TargetEnvironmentConfigElement
-		   * @return Object[]
-		   */
-		  public Object[] getChildren(Object arg0) {
-		    if (arg0 instanceof TargetTypeElement) {
-		    	return ((TargetTypeElement) arg0).getElements().toArray();	
-		    }else if (arg0 instanceof ITargetElement){
-		        // gets the children of ITargetElement
-		    	return EnvironmentPlugin.getDefault().getChildrenProviderManager().getChildren((ITargetElement)arg0);		    	
-		    }else if (arg0 instanceof INode) {
-		        return ((INode) arg0).getChildren();
-		    }
-		    return EMPTY;
-		  }
-
-		  /**
-		   * Gets the parent TargetEnvironmentTypeElement for a TargetEnvironmentConfigElement
-		   * 
-		   * @param arg0
-		   *            the TargetEnvironmentConfigElement
-		   * @return Object
-		   */
-		  public Object getParent(Object arg0) {
-			if (arg0 instanceof ITargetElement) {
-				return ((ITargetElement) arg0).getType();
-			}else if (arg0 instanceof INode) {
-			    return ((INode) arg0).getParent();
-			}
-			return null;
-		  }
-
-		  /**
-		   * Gets whether this team or player has children
-		   * 
-		   * @param arg0
-		   *            the TargetEnvironmentTypeElement or TargetEnvironmentConfigElement
-		   * @return boolean
-		   */
-		  public boolean hasChildren(Object arg0) {
-		    return getChildren(arg0).length > 0;
-		  }
-
-		  /**
-		   * Gets the elements for the table
-		   * 
-		   * @param arg0
-		   *            the model
-		   * @return Object[]
-		   */
-		  public Object[] getElements(Object arg0) {
-			if (arg0 instanceof Object[]) {
-				return (Object[]) arg0;
-			}
-			return getChildren(arg0);
-		}
-
-		  /**
-			 * Disposes any resources
-			 */
-		  public void dispose() {
-		  }
-
-		  /**
-		   * Called when the input changes
-		   * 
-		   * @param arg0
-		   *            the parent viewer
-		   * @param arg1
-		   *            the old input
-		   * @param arg2
-		   *            the new input
-		   */
-		  public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
-		    // Nothing to do
-		  }
-		}
-	
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-		private Image viewIcon;
-
-		public String getColumnText(Object obj, int index) {
-			String result = "";
-			
-	        switch (index) {
-	            case 0:
-	                if (obj instanceof INode) {
-	                    result = ((INode) obj).getDisplayText();
-	                }else {
-	                    result = obj.toString();
-	                }
-	                break;
-	            case 1 :
-	            	if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-	            		int status = ((ITargetElement)obj).getStatus();
-	            		
-	            		switch (status) {
-							case ITargetElementStatus.STARTED:
-								result = "Started";
-								break;
-							case ITargetElementStatus.STOPPED:
-								result = "Stopped";
-								break;
-							case ITargetElementStatus.RESUMED:
-								result = "Running";
-								break;
-							case ITargetElementStatus.PAUSED:
-								result = "Paused";
-								break;
-	            		}
-	            			
-	            	}
-	                break;
-	            }
-	        return result;
-		}
-		
-		public Image getColumnImage(Object obj, int index) {
-			if (index == 0 ) {
-			   if (obj instanceof INode) {
-			       return ((INode) obj).getIcon();
-			   }else {
-			       return getImage(obj);
-			   }
-			}
-			return null;
-		}
-		
-		public Image getImage(Object obj) {
-			if (TargetTypeElement.class.isAssignableFrom(obj.getClass())) {
-                URL url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/connect_create.gif");
-                ImageDescriptor imageMonitorDescriptor = ImageDescriptor.createFromURL(url);
-                viewIcon = imageMonitorDescriptor.createImage();
-			} else if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-			    URL url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/monitor_obj.gif");
-                ImageDescriptor imageMonitorDescriptor = ImageDescriptor.createFromURL(url);
-                viewIcon = imageMonitorDescriptor.createImage();
-			}
-			return viewIcon;
-		}
-		
-		public void dispose() {
-			super.dispose();
-			if (viewIcon != null) {
-				viewIcon.dispose();
-				viewIcon = null;
-			}
-		}
-	}
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public RemoteToolsEnvironmentView() {
-	}
-
-	/**
-	 * This is a callback that will allow us
-	 * to create the viewer and initialize it.
-	 */
-	public void createPartControl(Composite parent) {
-		
-		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		viewer.setSorter(new NameSorter());
-		defineTable(viewer);
-		viewer.setColumnProperties(columnNames);
-		// viewer.setInput(getViewSite());
-		viewer.setInput(model.getTypeElements().toArray());
-		viewer.refresh();
-		getSite().setSelectionProvider(viewer);
-		viewer.addSelectionChangedListener(this);
-		workloadControllers = getWorkloadControllers();
-		for (Action controller : workloadControllers) {
-			if(controller instanceof ISelectionChangedListener) {
-				viewer.addSelectionChangedListener((ISelectionChangedListener) controller);
-			}
-		}
-		model.addModelEventListener(this);
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-		contributeToActionBars();
-		
-		// Pack the window
-	    parent.pack();
-
-	    // Scroll to top
-	    viewer.reveal(viewer.getTree().getItem(0));
-	}
-
-	private void defineTable(TreeViewer viewer) {
-		Tree t = viewer.getTree();
-		t.setHeaderVisible(true);
-		
-		// 1st column with image/checkboxes - NOTE: The SWT.CENTER has no effect!!
-		TreeColumn column = new TreeColumn(t, SWT.LEFT, 0);		
-		column.setText(ENVIRONMENT_CONTROL_NAME);
-		column.setWidth(650);
-		
-		// 2nd column with task Description
-		column = new TreeColumn(t, SWT.RIGHT, 1);
-		column.setText(ENVIRONMENT_CONTROL_STATUS);
-		column.setWidth(50);
-		
-		viewer.expandAll();
-		
-		// Pack the columns
-		/*
-	    for (int i = 0, n = t.getColumnCount(); i < n; i++) {
-	      t.getColumn(i).pack();
-	    }
-	    */
-	    // Turn on the header and the lines
-	    t.setHeaderVisible(true);
-	    t.setLinesVisible(true);
-		
-		
-	}
-	
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						// Edit
-						// Remove						
-						createAction.setEnabled(false);
-						
-						ITargetElement temp = (ITargetElement)obj;			
-						if(temp.getStatus() == ITargetElementStatus.STOPPED){
-							editAction.setEnabled(true);
-							removeAction.setEnabled(true);
-						} else{
-							editAction.setEnabled(false);
-							removeAction.setEnabled(false);
-						}
-						RemoteToolsEnvironmentView.this.fillContextMenu(manager);
-					} else if (TargetTypeElement.class.isAssignableFrom(obj.getClass())) {
-						//Create
-						createAction.setEnabled(true);
-						editAction.setEnabled(false);
-						removeAction.setEnabled(false);
-						RemoteToolsEnvironmentView.this.fillContextMenu(manager);
-					}
-				}
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		//manager.add(action1);
-		//manager.add(new Separator());
-		//manager.add(action2);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(createAction);
-		manager.add(editAction);
-		manager.add(removeAction);
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-	
-	private void fillLocalToolBar(IToolBarManager manager) {
-		// Other plug-ins can contribute there actions here
-		for (Action controller : workloadControllers) {
-			manager.add(controller);
-		}
-		
-		manager.add(startAction);
-		manager.add(stopAction);
-		manager.add(resumeAction);
-		manager.add(pauseAction);
-	}
-	
-	private List<Action> getWorkloadControllers() {
-
-		List<Action> actions = new ArrayList<Action>();
-		
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry
-				.getExtensionPoint("org.eclipse.ptp.remotetools.environment.ui.workloadController");
-		IExtension[] extensions = extensionPoint.getExtensions();
-
-		try {
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				IConfigurationElement[] elements = extension
-						.getConfigurationElements();
-				for (int j = 0; j < elements.length; j++) {
-				    IConfigurationElement element = elements[j];
-	                if ("controllerDelegate".equals(element.getName())) {
-	                    actions.add((Action) element.createExecutableExtension("class"));
-	                }
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return actions.isEmpty() ? Collections.EMPTY_LIST : actions;
-	}
-	
-	public void refresh() {
-		final Display display = viewer.getControl().getDisplay();
-		display.asyncExec(new Runnable() {
-		      public void run () {
-		          if (!viewer.getControl().isDisposed())
-		        	  viewer.refresh(true);
-		      }
-		});
-	}
-
-	private void makeActions() {
-		
-		URL url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/run_exc.gif");
-	    ImageDescriptor imageRun = ImageDescriptor.createFromURL(url);
-	    url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/terminatedlaunch.gif");
-	    ImageDescriptor imageStop = ImageDescriptor.createFromURL(url);
-	    url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/suspend.gif");
-	    ImageDescriptor imageSuspend = ImageDescriptor.createFromURL(url);
-	    url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/resume.gif");
-	    ImageDescriptor imageResume = ImageDescriptor.createFromURL(url);
-	    
-	    IWorkbenchPartSite site =  this.getSite();
-		final Shell shell = site.getShell();
-		
-		final IJobChangeListener ijob = new IJobChangeListener() {
-
-			public void aboutToRun(IJobChangeEvent event) {
-				
-				
-			}
-
-			public void awake(IJobChangeEvent event) {
-				
-				
-			}
-
-			public void done(IJobChangeEvent event) {
-				
-				refresh();
-				
-			}
-
-			public void running(IJobChangeEvent event) {
-				
-				
-			}
-
-			public void scheduled(IJobChangeEvent event) {
-				
-				
-			}
-
-			public void sleeping(IJobChangeEvent event) {
-				
-				
-			}
-			
-		};
-		
-		startAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection)selection).getFirstElement();
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job("Start the  Environment") {
-							protected IStatus run(IProgressMonitor monitor) {
-								
-								startAction.setEnabled(false);
-								IStatus status = null;
-								ITargetElement element = null;
-								ITargetControl control = null;
-								
-								try {
-									element = (ITargetElement)obj;
-									control = element.getControl();
-									if ( control.create(monitor) )
-										status = Status.OK_STATUS;
-								} catch (CoreException e) {
-									status = e.getStatus();
-									startAction.setEnabled(true);
-								}
-								
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return ;
-					}
-				}
-				showMessage("Please Select a Target Configuration first",viewer);
-			}
-		};
-		startAction.setText("Create");
-		startAction.setToolTipText("Start the Environment");
-		startAction.setImageDescriptor(imageRun);
-		
-		stopAction = new Action() {
-			public void run() {
-				
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection)selection).getFirstElement();
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job("Stop the  Environment") {
-							protected IStatus run(IProgressMonitor monitor) {
-								
-								stopAction.setEnabled(false);
-								IStatus status = null;
-								
-								try {
-									if ( ((ITargetElement)obj).getControl().kill(monitor) )
-										status = Status.OK_STATUS;
-								} catch (CoreException e) {
-									status = e.getStatus();
-									stopAction.setEnabled(true);
-								}
-								
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return ;
-					}
-				}
-				showMessage("Please Select a Target Configuration first",viewer);
-			}
-		};
-		stopAction.setText("Kill");
-		stopAction.setToolTipText("Kill the Environment");
-		stopAction.setImageDescriptor(imageStop);
-		
-		//resume
-		resumeAction = new Action() {
-			public void run() {
-				
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection)selection).getFirstElement();
-				
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job("Resume the  Environment") {
-							protected IStatus run(IProgressMonitor monitor) {
-								
-								resumeAction.setEnabled(false);
-								IStatus status = null;
-								
-								try {
-									if ( ((ITargetElement)obj).getControl().resume(monitor) ) {
-										status = Status.OK_STATUS;
-										pauseAction.setEnabled(true);
-									}
-								} catch (CoreException e) {
-									status = e.getStatus();
-									resumeAction.setEnabled(true);
-								}
-								
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return ;
-					}
-				}
-				showMessage("Please Select a Target Configuration first",viewer);
-			}
-		};
-		resumeAction.setText("Resume");
-		resumeAction.setToolTipText("Resume");
-		resumeAction.setImageDescriptor(imageResume);
-		
-		//stop
-		pauseAction = new Action() {
-			public void run() {
-				
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection)selection).getFirstElement();
-				
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job("Pause the  Environment") {
-							protected IStatus run(IProgressMonitor monitor) {
-								
-								pauseAction.setEnabled(false);
-								IStatus status = null;
-								
-								try {
-									if ( ((ITargetElement)obj).getControl().stop(monitor) ) {
-										status = Status.OK_STATUS;
-										resumeAction.setEnabled(true);
-									}
-								} catch (CoreException e) {
-									status = e.getStatus();
-									pauseAction.setEnabled(true);
-								}
-								
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return ;
-					}
-				}
-				showMessage("Please Select a Target Configuration first",viewer);
-			}
-		};
-		pauseAction.setText("Pause");
-		pauseAction.setToolTipText("Pause");
-		pauseAction.setImageDescriptor(imageSuspend);
-		
-		// Create
-		createAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				
-				if (TargetTypeElement.class.isAssignableFrom(obj.getClass())) {
-					EnvironmentWizard wizard = new EnvironmentWizard((TargetTypeElement)obj);
-					WizardDialog dialog = new WizardDialog(shell, wizard);
-					dialog.create();
-					dialog.setBlockOnOpen(true);
-					dialog.open();
-					refresh();
-				}
-				
-			}
-		};
-		createAction.setText("Create");
-		createAction.setToolTipText("Creates a new configuration");
-		
-		// Edit
-		editAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				
-				if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-					EnvironmentWizard wizard = new EnvironmentWizard((ITargetElement)obj);
-					WizardDialog dialog = new WizardDialog(shell, wizard);
-					dialog.create();
-					dialog.setBlockOnOpen(true);
-					dialog.open();
-					refresh();
-				}
-			}
-		};
-		editAction.setText("Edit");
-		editAction.setToolTipText("Edits configuration");
-		
-		// Remove
-		removeAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				
-				if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-					ITargetElement confElement = (ITargetElement)obj;
-					if (confElement.getStatus() != ITargetElementStatus.STARTED) {
-						if (showConfirm("Do you really want to remove ?",viewer)) {
-							confElement.getType().removeElement(confElement);
-							refresh();
-						}
-					} else {
-						showMessage("Please stop this instance first !",viewer);
-					}
-				}
-			}
-		};
-		removeAction.setText("Remove");
-		removeAction.setToolTipText("Removes configuration");
-		
-		doubleClickAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				//TargetEnvironmentTypeElement
-				//TargetEnvironmentConfigElement, type TargetEnvironmentTypeElement
-				
-				if (TargetTypeElement.class.isAssignableFrom(obj.getClass())){
-					if(viewer.getExpandedState(obj)){
-						viewer.setExpandedState(obj, false);
-					}
-					else
-						viewer.setExpandedState(obj,true);
-					
-				}
-				
-				if (TargetElement.class.isAssignableFrom(obj.getClass())){
-					ITargetElement ele = (ITargetElement) obj;
-					try {
-						ITargetControl control = ele.getControl();
-						if(control.query() == ITargetElementStatus.STOPPED){
-							editAction.run();
-						}
-					} catch (CoreException e) {
-						e.printStackTrace();
-					}					
-				}
-
-                if (INode.class.isAssignableFrom(obj.getClass())) {
-                    INode node = (INode) obj;
-                    UIEnvironmentPlugin.getDefault().getDoubleClickHandlerManager().doubleClickExecute(node);
-                }
-
-               //showMessage("Double-click detected on "+obj.toString(),viewer);
-			}
-		};		
-		
-		stopAction.setEnabled(false);
-		resumeAction.setEnabled(false);
-		pauseAction.setEnabled(false);
-		createAction.setEnabled(false);
-		editAction.setEnabled(false);
-		removeAction.setEnabled(false);
-		
-	}
-	
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-	
-	private void showMessage(String message,TreeViewer viewer) {
-		MessageDialog.openInformation(
-			viewer.getControl().getShell(),
-			"Environments",
-			message);
-	}
-
-	private boolean showConfirm(String message,TreeViewer viewer) {
-		return MessageDialog.openConfirm(
-			viewer.getControl().getShell(),
-			"Environments",
-			message);
-	}
-	
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-
-	public void selectionChanged(SelectionChangedEvent event) {
-		ISelection selection = event.getSelection();
-		Object obj = ((IStructuredSelection)selection).getFirstElement();
-				
-		if (obj != null) {
-			if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-				currentElement = (ITargetElement) obj;
-				switch (currentElement.getStatus()) {
-					case ITargetElementStatus.STARTED:
-						targetStarted(currentElement);
-						break;
-					case ITargetElementStatus.STOPPED:
-						targetStopped(currentElement);
-						break;
-					case ITargetElementStatus.RESUMED:
-						targetResumed(currentElement);
-						break;
-					case ITargetElementStatus.PAUSED:
-						targetPaused(currentElement);
-						break;
-				}
-			} else {
-				currentElement = null;
-				startAction.setEnabled(false); // Create
-				stopAction.setEnabled(false); // Kill
-				resumeAction.setEnabled(false); // Resume
-				pauseAction.setEnabled(false); // Pause
-			}
-		}
-	}
-
-	public void targetStarted(ITargetElement event) {
-		
-		if (event != null && currentElement != null) {
-				if (event.equals(currentElement)) {
-					startAction.setEnabled(false); // Create
-					stopAction.setEnabled(true); // Kill
-					resumeAction.setEnabled(true); // Resume
-					pauseAction.setEnabled(false); // Pause
-					editAction.setEnabled(false);
-					removeAction.setEnabled(false);
-				}
-		}
-		this.refresh();
-		
-	}
-
-	public void targetStopped(ITargetElement event) {
-		
-		if (event != null && currentElement != null) {
-			if (event.equals(currentElement)) {
-					startAction.setEnabled(true); // Create
-					stopAction.setEnabled(false); // Kill
-					resumeAction.setEnabled(false); // Resume
-					pauseAction.setEnabled(false); // Pause
-					editAction.setEnabled(true);
-					removeAction.setEnabled(true);
-			}
-		}
-		this.refresh();
-		
-	}
-
-	public void targetPaused(ITargetElement event) {
-		
-		if (event != null && currentElement != null) {
-			if (event.equals(currentElement)) {
-					startAction.setEnabled(false); // Create
-					stopAction.setEnabled(true); // Kill
-					resumeAction.setEnabled(true); // Resume
-					pauseAction.setEnabled(false); // Pause
-				
-			}
-		}
-		this.refresh();
-		
-	}
-
-	public void targetResumed(ITargetElement event) {
-		
-		if (event != null && currentElement != null) {
-			if (event.equals(currentElement)) {
-					startAction.setEnabled(false); // Create
-					stopAction.setEnabled(true); // Kill
-					resumeAction.setEnabled(false); // Resume
-					pauseAction.setEnabled(true); // Pause
-				
-			}
-		}
-		this.refresh();
-		
-	}
-
-	public void handleStateChangeEvent(int event, ITargetElement from) {
-		
-		switch (event) {
-			case ITargetElementStatus.STARTED:
-				targetStarted(from);
-				break;
-			case ITargetElementStatus.STOPPED:
-				targetStopped(from);
-				break;
-			case ITargetElementStatus.RESUMED:
-				targetResumed(from);
-				break;
-			case ITargetElementStatus.PAUSED:
-				targetPaused(from);
-				break;
-		}
-		
-	}
-	
-	public void dispose() {
-		super.dispose();
-		model.removeModelEventListener(this);
-	}
-}
-
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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/remotetools/org.eclipse.ptp.remotetools.preferences/.project b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.project
deleted file mode 100755
index b7237ec..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.preferences</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF
deleted file mode 100755
index fe6dcec..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.preferences;singleton:=true
-Bundle-Version: 1.3.1.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.preferences.PreferencesPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.ptp.remotetools.preferences,
- org.eclipse.ptp.remotetools.preferences.events,
- org.eclipse.ptp.remotetools.preferences.ui

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties
deleted file mode 100755
index 2681e2d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.properties
deleted file mode 100644
index 0c91414..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools Preferences
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml
deleted file mode 100755
index 01b38f8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="Remote Tools"
-            class="org.eclipse.ptp.remotetools.preferences.ui.TargetPreferencePage"
-            id="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage">
-      </page>
-      <page
-            category="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage"
-            class="org.eclipse.ptp.remotetools.preferences.ui.TargetEnvironmentPreferencePage"
-            id="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage.EnvironmentPreferencePage"
-            name="Environments"/>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="org.eclipse.ptp.remotetools.preferences.ui.PreferenceInitializer">
-      </initializer>
-   </extension>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java
deleted file mode 100755
index 4e2e19a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.ptp.remotetools.preferences.events.PreferencesChangeEvent;
-import org.eclipse.ptp.remotetools.preferences.events.IPreferencesChangeListener;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class PreferencesPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static PreferencesPlugin plugin;
-	
-	private List propertiesListeners;
-	
-	private Preferences.IPropertyChangeListener propertyListener;
-	
-	/**
-	 * The constructor.
-	 */
-	public PreferencesPlugin() {
-		plugin = this;
-		propertiesListeners = new ArrayList();
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		propertyListener = new Preferences.IPropertyChangeListener() {
-
-			public void propertyChange(Preferences.PropertyChangeEvent event) {
-				
-				fireValueChanged(event.getProperty(),event.getOldValue(),event.getNewValue());
-				
-			}
-			
-		};
-		this.getPluginPreferences().addPropertyChangeListener(propertyListener);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		this.getPluginPreferences().removePropertyChangeListener(propertyListener);
-		this.savePluginPreferences();
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PreferencesPlugin getDefault() {
-		return plugin;
-	}
-	
-	public void addListener(IPreferencesChangeListener listener) {
-		
-		propertiesListeners.add(listener);
-	}
-	
-	public void removeListener(IPreferencesChangeListener listener) {
-		
-		propertiesListeners.remove(listener);
-	}
-	
-	public void fireValueChanged(String property, Object oldValue,
-            Object newValue) {
-        if (propertiesListeners.size() == 0)
-            return;
-        Iterator i = propertiesListeners.iterator();
-        
-        while (i.hasNext()) { 
-        	IPreferencesChangeListener listener = (IPreferencesChangeListener) i.next();
-        	listener.propertyChange(new PreferencesChangeEvent(this,
-                property, oldValue, newValue));
-        }
-    }
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java
deleted file mode 100755
index 8846fea..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.preferences.events;
-
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class FollowBeginStringFieldEditorPropertyChangeListener implements
-		IPropertyChangeListener {
-
-	protected StringFieldEditor stringFieldEditor;
-
-	protected Text textControl;
-
-	protected IPreferenceStore preferenceStore;
-
-	protected String preferenceName;
-
-	protected Display display;
-
-	/**
-	 * 
-	 */
-	public FollowBeginStringFieldEditorPropertyChangeListener(
-			StringFieldEditor stringFieldEditor, Composite parent) {
-		this.stringFieldEditor = stringFieldEditor;
-		this.textControl = stringFieldEditor.getTextControl(parent);
-		this.display = this.textControl.getDisplay();
-		this.preferenceStore = stringFieldEditor.getPreferenceStore();
-		this.preferenceName = stringFieldEditor.getPreferenceName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		final String oldValue = (String) event.getOldValue(); // old value for
-																// the property
-																// being
-																// monitored
-		final String newValue = (String) event.getNewValue(); // new value for
-																// the property
-																// being
-																// monitored
-		// Update the value in the GUI or in the preference store, which one is
-		// active
-		if (this.display != null) {
-			this.display.asyncExec(new Runnable() {
-				public void run() {
-					String stringValue;
-					String stringNewValue;
-					if (!FollowBeginStringFieldEditorPropertyChangeListener.this.textControl
-							.isDisposed()) {
-						stringValue = FollowBeginStringFieldEditorPropertyChangeListener.this.stringFieldEditor
-								.getStringValue();
-						if (stringValue.startsWith(oldValue)) {
-							stringNewValue = stringValue.replaceFirst(oldValue,
-									newValue);
-							FollowBeginStringFieldEditorPropertyChangeListener.this.stringFieldEditor
-									.setStringValue(stringNewValue);
-						}
-					} else {
-						stringValue = FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-								.getString(FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName);
-						if (stringValue.startsWith(oldValue)) {
-							stringNewValue = stringValue.replaceFirst(oldValue,
-									newValue);
-							FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-									.setValue(
-											FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName,
-											stringNewValue);
-						}
-					}
-				}
-			});
-		} else {
-			String stringValue = FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-					.getString(FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName);
-			if (stringValue.startsWith(oldValue)) {
-				String stringNewValue = stringValue.replaceFirst(oldValue,
-						newValue);
-				FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-						.setValue(
-								FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName,
-								stringNewValue);
-			}
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java
deleted file mode 100644
index e48b25c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.events;
-
-import java.util.EventListener;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public interface IPreferencesChangeListener extends EventListener {
-
-	/**
-	 * Notification that a property has changed.
-	 * <p>
-	 * This method gets called when the observed object fires a property
-	 * change event.
-	 * </p>
-	 *
-	 * @param event the property change event object describing which
-	 *    property changed and how
-	 */
-	public void propertyChange(PreferencesChangeEvent event);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java
deleted file mode 100644
index 3c4c9c6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.events;
-
-import java.util.EventObject;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class PreferencesChangeEvent extends EventObject {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4835020254788026229L;
-
-	/**
-	 * The name of the changed property.
-	 */
-	private String propertyName;
-
-	/**
-	 * The old value of the changed property, or <code>null</code> if
-	 * not known or not relevant.
-	 */
-	private Object oldValue;
-
-	/**
-	 * The new value of the changed property, or <code>null</code> if
-	 * not known or not relevant.
-	 */
-	private Object newValue;
-
-	/**
-	 * Creates a new property change event.
-	 *
-	 * @param source the object whose property has changed
-	 * @param property the property that has changed (must not be 
-	 *    <code>null</code>)
-	 * @param oldValue the old value of the property, or 
-	 *    <code>null</code> if none
-	 * @param newValue the new value of the property, or 
-	 *    <code>null</code> if none
-	 */
-	public PreferencesChangeEvent(Object source, String property, Object oldValue, Object newValue) {
-		super(source);
-		if (property == null) {
-			throw new IllegalArgumentException();
-		}
-		this.propertyName = property;
-		this.oldValue = oldValue;
-		this.newValue = newValue;
-	}
-
-	/**
-	 * Returns the name of the property that changed.
-	 * <p>
-	 * Warning: there is no guarantee that the property name returned
-	 * is a constant string.  Callers must compare property names using
-	 * <code>equals</code>, not ==.
-	 *</p>
-	 * 
-	 * @return the name of the property that changed
-	 */
-	public String getProperty() {
-		return propertyName;
-	}
-
-	/**
-	 * Returns the new value of the property.
-	 *
-	 * @return the new value, or <code>null</code> if not known
-	 *  or not relevant
-	 */
-	public Object getNewValue() {
-		return newValue;
-	}
-
-	/**
-	 * Returns the old value of the property.
-	 *
-	 * @return the old value, or <code>null</code> if not known
-	 *  or not relevant
-	 */
-	public Object getOldValue() {
-		return oldValue;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java
deleted file mode 100755
index 5f9984d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public abstract class AbstractBaseFieldEditorPreferencePage extends
-		FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	public AbstractBaseFieldEditorPreferencePage(int style) {
-		super(style);
-	}
-
-	public AbstractBaseFieldEditorPreferencePage(String title, int style) {
-		super(title, style);
-
-	}
-
-	public AbstractBaseFieldEditorPreferencePage(String title,
-			ImageDescriptor image, int style) {
-		super(title, image, style);
-
-	}
-
-	protected void createFieldEditors() {
-
-
-	}
-
-	public void init(IWorkbench workbench) {
-
-	}
-	
-	public void propertyChange(PropertyChangeEvent event) {
-		super.propertyChange(event);
-		
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java
deleted file mode 100755
index 31b0848..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-
-public class AbstractBasicPreferencePage
-	extends PreferencePage
-	implements IWorkbenchPreferencePage {
-
-	public AbstractBasicPreferencePage() {
-		super();
-		noDefaultAndApplyButton();
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-
-	protected Control createContents(Composite parent) {
-		
-		return parent;
-	}
-	
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java
deleted file mode 100755
index 6745f50..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2006 IBM Corporation.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - Initial Implementation

- *

- */

-package org.eclipse.ptp.remotetools.preferences.ui;

-

-import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-

-/**

- * A field editor for displaying labels not associated with other widgets.

- * 

- * @author Ricardo M. Matinata

- * @since 1.0

- */

-public class LabelFieldEditor extends FieldEditor {

-

-	private Label label;

-

-	public LabelFieldEditor(String value, Composite parent) {

-		super("label", value, parent);

-	}

-

-	protected void adjustForNumColumns(int numColumns) {

-		((GridData) label.getLayoutData()).horizontalSpan = numColumns;

-	}

-

-	protected void doFillIntoGrid(Composite parent, int numColumns) {

-		label = getLabelControl(parent);

-		

-		GridData gridData = new GridData();

-		gridData.horizontalSpan = numColumns;

-		gridData.horizontalAlignment = GridData.FILL;

-		gridData.grabExcessHorizontalSpace = false;

-		gridData.verticalAlignment = GridData.CENTER;

-		gridData.grabExcessVerticalSpace = false;

-		

-		label.setLayoutData(gridData);

-	}

-

-	public int getNumberOfControls() {

-		return 1;

-	}

-

-	protected void doLoad() {

-	}

-	protected void doLoadDefault() {

-	}

-	protected void doStore() {

-	}

-}


diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties
deleted file mode 100755
index e8d39b0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-searchButtonText=Find it!
-searchEngineInformationTitle="Search engine information"
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java
deleted file mode 100755
index b0569a1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.preferences.PreferencesPlugin;
-
-
-/**
- * Constant definitions for plug-in preferences
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class PreferenceConstants {
-
-	//keys
-	public static final String TIMING_SPUBIN = "timing-spubin";
-		
-	private IPreferenceStore preferences = null;
-	private static PreferenceConstants instance = null;
-
-	public PreferenceConstants() {
-		super();
-		preferences = PreferencesPlugin.getDefault().getPreferenceStore();
-	}
-	
-	public static PreferenceConstants getInstance() {
-		if (instance == null)
-			instance = new PreferenceConstants();
-		return instance;
-	}
-	
-	public IPath getTIMING_SPUBIN() {
-		return new Path(preferences.getString(TIMING_SPUBIN));
-	}
-	
-	public IPath getDefaultTIMING_SPUBIN() {
-		return new Path("spu_timing");
-	}
-	
-	public void setTIMING_SPUBIN(IPath value) {
-		preferences.setValue(TIMING_SPUBIN, value.toOSString());
-		PreferencesPlugin.getDefault().savePluginPreferences();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java
deleted file mode 100755
index cb0a07c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Richard Maciel
- *
- * @since 1.2.3
- */
-public class PreferenceConstantsFromFile extends NLS
-{
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remotetools.preferences.PluginResources"; //$NON-NLS-1$
-	
-	public static String TIMING_SPUBIN_VALUE;
-	
-	public static String searchButtonText;
-	
-	public static String searchEngineInformationTitle;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, PreferenceConstantsFromFile.class);
-	}
-
-	private PreferenceConstantsFromFile() {
-		// cannot create new instance
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java
deleted file mode 100755
index 70023a4..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.preferences.PreferencesPlugin;
-
-import org.eclipse.ptp.remotetools.preferences.ui.PreferenceConstants;
-import org.eclipse.ptp.remotetools.preferences.ui.PreferenceConstantsFromFile;
-
-/**
- * Class used to initialize default preference values.
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.0
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = PreferencesPlugin.getDefault()
-				.getPreferenceStore();
-		PreferenceConstants prefs = PreferenceConstants.getInstance();
-		store.setDefault(PreferenceConstants.TIMING_SPUBIN,PreferenceConstantsFromFile.TIMING_SPUBIN_VALUE);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java
deleted file mode 100755
index 4ba7a67..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2006 IBM Corporation.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - Initial Implementation

- *

- */

-package org.eclipse.ptp.remotetools.preferences.ui;

-

-import org.eclipse.swt.widgets.Composite;

-

-/**

- * A field editor for adding space to a preference page.

- * 

- * @author Ricardo M. Matinata

- * @since 1.0

- */

-public class SpacerFieldEditor extends LabelFieldEditor {

-	

-	public SpacerFieldEditor(Composite parent) {

-		super("", parent);

-	}

-}


diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java
deleted file mode 100644
index 751c93d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class TargetEnvironmentPreferencePage extends AbstractBasicPreferencePage {
-	
-	public TargetEnvironmentPreferencePage() {
-		super();
-		setDescription("Target Environment Preferences");
-	}
-
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java
deleted file mode 100644
index 449db7a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-
-/**
- * This class represents a preference page that
- * is contributed to the Preferences dialog.
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class TargetPreferencePage
-	extends AbstractBasicPreferencePage{
-
-	public TargetPreferencePage() {
-		super();
-		setDescription("Remote Tools preferences");
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.utils/.classpath
deleted file mode 100755
index 751c8f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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/remotetools/org.eclipse.ptp.remotetools.utils/.project b/tools/remotetools/org.eclipse.ptp.remotetools.utils/.project
deleted file mode 100755
index 8e64ce8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.utils</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF
deleted file mode 100755
index 0019af3d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.utils
-Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.utils.UtilsPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.console,
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.swt,
- org.eclipse.jface,
- org.eclipse.ui
-Eclipse-LazyStart: true
-Export-Package: 
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.remotetools.utils.network,
- org.eclipse.ptp.remotetools.utils.stream

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.utils/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties
deleted file mode 100755
index d944674..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.utils/plugin.properties
deleted file mode 100644
index da055d5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools Utilities
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java
deleted file mode 100755
index 3ebdf0f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plug-in class to be used in the desktop.
- */
-public class UtilsPlugin extends Plugin {
-
-	//private static final String PLUGIN_ID = "org.eclipse.ptp.remotetools.utils"; //$NON-NLS-1$
-	
-	//The shared instance.
-	private static UtilsPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public UtilsPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/*public static String getUniqueIdentifier() {
-		if (plugin == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier.
-			return PLUGIN_ID;
-		}
-		return plugin.getBundle().getSymbolicName();
-	}*/
-	
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UtilsPlugin getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java
deleted file mode 100755
index 2431b8b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.network;
-
-import java.math.BigInteger;
-
-/**
- * Class that represents a 
- * 
- * @author Richard Maciel
- * @since 3.0
- */
-public class MacAddress {
-	public static int MAX_BITS = 48;
-	public static int HEXDIGITS = MAX_BITS/4;
-	public static int HEXBASE = 16;
-	
-	BigInteger mac;
-	
-	private MacAddress() {
-	}
-	
-	/**
-	 * Creatre a MacAddress from a {@link String}.
-	 * 
-	 * If the string is not in the XX:XX:XX:XX:XX:XX format, where XX is two hexadecimal digits, then
-	 * a MacAddressFormatException is raised.
-	 * 
-	 * @param macString
-	 * @return
-	 * @throws MacAddressFormatException
-	 */
-	public static MacAddress createMacAddress(String macString) throws MacAddressFormatException {
-		MacAddress maddr = new MacAddress();
-		maddr.mac = convertStringToInternalRepresentation(macString);
-		
-		return maddr;
-	}
-	
-	/**
-	 * Create a Mac Address from a {@link BigInteger}.
-	 * 
-	 * If the number is negative, it will be converted to a positive one.
-	 * If the number cannot be represented with MAX_BITS, then get the MAX_BITS least significant bits
-	 *  
-	 * @param macNumber
-	 */
-	public static MacAddress createMacAddress(BigInteger macNumber) {
-		MacAddress maddr = new MacAddress();
-		maddr.mac  = convertBigIntegerToInternalRepresentation(macNumber);
-		
-		return maddr;
-	}
-
-	private static BigInteger convertBigIntegerToInternalRepresentation(BigInteger macNumber) {
-		if(macNumber.signum() < 0) {
-//			 macNumber cannot be negative. Set it to a positive number
-			macNumber = macNumber.negate();
-		} 
-		
-		if(macNumber.bitLength() > MAX_BITS) { 
-//			 Mac number cannot be greater than 2 ^48, then convert to a 48 bit number
-			String bigMacStr = macNumber.toString(HEXBASE); 
-			String macStr = bigMacStr.substring(bigMacStr.length()-1 - HEXDIGITS, bigMacStr.length() - 1);
-			macNumber = new BigInteger(macStr);
-		}
-		return macNumber;
-	}
-
-	private static BigInteger convertStringToInternalRepresentation(String macString) throws MacAddressFormatException {
-		String trimmedMacString = macString.trim(); 
-		boolean isValidMac = trimmedMacString.matches("^(\\p{XDigit}{2}:){5}\\p{XDigit}{2}$"); //$NON-NLS-1$
-		
-		if(!isValidMac) {
-			throw new MacAddressFormatException(Messages.MacAddress_InvalidMACAddressFormat);
-		}
-		// Remove all ':' from the String
-		String validMacString = trimmedMacString.replaceAll(":", ""); //replace(':', '\0');  //$NON-NLS-1$//$NON-NLS-2$
-		
-		// Convert to the internal representation
-		return new BigInteger(validMacString, HEXBASE);
-		
-	}
-	
-	public void setValue(BigInteger macNumber) {
-		mac = MacAddress.convertBigIntegerToInternalRepresentation(macNumber);
-	}
-	
-	public void setValue(String macString) throws MacAddressFormatException {
-		mac = convertStringToInternalRepresentation(macString);
-	}
-	
-	public BigInteger getBigIntegerRepresentation() {
-		return mac;
-	}
-	
-	/**
-	 * Return a string representation of the mac address
-	 * 
-	 * @return String containing the mac address representation
-	 */
-	public String getStringRepresentation() {
-		String strRep = mac.toString(HEXBASE);
-		
-//		 Add the 0 at the left to complete the string.
-		if(strRep.length() < HEXDIGITS) {
-			
-			StringBuffer zeroStr =  new StringBuffer();
-			
-			for(int i=0; i < (HEXDIGITS - strRep.length()); i++) {
-				zeroStr.append("0"); //$NON-NLS-1$
-			}
-			strRep = new String(zeroStr + strRep);
-		}
-		
-		// For each pair of character, add a : character, except for the last one
-		StringBuffer hexRep = new StringBuffer();
-		for(int i=0; i < HEXDIGITS - 2; i = i + 2) {
-			hexRep.append(strRep.substring(i, i+2) + ":"); //$NON-NLS-1$
-		}
-		hexRep.append(strRep.substring(HEXDIGITS-2, HEXDIGITS));
-		
-		return hexRep.toString();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java
deleted file mode 100755
index 5a57406..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.network;
-
-/**
- * @author Richard Maciel
- * @since 3.0
- */
-public class MacAddressFormatException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 9098093943130065515L;
-
-	public MacAddressFormatException(String errorMsg) {
-		super(errorMsg);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java
deleted file mode 100644
index 05ef360..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package org.eclipse.ptp.remotetools.utils.network;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.cell.utils.network.messages"; //$NON-NLS-1$
-	public static String MacAddress_InvalidMACAddressFormat;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties
deleted file mode 100644
index 1d5df14..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-MacAddress_InvalidMACAddressFormat=Invalid Mac Address format\!

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java
deleted file mode 100755
index 40933da..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.stream;
-
-/**
- * A listener that is called when an entire line is read from a stream.
- * A ILineStreamListener is an entity that can receive one line of text at time.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public interface ILineStreamListener {
-	void newLine(String line);
-	void streamClosed();
-	void streamError(Exception e);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java
deleted file mode 100755
index f002f57..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-
-/**
- * A listener that is called when some chunk of data is received from a stream.
- * A IStreamListener is an entity that can receive one chunk at time.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public interface IStreamListener {
-	void newBytes(byte bytes[], int length);
-	void streamClosed();
-	void streamError(Exception e);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java
deleted file mode 100755
index 55d9b98..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class ListenedOutputStream extends OutputStream {
-
-	private IStreamListener listener;
-
-	public ListenedOutputStream(IStreamListener listener) {
-		this.listener = listener;
-	}
-	
-	public void write(byte[] b, int off, int len) throws IOException {
-		byte [] bytes = new byte[len];
-		System.arraycopy(b, off, bytes, 0, len);
-		listener.newBytes(bytes, len);
-	}
-
-	public void write(byte[] b) throws IOException {
-		listener.newBytes(b, b.length);
-	}
-
-	public void write(int b) throws IOException {
-		byte [] bytes = new byte[1];
-		bytes[0] = (byte) b;
-		listener.newBytes(bytes, bytes.length);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java
deleted file mode 100755
index f24e775..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Connects an inputstream to an outputstream.
- * <p>
- * This is a general facility that allows to forward data received from an
- * inputstream to an outputstream.
- * <p>
- * An example would be to forward automatically data received from a socket
- * inputstream to a file outputstream.
- * <p>
- * Do not forget to call run() method!
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public class StreamBridge  {
-	/*
-	 * TODO: Open issues
-	 * - Handle exceptions
-	 */
-	IStreamListener dataForwarder = null;
-	StreamObserver streamObserver = null;
-	
-	private class DataForwarder implements IStreamListener {
-		OutputStream output;
-		StreamBridge bridge;
-
-		public DataForwarder(StreamBridge bridge, OutputStream output) {
-			this.output = output;
-			this.bridge = bridge;
-		}
-
-		public void newBytes(byte[] bytes, int length) {
-			try {
-				output.write(bytes, 0, length);
-			} catch (IOException e) {
-				// TODO Handle exception
-				bridge.kill();
-			}
-		}
-
-		public void newChars(char[] chars, int length) {
-		}
-
-		public void streamClosed() {
-			bridge.kill();
-		}
-
-		public void streamError(Exception e) {	
-			// TODO Handle exception
-			bridge.kill();
-		}
-	}
-
-	public StreamBridge(InputStream input, OutputStream output, String name) {
-		dataForwarder = new DataForwarder(this, output);
-		streamObserver = new StreamObserver(input, dataForwarder, name);
-	}
-
-	public StreamBridge(InputStream input, OutputStream output) {
-		dataForwarder = new DataForwarder(this, output);
-		streamObserver = new StreamObserver(input, dataForwarder);
-	}
-
-	public void kill() {
-		if (streamObserver != null) {
-			streamObserver.kill();
-		}
-		dataForwarder = null;
-		streamObserver = null;
-	}
-	
-	public void run() {
-		streamObserver.start();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java
deleted file mode 100755
index 6b67892..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Connects an inputstream to a stream listener.
- * <p>
- * This is a general facility that allows to forward data received from an
- * inputstream to a listener object. Note that only one listener is connected
- * to the observer.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public class StreamObserver extends Thread {
-	/*
-	 * TODO: Open issues 
-	 * - Does access to 'killed' attribute need synchronized access?
-	 * - On sockets, often one byte is read one after the other, instead of
-	 *   blocks of bytes. Maybe adding some delay might force to read
-	 *   more than one byte.
-	 */
-	/**
-	 * Stream that is been observed and read.
-	 */
-	private InputStream input;
-
-	/**
-	 * Signals that bridge should stop.
-	 */
-	private boolean killed;
-
-	/**
-	 * Name to identify bridge when debugging.
-	 */
-	private String name;
-
-	/**
-	 * Listener that is called when data is received.
-	 */
-	private IStreamListener listener;
-
-	static final int BUFFER_SIZE = 100;
-
-	public StreamObserver(InputStream input, IStreamListener listener,
-			String name) {
-		this.name = name;
-		this.input = input;
-		this.listener = listener;
-		setName(name);
-	}
-
-	public StreamObserver(InputStream input, IStreamListener listener) {
-		this.name = this.getClass().getName();
-		this.input = input;
-		this.listener = listener;
-		setName(name);
-	}
-
-	/**
-	 * Stop observing data and terminate thread.
-	 */
-	public synchronized void kill() {
-		killed = true;
-	}
-	
-	void log(String s) {
-//		System.err.println(name + ": " + s);
-	}
-	
-	void streamClosed() {
-		log("Stream closed");
-		listener.streamClosed();
-	}
-	
-	void streamError(Exception e) {
-		log("Recovered from exception: " + e.getMessage());
-		listener.streamError(e);
-	}
-	
-	void newBytes(byte buffer[], int length) {
-		log("Received: " + Integer.toString(length) + " bytes");
-		listener.newBytes(buffer, length);		
-	}
-
-	/**
-	 * Run in background.
-	 */
-	public void run() {
-		byte buffer[] = new byte[250];
-		log("Started observing");
-		while (!killed) {
-			try {
-				int bytes = input.read(buffer);
-				if (bytes > 0) {
-					newBytes(buffer, bytes);
-				} else if (bytes == -1) {
-					streamClosed();
-					break;
-				}
-			} catch (IOException e) {
-				if (killed) {
-					streamClosed();
-					break;
-				}
-				if (e instanceof EOFException) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			} catch (NullPointerException e) {
-				/*
-				 * When the stream is closed, Java may raise a
-				 * NullPointerException. This case is handled like a
-				 * IOException, as above.
-				 */
-				if (killed) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			}
-		}
-		log("Finished observing");		
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java
deleted file mode 100755
index 72c9469..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * A temporarily workaround to read lines of text.
- * In future, will be replaced by an IStreamListener that converts
- * blocks of bytes to lines.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- * 
- */
-public class TextStreamObserver extends Thread {
-	private BufferedReader reader;
-	private boolean killed;
-	private String name;
-	private ILineStreamListener listener;
-
-	public TextStreamObserver(InputStream input, ILineStreamListener listener,
-			String name) {
-		this.name = name;
-		reader = new BufferedReader(new InputStreamReader(input));
-		this.listener = listener;
-		setName(name);
-	}
-
-	public TextStreamObserver(InputStream input, ILineStreamListener listener) {
-		this.name = this.getClass().getName();
-		reader = new BufferedReader(new InputStreamReader(input));
-		this.listener = listener;
-		setName(name);
-	}
-	
-	public synchronized void kill() {
-		killed = true;
-	}
-
-	void log(String string) {
-//		System.err.println(name + ": " + s);
-	}
-	
-	void newLine(String line) {
-		log("Received: " + Integer.toString(line.length()) + " bytes");
-		listener.newLine(line);
-	}
-
-	void streamClosed() {
-		log("Stream closed");
-		listener.streamClosed();
-	}
-	
-	void streamError(Exception e) {
-		log("Recovered from exception: " + e.getMessage());
-		listener.streamError(e);
-	}
-	
-	public void run() {
-		String line;
-
-		while (!killed) {
-			try {
-				line = reader.readLine();
-				if (line == null) {
-					streamClosed();
-					return;
-				} else {
-					newLine(line);
-				}
-			} catch (IOException e) {
-				if (e instanceof EOFException) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			} catch (NullPointerException e) {
-				if (killed) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			}
-		}
-	}
-
-}
commit	cfee18cd4b74973f8e793f21e10e201190f538bb	[log] [tgz]
author	cvs2svn <ptp-dev@eclipse.org>	Mon Nov 16 21:13:36 2009 +0000
committer	cvs2svn <ptp-dev@eclipse.org>	Mon Nov 16 21:13:36 2009 +0000
tree	532c2b038e5e27880eb1c9eb1237a7a81a4f65d2
parent	33c8979e37887c32d3b0e4005fc5bc189132bf18 [diff]